[PATCH 0/3] MR9254: include: Remove some msxml6 types from msxml2.idl.

[Nikolay Sivov (＠nsivov)]

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

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

[PATCH 1/3] include: Remove some msxml6 types from msxml2.idl.

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/msxml3/factory.c |  6 +++++
 include/msxml2.idl    | 55 -------------------------------------------
 2 files changed, 6 insertions(+), 55 deletions(-)

diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c
index e91666c6d79..0945a4b3a36 100644
--- a/dlls/msxml3/factory.c
+++ b/dlls/msxml3/factory.c
@@ -41,6 +41,12 @@
 
 #include "msxml_private.h"
 
+#include "initguid.h"
+DEFINE_GUID(CLSID_XMLHTTP60, 0x88d96a0a, 0xf192, 0x11d4, 0xa6, 0x5f, 0x00, 0x40, 0x96, 0x32, 0x51, 0xe5);
+DEFINE_GUID(CLSID_ServerXMLHTTP60, 0x88d96a0b, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5);
+DEFINE_GUID(CLSID_SAXAttributes60, 0x88d96a0e, 0xf192, 0x11d4, 0xa6, 0x5f, 0x00, 0x40, 0x96, 0x32, 0x51, 0xe5);
+DEFINE_GUID(CLSID_MXNamespaceManager60, 0x88d96a11, 0xf192, 0x11d4, 0xa6, 0x5f, 0x00, 0x40, 0x96, 0x32, 0x51, 0xe5);
+
 WINE_DEFAULT_DEBUG_CHANNEL(msxml);
 
 extern GUID CLSID_XMLSchemaCache60;
diff --git a/include/msxml2.idl b/include/msxml2.idl
index 848bc13952a..a0f31159e54 100644
--- a/include/msxml2.idl
+++ b/include/msxml2.idl
@@ -1662,14 +1662,6 @@ coclass XMLHTTP40
     [default] interface IXMLHTTPRequest;
 }
 
-[
-    uuid(88d96a0a-f192-11d4-a65f-0040963251e5)
-]
-coclass XMLHTTP60
-{
-    [default] interface IXMLHTTPRequest;
-}
-
 [
     helpstring("XML HTTP"),
     progid("Msxml2.XMLHTTP"),
@@ -1702,14 +1694,6 @@ coclass ServerXMLHTTP40
     [default] interface IServerXMLHTTPRequest2;
 }
 
-[
-    uuid(88d96a0b-f192-11d4-a65f-0040963251e5)
-]
-coclass ServerXMLHTTP60
-{
-    [default] interface IServerXMLHTTPRequest2;
-}
-
 [
     helpstring("Server XML HTTP"),
     progid("Msxml2.ServerXMLHTTP"),
@@ -3372,26 +3356,6 @@ coclass MXHTMLWriter40
     interface IVBSAXLexicalHandler;
 }
 
-[
-    uuid(88d96a10-f192-11d4-a65f-0040963251e5)
-]
-coclass MXHTMLWriter60
-{
-    [default] interface IMXWriter;
-
-    interface ISAXContentHandler;
-    interface ISAXDeclHandler;
-    interface ISAXDTDHandler;
-    interface ISAXErrorHandler;
-    interface ISAXLexicalHandler;
-
-    interface IVBSAXContentHandler;
-    interface IVBSAXDeclHandler;
-    interface IVBSAXDTDHandler;
-    interface IVBSAXErrorHandler;
-    interface IVBSAXLexicalHandler;
-}
-
 [
     helpstring("MXXMLWriter 3.0"),
     progid("Msxml2.MXXMLWriter.3.0"),
@@ -3498,15 +3462,6 @@ coclass MXNamespaceManager40
     interface IMXNamespaceManager;
 }
 
-[
-    uuid(88d96a11-f192-11d4-a65f-0040963251e5)
-]
-coclass MXNamespaceManager60
-{
-    [default] interface IVBMXNamespaceManager;
-    interface IMXNamespaceManager;
-}
-
 [
     helpstring("SAXAttributes 3.0"),
     progid("Msxml2.SAXAttributes.3.0"),
@@ -3531,16 +3486,6 @@ coclass SAXAttributes40
     interface ISAXAttributes;
 }
 
-[
-    uuid(88d96a0e-f192-11d4-a65f-0040963251e5)
-]
-coclass SAXAttributes60
-{
-    [default] interface IMXAttributes;
-    interface IVBSAXAttributes;
-    interface ISAXAttributes;
-}
-
 [
     helpstring("SAXAttributes"),
     progid("Msxml2.SAXAttributes"),
-- 
GitLab


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

[PATCH 2/3] msxml3/tests: Remove duplicated test.

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

This one already exists in msxml6 tests. Simply switching to
older classes shows different behavior.

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/msxml3/tests/saxreader.c | 194 ----------------------------------
 1 file changed, 194 deletions(-)

diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c
index f156b40079b..31424aa62b6 100644
--- a/dlls/msxml3/tests/saxreader.c
+++ b/dlls/msxml3/tests/saxreader.c
@@ -4438,199 +4438,6 @@ static void test_mxwriter_stream(void)
     free_bstrs();
 }
 
