Jacek Caban : mshtml: Share nsobject reference with nsnode.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7a8f0994dfc4ac05272965fa51e5dec2b159c955
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7a8f0994dfc4ac05272965fa51...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Wed Jun 27 10:58:23 2012 +0200

mshtml: Share nsobject reference with nsnode.

---

 dlls/mshtml/htmlobject.c |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c
index 6f171c6..fdd6614 100644
--- a/dlls/mshtml/htmlobject.c
+++ b/dlls/mshtml/htmlobject.c
@@ -17,6 +17,7 @@
  */
 
 #include <stdarg.h>
+#include <assert.h>
 
 #define COBJMACROS
 
@@ -571,8 +572,6 @@ static void HTMLObjectElement_destructor(HTMLDOMNode *iface)
 
     if(This->plugin_container.plugin_host)
         detach_plugin_host(This->plugin_container.plugin_host);
-    if(This->nsobject)
-        nsIDOMHTMLObjectElement_Release(This->nsobject);
 
     HTMLElement_destructor(&This->plugin_container.element.node);
 }
@@ -646,14 +645,13 @@ HRESULT HTMLObjectElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele
     ret->IHTMLObjectElement2_iface.lpVtbl = &HTMLObjectElement2Vtbl;
     ret->plugin_container.element.node.vtbl = &HTMLObjectElementImplVtbl;
 
+    HTMLElement_Init(&ret->plugin_container.element, doc, nselem, &HTMLObjectElement_dispex);
+
     nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLObjectElement, (void**)&ret->nsobject);
-    if(NS_FAILED(nsres)) {
-        ERR("Could not get nsIDOMHTMLObjectElement iface: %08x\n", nsres);
-        heap_free(ret);
-        return E_FAIL;
-    }
 
-    HTMLElement_Init(&ret->plugin_container.element, doc, nselem, &HTMLObjectElement_dispex);
+    /* 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);
 
     *elem = &ret->plugin_container.element;
     return S_OK;