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