Rémi Bernon : imm32: Use INPUTCONTEXT directly in ImmSetConversionStatus.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1cd71e92be6ed57621ea545fcfbd46da7cfe7b58
URL:    https://gitlab.winehq.org/wine/wine/-/commit/1cd71e92be6ed57621ea545fcfbd46d...

Author: Rémi Bernon 
Date:   Thu Apr  6 01:01:37 2023 +0200

imm32: Use INPUTCONTEXT directly in ImmSetConversionStatus.

---

dlls/imm32/imm.c         | 41 +++++++++++++++++++----------------------
 dlls/imm32/tests/imm32.c |  1 -
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index b2dc58a95ab..d29684f34a2 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -2635,37 +2635,34 @@ BOOL WINAPI ImmSetCompositionWindow(
 /***********************************************************************
  *		ImmSetConversionStatus (IMM32.@)
  */
-BOOL WINAPI ImmSetConversionStatus(
-  HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence)
+BOOL WINAPI ImmSetConversionStatus( HIMC himc, DWORD conversion, DWORD sentence )
 {
-    DWORD oldConversion, oldSentence;
-    struct imc *data = get_imc_data( hIMC );
-
-    TRACE("%p %ld %ld\n", hIMC, fdwConversion, fdwSentence);
+    DWORD old_conversion, old_sentence;
+    INPUTCONTEXT *ctx;

-    if (!data)
-    {
-        SetLastError(ERROR_INVALID_HANDLE);
-        return FALSE;
-    }
+    TRACE( "himc %p, conversion %#lx, sentence %#lx\n", himc, conversion, sentence );

-    if (NtUserQueryInputContext( hIMC, NtUserInputContextThreadId ) != GetCurrentThreadId()) return FALSE;
+    if (NtUserQueryInputContext( himc, NtUserInputContextThreadId ) != GetCurrentThreadId()) return FALSE;
+    if (!(ctx = ImmLockIMC( himc ))) return FALSE;

-    if ( fdwConversion != data->IMC.fdwConversion )
+    if (conversion != ctx->fdwConversion)
     {
-        oldConversion = data->IMC.fdwConversion;
-        data->IMC.fdwConversion = fdwConversion;
-        ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, oldConversion, IMC_SETCONVERSIONMODE);
-        imc_notify_ime( data, IMN_SETCONVERSIONMODE, 0 );
+        old_conversion = ctx->fdwConversion;
+        ctx->fdwConversion = conversion;
+        ImmNotifyIME( himc, NI_CONTEXTUPDATED, old_conversion, IMC_SETCONVERSIONMODE );
+        SendMessageW( ctx->hWnd, WM_IME_NOTIFY, IMN_SETCONVERSIONMODE, 0 );
     }
-    if ( fdwSentence != data->IMC.fdwSentence )
+
+    if (sentence != ctx->fdwSentence)
     {
-        oldSentence = data->IMC.fdwSentence;
-        data->IMC.fdwSentence = fdwSentence;
-        ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, oldSentence, IMC_SETSENTENCEMODE);
-        imc_notify_ime( data, IMN_SETSENTENCEMODE, 0 );
+        old_sentence = ctx->fdwSentence;
+        ctx->fdwSentence = sentence;
+        ImmNotifyIME( himc, NI_CONTEXTUPDATED, old_sentence, IMC_SETSENTENCEMODE );
+        SendMessageW( ctx->hWnd, WM_IME_NOTIFY, IMN_SETSENTENCEMODE, 0 );
     }

+    ImmUnlockIMC( himc );
+
     return TRUE;
 }

diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index 8c6d441181b..bbfae7e65d1 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -4219,7 +4219,6 @@ static void test_ImmSetConversionStatus(void)
             .hkl = expect_ime, .himc = default_himc,
             .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0xdeadbeef, .value = IMC_SETCONVERSIONMODE},
         },
-        {.todo = TRUE}, /* spurious calls */
         {0},
     };
     const struct ime_call set_conversion_status_2_seq[] =