win32u: Keep the current user locale when enumerating layouts.

The low word of the enumerated HKL is the desired user locale, the high word is either the keyboard layout LANGID, or the keyboard "Layout Id" for additional layouts with the same LANGID.

win32u: Keep the current user locale when enumerating layouts.
d12dda39 · Rémi Bernon · Alexandre Julliard · ab80ee17 · d12dda39
Commit d12dda39 authored Mar 03, 2023 by Rémi Bernon Committed by Alexandre Julliard Mar 14, 2023
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

input.c dlls/win32u/input.c +2 -2

No files found.
--- a/dlls/win32u/input.c
+++ b/dlls/win32u/input.c
@@ -1273,10 +1273,10 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
            tmp = wcstoul( key_info->Name, NULL, 16 );
            if (query_reg_ascii_value( subkey, "Layout Id", value_info, sizeof(buffer) ) &&
                value_info->Type == REG_SZ)
-                tmp = MAKELONG( LOWORD( tmp ),
-                                0xf000 | (wcstoul( (const WCHAR *)value_info->Data, NULL, 16 ) & 0xfff) );
+                tmp = 0xf000 | (wcstoul( (const WCHAR *)value_info->Data, NULL, 16 ) & 0xfff);
            NtClose( subkey );

+            tmp = MAKELONG( LOWORD( layout ), LOWORD( tmp ) );
            if (layout == UlongToHandle( tmp )) continue;

            count++;