Commit c8b15e90 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

msxml3: Don't use xmlnode's IXMLDOMNode iface in get_childNode implementations.

parent ed2b7224
......@@ -238,7 +238,10 @@ static HRESULT WINAPI domattr_get_childNodes(
IXMLDOMNodeList** outList)
{
domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList );
TRACE("(%p)->(%p)\n", This, outList);
return node_get_child_nodes(&This->node, outList);
}
static HRESULT WINAPI domattr_get_firstChild(
......
......@@ -249,7 +249,10 @@ static HRESULT WINAPI domcdata_get_childNodes(
IXMLDOMNodeList** outList)
{
domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList );
TRACE("(%p)->(%p)\n", This, outList);
return node_get_child_nodes(&This->node, outList);
}
static HRESULT WINAPI domcdata_get_firstChild(
......
......@@ -242,7 +242,10 @@ static HRESULT WINAPI domcomment_get_childNodes(
IXMLDOMNodeList** outList)
{
domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList );
TRACE("(%p)->(%p)\n", This, outList);
return node_get_child_nodes(&This->node, outList);
}
static HRESULT WINAPI domcomment_get_firstChild(
......
......@@ -244,7 +244,10 @@ static HRESULT WINAPI domfrag_get_childNodes(
IXMLDOMNodeList** outList)
{
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList );
TRACE("(%p)->(%p)\n", This, outList);
return node_get_child_nodes(&This->node, outList);
}
static HRESULT WINAPI domfrag_get_firstChild(
......
......@@ -752,7 +752,10 @@ static HRESULT WINAPI domdoc_get_childNodes(
IXMLDOMNodeList** childList )
{
domdoc *This = impl_from_IXMLDOMDocument3( iface );
return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), childList );
TRACE("(%p)->(%p)\n", This, childList);
return node_get_child_nodes(&This->node, childList);
}
......
......@@ -253,7 +253,10 @@ static HRESULT WINAPI domelem_get_childNodes(
IXMLDOMNodeList** outList)
{
domelem *This = impl_from_IXMLDOMElement( iface );
return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList );
TRACE("(%p)->(%p)\n", This, outList);
return node_get_child_nodes(&This->node, outList);
}
static HRESULT WINAPI domelem_get_firstChild(
......
......@@ -240,7 +240,10 @@ static HRESULT WINAPI entityref_get_childNodes(
IXMLDOMNodeList** outList)
{
entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList );
TRACE("(%p)->(%p)\n", This, outList);
return node_get_child_nodes(&This->node, outList);
}
static HRESULT WINAPI entityref_get_firstChild(
......
......@@ -163,6 +163,8 @@ extern HRESULT node_get_nodeName(xmlnode*,BSTR*);
extern HRESULT node_get_content(xmlnode*,VARIANT*);
extern HRESULT node_put_value(xmlnode*,VARIANT*);
extern HRESULT node_get_parent(xmlnode*,IXMLDOMNode**);
extern HRESULT node_get_child_nodes(xmlnode*,IXMLDOMNodeList**);
extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document);
......
......@@ -293,24 +293,26 @@ static HRESULT WINAPI xmlnode_get_parentNode(
return E_NOTIMPL;
}
static HRESULT WINAPI xmlnode_get_childNodes(
IXMLDOMNode *iface,
IXMLDOMNodeList** childList)
HRESULT node_get_child_nodes(xmlnode *This, IXMLDOMNodeList **ret)
{
xmlnode *This = impl_from_IXMLDOMNode( iface );
TRACE("(%p)->(%p)\n", This, childList );
if ( !childList )
if(!ret)
return E_INVALIDARG;
*childList = create_children_nodelist(This->node);
if (*childList == NULL)
*ret = create_children_nodelist(This->node);
if(!*ret)
return E_OUTOFMEMORY;
return S_OK;
}
static HRESULT WINAPI xmlnode_get_childNodes(
IXMLDOMNode *iface,
IXMLDOMNodeList** childList)
{
ERR("Should not be called\n");
return E_NOTIMPL;
}
static HRESULT WINAPI xmlnode_get_firstChild(
IXMLDOMNode *iface,
IXMLDOMNode** firstChild)
......@@ -1825,7 +1827,10 @@ static HRESULT WINAPI unknode_get_childNodes(
IXMLDOMNodeList** outList)
{
unknode *This = impl_from_unkIXMLDOMNode( iface );
return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList );
TRACE("(%p)->(%p)\n", This, outList);
return node_get_child_nodes(&This->node, outList);
}
static HRESULT WINAPI unknode_get_firstChild(
......
......@@ -255,7 +255,10 @@ static HRESULT WINAPI dom_pi_get_childNodes(
IXMLDOMNodeList** outList)
{
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList );
TRACE("(%p)->(%p)\n", This, outList);
return node_get_child_nodes(&This->node, outList);
}
static HRESULT WINAPI dom_pi_get_firstChild(
......
......@@ -255,7 +255,10 @@ static HRESULT WINAPI domtext_get_childNodes(
IXMLDOMNodeList** outList)
{
domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList );
TRACE("(%p)->(%p)\n", This, outList);
return node_get_child_nodes(&This->node, outList);
}
static HRESULT WINAPI domtext_get_firstChild(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment