[PATCH v5 2/2] msxml3/tests: incorporate review for domdoc tests

[Reinhold Gschweicher]

From: Reinhold Gschweicher

---
 dlls/msxml3/tests/domdoc.c | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index 70284d43294..dcda4821125 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -2329,34 +2329,30 @@ static void test_domnode( void )
         hr = IXMLDOMElement_getAttributeNode( element, str, &attr );
         ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
         ok(attr != NULL, "getAttributeNode returned NULL\n");
-        if (attr)
-        {
-            attr_out = NULL;
-            hr = IXMLDOMElement_removeAttributeNode(element, attr, &attr_out );
+        attr_out = NULL;
+        hr = IXMLDOMElement_removeAttributeNode(element, attr, &attr_out );
 todo_wine {
-            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-            ok(attr_out != NULL, "removeAttributeNode expected to set attr_out, but got NULL pointer\n");
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        ok(attr_out != NULL, "removeAttributeNode expected to set attr_out, but got NULL pointer\n");
 }
-            if (attr_out)
-            {
-                /* remove the same attribute again returns invalid arg */
-                hr = IXMLDOMElement_removeAttributeNode( element, attr, NULL );
-                ok(hr == E_INVALIDARG, "removeAttributeNode removed an already removed node, unexpected hr %#lx.\n", hr);
+        if (attr_out)
+        {
+            /* remove the same attribute again returns invalid arg */
+            hr = IXMLDOMElement_removeAttributeNode( element, attr, NULL );
+            ok(hr == E_INVALIDARG, "removeAttributeNode removed an already removed node, unexpected hr %#lx.\n", hr);

-                /* readd removed attribute to recover previous state */
-                hr = IXMLDOMElement_setAttributeNode(element, attr_out, NULL);
-                ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+            /* readd removed attribute to recover previous state */
+            hr = IXMLDOMElement_setAttributeNode(element, attr_out, NULL);
+            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

-                IXMLDOMAttribute_Release(attr_out);
-            }
-            IXMLDOMAttribute_Release(attr);
+            IXMLDOMAttribute_Release(attr_out);
         }
+        IXMLDOMAttribute_Release(attr);

SysFreeString( str );

-        attr = NULL;
         attr_out = (IXMLDOMAttribute*)0xdeadbeef;
-        hr = IXMLDOMElement_removeAttributeNode( element, attr, &attr_out );
+        hr = IXMLDOMElement_removeAttributeNode( element, NULL, &attr_out );
         todo_wine ok(hr == E_INVALIDARG, "removeAttributeNode removed a NULL pointer hr: %#lx.\n", hr);
         ok(attr_out == (IXMLDOMAttribute*)0xdeadbeef, "removeAttributeNode expected to not touch attr_out in error case, got (%p)\n", attr_out);