msxml3: Remove appendChild() forward.

This commit is contained in:
Nikolay Sivov 2011-02-23 14:32:16 +03:00 committed by Alexandre Julliard
parent 1178f7b46e
commit 5775bcde4a
11 changed files with 35 additions and 31 deletions

View file

@ -335,10 +335,11 @@ static HRESULT WINAPI domattr_removeChild(
static HRESULT WINAPI domattr_appendChild(
IXMLDOMAttribute *iface,
IXMLDOMNode* newNode, IXMLDOMNode** outNewNode)
IXMLDOMNode *child, IXMLDOMNode **outChild)
{
domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_appendChild( &This->node.IXMLDOMNode_iface, newNode, outNewNode );
TRACE("(%p)->(%p %p)\n", This, child, outChild);
return node_append_child(&This->node, child, outChild);
}
static HRESULT WINAPI domattr_hasChildNodes(

View file

@ -346,10 +346,11 @@ static HRESULT WINAPI domcdata_removeChild(
static HRESULT WINAPI domcdata_appendChild(
IXMLDOMCDATASection *iface,
IXMLDOMNode* newNode, IXMLDOMNode** outNewNode)
IXMLDOMNode *child, IXMLDOMNode **outChild)
{
domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_appendChild( &This->node.IXMLDOMNode_iface, newNode, outNewNode );
TRACE("(%p)->(%p %p)\n", This, child, outChild);
return node_append_child(&This->node, child, outChild);
}
static HRESULT WINAPI domcdata_hasChildNodes(

View file

@ -339,10 +339,11 @@ static HRESULT WINAPI domcomment_removeChild(
static HRESULT WINAPI domcomment_appendChild(
IXMLDOMComment *iface,
IXMLDOMNode* newNode, IXMLDOMNode** outNewNode)
IXMLDOMNode *child, IXMLDOMNode **outChild)
{
domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_appendChild( &This->node.IXMLDOMNode_iface, newNode, outNewNode );
TRACE("(%p)->(%p %p)\n", This, child, outChild);
return node_append_child(&This->node, child, outChild);
}
static HRESULT WINAPI domcomment_hasChildNodes(

View file

@ -343,10 +343,11 @@ static HRESULT WINAPI domfrag_removeChild(
static HRESULT WINAPI domfrag_appendChild(
IXMLDOMDocumentFragment *iface,
IXMLDOMNode* newNode, IXMLDOMNode** outNewNode)
IXMLDOMNode *child, IXMLDOMNode **outChild)
{
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_appendChild( &This->node.IXMLDOMNode_iface, newNode, outNewNode );
TRACE("(%p)->(%p %p)\n", This, child, outChild);
return node_append_child(&This->node, child, outChild);
}
static HRESULT WINAPI domfrag_hasChildNodes(

View file

@ -1228,11 +1228,12 @@ static HRESULT WINAPI domdoc_removeChild(
static HRESULT WINAPI domdoc_appendChild(
IXMLDOMDocument3 *iface,
IXMLDOMNode* newChild,
IXMLDOMNode** outNewChild)
IXMLDOMNode *child,
IXMLDOMNode **outChild)
{
domdoc *This = impl_from_IXMLDOMDocument3( iface );
return IXMLDOMNode_appendChild( &This->node.IXMLDOMNode_iface, newChild, outNewChild );
TRACE("(%p)->(%p %p)\n", This, child, outChild);
return node_append_child(&This->node, child, outChild);
}

View file

@ -354,10 +354,11 @@ static HRESULT WINAPI domelem_removeChild(
static HRESULT WINAPI domelem_appendChild(
IXMLDOMElement *iface,
IXMLDOMNode* newNode, IXMLDOMNode** outNewNode)
IXMLDOMNode *child, IXMLDOMNode **outChild)
{
domelem *This = impl_from_IXMLDOMElement( iface );
return IXMLDOMNode_appendChild( &This->node.IXMLDOMNode_iface, newNode, outNewNode );
TRACE("(%p)->(%p %p)\n", This, child, outChild);
return node_append_child(&This->node, child, outChild);
}
static HRESULT WINAPI domelem_hasChildNodes(

View file

@ -337,10 +337,11 @@ static HRESULT WINAPI entityref_removeChild(
static HRESULT WINAPI entityref_appendChild(
IXMLDOMEntityReference *iface,
IXMLDOMNode* newNode, IXMLDOMNode** outNewNode)
IXMLDOMNode *child, IXMLDOMNode **outChild)
{
entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_appendChild( &This->node.IXMLDOMNode_iface, newNode, outNewNode );
TRACE("(%p)->(%p %p)\n", This, child, outChild);
return node_append_child(&This->node, child, outChild);
}
static HRESULT WINAPI entityref_hasChildNodes(

View file

@ -252,6 +252,7 @@ extern void destroy_xmlnode(xmlnode*);
extern BOOL node_query_interface(xmlnode*,REFIID,void**);
extern xmlnode *get_node_obj(IXMLDOMNode*);
extern HRESULT node_append_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode**);
extern HRESULT node_get_nodeName(xmlnode*,BSTR*);
extern HRESULT node_get_content(xmlnode*,VARIANT*);
extern HRESULT node_set_content(xmlnode*,LPCWSTR);

View file

@ -433,26 +433,20 @@ HRESULT node_remove_child(xmlnode *This, IXMLDOMNode* child, IXMLDOMNode** oldCh
return S_OK;
}
static HRESULT WINAPI xmlnode_appendChild(
IXMLDOMNode *iface,
IXMLDOMNode* newChild,
IXMLDOMNode** outNewChild)
HRESULT node_append_child(xmlnode *This, IXMLDOMNode *child, IXMLDOMNode **outChild)
{
xmlnode *This = impl_from_IXMLDOMNode( iface );
DOMNodeType type;
VARIANT var;
HRESULT hr;
TRACE("(%p)->(%p %p)\n", This, newChild, outNewChild);
hr = IXMLDOMNode_get_nodeType(newChild, &type);
hr = IXMLDOMNode_get_nodeType(child, &type);
if(FAILED(hr) || type == NODE_ATTRIBUTE) {
if(outNewChild) *outNewChild = NULL;
if (outChild) *outChild = NULL;
return E_FAIL;
}
VariantInit(&var);
return IXMLDOMNode_insertBefore(This->iface, newChild, var, outNewChild);
return IXMLDOMNode_insertBefore(This->iface, child, var, outChild);
}
static HRESULT WINAPI xmlnode_hasChildNodes(
@ -1147,7 +1141,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl =
NULL,
NULL,
NULL,
xmlnode_appendChild,
NULL,
xmlnode_hasChildNodes,
xmlnode_get_ownerDocument,
NULL,
@ -1496,7 +1490,7 @@ static HRESULT WINAPI unknode_appendChild(
IXMLDOMNode* newNode, IXMLDOMNode** outNewNode)
{
unknode *This = unknode_from_IXMLDOMNode( iface );
return IXMLDOMNode_appendChild( &This->node.IXMLDOMNode_iface, newNode, outNewNode );
return node_append_child(&This->node, newNode, outNewNode);
}
static HRESULT WINAPI unknode_hasChildNodes(

View file

@ -353,10 +353,11 @@ static HRESULT WINAPI dom_pi_removeChild(
static HRESULT WINAPI dom_pi_appendChild(
IXMLDOMProcessingInstruction *iface,
IXMLDOMNode* newNode, IXMLDOMNode** outNewNode)
IXMLDOMNode *child, IXMLDOMNode **outChild)
{
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_appendChild( &This->node.IXMLDOMNode_iface, newNode, outNewNode );
TRACE("(%p)->(%p %p)\n", This, child, outChild);
return node_append_child(&This->node, child, outChild);
}
static HRESULT WINAPI dom_pi_hasChildNodes(

View file

@ -352,10 +352,11 @@ static HRESULT WINAPI domtext_removeChild(
static HRESULT WINAPI domtext_appendChild(
IXMLDOMText *iface,
IXMLDOMNode* newNode, IXMLDOMNode** outNewNode)
IXMLDOMNode *child, IXMLDOMNode **outChild)
{
domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_appendChild( &This->node.IXMLDOMNode_iface, newNode, outNewNode );
TRACE("(%p)->(%p %p)\n", This, child, outChild);
return node_append_child(&This->node, child, outChild);
}
static HRESULT WINAPI domtext_hasChildNodes(