Jacek Caban : mshtml: Share nsinput reference with nsnode.
Alexandre Julliard
julliard at winehq.org
Thu Jun 28 13:55:17 CDT 2012
Module: wine
Branch: master
Commit: d37f7a91400bad741f47323c6fb15b86dbcb534f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37f7a91400bad741f47323c6fb15b86dbcb534f
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Jun 28 11:20:28 2012 +0200
mshtml: Share nsinput reference with nsnode.
---
dlls/mshtml/htmlinput.c | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c
index a174634..27b1b47 100644
--- a/dlls/mshtml/htmlinput.c
+++ b/dlls/mshtml/htmlinput.c
@@ -17,6 +17,7 @@
*/
#include <stdarg.h>
+#include <assert.h>
#define COBJMACROS
@@ -1117,15 +1118,6 @@ static HRESULT HTMLInputElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv)
return HTMLElement_QI(&This->element.node, riid, ppv);
}
-static void HTMLInputElement_destructor(HTMLDOMNode *iface)
-{
- HTMLInputElement *This = impl_from_HTMLDOMNode(iface);
-
- nsIDOMHTMLInputElement_Release(This->nsinput);
-
- HTMLElement_destructor(&This->element.node);
-}
-
static HRESULT HTMLInputElementImpl_fire_event(HTMLDOMNode *iface, eventid_t eid, BOOL *handled)
{
HTMLInputElement *This = impl_from_HTMLDOMNode(iface);
@@ -1159,7 +1151,7 @@ static HRESULT HTMLInputElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOO
static const NodeImplVtbl HTMLInputElementImplVtbl = {
HTMLInputElement_QI,
- HTMLInputElement_destructor,
+ HTMLElement_destructor,
HTMLElement_clone,
HTMLElement_get_attr_col,
NULL,
@@ -1194,14 +1186,13 @@ HRESULT HTMLInputElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem
ret->IHTMLInputTextElement_iface.lpVtbl = &HTMLInputTextElementVtbl;
ret->element.node.vtbl = &HTMLInputElementImplVtbl;
+ HTMLElement_Init(&ret->element, doc, nselem, &HTMLInputElement_dispex);
+
nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLInputElement, (void**)&ret->nsinput);
- if(NS_FAILED(nsres)) {
- ERR("Could not get nsIDOMHTMLInputElement interface: %08x\n", nsres);
- heap_free(ret);
- return E_FAIL;
- }
- HTMLElement_Init(&ret->element, doc, nselem, &HTMLInputElement_dispex);
+ /* Share nsinput reference with nsnode */
+ assert(nsres == NS_OK && (nsIDOMNode*)ret->nsinput == ret->element.node.nsnode);
+ nsIDOMNode_Release(ret->element.node.nsnode);
*elem = &ret->element;
return S_OK;
More information about the wine-cvs
mailing list