February 2011 - Wine-commits

Jacek Caban : mshtml: Added IHTMLElement4 stub implementation.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 877069c2ada75e19b9913d03407091ebd9c3e393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=877069c2ada75e19b9913d034… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 24 13:03:42 2011 +0100 mshtml: Added IHTMLElement4 stub implementation. --- dlls/mshtml/htmlelem.c | 3 + dlls/mshtml/htmlelem3.c | 162 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 149 ++++++++------------------------------- 4 files changed, 195 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=877069c2ada75e19b9913…

1 0

Jacek Caban : mshtml.idl: Added DispHTMLDOMAttribute declaration.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 79971018ecb2e2c8261689846aaefa7753e9aacb URL: http://source.winehq.org/git/wine.git/?a=commit;h=79971018ecb2e2c8261689846… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 24 13:03:57 2011 +0100 mshtml.idl: Added DispHTMLDOMAttribute declaration. --- include/mshtmdid.h | 6 +++ include/mshtml.idl | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index c6dc2e7..2dad6fb 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2078,6 +2078,12 @@ #define DISPID_IHTMLDOMATTRIBUTE2_HASCHILDNODES DISPID_DOMATTRIBUTE+19 #define DISPID_IHTMLDOMATTRIBUTE2_CLONENODE DISPID_DOMATTRIBUTE+20 +/* IHTMLDOMAttribute3 */ +#define DISPID_IHTMLDOMATTRIBUTE3_IE8_NODEVALUE DISPID_IE8_ATTR+3 +#define DISPID_IHTMLDOMATTRIBUTE3_IE8_VALUE DISPID_IE8_ATTR+4 +#define DISPID_IHTMLDOMATTRIBUTE3_IE8_SPECIFIED DISPID_IE8_ATTR +#define DISPID_IHTMLDOMATTRIBUTE3_OWNERELEMENT DISPID_IE8_ATTR+1 + /* IHTMLDocumentCompatibleInfo */ #define DISPID_IHTMLDOCUMENTCOMPATIBLEINFO_USERAGENT DISPID_DOCUMENTCOMPATIBLEINFO #define DISPID_IHTMLDOCUMENTCOMPATIBLEINFO_VERSION DISPID_DOCUMENTCOMPATIBLEINFO+1 diff --git a/include/mshtml.idl b/include/mshtml.idl index f7dde54..c2e0874 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -126,6 +126,7 @@ interface IHTMLDOMConstructor : IDispatch IDispatch *constructor() interface IHTMLDocument2; +interface IHTMLElement2; interface IHTMLStyleSheetsCollection; interface IHTMLFrameBase; @@ -3686,6 +3687,111 @@ interface IHTMLDOMImplementation : IDispatch } /***************************************************************************** + * DispHTMLDOMAttribute dispinterface + */ +[ + hidden, + uuid(3050f564-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLDOMAttribute +{ + properties: + methods: + [propget, id(DISPID_IHTMLDOMATTRIBUTE_NODENAME)] + BSTR nodeName(); + + [propput, id(DISPID_IHTMLDOMATTRIBUTE_NODEVALUE)] + void nodeValue(VARIANT v); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE_NODEVALUE)] + VARIANT nodeValue(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE_SPECIFIED)] + VARIANT_BOOL specified(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_NAME)] + BSTR name(); + + [propput, id(DISPID_IHTMLDOMATTRIBUTE2_VALUE)] + void value(BSTR v); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_VALUE)] + BSTR value(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_EXPANDO)] + VARIANT_BOOL expando(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_NODETYPE)] + long nodeType(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_PARENTNODE)] + IHTMLDOMNode *parentNode(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_CHILDNODES)] + IDispatch *childNodes(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_FIRSTCHILD)] + IHTMLDOMNode *firstChild(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_LASTCHILD)] + IHTMLDOMNode *lastChild(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_PREVIOUSSIBLING)] + IHTMLDOMNode *previousSibling(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_NEXTSIBLING)] + IHTMLDOMNode *nextSibling(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_ATTRIBUTES)] + IDispatch *attributes(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_OWNERDOCUMENT)] + IDispatch *ownerDocument(); + + [id(DISPID_IHTMLDOMATTRIBUTE2_INSERTBEFORE)] + IHTMLDOMNode *insertBefore( + [in] IHTMLDOMNode *newChild, + [optional, in] VARIANT refChild); + + [id(DISPID_IHTMLDOMATTRIBUTE2_REPLACECHILD)] + IHTMLDOMNode *replaceChild( + [in] IHTMLDOMNode *newChild, + [in] IHTMLDOMNode *oldChild); + + [id(DISPID_IHTMLDOMATTRIBUTE2_REMOVECHILD)] + IHTMLDOMNode *removeChild([in] IHTMLDOMNode *oldChild); + + [id(DISPID_IHTMLDOMATTRIBUTE2_APPENDCHILD)] + IHTMLDOMNode *appendChild([in] IHTMLDOMNode *newChild); + + [id(DISPID_IHTMLDOMATTRIBUTE2_HASCHILDNODES)] + VARIANT_BOOL hasChildNodes(); + + [id(DISPID_IHTMLDOMATTRIBUTE2_CLONENODE)] + IHTMLDOMAttribute *cloneNode([in] VARIANT_BOOL fDeep); + + [propput, id(DISPID_IHTMLDOMATTRIBUTE3_IE8_NODEVALUE)] + void ie8_nodeValue(VARIANT v); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE3_IE8_NODEVALUE)] + VARIANT ie8_nodeValue(); + + [propput, id(DISPID_IHTMLDOMATTRIBUTE3_IE8_VALUE)] + void ie8_value(BSTR v); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE3_IE8_VALUE)] + BSTR ie8_value(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE3_IE8_SPECIFIED)] + VARIANT_BOOL ie8_specified(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE3_OWNERELEMENT)] + IHTMLElement2 *ownerElement(); + + WINE_IHTMLDOMCONSTRUCTOR_DISPINTERFACE_DECL; +} + +/***************************************************************************** * IHTMLDocumentCompatibleInfo interface */ [

