Jacek Caban : urlmon: Added support for COM aggregation to ftp protocol handler.
Alexandre Julliard
julliard at winehq.org
Tue May 8 15:58:58 CDT 2018
Module: wine
Branch: master
Commit: 44a9940256189bac618bf0c062f10597691cbcb6
URL: https://source.winehq.org/git/wine.git/?a=commit;h=44a9940256189bac618bf0c062f10597691cbcb6
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue May 8 18:18:36 2018 +0200
urlmon: Added support for COM aggregation to ftp protocol handler.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/urlmon/ftp.c | 71 ++++++++++++++++++++++++++++++++------------
dlls/urlmon/tests/protocol.c | 1 +
2 files changed, 53 insertions(+), 19 deletions(-)
diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c
index da1efe2..aef4a6c 100644
--- a/dlls/urlmon/ftp.c
+++ b/dlls/urlmon/ftp.c
@@ -28,13 +28,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
typedef struct {
Protocol base;
+ IUnknown IUnknown_outer;
IInternetProtocolEx IInternetProtocolEx_iface;
IInternetPriority IInternetPriority_iface;
IWinInetHttpInfo IWinInetHttpInfo_iface;
LONG ref;
+ IUnknown *outer;
} FtpProtocol;
+static inline FtpProtocol *impl_from_IUnknown(IUnknown *iface)
+{
+ return CONTAINING_RECORD(iface, FtpProtocol, IUnknown_outer);
+}
+
static inline FtpProtocol *impl_from_IInternetProtocolEx(IInternetProtocolEx *iface)
{
return CONTAINING_RECORD(iface, FtpProtocol, IInternetProtocolEx_iface);
@@ -115,14 +122,13 @@ static const ProtocolVtbl AsyncProtocolVtbl = {
FtpProtocol_on_error
};
-static HRESULT WINAPI FtpProtocol_QueryInterface(IInternetProtocolEx *iface, REFIID riid, void **ppv)
+static HRESULT WINAPI FtpProtocolUnk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv)
{
- FtpProtocol *This = impl_from_IInternetProtocolEx(iface);
+ FtpProtocol *This = impl_from_IUnknown(iface);
- *ppv = NULL;
if(IsEqualGUID(&IID_IUnknown, riid)) {
TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
- *ppv = &This->IInternetProtocolEx_iface;
+ *ppv = &This->IUnknown_outer;
}else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) {
TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv);
*ppv = &This->IInternetProtocolEx_iface;
@@ -141,28 +147,27 @@ static HRESULT WINAPI FtpProtocol_QueryInterface(IInternetProtocolEx *iface, REF
}else if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) {
TRACE("(%p)->(IID_IWinInetHttpInfo %p)\n", This, ppv);
*ppv = &This->IWinInetHttpInfo_iface;
+ }else {
+ *ppv = NULL;
+ WARN("not supported interface %s\n", debugstr_guid(riid));
+ return E_NOINTERFACE;
}
- if(*ppv) {
- IInternetProtocolEx_AddRef(iface);
- return S_OK;
- }
-
- WARN("not supported interface %s\n", debugstr_guid(riid));
- return E_NOINTERFACE;
+ IUnknown_AddRef((IUnknown*)*ppv);
+ return S_OK;
}
-static ULONG WINAPI FtpProtocol_AddRef(IInternetProtocolEx *iface)
+static ULONG WINAPI FtpProtocolUnk_AddRef(IUnknown *iface)
{
- FtpProtocol *This = impl_from_IInternetProtocolEx(iface);
+ FtpProtocol *This = impl_from_IUnknown(iface);
LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
return ref;
}
-static ULONG WINAPI FtpProtocol_Release(IInternetProtocolEx *iface)
+static ULONG WINAPI FtpProtocolUnk_Release(IUnknown *iface)
{
- FtpProtocol *This = impl_from_IInternetProtocolEx(iface);
+ FtpProtocol *This = impl_from_IUnknown(iface);
LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
@@ -177,6 +182,33 @@ static ULONG WINAPI FtpProtocol_Release(IInternetProtocolEx *iface)
return ref;
}
+static const IUnknownVtbl FtpProtocolUnkVtbl = {
+ FtpProtocolUnk_QueryInterface,
+ FtpProtocolUnk_AddRef,
+ FtpProtocolUnk_Release
+};
+
+static HRESULT WINAPI FtpProtocol_QueryInterface(IInternetProtocolEx *iface, REFIID riid, void **ppv)
+{
+ FtpProtocol *This = impl_from_IInternetProtocolEx(iface);
+ TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv);
+ return IUnknown_QueryInterface(This->outer, riid, ppv);
+}
+
+static ULONG WINAPI FtpProtocol_AddRef(IInternetProtocolEx *iface)
+{
+ FtpProtocol *This = impl_from_IInternetProtocolEx(iface);
+ TRACE("(%p)\n", This);
+ return IUnknown_AddRef(This->outer);
+}
+
+static ULONG WINAPI FtpProtocol_Release(IInternetProtocolEx *iface)
+{
+ FtpProtocol *This = impl_from_IInternetProtocolEx(iface);
+ TRACE("(%p)\n", This);
+ return IUnknown_Release(This->outer);
+}
+
static HRESULT WINAPI FtpProtocol_Start(IInternetProtocolEx *iface, LPCWSTR szUrl,
IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo,
DWORD grfPI, HANDLE_PTR dwReserved)
@@ -416,23 +448,24 @@ static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = {
HttpInfo_QueryInfo
};
-HRESULT FtpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj)
+HRESULT FtpProtocol_Construct(IUnknown *outer, void **ppv)
{
FtpProtocol *ret;
- TRACE("(%p %p)\n", pUnkOuter, ppobj);
+ TRACE("(%p %p)\n", outer, ppv);
URLMON_LockModule();
ret = heap_alloc_zero(sizeof(FtpProtocol));
ret->base.vtbl = &AsyncProtocolVtbl;
+ ret->IUnknown_outer.lpVtbl = &FtpProtocolUnkVtbl;
ret->IInternetProtocolEx_iface.lpVtbl = &FtpProtocolVtbl;
ret->IInternetPriority_iface.lpVtbl = &FtpPriorityVtbl;
ret->IWinInetHttpInfo_iface.lpVtbl = &WinInetHttpInfoVtbl;
ret->ref = 1;
+ ret->outer = outer ? outer : &ret->IUnknown_outer;
- *ppobj = &ret->IInternetProtocolEx_iface;
-
+ *ppv = &ret->IUnknown_outer;
return S_OK;
}
diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c
index 233a2c0..043724b 100644
--- a/dlls/urlmon/tests/protocol.c
+++ b/dlls/urlmon/tests/protocol.c
@@ -4103,6 +4103,7 @@ START_TEST(protocol)
test_com_aggregation(&CLSID_FileProtocol);
test_com_aggregation(&CLSID_HttpProtocol);
test_com_aggregation(&CLSID_HttpSProtocol);
+ test_com_aggregation(&CLSID_FtpProtocol);
OleUninitialize();
}
More information about the wine-cvs
mailing list