msvcrt:locale Remove todo_wine and add broken when necessary

[Alexandre Goujon]

---
 dlls/msvcrt/tests/locale.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c
index 2496ebc..8879f1a 100644
--- a/dlls/msvcrt/tests/locale.c
+++ b/dlls/msvcrt/tests/locale.c
@@ -110,32 +110,33 @@ static void test_setlocale(void)
     ret = setlocale(LC_ALL, "chinese");
     ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");
     if(ret)
-        todo_wine ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936")
+        ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936")
+        || 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-simplified");
     ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");
     if(ret)
-        todo_wine ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936")
+        ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936")
         || 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");
     if(ret)
-        todo_wine ok(!strcmp(ret, "Chinese (Traditional)_Taiwan.950")
+        ok(!strcmp(ret, "Chinese (Traditional)_Taiwan.950")
         || broken(!strcmp(ret, "Chinese_Taiwan.950")), "ret = %s\n", ret);
 
     ret = setlocale(LC_ALL, "chs");
     ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");
     if(ret)
-        todo_wine ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936")
+        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);
 
     ret = setlocale(LC_ALL, "cht");
     ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");
     if(ret)
-        todo_wine ok(!strcmp(ret, "Chinese (Traditional)_Taiwan.950")
+        ok(!strcmp(ret, "Chinese (Traditional)_Taiwan.950")
         || broken(!strcmp(ret, "Chinese_Taiwan.950")), "ret = %s\n", ret);
 
     ret = setlocale(LC_ALL, "csy");
@@ -431,7 +432,7 @@ static void test_setlocale(void)
     ret = setlocale(LC_ALL, "non");
     ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");
     if(ret)
-        todo_wine ok((!strcmp( ret, "Norwegian-Nynorsk_Norway.1252"))
+        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);
@@ -453,7 +454,7 @@ static void test_setlocale(void)
     ret = setlocale(LC_ALL, "norwegian-nynorsk");
     ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");
     if(ret)
-        todo_wine ok(!strcmp(ret, "Norwegian-Nynorsk_Norway.1252")
+        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"))
@@ -524,7 +525,7 @@ static void test_setlocale(void)
     ret = setlocale(LC_ALL, "spanish-modern");
     ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");
     if(ret)
-        todo_wine ok(!strcmp(ret, "Spanish - Modern Sort_Spain.1252")
+        ok(!strcmp(ret, "Spanish - Modern Sort_Spain.1252")
         || broken(!strcmp(ret, "Spanish_Spain.1252")), "ret = %s\n", ret);
 
     ret = setlocale(LC_ALL, "sve");
-- 
1.7.0.4