[akhaldi] 71738: [URLMON_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368

Author: akhaldi
Date: Sat Jul  2 13:12:56 2016
New Revision: 71738

URL: http://svn.reactos.org/svn/reactos?rev=71738&view=rev
Log:
[URLMON_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368

Modified:
    trunk/rostests/winetests/urlmon/misc.c
    trunk/rostests/winetests/urlmon/sec_mgr.c
    trunk/rostests/winetests/urlmon/uri.c

Modified: trunk/rostests/winetests/urlmon/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/misc.c?r…
==============================================================================
--- trunk/rostests/winetests/urlmon/misc.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/urlmon/misc.c	[iso-8859-1] Sat Jul  2 13:12:56 2016
@@ -1730,14 +1730,9 @@
 
     for(i = 0; i < sizeof(default_feature_tests)/sizeof(default_feature_tests[0]);
++i) {
         hres = pCoInternetIsFeatureEnabled(default_feature_tests[i].feature,
default_feature_tests[i].get_flags);
-        if(default_feature_tests[i].todo) {
-            todo_wine
+        todo_wine_if (default_feature_tests[i].todo)
             ok(hres == default_feature_tests[i].expected,
"CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n",
                 hres, default_feature_tests[i].expected, i);
-        } else {
-            ok(hres == default_feature_tests[i].expected,
"CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n",
-                hres, default_feature_tests[i].expected, i);
-        }
     }
 }
 
@@ -1883,24 +1878,15 @@
     for(i = 0; i < sizeof(internet_feature_tests)/sizeof(internet_feature_tests[0]);
++i) {
         hres = pCoInternetSetFeatureEnabled(internet_feature_tests[i].feature,
internet_feature_tests[i].set_flags,
                                             internet_feature_tests[i].enable);
-        if(internet_feature_tests[i].set_todo) {
-            todo_wine
+        todo_wine_if (internet_feature_tests[i].set_todo)
             ok(hres == internet_feature_tests[i].set_expected,
"CoInternetSetFeatureEnabled returned %08x, expected %08x on test %d\n",
                 hres, internet_feature_tests[i].set_expected, i);
-        } else {
-            ok(hres == internet_feature_tests[i].set_expected,
"CoInternetSetFeatureEnabled returned %08x, expected %08x on test %d\n",
-                hres, internet_feature_tests[i].set_expected, i);
-        }
 
         hres = pCoInternetIsFeatureEnabled(internet_feature_tests[i].feature,
internet_feature_tests[i].set_flags);
-        if(internet_feature_tests[i].get_todo) {
-            todo_wine
+        todo_wine_if (internet_feature_tests[i].get_todo)
             ok(hres == internet_feature_tests[i].get_expected,
"CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n",
                 hres, internet_feature_tests[i].get_expected, i);
-        } else {
-            ok(hres == internet_feature_tests[i].get_expected,
"CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n",
-                hres, internet_feature_tests[i].get_expected, i);
-        }
+
     }
 }
 

Modified: trunk/rostests/winetests/urlmon/sec_mgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/sec_mgr.…
==============================================================================
--- trunk/rostests/winetests/urlmon/sec_mgr.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/urlmon/sec_mgr.c	[iso-8859-1] Sat Jul  2 13:12:56 2016
@@ -948,11 +948,7 @@
 
         hres = IInternetSecurityManager_MapUrlToZone(secmgr, urlW, &zone, 0);
         ok(hres == S_OK, "MapUrlToZone failed: %08x\n", hres);
-        if(test->todo)
-            todo_wine
-                ok(zone == test->zone || broken(test->broken_zone == zone),
-                    "Expected %d, but got %d on test %d\n", test->zone,
zone, i);
-        else
+        todo_wine_if (test->todo)
             ok(zone == test->zone || broken(test->broken_zone == zone),
                 "Expected %d, but got %d on test %d\n", test->zone, zone,
i);
 
@@ -1644,12 +1640,7 @@
             result = NULL;
 
             hr = pCoInternetGetSecurityUrlEx(uri, &result, PSU_DEFAULT, 0);
