Rémi Bernon : imm32: Re-create the IME UI window when IME changes.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bb2414fdb15a074786d463376d3bf5f17f73c459
URL:    https://gitlab.winehq.org/wine/wine/-/commit/bb2414fdb15a074786d463376d3bf5f...

Author: Rémi Bernon 
Date:   Tue Mar 28 12:38:14 2023 +0200

imm32: Re-create the IME UI window when IME changes.

---

dlls/imm32/imm.c         | 5 ++++-
 dlls/imm32/tests/imm32.c | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index d68930bade3..ed903cb8d00 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -3150,21 +3150,24 @@ static BOOL is_ime_ui_msg(UINT msg)

static LRESULT ime_internal_msg( WPARAM wparam, LPARAM lparam)
 {
-    HWND hwnd = (HWND)lparam;
+    HWND hwnd;
     HIMC himc;

switch (wparam)
     {
     case IME_INTERNAL_ACTIVATE:
     case IME_INTERNAL_DEACTIVATE:
+        hwnd = (HWND)lparam;
         himc = ImmGetContext(hwnd);
         ImmSetActiveContext(hwnd, himc, wparam == IME_INTERNAL_ACTIVATE);
         ImmReleaseContext(hwnd, himc);
         break;
     case IME_INTERNAL_HKL_ACTIVATE:
         ImmEnumInputContext( 0, enum_activate_layout, 0 );
+        hwnd = get_ime_ui_window();
         break;
    case IME_INTERNAL_HKL_DEACTIVATE:
+        hwnd = get_ime_ui_window();
         break;
     default:
         FIXME("wparam = %Ix\n", wparam);
diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index 7da3da1e6c2..bb9fad29bf0 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -4183,7 +4183,7 @@ static void test_ImmActivateLayout(void)

ok_ret( 1, EnumThreadWindows( GetCurrentThreadId(), enum_thread_ime_windows, (LPARAM)&ime_windows ) );
     ok( !!ime_windows.ime_hwnd, "missing IME window\n" );
-    todo_wine ok( !!ime_windows.ime_ui_hwnd, "missing IME UI window\n" );
+    ok( !!ime_windows.ime_ui_hwnd, "missing IME UI window\n" );
     todo_wine ok_ret( (UINT_PTR)ime_windows.ime_hwnd, (UINT_PTR)GetParent( ime_windows.ime_ui_hwnd ) );

todo_ImeDestroy = TRUE; /* Wine doesn't leak the IME */