[PATCH 0/2] MR2454: imm32/tests: Fix some test failures on Windows with Korean locale.

[Rémi Bernon]

Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54710
Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54711

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2454

[PATCH 1/2] imm32/tests: Remove GetLastError check on default IME ImmEscape tests.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54710
---
 dlls/imm32/tests/imm32.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index 6f98fb4f645..254b897f3cc 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -3321,11 +3321,8 @@ static void test_ImmEscape( BOOL unicode )
 
     winetest_push_context( unicode ? "unicode" : "ansi" );
 
-    SetLastError( 0xdeadbeef );
     ok_ret( 0, ImmEscapeW( hkl, 0, 0, NULL ) );
     ok_ret( 0, ImmEscapeA( hkl, 0, 0, NULL ) );
-    todo_wine
-    ok_ret( 0xdeadbeef, GetLastError() );
 
     /* IME_PROP_END_UNLOAD for the IME to unload / reload. */
     ime_info.fdwProperty = IME_PROP_END_UNLOAD;
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2454

[PATCH 2/2] imm32/tests: Update ImmGetProperty expectations for Korean locale.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54711
---
 dlls/imm32/tests/imm32.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index 254b897f3cc..301480090cd 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -3062,7 +3062,7 @@ static void test_ImmGetProperty(void)
     };
     static const IMEINFO expect_ime_info_0411 = /* MS Japanese IME */
     {
-        .fdwProperty = IME_PROP_COMPLETE_ON_UNSELECT | IME_PROP_CANDLIST_START_FROM_1 | IME_PROP_UNICODE | IME_PROP_AT_CARET | 0xa,
+        .fdwProperty = IME_PROP_CANDLIST_START_FROM_1 | IME_PROP_UNICODE | IME_PROP_AT_CARET | 0xa,
         .fdwConversionCaps = IME_CMODE_NATIVE | IME_CMODE_FULLSHAPE | IME_CMODE_KATAKANA,
         .fdwSentenceCaps = IME_SMODE_PLAURALCLAUSE | IME_SMODE_CONVERSATION,
         .fdwSCSCaps = SCS_CAP_COMPSTR | SCS_CAP_SETRECONVERTSTRING | SCS_CAP_MAKEREAD,
@@ -3101,7 +3101,8 @@ static void test_ImmGetProperty(void)
     else if (hkl == (HKL)0x08040804) expect = &expect_ime_info_0804;
     else expect = &expect_ime_info;
 
-    ok_ret( expect->fdwProperty,       ImmGetProperty( hkl, IGP_PROPERTY ) );
+    /* IME_PROP_COMPLETE_ON_UNSELECT seems to be somtimes set on CJK locales IMEs, sometimes not */
+    ok_ret( expect->fdwProperty,       ImmGetProperty( hkl, IGP_PROPERTY ) & ~IME_PROP_COMPLETE_ON_UNSELECT );
     todo_wine
     ok_ret( expect->fdwConversionCaps, ImmGetProperty( hkl, IGP_CONVERSION ) );
     todo_wine
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2454