[ros-diffs] [fireball] 31711: Dmitry Philippov <[e-mail]> - 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.

Author: fireball
Date: Fri Jan 11 14:16:02 2008
New Revision: 31711

URL: http://svn.reactos.org/svn/reactos?rev=31711&view=rev
Log:
Dmitry Philippov [e-mail]
- 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.

Modified:
    trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c

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 (original)
+++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c Fri Jan 11 14:16:02 2008
@@ -357,8 +357,17 @@
         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 @@
                 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 @@
             {
                 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] ) {