wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Jacek Caban : mshtml: Share nsobject reference with nsnode.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 7a8f0994dfc4ac05272965fa51e5dec2b159c955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8f0994dfc4ac05272965fa5… 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;

1 0

Jacek Caban : mshtml: Share nsscript reference with nsnode.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: f2b32208545f120624aedb8d0690ee40e7806d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b32208545f120624aedb8d0… Author: Jacek Caban <jacek(a)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;

1 0

Jacek Caban : mshtml: Share nsoption reference with nsnode.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: e45c62171908f36c87595a1eb49884c3c3082644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e45c62171908f36c87595a1eb… Author: Jacek Caban <jacek(a)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;

1 0

Jacek Caban : mshtml: Share nsimg reference with nsnode.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 8a9d3c845b76348e8c2fc038e48a22e7aa5c5271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a9d3c845b76348e8c2fc038e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 27 10:56:54 2012 +0200 mshtml: Share nsimg reference with nsnode. --- dlls/mshtml/htmlimg.c | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 5d1c665..be33a71 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -621,16 +622,6 @@ static HRESULT HTMLImgElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return S_OK; } -static void HTMLImgElement_destructor(HTMLDOMNode *iface) -{ - HTMLImgElement *This = impl_from_HTMLDOMNode(iface); - - if(This->nsimg) - nsIDOMHTMLImageElement_Release(This->nsimg); - - HTMLElement_destructor(&This->element.node); -} - static HRESULT HTMLImgElement_get_readystate(HTMLDOMNode *iface, BSTR *p) { HTMLImgElement *This = impl_from_HTMLDOMNode(iface); @@ -640,7 +631,7 @@ static HRESULT HTMLImgElement_get_readystate(HTMLDOMNode *iface, BSTR *p) static const NodeImplVtbl HTMLImgElementImplVtbl = { HTMLImgElement_QI, - HTMLImgElement_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_get_attr_col, NULL, @@ -676,14 +667,13 @@ HRESULT HTMLImgElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, ret->IHTMLImgElement_iface.lpVtbl = &HTMLImgElementVtbl; ret->element.node.vtbl = &HTMLImgElementImplVtbl; + HTMLElement_Init(&ret->element, doc, nselem, &HTMLImgElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLImageElement, (void**)&ret->nsimg); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLImageElement: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLImgElement_dispex); + /* Share nsimg reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nsimg == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); *elem = &ret->element; return S_OK;

1 0

Jacek Caban : mshtml: Share nsdoc reference with nsnode.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: caada38f0484aaab18acbe128c46415803683725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caada38f0484aaab18acbe128… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 27 10:56:44 2012 +0200 mshtml: Share nsdoc reference with nsnode. --- dlls/mshtml/htmldoc.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 6016630..5e98cea 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <stdio.h> +#include <assert.h> #define COBJMACROS @@ -2084,10 +2085,8 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) while(!list_empty(&This->plugin_hosts)) detach_plugin_host(LIST_ENTRY(list_head(&This->plugin_hosts), PluginHost, entry)); - if(This->nsdoc) { + if(This->nsdoc) release_document_mutation(This); - nsIDOMHTMLDocument_Release(This->nsdoc); - } heap_free(This->event_vector); destroy_htmldoc(&This->basedoc); @@ -2236,12 +2235,15 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob if(!doc_obj->basedoc.window || window == doc_obj->basedoc.window) doc->basedoc.cp_container.forward_container = &doc_obj->basedoc.cp_container; - nsIDOMHTMLDocument_AddRef(nsdoc); + HTMLDOMNode_Init(doc, &doc->node, (nsIDOMNode*)nsdoc); + + /* No AddRef, share the reference with nsnode */ + assert((nsIDOMNode*)nsdoc == doc->node.nsnode); doc->nsdoc = nsdoc; + init_document_mutation(doc); doc_init_events(doc); - HTMLDOMNode_Init(doc, &doc->node, (nsIDOMNode*)nsdoc); doc->node.vtbl = &HTMLDocumentNodeImplVtbl; doc->node.cp_container = &doc->basedoc.cp_container;

1 0

Jacek Caban : mshtml: Share nstable reference with nsnode.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: db244a8051419857e9ae9f4e29cfe3e4e23c532f URL: http://source.winehq.org/git/wine.git/?a=commit;h=db244a8051419857e9ae9f4e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 27 10:56:30 2012 +0200 mshtml: Share nstable reference with nsnode. --- dlls/mshtml/htmltable.c | 25 ++++++++----------------- 1 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 79223be..c174634 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -741,19 +742,9 @@ static HRESULT HTMLTable_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } -static void HTMLTable_destructor(HTMLDOMNode *iface) -{ - HTMLTable *This = impl_from_HTMLDOMNode(iface); - - if(This->nstable) - nsIDOMHTMLTableElement_Release(This->nstable); - - HTMLElement_destructor(&This->element.node); -} - static const NodeImplVtbl HTMLTableImplVtbl = { HTMLTable_QI, - HTMLTable_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_get_attr_col }; @@ -783,14 +774,14 @@ HRESULT HTMLTable_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLE ret->element.node.vtbl = &HTMLTableImplVtbl; ret->IHTMLTable_iface.lpVtbl = &HTMLTableVtbl; + HTMLElement_Init(&ret->element, doc, nselem, &HTMLTable_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTableElement, (void**)&ret->nstable); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLTableElement iface: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLTable_dispex); + /* Share the reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nstable == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); + ConnectionPoint_Init(&ret->cp, &ret->element.cp_container, &DIID_HTMLTableEvents, NULL); *elem = &ret->element;

1 0

Jacek Caban : mshtml: Share nsframe and nsiframe references with nsnode.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 39005645b89ca7357c969abc270f8ecf34bbd0e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39005645b89ca7357c969abc2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 27 10:56:14 2012 +0200 mshtml: Share nsframe and nsiframe references with nsnode. --- dlls/mshtml/htmlframebase.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index b06534e..a5344ec 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -522,11 +523,6 @@ void HTMLFrameBase_destructor(HTMLFrameBase *This) if(This->content_window) This->content_window->frame_element = NULL; - if(This->nsframe) - nsIDOMHTMLFrameElement_Release(This->nsframe); - if(This->nsiframe) - nsIDOMHTMLIFrameElement_Release(This->nsiframe); - HTMLElement_destructor(&This->element.node); } @@ -542,9 +538,14 @@ void HTMLFrameBase_Init(HTMLFrameBase *This, HTMLDocumentNode *doc, nsIDOMHTMLEl nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLFrameElement, (void**)&This->nsframe); if(NS_FAILED(nsres)) { + This->nsframe = NULL; nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLIFrameElement, (void**)&This->nsiframe); - if(NS_FAILED(nsres)) - ERR("Could not get nsIDOMHTML[I]Frame interface\n"); - }else + assert(nsres == NS_OK && (nsIDOMNode*)This->nsiframe == This->element.node.nsnode); + }else { + assert((nsIDOMNode*)This->nsframe == This->element.node.nsnode); This->nsiframe = NULL; + } + + /* Share the reference with nsnode */ + nsIDOMNode_Release(This->element.node.nsnode); }

