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

msxml3: Remove selectNodes() forward.

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

3
dlls/msxml3/attribute.c
View File

@ -489,7 +489,8 @@ static HRESULT WINAPI domattr_selectNodes(
BSTR p, IXMLDOMNodeList** outList)
{
domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList );
TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList);
return node_select_nodes(&This->node, p, outList);
}
static HRESULT WINAPI domattr_selectSingleNode(

3
dlls/msxml3/cdata.c
View File

@ -499,7 +499,8 @@ static HRESULT WINAPI domcdata_selectNodes(
BSTR p, IXMLDOMNodeList** outList)
{
domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList );
TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList);
return node_select_nodes(&This->node, p, outList);
}
static HRESULT WINAPI domcdata_selectSingleNode(

3
dlls/msxml3/comment.c
View File

@ -492,7 +492,8 @@ static HRESULT WINAPI domcomment_selectNodes(
BSTR p, IXMLDOMNodeList** outList)
{
domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList );
TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList);
return node_select_nodes(&This->node, p, outList);
}
static HRESULT WINAPI domcomment_selectSingleNode(

3
dlls/msxml3/docfrag.c
View File

@ -496,7 +496,8 @@ static HRESULT WINAPI domfrag_selectNodes(
BSTR p, IXMLDOMNodeList** outList)
{
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList );
TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList);
return node_select_nodes(&This->node, p, outList);
}
static HRESULT WINAPI domfrag_selectSingleNode(

7
dlls/msxml3/domdoc.c
View File

@ -1442,11 +1442,12 @@ static HRESULT WINAPI domdoc_transformNode(
static HRESULT WINAPI domdoc_selectNodes(
IXMLDOMDocument3 *iface,
BSTR queryString,
IXMLDOMNodeList** resultList )
BSTR p,
IXMLDOMNodeList **outList)
{
domdoc *This = impl_from_IXMLDOMDocument3( iface );
return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, queryString, resultList );
TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList);
return node_select_nodes(&This->node, p, outList);
}

3
dlls/msxml3/element.c
View File

@ -948,7 +948,8 @@ static HRESULT WINAPI domelem_selectNodes(
BSTR p, IXMLDOMNodeList** outList)
{
domelem *This = impl_from_IXMLDOMElement( iface );
return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList );
TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList);
return node_select_nodes(&This->node, p, outList);
}
static HRESULT WINAPI domelem_selectSingleNode(

3
dlls/msxml3/entityref.c
View File

@ -490,7 +490,8 @@ static HRESULT WINAPI entityref_selectNodes(
BSTR p, IXMLDOMNodeList** outList)
{
entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList );
TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList);
return node_select_nodes(&This->node, p, outList);
}
static HRESULT WINAPI entityref_selectSingleNode(

1
dlls/msxml3/msxml_private.h
View File

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

18
dlls/msxml3/node.c
View File

@ -1032,21 +1032,15 @@ static HRESULT WINAPI xmlnode_transformNode(
#endif
}
static HRESULT WINAPI xmlnode_selectNodes(
IXMLDOMNode *iface,
BSTR queryString,
IXMLDOMNodeList** resultList)
HRESULT node_select_nodes(const xmlnode *This, BSTR query, IXMLDOMNodeList **nodes)
{
xmlnode *This = impl_from_IXMLDOMNode( iface );
xmlChar* str;
HRESULT hr;
TRACE("(%p)->(%s %p)\n", This, debugstr_w(queryString), resultList );
if (!query || !nodes) return E_INVALIDARG;
if (!queryString || !resultList) return E_INVALIDARG;
str = xmlChar_from_wchar(queryString);
hr = queryresult_create(This->node, str, resultList);
str = xmlChar_from_wchar(query);
hr = queryresult_create(This->node, str, nodes);
heap_free(str);
return hr;
@ -1161,7 +1155,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl =
NULL,
NULL,
xmlnode_transformNode,
xmlnode_selectNodes,
NULL,
xmlnode_selectSingleNode
};
@ -1632,7 +1626,7 @@ static HRESULT WINAPI unknode_selectNodes(
BSTR p, IXMLDOMNodeList** outList)
{
unknode *This = unknode_from_IXMLDOMNode( iface );
return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList );
return node_select_nodes(&This->node, p, outList);
}
static HRESULT WINAPI unknode_selectSingleNode(

3
dlls/msxml3/pi.c
View File

@ -507,7 +507,8 @@ static HRESULT WINAPI dom_pi_selectNodes(
BSTR p, IXMLDOMNodeList** outList)
{
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList );
TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList);
return node_select_nodes(&This->node, p, outList);
}
static HRESULT WINAPI dom_pi_selectSingleNode(

3
dlls/msxml3/text.c
View File

@ -577,7 +577,8 @@ static HRESULT WINAPI domtext_selectNodes(
BSTR p, IXMLDOMNodeList** outList)
{
domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList );
TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList);
return node_select_nodes(&This->node, p, outList);
}
static HRESULT WINAPI domtext_selectSingleNode(