ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

urlmon: BindProocol's protocol handler doesn't need IInternetProtocolEx iface.

This commit is contained in:
Jacek Caban 2010-11-15 12:36:41 +01:00 committed by Alexandre Julliard
parent 0d4287b2e8
commit 5c61a34a7a
1 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
dlls/urlmon/bindprot.c
View File

@ -40,7 +40,7 @@ struct BindProtocol {
const IInternetProtocolSinkVtbl *lpIInternetProtocolSinkVtbl; const IInternetProtocolSinkVtbl *lpIInternetProtocolSinkVtbl;
const IWinInetHttpInfoVtbl *lpIWinInetHttpInfoVtbl; const IWinInetHttpInfoVtbl *lpIWinInetHttpInfoVtbl;
const IInternetProtocolExVtbl *lpIInternetProtocolHandlerVtbl; const IInternetProtocolVtbl *lpIInternetProtocolHandlerVtbl;
LONG ref; LONG ref;
@ -78,7 +78,7 @@ struct BindProtocol {
#define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl)
#define PROTOCOLEX(x) ((IInternetProtocolEx*) &(x)->lpIInternetProtocolExVtbl) #define PROTOCOLEX(x) ((IInternetProtocolEx*) &(x)->lpIInternetProtocolExVtbl)
#define PROTOCOLHANDLER(x) ((IInternetProtocolEx*) &(x)->lpIInternetProtocolHandlerVtbl) #define PROTOCOLHANDLER(x) ((IInternetProtocol*) &(x)->lpIInternetProtocolHandlerVtbl)
#define BUFFER_SIZE 2048 #define BUFFER_SIZE 2048
#define MIME_TEST_SIZE 255 #define MIME_TEST_SIZE 255
@ -233,7 +233,7 @@ static HRESULT handle_mime_filter(BindProtocol *This, IInternetProtocol *mime_fi
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
hres = create_protocol_proxy((IInternetProtocol*)PROTOCOLHANDLER(This), This->protocol_sink, &filter_proxy); hres = create_protocol_proxy(PROTOCOLHANDLER(This), This->protocol_sink, &filter_proxy);
if(FAILED(hres)) { if(FAILED(hres)) {
IInternetProtocolSink_Release(protocol_sink); IInternetProtocolSink_Release(protocol_sink);
return hres; return hres;
@ -381,7 +381,7 @@ static ULONG WINAPI BindProtocol_Release(IInternetProtocolEx *iface)
IInternetProtocol_Release(This->protocol); IInternetProtocol_Release(This->protocol);
if(This->bind_info) if(This->bind_info)
IInternetBindInfo_Release(This->bind_info); IInternetBindInfo_Release(This->bind_info);
if(This->protocol_handler && This->protocol_handler != (IInternetProtocol*)PROTOCOLHANDLER(This)) if(This->protocol_handler && This->protocol_handler != PROTOCOLHANDLER(This))
IInternetProtocol_Release(This->protocol_handler); IInternetProtocol_Release(This->protocol_handler);
if(This->filter_proxy) if(This->filter_proxy)
IInternetProtocol_Release(PROTOCOL(This->filter_proxy)); IInternetProtocol_Release(PROTOCOL(This->filter_proxy));
@ -660,25 +660,25 @@ static const IInternetProtocolExVtbl BindProtocolVtbl = {
#define PROTOCOLHANDLER_THIS(iface) DEFINE_THIS(BindProtocol, IInternetProtocolHandler, iface) #define PROTOCOLHANDLER_THIS(iface) DEFINE_THIS(BindProtocol, IInternetProtocolHandler, iface)
static HRESULT WINAPI ProtocolHandler_QueryInterface(IInternetProtocolEx *iface, REFIID riid, void **ppv) static HRESULT WINAPI ProtocolHandler_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv)
{ {
ERR("should not be called\n"); ERR("should not be called\n");
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI ProtocolHandler_AddRef(IInternetProtocolEx *iface) static ULONG WINAPI ProtocolHandler_AddRef(IInternetProtocol *iface)
{ {
BindProtocol *This = PROTOCOLHANDLER_THIS(iface); BindProtocol *This = PROTOCOLHANDLER_THIS(iface);
return IInternetProtocolEx_AddRef(PROTOCOLEX(This)); return IInternetProtocolEx_AddRef(PROTOCOLEX(This));
} }
static ULONG WINAPI ProtocolHandler_Release(IInternetProtocolEx *iface) static ULONG WINAPI ProtocolHandler_Release(IInternetProtocol *iface)
{ {
BindProtocol *This = PROTOCOLHANDLER_THIS(iface); BindProtocol *This = PROTOCOLHANDLER_THIS(iface);
return IInternetProtocolEx_Release(PROTOCOLEX(This)); return IInternetProtocolEx_Release(PROTOCOLEX(This));
} }
static HRESULT WINAPI ProtocolHandler_Start(IInternetProtocolEx *iface, LPCWSTR szUrl, static HRESULT WINAPI ProtocolHandler_Start(IInternetProtocol *iface, LPCWSTR szUrl,
IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo,
DWORD grfPI, HANDLE_PTR dwReserved) DWORD grfPI, HANDLE_PTR dwReserved)
{ {
@ -686,7 +686,7 @@ static HRESULT WINAPI ProtocolHandler_Start(IInternetProtocolEx *iface, LPCWSTR
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI ProtocolHandler_Continue(IInternetProtocolEx *iface, PROTOCOLDATA *pProtocolData) static HRESULT WINAPI ProtocolHandler_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData)
{ {
BindProtocol *This = PROTOCOLHANDLER_THIS(iface); BindProtocol *This = PROTOCOLHANDLER_THIS(iface);
HRESULT hres; HRESULT hres;
@ -699,7 +699,7 @@ static HRESULT WINAPI ProtocolHandler_Continue(IInternetProtocolEx *iface, PROTO
return hres; return hres;
} }
static HRESULT WINAPI ProtocolHandler_Abort(IInternetProtocolEx *iface, HRESULT hrReason, static HRESULT WINAPI ProtocolHandler_Abort(IInternetProtocol *iface, HRESULT hrReason,
DWORD dwOptions) DWORD dwOptions)
{ {
BindProtocol *This = PROTOCOLHANDLER_THIS(iface); BindProtocol *This = PROTOCOLHANDLER_THIS(iface);
@ -712,7 +712,7 @@ static HRESULT WINAPI ProtocolHandler_Abort(IInternetProtocolEx *iface, HRESULT
return S_OK; return S_OK;
} }
static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocolEx *iface, DWORD dwOptions) static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD dwOptions)
{ {
BindProtocol *This = PROTOCOLHANDLER_THIS(iface); BindProtocol *This = PROTOCOLHANDLER_THIS(iface);
@ -738,21 +738,21 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocolEx *iface, DWOR
return S_OK; return S_OK;
} }
static HRESULT WINAPI ProtocolHandler_Suspend(IInternetProtocolEx *iface) static HRESULT WINAPI ProtocolHandler_Suspend(IInternetProtocol *iface)
{ {
BindProtocol *This = PROTOCOLHANDLER_THIS(iface); BindProtocol *This = PROTOCOLHANDLER_THIS(iface);
FIXME("(%p)\n", This); FIXME("(%p)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI ProtocolHandler_Resume(IInternetProtocolEx *iface) static HRESULT WINAPI ProtocolHandler_Resume(IInternetProtocol *iface)
{ {
BindProtocol *This = PROTOCOLHANDLER_THIS(iface); BindProtocol *This = PROTOCOLHANDLER_THIS(iface);
FIXME("(%p)\n", This); FIXME("(%p)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI ProtocolHandler_Read(IInternetProtocolEx *iface, void *pv, static HRESULT WINAPI ProtocolHandler_Read(IInternetProtocol *iface, void *pv,
ULONG cb, ULONG *pcbRead) ULONG cb, ULONG *pcbRead)
{ {
BindProtocol *This = PROTOCOLHANDLER_THIS(iface); BindProtocol *This = PROTOCOLHANDLER_THIS(iface);
@ -786,7 +786,7 @@ static HRESULT WINAPI ProtocolHandler_Read(IInternetProtocolEx *iface, void *pv,
return hres; return hres;
} }
static HRESULT WINAPI ProtocolHandler_Seek(IInternetProtocolEx *iface, LARGE_INTEGER dlibMove, static HRESULT WINAPI ProtocolHandler_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove,
DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition)
{ {
BindProtocol *This = PROTOCOLHANDLER_THIS(iface); BindProtocol *This = PROTOCOLHANDLER_THIS(iface);
@ -794,7 +794,7 @@ static HRESULT WINAPI ProtocolHandler_Seek(IInternetProtocolEx *iface, LARGE_INT
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI ProtocolHandler_LockRequest(IInternetProtocolEx *iface, DWORD dwOptions) static HRESULT WINAPI ProtocolHandler_LockRequest(IInternetProtocol *iface, DWORD dwOptions)
{ {
BindProtocol *This = PROTOCOLHANDLER_THIS(iface); BindProtocol *This = PROTOCOLHANDLER_THIS(iface);
@ -803,7 +803,7 @@ static HRESULT WINAPI ProtocolHandler_LockRequest(IInternetProtocolEx *iface, DW
return IInternetProtocol_LockRequest(This->protocol, dwOptions); return IInternetProtocol_LockRequest(This->protocol, dwOptions);
} }
static HRESULT WINAPI ProtocolHandler_UnlockRequest(IInternetProtocolEx *iface) static HRESULT WINAPI ProtocolHandler_UnlockRequest(IInternetProtocol *iface)
{ {
BindProtocol *This = PROTOCOLHANDLER_THIS(iface); BindProtocol *This = PROTOCOLHANDLER_THIS(iface);
@ -812,17 +812,9 @@ static HRESULT WINAPI ProtocolHandler_UnlockRequest(IInternetProtocolEx *iface)
return IInternetProtocol_UnlockRequest(This->protocol); return IInternetProtocol_UnlockRequest(This->protocol);
} }
static HRESULT WINAPI ProtocolHandler_StartEx(IInternetProtocolEx *iface, IUri *pUri,
IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo,
DWORD grfPI, HANDLE *dwReserved)
{
ERR("Should not be called\n");
return E_NOTIMPL;
}
#undef PROTOCOL_THIS #undef PROTOCOL_THIS
static const IInternetProtocolExVtbl InternetProtocolHandlerVtbl = { static const IInternetProtocolVtbl InternetProtocolHandlerVtbl = {
ProtocolHandler_QueryInterface, ProtocolHandler_QueryInterface,
ProtocolHandler_AddRef, ProtocolHandler_AddRef,
ProtocolHandler_Release, ProtocolHandler_Release,
@ -835,8 +827,7 @@ static const IInternetProtocolExVtbl InternetProtocolHandlerVtbl = {
ProtocolHandler_Read, ProtocolHandler_Read,
ProtocolHandler_Seek, ProtocolHandler_Seek,
ProtocolHandler_LockRequest, ProtocolHandler_LockRequest,
ProtocolHandler_UnlockRequest, ProtocolHandler_UnlockRequest
ProtocolHandler_StartEx
}; };
#define BINDINFO_THIS(iface) DEFINE_THIS(BindProtocol, InternetBindInfo, iface) #define BINDINFO_THIS(iface) DEFINE_THIS(BindProtocol, InternetBindInfo, iface)
@ -1365,7 +1356,7 @@ HRESULT create_binding_protocol(LPCWSTR url, BOOL from_urlmon, IInternetProtocol
ret->from_urlmon = from_urlmon; ret->from_urlmon = from_urlmon;
ret->apartment_thread = GetCurrentThreadId(); ret->apartment_thread = GetCurrentThreadId();
ret->notif_hwnd = get_notif_hwnd(); ret->notif_hwnd = get_notif_hwnd();
ret->protocol_handler = (IInternetProtocol*)PROTOCOLHANDLER(ret); ret->protocol_handler = PROTOCOLHANDLER(ret);
InitializeCriticalSection(&ret->section); InitializeCriticalSection(&ret->section);
URLMON_LockModule(); URLMON_LockModule();