ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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-06 12:03:13 +02:00 committed by Alexandre Julliard
parent c4e6d16271
commit 8ec1206ba0
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/user32/input.c
View File

@ -1110,7 +1110,9 @@ BOOL WINAPI GetKeyboardLayoutNameA(LPSTR pszKLID)
*/ */
BOOL WINAPI GetKeyboardLayoutNameW( WCHAR *name ) BOOL WINAPI GetKeyboardLayoutNameW( WCHAR *name )
{ {
DWORD tmp; WCHAR klid[KL_NAMELENGTH], value[5];
DWORD value_size, tmp, i = 0;
HKEY hkey;
HKL layout; HKL layout;
TRACE_(keyboard)( "name %p\n", name ); TRACE_(keyboard)( "name %p\n", name );
@ -1126,6 +1128,25 @@ BOOL WINAPI GetKeyboardLayoutNameW( WCHAR *name )
if (HIWORD( tmp ) == LOWORD( tmp )) tmp = LOWORD( tmp ); if (HIWORD( tmp ) == LOWORD( tmp )) tmp = LOWORD( tmp );
swprintf( name, KL_NAMELENGTH, L"%08X", tmp ); swprintf( name, KL_NAMELENGTH, L"%08X", tmp );
if (!RegOpenKeyW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Keyboard Layouts", &hkey ))
{
while (!RegEnumKeyW( hkey, i++, klid, ARRAY_SIZE(klid) ))
{
value_size = sizeof(value);
if (!RegGetValueW( hkey, klid, L"Layout Id", RRF_RT_REG_SZ, NULL, (void *)&value, &value_size ))
tmp = 0xf000 | (wcstoul( value, NULL, 16 ) & 0xfff);
else
tmp = wcstoul( klid, NULL, 16 );
if (HIWORD( layout ) == tmp)
{
lstrcpynW( name, klid, KL_NAMELENGTH );
break;
}
}
RegCloseKey( hkey );
}
TRACE_(keyboard)( "ret %s\n", debugstr_w( name ) ); TRACE_(keyboard)( "ret %s\n", debugstr_w( name ) );
return TRUE; return TRUE;
} }