Author: akhaldi
Date: Thu Mar 3 13:42:35 2016
New Revision: 70880
URL: http://svn.reactos.org/svn/reactos?rev=70880&view=rev
Log:
[MLANG_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
Modified:
trunk/rostests/winetests/mlang/mlang.c
Modified: trunk/rostests/winetests/mlang/mlang.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mlang/mlang.c?rev=70880&r1=70879&r2=70880&view=diff
==============================================================================
--- trunk/rostests/winetests/mlang/mlang.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/mlang/mlang.c [iso-8859-1] Thu Mar 3
13:42:35 2016
@@ -1216,8 +1216,7 @@
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 @@
"#%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 */
