Andrew Nguyen : msvcrt/tests: Avoid embedding extended ASCII characters in locale string literals.
Alexandre Julliard
julliard at winehq.org
Mon Jan 17 10:59:48 CST 2011
Module: wine
Branch: master
Commit: 92fe8ef38e84f6a62f71a6cdde37a2eb51c0bdc3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=92fe8ef38e84f6a62f71a6cdde37a2eb51c0bdc3
Author: Andrew Nguyen <anguyen at codeweavers.com>
Date: Sat Jan 15 02:28:19 2011 -0600
msvcrt/tests: Avoid embedding extended ASCII characters in locale string literals.
---
dlls/msvcrt/tests/locale.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c
index 911bddd..0e8d0dd 100644
--- a/dlls/msvcrt/tests/locale.c
+++ b/dlls/msvcrt/tests/locale.c
@@ -435,20 +435,20 @@ static void test_setlocale(void)
if(ret)
ok(!strcmp( ret, "Norwegian-Nynorsk_Norway.1252")
|| !strcmp(ret, "Norwegian (Nynorsk)_Norway.1252")
- || broken(!strcmp(ret, "Norwegian (Bokmål)_Norway.1252"))
+ || broken(!strcmp(ret, "Norwegian (Bokm\xe5l)_Norway.1252"))
|| broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret);
ret = setlocale(LC_ALL, "nor");
ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");
if(ret)
- ok(!strcmp(ret, "Norwegian (Bokmål)_Norway.1252")
+ ok(!strcmp(ret, "Norwegian (Bokm\xe5l)_Norway.1252")
|| !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")
+ ok(!strcmp(ret, "Norwegian (Bokm\xe5l)_Norway.1252")
|| !strcmp(ret, "Norwegian (Bokmal)_Norway.1252")
|| broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret);
@@ -459,7 +459,7 @@ static void test_setlocale(void)
|| !strcmp(ret, "Norwegian (Nynorsk)_Norway.1252")
|| broken(!strcmp(ret, "Norwegian_Norway.1252"))
|| broken(!strcmp(ret, "Norwegian (Bokmal)_Norway.1252"))
- || broken(!strcmp(ret, "Norwegian (Bokmål)_Norway.1252")), "ret = %s\n", ret);
+ || broken(!strcmp(ret, "Norwegian (Bokm\xe5l)_Norway.1252")), "ret = %s\n", ret);
ret = setlocale(LC_ALL, "plk");
ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");
More information about the wine-cvs
mailing list