July 2022 - Wine-commits - list.winehq.org

Eric Pouech : dbghelp: Member's lexical parent is module (not parent UDT).
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 9cb69964d6ccd5f0e2eb52d1564f42193f68ed89 URL: https://gitlab.winehq.org/wine/wine/-/commit/9cb69964d6ccd5f0e2eb52d1564f42… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Jul 12 09:28:57 2022 +0200 dbghelp: Member's lexical parent is module (not parent UDT). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/type.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 53ba85f9e77..3a5d3caf09f 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -321,7 +321,7 @@ BOOL symt_add_udt_element(struct module* module, struct symt_udt* udt_type, m->hash_elt.next = NULL; m->kind = DataIsMember; - m->container = &udt_type->symt; + m->container = &module->top->symt; /* native defines lexical parent as module, not udt... */ m->type = elt_type; m->u.member.offset = offset; m->u.member.bit_offset = bit_offset;

1 0

Eric Pouech : dbghelp: Set constants lexical parent to module when no compiland is present.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: fe52589cdd520ef77d6251995cfc0d490167cd07 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe52589cdd520ef77d6251995cfc0d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Jul 12 09:28:57 2022 +0200 dbghelp: Set constants lexical parent to module when no compiland is present. Especially needed for enumeration's values. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/symbol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 4bf0bbae74a..abf6054d0ee 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -662,7 +662,7 @@ struct symt_data* symt_new_constant(struct module* module, sym->symt.tag = SymTagData; sym->hash_elt.name = pool_strdup(&module->pool, name); sym->kind = DataIsConstant; - sym->container = compiland ? &compiland->symt : NULL; + sym->container = compiland ? &compiland->symt : &module->top->symt; sym->type = type; sym->u.value = *v; symt_add_module_ht(module, (struct symt_ht*)sym);

1 0

Jinoh Kang : riched20: Ensure MEPF_COMPLEX is unset when in password input mode.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: f77f12ba3b1dad9ebdcb116c66b137e9103a0d1b URL: https://gitlab.winehq.org/wine/wine/-/commit/f77f12ba3b1dad9ebdcb116c66b137… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Jul 12 02:28:15 2022 +0900 riched20: Ensure MEPF_COMPLEX is unset when in password input mode. Otherwise, Wine may crash while attempting to fetch the script shaping information, which does not exist since shape_para() was not called. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53335 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/riched20/wrap.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index db3e2806239..8cfb1692ecd 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -835,6 +835,15 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Parag if (SUCCEEDED( itemize_para( c, para ) )) shape_para( c, para ); } + else + { + /* If the user has just converted a normal rich editor with already + * existing text into a password input, the text may contain paragraphs + * with MEPF_COMPLEX set. Since we don't really shape any paragraphs + * here, we need to ensure that the MEPF_COMPLEX flag is unset. + */ + para->nFlags &= ~MEPF_COMPLEX; + } wc.context = c; wc.para = para;

1 0

