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

mshtml: Don't share nsobject reference with nsnode.

This commit is contained in:
Jacek Caban 2014-09-25 12:11:59 +02:00 committed by Alexandre Julliard
parent d2a97e73eb
commit b472a1f3f4
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/mshtml/htmlobject.c
View File

@ -704,6 +704,26 @@ static HRESULT HTMLObjectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid
return invoke_plugin_prop(&This->plugin_container, id, lcid, flags, params, res, ei);
}
static void HTMLObjectElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb)
{
HTMLObjectElement *This = impl_from_HTMLDOMNode(iface);
if(This->nsobject)
note_cc_edge((nsISupports*)This->nsobject, "This->nsobject", cb);
}
static void HTMLObjectElement_unlink(HTMLDOMNode *iface)
{
HTMLObjectElement *This = impl_from_HTMLDOMNode(iface);
if(This->nsobject) {
nsIDOMHTMLObjectElement *nsobject = This->nsobject;
This->nsobject = NULL;
nsIDOMHTMLObjectElement_Release(nsobject);
}
}
static const NodeImplVtbl HTMLObjectElementImplVtbl = {
HTMLObjectElement_QI,
HTMLObjectElement_destructor,
@ -718,7 +738,10 @@ static const NodeImplVtbl HTMLObjectElementImplVtbl = {
NULL,
HTMLObjectElement_get_readystate,
HTMLObjectElement_get_dispid,
HTMLObjectElement_invoke
HTMLObjectElement_invoke,
NULL,
HTMLObjectElement_traverse,
HTMLObjectElement_unlink
};
static const tid_t HTMLObjectElement_iface_tids[] = {
@ -750,10 +773,7 @@ HRESULT HTMLObjectElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele
HTMLElement_Init(&ret->plugin_container.element, doc, nselem, &HTMLObjectElement_dispex);
nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLObjectElement, (void**)&ret->nsobject);
/* Share nsobject reference with nsnode */
assert(nsres == NS_OK && (nsIDOMNode*)ret->nsobject == ret->plugin_container.element.node.nsnode);
nsIDOMNode_Release(ret->plugin_container.element.node.nsnode);
assert(nsres == NS_OK);
*elem = &ret->plugin_container.element;
return S_OK;