msxml6/tests: Copy namespaces as attributes tests.

configure

@@ -21637,6 +21637,7 @@ wine_fn_config_makefile dlls/msxml3/tests enable_tests
 wine_fn_config_makefile dlls/msxml4 enable_msxml4
 wine_fn_config_makefile dlls/msxml4/tests enable_tests
 wine_fn_config_makefile dlls/msxml6 enable_msxml6
+wine_fn_config_makefile dlls/msxml6/tests enable_tests
 wine_fn_config_makefile dlls/mtxdm enable_mtxdm
 wine_fn_config_makefile dlls/ncrypt enable_ncrypt
 wine_fn_config_makefile dlls/ncrypt/tests enable_tests

configure.ac

@@ -2883,6 +2883,7 @@ WINE_CONFIG_MAKEFILE(dlls/msxml3/tests)
 WINE_CONFIG_MAKEFILE(dlls/msxml4)
 WINE_CONFIG_MAKEFILE(dlls/msxml4/tests)
 WINE_CONFIG_MAKEFILE(dlls/msxml6)
+WINE_CONFIG_MAKEFILE(dlls/msxml6/tests)
 WINE_CONFIG_MAKEFILE(dlls/mtxdm)
 WINE_CONFIG_MAKEFILE(dlls/ncrypt)
 WINE_CONFIG_MAKEFILE(dlls/ncrypt/tests)

dlls/msxml3/tests/domdoc.c

@@ -13661,11 +13661,10 @@ static const namespace_as_attribute_t namespace_as_attribute_test_data[] = {
     { &CLSID_DOMDocument2,  "CLSID_DOMDocument2",  "" },
     { &CLSID_DOMDocument26, "CLSID_DOMDocument26", "" },
     { &CLSID_DOMDocument30, "CLSID_DOMDocument30", "" },
-    { &CLSID_DOMDocument60, "CLSID_DOMDocument60", "http://www.w3.org/2000/xmlns/" },
     { 0 }
 };
 
-/* see dlls/msxml4/tests/domdoc.c */
+/* see dlls/msxml[46]/tests/domdoc.c */
 static void test_namespaces_as_attributes(void)
 {
     const namespace_as_attribute_t *entry = namespace_as_attribute_test_data;

dlls/msxml4/tests/domdoc.c

@@ -62,7 +62,7 @@ static void free_bstrs(void)
     alloced_bstrs_count = 0;
 }
 
