user32: Read "Layout Id" from registry in LoadKeyboardLayoutW.

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-07 10:29:46 +02:00 committed by Alexandre Julliard
parent bda517c085
commit 3e2b225428
1 changed files with 15 additions and 1 deletions

View File

@ -1540,7 +1540,9 @@ BOOL WINAPI UnregisterHotKey(HWND hwnd,INT id)
*/
HKL WINAPI LoadKeyboardLayoutW( const WCHAR *name, UINT flags )
{
DWORD tmp;
WCHAR layout_path[MAX_PATH], value[5];
DWORD value_size, tmp;
HKEY hkey;
HKL layout;
FIXME_(keyboard)( "name %s, flags %x, semi-stub!\n", debugstr_w( name ), flags );
@ -1548,6 +1550,18 @@ HKL WINAPI LoadKeyboardLayoutW( const WCHAR *name, UINT flags )
tmp = wcstoul( name, NULL, 16 );
layout = UlongToHandle( tmp );
wcscpy( layout_path, L"System\\CurrentControlSet\\Control\\Keyboard Layouts\\" );
wcscat( layout_path, name );
if (!RegOpenKeyW( HKEY_LOCAL_MACHINE, layout_path, &hkey ))
{
value_size = sizeof(value);
if (!RegGetValueW( hkey, NULL, L"Layout Id", RRF_RT_REG_SZ, NULL, (void *)&value, &value_size ))
layout = UlongToHandle( MAKELONG( LOWORD( tmp ), 0xf000 | (wcstoul( value, NULL, 16 ) & 0xfff) ) );
RegCloseKey( hkey );
}
if ((flags & KLF_ACTIVATE) && ActivateKeyboardLayout( layout, 0 )) return layout;
/* FIXME: semi-stub: returning default layout */