Update SmmBase Communicate Thunk behaivor to be compatible with Framework implemenation.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10271 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c b/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c
index 1c52fa83b8b4480294fca5e628bdd5b2aafef397..a30058bb5cd1b17cc0e4a048922a7ec4164f2b3f 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c
+++ b/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c
@@ -42,6 +42,8 @@ typedef struct {
   EFI_HANDLE                    DispatchHandle;\r
   EFI_HANDLE                    SmmImageHandle;\r
   EFI_SMM_CALLBACK_ENTRY_POINT  CallbackAddress;\r
+  VOID                          *CommunicationBuffer;\r
+  UINTN                         *SourceSize;\r
 } CALLBACK_INFO;\r
 \r
 typedef struct {\r
@@ -410,8 +412,8 @@ CallbackThunk (
   ///\r
   Status = (CallbackInfo->CallbackAddress) (\r
                             CallbackInfo->SmmImageHandle,\r
-                            CommBuffer,\r
-                            CommBufferSize\r
+                            CallbackInfo->CommunicationBuffer,\r
+                            CallbackInfo->SourceSize\r
                             );\r
   ///\r
   /// Save CPU Save States in case any of them was modified\r
@@ -466,7 +468,7 @@ RegisterCallback (
   ///\r
   /// Allocate buffer for callback thunk information\r
   ///\r
-  Buffer = (CALLBACK_INFO *)AllocatePool (sizeof (CALLBACK_INFO));\r
+  Buffer = (CALLBACK_INFO *)AllocateZeroPool (sizeof (CALLBACK_INFO));\r
   if (Buffer == NULL) {\r
     FunctionData->Status = EFI_OUT_OF_RESOURCES;\r
     return;\r
@@ -552,14 +554,9 @@ HelperCommunicate (
     CallbackInfo = (CALLBACK_INFO *)Node;\r
 \r
     if (FunctionData->Args.Communicate.ImageHandle == CallbackInfo->SmmImageHandle) {\r
-      ///\r
-      /// Thunk into original Framwork SMI handler\r
-      ///\r
-      (CallbackInfo->CallbackAddress) (\r
-                       CallbackInfo->SmmImageHandle,\r
-                       FunctionData->Args.Communicate.CommunicationBuffer,\r
-                       FunctionData->Args.Communicate.SourceSize\r
-                       );\r
+      CallbackInfo->CommunicationBuffer = FunctionData->Args.Communicate.CommunicationBuffer;\r
+      CallbackInfo->SourceSize          = FunctionData->Args.Communicate.SourceSize;\r
+\r
       ///\r
       /// The message was successfully posted.\r
       ///\r