[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 8049468..f689834 100644 (file)
--- 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;
         }
 
             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 */
             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));
         }
                 "#%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 */
     }
 
     /* SUBLANG_NEUTRAL only allowed for English, Arabic, Chinese */