system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-02 10:43:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

win32u: Keep the current user locale when loading layout.

Browse source
This commit is contained in:
Rémi Bernon 2023-03-09 09:48:53 +01:00 committed by Alexandre Julliard
parent d12dda395f
commit 27c5abe378
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dlls/user32/input.c
View file

@ -439,7 +439,8 @@ BOOL WINAPI BlockInput(BOOL fBlockIt)
HKL WINAPI LoadKeyboardLayoutW( const WCHAR *name, UINT flags )
{
WCHAR layout_path[MAX_PATH], value[5];
DWORD value_size, tmp;
LCID locale = GetUserDefaultLCID();
DWORD id, value_size, tmp;
HKEY hkey;
HKL layout;
@ -449,6 +450,9 @@ HKL WINAPI LoadKeyboardLayoutW( const WCHAR *name, UINT flags )
if (HIWORD( tmp )) layout = UlongToHandle( tmp );
else layout = UlongToHandle( MAKELONG( LOWORD( tmp ), LOWORD( tmp ) ) );
if (!((UINT_PTR)layout >> 28)) id = LOWORD( tmp );
else id = HIWORD( layout ); /* IME or aliased layout */
wcscpy( layout_path, L"System\\CurrentControlSet\\Control\\Keyboard Layouts\\" );
wcscat( layout_path, name );
@ -456,11 +460,12 @@ HKL WINAPI LoadKeyboardLayoutW( const WCHAR *name, UINT flags )
{
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) ) );
id = 0xf000 | (wcstoul( value, NULL, 16 ) & 0xfff);
RegCloseKey( hkey );
}
layout = UlongToHandle( MAKELONG( locale, id ) );
if ((flags & KLF_ACTIVATE) && NtUserActivateKeyboardLayout( layout, 0 )) return layout;
/* FIXME: semi-stub: returning default layout */