Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USER32] Improve CliGetPreloadKeyboardLayouts

Browse source 
CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2022-10-19 17:34:43 +09:00
parent 10acb335fa
commit 21feb529fe
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -369,7 +369,7 @@ BOOL FASTCALL CliGetImeHotKeysFromRegistry(VOID)
VOID APIENTRY CliGetPreloadKeyboardLayouts(PBYTE pbFlags)
{
WCHAR szValueName[8], szValue[16];
WCHAR szValueName[12], szValue[16];
UNICODE_STRING ustrValue;
DWORD dwKL, cbValue, dwType;
UINT iNumber;
@ -382,14 +382,17 @@ VOID APIENTRY CliGetPreloadKeyboardLayouts(PBYTE pbFlags)
for (iNumber = 1; iNumber < 1000; ++iNumber)
{
StringCchPrintfW(szValueName, _countof(szValueName), L"%u", iNumber);
RtlIntegerToUnicode(iNumber, 10, sizeof(szValueName), szValueName);
cbValue = sizeof(szValue);
error = RegQueryValueExW(hKey, szValueName, NULL, &dwType, (LPBYTE)szValue, &cbValue);
if (error != ERROR_SUCCESS || dwType != REG_SZ)
if (error != ERROR_SUCCESS)
break;
szValue[_countof(szValue) - 1] = 0;
if (dwType != REG_SZ)
continue;
szValue[_countof(szValue) - 1] = 0; /* Avoid stack overrun */
RtlInitUnicodeString(&ustrValue, szValue);
RtlUnicodeStringToInteger(&ustrValue, 16, &dwKL);