Module: wine Branch: master Commit: 9e8c0e54c63b9bccdc72411dd8a114284cb560be URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e8c0e54c63b9bccdc72411dd8...
Author: Alistair Leslie-Hughes leslie_alistair@hotmail.com Date: Wed Feb 13 06:56:09 2008 +1100
msxml3: Corrected tests for msxml service packs versions.
---
dlls/msxml3/tests/xmldoc.c | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 0d1c90a..b4e6823 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -270,16 +270,25 @@ static void test_createElement(void) V_I4(&vType) = -1; V_VT(&vName) = VT_NULL; hr = IXMLDocument_createElement(doc, vType, vName, &element); - ok(hr == E_NOTIMPL, "Expected E_NOTIMPL, got %d\n", hr); - ok(element == NULL, "Expected NULL element\n"); - - if (element != NULL) + /* Upto and including SP7, createElement returns an element. */ + if(hr == S_OK) { - hr = IXMLElement_get_type(element, &type); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); - ok(type == XMLELEMTYPE_OTHER, "Expected XMLELEMTYPE_OTHER, got %ld\n", type); - - IXMLElement_Release(element); + ok(element != NULL, "Expected element\n"); + if (element != NULL) + { + hr = IXMLElement_get_type(element, &type); + ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + /* SP7 returns an XMLELEMTYPE_ELEMENT */ + ok(type == XMLELEMTYPE_OTHER || type == XMLELEMTYPE_ELEMENT, + "Expected XMLELEMTYPE_OTHER || XMLELEMTYPE_ELEMENT, got %ld\n", type); + + 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 */