Jacek Caban : mshtml: Share nstable reference with nsnode.
Alexandre Julliard
julliard at winehq.org
Wed Jun 27 19:13:59 CDT 2012
Module: wine
Branch: master
Commit: db244a8051419857e9ae9f4e29cfe3e4e23c532f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=db244a8051419857e9ae9f4e29cfe3e4e23c532f
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Jun 27 10:56:30 2012 +0200
mshtml: Share nstable reference with nsnode.
---
dlls/mshtml/htmltable.c | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c
index 79223be..c174634 100644
--- a/dlls/mshtml/htmltable.c
+++ b/dlls/mshtml/htmltable.c
@@ -17,6 +17,7 @@
*/
#include <stdarg.h>
+#include <assert.h>
#define COBJMACROS
@@ -741,19 +742,9 @@ static HRESULT HTMLTable_QI(HTMLDOMNode *iface, REFIID riid, void **ppv)
return HTMLElement_QI(&This->element.node, riid, ppv);
}
-static void HTMLTable_destructor(HTMLDOMNode *iface)
-{
- HTMLTable *This = impl_from_HTMLDOMNode(iface);
-
- if(This->nstable)
- nsIDOMHTMLTableElement_Release(This->nstable);
-
- HTMLElement_destructor(&This->element.node);
-}
-
static const NodeImplVtbl HTMLTableImplVtbl = {
HTMLTable_QI,
- HTMLTable_destructor,
+ HTMLElement_destructor,
HTMLElement_clone,
HTMLElement_get_attr_col
};
@@ -783,14 +774,14 @@ HRESULT HTMLTable_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLE
ret->element.node.vtbl = &HTMLTableImplVtbl;
ret->IHTMLTable_iface.lpVtbl = &HTMLTableVtbl;
+ HTMLElement_Init(&ret->element, doc, nselem, &HTMLTable_dispex);
+
nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTableElement, (void**)&ret->nstable);
- if(NS_FAILED(nsres)) {
- ERR("Could not get nsIDOMHTMLTableElement iface: %08x\n", nsres);
- heap_free(ret);
- return E_FAIL;
- }
- HTMLElement_Init(&ret->element, doc, nselem, &HTMLTable_dispex);
+ /* Share the reference with nsnode */
+ assert(nsres == NS_OK && (nsIDOMNode*)ret->nstable == ret->element.node.nsnode);
+ nsIDOMNode_Release(ret->element.node.nsnode);
+
ConnectionPoint_Init(&ret->cp, &ret->element.cp_container, &DIID_HTMLTableEvents, NULL);
*elem = &ret->element;
More information about the wine-cvs
mailing list