Jacek Caban : shdocvw: Move IServiceProvider to DocHost object.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 3a9aeace0f1307b8c71b540cfa4c6530362671af
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=3a9aeace0f1307b8c71b540c...

Author: Jacek Caban 
Date:   Tue Apr 18 00:35:16 2006 +0200

shdocvw: Move IServiceProvider to DocHost object.

---

dlls/shdocvw/client.c  |   22 +++++++++++-----------
 dlls/shdocvw/shdocvw.h |    7 ++-----
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c
index 1e7fc7c..9082e12 100644
--- a/dlls/shdocvw/client.c
+++ b/dlls/shdocvw/client.c
@@ -58,7 +58,7 @@ static HRESULT WINAPI ClientSite_QueryIn
         *ppv = CLDISP(This);
     }else if(IsEqualGUID(&IID_IServiceProvider, riid)) {
         TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv);
-        *ppv = CLSERVPROV(This->wb);
+        *ppv = SERVPROV(This);
     }

if(*ppv) {
@@ -419,35 +419,35 @@ static const IDispatchVtbl DispatchVtbl 
     ClDispatch_Invoke
 };

-#define SERVPROV_THIS(iface) DEFINE_THIS(WebBrowser, ClServiceProvider, iface)
+#define SERVPROV_THIS(iface) DEFINE_THIS(DocHost, ServiceProvider, iface)

static HRESULT WINAPI ClServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid,
                                                        void **ppv)
 {
-    WebBrowser *This = SERVPROV_THIS(iface);
-    return IOleClientSite_QueryInterface(CLIENTSITE(&This->doc_host), riid, ppv);
+    DocHost *This = SERVPROV_THIS(iface);
+    return IOleClientSite_QueryInterface(CLIENTSITE(This), riid, ppv);
 }

static ULONG WINAPI ClServiceProvider_AddRef(IServiceProvider *iface)
 {
-    WebBrowser *This = SERVPROV_THIS(iface);
-    return IOleClientSite_AddRef(CLIENTSITE(&This->doc_host));
+    DocHost *This = SERVPROV_THIS(iface);
+    return IOleClientSite_AddRef(CLIENTSITE(This));
 }

static ULONG WINAPI ClServiceProvider_Release(IServiceProvider *iface)
 {
-    WebBrowser *This = SERVPROV_THIS(iface);
-    return IOleClientSite_Release(CLIENTSITE(&This->doc_host));
+    DocHost *This = SERVPROV_THIS(iface);
+    return IOleClientSite_Release(CLIENTSITE(This));
 }

static HRESULT WINAPI ClServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService,
                                                      REFIID riid, void **ppv)
 {
-    WebBrowser *This = SERVPROV_THIS(iface);
+    DocHost *This = SERVPROV_THIS(iface);

if(IsEqualGUID(&IID_IHlinkFrame, guidService)) {
         TRACE("(%p)->(IID_IHlinkFrame %s %p)\n", This, debugstr_guid(riid), ppv);
-        return IWebBrowser2_QueryInterface(WEBBROWSER(This), riid, ppv);
+        return IDispatch_QueryInterface(This->disp, riid, ppv);
     }

FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv);
@@ -470,7 +470,7 @@ void WebBrowser_ClientSite_Init(WebBrows
     This->doc_host.lpOleInPlaceSiteVtbl = &OleInPlaceSiteVtbl;
     This->doc_host.lpOleDocumentSiteVtbl = &OleDocumentSiteVtbl;
     This->doc_host.lpDispatchVtbl          = &DispatchVtbl;
-    This->lpClServiceProviderVtbl = &ServiceProviderVtbl;
+    This->doc_host.lpServiceProviderVtbl = &ServiceProviderVtbl;

This->doc_host.view = NULL;

diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h
index 64a31f1..658a33a 100644
--- a/dlls/shdocvw/shdocvw.h
+++ b/dlls/shdocvw/shdocvw.h
@@ -60,6 +60,7 @@ typedef struct {
     const IOleDocumentSiteVtbl    *lpOleDocumentSiteVtbl;
     const IOleCommandTargetVtbl   *lpOleCommandTargetVtbl;
     const IDispatchVtbl           *lpDispatchVtbl;
+    const IServiceProviderVtbl    *lpServiceProviderVtbl;

IDispatch *disp;

@@ -89,10 +90,6 @@ typedef struct WebBrowser {
     const IOleCommandTargetVtbl         *lpWBOleCommandTargetVtbl;
     const IHlinkFrameVtbl               *lpHlinkFrameVtbl;

-    /* Interfaces available for embeded document */
-
-    const IServiceProviderVtbl          *lpClServiceProviderVtbl;
-
     /* Interfaces of InPlaceFrame object */

const IOleInPlaceFrameVtbl          *lpOleInPlaceFrameVtbl;
@@ -148,7 +145,7 @@ typedef struct WebBrowser {
 #define DOCSITE(x)      ((IOleDocumentSite*)            &(x)->lpOleDocumentSiteVtbl)
 #define CLOLECMD(x)     ((IOleCommandTarget*)           &(x)->lpOleCommandTargetVtbl)
 #define CLDISP(x)       ((IDispatch*)                   &(x)->lpDispatchVtbl)
-#define CLSERVPROV(x)   ((IServiceProvider*)            &(x)->lpClServiceProviderVtbl)
+#define SERVPROV(x)     ((IServiceProvider*)            &(x)->lpServiceProviderVtbl)

#define INPLACEFRAME(x) ((IOleInPlaceFrame*)            &(x)->lpOleInPlaceFrameVtbl)