Rémi Bernon : imm32: Compare open status values in ImmSetOpenStatus.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 26d2d2c438d9e5f66212b22dc2d29b7881e9ad09
URL:    https://gitlab.winehq.org/wine/wine/-/commit/26d2d2c438d9e5f66212b22dc2d29b7...

Author: Rémi Bernon 
Date:   Thu Apr  6 00:54:42 2023 +0200

imm32: Compare open status values in ImmSetOpenStatus.

---

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

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index 81444ad420c..c99feb65a45 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -2688,7 +2688,7 @@ BOOL WINAPI ImmSetOpenStatus( HIMC himc, BOOL status )

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

-    if (!status != !ctx->fOpen)
+    if (status != ctx->fOpen)
     {
         ctx->fOpen = status;
         ImmNotifyIME( himc, NI_CONTEXTUPDATED, 0, IMC_SETOPENSTATUS );
diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index 88b167c701d..8c6d441181b 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -4399,7 +4399,6 @@ static void test_ImmSetOpenStatus(void)
         {
             .hkl = expect_ime, .himc = default_himc,
             .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0, .value = IMC_SETOPENSTATUS},
-            .todo = TRUE,
         },
         {0},
     };
@@ -4408,17 +4407,14 @@ static void test_ImmSetOpenStatus(void)
         {
             .hkl = expect_ime, .himc = default_himc,
             .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0, .value = IMC_SETOPENSTATUS},
-            .todo = TRUE,
         },
         {
             .hkl = expect_ime, .himc = default_himc,
             .func = MSG_TEST_WIN, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETOPENSTATUS},
-            .todo = TRUE,
         },
         {
             .hkl = expect_ime, .himc = default_himc,
             .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETOPENSTATUS},
-            .todo = TRUE,
         },
         {0},
     };
@@ -4483,8 +4479,8 @@ static void test_ImmSetOpenStatus(void)
     ok_seq( set_open_status_1_seq );

status = ImmGetOpenStatus( default_himc );
-    todo_wine ok_eq( 0xfeedcafe, status, UINT, "%#x" );
-    todo_wine ok_eq( 0xfeedcafe, ctx->fOpen, UINT, "%#x" );
+    ok_eq( 0xfeedcafe, status, UINT, "%#x" );
+    ok_eq( 0xfeedcafe, ctx->fOpen, UINT, "%#x" );

ctx->hWnd = hwnd;
     ok_seq( empty_sequence );
@@ -4492,15 +4488,15 @@ static void test_ImmSetOpenStatus(void)
     ok_seq( set_open_status_2_seq );

status = ImmGetOpenStatus( default_himc );
-    todo_wine ok_eq( ~0, status, UINT, "%#x" );
-    todo_wine ok_eq( ~0, ctx->fOpen, UINT, "%#x" );
+    ok_eq( ~0, status, UINT, "%#x" );
+    ok_eq( ~0, ctx->fOpen, UINT, "%#x" );

ok_ret( 1, ImmSetOpenStatus( default_himc, ~0 ) );
     ok_seq( empty_sequence );

status = ImmGetOpenStatus( default_himc );
-    todo_wine ok_eq( ~0, status, UINT, "%#x" );
-    todo_wine ok_eq( ~0, ctx->fOpen, UINT, "%#x" );
+    ok_eq( ~0, status, UINT, "%#x" );
+    ok_eq( ~0, ctx->fOpen, UINT, "%#x" );

/* status is cached between IME activations */