Piotr Caban : msvcrt: Fixed setlocale tests on Win8.

Alexandre Julliard julliard at winehq.org
Fri Jan 25 13:31:49 CST 2013


Module: wine
Branch: master
Commit: 8304bf4dfce272cf350a19f7b4eff2998f8f6305
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8304bf4dfce272cf350a19f7b4eff2998f8f6305

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Fri Jan 25 15:07:16 2013 +0100

msvcrt: Fixed setlocale tests on Win8.

---

 dlls/msvcrt/tests/locale.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c
index fba2462..3bb7fdc 100644
--- a/dlls/msvcrt/tests/locale.c
+++ b/dlls/msvcrt/tests/locale.c
@@ -116,12 +116,14 @@ static void test_setlocale(void)
     ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");
     if(ret)
         ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936")
+        || !strcmp(ret, "Chinese (Simplified)_China.936")
         || broken(!strcmp(ret, "Chinese_Taiwan.950")), "ret = %s\n", ret);
 
     ret = setlocale(LC_ALL, "chinese-simplified");
     ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");
     if(ret)
         ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936")
+        || !strcmp(ret, "Chinese (Simplified)_China.936")
         || broken(!strcmp(ret, "Chinese_People's Republic of China.936"))
         || broken(!strcmp(ret, "Chinese_Taiwan.950")), "ret = %s\n", ret);
 
@@ -135,6 +137,7 @@ static void test_setlocale(void)
     ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");
     if(ret)
         ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936")
+        || !strcmp(ret, "Chinese (Simplified)_China.936")
         || broken(!strcmp(ret, "Chinese_People's Republic of China.936")), "ret = %s\n", ret);
 
     ret = setlocale(LC_ALL, "cht");




More information about the wine-cvs mailing list