May 2006 - Wine-Commits - list.winehq.org

Jacek Caban : shdocvw: Code cleanup.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: 21196a084aea2fd1cd6e20ebdf72ae7b5ea6f96e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=21196a084aea2fd1cd6e20e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 17 18:28:13 2006 +0200 shdocvw: Code cleanup. --- dlls/shdocvw/client.c | 2 +- dlls/shdocvw/oleobject.c | 4 ++-- dlls/shdocvw/shdocvw.h | 5 ++--- dlls/shdocvw/webbrowser.c | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index 41cc176..6ba5d03 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -52,7 +52,7 @@ static HRESULT WINAPI ClientSite_QueryIn *ppv = DOCSITE(This); }else if(IsEqualGUID(&IID_IOleCommandTarget, riid)) { TRACE("(%p)->(IID_IOleCommandTarget %p)\n", This, ppv); - *ppv = CLOLECMD(This); + *ppv = OLECMD(This); }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = CLDISP(This); diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 0b7188c..8c584bc 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -700,7 +700,7 @@ static const IOleInPlaceActiveObjectVtbl InPlaceActiveObject_EnableModeless }; -#define OLECMD_THIS(iface) DEFINE_THIS(WebBrowser, WBOleCommandTarget, iface) +#define OLECMD_THIS(iface) DEFINE_THIS(WebBrowser, OleCommandTarget, iface) static HRESULT WINAPI WBOleCommandTarget_QueryInterface(IOleCommandTarget *iface, REFIID riid, void **ppv) @@ -756,7 +756,7 @@ void WebBrowser_OleObject_Init(WebBrowse This->lpOleInPlaceObjectVtbl = &OleInPlaceObjectVtbl; This->lpOleControlVtbl = &OleControlVtbl; This->lpOleInPlaceActiveObjectVtbl = &OleInPlaceActiveObjectVtbl; - This->lpWBOleCommandTargetVtbl = &OleCommandTargetVtbl; + This->lpOleCommandTargetVtbl = &OleCommandTargetVtbl; This->client = NULL; This->inplace = NULL; diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 2cad496..b8d5f99 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -99,7 +99,7 @@ typedef struct { const IProvideClassInfo2Vtbl *lpProvideClassInfoVtbl; const IViewObject2Vtbl *lpViewObjectVtbl; const IOleInPlaceActiveObjectVtbl *lpOleInPlaceActiveObjectVtbl; - const IOleCommandTargetVtbl *lpWBOleCommandTargetVtbl; + const IOleCommandTargetVtbl *lpOleCommandTargetVtbl; const IHlinkFrameVtbl *lpHlinkFrameVtbl; LONG ref; @@ -151,7 +151,7 @@ #define CONPTCONT(x) ((IConnectionPoi #define VIEWOBJ(x) ((IViewObject*) &(x)->lpViewObjectVtbl); #define VIEWOBJ2(x) ((IViewObject2*) &(x)->lpViewObjectVtbl); #define ACTIVEOBJ(x) ((IOleInPlaceActiveObject*) &(x)->lpOleInPlaceActiveObjectVtbl) -#define WBOLECMD(x) ((IOleCommandTarget*) &(x)->lpWBOleCommandTargetVtbl) +#define OLECMD(x) ((IOleCommandTarget*) &(x)->lpOleCommandTargetVtbl) #define HLINKFRAME(x) ((IHlinkFrame*) &(x)->lpHlinkFrameVtbl) #define CLIENTSITE(x) ((IOleClientSite*) &(x)->lpOleClientSiteVtbl) @@ -159,7 +159,6 @@ #define INPLACESITE(x) ((IOleInPlaceSit #define DOCHOSTUI(x) ((IDocHostUIHandler*) &(x)->lpDocHostUIHandlerVtbl) #define DOCHOSTUI2(x) ((IDocHostUIHandler2*) &(x)->lpDocHostUIHandlerVtbl) #define DOCSITE(x) ((IOleDocumentSite*) &(x)->lpOleDocumentSiteVtbl) -#define CLOLECMD(x) ((IOleCommandTarget*) &(x)->lpOleCommandTargetVtbl) #define CLDISP(x) ((IDispatch*) &(x)->lpDispatchVtbl) #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index ca17166..6dd8105 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -95,7 +95,7 @@ static HRESULT WINAPI WebBrowser_QueryIn *ppv = ACTIVEOBJ(This); }else if(IsEqualGUID(&IID_IOleCommandTarget, riid)) { TRACE("(%p)->(IID_IOleCommandTarget %p)\n", This, ppv); - *ppv = WBOLECMD(This); + *ppv = OLECMD(This); }else if(IsEqualGUID(&IID_IHlinkFrame, riid)) { TRACE("(%p)->(IID_IHlinkFrame %p)\n", This, ppv); *ppv = HLINKFRAME(This);

