[PATCH v2 2/4] msxml3/tests: Add more iteration tests for IXMLDOMNamedNodeMap, IXMLDOMSchemaCollection and IXMLDOMNodeList.
Gijs Vermeulen
gijsvrm at gmail.com
Sun Sep 13 07:14:39 CDT 2020
Signed-off-by: Gijs Vermeulen <gijsvrm at gmail.com>
---
dlls/msxml3/tests/domdoc.c | 239 ++++++++++++++++++++++++++++++-------
1 file changed, 193 insertions(+), 46 deletions(-)
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index 8c605573ad..53fd2927c1 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -3584,8 +3584,9 @@ static void test_get_childNodes(void)
IXMLDOMNode *node, *node2;
IXMLDOMElement *element;
IUnknown *unk1, *unk2;
+ ULONG fetched;
+ VARIANT v[2];
HRESULT hr;
- VARIANT v;
BSTR str;
LONG len;
@@ -3670,18 +3671,57 @@ static void test_get_childNodes(void)
SysFreeString(str);
IXMLDOMNode_Release(node);
- V_VT(&v) = VT_EMPTY;
- hr = IEnumVARIANT_Next(enum1, 1, &v, NULL);
+ V_VT(&v[0]) = VT_EMPTY;
+ hr = IEnumVARIANT_Next(enum1, 1, &v[0], NULL);
EXPECT_HR(hr, S_OK);
- ok(V_VT(&v) == VT_DISPATCH, "got var type %d\n", V_VT(&v));
- hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IXMLDOMNode, (void**)&node);
+ ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0]));
+ hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node);
EXPECT_HR(hr, S_OK);
hr = IXMLDOMNode_get_nodeName(node, &str);
EXPECT_HR(hr, S_OK);
ok(!lstrcmpW(str, L"bs"), "got node name %s\n", wine_dbgstr_w(str));
SysFreeString(str);
IXMLDOMNode_Release(node);
- VariantClear(&v);
+ VariantClear(&v[0]);
+
+ V_VT(&v[1]) = VT_EMPTY;
+ V_VT(&v[0]) = VT_EMPTY;
+ hr = IEnumVARIANT_Next(enum1, 2, v, &fetched);
+ EXPECT_HR(hr, S_OK);
+ ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0]));
+ ok(V_VT(&v[1]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[1]));
+ ok(fetched == 2, "got %d, expected 2\n", fetched);
+ hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node);
+ EXPECT_HR(hr, S_OK);
+ hr = IXMLDOMNode_get_nodeName(node, &str);
+ EXPECT_HR(hr, S_OK);
+ ok(!lstrcmpW(str, L"pr"), "got node name %s\n", wine_dbgstr_w(str));
+ SysFreeString(str);
+ IXMLDOMNode_Release(node);
+ hr = IDispatch_QueryInterface(V_DISPATCH(&v[1]), &IID_IXMLDOMNode, (void**)&node);
+ EXPECT_HR(hr, S_OK);
+ hr = IXMLDOMNode_get_nodeName(node, &str);
+ EXPECT_HR(hr, S_OK);
+ ok(!lstrcmpW(str, L"empty"), "got node name %s\n", wine_dbgstr_w(str));
+ SysFreeString(str);
+ IXMLDOMNode_Release(node);
+ VariantClear(&v[1]);
+ VariantClear(&v[0]);
+
+ V_VT(&v[1]) = VT_NULL;
+ V_VT(&v[0]) = VT_EMPTY;
+ hr = IEnumVARIANT_Next(enum1, 2, v, &fetched);
+ EXPECT_HR(hr, S_FALSE);
+ ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0]));
+ ok(V_VT(&v[1]) == VT_EMPTY, "got var type %d\n", V_VT(&v[1]));
+ ok(fetched == 1, "got %d, expected 1\n", fetched);
+ hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node);
+ EXPECT_HR(hr, S_OK);
+ hr = IXMLDOMNode_get_nodeName(node, &str);
+ EXPECT_HR(hr, S_OK);
+ ok(!lstrcmpW(str, L"fo"), "got node name %s\n", wine_dbgstr_w(str));
+ SysFreeString(str);
+ VariantClear(&v[0]);
hr = IXMLDOMNodeList_nextNode(node_list, &node);
EXPECT_HR(hr, S_OK);
@@ -11989,8 +12029,9 @@ static void test_get_namespaces(void)
IUnknown *unk1, *unk2;
IXMLDOMNode *node;
VARIANT_BOOL b;
+ ULONG fetched;
+ VARIANT v[2];
HRESULT hr;
- VARIANT v;
LONG len;
BSTR s;
@@ -12053,9 +12094,9 @@ static void test_get_namespaces(void)
hr = IXMLDOMDocument2_loadXML(doc2, _bstr_(xsd_schema1_xml), &b);
EXPECT_HR(hr, S_OK);
- V_VT(&v) = VT_DISPATCH;
- V_DISPATCH(&v) = (IDispatch*)doc2;
- hr = IXMLDOMSchemaCollection_add(collection, _bstr_(xsd_schema1_uri), v);
+ V_VT(&v[0]) = VT_DISPATCH;
+ V_DISPATCH(&v[0]) = (IDispatch*)doc2;
+ hr = IXMLDOMSchemaCollection_add(collection, _bstr_(xsd_schema1_uri), v[0]);
EXPECT_HR(hr, E_FAIL);
hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 0, &s);
@@ -12092,28 +12133,54 @@ static void test_get_namespaces(void)
hr = IXMLDOMSchemaCollection_QueryInterface(collection, &IID_IEnumVARIANT, (void**)&enum2);
EXPECT_HR(hr, E_NOINTERFACE);
- V_VT(&v) = VT_EMPTY;
- hr = IEnumVARIANT_Next(enumv, 1, &v, NULL);
+ V_VT(&v[0]) = VT_EMPTY;
+ hr = IEnumVARIANT_Next(enumv, 1, &v[0], NULL);
EXPECT_HR(hr, S_OK);
- ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v));
- ok(!lstrcmpW(V_BSTR(&v), L"http://blah.org"), "got %s\n", wine_dbgstr_w(V_BSTR(&v)));
- VariantClear(&v);
+ ok(V_VT(&v[0]) == VT_BSTR, "got %d\n", V_VT(&v[0]));
+ ok(!lstrcmpW(V_BSTR(&v[0]), L"http://blah.org"), "got %s\n", wine_dbgstr_w(V_BSTR(&v[0])));
+ VariantClear(&v[0]);
- V_VT(&v) = VT_EMPTY;
- hr = IEnumVARIANT_Next(enumv, 1, &v, NULL);
+ V_VT(&v[0]) = VT_EMPTY;
+ hr = IEnumVARIANT_Next(enumv, 1, &v[0], &fetched);
EXPECT_HR(hr, S_OK);
- ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v));
- ok(!lstrcmpW(V_BSTR(&v), L"http://blahblah.org"), "got %s\n", wine_dbgstr_w(V_BSTR(&v)));
- VariantClear(&v);
+ ok(fetched == 1, "got %d, expected 1\n", fetched);
+ ok(V_VT(&v[0]) == VT_BSTR, "got %d\n", V_VT(&v[0]));
+ ok(!lstrcmpW(V_BSTR(&v[0]), L"http://blahblah.org"), "got %s\n", wine_dbgstr_w(V_BSTR(&v[0])));
+ VariantClear(&v[0]);
- V_VT(&v) = VT_NULL;
- hr = IEnumVARIANT_Next(enumv, 1, &v, NULL);
+ V_VT(&v[0]) = VT_NULL;
+ hr = IEnumVARIANT_Next(enumv, 1, &v[0], &fetched);
EXPECT_HR(hr, S_FALSE);
- ok(V_VT(&v) == VT_EMPTY, "got %d\n", V_VT(&v));
+ ok(fetched == 0, "got %d, expected 0\n", fetched);
+ ok(V_VT(&v[0]) == VT_EMPTY, "got %d\n", V_VT(&v[0]));
IEnumVARIANT_Release(enumv);
- IXMLDOMSchemaCollection_Release(collection);
+ enumv = (void*)0xdeadbeef;
+ hr = IXMLDOMSchemaCollection_get__newEnum(collection, (IUnknown**)&enumv);
+ EXPECT_HR(hr, S_OK);
+ ok(enumv != NULL, "got %p\n", enumv);
+
+ V_VT(&v[1]) = VT_EMPTY;
+ V_VT(&v[0]) = VT_EMPTY;
+ hr = IEnumVARIANT_Next(enumv, 2, v, &fetched);
+ EXPECT_HR(hr, S_OK);
+ ok(fetched == 2, "got %d, expected 2\n", fetched);
+ ok(V_VT(&v[0]) == VT_BSTR, "got %d\n", V_VT(&v[0]));
+ ok(V_VT(&v[1]) == VT_BSTR, "got %d\n", V_VT(&v[1]));
+ ok(!lstrcmpW(V_BSTR(&v[0]), L"http://blah.org"), "got %s\n", wine_dbgstr_w(V_BSTR(&v[0])));
+ ok(!lstrcmpW(V_BSTR(&v[1]), L"http://blahblah.org"), "got %s\n", wine_dbgstr_w(V_BSTR(&v[1])));
+ VariantClear(&v[1]);
+ VariantClear(&v[0]);
+
+ V_VT(&v[0]) = VT_NULL;
+ hr = IEnumVARIANT_Next(enumv, 1, v, &fetched);
+ EXPECT_HR(hr, S_FALSE);
+ ok(fetched == 0, "got %d, expected 0\n", fetched);
+ ok(V_VT(&v[0]) == VT_EMPTY, "got %d\n", V_VT(&v[0]));
+
+ IEnumVARIANT_Release(enumv);
+ IXMLDOMSchemaCollection_Release(collection);
IXMLDOMDocument2_Release(doc);
/* now with CLSID_DOMDocument60 */
@@ -12171,9 +12238,9 @@ static void test_get_namespaces(void)
hr = IXMLDOMDocument2_loadXML(doc2, _bstr_(xsd_schema1_xml), &b);
EXPECT_HR(hr, S_OK);
- V_VT(&v) = VT_DISPATCH;
- V_DISPATCH(&v) = (IDispatch*)doc2;
- hr = IXMLDOMSchemaCollection_add(collection, _bstr_(xsd_schema1_uri), v);
+ V_VT(&v[0]) = VT_DISPATCH;
+ V_DISPATCH(&v[0]) = (IDispatch*)doc2;
+ hr = IXMLDOMSchemaCollection_add(collection, _bstr_(xsd_schema1_uri), v[0]);
EXPECT_HR(hr, E_FAIL);
IXMLDOMDocument2_Release(doc2);
@@ -12198,24 +12265,49 @@ static void test_get_namespaces(void)
EXPECT_HR(hr, S_OK);
ok(enumv != NULL, "got %p\n", enumv);
- V_VT(&v) = VT_EMPTY;
- hr = IEnumVARIANT_Next(enumv, 1, &v, NULL);
+ V_VT(&v[0]) = VT_EMPTY;
+ hr = IEnumVARIANT_Next(enumv, 1, &v[0], NULL);
EXPECT_HR(hr, S_OK);
- ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v));
- ok(!lstrcmpW(V_BSTR(&v), L"http://blah.org"), "got %s\n", wine_dbgstr_w(V_BSTR(&v)));
- VariantClear(&v);
+ ok(V_VT(&v[0]) == VT_BSTR, "got %d\n", V_VT(&v[0]));
+ ok(!lstrcmpW(V_BSTR(&v[0]), L"http://blah.org"), "got %s\n", wine_dbgstr_w(V_BSTR(&v[0])));
+ VariantClear(&v[0]);
- V_VT(&v) = VT_EMPTY;
- hr = IEnumVARIANT_Next(enumv, 1, &v, NULL);
+ V_VT(&v[0]) = VT_EMPTY;
+ hr = IEnumVARIANT_Next(enumv, 1, &v[0], NULL);
EXPECT_HR(hr, S_OK);
- ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v));
- ok(!lstrcmpW(V_BSTR(&v), L"http://blahblah.org"), "got %s\n", wine_dbgstr_w(V_BSTR(&v)));
- VariantClear(&v);
+ ok(V_VT(&v[0]) == VT_BSTR, "got %d\n", V_VT(&v[0]));
+ ok(!lstrcmpW(V_BSTR(&v[0]), L"http://blahblah.org"), "got %s\n", wine_dbgstr_w(V_BSTR(&v[0])));
+ VariantClear(&v[0]);
- V_VT(&v) = VT_NULL;
- hr = IEnumVARIANT_Next(enumv, 1, &v, NULL);
+ V_VT(&v[0]) = VT_NULL;
+ hr = IEnumVARIANT_Next(enumv, 1, &v[0], NULL);
EXPECT_HR(hr, S_FALSE);
- ok(V_VT(&v) == VT_EMPTY, "got %d\n", V_VT(&v));
+ ok(V_VT(&v[0]) == VT_EMPTY, "got %d\n", V_VT(&v[0]));
+
+ IEnumVARIANT_Release(enumv);
+
+ enumv = (void*)0xdeadbeef;
+ hr = IXMLDOMSchemaCollection_get__newEnum(collection, (IUnknown**)&enumv);
+ EXPECT_HR(hr, S_OK);
+ ok(enumv != NULL, "got %p\n", enumv);
+
+ V_VT(&v[1]) = VT_EMPTY;
+ V_VT(&v[0]) = VT_EMPTY;
+ hr = IEnumVARIANT_Next(enumv, 2, v, &fetched);
+ EXPECT_HR(hr, S_OK);
+ ok(fetched == 2, "got %d, expected 2\n", fetched);
+ ok(V_VT(&v[0]) == VT_BSTR, "got %d\n", V_VT(&v[0]));
+ ok(V_VT(&v[1]) == VT_BSTR, "got %d\n", V_VT(&v[1]));
+ ok(!lstrcmpW(V_BSTR(&v[0]), L"http://blah.org"), "got %s\n", wine_dbgstr_w(V_BSTR(&v[0])));
+ ok(!lstrcmpW(V_BSTR(&v[1]), L"http://blahblah.org"), "got %s\n", wine_dbgstr_w(V_BSTR(&v[0])));
+ VariantClear(&v[1]);
+ VariantClear(&v[0]);
+
+ V_VT(&v[0]) = VT_NULL;
+ hr = IEnumVARIANT_Next(enumv, 1, v, &fetched);
+ EXPECT_HR(hr, S_FALSE);
+ ok(fetched == 0, "got %d, expected 0\n", fetched);
+ ok(V_VT(&v[0]) == VT_EMPTY, "got %d\n", V_VT(&v[0]));
IEnumVARIANT_Release(enumv);
IXMLDOMSchemaCollection_Release(collection);
@@ -12561,8 +12653,9 @@ static void test_namedmap_newenum(void)
IXMLDOMElement *elem;
IXMLDOMNode *node;
VARIANT_BOOL b;
+ ULONG fetched;
+ VARIANT v[3];
HRESULT hr;
- VARIANT v;
BSTR str;
doc = create_document(&IID_IXMLDOMDocument);
@@ -12634,18 +12727,18 @@ static void test_namedmap_newenum(void)
SysFreeString(str);
IXMLDOMNode_Release(node);
- V_VT(&v) = VT_EMPTY;
- hr = IEnumVARIANT_Next(enum2, 1, &v, NULL);
+ V_VT(&v[0]) = VT_EMPTY;
+ hr = IEnumVARIANT_Next(enum2, 1, &v[0], NULL);
EXPECT_HR(hr, S_OK);
- ok(V_VT(&v) == VT_DISPATCH, "got var type %d\n", V_VT(&v));
- hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IXMLDOMNode, (void**)&node);
+ ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0]));
+ hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node);
EXPECT_HR(hr, S_OK);
hr = IXMLDOMNode_get_nodeName(node, &str);
EXPECT_HR(hr, S_OK);
ok(!lstrcmpW(str, L"attr1"), "got node name %s\n", wine_dbgstr_w(str));
SysFreeString(str);
IXMLDOMNode_Release(node);
- VariantClear(&v);
+ VariantClear(&v[0]);
hr = IXMLDOMNamedNodeMap_nextNode(map, &node);
EXPECT_HR(hr, S_OK);
@@ -12654,8 +12747,62 @@ static void test_namedmap_newenum(void)
ok(!lstrcmpW(str, L"attr2"), "got %s\n", wine_dbgstr_w(str));
SysFreeString(str);
IXMLDOMNode_Release(node);
+ IEnumVARIANT_Release(enum2);
+ hr = IXMLDOMNamedNodeMap__newEnum(map, (IUnknown**)&enum2);
+ EXPECT_HR(hr, S_OK);
+
+ V_VT(&v[1]) = VT_EMPTY;
+ V_VT(&v[0]) = VT_EMPTY;
+ hr = IEnumVARIANT_Next(enum2, 2, v, &fetched);
+ EXPECT_HR(hr, S_OK);
+ ok(fetched == 2, "got %d, expected 2\n", fetched);
+ ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0]));
+ ok(V_VT(&v[1]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[1]));
+ hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node);
+ EXPECT_HR(hr, S_OK);
+ hr = IXMLDOMNode_get_nodeName(node, &str);
+ EXPECT_HR(hr, S_OK);
+ ok(!lstrcmpW(str, L"attr1"), "got node name %s\n", wine_dbgstr_w(str));
+ SysFreeString(str);
+ IXMLDOMNode_Release(node);
+ hr = IDispatch_QueryInterface(V_DISPATCH(&v[1]), &IID_IXMLDOMNode, (void**)&node);
+ EXPECT_HR(hr, S_OK);
+ hr = IXMLDOMNode_get_nodeName(node, &str);
+ EXPECT_HR(hr, S_OK);
+ ok(!lstrcmpW(str, L"attr2"), "got node name %s\n", wine_dbgstr_w(str));
+ SysFreeString(str);
+ IXMLDOMNode_Release(node);
+ VariantClear(&v[1]);
+ VariantClear(&v[0]);
+
+ V_VT(&v[2]) = VT_NULL;
+ V_VT(&v[1]) = VT_EMPTY;
+ V_VT(&v[0]) = VT_EMPTY;
+ hr = IEnumVARIANT_Next(enum2, 3, v, &fetched);
+ EXPECT_HR(hr, S_FALSE);
+ ok(fetched == 2, "got %d, expected 2\n", fetched);
+ ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0]));
+ ok(V_VT(&v[1]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[1]));
+ ok(V_VT(&v[2]) == VT_EMPTY, "got var type %d\n", V_VT(&v[2]));
+ hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node);
+ EXPECT_HR(hr, S_OK);
+ hr = IXMLDOMNode_get_nodeName(node, &str);
+ EXPECT_HR(hr, S_OK);
+ ok(!lstrcmpW(str, L"attr3"), "got node name %s\n", wine_dbgstr_w(str));
+ SysFreeString(str);
+ IXMLDOMNode_Release(node);
+ hr = IDispatch_QueryInterface(V_DISPATCH(&v[1]), &IID_IXMLDOMNode, (void**)&node);
+ EXPECT_HR(hr, S_OK);
+ hr = IXMLDOMNode_get_nodeName(node, &str);
+ EXPECT_HR(hr, S_OK);
+ ok(!lstrcmpW(str, L"attr4"), "got node name %s\n", wine_dbgstr_w(str));
+ SysFreeString(str);
+ IXMLDOMNode_Release(node);
+ VariantClear(&v[1]);
+ VariantClear(&v[0]);
IEnumVARIANT_Release(enum2);
+
IXMLDOMNamedNodeMap_Release(map);
IXMLDOMDocument_Release(doc);
}
--
2.28.0
More information about the wine-devel
mailing list