Jacek Caban : mshtml: Share nsform reference with nsnode.
Alexandre Julliard
julliard at winehq.org
Wed Jun 27 19:13:59 CDT 2012
Module: wine
Branch: master
Commit: 6ac375d3acbc9711ef1ebac14a4b8986eadbbbae
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac375d3acbc9711ef1ebac14a4b8986eadbbbae
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Jun 27 10:56:00 2012 +0200
mshtml: Share nsform reference with nsnode.
---
dlls/mshtml/htmlform.c | 24 +++++++-----------------
1 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c
index be2f76c..ce931a2 100644
--- a/dlls/mshtml/htmlform.c
+++ b/dlls/mshtml/htmlform.c
@@ -17,6 +17,7 @@
*/
#include <stdarg.h>
+#include <assert.h>
#define COBJMACROS
@@ -505,16 +506,6 @@ static HRESULT HTMLFormElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv)
return HTMLElement_QI(&This->element.node, riid, ppv);
}
-static void HTMLFormElement_destructor(HTMLDOMNode *iface)
-{
- HTMLFormElement *This = impl_from_HTMLDOMNode(iface);
-
- if(This->nsform)
- nsIDOMHTMLFormElement_Release(This->nsform);
-
- HTMLElement_destructor(&This->element.node);
-}
-
static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface,
BSTR name, DWORD grfdex, DISPID *pid)
{
@@ -639,7 +630,7 @@ static HRESULT HTMLFormElement_invoke(HTMLDOMNode *iface,
static const NodeImplVtbl HTMLFormElementImplVtbl = {
HTMLFormElement_QI,
- HTMLFormElement_destructor,
+ HTMLElement_destructor,
HTMLElement_clone,
HTMLElement_get_attr_col,
NULL,
@@ -678,14 +669,13 @@ HRESULT HTMLFormElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem,
ret->IHTMLFormElement_iface.lpVtbl = &HTMLFormElementVtbl;
ret->element.node.vtbl = &HTMLFormElementImplVtbl;
+ HTMLElement_Init(&ret->element, doc, nselem, &HTMLFormElement_dispex);
+
nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLFormElement, (void**)&ret->nsform);
- if(NS_FAILED(nsres)) {
- ERR("Could not get nsIDOMHTMLFormElement interface: %08x\n", nsres);
- heap_free(ret);
- return E_FAIL;
- }
- HTMLElement_Init(&ret->element, doc, nselem, &HTMLFormElement_dispex);
+ /* Share the reference with nsnode */
+ assert(nsres == NS_OK && (nsIDOMNode*)ret->nsform == ret->element.node.nsnode);
+ nsIDOMNode_Release(ret->element.node.nsnode);
*elem = &ret->element;
return S_OK;
More information about the wine-cvs
mailing list