Byeong-Sik Jeon : imm32: Avoid updating INPUTCONTEXT hWnd on ImmSetActiveContext deactivation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 93e5d7b317e9a9dc90a95dc731e5e07e8b1ec776
URL:    https://gitlab.winehq.org/wine/wine/-/commit/93e5d7b317e9a9dc90a95dc731e5e07...

Author: Byeong-Sik Jeon <bsjeon(a)hanmail.net>
Date:   Mon Apr 17 10:10:28 2023 +0200

imm32: Avoid updating INPUTCONTEXT hWnd on ImmSetActiveContext deactivation.

---

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

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index 5a32138561c..2fd247f36c7 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -852,7 +852,7 @@ BOOL WINAPI ImmSetActiveContext(HWND hwnd, HIMC himc, BOOL activate)
 
     if (data)
     {
-        data->IMC.hWnd = activate ? hwnd : NULL;
+        if (activate) data->IMC.hWnd = hwnd;
         if ((ime = imc_select_ime( data ))) ime->pImeSetActiveContext( himc, activate );
     }
 
diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index d9f8c7c446a..92b59b7d005 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -5314,7 +5314,7 @@ static void test_ImmSetActiveContext(void)
 
     ctx->hWnd = (HWND)0xdeadbeef;
     ok_ret( 1, ImmSetActiveContext( hwnd, himc, FALSE ) );
-    todo_wine ok_eq( (HWND)0xdeadbeef, ctx->hWnd, HWND, "%p" );
+    ok_eq( (HWND)0xdeadbeef, ctx->hWnd, HWND, "%p" );
     deactivate_2_seq[0].himc = himc;
     ok_seq( deactivate_2_seq );