Rémi Bernon : imm32: Call ImeSelect from ImmLockIMC with current IME.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 61219f1b8be1f827b99dd2ffc5c5046b751d664c
URL:    https://gitlab.winehq.org/wine/wine/-/commit/61219f1b8be1f827b99dd2ffc5c5046...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Tue Mar 28 09:27:28 2023 +0200

imm32: Call ImeSelect from ImmLockIMC with current IME.

---

 dlls/imm32/imm.c         | 15 +++++++++------
 dlls/imm32/tests/imm32.c | 20 ++++++++++++++------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index 04bfc461658..2c3af063ac5 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -2829,14 +2829,17 @@ DWORD WINAPI ImmGetImeMenuItemsW( HIMC himc, DWORD flags, DWORD type, IMEMENUITE
 /***********************************************************************
 *		ImmLockIMC(IMM32.@)
 */
-LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC hIMC)
+INPUTCONTEXT *WINAPI ImmLockIMC( HIMC himc )
 {
-    struct imc *data = get_imc_data( hIMC );
+    struct imc *imc = get_imc_data( himc );
 
-    if (!data)
-        return NULL;
-    data->dwLock++;
-    return &data->IMC;
+    TRACE( "himc %p\n", himc );
+
+    if (!imc) return NULL;
+    imc->dwLock++;
+
+    imc_select_hkl( imc, GetKeyboardLayout( 0 ) );
+    return &imc->IMC;
 }
 
 /***********************************************************************
diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index 8340d67deae..e8116081f52 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -3798,7 +3798,6 @@ static void test_ImmActivateLayout(void)
         {
             .hkl = expect_ime, .himc = default_himc,
             .func = IME_SELECT, .select = 1,
-            .todo = TRUE,
         },
         {0},
     };
@@ -3816,6 +3815,15 @@ static void test_ImmActivateLayout(void)
         },
         {0},
     };
+    const struct ime_call activate_with_window_seq[] =
+    {
+        {
+            .hkl = expect_ime, .himc = default_himc,
+            .func = IME_SELECT, .select = 1,
+            .todo = TRUE,
+        },
+        {0},
+    };
     HKL hkl, old_hkl = GetKeyboardLayout( 0 );
     UINT ret;
 
@@ -3843,7 +3851,6 @@ static void test_ImmActivateLayout(void)
     SET_EXPECT( ImeInquire );
     ok_ret( 1, ImmActivateLayout( hkl ) );
     ok_seq( activate_seq );
-    todo_wine
     CHECK_CALLED( ImeInquire );
 
     ok_eq( hkl, GetKeyboardLayout( 0 ), HKL, "%p" );
@@ -3851,8 +3858,10 @@ static void test_ImmActivateLayout(void)
     ok_ret( 1, ImmActivateLayout( hkl ) );
     ok_seq( empty_sequence );
 
+    todo_ImeDestroy = TRUE; /* Wine doesn't leak the IME */
     ok_ret( 1, ImmActivateLayout( old_hkl ) );
     ok_seq( deactivate_seq );
+    todo_ImeDestroy = FALSE;
 
     ok_eq( old_hkl, GetKeyboardLayout( 0 ), HKL, "%p" );
 
@@ -3865,7 +3874,6 @@ static void test_ImmActivateLayout(void)
     SET_EXPECT( ImeDestroy );
     ret = ImmFreeLayout( hkl );
     ok( ret, "ImmFreeLayout returned %u\n", ret );
-    todo_wine
     CHECK_CALLED( ImeDestroy );
     ok_seq( empty_sequence );
 
@@ -3883,7 +3891,7 @@ static void test_ImmActivateLayout(void)
     ok_eq( old_hkl, ActivateKeyboardLayout( hkl, 0 ), HKL, "%p" );
     todo_wine
     CHECK_CALLED( ImeInquire );
-    ok_seq( activate_seq );
+    ok_seq( activate_with_window_seq );
 
     ok_eq( hkl, GetKeyboardLayout( 0 ), HKL, "%p" );
 
@@ -3919,12 +3927,12 @@ static void test_ImmCreateInputContext(void)
         {
             .hkl = expect_ime, .himc = default_himc,
             .func = IME_SELECT, .select = 1,
-            .todo = TRUE, .flaky_himc = TRUE,
+            .flaky_himc = TRUE,
         },
         {
             .hkl = expect_ime, .himc = 0/*himc[0]*/,
             .func = IME_SELECT, .select = 1,
-            .todo = TRUE, .flaky_himc = TRUE,
+            .flaky_himc = TRUE,
         },
         {0},
     };