Module: wine Branch: master Commit: d3f456d1461ba4eafba6e712065202e57ccd868b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3f456d1461ba4eafba6e71206...
Author: Jacek Caban jacek@codeweavers.com Date: Sun Jan 9 21:42:55 2011 +0100
msxml3: Don't forward get_namespaceURI calls to node's IXMLDOMNode iface.
---
dlls/msxml3/attribute.c | 3 ++- dlls/msxml3/cdata.c | 3 ++- dlls/msxml3/comment.c | 3 ++- dlls/msxml3/docfrag.c | 3 ++- dlls/msxml3/domdoc.c | 3 ++- dlls/msxml3/element.c | 3 ++- dlls/msxml3/entityref.c | 3 ++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 14 ++++---------- dlls/msxml3/pi.c | 3 ++- dlls/msxml3/text.c | 3 ++- 11 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index a6fa1c3..bae80e2 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -504,7 +504,8 @@ static HRESULT WINAPI domattr_get_namespaceURI( BSTR* p) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_namespaceURI(&This->node, p); }
static HRESULT WINAPI domattr_get_prefix( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index e5c6641..d0984c1 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -515,7 +515,8 @@ static HRESULT WINAPI domcdata_get_namespaceURI( BSTR* p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_namespaceURI(&This->node, p); }
static HRESULT WINAPI domcdata_get_prefix( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index a5d76c5..5ebc9c3 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -508,7 +508,8 @@ static HRESULT WINAPI domcomment_get_namespaceURI( BSTR* p) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_namespaceURI(&This->node, p); }
static HRESULT WINAPI domcomment_get_prefix( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index a43d132..8ecf905 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -512,7 +512,8 @@ static HRESULT WINAPI domfrag_get_namespaceURI( BSTR* p) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_namespaceURI(&This->node, p); }
static HRESULT WINAPI domfrag_get_prefix( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 3ea85b3..b4a5b84 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1425,7 +1425,8 @@ static HRESULT WINAPI domdoc_get_namespaceURI( BSTR* namespaceURI ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), namespaceURI ); + TRACE("(%p)->(%p)\n", This, namespaceURI); + return node_get_namespaceURI(&This->node, namespaceURI); }
diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 5c8383e..fe3e558 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -964,7 +964,8 @@ static HRESULT WINAPI domelem_get_namespaceURI( BSTR* p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_namespaceURI(&This->node, p); }
static HRESULT WINAPI domelem_get_prefix( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 6b1ce2e..dc68143 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -506,7 +506,8 @@ static HRESULT WINAPI entityref_get_namespaceURI( BSTR* p) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_namespaceURI(&This->node, p); }
static HRESULT WINAPI entityref_get_prefix( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index bbe8394..ff255cb 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -273,6 +273,7 @@ extern HRESULT node_get_xml(xmlnode*,BOOL,BOOL,BSTR*); extern HRESULT node_clone(xmlnode*,VARIANT_BOOL,IXMLDOMNode**); extern HRESULT node_get_prefix(xmlnode*,BSTR*); extern HRESULT node_get_base_name(xmlnode*,BSTR*); +extern HRESULT node_get_namespaceURI(xmlnode*,BSTR*);
extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); extern HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tree); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 8e90029..b2e5b16 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1079,15 +1079,10 @@ static HRESULT WINAPI xmlnode_selectSingleNode( return r; }
-static HRESULT WINAPI xmlnode_get_namespaceURI( - IXMLDOMNode *iface, - BSTR* namespaceURI) +HRESULT node_get_namespaceURI(xmlnode *This, BSTR *namespaceURI) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); xmlNsPtr *ns;
- TRACE("(%p)->(%p)\n", This, namespaceURI ); - if(!namespaceURI) return E_INVALIDARG;
@@ -1174,9 +1169,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl = NULL, xmlnode_transformNode, xmlnode_selectNodes, - xmlnode_selectSingleNode, - NULL, - xmlnode_get_namespaceURI + xmlnode_selectSingleNode };
void destroy_xmlnode(xmlnode *This) @@ -1672,7 +1665,8 @@ static HRESULT WINAPI unknode_get_namespaceURI( BSTR* p) { unknode *This = impl_from_unkIXMLDOMNode( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_namespaceURI(&This->node, p); }
static HRESULT WINAPI unknode_get_prefix( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 6018093..48adea8 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -523,7 +523,8 @@ static HRESULT WINAPI dom_pi_get_namespaceURI( BSTR* p) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_namespaceURI(&This->node, p); }
static HRESULT WINAPI dom_pi_get_prefix( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 988dd97..0d3425e 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -593,7 +593,8 @@ static HRESULT WINAPI domtext_get_namespaceURI( BSTR* p) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_namespaceURI(&This->node, p); }
static HRESULT WINAPI domtext_get_prefix(