Jacek Caban : imm32: Store message spy pointer in TEB.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 3e8a4b671dca2d22596c43157e2ae80fcfe18737 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e8a4b671dca2d22596c43157e2ae8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 12 13:41:23 2022 +0200 imm32: Store message spy pointer in TEB. --- dlls/imm32/imm.c | 30 +++++++++++++++++------------- include/ntuser.h | 1 + 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 42cf6a712f9..8bfa6267f16 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -123,8 +123,6 @@ struct coinit_spy } apt_flags; }; -static LONG spy_tls = TLS_OUT_OF_INDEXES; - static struct list ImmHklList = LIST_INIT(ImmHklList); static struct list ImmThreadDataList = LIST_INIT(ImmThreadDataList); @@ -256,13 +254,18 @@ static DWORD convert_candidatelist_AtoW( return ret; } +static struct coinit_spy *get_thread_coinit_spy(void) +{ + return NtUserGetThreadInfo()->client_imm; +} + static void imm_couninit_thread(BOOL cleanup) { struct coinit_spy *spy; TRACE("implicit COM deinitialization\n"); - if (!(spy = TlsGetValue(spy_tls)) || (spy->apt_flags & IMM_APT_BROKEN)) + if (!(spy = get_thread_coinit_spy()) || (spy->apt_flags & IMM_APT_BROKEN)) return; if (cleanup && spy->cookie.QuadPart) @@ -314,7 +317,11 @@ static ULONG WINAPI InitializeSpy_Release(IInitializeSpy *iface) { struct coinit_spy *spy = impl_from_IInitializeSpy(iface); LONG ref = InterlockedDecrement(&spy->ref); - if (!ref) HeapFree(GetProcessHeap(), 0, spy); + if (!ref) + { + HeapFree(GetProcessHeap(), 0, spy); + NtUserGetThreadInfo()->client_imm = NULL; + } return ref; } @@ -380,20 +387,15 @@ static void imm_coinit_thread(void) TRACE("implicit COM initialization\n"); - if (spy_tls == TLS_OUT_OF_INDEXES) - { - DWORD tls = TlsAlloc(); - if (tls == TLS_OUT_OF_INDEXES) return; - if (InterlockedCompareExchange(&spy_tls, tls, TLS_OUT_OF_INDEXES)) TlsFree(tls); - } - if (!(spy = TlsGetValue(spy_tls))) + if (!(spy = get_thread_coinit_spy())) { if (!(spy = HeapAlloc(GetProcessHeap(), 0, sizeof(*spy)))) return; spy->IInitializeSpy_iface.lpVtbl = &InitializeSpyVtbl; spy->ref = 1; spy->cookie.QuadPart = 0; spy->apt_flags = 0; - TlsSetValue(spy_tls, spy); + NtUserGetThreadInfo()->client_imm = spy; + } if (spy->apt_flags & (IMM_APT_INIT | IMM_APT_BROKEN)) @@ -474,7 +476,8 @@ static void IMM_FreeThreadData(void) } LeaveCriticalSection(&threaddata_cs); - if ((spy = TlsGetValue(spy_tls))) IInitializeSpy_Release(&spy->IInitializeSpy_iface); + if ((spy = get_thread_coinit_spy())) + IInitializeSpy_Release(&spy->IInitializeSpy_iface); } static HMODULE load_graphics_driver(void) @@ -754,6 +757,7 @@ BOOL WINAPI ImmSetActiveContext(HWND hwnd, HIMC himc, BOOL activate) SendMessageW(hwnd, WM_IME_SETCONTEXT, activate, ISC_SHOWUIALL); /* TODO: send WM_IME_NOTIFY */ } + SetLastError(0); return TRUE; } diff --git a/include/ntuser.h b/include/ntuser.h index 713c7d071fc..672e3156536 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -63,6 +63,7 @@ struct ntuser_thread_info ULONG_PTR message_extra; /* value for GetMessageExtraInfo */ HWND top_window; /* desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ + void *client_imm; /* client IMM thread info */ }; static inline struct ntuser_thread_info *NtUserGetThreadInfo(void)

1 0

Jacek Caban : win32u: Move window input context handling from imm32.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: f5b3283e245b34ddbd3d5dc58095c1fce9492c7b URL: https://gitlab.winehq.org/wine/wine/-/commit/f5b3283e245b34ddbd3d5dc58095c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 8 20:09:26 2022 +0200 win32u: Move window input context handling from imm32. --- dlls/imm32/imm.c | 252 +++++++++++++++++-------------------------- dlls/win32u/imm.c | 69 ++++++++++++ dlls/win32u/ntuser_private.h | 1 + dlls/win32u/syscall.c | 1 + dlls/win32u/sysparams.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 4 + dlls/win32u/window.c | 5 + dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 ++ include/ntuser.h | 16 +++ 11 files changed, 207 insertions(+), 154 deletions(-)

1 0

