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

msxml3: Remove selectSingleNode() forward.

This commit is contained in:
Nikolay Sivov 2011-02-23 14:44:20 +03:00 committed by Alexandre Julliard
parent 004944c81a
commit aac690d4fc
11 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/msxml3/attribute.c
View File

@ -498,7 +498,8 @@ static HRESULT WINAPI domattr_selectSingleNode(
BSTR p, IXMLDOMNode** outNode)
{
domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode );
TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode);
return node_select_singlenode(&This->node, p, outNode);
}
static HRESULT WINAPI domattr_get_parsed(

3
dlls/msxml3/cdata.c
View File

@ -508,7 +508,8 @@ static HRESULT WINAPI domcdata_selectSingleNode(
BSTR p, IXMLDOMNode** outNode)
{
domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode );
TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode);
return node_select_singlenode(&This->node, p, outNode);
}
static HRESULT WINAPI domcdata_get_parsed(

3
dlls/msxml3/comment.c
View File

@ -501,7 +501,8 @@ static HRESULT WINAPI domcomment_selectSingleNode(
BSTR p, IXMLDOMNode** outNode)
{
domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode );
TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode);
return node_select_singlenode(&This->node, p, outNode);
}
static HRESULT WINAPI domcomment_get_parsed(

3
dlls/msxml3/docfrag.c
View File

@ -505,7 +505,8 @@ static HRESULT WINAPI domfrag_selectSingleNode(
BSTR p, IXMLDOMNode** outNode)
{
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode );
TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode);
return node_select_singlenode(&This->node, p, outNode);
}
static HRESULT WINAPI domfrag_get_parsed(

7
dlls/msxml3/domdoc.c
View File

@ -1453,11 +1453,12 @@ static HRESULT WINAPI domdoc_selectNodes(
static HRESULT WINAPI domdoc_selectSingleNode(
IXMLDOMDocument3 *iface,
BSTR queryString,
IXMLDOMNode** resultNode )
BSTR p,
IXMLDOMNode **outNode)
{
domdoc *This = impl_from_IXMLDOMDocument3( iface );
return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, queryString, resultNode );
TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode);
return node_select_singlenode(&This->node, p, outNode);
}

3
dlls/msxml3/element.c
View File

@ -957,7 +957,8 @@ static HRESULT WINAPI domelem_selectSingleNode(
BSTR p, IXMLDOMNode** outNode)
{
domelem *This = impl_from_IXMLDOMElement( iface );
return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode );
TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode);
return node_select_singlenode(&This->node, p, outNode);
}
static HRESULT WINAPI domelem_get_parsed(

3
dlls/msxml3/entityref.c
View File

@ -499,7 +499,8 @@ static HRESULT WINAPI entityref_selectSingleNode(
BSTR p, IXMLDOMNode** outNode)
{
entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode );
TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode);
return node_select_singlenode(&This->node, p, outNode);
}
static HRESULT WINAPI entityref_get_parsed(

1
dlls/msxml3/msxml_private.h
View File

@ -269,6 +269,7 @@ 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 node_select_nodes(const xmlnode*,BSTR,IXMLDOMNodeList**);
extern HRESULT node_select_singlenode(const xmlnode*,BSTR,IXMLDOMNode**);
extern HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document);

22
dlls/msxml3/node.c
View File

@ -1046,24 +1046,18 @@ HRESULT node_select_nodes(const xmlnode *This, BSTR query, IXMLDOMNodeList **nod
return hr;
}
static HRESULT WINAPI xmlnode_selectSingleNode(
IXMLDOMNode *iface,
BSTR queryString,
IXMLDOMNode** resultNode)
HRESULT node_select_singlenode(const xmlnode *This, BSTR query, IXMLDOMNode **node)
{
xmlnode *This = impl_from_IXMLDOMNode( iface );
IXMLDOMNodeList *list;
HRESULT r;
HRESULT hr;
TRACE("(%p)->(%s %p)\n", This, debugstr_w(queryString), resultNode );
r = IXMLDOMNode_selectNodes(This->iface, queryString, &list);
if(r == S_OK)
hr = node_select_nodes(This, query, &list);
if (hr == S_OK)
{
r = IXMLDOMNodeList_nextNode(list, resultNode);
hr = IXMLDOMNodeList_nextNode(list, node);
IXMLDOMNodeList_Release(list);
}
return r;
return hr;
}
HRESULT node_get_namespaceURI(xmlnode *This, BSTR *namespaceURI)
@ -1156,7 +1150,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl =
NULL,
xmlnode_transformNode,
NULL,
xmlnode_selectSingleNode
NULL
};
void destroy_xmlnode(xmlnode *This)
@ -1634,7 +1628,7 @@ static HRESULT WINAPI unknode_selectSingleNode(
BSTR p, IXMLDOMNode** outNode)
{
unknode *This = unknode_from_IXMLDOMNode( iface );
return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode );
return node_select_singlenode(&This->node, p, outNode);
}
static HRESULT WINAPI unknode_get_parsed(

3
dlls/msxml3/pi.c
View File

@ -516,7 +516,8 @@ static HRESULT WINAPI dom_pi_selectSingleNode(
BSTR p, IXMLDOMNode** outNode)
{
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode );
TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode);
return node_select_singlenode(&This->node, p, outNode);
}
static HRESULT WINAPI dom_pi_get_parsed(

3
dlls/msxml3/text.c
View File

@ -586,7 +586,8 @@ static HRESULT WINAPI domtext_selectSingleNode(
BSTR p, IXMLDOMNode** outNode)
{
domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode );
TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode);
return node_select_singlenode(&This->node, p, outNode);
}
static HRESULT WINAPI domtext_get_parsed(