Module: wine Branch: refs/heads/master Commit: 7c7603ca1e438aa050e557e24a594a4c3c193cab URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7c7603ca1e438aa050e557e2...
Author: Jacek Caban jacek@codeweavers.com Date: Wed May 17 18:25:33 2006 +0200
shdocvw: Move connection points to the new ConnectionPointContainer struct.
---
dlls/shdocvw/dochost.c | 4 ++-- dlls/shdocvw/events.c | 24 ++++++++++++------------ dlls/shdocvw/navigate.c | 2 +- dlls/shdocvw/shdocvw.h | 12 +++++++----- dlls/shdocvw/webbrowser.c | 10 +++++----- 5 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 7335f53..1680f1c 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -51,8 +51,8 @@ static void navigate_complete(DocHost *T V_VT(&url) = VT_BSTR; V_BSTR(&url) = This->url;
- call_sink(This->cp_wbe2, DISPID_NAVIGATECOMPLETE2, &dispparams); - call_sink(This->cp_wbe2, DISPID_DOCUMENTCOMPLETE, &dispparams); + call_sink(This->cps.wbe2, DISPID_NAVIGATECOMPLETE2, &dispparams); + call_sink(This->cps.wbe2, DISPID_DOCUMENTCOMPLETE, &dispparams);
if(disp) IDispatch_Release(disp); diff --git a/dlls/shdocvw/events.c b/dlls/shdocvw/events.c index 8d35728..194002b 100644 --- a/dlls/shdocvw/events.c +++ b/dlls/shdocvw/events.c @@ -88,13 +88,13 @@ static HRESULT WINAPI ConnectionPointCon
if(IsEqualGUID(&DIID_DWebBrowserEvents2, riid)) { TRACE("(%p)->(DIID_DWebBrowserEvents2 %p)\n", This, ppCP); - *ppCP = CONPOINT(This->doc_host.cp_wbe2); + *ppCP = CONPOINT(This->doc_host.cps.wbe2); }else if(IsEqualGUID(&DIID_DWebBrowserEvents, riid)) { TRACE("(%p)->(DIID_DWebBrowserEvents %p)\n", This, ppCP); - *ppCP = CONPOINT(This->doc_host.cp_wbe); + *ppCP = CONPOINT(This->doc_host.cps.wbe); }else if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { TRACE("(%p)->(IID_IPropertyNotifySink %p)\n", This, ppCP); - *ppCP = CONPOINT(This->doc_host.cp_pns); + *ppCP = CONPOINT(This->doc_host.cps.pns); }
if(*ppCP) { @@ -299,23 +299,23 @@ static void ConnectionPoint_Destroy(Conn
void DocHost_Events_Init(DocHost *This) { - ConnectionPoint_Create(This, &DIID_DWebBrowserEvents2, &This->cp_wbe2); - ConnectionPoint_Create(This, &DIID_DWebBrowserEvents, &This->cp_wbe); - ConnectionPoint_Create(This, &IID_IPropertyNotifySink, &This->cp_pns); + ConnectionPoint_Create(This, &DIID_DWebBrowserEvents2, &This->cps.wbe2); + ConnectionPoint_Create(This, &DIID_DWebBrowserEvents, &This->cps.wbe); + ConnectionPoint_Create(This, &IID_IPropertyNotifySink, &This->cps.pns); }
void DocHost_Events_Release(DocHost *This) { - ConnectionPoint_Destroy(This->cp_wbe2); - ConnectionPoint_Destroy(This->cp_wbe); - ConnectionPoint_Destroy(This->cp_pns); + ConnectionPoint_Destroy(This->cps.wbe2); + ConnectionPoint_Destroy(This->cps.wbe); + ConnectionPoint_Destroy(This->cps.pns); }
void WebBrowser_Events_Init(WebBrowser *This) { This->lpConnectionPointContainerVtbl = &ConnectionPointContainerVtbl;
- This->doc_host.cp_wbe2->container = CONPTCONT(This); - This->doc_host.cp_wbe->container = CONPTCONT(This); - This->doc_host.cp_pns->container = CONPTCONT(This); + This->doc_host.cps.wbe2->container = CONPTCONT(This); + This->doc_host.cps.wbe->container = CONPTCONT(This); + This->doc_host.cps.pns->container = CONPTCONT(This); } diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 9998624..6abc1f9 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -373,7 +373,7 @@ static void on_before_navigate2(DocHost V_VT(params+6) = (VT_DISPATCH); V_DISPATCH(params+6) = This->disp;
- call_sink(This->cp_wbe2, DISPID_BEFORENAVIGATE2, &dispparams); + call_sink(This->cps.wbe2, DISPID_BEFORENAVIGATE2, &dispparams);
SysFreeString(V_BSTR(&var_url)); if(post_data_len) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 0279aca..db7206a 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -52,6 +52,12 @@ extern HRESULT SHDOCVW_GetShellInstanceO typedef struct ConnectionPoint ConnectionPoint;
typedef struct { + ConnectionPoint *wbe2; + ConnectionPoint *wbe; + ConnectionPoint *pns; +} ConnectionPointContainer; + +typedef struct { const IOleClientSiteVtbl *lpOleClientSiteVtbl; const IOleInPlaceSiteVtbl *lpOleInPlaceSiteVtbl; const IDocHostUIHandler2Vtbl *lpDocHostUIHandlerVtbl; @@ -74,11 +80,7 @@ typedef struct {
LPOLESTR url;
- /* Connection points */ - - ConnectionPoint *cp_wbe2; - ConnectionPoint *cp_wbe; - ConnectionPoint *cp_pns; + ConnectionPointContainer cps; } DocHost;
typedef struct { diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 3b319de..b021d1b 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -518,7 +518,7 @@ static HRESULT WINAPI WebBrowser_put_Vis
V_VT(&arg) = VT_BOOL; V_BOOL(&arg) = Value; - call_sink(This->doc_host.cp_wbe2, DISPID_ONVISIBLE, &dispparams); + call_sink(This->doc_host.cps.wbe2, DISPID_ONVISIBLE, &dispparams);
return S_OK; } @@ -548,7 +548,7 @@ static HRESULT WINAPI WebBrowser_put_Sta
V_VT(&arg) = VT_BOOL; V_BOOL(&arg) = Value; - call_sink(This->doc_host.cp_wbe2, DISPID_ONSTATUSBAR, &dispparams); + call_sink(This->doc_host.cps.wbe2, DISPID_ONSTATUSBAR, &dispparams);
return S_OK; } @@ -592,7 +592,7 @@ static HRESULT WINAPI WebBrowser_put_Too
V_VT(&arg) = VT_BOOL; V_BOOL(&arg) = Value; - call_sink(This->doc_host.cp_wbe2, DISPID_ONTOOLBAR, &dispparams); + call_sink(This->doc_host.cps.wbe2, DISPID_ONTOOLBAR, &dispparams);
return S_OK; } @@ -622,7 +622,7 @@ static HRESULT WINAPI WebBrowser_put_Men
V_VT(&arg) = VT_BOOL; V_BOOL(&arg) = Value; - call_sink(This->doc_host.cp_wbe2, DISPID_ONMENUBAR, &dispparams); + call_sink(This->doc_host.cps.wbe2, DISPID_ONMENUBAR, &dispparams);
return S_OK; } @@ -822,7 +822,7 @@ static HRESULT WINAPI WebBrowser_put_Add
V_VT(&arg) = VT_BOOL; V_BOOL(&arg) = Value; - call_sink(This->doc_host.cp_wbe2, DISPID_ONADDRESSBAR, &dispparams); + call_sink(This->doc_host.cps.wbe2, DISPID_ONADDRESSBAR, &dispparams);
return S_OK; }