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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: cf03ab413383df151d82a573d5934e18c0889360
URL:    https://gitlab.winehq.org/wine/wine/-/commit/cf03ab413383df151d82a573d5934e1...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Thu Apr  6 01:11:14 2023 +0200

imm32: Use INPUTCONTEXT directly in ImmSetCandidateWindow.

---

 dlls/imm32/imm.c         | 42 +++++++++++++++++++-----------------------
 dlls/imm32/tests/imm32.c |  2 +-
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index 68196bf0149..aa63be82e4b 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -127,6 +127,14 @@ static const char *debugstr_composition( const COMPOSITIONFORM *composition )
                              wine_dbgstr_rect( &composition->rcArea ) );
 }
 
+static const char *debugstr_candidate( const CANDIDATEFORM *candidate )
+{
+    if (!candidate) return "(null)";
+    return wine_dbg_sprintf( "idx %#lx, style %#lx, pos %s, area %s", candidate->dwIndex,
+                             candidate->dwStyle, wine_dbgstr_point( &candidate->ptCurrentPos ),
+                             wine_dbgstr_rect( &candidate->rcArea ) );
+}
+
 static BOOL ime_is_unicode( const struct ime *ime )
 {
     return !!(ime->info.fdwProperty & IME_PROP_UNICODE);
@@ -827,13 +835,6 @@ static void imc_send_message( struct imc *imc, TRANSMSG *message )
     SendMessageW( target, message->message, message->wParam, message->lParam );
 }
 
-static LRESULT imc_notify_ime( struct imc *imc, WPARAM notify, LPARAM lparam )
-{
-    HWND target;
-    if (!(target = imc->IMC.hWnd) && !(target = GetFocus())) return 0;
-    return SendMessageW( target, WM_IME_NOTIFY, notify, lparam );
-}
-
 /***********************************************************************
  *		ImmSetActiveContext (IMM32.@)
  */
@@ -2429,29 +2430,24 @@ LRESULT WINAPI ImmRequestMessageW(HIMC hIMC, WPARAM wParam, LPARAM lParam)
 /***********************************************************************
  *		ImmSetCandidateWindow (IMM32.@)
  */
-BOOL WINAPI ImmSetCandidateWindow(
-  HIMC hIMC, LPCANDIDATEFORM lpCandidate)
+BOOL WINAPI ImmSetCandidateWindow( HIMC himc, CANDIDATEFORM *candidate )
 {
-    struct imc *data = get_imc_data( hIMC );
+    INPUTCONTEXT *ctx;
 
-    TRACE("(%p, %p)\n", hIMC, lpCandidate);
+    TRACE( "hwnd %p, candidate %s\n", himc, debugstr_candidate( candidate ) );
 
-    if (!data || !lpCandidate)
-        return FALSE;
+    if (!candidate) return FALSE;
+    if (candidate->dwIndex >= ARRAY_SIZE(ctx->cfCandForm)) return FALSE;
 
-    if (NtUserQueryInputContext( hIMC, NtUserInputContextThreadId ) != GetCurrentThreadId()) return FALSE;
+    if (NtUserQueryInputContext( himc, NtUserInputContextThreadId ) != GetCurrentThreadId()) return FALSE;
+    if (!(ctx = ImmLockIMC( himc ))) return FALSE;
 
-    TRACE("\t%lx, %lx, %s, %s\n",
-          lpCandidate->dwIndex, lpCandidate->dwStyle,
-          wine_dbgstr_point(&lpCandidate->ptCurrentPos),
-          wine_dbgstr_rect(&lpCandidate->rcArea));
+    ctx->cfCandForm[candidate->dwIndex] = *candidate;
 
-    if (lpCandidate->dwIndex >= ARRAY_SIZE(data->IMC.cfCandForm))
-        return FALSE;
+    ImmNotifyIME( himc, NI_CONTEXTUPDATED, 0, IMC_SETCANDIDATEPOS );
+    SendMessageW( ctx->hWnd, WM_IME_NOTIFY, IMN_SETCANDIDATEPOS, 1 << candidate->dwIndex );
 
-    data->IMC.cfCandForm[lpCandidate->dwIndex] = *lpCandidate;
-    ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCANDIDATEPOS);
-    imc_notify_ime( data, IMN_SETCANDIDATEPOS, 1 << lpCandidate->dwIndex );
+    ImmUnlockIMC( himc );
 
     return TRUE;
 }
diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index 3b8b4755080..cf6c521e52f 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -6442,7 +6442,7 @@ static void test_ImmSetCandidateWindow(void)
             .hkl = expect_ime, .himc = 0/*himc*/,
             .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0, .value = IMC_SETCANDIDATEPOS},
         },
-        {.todo = TRUE},
+        {0},
     };
     CANDIDATEFORM cand_form, expect_form =
     {