Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 20:43:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

[IMM32] s/Imm32IsImmMode/IS_IMM_MODE/

Browse source 
CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2022-01-27 07:34:29 +09:00
parent fc62d268d2
commit 356babcaf3
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -630,7 +630,7 @@ BOOL WINAPI ImmIsIME(HKL hKL)
*/ */
HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd)
{ {
if (!Imm32IsImmMode()) if (!IS_IMM_MODE())
return NULL; return NULL;
if (hWnd == NULL) if (hWnd == NULL)

18
dll/win32/imm32/imm.c
View file

@ -235,7 +235,7 @@ VOID APIENTRY Imm32SelectLayout(HKL hNewKL, HKL hOldKL, HIMC hIMC)
if (CtfImmIsTextFrameServiceDisabled()) if (CtfImmIsTextFrameServiceDisabled())
{ {
if (Imm32IsImmMode() && !Imm32IsCiceroMode()) if (IS_IMM_MODE() && !Imm32IsCiceroMode())
{ {
bIsNewHKLIme = IS_IME_HKL(hNewKL); bIsNewHKLIme = IS_IME_HKL(hNewKL);
bIsOldHKLIme = IS_IME_HKL(hOldKL); bIsOldHKLIme = IS_IME_HKL(hOldKL);
@ -503,7 +503,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC)
TRACE("(%p, %p)\n", hWnd, hIMC); TRACE("(%p, %p)\n", hWnd, hIMC);
if (!Imm32IsImmMode()) if (!IS_IMM_MODE())
return NULL; return NULL;
pWnd = ValidateHwndNoErr(hWnd); pWnd = ValidateHwndNoErr(hWnd);
@ -545,7 +545,7 @@ BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags)
TRACE("(%p, %p, 0x%lX)\n", hWnd, hIMC, dwFlags); TRACE("(%p, %p, 0x%lX)\n", hWnd, hIMC, dwFlags);
if (!Imm32IsImmMode()) if (!IS_IMM_MODE())
return FALSE; return FALSE;
if (hIMC && !(dwFlags & IACE_DEFAULT) && Imm32IsCrossThreadAccess(hIMC)) if (hIMC && !(dwFlags & IACE_DEFAULT) && Imm32IsCrossThreadAccess(hIMC))
@ -590,7 +590,7 @@ HIMC WINAPI ImmCreateContext(void)
TRACE("()\n"); TRACE("()\n");
if (!Imm32IsImmMode()) if (!IS_IMM_MODE())
return NULL; return NULL;
pClientImc = Imm32HeapAlloc(HEAP_ZERO_MEMORY, sizeof(CLIENTIMC)); pClientImc = Imm32HeapAlloc(HEAP_ZERO_MEMORY, sizeof(CLIENTIMC));
@ -637,7 +637,7 @@ BOOL APIENTRY Imm32CleanupContext(HIMC hIMC, HKL hKL, BOOL bKeep)
PCLIENTIMC pClientImc; PCLIENTIMC pClientImc;
PIMC pIMC; PIMC pIMC;
if (!Imm32IsImmMode() || hIMC == NULL) if (!IS_IMM_MODE() || hIMC == NULL)
return FALSE; return FALSE;
pIMC = ValidateHandleNoErr(hIMC, TYPE_INPUTCONTEXT); pIMC = ValidateHandleNoErr(hIMC, TYPE_INPUTCONTEXT);
@ -888,7 +888,7 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC)
TRACE("(%p)\n", hIMC); TRACE("(%p)\n", hIMC);
if (!Imm32IsImmMode()) if (!IS_IMM_MODE())
return FALSE; return FALSE;
if (Imm32IsCrossThreadAccess(hIMC)) if (Imm32IsCrossThreadAccess(hIMC))
@ -972,7 +972,7 @@ static HIMC APIENTRY Imm32GetContextEx(HWND hWnd, DWORD dwContextFlags)
PCLIENTIMC pClientImc; PCLIENTIMC pClientImc;
PWND pWnd; PWND pWnd;
if (!Imm32IsImmMode()) if (!IS_IMM_MODE())
return NULL; return NULL;
if (!hWnd) if (!hWnd)
@ -1141,7 +1141,7 @@ BOOL WINAPI ImmSetActiveContext(HWND hWnd, HIMC hIMC, BOOL fActive)
TRACE("(%p, %p, %d)\n", hWnd, hIMC, fActive); TRACE("(%p, %p, %d)\n", hWnd, hIMC, fActive);
if (!Imm32IsImmMode()) if (!IS_IMM_MODE())
return FALSE; return FALSE;
pClientImc = ImmLockClientImc(hIMC); pClientImc = ImmLockClientImc(hIMC);
@ -1264,7 +1264,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
break; break;
case DLL_THREAD_DETACH: case DLL_THREAD_DETACH:
if (!Imm32IsImmMode()) if (!IS_IMM_MODE())
return TRUE; return TRUE;
pTeb = NtCurrentTeb(); pTeb = NtCurrentTeb();

2
dll/win32/imm32/precomp.h
View file

@ -111,7 +111,7 @@ static inline BOOL Imm32IsCrossProcessAccess(HWND hWnd)
BOOL WINAPI Imm32IsImcAnsi(HIMC hIMC); BOOL WINAPI Imm32IsImcAnsi(HIMC hIMC);
#define ImeDpi_IsUnicode(pImeDpi) ((pImeDpi)->ImeInfo.fdwProperty & IME_PROP_UNICODE) #define ImeDpi_IsUnicode(pImeDpi) ((pImeDpi)->ImeInfo.fdwProperty & IME_PROP_UNICODE)
#define Imm32IsImmMode() (g_psi && (g_psi->dwSRVIFlags & SRVINFO_IMM32)) #define IS_IMM_MODE() (g_psi && (g_psi->dwSRVIFlags & SRVINFO_IMM32))
#define Imm32IsCiceroMode() (g_psi && (g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) #define Imm32IsCiceroMode() (g_psi && (g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED))
#define Imm32Is16BitMode() (GetWin32ClientInfo()->dwTIFlags & TIF_16BIT) #define Imm32Is16BitMode() (GetWin32ClientInfo()->dwTIFlags & TIF_16BIT)