[ros-diffs] [akhaldi] 73295: [URLMON_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409

Author: akhaldi
Date: Thu Nov 17 23:11:50 2016
New Revision: 73295

URL: http://svn.reactos.org/svn/reactos?rev=73295&view=rev
Log:
[URLMON_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409

Modified:
    trunk/rostests/winetests/urlmon/misc.c
    trunk/rostests/winetests/urlmon/url.c

Modified: trunk/rostests/winetests/urlmon/misc.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/misc.c?re...
==============================================================================
--- trunk/rostests/winetests/urlmon/misc.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/urlmon/misc.c	[iso-8859-1] Thu Nov 17 23:11:50 2016
@@ -647,7 +647,7 @@
     {data50, sizeof(data50), "video/mpeg"},
     {data51, sizeof(data51), "video/mpeg"},
     {data52, sizeof(data52), "application/octet-stream", "image/pjpeg"},
-    {data53, sizeof(data53), "application/octet-stream", "image/pjpeg"},
+    {data53, sizeof(data53), "application/octet-stream", "image/pjpeg", "image/x-icon"},
     {data54, sizeof(data54), "text/html", "video/mpeg"},
     {data55, sizeof(data55), "application/x-gzip-compressed"},
     {data56, sizeof(data56), "text/plain"},

Modified: trunk/rostests/winetests/urlmon/url.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/url.c?rev...
==============================================================================
--- trunk/rostests/winetests/urlmon/url.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/urlmon/url.c	[iso-8859-1] Thu Nov 17 23:11:50 2016
@@ -3418,10 +3418,7 @@
     }

ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n");
-    if(test_protocol != HTTP_TEST || emulate_protocol || !(bindf & BINDF_ASYNCHRONOUS))
-        ok(IBindCtx_Release(bctx) == 0, "bctx should be destroyed here\n");
-    else
-        IBindCtx_Release(bctx);
+    IBindCtx_Release(bctx);

if(emulate_protocol)
         CoRevokeClassObject(regid);