Skip to content

Commit 5d40ec3

Browse files
authored
[IMM32] ImeGetImeMenuItems is optional (reactos#8008)
Supporting old IMEs. JIRA issue: CORE-19268 Do null check of ImeGetImeMenuItems function of IME side, in ImmGetImeMenuItemsAW function.
1 parent eb9c664 commit 5d40ec3

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

dll/win32/imm32/imemenu.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,15 @@ ImmGetImeMenuItemsAW(
538538
return 0;
539539
}
540540

541+
/* ImeGetImeMenuItems is optional */
542+
if (!pImeDpi->ImeGetImeMenuItems)
543+
{
544+
WARN("ImeGetImeMenuItems is not available (optional).\n");
545+
ImmUnlockImeDpi(pImeDpi);
546+
ImmUnlockIMC(hIMC);
547+
return 0;
548+
}
549+
541550
/* Is the IME ANSI? */
542551
BOOL bImcIsAnsi = Imm32IsImcAnsi(hIMC);
543552

0 commit comments

Comments
 (0)