From cac39acbe3c66bb5319aab6e31e043af6e811b58 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Thu, 25 Sep 2014 12:11:06 +0200
Subject: [PATCH] mshtml: Don't share nsselect reference with nsnode.

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

diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c
index 08a374ad8c5..3cdf496b954 100644
--- a/dlls/mshtml/htmlselect.c
+++ b/dlls/mshtml/htmlselect.c
@@ -615,6 +615,26 @@ static HRESULT HTMLSelectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid
     return S_OK;
 }
 
+static void HTMLSelectElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb)
+{
+    HTMLSelectElement *This = impl_from_HTMLDOMNode(iface);
+
+    if(This->nsselect)
+        note_cc_edge((nsISupports*)This->nsselect, "This->nsselect", cb);
+}
+
+static void HTMLSelectElement_unlink(HTMLDOMNode *iface)
+{
+    HTMLSelectElement *This = impl_from_HTMLDOMNode(iface);
+
+    if(This->nsselect) {
+        nsIDOMHTMLSelectElement *nsselect = This->nsselect;
+
+        This->nsselect = NULL;
+        nsIDOMHTMLSelectElement_Release(nsselect);
+    }
+}
+
 static const NodeImplVtbl HTMLSelectElementImplVtbl = {
     HTMLSelectElement_QI,
     HTMLElement_destructor,
@@ -629,7 +649,10 @@ static const NodeImplVtbl HTMLSelectElementImplVtbl = {
     NULL,
     NULL,
     HTMLSelectElement_get_dispid,
-    HTMLSelectElement_invoke
+    HTMLSelectElement_invoke,
+    NULL,
+    HTMLSelectElement_traverse,
+    HTMLSelectElement_unlink
 };
 
 static const tid_t HTMLSelectElement_tids[] = {
@@ -661,10 +684,7 @@ HRESULT HTMLSelectElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele
 
     nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLSelectElement,
                                              (void**)&ret->nsselect);
-
-    /* Share nsselect reference with nsnode */
-    assert(nsres == NS_OK && (nsIDOMNode*)ret->nsselect == ret->element.node.nsnode);
-    nsIDOMNode_Release(ret->element.node.nsnode);
+    assert(nsres == NS_OK);
 
     *elem = &ret->element;
     return S_OK;
-- 
2.11.4.GIT