June 2012 - Wine-Commits - list.winehq.org

Piotr Caban : msvcp90: Added locale::facet:: _Register function implementation.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: f457511b1db81a951065efc8d23079f191b88e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f457511b1db81a951065efc8d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 27 11:16:21 2012 +0200 msvcp90: Added locale::facet::_Register function implementation. --- dlls/msvcp90/locale.c | 10 ++++++++++ dlls/msvcp90/msvcp90.spec | 2 ++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 5cba182..7b98539 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -223,6 +223,16 @@ void __cdecl locale_facet_register(locale_facet *add) } /* Not exported from msvcp90 */ +/* ?_Register(a)facet@locale(a)std@@QAEXXZ */ +/* ?_Register(a)facet@locale(a)std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(locale_facet__Register, 4) +void __thiscall locale_facet__Register(locale_facet *this) +{ + TRACE("(%p)\n", this); + locale_facet_register(this); +} + +/* Not exported from msvcp90 */ /* ??_7facet(a)locale@std@@6B@ */ extern const vtable_ptr MSVCP_locale_facet_vtable; diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 6d2656c..7126603 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5817,3 +5817,5 @@ @ extern ??_7facet(a)locale@std@@6B@ MSVCP_locale_facet_vtable @ cdecl -arch=win32 ?facet_Register(a)facet@locale(a)std@@CAXPAV123@@Z(ptr) locale_facet_register @ cdecl -arch=win64 ?facet_Register(a)facet@locale(a)std@@CAXPEAV123@@Z(ptr) locale_facet_register +@ thiscall -arch=win32 ?_Register(a)facet@locale(a)std@@QAEXXZ(ptr) locale_facet__Register +@ cdecl -arch=win64 ?_Register(a)facet@locale(a)std@@QEAAXXZ(ptr) locale_facet__Register

1 0

Jacek Caban : mshtml: Get rid of no longer needed unk_ref from HTMLElementCollection.
by Alexandre Julliard June 28, 2012

June 28, 2012

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

