[ros-diffs] [reactos] 01/01: [IMM32] s/Imm32IsImmMode/IS_IMM_MODE/

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=356babcaf3726c0e8f261…

commit 356babcaf3726c0e8f2617c006650ff8a989753e
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Thu Jan 27 07:34:29 2022 +0900
Commit:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
CommitDate: Thu Jan 27 07:34:29 2022 +0900

    [IMM32] s/Imm32IsImmMode/IS_IMM_MODE/
    
    CORE-11700
---
 dll/win32/imm32/ime.c     |  2 +-
 dll/win32/imm32/imm.c     | 18 +++++++++---------
 dll/win32/imm32/precomp.h |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c
index 853951b352b..ef18b027a77 100644
--- a/dll/win32/imm32/ime.c
+++ b/dll/win32/imm32/ime.c
@@ -630,7 +630,7 @@ BOOL WINAPI ImmIsIME(HKL hKL)
  */
 HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd)
 {
-    if (!Imm32IsImmMode())
+    if (!IS_IMM_MODE())
         return NULL;
 
     if (hWnd == NULL)
diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c
index b965e0d3093..dc0d19ecf1f 100644
--- a/dll/win32/imm32/imm.c
+++ b/dll/win32/imm32/imm.c
@@ -235,7 +235,7 @@ VOID APIENTRY Imm32SelectLayout(HKL hNewKL, HKL hOldKL, HIMC hIMC)
 
     if (CtfImmIsTextFrameServiceDisabled())
     {
-        if (Imm32IsImmMode() && !Imm32IsCiceroMode())
+        if (IS_IMM_MODE() && !Imm32IsCiceroMode())
         {
             bIsNewHKLIme = IS_IME_HKL(hNewKL);
             bIsOldHKLIme = IS_IME_HKL(hOldKL);
@@ -503,7 +503,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC)
 
     TRACE("(%p, %p)\n", hWnd, hIMC);
 
-    if (!Imm32IsImmMode())
+    if (!IS_IMM_MODE())
         return NULL;
 
     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);
 
-    if (!Imm32IsImmMode())
+    if (!IS_IMM_MODE())
         return FALSE;
 
     if (hIMC && !(dwFlags & IACE_DEFAULT) &&
Imm32IsCrossThreadAccess(hIMC))
@@ -590,7 +590,7 @@ HIMC WINAPI ImmCreateContext(void)
 
     TRACE("()\n");
 
-    if (!Imm32IsImmMode())
+    if (!IS_IMM_MODE())
         return NULL;
 
     pClientImc = Imm32HeapAlloc(HEAP_ZERO_MEMORY, sizeof(CLIENTIMC));
@@ -637,7 +637,7 @@ BOOL APIENTRY Imm32CleanupContext(HIMC hIMC, HKL hKL, BOOL bKeep)
     PCLIENTIMC pClientImc;
     PIMC pIMC;
 
-    if (!Imm32IsImmMode() || hIMC == NULL)
+    if (!IS_IMM_MODE() || hIMC == NULL)
         return FALSE;
 
     pIMC = ValidateHandleNoErr(hIMC, TYPE_INPUTCONTEXT);
@@ -888,7 +888,7 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC)
 
     TRACE("(%p)\n", hIMC);
 
-    if (!Imm32IsImmMode())
+    if (!IS_IMM_MODE())
         return FALSE;
 
     if (Imm32IsCrossThreadAccess(hIMC))
@@ -972,7 +972,7 @@ static HIMC APIENTRY Imm32GetContextEx(HWND hWnd, DWORD
dwContextFlags)
     PCLIENTIMC pClientImc;
     PWND pWnd;
 
-    if (!Imm32IsImmMode())
+    if (!IS_IMM_MODE())
         return NULL;
 
     if (!hWnd)
@@ -1141,7 +1141,7 @@ BOOL WINAPI ImmSetActiveContext(HWND hWnd, HIMC hIMC, BOOL fActive)
 
     TRACE("(%p, %p, %d)\n", hWnd, hIMC, fActive);
 
-    if (!Imm32IsImmMode())
+    if (!IS_IMM_MODE())
         return FALSE;
 
     pClientImc = ImmLockClientImc(hIMC);
@@ -1264,7 +1264,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID
lpReserved)
             break;
 
         case DLL_THREAD_DETACH:
-            if (!Imm32IsImmMode())
+            if (!IS_IMM_MODE())
                 return TRUE;
 
             pTeb = NtCurrentTeb();
diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h
index 4cd92e5e09d..a7a3b3c904a 100644
--- a/dll/win32/imm32/precomp.h
+++ b/dll/win32/imm32/precomp.h
@@ -111,7 +111,7 @@ static inline BOOL Imm32IsCrossProcessAccess(HWND hWnd)
 BOOL WINAPI Imm32IsImcAnsi(HIMC hIMC);
 
 #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 Imm32Is16BitMode()          (GetWin32ClientInfo()->dwTIFlags & TIF_16BIT)