From de83c5308575fb227ba3faabed7b3c00015ae55c Mon Sep 17 00:00:00 2001 From: Austin English Date: Mon, 3 May 2010 18:36:16 -0500 Subject: [PATCH] msvcrt: Fix tests for Windows ME. --- dlls/msvcrt/tests/locale.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 23ecbc5fa55..df7d8e7e296 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");