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

Dmitry Philippov <shedon@mail.ru>

Browse source 
- Respect format of the returned string (unicode or ansi). This fixes the text inside csrss hard error message box.
- Unicode->ansi conversion is done especially.

svn path=/trunk/; revision=31711
This commit is contained in:
Aleksey Bragin 2008-01-11 11:16:02 +00:00
parent f1df2b6693
commit bbca7c647c
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
reactos/subsystems/win32/csrss/win32csr/dllmain.c
View file

@ -357,8 +357,17 @@ Win32CsrHardError(IN PCSRSS_PROCESS_DATA ProcessData,
UNICODE_STRING MessageU;
ANSI_STRING MessageA;
RtlInitUnicodeString(&MessageU, (PWSTR)MessageResource->Text);
RtlUnicodeStringToAnsiString(&MessageA, &MessageU, TRUE);
if( !MessageResource->Flags ) {
/* we've got an ansi string */
DPRINT("MessageResource->Text=%s\n", (PSTR)MessageResource->Text);
RtlInitAnsiString(&MessageA, MessageResource->Text);
}
else {
/* we've got a unicode string */
DPRINT("MessageResource->Text=%S\n", (PWSTR)MessageResource->Text);
RtlInitUnicodeString(&MessageU, (PWSTR)MessageResource->Text);
RtlUnicodeStringToAnsiString(&MessageA, &MessageU, TRUE);
}
USHORT CaptionSize = 0;
// check whether a caption exists
@ -387,6 +396,7 @@ Win32CsrHardError(IN PCSRSS_PROCESS_DATA ProcessData,
wsprintfW(szxCaptionText, L"System");
}
}
DPRINT("ParameterList[0]=0x%lx\n", ParameterList[0]);
if( STATUS_UNHANDLED_EXCEPTION == HardErrorMessage->Status )
{
PRTL_MESSAGE_RESOURCE_ENTRY MsgResException;
@ -402,10 +412,17 @@ Win32CsrHardError(IN PCSRSS_PROCESS_DATA ProcessData,
{
UNICODE_STRING ExcMessageU;
ANSI_STRING ExcMessageA;
RtlInitUnicodeString(&ExcMessageU, (PWSTR)MsgResException->Text);
RtlUnicodeStringToAnsiString(&ExcMessageA, &ExcMessageU, TRUE);
if( !MsgResException->Flags ) {
/* we've got an ansi string */
DPRINT("MsgResException->Text=%s\n", (PSTR)MsgResException->Text);
RtlInitAnsiString(&ExcMessageA, MsgResException->Text);
}
else {
/* we've got a unicode string */
DPRINT("MsgResException->Text=%S\n", (PWSTR)MsgResException->Text);
RtlInitUnicodeString(&ExcMessageU, (PWSTR)MsgResException->Text);
RtlUnicodeStringToAnsiString(&ExcMessageA, &ExcMessageU, TRUE);
}
MessageBody = (LPSTR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, MsgResException->Length+SizeOfAllUnicodeStrings+1024); // 1024 is a magic number I think it should be enough
if( STATUS_ACCESS_VIOLATION == ParameterList[0] ) {