Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-30 02:58:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

[IMM32] Remove unnecessary NULL checks for function pointers

Browse source 
CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2022-09-08 09:57:17 +09:00
parent 8ba378c901
commit 020d7d582f
3 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -129,7 +129,6 @@ BOOL WINAPI CtfImmIsGuidMapEnable(HIMC hIMC)
if (!pImeDpi) if (!pImeDpi)
return ret; return ret;
if (pImeDpi->CtfImeIsGuidMapEnable)
ret = pImeDpi->CtfImeIsGuidMapEnable(hIMC); ret = pImeDpi->CtfImeIsGuidMapEnable(hIMC);
ImmUnlockImeDpi(pImeDpi); ImmUnlockImeDpi(pImeDpi);
@ -162,7 +161,6 @@ HRESULT WINAPI CtfImmGetGuidAtom(HIMC hIMC, DWORD dwUnknown, LPDWORD pdwGuidAtom
if (!pImeDpi) if (!pImeDpi)
return hr; return hr;
if (pImeDpi->CtfImeGetGuidAtom)
hr = pImeDpi->CtfImeGetGuidAtom(hIMC, dwUnknown, pdwGuidAtom); hr = pImeDpi->CtfImeGetGuidAtom(hIMC, dwUnknown, pdwGuidAtom);
ImmUnlockImeDpi(pImeDpi); ImmUnlockImeDpi(pImeDpi);

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

@ -59,7 +59,7 @@ BOOL APIENTRY Imm32InquireIme(PIMEDPI pImeDpi)
if (!pImeDpi->ImeInquire(pImeInfo, szUIClass, dwSysInfoFlags)) if (!pImeDpi->ImeInquire(pImeInfo, szUIClass, dwSysInfoFlags))
return FALSE; return FALSE;
} }
else if (IS_CICERO_MODE() && pImeDpi->CtfImeInquireExW) else if (IS_CICERO_MODE())
{ {
if (!pImeDpi->CtfImeInquireExW(pImeInfo, szUIClass, dwSysInfoFlags, pImeDpi->hKL)) if (!pImeDpi->CtfImeInquireExW(pImeInfo, szUIClass, dwSysInfoFlags, pImeDpi->hKL))
return FALSE; return FALSE;
@ -311,7 +311,7 @@ ImeDpi_Escape(PIMEDPI pImeDpi, HIMC hIMC, UINT uSubFunc, LPVOID lpData, HKL hKL)
if (IS_IME_HKL(hKL)) if (IS_IME_HKL(hKL))
return pImeDpi->ImeEscape(hIMC, uSubFunc, lpData); return pImeDpi->ImeEscape(hIMC, uSubFunc, lpData);
if (IS_CICERO_MODE() && pImeDpi->CtfImeEscapeEx) if (IS_CICERO_MODE())
return pImeDpi->CtfImeEscapeEx(hIMC, uSubFunc, lpData, hKL); return pImeDpi->CtfImeEscapeEx(hIMC, uSubFunc, lpData, hKL);
return 0; return 0;
@ -604,9 +604,6 @@ ImmGetImeMenuItemsAW(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID lpImeParentM
return 0; return 0;
} }
if (pImeDpi->ImeGetImeMenuItems == NULL)
goto Quit;
bImcIsAnsi = Imm32IsImcAnsi(hIMC); bImcIsAnsi = Imm32IsImcAnsi(hIMC);
if (bImcIsAnsi != bTargetIsAnsi) if (bImcIsAnsi != bTargetIsAnsi)

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

@ -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() && !IS_16BIT_MODE() && pOldImeDpi->CtfImeSelectEx) else if (IS_CICERO_MODE() && !IS_16BIT_MODE())
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() && !IS_16BIT_MODE() && pNewImeDpi->CtfImeSelectEx) else if (IS_CICERO_MODE() && !IS_16BIT_MODE())
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() && !IS_16BIT_MODE() && pNewImeDpi->CtfImeSelectEx) else if (IS_CICERO_MODE() && !IS_16BIT_MODE())
pNewImeDpi->CtfImeSelectEx(hIMC, TRUE, hNewKL); pNewImeDpi->CtfImeSelectEx(hIMC, TRUE, hNewKL);
pClientImc->hKL = hNewKL; pClientImc->hKL = hNewKL;
@ -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() && !IS_16BIT_MODE() && pImeDpi->CtfImeSelectEx) else if (IS_CICERO_MODE() && !IS_16BIT_MODE())
pImeDpi->CtfImeSelectEx(hIMC, TRUE, hKL); pImeDpi->CtfImeSelectEx(hIMC, TRUE, hKL);
} }