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

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

user32: Read "Layout Id" from registry in GetKeyboardLayoutList.
80985b7e · Rémi Bernon · Alexandre Julliard · 66c31814 · 80985b7e
Commit 80985b7e authored Apr 30, 2021 by Rémi Bernon Committed by Alexandre Julliard Apr 30, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

input.c dlls/user32/input.c +6 -2

No files found.
--- a/dlls/user32/input.c
+++ b/dlls/user32/input.c
@@ -1336,8 +1336,8 @@ BOOL WINAPI BlockInput(BOOL fBlockIt)
 */
 UINT WINAPI GetKeyboardLayoutList( INT size, HKL *layouts )
 {
-    WCHAR klid[KL_NAMELENGTH];
-    UINT count, tmp, i = 0;
+    WCHAR klid[KL_NAMELENGTH], value[5];
+    DWORD value_size, count, tmp, i = 0;
    HKEY hkey;
    HKL layout;

@@ -1360,6 +1360,10 @@ UINT WINAPI GetKeyboardLayoutList( INT size, HKL *layouts )
        while (!RegEnumKeyW( hkey, i++, klid, ARRAY_SIZE(klid) ))
        {
            tmp = wcstoul( klid, NULL, 16 );
+            value_size = sizeof(value);
+            if (!RegGetValueW( hkey, klid, L"Layout Id", RRF_RT_REG_SZ, NULL, (void *)&value, &value_size ))
+                tmp = MAKELONG( LOWORD( tmp ), 0xf000 | (wcstoul( value, NULL, 16 ) & 0xfff) );
+
            if (layout == UlongToHandle( tmp )) continue;

            count++;