From 5d40ec3e8c3e1c2f696790b17ea9c82ff415f903 Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Mon, 19 May 2025 06:09:48 +0900
Subject: [PATCH] [IMM32] ImeGetImeMenuItems is optional (#8008)

Supporting old IMEs.
JIRA issue: CORE-19268
Do null check of ImeGetImeMenuItems
function of IME side, in
ImmGetImeMenuItemsAW function.
---
 dll/win32/imm32/imemenu.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dll/win32/imm32/imemenu.c b/dll/win32/imm32/imemenu.c
index 51d57941650..966b37af4ca 100644
--- a/dll/win32/imm32/imemenu.c
+++ b/dll/win32/imm32/imemenu.c
@@ -538,6 +538,15 @@ ImmGetImeMenuItemsAW(
         return 0;
     }
 
+    /* ImeGetImeMenuItems is optional */
+    if (!pImeDpi->ImeGetImeMenuItems)
+    {
+        WARN("ImeGetImeMenuItems is not available (optional).\n");
+        ImmUnlockImeDpi(pImeDpi);
+        ImmUnlockIMC(hIMC);
+        return 0;
+    }
+
     /* Is the IME ANSI? */
     BOOL bImcIsAnsi = Imm32IsImcAnsi(hIMC);