[URLMON_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409
authorAmine Khaldi <amine.khaldi@reactos.org>
Thu, 17 Nov 2016 23:11:50 +0000 (23:11 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Thu, 17 Nov 2016 23:11:50 +0000 (23:11 +0000)
svn path=/trunk/; revision=73295

rostests/winetests/urlmon/misc.c
rostests/winetests/urlmon/url.c

index 53cbb3c..299dcdf 100644 (file)
@@ -647,7 +647,7 @@ static const struct {
     {data50, sizeof(data50), "video/mpeg"},
     {data51, sizeof(data51), "video/mpeg"},
     {data52, sizeof(data52), "application/octet-stream", "image/pjpeg"},
     {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"},
     {data54, sizeof(data54), "text/html", "video/mpeg"},
     {data55, sizeof(data55), "application/x-gzip-compressed"},
     {data56, sizeof(data56), "text/plain"},
index 1326917..d9a3811 100644 (file)
@@ -3418,10 +3418,7 @@ static void test_BindToObject(int protocol, DWORD flags, HRESULT exhres)
     }
 
     ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n");
     }
 
     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);
 
     if(emulate_protocol)
         CoRevokeClassObject(regid);