[PATCH 0/1] MR4599: msxml3: Handle default namespace in get_nodeName.

[Daniel Lehman (＠dlehman25)]

3rd of 5 request to remove the todos i added

combined result of remaining requests:
https://gitlab.winehq.org/dlehman25/wine/-/tree/msxml-nullpfx-combined

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4599

[PATCH 1/1] msxml3: Handle default namespace in get_nodeName.

[Daniel Lehman]

From: Daniel Lehman <dlehman25(a)gmail.com>

---
 dlls/msxml3/node.c         | 22 ++++++++++++++++++----
 dlls/msxml3/tests/domdoc.c |  1 -
 dlls/msxml4/tests/domdoc.c |  1 -
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c
index f557aeaa2bf..5145acc77a2 100644
--- a/dlls/msxml3/node.c
+++ b/dlls/msxml3/node.c
@@ -186,6 +186,13 @@ HRESULT node_get_nodeName(xmlnode *This, BSTR *name)
     hr = node_get_base_name(This, &base);
     if (hr != S_OK) return hr;
 
+    if (!base[0] && xmldoc_version(This->node->doc) != MSXML6)
+    {
+        SysFreeString(base);
+        *name = SysAllocString(L"xmlns");
+        return S_OK;
+    }
+
     hr = node_get_prefix(This, &prefix);
     if (hr == S_OK)
     {
@@ -194,10 +201,17 @@ HRESULT node_get_nodeName(xmlnode *This, BSTR *name)
 
         /* +1 for ':' */
         ptr = *name = SysAllocStringLen(NULL, SysStringLen(base) + SysStringLen(prefix) + 1);
-        memcpy(ptr, prefix, SysStringByteLen(prefix));
-        ptr += SysStringLen(prefix);
-        memcpy(ptr++, &colW, sizeof(WCHAR));
-        memcpy(ptr, base, SysStringByteLen(base));
+        if (SysStringByteLen(prefix))
+        {
+            memcpy(ptr, prefix, SysStringByteLen(prefix));
+            ptr += SysStringLen(prefix);
+        }
+        if (SysStringByteLen(base))
+        {
+            if (SysStringByteLen(prefix))
+                memcpy(ptr++, &colW, sizeof(WCHAR));
+            memcpy(ptr, base, SysStringByteLen(base));
+        }
 
         SysFreeString(base);
         SysFreeString(prefix);
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index 1eceeda65de..3117ddabe4e 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -13778,7 +13778,6 @@ static void test_namespaces_as_attributes(void)
                 str = NULL;
                 hr = IXMLDOMNode_get_nodeName(item, &str);
                 ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-                todo_wine_if(test->todo)
                 ok(!lstrcmpW(str, _bstr_(test->names[i])), "got %s\n", wine_dbgstr_w(str));
                 SysFreeString(str);
 
diff --git a/dlls/msxml4/tests/domdoc.c b/dlls/msxml4/tests/domdoc.c
index 70bd4de58c3..b2af7a1658e 100644
--- a/dlls/msxml4/tests/domdoc.c
+++ b/dlls/msxml4/tests/domdoc.c
@@ -261,7 +261,6 @@ static void test_namespaces_as_attributes(void)
             str = NULL;
             hr = IXMLDOMNode_get_nodeName(item, &str);
             ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-            todo_wine_if(test->todo)
             ok(!lstrcmpW(str, test->names[i]), "got %s\n", wine_dbgstr_w(str));
             SysFreeString(str);
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/4599

[PATCH 0/1] MR4599: msxml3: Handle default namespace in get_nodeName. - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4599