From 2472f9162efa6ab8bb1ec03e30b03e83082614d0 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 15 Mar 2018 12:31:05 +0100 Subject: [PATCH] [IMM32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/imm32/imm.c | 37 ++++++++++++++++++++++--------------- dll/win32/imm32/imm32.spec | 1 + media/doc/README.WINE | 2 +- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 0c98c58298d..377a2775136 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -19,23 +19,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -//#include +#include #include -#include -#include -//#include "wingdi.h" -#include -//#include "winerror.h" -#include -//#include "imm.h" -#include -#include -#include -#include -#include +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winerror.h" +#include "wine/debug.h" +#include "imm.h" +#include "ddk/imm.h" +#include "winnls.h" +#include "winreg.h" +#include "wine/list.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); @@ -3147,3 +3145,12 @@ BOOL WINAPI ImmGetHotKey(DWORD hotkey, UINT *modifiers, UINT *key, HKL hkl) FIXME("%x, %p, %p, %p: stub\n", hotkey, modifiers, key, hkl); return FALSE; } + +/*********************************************************************** + * IMMDisableLegacyIME(IMM32.@) + */ +BOOL WINAPI ImmDisableLegacyIME(void) +{ + FIXME("stub\n"); + return TRUE; +} diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index 2be5d92b117..4197bb81e21 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -11,6 +11,7 @@ @ stdcall ImmDestroySoftKeyboard(long) @ stdcall ImmDisableIME(long) @ stdcall ImmDisableIme(long) ImmDisableIME +@ stdcall ImmDisableLegacyIME() @ stdcall ImmDisableTextFrameService(long) @ stdcall ImmEnumInputContext(long ptr long) @ stdcall ImmEnumRegisterWordA(long ptr str long str ptr) diff --git a/media/doc/README.WINE b/media/doc/README.WINE index cd8730679dc..51b4799dd1c 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -77,7 +77,7 @@ reactos/dll/win32/iccvid # Synced to WineStaging-3.3 reactos/dll/win32/ieframe # Synced to WineStaging-3.3 reactos/dll/win32/imaadp32.acm # Synced to WineStaging-3.3 reactos/dll/win32/imagehlp # Synced to WineStaging-3.3 -reactos/dll/win32/imm32 # Synced to Wine-2.22 +reactos/dll/win32/imm32 # Synced to WineStaging-3.3 reactos/dll/win32/inetcomm # Synced to Wine-3.0 reactos/dll/win32/inetmib1 # Synced to WineStaging-2.9 reactos/dll/win32/initpki # Synced to WineStaging-2.9