Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-23 14:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[KBSWITCH] Fix GetNextLayout for three or more languages (#4629)

Browse source 
Typing Alt+Shift should work cyclically.
CORE-11737
This commit is contained in:
Katayama Hirofumi MZ 2022-08-26 06:33:39 +09:00 committed by GitHub
parent b4114030a2
commit e8b830d6bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 47 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
base/applications/kbswitch/kbswitch.c
View file

@ -296,7 +296,8 @@ ActivateLayout(HWND hwnd, ULONG uLayoutNum)
TCHAR szLayoutNum[CCH_ULONG_DEC + 1], szLCID[CCH_LAYOUT_ID + 1], szLangName[MAX_PATH];
LANGID LangID;
if (uLayoutNum == (ULONG)-1 || uLayoutNum > 0xFF) /* Invalid */
/* The layout number starts from one. Zero is invalid */
if (uLayoutNum == 0 || uLayoutNum > 0xFF) /* Invalid */
return;
_ultot(uLayoutNum, szLayoutNum, 10);
@ -349,6 +350,40 @@ BuildLeftPopupMenu(VOID)
return hMenu;
}
static ULONG
GetMaxLayoutNum(VOID)
{
HKEY hKey;
ULONG dwIndex, dwSize, uLayoutNum, uMaxLayoutNum = 0;
TCHAR szLayoutNum[CCH_ULONG_DEC + 1], szLayoutID[CCH_LAYOUT_ID + 1];
/* Get the maximum layout number in the Preload key */
if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0,
KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
{
for (dwIndex = 0; ; dwIndex++)
{
dwSize = sizeof(szLayoutNum);
if (RegEnumValue(hKey, dwIndex, szLayoutNum, &dwSize, NULL, NULL,
NULL, NULL) != ERROR_SUCCESS)
{
break;
}
if (GetLayoutID(szLayoutNum, szLayoutID, ARRAYSIZE(szLayoutID)))
{
uLayoutNum = _ttoi(szLayoutNum);
if (uMaxLayoutNum < uLayoutNum)
uMaxLayoutNum = uLayoutNum;
}
}
RegCloseKey(hKey);
}
return uMaxLayoutNum;
}
BOOL
SetHooks(VOID)
{
@ -380,26 +415,21 @@ ULONG
GetNextLayout(VOID)
{
TCHAR szLayoutNum[3 + 1], szLayoutID[CCH_LAYOUT_ID + 1];
ULONG Ret = ulCurrentLayoutNum;
ULONG uLayoutNum, uMaxNum = GetMaxLayoutNum();
_ultot(ulCurrentLayoutNum, szLayoutNum, 10);
if (!GetLayoutID(szLayoutNum, szLayoutID, ARRAYSIZE(szLayoutID)))
for (uLayoutNum = ulCurrentLayoutNum + 1; ; ++uLayoutNum)
{
return -1;
if (uLayoutNum > uMaxNum)
uLayoutNum = 1;
if (uLayoutNum == ulCurrentLayoutNum)
break;
_ultot(uLayoutNum, szLayoutNum, 10);
if (GetLayoutID(szLayoutNum, szLayoutID, ARRAYSIZE(szLayoutID)))
return uLayoutNum;
}
_ultot(Ret + 1, szLayoutNum, 10);
if (GetLayoutID(szLayoutNum, szLayoutID, ARRAYSIZE(szLayoutID)))
{
return (Ret + 1);
}
_ultot(Ret - 1, szLayoutNum, 10);
if (GetLayoutID(szLayoutNum, szLayoutID, ARRAYSIZE(szLayoutID)))
return (Ret - 1);
return -1;
return ulCurrentLayoutNum;
}
LRESULT