[PATCH 6/8] imm32: Avoid updating INPUTCONTEXT hWnd on ImmSetActiveContext deactivation.

[Byeong-Sik Jeon]

From: Byeong-Sik Jeon

---
 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 );