ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msxml3: Get rid of ::get_baseName() forward.

This commit is contained in:
Nikolay Sivov 2010-10-31 12:39:53 +03:00 committed by Alexandre Julliard
parent 6556ad57f3
commit 1e998bfc3f
11 changed files with 35 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/msxml3/attribute.c
View File

@ -506,10 +506,11 @@ static HRESULT WINAPI domattr_get_prefix(
static HRESULT WINAPI domattr_get_baseName(
IXMLDOMAttribute *iface,
BSTR* p)
BSTR* name)
{
domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p );
TRACE("(%p)->(%p)\n", This, name);
return node_get_base_name( &This->node, name );
}
static HRESULT WINAPI domattr_transformNodeToObject(

5
dlls/msxml3/cdata.c
View File

@ -517,10 +517,11 @@ static HRESULT WINAPI domcdata_get_prefix(
static HRESULT WINAPI domcdata_get_baseName(
IXMLDOMCDATASection *iface,
BSTR* p)
BSTR* name)
{
domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p );
FIXME("(%p)->(%p): needs test\n", This, name);
return return_null_bstr( name );
}
static HRESULT WINAPI domcdata_transformNodeToObject(

5
dlls/msxml3/comment.c
View File

@ -510,10 +510,11 @@ static HRESULT WINAPI domcomment_get_prefix(
static HRESULT WINAPI domcomment_get_baseName(
IXMLDOMComment *iface,
BSTR* p)
BSTR* name)
{
domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p );
TRACE("(%p)->(%p)\n", This, name);
return return_null_bstr( name );
}
static HRESULT WINAPI domcomment_transformNodeToObject(

5
dlls/msxml3/docfrag.c
View File

@ -514,10 +514,11 @@ static HRESULT WINAPI domfrag_get_prefix(
static HRESULT WINAPI domfrag_get_baseName(
IXMLDOMDocumentFragment *iface,
BSTR* p)
BSTR* name)
{
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p );
FIXME("(%p)->(%p): needs test\n", This, name);
return return_null_bstr( name );
}
static HRESULT WINAPI domfrag_transformNodeToObject(

5
dlls/msxml3/domdoc.c
View File

@ -1341,10 +1341,11 @@ static HRESULT WINAPI domdoc_get_prefix(
static HRESULT WINAPI domdoc_get_baseName(
IXMLDOMDocument3 *iface,
BSTR* nameString )
BSTR* name )
{
domdoc *This = impl_from_IXMLDOMDocument3( iface );
return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), nameString );
TRACE("(%p)->(%p)\n", This, name);
return return_null_bstr( name );
}

5
dlls/msxml3/element.c
View File

@ -562,10 +562,11 @@ static HRESULT WINAPI domelem_get_prefix(
static HRESULT WINAPI domelem_get_baseName(
IXMLDOMElement *iface,
BSTR* p)
BSTR* name)
{
domelem *This = impl_from_IXMLDOMElement( iface );
return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p );
TRACE("(%p)->(%p)\n", This, name);
return node_get_base_name( &This->node, name );
}
static HRESULT WINAPI domelem_transformNodeToObject(

5
dlls/msxml3/entityref.c
View File

@ -508,10 +508,11 @@ static HRESULT WINAPI entityref_get_prefix(
static HRESULT WINAPI entityref_get_baseName(
IXMLDOMEntityReference *iface,
BSTR* p)
BSTR* name)
{
entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p );
FIXME("(%p)->(%p): needs test\n", This, name);
return return_null_bstr( name );
}
static HRESULT WINAPI entityref_transformNodeToObject(

1
dlls/msxml3/msxml_private.h
View File

@ -194,6 +194,7 @@ extern HRESULT node_put_text(xmlnode*,BSTR);
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 DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document);

38
dlls/msxml3/node.c
View File

@ -1170,40 +1170,16 @@ HRESULT node_get_prefix(xmlnode *This, BSTR *prefix)
return *prefix ? S_OK : S_FALSE;
}
static HRESULT WINAPI xmlnode_get_baseName(
IXMLDOMNode *iface,
BSTR* nameString)
HRESULT node_get_base_name(xmlnode *This, BSTR *name)
{
xmlnode *This = impl_from_IXMLDOMNode( iface );
BSTR str = NULL;
HRESULT r = S_FALSE;
if (!name) return E_INVALIDARG;
TRACE("(%p)->(%p)\n", This, nameString );
*name = bstr_from_xmlChar(This->node->name);
if (!*name) return E_OUTOFMEMORY;
if ( !nameString )
return E_INVALIDARG;
TRACE("returning %s\n", debugstr_w(*name));
switch ( This->node->type )
{
case XML_ELEMENT_NODE:
case XML_ATTRIBUTE_NODE:
case XML_PI_NODE:
str = bstr_from_xmlChar( This->node->name );
r = S_OK;
break;
case XML_TEXT_NODE:
case XML_COMMENT_NODE:
case XML_DOCUMENT_NODE:
break;
default:
ERR("Unhandled type %d\n", This->node->type );
break;
}
TRACE("returning %08x str = %s\n", r, debugstr_w( str ) );
*nameString = str;
return r;
return S_OK;
}
static HRESULT WINAPI xmlnode_transformNodeToObject(
@ -1259,7 +1235,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl =
NULL,
xmlnode_get_namespaceURI,
NULL,
xmlnode_get_baseName,
NULL,
xmlnode_transformNodeToObject,
};

5
dlls/msxml3/pi.c
View File

@ -524,10 +524,11 @@ static HRESULT WINAPI dom_pi_get_prefix(
static HRESULT WINAPI dom_pi_get_baseName(
IXMLDOMProcessingInstruction *iface,
BSTR* p)
BSTR* name)
{
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p );
TRACE("(%p)->(%p)\n", This, name);
return node_get_base_name( &This->node, name );
}
static HRESULT WINAPI dom_pi_transformNodeToObject(

5
dlls/msxml3/text.c
View File

@ -523,10 +523,11 @@ static HRESULT WINAPI domtext_get_prefix(
static HRESULT WINAPI domtext_get_baseName(
IXMLDOMText *iface,
BSTR* p)
BSTR* name)
{
domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p );
TRACE("(%p)->(%p)\n", This, name);
return return_null_bstr( name );
}
static HRESULT WINAPI domtext_transformNodeToObject(