Jacek Caban : mshtml: Don't share nslink reference with nsnode.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Sep 24 15:28:37 CDT 2014
Module: wine
Branch: master
Commit: a57d87d265380b92ac0ad2efd486ce3693ea0e3f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a57d87d265380b92ac0ad2efd486ce3693ea0e3f
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Sep 24 16:05:40 2014 +0200
mshtml: Don't share nslink reference with nsnode.
---
dlls/mshtml/htmlinput.c | 1 -
dlls/mshtml/htmllink.c | 31 +++++++++++++++++++++++++++----
2 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c
index d6567a0..62eff21 100644
--- a/dlls/mshtml/htmlinput.c
+++ b/dlls/mshtml/htmlinput.c
@@ -1255,7 +1255,6 @@ static HRESULT HTMLInputElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOO
return IHTMLInputElement_get_disabled(&This->IHTMLInputElement_iface, p);
}
-
static void HTMLInputElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb)
{
HTMLInputElement *This = impl_from_HTMLDOMNode(iface);
diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c
index e636872..39853e4 100644
--- a/dlls/mshtml/htmllink.c
+++ b/dlls/mshtml/htmllink.c
@@ -397,6 +397,25 @@ static HRESULT HTMLLinkElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOOL
return IHTMLLinkElement_get_disabled(&This->IHTMLLinkElement_iface, p);
}
+static void HTMLLinkElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb)
+{
+ HTMLLinkElement *This = impl_from_HTMLDOMNode(iface);
+
+ if(This->nslink)
+ note_cc_edge((nsISupports*)This->nslink, "This->nslink", cb);
+}
+
+static void HTMLLinkElement_unlink(HTMLDOMNode *iface)
+{
+ HTMLLinkElement *This = impl_from_HTMLDOMNode(iface);
+
+ if(This->nslink) {
+ nsIDOMHTMLLinkElement *nslink = This->nslink;
+
+ This->nslink = NULL;
+ nsIDOMHTMLLinkElement_Release(nslink);
+ }
+}
static const NodeImplVtbl HTMLLinkElementImplVtbl = {
HTMLLinkElement_QI,
HTMLElement_destructor,
@@ -408,6 +427,13 @@ static const NodeImplVtbl HTMLLinkElementImplVtbl = {
NULL,
HTMLLinkElementImpl_put_disabled,
HTMLLinkElementImpl_get_disabled,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ HTMLLinkElement_traverse,
+ HTMLLinkElement_unlink
};
static const tid_t HTMLLinkElement_iface_tids[] = {
@@ -437,10 +463,7 @@ HRESULT HTMLLinkElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem,
HTMLElement_Init(&ret->element, doc, nselem, &HTMLLinkElement_dispex);
nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLLinkElement, (void**)&ret->nslink);
-
- /* Share nslink reference with nsnode */
- assert(nsres == NS_OK && (nsIDOMNode*)ret->nslink == ret->element.node.nsnode);
- nsIDOMNode_Release(ret->element.node.nsnode);
+ assert(nsres == NS_OK);
*elem = &ret->element;
return S_OK;
More information about the wine-cvs
mailing list