-            if(sec_url_ex_tests[i].todo) {
-                todo_wine
-                    ok(hr == sec_url_ex_tests[i].default_hres,
-                        "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x
on test %d\n",
-                        hr, sec_url_ex_tests[i].default_hres, i);
-            } else {
+            todo_wine_if (sec_url_ex_tests[i].todo) {
                 ok(hr == sec_url_ex_tests[i].default_hres,
                     "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on
test %d\n",
                     hr, sec_url_ex_tests[i].default_hres, i);
@@ -1660,12 +1651,7 @@
                 hr = IUri_GetDisplayUri(result, &received);
                 ok(hr == S_OK, "GetDisplayUri returned 0x%08x on test %d\n",
hr, i);
                 if(hr == S_OK) {
-                    if(sec_url_ex_tests[i].todo) {
-                        todo_wine
-                            ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received),
-                                "Expected %s but got %s on test %d\n",
sec_url_ex_tests[i].default_uri,
-                                wine_dbgstr_w(received), i);
-                    } else {
+                    todo_wine_if (sec_url_ex_tests[i].todo) {
                         ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received),
                             "Expected %s but got %s on test %d\n",
sec_url_ex_tests[i].default_uri,
                             wine_dbgstr_w(received), i);
@@ -1677,12 +1663,7 @@
 
             result = NULL;
             hr = pCoInternetGetSecurityUrlEx(uri, &result, PSU_SECURITY_URL_ONLY,
0);
-            if(sec_url_ex_tests[i].todo) {
-                todo_wine
-                    ok(hr == sec_url_ex_tests[i].default_hres,
-                        "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x
on test %d\n",
-                        hr, sec_url_ex_tests[i].default_hres, i);
-            } else {
+            todo_wine_if (sec_url_ex_tests[i].todo) {
                 ok(hr == sec_url_ex_tests[i].default_hres,
                     "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on
test %d\n",
                     hr, sec_url_ex_tests[i].default_hres, i);
@@ -1693,12 +1674,7 @@
                 hr = IUri_GetDisplayUri(result, &received);
                 ok(hr == S_OK, "GetDisplayUri returned 0x%08x on test %d\n",
hr, i);
                 if(hr == S_OK) {
-                    if(sec_url_ex_tests[i].todo) {
-                        todo_wine
-                            ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received),
-                                "Expected %s but got %s on test %d\n",
sec_url_ex_tests[i].default_uri,
-                                wine_dbgstr_w(received), i);
-                    } else {
+                    todo_wine_if (sec_url_ex_tests[i].todo) {
                         ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received),
                             "Expected %s but got %s on test %d\n",
sec_url_ex_tests[i].default_uri,
                             wine_dbgstr_w(received), i);
@@ -1866,14 +1842,7 @@
         ok(hres == S_OK, "CreateUri returned %08x for '%s'\n", hres,
sec_mgr_ex2_tests[i].uri);
 
         hres = IInternetSecurityManagerEx2_MapUrlToZoneEx2(sec_mgr2, uri, &zone, 0,
NULL, NULL);
-        if(sec_mgr_ex2_tests[i].map_todo) {
-            todo_wine
-                ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlZoneToEx2 returned
%08x, expected %08x for '%s'\n",
-                    hres, sec_mgr_ex2_tests[i].map_hres, sec_mgr_ex2_tests[i].uri);
-            todo_wine
-                ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d
for '%s'\n", sec_mgr_ex2_tests[i].zone,
-                    zone, sec_mgr_ex2_tests[i].uri);
-        } else {
+        todo_wine_if (sec_mgr_ex2_tests[i].map_todo) {
             ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlToZoneEx2 returned
%08x, expected %08x for '%s'\n",
                 hres, sec_mgr_ex2_tests[i].map_hres, sec_mgr_ex2_tests[i].uri);
             ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d for
'%s'\n", sec_mgr_ex2_tests[i].zone,
@@ -1884,19 +1853,7 @@
         memset(buf, 0xf0, buf_size);
 
         hres = IInternetSecurityManagerEx2_GetSecurityIdEx2(sec_mgr2, uri, buf,
&buf_size, 0);
-        if(sec_mgr_ex2_tests[i].secid_todo) {
-            todo_wine
-                ok(hres == sec_mgr_ex2_tests[i].secid_hres, "GetSecurityIdEx2
returned %08x, expected %08x on test '%s'\n",
-                    hres, sec_mgr_ex2_tests[i].secid_hres, sec_mgr_ex2_tests[i].uri);
-            if(sec_mgr_ex2_tests[i].secid) {
-                todo_wine {
-                    ok(buf_size == sec_mgr_ex2_tests[i].secid_size, "Got wrong
security id size=%d, expected %d on test '%s'\n",
-                        buf_size, sec_mgr_ex2_tests[i].secid_size,
sec_mgr_ex2_tests[i].uri);
-                    ok(!memcmp(buf, sec_mgr_ex2_tests[i].secid,
sec_mgr_ex2_tests[i].secid_size), "Got wrong security id on test
'%s'\n",
-                        sec_mgr_ex2_tests[i].uri);
-                }
-            }
-        } else {
+        todo_wine_if (sec_mgr_ex2_tests[i].secid_todo) {
             ok(hres == sec_mgr_ex2_tests[i].secid_hres, "GetSecurityIdEx2 returned
%08x, expected %08x on test '%s'\n",
                 hres, sec_mgr_ex2_tests[i].secid_hres, sec_mgr_ex2_tests[i].uri);
             if(sec_mgr_ex2_tests[i].secid) {

Modified: trunk/rostests/winetests/urlmon/uri.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/uri.c?re…
==============================================================================
--- trunk/rostests/winetests/urlmon/uri.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/urlmon/uri.c	[iso-8859-1] Sat Jul  2 13:12:56 2016
@@ -5775,7 +5775,7 @@
         0,INET_E_INVALID_URL,FALSE,
         0,0,0,INET_E_INVALID_URL,FALSE
     },
-    /* UserName can't contain any character that is a delimeter for another
+    /* UserName can't contain any character that is a delimiter for another
      * component that appears after it in a normal URI.
      */
     {   "http://google.com/",0,S_OK,FALSE,