Module: wine Branch: master Commit: e068287c21850f1b6d2614bc7cb44bd63f28f6bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e068287c21850f1b6d2614bc7c...
Author: Michael Stefaniuc mstefani@redhat.de Date: Thu Dec 30 01:40:18 2010 +0100
mshtml: COM cleanup for the IHTMLDOMNode2 iface.
---
dlls/mshtml/htmlnode.c | 27 ++++++++++++++------------- dlls/mshtml/mshtml_private.h | 4 +--- 2 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 34a6c24..d6de2c8 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -838,40 +838,43 @@ static const IHTMLDOMNodeVtbl HTMLDOMNodeVtbl = { HTMLDOMNode_get_nextSibling };
-#define HTMLDOMNODE2_THIS(iface) DEFINE_THIS(HTMLDOMNode, HTMLDOMNode2, iface) +static inline HTMLDOMNode *impl_from_IHTMLDOMNode2(IHTMLDOMNode2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMNode, IHTMLDOMNode2_iface); +}
static HRESULT WINAPI HTMLDOMNode2_QueryInterface(IHTMLDOMNode2 *iface, REFIID riid, void **ppv) { - HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + HTMLDOMNode *This = impl_from_IHTMLDOMNode2(iface);
return IHTMLDOMNode_QueryInterface(&This->IHTMLDOMNode_iface, riid, ppv); }
static ULONG WINAPI HTMLDOMNode2_AddRef(IHTMLDOMNode2 *iface) { - HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + HTMLDOMNode *This = impl_from_IHTMLDOMNode2(iface);
return IHTMLDOMNode_AddRef(&This->IHTMLDOMNode_iface); }
static ULONG WINAPI HTMLDOMNode2_Release(IHTMLDOMNode2 *iface) { - HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + HTMLDOMNode *This = impl_from_IHTMLDOMNode2(iface);
return IHTMLDOMNode_Release(&This->IHTMLDOMNode_iface); }
static HRESULT WINAPI HTMLDOMNode2_GetTypeInfoCount(IHTMLDOMNode2 *iface, UINT *pctinfo) { - HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + HTMLDOMNode *This = impl_from_IHTMLDOMNode2(iface); return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->dispex), pctinfo); }
static HRESULT WINAPI HTMLDOMNode2_GetTypeInfo(IHTMLDOMNode2 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + HTMLDOMNode *This = impl_from_IHTMLDOMNode2(iface); return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); }
@@ -879,7 +882,7 @@ static HRESULT WINAPI HTMLDOMNode2_GetIDsOfNames(IHTMLDOMNode2 *iface, REFIID ri LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + HTMLDOMNode *This = impl_from_IHTMLDOMNode2(iface); return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); }
@@ -887,14 +890,14 @@ static HRESULT WINAPI HTMLDOMNode2_Invoke(IHTMLDOMNode2 *iface, DISPID dispIdMem REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + HTMLDOMNode *This = impl_from_IHTMLDOMNode2(iface); return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); }
static HRESULT WINAPI HTMLDOMNode2_get_ownerDocument(IHTMLDOMNode2 *iface, IDispatch **p) { - HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + HTMLDOMNode *This = impl_from_IHTMLDOMNode2(iface);
TRACE("(%p)->(%p)\n", This, p);
@@ -908,8 +911,6 @@ static HRESULT WINAPI HTMLDOMNode2_get_ownerDocument(IHTMLDOMNode2 *iface, IDisp return S_OK; }
-#undef HTMLDOMNODE2_THIS - static const IHTMLDOMNode2Vtbl HTMLDOMNode2Vtbl = { HTMLDOMNode2_QueryInterface, HTMLDOMNode2_AddRef, @@ -944,7 +945,7 @@ HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) *ppv = &This->IHTMLDOMNode_iface; }else if(IsEqualGUID(&IID_IHTMLDOMNode2, riid)) { TRACE("(%p)->(IID_IHTMLDOMNode2 %p)\n", This, ppv); - *ppv = HTMLDOMNODE2(This); + *ppv = &This->IHTMLDOMNode2_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; } @@ -987,7 +988,7 @@ static const NodeImplVtbl HTMLDOMNodeImplVtbl = { void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsnode) { node->IHTMLDOMNode_iface.lpVtbl = &HTMLDOMNodeVtbl; - node->lpHTMLDOMNode2Vtbl = &HTMLDOMNode2Vtbl; + node->IHTMLDOMNode2_iface.lpVtbl = &HTMLDOMNode2Vtbl; node->ref = 1; node->doc = doc;
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ae7c121..e936bce 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -532,7 +532,7 @@ typedef struct { struct HTMLDOMNode { DispatchEx dispex; IHTMLDOMNode IHTMLDOMNode_iface; - const IHTMLDOMNode2Vtbl *lpHTMLDOMNode2Vtbl; + IHTMLDOMNode2 IHTMLDOMNode2_iface; const NodeImplVtbl *vtbl;
LONG ref; @@ -642,8 +642,6 @@ struct HTMLDocumentNode { #define STATUSCLB(x) ((IBindStatusCallback*) &(x)->lpBindStatusCallbackVtbl) #define BINDINFO(x) ((IInternetBindInfo*) &(x)->lpInternetBindInfoVtbl);
-#define HTMLDOMNODE2(x) ((IHTMLDOMNode2*) &(x)->lpHTMLDOMNode2Vtbl) - #define HTMLTEXTCONT(x) ((IHTMLTextContainer*) &(x)->lpHTMLTextContainerVtbl) #define HTMLFRAMEBASE(x) ((IHTMLFrameBase*) &(x)->lpIHTMLFrameBaseVtbl) #define HTMLFRAMEBASE2(x) ((IHTMLFrameBase2*) &(x)->lpIHTMLFrameBase2Vtbl)
-
Alexandre Julliard