[PATCH 0/1] MR5802: dwrite/tests: Fix a test failure on some Win10 machines with CJK locales.

[Nikolay Sivov (＠nsivov)]

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

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

[PATCH 1/1] dwrite/tests: Fix a test failure on some Win10 machines with CJK locales.

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/dwrite/tests/layout.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
index c8c706a7395..f8ca4f250c4 100644
--- a/dlls/dwrite/tests/layout.c
+++ b/dlls/dwrite/tests/layout.c
@@ -5266,6 +5266,19 @@ static void test_MapCharacters(void)
     IDWriteFactory2_Release(factory2);
 }
 
+static BOOL is_font_name_match(const WCHAR *name, const WCHAR *list)
+{
+     WCHAR *p, str[256];
+
+     wcscpy(str, list);
+     for (p = wcstok(str, L";"); p; p = wcstok(NULL, L";"))
+     {
+         if (!wcscmp(p, name))
+             return TRUE;
+     }
+     return FALSE;
+}
+
 static void test_system_fallback(void)
 {
     static const struct fallback_test
@@ -5275,7 +5288,7 @@ static void test_system_fallback(void)
     }
     tests[] =
     {
-        { { 0x25d4, 0}, L"Segoe UI Symbol" },
+        { { 0x25d4, 0}, L"Segoe UI Symbol;Meiryo UI" },
     };
     IDWriteFontFallback *fallback;
     IDWriteFactory2 *factory;
@@ -5310,7 +5323,7 @@ static void test_system_fallback(void)
 
         get_font_name(font, name, ARRAY_SIZE(name));
         todo_wine
-        ok(!wcscmp(name, tests[i].name), "%u: unexpected name %s.\n", i, wine_dbgstr_w(name));
+        ok(is_font_name_match(name, tests[i].name), "%u: unexpected name %s.\n", i, wine_dbgstr_w(name));
 
         hr = IDWriteFont_HasCharacter(font, g_source[0], &exists);
         ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-- 
GitLab

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