Commit 9e8c0e54 authored by Alistair Leslie-Hughes's avatar Alistair Leslie-Hughes Committed by Alexandre Julliard

msxml3: Corrected tests for msxml service packs versions.

parent 56d085cc
...@@ -270,17 +270,26 @@ static void test_createElement(void) ...@@ -270,17 +270,26 @@ static void test_createElement(void)
V_I4(&vType) = -1; V_I4(&vType) = -1;
V_VT(&vName) = VT_NULL; V_VT(&vName) = VT_NULL;
hr = IXMLDocument_createElement(doc, vType, vName, &element); hr = IXMLDocument_createElement(doc, vType, vName, &element);
ok(hr == E_NOTIMPL, "Expected E_NOTIMPL, got %d\n", hr); /* Upto and including SP7, createElement returns an element. */
ok(element == NULL, "Expected NULL element\n"); if(hr == S_OK)
{
ok(element != NULL, "Expected element\n");
if (element != NULL) if (element != NULL)
{ {
hr = IXMLElement_get_type(element, &type); hr = IXMLElement_get_type(element, &type);
ok(hr == S_OK, "Expected S_OK, got %d\n", hr); ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
ok(type == XMLELEMTYPE_OTHER, "Expected XMLELEMTYPE_OTHER, got %ld\n", type); /* SP7 returns an XMLELEMTYPE_ELEMENT */
ok(type == XMLELEMTYPE_OTHER || type == XMLELEMTYPE_ELEMENT,
"Expected XMLELEMTYPE_OTHER || XMLELEMTYPE_ELEMENT, got %ld\n", type);
IXMLElement_Release(element); IXMLElement_Release(element);
} }
}
else
{
ok(hr == E_NOTIMPL, "Expected E_NOTIMPL, got %d\n", hr);
ok(element == NULL, "Expected NULL element\n");
}
/* invalid vName type */ /* invalid vName type */
V_VT(&vType) = VT_I4; V_VT(&vType) = VT_I4;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment