Austin English : msvcrt: Fix tests for Windows ME.

[Alexandre Julliard]

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

Author: Austin English 
Date:   Mon May  3 18:36:16 2010 -0500

msvcrt: Fix tests for Windows ME.

---

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

diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c
index 23ecbc5..df7d8e7 100644
--- a/dlls/msvcrt/tests/locale.c
+++ b/dlls/msvcrt/tests/locale.c
@@ -437,23 +437,27 @@ static void test_setlocale(void)
     if(ret)
         todo_wine ok((!strcmp( ret, "Norwegian-Nynorsk_Norway.1252"))
         || broken(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252"))
+        || broken(!strcmp(ret, "Norwegian_Norway.1252"))
         || broken(!strcmp(ret, "Norwegian (Nynorsk)_Norway.1252")), "ret = %s\n", ret);

ret = setlocale(LC_ALL, "nor");
     ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");
     if(ret)
-        todo_wine ok(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252"), "ret = %s\n", ret);
+        todo_wine ok(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252")
+        || broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret);

ret = setlocale(LC_ALL, "norwegian-bokmal");
     todo_wine ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");
     if(ret)
-        ok(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252"), "ret = %s\n", ret);
+        ok(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252")
+        || broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret);

ret = setlocale(LC_ALL, "norwegian-nynorsk");
     todo_wine ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");
     if(ret)
         ok(!strcmp(ret, "Norwegian-Nynorsk_Norway.1252")
-        || broken(!strcmp( ret, "Norwegian (Nynorsk)_Norway.1252"))
+        || broken(!strcmp(ret, "Norwegian_Norway.1252"))
+        || broken(!strcmp(ret, "Norwegian (Nynorsk)_Norway.1252"))
         || broken(!strcmp(ret, "Norwegian (Bokm�l)_Norway.1252")), "ret = %s\n", ret);

ret = setlocale(LC_ALL, "plk");