Rémi Bernon : imm32: Call ActivateKeyboardLayout from ImmActivateLayout.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 47533974ce156c90b203fe59e69a17b17ed312b6
URL:    https://gitlab.winehq.org/wine/wine/-/commit/47533974ce156c90b203fe59e69a17b...

Author: Rémi Bernon 
Date:   Mon Mar 27 10:33:45 2023 +0200

imm32: Call ActivateKeyboardLayout from ImmActivateLayout.

---

dlls/imm32/imm.c         | 8 ++++++--
 dlls/imm32/tests/imm32.c | 7 +++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index e600156f504..ee9e673233b 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -566,8 +566,12 @@ static void ime_release( struct ime *ime )

BOOL WINAPI ImmActivateLayout( HKL hkl )
 {
-    FIXME( "hkl %p stub!\n", hkl );
-    return FALSE;
+    FIXME( "hkl %p semi-stub!\n", hkl );
+
+    if (hkl == GetKeyboardLayout( 0 )) return TRUE;
+    if (!ActivateKeyboardLayout( hkl, 0 )) return FALSE;
+
+    return TRUE;
 }

static BOOL free_input_context_data( HIMC hIMC )
diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index 2eea7f0d8c5..204c805f748 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -3820,7 +3820,6 @@ static void test_ImmActivateLayout(void)
     SET_ENABLE( ImeInquire, TRUE );
     SET_ENABLE( ImeDestroy, TRUE );

-    todo_wine
     ok_ret( 1, ImmActivateLayout( old_hkl ) );

ime_info.fdwProperty = IME_PROP_END_UNLOAD | IME_PROP_UNICODE;
@@ -3840,16 +3839,16 @@ static void test_ImmActivateLayout(void)
     /* ImmActivateLayout changes active HKL */

SET_EXPECT( ImeInquire );
-    todo_wine
     ok_ret( 1, ImmActivateLayout( hkl ) );
     ok_seq( activate_seq );
     todo_wine
     CHECK_CALLED( ImeInquire );

-    todo_wine
     ok_eq( hkl, GetKeyboardLayout( 0 ), HKL, "%p" );

-    todo_wine
+    ok_ret( 1, ImmActivateLayout( hkl ) );
+    ok_seq( empty_sequence );
+
     ok_ret( 1, ImmActivateLayout( old_hkl ) );
     ok_seq( deactivate_seq );