Jacek Caban : ieframe: Added IServiceProvider interface to InternetExplorer object.
Alexandre Julliard
julliard at winehq.org
Fri Jan 6 15:31:35 CST 2012
Module: wine
Branch: master
Commit: a3d645022680eee34e0e45865efa217bafa09ee4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3d645022680eee34e0e45865efa217bafa09ee4
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Jan 6 12:59:23 2012 +0100
ieframe: Added IServiceProvider interface to InternetExplorer object.
---
dlls/ieframe/ie.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
dlls/ieframe/ieframe.h | 1 +
2 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c
index 5fbc368..d29f64f 100644
--- a/dlls/ieframe/ie.c
+++ b/dlls/ieframe/ie.c
@@ -51,6 +51,9 @@ static HRESULT WINAPI InternetExplorer_QueryInterface(IWebBrowser2 *iface, REFII
}else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) {
TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv);
*ppv = &This->doc_host->doc_host.cps.IConnectionPointContainer_iface;
+ }else if(IsEqualGUID(&IID_IServiceProvider, riid)) {
+ TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv);
+ *ppv = &This->IServiceProvider_iface;
}else if(HlinkFrame_QI(&This->hlink_frame, riid, ppv)) {
return S_OK;
}
@@ -700,7 +703,49 @@ static const IWebBrowser2Vtbl InternetExplorerVtbl =
InternetExplorer_put_Resizable
};
+static inline InternetExplorer *impl_from_IServiceProvider(IServiceProvider *iface)
+{
+ return CONTAINING_RECORD(iface, InternetExplorer, IServiceProvider_iface);
+}
+
+static HRESULT WINAPI IEServiceProvider_QueryInterface(IServiceProvider *iface,
+ REFIID riid, LPVOID *ppv)
+{
+ InternetExplorer *This = impl_from_IServiceProvider(iface);
+ return IWebBrowser_QueryInterface(&This->IWebBrowser2_iface, riid, ppv);
+}
+
+static ULONG WINAPI IEServiceProvider_AddRef(IServiceProvider *iface)
+{
+ InternetExplorer *This = impl_from_IServiceProvider(iface);
+ return IWebBrowser_AddRef(&This->IWebBrowser2_iface);
+}
+
+static ULONG WINAPI IEServiceProvider_Release(IServiceProvider *iface)
+{
+ InternetExplorer *This = impl_from_IServiceProvider(iface);
+ return IWebBrowser_Release(&This->IWebBrowser2_iface);
+}
+
+static HRESULT WINAPI IEServiceProvider_QueryService(IServiceProvider *iface,
+ REFGUID guidService, REFIID riid, void **ppv)
+{
+ InternetExplorer *This = impl_from_IServiceProvider(iface);
+ FIXME("(%p)->(%s, %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv);
+ *ppv = NULL;
+ return E_NOINTERFACE;
+}
+
+static const IServiceProviderVtbl ServiceProviderVtbl =
+{
+ IEServiceProvider_QueryInterface,
+ IEServiceProvider_AddRef,
+ IEServiceProvider_Release,
+ IEServiceProvider_QueryService
+};
+
void InternetExplorer_WebBrowser_Init(InternetExplorer *This)
{
This->IWebBrowser2_iface.lpVtbl = &InternetExplorerVtbl;
+ This->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl;
}
diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h
index 026ab12..944b4ab 100644
--- a/dlls/ieframe/ieframe.h
+++ b/dlls/ieframe/ieframe.h
@@ -198,6 +198,7 @@ typedef struct {
struct InternetExplorer {
IWebBrowser2 IWebBrowser2_iface;
+ IServiceProvider IServiceProvider_iface;
HlinkFrame hlink_frame;
LONG ref;
More information about the wine-cvs
mailing list