Jacek Caban : mshtml: Share nsscript reference with nsnode.
Alexandre Julliard
julliard at winehq.org
Wed Jun 27 19:13:59 CDT 2012
Module: wine
Branch: master
Commit: f2b32208545f120624aedb8d0690ee40e7806d95
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b32208545f120624aedb8d0690ee40e7806d95
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Jun 27 10:58:11 2012 +0200
mshtml: Share nsscript reference with nsnode.
---
dlls/mshtml/htmlscript.c | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c
index 376db7b..e5806db 100644
--- a/dlls/mshtml/htmlscript.c
+++ b/dlls/mshtml/htmlscript.c
@@ -17,6 +17,7 @@
*/
#include <stdarg.h>
+#include <assert.h>
#define COBJMACROS
@@ -305,12 +306,6 @@ static HRESULT HTMLScriptElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv)
return HTMLElement_QI(&This->element.node, riid, ppv);
}
-static void HTMLScriptElement_destructor(HTMLDOMNode *iface)
-{
- HTMLScriptElement *This = impl_from_HTMLDOMNode(iface);
- HTMLElement_destructor(&This->element.node);
-}
-
static HRESULT HTMLScriptElement_get_readystate(HTMLDOMNode *iface, BSTR *p)
{
HTMLScriptElement *This = impl_from_HTMLDOMNode(iface);
@@ -320,7 +315,7 @@ static HRESULT HTMLScriptElement_get_readystate(HTMLDOMNode *iface, BSTR *p)
static const NodeImplVtbl HTMLScriptElementImplVtbl = {
HTMLScriptElement_QI,
- HTMLScriptElement_destructor,
+ HTMLElement_destructor,
HTMLElement_clone,
HTMLElement_get_attr_col,
NULL,
@@ -357,14 +352,13 @@ HRESULT HTMLScriptElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele
ret->IHTMLScriptElement_iface.lpVtbl = &HTMLScriptElementVtbl;
ret->element.node.vtbl = &HTMLScriptElementImplVtbl;
+ HTMLElement_Init(&ret->element, doc, nselem, &HTMLScriptElement_dispex);
+
nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLScriptElement, (void**)&ret->nsscript);
- if(NS_FAILED(nsres)) {
- ERR("Could not get nsIDOMHTMLScriptElement: %08x\n", nsres);
- heap_free(ret);
- return E_FAIL;
- }
- HTMLElement_Init(&ret->element, doc, nselem, &HTMLScriptElement_dispex);
+ /* Share nsscript reference with nsnode */
+ assert(nsres == NS_OK && (nsIDOMNode*)ret->nsscript == ret->element.node.nsnode);
+ nsIDOMNode_Release(ret->element.node.nsnode);
*elem = &ret->element;
return S_OK;
More information about the wine-cvs
mailing list