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

[NTUSER] Refactor NtUserUnloadKeyboardLayout (#4605)

Browse source 
- Add IntHKLtoPKL, co_UserActivateKeyboardLayout, IntReorderKeyboardLayouts, and co_IntActivateKeyboardLayout helper functions.
- Rewrite NtUserUnloadKeyboardLayout by using helper functions.
CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2022-08-15 08:25:06 +09:00 committed by GitHub
parent e8ccc8516f
commit 379188acfe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 135 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
win32ss/include/ntuser.h
View file

@ -1515,7 +1515,7 @@ NtUserTrackPopupMenuEx(
HKL
NTAPI
NtUserActivateKeyboardLayout(
HKL hKl,
HKL hKL,
ULONG Flags);
DWORD

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

@ -27,7 +27,71 @@ typedef PVOID (*PFN_KBDLAYERDESCRIPTOR)(VOID);
/* PRIVATE FUNCTIONS ******************************************************/
// Win: _GetKeyboardLayoutList
/*
* Retrieves a PKL by an input locale identifier (HKL).
* @implemented
* Win: HKLtoPKL
*/
PKL FASTCALL IntHKLtoPKL(_Inout_ PTHREADINFO pti, _In_ HKL hKL)
{
PKL pFirstKL, pKL;
pFirstKL = pti->KeyboardLayout;
if (!pFirstKL)
return NULL;
pKL = pFirstKL;
/* hKL can have special value HKL_NEXT or HKL_PREV */
if (hKL == (HKL)(ULONG_PTR)HKL_NEXT) /* Looking forward */
{
do
{
pKL = pKL->pklNext;
if (!(pKL->dwKL_Flags & KLF_UNLOAD))
return pKL;
} while (pKL != pFirstKL);
}
else if (hKL == (HKL)(ULONG_PTR)HKL_PREV) /* Looking backward */
{
do
{
pKL = pKL->pklPrev;
if (!(pKL->dwKL_Flags & KLF_UNLOAD))
return pKL;
} while (pKL != pFirstKL);
}
else if (HIWORD(hKL)) /* hKL is a full input locale identifier */
{
/* No KLF_UNLOAD check */
do
{
if (pKL->hkl == hKL)
return pKL;
pKL = pKL->pklNext;
} while (pKL != pFirstKL);
}
else /* Language only specified */
{
/* No KLF_UNLOAD check */
do
{
if (LOWORD(pKL->hkl) == LOWORD(hKL)) /* Low word is language ID */
return pKL;
pKL = pKL->pklNext;
} while (pKL != pFirstKL);
}
return NULL;
}
/*
* A helper function for NtUserGetKeyboardLayoutList.
* @implemented
* Win: _GetKeyboardLayoutList
*/
static UINT APIENTRY
IntGetKeyboardLayoutList(
_Inout_ PWINSTATION_OBJECT pWinSta,
@ -543,6 +607,66 @@ co_UserActivateKbl(PTHREADINFO pti, PKL pKl, UINT Flags)
return pklPrev;
}
/* Win: xxxInternalActivateKeyboardLayout */
HKL APIENTRY
co_UserActivateKeyboardLayout(
_Inout_ PKL pKL,
_In_ ULONG uFlags,
_Inout_ PWND pWnd)
{
HKL hKL = pKL->hkl;
PTHREADINFO pti = PsGetCurrentThreadWin32Thread();
if (pKL != pti->KeyboardLayout)
{
/* Activate layout for current thread */
co_UserActivateKbl(pti, pKL, uFlags);
/* Send shell message */
if (!(uFlags & KLF_NOTELLSHELL))
co_IntShellHookNotify(HSHELL_LANGUAGE, 0, (LPARAM)hKL);
}
/* FIXME: KLF_RESET
KLF_SHIFTLOCK */
return hKL;
}
// Win: ReorderKeyboardLayouts
VOID FASTCALL
IntReorderKeyboardLayouts(
_Inout_ PWINSTATION_OBJECT pWinSta,
_Inout_ PKL pKL)
{
/* FIXME */
gspklBaseLayout = pKL;
}
/* Win: xxxActivateKeyboardLayout */
HKL APIENTRY
co_IntActivateKeyboardLayout(
_Inout_ PWINSTATION_OBJECT pWinSta,
_In_ HKL hKL,
_In_ ULONG uFlags,
_Inout_ PWND pWnd)
{
PKL pKL;
PTHREADINFO pti = PsGetCurrentThreadWin32Thread();
pKL = IntHKLtoPKL(pti, hKL);
if (!pKL)
{
ERR("Invalid HKL %p!\n", hKL);
return NULL;
}
if (uFlags & KLF_REORDER)
IntReorderKeyboardLayouts(pWinSta, pKL);
return co_UserActivateKeyboardLayout(pKL, uFlags, pWnd);
}
/* EXPORTS *******************************************************************/
/*
@ -821,62 +945,23 @@ cleanup:
* Activates specified layout for thread or process
*/
HKL
APIENTRY
NTAPI
NtUserActivateKeyboardLayout(
HKL hKl,
HKL hKL,
ULONG Flags)
{
PKL pKl = NULL;
HKL hkl = NULL;
PTHREADINFO pti;
PWINSTATION_OBJECT pWinSta;
HKL hOldKL;
UserEnterExclusive();
pti = PsGetCurrentThreadWin32Thread();
/* FIXME */
/* hKl can have special value HKL_NEXT or HKL_PREV */
if (hKl == (HKL)HKL_NEXT)
{
/* Get next keyboard layout starting with current */
if (pti->KeyboardLayout)
pKl = pti->KeyboardLayout->pklNext;
}
else if (hKl == (HKL)HKL_PREV)
{
/* Get previous keyboard layout starting with current */
if (pti->KeyboardLayout)
pKl = pti->KeyboardLayout->pklPrev;
}
else
pKl = UserHklToKbl(hKl);
if (!pKl)
{
ERR("Invalid HKL %p!\n", hKl);
goto cleanup;
}
hkl = pKl->hkl;
/* FIXME: KLF_RESET
KLF_SHIFTLOCK */
if (Flags & KLF_REORDER)
gspklBaseLayout = pKl;
if (pKl != pti->KeyboardLayout)
{
/* Activate layout for current thread */
pKl = co_UserActivateKbl(pti, pKl, Flags);
/* Send shell message */
if (!(Flags & KLF_NOTELLSHELL))
co_IntShellHookNotify(HSHELL_LANGUAGE, 0, (LPARAM)hkl);
}
cleanup:
pWinSta = IntGetProcessWindowStation(NULL);
hOldKL = co_IntActivateKeyboardLayout(pWinSta, hKL, Flags, NULL);
UserLeave();
return hkl;
return hOldKL;
}
/*