system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 00:25:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

msxml3: Clear one extra variant in collection enumeration.

Browse source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-11-27 11:36:37 +01:00
parent 133ba763e1
commit b00e2df3e8
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dlls/msxml3/tests/xmldoc.c
View file

@ -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);

8
dlls/msxml3/xmlelem.c
View file

@ -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(