Zebediah Figura : kernel32: Fix a couple internal uses of ANSI functions.

Alexandre Julliard julliard at winehq.org
Fri Dec 1 14:08:20 CST 2017


Module: wine
Branch: master
Commit: 47e9e911acd2d0883ac1ccfc0a153db09ad78b41
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=47e9e911acd2d0883ac1ccfc0a153db09ad78b41

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Fri Dec  1 12:18:55 2017 -0600

kernel32: Fix a couple internal uses of ANSI functions.

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/kernel32/file.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c
index 3e93b0d..4766830 100644
--- a/dlls/kernel32/file.c
+++ b/dlls/kernel32/file.c
@@ -74,6 +74,7 @@ static const UINT max_entry_size = offsetof( FILE_BOTH_DIRECTORY_INFORMATION, Fi
 static BOOL oem_file_apis;
 
 static const WCHAR wildcardsW[] = { '*','?',0 };
+static const WCHAR krnl386W[] = {'k','r','n','l','3','8','6','.','e','x','e','1','6',0};
 
 /***********************************************************************
  *              create_file_OF
@@ -1587,7 +1588,7 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing,
         if (vxd_name && vxd_name[0])
         {
             static HANDLE (*vxd_open)(LPCWSTR,DWORD,SECURITY_ATTRIBUTES*);
-            if (!vxd_open) vxd_open = (void *)GetProcAddress( GetModuleHandleA("krnl386.exe16"),
+            if (!vxd_open) vxd_open = (void *)GetProcAddress( GetModuleHandleW(krnl386W),
                                                               "__wine_vxd_open" );
             if (vxd_open && (ret = vxd_open( vxd_name, access, sa ))) goto done;
         }
@@ -2613,7 +2614,7 @@ BOOL WINAPI DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode,
         static DeviceIoProc (*vxd_get_proc)(HANDLE);
         DeviceIoProc proc = NULL;
 
-        if (!vxd_get_proc) vxd_get_proc = (void *)GetProcAddress( GetModuleHandleA("krnl386.exe16"),
+        if (!vxd_get_proc) vxd_get_proc = (void *)GetProcAddress( GetModuleHandleW(krnl386W),
                                                                   "__wine_vxd_get_proc" );
         if (vxd_get_proc) proc = vxd_get_proc( hDevice );
         if (proc) return proc( dwIoControlCode, lpvInBuffer, cbInBuffer,




More information about the wine-cvs mailing list