Rémi Bernon : imm32/tests: Init INPUTCONTEXT status in ImeSelect.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7d03937abe899db810c983779f2566b94d787e8a
URL:    https://gitlab.winehq.org/wine/wine/-/commit/7d03937abe899db810c983779f2566b...

Author: Rémi Bernon 
Date:   Fri Mar 31 11:32:52 2023 +0200

imm32/tests: Init INPUTCONTEXT status in ImeSelect.

---

dlls/imm32/tests/imm32.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index 5a1ce4accb4..134dc57212e 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -2485,6 +2485,7 @@ static void test_ImmDisableIME(void)

#define ime_trace( msg, ... ) if (winetest_debug > 1) trace( "%04lx:%s " msg, GetCurrentThreadId(), __func__, ## __VA_ARGS__ )

+static BOOL ImeSelect_init_status;
 static BOOL todo_ImeInquire;
 DEFINE_EXPECT( ImeInquire );
 static BOOL todo_ImeDestroy;
@@ -2907,8 +2908,21 @@ static BOOL WINAPI ime_ImeSelect( HIMC himc, BOOL select )
         .hkl = GetKeyboardLayout( 0 ), .himc = himc,
         .func = IME_SELECT, .select = select
     };
+    INPUTCONTEXT *ctx;
+
     ime_trace( "himc %p, select %d\n", himc, select );
     ime_calls[ime_call_count++] = call;
+
+    if (ImeSelect_init_status && select)
+    {
+        ctx = ImmLockIMC( himc );
+        ok_ne( NULL, ctx, INPUTCONTEXT *, "%p" );
+        ctx->fOpen = ~0;
+        ctx->fdwConversion = ~0;
+        ctx->fdwSentence = ~0;
+        ImmUnlockIMC( himc );
+    }
+
     return TRUE;
 }

@@ -4308,10 +4322,15 @@ static void test_ImmActivateLayout(void)
             .func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_OPENSTATUSWINDOW},
             .todo = TRUE,
         },
+        {
+            .hkl = expect_ime, .himc = default_himc,
+            .func = MSG_IME_UI, .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_SETCONVERSIONMODE},
-            .todo = TRUE, .broken = (default_hkl == (HKL)0x04120412),
+            .todo = TRUE,
         },
         {
             .hkl = expect_ime, .himc = default_himc,
@@ -4776,6 +4795,7 @@ START_TEST(imm32)
     /* test these first to sanitize conversion / open statuses */
     test_ImmSetConversionStatus();
     test_ImmSetOpenStatus();
+    ImeSelect_init_status = TRUE;

test_ImmActivateLayout();
     test_ImmCreateInputContext();