A few trivial Unicode-Ascii fixes

Matthew Davison m.davison at virgin.net
Wed Nov 27 16:31:48 CST 2002


changelog:
	A few Trivial Unicode-Ascii cross-call fixes#

Index: dlls/kernel/format_msg.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/format_msg.c,v
retrieving revision 1.25
diff -u -r1.25 format_msg.c
--- dlls/kernel/format_msg.c	4 Nov 2002 23:49:53 -0000	1.25
+++ dlls/kernel/format_msg.c	27 Nov 2002 22:29:03 -0000
@@ -453,7 +453,8 @@
         }
         if ((dwFlags & FORMAT_MESSAGE_FROM_SYSTEM) && (!bufsize))
         {
-           hmodule = GetModuleHandleA("kernel32");
+           static const WCHAR kernel32_res_nameW[] = {
'k','e','r','n','e','l','3','2','.','d','l','l',0 };
+           hmodule = GetModuleHandleW(kernel32_res_nameW);
           
bufsize=load_messageA(hmodule,dwMessageId,dwLanguageId,NULL,100);
            if ((!bufsize) && (!dwLanguageId)) {
                 bufsize=load_messageA(hmodule,dwMessageId,
Index: dlls/kernel/locale.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/locale.c,v
retrieving revision 1.5
diff -u -r1.5 locale.c
--- dlls/kernel/locale.c	13 Sep 2002 18:52:01 -0000	1.5
+++ dlls/kernel/locale.c	27 Nov 2002 22:29:04 -0000
@@ -640,7 +640,8 @@
     if (SUBLANGID(lang_id) == SUBLANG_NEUTRAL)
         lang_id = MAKELANGID(PRIMARYLANGID(lang_id), SUBLANG_DEFAULT);
 
-    hModule = GetModuleHandleA( "kernel32.dll" );
+    static const WCHAR kernel32_res_nameW[] = {
'k','e','r','n','e','l','3','2','.','d','l','l',0 };
+    hModule = GetModuleHandleW( kernel32_res_nameW );
     if (!(hrsrc = FindResourceExW( hModule, RT_STRINGW,
(LPCWSTR)((lctype >> 4) + 1), lang_id )))
     {
         SetLastError( ERROR_INVALID_FLAGS );  /* no such lctype */
Index: win32/except.c
===================================================================
RCS file: /home/wine/wine/win32/except.c,v
retrieving revision 1.62
diff -u -r1.62 except.c
--- win32/except.c	21 Nov 2002 03:45:01 -0000	1.62
+++ win32/except.c	27 Nov 2002 22:29:23 -0000
@@ -512,7 +512,8 @@
  */
 void WINAPI FatalAppExitW( UINT action, LPCWSTR str )
 {
-    HMODULE mod = GetModuleHandleA( "user32.dll" );
+    static const WCHAR user32_res_nameW[] = {
'u','s','e','r','3','2','.','d','l','l',0 };
+    HMODULE mod = GetModuleHandleA( user32_res_nameW );
     MessageBoxW_funcptr pMessageBoxW = NULL;
 
     WARN("AppExit\n");

-- 
Matthew Davison <m.davison at virgin.net>




More information about the wine-patches mailing list