user32: Add a default ActivateKeyboardLayout implementation.

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Rémi Bernon 2021-05-03 11:37:56 +02:00 committed by Alexandre Julliard
parent 30fe080965
commit 66a46120a0
2 changed files with 9 additions and 4 deletions

View File

@ -189,7 +189,7 @@ void USER_unload_driver(void)
static HKL CDECL nulldrv_ActivateKeyboardLayout( HKL layout, UINT flags )
{
return 0;
return (HKL)~0; /* use default implementation */
}
static void CDECL nulldrv_Beep(void)

View File

@ -1310,11 +1310,16 @@ INT WINAPI ToAsciiEx( UINT virtKey, UINT scanCode, const BYTE *lpKeyState,
/**********************************************************************
* ActivateKeyboardLayout (USER32.@)
*/
HKL WINAPI ActivateKeyboardLayout(HKL hLayout, UINT flags)
HKL WINAPI ActivateKeyboardLayout( HKL layout, UINT flags )
{
TRACE_(keyboard)("(%p, %d)\n", hLayout, flags);
HKL old_layout;
return USER_Driver->pActivateKeyboardLayout(hLayout, flags);
TRACE_(keyboard)( "layout %p, flags %x\n", layout, flags );
if ((old_layout = USER_Driver->pActivateKeyboardLayout( layout, flags )) != (HKL)~0)
return old_layout;
return get_locale_kbd_layout();
}
/**********************************************************************