1 0

Jacek Caban : shdocvw: Added IConnectionPointContainer to InternetExplorer: :QueryInterface.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: 7ac9bc4d6e51867d16db9e9bd7834251a58ba17a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7ac9bc4d6e51867d16db9e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 17 18:27:23 2006 +0200 shdocvw: Added IConnectionPointContainer to InternetExplorer::QueryInterface. --- dlls/shdocvw/ie.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/ie.c b/dlls/shdocvw/ie.c index 354ad3c..b17f8de 100644 --- a/dlls/shdocvw/ie.c +++ b/dlls/shdocvw/ie.c @@ -44,6 +44,9 @@ static HRESULT WINAPI InternetExplorer_Q }else if(IsEqualGUID(&IID_IWebBrowser2, riid)) { TRACE("(%p)->(IID_IWebBrowser2 %p)\n", This, ppv); *ppv = WEBBROWSER(This); + }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { + TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); + *ppv = CONPTCONT(&This->doc_host.cps); } if(*ppv) {

1 0

Jacek Caban : shdocvw: Move IConnectionPointContainer implementation to separated object.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: 0b613f291ff836255723543b342cdaca97b4434f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0b613f291ff836255723543… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 17 18:26:30 2006 +0200 shdocvw: Move IConnectionPointContainer implementation to separated object. --- dlls/shdocvw/dochost.c | 6 +++- dlls/shdocvw/events.c | 67 +++++++++++++++++++++------------------------ dlls/shdocvw/shdocvw.h | 11 +++++-- dlls/shdocvw/webbrowser.c | 3 +- 4 files changed, 43 insertions(+), 44 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 1680f1c..a22b319 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -494,13 +494,15 @@ void DocHost_Init(DocHost *This, IDispat DocHost_ClientSite_Init(This); DocHost_Frame_Init(This); - DocHost_Events_Init(This); + + ConnectionPointContainer_Init(&This->cps, (IUnknown*)disp); } void DocHost_Release(DocHost *This) { DocHost_ClientSite_Release(This); - DocHost_Events_Release(This); + + ConnectionPointContainer_Destroy(&This->cps); SysFreeString(This->url); } diff --git a/dlls/shdocvw/events.c b/dlls/shdocvw/events.c index 194002b..3f65375 100644 --- a/dlls/shdocvw/events.c +++ b/dlls/shdocvw/events.c @@ -5,6 +5,7 @@ * - IConnectionPoint * * Copyright 2001 John R. Sheets (for CodeWeavers) + * Copyright 2006 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,7 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); struct ConnectionPoint { const IConnectionPointVtbl *lpConnectionPointVtbl; - DocHost *doc_host; IConnectionPointContainer *container; IDispatch **sinks; @@ -45,31 +45,31 @@ #define CONPOINT(x) ((IConnectionPoint* * Implement the IConnectionPointContainer interface */ -#define CONPTCONT_THIS(iface) DEFINE_THIS(WebBrowser, ConnectionPointContainer, iface) +#define CONPTCONT_THIS(iface) DEFINE_THIS(ConnectionPointContainer, ConnectionPointContainer, iface) static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, - REFIID riid, LPVOID *ppobj) + REFIID riid, LPVOID *ppv) { - WebBrowser *This = CONPTCONT_THIS(iface); - return IWebBrowser_QueryInterface(WEBBROWSER(This), riid, ppobj); + ConnectionPointContainer *This = CONPTCONT_THIS(iface); + return IUnknown_QueryInterface(This->impl, riid, ppv); } static ULONG WINAPI ConnectionPointContainer_AddRef(IConnectionPointContainer *iface) { - WebBrowser *This = CONPTCONT_THIS(iface); - return IWebBrowser_AddRef(WEBBROWSER(This)); + ConnectionPointContainer *This = CONPTCONT_THIS(iface); + return IUnknown_AddRef(This->impl); } static ULONG WINAPI ConnectionPointContainer_Release(IConnectionPointContainer *iface) { - WebBrowser *This = CONPTCONT_THIS(iface); - return IWebBrowser_Release(WEBBROWSER(This)); + ConnectionPointContainer *This = CONPTCONT_THIS(iface); + return IUnknown_Release(This->impl); } static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionPointContainer *iface, LPENUMCONNECTIONPOINTS *ppEnum) { - WebBrowser *This = CONPTCONT_THIS(iface); + ConnectionPointContainer *This = CONPTCONT_THIS(iface); FIXME("(%p)->(%p)\n", This, ppEnum); return E_NOTIMPL; } @@ -77,7 +77,7 @@ static HRESULT WINAPI ConnectionPointCon static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface, REFIID riid, LPCONNECTIONPOINT *ppCP) { - WebBrowser *This = CONPTCONT_THIS(iface); + ConnectionPointContainer *This = CONPTCONT_THIS(iface); if(!ppCP) { WARN("ppCP == NULL\n"); @@ -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.cps.wbe2); + *ppCP = CONPOINT(This->wbe2); }else if(IsEqualGUID(&DIID_DWebBrowserEvents, riid)) { TRACE("(%p)->(DIID_DWebBrowserEvents %p)\n", This, ppCP); - *ppCP = CONPOINT(This->doc_host.cps.wbe); + *ppCP = CONPOINT(This->wbe); }else if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { TRACE("(%p)->(IID_IPropertyNotifySink %p)\n", This, ppCP); - *ppCP = CONPOINT(This->doc_host.cps.pns); + *ppCP = CONPOINT(This->pns); } if(*ppCP) { @@ -140,7 +140,7 @@ static HRESULT WINAPI ConnectionPoint_Qu } if(*ppv) { - IOleClientSite_AddRef(CLIENTSITE(This->doc_host)); + IConnectionPointContainer_AddRef(This->container); return S_OK; } @@ -151,13 +151,13 @@ static HRESULT WINAPI ConnectionPoint_Qu static ULONG WINAPI ConnectionPoint_AddRef(IConnectionPoint *iface) { ConnectionPoint *This = CONPOINT_THIS(iface); - return IOleClientSite_AddRef(CLIENTSITE(This->doc_host)); + return IConnectionPointContainer_AddRef(This->container); } static ULONG WINAPI ConnectionPoint_Release(IConnectionPoint *iface) { ConnectionPoint *This = CONPOINT_THIS(iface); - return IOleClientSite_Release(CLIENTSITE(This->doc_host)); + return IConnectionPointContainer_Release(This->container); } static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *iface, IID *pIID) @@ -268,16 +268,16 @@ void call_sink(ConnectionPoint *This, DI } } -static void ConnectionPoint_Create(DocHost *doc_host, REFIID riid, ConnectionPoint **cp) +static void ConnectionPoint_Create(REFIID riid, ConnectionPoint **cp, + IConnectionPointContainer *container) { ConnectionPoint *ret = shdocvw_alloc(sizeof(ConnectionPoint)); ret->lpConnectionPointVtbl = &ConnectionPointVtbl; - ret->doc_host = doc_host; ret->sinks = NULL; ret->sinks_size = 0; - ret->container = NULL; + ret->container = container; memcpy(&ret->iid, riid, sizeof(IID)); @@ -297,25 +297,20 @@ static void ConnectionPoint_Destroy(Conn shdocvw_free(This); } -void DocHost_Events_Init(DocHost *This) +void ConnectionPointContainer_Init(ConnectionPointContainer *This, IUnknown *impl) { - ConnectionPoint_Create(This, &DIID_DWebBrowserEvents2, &This->cps.wbe2); - ConnectionPoint_Create(This, &DIID_DWebBrowserEvents, &This->cps.wbe); - ConnectionPoint_Create(This, &IID_IPropertyNotifySink, &This->cps.pns); -} + This->lpConnectionPointContainerVtbl = &ConnectionPointContainerVtbl; -void DocHost_Events_Release(DocHost *This) -{ - ConnectionPoint_Destroy(This->cps.wbe2); - ConnectionPoint_Destroy(This->cps.wbe); - ConnectionPoint_Destroy(This->cps.pns); + ConnectionPoint_Create(&DIID_DWebBrowserEvents2, &This->wbe2, CONPTCONT(This)); + ConnectionPoint_Create(&DIID_DWebBrowserEvents, &This->wbe, CONPTCONT(This)); + ConnectionPoint_Create(&IID_IPropertyNotifySink, &This->pns, CONPTCONT(This)); + + This->impl = impl; } -void WebBrowser_Events_Init(WebBrowser *This) +void ConnectionPointContainer_Destroy(ConnectionPointContainer *This) { - This->lpConnectionPointContainerVtbl = &ConnectionPointContainerVtbl; - - This->doc_host.cps.wbe2->container = CONPTCONT(This); - This->doc_host.cps.wbe->container = CONPTCONT(This); - This->doc_host.cps.pns->container = CONPTCONT(This); + ConnectionPoint_Destroy(This->wbe2); + ConnectionPoint_Destroy(This->wbe); + ConnectionPoint_Destroy(This->pns); } diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index db7206a..2cad496 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -52,9 +52,13 @@ extern HRESULT SHDOCVW_GetShellInstanceO typedef struct ConnectionPoint ConnectionPoint; typedef struct { + const IConnectionPointContainerVtbl *lpConnectionPointContainerVtbl; + ConnectionPoint *wbe2; ConnectionPoint *wbe; ConnectionPoint *pns; + + IUnknown *impl; } ConnectionPointContainer; typedef struct { @@ -93,7 +97,6 @@ typedef struct { const IPersistStorageVtbl *lpPersistStorageVtbl; const IPersistStreamInitVtbl *lpPersistStreamInitVtbl; const IProvideClassInfo2Vtbl *lpProvideClassInfoVtbl; - const IConnectionPointContainerVtbl *lpConnectionPointContainerVtbl; const IViewObject2Vtbl *lpViewObjectVtbl; const IOleInPlaceActiveObjectVtbl *lpOleInPlaceActiveObjectVtbl; const IOleCommandTargetVtbl *lpWBOleCommandTargetVtbl; @@ -166,19 +169,19 @@ void WebBrowser_OleObject_Init(WebBrowse void WebBrowser_ViewObject_Init(WebBrowser*); void WebBrowser_Persist_Init(WebBrowser*); void WebBrowser_ClassInfo_Init(WebBrowser*); -void WebBrowser_Events_Init(WebBrowser*); void WebBrowser_HlinkFrame_Init(WebBrowser*); void WebBrowser_OleObject_Destroy(WebBrowser*); void DocHost_Init(DocHost*,IDispatch*); void DocHost_ClientSite_Init(DocHost*); -void DocHost_Events_Init(DocHost*); void DocHost_Frame_Init(DocHost*); void DocHost_Release(DocHost*); void DocHost_ClientSite_Release(DocHost*); -void DocHost_Events_Release(DocHost*); + +void ConnectionPointContainer_Init(ConnectionPointContainer*,IUnknown*); +void ConnectionPointContainer_Destroy(ConnectionPointContainer*); HRESULT WebBrowser_Create(IUnknown*,REFIID,void**); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index b021d1b..ca17166 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -83,7 +83,7 @@ static HRESULT WINAPI WebBrowser_QueryIn *ppv = CLASSINFO(This); }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); - *ppv = CONPTCONT(This); + *ppv = CONPTCONT(&This->doc_host.cps); }else if(IsEqualGUID(&IID_IViewObject, riid)) { TRACE("(%p)->(IID_IViewObject %p)\n", This, ppv); *ppv = VIEWOBJ(This); @@ -942,7 +942,6 @@ HRESULT WebBrowser_Create(IUnknown *pOut WebBrowser_ViewObject_Init(ret); WebBrowser_Persist_Init(ret); WebBrowser_ClassInfo_Init(ret); - WebBrowser_Events_Init(ret); WebBrowser_HlinkFrame_Init(ret); hres = IWebBrowser_QueryInterface(WEBBROWSER(ret), riid, ppv);

1 0

Jacek Caban : shdocvw: Move connection points to the new ConnectionPointContainer struct.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: 7c7603ca1e438aa050e557e24a594a4c3c193cab URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7c7603ca1e438aa050e557e… Author: Jacek Caban <jacek(a)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; }

1 0

Jacek Caban : widl: Added importlib reading implementation.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: 6137e1b60a12094681318d6806f97c0b47a26764 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6137e1b60a12094681318d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 15 21:55:04 2006 +0200 widl: Added importlib reading implementation. --- tools/widl/typelib.c | 127 +++++++++++++++++++++++++++++++++++++++++++ tools/widl/typelib_struct.h | 4 + tools/widl/widltypes.h | 28 +++++++++ 3 files changed, 158 insertions(+), 1 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index fb8fd66..77d5155 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -2,6 +2,7 @@ * IDL Compiler * * Copyright 2004 Ove Kaaven + * Copyright 2006 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,20 +20,33 @@ */ #include "config.h" +#include "wine/port.h" +#include "wine/wpp.h" #include <stdio.h> #include <stdlib.h> +#include <stdarg.h> #include <unistd.h> #include <string.h> #include <assert.h> #include <ctype.h> #include <signal.h> +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "windef.h" +#include "winbase.h" + +#include "wine/unicode.h" + #include "widl.h" #include "utils.h" #include "parser.h" #include "header.h" #include "typelib.h" +#include "widltypes.h" +#include "typelib_struct.h" int in_typelib = 0; @@ -279,9 +293,122 @@ void add_typedef(type_t *tdef, var_t *na typelib->entry = entry; } +static void tlb_read(int fd, void *buf, size_t count) +{ + if(read(fd, buf, count) < count) + error("error while reading importlib.\n"); +} + +static void tlb_lseek(int fd, off_t offset) +{ + if(lseek(fd, offset, SEEK_SET) == -1) + error("lseek failed\n"); +} + +static void msft_read_guid(int fd, MSFT_SegDir *segdir, int offset, GUID *guid) +{ + tlb_lseek(fd, segdir->pGuidTab.offset+offset); + tlb_read(fd, guid, sizeof(GUID)); +} + +static void read_msft_importlib(importlib_t *importlib, int fd) +{ + MSFT_Header header; + MSFT_SegDir segdir; + int *typeinfo_offs; + int i; + + importlib->allocated = 0; + + tlb_lseek(fd, 0); + tlb_read(fd, &header, sizeof(header)); + + importlib->version = header.version; + + typeinfo_offs = xmalloc(header.nrtypeinfos*sizeof(INT)); + tlb_read(fd, typeinfo_offs, header.nrtypeinfos*sizeof(INT)); + tlb_read(fd, &segdir, sizeof(segdir)); + + msft_read_guid(fd, &segdir, header.posguid, &importlib->guid); + + importlib->ntypeinfos = header.nrtypeinfos; + importlib->importinfos = xmalloc(importlib->ntypeinfos*sizeof(importinfo_t)); + + for(i=0; i < importlib->ntypeinfos; i++) { + MSFT_TypeInfoBase base; + MSFT_NameIntro nameintro; + int len; + + tlb_lseek(fd, sizeof(MSFT_Header) + header.nrtypeinfos*sizeof(INT) + sizeof(MSFT_SegDir) + + typeinfo_offs[i]); + tlb_read(fd, &base, sizeof(base)); + + importlib->importinfos[i].importlib = importlib; + importlib->importinfos[i].flags = (base.typekind&0xf)<<24; + importlib->importinfos[i].offset = -1; + importlib->importinfos[i].id = i; + + if(base.posguid != -1) { + importlib->importinfos[i].flags |= MSFT_IMPINFO_OFFSET_IS_GUID; + msft_read_guid(fd, &segdir, base.posguid, &importlib->importinfos[i].guid); + } + + tlb_lseek(fd, segdir.pNametab.offset + base.NameOffset); + tlb_read(fd, &nameintro, sizeof(nameintro)); + + len = nameintro.namelen & 0xff; + + importlib->importinfos[i].name = xmalloc(len+1); + tlb_read(fd, importlib->importinfos[i].name, len); + importlib->importinfos[i].name[len] = 0; + } + + free(typeinfo_offs); +} + +static void read_importlib(importlib_t *importlib) +{ + int fd; + INT magic; + char *file_name; + + file_name = wpp_find_include(importlib->name, NULL); + if(file_name) { + fd = open(file_name, O_RDONLY); + free(file_name); + }else { + fd = open(importlib->name, O_RDONLY); + } + + if(fd < 0) + error("Could not open importlib %s.\n", importlib->name); + + tlb_read(fd, &magic, sizeof(magic)); + + switch(magic) { + case MSFT_MAGIC: + read_msft_importlib(importlib, fd); + break; + default: + error("Wrong or unsupported typelib magic %x\n", magic); + }; + + close(fd); +} + void add_importlib(const char *name) { + importlib_t *importlib; + if(!typelib) return; + importlib = xmalloc(sizeof(*importlib)); + importlib->name = xstrdup(name); + + read_importlib(importlib); + + LINK(importlib, typelib->importlibs); + typelib->importlibs = importlib; + warning("importlib is not yet supported.\n"); } diff --git a/tools/widl/typelib_struct.h b/tools/widl/typelib_struct.h index 961105c..6067abb 100644 --- a/tools/widl/typelib_struct.h +++ b/tools/widl/typelib_struct.h @@ -34,6 +34,8 @@ #define MSFT_HREFTYPE_INDEX(href) ((href * with ICreateTypeLib2 have "MSFT". */ +#define MSFT_MAGIC 0x5446534d + /***************************************************** * MSFT typelibs * @@ -162,7 +164,7 @@ typedef struct tagMSFT_ImpInfo { /* if clear oGuid is a typeinfo index in the specified typelib */ /* bits 24 - 31: TKIND of reference */ INT oImpFile; /* offset in the Import File table */ - INT oGuid; /* offset in Guid table or typeinfo index (see bit 16 of res0) */ + INT oGuid; /* offset in Guid table or typeinfo index (see bit 16 of flags) */ } MSFT_ImpInfo; #define MSFT_IMPINFO_OFFSET_IS_GUID 0x00010000 diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index a2d917b..83d2311 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -42,6 +42,8 @@ typedef struct _func_t func_t; typedef struct _ifref_t ifref_t; typedef struct _class_t class_t; typedef struct _typelib_entry_t typelib_entry_t; +typedef struct _importlib_t importlib_t; +typedef struct _importinfo_t importinfo_t; typedef struct _typelib_t typelib_t; #define DECL_LINK(type) \ @@ -260,11 +262,37 @@ struct _typelib_entry_t { DECL_LINK(typelib_entry_t) }; +struct _importinfo_t { + int offset; + GUID guid; + int flags; + int id; + + char *name; + + importlib_t *importlib; +}; + +struct _importlib_t { + char *name; + + int version; + GUID guid; + + importinfo_t *importinfos; + int ntypeinfos; + + int allocated; + + DECL_LINK(importlib_t); +}; + struct _typelib_t { char *name; char *filename; attr_t *attrs; typelib_entry_t *entry; + importlib_t *importlibs; }; #endif

1 0

Mikołaj Zalewski : comctl32: header: Don' t erase the left header egde.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: 3897015580d90ceb65a81222d3bc2854108a76e9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3897015580d90ceb65a8122… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed May 17 01:17:02 2006 +0200 comctl32: header: Don't erase the left header egde. --- dlls/comctl32/header.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 19d3889..d363e34 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -328,6 +328,7 @@ HEADER_DrawItem (HWND hwnd, HDC hdc, INT RECT rcBackground = r; rcBackground.right -= cxEdge; + rcBackground.left += cxEdge; FillRect(hdc, &rcBackground, hbr); DeleteObject(hbr); }

1 0

Mikołaj Zalewski : comctl32: header: Send the width in HDN_BEGINTRACK.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: 28e3ba552e5402403d40d4468069c0b8e5fbcbb2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=28e3ba552e5402403d40d44… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed May 17 01:13:45 2006 +0200 comctl32: header: Send the width in HDN_BEGINTRACK. --- dlls/comctl32/header.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 4dec2d7..19d3889 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1465,7 +1465,7 @@ HEADER_LButtonDown (HWND hwnd, WPARAM wP TRACE("Pressed item %d!\n", nItem); } else if ((flags == HHT_ONDIVIDER) || (flags == HHT_ONDIVOPEN)) { - if (!(HEADER_SendHeaderNotifyT (hwnd, HDN_BEGINTRACKW, nItem, 0, NULL))) { + if (!(HEADER_SendHeaderNotifyT (hwnd, HDN_BEGINTRACKW, nItem, HDI_WIDTH, NULL))) { SetCapture (hwnd); infoPtr->bCaptured = TRUE; infoPtr->bTracking = TRUE;

1 0

Mikołaj Zalewski : comctl32: listview: Recompute sizes after a column deletion.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: 117b8e792758769adc0ecd661ebe1ddfe586516f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=117b8e792758769adc0ecd6… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed May 17 01:20:22 2006 +0200 comctl32: listview: Recompute sizes after a column deletion. --- dlls/comctl32/listview.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e57e584..44fa653 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4430,6 +4430,7 @@ static BOOL LISTVIEW_DeleteColumn(LISTVI } /* update the other column info */ + LISTVIEW_UpdateItemSize(infoPtr); if(DPA_GetPtrCount(infoPtr->hdpaColumns) == 0) LISTVIEW_InvalidateList(infoPtr); else

1 0

Robert Shearman : rpcrt4: Implement NdrInterfacePointerMemorySize.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: a8c51a4cd99d042df8c85206440609669b9da38e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a8c51a4cd99d042df8c8520… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 17 14:46:06 2006 +0100 rpcrt4: Implement NdrInterfacePointerMemorySize. --- dlls/rpcrt4/ndr_ole.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index 4bdeefe..ba0404f 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -324,8 +324,17 @@ void WINAPI NdrInterfacePointerBufferSiz unsigned long WINAPI NdrInterfacePointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { - FIXME("(%p,%p): stub\n", pStubMsg, pFormat); - return 0; + ULONG size; + + TRACE("(%p,%p)\n", pStubMsg, pFormat); + + size = *(ULONG *)pStubMsg->Buffer; + pStubMsg->Buffer += 4; + pStubMsg->MemorySize += 4; + + pStubMsg->Buffer += size; + + return pStubMsg->MemorySize; } /***********************************************************************

1 0

Robert Shearman : rpcrt4: Make some functions that aren' t used outside of the file static.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: 45ee17899a63e5d3255a486f027825e70318adf5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=45ee17899a63e5d3255a486… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 17 14:45:30 2006 +0100 rpcrt4: Make some functions that aren't used outside of the file static. --- dlls/rpcrt4/ndr_marshall.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 3207719..4bbc94d 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1523,7 +1523,7 @@ void WINAPI NdrSimpleStructFree(PMIDL_ST } -unsigned long WINAPI EmbeddedComplexSize(PMIDL_STUB_MESSAGE pStubMsg, +static unsigned long EmbeddedComplexSize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { switch (*pFormat) { @@ -1550,7 +1550,7 @@ unsigned long WINAPI EmbeddedComplexSize } -unsigned long WINAPI EmbeddedComplexMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +static unsigned long EmbeddedComplexMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { NDR_MEMORYSIZE m = NdrMemorySizer[*pFormat & NDR_TABLE_MASK]; @@ -1565,7 +1565,7 @@ unsigned long WINAPI EmbeddedComplexMemo } -unsigned char * WINAPI ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, +static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, PFORMAT_STRING pPointer) @@ -1629,7 +1629,7 @@ unsigned char * WINAPI ComplexMarshall(P return pMemory; } -unsigned char * WINAPI ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, PFORMAT_STRING pPointer, @@ -1696,7 +1696,7 @@ unsigned char * WINAPI ComplexUnmarshall return pMemory; } -unsigned char * WINAPI ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +static unsigned char * ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, PFORMAT_STRING pPointer) @@ -1754,7 +1754,7 @@ unsigned char * WINAPI ComplexBufferSize return pMemory; } -unsigned char * WINAPI ComplexFree(PMIDL_STUB_MESSAGE pStubMsg, +static unsigned char * ComplexFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, PFORMAT_STRING pPointer) @@ -1810,7 +1810,7 @@ unsigned char * WINAPI ComplexFree(PMIDL return pMemory; } -unsigned long WINAPI ComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +static unsigned long ComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { PFORMAT_STRING desc;

1 0