Piotr Caban : msvcr110/tests: Fix setlocale test failure on systems with UTF-8 locales enabled.

Alexandre Julliard julliard at winehq.org
Thu May 12 15:55:51 CDT 2022


Module: wine
Branch: master
Commit: fac521ee33aa9ca793967d6e3a89821f760ab262
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=fac521ee33aa9ca793967d6e3a89821f760ab262

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Thu May 12 16:53:57 2022 +0200

msvcr110/tests: Fix setlocale test failure on systems with UTF-8 locales enabled.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52937
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msvcr110/tests/msvcr110.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c
index f88e3122ac9..55d077c6de9 100644
--- a/dlls/msvcr110/tests/msvcr110.c
+++ b/dlls/msvcr110/tests/msvcr110.c
@@ -132,7 +132,15 @@ static void test_setlocale(void)
     for(i=0; i<ARRAY_SIZE(names); i++) {
         ret = p_setlocale(LC_ALL, names[i]);
         ok(ret != NULL, "expected success, but got NULL\n");
-        ok(!strcmp(ret, names[i]), "expected %s, got %s\n", names[i], ret);
+        if(!strcmp(names[i], "syr-SY") && GetACP() == CP_UTF8)
+        {
+            todo_wine ok(!strcmp(ret, "LC_COLLATE=syr-SY;LC_CTYPE=EN-US;LC_MONETARY=syr-SY;"
+                        "LC_NUMERIC=syr-SY;LC_TIME=syr-SY"), "got %s\n", ret);
+        }
+        else
+        {
+            ok(!strcmp(ret, names[i]), "expected %s, got %s\n", names[i], ret);
+        }
     }
 
     ret = p_setlocale(LC_ALL, "en-us.1250");




More information about the wine-cvs mailing list