Module: wine Branch: master Commit: a95bfede8a1573715275f94685bbf390dc3c10ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a95bfede8a1573715275f94685...
Author: Jacek Caban jacek@codeweavers.com Date: Wed Sep 19 12:40:41 2007 +0200
mshtml: Forward node ref calls to IHTMLDOMNode interface.
---
dlls/mshtml/htmlanchor.c | 8 ++------ dlls/mshtml/htmlbody.c | 8 ++------ dlls/mshtml/htmlelem.c | 12 ++---------- dlls/mshtml/htmlinput.c | 8 ++------ dlls/mshtml/htmlnode.c | 8 ++------ dlls/mshtml/htmlselect.c | 8 ++------ dlls/mshtml/htmltextarea.c | 8 ++------ 7 files changed, 14 insertions(+), 46 deletions(-)
diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 3bd08fc..71390e9 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -80,18 +80,14 @@ static ULONG WINAPI HTMLAnchorElement_AddRef(IHTMLAnchorElement *iface) { HTMLAnchorElement *This = HTMLANCHOR_THIS(iface);
- TRACE("(%p)\n", This); - - return IHTMLDocument2_AddRef(HTMLDOC(This->element.node.doc)); + return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->element.node)); }
static ULONG WINAPI HTMLAnchorElement_Release(IHTMLAnchorElement *iface) { HTMLAnchorElement *This = HTMLANCHOR_THIS(iface);
- TRACE("(%p)\n", This); - - return IHTMLDocument2_Release(HTMLDOC(This->element.node.doc)); + return IHTMLDOMNode_Release(HTMLDOMNODE(&This->element.node)); }
static HRESULT WINAPI HTMLAnchorElement_GetTypeInfoCount(IHTMLAnchorElement *iface, UINT *pctinfo) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 35be04f..b8c153a 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -94,18 +94,14 @@ static ULONG WINAPI HTMLBodyElement_AddRef(IHTMLBodyElement *iface) { HTMLBodyElement *This = HTMLBODY_THIS(iface);
- TRACE("(%p)\n", This); - - return IHTMLDocument2_AddRef(HTMLDOC(This->textcont.element.node.doc)); + return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->textcont.element.node)); }
static ULONG WINAPI HTMLBodyElement_Release(IHTMLBodyElement *iface) { HTMLBodyElement *This = HTMLBODY_THIS(iface);
- TRACE("(%p)\n", This); - - return IHTMLDocument2_Release(HTMLDOC(This->textcont.element.node.doc)); + return IHTMLDOMNode_Release(HTMLDOMNODE(&This->textcont.element.node)); }
static HRESULT WINAPI HTMLBodyElement_GetTypeInfoCount(IHTMLBodyElement *iface, UINT *pctinfo) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 3334763..05071d8 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -80,22 +80,14 @@ static ULONG WINAPI HTMLElement_AddRef(IHTMLElement *iface) { HTMLElement *This = HTMLELEM_THIS(iface);
- if(This->impl) - return IUnknown_AddRef(This->impl); - - TRACE("(%p)\n", This); - return IHTMLDocument2_AddRef(HTMLDOC(This->node.doc)); + return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->node)); }
static ULONG WINAPI HTMLElement_Release(IHTMLElement *iface) { HTMLElement *This = HTMLELEM_THIS(iface);
- if(This->impl) - return IUnknown_Release(This->impl); - - TRACE("(%p)\n", This); - return IHTMLDocument2_Release(HTMLDOC(This->node.doc)); + return IHTMLDOMNode_Release(HTMLDOMNODE(&This->node)); }
static HRESULT WINAPI HTMLElement_GetTypeInfoCount(IHTMLElement *iface, UINT *pctinfo) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 7cef2bd..dc3ec8a 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -82,18 +82,14 @@ static ULONG WINAPI HTMLInputElement_AddRef(IHTMLInputElement *iface) { HTMLInputElement *This = HTMLINPUT_THIS(iface);
- TRACE("(%p)\n", This); - - return IHTMLDocument2_AddRef(HTMLDOC(This->element.node.doc)); + return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->element.node)); }
static ULONG WINAPI HTMLInputElement_Release(IHTMLInputElement *iface) { HTMLInputElement *This = HTMLINPUT_THIS(iface);
- TRACE("(%p)\n", This); - - return IHTMLDocument2_Release(HTMLDOC(This->element.node.doc)); + return IHTMLDOMNode_Release(HTMLDOMNODE(&This->element.node)); }
static HRESULT WINAPI HTMLInputElement_GetTypeInfoCount(IHTMLInputElement *iface, UINT *pctinfo) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 62f650b..51837ce 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -59,10 +59,8 @@ static ULONG WINAPI HTMLDOMNode_AddRef(IHTMLDOMNode *iface) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface);
- if(This->impl.unk) - return IUnknown_AddRef(This->impl.unk); - TRACE("(%p)\n", This); + return IHTMLDocument2_AddRef(HTMLDOC(This->doc)); }
@@ -70,10 +68,8 @@ static ULONG WINAPI HTMLDOMNode_Release(IHTMLDOMNode *iface) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface);
- if(This->impl.unk) - return IUnknown_Release(This->impl.unk); - TRACE("(%p)\n", This); + return IHTMLDocument2_Release(HTMLDOC(This->doc)); }
diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index d0be23d..c50b431 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -82,18 +82,14 @@ static ULONG WINAPI HTMLSelectElement_AddRef(IHTMLSelectElement *iface) { HTMLSelectElement *This = HTMLSELECT_THIS(iface);
- TRACE("(%p)\n", This); - - return IHTMLDocument2_AddRef(HTMLDOC(This->element.node.doc)); + return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->element.node)); }
static ULONG WINAPI HTMLSelectElement_Release(IHTMLSelectElement *iface) { HTMLSelectElement *This = HTMLSELECT_THIS(iface);
- TRACE("(%p)\n", This); - - return IHTMLDocument2_Release(HTMLDOC(This->element.node.doc)); + return IHTMLDOMNode_Release(HTMLDOMNODE(&This->element.node)); }
static HRESULT WINAPI HTMLSelectElement_GetTypeInfoCount(IHTMLSelectElement *iface, UINT *pctinfo) diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 6266284..c9b0c3e 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -82,18 +82,14 @@ static ULONG WINAPI HTMLTextAreaElement_AddRef(IHTMLTextAreaElement *iface) { HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface);
- TRACE("(%p)\n", This); - - return IHTMLDocument2_AddRef(HTMLDOC(This->element.node.doc)); + return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->element.node)); }
static ULONG WINAPI HTMLTextAreaElement_Release(IHTMLTextAreaElement *iface) { HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface);
- TRACE("(%p)\n", This); - - return IHTMLDocument2_Release(HTMLDOC(This->element.node.doc)); + return IHTMLDOMNode_Release(HTMLDOMNODE(&This->element.node)); }
static HRESULT WINAPI HTMLTextAreaElement_GetTypeInfoCount(IHTMLTextAreaElement *iface, UINT *pctinfo)