1 0

Jacek Caban : mshtml: Share nsform reference with nsnode.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 6ac375d3acbc9711ef1ebac14a4b8986eadbbbae URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac375d3acbc9711ef1ebac14… Author: Jacek Caban <jacek(a)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;

1 0

Jacek Caban : mshtml: Get rid of no longer needed unk_ref from HTMLElementCollection.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 829f24c1c74fe918a96aac9776667909c551a6e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=829f24c1c74fe918a96aac977… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 27 10:55:48 2012 +0200 mshtml: Get rid of no longer needed unk_ref from HTMLElementCollection. --- dlls/mshtml/htmldoc.c | 10 +++++----- dlls/mshtml/htmldoc3.c | 3 +-- dlls/mshtml/htmlelem.c | 3 +-- dlls/mshtml/htmlelem2.c | 3 +-- dlls/mshtml/htmlelemcol.c | 28 +++++++++++----------------- dlls/mshtml/htmltable.c | 3 +-- dlls/mshtml/htmltablerow.c | 2 +- dlls/mshtml/mshtml_private.h | 4 ++-- 8 files changed, 23 insertions(+), 33 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 19b73e5..6016630 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -213,7 +213,7 @@ static HRESULT WINAPI HTMLDocument_get_images(IHTMLDocument2 *iface, IHTMLElemen } if(nscoll) { - *p = create_collection_from_htmlcol(This->doc_node, (IUnknown*)&This->IHTMLDocument2_iface, nscoll); + *p = create_collection_from_htmlcol(This->doc_node, nscoll); nsIDOMElement_Release(nscoll); } @@ -245,7 +245,7 @@ static HRESULT WINAPI HTMLDocument_get_applets(IHTMLDocument2 *iface, IHTMLEleme } if(nscoll) { - *p = create_collection_from_htmlcol(This->doc_node, (IUnknown*)&This->IHTMLDocument2_iface, nscoll); + *p = create_collection_from_htmlcol(This->doc_node, nscoll); nsIDOMElement_Release(nscoll); } @@ -277,7 +277,7 @@ static HRESULT WINAPI HTMLDocument_get_links(IHTMLDocument2 *iface, IHTMLElement } if(nscoll) { - *p = create_collection_from_htmlcol(This->doc_node, (IUnknown*)&This->IHTMLDocument2_iface, nscoll); + *p = create_collection_from_htmlcol(This->doc_node, nscoll); nsIDOMElement_Release(nscoll); } @@ -309,7 +309,7 @@ static HRESULT WINAPI HTMLDocument_get_forms(IHTMLDocument2 *iface, IHTMLElement } if(nscoll) { - *p = create_collection_from_htmlcol(This->doc_node, (IUnknown*)&This->IHTMLDocument2_iface, nscoll); + *p = create_collection_from_htmlcol(This->doc_node, nscoll); nsIDOMElement_Release(nscoll); } @@ -341,7 +341,7 @@ static HRESULT WINAPI HTMLDocument_get_anchors(IHTMLDocument2 *iface, IHTMLEleme } if(nscoll) { - *p = create_collection_from_htmlcol(This->doc_node, (IUnknown*)&This->IHTMLDocument2_iface, nscoll); + *p = create_collection_from_htmlcol(This->doc_node, nscoll); nsIDOMElement_Release(nscoll); } diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index eb19f8c..f930bcd 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -572,8 +572,7 @@ static HRESULT WINAPI HTMLDocument3_getElementsByTagName(IHTMLDocument3 *iface, return E_FAIL; } - *pelColl = create_collection_from_nodelist(This->doc_node, - (IUnknown*)&This->IHTMLDocument3_iface, nslist); + *pelColl = create_collection_from_nodelist(This->doc_node, nslist); nsIDOMNodeList_Release(nslist); return S_OK; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 5f59385..1556cc7 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1412,8 +1412,7 @@ static HRESULT WINAPI HTMLElement_get_children(IHTMLElement *iface, IDispatch ** return E_FAIL; } - *p = (IDispatch*)create_collection_from_nodelist(This->node.doc, - (IUnknown*)&This->IHTMLElement_iface, nsnode_list); + *p = (IDispatch*)create_collection_from_nodelist(This->node.doc, nsnode_list); nsIDOMNodeList_Release(nsnode_list); return S_OK; diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 9362805..4550681 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -1252,8 +1252,7 @@ static HRESULT WINAPI HTMLElement2_getElementsByTagName(IHTMLElement2 *iface, BS return E_FAIL; } - *pelColl = create_collection_from_nodelist(This->node.doc, - (IUnknown*)&This->IHTMLElement_iface, nslist); + *pelColl = create_collection_from_nodelist(This->node.doc, nslist); nsIDOMNodeList_Release(nslist); return S_OK; } diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 76da651..27811f7 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -35,7 +35,6 @@ typedef struct { DispatchEx dispex; IHTMLElementCollection IHTMLElementCollection_iface; - IUnknown *ref_unk; HTMLElement **elems; DWORD len; @@ -54,8 +53,7 @@ static inline HTMLElement *elem_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLElement, node); } -static IHTMLElementCollection *HTMLElementCollection_Create(IUnknown *ref_unk, - HTMLElement **elems, DWORD len); +static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems, DWORD len); static void elem_vector_add(elem_vector_t *buf, HTMLElement *elem) { @@ -141,9 +139,9 @@ static ULONG WINAPI HTMLElementCollection_Release(IHTMLElementCollection *iface) for(i=0; i < This->len; i++) node_release(&This->elems[i]->node); - IUnknown_Release(This->ref_unk); - release_dispex(&This->dispex); heap_free(This->elems); + + release_dispex(&This->dispex); heap_free(This); } @@ -331,7 +329,7 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, if(buf.len > 1) { elem_vector_normalize(&buf); - *pdisp = (IDispatch*)HTMLElementCollection_Create(This->ref_unk, buf.buf, buf.len); + *pdisp = (IDispatch*)HTMLElementCollection_Create(buf.buf, buf.len); }else { if(buf.len == 1) { /* Already AddRef-ed */ @@ -393,7 +391,7 @@ static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface, TRACE("fount %d tags\n", buf.len); - *pdisp = (IDispatch*)HTMLElementCollection_Create(This->ref_unk, buf.buf, buf.len); + *pdisp = (IDispatch*)HTMLElementCollection_Create(buf.buf, buf.len); return S_OK; } @@ -547,10 +545,10 @@ IHTMLElementCollection *create_all_collection(HTMLDOMNode *node, BOOL include_ro create_all_list(node->doc, node, &buf); elem_vector_normalize(&buf); - return HTMLElementCollection_Create((IUnknown*)&node->IHTMLDOMNode_iface, buf.buf, buf.len); + return HTMLElementCollection_Create(buf.buf, buf.len); } -IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode *doc, IUnknown *unk, nsIDOMNodeList *nslist) +IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode *doc, nsIDOMNodeList *nslist) { PRUint32 length = 0, i; HTMLDOMNode *node; @@ -582,10 +580,10 @@ IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode *doc, I buf.buf = NULL; } - return HTMLElementCollection_Create(unk, buf.buf, buf.len); + return HTMLElementCollection_Create(buf.buf, buf.len); } -IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode *doc, IUnknown *unk, nsIDOMHTMLCollection *nscol) +IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode *doc, nsIDOMHTMLCollection *nscol) { PRUint32 length = 0, i; elem_vector_t buf; @@ -617,11 +615,10 @@ IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode *doc, IU return NULL; } - return HTMLElementCollection_Create(unk, buf.buf, buf.len); + return HTMLElementCollection_Create(buf.buf, buf.len); } -static IHTMLElementCollection *HTMLElementCollection_Create(IUnknown *ref_unk, - HTMLElement **elems, DWORD len) +static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems, DWORD len) { HTMLElementCollection *ret = heap_alloc_zero(sizeof(HTMLElementCollection)); @@ -633,9 +630,6 @@ static IHTMLElementCollection *HTMLElementCollection_Create(IUnknown *ref_unk, init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLElementCollection_iface, &HTMLElementCollection_dispex); - IUnknown_AddRef(ref_unk); - ret->ref_unk = ref_unk; - TRACE("ret=%p len=%d\n", ret, len); return &ret->IHTMLElementCollection_iface; diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 975e53c..79223be 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -300,8 +300,7 @@ static HRESULT WINAPI HTMLTable_get_rows(IHTMLTable *iface, IHTMLElementCollecti return E_FAIL; } - *p = create_collection_from_htmlcol(This->element.node.doc, (IUnknown*)&This->IHTMLTable_iface, - nscol); + *p = create_collection_from_htmlcol(This->element.node.doc, nscol); nsIDOMHTMLCollection_Release(nscol); return S_OK; diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index c9b21ec..db5c7f2 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -210,7 +210,7 @@ static HRESULT WINAPI HTMLTableRow_get_cells(IHTMLTableRow *iface, IHTMLElementC return E_FAIL; } - *p = create_collection_from_htmlcol(This->element.node.doc, (IUnknown*)&This->IHTMLTableRow_iface, nscol); + *p = create_collection_from_htmlcol(This->element.node.doc, nscol); nsIDOMHTMLCollection_Release(nscol); return S_OK; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7d0fef1..f050411 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -862,8 +862,8 @@ HRESULT search_window_props(HTMLInnerWindow*,BSTR,DWORD,DISPID*) DECLSPEC_HIDDEN HRESULT wrap_iface(IUnknown*,IUnknown*,IUnknown**) DECLSPEC_HIDDEN; IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL) DECLSPEC_HIDDEN; -IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,IUnknown*,nsIDOMNodeList*) DECLSPEC_HIDDEN; -IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,IUnknown*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; +IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOMNodeList*) DECLSPEC_HIDDEN; +IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; /* commands */ typedef struct {

1 0

Jacek Caban : mshtml: Keep references to nodes stored in HTMLElementCollection.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: c2ca817dd14119ac9990f16cc915ea625662590e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ca817dd14119ac9990f16cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 27 10:55:32 2012 +0200 mshtml: Keep references to nodes stored in HTMLElementCollection. --- dlls/mshtml/htmlelemcol.c | 21 ++++++++++++++------- dlls/mshtml/mshtml_private.h | 5 +++++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 94395bb..76da651 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -137,6 +137,10 @@ static ULONG WINAPI HTMLElementCollection_Release(IHTMLElementCollection *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + unsigned i; + + for(i=0; i < This->len; i++) + node_release(&This->elems[i]->node); IUnknown_Release(This->ref_unk); release_dispex(&This->dispex); heap_free(This->elems); @@ -319,8 +323,10 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, buf.buf = heap_alloc(buf.size*sizeof(HTMLElement*)); for(i=0; i<This->len; i++) { - if(is_elem_name(This->elems[i], V_BSTR(&name))) + if(is_elem_name(This->elems[i], V_BSTR(&name))) { + node_addref(&This->elems[i]->node); elem_vector_add(&buf, This->elems[i]); + } } if(buf.len > 1) { @@ -328,8 +334,8 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, *pdisp = (IDispatch*)HTMLElementCollection_Create(This->ref_unk, buf.buf, buf.len); }else { if(buf.len == 1) { + /* Already AddRef-ed */ *pdisp = (IDispatch*)&buf.buf[0]->IHTMLElement_iface; - IDispatch_AddRef(*pdisp); } heap_free(buf.buf); @@ -376,8 +382,10 @@ static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface, nsAString_GetData(&tag_str, &tag); if(CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, tag, -1, - V_BSTR(&tagName), -1) == CSTR_EQUAL) + V_BSTR(&tagName), -1) == CSTR_EQUAL) { + node_addref(&This->elems[i]->node); elem_vector_add(&buf, This->elems[i]); + } } nsAString_Finish(&tag_str); @@ -522,7 +530,6 @@ static void create_all_list(HTMLDocumentNode *doc, HTMLDOMNode *elem, elem_vecto elem_vector_add(buf, elem_from_HTMLDOMNode(node)); create_all_list(doc, node, buf); - node_release(node); } } } @@ -533,8 +540,10 @@ IHTMLElementCollection *create_all_collection(HTMLDOMNode *node, BOOL include_ro buf.buf = heap_alloc(buf.size*sizeof(HTMLElement*)); - if(include_root) + if(include_root) { + node_addref(node); elem_vector_add(&buf, elem_from_HTMLDOMNode(node)); + } create_all_list(node->doc, node, &buf); elem_vector_normalize(&buf); @@ -564,7 +573,6 @@ IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode *doc, I if(FAILED(hres)) continue; buf.buf[buf.len++] = elem_from_HTMLDOMNode(node); - node_release(node); } nsIDOMNode_Release(nsnode); } @@ -599,7 +607,6 @@ IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode *doc, IU if(FAILED(hres)) break; buf.buf[i] = elem_from_HTMLDOMNode(node); - node_release(node); } }else { buf.buf = NULL; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d8d67f7..7d0fef1 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -572,6 +572,11 @@ struct HTMLDOMNode { HTMLDOMNode *next; }; +static inline void node_addref(HTMLDOMNode *node) +{ + IHTMLDOMNode_AddRef(&node->IHTMLDOMNode_iface); +} + static inline void node_release(HTMLDOMNode *node) { IHTMLDOMNode_Release(&node->IHTMLDOMNode_iface);

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2012