ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Don't share nsbutton reference with nsnode.

Browse Source
This commit is contained in:
Jacek Caban 2014-09-26 15:11:48 +02:00 committed by Alexandre Julliard
parent 1e9f33924b
commit cf8eacf1c1
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dlls/mshtml/htmlinput.c
View File

@ -1759,6 +1759,26 @@ static HRESULT HTMLButtonElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BO
return IHTMLButtonElement_get_disabled(&This->IHTMLButtonElement_iface, p); return IHTMLButtonElement_get_disabled(&This->IHTMLButtonElement_iface, p);
} }
static void HTMLButtonElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb)
{
HTMLButtonElement *This = button_from_HTMLDOMNode(iface);
if(This->nsbutton)
note_cc_edge((nsISupports*)This->nsbutton, "This->nsbutton", cb);
}
static void HTMLButtonElement_unlink(HTMLDOMNode *iface)
{
HTMLButtonElement *This = button_from_HTMLDOMNode(iface);
if(This->nsbutton) {
nsIDOMHTMLButtonElement *nsbutton = This->nsbutton;
This->nsbutton = NULL;
nsIDOMHTMLButtonElement_Release(nsbutton);
}
}
static const NodeImplVtbl HTMLButtonElementImplVtbl = { static const NodeImplVtbl HTMLButtonElementImplVtbl = {
HTMLButtonElement_QI, HTMLButtonElement_QI,
HTMLElement_destructor, HTMLElement_destructor,
@ -1769,7 +1789,14 @@ static const NodeImplVtbl HTMLButtonElementImplVtbl = {
NULL, NULL,
NULL, NULL,
HTMLButtonElementImpl_put_disabled, HTMLButtonElementImpl_put_disabled,
HTMLButtonElementImpl_get_disabled HTMLButtonElementImpl_get_disabled,
NULL,
NULL,
NULL,
NULL,
NULL,
HTMLButtonElement_traverse,
HTMLButtonElement_unlink
}; };
static const tid_t HTMLButtonElement_iface_tids[] = { static const tid_t HTMLButtonElement_iface_tids[] = {
@ -1800,10 +1827,7 @@ HRESULT HTMLButtonElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele
HTMLElement_Init(&ret->element, doc, nselem, &HTMLButtonElement_dispex); HTMLElement_Init(&ret->element, doc, nselem, &HTMLButtonElement_dispex);
nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLButtonElement, (void**)&ret->nsbutton); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLButtonElement, (void**)&ret->nsbutton);
assert(nsres == NS_OK);
/* Share nsbutton reference with nsnode */
assert(nsres == NS_OK && (nsIDOMNode*)ret->nsbutton == ret->element.node.nsnode);
nsIDOMNode_Release(ret->element.node.nsnode);
*elem = &ret->element; *elem = &ret->element;
return S_OK; return S_OK;