Rémi Bernon : imm32: Create the IME UI as child of the IME default window.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 585ac559b78da2a6d08b830b2f3e2310f50dc3e7
URL:    https://gitlab.winehq.org/wine/wine/-/commit/585ac559b78da2a6d08b830b2f3e231...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Wed Mar 29 11:39:41 2023 +0200

imm32: Create the IME UI as child of the IME default window.

---

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

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index ed903cb8d00..4cbdceeb9d9 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -942,8 +942,8 @@ static HWND get_ime_ui_window(void)
 
     if (!imc->ui_hwnd)
     {
-        imc->ui_hwnd = CreateWindowExW( WS_EX_TOOLWINDOW, imc->ime->ui_class, NULL,
-                                        WS_POPUP, 0, 0, 1, 1, 0, 0, imc->ime->module, 0 );
+        imc->ui_hwnd = CreateWindowExW( WS_EX_TOOLWINDOW, imc->ime->ui_class, NULL, WS_POPUP, 0, 0, 1, 1,
+                                        ImmGetDefaultIMEWnd( 0 ), 0, imc->ime->module, 0 );
         SetWindowLongPtrW( imc->ui_hwnd, IMMGWL_IMC, (LONG_PTR)imc->handle );
     }
     return imc->ui_hwnd;
diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index bb9fad29bf0..8352c16f9ec 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -4184,7 +4184,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" );
     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 ) );
+    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 */
     ok_eq( hkl, ActivateKeyboardLayout( old_hkl, 0 ), HKL, "%p" );