From 0c15cda214de44bd537f81705b4cf2d2dd59c79d Mon Sep 17 00:00:00 2001
From: Elizabeth Figura <zfigura@codeweavers.com>
Date: Sat, 6 Sep 2025 16:20:19 -0500
Subject: [PATCH] Rebase against e6df334f178a9b0058fdee0326c5901082efd0d2.

---
 ...ooping-of-Document-Element-propertie.patch | 97 -------------------
 patches/msxml3-element_props/definition       |  5 -
 staging/upstream-commit                       |  2 +-
 3 files changed, 1 insertion(+), 103 deletions(-)
 delete mode 100644 patches/msxml3-element_props/0001-msxml3-Correct-looping-of-Document-Element-propertie.patch
 delete mode 100644 patches/msxml3-element_props/definition

diff --git a/patches/msxml3-element_props/0001-msxml3-Correct-looping-of-Document-Element-propertie.patch b/patches/msxml3-element_props/0001-msxml3-Correct-looping-of-Document-Element-propertie.patch
deleted file mode 100644
index 8eb159f4..00000000
--- a/patches/msxml3-element_props/0001-msxml3-Correct-looping-of-Document-Element-propertie.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 2135156d666a6a7a779326b7f1fdcbd2a8d58c8a Mon Sep 17 00:00:00 2001
-From: Spencer Wallace <spencerwallace@esri.com>
-Date: Mon, 24 Feb 2025 13:33:18 -0800
-Subject: [PATCH] msxml3: Correct looping of Document Element properties.
-
----
- dlls/msxml3/element.c      |  2 ++
- dlls/msxml3/tests/domdoc.c | 53 ++++++++++++++++++++++++++++++++++++++
- 2 files changed, 55 insertions(+)
-
-diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c
-index 0fe72dcef9c..3e3c2d06169 100644
---- a/dlls/msxml3/element.c
-+++ b/dlls/msxml3/element.c
-@@ -1812,6 +1812,8 @@ static HRESULT domelem_get_item(const xmlNodePtr node, LONG index, IXMLDOMNode *
-             *item = create_node( (xmlNodePtr) curr );
-             return S_OK;
-         }
-+
-+        ++attrIndex;
-     }
- 
-     if (!node->nsDef)
-diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
-index dcb83f781ba..84a1f330582 100644
---- a/dlls/msxml3/tests/domdoc.c
-+++ b/dlls/msxml3/tests/domdoc.c
-@@ -10224,6 +10224,15 @@ static void test_get_attributes(void)
-         L"xmlns:dcterms",
-         L"xmlns:foaf"
-     };
-+    const WCHAR *attributes[] =
-+    {
-+        L"rdf:about",
-+        L"dcterms:created",
-+        L"xmlns:oslc_am",
-+        L"xmlns:rdf",
-+        L"xmlns:dcterms",
-+        L"xmlns:foaf"
-+    };
-     const get_attributes_t *entry = get_attributes;
-     IXMLDOMNamedNodeMap *map;
-     IXMLDOMDocument *doc, *doc2;
-@@ -10505,6 +10514,50 @@ static void test_get_attributes(void)
- 
-     IXMLDOMDocument_Release(doc);
- 
-+    str = SysAllocString(L"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-+                L"<rdf:RDF rdf:about=\"foo\""
-+                L"         dcterms:created=\"2025\""
-+                L"         xmlns:oslc_am=\"http://open-services.net/ns/am#\""
-+                L"         xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\""
-+                L"         xmlns:dcterms=\"http://purl.org/dc/terms/\""
-+                L"         xmlns:foaf=\"http://xmlns.com/foaf/0.1/\" >"
-+                L"</rdf:RDF>");
-+
-+    doc = create_document(&IID_IXMLDOMDocument2);
-+
-+    hr = IXMLDOMDocument_loadXML(doc, str, &b);
-+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-+    ok(b == VARIANT_TRUE, "got %d\n", b);
-+
-+    hr = IXMLDOMDocument_get_documentElement(doc, &elem);
-+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-+
-+    hr = IXMLDOMElement_get_attributes(elem, &map);
-+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-+
-+    length = -1;
-+    hr = IXMLDOMNamedNodeMap_get_length(map, &length);
-+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-+    ok(length == 6, "length %#lx.\n", length);
-+
-+    for(i=0; i < length; i++)
-+    {
-+        hr = IXMLDOMNamedNodeMap_get_item(map, i, &node2);
-+        ok( hr == S_OK, "Unexpected hr %#lx (%ld).\n", hr, i);
-+
-+        hr = IXMLDOMNode_get_nodeName(node2, &str);
-+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-+        ok(!lstrcmpW(str, attributes[i]), "got %s\n", wine_dbgstr_w(str));
-+        SysFreeString(str);
-+
-+        IXMLDOMNode_Release(node2);
-+    }
-+
-+    IXMLDOMNamedNodeMap_Release(map);
-+    IXMLDOMElement_Release(elem);
-+
-+    IXMLDOMDocument_Release(doc);
-+
-     free_bstrs();
- }
- 
--- 
-2.47.2
-
diff --git a/patches/msxml3-element_props/definition b/patches/msxml3-element_props/definition
deleted file mode 100644
index 337d4b53..00000000
--- a/patches/msxml3-element_props/definition
+++ /dev/null
@@ -1,5 +0,0 @@
-Fixes: msxml3: Correct regression when looping element properties.
-
-# PR https://gitlab.winehq.org/wine/wine/-/merge_requests/7529
-#
-
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 9b59e387..eb4171c9 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-a3385359f06e291a46364381b2a4ddea81d7cc45
+e6df334f178a9b0058fdee0326c5901082efd0d2