From: Marc-Aurel Zent <mzent@codeweavers.com> --- dlls/imm32/ime.c | 4 +--- dlls/win32u/driver.c | 12 ------------ dlls/win32u/imm.c | 4 ---- dlls/winemac.drv/gdi.c | 1 - dlls/winemac.drv/keyboard.c | 8 -------- dlls/winemac.drv/macdrv.h | 1 - include/ntuser.h | 1 - include/wine/gdi_driver.h | 1 - 8 files changed, 1 insertion(+), 31 deletions(-) diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c index 94eaaa0dcbd..1422ada55e1 100644 --- a/dlls/imm32/ime.c +++ b/dlls/imm32/ime.c @@ -540,7 +540,6 @@ BOOL WINAPI ImeSetActiveContext( HIMC himc, BOOL flag ) BOOL WINAPI ImeProcessKey( HIMC himc, UINT vkey, LPARAM lparam, BYTE *state ) { - struct ime_driver_call_params params = {.himc = himc, .state = state}; INPUTCONTEXT *ctx; LRESULT ret; @@ -549,8 +548,7 @@ BOOL WINAPI ImeProcessKey( HIMC himc, UINT vkey, LPARAM lparam, BYTE *state ) if (!is_ime_hkl( GetKeyboardLayout( 0 ) )) return FALSE; if (!(ctx = ImmLockIMC( himc ))) return FALSE; - ret = NtUserMessageCall( ctx->hWnd, WINE_IME_PROCESS_KEY, vkey, lparam, ¶ms, - NtUserImeDriverCall, FALSE ); + ret = TRUE; /* TODO: should be ctx->fOpen */ switch (LOWORD(vkey)) { case VK_SHIFT: diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 40ccdefc6e0..4d9708f377c 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -670,11 +670,6 @@ static void nulldrv_ReleaseKbdTables( const KBDTABLES *tables ) { } -static UINT nulldrv_ImeProcessKey( HIMC himc, UINT wparam, UINT lparam, const BYTE *state ) -{ - return 1; -} - static UINT nulldrv_ImeToAsciiEx( UINT vkey, UINT vsc, const BYTE *state, HIMC himc ) { return STATUS_NOT_IMPLEMENTED; @@ -1102,11 +1097,6 @@ static void loaderdrv_ReleaseKbdTables( const KBDTABLES *tables ) return load_driver()->pReleaseKbdTables( tables ); } -static UINT loaderdrv_ImeProcessKey( HIMC himc, UINT wparam, UINT lparam, const BYTE *state ) -{ - return load_driver()->pImeProcessKey( himc, wparam, lparam, state ); -} - static UINT loaderdrv_ImeToAsciiEx( UINT vkey, UINT vsc,const BYTE *state, HIMC himc ) { return load_driver()->pImeToAsciiEx( vkey, vsc, state, himc ); @@ -1264,7 +1254,6 @@ static const struct user_driver_funcs lazy_load_driver = loaderdrv_VkKeyScanEx, loaderdrv_KbdLayerDescriptor, loaderdrv_ReleaseKbdTables, - loaderdrv_ImeProcessKey, loaderdrv_ImeToAsciiEx, loaderdrv_NotifyIMEStatus, loaderdrv_SetIMECompositionRect, @@ -1369,7 +1358,6 @@ void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version SET_USER_FUNC(VkKeyScanEx); SET_USER_FUNC(KbdLayerDescriptor); SET_USER_FUNC(ReleaseKbdTables); - SET_USER_FUNC(ImeProcessKey); SET_USER_FUNC(ImeToAsciiEx); SET_USER_FUNC(NotifyIMEStatus); SET_USER_FUNC(SetIMECompositionRect); diff --git a/dlls/win32u/imm.c b/dlls/win32u/imm.c index 68e19bc7a68..1c1cad94b3f 100644 --- a/dlls/win32u/imm.c +++ b/dlls/win32u/imm.c @@ -663,10 +663,6 @@ LRESULT ime_driver_call( HWND hwnd, enum wine_ime_call call, WPARAM wparam, LPAR switch (call) { - case WINE_IME_PROCESS_KEY: - res = user_driver->pImeProcessKey( params->himc, wparam, lparam, params->state ); - TRACE( "ImeProcessKey vkey %#x, scan %#x -> %lu\n", LOWORD(wparam), HIWORD(lparam), res ); - return res; case WINE_IME_TO_ASCII_EX: if (params->state) { diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 1bf703459f5..a0f314234b9 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -277,7 +277,6 @@ static const struct user_driver_funcs macdrv_funcs = .pUpdateClipboard = macdrv_UpdateClipboard, .pUpdateLayeredWindow = macdrv_UpdateLayeredWindow, .pVkKeyScanEx = macdrv_VkKeyScanEx, - .pImeProcessKey = macdrv_ImeProcessKey, .pImeToAsciiEx = macdrv_ImeToAsciiEx, .pNotifyIMEStatus = macdrv_NotifyIMEStatus, .pSetIMECompositionRect = macdrv_SetIMECompositionRect, diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index dc064ad4823..8cf203c9fb8 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1105,14 +1105,6 @@ void macdrv_hotkey_press(const macdrv_event *event) } -/*********************************************************************** - * ImeProcessKey (MACDRV.@) - */ -UINT macdrv_ImeProcessKey(HIMC himc, UINT wparam, UINT lparam, const BYTE *key_state) -{ - return 1; -} - /*********************************************************************** * ImeToAsciiEx (MACDRV.@) */ diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index e5c922296bf..8c8100f38a5 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -158,7 +158,6 @@ extern void macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, HWND owner_hin extern BOOL macdrv_RegisterHotKey(HWND hwnd, UINT mod_flags, UINT vkey); extern void macdrv_UnregisterHotKey(HWND hwnd, UINT modifiers, UINT vkey); extern SHORT macdrv_VkKeyScanEx(WCHAR wChar, HKL hkl); -extern UINT macdrv_ImeProcessKey(HIMC himc, UINT wparam, UINT lparam, const BYTE *state); extern UINT macdrv_ImeToAsciiEx(UINT vkey, UINT vsc, const BYTE *state, HIMC himc); extern UINT macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl); extern INT macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, diff --git a/include/ntuser.h b/include/ntuser.h index 939771c9121..f8d5882abf4 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -676,7 +676,6 @@ enum wine_internal_message /* builtin IME driver calls */ enum wine_ime_call { - WINE_IME_PROCESS_KEY, WINE_IME_TO_ASCII_EX, WINE_IME_POST_UPDATE, /* for the user drivers */ }; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index c5b200fb935..97c646d6ec9 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -372,7 +372,6 @@ struct user_driver_funcs const KBDTABLES *(*pKbdLayerDescriptor)(HKL); void (*pReleaseKbdTables)(const KBDTABLES *); /* IME functions */ - UINT (*pImeProcessKey)(HIMC,UINT,UINT,const BYTE*); UINT (*pImeToAsciiEx)(UINT,UINT,const BYTE*,HIMC); void (*pNotifyIMEStatus)(HWND,UINT); BOOL (*pSetIMECompositionRect)(HWND,RECT); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9992