From 35d30ec5fe7335222bf9d7bd227addcd0f72251e Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Mon, 23 Mar 2026 23:28:58 +0900
Subject: [PATCH] [IMM32] ImmSetConversionStatus: Check
 IS_CICERO_COMPAT_DISABLED (#8760)

Improve IME compatibility.
JIRA issue: CORE-19268
- Check IS_CICERO_COMPAT_DISABLED's
  value.
- Initialize dwOldConversion and
  dwOldSentence variables.
---
 win32ss/user/imm32/ime.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/win32ss/user/imm32/ime.c b/win32ss/user/imm32/ime.c
index 01fb8ab97e3..51bdd39d47d 100644
--- a/win32ss/user/imm32/ime.c
+++ b/win32ss/user/imm32/ime.c
@@ -1538,14 +1538,14 @@ ImmSetConversionStatus(
 {
     HKL hKL;
     LPINPUTCONTEXT pIC;
-    DWORD dwOldConversion, dwOldSentence;
+    DWORD dwOldConversion = fdwConversion, dwOldSentence = fdwSentence;
     BOOL fOpen = FALSE, fConversionChange = FALSE, fSentenceChange = FALSE, fUseCicero = FALSE;
     HWND hWnd;
 
     TRACE("(%p, 0x%lX, 0x%lX)\n", hIMC, fdwConversion, fdwSentence);
 
     hKL = GetKeyboardLayout(0);
-    if (!IS_IME_HKL(hKL) && IS_CICERO_MODE() && !IS_16BIT_MODE())
+    if (!IS_IME_HKL(hKL) && IS_CICERO_MODE() && !IS_16BIT_MODE() && !IS_CICERO_COMPAT_DISABLED())
         fUseCicero = TRUE;
 
     if (IS_CROSS_THREAD_HIMC(hIMC))