Misha Koshelev : urlmon: Fix HttpProtocol behavior when it is called without the BINDF_FROMURLMON flag .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 043f71b576d8abbed77078e0b9a1d4892ec4b91c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=043f71b576d8abbed77078e0b9...

Author: Misha Koshelev <mk144210(a)bcm.edu>
Date:   Wed Jul 18 19:59:11 2007 -0500

urlmon: Fix HttpProtocol behavior when it is called without the BINDF_FROMURLMON flag.

---

 dlls/urlmon/http.c |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c
index 5cf48d2..d2d0241 100644
--- a/dlls/urlmon/http.c
+++ b/dlls/urlmon/http.c
@@ -74,7 +74,7 @@ typedef struct {
     const IInternetProtocolVtbl *lpInternetProtocolVtbl;
     const IInternetPriorityVtbl *lpInternetPriorityVtbl;
 
-    DWORD flags;
+    DWORD flags, grfBINDF;
     IInternetProtocolSink *protocol_sink;
     IHttpNegotiate *http_negotiate;
     HINTERNET internet, connect, request;
@@ -192,7 +192,10 @@ static void CALLBACK HTTPPROTOCOL_InternetStatusCallback(
             data.pData = (LPVOID)BINDSTATUS_ENDDOWNLOADCOMPONENTS;
         else
             data.pData = (LPVOID)BINDSTATUS_DOWNLOADINGDATA;
-        IInternetProtocolSink_Switch(This->protocol_sink, &data);
+        if (This->grfBINDF & BINDF_FROMURLMON)
+            IInternetProtocolSink_Switch(This->protocol_sink, &data);
+        else
+            IInternetProtocol_Continue((IInternetProtocol *)This, &data);
         return;
     default:
         WARN("Unhandled Internet status callback %d\n", dwInternetStatus);
@@ -283,7 +286,7 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl
     HttpProtocol *This = PROTOCOL_THIS(iface);
     URL_COMPONENTSW url;
     BINDINFO bindinfo;
-    DWORD grfBINDF = 0, len = 0;
+    DWORD len = 0;
     ULONG num = 0;
     IServiceProvider *service_provider = 0;
     IHttpNegotiate2 *http_negotiate2 = 0;
@@ -301,7 +304,7 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl
 
     memset(&bindinfo, 0, sizeof(bindinfo));
     bindinfo.cbSize = sizeof(BINDINFO);
-    hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &grfBINDF, &bindinfo);
+    hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &This->grfBINDF, &bindinfo);
     if (hres != S_OK)
     {
         WARN("GetBindInfo failed: %08x\n", hres);
@@ -331,6 +334,9 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl
     if (!url.nPort)
         url.nPort = INTERNET_DEFAULT_HTTP_PORT;
 
+    if(!(This->grfBINDF & BINDF_FROMURLMON))
+        IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_DIRECTBIND, NULL);
+
     hres = IInternetBindInfo_GetBindString(pOIBindInfo, BINDSTRING_USER_AGENT, &user_agent,
                                            1, &num);
     if (hres != S_OK || !num)
@@ -556,13 +562,17 @@ static HRESULT WINAPI HttpProtocol_Continue(IInternetProtocol *iface, PROTOCOLDA
         {
             WARN("HttpQueryInfo failed: %d\n", GetLastError());
             IInternetProtocolSink_ReportProgress(This->protocol_sink,
-                                                 BINDSTATUS_MIMETYPEAVAILABLE,
+                                                 (This->grfBINDF & BINDF_FROMURLMON) ?
+                                                 BINDSTATUS_MIMETYPEAVAILABLE :
+                                                 BINDSTATUS_RAWMIMETYPE,
                                                  wszDefaultContentType);
         }
         else
         {
             IInternetProtocolSink_ReportProgress(This->protocol_sink,
-                                                 BINDSTATUS_MIMETYPEAVAILABLE,
+                                                 (This->grfBINDF & BINDF_FROMURLMON) ?
+                                                 BINDSTATUS_MIMETYPEAVAILABLE :
+                                                 BINDSTATUS_RAWMIMETYPE,
                                                  content_type);
         }
 
@@ -831,7 +841,7 @@ HRESULT HttpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj)
 
     ret->lpInternetProtocolVtbl = &HttpProtocolVtbl;
     ret->lpInternetPriorityVtbl = &HttpPriorityVtbl;
-    ret->flags = 0;
+    ret->flags = ret->grfBINDF = 0;
     ret->protocol_sink = 0;
     ret->http_negotiate = 0;
     ret->internet = ret->connect = ret->request = 0;