msxml3: Remove get_text() forward.

This commit is contained in:
Nikolay Sivov 2011-02-23 14:40:43 +03:00 committed by Alexandre Julliard
parent 2e5a0dd63f
commit d0bff37cb2
11 changed files with 29 additions and 25 deletions

View File

@ -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(

View File

@ -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(

View File

@ -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(

View File

@ -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(

View File

@ -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);
}

View File

@ -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(

View File

@ -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(

View File

@ -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);

View File

@ -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;
xmlChar *content;
TRACE("(%p, type %d)->(%p)\n", This, This->node->type, text);
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(

View File

@ -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(

View File

@ -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(