September 2010 - Wine-Commits

Jacek Caban : msxml3: Don't use xmlnode' s IXMLDOMNode iface in get_nodeName implementations.
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: 7a68fad27389fa33fa6f5b6d47208271ae19b9be URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a68fad27389fa33fa6f5b6d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 4 17:56:25 2010 +0200 msxml3: Don't use xmlnode's IXMLDOMNode iface in get_nodeName implementations. --- dlls/msxml3/attribute.c | 11 ++++++-- dlls/msxml3/cdata.c | 8 +++++- dlls/msxml3/comment.c | 7 ++++- dlls/msxml3/docfrag.c | 8 +++++- dlls/msxml3/domdoc.c | 7 ++++- dlls/msxml3/element.c | 5 +++- dlls/msxml3/entityref.c | 5 +++- dlls/msxml3/msxml_private.h | 18 ++++++++++++++ dlls/msxml3/node.c | 55 +++++++++++-------------------------------- dlls/msxml3/pi.c | 12 +++++++-- dlls/msxml3/text.c | 7 ++++- 11 files changed, 89 insertions(+), 54 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index a004981..30a05cd 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -182,7 +182,10 @@ static HRESULT WINAPI domattr_get_nodeName( BSTR* p ) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); + + TRACE("(%p)->(%p)\n", This, p); + + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI domattr_get_nodeValue( @@ -475,9 +478,11 @@ static HRESULT WINAPI domattr_get_name( IXMLDOMAttribute *iface, BSTR *p) { - /* name property returns the same value as nodeName */ domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); + + TRACE("(%p)->(%p)\n", This, p); + + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI domattr_get_value( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 6baacc8..903f36f 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -190,7 +190,13 @@ static HRESULT WINAPI domcdata_get_nodeName( BSTR* p ) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); + + static const WCHAR cdata_sectionW[] = + {'#','c','d','a','t','a','-','s','e','c','t','i','o','n',0}; + + TRACE("(%p)->(%p)\n", This, p); + + return return_bstr(cdata_sectionW, p); } static HRESULT WINAPI domcdata_get_nodeValue( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 68fa9b8..513ce0c 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -184,7 +184,12 @@ static HRESULT WINAPI domcomment_get_nodeName( BSTR* p ) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); + + static const WCHAR commentW[] = {'#','c','o','m','m','e','n','t',0}; + + TRACE("(%p)->(%p)\n", This, p); + + return return_bstr(commentW, p); } static HRESULT WINAPI domcomment_get_nodeValue( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index df6676e..5264d96 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -183,7 +183,13 @@ static HRESULT WINAPI domfrag_get_nodeName( BSTR* p ) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); + + static const WCHAR document_fragmentW[] = + {'#','d','o','c','u','m','e','n','t','-','f','r','a','g','m','e','n','t',0}; + + TRACE("(%p)->(%p)\n", This, p); + + return return_bstr(document_fragmentW, p); } static HRESULT WINAPI domfrag_get_nodeValue( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index b122880..6046c1e 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -686,7 +686,12 @@ static HRESULT WINAPI domdoc_get_nodeName( BSTR* name ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), name ); + + static const WCHAR documentW[] = {'#','d','o','c','u','m','e','n','t',0}; + + TRACE("(%p)->(%p)\n", This, name); + + return return_bstr(documentW, name); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 890ea14..4e5522c 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -194,7 +194,10 @@ static HRESULT WINAPI domelem_get_nodeName( BSTR* p ) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); + + TRACE("(%p)->(%p)\n", This, p); + + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI domelem_get_nodeValue( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 63c962b..db7d162 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -182,7 +182,10 @@ static HRESULT WINAPI entityref_get_nodeName( BSTR* p ) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); + + FIXME("(%p)->(%p)\n", This, p); + + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI entityref_get_nodeValue( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index cea3686..b249d90 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -159,6 +159,8 @@ extern void destroy_xmlnode(xmlnode*); extern BOOL node_query_interface(xmlnode*,REFIID,void**); extern xmlnode *get_node_obj(IXMLDOMNode*); +extern HRESULT node_get_nodeName(xmlnode*,BSTR*); + extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); static inline BSTR bstr_from_xmlChar(const xmlChar *str) @@ -177,6 +179,22 @@ static inline BSTR bstr_from_xmlChar(const xmlChar *str) return ret; } +static inline HRESULT return_bstr(const WCHAR *value, BSTR *p) +{ + if(!p) + return E_INVALIDARG; + + if(value) { + *p = SysAllocString(value); + if(!*p) + return E_OUTOFMEMORY; + }else { + *p = NULL; + } + + return S_OK; +} + #endif void* libxslt_handle; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 6143f13..f057a95 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -178,56 +178,26 @@ static HRESULT WINAPI xmlnode_Invoke( return E_NOTIMPL; } -static HRESULT WINAPI xmlnode_get_nodeName( - IXMLDOMNode *iface, - BSTR* name) +HRESULT node_get_nodeName(xmlnode *This, BSTR *name) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); - const xmlChar *str; - - TRACE("(%p)->(%p)\n", This, name ); - if (!name) return E_INVALIDARG; - if ( !This->node ) - return E_FAIL; - - switch( This->node->type ) - { - case XML_CDATA_SECTION_NODE: - str = (const xmlChar*) "#cdata-section"; - break; - case XML_COMMENT_NODE: - str = (const xmlChar*) "#comment"; - break; - case XML_DOCUMENT_FRAG_NODE: - str = (const xmlChar*) "#document-fragment"; - break; - case XML_TEXT_NODE: - str = (const xmlChar*) "#text"; - break; - case XML_DOCUMENT_NODE: - str = (const xmlChar*) "#document"; - break; - case XML_ATTRIBUTE_NODE: - case XML_ELEMENT_NODE: - case XML_PI_NODE: - str = This->node->name; - break; - default: - FIXME("nodeName not mapped correctly (%d)\n", This->node->type); - str = This->node->name; - break; - } - - *name = bstr_from_xmlChar( str ); + *name = bstr_from_xmlChar(This->node->name); if (!*name) return S_FALSE; return S_OK; } +static HRESULT WINAPI xmlnode_get_nodeName( + IXMLDOMNode *iface, + BSTR* name) +{ + ERR("Should not be called\n"); + return E_NOTIMPL; +} + static HRESULT WINAPI xmlnode_get_nodeValue( IXMLDOMNode *iface, VARIANT* value) @@ -1843,7 +1813,10 @@ static HRESULT WINAPI unknode_get_nodeName( BSTR* p ) { unknode *This = impl_from_unkIXMLDOMNode( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); + + FIXME("(%p)->(%p)\n", This, p); + + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI unknode_get_nodeValue( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index c86fd46..aeb296e 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -183,7 +183,10 @@ static HRESULT WINAPI dom_pi_get_nodeName( BSTR* p ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); + + TRACE("(%p)->(%p)\n", This, p); + + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI dom_pi_get_nodeValue( @@ -492,9 +495,12 @@ static HRESULT WINAPI dom_pi_get_target( IXMLDOMProcessingInstruction *iface, BSTR *p) { - /* target returns the same value as nodeName property */ dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); + + TRACE("(%p)->(%p)\n", This, p); + + /* target returns the same value as nodeName property */ + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI dom_pi_get_data( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index b131be1..ccfc36e 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -192,7 +192,12 @@ static HRESULT WINAPI domtext_get_nodeName( BSTR* p ) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); + + static const WCHAR textW[] = {'#','t','e','x','t',0}; + + TRACE("(%p)->(%p)\n", This, p); + + return return_bstr(textW, p); } static HRESULT WINAPI domtext_get_nodeValue(

1 0

Jacek Caban : msxml3: Don't use xmlnode' s IXMLDOMNode iface in get_nodeValue implementations.
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: 6ce537baacd6a78ceb8165238941eef9c65e8f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ce537baacd6a78ceb8165238… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 4 17:56:45 2010 +0200 msxml3: Don't use xmlnode's IXMLDOMNode iface in get_nodeValue implementations. --- dlls/msxml3/attribute.c | 14 ++++++-- dlls/msxml3/cdata.c | 7 +++- dlls/msxml3/comment.c | 7 +++- dlls/msxml3/docfrag.c | 11 ++++++- dlls/msxml3/domdoc.c | 10 ++++++- dlls/msxml3/element.c | 12 ++++++- dlls/msxml3/entityref.c | 11 ++++++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 65 ++++++++++++++++--------------------------- dlls/msxml3/pi.c | 7 +++- dlls/msxml3/text.c | 24 ++++++++------- 11 files changed, 100 insertions(+), 69 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 30a05cd..2e06512 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -190,10 +190,13 @@ static HRESULT WINAPI domattr_get_nodeName( static HRESULT WINAPI domattr_get_nodeValue( IXMLDOMAttribute *iface, - VARIANT* var1 ) + VARIANT* value) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); + + TRACE("(%p)->(%p)\n", This, value); + + return node_get_content(&This->node, value); } static HRESULT WINAPI domattr_put_nodeValue( @@ -487,10 +490,13 @@ static HRESULT WINAPI domattr_get_name( static HRESULT WINAPI domattr_get_value( IXMLDOMAttribute *iface, - VARIANT *var1) + VARIANT *value) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); + + TRACE("(%p)->(%p)\n", This, value); + + return node_get_content(&This->node, value); } static HRESULT WINAPI domattr_put_value( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 903f36f..b29a6cd 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -201,10 +201,13 @@ static HRESULT WINAPI domcdata_get_nodeName( static HRESULT WINAPI domcdata_get_nodeValue( IXMLDOMCDATASection *iface, - VARIANT* var1 ) + VARIANT* value) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); + + TRACE("(%p)->(%p)\n", This, value); + + return node_get_content(&This->node, value); } static HRESULT WINAPI domcdata_put_nodeValue( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 513ce0c..3649daf 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -194,10 +194,13 @@ static HRESULT WINAPI domcomment_get_nodeName( static HRESULT WINAPI domcomment_get_nodeValue( IXMLDOMComment *iface, - VARIANT* var1 ) + VARIANT* value) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); + + TRACE("(%p)->(%p)\n", This, value); + + return node_get_content(&This->node, value); } static HRESULT WINAPI domcomment_put_nodeValue( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 5264d96..fb6308e 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -194,10 +194,17 @@ static HRESULT WINAPI domfrag_get_nodeName( static HRESULT WINAPI domfrag_get_nodeValue( IXMLDOMDocumentFragment *iface, - VARIANT* var1 ) + VARIANT* value) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); + + FIXME("(%p)->(%p)\n", This, value); + + if(!value) + return E_INVALIDARG; + + V_VT(value) = VT_NULL; + return S_FALSE; } static HRESULT WINAPI domfrag_put_nodeValue( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 6046c1e..d591afa 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -700,7 +700,15 @@ static HRESULT WINAPI domdoc_get_nodeValue( VARIANT* value ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), value ); + + TRACE("(%p)->(%p)\n", This, value); + + if(!value) + return E_INVALIDARG; + + V_VT(value) = VT_NULL; + V_BSTR(value) = NULL; /* tests show that we should do this */ + return S_FALSE; } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 4e5522c..0e8559a 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -202,10 +202,18 @@ static HRESULT WINAPI domelem_get_nodeName( static HRESULT WINAPI domelem_get_nodeValue( IXMLDOMElement *iface, - VARIANT* var1 ) + VARIANT* value) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); + + TRACE("(%p)->(%p)\n", This, value); + + if(!value) + return E_INVALIDARG; + + V_VT(value) = VT_NULL; + V_BSTR(value) = NULL; /* tests show that we should do this */ + return S_FALSE; } static HRESULT WINAPI domelem_put_nodeValue( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index db7d162..a779d92 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -190,10 +190,17 @@ static HRESULT WINAPI entityref_get_nodeName( static HRESULT WINAPI entityref_get_nodeValue( IXMLDOMEntityReference *iface, - VARIANT* var1 ) + VARIANT* value) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); + + FIXME("(%p)->(%p)\n", This, value); + + if(!value) + return E_INVALIDARG; + + V_VT(value) = VT_NULL; + return S_FALSE; } static HRESULT WINAPI entityref_put_nodeValue( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index b249d90..3fc9666 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -160,6 +160,7 @@ extern BOOL node_query_interface(xmlnode*,REFIID,void**); extern xmlnode *get_node_obj(IXMLDOMNode*); extern HRESULT node_get_nodeName(xmlnode*,BSTR*); +extern HRESULT node_get_content(xmlnode*,VARIANT*); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index f057a95..905ae41 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -198,52 +198,28 @@ static HRESULT WINAPI xmlnode_get_nodeName( return E_NOTIMPL; } -static HRESULT WINAPI xmlnode_get_nodeValue( - IXMLDOMNode *iface, - VARIANT* value) +HRESULT node_get_content(xmlnode *This, VARIANT *value) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); - HRESULT r = S_FALSE; - - TRACE("(%p)->(%p)\n", This, value); + xmlChar *content; if(!value) return E_INVALIDARG; - V_BSTR(value) = NULL; - V_VT(value) = VT_NULL; - - switch ( This->node->type ) - { - case XML_CDATA_SECTION_NODE: - case XML_COMMENT_NODE: - case XML_PI_NODE: - case XML_ATTRIBUTE_NODE: - { - xmlChar *content = xmlNodeGetContent(This->node); - V_VT(value) = VT_BSTR; - V_BSTR(value) = bstr_from_xmlChar( content ); - xmlFree(content); - r = S_OK; - break; - } - case XML_TEXT_NODE: - V_VT(value) = VT_BSTR; - V_BSTR(value) = bstr_from_xmlChar( This->node->content ); - r = S_OK; - break; - case XML_ELEMENT_NODE: - case XML_DOCUMENT_NODE: - /* these seem to return NULL */ - break; + content = xmlNodeGetContent(This->node); + V_VT(value) = VT_BSTR; + V_BSTR(value) = bstr_from_xmlChar( content ); + xmlFree(content); - default: - FIXME("node %p type %d\n", This, This->node->type); - } - - TRACE("%p returned %s\n", This, debugstr_w( V_BSTR(value) ) ); + TRACE("%p returned %s\n", This, debugstr_w(V_BSTR(value))); + return S_OK; +} - return r; +static HRESULT WINAPI xmlnode_get_nodeValue( + IXMLDOMNode *iface, + VARIANT* value) +{ + ERR("Should not be called\n"); + return E_NOTIMPL; } static HRESULT WINAPI xmlnode_put_nodeValue( @@ -1821,10 +1797,17 @@ static HRESULT WINAPI unknode_get_nodeName( static HRESULT WINAPI unknode_get_nodeValue( IXMLDOMNode *iface, - VARIANT* var1 ) + VARIANT* value) { unknode *This = impl_from_unkIXMLDOMNode( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); + + FIXME("(%p)->(%p)\n", This, value); + + if(!value) + return E_INVALIDARG; + + V_VT(value) = VT_NULL; + return S_FALSE; } static HRESULT WINAPI unknode_put_nodeValue( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index aeb296e..518fa66 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -191,10 +191,13 @@ static HRESULT WINAPI dom_pi_get_nodeName( static HRESULT WINAPI dom_pi_get_nodeValue( IXMLDOMProcessingInstruction *iface, - VARIANT* var1 ) + VARIANT* value) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); + + TRACE("(%p)->(%p)\n", This, value); + + return node_get_content(&This->node, value); } static HRESULT WINAPI dom_pi_put_nodeValue( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index ccfc36e..07f9de5 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -202,10 +202,18 @@ static HRESULT WINAPI domtext_get_nodeName( static HRESULT WINAPI domtext_get_nodeValue( IXMLDOMText *iface, - VARIANT* var1 ) + VARIANT* value ) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); + + TRACE("(%p)->(%p)\n", This, value); + + if(!value) + return E_INVALIDARG; + + V_VT(value) = VT_BSTR; + V_BSTR(value) = bstr_from_xmlChar(This->node.node->content); + return S_OK; } static HRESULT WINAPI domtext_put_nodeValue( @@ -487,19 +495,13 @@ static HRESULT WINAPI domtext_get_data( IXMLDOMText *iface, BSTR *p) { - HRESULT hr; - VARIANT vRet; + domtext *This = impl_from_IXMLDOMText( iface ); if(!p) return E_INVALIDARG; - hr = IXMLDOMNode_get_nodeValue( iface, &vRet ); - if(hr == S_OK) - { - *p = V_BSTR(&vRet); - } - - return hr; + *p = bstr_from_xmlChar(This->node.node->content); + return S_OK; } static HRESULT WINAPI domtext_put_data(

1 0

Gerald Pfeifer : gdi32/tests: Fix a test description in test_logpen.
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: b2e2793e28d52712ce78808535b3e6b581af5737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e2793e28d52712ce7880853… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Sep 5 00:14:45 2010 +0200 gdi32/tests: Fix a test description in test_logpen. --- dlls/gdi32/tests/pen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index 460288d..5a5c063 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -293,7 +293,7 @@ static void test_logpen(void) ok(ext_pen.elp.elpHatch == HS_CROSS, "expected HS_CROSS, got %p\n", (void *)ext_pen.elp.elpHatch); ok(ext_pen.elp.elpNumEntries == 2, "expected 0, got %x\n", ext_pen.elp.elpNumEntries); ok(ext_pen.elp.elpStyleEntry[0] == 0xabc, "expected 0xabc, got %x\n", ext_pen.elp.elpStyleEntry[0]); - ok(ext_pen.elp.elpStyleEntry[1] == 0xdef, "expected 0xabc, got %x\n", ext_pen.elp.elpStyleEntry[1]); + ok(ext_pen.elp.elpStyleEntry[1] == 0xdef, "expected 0xdef, got %x\n", ext_pen.elp.elpStyleEntry[1]); break; default:

1 0

André Hentschel : Wine 1.3.2 freigegeben
by Jeremy Newman Sept. 3, 2010

Sept. 3, 2010

Module: website Branch: master Commit: 5285a42945c9bfec1bed86b7b3270e5593f7c84c URL: http://source.winehq.org/git/website.git/?a=commit;h=5285a42945c9bfec1bed86… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 3 20:05:18 2010 +0200 Wine 1.3.2 freigegeben --- news/de/2010090301.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/de/2010090301.xml b/news/de/2010090301.xml new file mode 100644 index 0000000..a1f1cb9 --- /dev/null +++ b/news/de/2010090301.xml @@ -0,0 +1,15 @@ +<news> +<date>3. September 2010</date> +<title>Wine 1.3.2 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Update der Gecko Engine, jetzt auch als 64-Bit Version.</li> + <li>Neue Implementierung der Linux Konsolenunterstützung.</li> + <li>Viele neue Funktionen in den C Runtime Dlls.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.2.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.3.2
by Alexandre Julliard Sept. 3, 2010

Sept. 3, 2010

Module: website Branch: master Commit: 1d39150eee1a07262c0bf8ea9bcbadf5e64b0e05 URL: http://source.winehq.org/git/website.git/?a=commit;h=1d39150eee1a07262c0bf8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 3 19:47:43 2010 +0200 Wine release 1.3.2 --- news/en/2010090301.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/en/2010090301.xml b/news/en/2010090301.xml new file mode 100644 index 0000000..62f34ed --- /dev/null +++ b/news/en/2010090301.xml @@ -0,0 +1,15 @@ +<news> +<date>September 3, 2010</date> +<title>Wine 1.3.2 Released</title> +<body> + The Wine development release 1.3.2 is now available. + <a href="{$root}/announce/1.3.2">What's new</a> in this release: +<ul> + <li>Update of the Gecko engine, now including a 64-bit version.</li> + <li>New implementation of console support on Unix terminals.</li> + <li>Many new functions in the C runtime dlls.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.2.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.3.2 : Alexandre Julliard : Release 1.3.2
by Alexandre Julliard Sept. 3, 2010

Sept. 3, 2010

Module: wine Branch: refs/tags/wine-1.3.2 Tag: 196c67636fb97e6ea6428d0d0a364824ed561040 URL: http://source.winehq.org/git/wine.git/?a=tag;h=196c67636fb97e6ea6428d0d0a36… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 3 19:39:07 2010 +0200 Release 1.3.2

1 0

Alexandre Julliard : Release 1.3.2.
by Alexandre Julliard Sept. 3, 2010

Sept. 3, 2010

Module: wine Branch: master Commit: 75af4023079d16976cf937fb0e0ef061cb3883cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=75af4023079d16976cf937fb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 3 19:39:05 2010 +0200 Release 1.3.2. --- ANNOUNCE | 1337 +++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 646 insertions(+), 711 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75af4023079d16976cf93…

1 0

Jörg Höhle : winmm: Implement MCIERR_DUPLICATE_ALIAS and MCIERR_DEVICE_OPEN.
by Alexandre Julliard Sept. 3, 2010

Sept. 3, 2010

Module: wine Branch: master Commit: 294d0c9501c68e6b07a9cce5ed51d5ac5d53ca5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=294d0c9501c68e6b07a9cce5e… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Sep 1 20:57:24 2010 +0200 winmm: Implement MCIERR_DUPLICATE_ALIAS and MCIERR_DEVICE_OPEN. --- dlls/winmm/mci.c | 8 ++++++-- dlls/winmm/tests/mci.c | 13 ++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 6724d7f..c7e8165 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -898,14 +898,18 @@ static DWORD MCI_FinishOpen(LPWINE_MCIDRIVER wmd, LPMCI_OPEN_PARMSW lpParms, { LPCWSTR alias = NULL; /* Open always defines an alias for further reference */ - if (dwParam & MCI_OPEN_ALIAS) /* open ... alias */ + if (dwParam & MCI_OPEN_ALIAS) { /* open ... alias */ alias = lpParms->lpstrAlias; - else { + if (MCI_GetDriverFromString(alias)) + return MCIERR_DUPLICATE_ALIAS; + } else { if ((dwParam & MCI_OPEN_ELEMENT) /* open file.wav */ && !(dwParam & MCI_OPEN_ELEMENT_ID)) alias = lpParms->lpstrElementName; else if (dwParam & MCI_OPEN_TYPE ) /* open cdaudio */ alias = wmd->lpstrDeviceType; + if (alias && MCI_GetDriverFromString(alias)) + return MCIERR_DEVICE_OPEN; } if (alias) { wmd->lpstrAlias = HeapAlloc(GetProcessHeap(), 0, (strlenW(alias)+1) * sizeof(WCHAR)); diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index e951fbf..f47d4f6 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -525,6 +525,11 @@ static void test_openCloseWAVE(HWND hwnd) err = mciGetDeviceID("waveaudio"); ok(err==1,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); + err = mciSendString("open no-such-file.wav alias waveaudio", buf, sizeof(buf), NULL); + ok(err==MCIERR_DUPLICATE_ALIAS, "mci open alias waveaudio returned %s\n", dbg_mcierr(err)); + /* If it were not already in use, open avivideo alias waveaudio would succeed, + * making for funny test cases. */ + err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_WAIT, 0); /* from MSDN */ ok(!err,"mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_WAIT, 0) returned %s\n", dbg_mcierr(err)); @@ -1124,10 +1129,12 @@ static void test_AutoOpenWAVE(HWND hwnd) ok(!err,"mci status tempfile.wav mode returned %s\n", dbg_mcierr(err)); if(!err) ok(!strcmp(buf,"playing"), "mci auto-open status mode, got: %s\n", buf); - if (0) { /* FIXME: wait until this no more confuses Wine */ err = mciSendString("open tempfile.wav", buf, sizeof(buf), NULL); - todo_wine ok(err==MCIERR_DEVICE_OPEN, "mci open from auto-open returned %s\n", dbg_mcierr(err)); - } + ok(err==MCIERR_DEVICE_OPEN, "mci open from auto-open returned %s\n", dbg_mcierr(err)); + + err = mciSendString("open foo.wav alias tempfile.wav", buf, sizeof(buf), NULL); + ok(err==MCIERR_DUPLICATE_ALIAS, "mci open re-using alias returned %s\n", dbg_mcierr(err)); + /* w2k/xp and Wine differ. While the device is busy playing, it is * regularly open and accessible via the filename: subsequent * commands must not cause auto-open each. In Wine, a subsequent

1 0

Jörg Höhle : winmm: GetDeviceID only considers a single name per entry.
by Alexandre Julliard Sept. 3, 2010

Sept. 3, 2010

Module: wine Branch: master Commit: 6b271b6d3c4b8b155613d8b1456754dec953bcdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b271b6d3c4b8b155613d8b14… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Sep 1 21:03:43 2010 +0200 winmm: GetDeviceID only considers a single name per entry. --- dlls/winmm/mci.c | 4 ---- dlls/winmm/tests/mci.c | 18 +++++++++++++++--- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index b7799c8..6724d7f 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -127,10 +127,6 @@ static UINT MCI_GetDriverFromString(LPCWSTR lpstrName) ret = wmd->wDeviceID; break; } - if (wmd->lpstrDeviceType && strcmpiW(wmd->lpstrDeviceType, lpstrName) == 0) { - ret = wmd->wDeviceID; - break; - } } LeaveCriticalSection(&WINMM_cs); diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 8adc46b..e951fbf 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -565,7 +565,7 @@ static void test_recordWAVE(HWND hwnd) /* Only the alias is looked up. */ err = mciGetDeviceID("waveaudio"); - todo_wine ok(err==0,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); + ok(err==0,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); test_notification(hwnd, "open new", MCI_NOTIFY_SUCCESSFUL); test_notification(hwnd, "open new no #2", 0); @@ -724,6 +724,15 @@ static void test_playWAVE(HWND hwnd) return; } + err = mciGetDeviceID("mysound"); + ok(err==1,"mciGetDeviceID mysound returned %u, expected 1\n", err); + + err = mciGetDeviceID("tempfile.wav"); + ok(err==0,"mciGetDeviceID tempfile.wav returned %u, expected 0\n", err); + + err = mciGetDeviceID("waveaudio"); + ok(err==0,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); + err = mciSendString("status mysound length", buf, sizeof(buf), NULL); ok(!err,"mci status length returned %s\n", dbg_mcierr(err)); todo_wine ok(!strcmp(buf,"2000"), "mci status length gave %s, expected 2000, some tests will fail.\n", buf); @@ -852,10 +861,10 @@ static void test_asyncWAVE(HWND hwnd) /* Only the alias is looked up. */ err = mciGetDeviceID("tempfile.wav"); - ok(err==0,"mciGetDeviceID element returned %u, expected 0\n", err); + ok(err==0,"mciGetDeviceID tempfile.wav returned %u, expected 0\n", err); err = mciGetDeviceID("waveaudio"); - todo_wine ok(err==0,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); + ok(err==0,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); err = mciSendString("status mysound mode", buf, sizeof(buf), hwnd); ok(!err,"mci status mode returned %s\n", dbg_mcierr(err)); @@ -1095,6 +1104,9 @@ static void test_AutoOpenWAVE(HWND hwnd) if(!err) ok(!strcmp(buf,"tempfile.wav"), "sysinfo name 1 open: %s\n", buf); test_notification(hwnd, "sysinfo name notify\n", MCI_NOTIFY_SUCCESSFUL); + err = mciGetDeviceID("tempfile.wav"); + ok(err==1,"mciGetDeviceID tempfile.wav returned %u, expected 1\n", err); + /* Save the full pathname to the file. */ err = mciSendString("info tempfile.wav file", path, sizeof(path), NULL); ok(!err,"mci info tempfile.wav file returned %s\n", dbg_mcierr(err));

1 0

Piotr Caban : msvcp90/tests: Fix basic_string<wchar_t>.size tests.
by Alexandre Julliard Sept. 3, 2010

Sept. 3, 2010

Module: wine Branch: master Commit: 960a248da66b33edef31f0fcf513e21452e06edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=960a248da66b33edef31f0fcf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 3 12:07:19 2010 +0200 msvcp90/tests: Fix basic_string<wchar_t>.size tests. --- dlls/msvcp90/tests/string.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index dc9a1ee..cb0b74b 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -407,7 +407,7 @@ static void test_basic_string_wchar(void) { ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); str = call_func1(p_basic_string_wchar_data, &str1); ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); - size = (size_t)call_func1(p_basic_string_char_size, &str1); + size = (size_t)call_func1(p_basic_string_wchar_size, &str1); ok(size == 4, "size = %lu\n", (unsigned long)size); memset(&str2, 0, sizeof(basic_string_wchar)); @@ -423,7 +423,7 @@ static void test_basic_string_wchar(void) { ok(str[0]=='t' && str[1]=='t' && str[2]=='\0', "str = %s\n", wine_dbgstr_w(str)); str = call_func1(p_basic_string_wchar_data, &str2); ok(str[0]=='t' && str[1]=='t' && str[2]=='\0', "str = %s\n", wine_dbgstr_w(str)); - size = (size_t)call_func1(p_basic_string_char_size, &str1); + size = (size_t)call_func1(p_basic_string_wchar_size, &str1); ok(size == 4, "size = %lu\n", (unsigned long)size); call_func3(p_basic_string_wchar_erase, &str2, 1, 100); @@ -431,7 +431,7 @@ static void test_basic_string_wchar(void) { ok(str[0]=='t' && str[1]=='\0', "str = %s\n", wine_dbgstr_w(str)); str = call_func1(p_basic_string_wchar_data, &str2); ok(str[0]=='t' && str[1]=='\0', "str = %s\n", wine_dbgstr_w(str)); - size = (size_t)call_func1(p_basic_string_char_size, &str1); + size = (size_t)call_func1(p_basic_string_wchar_size, &str1); ok(size == 4, "size = %lu\n", (unsigned long)size); call_func3(p_basic_string_wchar_assign_cstr_len, &str2, test, 4);

1 0