Skip to content

W
wine-cw
Commit fd925d0e authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

msxml3: Remove child node in one place in node_insert_before().

parent 4782be7e
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 15 deletions
dlls/msxml3/node.c
View file @ fd925d0e
...@@ -477,15 +477,19 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT ...@@ -477,15 +477,19 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT
xmlnode *before_node_obj = get_node_obj(before); xmlnode *before_node_obj = get_node_obj(before);
IXMLDOMNode_Release(before); IXMLDOMNode_Release(before);
if(!before_node_obj) return E_FAIL; if(!before_node_obj) return E_FAIL;
}
/* unlink from current parent first */ /* unlink from current parent first */
if(node_obj->parent) if(node_obj->parent)
{ {
hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL);
if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node);
} }
doc = node_obj->node->doc;
doc = node_obj->node->doc; if(before)
{
xmlnode *before_node_obj = get_node_obj(before);
/* refs count including subtree */ /* refs count including subtree */
if (doc != before_node_obj->node->doc) if (doc != before_node_obj->node->doc)
...@@ -498,14 +502,6 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT ...@@ -498,14 +502,6 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT
} }
else else
{ {
/* unlink from current parent first */
if(node_obj->parent)
{
hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL);
if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node);
}
doc = node_obj->node->doc;
if (doc != This->node->doc) if (doc != This->node->doc)
refcount = xmlnode_get_inst_cnt(node_obj); refcount = xmlnode_get_inst_cnt(node_obj);
......
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