https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a415bd46b1066706c98884...
commit a415bd46b1066706c9888473e720ff63d90e7411 Author: Katayama Hirofumi MZ katayama.hirofumi.mz@gmail.com AuthorDate: Mon Sep 27 09:37:14 2021 +0900 Commit: Katayama Hirofumi MZ katayama.hirofumi.mz@gmail.com CommitDate: Mon Sep 27 09:37:14 2021 +0900
[IMM32] Trivial tiny improvements
CORE-11700 --- dll/win32/imm32/ime.c | 9 +++------ dll/win32/imm32/imm.c | 1 - 2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 1fd912b1a86..99c675dbfce 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -172,9 +172,9 @@ BOOL APIENTRY Imm32LoadImeInfo(PIMEINFOEX pImeInfoEx, PIMEDPI pImeDpi) do { \ fn = GetProcAddress(hIME, #name); \ if (fn) pImeDpi->name = (FN_##name)fn; \ - else if (!extended) goto Failed; \ + else if (!(extended)) goto Failed; \ } while (0); -#include "../../../win32ss/include/imetable.h" +#include "imetable.h" #undef DEFINE_IME_ENTRY
if (!Imm32InquireIme(pImeDpi)) @@ -346,10 +346,7 @@ BOOL WINAPI ImmDisableLegacyIME(void) */ BOOL WINAPI CtfImmIsTextFrameServiceDisabled(VOID) { - PTEB pTeb = NtCurrentTeb(); - if (((PW32CLIENTINFO)pTeb->Win32ClientInfo)->CI_flags & CI_TFSDISABLED) - return TRUE; - return FALSE; + return !!(GetWin32ClientInfo()->CI_flags & CI_TFSDISABLED); }
/*********************************************************************** diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 383a395f15e..135b7afc6ee 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -1530,7 +1530,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: - //Imm32GenerateRandomSeed(hinstDLL, 1, lpReserved); // Non-sense if (!Imm32InitInstance(hinstDLL)) { ERR("Imm32InitInstance failed\n");