Alexandre Julliard : msxml3: Clear one extra variant in collection enumeration.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b00e2df3e82bcf3213825bd12f1c2fb0237c47dc
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=b00e2df3e82bcf3213825bd12...

Author: Alexandre Julliard 
Date:   Fri Nov 27 11:36:37 2020 +0100

msxml3: Clear one extra variant in collection enumeration.

Signed-off-by: Alexandre Julliard

---

dlls/msxml3/tests/xmldoc.c | 7 +++++--
 dlls/msxml3/xmlelem.c      | 8 +++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c
index 7ad6e3177f7..94b5ea01f3b 100644
--- a/dlls/msxml3/tests/xmldoc.c
+++ b/dlls/msxml3/tests/xmldoc.c
@@ -647,7 +647,7 @@ static void test_xmlelem_collection(void)
     WCHAR path[MAX_PATH];
     LONG length, type;
     ULONG num_vars;
-    VARIANT var[3], dummy, vIndex, vName;
+    VARIANT var[4], dummy, vIndex, vName;
     BSTR url, str;

hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER,
@@ -789,12 +789,15 @@ static void test_xmlelem_collection(void)
     VariantClear(&var[1]);
     VariantClear(&var[0]);

+    memset( var, 0xcc, sizeof(var));
+
     /* request more elements than available */
-    hr = IEnumVARIANT_Next(enumVar, 3, var, &num_vars);
+    hr = IEnumVARIANT_Next(enumVar, 4, var, &num_vars);
     ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr);
     ok(V_VT(&var[0]) == VT_DISPATCH, "Expected VT_DISPATCH, got %d\n", V_VT(&var[0]));
     ok(V_VT(&var[1]) == VT_DISPATCH, "Expected VT_DISPATCH, got %d\n", V_VT(&var[1]));
     ok(V_VT(&var[2]) == VT_EMPTY, "Expected 0, got %d\n", V_VT(&var[2]));
+    ok(V_VT(&var[3]) == 0xcccc, "Expected invalid, got %x\n", V_VT(&var[3]));
     ok(num_vars == 2, "Expected 2, got %d\n", num_vars);

hr = IDispatch_QueryInterface(V_DISPATCH(&var[1]), &IID_IXMLElement, (LPVOID *)&child);
diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c
index 3addcbd19b5..f8778aae91d 100644
--- a/dlls/msxml3/xmlelem.c
+++ b/dlls/msxml3/xmlelem.c
@@ -774,11 +774,13 @@ static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Next(
         hr = XMLElement_create(This->current, (void **)&V_DISPATCH(rgVar), FALSE);
         if (FAILED(hr)) return hr;
         This->current = This->current->next;
-        if (--celt && This->current) ++rgVar;
         if (fetched) ++*fetched;
+        rgVar++;
+        celt--;
     }
-
-    return celt == 0 ? S_OK : S_FALSE;
+    if (!celt) return S_OK;
+    V_VT(rgVar) = VT_EMPTY;
+    return S_FALSE;
 }

static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Skip(