system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-07 23:37:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

urlmon: Don't store IWinInetHttpInfo reference in BindProtocol.

Browse source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2018-05-08 18:18:11 +02:00 committed by Alexandre Julliard
parent 357da1e8a6
commit 73fd4b09ae
3 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
dlls/urlmon/binding.c
View file

@ -800,12 +800,20 @@ static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void
*ppv = &This->IWinInetHttpInfo_iface; *ppv = &This->IWinInetHttpInfo_iface;
}else if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { }else if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) {
IWinInetHttpInfo *http_info;
HRESULT hres;
TRACE("(%p)->(IID_IWinInetHttpInfo %p)\n", This, ppv); TRACE("(%p)->(IID_IWinInetHttpInfo %p)\n", This, ppv);
if(!This->protocol->wininet_http_info) /* NOTE: This violidates COM rules, but tests prove that we should do it */
return E_NOINTERFACE; if(This->protocol->protocol_unk) {
hres = IUnknown_QueryInterface(This->protocol->protocol_unk, &IID_IWinInetHttpInfo,
*ppv = &This->IWinInetHttpInfo_iface; (void**)&http_info);
if(SUCCEEDED(hres)) {
IWinInetHttpInfo_Release(http_info);
*ppv = &This->IWinInetHttpInfo_iface;
}
}
} }
if(*ppv) { if(*ppv) {
@ -1318,13 +1326,22 @@ static HRESULT WINAPI WinInetHttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD d
void *pBuffer, DWORD *pcbBuffer, DWORD *pdwFlags, DWORD *pdwReserved) void *pBuffer, DWORD *pcbBuffer, DWORD *pdwFlags, DWORD *pdwReserved)
{ {
Binding *This = impl_from_IWinInetHttpInfo(iface); Binding *This = impl_from_IWinInetHttpInfo(iface);
IWinInetHttpInfo *http_info;
HRESULT hres;
TRACE("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); TRACE("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved);
if(!This->protocol->wininet_http_info) if(!This->protocol->protocol_unk)
return E_FAIL; return E_FAIL;
return IWinInetHttpInfo_QueryInfo(This->protocol->wininet_http_info, hres = IUnknown_QueryInterface(This->protocol->protocol_unk, &IID_IWinInetHttpInfo,
dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); (void**)&http_info);
if(FAILED(hres))
return E_FAIL;
hres = IWinInetHttpInfo_QueryInfo(http_info, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved);
IWinInetHttpInfo_Release(http_info);
return hres;
} }
static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = { static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = {

5
dlls/urlmon/bindprot.c
View file

@ -334,10 +334,6 @@ static void release_protocol_handler(BindProtocol *This)
IWinInetInfo_Release(This->wininet_info); IWinInetInfo_Release(This->wininet_info);
This->wininet_info = NULL; This->wininet_info = NULL;
} }
if(This->wininet_http_info) {
IWinInetHttpInfo_Release(This->wininet_http_info);
This->wininet_http_info = NULL;
}
if(This->protocol_unk) { if(This->protocol_unk) {
IUnknown_Release(This->protocol_unk); IUnknown_Release(This->protocol_unk);
This->protocol_unk = NULL; This->protocol_unk = NULL;
@ -568,7 +564,6 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr
if(urlmon_protocol) { if(urlmon_protocol) {
IInternetProtocol_QueryInterface(protocol, &IID_IWinInetInfo, (void**)&This->wininet_info); IInternetProtocol_QueryInterface(protocol, &IID_IWinInetInfo, (void**)&This->wininet_info);
IInternetProtocol_QueryInterface(protocol, &IID_IWinInetHttpInfo, (void**)&This->wininet_http_info);
} }
set_binding_sink(This, pOIProtSink, pOIBindInfo); set_binding_sink(This, pOIProtSink, pOIBindInfo);

1
dlls/urlmon/urlmon_main.h
View file

@ -179,7 +179,6 @@ typedef struct {
IUnknown *protocol_unk; IUnknown *protocol_unk;
IInternetProtocol *protocol; IInternetProtocol *protocol;
IWinInetInfo *wininet_info; IWinInetInfo *wininet_info;
IWinInetHttpInfo *wininet_http_info;
IInternetBindInfo *bind_info; IInternetBindInfo *bind_info;
IInternetProtocolSink *protocol_sink; IInternetProtocolSink *protocol_sink;