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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 374db20a5d011ad909a61d6857ead7a6261231ec
URL:    https://gitlab.winehq.org/wine/wine/-/commit/374db20a5d011ad909a61d6857ead7a...

Author: Rémi Bernon 
Date:   Mon Apr  3 17:39:21 2023 +0200

imm32: Use INPUTCONTEXT directly in ImmSetOpenStatus.

---

dlls/imm32/imm.c | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index 753213b623f..a17869a1c94 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -2605,30 +2605,27 @@ BOOL WINAPI ImmSetConversionStatus(
 /***********************************************************************
  *		ImmSetOpenStatus (IMM32.@)
  */
-BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen)
+BOOL WINAPI ImmSetOpenStatus( HIMC himc, BOOL status )
 {
-    struct imc *data = get_imc_data( hIMC );
+    INPUTCONTEXT *ctx;
     HWND ui_hwnd;

-    TRACE("%p %d\n", hIMC, fOpen);
-
-    if (!data)
-    {
-        SetLastError(ERROR_INVALID_HANDLE);
-        return FALSE;
-    }
+    TRACE( "himc %p, status %u\n", himc, status );

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

-    if ((ui_hwnd = get_ime_ui_window())) SetWindowLongPtrW( ui_hwnd, IMMGWL_IMC, (LONG_PTR)hIMC );
+    if ((ui_hwnd = get_ime_ui_window())) SetWindowLongPtrW( ui_hwnd, IMMGWL_IMC, (LONG_PTR)himc );

-    if (!fOpen != !data->IMC.fOpen)
+    if (!status != !ctx->fOpen)
     {
-        data->IMC.fOpen = fOpen;
-        ImmNotifyIME( hIMC, NI_CONTEXTUPDATED, 0, IMC_SETOPENSTATUS);
-        imc_notify_ime( data, IMN_SETOPENSTATUS, 0 );
+        ctx->fOpen = status;
+        ImmNotifyIME( himc, NI_CONTEXTUPDATED, 0, IMC_SETOPENSTATUS );
+        SendMessageW( ctx->hWnd, WM_IME_NOTIFY, IMN_SETOPENSTATUS, 0 );
     }

+    ImmUnlockIMC( himc );
+
     return TRUE;
 }