https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ba378c9015f95d2e5c1422bfc68f0a08cdb2573
commit 8ba378c9015f95d2e5c1422bfc68f0a08cdb2573
Author: Katayama Hirofumi MZ <katayama.hirofumi...@gmail.com>
AuthorDate: Thu Sep 8 09:43:43 2022 +0900
Commit: Katayama Hirofumi MZ <katayama.hirofumi...@gmail.com>
CommitDate: Thu Sep 8 09:43:43 2022 +0900
[IMM32] s/Imm32Is16BitMode/IS_16BIT_MODE/
CORE-11700
---
dll/win32/imm32/ctf.c | 4 ++--
dll/win32/imm32/ime.c | 8 ++++----
dll/win32/imm32/imm.c | 16 ++++++++--------
dll/win32/imm32/precomp.h | 2 +-
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dll/win32/imm32/ctf.c b/dll/win32/imm32/ctf.c
index ecab88a5198..7f5268bffe9 100644
--- a/dll/win32/imm32/ctf.c
+++ b/dll/win32/imm32/ctf.c
@@ -116,7 +116,7 @@ BOOL WINAPI CtfImmIsGuidMapEnable(HIMC hIMC)
TRACE("(%p)\n", hIMC);
- if (!IS_CICERO_MODE() || Imm32Is16BitMode())
+ if (!IS_CICERO_MODE() || IS_16BIT_MODE())
return ret;
dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID);
@@ -150,7 +150,7 @@ HRESULT WINAPI CtfImmGetGuidAtom(HIMC hIMC, DWORD
dwUnknown, LPDWORD pdwGuidAtom
*pdwGuidAtom = 0;
- if (!IS_CICERO_MODE() || Imm32Is16BitMode())
+ if (!IS_CICERO_MODE() || IS_16BIT_MODE())
return hr;
dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID);
diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c
index 1b2b0c66c2d..30cd10b7658 100644
--- a/dll/win32/imm32/ime.c
+++ b/dll/win32/imm32/ime.c
@@ -296,7 +296,7 @@ PIMEDPI APIENTRY Imm32FindOrLoadImeDpi(HKL hKL)
{
PIMEDPI pImeDpi;
- if (!IS_IME_HKL(hKL) && (!IS_CICERO_MODE() || Imm32Is16BitMode()))
+ if (!IS_IME_HKL(hKL) && (!IS_CICERO_MODE() || IS_16BIT_MODE()))
return NULL;
pImeDpi = ImmLockImeDpi(hKL);
@@ -886,7 +886,7 @@ ImmGetImeInfoEx(PIMEINFOEX pImeInfoEx, IMEINFOEXCLASS
SearchType, PVOID pvSearch
if (!IS_IME_HKL(hKL))
{
if (!CtfImmIsTextFrameServiceDisabled() ||
- !IS_CICERO_MODE() || Imm32Is16BitMode())
+ !IS_CICERO_MODE() || IS_16BIT_MODE())
{
return FALSE;
}
@@ -997,7 +997,7 @@ BOOL WINAPI ImmLoadIME(HKL hKL)
{
PIMEDPI pImeDpi;
- if (!IS_IME_HKL(hKL) && (!IS_CICERO_MODE() || Imm32Is16BitMode()))
+ if (!IS_IME_HKL(hKL) && (!IS_CICERO_MODE() || IS_16BIT_MODE()))
return FALSE;
pImeDpi = Imm32FindImeDpi(hKL);
@@ -1825,7 +1825,7 @@ BOOL WINAPI ImmSetConversionStatus(HIMC hIMC, DWORD
fdwConversion, DWORD fdwSent
TRACE("(%p, 0x%lX, 0x%lX)\n", hIMC, fdwConversion, fdwSentence);
hKL = GetKeyboardLayout(0);
- if (!IS_IME_HKL(hKL) && IS_CICERO_MODE() && !Imm32Is16BitMode())
+ if (!IS_IME_HKL(hKL) && IS_CICERO_MODE() && !IS_16BIT_MODE())
fUseCicero = TRUE;
if (Imm32IsCrossThreadAccess(hIMC))
diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c
index b5f288bfa5b..9cc21e111c3 100644
--- a/dll/win32/imm32/imm.c
+++ b/dll/win32/imm32/imm.c
@@ -62,7 +62,7 @@ BOOL WINAPI ImmLoadLayout(HKL hKL, PIMEINFOEX pImeInfoEx)
ZeroMemory(pImeInfoEx, sizeof(IMEINFOEX));
- if (IS_IME_HKL(hKL) || !IS_CICERO_MODE() || Imm32Is16BitMode())
+ if (IS_IME_HKL(hKL) || !IS_CICERO_MODE() || IS_16BIT_MODE())
{
StringCchPrintfW(szLayout, _countof(szLayout), L"%s\\%08lX",
REGKEY_KEYBOARD_LAYOUTS, HandleToUlong(hKL));
@@ -220,7 +220,7 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL
hOldKL, HIMC hIMC)
{
if (IS_IME_HKL(hOldKL))
pOldImeDpi->ImeSelect(hIMC, FALSE);
- else if (IS_CICERO_MODE() && !Imm32Is16BitMode() &&
pOldImeDpi->CtfImeSelectEx)
+ else if (IS_CICERO_MODE() && !IS_16BIT_MODE() &&
pOldImeDpi->CtfImeSelectEx)
pOldImeDpi->CtfImeSelectEx(hIMC, FALSE, hOldKL);
}
pClientImc->hKL = NULL;
@@ -242,7 +242,7 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL
hOldKL, HIMC hIMC)
{
if (IS_IME_HKL(hNewKL))
pNewImeDpi->ImeSelect(hIMC, TRUE);
- else if (IS_CICERO_MODE() && !Imm32Is16BitMode() &&
pNewImeDpi->CtfImeSelectEx)
+ else if (IS_CICERO_MODE() && !IS_16BIT_MODE() &&
pNewImeDpi->CtfImeSelectEx)
pNewImeDpi->CtfImeSelectEx(hIMC, TRUE, hNewKL);
pClientImc->hKL = hNewKL;
@@ -389,7 +389,7 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL
hOldKL, HIMC hIMC)
{
if (IS_IME_HKL(hNewKL))
pNewImeDpi->ImeSelect(hIMC, TRUE);
- else if (IS_CICERO_MODE() && !Imm32Is16BitMode() &&
pNewImeDpi->CtfImeSelectEx)
+ else if (IS_CICERO_MODE() && !IS_16BIT_MODE() &&
pNewImeDpi->CtfImeSelectEx)
pNewImeDpi->CtfImeSelectEx(hIMC, TRUE, hNewKL);
pClientImc->hKL = hNewKL;
@@ -681,7 +681,7 @@ BOOL APIENTRY Imm32DestroyInputContext(HIMC hIMC, HKL hKL,
BOOL bKeep)
{
if (IS_IME_HKL(hKL))
pImeDpi->ImeSelect(hIMC, FALSE);
- else if (IS_CICERO_MODE() && !Imm32Is16BitMode())
+ else if (IS_CICERO_MODE() && !IS_16BIT_MODE())
pImeDpi->CtfImeSelectEx(hIMC, FALSE, hKL);
ImmUnlockImeDpi(pImeDpi);
@@ -781,7 +781,7 @@ Imm32CreateInputContext(HIMC hIMC, LPINPUTCONTEXT pIC,
PCLIENTIMC pClientImc, HK
{
if (IS_IME_HKL(hKL))
pImeDpi->ImeSelect(hIMC, TRUE);
- else if (IS_CICERO_MODE() && !Imm32Is16BitMode() &&
pImeDpi->CtfImeSelectEx)
+ else if (IS_CICERO_MODE() && !IS_16BIT_MODE() &&
pImeDpi->CtfImeSelectEx)
pImeDpi->CtfImeSelectEx(hIMC, TRUE, hKL);
}
@@ -831,7 +831,7 @@ LPINPUTCONTEXT APIENTRY Imm32InternalLockIMC(HIMC hIMC,
BOOL fSelect)
}
dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID);
- if (dwThreadId == GetCurrentThreadId() && IS_CICERO_MODE() &&
!Imm32Is16BitMode())
+ if (dwThreadId == GetCurrentThreadId() && IS_CICERO_MODE() &&
!IS_16BIT_MODE())
{
hOldKL = GetKeyboardLayout(0);
LangID = LOWORD(hOldKL);
@@ -1177,7 +1177,7 @@ BOOL WINAPI ImmSetActiveContext(HWND hWnd, HIMC hIMC,
BOOL fActive)
hKL = GetKeyboardLayout(0);
- if (IS_CICERO_MODE() && !Imm32Is16BitMode())
+ if (IS_CICERO_MODE() && !IS_16BIT_MODE())
{
Imm32CiceroSetActiveContext(hIMC, fActive, hWnd, hKL);
hKL = GetKeyboardLayout(0);
diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h
index 5c693eab26f..ca8da55a108 100644
--- a/dll/win32/imm32/precomp.h
+++ b/dll/win32/imm32/precomp.h
@@ -114,7 +114,7 @@ static inline BOOL Imm32IsCrossProcessAccess(HWND hWnd)
BOOL WINAPI Imm32IsImcAnsi(HIMC hIMC);
#define ImeDpi_IsUnicode(pImeDpi) ((pImeDpi)->ImeInfo.fdwProperty &
IME_PROP_UNICODE)
-#define Imm32Is16BitMode() (GetWin32ClientInfo()->dwTIFlags &
TIF_16BIT)
+#define IS_16BIT_MODE() (GetWin32ClientInfo()->dwTIFlags &
TIF_16BIT)
DWORD APIENTRY
CandidateListWideToAnsi(const CANDIDATELIST *pWideCL, LPCANDIDATELIST pAnsiCL,
DWORD dwBufLen,
