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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 048d2f0d13011cc2d4b574bb0e42f20126cfe2de
URL:    https://gitlab.winehq.org/wine/wine/-/commit/048d2f0d13011cc2d4b574bb0e42f20...

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

imm32: Use INPUTCONTEXT directly in ImmSetCompositionWindow.

---

 dlls/imm32/imm.c         | 39 ++++++++++++++++++++-------------------
 dlls/imm32/tests/imm32.c |  6 ++----
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index d29684f34a2..16c36c0173d 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -119,6 +119,14 @@ static struct list ime_list = LIST_INIT( ime_list );
 
 static const WCHAR layouts_formatW[] = L"System\\CurrentControlSet\\Control\\Keyboard Layouts\\%08lx";
 
+static const char *debugstr_composition( const COMPOSITIONFORM *composition )
+{
+    if (!composition) return "(null)";
+    return wine_dbg_sprintf( "style %#lx, pos %s, area %s", composition->dwStyle,
+                             wine_dbgstr_point( &composition->ptCurrentPos ),
+                             wine_dbgstr_rect( &composition->rcArea ) );
+}
+
 static BOOL ime_is_unicode( const struct ime *ime )
 {
     return !!(ime->info.fdwProperty & IME_PROP_UNICODE);
@@ -2595,28 +2603,19 @@ BOOL WINAPI ImmSetCompositionStringW(
 /***********************************************************************
  *		ImmSetCompositionWindow (IMM32.@)
  */
-BOOL WINAPI ImmSetCompositionWindow(
-  HIMC hIMC, LPCOMPOSITIONFORM lpCompForm)
+BOOL WINAPI ImmSetCompositionWindow( HIMC himc, COMPOSITIONFORM *composition )
 {
     BOOL reshow = FALSE;
-    struct imc *data = get_imc_data( hIMC );
+    INPUTCONTEXT *ctx;
     HWND ui_hwnd;
 
-    TRACE("(%p, %p)\n", hIMC, lpCompForm);
-    if (lpCompForm)
-        TRACE("\t%lx, %s, %s\n", lpCompForm->dwStyle,
-              wine_dbgstr_point(&lpCompForm->ptCurrentPos),
-              wine_dbgstr_rect(&lpCompForm->rcArea));
+    TRACE( "himc %p, composition %s\n", himc, debugstr_composition( composition ) );
 
-    if (!data)
-    {
-        SetLastError(ERROR_INVALID_HANDLE);
-        return FALSE;
-    }
-
-    if (NtUserQueryInputContext( hIMC, NtUserInputContextThreadId ) != GetCurrentThreadId()) return FALSE;
+    if (NtUserQueryInputContext( himc, NtUserInputContextThreadId ) != GetCurrentThreadId()) return FALSE;
+    if (!(ctx = ImmLockIMC( himc ))) return FALSE;
 
-    data->IMC.cfCompForm = *lpCompForm;
+    ctx->cfCompForm = *composition;
+    ctx->fdwInit |= INIT_COMPFORM;
 
     if ((ui_hwnd = get_ime_ui_window()) && IsWindowVisible( ui_hwnd ))
     {
@@ -2624,11 +2623,13 @@ BOOL WINAPI ImmSetCompositionWindow(
         ShowWindow( ui_hwnd, SW_HIDE );
     }
 
-    /* FIXME: this is a partial stub */
-
     if (ui_hwnd && reshow) ShowWindow( ui_hwnd, SW_SHOWNOACTIVATE );
 
-    imc_notify_ime( data, IMN_SETCOMPOSITIONWINDOW, 0 );
+    ImmNotifyIME( himc, NI_CONTEXTUPDATED, 0, IMC_SETCOMPOSITIONWINDOW );
+    SendMessageW( ctx->hWnd, WM_IME_NOTIFY, IMN_SETCOMPOSITIONWINDOW, 0 );
+
+    ImmUnlockIMC( himc );
+
     return TRUE;
 }
 
diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index ccdc6b8f801..45efd946d4e 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -6069,7 +6069,6 @@ static void test_ImmSetCompositionWindow(void)
         {
             .hkl = expect_ime, .himc = 0/*himc*/,
             .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0, .value = IMC_SETCOMPOSITIONWINDOW},
-            .todo = TRUE
         },
         {
             .hkl = expect_ime, .himc = default_himc,
@@ -6086,9 +6085,8 @@ static void test_ImmSetCompositionWindow(void)
         {
             .hkl = expect_ime, .himc = 0/*himc*/,
             .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0, .value = IMC_SETCOMPOSITIONWINDOW},
-            .todo = TRUE
         },
-        {.todo = TRUE},
+        {0},
     };
     COMPOSITIONFORM comp_form, expect_form =
     {
@@ -6136,7 +6134,7 @@ static void test_ImmSetCompositionWindow(void)
     memset( &comp_form, 0xcd, sizeof(comp_form) );
     ok_ret( 1, ImmSetCompositionWindow( himc, &comp_form ) );
     ok_seq( set_composition_window_0_seq );
-    todo_wine ok_eq( INIT_COMPFORM, ctx->fdwInit, UINT, "%u" );
+    ok_eq( INIT_COMPFORM, ctx->fdwInit, UINT, "%u" );
     check_composition_form( &ctx->cfCompForm, &comp_form );
 
     ok_ret( 1, ImmSetCompositionWindow( himc, &expect_form ) );