Piotr Caban : msvcp90: Allocate different id' s for facets in use_facet functions.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 705fe163da3538ec6e98e738bb9ab921b20ea9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=705fe163da3538ec6e98e738b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 27 11:17:03 2012 +0200 msvcp90: Allocate different id's for facets in use_facet functions. --- dlls/msvcp90/locale.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 7b98539..df0592f 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -1531,7 +1531,7 @@ ctype_char* ctype_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, ctype_char_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_char_id)); if(fac) { _Lockit_dtor(&lock); return (ctype_char*)fac; @@ -2286,7 +2286,7 @@ ctype_wchar* ctype_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, ctype_wchar_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_wchar_id)); if(fac) { _Lockit_dtor(&lock); return (ctype_wchar*)fac; @@ -2751,7 +2751,7 @@ codecvt_char* codecvt_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, codecvt_char_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_char_id)); if(fac) { _Lockit_dtor(&lock); return (codecvt_char*)fac; @@ -3463,7 +3463,7 @@ static numpunct_char* numpunct_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, numpunct_char_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_char_id)); if(fac) { _Lockit_dtor(&lock); return (numpunct_char*)fac; @@ -3819,7 +3819,7 @@ static numpunct_wchar* numpunct_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, numpunct_wchar_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_wchar_id)); if(fac) { _Lockit_dtor(&lock); return (numpunct_wchar*)fac; @@ -3865,7 +3865,7 @@ static numpunct_wchar* numpunct_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, numpunct_short_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_short_id)); if(fac) { _Lockit_dtor(&lock); return (numpunct_wchar*)fac; @@ -4262,7 +4262,7 @@ num_get* num_get_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, num_get_wchar_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_wchar_id)); if(fac) { _Lockit_dtor(&lock); return (num_get*)fac; @@ -5372,7 +5372,7 @@ num_get* num_get_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, num_get_char_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_char_id)); if(fac) { _Lockit_dtor(&lock); return (num_get*)fac; @@ -6222,7 +6222,7 @@ num_put* num_put_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, num_put_char_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_char_id)); if(fac) { _Lockit_dtor(&lock); return (num_put*)fac; @@ -6833,7 +6833,7 @@ num_put* num_put_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, num_put_wchar_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_wchar_id)); if(fac) { _Lockit_dtor(&lock); return (num_put*)fac;

1 0

Jacek Caban : mshtml: Share nsform reference with nsnode.
by Alexandre Julliard June 28, 2012

June 28, 2012

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: Share nsdoc reference with nsnode.
by Alexandre Julliard June 28, 2012

June 28, 2012

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 nsscript reference with nsnode.
by Alexandre Julliard June 28, 2012

June 28, 2012

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

Piotr Caban : msvcp90: Added basic_istream::operator>>(char&) implementation.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: c1ae61b07f6f9d85188b7613cfdecb69a1e80597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ae61b07f6f9d85188b7613c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 27 11:15:49 2012 +0200 msvcp90: Added basic_istream::operator>>(char&) implementation. --- dlls/msvcp90/ios.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 8 +++--- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index b3e541e..0950077 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5755,6 +5755,30 @@ basic_istream_char* __cdecl basic_istream_char_get_bstr( return istream; } +/* ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAD(a)Z */ +/* ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAD(a)Z */ +basic_istream_char* __cdecl basic_istream_char_read_ch(basic_istream_char *istream, char *ch) +{ + IOSB_iostate state = IOSTATE_failbit; + int c = 0; + + TRACE("(%p %p)\n", istream, ch); + + if(basic_istream_char_sentry_create(istream, FALSE)) { + c = basic_streambuf_char_sbumpc(basic_ios_char_rdbuf_get( + basic_istream_char_get_basic_ios(istream))); + if(c != EOF) { + state = IOSTATE_goodbit; + *ch = c; + } + } + basic_istream_char_sentry_destroy(istream); + + basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), + state | (c==EOF ? IOSTATE_eofbit : IOSTATE_goodbit)); + return istream; +} + /* Caution: basic_istream uses virtual inheritance. */ static inline basic_ios_wchar* basic_istream_wchar_get_basic_ios(basic_istream_wchar *this) { @@ -6783,6 +6807,30 @@ basic_istream_wchar* __cdecl basic_istream_wchar_get_bstr( return istream; } +/* ??$?5_WU?$char_traits(a)_W@std@@@std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@AA_W(a)Z */ +/* ??$?5_WU?$char_traits(a)_W@std@@@std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@AEA_W(a)Z */ +basic_istream_wchar* __cdecl basic_istream_wchar_read_ch(basic_istream_wchar *istream, wchar_t *ch) +{ + IOSB_iostate state = IOSTATE_failbit; + unsigned short c = 0; + + TRACE("(%p %p)\n", istream, ch); + + if(basic_istream_wchar_sentry_create(istream, FALSE)) { + c = basic_streambuf_wchar_sbumpc(basic_ios_wchar_rdbuf_get( + basic_istream_wchar_get_basic_ios(istream))); + if(c != WEOF) { + state = IOSTATE_goodbit; + *ch = c; + } + } + basic_istream_wchar_sentry_destroy(istream); + + basic_ios_wchar_setstate(basic_istream_wchar_get_basic_ios(istream), + state | (c==WEOF ? IOSTATE_eofbit : IOSTATE_goodbit)); + return istream; +} + /* ??0?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PAV?$basic_streambuf(a)DU?$char_traits(a)D@std@@@1@@Z */ /* ??0?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEAV?$basic_streambuf(a)DU?$char_traits(a)D@std@@@1@@Z */ DEFINE_THISCALL_WRAPPER(basic_iostream_char_ctor, 12) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index d1efc78..6d2656c 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1,5 +1,5 @@ -@ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAD(a)Z -@ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAD(a)Z +@ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAD(a)Z(ptr ptr) basic_istream_char_read_ch +@ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAD(a)Z(ptr ptr) basic_istream_char_read_ch @ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PAD(a)Z @ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEAD(a)Z @ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_istream_char_get_bstr @@ -36,8 +36,8 @@ @ stub -arch=win64 ??$?5U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEAC(a)Z @ stub -arch=win32 ??$?5U?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PAE(a)Z @ stub -arch=win64 ??$?5U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEAE(a)Z -@ stub -arch=win32 ??$?5_WU?$char_traits(a)_W@std@@@std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@AA_W(a)Z -@ stub -arch=win64 ??$?5_WU?$char_traits(a)_W@std@@@std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@AEA_W(a)Z +@ cdecl -arch=win32 ??$?5_WU?$char_traits(a)_W@std@@@std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@AA_W(a)Z(ptr ptr) basic_istream_wchar_read_ch +@ cdecl -arch=win64 ??$?5_WU?$char_traits(a)_W@std@@@std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@AEA_W(a)Z(ptr ptr) basic_istream_wchar_read_ch @ stub -arch=win32 ??$?5_WU?$char_traits(a)_W@std@@@std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@PA_W(a)Z @ stub -arch=win64 ??$?5_WU?$char_traits(a)_W@std@@@std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@PEA_W(a)Z @ cdecl -arch=win32 ??$?5_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@AAV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z(ptr ptr) basic_istream_wchar_get_bstr

1 0

Piotr Caban : msvcp80: Forward basic_string<char>:: erase functions to msvcp90.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 3c921119d69d718ea8fb912d14ac9c358c1e3b4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c921119d69d718ea8fb912d1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 27 11:16:05 2012 +0200 msvcp80: Forward basic_string<char>::erase functions to msvcp90. --- dlls/msvcp80/msvcp80.spec | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index bccae98..5198e27 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -3738,10 +3738,10 @@ @ cdecl -arch=win64 ?eq_int_type@?$char_traits(a)G@std@@SA_NAEBG0(a)Z(ptr ptr) msvcp90.?eq_int_type@?$char_traits(a)G@std@@SA_NAEBG0(a)Z @ cdecl -arch=win32 ?eq_int_type@?$char_traits(a)_W@std@@SA_NABG0(a)Z(ptr ptr) msvcp90.?eq_int_type@?$char_traits(a)_W@std@@SA_NABG0(a)Z @ cdecl -arch=win64 ?eq_int_type@?$char_traits(a)_W@std@@SA_NAEBG0(a)Z(ptr ptr) msvcp90.?eq_int_type@?$char_traits(a)_W@std@@SA_NAEBG0(a)Z -@ stub -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@0(a)Z -@ stub -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@0(a)Z -@ stub -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@@Z -@ stub -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@@Z +@ thiscall -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@0(a)Z(ptr ptr ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z +@ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@0(a)Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@0(a)Z +@ thiscall -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@@Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z +@ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@@Z(ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z @ thiscall -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)II@Z(ptr long long) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)II@Z @ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0@Z(ptr long long) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0@Z @ stub -arch=win32 ?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAE?AV?$_String_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)V32@0(a)Z

1 0

Jacek Caban : mshtml: Share nsoption reference with nsnode.
by Alexandre Julliard June 28, 2012

June 28, 2012

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: Keep references to nodes stored in HTMLElementCollection.
by Alexandre Julliard June 28, 2012

June 28, 2012

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