Alexandre Julliard : msvcrt/tests: Add some alternative locale names that happen on Windows.
Alexandre Julliard
julliard at winehq.org
Fri Jul 9 09:46:26 CDT 2010
Module: wine
Branch: master
Commit: d2cda58a1f7780d26ad0fef2edd79453f6740e22
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2cda58a1f7780d26ad0fef2edd79453f6740e22
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Jul 9 11:38:08 2010 +0200
msvcrt/tests: Add some alternative locale names that happen on Windows.
---
dlls/msvcrt/tests/locale.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c
index cf51c4c..2496ebc 100644
--- a/dlls/msvcrt/tests/locale.c
+++ b/dlls/msvcrt/tests/locale.c
@@ -117,7 +117,8 @@ static void test_setlocale(void)
ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");
if(ret)
todo_wine ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936")
- || broken(!strcmp(ret, "Chinese_People's Republic of China.936")), "ret = %s\n", ret);
+ || broken(!strcmp(ret, "Chinese_People's Republic of China.936"))
+ || broken(!strcmp(ret, "Chinese_Taiwan.950")), "ret = %s\n", ret);
ret = setlocale(LC_ALL, "chinese-traditional");
ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");
@@ -439,12 +440,14 @@ static void test_setlocale(void)
ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");
if(ret)
ok(!strcmp(ret, "Norwegian (Bokmål)_Norway.1252")
+ || broken(!strcmp(ret, "Norwegian (Bokmal)_Norway.1252"))
|| broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret);
ret = setlocale(LC_ALL, "norwegian-bokmal");
ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");
if(ret)
ok(!strcmp(ret, "Norwegian (Bokmål)_Norway.1252")
+ || broken(!strcmp(ret, "Norwegian (Bokmal)_Norway.1252"))
|| broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret);
ret = setlocale(LC_ALL, "norwegian-nynorsk");
@@ -453,6 +456,7 @@ static void test_setlocale(void)
todo_wine ok(!strcmp(ret, "Norwegian-Nynorsk_Norway.1252")
|| broken(!strcmp(ret, "Norwegian_Norway.1252"))
|| broken(!strcmp(ret, "Norwegian (Nynorsk)_Norway.1252"))
+ || broken(!strcmp(ret, "Norwegian (Bokmal)_Norway.1252"))
|| broken(!strcmp(ret, "Norwegian (Bokmål)_Norway.1252")), "ret = %s\n", ret);
ret = setlocale(LC_ALL, "plk");
More information about the wine-cvs
mailing list