Jacek Caban : mshtml: Don't share nsform reference with nsnode.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c0f8d17c05ac6e4d38cac0e6eba6d66e29e7d061
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c0f8d17c05ac6e4d38cac0e6eb...

Author: Jacek Caban 
Date:   Wed Sep 24 16:05:12 2014 +0200

mshtml: Don't share nsform reference with nsnode.

---

dlls/mshtml/htmlform.c | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c
index df425d1..b85cf4d 100644
--- a/dlls/mshtml/htmlform.c
+++ b/dlls/mshtml/htmlform.c
@@ -726,6 +726,26 @@ static HRESULT HTMLFormElement_handle_event(HTMLDOMNode *iface, eventid_t eid, n
     return HTMLElement_handle_event(&This->element.node, eid, event, prevent_default);
 }

+static void HTMLFormElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb)
+{
+    HTMLFormElement *This = impl_from_HTMLDOMNode(iface);
+
+    if(This->nsform)
+        note_cc_edge((nsISupports*)This->nsform, "This->nsform", cb);
+}
+
+static void HTMLFormElement_unlink(HTMLDOMNode *iface)
+{
+    HTMLFormElement *This = impl_from_HTMLDOMNode(iface);
+
+    if(This->nsform) {
+        nsIDOMHTMLFormElement *nsform = This->nsform;
+
+        This->nsform = NULL;
+        nsIDOMHTMLFormElement_Release(nsform);
+    }
+}
+
 static const NodeImplVtbl HTMLFormElementImplVtbl = {
     HTMLFormElement_QI,
     HTMLElement_destructor,
@@ -740,7 +760,10 @@ static const NodeImplVtbl HTMLFormElementImplVtbl = {
     NULL,
     NULL,
     HTMLFormElement_get_dispid,
-    HTMLFormElement_invoke
+    HTMLFormElement_invoke,
+    NULL,
+    HTMLFormElement_traverse,
+    HTMLFormElement_unlink
 };

static const tid_t HTMLFormElement_iface_tids[] = {
@@ -771,10 +794,7 @@ HRESULT HTMLFormElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem,
     HTMLElement_Init(&ret->element, doc, nselem, &HTMLFormElement_dispex);

nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLFormElement, (void**)&ret->nsform);
-
-    /* Share the reference with nsnode */
-    assert(nsres == NS_OK && (nsIDOMNode*)ret->nsform == ret->element.node.nsnode);
-    nsIDOMNode_Release(ret->element.node.nsnode);
+    assert(nsres == NS_OK);

*elem = &ret->element;
     return S_OK;