diff --git a/reactos/dll/win32/urlmon/bindctx.c b/reactos/dll/win32/urlmon/bindctx.c index 4eaeff84c00..7a81406e730 100644 --- a/reactos/dll/win32/urlmon/bindctx.c +++ b/reactos/dll/win32/urlmon/bindctx.c @@ -424,7 +424,7 @@ static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate2 *iface, DWORD if(pszAdditionalRequestHeaders) *pszAdditionalRequestHeaders = additional_headers; - else if(additional_headers) + else CoTaskMemFree(additional_headers); return hres; diff --git a/reactos/dll/win32/urlmon/umstream.c b/reactos/dll/win32/urlmon/umstream.c index 3f33a23485c..23e1f869176 100644 --- a/reactos/dll/win32/urlmon/umstream.c +++ b/reactos/dll/win32/urlmon/umstream.c @@ -113,12 +113,18 @@ static HRESULT WINAPI ProxyBindStatusCallback_OnStopBinding(IBindStatusCallback static HRESULT WINAPI ProxyBindStatusCallback_GetBindInfo(IBindStatusCallback *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) { + DWORD size = pbindinfo->cbSize; ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); if(This->pBSC) return IBindStatusCallback_GetBindInfo(This->pBSC, grfBINDF, pbindinfo); - return E_INVALIDARG; + memset(pbindinfo, 0, size); + pbindinfo->cbSize = size; + + *grfBINDF = 0; + + return S_OK; } static HRESULT WINAPI ProxyBindStatusCallback_OnDataAvailable(IBindStatusCallback *iface, DWORD grfBSCF, @@ -167,8 +173,20 @@ static const IBindStatusCallbackVtbl BlockingBindStatusCallbackVtbl = static HRESULT WINAPI AsyncBindStatusCallback_GetBindInfo(IBindStatusCallback *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) { ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); - HRESULT hr = IBindStatusCallback_GetBindInfo(This->pBSC, grfBINDF, pbindinfo); + HRESULT hr = S_OK; + + if(This->pBSC) + hr = IBindStatusCallback_GetBindInfo(This->pBSC, grfBINDF, pbindinfo); + else{ + DWORD size = pbindinfo->cbSize; + memset(pbindinfo, 0, size); + pbindinfo->cbSize = size; + + *grfBINDF = 0; + } + *grfBINDF |= BINDF_PULLDATA | BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE; + return hr; } diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index f685f27a8c8..8f3e88b60a6 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -192,7 +192,7 @@ reactos/dll/win32/traffic # Synced to WineStaging-1.9.11 reactos/dll/win32/twain_32 # Synced to WineStaging-1.9.11 reactos/dll/win32/updspapi # Synced to WineStaging-1.9.11 reactos/dll/win32/url # Synced to WineStaging-1.9.11 -reactos/dll/win32/urlmon # Synced to WineStaging-1.9.11 +reactos/dll/win32/urlmon # Synced to WineStaging-1.9.16 reactos/dll/win32/usp10 # Synced to WineStaging-1.9.11 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-1.9.11