-/* see dlls/msxml3/tests/domdoc.c */
+/* see dlls/msxml[36]/tests/domdoc.c */
 static void test_namespaces_as_attributes(void)
 {
     struct test

dlls/msxml6/tests/Makefile.in

+TESTDLL = msxml6.dll
+IMPORTS = oleaut32 ole32
+
+C_SRCS = \
+	domdoc.c

dlls/msxml6/tests/domdoc.c

+/*
+ * XML test
+ *
+ * Copyright 2005 Mike McCormack for CodeWeavers
+ * Copyright 2007-2008 Alistair Leslie-Hughes
+ * Copyright 2010-2011 Adam Martinson for CodeWeavers
+ * Copyright 2010-2013 Nikolay Sivov for CodeWeavers
+ * Copyright 2023 Daniel Lehman
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+
+#define COBJMACROS
+#define CONST_VTABLE
+
+#include <stdio.h>
+#include <assert.h>
+
+#include "windows.h"
+
+#include "initguid.h"
+#include "msxml6.h"
+
+#include "wine/test.h"
+
+static BSTR alloced_bstrs[256];
+static int alloced_bstrs_count;
+
+static BSTR alloc_str_from_narrow(const char *str)
+{
+    int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0);
+    BSTR ret = SysAllocStringLen(NULL, len - 1);  /* NUL character added automatically */
+    MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len);
+    return ret;
+}
+
+static BSTR _bstr_(const char *str)
+{
+    assert(alloced_bstrs_count < ARRAY_SIZE(alloced_bstrs));
+    alloced_bstrs[alloced_bstrs_count] = alloc_str_from_narrow(str);
+    return alloced_bstrs[alloced_bstrs_count++];
+}
+
+static void free_bstrs(void)
+{
+    int i;
+    for (i = 0; i < alloced_bstrs_count; i++)
+        SysFreeString(alloced_bstrs[i]);
+    alloced_bstrs_count = 0;
+}
+
+/* see dlls/msxml[34]/tests/domdoc.c */
+static void test_namespaces_as_attributes(void)
+{
+    struct test
+    {
+        const char *xml;
+        int explen;
+        const char *names[3];
+        const char *prefixes[3];
+        const char *basenames[3];
+        const char *uris[3];
+        const char *texts[3];
+    };
+    static const struct test tests[] =
+    {
+        {
+            "<a ns:b=\"b attr\" d=\"d attr\" xmlns:ns=\"nshref\" />", 3,
+            { "ns:b",   "d",     "xmlns:ns" },  /* nodeName */
+            { "ns",     NULL,     "xmlns" },    /* prefix */
+            { "b",      "d",      "ns" },       /* baseName */
+            { "nshref", NULL,     "" },         /* namespaceURI */
+            { "b attr", "d attr", "nshref" },   /* text */
+        },
+        /* property only */
+        {
+            "<a d=\"d attr\" />", 1,
+            { "d" },            /* nodeName */
+            { NULL },           /* prefix */
+            { "d" },            /* baseName */
+            { NULL },           /* namespaceURI */
+            { "d attr" },       /* text */
+        },
+        /* namespace only */
+        {
+            "<a xmlns:ns=\"nshref\" />", 1,
+            { "xmlns:ns" },             /* nodeName */
+            { "xmlns" },                /* prefix */
+            { "ns" },                   /* baseName */
+            { "" },                     /* namespaceURI */
+            { "nshref" },               /* text */
+        },
+        /* no properties or namespaces */
+        {
+            "<a />", 0,
+        },
+
+        { NULL }
+    };
+    const struct test *test;
+    IXMLDOMNamedNodeMap *map;
+    IXMLDOMNode *node, *item;
+    IXMLDOMDocument2 *doc;
+    VARIANT_BOOL b;
+    LONG len, i;
+    HRESULT hr;
+    BSTR str;
+
+    test = tests;
+    while (test->xml)
+    {
+        hr = CoCreateInstance(&CLSID_DOMDocument60, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (void **)&doc);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+        hr = IXMLDOMDocument2_loadXML(doc, _bstr_(test->xml), &b);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+        node = NULL;
+        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("a"), &node);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+        hr = IXMLDOMNode_get_attributes(node, &map);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+        len = -1;
+        hr = IXMLDOMNamedNodeMap_get_length(map, &len);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        ok(len == test->explen, "got %ld\n", len);
+
+        item = NULL;
+        hr = IXMLDOMNamedNodeMap_get_item(map, test->explen+1, &item);
+        ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
+        ok(!item, "Item should be NULL\n");
+
+        for (i = 0; i < len; i++)
+        {
+            item = NULL;
+            hr = IXMLDOMNamedNodeMap_get_item(map, i, &item);
+            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+            str = NULL;
+            hr = IXMLDOMNode_get_nodeName(item, &str);
+            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+            ok(!lstrcmpW(str, _bstr_(test->names[i])), "got %s\n", wine_dbgstr_w(str));
+            SysFreeString(str);
+
+            str = NULL;
+            hr = IXMLDOMNode_get_prefix(item, &str);
+            if (test->prefixes[i])
+            {
+                ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+                ok(!lstrcmpW(str, _bstr_(test->prefixes[i])), "got %s\n", wine_dbgstr_w(str));
+                SysFreeString(str);
+            }
+            else
+                ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr );
+
+            str = NULL;
+            hr = IXMLDOMNode_get_baseName(item, &str);
+            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+            ok(!lstrcmpW(str, _bstr_(test->basenames[i])), "got %s\n", wine_dbgstr_w(str));
+            SysFreeString(str);
+
+            str = NULL;
+            hr = IXMLDOMNode_get_namespaceURI(item, &str);
+            if (test->uris[i])
+            {
+                ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+                if (test->prefixes[i] && !strcmp(test->prefixes[i], "xmlns"))
+                    ok(!lstrcmpW(str, L"http://www.w3.org/2000/xmlns/"),
+                                 "got %s\n", wine_dbgstr_w(str));
+                else
+                    ok(!lstrcmpW(str, _bstr_(test->uris[i])), "got %s\n", wine_dbgstr_w(str));
+                SysFreeString(str);
+            }
+            else
+                ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr );
+
+            str = NULL;
+            hr = IXMLDOMNode_get_text(item, &str);
+            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+            ok(!lstrcmpW(str, _bstr_(test->texts[i])), "got %s\n", wine_dbgstr_w(str));
+            SysFreeString(str);
+
+            IXMLDOMNode_Release(item);
+        }
+
+        IXMLDOMNamedNodeMap_Release(map);
+        IXMLDOMNode_Release(node);
+        IXMLDOMDocument2_Release(doc);
+
+        test++;
+    }
+    free_bstrs();
+}
+
+START_TEST(domdoc)
+{
+    HRESULT hr;
+    IXMLDOMDocument2 *doc;
+
+    hr = CoInitialize(NULL);
+    ok(hr == S_OK, "failed to init com\n");
+
+    hr = CoCreateInstance(&CLSID_DOMDocument60, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (void **)&doc);
+    if (hr != S_OK)
+    {
+        win_skip("class &CLSID_DOMDocument60 not supported\n");
+        return;
+    }
+    IXMLDOMDocument2_Release(doc);
+
+    test_namespaces_as_attributes();
+
+    CoUninitialize();
+}