Rémi Bernon : imm32: Query the new input context in ImmAssociateContextEx / IACE_DEFAULT.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7ed63c30e8dee3509c52e11230470be2dcfe6cf5
URL:    https://gitlab.winehq.org/wine/wine/-/commit/7ed63c30e8dee3509c52e11230470be...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Tue May 30 11:01:17 2023 +0200

imm32: Query the new input context in ImmAssociateContextEx / IACE_DEFAULT.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54991

---

 dlls/imm32/imm.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index c2cd5415e98..cc843ce4a8e 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -1038,6 +1038,7 @@ BOOL WINAPI ImmAssociateContextEx( HWND hwnd, HIMC new_himc, DWORD flags )
     ret = NtUserAssociateInputContext( hwnd, new_himc, flags );
     if (ret == AICR_FOCUS_CHANGED)
     {
+        if (flags == IACE_DEFAULT) new_himc = NtUserGetWindowInputContext( hwnd );
         ImmSetActiveContext( hwnd, old_himc, FALSE );
         ImmSetActiveContext( hwnd, new_himc, TRUE );
         if (hwnd == GetFocus()) set_ime_ui_window_himc( new_himc );