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

[IMM32] s/Imm32Is16BitMode/IS_16BIT_MODE/

Browse source 
CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2022-09-08 09:43:43 +09:00
parent 5b87c95e23
commit 8ba378c901
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dll/win32/imm32/ctf.c
View file

@ -116,7 +116,7 @@ BOOL WINAPI CtfImmIsGuidMapEnable(HIMC hIMC)
TRACE("(%p)\n", hIMC); TRACE("(%p)\n", hIMC);
if (!IS_CICERO_MODE() || Imm32Is16BitMode()) if (!IS_CICERO_MODE() || IS_16BIT_MODE())
return ret; return ret;
dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID);
@ -150,7 +150,7 @@ HRESULT WINAPI CtfImmGetGuidAtom(HIMC hIMC, DWORD dwUnknown, LPDWORD pdwGuidAtom
*pdwGuidAtom = 0; *pdwGuidAtom = 0;
if (!IS_CICERO_MODE() || Imm32Is16BitMode()) if (!IS_CICERO_MODE() || IS_16BIT_MODE())
return hr; return hr;
dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID);

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

@ -296,7 +296,7 @@ PIMEDPI APIENTRY Imm32FindOrLoadImeDpi(HKL hKL)
{ {
PIMEDPI pImeDpi; PIMEDPI pImeDpi;
if (!IS_IME_HKL(hKL) && (!IS_CICERO_MODE() || Imm32Is16BitMode())) if (!IS_IME_HKL(hKL) && (!IS_CICERO_MODE() || IS_16BIT_MODE()))
return NULL; return NULL;
pImeDpi = ImmLockImeDpi(hKL); pImeDpi = ImmLockImeDpi(hKL);
@ -886,7 +886,7 @@ ImmGetImeInfoEx(PIMEINFOEX pImeInfoEx, IMEINFOEXCLASS SearchType, PVOID pvSearch
if (!IS_IME_HKL(hKL)) if (!IS_IME_HKL(hKL))
{ {
if (!CtfImmIsTextFrameServiceDisabled() || if (!CtfImmIsTextFrameServiceDisabled() ||
!IS_CICERO_MODE() || Imm32Is16BitMode()) !IS_CICERO_MODE() || IS_16BIT_MODE())
{ {
return FALSE; return FALSE;
} }
@ -997,7 +997,7 @@ BOOL WINAPI ImmLoadIME(HKL hKL)
{ {
PIMEDPI pImeDpi; PIMEDPI pImeDpi;
if (!IS_IME_HKL(hKL) && (!IS_CICERO_MODE() || Imm32Is16BitMode())) if (!IS_IME_HKL(hKL) && (!IS_CICERO_MODE() || IS_16BIT_MODE()))
return FALSE; return FALSE;
pImeDpi = Imm32FindImeDpi(hKL); 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); TRACE("(%p, 0x%lX, 0x%lX)\n", hIMC, fdwConversion, fdwSentence);
hKL = GetKeyboardLayout(0); 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; fUseCicero = TRUE;
if (Imm32IsCrossThreadAccess(hIMC)) if (Imm32IsCrossThreadAccess(hIMC))

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

@ -62,7 +62,7 @@ BOOL WINAPI ImmLoadLayout(HKL hKL, PIMEINFOEX pImeInfoEx)
ZeroMemory(pImeInfoEx, sizeof(IMEINFOEX)); 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", StringCchPrintfW(szLayout, _countof(szLayout), L"%s\\%08lX",
REGKEY_KEYBOARD_LAYOUTS, HandleToUlong(hKL)); REGKEY_KEYBOARD_LAYOUTS, HandleToUlong(hKL));
@ -220,7 +220,7 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL hOldKL, HIMC hIMC)
{ {
if (IS_IME_HKL(hOldKL)) if (IS_IME_HKL(hOldKL))
pOldImeDpi->ImeSelect(hIMC, FALSE); 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); pOldImeDpi->CtfImeSelectEx(hIMC, FALSE, hOldKL);
} }
pClientImc->hKL = NULL; pClientImc->hKL = NULL;
@ -242,7 +242,7 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL hOldKL, HIMC hIMC)
{ {
if (IS_IME_HKL(hNewKL)) if (IS_IME_HKL(hNewKL))
pNewImeDpi->ImeSelect(hIMC, TRUE); 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); pNewImeDpi->CtfImeSelectEx(hIMC, TRUE, hNewKL);
pClientImc->hKL = hNewKL; pClientImc->hKL = hNewKL;
@ -389,7 +389,7 @@ VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL hOldKL, HIMC hIMC)
{ {
if (IS_IME_HKL(hNewKL)) if (IS_IME_HKL(hNewKL))
pNewImeDpi->ImeSelect(hIMC, TRUE); 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); pNewImeDpi->CtfImeSelectEx(hIMC, TRUE, hNewKL);
pClientImc->hKL = hNewKL; pClientImc->hKL = hNewKL;
@ -681,7 +681,7 @@ BOOL APIENTRY Imm32DestroyInputContext(HIMC hIMC, HKL hKL, BOOL bKeep)
{ {
if (IS_IME_HKL(hKL)) if (IS_IME_HKL(hKL))
pImeDpi->ImeSelect(hIMC, FALSE); pImeDpi->ImeSelect(hIMC, FALSE);
else if (IS_CICERO_MODE() && !Imm32Is16BitMode()) else if (IS_CICERO_MODE() && !IS_16BIT_MODE())
pImeDpi->CtfImeSelectEx(hIMC, FALSE, hKL); pImeDpi->CtfImeSelectEx(hIMC, FALSE, hKL);
ImmUnlockImeDpi(pImeDpi); ImmUnlockImeDpi(pImeDpi);
@ -781,7 +781,7 @@ Imm32CreateInputContext(HIMC hIMC, LPINPUTCONTEXT pIC, PCLIENTIMC pClientImc, HK
{ {
if (IS_IME_HKL(hKL)) if (IS_IME_HKL(hKL))
pImeDpi->ImeSelect(hIMC, TRUE); 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); pImeDpi->CtfImeSelectEx(hIMC, TRUE, hKL);
} }
@ -831,7 +831,7 @@ LPINPUTCONTEXT APIENTRY Imm32InternalLockIMC(HIMC hIMC, BOOL fSelect)
} }
dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); 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); hOldKL = GetKeyboardLayout(0);
LangID = LOWORD(hOldKL); LangID = LOWORD(hOldKL);
@ -1177,7 +1177,7 @@ BOOL WINAPI ImmSetActiveContext(HWND hWnd, HIMC hIMC, BOOL fActive)
hKL = GetKeyboardLayout(0); hKL = GetKeyboardLayout(0);
if (IS_CICERO_MODE() && !Imm32Is16BitMode()) if (IS_CICERO_MODE() && !IS_16BIT_MODE())
{ {
Imm32CiceroSetActiveContext(hIMC, fActive, hWnd, hKL); Imm32CiceroSetActiveContext(hIMC, fActive, hWnd, hKL);
hKL = GetKeyboardLayout(0); hKL = GetKeyboardLayout(0);

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

@ -114,7 +114,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 Imm32Is16BitMode() (GetWin32ClientInfo()->dwTIFlags & TIF_16BIT) #define IS_16BIT_MODE() (GetWin32ClientInfo()->dwTIFlags & TIF_16BIT)
DWORD APIENTRY DWORD APIENTRY
CandidateListWideToAnsi(const CANDIDATELIST *pWideCL, LPCANDIDATELIST pAnsiCL, DWORD dwBufLen, CandidateListWideToAnsi(const CANDIDATELIST *pWideCL, LPCANDIDATELIST pAnsiCL, DWORD dwBufLen,