Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-26 07:51:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTUSER] Improve NtUserGetImeInfoEx / NtUserSetImeInfoEx

Browse source 
CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2022-08-25 10:20:42 +09:00
parent 4d724b6fbb
commit 9e7c2ba460
1 changed files with 35 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
win32ss/user/ntuser/ime.c
View file

@ -954,11 +954,15 @@ Quit:
}
// Win: GetImeInfoEx
BOOL FASTCALL UserGetImeInfoEx(LPVOID pUnknown, PIMEINFOEX pInfoEx, IMEINFOEXCLASS SearchType)
BOOL FASTCALL
UserGetImeInfoEx(
_Inout_ PWINSTATION_OBJECT pWinSta,
_Inout_ PIMEINFOEX pInfoEx,
_In_ IMEINFOEXCLASS SearchType)
{
PKL pkl, pklHead;
if (!gspklBaseLayout)
if (!pWinSta || !gspklBaseLayout)
return FALSE;
pkl = pklHead = gspklBaseLayout;
@ -971,7 +975,10 @@ BOOL FASTCALL UserGetImeInfoEx(LPVOID pUnknown, PIMEINFOEX pInfoEx, IMEINFOEXCLA
if (pInfoEx->hkl == pkl->hkl)
{
if (!pkl->piiex)
{
ERR("!pkl->piiex at %p\n", pkl->hkl);
break;
}
*pInfoEx = *pkl->piiex;
return TRUE;
@ -984,12 +991,18 @@ BOOL FASTCALL UserGetImeInfoEx(LPVOID pUnknown, PIMEINFOEX pInfoEx, IMEINFOEXCLA
{
do
{
if (pkl->piiex &&
_wcsnicmp(pkl->piiex->wszImeFile, pInfoEx->wszImeFile,
if (_wcsnicmp(pkl->piiex->wszImeFile, pInfoEx->wszImeFile,
RTL_NUMBER_OF(pkl->piiex->wszImeFile)) == 0)
{
*pInfoEx = *pkl->piiex;
return TRUE;
if (pkl->piiex)
{
*pInfoEx = *pkl->piiex;
return TRUE;
}
else
{
ERR("!pkl->piiex at %p\n", pkl->hkl);
}
}
pkl = pkl->pklNext;
@ -1011,6 +1024,7 @@ NtUserGetImeInfoEx(
{
IMEINFOEX ImeInfoEx;
BOOL ret = FALSE;
PWINSTATION_OBJECT pWinSta;
UserEnterShared();
@ -1031,7 +1045,8 @@ NtUserGetImeInfoEx(
}
_SEH2_END;
ret = UserGetImeInfoEx(NULL, &ImeInfoEx, SearchType);
pWinSta = IntGetProcessWindowStation(NULL);
ret = UserGetImeInfoEx(pWinSta, &ImeInfoEx, SearchType);
if (!ret)
goto Quit;
@ -1081,10 +1096,16 @@ Quit:
}
// Win: SetImeInfoEx
BOOL FASTCALL UserSetImeInfoEx(LPVOID pUnknown, PIMEINFOEX pImeInfoEx)
BOOL FASTCALL
UserSetImeInfoEx(
_Inout_ PWINSTATION_OBJECT pWinSta,
_Inout_ PIMEINFOEX pImeInfoEx)
{
PKL pklHead, pkl;
if (!pWinSta || !gspklBaseLayout)
return FALSE;
pkl = pklHead = gspklBaseLayout;
do
@ -1096,7 +1117,10 @@ BOOL FASTCALL UserSetImeInfoEx(LPVOID pUnknown, PIMEINFOEX pImeInfoEx)
}
if (!pkl->piiex)
{
ERR("!pkl->piiex at %p\n", pkl->hkl);
return FALSE;
}
if (!pkl->piiex->fLoadFlag)
*pkl->piiex = *pImeInfoEx;
@ -1113,6 +1137,7 @@ NtUserSetImeInfoEx(PIMEINFOEX pImeInfoEx)
{
BOOL ret = FALSE;
IMEINFOEX ImeInfoEx;
PWINSTATION_OBJECT pWinSta;
UserEnterExclusive();
@ -1133,7 +1158,8 @@ NtUserSetImeInfoEx(PIMEINFOEX pImeInfoEx)
}
_SEH2_END;
ret = UserSetImeInfoEx(NULL, &ImeInfoEx);
pWinSta = IntGetProcessWindowStation(NULL);
ret = UserSetImeInfoEx(pWinSta, &ImeInfoEx);
Quit:
UserLeave();