Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 21:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[IMM32][NTUSER] Fix NtUserGetThreadState call of Imm32InquireIme

Browse source 
There was a mistake of parameter value for NtUserGetThreadState
call in Imm32InquireIme function. This affected the logon process.

JIRA issue: CORE-19320

- Replace THREADSTATE_ISWINLOGON2 with THREADSTATE_ISWINLOGON in
  NtUserGetThreadState call in Imm32InquireIme function.
- Rename THREADSTATE_ISWINLOGON2 as THREADSTATE_UNKNOWN_0x10.
- Adapt NtUserGetThreadState to this change.
This commit is contained in:
Katayama Hirofumi MZ 2024-05-28 22:01:48 +09:00
parent 20f1bb4ab8
commit 4225717dc9
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dll/win32/imm32/ime.c
View file

@ -51,7 +51,7 @@ BOOL APIENTRY Imm32InquireIme(PIMEDPI pImeDpi)
DWORD dwSysInfoFlags = 0; DWORD dwSysInfoFlags = 0;
LPIMEINFO pImeInfo = &pImeDpi->ImeInfo; LPIMEINFO pImeInfo = &pImeDpi->ImeInfo;
if (NtUserGetThreadState(THREADSTATE_ISWINLOGON2)) if (NtUserGetThreadState(THREADSTATE_ISWINLOGON))
dwSysInfoFlags |= IME_SYSINFO_WINLOGON; dwSysInfoFlags |= IME_SYSINFO_WINLOGON;
if (GetWin32ClientInfo()->dwTIFlags & TIF_16BIT) if (GetWin32ClientInfo()->dwTIFlags & TIF_16BIT)

2
win32ss/include/ntuser.h
View file

@ -2485,7 +2485,7 @@ enum ThreadStateRoutines
THREADSTATE_IMECOMPATFLAGS, THREADSTATE_IMECOMPATFLAGS,
THREADSTATE_OLDKEYBOARDLAYOUT, THREADSTATE_OLDKEYBOARDLAYOUT,
THREADSTATE_ISWINLOGON, THREADSTATE_ISWINLOGON,
THREADSTATE_ISWINLOGON2, THREADSTATE_UNKNOWN_0x10,
THREADSTATE_CHECKCONIME, THREADSTATE_CHECKCONIME,
THREADSTATE_GETTHREADINFO, THREADSTATE_GETTHREADINFO,
THREADSTATE_PROGMANWINDOW, /* FIXME: Delete this HACK */ THREADSTATE_PROGMANWINDOW, /* FIXME: Delete this HACK */

4
win32ss/user/ntuser/misc.c
View file

@ -340,9 +340,11 @@ NtUserGetThreadState(
ret = (ULONG_PTR)pti->hklPrev; ret = (ULONG_PTR)pti->hklPrev;
break; break;
case THREADSTATE_ISWINLOGON: case THREADSTATE_ISWINLOGON:
case THREADSTATE_ISWINLOGON2:
ret = (gpidLogon == PsGetCurrentProcessId()); ret = (gpidLogon == PsGetCurrentProcessId());
break; break;
case THREADSTATE_UNKNOWN_0x10:
FIXME("stub\n");
break;
case THREADSTATE_CHECKCONIME: case THREADSTATE_CHECKCONIME:
ret = (IntTID2PTI(UlongToHandle(pti->rpdesk->dwConsoleThreadId)) == pti); ret = (IntTID2PTI(UlongToHandle(pti->rpdesk->dwConsoleThreadId)) == pti);
break; break;