Jacek Caban : imm32/tests: Add NtUserAssociateInputContext tests.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 9c1ecf997108bf8ef06d156590f5cb10f2d2f9f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c1ecf997108bf8ef06d156590f5cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 11 18:17:47 2022 +0200 imm32/tests: Add NtUserAssociateInputContext tests. --- dlls/imm32/tests/imm32.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 3f2e503b5e5..5bb51d90456 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -30,6 +30,7 @@ BOOL WINAPI ImmSetActiveContext(HWND, HIMC, BOOL); static BOOL (WINAPI *pImmAssociateContextEx)(HWND,HIMC,DWORD); +static UINT (WINAPI *pNtUserAssociateInputContext)(HWND,HIMC,ULONG); static BOOL (WINAPI *pImmIsUIMessageA)(HWND,UINT,WPARAM,LPARAM); static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); @@ -303,6 +304,8 @@ static BOOL init(void) { pImmAssociateContextEx = (void*)GetProcAddress(hmod, "ImmAssociateContextEx"); pImmIsUIMessageA = (void*)GetProcAddress(hmod, "ImmIsUIMessageA"); pSendInput = (void*)GetProcAddress(huser, "SendInput"); + pNtUserAssociateInputContext = (void*)GetProcAddress(GetModuleHandleW(L"win32u.dll"), + "NtUserAssociateInputContext"); wc.cbSize = sizeof(WNDCLASSEXA); wc.style = 0; @@ -753,6 +756,81 @@ static void test_ImmAssociateContextEx(void) ImmReleaseContext(hwnd,imc); } +/* similar to above, but using NtUserAssociateInputContext */ +static void test_NtUserAssociateInputContext(void) +{ + HIMC imc; + UINT rc; + + if (!pNtUserAssociateInputContext) + { + win_skip("NtUserAssociateInputContext not available\n"); + return; + } + + imc = ImmGetContext(hwnd); + if (imc) + { + HIMC retimc, newimc; + HWND focus; + + SET_ENABLE(WM_IME_SETCONTEXT_ACTIVATE, TRUE); + SET_ENABLE(WM_IME_SETCONTEXT_DEACTIVATE, TRUE); + + ok(GetActiveWindow() == hwnd, "hwnd is not active\n"); + newimc = ImmCreateContext(); + ok(newimc != imc, "handles should not be the same\n"); + rc = pNtUserAssociateInputContext(NULL, NULL, 0); + ok(rc == 2, "NtUserAssociateInputContext returned %x\n", rc); + rc = pNtUserAssociateInputContext(hwnd, NULL, 0); + ok(rc == 1, "NtUserAssociateInputContext returned %x\n", rc); + rc = pNtUserAssociateInputContext(NULL, imc, 0); + ok(rc == 2, "NtUserAssociateInputContext returned %x\n", rc); + + rc = pNtUserAssociateInputContext(hwnd, imc, 0); + ok(rc == 1, "NtUserAssociateInputContext returned %x\n", rc); + retimc = ImmGetContext(hwnd); + ok(retimc == imc, "handles should be the same\n"); + ImmReleaseContext(hwnd,retimc); + + rc = pNtUserAssociateInputContext(hwnd, imc, 0); + ok(rc == 0, "NtUserAssociateInputContext returned %x\n", rc); + + rc = pNtUserAssociateInputContext(hwnd, newimc, 0); + ok(rc == 1, "NtUserAssociateInputContext returned %x\n", rc); + retimc = ImmGetContext(hwnd); + ok(retimc == newimc, "handles should be the same\n"); + ImmReleaseContext(hwnd,retimc); + + focus = CreateWindowA("button", "button", 0, 0, 0, 0, 0, 0, 0, 0, 0); + ok(focus != NULL, "CreateWindow failed\n"); + SET_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); + SetFocus(focus); + CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); + rc = pNtUserAssociateInputContext(hwnd, imc, 0); + ok(rc == 0, "NtUserAssociateInputContext returned %x\n", rc); + SET_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); + DestroyWindow(focus); + CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); + + SET_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); + SetFocus(child); + CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); + rc = pNtUserAssociateInputContext(hwnd, newimc, 0); + ok(rc == 0, "NtUserAssociateInputContext returned %x\n", rc); + SET_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); + SetFocus(hwnd); + CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); + + rc = pNtUserAssociateInputContext(hwnd, NULL, IACE_DEFAULT); + ok(rc == 1, "NtUserAssociateInputContext returned %x\n", rc); + + SET_ENABLE(WM_IME_SETCONTEXT_ACTIVATE, FALSE); + SET_ENABLE(WM_IME_SETCONTEXT_DEACTIVATE, FALSE); + } + ImmReleaseContext(hwnd,imc); +} + typedef struct _igc_threadinfo { HWND hwnd; HANDLE event; @@ -2331,6 +2409,7 @@ START_TEST(imm32) { test_ImmSetCompositionString(); test_ImmIME(); test_ImmAssociateContextEx(); + test_NtUserAssociateInputContext(); test_ImmThreads(); test_ImmIsUIMessage(); test_ImmGetContext();

1 0

Jacek Caban : imm32/tests: Add more tests for disabling IME.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 0e763f72a62112a80368e20f366870b22656184a URL: https://gitlab.winehq.org/wine/wine/-/commit/0e763f72a62112a80368e20f366870… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 11 18:24:50 2022 +0200 imm32/tests: Add more tests for disabling IME. --- dlls/imm32/tests/imm32.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 5bb51d90456..a7663376eee 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -2336,6 +2336,7 @@ static void test_com_initialization(void) wnd = CreateWindowA("static", "static", WS_POPUP, 0, 0, 100, 100, 0, 0, 0, 0); ok(wnd != NULL, "CreateWindow failed\n"); + test_apttype(-1); ShowWindow(wnd, SW_SHOW); test_apttype(APTTYPE_MAINSTA); DestroyWindow(wnd); @@ -2368,15 +2369,47 @@ static DWORD WINAPI disable_ime_thread(void *arg) return 0; } +static DWORD WINAPI check_not_disabled_ime_thread(void *arg) +{ + HWND def, hwnd; + + WaitForSingleObject(arg, INFINITE); + hwnd = CreateWindowA("static", "static", 0, 0, 0, 0, 0, 0, 0, 0, 0); + ok(hwnd != NULL, "CreateWindow failed\n"); + def = ImmGetDefaultIMEWnd(hwnd); + todo_wine + ok(def != NULL, "ImmGetDefaultIMEWnd returned %p\n", def); + return 0; +} + +static DWORD WINAPI disable_ime_process(void *arg) +{ + BOOL r = ImmDisableIME(-1); + ok(r, "ImmDisableIME failed\n"); + return 0; +} + static void test_ImmDisableIME(void) { - HANDLE thread; - HWND def; + HANDLE thread, event; + DWORD tid; + HWND def, def2; BOOL r; def = ImmGetDefaultIMEWnd(hwnd); ok(def != NULL, "ImmGetDefaultIMEWnd(hwnd) returned NULL\n"); + event = CreateEventW(NULL, TRUE, FALSE, FALSE); + thread = CreateThread(NULL, 0, check_not_disabled_ime_thread, event, 0, &tid); + ok(thread != NULL, "CreateThread failed\n"); + r = ImmDisableIME(tid); + todo_wine + ok(!r, "ImmDisableIME(tid) succeeded\n"); + SetEvent(event); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + CloseHandle(event); + thread = CreateThread(NULL, 0, disable_ime_thread, 0, 0, NULL); ok(thread != NULL, "CreateThread failed\n"); WaitForSingleObject(thread, INFINITE); @@ -2387,6 +2420,23 @@ static void test_ImmDisableIME(void) WaitForSingleObject(thread, INFINITE); CloseHandle(thread); + msg_spy_pump_msg_queue(); + thread = CreateThread(NULL, 0, disable_ime_process, 0, 0, NULL); + ok(thread != NULL, "CreateThread failed\n"); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + ok(IsWindow(def), "not a window\n"); + def2 = ImmGetDefaultIMEWnd(hwnd); + todo_wine + ok(def2 == def, "ImmGetDefaultIMEWnd(hwnd) returned %p\n", def2); + ok(IsWindow(def), "not a window\n"); + msg_spy_pump_msg_queue(); + todo_wine + ok(!IsWindow(def), "window is still valid\n"); + def = ImmGetDefaultIMEWnd(hwnd); + ok(!def, "ImmGetDefaultIMEWnd(hwnd) returned %p\n", def); + r = ImmDisableIME(-1); ok(r, "ImmDisableIME(-1) failed\n"); def = ImmGetDefaultIMEWnd(hwnd);

1 0

Jacek Caban : imm32: Don't allow disabling other thread's IME by thread ID.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: f4f589c421154d0fa05faa87fd845e4455aabc67 URL: https://gitlab.winehq.org/wine/wine/-/commit/f4f589c421154d0fa05faa87fd845e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 8 20:32:35 2022 +0200 imm32: Don't allow disabling other thread's IME by thread ID. --- dlls/imm32/imm.c | 3 ++- dlls/imm32/tests/imm32.c | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index f809e771cf8..c5b5895bec8 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1022,7 +1022,7 @@ BOOL WINAPI ImmDisableIME(DWORD idThread) DestroyWindow(to_destroy); } } - else + else if (!idThread || idThread == GetCurrentThreadId()) { thread_data = IMM_GetThreadData(NULL, idThread); if (!thread_data) return FALSE; @@ -1033,6 +1033,7 @@ BOOL WINAPI ImmDisableIME(DWORD idThread) if (to_destroy) DestroyWindow(to_destroy); } + else return FALSE; return TRUE; } diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index a7663376eee..c5409ce1708 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -2377,7 +2377,6 @@ static DWORD WINAPI check_not_disabled_ime_thread(void *arg) hwnd = CreateWindowA("static", "static", 0, 0, 0, 0, 0, 0, 0, 0, 0); ok(hwnd != NULL, "CreateWindow failed\n"); def = ImmGetDefaultIMEWnd(hwnd); - todo_wine ok(def != NULL, "ImmGetDefaultIMEWnd returned %p\n", def); return 0; } @@ -2403,7 +2402,6 @@ static void test_ImmDisableIME(void) thread = CreateThread(NULL, 0, check_not_disabled_ime_thread, event, 0, &tid); ok(thread != NULL, "CreateThread failed\n"); r = ImmDisableIME(tid); - todo_wine ok(!r, "ImmDisableIME(tid) succeeded\n"); SetEvent(event); WaitForSingleObject(thread, INFINITE);

1 0

Jacek Caban : win32u: Move default IME window management from imm32.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 047d74c4b10bfbd62ad0530959237caad110be46 URL: https://gitlab.winehq.org/wine/wine/-/commit/047d74c4b10bfbd62ad0530959237c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 9 01:17:54 2022 +0200 win32u: Move default IME window management from imm32. --- dlls/imm32/imm.c | 219 +------------------------------------------ dlls/imm32/imm32.spec | 6 +- dlls/imm32/tests/imm32.c | 2 - dlls/user32/misc.c | 4 - dlls/user32/user_main.c | 19 ---- dlls/user32/user_private.h | 3 - dlls/win32u/class.c | 12 +++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/imm.c | 176 ++++++++++++++++++++++++++++++++++ dlls/win32u/input.c | 12 ++- dlls/win32u/ntuser_private.h | 5 +- dlls/win32u/sysparams.c | 2 +- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 5 + dlls/win32u/window.c | 12 +-- dlls/win32u/wrappers.c | 6 ++ include/ntuser.h | 7 ++ 17 files changed, 228 insertions(+), 265 deletions(-)

1 0

Jacek Caban : win32u: Use KeUserModeCallback for ImmProcessKey and ImmTranslateMessage calls.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 0826fbbb745917c7414df27da26c2cad7a0eac9a URL: https://gitlab.winehq.org/wine/wine/-/commit/0826fbbb745917c7414df27da26c2c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 9 14:09:29 2022 +0200 win32u: Use KeUserModeCallback for ImmProcessKey and ImmTranslateMessage calls. --- dlls/user32/user_main.c | 15 +++++++++++++-- dlls/win32u/imm.c | 20 ++++++++++++++++++++ dlls/win32u/message.c | 9 ++++----- dlls/win32u/ntuser_private.h | 2 -- include/ntuser.h | 20 ++++++++++++++++++++ 5 files changed, 57 insertions(+), 9 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index ae6a0d4c8e4..f9bc4985368 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -133,8 +133,6 @@ static NTSTATUS try_finally( NTSTATUS (CDECL *func)( void *), void *arg, static const struct user_callbacks user_funcs = { - ImmProcessKey, - ImmTranslateMessage, NtWaitForMultipleObjects, post_dde_message, unpack_dde_message, @@ -163,6 +161,17 @@ static NTSTATUS WINAPI User32DrawText( const struct draw_text_params *params, UL return DrawTextW( params->hdc, params->str, size / sizeof(WCHAR), params->rect, params->flags ); } +static NTSTATUS WINAPI User32ImmProcessKey( const struct imm_process_key_params *params, ULONG size ) +{ + return ImmProcessKey( params->hwnd, params->hkl, params->vkey, params->key_data, 0 ); +} + +static NTSTATUS WINAPI User32ImmTranslateMessage( const struct imm_translate_message_params *params, + ULONG size ) +{ + return ImmTranslateMessage( params->hwnd, params->msg, params->wparam, params->key_data ); +} + static NTSTATUS WINAPI User32LoadImage( const struct load_image_params *params, ULONG size ) { HANDLE ret = LoadImageW( params->hinst, params->name, params->type, @@ -206,6 +215,8 @@ static const void *kernel_callback_table[NtUserCallCount] = User32DrawScrollBar, User32DrawText, User32FreeCachedClipboardData, + User32ImmProcessKey, + User32ImmTranslateMessage, User32LoadDriver, User32LoadImage, User32LoadSysMenu, diff --git a/dlls/win32u/imm.c b/dlls/win32u/imm.c index 94621bb2a5c..5adfe3704aa 100644 --- a/dlls/win32u/imm.c +++ b/dlls/win32u/imm.c @@ -27,6 +27,7 @@ #include <pthread.h> #include "win32u_private.h" #include "ntuser_private.h" +#include "ddk/imm.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); @@ -391,3 +392,22 @@ void cleanup_imm_thread(void) NtUserDestroyInputContext( thread_info->client_info.default_imc ); } + +BOOL WINAPI ImmProcessKey( HWND hwnd, HKL hkl, UINT vkey, LPARAM key_data, DWORD unknown ) +{ + struct imm_process_key_params params = + { .hwnd = hwnd, .hkl = hkl, .vkey = vkey, .key_data = key_data }; + void *ret_ptr; + ULONG ret_len; + return KeUserModeCallback( NtUserImmProcessKey, &params, sizeof(params), &ret_ptr, &ret_len ); +} + +BOOL WINAPI ImmTranslateMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM key_data ) +{ + struct imm_translate_message_params params = + { .hwnd = hwnd, .msg = msg, .wparam = wparam, .key_data = key_data }; + void *ret_ptr; + ULONG ret_len; + return KeUserModeCallback( NtUserImmTranslateMessage, &params, sizeof(params), + &ret_ptr, &ret_len ); +} diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 65f44783fe6..b8ea7cdce9f 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -32,6 +32,7 @@ #include "hidusage.h" #include "dbt.h" #include "dde.h" +#include "ddk/imm.h" #include "wine/server.h" #include "wine/debug.h" @@ -1362,9 +1363,8 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, if (remove) accept_hardware_message( hw_id ); msg->pt = point_phys_to_win_dpi( msg->hwnd, msg->pt ); - if (remove && msg->message == WM_KEYDOWN && user_callbacks) - if (user_callbacks->pImmProcessKey( msg->hwnd, NtUserGetKeyboardLayout(0), - msg->wParam, msg->lParam, 0 )) + if (remove && msg->message == WM_KEYDOWN) + if (ImmProcessKey( msg->hwnd, NtUserGetKeyboardLayout(0), msg->wParam, msg->lParam, 0 )) msg->wParam = VK_PROCESSKEY; return TRUE; @@ -2969,8 +2969,7 @@ BOOL WINAPI NtUserTranslateMessage( const MSG *msg, UINT flags ) return TRUE; case VK_PROCESSKEY: - return user_callbacks && user_callbacks->pImmTranslateMessage( msg->hwnd, msg->message, - msg->wParam, msg->lParam ); + return ImmTranslateMessage( msg->hwnd, msg->message, msg->wParam, msg->lParam ); } NtUserGetKeyboardState( state ); diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 780af425673..55f2a449be4 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -32,8 +32,6 @@ struct hardware_msg_data; struct user_callbacks { - BOOL (WINAPI *pImmProcessKey)(HWND, HKL, UINT, LPARAM, DWORD); - BOOL (WINAPI *pImmTranslateMessage)(HWND, UINT, WPARAM, LPARAM); NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); BOOL (CDECL *post_dde_message)( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid, DWORD type ); diff --git a/include/ntuser.h b/include/ntuser.h index 281d88dfb1a..d22799ebe01 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -37,6 +37,8 @@ enum NtUserDrawScrollBar, NtUserDrawText, NtUserFreeCachedClipboardData, + NtUserImmProcessKey, + NtUserImmTranslateMessage, NtUserLoadDriver, NtUserLoadImage, NtUserLoadSysMenu, @@ -181,6 +183,24 @@ struct free_cached_data_params HANDLE handle; }; +/* NtUserImmProcessKey params */ +struct imm_process_key_params +{ + HWND hwnd; + HKL hkl; + UINT vkey; + LPARAM key_data; +}; + +/* NtUserImmTranslateMessage params */ +struct imm_translate_message_params +{ + HWND hwnd; + UINT msg; + WPARAM wparam; + LPARAM key_data; +}; + /* NtUserLoadImage params */ struct load_image_params {

1 0