[PATCH 0/3] MR4097: Msxml add get xml

[PATCH 1/3] msmxl3/tests: Add tests for get_xml.

[Daniel Lehman]

From: Daniel Lehman

---
 dlls/msxml3/tests/domdoc.c | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index d7de144c84c..d22557595b7 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -13676,6 +13676,7 @@ static void test_namespaces_as_attributes(void)
         const char *basenames[3];
         const char *uris[3];
         const char *texts[3];
+        const char *xmls[3];
     };
     static const struct test tests[] = {
         {
@@ -13685,24 +13686,27 @@ static void test_namespaces_as_attributes(void)
             { "b",      "d",      "ns" },       /* baseName */
             { "nshref", NULL,     "" },         /* namespaceURI */
             { "b attr", "d attr", "nshref" },   /* text */
+            { "ns:b="b attr"", "d="d attr"", "xmlns:ns="nshref"" }, /* xml */
         },
         /* property only */
         {
             "<a d="d attr" />", 1,
-            { "d" },        /* nodeName */
-            { NULL },       /* prefix */
-            { "d" },        /* baseName */
-            { NULL },       /* namespaceURI */
-            { "d attr" },   /* text */
+            { "d" },            /* nodeName */
+            { NULL },           /* prefix */
+            { "d" },            /* baseName */
+            { NULL },           /* namespaceURI */
+            { "d attr" },       /* text */
+            { "d="d attr"" }, /* xml */
         },
         /* namespace only */
         {
             "<a xmlns:ns="nshref" />", 1,
-            { "xmlns:ns" }, /* nodeName */
-            { "xmlns" },    /* prefix */
-            { "ns" },       /* baseName */
-            { "" },         /* namespaceURI */
-            { "nshref" },   /* text */
+            { "xmlns:ns" },             /* nodeName */
+            { "xmlns" },                /* prefix */
+            { "ns" },                   /* baseName */
+            { "" },                     /* namespaceURI */
+            { "nshref" },               /* text */
+            { "xmlns:ns="nshref"" },  /* xml */
         },
         /* no properties or namespaces */
         {
@@ -13802,6 +13806,12 @@ static void test_namespaces_as_attributes(void)
                 ok(!lstrcmpW(str, _bstr_(test->texts[i])), "got %s\n", wine_dbgstr_w(str));
                 SysFreeString(str);

+                str = NULL;
+                hr = IXMLDOMNode_get_xml(item, &str);
+                ok(SUCCEEDED(hr), "Failed to get node xml, hr %#lx.\n", hr);
+                ok(!lstrcmpW(str, _bstr_(test->xmls[i])), "got %s\n", wine_dbgstr_w(str));
+                SysFreeString(str);
+
                 IXMLDOMNode_Release(item);
             }

[PATCH 2/3] msmxl4/tests: Add tests for get_xml.

[Daniel Lehman]

From: Daniel Lehman

---
 dlls/msxml4/tests/domdoc.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dlls/msxml4/tests/domdoc.c b/dlls/msxml4/tests/domdoc.c
index 39fe8c5a995..4f9c391ad2a 100644
--- a/dlls/msxml4/tests/domdoc.c
+++ b/dlls/msxml4/tests/domdoc.c
@@ -74,6 +74,7 @@ static void test_namespaces_as_attributes(void)
         const char *basenames[3];
         const char *uris[3];
         const char *texts[3];
+        const char *xmls[3];
     };
     static const struct test tests[] =
     {
@@ -84,6 +85,7 @@ static void test_namespaces_as_attributes(void)
             { "b",      "d",      "ns" },       /* baseName */
             { "nshref", NULL,     "" },         /* namespaceURI */
             { "b attr", "d attr", "nshref" },   /* text */
+            { "ns:b="b attr"", "d="d attr"", "xmlns:ns="nshref"" }, /* xml */
         },
         /* property only */
         {
@@ -93,6 +95,7 @@ static void test_namespaces_as_attributes(void)
             { "d" },            /* baseName */
             { NULL },           /* namespaceURI */
             { "d attr" },       /* text */
+            { "d="d attr"" }, /* xml */
         },
         /* namespace only */
         {
@@ -102,6 +105,7 @@ static void test_namespaces_as_attributes(void)
             { "ns" },                   /* baseName */
             { "" },                     /* namespaceURI */
             { "nshref" },               /* text */
+            { "xmlns:ns="nshref"" },  /* xml */
         },
         /* no properties or namespaces */
         {
@@ -194,6 +198,12 @@ static void test_namespaces_as_attributes(void)
             ok(!lstrcmpW(str, _bstr_(test->texts[i])), "got %s\n", wine_dbgstr_w(str));
             SysFreeString(str);

+            str = NULL;
+            hr = IXMLDOMNode_get_xml(item, &str);
+            ok(SUCCEEDED(hr), "Failed to get node xml, hr %#lx.\n", hr);
+            ok(!lstrcmpW(str, _bstr_(test->xmls[i])), "got %s\n", wine_dbgstr_w(str));
+            SysFreeString(str);
+
             IXMLDOMNode_Release(item);
         }

[PATCH 3/3] msmxl6/tests: Add tests for get_xml.

[Daniel Lehman]

From: Daniel Lehman

---
 dlls/msxml6/tests/domdoc.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dlls/msxml6/tests/domdoc.c b/dlls/msxml6/tests/domdoc.c
index a6ee0fdc5e4..5d924d9f5cb 100644
--- a/dlls/msxml6/tests/domdoc.c
+++ b/dlls/msxml6/tests/domdoc.c
@@ -74,6 +74,7 @@ static void test_namespaces_as_attributes(void)
         const char *basenames[3];
         const char *uris[3];
         const char *texts[3];
+        const char *xmls[3];
     };
     static const struct test tests[] =
     {
@@ -84,6 +85,7 @@ static void test_namespaces_as_attributes(void)
             { "b",      "d",      "ns" },       /* baseName */
             { "nshref", NULL,     "" },         /* namespaceURI */
             { "b attr", "d attr", "nshref" },   /* text */
+            { "ns:b="b attr"", "d="d attr"", "xmlns:ns="nshref"" }, /* xml */
         },
         /* property only */
         {
@@ -93,6 +95,7 @@ static void test_namespaces_as_attributes(void)
             { "d" },            /* baseName */
             { NULL },           /* namespaceURI */
             { "d attr" },       /* text */
+            { "d="d attr"" }, /* xml */
         },
         /* namespace only */
         {
@@ -102,6 +105,7 @@ static void test_namespaces_as_attributes(void)
             { "ns" },                   /* baseName */
             { "" },                     /* namespaceURI */
             { "nshref" },               /* text */
+            { "xmlns:ns="nshref"" },  /* xml */
         },
         /* no properties or namespaces */
         {
@@ -195,6 +199,12 @@ static void test_namespaces_as_attributes(void)
             ok(!lstrcmpW(str, _bstr_(test->texts[i])), "got %s\n", wine_dbgstr_w(str));
             SysFreeString(str);

+            str = NULL;
+            hr = IXMLDOMNode_get_xml(item, &str);
+            ok(SUCCEEDED(hr), "Failed to get node xml, hr %#lx.\n", hr);
+            ok(!lstrcmpW(str, _bstr_(test->xmls[i])), "got %s\n", wine_dbgstr_w(str));
+            SysFreeString(str);
+
             IXMLDOMNode_Release(item);
         }

[Nikolay Sivov (＠nsivov)]

Maybe we could use L"" literals, instead of converting test data on every check.