[IMM32] Trivial tiny improvements

CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2021-09-27 09:37:14 +09:00
parent b3382d8d24
commit a415bd46b1
2 changed files with 3 additions and 7 deletions

View file

@ -172,9 +172,9 @@ BOOL APIENTRY Imm32LoadImeInfo(PIMEINFOEX pImeInfoEx, PIMEDPI pImeDpi)
do { \ do { \
fn = GetProcAddress(hIME, #name); \ fn = GetProcAddress(hIME, #name); \
if (fn) pImeDpi->name = (FN_##name)fn; \ if (fn) pImeDpi->name = (FN_##name)fn; \
else if (!extended) goto Failed; \ else if (!(extended)) goto Failed; \
} while (0); } while (0);
#include "../../../win32ss/include/imetable.h" #include "imetable.h"
#undef DEFINE_IME_ENTRY #undef DEFINE_IME_ENTRY
if (!Imm32InquireIme(pImeDpi)) if (!Imm32InquireIme(pImeDpi))
@ -346,10 +346,7 @@ BOOL WINAPI ImmDisableLegacyIME(void)
*/ */
BOOL WINAPI CtfImmIsTextFrameServiceDisabled(VOID) BOOL WINAPI CtfImmIsTextFrameServiceDisabled(VOID)
{ {
PTEB pTeb = NtCurrentTeb(); return !!(GetWin32ClientInfo()->CI_flags & CI_TFSDISABLED);
if (((PW32CLIENTINFO)pTeb->Win32ClientInfo)->CI_flags & CI_TFSDISABLED)
return TRUE;
return FALSE;
} }
/*********************************************************************** /***********************************************************************

View file

@ -1530,7 +1530,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
switch (fdwReason) switch (fdwReason)
{ {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:
//Imm32GenerateRandomSeed(hinstDLL, 1, lpReserved); // Non-sense
if (!Imm32InitInstance(hinstDLL)) if (!Imm32InitInstance(hinstDLL))
{ {
ERR("Imm32InitInstance failed\n"); ERR("Imm32InitInstance failed\n");