1 0

Jacek Caban : mshtml: Added IHTMLElement4::getAttributeNode implementation.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 0e3bf9b2285a1f5e3e98b82dc6a76782c1f79cf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e3bf9b2285a1f5e3e98b82dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 24 13:04:08 2011 +0100 mshtml: Added IHTMLElement4::getAttributeNode implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlattr.c | 177 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlelem3.c | 29 +++++++- dlls/mshtml/mshtml_private.h | 9 ++ dlls/mshtml/nsiface.idl | 16 ++++- 5 files changed, 229 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 2093eb6..ea716fb 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ editor.c \ hlink.c \ htmlanchor.c \ + htmlattr.c \ htmlbody.c \ htmlcomment.c \ htmlcurstyle.c \ diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c new file mode 100644 index 0000000..05b13fc --- /dev/null +++ b/dlls/mshtml/htmlattr.c @@ -0,0 +1,177 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + +#include "mshtml_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mshtml); + +static inline HTMLDOMAttribute *impl_from_IHTMLDOMAttribute(IHTMLDOMAttribute *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMAttribute, IHTMLDOMAttribute_iface); +} + +static HRESULT WINAPI HTMLDOMAttribute_QueryInterface(IHTMLDOMAttribute *iface, + REFIID riid, void **ppv) +{ + HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IHTMLDOMAttribute_iface; + }else if(IsEqualGUID(&IID_IHTMLDOMAttribute, riid)) { + TRACE("(%p)->(IID_IHTMLDOMAttribute %p)\n", This, ppv); + *ppv = &This->IHTMLDOMAttribute_iface; + }else { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLDOMAttribute_AddRef(IHTMLDOMAttribute *iface) +{ + HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLDOMAttribute_Release(IHTMLDOMAttribute *iface) +{ + HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + nsIDOMAttr_Release(This->nsattr); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLDOMAttribute_GetTypeInfoCount(IHTMLDOMAttribute *iface, UINT *pctinfo) +{ + HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMAttribute_GetTypeInfo(IHTMLDOMAttribute *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMAttribute_GetIDsOfNames(IHTMLDOMAttribute *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMAttribute_Invoke(IHTMLDOMAttribute *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMAttribute_get_nodeName(IHTMLDOMAttribute *iface, BSTR *p) +{ + HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMAttribute_put_nodeName(IHTMLDOMAttribute *iface, VARIANT v) +{ + HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMAttribute_get_nodeValue(IHTMLDOMAttribute *iface, VARIANT *p) +{ + HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, VARIANT_BOOL *p) +{ + HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLDOMAttributeVtbl HTMLDOMAttributeVtbl = { + HTMLDOMAttribute_QueryInterface, + HTMLDOMAttribute_AddRef, + HTMLDOMAttribute_Release, + HTMLDOMAttribute_GetTypeInfoCount, + HTMLDOMAttribute_GetTypeInfo, + HTMLDOMAttribute_GetIDsOfNames, + HTMLDOMAttribute_Invoke, + HTMLDOMAttribute_get_nodeName, + HTMLDOMAttribute_put_nodeName, + HTMLDOMAttribute_get_nodeValue, + HTMLDOMAttribute_get_specified +}; + +HRESULT HTMLDOMAttribute_Create(HTMLDocumentNode *doc, nsIDOMAttr *nsattr, HTMLDOMAttribute **attr) +{ + HTMLDOMAttribute *ret; + + ret = heap_alloc_zero(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IHTMLDOMAttribute_iface.lpVtbl = &HTMLDOMAttributeVtbl; + ret->ref = 1; + + nsIDOMAttr_AddRef(nsattr); + ret->nsattr = nsattr; + + *attr = ret; + return S_OK; +} diff --git a/dlls/mshtml/htmlelem3.c b/dlls/mshtml/htmlelem3.c index 9fc0d39..7841346 100644 --- a/dlls/mshtml/htmlelem3.c +++ b/dlls/mshtml/htmlelem3.c @@ -560,8 +560,33 @@ static HRESULT WINAPI HTMLElement4_normalize(IHTMLElement4 *iface) static HRESULT WINAPI HTMLElement4_getAttributeNode(IHTMLElement4 *iface, BSTR bstrname, IHTMLDOMAttribute **ppAttribute) { HTMLElement *This = impl_from_IHTMLElement4(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrname), ppAttribute); - return E_NOTIMPL; + HTMLDOMAttribute *attr; + nsAString name_str; + nsIDOMAttr *nsattr; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrname), ppAttribute); + + nsAString_InitDepend(&name_str, bstrname); + nsres = nsIDOMHTMLElement_GetAttributeNode(This->nselem, &name_str, &nsattr); + nsAString_Finish(&name_str); + if(NS_FAILED(nsres)) { + ERR("GetAttributeNode failed: %08x\n", nsres); + return E_FAIL; + } + + if(nsattr) { + hres = HTMLDOMAttribute_Create(This->node.doc, nsattr, &attr); + nsIDOMAttr_Release(nsattr); + if(FAILED(hres)) + return hres; + + *ppAttribute = &attr->IHTMLDOMAttribute_iface; + }else { + *ppAttribute = NULL; + } + return S_OK; } static HRESULT WINAPI HTMLElement4_setAttributeNode(IHTMLElement4 *iface, IHTMLDOMAttribute *pattr, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c6d56ee..dc99fbf 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -739,6 +739,15 @@ HRESULT create_nselem(HTMLDocumentNode*,const WCHAR*,nsIDOMHTMLElement**); HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLDOMNode**); +typedef struct { + IHTMLDOMAttribute IHTMLDOMAttribute_iface; + + LONG ref; + nsIDOMAttr *nsattr; +} HTMLDOMAttribute; + +HRESULT HTMLDOMAttribute_Create(HTMLDocumentNode*,nsIDOMAttr*,HTMLDOMAttribute**); + HRESULT HTMLElement_Create(HTMLDocumentNode*,nsIDOMNode*,BOOL,HTMLElement**); HRESULT HTMLCommentElement_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLElement**); HRESULT HTMLAnchorElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 4248768..7d8b5ce 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -89,6 +89,7 @@ interface nsIDOMCSSStyleSheet; interface nsIDOMDocumentView; interface nsIDocumentObserver; interface nsIDOMWindow; +interface nsIDOMElement; interface IMoniker; @@ -111,7 +112,6 @@ typedef nsISupports nsIDOMBarProp; typedef nsISupports nsIPrompt; typedef nsISupports nsIAuthPrompt; typedef nsISupports nsIDOMNamedNodeMap; -typedef nsISupports nsIDOMAttr; typedef nsISupports nsIDOMDocumentType; typedef nsISupports nsIDOMDOMImplementation; typedef nsISupports nsIDOMCDATASection; @@ -675,6 +675,20 @@ interface nsIDOMNode : nsISupports [ object, + uuid(a6cf9070-15b3-11d2-932e-00805f8add32), + local +] +interface nsIDOMAttr : nsIDOMNode +{ + nsresult GetName(nsAString *aName); + nsresult GetSpecified(PRBool *aSpecified); + nsresult GetValue(nsAString *aValue); + nsresult SetValue(const nsAString *aValue); + nsresult GetOwnerElement(nsIDOMElement **aOwnerElement); +} + +[ + object, uuid(a6cf9078-15b3-11d2-932e-00805f8add32), local ]

1 0

Jacek Caban : mshtml: Added IDispatchEx support to HTMLDOMAttribute object.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 17736769c41720905b290b691abdd42d272a8e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17736769c41720905b290b691… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 24 13:04:18 2011 +0100 mshtml: Added IDispatchEx support to HTMLDOMAttribute object. --- dlls/mshtml/htmlattr.c | 31 +++++++++++++++++++++++-------- dlls/mshtml/mshtml_private.h | 3 +++ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 05b13fc..3d6de22 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -48,6 +48,8 @@ static HRESULT WINAPI HTMLDOMAttribute_QueryInterface(IHTMLDOMAttribute *iface, }else if(IsEqualGUID(&IID_IHTMLDOMAttribute, riid)) { TRACE("(%p)->(IID_IHTMLDOMAttribute %p)\n", This, ppv); *ppv = &This->IHTMLDOMAttribute_iface; + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; }else { WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -77,6 +79,7 @@ static ULONG WINAPI HTMLDOMAttribute_Release(IHTMLDOMAttribute *iface) if(!ref) { nsIDOMAttr_Release(This->nsattr); + release_dispex(&This->dispex); heap_free(This); } @@ -86,16 +89,14 @@ static ULONG WINAPI HTMLDOMAttribute_Release(IHTMLDOMAttribute *iface) static HRESULT WINAPI HTMLDOMAttribute_GetTypeInfoCount(IHTMLDOMAttribute *iface, UINT *pctinfo) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - FIXME("%p\n", This); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLDOMAttribute_GetTypeInfo(IHTMLDOMAttribute *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - FIXME("%p\n", This); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLDOMAttribute_GetIDsOfNames(IHTMLDOMAttribute *iface, REFIID riid, @@ -103,8 +104,8 @@ static HRESULT WINAPI HTMLDOMAttribute_GetIDsOfNames(IHTMLDOMAttribute *iface, R LCID lcid, DISPID *rgDispId) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - FIXME("%p\n", This); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); } static HRESULT WINAPI HTMLDOMAttribute_Invoke(IHTMLDOMAttribute *iface, DISPID dispIdMember, @@ -112,8 +113,8 @@ static HRESULT WINAPI HTMLDOMAttribute_Invoke(IHTMLDOMAttribute *iface, DISPID d VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - FIXME("%p\n", This); - return E_NOTIMPL; + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLDOMAttribute_get_nodeName(IHTMLDOMAttribute *iface, BSTR *p) @@ -158,6 +159,17 @@ static const IHTMLDOMAttributeVtbl HTMLDOMAttributeVtbl = { HTMLDOMAttribute_get_specified }; +static const tid_t HTMLDOMAttribute_iface_tids[] = { + IHTMLDOMAttribute_tid, + 0 +}; +static dispex_static_data_t HTMLDOMAttribute_dispex = { + NULL, + DispHTMLDOMAttribute_tid, + 0, + HTMLDOMAttribute_iface_tids +}; + HRESULT HTMLDOMAttribute_Create(HTMLDocumentNode *doc, nsIDOMAttr *nsattr, HTMLDOMAttribute **attr) { HTMLDOMAttribute *ret; @@ -172,6 +184,9 @@ HRESULT HTMLDOMAttribute_Create(HTMLDocumentNode *doc, nsIDOMAttr *nsattr, HTMLD nsIDOMAttr_AddRef(nsattr); ret->nsattr = nsattr; + init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLDOMAttribute_iface, + &HTMLDOMAttribute_dispex); + *attr = ret; return S_OK; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index dc99fbf..e69949e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -74,6 +74,7 @@ typedef struct event_target_t event_target_t; XDIID(DispHTMLCommentElement) \ XDIID(DispHTMLCurrentStyle) \ XDIID(DispHTMLDocument) \ + XDIID(DispHTMLDOMAttribute) \ XDIID(DispHTMLDOMTextNode) \ XDIID(DispHTMLElementCollection) \ XDIID(DispHTMLEmbed) \ @@ -111,6 +112,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLDocument3) \ XIID(IHTMLDocument4) \ XIID(IHTMLDocument5) \ + XIID(IHTMLDOMAttribute) \ XIID(IHTMLDOMChildrenCollection) \ XIID(IHTMLDOMNode) \ XIID(IHTMLDOMNode2) \ @@ -740,6 +742,7 @@ HRESULT create_nselem(HTMLDocumentNode*,const WCHAR*,nsIDOMHTMLElement**); HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLDOMNode**); typedef struct { + DispatchEx dispex; IHTMLDOMAttribute IHTMLDOMAttribute_iface; LONG ref;

1 0

Jacek Caban : mshtml: Added attribute object tests.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 8f79e50e1a90d406b86f714c4d617266b6634ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f79e50e1a90d406b86f714c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 24 13:04:29 2011 +0100 mshtml: Added attribute object tests. --- dlls/mshtml/tests/dom.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 73 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d6dfff9..296de73 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1,5 +1,5 @@ /* - * Copyright 2007-2008 Jacek Caban for CodeWeavers + * Copyright 2007-2011 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -225,6 +225,12 @@ static const IID * const text_iids[] = { NULL }; +static const IID * const attr_iids[] = { + &IID_IHTMLDOMAttribute, + &IID_IDispatchEx, + NULL +}; + static const IID * const location_iids[] = { &IID_IDispatch, &IID_IHTMLLocation, @@ -468,6 +474,18 @@ static void _test_ifaces(unsigned line, IUnknown *iface, REFIID *iids) } } +#define test_no_iface(a,b) _test_no_iface(__LINE__,a,b) +static void _test_no_iface(unsigned line, IUnknown *iface, REFIID iid) +{ + IUnknown *unk; + HRESULT hres; + + unk = (void*)0xdeadbeef; + hres = IUnknown_QueryInterface(iface, iid, (void**)&unk); + ok_(__FILE__,line)(hres == E_NOINTERFACE, "hres = %08x, expected E_NOINTERFACE\n", hres); + ok_(__FILE__,line)(!unk, "unk = %p\n", unk); +} + #define test_get_dispid(u,id) _test_get_dispid(__LINE__,u,id) static BOOL _test_get_dispid(unsigned line, IUnknown *unk, IID *iid) { @@ -589,6 +607,17 @@ static IHTMLElement3 *_get_elem3_iface(unsigned line, IUnknown *unk) return elem; } +#define get_elem4_iface(u) _get_elem4_iface(__LINE__,u) +static IHTMLElement4 *_get_elem4_iface(unsigned line, IUnknown *unk) +{ + IHTMLElement4 *elem; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement4, (void**)&elem); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement4: %08x\n", hres); + return elem; +} + #define get_node_iface(u) _get_node_iface(__LINE__,u) static IHTMLDOMNode *_get_node_iface(unsigned line, IUnknown *unk) { @@ -2795,6 +2824,27 @@ static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) return doc; } +#define get_elem_attr_node(a,b,c) _get_elem_attr_node(__LINE__,a,b,c) +static IHTMLDOMAttribute *_get_elem_attr_node(unsigned line, IUnknown *unk, const char *attr_name, BOOL expect_success) +{ + IHTMLElement4 *elem = _get_elem4_iface(line, unk); + BSTR str = a2bstr(attr_name); + IHTMLDOMAttribute *attr; + HRESULT hres; + + attr = (void*)0xdeadbeef; + hres = IHTMLElement4_getAttributeNode(elem, str, &attr); + ok_(__FILE__,line)(hres == S_OK, "getAttributeNode failed: %08x\n", hres); + if(expect_success) + ok_(__FILE__,line)(attr != NULL, "attr = NULL\n"); + else + ok_(__FILE__,line)(!attr, "attr = %p\n", attr); + + IHTMLElement4_Release(elem); + SysFreeString(str); + return attr; +} + #define get_window_doc(e) _get_window_doc(__LINE__,e) static IHTMLDocument2 *_get_window_doc(unsigned line, IHTMLWindow2 *window) { @@ -6584,6 +6634,26 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLWindow2_Release(window); } +static void test_attr(IHTMLElement *elem) +{ + IHTMLDOMAttribute *attr, *attr2; + + get_elem_attr_node((IUnknown*)elem, "noattr", FALSE); + + attr = get_elem_attr_node((IUnknown*)elem, "id", TRUE); + + test_disp((IUnknown*)attr, &DIID_DispHTMLDOMAttribute, "[object]"); + test_ifaces((IUnknown*)attr, attr_iids); + test_no_iface((IUnknown*)attr, &IID_IHTMLDOMNode); + + attr2 = get_elem_attr_node((IUnknown*)elem, "id", TRUE); + todo_wine + ok(iface_cmp((IUnknown*)attr, (IUnknown*)attr2), "attr != attr2\n"); + IHTMLDOMAttribute_Release(attr2); + + IHTMLDOMAttribute_Release(attr); +} + static void test_elems2(IHTMLDocument2 *doc) { IHTMLElement *elem, *elem2, *div; @@ -6642,6 +6712,8 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + test_attr(div); + IHTMLElement_Release(div); }

1 0

Marcus Meissner : ws2_32: name is never NULL as array (Coverity).
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: ae0797150e40f30dbb35a395e68a1a0195c47d6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae0797150e40f30dbb35a395e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Feb 23 21:27:22 2011 +0100 ws2_32: name is never NULL as array (Coverity). --- dlls/ws2_32/tests/sock.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d2f011f..ca72e68 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2548,10 +2548,6 @@ static void test_gethostbyname_hack(void) he->h_addr_list[0][3]); } - /* No reason to test further with NULL hostname */ - if(name == NULL) - return; - if(strcmp(name, "localhost") == 0) { skip("hostname seems to be \"localhost\", skipping test.\n");

1 0

Vincent Povirk : msvcrt: Try to call CorExitProcess instead of ExitProcess on exit.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 71bfd33463e24de24ea4a94e47ce01946ad37a25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71bfd33463e24de24ea4a94e4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 21 15:49:59 2011 -0600 msvcrt: Try to call CorExitProcess instead of ExitProcess on exit. --- dlls/msvcrt/exit.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 6e5a58a..d7f28f1 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -265,8 +265,23 @@ MSVCRT__onexit_t CDECL MSVCRT__onexit(MSVCRT__onexit_t func) */ void CDECL MSVCRT_exit(int exitcode) { + HMODULE hmscoree; + static const WCHAR mscoreeW[] = {'m','s','c','o','r','e','e',0}; + void WINAPI (*pCorExitProcess)(int); + TRACE("(%d)\n",exitcode); MSVCRT__cexit(); + + hmscoree = GetModuleHandleW(mscoreeW); + + if (hmscoree) + { + pCorExitProcess = (void*)GetProcAddress(hmscoree, "CorExitProcess"); + + if (pCorExitProcess) + pCorExitProcess(exitcode); + } + ExitProcess(exitcode); }

1 0

Vincent Povirk : mscoree: Overhaul of mono runtime shutdown process.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: d6582ae8bd3e5ffe526407c2b2d6fe0b572c28f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6582ae8bd3e5ffe526407c2b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 21 14:22:02 2011 -0600 mscoree: Overhaul of mono runtime shutdown process. It turns out that we can't free individual domains because that tears down important data structures. Instead we must shut down the entire runtime, but only if Mono doesn't shut itself down first. And we need to do it before DLL_PROCESS_DETACH because important libraries might be gone by then. --- dlls/mscoree/corruntimehost.c | 10 +++-- dlls/mscoree/metahost.c | 68 +++++++++++++++++++++++++++++++++++++++- dlls/mscoree/mscoree_main.c | 5 ++- dlls/mscoree/mscoree_private.h | 17 +++++++++- 4 files changed, 91 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6582ae8bd3e5ffe52640…

1 0

Vincent Povirk : mscoree: Always return S_FALSE from DllCanUnloadNow.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: b92d834d36fe9f5df42def9e8c8ea589972e34e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b92d834d36fe9f5df42def9e8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 23 15:29:58 2011 -0600 mscoree: Always return S_FALSE from DllCanUnloadNow. We can't really unload after Mono is loaded unless we're exiting the process. We could before that, but it's probably not worth the effort. --- dlls/mscoree/corruntimehost.c | 7 ------- dlls/mscoree/metadata.c | 4 ---- dlls/mscoree/metahost.c | 8 -------- dlls/mscoree/mscoree_main.c | 7 +------ dlls/mscoree/mscoree_private.h | 4 ---- 5 files changed, 1 insertions(+), 29 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 0254753..bcdd485 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -95,8 +95,6 @@ static HRESULT RuntimeHost_AddDomain(RuntimeHost *This, MonoDomain **result) list_add_tail(&This->domains, &entry->entry); - MSCOREE_LockModule(); - *result = entry->domain; end: @@ -137,7 +135,6 @@ static void RuntimeHost_DeleteDomain(RuntimeHost *This, MonoDomain *domain) if (This->default_domain == domain) This->default_domain = NULL; HeapFree(GetProcessHeap(), 0, entry); - MSCOREE_UnlockModule(); break; } } @@ -183,8 +180,6 @@ static ULONG WINAPI corruntimehost_AddRef(ICorRuntimeHost* iface) { RuntimeHost *This = impl_from_ICorRuntimeHost( iface ); - MSCOREE_LockModule(); - return InterlockedIncrement( &This->ref ); } @@ -193,8 +188,6 @@ static ULONG WINAPI corruntimehost_Release(ICorRuntimeHost* iface) RuntimeHost *This = impl_from_ICorRuntimeHost( iface ); ULONG ref; - MSCOREE_UnlockModule(); - ref = InterlockedDecrement( &This->ref ); return ref; diff --git a/dlls/mscoree/metadata.c b/dlls/mscoree/metadata.c index 7a5336d..a2db508 100644 --- a/dlls/mscoree/metadata.c +++ b/dlls/mscoree/metadata.c @@ -79,8 +79,6 @@ static ULONG WINAPI MetaDataDispenser_AddRef(IMetaDataDispenserEx* iface) TRACE("%p ref=%u\n", This, ref); - MSCOREE_LockModule(); - return ref; } @@ -96,8 +94,6 @@ static ULONG WINAPI MetaDataDispenser_Release(IMetaDataDispenserEx* iface) HeapFree(GetProcessHeap(), 0, This); } - MSCOREE_UnlockModule(); - return ref; } diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 72215f0..708f638 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -325,13 +325,11 @@ static HRESULT WINAPI CLRRuntimeInfo_QueryInterface(ICLRRuntimeInfo* iface, static ULONG WINAPI CLRRuntimeInfo_AddRef(ICLRRuntimeInfo* iface) { - MSCOREE_LockModule(); return 2; } static ULONG WINAPI CLRRuntimeInfo_Release(ICLRRuntimeInfo* iface) { - MSCOREE_UnlockModule(); return 1; } @@ -788,8 +786,6 @@ static ULONG WINAPI InstalledRuntimeEnum_AddRef(IEnumUnknown* iface) struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; ULONG ref = InterlockedIncrement(&This->ref); - MSCOREE_LockModule(); - TRACE("(%p) refcount=%u\n", iface, ref); return ref; @@ -800,8 +796,6 @@ static ULONG WINAPI InstalledRuntimeEnum_Release(IEnumUnknown* iface) struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; ULONG ref = InterlockedDecrement(&This->ref); - MSCOREE_UnlockModule(); - TRACE("(%p) refcount=%u\n", iface, ref); if (ref == 0) @@ -942,13 +936,11 @@ static HRESULT WINAPI CLRMetaHost_QueryInterface(ICLRMetaHost* iface, static ULONG WINAPI CLRMetaHost_AddRef(ICLRMetaHost* iface) { - MSCOREE_LockModule(); return 2; } static ULONG WINAPI CLRMetaHost_Release(ICLRMetaHost* iface) { - MSCOREE_UnlockModule(); return 1; } diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 6901f7a..6f53c8f 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -47,8 +47,6 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); -LONG dll_refs = 0; - char *WtoA(LPCWSTR wstr) { int length; @@ -459,10 +457,7 @@ HRESULT WINAPI DllUnregisterServer(void) HRESULT WINAPI DllCanUnloadNow(VOID) { - if (dll_refs) - return S_FALSE; - else - return S_OK; + return S_FALSE; } INT WINAPI ND_RU1( const void *ptr, INT offset ) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 16ae5d3..aa0ee2e 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -20,10 +20,6 @@ #ifndef __MSCOREE_PRIVATE__ #define __MSCOREE_PRIVATE__ -extern LONG dll_refs; -static inline void MSCOREE_LockModule(void) { InterlockedIncrement(&dll_refs); } -static inline void MSCOREE_UnlockModule(void) { InterlockedDecrement(&dll_refs); } - extern char *WtoA(LPCWSTR wstr); extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj);

1 0

Michael Stefaniuc : msxml3: COM cleanup for the IDispatchEx iface.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 16c543a089f6808878efca35bbf0b898d8beef46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16c543a089f6808878efca35b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 23 23:15:47 2011 +0100 msxml3: COM cleanup for the IDispatchEx iface. --- dlls/msxml3/dispex.c | 14 ++++++-------- dlls/msxml3/msxml_private.h | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 1b8afb5..392d856 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -40,8 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); -#define DISPATCHEX(x) ((IDispatchEx*) &(x)->lpIDispatchExVtbl) - typedef struct { DISPID id; BSTR name; @@ -306,7 +304,7 @@ static inline BOOL is_dynamic_dispid(DISPID id) static inline DispatchEx *impl_from_IDispatchEx(IDispatchEx *iface) { - return (DispatchEx*)((char*)iface - FIELD_OFFSET(DispatchEx, lpIDispatchExVtbl)); + return CONTAINING_RECORD(iface, DispatchEx, IDispatchEx_iface); } static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) @@ -362,7 +360,7 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, lcid, rgDispId); for(i=0; i < cNames; i++) { - hres = IDispatchEx_GetDispID(DISPATCHEX(This), rgszNames[i], 0, rgDispId+i); + hres = IDispatchEx_GetDispID(&This->IDispatchEx_iface, rgszNames[i], 0, rgDispId+i); if(FAILED(hres)) return hres; } @@ -379,7 +377,7 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return IDispatchEx_InvokeEx(DISPATCHEX(This), dispIdMember, lcid, wFlags, + return IDispatchEx_InvokeEx(&This->IDispatchEx_iface, dispIdMember, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, NULL); } @@ -630,10 +628,10 @@ BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = DISPATCHEX(This); + *ppv = &This->IDispatchEx_iface; }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); - *ppv = DISPATCHEX(This); + *ppv = &This->IDispatchEx_iface; }else if(IsEqualGUID(&IID_UndocumentedScriptIface, riid)) { TRACE("(%p)->(IID_UndocumentedScriptIface %p) returning NULL\n", This, ppv); *ppv = NULL; @@ -651,7 +649,7 @@ BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) void init_dispex(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *data) { - dispex->lpIDispatchExVtbl = &DispatchExVtbl; + dispex->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; dispex->outer = outer; dispex->data = data; } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 65e10bf..2687324 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -144,7 +144,7 @@ typedef struct { } dispex_static_data_t; typedef struct { - const IDispatchExVtbl *lpIDispatchExVtbl; + IDispatchEx IDispatchEx_iface; IUnknown *outer;

1 0