[URLMON_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
authorAmine Khaldi <amine.khaldi@reactos.org>
Sat, 21 Nov 2015 09:37:15 +0000 (09:37 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sat, 21 Nov 2015 09:37:15 +0000 (09:37 +0000)
svn path=/trunk/; revision=69980

rostests/winetests/urlmon/protocol.c
rostests/winetests/urlmon/url.c

index 20b21f0..064d814 100644 (file)
@@ -31,7 +31,7 @@
 //#include "winbase.h"
 #include <winnls.h>
 #include <ole2.h>
-//#include "urlmon.h"
+#include <urlmon.h>
 #include <wininet.h>
 
 static HRESULT (WINAPI *pCoInternetGetSession)(DWORD, IInternetSession **, DWORD);
@@ -892,6 +892,9 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface,
     case BINDSTATUS_RESERVED_7:
         trace("BINDSTATUS_RESERVED_7\n");
         break;
+    case BINDSTATUS_RESERVED_8:
+        trace("BINDSTATUS_RESERVED_8\n");
+        break;
     default:
         ok(0, "Unexpected status %d (%d)\n", ulStatusCode, ulStatusCode-BINDSTATUS_LAST);
     };
@@ -1410,6 +1413,9 @@ static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, ULONG ulS
         CHECK_EXPECT(GetBindString_ROOTDOC_URL);
         ok(cEl == 1, "cEl=%d, expected 1\n", cEl);
         return E_NOTIMPL;
+    case BINDSTRING_ENTERPRISE_ID:
+        ok(cEl == 1, "cEl=%d, expected 1\n", cEl);
+        return E_NOTIMPL;
     default:
         ok(0, "unexpected ulStringType %d\n", ulStringType);
     }
index 06616a9..13d5462 100644 (file)
@@ -2871,7 +2871,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t)
         url_a = (flags & BINDTEST_INVALID_CN) ? "https://209.46.25.134/favicon.ico" : "https://test.winehq.org/tests/hello.html";
         break;
     case FTP_TEST:
-        url_a = "ftp://ftp.winehq.org/pub/other/winelogo.xcf.tar.bz2";
+        url_a = "ftp://ftp.winehq.org/welcome.msg";
         break;
     default:
         url_a = "winetest:test";