[jimtabor] 43086: - Two bugs found by Michael Martin.

Author: jimtabor
Date: Sun Sep 20 00:17:25 2009
New Revision: 43086

URL: http://svn.reactos.org/svn/reactos?rev=43086&view=rev
Log:
- Two bugs found by Michael Martin.

Modified:
    trunk/reactos/dll/win32/user32/windows/menu.c
    trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c

Modified: trunk/reactos/dll/win32/user32/windows/menu.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/me...
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sun Sep 20 00:17:25 2009
@@ -3967,7 +3967,7 @@

Common = (PLOADMENU_CALLBACK_ARGUMENTS) Arguments;

-  Result = (LRESULT)LoadMenuW(Common->hModule, (LPCWSTR)&Common->MenuName);
+  Result = (LRESULT)LoadMenuW(Common->hModule, IS_INTRESOURCE(Common->MenuName) ? Common->MenuName : (LPCWSTR)&Common->MenuName);

return ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS);
 }

Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win3...
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Sun Sep 20 00:17:25 2009
@@ -386,7 +386,7 @@

CaptionText = (LPSTR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, CaptionSize);
             RtlCopyMemory(CaptionText, MessageA.Buffer+1, CaptionSize-1);
-            CaptionSize += 3; // "}\r\n" - 3
+            CaptionSize += 2; // "}\r\n" - 3

szxCaptionText = (LPWSTR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(wchar_t)*CaptionSize+ClientFileNameU.MaximumLength+128);
             if( ClientFileNameU.Buffer ) {