mirror of
https://github.com/reactos/reactos.git
synced 2024-08-01 00:58:16 +00:00
- Two bugs found by Michael Martin.
svn path=/trunk/; revision=43086
This commit is contained in:
parent
4dfeddc69f
commit
3cb48f661e
|
@ -3967,7 +3967,7 @@ User32CallLoadMenuFromKernel(PVOID Arguments, ULONG ArgumentLength)
|
|||
|
||||
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);
|
||||
}
|
||||
|
|
|
@ -386,7 +386,7 @@ Win32CsrHardError(IN PCSRSS_PROCESS_DATA ProcessData,
|
|||
|
||||
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 ) {
|
||||
|
|
Loading…
Reference in a new issue