Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 01:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USER32] Fix HKL value in IntLoadKeyboardLayout (#4632)

Browse source 
The loaded HKL values were wrong. CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2022-08-27 07:42:37 +09:00 committed by GitHub
parent 83442919e4
commit ea2d32b9eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
win32ss/user/ntuser/kbdlayout.c
View file

@ -999,6 +999,8 @@ cleanup:
* NtUserLoadKeyboardLayoutEx * NtUserLoadKeyboardLayoutEx
* *
* Loads keyboard layout with given locale id * Loads keyboard layout with given locale id
*
* NOTE: We adopt a different design from Microsoft's one for security reason.
*/ */
HKL HKL
APIENTRY APIENTRY

61
win32ss/user/user32/windows/input.c
View file

@ -640,6 +640,8 @@ LoadKeyboardLayoutA(LPCSTR pszKLID,
/* /*
* @unimplemented * @unimplemented
*
* NOTE: We adopt a different design from Microsoft's one for security reason.
*/ */
/* Win: LoadKeyboardLayoutWorker */ /* Win: LoadKeyboardLayoutWorker */
HKL APIENTRY HKL APIENTRY
@ -650,16 +652,25 @@ IntLoadKeyboardLayout(
_In_ UINT Flags, _In_ UINT Flags,
_In_ BOOL unknown5) _In_ BOOL unknown5)
{ {
DWORD dwhkl, dwType, dwSize; DWORD dwHKL, dwType, dwSize;
WORD wKeybdLangID, wLayoutID;
UNICODE_STRING ustrKbdName; UNICODE_STRING ustrKbdName;
UNICODE_STRING ustrKLID; UNICODE_STRING ustrKLID;
WCHAR wszRegKey[256] = L"SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\"; WCHAR wszRegKey[256] = L"SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\";
WCHAR wszLayoutId[10], wszNewKLID[10]; WCHAR wszLayoutId[10], wszNewKLID[10], szImeFileName[80];
WCHAR *endptr;
HKEY hKey; HKEY hKey;
HKL hNewKL; HKL hInputKL, hNewKL;
/* LOWORD of dwhkl is Locale Identifier */ hInputKL = (HKL)UlongToHandle(wcstoul(pwszKLID, &endptr, 16));
dwhkl = LOWORD(wcstoul(pwszKLID, NULL, 16)); if ((endptr - pwszKLID) != 8)
{
ERR("pwszKLID: '%S'\n", pwszKLID);
return NULL;
}
wKeybdLangID = LOWORD(hInputKL); /* language identifier */
wLayoutID = HIWORD(hInputKL); /* layout identifier */
if (Flags & KLF_SUBSTITUTE_OK) if (Flags & KLF_SUBSTITUTE_OK)
{ {
@ -683,19 +694,32 @@ IntLoadKeyboardLayout(
StringCbCatW(wszRegKey, sizeof(wszRegKey), pwszKLID); StringCbCatW(wszRegKey, sizeof(wszRegKey), pwszKLID);
/* Open layout registry key for read */ /* Open layout registry key for read */
if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszRegKey, 0, if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszRegKey, 0, KEY_READ, &hKey) == ERROR_SUCCESS)
KEY_READ, &hKey) == ERROR_SUCCESS)
{ {
/* Check "Layout Id" value */
dwSize = sizeof(wszLayoutId); dwSize = sizeof(wszLayoutId);
if (RegQueryValueExW(hKey, L"Layout Id", NULL, &dwType, (LPBYTE)wszLayoutId, &dwSize) == ERROR_SUCCESS) if (RegQueryValueExW(hKey, L"Layout Id", NULL, &dwType, (LPBYTE)wszLayoutId, &dwSize) == ERROR_SUCCESS)
{ {
/* If Layout Id is specified, use this value | f000 as HIWORD */ /* If Layout Id is specified, use this value | f000 as HIWORD */
/* FIXME: Microsoft Office expects this value to be something specific /* FIXME: Microsoft Office expects this value to be something specific
* for Japanese and Korean Windows with an IME the value is 0xe001 * for Japanese and Korean Windows with an IME the value is 0xe001
* We should probably check to see if an IME exists and if so then
* set this word properly.
*/ */
dwhkl |= (0xf000 | wcstol(wszLayoutId, NULL, 16)) << 16; wLayoutID = 0xF000 | LOWORD(wcstol(wszLayoutId, NULL, 16));
}
if (IS_IME_HKL(hInputKL)) /* IME? */
{
/* Check "IME File" value */
dwSize = sizeof(szImeFileName);
if (RegQueryValueExW(hKey, L"IME File", NULL, &dwType, (LPBYTE)szImeFileName,
&dwSize) != ERROR_SUCCESS)
{
/*
* FIXME: We should probably check to see if an IME exists and if so then
* set this word properly.
*/
wLayoutID = 0;
}
} }
/* Close the key now */ /* Close the key now */
@ -707,15 +731,20 @@ IntLoadKeyboardLayout(
return NULL; return NULL;
} }
/* If Layout Id is not given HIWORD == LOWORD (for dwhkl) */ if (IS_IME_HKL(hInputKL) && wLayoutID) /* IME? */
if (!HIWORD(dwhkl)) {
dwhkl |= dwhkl << 16; dwHKL = HandleToUlong(hInputKL);
}
else
{
if (!wLayoutID)
wLayoutID = wKeybdLangID;
dwHKL = MAKELONG(wKeybdLangID, wLayoutID);
}
ZeroMemory(&ustrKbdName, sizeof(ustrKbdName)); ZeroMemory(&ustrKbdName, sizeof(ustrKbdName));
RtlInitUnicodeString(&ustrKLID, pwszKLID); RtlInitUnicodeString(&ustrKLID, pwszKLID);
hNewKL = NtUserLoadKeyboardLayoutEx(NULL, 0, &ustrKbdName, hNewKL = NtUserLoadKeyboardLayoutEx(NULL, 0, &ustrKbdName, NULL, &ustrKLID, dwHKL, Flags);
NULL, &ustrKLID,
dwhkl, Flags);
CliImmInitializeHotKeys(SETIMEHOTKEY_ADD, hNewKL); CliImmInitializeHotKeys(SETIMEHOTKEY_ADD, hNewKL);
return hNewKL; return hNewKL;
} }