https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db16a1f7836dad8701f125...
commit db16a1f7836dad8701f1252242d7affbca4bba85 Author: Katayama Hirofumi MZ katayama.hirofumi.mz@gmail.com AuthorDate: Fri Oct 21 10:40:38 2022 +0900 Commit: Katayama Hirofumi MZ katayama.hirofumi.mz@gmail.com CommitDate: Fri Oct 21 10:40:38 2022 +0900
[IMM32] ImmGetImeInfoEx minor fix
CORE-11700 --- dll/win32/imm32/ime.c | 5 +---- dll/win32/imm32/precomp.h | 1 + 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 2e3b7370db5..5dbddca417e 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -887,11 +887,8 @@ ImmGetImeInfoEx(PIMEINFOEX pImeInfoEx, IMEINFOEXCLASS SearchType, PVOID pvSearch { if (!IS_IME_HKL(hKL)) { - if (!CtfImmIsTextFrameServiceDisabled() || - !IS_CICERO_MODE() || IS_16BIT_MODE()) - { + if (CtfImmIsTextFrameServiceDisabled() || !IS_CICERO_MODE() || IS_16BIT_MODE()) return FALSE; - } }
SearchType = ImeInfoExKeyboardLayout; diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 5e1138482cc..91eb68c984a 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -157,6 +157,7 @@ BOOL APIENTRY Imm32WriteImeLayout(HKL hKL, LPCWSTR pchFilePart, LPCWSTR pszLayou HKL APIENTRY Imm32AssignNewLayout(UINT cKLs, const REG_IME *pLayouts, WORD wLangID); BOOL APIENTRY Imm32CopyImeFile(LPWSTR pszOldFile, LPCWSTR pszNewFile);
+/* Win: PtiCurrent */ static inline PTHREADINFO FASTCALL Imm32CurrentPti(VOID) { if (NtCurrentTeb()->Win32ThreadInfo == NULL)