Commit 47533974 authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard

imm32: Call ActivateKeyboardLayout from ImmActivateLayout.

parent ca97db75
......@@ -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 )
......
......@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment