Module: wine Branch: master Commit: d0bff37cb2d16ff82bf5c2a0ac2061608175e7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0bff37cb2d16ff82bf5c2a0ac...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Wed Feb 23 14:40:43 2011 +0300
msxml3: Remove get_text() forward.
---
dlls/msxml3/attribute.c | 3 ++- dlls/msxml3/cdata.c | 3 ++- dlls/msxml3/comment.c | 3 ++- dlls/msxml3/docfrag.c | 3 ++- dlls/msxml3/domdoc.c | 5 +++-- dlls/msxml3/element.c | 3 ++- dlls/msxml3/entityref.c | 3 ++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 24 +++++++++--------------- dlls/msxml3/pi.c | 3 ++- dlls/msxml3/text.c | 3 ++- 11 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 8fa24f1..03e0fc9 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -386,7 +386,8 @@ static HRESULT WINAPI domattr_get_text( BSTR* p) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_text( &This->node.IXMLDOMNode_iface, p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_text(&This->node, p); }
static HRESULT WINAPI domattr_put_text( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 64185ca..1eb3597 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -397,7 +397,8 @@ static HRESULT WINAPI domcdata_get_text( BSTR* p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_text( &This->node.IXMLDOMNode_iface, p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_text(&This->node, p); }
static HRESULT WINAPI domcdata_put_text( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index bb0c488..e7d6ba1 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -390,7 +390,8 @@ static HRESULT WINAPI domcomment_get_text( BSTR* p) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_text( &This->node.IXMLDOMNode_iface, p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_text(&This->node, p); }
static HRESULT WINAPI domcomment_put_text( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 8c7c8bf..9600176 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -394,7 +394,8 @@ static HRESULT WINAPI domfrag_get_text( BSTR* p) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_text( &This->node.IXMLDOMNode_iface, p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_text(&This->node, p); }
static HRESULT WINAPI domfrag_put_text( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index f0938e4..d2ea36e 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1283,10 +1283,11 @@ static HRESULT WINAPI domdoc_get_nodeTypeString(
static HRESULT WINAPI domdoc_get_text( IXMLDOMDocument3 *iface, - BSTR* text ) + BSTR *p) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_get_text( &This->node.IXMLDOMNode_iface, text ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_text(&This->node, p); }
diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 7cf3afc..c1f3564 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -405,7 +405,8 @@ static HRESULT WINAPI domelem_get_text( BSTR* p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_text( &This->node.IXMLDOMNode_iface, p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_text(&This->node, p); }
static HRESULT WINAPI domelem_put_text( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index d8d1f21..4231c7e 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -388,7 +388,8 @@ static HRESULT WINAPI entityref_get_text( BSTR* p) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_text( &This->node.IXMLDOMNode_iface, p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_text(&This->node, p); }
static HRESULT WINAPI entityref_put_text( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 499aecb..65e10bf 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -275,6 +275,7 @@ extern HRESULT node_get_namespaceURI(xmlnode*,BSTR*); extern HRESULT node_remove_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode**); extern HRESULT node_has_childnodes(const xmlnode*,VARIANT_BOOL*); extern HRESULT node_get_owner_doc(const xmlnode*,IXMLDOMDocument**); +extern HRESULT node_get_text(const xmlnode*,BSTR*);
extern HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document);
diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index dc393f8..aa181a9 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -583,24 +583,18 @@ static xmlChar* do_get_text(xmlNodePtr node) return str; }
-static HRESULT WINAPI xmlnode_get_text( - IXMLDOMNode *iface, - BSTR* text) +HRESULT node_get_text(const xmlnode *This, BSTR *text) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); BSTR str = NULL; - xmlChar *pContent; - - TRACE("(%p, type %d)->(%p)\n", This, This->node->type, text); + xmlChar *content;
- if ( !text ) - return E_INVALIDARG; + if (!text) return E_INVALIDARG;
- pContent = do_get_text((xmlNodePtr)This->node); - if(pContent) + content = do_get_text(This->node); + if (content) { - str = bstr_from_xmlChar(pContent); - xmlFree(pContent); + str = bstr_from_xmlChar(content); + xmlFree(content); }
/* Always return a string. */ @@ -1134,7 +1128,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl = NULL, NULL, NULL, - xmlnode_get_text, + NULL, NULL, NULL, NULL, @@ -1521,7 +1515,7 @@ static HRESULT WINAPI unknode_get_text( BSTR* p) { unknode *This = unknode_from_IXMLDOMNode( iface ); - return IXMLDOMNode_get_text( &This->node.IXMLDOMNode_iface, p ); + return node_get_text(&This->node, p); }
static HRESULT WINAPI unknode_put_text( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 6b812a5..5e87e49 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -405,7 +405,8 @@ static HRESULT WINAPI dom_pi_get_text( BSTR* p) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_text( &This->node.IXMLDOMNode_iface, p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_text(&This->node, p); }
static HRESULT WINAPI dom_pi_put_text( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index c57428f..c8a0186 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -403,7 +403,8 @@ static HRESULT WINAPI domtext_get_text( BSTR* p) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_text( &This->node.IXMLDOMNode_iface, p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_text(&This->node, p); }
static HRESULT WINAPI domtext_put_text(