From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 3 Mar 2016 13:42:35 +0000 (+0000)
Subject: [MLANG_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
X-Git-Tag: ReactOS-0.4.1~335
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=1458f62d388549f8873f8e8626a08cf11742278e

[MLANG_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

svn path=/trunk/; revision=70880
---

diff --git a/rostests/winetests/mlang/mlang.c b/rostests/winetests/mlang/mlang.c
index 80494688cc0..f6898344ced 100644
--- a/rostests/winetests/mlang/mlang.c
+++ b/rostests/winetests/mlang/mlang.c
@@ -1216,8 +1216,7 @@ static void test_GetRfc1766Info(IMultiLanguage2 *iML2)
             short_broken_name[MAX_LOCALE_NAME - 2] = 0;
         }
 
-        if (info_table[i].todo & TODO_NAME) {
-            todo_wine
+        todo_wine_if (info_table[i].todo & TODO_NAME) {
             ok( (!lstrcmpW(prfc->wszLocaleName, info_table[i].localename)) ||
                (info_table[i].broken_name && (
                 broken(!lstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */
@@ -1225,14 +1224,6 @@ static void test_GetRfc1766Info(IMultiLanguage2 *iML2)
                 "#%02d: got %s (expected %s)\n", i,
                 wine_dbgstr_w(prfc->wszLocaleName), wine_dbgstr_w(info_table[i].localename));
         }
-        else
-            ok( (!lstrcmpW(prfc->wszLocaleName, info_table[i].localename)) ||
-               (info_table[i].broken_name && (
-                broken(!lstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */
-                broken(!lstrcmpW(prfc->wszLocaleName, short_broken_name)))),
-                "#%02d: got %s (expected %s)\n", i,
-                wine_dbgstr_w(prfc->wszLocaleName), wine_dbgstr_w(info_table[i].localename));
-
     }
 
     /* SUBLANG_NEUTRAL only allowed for English, Arabic, Chinese */