Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32CSR]

Browse source 
Fix display of harderror message box for STATUS_UNHANDLED_EXCEPTION

svn path=/trunk/; revision=47213
This commit is contained in:
Timo Kreuzer 2010-05-15 01:05:09 +00:00
parent e093be6897
commit 1e9beb6809
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/subsystems/win32/csrss/win32csr/harderror.c
View file

@ -223,7 +223,7 @@ CsrpFormatMessages(
ANSI_STRING FormatA;
PRTL_MESSAGE_RESOURCE_ENTRY MessageResource;
PWSTR FormatString;
ULONG Size;
ULONG Size, ExceptionCode;
/* Get the file name of the client process */
CsrpGetClientFileName(&FileNameU, hProcess);
@ -310,8 +310,10 @@ CsrpFormatMessages(
/* Check if this is an exception message */
if (Message->Status == STATUS_UNHANDLED_EXCEPTION)
{
ExceptionCode = Parameters[0];
/* Handle special cases */
if (Parameters[0] == STATUS_ACCESS_VIOLATION)
if (ExceptionCode == STATUS_ACCESS_VIOLATION)
{
Parameters[0] = Parameters[1];
Parameters[1] = Parameters[3];
@ -319,7 +321,7 @@ CsrpFormatMessages(
else Parameters[2] = (ULONG_PTR)L"read";
MessageResource = NULL;
}
else if (Parameters[0] == STATUS_IN_PAGE_ERROR)
else if (ExceptionCode == STATUS_IN_PAGE_ERROR)
{
Parameters[0] = Parameters[1];
Parameters[1] = Parameters[3];
@ -339,7 +341,7 @@ CsrpFormatMessages(
Status = RtlFindMessage(GetModuleHandleW(L"ntdll"),
(ULONG_PTR)RT_MESSAGETABLE,
LANG_NEUTRAL,
Parameters[0],
ExceptionCode,
&MessageResource);
if (NT_SUCCESS(Status))
@ -356,6 +358,7 @@ CsrpFormatMessages(
RtlInitAnsiString(&FormatA, MessageResource->Text);
RtlAnsiStringToUnicodeString(&FormatU, &FormatA, TRUE);
}
FormatString = FormatU.Buffer;
}
else
{
@ -368,9 +371,8 @@ CsrpFormatMessages(
}
/* Calculate length of text buffer */
TextStringU->MaximumLength = wcslen(FormatString) * sizeof(WCHAR) +
SizeOfStrings + 42 * sizeof(WCHAR);
TextStringU->MaximumLength = FormatU.Length + SizeOfStrings + 42 * sizeof(WCHAR);
/* Allocate a buffer for the text */
TextStringU->Buffer = RtlAllocateHeap(RtlGetProcessHeap(),
HEAP_ZERO_MEMORY,