[PATCH v3 14/15] msxml3: Handle default namespace in get_prefix.

[Daniel Lehman]

From: Daniel Lehman

---
 dlls/msxml3/attribute.c    | 13 +++++--------
 dlls/msxml3/tests/domdoc.c |  2 --
 dlls/msxml4/tests/domdoc.c |  2 --
 dlls/msxml6/tests/domdoc.c |  2 --
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c
index 89a1f630021..6b8c7fba6d9 100644
--- a/dlls/msxml3/attribute.c
+++ b/dlls/msxml3/attribute.c
@@ -589,14 +589,11 @@ static HRESULT WINAPI domattr_get_prefix(

*prefix = NULL;

-    if (ns)
-    {
-        /* special case for default namespace definition */
-        if (xmlStrEqual(This->node.node->name, xmlns))
-            *prefix = bstr_from_xmlChar(xmlns);
-        else if (ns->prefix)
-            *prefix = bstr_from_xmlChar(ns->prefix);
-    }
+    if (xmlStrEqual(This->node.node->name, xmlns) &&
+        xmldoc_version(This->node.node->doc) != MSXML6)
+        *prefix = bstr_from_xmlChar(xmlns);
+    else if (ns && ns->prefix)
+        *prefix = bstr_from_xmlChar(ns->prefix);

TRACE("prefix: %s\n", debugstr_w(*prefix));

diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index d2598820f16..aef056a61b1 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -13779,10 +13779,8 @@ static void test_namespaces_as_attributes(void)
                 hr = IXMLDOMNode_get_prefix(item, &str);
                 if (test->prefixes[i])
                 {
-                    todo_wine_if(test->todo) {
                     ok(hr == S_OK, "Failed to get prefix, hr %#lx.\n", hr);
                     ok(!lstrcmpW(str, _bstr_(test->prefixes[i])), "got %s\n", wine_dbgstr_w(str));
-                    }
                     SysFreeString(str);
                 }
                 else
diff --git a/dlls/msxml4/tests/domdoc.c b/dlls/msxml4/tests/domdoc.c
index 0ca1a0b7b1b..2880f9b7f37 100644
--- a/dlls/msxml4/tests/domdoc.c
+++ b/dlls/msxml4/tests/domdoc.c
@@ -272,11 +272,9 @@ static void test_namespaces_as_attributes(void)
             if (test->prefixes[i])
             {
                 /* MSXML4 can report different results with different service packs */
-                todo_wine_if(test->todo) {
                 ok(hr == S_OK || broken(hr == S_FALSE), "Failed to get prefix, hr %#lx.\n", hr);
                 ok(!lstrcmpW(str, _bstr_(test->prefixes[i])) || broken(!str),
                    "got %s\n", wine_dbgstr_w(str));
-                }
                 SysFreeString(str);
             }
             else
diff --git a/dlls/msxml6/tests/domdoc.c b/dlls/msxml6/tests/domdoc.c
index 3035a45c350..a201ee5deae 100644
--- a/dlls/msxml6/tests/domdoc.c
+++ b/dlls/msxml6/tests/domdoc.c
@@ -112,10 +112,8 @@ static void test_create_attribute(void)
         }
         else
         {
-            todo_wine_if(ptr->todo) {
             ok(hr == S_FALSE, "%d: unexpected hr %#lx\n", i, hr);
             ok(str == NULL, "%d: got prefix %s\n", i, wine_dbgstr_w(str));
-            }
         }
         SysFreeString(str);