imm32: Build with msvcrt.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2019-06-06 09:01:04 +02:00
parent 4bc3657962
commit 700910be7c
2 changed files with 5 additions and 4 deletions

View File

@ -2,6 +2,8 @@ MODULE = imm32.dll
IMPORTLIB = imm32 IMPORTLIB = imm32
IMPORTS = user32 gdi32 advapi32 IMPORTS = user32 gdi32 advapi32
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \ C_SRCS = \
imm.c imm.c

View File

@ -33,7 +33,6 @@
#include "winnls.h" #include "winnls.h"
#include "winreg.h" #include "winreg.h"
#include "wine/list.h" #include "wine/list.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(imm); WINE_DEFAULT_DEBUG_CHANNEL(imm);
@ -318,8 +317,8 @@ static HMODULE load_graphics_driver(void)
if (!guid_atom) return 0; if (!guid_atom) return 0;
memcpy( key, key_pathW, sizeof(key_pathW) ); memcpy( key, key_pathW, sizeof(key_pathW) );
if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0; if (!GlobalGetAtomNameW( guid_atom, key + lstrlenW(key), 40 )) return 0;
strcatW( key, displayW ); lstrcatW( key, displayW );
if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0;
size = sizeof(path); size = sizeof(path);
if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path );
@ -1643,7 +1642,7 @@ static BOOL needs_ime_window(HWND hwnd)
{ {
WCHAR classW[8]; WCHAR classW[8];
if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !strcmpW(classW, szwIME)) if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !lstrcmpW(classW, szwIME))
return FALSE; return FALSE;
if (GetClassLongPtrW(hwnd, GCL_STYLE) & CS_IME) return FALSE; if (GetClassLongPtrW(hwnd, GCL_STYLE) & CS_IME) return FALSE;