Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-03 09:41:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KBSWITCH]

Browse source 
- Don't fall through to the default label. CID 515166

[NTUSER]
- Fix a copypasta.

[USER32]
- Fix computing of HKL for layouts with Layout id.
- Don't call NtUserLoadKeyboardLayoutEx with bogus keyboard layout id.
- Ideally LoadKeyboardLayout should return the default system layout on failure - to be continued.

svn path=/trunk/; revision=73708
This commit is contained in:
Kamil Hornicek 2017-02-05 15:42:23 +00:00
parent 66a30f987b
commit 73bb103c3c
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/base/applications/kbswitch/kbswitch.c
View file

@ -492,6 +492,8 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
if (!ShellExecuteEx(&shInputDll)) if (!ShellExecuteEx(&shInputDll))
MessageBox(hwnd, _T("Can't start input.dll"), NULL, MB_OK | MB_ICONERROR); MessageBox(hwnd, _T("Can't start input.dll"), NULL, MB_OK | MB_ICONERROR);
return 0;
} }
default: default:

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

@ -722,7 +722,7 @@ NtUserActivateKeyboardLayout(
{ {
/* Get previous keyboard layout starting with current */ /* Get previous keyboard layout starting with current */
if (pti->KeyboardLayout) if (pti->KeyboardLayout)
pKl = pti->KeyboardLayout->pklNext; pKl = pti->KeyboardLayout->pklPrev;
} }
else else
pKl = UserHklToKbl(hKl); pKl = UserHklToKbl(hKl);

11
reactos/win32ss/user/user32/windows/input.c
View file

@ -281,7 +281,7 @@ LoadKeyboardLayoutW(LPCWSTR pwszKLID,
HKEY hKey; HKEY hKey;
/* LOWORD of dwhkl is Locale Identifier */ /* LOWORD of dwhkl is Locale Identifier */
dwhkl = wcstol(pwszKLID, NULL, 16); dwhkl = LOWORD(wcstoul(pwszKLID, NULL, 16));
if (Flags & KLF_SUBSTITUTE_OK) if (Flags & KLF_SUBSTITUTE_OK)
{ {
@ -305,7 +305,7 @@ LoadKeyboardLayoutW(LPCWSTR pwszKLID,
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)
{ {
dwSize = sizeof(wszLayoutId); dwSize = sizeof(wszLayoutId);
@ -324,10 +324,13 @@ LoadKeyboardLayoutW(LPCWSTR pwszKLID,
RegCloseKey(hKey); RegCloseKey(hKey);
} }
else else
ERR("RegOpenKeyExW failed!\n"); {
ERR("Could not find keyboard layout %S.\n", pwszKLID);
return NULL;
}
/* If Layout Id is not given HIWORD == LOWORD (for dwhkl) */ /* If Layout Id is not given HIWORD == LOWORD (for dwhkl) */
if (!HIWORD(dwhkl)) if (!HIWORD(dwhkl))
dwhkl |= dwhkl << 16; dwhkl |= dwhkl << 16;
ZeroMemory(&ustrKbdName, sizeof(ustrKbdName)); ZeroMemory(&ustrKbdName, sizeof(ustrKbdName));