Sync with trunk r43123

[reactos.git] / reactos / subsystems / win32 / win32k / ntuser / callback.c

diff --git a/reactos/subsystems/win32/win32k/ntuser/callback.c b/reactos/subsystems/win32/win32k/ntuser/callback.c
index ce4be28..71d6519 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/callback.c
+++ b/reactos/subsystems/win32/win32k/ntuser/callback.c
@@ -662,11 +662,13 @@ co_IntCallLoadMenu( HINSTANCE hModule,
    Argument = IntCbAllocateMemory(ArgumentLength);
    if (NULL == Argument)
    {
-      DPRINT1("EventProc callback failed: out of memory\n");
+      DPRINT1("LoadMenu callback failed: out of memory\n");
       return 0;
    }
    Common = (PLOADMENU_CALLBACK_ARGUMENTS) Argument;
 
+   // Help Intersource check and MenuName is now 4 bytes + so zero it.
+   RtlZeroMemory(Common, ArgumentLength); 
 
    Common->hModule = hModule;
    if (pMenuName->Length)
@@ -687,6 +689,8 @@ co_IntCallLoadMenu( HINSTANCE hModule,
 
    UserEnterCo();
 
+   Result = *(LRESULT*)ResultPointer;
+
    IntCbFreeMemory(Argument);
   
    if (!NT_SUCCESS(Status))