Jacek Caban : mshtml: Share nsoption reference with nsnode.
Alexandre Julliard
julliard at winehq.org
Wed Jun 27 19:13:59 CDT 2012
Module: wine
Branch: master
Commit: e45c62171908f36c87595a1eb49884c3c3082644
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e45c62171908f36c87595a1eb49884c3c3082644
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Jun 27 10:57:56 2012 +0200
mshtml: Share nsoption reference with nsnode.
---
dlls/mshtml/htmloption.c | 24 +++++++-----------------
1 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c
index 8bc0f40..fac06ed 100644
--- a/dlls/mshtml/htmloption.c
+++ b/dlls/mshtml/htmloption.c
@@ -17,6 +17,7 @@
*/
#include <stdarg.h>
+#include <assert.h>
#define COBJMACROS
@@ -310,19 +311,9 @@ static HRESULT HTMLOptionElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv)
return HTMLElement_QI(&This->element.node, riid, ppv);
}
-static void HTMLOptionElement_destructor(HTMLDOMNode *iface)
-{
- HTMLOptionElement *This = impl_from_HTMLDOMNode(iface);
-
- if(This->nsoption)
- nsIDOMHTMLOptionElement_Release(This->nsoption);
-
- HTMLElement_destructor(&This->element.node);
-}
-
static const NodeImplVtbl HTMLOptionElementImplVtbl = {
HTMLOptionElement_QI,
- HTMLOptionElement_destructor,
+ HTMLElement_destructor,
HTMLElement_clone,
HTMLElement_get_attr_col
};
@@ -351,14 +342,13 @@ HRESULT HTMLOptionElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele
ret->IHTMLOptionElement_iface.lpVtbl = &HTMLOptionElementVtbl;
ret->element.node.vtbl = &HTMLOptionElementImplVtbl;
+ HTMLElement_Init(&ret->element, doc, nselem, &HTMLOptionElement_dispex);
+
nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLOptionElement, (void**)&ret->nsoption);
- if(NS_FAILED(nsres)) {
- ERR("Could not get nsIDOMHTMLOptionElement interface: %08x\n", nsres);
- heap_free(ret);
- return E_FAIL;
- }
- HTMLElement_Init(&ret->element, doc, nselem, &HTMLOptionElement_dispex);
+ /* Share nsoption reference with nsnode */
+ assert(nsres == NS_OK && (nsIDOMNode*)ret->nsoption == ret->element.node.nsnode);
+ nsIDOMNode_Release(ret->element.node.nsnode);
*elem = &ret->element;
return S_OK;
More information about the wine-cvs
mailing list