[PATCH 0/2] MR10027: msxml3: Skip writing xml declaration if it already exists.
From: Daniel Lehman <dlehman25@gmail.com> --- dlls/msxml3/tests/domdoc.c | 102 +++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a08506fad9b..6aaa9a4f086 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13654,6 +13654,50 @@ static void test_merging_text(void) free_bstrs(); } +static const WCHAR transform_xsldecl_utf16_xsl[] = +L"<?xml version=\"1.0\" encoding=\"utf-16\"?>\n" +"<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\">\n" +"<xsl:output method=\"xml\" version=\"1.0\" encoding=\"utf-16\"/>" +"<xsl:template match=\"/\">" +" <xsl:for-each select=\"/a/item\">" +" <xsl:element name=\"node\">" +" <xsl:value-of select=\"@name\"/>" +" </xsl:element>" +" </xsl:for-each>" +"</xsl:template>" +"</xsl:stylesheet>"; + +static const char transform_xsldecl_copy_xsl[] = +"<?xml version=\"1.0\"?>\n" +"<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\">\n" +"<xsl:output method=\"xml\" version=\"1.0\" encoding=\"utf-8\"/>" +"<xsl:template match=\"@* | node()\" >" +" <xsl:copy>" +" <xsl:apply-templates select=\"@* | node()\" />" +" </xsl:copy>" +"</xsl:template>" +"</xsl:stylesheet>"; + +static const char transform_xmldecl_utf8_doc[] = +"<?xml version=\"1.0\" encoding=\"utf-8\"?>" +"<a>" +" <item name=\"item1\"/>" +" <item name=\"item2\"/>" +"</a>"; + +static const char transform_utf8_ret[] = +"<?xml version=\"1.0\" encoding=\"utf-8\"?>" +"<a><item name=\"item1\"></item><item name=\"item2\"></item></a>"; + +static const char transform_utf8_ret_alt[] = +"<?xml version=\"1.0\" encoding=\"utf-8\"?>" +"<a><item name=\"item1\"/><item name=\"item2\"/></a>"; + +static const WCHAR transform_utf16_ret[] = +L"<?xml version=\"1.0\" encoding=\"utf-16\"?>" +"<node>item1</node><node>item2</node>"; + + static HRESULT WINAPI transformdest_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { BOOL known_iid = IsEqualIID(riid, &IID_IHTMLObjectElement) || @@ -13693,11 +13737,13 @@ static void test_transformNodeToObject(void) ISequentialStream *sstream; LARGE_INTEGER off; WCHAR buffer[256]; + char bufferA[256]; IStream *istream; VARIANT_BOOL b; ULONG nread; HRESULT hr; VARIANT v; + BSTR bstr; doc = create_document(&IID_IXMLDOMDocument); doc2 = create_document(&IID_IXMLDOMDocument); @@ -13773,6 +13819,62 @@ static void test_transformNodeToObject(void) ISequentialStream_Release(sstream); IStream_Release(istream); + /* test duplicate xml declarations */ + hr = IXMLDOMDocument_loadXML(doc, _bstr_(transform_xmldecl_utf8_doc), &b); + ok(hr == S_OK, "Failed to load document, hr %#lx.\n", hr); + hr = IXMLDOMDocument_loadXML(doc2, _bstr_(transform_xsldecl_copy_xsl), &b); + ok(hr == S_OK, "Failed to load document, hr %#lx.\n", hr); + + istream = SHCreateMemStream(NULL, 0); + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown*)istream; + hr = IXMLDOMDocument_transformNodeToObject(doc, (IXMLDOMNode*)doc2, v); + ok(hr == S_OK, "Failed to transform node, hr %#lx.\n", hr); + + off.QuadPart = 0; + hr = IStream_Seek(istream, off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "Failed to seek, hr %#lx.\n", hr); + + nread = 0; + memset(bufferA, 0xcc, sizeof(bufferA)); + hr = IStream_Read(istream, bufferA, sizeof(bufferA), &nread); + ok(hr == S_OK, "Failed to read, hr %#lx.\n", hr); + bufferA[nread] = 0; + todo_wine + ok(!strcmp(bufferA, transform_utf8_ret) || + !strcmp(bufferA, transform_utf8_ret_alt), + "got output %s\n", wine_dbgstr_a(bufferA)); + IStream_Release(istream); + + /* test both xml and xsl have xml declaration, different encoding */ + hr = IXMLDOMDocument_loadXML(doc, _bstr_(transform_xmldecl_utf8_doc), &b); + ok(hr == S_OK, "Failed to load document, hr %#lx.\n", hr); + bstr = SysAllocString(transform_xsldecl_utf16_xsl); + hr = IXMLDOMDocument_loadXML(doc2, bstr, &b); + ok(hr == S_OK, "Failed to load document, hr %#lx.\n", hr); + SysFreeString(bstr); + + istream = SHCreateMemStream(NULL, 0); + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown*)istream; + hr = IXMLDOMDocument_transformNodeToObject(doc, (IXMLDOMNode*)doc2, v); + ok(hr == S_OK, "Failed to transform node, hr %#lx.\n", hr); + + off.QuadPart = 0; + hr = IStream_Seek(istream, off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "Failed to seek, hr %#lx.\n", hr); + + nread = 0; + memset(buffer, 0xcc, sizeof(buffer)); + hr = IStream_Read(istream, buffer, sizeof(buffer), &nread); + ok(hr == S_OK, "Failed to read, hr %#lx.\n", hr); + buffer[nread / 2] = 0; + ok(buffer[0] == 0xfeff, "got %x\n", buffer[0]); + bstr = SysAllocString(transform_utf16_ret); + ok(compareIgnoreReturns(&buffer[1], bstr), "got output %s\n", wine_dbgstr_w(buffer)); + SysFreeString(bstr); + IStream_Release(istream); + IXMLDOMDocument_Release(doc3); IXMLDOMDocument_Release(doc2); IXMLDOMDocument_Release(doc); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10027
From: Daniel Lehman <dlehman25@gmail.com> --- dlls/msxml3/domdoc.c | 22 +++++++++++++--------- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 3 ++- dlls/msxml3/tests/domdoc.c | 1 - 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index f35daff5f6d..bc27c85247c 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -376,24 +376,28 @@ void xmldoc_link_xmldecl(xmlDocPtr doc, xmlNodePtr node) if (doc->standalone != -1) xmlAddPrevSibling( doc->children, node ); } +xmlNodePtr xmldoc_get_xmldecl( xmlDocPtr doc ) +{ + static const xmlChar xmlA[] = "xml"; + xmlNodePtr first_child; + + first_child = doc->children; + if (first_child && first_child->type == XML_PI_NODE && xmlStrEqual(first_child->name, xmlA)) + return first_child; + return NULL; +} + /* unlinks a first "<?xml" child if it was created */ xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc) { - static const xmlChar xmlA[] = "xml"; - xmlNodePtr node, first_child; + xmlNodePtr node; assert(doc != NULL); /* xml declaration node could be created automatically after parsing or added to a tree later */ - first_child = doc->children; - if (first_child && first_child->type == XML_PI_NODE && xmlStrEqual(first_child->name, xmlA)) - { - node = first_child; + if ((node = xmldoc_get_xmldecl(doc))) xmlUnlinkNode( node ); - } - else - node = NULL; return node; } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 9709f8247ab..02fe5991e59 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -190,6 +190,7 @@ extern HRESULT xmldoc_add_orphan( xmlDocPtr doc, xmlNodePtr node ); extern HRESULT xmldoc_remove_orphan( xmlDocPtr doc, xmlNodePtr node ); extern void xmldoc_link_xmldecl(xmlDocPtr doc, xmlNodePtr node); extern xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc); +extern xmlNodePtr xmldoc_get_xmldecl( xmlDocPtr doc ); extern MSXML_VERSION xmldoc_version( xmlDocPtr doc ); extern void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const* msg, va_list ap); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 3e389144cd4..5864de96c80 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1214,7 +1214,8 @@ static HRESULT node_transform_write(xsltStylesheetPtr style, xmlDocPtr result, B transform_write_text(result, style, output); else { - transform_write_xmldecl(result, style, omit_encoding, output); + if (!xmldoc_get_xmldecl(result)) + transform_write_xmldecl(result, style, omit_encoding, output); if (result->children) { diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6aaa9a4f086..d95d3df9dbf 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13840,7 +13840,6 @@ static void test_transformNodeToObject(void) hr = IStream_Read(istream, bufferA, sizeof(bufferA), &nread); ok(hr == S_OK, "Failed to read, hr %#lx.\n", hr); bufferA[nread] = 0; - todo_wine ok(!strcmp(bufferA, transform_utf8_ret) || !strcmp(bufferA, transform_utf8_ret_alt), "got output %s\n", wine_dbgstr_a(bufferA)); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10027
Nikolay Sivov (@nsivov) commented about dlls/msxml3/node.c:
transform_write_text(result, style, output); else { - transform_write_xmldecl(result, style, omit_encoding, output); + if (!xmldoc_get_xmldecl(result)) + transform_write_xmldecl(result, style, omit_encoding, output);
Does this properly handle "omit_encoding" condition? I'm not sure there is an easy way to tell from the tests. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10027#note_129057
Nikolay Sivov (@nsivov) commented about dlls/msxml3/tests/domdoc.c:
+ ok(hr == S_OK, "Failed to transform node, hr %#lx.\n", hr); + + off.QuadPart = 0; + hr = IStream_Seek(istream, off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "Failed to seek, hr %#lx.\n", hr); + + nread = 0; + memset(bufferA, 0xcc, sizeof(bufferA)); + hr = IStream_Read(istream, bufferA, sizeof(bufferA), &nread); + ok(hr == S_OK, "Failed to read, hr %#lx.\n", hr); + bufferA[nread] = 0; + todo_wine + ok(!strcmp(bufferA, transform_utf8_ret) || + !strcmp(bufferA, transform_utf8_ret_alt), + "got output %s\n", wine_dbgstr_a(bufferA)); + IStream_Release(istream); Could you try to get rid of this variance in results? For example adjusting output to be <item>text</item>, so we have closing tag at all times.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/10027#note_129056
On Sun Feb 8 15:12:56 2026 +0000, Nikolay Sivov wrote:
Does this properly handle "omit_encoding" condition? I'm not sure there is an easy way to tell from the tests. i'll add some more tests
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/10027#note_129309
On Sun Feb 8 15:12:56 2026 +0000, Nikolay Sivov wrote:
Could you try to get rid of this variance in results? For example adjusting output to be <item>text</item>, so we have closing tag at all times. libxml2 has a flag that does that but setting it breaks other tests. i don't see how to change it with the currently used apis. how much can i change the bundled libxml2? i see there are currently a few edits but assumed we'd want to keep it as vanilla as possible for future updates
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/10027#note_129310
On Tue Feb 10 05:48:16 2026 +0000, Daniel Lehman wrote:
libxml2 has a flag that does that but setting it breaks other tests. i don't see how to change it with the currently used apis. how much can i change the bundled libxml2? i see there are currently a few edits but assumed we'd want to keep it as vanilla as possible for future updates Oh no, I meant adjust test files if possible, so that we get same output everywhere. Unless I'm misunderstanding, is it different between libxslt and msxml3, or between msxml3 versions and/or msxml6?
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/10027#note_129352
participants (3)
-
Daniel Lehman -
Daniel Lehman (＠dlehman25)
-
Nikolay Sivov (＠nsivov)