Alexandre Julliard : imm32: Build with msvcrt.
Alexandre Julliard
julliard at winehq.org
Thu Jun 6 17:05:18 CDT 2019
Module: wine
Branch: master
Commit: 700910be7c02cdd9a05b3e45e90d17479eac40d9
URL: https://source.winehq.org/git/wine.git/?a=commit;h=700910be7c02cdd9a05b3e45e90d17479eac40d9
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Jun 6 09:01:04 2019 +0200
imm32: Build with msvcrt.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/imm32/Makefile.in | 2 ++
dlls/imm32/imm.c | 7 +++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in
index b190888..cebcf4c 100644
--- a/dlls/imm32/Makefile.in
+++ b/dlls/imm32/Makefile.in
@@ -2,6 +2,8 @@ MODULE = imm32.dll
IMPORTLIB = imm32
IMPORTS = user32 gdi32 advapi32
+EXTRADLLFLAGS = -mno-cygwin
+
C_SRCS = \
imm.c
diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index b2ac662..5f68c1d 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -33,7 +33,6 @@
#include "winnls.h"
#include "winreg.h"
#include "wine/list.h"
-#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(imm);
@@ -318,8 +317,8 @@ static HMODULE load_graphics_driver(void)
if (!guid_atom) return 0;
memcpy( key, key_pathW, sizeof(key_pathW) );
- if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0;
- strcatW( key, displayW );
+ if (!GlobalGetAtomNameW( guid_atom, key + lstrlenW(key), 40 )) return 0;
+ lstrcatW( key, displayW );
if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0;
size = sizeof(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];
- if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !strcmpW(classW, szwIME))
+ if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !lstrcmpW(classW, szwIME))
return FALSE;
if (GetClassLongPtrW(hwnd, GCL_STYLE) & CS_IME) return FALSE;
More information about the wine-cvs
mailing list