-static void test_mxwriter_domdoc(void)
-{
-    ISAXContentHandler *content;
-    IXMLDOMDocument *domdoc;
-    IMXWriter *writer;
-    HRESULT hr;
-    VARIANT dest;
-    IXMLDOMElement *root = NULL;
-    IXMLDOMNodeList *node_list = NULL;
-    IXMLDOMNode *node = NULL;
-    LONG list_length = 0;
-    BSTR str;
-
-    /* Create writer and attach DOMDocument output */
-    hr = CoCreateInstance(&CLSID_MXXMLWriter60, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer);
-    ok(hr == S_OK, "Failed to create a writer, hr %#lx.\n", hr);
-
-    hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    hr = CoCreateInstance(&CLSID_DOMDocument60, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void **)&domdoc);
-    ok(hr == S_OK, "Failed to create a document, hr %#lx.\n", hr);
-
-    V_VT(&dest) = VT_DISPATCH;
-    V_DISPATCH(&dest) = (IDispatch *)domdoc;
-
-    hr = IMXWriter_put_output(writer, dest);
-    todo_wine
-    ok(hr == S_OK, "Failed to set writer output, hr %#lx.\n", hr);
-    if (FAILED(hr))
-    {
-        IXMLDOMDocument_Release(domdoc);
-        IMXWriter_Release(writer);
-        return;
-    }
-
-    /* Add root element to document. */
-    hr = IXMLDOMDocument_createElement(domdoc, _bstr_("TestElement"), &root);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    hr = IXMLDOMDocument_appendChild(domdoc, (IXMLDOMNode *)root, NULL);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    IXMLDOMElement_Release(root);
-
-    hr = IXMLDOMDocument_get_documentElement(domdoc, &root);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok(root != NULL, "Unexpected document root.\n");
-    IXMLDOMElement_Release(root);
-
-    /* startDocument clears root element and disables methods. */
-    hr = ISAXContentHandler_startDocument(content);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    hr = IXMLDOMDocument_get_documentElement(domdoc, &root);
-    todo_wine
-    ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
-
-    hr = IXMLDOMDocument_createElement(domdoc, _bstr_("TestElement"), &root);
-    todo_wine
-    ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr);
-
-    /* startElement allows document root node to be accessed. */
-    hr = ISAXContentHandler_startElement(content, L"", 0, L"", 0, L"BankAccount", 11, NULL);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    hr = IXMLDOMDocument_get_documentElement(domdoc, &root);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok(root != NULL, "Unexpected document root.\n");
-
-    hr = IXMLDOMElement_get_nodeName(root, &str);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    todo_wine
-    ok(!lstrcmpW(L"BankAccount", str), "Unexpected name %s.\n", wine_dbgstr_w(str));
-    SysFreeString(str);
-
-    /* startElement immediately updates previous node. */
-    hr = ISAXContentHandler_startElement(content, L"", 0, L"", 0, L"Number", 6, NULL);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    hr = IXMLDOMElement_get_childNodes(root, &node_list);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    hr = IXMLDOMNodeList_get_length(node_list, &list_length);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    todo_wine
-    ok(list_length == 1, "list length %ld, expected 1\n", list_length);
-
-    hr = IXMLDOMNodeList_get_item(node_list, 0, &node);
-    todo_wine
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    hr = IXMLDOMNode_get_nodeName(node, &str);
-todo_wine {
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok(!lstrcmpW(L"Number", str), "got %s\n", wine_dbgstr_w(str));
-}
-    SysFreeString(str);
-
-    /* characters not immediately visible. */
-    hr = ISAXContentHandler_characters(content, L"12345", 5);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    hr = IXMLDOMNode_get_text(node, &str);
-todo_wine {
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok(!lstrcmpW(L"", str), "got %s\n", wine_dbgstr_w(str));
-}
-    SysFreeString(str);
-
-    /* characters visible after endElement. */
-    hr = ISAXContentHandler_endElement(content, L"", 0, L"", 0, L"Number", 6);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    hr = IXMLDOMNode_get_text(node, &str);
-todo_wine {
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok(!lstrcmpW(L"12345", str), "got %s\n", wine_dbgstr_w(str));
-}
-    SysFreeString(str);
-
-    IXMLDOMNode_Release(node);
-
-    /* second startElement updates the existing node list. */
-
-    hr = ISAXContentHandler_startElement(content, L"", 0, L"", 0, L"Name", 4, NULL);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    hr = ISAXContentHandler_characters(content, L"Captain Ahab", 12);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    hr = ISAXContentHandler_endElement(content, L"", 0, L"", 0, L"Name", 4);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    hr = ISAXContentHandler_endElement(content, L"", 0, L"", 0, L"BankAccount", 11);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    hr = IXMLDOMNodeList_get_length(node_list, &list_length);
-todo_wine {
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok(2 == list_length, "list length %ld, expected 2\n", list_length);
-}
-    hr = IXMLDOMNodeList_get_item(node_list, 1, &node);
-    todo_wine
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    hr = IXMLDOMNode_get_nodeName(node, &str);
-todo_wine {
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok(!lstrcmpW(L"Name", str), "got %s\n", wine_dbgstr_w(str));
-}
-    SysFreeString(str);
-
-    hr = IXMLDOMNode_get_text(node, &str);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-todo_wine {
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok(!lstrcmpW(L"Captain Ahab", str), "got %s\n", wine_dbgstr_w(str));
-}
-    SysFreeString(str);
-
-    IXMLDOMNode_Release(node);
-    IXMLDOMNodeList_Release(node_list);
-    IXMLDOMElement_Release(root);
-
-    /* endDocument makes document modifiable again. */
-
-    hr = ISAXContentHandler_endDocument(content);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-
-    hr = IXMLDOMDocument_createElement(domdoc, _bstr_("TestElement"), &root);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    IXMLDOMElement_Release(root);
-
-    /* finally check doc output */
-    hr = IXMLDOMDocument_get_xml(domdoc, &str);
-todo_wine {
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok(!lstrcmpW(
-            L"<BankAccount>"
-            "<Number>12345</Number>"
-            "<Name>Captain Ahab</Name>"
-            "</BankAccount>\r\n",
-            str),
-        "got %s\n", wine_dbgstr_w(str));
-}
-    SysFreeString(str);
-
-    IXMLDOMDocument_Release(domdoc);
-    ISAXContentHandler_Release(content);
-    IMXWriter_Release(writer);
-
-    free_bstrs();
-}
-
 static const char *encoding_names[] = {
     "iso-8859-1",
     "iso-8859-2",
@@ -5995,7 +5802,6 @@ START_TEST(saxreader)
         test_mxwriter_properties();
         test_mxwriter_flush();
         test_mxwriter_stream();
-        test_mxwriter_domdoc();
         test_mxwriter_encoding();
         test_mxwriter_dispex();
         test_mxwriter_indent();
-- 
GitLab


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

[PATCH 3/3] include: Remove more coclass entries from msxml2.idl.

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/msxml3/factory.c |  2 ++
 include/msxml2.idl    | 28 ----------------------------
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c
index 0945a4b3a36..19249555cb4 100644
--- a/dlls/msxml3/factory.c
+++ b/dlls/msxml3/factory.c
@@ -46,6 +46,8 @@ DEFINE_GUID(CLSID_XMLHTTP60, 0x88d96a0a, 0xf192, 0x11d4, 0xa6, 0x5f, 0x00, 0x40,
 DEFINE_GUID(CLSID_ServerXMLHTTP60, 0x88d96a0b, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5);
 DEFINE_GUID(CLSID_SAXAttributes60, 0x88d96a0e, 0xf192, 0x11d4, 0xa6, 0x5f, 0x00, 0x40, 0x96, 0x32, 0x51, 0xe5);
 DEFINE_GUID(CLSID_MXNamespaceManager60, 0x88d96a11, 0xf192, 0x11d4, 0xa6, 0x5f, 0x00, 0x40, 0x96, 0x32, 0x51, 0xe5);
+DEFINE_GUID(CLSID_MXXMLWriter60, 0x88d96a0f, 0xf192, 0x11d4, 0xa6, 0x5f, 0x00, 0x40, 0x96, 0x32, 0x51, 0xe5);
+DEFINE_GUID(CLSID_XSLTemplate60, 0x88d96a08, 0xf192, 0x11d4, 0xa6, 0x5f, 0x00, 0x40, 0x96, 0x32, 0x51, 0xe5);
 
 WINE_DEFAULT_DEBUG_CHANNEL(msxml);
 
diff --git a/include/msxml2.idl b/include/msxml2.idl
index a0f31159e54..a7432a6bf71 100644
--- a/include/msxml2.idl
+++ b/include/msxml2.idl
@@ -1774,14 +1774,6 @@ coclass XSLTemplate40
     [default] interface IXSLTemplate;
 }
 
-[
-    uuid(88d96a08-f192-11d4-a65f-0040963251e5)
-]
-coclass XSLTemplate60
-{
-    [default] interface IXSLTemplate;
-}
-
 [
     helpstring("XSL Template"),
     progid("Msxml2.XSLTemplate"),
@@ -3400,26 +3392,6 @@ coclass MXXMLWriter40
     interface IVBSAXLexicalHandler;
 }
 
-[
-    uuid(88d96a0f-f192-11d4-a65f-0040963251e5)
-]
-coclass MXXMLWriter60
-{
-    [default] interface IMXWriter;
-
-    interface ISAXContentHandler;
-    interface ISAXDeclHandler;
-    interface ISAXDTDHandler;
-    interface ISAXErrorHandler;
-    interface ISAXLexicalHandler;
-
-    interface IVBSAXContentHandler;
-    interface IVBSAXDeclHandler;
-    interface IVBSAXDTDHandler;
-    interface IVBSAXErrorHandler;
-    interface IVBSAXLexicalHandler;
-}
-
 [
     helpstring("MXXMLWriter"),
     progid("Msxml2.MXXMLWriter"),
-- 
GitLab

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