Author: akhaldi
Date: Thu Aug 18 10:45:43 2016
New Revision: 72309
URL: http://svn.reactos.org/svn/reactos?rev=72309&view=rev
Log:
[URLMON] Sync with Wine Staging 1.9.16. CORE-11866
Modified:
trunk/reactos/dll/win32/urlmon/bindctx.c
trunk/reactos/dll/win32/urlmon/umstream.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/urlmon/bindctx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/bindctx.c?rev=72309&r1=72308&r2=72309&view=diff
==============================================================================
--- trunk/reactos/dll/win32/urlmon/bindctx.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/bindctx.c [iso-8859-1] Thu Aug 18
10:45:43 2016
@@ -424,7 +424,7 @@
if(pszAdditionalRequestHeaders)
*pszAdditionalRequestHeaders = additional_headers;
- else if(additional_headers)
+ else
CoTaskMemFree(additional_headers);
return hres;
Modified: trunk/reactos/dll/win32/urlmon/umstream.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/umstream.c?rev=72309&r1=72308&r2=72309&view=diff
==============================================================================
--- trunk/reactos/dll/win32/urlmon/umstream.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/umstream.c [iso-8859-1] Thu Aug 18
10:45:43 2016
@@ -113,12 +113,18 @@
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 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;
}
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=72309&r1=72308&r2=72309&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 10:45:43 2016
@@ -192,7 +192,7 @@
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
