[PATCH 0/3] MR10618: msxml3/tests: Add some more tests for getNamedItem().

[Nikolay Sivov (＠nsivov)]

Signed-off-by: Nikolay Sivov <[e-mail]>

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

[PATCH 1/3] msxml3/tests: Add some more tests for getNamedItem().

[Nikolay Sivov]

From: Nikolay Sivov <[e-mail]>

Signed-off-by: Nikolay Sivov <[e-mail]>
---
 dlls/msxml3/tests/domdoc.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index f9dfef94b81..ab83974a020 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -10649,6 +10649,22 @@ static void test_get_attributes(void)
         IXMLDOMNode_Release(node2);
     }
 
+    hr = IXMLDOMNamedNodeMap_getNamedItem(map, _bstr_("xmlns:foaf"), &node2);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IXMLDOMNode_get_xml(node2, &str);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(!wcscmp(str, L"xmlns:foaf=\"http://xmlns.com/foaf/0.1/\""), "Unexpected xml %s.\n", debugstr_w(str));
+    SysFreeString(str);
+    IXMLDOMNode_Release(node2);
+
+    hr = IXMLDOMNamedNodeMap_getNamedItem(map, _bstr_("dcterms:created"), &node2);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IXMLDOMNode_get_xml(node2, &str);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(!wcscmp(str, L"dcterms:created=\"2025\""), "Unexpected xml %s.\n", debugstr_w(str));
+    SysFreeString(str);
+    IXMLDOMNode_Release(node2);
+
     IXMLDOMNamedNodeMap_Release(map);
     IXMLDOMElement_Release(elem);
 
-- 
GitLab


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

[PATCH 2/3] msxml3: Do not try to convert NULL strings when creating libxml2 document representation.

[Nikolay Sivov]

From: Nikolay Sivov <[e-mail]>

Converting NULLs will propagate wctomb last error to application, and sometimes
it's not expected.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59632
Signed-off-by: Nikolay Sivov <[e-mail]>
---
 dlls/msxml3/node.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c
index d75590a31bc..1f2c7a52daa 100644
--- a/dlls/msxml3/node.c
+++ b/dlls/msxml3/node.c
@@ -4225,8 +4225,8 @@ static xmlNodePtr create_xmlnode_from_domnode(struct xmldoc_context *context, st
     struct domnode *n;
     xmlDtdPtr dtd;
 
-    name = xmlchar_from_wchar(node->name);
-    data = xmlchar_from_wchar(node->data);
+    name = node->name ? xmlchar_from_wchar(node->name) : NULL;
+    data = node->data ? xmlchar_from_wchar(node->data) : NULL;
 
     switch (node->type)
     {
-- 
GitLab


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

[PATCH 3/3] msxml3: Remove duplicated SafeArrayUnaccessData() in load().

[Nikolay Sivov]

From: Nikolay Sivov <[e-mail]>

Signed-off-by: Nikolay Sivov <[e-mail]>
---
 dlls/msxml3/domdoc.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index c19bcde03ab..b3a01f477ed 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -1312,8 +1312,6 @@ static HRESULT WINAPI domdoc_load(IXMLDOMDocument3 *iface, VARIANT source, VARIA
                     TRACE("failed to parse document\n");
                 }
 
-                SafeArrayUnaccessData(psa);
-
                 return doc->error == S_OK ? S_OK : S_FALSE;
             default:
                 FIXME("unhandled SAFEARRAY dim: %d\n", dim);
-- 
GitLab

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