[MSXML3_WINETEST]
[reactos.git] / rostests / winetests / msxml3 / domdoc.c
index 21e8178..103d0ed 100644 (file)
@@ -3,6 +3,8 @@
  *
  * Copyright 2005 Mike McCormack for CodeWeavers
  * Copyright 2007-2008 Alistair Leslie-Hughes
+ * Copyright 2010-2011 Adam Martinson for CodeWeavers
+ * Copyright 2010-2013 Nikolay Sivov for CodeWeavers
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  */
 
 
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #define COBJMACROS
+#define CONST_VTABLE
 
-#include "windows.h"
-#include "ole2.h"
-#include "objsafe.h"
-#include "xmldom.h"
-#include "msxml2.h"
-#include "msxml2did.h"
-#include "dispex.h"
 #include <stdio.h>
 #include <assert.h>
 
-#include "wine/test.h"
+//#include "windows.h"
+
+#include <wine/test.h>
+
+#include <winnls.h>
+#include <ole2.h>
+#include <msxml.h>
+#include <msxml2.h>
+#include <msxml2did.h>
+#include <dispex.h>
+#include <objsafe.h>
+//#include "initguid.h"
+
+/* undef the #define in msxml2 so that we can access all versions */
+#undef CLSID_DOMDocument
+
+DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
+
+static int g_unexpectedcall, g_expectedcall;
+
+struct msxmlsupported_data_t
+{
+    const GUID *clsid;
+    const char *name;
+    const IID  *ifaces[3];
+    BOOL        supported[3];
+};
+
+static struct msxmlsupported_data_t domdoc_support_data[] =
+{
+    { &CLSID_DOMDocument,   "DOMDocument",   {&IID_IXMLDOMDocument, &IID_IXMLDOMDocument2} },
+    { &CLSID_DOMDocument2,  "DOMDocument2",  {&IID_IXMLDOMDocument, &IID_IXMLDOMDocument2} },
+    { &CLSID_DOMDocument30, "DOMDocument30", {&IID_IXMLDOMDocument, &IID_IXMLDOMDocument2} },
+    { &CLSID_DOMDocument40, "DOMDocument40", {&IID_IXMLDOMDocument, &IID_IXMLDOMDocument2} },
+    { &CLSID_DOMDocument60, "DOMDocument60", {&IID_IXMLDOMDocument, &IID_IXMLDOMDocument2, &IID_IXMLDOMDocument3} },
+    { &CLSID_FreeThreadedDOMDocument, "FreeThreadedDOMDocument", {&IID_IXMLDOMDocument, &IID_IXMLDOMDocument2} },
+    { &CLSID_XMLSchemaCache, "XMLSchemaCache", {&IID_IXMLDOMSchemaCollection} },
+    { &CLSID_XSLTemplate,    "XSLTemplate", {&IID_IXSLTemplate} },
+    { &CLSID_MXNamespaceManager40, "MXNamespaceManager40", {&IID_IMXNamespaceManager} },
+    { NULL }
+};
+
+static const char *debugstr_msxml_guid(REFIID riid)
+{
+    if(!riid)
+        return "(null)";
+
+    if (IsEqualIID(&IID_IXMLDOMDocument, riid))
+        return "IXMLDOMDocument";
+    else if (IsEqualIID(&IID_IXMLDOMDocument2, riid))
+        return "IXMLDOMDocument2";
+    else if (IsEqualIID(&IID_IXMLDOMDocument3, riid))
+        return "IXMLDOMDocument3";
+    else if (IsEqualIID(&IID_IXMLDOMSchemaCollection, riid))
+        return "IXMLDOMSchemaCollection";
+    else if (IsEqualIID(&IID_IXSLTemplate, riid))
+        return "IXSLTemplate";
+    else if (IsEqualIID(&IID_IMXNamespaceManager, riid))
+        return "IMXNamespaceManager";
+    else
+        return wine_dbgstr_guid(riid);
+}
+
+static void get_class_support_data(struct msxmlsupported_data_t *table)
+{
+    while (table->clsid)
+    {
+        IUnknown *unk;
+        HRESULT hr;
+        int i;
+
+        for (i = 0; i < sizeof(table->ifaces)/sizeof(table->ifaces[0]) && table->ifaces[i] != NULL; i++)
+        {
+            hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, table->ifaces[i], (void**)&unk);
+            if (hr == S_OK) IUnknown_Release(unk);
+
+            table->supported[i] = hr == S_OK;
+            if (hr != S_OK) win_skip("class %s, iface %s not supported\n", table->name, debugstr_msxml_guid(table->ifaces[i]));
+        }
+
+        table++;
+    }
+}
+
+static BOOL is_clsid_supported(const GUID *clsid, REFIID riid)
+{
+    const struct msxmlsupported_data_t *table = domdoc_support_data;
+    while (table->clsid)
+    {
+        if (table->clsid == clsid)
+        {
+            int i;
+
+            for (i = 0; i < sizeof(table->ifaces)/sizeof(table->ifaces[0]) && table->ifaces[i] != NULL; i++)
+                if (table->ifaces[i] == riid) return table->supported[i];
+        }
+
+        table++;
+    }
+    return FALSE;
+}
+
+typedef struct
+{
+    IDispatch IDispatch_iface;
+    LONG ref;
+} dispevent;
+
+static inline dispevent *impl_from_IDispatch( IDispatch *iface )
+{
+    return CONTAINING_RECORD(iface, dispevent, IDispatch_iface);
+}
+
+static HRESULT WINAPI dispevent_QueryInterface(IDispatch *iface, REFIID riid, void **ppvObject)
+{
+    *ppvObject = NULL;
+
+    if ( IsEqualGUID( riid, &IID_IDispatch) ||
+         IsEqualGUID( riid, &IID_IUnknown) )
+    {
+        *ppvObject = iface;
+    }
+    else
+        return E_NOINTERFACE;
+
+    IDispatch_AddRef( iface );
+
+    return S_OK;
+}
+
+static ULONG WINAPI dispevent_AddRef(IDispatch *iface)
+{
+    dispevent *This = impl_from_IDispatch( iface );
+    return InterlockedIncrement( &This->ref );
+}
+
+static ULONG WINAPI dispevent_Release(IDispatch *iface)
+{
+    dispevent *This = impl_from_IDispatch( iface );
+    ULONG ref = InterlockedDecrement( &This->ref );
+
+    if (ref == 0)
+        HeapFree(GetProcessHeap(), 0, This);
+
+    return ref;
+}
+
+static HRESULT WINAPI dispevent_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo)
+{
+    g_unexpectedcall++;
+    *pctinfo = 0;
+    return S_OK;
+}
+
+static HRESULT WINAPI dispevent_GetTypeInfo(IDispatch *iface, UINT iTInfo,
+        LCID lcid, ITypeInfo **ppTInfo)
+{
+    g_unexpectedcall++;
+    return S_OK;
+}
+
+static HRESULT WINAPI dispevent_GetIDsOfNames(IDispatch *iface, REFIID riid,
+        LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId)
+{
+    g_unexpectedcall++;
+    return S_OK;
+}
+
+static HRESULT WINAPI dispevent_Invoke(IDispatch *iface, DISPID member, REFIID riid,
+        LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result,
+        EXCEPINFO *excepInfo, UINT *argErr)
+{
+    ok(member == 0, "expected 0 member, got %d\n", member);
+    ok(lcid == LOCALE_SYSTEM_DEFAULT, "expected LOCALE_SYSTEM_DEFAULT, got lcid %x\n", lcid);
+    ok(flags == DISPATCH_METHOD, "expected DISPATCH_METHOD, got %d\n", flags);
+
+    ok(params->cArgs == 0, "got %d\n", params->cArgs);
+    ok(params->cNamedArgs == 0, "got %d\n", params->cNamedArgs);
+    ok(params->rgvarg == NULL, "got %p\n", params->rgvarg);
+    ok(params->rgdispidNamedArgs == NULL, "got %p\n", params->rgdispidNamedArgs);
+
+    ok(result == NULL, "got %p\n", result);
+    ok(excepInfo == NULL, "got %p\n", excepInfo);
+    ok(argErr == NULL, "got %p\n", argErr);
+
+    g_expectedcall++;
+    return E_FAIL;
+}
+
+static const IDispatchVtbl dispeventVtbl =
+{
+    dispevent_QueryInterface,
+    dispevent_AddRef,
+    dispevent_Release,
+    dispevent_GetTypeInfoCount,
+    dispevent_GetTypeInfo,
+    dispevent_GetIDsOfNames,
+    dispevent_Invoke
+};
+
+static IDispatch* create_dispevent(void)
+{
+    dispevent *event = HeapAlloc(GetProcessHeap(), 0, sizeof(*event));
+
+    event->IDispatch_iface.lpVtbl = &dispeventVtbl;
+    event->ref = 1;
+
+    return (IDispatch*)&event->IDispatch_iface;
+}
+
+/* IStream */
+static HRESULT WINAPI istream_QueryInterface(IStream *iface, REFIID riid, void **ppvObject)
+{
+    *ppvObject = NULL;
+
+    if (IsEqualGUID(riid, &IID_IStream) ||
+        IsEqualGUID(riid, &IID_IUnknown))
+        *ppvObject = iface;
+    else
+        return E_NOINTERFACE;
+
+    return S_OK;
+}
+
+static ULONG WINAPI istream_AddRef(IStream *iface)
+{
+    return 2;
+}
+
+static ULONG WINAPI istream_Release(IStream *iface)
+{
+    return 1;
+}
+
+static HRESULT WINAPI istream_Read(IStream *iface, void *ptr, ULONG len, ULONG *pread)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI istream_Write(IStream *iface, const void *ptr, ULONG len, ULONG *written)
+{
+    *written = len/2;
+    return S_OK;
+}
+
+static HRESULT WINAPI istream_Seek(IStream *iface, LARGE_INTEGER move, DWORD origin, ULARGE_INTEGER *new_pos)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI istream_SetSize(IStream *iface, ULARGE_INTEGER size)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI istream_CopyTo(IStream *iface, IStream *stream, ULARGE_INTEGER len,
+        ULARGE_INTEGER *pread, ULARGE_INTEGER *written)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI istream_Commit(IStream *iface, DWORD flags)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI istream_Revert(IStream *iface)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI istream_LockRegion(IStream *iface, ULARGE_INTEGER offset,
+        ULARGE_INTEGER len, DWORD locktype)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI istream_UnlockRegion(IStream *iface, ULARGE_INTEGER offset,
+        ULARGE_INTEGER len, DWORD locktype)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI istream_Stat(IStream *iface, STATSTG *pstatstg, DWORD flag)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI istream_Clone(IStream *iface, IStream **stream)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static const IStreamVtbl StreamVtbl = {
+    istream_QueryInterface,
+    istream_AddRef,
+    istream_Release,
+    istream_Read,
+    istream_Write,
+    istream_Seek,
+    istream_SetSize,
+    istream_CopyTo,
+    istream_Commit,
+    istream_Revert,
+    istream_LockRegion,
+    istream_UnlockRegion,
+    istream_Stat,
+    istream_Clone
+};
+
+#if CORE_6738_IS_FIXED
+static IStream savestream = { &StreamVtbl };
+#endif
+
+#define EXPECT_CHILDREN(node) _expect_children((IXMLDOMNode*)node, __LINE__)
+static void _expect_children(IXMLDOMNode *node, int line)
+{
+    VARIANT_BOOL b;
+    HRESULT hr;
+
+    b = VARIANT_FALSE;
+    hr = IXMLDOMNode_hasChildNodes(node, &b);
+    ok_(__FILE__,line)(hr == S_OK, "hasChildNodes() failed, 0x%08x\n", hr);
+    ok_(__FILE__,line)(b == VARIANT_TRUE, "no children, %d\n", b);
+}
+
+#define EXPECT_NO_CHILDREN(node) _expect_no_children((IXMLDOMNode*)node, __LINE__)
+static void _expect_no_children(IXMLDOMNode *node, int line)
+{
+    VARIANT_BOOL b;
+    HRESULT hr;
+
+    b = VARIANT_TRUE;
+    hr = IXMLDOMNode_hasChildNodes(node, &b);
+    ok_(__FILE__,line)(hr == S_FALSE, "hasChildNodes() failed, 0x%08x\n", hr);
+    ok_(__FILE__,line)(b == VARIANT_FALSE, "no children, %d\n", b);
+}
+
+#define EXPECT_REF(node,ref) _expect_ref((IUnknown*)node, ref, __LINE__)
+static void _expect_ref(IUnknown* obj, ULONG ref, int line)
+{
+    ULONG rc;
+    IUnknown_AddRef(obj);
+    rc = IUnknown_Release(obj);
+    ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc);
+}
+
+#define EXPECT_LIST_LEN(list,len) _expect_list_len(list, len, __LINE__)
+static void _expect_list_len(IXMLDOMNodeList *list, LONG len, int line)
+{
+    LONG length;
+    HRESULT hr;
+
+    length = 0;
+    hr = IXMLDOMNodeList_get_length(list, &length);
+    ok_(__FILE__,line)(hr == S_OK, "got 0x%08x\n", hr);
+    ok_(__FILE__,line)(length == len, "got %d, expected %d\n", length, len);
+}
 
-#include "initguid.h"
+#define EXPECT_HR(hr,hr_exp) \
+    ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp)
 
-DEFINE_GUID(IID_IObjectSafety, 0xcb5bdc81, 0x93c1, 0x11cf, 0x8f,0x20, 0x00,0x80,0x5f,0x2c,0xd0,0x64);
+#define EXPECT_NOT_HR(hr,hr_exp) \
+    ok(hr != hr_exp, "got 0x%08x, expected not 0x%08x\n", hr, hr_exp)
 
 static const WCHAR szEmpty[] = { 0 };
 static const WCHAR szIncomplete[] = {
@@ -58,24 +427,23 @@ static const WCHAR szComplete3[] = {
     'v','e','r','s','i','o','n','=','\'','1','.','0','\'','?','>','\n',
     '<','a','>','<','/','a','>','\n',0
 };
-static const WCHAR szComplete4[] = {
-    '<','?','x','m','l',' ','v','e','r','s','i','o','n','=','\'','1','.','0','\'','?','>','\n',
-    '<','l','c',' ','d','l','=','\'','s','t','r','1','\'','>','\n',
-        '<','b','s',' ','v','r','=','\'','s','t','r','2','\'',' ','s','z','=','\'','1','2','3','4','\'','>',
-            'f','n','1','.','t','x','t','\n',
-        '<','/','b','s','>','\n',
-        '<','p','r',' ','i','d','=','\'','s','t','r','3','\'',' ','v','r','=','\'','1','.','2','.','3','\'',' ',
-                    'p','n','=','\'','w','i','n','e',' ','2','0','0','5','0','8','0','4','\'','>','\n',
-            'f','n','2','.','t','x','t','\n',
-        '<','/','p','r','>','\n',
-        '<','e','m','p','t','y','>','<','/','e','m','p','t','y','>','\n',
-        '<','f','o','>','\n',
-            '<','b','a','>','\n',
-                'f','1','\n',
-            '<','/','b','a','>','\n',
-        '<','/','f','o','>','\n',
-    '<','/','l','c','>','\n',0
-};
+static const char complete4A[] =
+    "<?xml version=\'1.0\'?>\n"
+    "<lc dl=\'str1\'>\n"
+        "<bs vr=\'str2\' sz=\'1234\'>"
+            "fn1.txt\n"
+        "</bs>\n"
+        "<pr id=\'str3\' vr=\'1.2.3\' pn=\'wine 20050804\'>\n"
+            "fn2.txt\n"
+        "</pr>\n"
+        "<empty></empty>\n"
+        "<fo>\n"
+            "<ba>\n"
+                "f1\n"
+            "</ba>\n"
+        "</fo>\n"
+    "</lc>\n";
+
 static const WCHAR szComplete5[] = {
     '<','S',':','s','e','a','r','c','h',' ','x','m','l','n','s',':','D','=','"','D','A','V',':','"',' ',
     'x','m','l','n','s',':','C','=','"','u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','o','f','f','i','c','e',':','c','l','i','p','g','a','l','l','e','r','y','"',
@@ -96,21 +464,43 @@ static const WCHAR szComplete6[] = {
     '<','o','p','e','n','>','<','/','o','p','e','n','>','\n',0
 };
 
-static const CHAR szNonUnicodeXML[] =
-"<?xml version='1.0' encoding='Windows-1252'?>\n"
-"<open></open>\n";
+static const char complete7[] = {
+    "<?xml version=\"1.0\"?>\n\t"
+    "<root>\n"
+    "\t<a/>\n"
+    "\t<b/>\n"
+    "\t<c/>\n"
+    "</root>"
+};
+
+#define DECL_WIN_1252 \
+"<?xml version=\"1.0\" encoding=\"Windows-1252\"?>"
+
+static const char win1252xml[] =
+DECL_WIN_1252
+"<open></open>";
 
-static const CHAR szExampleXML[] =
+static const char win1252decl[] =
+DECL_WIN_1252
+;
+
+static const char nocontent[] = "no xml content here";
+
+static const char szExampleXML[] =
 "<?xml version='1.0' encoding='utf-8'?>\n"
-"<root xmlns:foo='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n"
+"<root xmlns:foo='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' a=\"attr a\" foo:b=\"attr b\" >\n"
 "    <elem>\n"
 "        <a>A1 field</a>\n"
 "        <b>B1 field</b>\n"
 "        <c>C1 field</c>\n"
+"        <d>D1 field</d>\n"
 "        <description xmlns:foo='http://www.winehq.org' xmlns:bar='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n"
 "            <html xmlns='http://www.w3.org/1999/xhtml'>\n"
 "                This is <strong>a</strong> <i>description</i>. <bar:x/>\n"
 "            </html>\n"
+"            <html xml:space='preserve' xmlns='http://www.w3.org/1999/xhtml'>\n"
+"                This is <strong>a</strong> <i>description</i> with preserved whitespace. <bar:x/>\n"
+"            </html>\n"
 "        </description>\n"
 "    </elem>\n"
 "\n"
@@ -118,6 +508,7 @@ static const CHAR szExampleXML[] =
 "        <a>A2 field</a>\n"
 "        <b>B2 field</b>\n"
 "        <c type=\"old\">C2 field</c>\n"
+"        <d>D2 field</d>\n"
 "    </elem>\n"
 "\n"
 "    <elem xmlns='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n"
@@ -130,10 +521,42 @@ static const CHAR szExampleXML[] =
 "        <a>A4 field</a>\n"
 "        <b>B4 field</b>\n"
 "        <foo:c>C4 field</foo:c>\n"
+"        <d>D4 field</d>\n"
 "    </elem>\n"
 "</root>\n";
 
-static  const CHAR szTransformXML[] =
+static const char charrefsxml[] =
+"<?xml version='1.0'?>"
+"<a>"
+"<b1> Text &#65; end </b1>"
+"<b2>&#65;&#66; &#67; </b2>"
+"</a>";
+
+static const CHAR szNodeTypesXML[] =
+"<?xml version='1.0'?>"
+"<!-- comment node 0 -->"
+"<root id='0' depth='0'>"
+"   <!-- comment node 1 -->"
+"   text node 0"
+"   <x id='1' depth='1'>"
+"       <?foo value='PI for x'?>"
+"       <!-- comment node 2 -->"
+"       text node 1"
+"       <a id='3' depth='2'/>"
+"       <b id='4' depth='2'/>"
+"       <c id='5' depth='2'/>"
+"   </x>"
+"   <y id='2' depth='1'>"
+"       <?bar value='PI for y'?>"
+"       <!-- comment node 3 -->"
+"       text node 2"
+"       <a id='6' depth='2'/>"
+"       <b id='7' depth='2'/>"
+"       <c id='8' depth='2'/>"
+"   </y>"
+"</root>";
+
+static const CHAR szTransformXML[] =
 "<?xml version=\"1.0\"?>\n"
 "<greeting>\n"
 "Hello World\n"
@@ -188,6 +611,8 @@ static const CHAR szTypeValueXML[] =
 "   <uuid dt:dt=\"uuid\">333C7BC4-460F-11D0-BC04-0080C7055a83</uuid>\n"
 "   <binhex dt:dt=\"bin.hex\">fffca012003c</binhex>\n"
 "   <binbase64 dt:dt=\"bin.base64\">YmFzZTY0IHRlc3Q=</binbase64>\n"
+"   <binbase64_1 dt:dt=\"bin.base64\">\nYmFzZTY0\nIHRlc3Q=\n</binbase64_1>\n"
+"   <binbase64_2 dt:dt=\"bin.base64\">\nYmF\r\t z  ZTY0\nIHRlc3Q=\n</binbase64_2>\n"
 "</root>";
 
 static const CHAR szBasicTransformSSXMLPart1[] =
@@ -221,10 +646,215 @@ static const CHAR szBasicTransformXML[] =
 static const CHAR szBasicTransformOutput[] =
 "<HTML><BODY><TABLE><TD>Wine</TD><TD>$25.00</TD></TABLE></BODY></HTML>";
 
-static const WCHAR szNonExistentFile[] = {
+#define SZ_EMAIL_DTD \
+"<!DOCTYPE email ["\
+"   <!ELEMENT email         (recipients,from,reply-to?,subject,body,attachment*)>"\
+"       <!ATTLIST email attachments IDREFS #REQUIRED>"\
+"       <!ATTLIST email sent (yes|no) \"no\">"\
+"   <!ELEMENT recipients    (to+,cc*)>"\
+"   <!ELEMENT to            (#PCDATA)>"\
+"       <!ATTLIST to name CDATA #IMPLIED>"\
+"   <!ELEMENT cc            (#PCDATA)>"\
+"       <!ATTLIST cc name CDATA #IMPLIED>"\
+"   <!ELEMENT from          (#PCDATA)>"\
+"       <!ATTLIST from name CDATA #IMPLIED>"\
+"   <!ELEMENT reply-to      (#PCDATA)>"\
+"       <!ATTLIST reply-to name CDATA #IMPLIED>"\
+"   <!ELEMENT subject       ANY>"\
+"   <!ELEMENT body          ANY>"\
+"       <!ATTLIST body enc CDATA #FIXED \"UTF-8\">"\
+"   <!ELEMENT attachment    (#PCDATA)>"\
+"       <!ATTLIST attachment id ID #REQUIRED>"\
+"]>"
+
+static const CHAR szEmailXML[] =
+"<?xml version=\"1.0\"?>"
+SZ_EMAIL_DTD
+"<email attachments=\"patch1\">"
+"   <recipients>"
+"       <to>wine-patches@winehq.org</to>"
+"   </recipients>"
+"   <from name=\"Anonymous\">user@localhost</from>"
+"   <subject>msxml3/tests: DTD validation (try 87)</subject>"
+"   <body>"
+"       It no longer causes spontaneous combustion..."
+"   </body>"
+"   <attachment id=\"patch1\">0001-msxml3-tests-DTD-validation.patch</attachment>"
+"</email>";
+
+static const CHAR szEmailXML_0D[] =
+"<?xml version=\"1.0\"?>"
+SZ_EMAIL_DTD
+"<email attachments=\"patch1\">"
+"   <recipients>"
+"       <to>wine-patches@winehq.org</to>"
+"   </recipients>"
+"   <from name=\"Anonymous\">user@localhost</from>"
+"   <subject>msxml3/tests: DTD validation (try 88)</subject>"
+"   <body>"
+"       <undecl />"
+"       XML_ELEMENT_UNDECLARED 0xC00CE00D"
+"   </body>"
+"   <attachment id=\"patch1\">0001-msxml3-tests-DTD-validation.patch</attachment>"
+"</email>";
+
+static const CHAR szEmailXML_0E[] =
+"<?xml version=\"1.0\"?>"
+SZ_EMAIL_DTD
+"<email attachments=\"patch1\">"
+"   <recipients>"
+"       <to>wine-patches@winehq.org</to>"
+"   </recipients>"
+"   <from name=\"Anonymous\">user@localhost</from>"
+"   <subject>msxml3/tests: DTD validation (try 89)</subject>"
+"   <body>"
+"       XML_ELEMENT_ID_NOT_FOUND 0xC00CE00E"
+"   </body>"
+"   <attachment id=\"patch\">0001-msxml3-tests-DTD-validation.patch</attachment>"
+"</email>";
+
+static const CHAR szEmailXML_11[] =
+"<?xml version=\"1.0\"?>"
+SZ_EMAIL_DTD
+"<email attachments=\"patch1\">"
+"   <recipients>"
+"   </recipients>"
+"   <from name=\"Anonymous\">user@localhost</from>"
+"   <subject>msxml3/tests: DTD validation (try 90)</subject>"
+"   <body>"
+"       XML_EMPTY_NOT_ALLOWED 0xC00CE011"
+"   </body>"
+"   <attachment id=\"patch1\">0001-msxml3-tests-DTD-validation.patch</attachment>"
+"</email>";
+
+static const CHAR szEmailXML_13[] =
+"<?xml version=\"1.0\"?>"
+SZ_EMAIL_DTD
+"<msg attachments=\"patch1\">"
+"   <recipients>"
+"       <to>wine-patches@winehq.org</to>"
+"   </recipients>"
+"   <from name=\"Anonymous\">user@localhost</from>"
+"   <subject>msxml3/tests: DTD validation (try 91)</subject>"
+"   <body>"
+"       XML_ROOT_NAME_MISMATCH 0xC00CE013"
+"   </body>"
+"   <attachment id=\"patch1\">0001-msxml3-tests-DTD-validation.patch</attachment>"
+"</msg>";
+
+static const CHAR szEmailXML_14[] =
+"<?xml version=\"1.0\"?>"
+SZ_EMAIL_DTD
+"<email attachments=\"patch1\">"
+"   <to>wine-patches@winehq.org</to>"
+"   <from name=\"Anonymous\">user@localhost</from>"
+"   <subject>msxml3/tests: DTD validation (try 92)</subject>"
+"   <body>"
+"       XML_INVALID_CONTENT 0xC00CE014"
+"   </body>"
+"   <attachment id=\"patch1\">0001-msxml3-tests-DTD-validation.patch</attachment>"
+"</email>";
+
+static const CHAR szEmailXML_15[] =
+"<?xml version=\"1.0\"?>"
+SZ_EMAIL_DTD
+"<email attachments=\"patch1\" ip=\"127.0.0.1\">"
+"   <recipients>"
+"       <to>wine-patches@winehq.org</to>"
+"   </recipients>"
+"   <from name=\"Anonymous\">user@localhost</from>"
+"   <subject>msxml3/tests: DTD validation (try 93)</subject>"
+"   <body>"
+"       XML_ATTRIBUTE_NOT_DEFINED 0xC00CE015"
+"   </body>"
+"   <attachment id=\"patch1\">0001-msxml3-tests-DTD-validation.patch</attachment>"
+"</email>";
+
+static const CHAR szEmailXML_16[] =
+"<?xml version=\"1.0\"?>"
+SZ_EMAIL_DTD
+"<email attachments=\"patch1\">"
+"   <recipients>"
+"       <to>wine-patches@winehq.org</to>"
+"   </recipients>"
+"   <from name=\"Anonymous\">user@localhost</from>"
+"   <subject>msxml3/tests: DTD validation (try 94)</subject>"
+"   <body enc=\"ASCII\">"
+"       XML_ATTRIBUTE_FIXED 0xC00CE016"
+"   </body>"
+"   <attachment id=\"patch1\">0001-msxml3-tests-DTD-validation.patch</attachment>"
+"</email>";
+
+static const CHAR szEmailXML_17[] =
+"<?xml version=\"1.0\"?>"
+SZ_EMAIL_DTD
+"<email attachments=\"patch1\" sent=\"true\">"
+"   <recipients>"
+"       <to>wine-patches@winehq.org</to>"
+"   </recipients>"
+"   <from name=\"Anonymous\">user@localhost</from>"
+"   <subject>msxml3/tests: DTD validation (try 95)</subject>"
+"   <body>"
+"       XML_ATTRIBUTE_VALUE 0xC00CE017"
+"   </body>"
+"   <attachment id=\"patch1\">0001-msxml3-tests-DTD-validation.patch</attachment>"
+"</email>";
+
+static const CHAR szEmailXML_18[] =
+"<?xml version=\"1.0\"?>"
+SZ_EMAIL_DTD
+"<email attachments=\"patch1\">"
+"   oops"
+"   <recipients>"
+"       <to>wine-patches@winehq.org</to>"
+"   </recipients>"
+"   <from name=\"Anonymous\">user@localhost</from>"
+"   <subject>msxml3/tests: DTD validation (try 96)</subject>"
+"   <body>"
+"       XML_ILLEGAL_TEXT 0xC00CE018"
+"   </body>"
+"   <attachment id=\"patch1\">0001-msxml3-tests-DTD-validation.patch</attachment>"
+"</email>";
+
+static const CHAR szEmailXML_20[] =
+"<?xml version=\"1.0\"?>"
+SZ_EMAIL_DTD
+"<email>"
+"   <recipients>"
+"       <to>wine-patches@winehq.org</to>"
+"   </recipients>"
+"   <from name=\"Anonymous\">user@localhost</from>"
+"   <subject>msxml3/tests: DTD validation (try 97)</subject>"
+"   <body>"
+"       XML_REQUIRED_ATTRIBUTE_MISSING 0xC00CE020"
+"   </body>"
+"   <attachment id=\"patch1\">0001-msxml3-tests-DTD-validation.patch</attachment>"
+"</email>";
+
+static const char xpath_simple_list[] =
+"<?xml version=\"1.0\"?>"
+"<root>"
+"   <a attr1=\"1\" attr2=\"2\" />"
+"   <b/>"
+"   <c/>"
+"   <d/>"
+"</root>";
+
+static const char default_ns_doc[] = {
+    "<?xml version=\"1.0\"?>"
+    "<a xmlns:ns=\"nshref\" xml:lang=\"ru\" ns:b=\"b attr\" xml:c=\"c attr\" "
+    "    d=\"d attr\" />"
+};
+
+static const char attributes_map[] = {
+    "<?xml version=\"1.0\"?>"
+    "<a attr1=\"value1\" attr2=\"value2\" attr3=\"value3\" attr4=\"value4\" />"
+};
+
+static const WCHAR nonexistent_fileW[] = {
     'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0
 };
-static const WCHAR szNonExistentAttribute[] = {
+static const WCHAR nonexistent_attrW[] = {
     'n','o','n','E','x','i','s','i','t','i','n','g','A','t','t','r','i','b','u','t','e',0
 };
 static const WCHAR szDocument[] = {
@@ -232,41 +862,41 @@ static const WCHAR szDocument[] = {
 };
 
 static const WCHAR szOpen[] = { 'o','p','e','n',0 };
-static WCHAR szdl[] = { 'd','l',0 };
+static const WCHAR szdl[] = { 'd','l',0 };
 static const WCHAR szvr[] = { 'v','r',0 };
 static const WCHAR szlc[] = { 'l','c',0 };
-static WCHAR szbs[] = { 'b','s',0 };
+static const WCHAR szbs[] = { 'b','s',0 };
 static const WCHAR szstr1[] = { 's','t','r','1',0 };
 static const WCHAR szstr2[] = { 's','t','r','2',0 };
 static const WCHAR szstar[] = { '*',0 };
 static const WCHAR szfn1_txt[] = {'f','n','1','.','t','x','t',0};
 
-static WCHAR szComment[] = {'A',' ','C','o','m','m','e','n','t',0 };
-static WCHAR szCommentXML[] = {'<','!','-','-','A',' ','C','o','m','m','e','n','t','-','-','>',0 };
-static WCHAR szCommentNodeText[] = {'#','c','o','m','m','e','n','t',0 };
+static const WCHAR szComment[] = {'A',' ','C','o','m','m','e','n','t',0 };
+static const WCHAR szCommentXML[] = {'<','!','-','-','A',' ','C','o','m','m','e','n','t','-','-','>',0 };
+static const WCHAR szCommentNodeText[] = {'#','c','o','m','m','e','n','t',0 };
 
 static WCHAR szElement[] = {'E','l','e','T','e','s','t', 0 };
-static WCHAR szElementXML[]  = {'<','E','l','e','T','e','s','t','/','>',0 };
-static WCHAR szElementXML2[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','/','>',0 };
-static WCHAR szElementXML3[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','>',
-                                'T','e','s','t','i','n','g','N','o','d','e','<','/','E','l','e','T','e','s','t','>',0 };
-static WCHAR szElementXML4[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','>',
-                                '&','a','m','p',';','x',' ',0x2103,'<','/','E','l','e','T','e','s','t','>',0 };
-
-static WCHAR szAttribute[] = {'A','t','t','r',0 };
-static WCHAR szAttributeXML[] = {'A','t','t','r','=','"','"',0 };
-
-static WCHAR szCData[] = {'[','1',']','*','2','=','3',';',' ','&','g','e','e',' ','t','h','a','t','s',
-                          ' ','n','o','t',' ','r','i','g','h','t','!', 0};
-static WCHAR szCDataXML[] = {'<','!','[','C','D','A','T','A','[','[','1',']','*','2','=','3',';',' ','&',
-                             'g','e','e',' ','t','h','a','t','s',' ','n','o','t',' ','r','i','g','h','t',
-                             '!',']',']','>',0};
-static WCHAR szCDataNodeText[] = {'#','c','d','a','t','a','-','s','e','c','t','i','o','n',0 };
-static WCHAR szDocFragmentText[] = {'#','d','o','c','u','m','e','n','t','-','f','r','a','g','m','e','n','t',0 };
-
-static WCHAR szEntityRef[] = {'e','n','t','i','t','y','r','e','f',0 };
-static WCHAR szEntityRefXML[] = {'&','e','n','t','i','t','y','r','e','f',';',0 };
-static WCHAR szStrangeChars[] = {'&','x',' ',0x2103, 0};
+static const WCHAR szElementXML[]  = {'<','E','l','e','T','e','s','t','/','>',0 };
+static const WCHAR szElementXML2[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','/','>',0 };
+static const WCHAR szElementXML3[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','>',
+                                      'T','e','s','t','i','n','g','N','o','d','e','<','/','E','l','e','T','e','s','t','>',0 };
+static const WCHAR szElementXML4[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','>',
+                                      '&','a','m','p',';','x',' ',0x2103,'<','/','E','l','e','T','e','s','t','>',0 };
+
+static const WCHAR szAttribute[] = {'A','t','t','r',0 };
+static const WCHAR szAttributeXML[] = {'A','t','t','r','=','"','"',0 };
+
+static const WCHAR szCData[] = {'[','1',']','*','2','=','3',';',' ','&','g','e','e',' ','t','h','a','t','s',
+                                ' ','n','o','t',' ','r','i','g','h','t','!', 0};
+static const WCHAR szCDataXML[] = {'<','!','[','C','D','A','T','A','[','[','1',']','*','2','=','3',';',' ','&',
+                                   'g','e','e',' ','t','h','a','t','s',' ','n','o','t',' ','r','i','g','h','t',
+                                   '!',']',']','>',0};
+static const WCHAR szCDataNodeText[] = {'#','c','d','a','t','a','-','s','e','c','t','i','o','n',0 };
+static const WCHAR szDocFragmentText[] = {'#','d','o','c','u','m','e','n','t','-','f','r','a','g','m','e','n','t',0 };
+
+static const WCHAR szEntityRef[] = {'e','n','t','i','t','y','r','e','f',0 };
+static const WCHAR szEntityRefXML[] = {'&','e','n','t','i','t','y','r','e','f',';',0 };
+static const WCHAR szStrangeChars[] = {'&','x',' ',0x2103, 0};
 
 #define expect_bstr_eq_and_free(bstr, expect) { \
     BSTR bstrExp = alloc_str_from_narrow(expect); \
@@ -289,6 +919,24 @@ static WCHAR szStrangeChars[] = {'&','x',' ',0x2103, 0};
 
 #define double_eq(x, y) ok((x)-(y)<=1e-14*(x) && (x)-(y)>=-1e-14*(x), "expected %.16g, got %.16g\n", x, y)
 
+static void* _create_object(const GUID *clsid, const char *name, const IID *iid, int line)
+{
+    void *obj = NULL;
+    HRESULT hr;
+
+    hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, iid, &obj);
+    ok(hr == S_OK, "failed to create %s instance: 0x%08x\n", name, hr);
+
+    return obj;
+}
+
+#define _create(cls) cls, #cls
+
+#define create_document(iid) _create_object(&_create(CLSID_DOMDocument2), iid, __LINE__)
+#define create_document_version(v, iid) _create_object(&_create(CLSID_DOMDocument ## v), iid, __LINE__)
+#define create_cache(iid) _create_object(&_create(CLSID_XMLSchemaCache), iid, __LINE__)
+#define create_xsltemplate(iid) _create_object(&_create(CLSID_XSLTemplate), iid, __LINE__)
+
 static BSTR alloc_str_from_narrow(const char *str)
 {
     int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0);
@@ -297,8 +945,8 @@ static BSTR alloc_str_from_narrow(const char *str)
     return ret;
 }
 
-BSTR alloced_bstrs[256];
-int alloced_bstrs_count = 0;
+static BSTR alloced_bstrs[256];
+static int alloced_bstrs_count;
 
 static BSTR _bstr_(const char *str)
 {
@@ -336,20 +984,6 @@ static BOOL compareIgnoreReturns(BSTR sLeft, BSTR sRight)
     }
 }
 
-static BOOL compareIgnoreReturnsWhitespace(BSTR sLeft, BSTR sRight)
-{
-    /* MSXML3 inserts whitespace where as libxml doesn't. */
-    for (;;)
-    {
-        while (*sLeft == '\r' || *sLeft == '\n' || *sLeft == ' ') sLeft++;
-        while (*sRight == '\r' || *sRight == '\n' || *sRight == ' ') sRight++;
-        if (*sLeft != *sRight) return FALSE;
-        if (!*sLeft) return TRUE;
-        sLeft++;
-        sRight++;
-    }
-}
-
 static void get_str_for_type(DOMNodeType type, char *buf)
 {
     switch (type)
@@ -363,60 +997,20 @@ static void get_str_for_type(DOMNodeType type, char *buf)
         case NODE_DOCUMENT:
             strcpy(buf, "D");
             break;
+        case NODE_TEXT:
+            strcpy(buf, "T");
+            break;
+        case NODE_COMMENT:
+            strcpy(buf, "C");
+            break;
+        case NODE_PROCESSING_INSTRUCTION:
+            strcpy(buf, "P");
+            break;
         default:
             wsprintfA(buf, "[%d]", type);
     }
 }
 
-#define test_disp(u) _test_disp(__LINE__,u)
-static void _test_disp(unsigned line, IUnknown *unk)
-{
-    DISPID dispid = DISPID_XMLDOM_NODELIST_RESET;
-    IDispatchEx *dispex;
-    DWORD dwProps = 0;
-    BSTR sName;
-    UINT ticnt;
-    IUnknown *pUnk;
-    HRESULT hres;
-
-    hres = IUnknown_QueryInterface(unk, &IID_IDispatchEx, (void**)&dispex);
-    ok_(__FILE__,line) (hres == S_OK, "Could not get IDispatch: %08x\n", hres);
-    if(FAILED(hres))
-        return;
-
-    ticnt = 0xdeadbeef;
-    hres = IDispatchEx_GetTypeInfoCount(dispex, &ticnt);
-    ok_(__FILE__,line) (hres == S_OK, "GetTypeInfoCount failed: %08x\n", hres);
-    ok_(__FILE__,line) (ticnt == 1, "ticnt=%u\n", ticnt);
-
-    sName = SysAllocString( szstar );
-    hres = IDispatchEx_DeleteMemberByName(dispex, sName, fdexNameCaseSensitive);
-    ok(hres == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", hres);
-    SysFreeString( sName );
-
-    hres = IDispatchEx_DeleteMemberByDispID(dispex, dispid);
-    ok(hres == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", hres);
-
-    hres = IDispatchEx_GetMemberProperties(dispex, dispid, grfdexPropCanAll, &dwProps);
-    ok(hres == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", hres);
-    ok(dwProps == 0, "expected 0 got %d\n", dwProps);
-
-    hres = IDispatchEx_GetMemberName(dispex, dispid, &sName);
-    ok(hres == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", hres);
-    if(SUCCEEDED(hres))
-        SysFreeString(sName);
-
-    hres = IDispatchEx_GetNextDispID(dispex, fdexEnumDefault, DISPID_XMLDOM_NODELIST_RESET, &dispid);
-    ok(hres == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", hres);
-
-    hres = IDispatchEx_GetNameSpaceParent(dispex, &pUnk);
-    ok(hres == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", hres);
-    if(hres == S_OK && pUnk)
-        IUnknown_Release(pUnk);
-
-    IDispatchEx_Release(dispex);
-}
-
 static int get_node_position(IXMLDOMNode *node)
 {
     HRESULT r;
@@ -471,7 +1065,7 @@ static void node_to_string(IXMLDOMNode *node, char *buf)
         else
         {
             r = IXMLDOMNode_get_parentNode(node, &new_node);
-            wsprintf(buf, "%d", get_node_position(node));
+            sprintf(buf, "%d", get_node_position(node));
             buf += strlen(buf);
         }
 
@@ -515,10 +1109,42 @@ static char *list_to_string(IXMLDOMNodeList *list)
 #define expect_node(node, expstr) { char str[4096]; node_to_string(node, str); ok(strcmp(str, expstr)==0, "Invalid node: %s, expected %s\n", str, expstr); }
 #define expect_list_and_release(list, expstr) { char *str = list_to_string(list); ok(strcmp(str, expstr)==0, "Invalid node list: %s, expected %s\n", str, expstr); if (list) IXMLDOMNodeList_Release(list); }
 
+struct docload_ret_t {
+    VARIANT_BOOL b;
+    HRESULT hr;
+};
+
+struct leading_spaces_t {
+    const CLSID *clsid;
+    const char *name;
+    struct docload_ret_t ret[2]; /* 0 - ::load(), 1 - ::loadXML() */
+};
+
+static const struct leading_spaces_t leading_spaces_classdata[] = {
+    { &CLSID_DOMDocument,   "CLSID_DOMDocument",   {{VARIANT_FALSE, S_FALSE }, {VARIANT_TRUE,  S_OK } }},
+    { &CLSID_DOMDocument2,  "CLSID_DOMDocument2",  {{VARIANT_FALSE, S_FALSE }, {VARIANT_FALSE, S_FALSE } }},
+    { &CLSID_DOMDocument26, "CLSID_DOMDocument26", {{VARIANT_FALSE, S_FALSE }, {VARIANT_TRUE,  S_OK } }},
+    { &CLSID_DOMDocument30, "CLSID_DOMDocument30", {{VARIANT_FALSE, S_FALSE }, {VARIANT_FALSE, S_FALSE } }},
+    { &CLSID_DOMDocument40, "CLSID_DOMDocument40", {{VARIANT_FALSE, S_FALSE }, {VARIANT_FALSE, S_FALSE } }},
+    { &CLSID_DOMDocument60, "CLSID_DOMDocument60", {{VARIANT_FALSE, S_FALSE }, {VARIANT_FALSE, S_FALSE } }},
+    { NULL }
+};
+
+static const char* leading_spaces_xmldata[] = {
+    "\n<?xml version=\"1.0\" encoding=\"UTF-16\" ?><root/>",
+    " <?xml version=\"1.0\"?><root/>",
+    "\n<?xml version=\"1.0\"?><root/>",
+    "\t<?xml version=\"1.0\"?><root/>",
+    "\r\n<?xml version=\"1.0\"?><root/>",
+    "\r<?xml version=\"1.0\"?><root/>",
+    "\r\r\r\r\t\t \n\n <?xml version=\"1.0\"?><root/>",
+    0
+};
+
 static void test_domdoc( void )
 {
-    HRESULT r;
-    IXMLDOMDocument *doc = NULL;
+    HRESULT r, hr;
+    IXMLDOMDocument *doc;
     IXMLDOMParseError *error;
     IXMLDOMElement *element = NULL;
     IXMLDOMNode *node;
@@ -527,40 +1153,99 @@ static void test_domdoc( void )
     IXMLDOMAttribute *node_attr = NULL;
     IXMLDOMNode *nodeChild = NULL;
     IXMLDOMProcessingInstruction *nodePI = NULL;
-    ISupportErrorInfo *support_error = NULL;
+    const struct leading_spaces_t *class_ptr;
+    const char **data_ptr;
     VARIANT_BOOL b;
     VARIANT var;
     BSTR str;
-    LONG code;
+    LONG code, ref;
     LONG nLength = 0;
     WCHAR buff[100];
+    char path[MAX_PATH];
+    int index;
+
+    GetTempPathA(MAX_PATH, path);
+    strcat(path, "leading_spaces.xml");
+
+    /* Load document with leading spaces
+     *
+     * Test all CLSIDs with all test data XML strings
+     */
+    class_ptr = leading_spaces_classdata;
+    index = 0;
+    while (class_ptr->clsid)
+    {
+        HRESULT hr;
+        int i;
 
-    r = CoCreateInstance( &CLSID_DOMDocument, NULL,
-        CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
-    ok( r == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", r );
-    if( r != S_OK )
-        return;
+        if (is_clsid_supported(class_ptr->clsid, &IID_IXMLDOMDocument))
+        {
+            hr = CoCreateInstance(class_ptr->clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc);
+        }
+        else
+        {
+            class_ptr++;
+            index++;
+            continue;
+        }
+
+        data_ptr = leading_spaces_xmldata;
+        i = 0;
+        while (*data_ptr) {
+            BSTR data = _bstr_(*data_ptr);
+            DWORD written;
+            HANDLE file;
+
+            file = CreateFileA(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL );
+            ok(file != INVALID_HANDLE_VALUE, "can't create file %s: %u\n", path, GetLastError());
+
+            WriteFile(file, data, lstrlenW(data)*sizeof(WCHAR), &written, NULL);
+            CloseHandle(file);
+
+            b = 0xc;
+            V_VT(&var) = VT_BSTR;
+            V_BSTR(&var) = _bstr_(path);
+            hr = IXMLDOMDocument_load(doc, var, &b);
+            EXPECT_HR(hr, class_ptr->ret[0].hr);
+            ok(b == class_ptr->ret[0].b, "%d:%d, got %d, expected %d\n", index, i, b, class_ptr->ret[0].b);
 
-    test_disp((IUnknown*)doc);
+            DeleteFileA(path);
+
+            b = 0xc;
+            hr = IXMLDOMDocument_loadXML(doc, data, &b);
+            EXPECT_HR(hr, class_ptr->ret[1].hr);
+            ok(b == class_ptr->ret[1].b, "%d:%d, got %d, expected %d\n", index, i, b, class_ptr->ret[1].b);
+
+            data_ptr++;
+            i++;
+        }
+
+        class_ptr++;
+        index++;
+        free_bstrs();
+    }
+
+    doc = create_document(&IID_IXMLDOMDocument);
+    if (!doc) return;
 
 if (0)
 {
     /* crashes on native */
-    r = IXMLDOMDocument_loadXML( doc, (BSTR)0x1, NULL );
+    IXMLDOMDocument_loadXML( doc, (BSTR)0x1, NULL );
 }
 
     /* try some stupid things */
-    r = IXMLDOMDocument_loadXML( doc, NULL, NULL );
-    ok( r == S_FALSE, "loadXML succeeded\n");
+    hr = IXMLDOMDocument_loadXML( doc, NULL, NULL );
+    EXPECT_HR(hr, S_FALSE);
 
     b = VARIANT_TRUE;
-    r = IXMLDOMDocument_loadXML( doc, NULL, &b );
-    ok( r == S_FALSE, "loadXML succeeded\n");
+    hr = IXMLDOMDocument_loadXML( doc, NULL, &b );
+    EXPECT_HR(hr, S_FALSE);
     ok( b == VARIANT_FALSE, "failed to load XML string\n");
 
     /* try to load a document from a nonexistent file */
     b = VARIANT_TRUE;
-    str = SysAllocString( szNonExistentFile );
+    str = SysAllocString( nonexistent_fileW );
     VariantInit(&var);
     V_VT(&var) = VT_BSTR;
     V_BSTR(&var) = str;
@@ -570,6 +1255,11 @@ if (0)
     ok( b == VARIANT_FALSE, "succeeded in loading XML string\n");
     SysFreeString( str );
 
+    str = (BSTR)0x1;
+    hr = IXMLDOMDocument_get_url(doc, &str);
+    ok(hr == S_FALSE, "got 0x%08x\n", hr);
+    ok(str == NULL, "got %p\n", str);
+
     /* try load an empty document */
     b = VARIANT_TRUE;
     str = SysAllocString( szEmpty );
@@ -626,7 +1316,7 @@ if (0)
 
     /* try a BSTR containing a Windows-1252 document */
     b = VARIANT_TRUE;
-    str = SysAllocStringByteLen( szNonUnicodeXML, sizeof(szNonUnicodeXML) - 1 );
+    str = SysAllocStringByteLen( win1252xml, strlen(win1252xml) );
     r = IXMLDOMDocument_loadXML( doc, str, &b );
     ok( r == S_FALSE, "loadXML succeeded\n");
     ok( b == VARIANT_FALSE, "succeeded in loading XML string\n");
@@ -658,7 +1348,7 @@ if (0)
     SysFreeString( str );
 
     /* test put_text */
-    r = IXMLDOMDocument_put_text( doc, _bstr_("Should Fail") );
+    r = IXMLDOMDocument_put_text( doc, _bstr_("Should fail") );
     ok( r == E_FAIL, "ret %08x\n", r );
 
     /* check that there's a document element */
@@ -668,41 +1358,13 @@ if (0)
     if( element )
     {
         IObjectIdentity *ident;
-        BSTR tag = NULL;
 
-        test_disp((IUnknown*)element);
-
-        r = IXMLDOMElement_QueryInterface( element, &IID_IObjectIdentity, (LPVOID*)&ident );
+        r = IXMLDOMElement_QueryInterface( element, &IID_IObjectIdentity, (void**)&ident );
         ok( r == E_NOINTERFACE, "ret %08x\n", r);
 
-        r = IXMLDOMElement_get_tagName( element, NULL );
-        ok( r == E_INVALIDARG, "ret %08x\n", r);
-
-        /* check if the tag is correct */
-        r = IXMLDOMElement_get_tagName( element, &tag );
-        ok( r == S_OK, "couldn't get tag name\n");
-        ok( tag != NULL, "tag was null\n");
-        ok( !lstrcmpW( tag, szOpen ), "incorrect tag name\n");
-        SysFreeString( tag );
-
-        /* figure out what happens if we try to reload the document */
-        str = SysAllocString( szComplete2 );
-        r = IXMLDOMDocument_loadXML( doc, str, &b );
-        ok( r == S_OK, "loadXML failed\n");
-        ok( b == VARIANT_TRUE, "failed to load XML string\n");
-        SysFreeString( str );
-
-        /* check if the tag is still correct */
-        tag = NULL;
-        r = IXMLDOMElement_get_tagName( element, &tag );
-        ok( r == S_OK, "couldn't get tag name\n");
-        ok( tag != NULL, "tag was null\n");
-        ok( !lstrcmpW( tag, szOpen ), "incorrect tag name\n");
-        SysFreeString( tag );
-
-        IXMLDOMElement_Release( element );
-        element = NULL;
-    }
+        IXMLDOMElement_Release( element );
+        element = NULL;
+    }
 
     /* as soon as we call loadXML again, the document element will disappear */
     b = 2;
@@ -722,11 +1384,9 @@ if (0)
 
     /* try something a little more complicated */
     b = FALSE;
-    str = SysAllocString( szComplete4 );
-    r = IXMLDOMDocument_loadXML( doc, str, &b );
+    r = IXMLDOMDocument_loadXML( doc, _bstr_(complete4A), &b );
     ok( r == S_OK, "loadXML failed\n");
     ok( b == VARIANT_TRUE, "failed to load XML string\n");
-    SysFreeString( str );
 
     r = IXMLDOMDocument_get_parseError( doc, &error );
     ok( r == S_OK, "returns %08x\n", r );
@@ -749,9 +1409,7 @@ if (0)
     SysFreeString( str );
     if(nodetext)
     {
-        IXMLDOMNamedNodeMap *pAttribs;
-
-        r = IXMLDOMText_QueryInterface(nodetext, &IID_IXMLDOMElement, (LPVOID*)&element);
+        r = IXMLDOMText_QueryInterface(nodetext, &IID_IXMLDOMElement, (void**)&element);
         ok(r == E_NOINTERFACE, "ret %08x\n", r );
 
         /* Text Last Child Checks */
@@ -763,21 +1421,6 @@ if (0)
         ok(r == S_FALSE, "ret %08x\n", r );
         ok(nodeChild == NULL, "nodeChild not NULL\n");
 
-        /* test get_attributes */
-        r = IXMLDOMText_get_attributes( nodetext, NULL );
-        ok( r == E_INVALIDARG, "get_attributes returned wrong code\n");
-
-        pAttribs = (IXMLDOMNamedNodeMap*)0x1;
-        r = IXMLDOMText_get_attributes( nodetext, &pAttribs);
-        ok(r == S_FALSE, "ret %08x\n", r );
-        ok( pAttribs == NULL, "pAttribs not NULL\n");
-
-        /* test get_dataType */
-        r = IXMLDOMText_get_dataType(nodetext, &var);
-        ok(r == S_FALSE, "ret %08x\n", r );
-        ok( V_VT(&var) == VT_NULL, "incorrect dataType type\n");
-        VariantClear(&var);
-
         /* test length property */
         r = IXMLDOMText_get_length(nodetext, NULL);
         ok(r == E_INVALIDARG, "ret %08x\n", r );
@@ -786,12 +1429,6 @@ if (0)
         ok(r == S_OK, "ret %08x\n", r );
         ok(nLength == 4, "expected 4 got %d\n", nLength);
 
-        /* test nodeTypeString */
-        r = IXMLDOMText_get_nodeTypeString(nodetext, &str);
-        ok(r == S_OK, "ret %08x\n", r );
-        ok( !lstrcmpW( str, _bstr_("text") ), "incorrect nodeTypeString string\n");
-        SysFreeString(str);
-
         /* put data Tests */
         r = IXMLDOMText_put_data(nodetext, _bstr_("This &is a ; test <>\\"));
         ok(r == S_OK, "ret %08x\n", r );
@@ -872,7 +1509,7 @@ if (0)
 
         r = IXMLDOMText_get_text(nodetext, &str);
         ok(r == S_OK, "ret %08x\n", r );
-        ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\Append") ), "incorrect get_text string\n");
+        ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\Append") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
         SysFreeString(str);
 
         /* test insertData */
@@ -913,7 +1550,7 @@ if (0)
 
         r = IXMLDOMText_get_text(nodetext, &str);
         ok(r == S_OK, "ret %08x\n", r );
-        ok( !lstrcmpW( str, _bstr_("Begin This &is a Middle; test <>\\Append End") ), "incorrect get_text string\n");
+        ok( !lstrcmpW( str, _bstr_("Begin This &is a Middle; test <>\\Append End") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
         SysFreeString(str);
 
         /* delete data */
@@ -947,8 +1584,7 @@ if (0)
 
         r = IXMLDOMText_get_text(nodetext, &str);
         ok(r == S_OK, "ret %08x\n", r );
-        /* whitespace preserving needs to be handled here */
-        todo_wine ok( !lstrcmpW( str, _bstr_("This &is a Middle; test <>\\Append End") ), "incorrect get_text string\n");
+        ok( !lstrcmpW( str, _bstr_("This &is a Middle; test <>\\Append End") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
         SysFreeString(str);
 
         /* delete from end */
@@ -961,7 +1597,7 @@ if (0)
 
         r = IXMLDOMText_get_text(nodetext, &str);
         ok(r == S_OK, "ret %08x\n", r );
-        todo_wine ok( !lstrcmpW( str, _bstr_("This &is a Middle; test <>\\Append") ), "incorrect get_text string\n");
+        ok( !lstrcmpW( str, _bstr_("This &is a Middle; test <>\\Append") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
         SysFreeString(str);
 
         /* delete from inside */
@@ -974,7 +1610,7 @@ if (0)
 
         r = IXMLDOMText_get_text(nodetext, &str);
         ok(r == S_OK, "ret %08x\n", r );
-        todo_wine ok( !lstrcmpW( str, _bstr_("") ), "incorrect get_text string\n");
+        ok( !lstrcmpW( str, _bstr_("") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
         SysFreeString(str);
 
         /* delete whole data ... */
@@ -996,7 +1632,7 @@ if (0)
 
         r = IXMLDOMText_get_text(nodetext, &str);
         ok(r == S_OK, "ret %08x\n", r );
-        ok( !lstrcmpW( str, szstr1 ), "incorrect get_text string\n");
+        ok( !lstrcmpW( str, szstr1 ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
         SysFreeString(str);
 
         /* test put_data */
@@ -1008,7 +1644,7 @@ if (0)
 
         r = IXMLDOMText_get_text(nodetext, &str);
         ok(r == S_OK, "ret %08x\n", r );
-        ok( !lstrcmpW( str, _bstr_("99") ), "incorrect get_text string\n");
+        ok( !lstrcmpW( str, _bstr_("99") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
         SysFreeString(str);
 
         /* ::replaceData() */
@@ -1022,14 +1658,14 @@ if (0)
         ok(r == E_INVALIDARG, "ret %08x\n", r );
         r = IXMLDOMText_get_text(nodetext, &str);
         ok(r == S_OK, "ret %08x\n", r );
-        ok( !lstrcmpW( str, _bstr_("str1") ), "incorrect get_text string\n");
+        ok( !lstrcmpW( str, _bstr_("str1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
         SysFreeString(str);
 
         r = IXMLDOMText_replaceData(nodetext, 0, 0, NULL);
         ok(r == S_OK, "ret %08x\n", r );
         r = IXMLDOMText_get_text(nodetext, &str);
         ok(r == S_OK, "ret %08x\n", r );
-        ok( !lstrcmpW( str, _bstr_("str1") ), "incorrect get_text string\n");
+        ok( !lstrcmpW( str, _bstr_("str1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
         SysFreeString(str);
 
         /* NULL pointer means delete */
@@ -1037,7 +1673,7 @@ if (0)
         ok(r == S_OK, "ret %08x\n", r );
         r = IXMLDOMText_get_text(nodetext, &str);
         ok(r == S_OK, "ret %08x\n", r );
-        ok( !lstrcmpW( str, _bstr_("tr1") ), "incorrect get_text string\n");
+        ok( !lstrcmpW( str, _bstr_("tr1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
         SysFreeString(str);
 
         /* empty string means delete */
@@ -1045,7 +1681,7 @@ if (0)
         ok(r == S_OK, "ret %08x\n", r );
         r = IXMLDOMText_get_text(nodetext, &str);
         ok(r == S_OK, "ret %08x\n", r );
-        ok( !lstrcmpW( str, _bstr_("r1") ), "incorrect get_text string\n");
+        ok( !lstrcmpW( str, _bstr_("r1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
         SysFreeString(str);
 
         /* zero count means insert */
@@ -1053,7 +1689,7 @@ if (0)
         ok(r == S_OK, "ret %08x\n", r );
         r = IXMLDOMText_get_text(nodetext, &str);
         ok(r == S_OK, "ret %08x\n", r );
-        ok( !lstrcmpW( str, _bstr_("ar1") ), "incorrect get_text string\n");
+        ok( !lstrcmpW( str, _bstr_("ar1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
         SysFreeString(str);
 
         r = IXMLDOMText_replaceData(nodetext, 0, 2, NULL);
@@ -1063,7 +1699,7 @@ if (0)
         ok(r == S_OK, "ret %08x\n", r );
         r = IXMLDOMText_get_text(nodetext, &str);
         ok(r == S_OK, "ret %08x\n", r );
-        ok( !lstrcmpW( str, _bstr_("m1") ), "incorrect get_text string\n");
+        ok( !lstrcmpW( str, _bstr_("m1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
         SysFreeString(str);
 
         /* nonempty string, count greater than its length */
@@ -1071,7 +1707,7 @@ if (0)
         ok(r == S_OK, "ret %08x\n", r );
         r = IXMLDOMText_get_text(nodetext, &str);
         ok(r == S_OK, "ret %08x\n", r );
-        ok( !lstrcmpW( str, _bstr_("a1.2") ), "incorrect get_text string\n");
+        ok( !lstrcmpW( str, _bstr_("a1.2") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
         SysFreeString(str);
 
         /* nonempty string, count less than its length */
@@ -1079,7 +1715,7 @@ if (0)
         ok(r == S_OK, "ret %08x\n", r );
         r = IXMLDOMText_get_text(nodetext, &str);
         ok(r == S_OK, "ret %08x\n", r );
-        ok( !lstrcmpW( str, _bstr_("wine1.2") ), "incorrect get_text string\n");
+        ok( !lstrcmpW( str, _bstr_("wine1.2") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
         SysFreeString(str);
 
         IXMLDOMText_Release( nodetext );
@@ -1126,7 +1762,7 @@ if (0)
 
         /* baseName */
         str = (BSTR)0xdeadbeef;
-        IXMLDOMComment_get_baseName(node_comment, &str);
+        r = IXMLDOMComment_get_baseName(node_comment, &str);
         ok(r == S_FALSE, "ret %08x\n", r );
         ok(str == NULL, "Expected NULL\n");
 
@@ -1139,7 +1775,7 @@ if (0)
     ok( r == E_INVALIDARG, "returns %08x\n", r );
     r = IXMLDOMDocument_createAttribute(doc, str, &node_attr);
     ok( r == S_OK, "returns %08x\n", r );
-    IXMLDOMText_Release( node_attr);
+    IXMLDOMAttribute_Release( node_attr);
     SysFreeString(str);
 
     /* test Processing Instruction */
@@ -1165,11 +1801,6 @@ if (0)
         ok(r == S_FALSE, "ret %08x\n", r );
         ok(nodeChild == NULL, "nodeChild not NULL\n");
 
-        r = IXMLDOMProcessingInstruction_get_dataType(nodePI, &var);
-        ok(r == S_FALSE, "ret %08x\n", r );
-        ok( V_VT(&var) == VT_NULL, "incorrect dataType type\n");
-        VariantClear(&var);
-
         /* test nodeName */
         r = IXMLDOMProcessingInstruction_get_nodeName(nodePI, &str);
         ok(r == S_OK, "ret %08x\n", r );
@@ -1189,18 +1820,6 @@ if (0)
         ok( !lstrcmpW( str, _bstr_("xml") ), "incorrect target string\n");
         SysFreeString(str);
 
-        /* test nodeTypeString */
-        r = IXMLDOMProcessingInstruction_get_nodeTypeString(nodePI, &str);
-        ok(r == S_OK, "ret %08x\n", r );
-        ok( !lstrcmpW( str, _bstr_("processinginstruction") ), "incorrect nodeTypeString string\n");
-        SysFreeString(str);
-
-        /* test get_nodeValue */
-        r = IXMLDOMProcessingInstruction_get_nodeValue(nodePI, &var);
-        ok(r == S_OK, "ret %08x\n", r );
-        ok( !lstrcmpW( V_BSTR(&var), _bstr_("version=\"1.0\"") ), "incorrect data string\n");
-        VariantClear(&var);
-
         /* test get_data */
         r = IXMLDOMProcessingInstruction_get_data(nodePI, &str);
         ok(r == S_OK, "ret %08x\n", r );
@@ -1227,17 +1846,8 @@ if (0)
         IXMLDOMProcessingInstruction_Release(nodePI);
     }
 
-    r = IXMLDOMDocument_QueryInterface( doc, &IID_ISupportErrorInfo, (LPVOID*)&support_error );
-    ok( r == S_OK, "ret %08x\n", r );
-    if(r == S_OK)
-    {
-        r = ISupportErrorInfo_InterfaceSupportsErrorInfo( support_error, &IID_IXMLDOMDocument );
-        todo_wine ok( r == S_OK, "ret %08x\n", r );
-        ISupportErrorInfo_Release( support_error );
-    }
-
-    r = IXMLDOMDocument_Release( doc );
-    ok( r == 0, "document ref count incorrect\n");
+    ref = IXMLDOMDocument_Release( doc );
+    ok( ref == 0, "got %d\n", ref);
 
     free_bstrs();
 }
@@ -1246,19 +1856,19 @@ static void test_persiststreaminit(void)
 {
     IXMLDOMDocument *doc;
     IPersistStreamInit *streaminit;
+    ULARGE_INTEGER size;
     HRESULT hr;
 
-    hr = CoCreateInstance( &CLSID_DOMDocument, NULL,
-        CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc );
-    ok( hr == S_OK, "failed with 0x%08x\n", hr );
-    if( hr != S_OK )
-        return;
+    doc = create_document(&IID_IXMLDOMDocument);
 
     hr = IXMLDOMDocument_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&streaminit);
-    ok( hr == S_OK, "failed with 0x%08x\n", hr );
+    ok(hr == S_OK, "got 0x%08x\n", hr);
 
     hr = IPersistStreamInit_InitNew(streaminit);
-    ok( hr == S_OK, "failed with 0x%08x\n", hr );
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IPersistStreamInit_GetSizeMax(streaminit, &size);
+    ok(hr == E_NOTIMPL, "got 0x%08x\n", hr);
 
     IXMLDOMDocument_Release(doc);
 }
@@ -1266,7 +1876,7 @@ static void test_persiststreaminit(void)
 static void test_domnode( void )
 {
     HRESULT r;
-    IXMLDOMDocument *doc = NULL, *owner = NULL;
+    IXMLDOMDocument *doc, *owner = NULL;
     IXMLDOMElement *element = NULL;
     IXMLDOMNamedNodeMap *map = NULL;
     IXMLDOMNode *node = NULL, *next = NULL;
@@ -1278,23 +1888,14 @@ static void test_domnode( void )
     VARIANT var;
     LONG count;
 
-    r = CoCreateInstance( &CLSID_DOMDocument, NULL,
-        CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
-    ok( r == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", r );
-    if( r != S_OK )
-        return;
+    doc = create_document(&IID_IXMLDOMDocument);
 
     b = FALSE;
-    str = SysAllocString( szComplete4 );
-    r = IXMLDOMDocument_loadXML( doc, str, &b );
+    r = IXMLDOMDocument_loadXML( doc, _bstr_(complete4A), &b );
     ok( r == S_OK, "loadXML failed\n");
     ok( b == VARIANT_TRUE, "failed to load XML string\n");
-    SysFreeString( str );
 
-    b = 1;
-    r = IXMLDOMNode_hasChildNodes( doc, &b );
-    ok( r == S_OK, "hasChildNoes bad return\n");
-    ok( b == VARIANT_TRUE, "hasChildNoes wrong result\n");
+    EXPECT_CHILDREN(doc);
 
     r = IXMLDOMDocument_get_documentElement( doc, &element );
     ok( r == S_OK, "should be a document element\n");
@@ -1303,10 +1904,10 @@ static void test_domnode( void )
     VariantInit(&var);
     ok( V_VT(&var) == VT_EMPTY, "variant init failed\n");
 
-    r = IXMLDOMNode_get_nodeValue( doc, NULL );
+    r = IXMLDOMDocument_get_nodeValue( doc, NULL );
     ok(r == E_INVALIDARG, "get_nodeValue ret %08x\n", r );
 
-    r = IXMLDOMNode_get_nodeValue( doc, &var );
+    r = IXMLDOMDocument_get_nodeValue( doc, &var );
     ok( r == S_FALSE, "nextNode returned wrong code\n");
     ok( V_VT(&var) == VT_NULL, "variant wasn't empty\n");
     ok( V_BSTR(&var) == NULL, "variant value wasn't null\n");
@@ -1314,18 +1915,18 @@ static void test_domnode( void )
     if (element)
     {
         owner = NULL;
-        r = IXMLDOMNode_get_ownerDocument( element, &owner );
+        r = IXMLDOMElement_get_ownerDocument( element, &owner );
         ok( r == S_OK, "get_ownerDocument return code\n");
         ok( owner != doc, "get_ownerDocument return\n");
         IXMLDOMDocument_Release(owner);
 
         type = NODE_INVALID;
-        r = IXMLDOMNode_get_nodeType( element, &type);
-        ok( r == S_OK, "getNamedItem returned wrong code\n");
+        r = IXMLDOMElement_get_nodeType( element, &type);
+        ok( r == S_OK, "got %08x\n", r);
         ok( type == NODE_ELEMENT, "node not an element\n");
 
         str = NULL;
-        r = IXMLDOMNode_get_baseName( element, &str );
+        r = IXMLDOMElement_get_baseName( element, &str );
         ok( r == S_OK, "get_baseName returned wrong code\n");
         ok( lstrcmpW(str,szlc) == 0, "basename was wrong\n");
         SysFreeString(str);
@@ -1333,7 +1934,7 @@ static void test_domnode( void )
         /* check if nodename is correct */
         r = IXMLDOMElement_get_nodeName( element, NULL );
         ok ( r == E_INVALIDARG, "get_nodeName (NULL) wrong code\n");
-    
+
         /* content doesn't matter here */
         str = NULL;
         r = IXMLDOMElement_get_nodeName( element, &str );
@@ -1342,7 +1943,7 @@ static void test_domnode( void )
         ok( !lstrcmpW( str, szlc ), "incorrect nodeName\n");
         SysFreeString( str );
 
-        str = SysAllocString( szNonExistentFile );     
+        str = SysAllocString( nonexistent_fileW );
         V_VT(&var) = VT_I4;
         V_I4(&var) = 0x1234;
         r = IXMLDOMElement_getAttribute( element, str, &var );
@@ -1350,22 +1951,6 @@ static void test_domnode( void )
         ok( V_VT(&var) == VT_NULL || V_VT(&var) == VT_EMPTY, "vt = %x\n", V_VT(&var));
         VariantClear(&var);
 
-        r = IXMLDOMElement_getAttributeNode( element, str, NULL);
-        ok( r == E_FAIL, "getAttributeNode ret %08x\n", r );
-
-        attr = (IXMLDOMAttribute*)0xdeadbeef;
-        r = IXMLDOMElement_getAttributeNode( element, str, &attr);
-        ok( r == E_FAIL, "getAttributeNode ret %08x\n", r );
-        ok( attr == NULL, "getAttributeNode ret %p, expected NULL\n", attr );
-        SysFreeString( str );
-
-        attr = (IXMLDOMAttribute*)0xdeadbeef;
-        str = SysAllocString( szNonExistentAttribute );
-        r = IXMLDOMElement_getAttributeNode( element, str, &attr);
-        ok( r == S_FALSE, "getAttributeNode ret %08x\n", r );
-        ok( attr == NULL, "getAttributeNode ret %p, expected NULL\n", attr );
-        SysFreeString( str );
-
         str = SysAllocString( szdl );  
         V_VT(&var) = VT_I4;
         V_I4(&var) = 0x1234;
@@ -1405,27 +1990,13 @@ static void test_domnode( void )
         ok( r == S_OK, "get_attributes returned wrong code\n");
         ok( map != NULL, "should be attributes\n");
 
-        b = 1;
-        r = IXMLDOMNode_hasChildNodes( element, &b );
-        ok( r == S_OK, "hasChildNoes bad return\n");
-        ok( b == VARIANT_TRUE, "hasChildNoes wrong result\n");
+        EXPECT_CHILDREN(element);
     }
     else
         ok( FALSE, "no element\n");
 
     if (map)
     {
-        ISupportErrorInfo *support_error;
-        r = IXMLDOMNamedNodeMap_QueryInterface( map, &IID_ISupportErrorInfo, (LPVOID*)&support_error );
-        ok( r == S_OK, "ret %08x\n", r );
-
-        r = ISupportErrorInfo_InterfaceSupportsErrorInfo( support_error, &IID_IXMLDOMNamedNodeMap );
-todo_wine
-{
-        ok( r == S_OK, "ret %08x\n", r );
-}
-        ISupportErrorInfo_Release( support_error );
-
         str = SysAllocString( szdl );
         r = IXMLDOMNamedNodeMap_getNamedItem( map, str, &node );
         ok( r == S_OK, "getNamedItem returned wrong code\n");
@@ -1438,7 +2009,7 @@ todo_wine
         ok( r == E_INVALIDARG, "getNamedItem should return E_INVALIDARG\n");
         SysFreeString( str );
 
-        /* something that isn't in szComplete4 */
+        /* something that isn't in complete4A */
         str = SysAllocString( szOpen );
         node = (IXMLDOMNode *) 1;
         r = IXMLDOMNamedNodeMap_getNamedItem( map, str, &node );
@@ -1479,12 +2050,14 @@ todo_wine
         ok ( str != NULL, "str is null\n");
         ok( !lstrcmpW( str, szdl ), "incorrect node name\n");
         SysFreeString( str );
+        IXMLDOMNode_Release( node );
 
         /* test sequential access of attributes */
         node = NULL;
         r = IXMLDOMNamedNodeMap_nextNode( map, &node );
         ok ( r == S_OK, "nextNode (first time) wrong code\n");
         ok ( node != NULL, "nextNode, should be attribute\n");
+        IXMLDOMNode_Release( node );
 
         r = IXMLDOMNamedNodeMap_nextNode( map, &node );
         ok ( r != S_OK, "nextNode (second time) wrong code\n");
@@ -1517,12 +2090,6 @@ todo_wine
         ok( lstrcmpW(str,szdl) == 0, "basename was wrong\n");
         SysFreeString( str );
 
-        r = IXMLDOMNode_get_nodeValue( node, &var );
-        ok( r == S_OK, "returns %08x\n", r );
-        ok( V_VT(&var) == VT_BSTR, "vt %x\n", V_VT(&var));
-        ok( !lstrcmpW(V_BSTR(&var), szstr1), "nodeValue incorrect\n");
-        VariantClear(&var);
-
         r = IXMLDOMNode_get_childNodes( node, NULL );
         ok( r == E_INVALIDARG, "get_childNodes returned wrong code\n");
 
@@ -1539,10 +2106,7 @@ todo_wine
 
         if (next)
         {
-            b = 1;
-            r = IXMLDOMNode_hasChildNodes( next, &b );
-            ok( r == S_FALSE, "hasChildNoes bad return\n");
-            ok( b == VARIANT_FALSE, "hasChildNoes wrong result\n");
+            EXPECT_NO_CHILDREN(next);
 
             type = NODE_INVALID;
             r = IXMLDOMNode_get_nodeType( next, &type);
@@ -1577,7 +2141,7 @@ todo_wine
     /* now traverse the tree from the root element */
     if (element)
     {
-        r = IXMLDOMNode_get_childNodes( element, &list );
+        r = IXMLDOMElement_get_childNodes( element, &list );
         ok( r == S_OK, "get_childNodes returned wrong code\n");
 
         /* using get_item for child list doesn't advance the position */
@@ -1595,13 +2159,13 @@ todo_wine
 
         node = (void*)0xdeadbeef;
         str = SysAllocString(szdl);
-        r = IXMLDOMNode_selectSingleNode( element, str, &node );
+        r = IXMLDOMElement_selectSingleNode( element, str, &node );
         SysFreeString(str);
         ok( r == S_FALSE, "ret %08x\n", r );
         ok( node == NULL, "node %p\n", node );
 
         str = SysAllocString(szbs);
-        r = IXMLDOMNode_selectSingleNode( element, str, &node );
+        r = IXMLDOMElement_selectSingleNode( element, str, &node );
         SysFreeString(str);
         ok( r == S_OK, "ret %08x\n", r );
         r = IXMLDOMNode_Release( node );
@@ -1612,21 +2176,18 @@ todo_wine
 
     if (list)
     {
-        r = IXMLDOMNodeList_QueryInterface(list, &IID_IDispatch, NULL);
-        ok( r == E_INVALIDARG || r == E_POINTER, "ret %08x\n", r );
-
         r = IXMLDOMNodeList_get_item(list, 0, NULL);
-        ok(r == E_INVALIDARG, "Exected E_INVALIDARG got %08x\n", r);
+        ok(r == E_INVALIDARG, "Expected E_INVALIDARG got %08x\n", r);
 
         r = IXMLDOMNodeList_get_length(list, NULL);
-        ok(r == E_INVALIDARG, "Exected E_INVALIDARG got %08x\n", r);
+        ok(r == E_INVALIDARG, "Expected E_INVALIDARG got %08x\n", r);
 
         r = IXMLDOMNodeList_get_length( list, &count );
         ok( r == S_OK, "get_length returns %08x\n", r );
         ok( count == 4, "get_length got %d\n", count );
 
         r = IXMLDOMNodeList_nextNode(list, NULL);
-        ok(r == E_INVALIDARG, "Exected E_INVALIDARG got %08x\n", r);
+        ok(r == E_INVALIDARG, "Expected E_INVALIDARG got %08x\n", r);
 
         r = IXMLDOMNodeList_nextNode( list, &node );
         ok( r == S_OK, "nextNode returned wrong code\n");
@@ -1641,20 +2202,10 @@ todo_wine
         ok( r == S_OK, "getNamedItem returned wrong code\n");
         ok( type == NODE_ELEMENT, "node not text\n");
 
-        VariantInit(&var);
-        ok( V_VT(&var) == VT_EMPTY, "variant init failed\n");
-        r = IXMLDOMNode_get_nodeValue( node, &var );
-        ok( r == S_FALSE, "nextNode returned wrong code\n");
-        ok( V_VT(&var) == VT_NULL, "variant wasn't empty\n");
-        ok( V_BSTR(&var) == NULL, "variant value wasn't null\n");
-
         r = IXMLDOMNode_hasChildNodes( node, NULL );
-        ok( r == E_INVALIDARG, "hasChildNoes bad return\n");
+        ok( r == E_INVALIDARG, "hasChildNodes bad return\n");
 
-        b = 1;
-        r = IXMLDOMNode_hasChildNodes( node, &b );
-        ok( r == S_OK, "hasChildNoes bad return\n");
-        ok( b == VARIANT_TRUE, "hasChildNoes wrong result\n");
+        EXPECT_CHILDREN(node);
 
         str = NULL;
         r = IXMLDOMNode_get_baseName( node, &str );
@@ -1679,10 +2230,7 @@ todo_wine
     ok( b == VARIANT_TRUE, "failed to load XML string\n");
     SysFreeString( str );
 
-    b = 1;
-    r = IXMLDOMNode_hasChildNodes( doc, &b );
-    ok( r == S_OK, "hasChildNoes bad return\n");
-    ok( b == VARIANT_TRUE, "hasChildNoes wrong result\n");
+    EXPECT_CHILDREN(doc);
 
     r = IXMLDOMDocument_get_documentElement( doc, &element );
     ok( r == S_OK, "should be a document element\n");
@@ -1704,71 +2252,286 @@ todo_wine
     if (element)
         IXMLDOMElement_Release( element );
     ok(IXMLDOMDocument_Release( doc ) == 0, "document is not destroyed\n");
+
+    free_bstrs();
 }
 
+typedef struct {
+    DOMNodeType type;
+    REFIID iid;
+} refcount_test_t;
+
+static const refcount_test_t refcount_test[] = {
+    { NODE_ELEMENT,                &IID_IXMLDOMElement },
+    { NODE_ATTRIBUTE,              &IID_IXMLDOMAttribute },
+    { NODE_TEXT,                   &IID_IXMLDOMText },
+    { NODE_CDATA_SECTION,          &IID_IXMLDOMCDATASection },
+    { NODE_ENTITY_REFERENCE,       &IID_IXMLDOMEntityReference },
+    { NODE_PROCESSING_INSTRUCTION, &IID_IXMLDOMProcessingInstruction },
+    { NODE_COMMENT,                &IID_IXMLDOMComment },
+    { NODE_DOCUMENT_FRAGMENT,      &IID_IXMLDOMDocumentFragment },
+    { NODE_INVALID,                &IID_NULL }
+};
+
 static void test_refs(void)
 {
-    HRESULT r;
-    BSTR str;
-    VARIANT_BOOL b;
-    IXMLDOMDocument *doc = NULL;
-    IXMLDOMElement *element = NULL;
-    IXMLDOMNode *node = NULL, *node2;
+    IXMLDOMImplementation *impl, *impl2;
+    IXMLDOMElement *element, *elem2;
     IXMLDOMNodeList *node_list = NULL;
-    LONG ref;
+    IXMLDOMNode *node, *node2, *node3;
+    const refcount_test_t *ptr;
+    IXMLDOMDocument *doc;
     IUnknown *unk, *unk2;
+    VARIANT_BOOL b;
+    HRESULT hr;
+    LONG ref;
 
-    r = CoCreateInstance( &CLSID_DOMDocument, NULL,
-        CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
-    ok( r == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", r );
-    if( r != S_OK )
-        return;
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    ptr = refcount_test;
+    while (ptr->type != NODE_INVALID)
+    {
+        IUnknown *node_typed, *node_typed2;
+        IDispatchEx *dispex, *dispex2;
+        IDispatch *disp, *disp2;
+        VARIANT type;
+
+        V_VT(&type) = VT_I1;
+        V_I1(&type) = ptr->type;
+
+        EXPECT_REF(doc, 1);
+        hr = IXMLDOMDocument_createNode(doc, type, _bstr_("name"), NULL, &node);
+        EXPECT_HR(hr, S_OK);
+        EXPECT_REF(doc, 1);
+        EXPECT_REF(node, 1);
+
+        /* try IDispatch and IUnknown from IXMLDOMNode */
+        hr = IXMLDOMNode_QueryInterface(node, &IID_IUnknown, (void**)&unk);
+        EXPECT_HR(hr, S_OK);
+        EXPECT_REF(unk, 2);
+todo_wine {
+        EXPECT_REF(node, 1);
+        ok(unk != (IUnknown*)node, "%d: got %p and %p\n", ptr->type, unk, node);
+}
+        EXPECT_REF(unk, 2);
+        hr = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&disp);
+        EXPECT_HR(hr, S_OK);
+        todo_wine ok(unk != (IUnknown*)disp, "%d: got %p and %p\n", ptr->type, unk, disp);
+        EXPECT_REF(unk, 3);
+        todo_wine EXPECT_REF(disp, 1);
+
+        EXPECT_REF(unk, 3);
+        hr = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&disp2);
+        EXPECT_HR(hr, S_OK);
+        todo_wine ok(disp != disp2, "%d: got %p and %p\n", ptr->type, disp, disp2);
+        EXPECT_REF(unk, 4);
+        todo_wine EXPECT_REF(disp2, 1);
+
+        IDispatch_Release(disp);
+        IDispatch_Release(disp2);
+
+        /* get IXMLDOMNode from this IUnknown */
+        EXPECT_REF(unk, 2);
+        hr = IUnknown_QueryInterface(unk, &IID_IXMLDOMNode, (void**)&node2);
+        EXPECT_HR(hr, S_OK);
+        todo_wine ok(unk != (IUnknown*)node2, "%d: got %p and %p\n", ptr->type, unk, node2);
+        EXPECT_REF(unk, 3);
+        todo_wine EXPECT_REF(node2, 1);
+
+        EXPECT_REF(unk, 3);
+        hr = IUnknown_QueryInterface(unk, &IID_IXMLDOMNode, (void**)&node3);
+        EXPECT_HR(hr, S_OK);
+        todo_wine ok(node2 != node3, "%d: got %p and %p\n", ptr->type, node2, node3);
+        EXPECT_REF(unk, 4);
+        todo_wine EXPECT_REF(node3, 1);
+
+        IXMLDOMNode_Release(node2);
+        IXMLDOMNode_Release(node3);
+
+        /* try IDispatchEx from IUnknown */
+        EXPECT_REF(unk, 2);
+        hr = IUnknown_QueryInterface(unk, &IID_IDispatchEx, (void**)&dispex);
+        EXPECT_HR(hr, S_OK);
+        ok(unk != (IUnknown*)dispex, "%d: got %p and %p\n", ptr->type, unk, dispex);
+        EXPECT_REF(unk, 3);
+        todo_wine EXPECT_REF(dispex, 1);
+
+        EXPECT_REF(unk, 3);
+        hr = IUnknown_QueryInterface(unk, &IID_IDispatchEx, (void**)&dispex2);
+        EXPECT_HR(hr, S_OK);
+        todo_wine ok(dispex != dispex2, "%d: got %p and %p\n", ptr->type, dispex, dispex2);
+        EXPECT_REF(unk, 4);
+        todo_wine EXPECT_REF(dispex2, 1);
+
+        IDispatchEx_Release(dispex);
+        IDispatchEx_Release(dispex2);
+
+        /* try corresponding IXMLDOM* */
+        EXPECT_REF(unk, 2);
+        hr = IUnknown_QueryInterface(unk, ptr->iid, (void**)&node_typed);
+        EXPECT_HR(hr, S_OK);
+        EXPECT_REF(unk, 3);
+        hr = IUnknown_QueryInterface(unk, ptr->iid, (void**)&node_typed2);
+        EXPECT_HR(hr, S_OK);
+        EXPECT_REF(unk, 4);
+        todo_wine ok(node_typed != node_typed2, "%d: got %p and %p\n", ptr->type, node_typed, node_typed2);
+        IUnknown_Release(node_typed);
+        IUnknown_Release(node_typed2);
+
+        /* try invalid IXMLDOM* */
+        hr = IUnknown_QueryInterface(unk, (ptr+1)->iid, (void**)&node_typed);
+        EXPECT_HR(hr, E_NOINTERFACE);
+
+        IUnknown_Release(unk);
+
+        EXPECT_REF(node, 1);
+        hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMNode, (void**)&node2);
+        EXPECT_HR(hr, S_OK);
+        EXPECT_REF(node, 2);
+        ok(node == node2, "%d: got %p and %p\n", ptr->type, node, node2);
+
+        EXPECT_REF(node, 2);
+        hr = IXMLDOMNode_QueryInterface(node, ptr->iid, (void**)&node_typed);
+        EXPECT_HR(hr, S_OK);
+        EXPECT_REF(node, 3);
+todo_wine {
+        EXPECT_REF(node_typed, 2);
+        ok((IUnknown*)node != node_typed, "%d: got %p and %p\n", ptr->type, node, node_typed);
+}
+        IUnknown_Release(node_typed);
+
+        IXMLDOMNode_Release(node2);
+        IXMLDOMNode_Release(node);
+
+        ptr++;
+    }
+
+    EXPECT_REF(doc, 1);
     ref = IXMLDOMDocument_Release(doc);
     ok( ref == 0, "ref %d\n", ref);
 
-    r = CoCreateInstance( &CLSID_DOMDocument, NULL,
-        CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
-    ok( r == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", r );
-    if( r != S_OK )
-        return;
+    /* check IUnknown after releasing DOM iface */
+    doc = create_document(&IID_IXMLDOMDocument);
+    EXPECT_REF(doc, 1);
+    hr = IXMLDOMDocument_QueryInterface(doc, &IID_IUnknown, (void**)&unk);
+    EXPECT_HR(hr, S_OK);
+todo_wine {
+    EXPECT_REF(unk, 3);
+    EXPECT_REF(doc, 1);
+}
+    IXMLDOMDocument_Release(doc);
+    EXPECT_REF(unk, 1);
+    IUnknown_Release(unk);
 
-    str = SysAllocString( szComplete4 );
-    r = IXMLDOMDocument_loadXML( doc, str, &b );
-    ok( r == S_OK, "loadXML failed\n");
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    EXPECT_REF(doc, 1);
+    hr = IXMLDOMDocument_QueryInterface(doc, &IID_IUnknown, (void**)&unk);
+    EXPECT_HR(hr, S_OK);
+todo_wine {
+    EXPECT_REF(unk, 3);
+    EXPECT_REF(doc, 1);
+}
+    IUnknown_Release(unk);
+
+    /* IXMLDOMImplementation */
+    EXPECT_REF(doc, 1);
+    hr = IXMLDOMDocument_get_implementation(doc, &impl);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(doc, 1);
+    EXPECT_REF(impl, 1);
+    hr = IXMLDOMDocument_get_implementation(doc, &impl2);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(doc, 1);
+    EXPECT_REF(impl2, 1);
+    ok(impl != impl2, "got %p, %p\n", impl, impl2);
+    IXMLDOMImplementation_Release(impl);
+    IXMLDOMImplementation_Release(impl2);
+
+    hr = IXMLDOMDocument_loadXML( doc, _bstr_(complete4A), &b );
+    EXPECT_HR(hr, S_OK);
     ok( b == VARIANT_TRUE, "failed to load XML string\n");
-    SysFreeString( str );
 
-    ref = IXMLDOMDocument_AddRef( doc );
-    ok( ref == 2, "ref %d\n", ref );
-    ref = IXMLDOMDocument_AddRef( doc );
-    ok( ref == 3, "ref %d\n", ref );
+    EXPECT_REF(doc, 1);
+    IXMLDOMDocument_AddRef( doc );
+    EXPECT_REF(doc, 2);
+    IXMLDOMDocument_AddRef( doc );
+    EXPECT_REF(doc, 3);
+
     IXMLDOMDocument_Release( doc );
     IXMLDOMDocument_Release( doc );
 
-    r = IXMLDOMDocument_get_documentElement( doc, &element );
-    ok( r == S_OK, "should be a document element\n");
-    ok( element != NULL, "should be an element\n");
+    EXPECT_REF(doc, 1);
+    hr = IXMLDOMDocument_QueryInterface(doc, &IID_IUnknown, (void**)&unk);
+    EXPECT_HR(hr, S_OK);
+todo_wine {
+    EXPECT_REF(unk, 3);
+    EXPECT_REF(doc, 1);
+}
+    hr = IXMLDOMDocument_get_documentElement(doc, &element);
+    EXPECT_HR(hr, S_OK);
+todo_wine {
+    EXPECT_REF(doc, 1);
+    EXPECT_REF(element, 2);
+}
+    hr = IXMLDOMDocument_get_documentElement(doc, &elem2);
+    EXPECT_HR(hr, S_OK);
 
-    ref = IXMLDOMDocument_AddRef( doc );
-    ok( ref == 2, "ref %d\n", ref );
-    IXMLDOMDocument_Release( doc );
+todo_wine {
+    EXPECT_REF(doc, 1);
+    EXPECT_REF(element, 2);
+    EXPECT_REF(elem2, 2);
+}
+    IXMLDOMElement_AddRef(element);
+    todo_wine EXPECT_REF(element, 3);
+    IXMLDOMElement_Release(element);
+
+    /* get IUnknown from a node doesn't touch node instance refcount */
+    hr = IXMLDOMElement_QueryInterface(element, &IID_IUnknown, (void**)&unk);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(element, 2);
+todo_wine {
+    EXPECT_REF(unk, 4);
+    EXPECT_REF(elem2, 2);
+}
+    hr = IXMLDOMElement_QueryInterface(elem2, &IID_IUnknown, (void**)&unk2);
+    EXPECT_HR(hr, S_OK);
+todo_wine {
+    EXPECT_REF(unk, 5);
+    EXPECT_REF(unk2, 5);
+}
+    EXPECT_REF(element, 2);
+    EXPECT_REF(elem2, 2);
 
-    r = IXMLDOMElement_get_childNodes( element, &node_list );
-    ok( r == S_OK, "rets %08x\n", r);
+    todo_wine ok(unk == unk2, "got %p and %p\n", unk, unk2);
+    IUnknown_Release(unk);
 
-    ref = IXMLDOMNodeList_AddRef( node_list );
-    ok( ref == 2, "ref %d\n", ref );
-    IXMLDOMNodeList_Release( node_list );
+    /* IUnknown refcount is not affected by node refcount */
+    todo_wine EXPECT_REF(unk2, 4);
+    IXMLDOMElement_AddRef(elem2);
+    todo_wine EXPECT_REF(unk2, 4);
+    IXMLDOMElement_Release(elem2);
 
-    IXMLDOMNodeList_get_item( node_list, 0, &node );
-    ok( r == S_OK, "rets %08x\n", r);
+    IXMLDOMElement_Release(elem2);
+    todo_wine EXPECT_REF(unk2, 3);
 
-    IXMLDOMNodeList_get_item( node_list, 0, &node2 );
-    ok( r == S_OK, "rets %08x\n", r);
+    IUnknown_Release(unk2);
 
-    ref = IXMLDOMNode_AddRef( node );
-    ok( ref == 2, "ref %d\n", ref );
-    IXMLDOMNode_Release( node );
+    hr = IXMLDOMElement_get_childNodes( element, &node_list );
+    EXPECT_HR(hr, S_OK);
+
+    todo_wine EXPECT_REF(element, 2);
+    EXPECT_REF(node_list, 1);
+
+    hr = IXMLDOMNodeList_get_item( node_list, 0, &node );
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(node_list, 1);
+    EXPECT_REF(node, 1);
+
+    hr = IXMLDOMNodeList_get_item( node_list, 0, &node2 );
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(node_list, 1);
+    EXPECT_REF(node2, 1);
 
     ref = IXMLDOMNode_Release( node );
     ok( ref == 0, "ref %d\n", ref );
@@ -1781,29 +2544,31 @@ static void test_refs(void)
     ok( node != node2, "node %p node2 %p\n", node, node2 );
 
     ref = IXMLDOMDocument_Release( doc );
-    ok( ref == 0, "ref %d\n", ref );
+    todo_wine ok( ref == 0, "ref %d\n", ref );
 
-    ref = IXMLDOMElement_AddRef( element );
-    todo_wine {
-    ok( ref == 3, "ref %d\n", ref );
-    }
-    IXMLDOMElement_Release( element );
+    todo_wine EXPECT_REF(element, 2);
 
     /* IUnknown must be unique however we obtain it */
-    r = IXMLDOMElement_QueryInterface( element, &IID_IUnknown, (LPVOID*)&unk );
-    ok( r == S_OK, "rets %08x\n", r );
-    r = IXMLDOMElement_QueryInterface( element, &IID_IXMLDOMNode, (LPVOID*)&node );
-    ok( r == S_OK, "rets %08x\n", r );
-    r = IXMLDOMNode_QueryInterface( node, &IID_IUnknown, (LPVOID*)&unk2 );
-    ok( r == S_OK, "rets %08x\n", r );
-    ok( unk == unk2, "unk %p unk2 %p\n", unk, unk2 );
+    hr = IXMLDOMElement_QueryInterface(element, &IID_IUnknown, (void**)&unk);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(element, 2);
+    hr = IXMLDOMElement_QueryInterface(element, &IID_IXMLDOMNode, (void**)&node);
+    EXPECT_HR(hr, S_OK);
+    todo_wine EXPECT_REF(element, 2);
+    hr = IXMLDOMNode_QueryInterface(node, &IID_IUnknown, (void**)&unk2);
+    EXPECT_HR(hr, S_OK);
+    todo_wine EXPECT_REF(element, 2);
+    ok(unk == unk2, "unk %p unk2 %p\n", unk, unk2);
+    todo_wine ok(element != (void*)node, "node %p element %p\n", node, element);
 
     IUnknown_Release( unk2 );
     IUnknown_Release( unk );
     IXMLDOMNode_Release( node );
+    todo_wine EXPECT_REF(element, 2);
 
     IXMLDOMElement_Release( element );
 
+    free_bstrs();
 }
 
 static void test_create(void)
@@ -1824,11 +2589,9 @@ static void test_create(void)
     LONG ref;
     LONG num;
 
-    r = CoCreateInstance( &CLSID_DOMDocument, NULL,
-        CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
-    ok( r == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", r );
-    if( r != S_OK )
-        return;
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    EXPECT_REF(doc, 1);
 
     /* types not supported for creation */
     V_VT(&var) = VT_I1;
@@ -2126,13 +2889,14 @@ static void test_create(void)
     V_I4(&var) = NODE_ELEMENT;
     r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node );
     ok( r == S_OK, "returns %08x\n", r );
+
+    EXPECT_REF(doc, 1);
     r = IXMLDOMDocument_appendChild( doc, node, &root );
     ok( r == S_OK, "returns %08x\n", r );
     ok( node == root, "%p %p\n", node, root );
+    EXPECT_REF(doc, 1);
 
-    ref = IXMLDOMNode_AddRef( node );
-    ok(ref == 3, "ref %d\n", ref);
-    IXMLDOMNode_Release( node );
+    EXPECT_REF(node, 2);
 
     ref = IXMLDOMNode_Release( node );
     ok(ref == 1, "ref %d\n", ref);
@@ -2145,25 +2909,24 @@ static void test_create(void)
     ok( r == S_OK, "returns %08x\n", r );
     SysFreeString( str );
 
-    ref = IXMLDOMNode_AddRef( node );
-    ok(ref == 2, "ref = %d\n", ref);
-    IXMLDOMNode_Release( node );
+    EXPECT_REF(node, 1);
 
-    r = IXMLDOMNode_QueryInterface( node, &IID_IUnknown, (LPVOID*)&unk );
+    r = IXMLDOMNode_QueryInterface( node, &IID_IUnknown, (void**)&unk );
     ok( r == S_OK, "returns %08x\n", r );
 
-    ref = IXMLDOMNode_AddRef( unk );
-    ok(ref == 3, "ref = %d\n", ref);
-    IXMLDOMNode_Release( unk );
+    EXPECT_REF(unk, 2);
 
     V_VT(&var) = VT_EMPTY;
+    child = NULL;
     r = IXMLDOMNode_insertBefore( root, (IXMLDOMNode*)unk, var, &child );
     ok( r == S_OK, "returns %08x\n", r );
     ok( unk == (IUnknown*)child, "%p %p\n", unk, child );
+
+    todo_wine EXPECT_REF(unk, 4);
+
     IXMLDOMNode_Release( child );
     IUnknown_Release( unk );
 
-
     V_VT(&var) = VT_NULL;
     V_DISPATCH(&var) = (IDispatch*)node;
     r = IXMLDOMNode_insertBefore( root, node, var, &child );
@@ -2171,14 +2934,13 @@ static void test_create(void)
     ok( node == child, "%p %p\n", node, child );
     IXMLDOMNode_Release( child );
 
-
     V_VT(&var) = VT_NULL;
     V_DISPATCH(&var) = (IDispatch*)node;
     r = IXMLDOMNode_insertBefore( root, node, var, NULL );
     ok( r == S_OK, "returns %08x\n", r );
     IXMLDOMNode_Release( node );
 
-    r = IXMLDOMNode_QueryInterface( root, &IID_IXMLDOMElement, (LPVOID*)&element );
+    r = IXMLDOMNode_QueryInterface( root, &IID_IXMLDOMElement, (void**)&element );
     ok( r == S_OK, "returns %08x\n", r );
 
     r = IXMLDOMElement_get_attributes( element, &attr_map );
@@ -2253,15 +3015,6 @@ static void test_create(void)
     ok( node != NULL, "node was null\n");
     SysFreeString(str);
 
-    if(r == S_OK)
-    {
-        r = IXMLDOMNode_get_nodeTypeString(node, &str);
-        ok( r == S_OK, "returns %08x\n", r );
-        ok( !lstrcmpW( str, _bstr_("attribute") ), "incorrect nodeTypeString string\n");
-        SysFreeString(str);
-        IXMLDOMNode_Release( node );
-    }
-
     IXMLDOMElement_Release( element );
     IXMLDOMNode_Release( root );
     IXMLDOMDocument_Release( doc );
@@ -2269,37 +3022,49 @@ static void test_create(void)
 
 static void test_getElementsByTagName(void)
 {
-    HRESULT r;
-    BSTR str;
-    VARIANT_BOOL b;
-    IXMLDOMDocument *doc;
     IXMLDOMNodeList *node_list;
+    IXMLDOMDocument *doc;
+    IXMLDOMElement *elem;
+    WCHAR buff[100];
+    VARIANT_BOOL b;
+    HRESULT r;
     LONG len;
+    BSTR str;
 
-    r = CoCreateInstance( &CLSID_DOMDocument, NULL,
-        CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
-    ok( r == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", r );
-    if( r != S_OK )
-        return;
+    doc = create_document(&IID_IXMLDOMDocument);
 
-    str = SysAllocString( szComplete4 );
-    r = IXMLDOMDocument_loadXML( doc, str, &b );
+    r = IXMLDOMDocument_loadXML( doc, _bstr_(complete4A), &b );
     ok( r == S_OK, "loadXML failed\n");
     ok( b == VARIANT_TRUE, "failed to load XML string\n");
-    SysFreeString( str );
 
     str = SysAllocString( szstar );
+
+    /* null arguments cases */
+    r = IXMLDOMDocument_getElementsByTagName(doc, NULL, &node_list);
+    ok( r == E_INVALIDARG, "ret %08x\n", r );
+    r = IXMLDOMDocument_getElementsByTagName(doc, str, NULL);
+    ok( r == E_INVALIDARG, "ret %08x\n", r );
+
     r = IXMLDOMDocument_getElementsByTagName(doc, str, &node_list);
     ok( r == S_OK, "ret %08x\n", r );
     r = IXMLDOMNodeList_get_length( node_list, &len );
     ok( r == S_OK, "ret %08x\n", r );
     ok( len == 6, "len %d\n", len );
 
-    test_disp((IUnknown*)node_list);
-
     IXMLDOMNodeList_Release( node_list );
     SysFreeString( str );
 
+    /* broken query BSTR */
+    memcpy(&buff[2], szstar, sizeof(szstar));
+    /* just a big length */
+    *(DWORD*)buff = 0xf0f0;
+    r = IXMLDOMDocument_getElementsByTagName(doc, &buff[2], &node_list);
+    ok( r == S_OK, "ret %08x\n", r );
+    r = IXMLDOMNodeList_get_length( node_list, &len );
+    ok( r == S_OK, "ret %08x\n", r );
+    ok( len == 6, "len %d\n", len );
+    IXMLDOMNodeList_Release( node_list );
+
     str = SysAllocString( szbs );
     r = IXMLDOMDocument_getElementsByTagName(doc, str, &node_list);
     ok( r == S_OK, "ret %08x\n", r );
@@ -2327,7 +3092,42 @@ static void test_getElementsByTagName(void)
     IXMLDOMNodeList_Release( node_list );
     SysFreeString( str );
 
+    /* test for element */
+    r = IXMLDOMDocument_get_documentElement(doc, &elem);
+    ok( r == S_OK, "ret %08x\n", r );
+
+    str = SysAllocString( szstar );
+
+    /* null arguments cases */
+    r = IXMLDOMElement_getElementsByTagName(elem, NULL, &node_list);
+    ok( r == E_INVALIDARG, "ret %08x\n", r );
+    r = IXMLDOMElement_getElementsByTagName(elem, str, NULL);
+    ok( r == E_INVALIDARG, "ret %08x\n", r );
+
+    r = IXMLDOMElement_getElementsByTagName(elem, str, &node_list);
+    ok( r == S_OK, "ret %08x\n", r );
+    r = IXMLDOMNodeList_get_length( node_list, &len );
+    ok( r == S_OK, "ret %08x\n", r );
+    ok( len == 5, "len %d\n", len );
+    expect_list_and_release(node_list, "E1.E2.D1 E2.E2.D1 E3.E2.D1 E4.E2.D1 E1.E4.E2.D1");
+    SysFreeString( str );
+
+    /* broken query BSTR */
+    memcpy(&buff[2], szstar, sizeof(szstar));
+    /* just a big length */
+    *(DWORD*)buff = 0xf0f0;
+    r = IXMLDOMElement_getElementsByTagName(elem, &buff[2], &node_list);
+    ok( r == S_OK, "ret %08x\n", r );
+    r = IXMLDOMNodeList_get_length( node_list, &len );
+    ok( r == S_OK, "ret %08x\n", r );
+    ok( len == 5, "len %d\n", len );
+    IXMLDOMNodeList_Release( node_list );
+
+    IXMLDOMElement_Release(elem);
+
     IXMLDOMDocument_Release( doc );
+
+    free_bstrs();
 }
 
 static void test_get_text(void)
@@ -2342,17 +3142,11 @@ static void test_get_text(void)
     IXMLDOMNamedNodeMap *node_map;
     LONG len;
 
-    r = CoCreateInstance( &CLSID_DOMDocument, NULL,
-        CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
-    ok( r == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", r );
-    if( r != S_OK )
-        return;
+    doc = create_document(&IID_IXMLDOMDocument);
 
-    str = SysAllocString( szComplete4 );
-    r = IXMLDOMDocument_loadXML( doc, str, &b );
+    r = IXMLDOMDocument_loadXML( doc, _bstr_(complete4A), &b );
     ok( r == S_OK, "loadXML failed\n");
     ok( b == VARIANT_TRUE, "failed to load XML string\n");
-    SysFreeString( str );
 
     str = SysAllocString( szbs );
     r = IXMLDOMDocument_getElementsByTagName( doc, str, &node_list );
@@ -2360,24 +3154,18 @@ static void test_get_text(void)
     SysFreeString(str);
 
     /* Test to get all child node text. */
-    r = IXMLDOMDocument_QueryInterface(doc, &IID_IXMLDOMNode, (LPVOID*)&nodeRoot);
+    r = IXMLDOMDocument_QueryInterface(doc, &IID_IXMLDOMNode, (void**)&nodeRoot);
     ok( r == S_OK, "ret %08x\n", r );
     if(r == S_OK)
     {
         r = IXMLDOMNode_get_text( nodeRoot, &str );
         ok( r == S_OK, "ret %08x\n", r );
-        ok( compareIgnoreReturnsWhitespace(str, _bstr_("fn1.txt\n\n fn2.txt \n\nf1\n")), "wrong get_text\n");
+        ok( compareIgnoreReturns(str, _bstr_("fn1.txt\n\n fn2.txt \n\nf1\n")), "wrong get_text: %s\n", wine_dbgstr_w(str));
         SysFreeString(str);
 
         IXMLDOMNode_Release(nodeRoot);
     }
 
-    if (0) {
-    /* this test crashes on win9x */
-    r = IXMLDOMNodeList_QueryInterface(node_list, &IID_IDispatch, NULL);
-    ok( r == E_INVALIDARG, "ret %08x\n", r );
-    }
-
     r = IXMLDOMNodeList_get_length( node_list, NULL );
     ok( r == E_INVALIDARG, "ret %08x\n", r );
 
@@ -2392,7 +3180,7 @@ static void test_get_text(void)
     ok( r == E_INVALIDARG, "ret %08x\n", r );
 
     r = IXMLDOMNodeList_get_item( node_list, 0, &node );
-    ok( r == S_OK, "ret %08x\n", r ); 
+    ok( r == S_OK, "ret %08x\n", r );
     IXMLDOMNodeList_Release( node_list );
 
     /* Invalid output parameter*/
@@ -2406,7 +3194,7 @@ static void test_get_text(void)
 
     r = IXMLDOMNode_get_attributes( node, &node_map );
     ok( r == S_OK, "ret %08x\n", r );
-    
+
     str = SysAllocString( szvr );
     r = IXMLDOMNamedNodeMap_getNamedItem( node_map, str, &node2 );
     ok( r == S_OK, "ret %08x\n", r );
@@ -2431,81 +3219,217 @@ static void test_get_text(void)
     IXMLDOMNamedNodeMap_Release( node_map );
     IXMLDOMNode_Release( node );
     IXMLDOMDocument_Release( doc );
+
+    free_bstrs();
+}
+
+#ifdef __REACTOS__
+/*
+ * This function is to display that xmlnodelist_QueryInterface
+ * generates SEGV for these conditions, and once fixed make sure
+ * it never does it again.
+ */
+static void verify_nodelist_query_interface(IXMLDOMNodeList *node_list)
+{
+    HRESULT hr;
+    /*
+     * NOTE: The following calls are supposed to test wine's
+     * xmlnodelist_QueryInterface behaving properly.
+     * While we should be able to expect E_POINTER (due to the NULL pointer),
+     * it seems MS' own implementation(s) violate the spec and return
+     * E_INVALIDARG. To not get cought be a potentially correct implementation
+     * in the future, we check for NOT S_OK.
+     */
+    hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, NULL);
+    EXPECT_NOT_HR(hr, S_OK);
+    hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IDispatch, NULL);
+    EXPECT_NOT_HR(hr, S_OK);
+    hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IXMLDOMNodeList, NULL);
+    EXPECT_NOT_HR(hr, S_OK);
 }
+#endif
 
 static void test_get_childNodes(void)
 {
-    HRESULT r;
-    BSTR str;
+    IXMLDOMNodeList *node_list, *node_list2;
+    IEnumVARIANT *enum1, *enum2, *enum3;
     VARIANT_BOOL b;
     IXMLDOMDocument *doc;
-    IXMLDOMElement *element;
     IXMLDOMNode *node, *node2;
-    IXMLDOMNodeList *node_list, *node_list2;
+    IXMLDOMElement *element;
+    IUnknown *unk1, *unk2;
+    HRESULT hr;
+    VARIANT v;
+    BSTR str;
     LONG len;
 
-    r = CoCreateInstance( &CLSID_DOMDocument, NULL,
-        CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
-    ok( r == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", r );
-    if( r != S_OK )
-        return;
+    doc = create_document(&IID_IXMLDOMDocument);
 
-    str = SysAllocString( szComplete4 );
-    r = IXMLDOMDocument_loadXML( doc, str, &b );
-    ok( r == S_OK, "loadXML failed\n");
+    hr = IXMLDOMDocument_loadXML( doc, _bstr_(complete4A), &b );
+    EXPECT_HR(hr, S_OK);
     ok( b == VARIANT_TRUE, "failed to load XML string\n");
-    SysFreeString( str );
 
-    r = IXMLDOMDocument_get_documentElement( doc, &element );
-    ok( r == S_OK, "ret %08x\n", r);
+    hr = IXMLDOMDocument_get_documentElement( doc, &element );
+    EXPECT_HR(hr, S_OK);
 
-    r = IXMLDOMElement_get_childNodes( element, &node_list );
-    ok( r == S_OK, "ret %08x\n", r);
+    hr = IXMLDOMElement_get_childNodes( element, &node_list );
+    EXPECT_HR(hr, S_OK);
 
-    r = IXMLDOMNodeList_get_length( node_list, &len );
-    ok( r == S_OK, "ret %08x\n", r);
+#ifdef __REACTOS__
+    verify_nodelist_query_interface(node_list);
+#endif
+
+    hr = IXMLDOMNodeList_get_length( node_list, &len );
+    EXPECT_HR(hr, S_OK);
     ok( len == 4, "len %d\n", len);
 
-    r = IXMLDOMNodeList_get_item( node_list, 2, &node );
-    ok( r == S_OK, "ret %08x\n", r);
+    /* refcount tests for IEnumVARIANT support */
+    EXPECT_REF(node_list, 1);
+    hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IEnumVARIANT, (void**)&enum1);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(node_list, 1);
+    EXPECT_REF(enum1, 2);
+
+    EXPECT_REF(node_list, 1);
+    hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IEnumVARIANT, (void**)&enum2);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(node_list, 1);
+    ok(enum2 == enum1, "got %p, %p\n", enum2, enum1);
+    IEnumVARIANT_Release(enum2);
+
+    hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, (void**)&unk1);
+    EXPECT_HR(hr, S_OK);
+    hr = IEnumVARIANT_QueryInterface(enum1, &IID_IUnknown, (void**)&unk2);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(node_list, 3);
+    EXPECT_REF(enum1, 2);
+    ok(unk1 == unk2, "got %p, %p\n", unk1, unk2);
+    IUnknown_Release(unk1);
+    IUnknown_Release(unk2);
+
+    EXPECT_REF(node_list, 1);
+    hr = IXMLDOMNodeList__newEnum(node_list, (IUnknown**)&enum2);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(node_list, 2);
+    EXPECT_REF(enum2, 1);
+    ok(enum2 != enum1, "got %p, %p\n", enum2, enum1);
+
+    /* enumerator created with _newEnum() doesn't share IUnknown* with main object */
+    hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, (void**)&unk1);
+    EXPECT_HR(hr, S_OK);
+    hr = IEnumVARIANT_QueryInterface(enum2, &IID_IUnknown, (void**)&unk2);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(node_list, 3);
+    EXPECT_REF(enum2, 2);
+    ok(unk1 != unk2, "got %p, %p\n", unk1, unk2);
+    IUnknown_Release(unk1);
+    IUnknown_Release(unk2);
+
+    hr = IXMLDOMNodeList__newEnum(node_list, (IUnknown**)&enum3);
+    EXPECT_HR(hr, S_OK);
+    ok(enum2 != enum3, "got %p, %p\n", enum2, enum3);
+    IEnumVARIANT_Release(enum3);
+    IEnumVARIANT_Release(enum2);
+
+    /* iteration tests */
+    hr = IXMLDOMNodeList_get_item(node_list, 0, &node);
+    EXPECT_HR(hr, S_OK);
+    hr = IXMLDOMNode_get_nodeName(node, &str);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(str, _bstr_("bs")), "got %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
+    IXMLDOMNode_Release(node);
 
-    r = IXMLDOMNode_get_childNodes( node, &node_list2 );
-    ok( r == S_OK, "ret %08x\n", r);
+    hr = IXMLDOMNodeList_nextNode(node_list, &node);
+    EXPECT_HR(hr, S_OK);
+    hr = IXMLDOMNode_get_nodeName(node, &str);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(str, _bstr_("bs")), "got %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
+    IXMLDOMNode_Release(node);
 
-    r = IXMLDOMNodeList_get_length( node_list2, &len );
-    ok( r == S_OK, "ret %08x\n", r);
+    V_VT(&v) = VT_EMPTY;
+    hr = IEnumVARIANT_Next(enum1, 1, &v, 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);
+    EXPECT_HR(hr, S_OK);
+    hr = IXMLDOMNode_get_nodeName(node, &str);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(str, _bstr_("bs")), "got node name %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
+    IXMLDOMNode_Release(node);
+    VariantClear(&v);
+
+    hr = IXMLDOMNodeList_nextNode(node_list, &node);
+    EXPECT_HR(hr, S_OK);
+    hr = IXMLDOMNode_get_nodeName(node, &str);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(str, _bstr_("pr")), "got %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
+    IXMLDOMNode_Release(node);
+
+    IEnumVARIANT_Release(enum1);
+
+    hr = IXMLDOMNodeList_get_item( node_list, 2, &node );
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMNode_get_childNodes( node, &node_list2 );
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMNodeList_get_length( node_list2, &len );
+    EXPECT_HR(hr, S_OK);
     ok( len == 0, "len %d\n", len);
 
-    r = IXMLDOMNodeList_get_item( node_list2, 0, &node2);
-    ok( r == S_FALSE, "ret %08x\n", r);
+    hr = IXMLDOMNodeList_get_item( node_list2, 0, &node2);
+    EXPECT_HR(hr, S_FALSE);
 
     IXMLDOMNodeList_Release( node_list2 );
     IXMLDOMNode_Release( node );
     IXMLDOMNodeList_Release( node_list );
     IXMLDOMElement_Release( element );
+
+    /* test for children of <?xml ..?> node */
+    hr = IXMLDOMDocument_get_firstChild(doc, &node);
+    EXPECT_HR(hr, S_OK);
+
+    str = NULL;
+    hr = IXMLDOMNode_get_nodeName(node, &str);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(str, _bstr_("xml")), "got %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
+
+    /* it returns empty but valid node list */
+    node_list = (void*)0xdeadbeef;
+    hr = IXMLDOMNode_get_childNodes(node, &node_list);
+    EXPECT_HR(hr, S_OK);
+
+    len = -1;
+    hr = IXMLDOMNodeList_get_length(node_list, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(len == 0, "got %d\n", len);
+
+    IXMLDOMNodeList_Release( node_list );
+    IXMLDOMNode_Release(node);
+
     IXMLDOMDocument_Release( doc );
+    free_bstrs();
 }
 
 static void test_get_firstChild(void)
 {
-    static WCHAR xmlW[] = {'x','m','l',0};
+    static const WCHAR xmlW[] = {'x','m','l',0};
     IXMLDOMDocument *doc;
     IXMLDOMNode *node;
     VARIANT_BOOL b;
     HRESULT r;
     BSTR str;
 
-    r = CoCreateInstance( &CLSID_DOMDocument, NULL,
-        CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc );
-    ok( r == S_OK, "failed with 0x%08x\n", r );
-    if( r != S_OK )
-        return;
+    doc = create_document(&IID_IXMLDOMDocument);
 
-    str = SysAllocString( szComplete4 );
-    r = IXMLDOMDocument_loadXML( doc, str, &b );
+    r = IXMLDOMDocument_loadXML( doc, _bstr_(complete4A), &b );
     ok( r == S_OK, "loadXML failed\n");
     ok( b == VARIANT_TRUE, "failed to load XML string\n");
-    SysFreeString( str );
 
     r = IXMLDOMDocument_get_firstChild( doc, &node );
     ok( r == S_OK, "ret %08x\n", r);
@@ -2513,49 +3437,90 @@ static void test_get_firstChild(void)
     r = IXMLDOMNode_get_nodeName( node, &str );
     ok( r == S_OK, "ret %08x\n", r);
 
-    ok(memcmp(str, xmlW, sizeof(xmlW)) == 0, "expected \"xml\" node name\n");
+    ok(!lstrcmpW(str, xmlW), "expected \"xml\" node name, got %s\n", wine_dbgstr_w(str));
 
     SysFreeString(str);
     IXMLDOMNode_Release( node );
     IXMLDOMDocument_Release( doc );
+
+    free_bstrs();
 }
 
-static void test_removeChild(void)
+static void test_get_lastChild(void)
 {
+    static const WCHAR lcW[] = {'l','c',0};
+    static const WCHAR foW[] = {'f','o',0};
+    IXMLDOMDocument *doc;
+    IXMLDOMNode *node, *child;
+    VARIANT_BOOL b;
     HRESULT r;
     BSTR str;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    r = IXMLDOMDocument_loadXML( doc, _bstr_(complete4A), &b );
+    ok( r == S_OK, "loadXML failed\n");
+    ok( b == VARIANT_TRUE, "failed to load XML string\n");
+
+    r = IXMLDOMDocument_get_lastChild( doc, &node );
+    ok( r == S_OK, "ret %08x\n", r);
+
+    r = IXMLDOMNode_get_nodeName( node, &str );
+    ok( r == S_OK, "ret %08x\n", r);
+
+    ok(memcmp(str, lcW, sizeof(lcW)) == 0, "expected \"lc\" node name\n");
+    SysFreeString(str);
+
+    r = IXMLDOMNode_get_lastChild( node, &child );
+    ok( r == S_OK, "ret %08x\n", r);
+
+    r = IXMLDOMNode_get_nodeName( child, &str );
+    ok( r == S_OK, "ret %08x\n", r);
+
+    ok(memcmp(str, foW, sizeof(foW)) == 0, "expected \"fo\" node name\n");
+    SysFreeString(str);
+
+    IXMLDOMNode_Release( child );
+    IXMLDOMNode_Release( node );
+    IXMLDOMDocument_Release( doc );
+
+    free_bstrs();
+}
+
+static void test_removeChild(void)
+{
+    HRESULT r;
     VARIANT_BOOL b;
     IXMLDOMDocument *doc;
     IXMLDOMElement *element, *lc_element;
     IXMLDOMNode *fo_node, *ba_node, *removed_node, *temp_node, *lc_node;
     IXMLDOMNodeList *root_list, *fo_list;
 
-    r = CoCreateInstance( &CLSID_DOMDocument, NULL,
-        CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
-    ok( r == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", r );
-    if( r != S_OK )
-        return;
+    doc = create_document(&IID_IXMLDOMDocument);
 
-    str = SysAllocString( szComplete4 );
-    r = IXMLDOMDocument_loadXML( doc, str, &b );
+    r = IXMLDOMDocument_loadXML( doc, _bstr_(complete4A), &b );
     ok( r == S_OK, "loadXML failed\n");
     ok( b == VARIANT_TRUE, "failed to load XML string\n");
-    SysFreeString( str );
 
     r = IXMLDOMDocument_get_documentElement( doc, &element );
     ok( r == S_OK, "ret %08x\n", r);
+    todo_wine EXPECT_REF(element, 2);
 
     r = IXMLDOMElement_get_childNodes( element, &root_list );
     ok( r == S_OK, "ret %08x\n", r);
+    EXPECT_REF(root_list, 1);
 
     r = IXMLDOMNodeList_get_item( root_list, 3, &fo_node );
     ok( r == S_OK, "ret %08x\n", r);
+    EXPECT_REF(fo_node, 1);
+
     r = IXMLDOMNode_get_childNodes( fo_node, &fo_list );
     ok( r == S_OK, "ret %08x\n", r);
+    EXPECT_REF(fo_list, 1);
+
     r = IXMLDOMNodeList_get_item( fo_list, 0, &ba_node );
     ok( r == S_OK, "ret %08x\n", r);
+    EXPECT_REF(ba_node, 1);
 
     /* invalid parameter: NULL ptr */
     removed_node = (void*)0xdeadbeef;
@@ -2565,19 +3530,28 @@ static void test_removeChild(void)
 
     /* ba_node is a descendant of element, but not a direct child. */
     removed_node = (void*)0xdeadbeef;
+    EXPECT_REF(ba_node, 1);
+    EXPECT_CHILDREN(fo_node);
     r = IXMLDOMElement_removeChild( element, ba_node, &removed_node );
     ok( r == E_INVALIDARG, "ret %08x\n", r );
     ok( removed_node == NULL, "%p\n", removed_node );
+    EXPECT_REF(ba_node, 1);
+    EXPECT_CHILDREN(fo_node);
 
+    EXPECT_REF(ba_node, 1);
+    EXPECT_REF(fo_node, 1);
     r = IXMLDOMElement_removeChild( element, fo_node, &removed_node );
     ok( r == S_OK, "ret %08x\n", r);
     ok( fo_node == removed_node, "node %p node2 %p\n", fo_node, removed_node );
+    EXPECT_REF(fo_node, 2);
+    EXPECT_REF(ba_node, 1);
 
     /* try removing already removed child */
     temp_node = (void*)0xdeadbeef;
     r = IXMLDOMElement_removeChild( element, fo_node, &temp_node );
     ok( r == E_INVALIDARG, "ret %08x\n", r);
     ok( temp_node == NULL, "%p\n", temp_node );
+    IXMLDOMNode_Release( fo_node );
 
     /* the removed node has no parent anymore */
     r = IXMLDOMNode_get_parentNode( removed_node, &temp_node );
@@ -2591,13 +3565,15 @@ static void test_removeChild(void)
     r = IXMLDOMNodeList_get_item( root_list, 0, &lc_node );
     ok( r == S_OK, "ret %08x\n", r);
 
-    r = IXMLDOMElement_QueryInterface( lc_node, &IID_IXMLDOMElement, (LPVOID*)&lc_element );
+    r = IXMLDOMNode_QueryInterface( lc_node, &IID_IXMLDOMElement, (void**)&lc_element );
     ok( r == S_OK, "ret %08x\n", r);
 
     /* MS quirk: passing wrong interface pointer works, too */
     r = IXMLDOMElement_removeChild( element, (IXMLDOMNode*)lc_element, NULL );
     ok( r == S_OK, "ret %08x\n", r);
+    IXMLDOMElement_Release( lc_element );
 
+    temp_node = (void*)0xdeadbeef;
     r = IXMLDOMNode_get_parentNode( lc_node, &temp_node );
     ok( r == S_FALSE, "ret %08x\n", r);
     ok( temp_node == NULL, "%p\n", temp_node );
@@ -2606,12 +3582,13 @@ static void test_removeChild(void)
     IXMLDOMNodeList_Release( root_list );
     IXMLDOMElement_Release( element );
     IXMLDOMDocument_Release( doc );
+
+    free_bstrs();
 }
 
 static void test_replaceChild(void)
 {
     HRESULT r;
-    BSTR str;
     VARIANT_BOOL b;
     IXMLDOMDocument *doc;
     IXMLDOMElement *element, *ba_element;
@@ -2620,17 +3597,11 @@ static void test_replaceChild(void)
     IUnknown * unk1, *unk2;
     LONG len;
 
-    r = CoCreateInstance( &CLSID_DOMDocument, NULL,
-        CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
-    ok( r == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", r );
-    if( r != S_OK )
-        return;
+    doc = create_document(&IID_IXMLDOMDocument);
 
-    str = SysAllocString( szComplete4 );
-    r = IXMLDOMDocument_loadXML( doc, str, &b );
+    r = IXMLDOMDocument_loadXML( doc, _bstr_(complete4A), &b );
     ok( r == S_OK, "loadXML failed\n");
     ok( b == VARIANT_TRUE, "failed to load XML string\n");
-    SysFreeString( str );
 
     r = IXMLDOMDocument_get_documentElement( doc, &element );
     ok( r == S_OK, "ret %08x\n", r);
@@ -2669,6 +3640,7 @@ static void test_replaceChild(void)
     r = IXMLDOMElement_replaceChild( element, lc_node, ba_node, &removed_node );
     ok( r == E_INVALIDARG, "ret %08x\n", r );
     ok( removed_node == NULL, "%p\n", removed_node );
+    IXMLDOMNode_Release( lc_node );
 
     /* invalid parameter: would create loop */
     removed_node = (void*)0xdeadbeef;
@@ -2701,9 +3673,14 @@ static void test_replaceChild(void)
     /* MS quirk: replaceChild also accepts elements instead of nodes */
     r = IXMLDOMNode_QueryInterface( ba_node, &IID_IXMLDOMElement, (void**)&ba_element);
     ok( r == S_OK, "ret %08x\n", r );
+    EXPECT_REF(ba_element, 2);
 
+    removed_node = NULL;
     r = IXMLDOMElement_replaceChild( element, ba_node, (IXMLDOMNode*)ba_element, &removed_node );
     ok( r == S_OK, "ret %08x\n", r );
+    ok( removed_node != NULL, "got %p\n", removed_node);
+    EXPECT_REF(ba_element, 3);
+    IXMLDOMElement_Release( ba_element );
 
     r = IXMLDOMNodeList_get_length( fo_list, &len);
     ok( r == S_OK, "ret %08x\n", r );
@@ -2717,6 +3694,8 @@ static void test_replaceChild(void)
     IXMLDOMNodeList_Release( root_list );
     IXMLDOMElement_Release( element );
     IXMLDOMDocument_Release( doc );
+
+    free_bstrs();
 }
 
 static void test_removeNamedItem(void)
@@ -2731,17 +3710,11 @@ static void test_removeNamedItem(void)
     LONG len;
     HRESULT r;
 
-    r = CoCreateInstance( &CLSID_DOMDocument, NULL,
-        CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
-    ok( r == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", r );
-    if( r != S_OK )
-        return;
+    doc = create_document(&IID_IXMLDOMDocument);
 
-    str = SysAllocString( szComplete4 );
-    r = IXMLDOMDocument_loadXML( doc, str, &b );
+    r = IXMLDOMDocument_loadXML( doc, _bstr_(complete4A), &b );
     ok( r == S_OK, "loadXML failed\n");
     ok( b == VARIANT_TRUE, "failed to load XML string\n");
-    SysFreeString( str );
 
     r = IXMLDOMDocument_get_documentElement( doc, &element );
     ok( r == S_OK, "ret %08x\n", r);
@@ -2762,7 +3735,7 @@ static void test_removeNamedItem(void)
     removed_node = (void*)0xdeadbeef;
     r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, NULL, &removed_node);
     ok ( r == E_INVALIDARG, "ret %08x\n", r);
-    ok ( removed_node == (void*)0xdeadbeef, "removed_node == %p\n", removed_node);
+    ok ( removed_node == (void*)0xdeadbeef, "got %p\n", removed_node);
 
     removed_node = (void*)0xdeadbeef;
     str = SysAllocString(szvr);
@@ -2772,7 +3745,7 @@ static void test_removeNamedItem(void)
     removed_node2 = (void*)0xdeadbeef;
     r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, str, &removed_node2);
     ok ( r == S_FALSE, "ret %08x\n", r);
-    ok ( removed_node2 == NULL, "removed_node == %p\n", removed_node2 );
+    ok ( removed_node2 == NULL, "got %p\n", removed_node2 );
 
     r = IXMLDOMNamedNodeMap_get_length( pr_attrs, &len );
     ok( r == S_OK, "ret %08x\n", r);
@@ -2803,96 +3776,200 @@ static void test_removeNamedItem(void)
     IXMLDOMNodeList_Release( root_list );
     IXMLDOMElement_Release( element );
     IXMLDOMDocument_Release( doc );
+
+    free_bstrs();
 }
 
-static void test_XMLHTTP(void)
+#define test_IObjectSafety_set(p, r, r2, s, m, e, e2) _test_IObjectSafety_set(__LINE__,p, r, r2, s, m, e, e2)
+static void _test_IObjectSafety_set(unsigned line, IObjectSafety *safety, HRESULT result,
+                                    HRESULT result2, DWORD set, DWORD mask, DWORD expected,
+                                    DWORD expected2)
 {
-    static const WCHAR wszBody[] = {'m','o','d','e','=','T','e','s','t',0};
-    static WCHAR wszPOST[] = {'P','O','S','T',0};
-    static WCHAR wszUrl[] = {'h','t','t','p',':','/','/',
-        'c','r','o','s','s','o','v','e','r','.','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m','/',
-        'p','o','s','t','t','e','s','t','.','p','h','p',0};
-    static const WCHAR wszExpectedResponse[] = {'F','A','I','L','E','D',0};
-    IXMLHttpRequest *pXMLHttpRequest;
-    BSTR bstrResponse, str1, str2;
-    VARIANT dummy;
-    VARIANT varfalse;
-    VARIANT varbody;
-    HRESULT hr = CoCreateInstance(&CLSID_XMLHTTPRequest, NULL,
-                                  CLSCTX_INPROC_SERVER, &IID_IXMLHttpRequest,
-                                  (void **)&pXMLHttpRequest);
-    if (FAILED(hr))
-    {
-        win_skip("IXMLHTTPRequest is not available (0x%08x)\n", hr);
-        return;
-    }
+    DWORD enabled, supported;
+    HRESULT hr;
 
-    VariantInit(&dummy);
-    V_VT(&dummy) = VT_ERROR;
-    V_ERROR(&dummy) = DISP_E_MEMBERNOTFOUND;
-    VariantInit(&varfalse);
-    V_VT(&varfalse) = VT_BOOL;
-    V_BOOL(&varfalse) = VARIANT_FALSE;
-    V_VT(&varbody) = VT_BSTR;
-    V_BSTR(&varbody) = SysAllocString(wszBody);
-
-    str1 = SysAllocString(wszPOST);
-    str2 = SysAllocString(wszUrl);
-    hr = IXMLHttpRequest_open(pXMLHttpRequest, str1, str2, varfalse, dummy, dummy);
-    todo_wine ok(hr == S_OK, "IXMLHttpRequest_open should have succeeded instead of failing with 0x%08x\n", hr);
-    SysFreeString(str1);
-    SysFreeString(str2);
-
-    hr = IXMLHttpRequest_send(pXMLHttpRequest, varbody);
-    if (hr == INET_E_RESOURCE_NOT_FOUND)
-    {
-        skip("No connection could be made with crossover.codeweavers.com\n");
-        IXMLHttpRequest_Release(pXMLHttpRequest);
-        return;
-    }
-    todo_wine ok(hr == S_OK, "IXMLHttpRequest_send should have succeeded instead of failing with 0x%08x\n", hr);
-    VariantClear(&varbody);
+    hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL, set, mask);
+    if (result == result2)
+        ok_(__FILE__,line)(hr == result, "SetInterfaceSafetyOptions: expected %08x, returned %08x\n", result, hr );
+    else
+        ok_(__FILE__,line)(broken(hr == result) || hr == result2,
+           "SetInterfaceSafetyOptions: expected %08x, got %08x\n", result2, hr );
 
-    hr = IXMLHttpRequest_get_responseText(pXMLHttpRequest, &bstrResponse);
-    todo_wine ok(hr == S_OK, "IXMLHttpRequest_get_responseText should have succeeded instead of failing with 0x%08x\n", hr);
-    /* the server currently returns "FAILED" because the Content-Type header is
-     * not what the server expects */
-    if(hr == S_OK)
-    {
-        ok(!memcmp(bstrResponse, wszExpectedResponse, sizeof(wszExpectedResponse)), "bstrResponse differs from what was expected\n");
-        SysFreeString(bstrResponse);
-    }
+    supported = enabled = 0xCAFECAFE;
+    hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled);
+    ok(hr == S_OK, "ret %08x\n", hr );
+    if (expected == expected2)
+        ok_(__FILE__,line)(enabled == expected, "Expected %08x, got %08x\n", expected, enabled);
+    else
+        ok_(__FILE__,line)(broken(enabled == expected) || enabled == expected2,
+           "Expected %08x, got %08x\n", expected2, enabled);
+
+    /* reset the safety options */
+
+    hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL,
+            INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_SECURITY_MANAGER,
+            0);
+    ok_(__FILE__,line)(hr == S_OK, "ret %08x\n", hr );
+
+    hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled);
+    ok_(__FILE__,line)(hr == S_OK, "ret %08x\n", hr );
+    ok_(__FILE__,line)(enabled == 0, "Expected 0, got %08x\n", enabled);
+}
+
+#define test_IObjectSafety_common(s) _test_IObjectSafety_common(__LINE__,s)
+static void _test_IObjectSafety_common(unsigned line, IObjectSafety *safety)
+{
+    DWORD enabled = 0, supported = 0;
+    HRESULT hr;
+
+    /* get */
+    hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, NULL, &enabled);
+    ok_(__FILE__,line)(hr == E_POINTER, "ret %08x\n", hr );
+    hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, NULL);
+    ok_(__FILE__,line)(hr == E_POINTER, "ret %08x\n", hr );
+
+    hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled);
+    ok_(__FILE__,line)(hr == S_OK, "ret %08x\n", hr );
+    ok_(__FILE__,line)(broken(supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA)) ||
+       supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */,
+        "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), "
+             "got %08x\n", supported);
+    ok_(__FILE__,line)(enabled == 0, "Expected 0, got %08x\n", enabled);
+
+    /* set -- individual flags */
+
+    test_IObjectSafety_set(safety, S_OK, S_OK,
+        INTERFACESAFE_FOR_UNTRUSTED_CALLER, INTERFACESAFE_FOR_UNTRUSTED_CALLER,
+        INTERFACESAFE_FOR_UNTRUSTED_CALLER, INTERFACESAFE_FOR_UNTRUSTED_CALLER);
+
+    test_IObjectSafety_set(safety, S_OK, S_OK,
+        INTERFACESAFE_FOR_UNTRUSTED_DATA, INTERFACESAFE_FOR_UNTRUSTED_DATA,
+        INTERFACESAFE_FOR_UNTRUSTED_DATA, INTERFACESAFE_FOR_UNTRUSTED_DATA);
+
+    test_IObjectSafety_set(safety, S_OK, S_OK,
+        INTERFACE_USES_SECURITY_MANAGER, INTERFACE_USES_SECURITY_MANAGER,
+        0, INTERFACE_USES_SECURITY_MANAGER /* msxml3 SP8+ */);
+
+    /* set INTERFACE_USES_DISPEX  */
+
+    test_IObjectSafety_set(safety, S_OK, E_FAIL /* msxml3 SP8+ */,
+        INTERFACE_USES_DISPEX, INTERFACE_USES_DISPEX,
+        0, 0);
+
+    test_IObjectSafety_set(safety, S_OK, E_FAIL /* msxml3 SP8+ */,
+        INTERFACE_USES_DISPEX, 0,
+        0, 0);
+
+    test_IObjectSafety_set(safety, S_OK, S_OK /* msxml3 SP8+ */,
+        0, INTERFACE_USES_DISPEX,
+        0, 0);
+
+    /* set option masking */
+
+    test_IObjectSafety_set(safety, S_OK, S_OK,
+        INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA,
+        INTERFACESAFE_FOR_UNTRUSTED_CALLER,
+        INTERFACESAFE_FOR_UNTRUSTED_CALLER,
+        INTERFACESAFE_FOR_UNTRUSTED_CALLER);
+
+    test_IObjectSafety_set(safety, S_OK, S_OK,
+        INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA,
+        INTERFACESAFE_FOR_UNTRUSTED_DATA,
+        INTERFACESAFE_FOR_UNTRUSTED_DATA,
+        INTERFACESAFE_FOR_UNTRUSTED_DATA);
+
+    test_IObjectSafety_set(safety, S_OK, S_OK,
+        INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA,
+        INTERFACE_USES_SECURITY_MANAGER,
+        0,
+        0);
+
+    /* set -- inheriting previous settings */
 
-    IXMLHttpRequest_Release(pXMLHttpRequest);
+    hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL,
+                                                         INTERFACESAFE_FOR_UNTRUSTED_CALLER,
+                                                         INTERFACESAFE_FOR_UNTRUSTED_CALLER);
+    ok_(__FILE__,line)(hr == S_OK, "ret %08x\n", hr );
+    hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled);
+    ok_(__FILE__,line)(hr == S_OK, "ret %08x\n", hr );
+    ok_(__FILE__,line)(enabled == INTERFACESAFE_FOR_UNTRUSTED_CALLER, "Expected INTERFACESAFE_FOR_UNTRUSTED_CALLER got %08x\n", enabled);
+    ok_(__FILE__,line)(broken(supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA)) ||
+       supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */,
+        "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), "
+             "got %08x\n", supported);
+
+    hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL,
+                                                         INTERFACESAFE_FOR_UNTRUSTED_DATA,
+                                                         INTERFACESAFE_FOR_UNTRUSTED_DATA);
+    ok_(__FILE__,line)(hr == S_OK, "ret %08x\n", hr );
+    hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled);
+    ok_(__FILE__,line)(hr == S_OK, "ret %08x\n", hr );
+    ok_(__FILE__,line)(broken(enabled == INTERFACESAFE_FOR_UNTRUSTED_DATA) ||
+                       enabled == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA),
+                       "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA) got %08x\n", enabled);
+    ok_(__FILE__,line)(broken(supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA)) ||
+       supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */,
+        "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), "
+             "got %08x\n", supported);
 }
 
 static void test_IXMLDOMDocument2(void)
 {
-    HRESULT r;
-    VARIANT_BOOL b;
-    BSTR str;
+    static const WCHAR emptyW[] = {0};
+    IXMLDOMDocument2 *doc2, *dtddoc2;
     IXMLDOMDocument *doc;
-    IXMLDOMDocument2 *doc2;
+    IXMLDOMParseError* err;
     IDispatchEx *dispex;
+    VARIANT_BOOL b;
     VARIANT var;
-    int ref;
+    HRESULT r;
+    LONG res;
 
-    r = CoCreateInstance( &CLSID_DOMDocument, NULL,
-        CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
-    ok( r == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", r );
-    if( r != S_OK )
-        return;
+    if (!is_clsid_supported(&CLSID_DOMDocument2, &IID_IXMLDOMDocument2)) return;
 
-    str = SysAllocString( szComplete4 );
-    r = IXMLDOMDocument_loadXML( doc, str, &b );
-    ok( r == S_OK, "loadXML failed\n");
-    ok( b == VARIANT_TRUE, "failed to load XML string\n");
-    SysFreeString( str );
+    doc = create_document(&IID_IXMLDOMDocument);
+    dtddoc2 = create_document(&IID_IXMLDOMDocument2);
 
     r = IXMLDOMDocument_QueryInterface( doc, &IID_IXMLDOMDocument2, (void**)&doc2 );
     ok( r == S_OK, "ret %08x\n", r );
     ok( doc == (IXMLDOMDocument*)doc2, "interfaces differ\n");
 
+    ole_expect(IXMLDOMDocument2_get_readyState(doc2, NULL), E_INVALIDARG);
+    ole_check(IXMLDOMDocument2_get_readyState(doc2, &res));
+    ok(res == READYSTATE_COMPLETE, "expected READYSTATE_COMPLETE (4), got %i\n", res);
+
+    err = NULL;
+    ole_expect(IXMLDOMDocument2_validate(doc2, NULL), S_FALSE);
+    ole_expect(IXMLDOMDocument2_validate(doc2, &err), S_FALSE);
+    ok(err != NULL, "expected a pointer\n");
+    if (err)
+    {
+        res = 0;
+        ole_check(IXMLDOMParseError_get_errorCode(err, &res));
+        /* XML_E_NOTWF */
+        ok(res == E_XML_NOTWF, "got %08x\n", res);
+        IXMLDOMParseError_Release(err);
+    }
+
+    r = IXMLDOMDocument2_loadXML( doc2, _bstr_(complete4A), &b );
+    ok( r == S_OK, "loadXML failed\n");
+    ok( b == VARIANT_TRUE, "failed to load XML string\n");
+
+    ole_check(IXMLDOMDocument_get_readyState(doc, &res));
+    ok(res == READYSTATE_COMPLETE, "expected READYSTATE_COMPLETE (4), got %i\n", res);
+
+    err = NULL;
+    ole_expect(IXMLDOMDocument2_validate(doc2, &err), S_FALSE);
+    ok(err != NULL, "expected a pointer\n");
+    if (err)
+    {
+        res = 0;
+        ole_check(IXMLDOMParseError_get_errorCode(err, &res));
+        /* XML_E_NODTD */
+        ok(res == E_XML_NODTD, "got %08x\n", res);
+        IXMLDOMParseError_Release(err);
+    }
+
     r = IXMLDOMDocument_QueryInterface( doc, &IID_IDispatchEx, (void**)&dispex );
     ok( r == S_OK, "ret %08x\n", r );
     if(r == S_OK)
@@ -2901,8 +3978,9 @@ static void test_IXMLDOMDocument2(void)
     }
 
     /* we will check if the variant got cleared */
-    ref = IXMLDOMDocument2_AddRef(doc2);
-    expect_eq(ref, 3, int, "%d");  /* doc, doc2, AddRef*/
+    IXMLDOMDocument2_AddRef(doc2);
+    EXPECT_REF(doc2, 3); /* doc, doc2, AddRef*/
+
     V_VT(&var) = VT_UNKNOWN;
     V_UNKNOWN(&var) = (IUnknown *)doc2;
 
@@ -2928,6 +4006,17 @@ static void test_IXMLDOMDocument2(void)
     ole_check(IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionLanguage"), _variantbstr_("XPath")));
     ole_check(IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionLanguage"), _variantbstr_("XSLPattern")));
 
+    V_VT(&var) = VT_BSTR;
+    V_BSTR(&var) = SysAllocString(emptyW);
+    r = IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionNamespaces"), var);
+    ok(r == S_OK, "got 0x%08x\n", r);
+    VariantClear(&var);
+
+    V_VT(&var) = VT_I2;
+    V_I2(&var) = 0;
+    r = IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionNamespaces"), var);
+    ok(r == E_FAIL, "got 0x%08x\n", r);
+
     /* contrary to what MSDN claims you can switch back from XPath to XSLPattern */
     ole_check(IXMLDOMDocument2_getProperty(doc2, _bstr_("SelectionLanguage"), &var));
     expect_eq(V_VT(&var), VT_BSTR, int, "%x");
@@ -2935,68 +4024,595 @@ static void test_IXMLDOMDocument2(void)
 
     IXMLDOMDocument2_Release( doc2 );
     IXMLDOMDocument_Release( doc );
-    free_bstrs();
-}
 
-static void test_XPath(void)
-{
-    HRESULT r;
-    VARIANT var;
-    VARIANT_BOOL b;
-    IXMLDOMDocument2 *doc;
-    IXMLDOMNode *rootNode;
-    IXMLDOMNode *elem1Node;
-    IXMLDOMNode *node;
-    IXMLDOMNodeList *list;
+    /* DTD validation */
+    ole_check(IXMLDOMDocument2_put_validateOnParse(dtddoc2, VARIANT_FALSE));
+    ole_check(IXMLDOMDocument2_loadXML(dtddoc2, _bstr_(szEmailXML), &b));
+    ok( b == VARIANT_TRUE, "failed to load XML string\n");
+    err = NULL;
+    ole_check(IXMLDOMDocument2_validate(dtddoc2, &err));
+    ok(err != NULL, "expected pointer\n");
+    if (err)
+    {
+        res = 0;
+        ole_expect(IXMLDOMParseError_get_errorCode(err, &res), S_FALSE);
+        ok(res == 0, "got %08x\n", res);
+        IXMLDOMParseError_Release(err);
+    }
 
-    r = CoCreateInstance( &CLSID_DOMDocument, NULL,
-        CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc );
-    ok( r == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", r );
-    if( r != S_OK )
-        return;
+    ole_check(IXMLDOMDocument2_loadXML(dtddoc2, _bstr_(szEmailXML_0D), &b));
+    ok( b == VARIANT_TRUE, "failed to load XML string\n");
+    err = NULL;
+    ole_expect(IXMLDOMDocument2_validate(dtddoc2, &err), S_FALSE);
+    ok(err != NULL, "expected pointer\n");
+    if (err)
+    {
+        res = 0;
+        ole_check(IXMLDOMParseError_get_errorCode(err, &res));
+        /* XML_ELEMENT_UNDECLARED */
+        todo_wine ok(res == 0xC00CE00D, "got %08x\n", res);
+        IXMLDOMParseError_Release(err);
+    }
 
-    ole_check(IXMLDOMDocument_loadXML(doc, _bstr_(szExampleXML), &b));
-    ok(b == VARIANT_TRUE, "failed to load XML string\n");
+    ole_check(IXMLDOMDocument2_loadXML(dtddoc2, _bstr_(szEmailXML_0E), &b));
+    ok( b == VARIANT_TRUE, "failed to load XML string\n");
+    err = NULL;
+    ole_expect(IXMLDOMDocument2_validate(dtddoc2, &err), S_FALSE);
+    ok(err != NULL, "expected pointer\n");
+    if (err)
+    {
+        res = 0;
+        ole_check(IXMLDOMParseError_get_errorCode(err, &res));
+        /* XML_ELEMENT_ID_NOT_FOUND */
+        todo_wine ok(res == 0xC00CE00E, "got %08x\n", res);
+        IXMLDOMParseError_Release(err);
+    }
 
-    /* switch to XPath */
-    ole_check(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), _variantbstr_("XPath")));
+    ole_check(IXMLDOMDocument2_loadXML(dtddoc2, _bstr_(szEmailXML_11), &b));
+    ok( b == VARIANT_TRUE, "failed to load XML string\n");
+    err = NULL;
+    ole_expect(IXMLDOMDocument2_validate(dtddoc2, &err), S_FALSE);
+    ok(err != NULL, "expected pointer\n");
+    if (err)
+    {
+        res = 0;
+        ole_check(IXMLDOMParseError_get_errorCode(err, &res));
+        /* XML_EMPTY_NOT_ALLOWED */
+        todo_wine ok(res == 0xC00CE011, "got %08x\n", res);
+        IXMLDOMParseError_Release(err);
+    }
 
-    /* some simple queries*/
-    ole_check(IXMLDOMDocument_selectNodes(doc, _bstr_("root"), &list));
-    ole_check(IXMLDOMNodeList_get_item(list, 0, &rootNode));
-    ole_check(IXMLDOMNodeList_reset(list));
-    expect_list_and_release(list, "E2.D1");
-    if (rootNode == NULL)
-        return;
+    ole_check(IXMLDOMDocument2_loadXML(dtddoc2, _bstr_(szEmailXML_13), &b));
+    ok( b == VARIANT_TRUE, "failed to load XML string\n");
+    err = NULL;
+    ole_expect(IXMLDOMDocument2_validate(dtddoc2, &err), S_FALSE);
+    ok(err != NULL, "expected pointer\n");
+    if (err)
+    {
+        res = 0;
+        ole_check(IXMLDOMParseError_get_errorCode(err, &res));
+        /* XML_ROOT_NAME_MISMATCH */
+        todo_wine ok(res == 0xC00CE013, "got %08x\n", res);
+        IXMLDOMParseError_Release(err);
+    }
 
-    ole_check(IXMLDOMDocument_selectNodes(doc, _bstr_("root//c"), &list));
-    expect_list_and_release(list, "E3.E1.E2.D1 E3.E2.E2.D1");
+    ole_check(IXMLDOMDocument2_loadXML(dtddoc2, _bstr_(szEmailXML_14), &b));
+    ok( b == VARIANT_TRUE, "failed to load XML string\n");
+    err = NULL;
+    ole_expect(IXMLDOMDocument2_validate(dtddoc2, &err), S_FALSE);
+    ok(err != NULL, "expected pointer\n");
+    if (err)
+    {
+        res = 0;
+        ole_check(IXMLDOMParseError_get_errorCode(err, &res));
+        /* XML_INVALID_CONTENT */
+        todo_wine ok(res == 0xC00CE014, "got %08x\n", res);
+        IXMLDOMParseError_Release(err);
+    }
 
-    ole_check(IXMLDOMDocument_selectNodes(doc, _bstr_("//c[@type]"), &list));
-    expect_list_and_release(list, "E3.E2.E2.D1");
+    ole_check(IXMLDOMDocument2_loadXML(dtddoc2, _bstr_(szEmailXML_15), &b));
+    ok( b == VARIANT_TRUE, "failed to load XML string\n");
+    err = NULL;
+    ole_expect(IXMLDOMDocument2_validate(dtddoc2, &err), S_FALSE);
+    ok(err != NULL, "expected pointer\n");
+    if (err)
+    {
+        res = 0;
+        ole_check(IXMLDOMParseError_get_errorCode(err, &res));
+        /* XML_ATTRIBUTE_NOT_DEFINED */
+        todo_wine ok(res == 0xC00CE015, "got %08x\n", res);
+        IXMLDOMParseError_Release(err);
+    }
 
-    ole_check(IXMLDOMNode_selectNodes(rootNode, _bstr_("elem"), &list));
-    /* using get_item for query results advances the position */
-    ole_check(IXMLDOMNodeList_get_item(list, 1, &node));
-    expect_node(node, "E2.E2.D1");
-    IXMLDOMNode_Release(node);
-    ole_check(IXMLDOMNodeList_nextNode(list, &node));
-    expect_node(node, "E4.E2.D1");
-    IXMLDOMNode_Release(node);
-    ole_check(IXMLDOMNodeList_reset(list));
-    expect_list_and_release(list, "E1.E2.D1 E2.E2.D1 E4.E2.D1");
+    ole_check(IXMLDOMDocument2_loadXML(dtddoc2, _bstr_(szEmailXML_16), &b));
+    ok( b == VARIANT_TRUE, "failed to load XML string\n");
+    err = NULL;
+    ole_expect(IXMLDOMDocument2_validate(dtddoc2, &err), S_FALSE);
+    ok(err != NULL, "expected pointer\n");
+    if (err)
+    {
+        res = 0;
+        ole_check(IXMLDOMParseError_get_errorCode(err, &res));
+        /* XML_ATTRIBUTE_FIXED */
+        todo_wine ok(res == 0xC00CE016, "got %08x\n", res);
+        IXMLDOMParseError_Release(err);
+    }
 
-    ole_check(IXMLDOMNode_selectNodes(rootNode, _bstr_("."), &list));
-    expect_list_and_release(list, "E2.D1");
+    ole_check(IXMLDOMDocument2_loadXML(dtddoc2, _bstr_(szEmailXML_17), &b));
+    ok( b == VARIANT_TRUE, "failed to load XML string\n");
+    err = NULL;
+    ole_expect(IXMLDOMDocument2_validate(dtddoc2, &err), S_FALSE);
+    ok(err != NULL, "expected pointer\n");
+    if (err)
+    {
+        res = 0;
+        ole_check(IXMLDOMParseError_get_errorCode(err, &res));
+        /* XML_ATTRIBUTE_VALUE */
+        todo_wine ok(res == 0xC00CE017, "got %08x\n", res);
+        IXMLDOMParseError_Release(err);
+    }
 
-    ole_check(IXMLDOMNode_selectNodes(rootNode, _bstr_("elem[3]/preceding-sibling::*"), &list));
-    ole_check(IXMLDOMNodeList_get_item(list, 0, &elem1Node));
-    ole_check(IXMLDOMNodeList_reset(list));
-    expect_list_and_release(list, "E1.E2.D1 E2.E2.D1 E3.E2.D1");
+    ole_check(IXMLDOMDocument2_loadXML(dtddoc2, _bstr_(szEmailXML_18), &b));
+    ok( b == VARIANT_TRUE, "failed to load XML string\n");
+    err = NULL;
+    ole_expect(IXMLDOMDocument2_validate(dtddoc2, &err), S_FALSE);
+    ok(err != NULL, "expected pointer\n");
+    if (err)
+    {
+        res = 0;
+        ole_check(IXMLDOMParseError_get_errorCode(err, &res));
+        /* XML_ILLEGAL_TEXT */
+        todo_wine ok(res == 0xC00CE018, "got %08x\n", res);
+        IXMLDOMParseError_Release(err);
+    }
 
-    /* select an attribute */
-    ole_check(IXMLDOMNode_selectNodes(rootNode, _bstr_(".//@type"), &list));
-    expect_list_and_release(list, "A'type'.E3.E2.E2.D1");
+    ole_check(IXMLDOMDocument2_loadXML(dtddoc2, _bstr_(szEmailXML_20), &b));
+    ok( b == VARIANT_TRUE, "failed to load XML string\n");
+    err = NULL;
+    ole_expect(IXMLDOMDocument2_validate(dtddoc2, &err), S_FALSE);
+    ok(err != NULL, "expected pointer\n");
+    if (err)
+    {
+        res = 0;
+        ole_check(IXMLDOMParseError_get_errorCode(err, &res));
+        /* XML_REQUIRED_ATTRIBUTE_MISSING */
+        todo_wine ok(res == 0xC00CE020, "got %08x\n", res);
+        IXMLDOMParseError_Release(err);
+    }
+
+    IXMLDOMDocument2_Release( dtddoc2 );
+    free_bstrs();
+}
+
+#define helper_ole_check(expr) { \
+    HRESULT r = expr; \
+    ok_(__FILE__, line)(r == S_OK, "=> %i: " #expr " returned %08x\n", __LINE__, r); \
+}
+
+#define helper_expect_list_and_release(list, expstr) { \
+    char *str = list_to_string(list); \
+    ok_(__FILE__, line)(strcmp(str, expstr)==0, "=> %i: Invalid node list: %s, expected %s\n", __LINE__, str, expstr); \
+    if (list) IXMLDOMNodeList_Release(list); \
+}
+
+#define helper_expect_bstr_and_release(bstr, str) { \
+    ok_(__FILE__, line)(lstrcmpW(bstr, _bstr_(str)) == 0, \
+       "=> %i: got %s\n", __LINE__, wine_dbgstr_w(bstr)); \
+    SysFreeString(bstr); \
+}
+
+#define check_ws_ignored(doc, str) _check_ws_ignored(__LINE__, doc, str)
+static inline void _check_ws_ignored(int line, IXMLDOMDocument2* doc, char const* str)
+{
+    IXMLDOMNode *node1, *node2;
+    IXMLDOMNodeList *list;
+    BSTR bstr;
+
+    helper_ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//*[local-name()='html']"), &list));
+    helper_ole_check(IXMLDOMNodeList_get_item(list, 0, &node1));
+    helper_ole_check(IXMLDOMNodeList_get_item(list, 1, &node2));
+    helper_ole_check(IXMLDOMNodeList_reset(list));
+    helper_expect_list_and_release(list, "E1.E5.E1.E2.D1 E2.E5.E1.E2.D1");
+
+    helper_ole_check(IXMLDOMNode_get_childNodes(node1, &list));
+    helper_expect_list_and_release(list, "T1.E1.E5.E1.E2.D1 E2.E1.E5.E1.E2.D1 E3.E1.E5.E1.E2.D1 T4.E1.E5.E1.E2.D1 E5.E1.E5.E1.E2.D1");
+    helper_ole_check(IXMLDOMNode_get_text(node1, &bstr));
+    if (str)
+    {
+        helper_expect_bstr_and_release(bstr, str);
+    }
+    else
+    {
+        helper_expect_bstr_and_release(bstr, "This is a description.");
+    }
+    IXMLDOMNode_Release(node1);
+
+    helper_ole_check(IXMLDOMNode_get_childNodes(node2, &list));
+    helper_expect_list_and_release(list, "T1.E2.E5.E1.E2.D1 E2.E2.E5.E1.E2.D1 T3.E2.E5.E1.E2.D1 E4.E2.E5.E1.E2.D1 T5.E2.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1 T7.E2.E5.E1.E2.D1");
+    helper_ole_check(IXMLDOMNode_get_text(node2, &bstr));
+    helper_expect_bstr_and_release(bstr, "\n                This is a description with preserved whitespace. \n            ");
+    IXMLDOMNode_Release(node2);
+}
+
+#define check_ws_preserved(doc, str) _check_ws_preserved(__LINE__, doc, str)
+static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char const* str)
+{
+    IXMLDOMNode *node1, *node2;
+    IXMLDOMNodeList *list;
+    BSTR bstr;
+
+    helper_ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//*[local-name()='html']"), &list));
+    helper_ole_check(IXMLDOMNodeList_get_item(list, 0, &node1));
+    helper_ole_check(IXMLDOMNodeList_get_item(list, 1, &node2));
+    helper_ole_check(IXMLDOMNodeList_reset(list));
+    helper_expect_list_and_release(list, "E2.E10.E2.E2.D1 E4.E10.E2.E2.D1");
+
+    helper_ole_check(IXMLDOMNode_get_childNodes(node1, &list));
+    helper_expect_list_and_release(list, "T1.E2.E10.E2.E2.D1 E2.E2.E10.E2.E2.D1 T3.E2.E10.E2.E2.D1 E4.E2.E10.E2.E2.D1 T5.E2.E10.E2.E2.D1 E6.E2.E10.E2.E2.D1 T7.E2.E10.E2.E2.D1");
+    helper_ole_check(IXMLDOMNode_get_text(node1, &bstr));
+    if (str)
+    {
+        helper_expect_bstr_and_release(bstr, str);
+    }
+    else
+    {
+        helper_expect_bstr_and_release(bstr, "\n                This is a description. \n            ");
+    }
+    IXMLDOMNode_Release(node1);
+
+    helper_ole_check(IXMLDOMNode_get_childNodes(node2, &list));
+    helper_expect_list_and_release(list, "T1.E4.E10.E2.E2.D1 E2.E4.E10.E2.E2.D1 T3.E4.E10.E2.E2.D1 E4.E4.E10.E2.E2.D1 T5.E4.E10.E2.E2.D1 E6.E4.E10.E2.E2.D1 T7.E4.E10.E2.E2.D1");
+    helper_ole_check(IXMLDOMNode_get_text(node2, &bstr));
+    helper_expect_bstr_and_release(bstr, "\n                This is a description with preserved whitespace. \n            ");
+    IXMLDOMNode_Release(node2);
+}
+
+static void test_preserve_charref(IXMLDOMDocument2 *doc, VARIANT_BOOL preserve)
+{
+    static const WCHAR b1_p[] = {' ','T','e','x','t',' ','A',' ','e','n','d',' ',0};
+    static const WCHAR b1_i[] = {'T','e','x','t',' ','A',' ','e','n','d',0};
+    static const WCHAR b2_p[] = {'A','B',' ','C',' ',0};
+    static const WCHAR b2_i[] = {'A','B',' ','C',0};
+    IXMLDOMNodeList *list;
+    IXMLDOMElement *root;
+    IXMLDOMNode *node;
+    const WCHAR *text;
+    VARIANT_BOOL b;
+    HRESULT hr;
+    BSTR s;
+
+    hr = IXMLDOMDocument2_put_preserveWhiteSpace(doc, preserve);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument2_loadXML(doc, _bstr_(charrefsxml), &b);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument2_get_documentElement(doc, &root);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMElement_get_childNodes(root, &list);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    IXMLDOMElement_Release(root);
+
+    text = preserve == VARIANT_TRUE ? b1_p : b1_i;
+    hr = IXMLDOMNodeList_get_item(list, 0, &node);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    hr = IXMLDOMNode_get_text(node, &s);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(!lstrcmpW(s, text), "0x%x, got %s\n", preserve, wine_dbgstr_w(s));
+    SysFreeString(s);
+    IXMLDOMNode_Release(node);
+
+    text = preserve == VARIANT_TRUE ? b2_p : b2_i;
+    hr = IXMLDOMNodeList_get_item(list, 1, &node);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    hr = IXMLDOMNode_get_text(node, &s);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(!lstrcmpW(s, text), "0x%x, got %s\n", preserve, wine_dbgstr_w(s));
+    SysFreeString(s);
+    IXMLDOMNode_Release(node);
+
+    IXMLDOMNodeList_Release(list);
+}
+
+static void test_whitespace(void)
+{
+    IXMLDOMDocument2 *doc1, *doc2, *doc3, *doc4;
+    IXMLDOMNodeList *list;
+    IXMLDOMElement *root;
+    VARIANT_BOOL b;
+    HRESULT hr;
+    LONG len;
+
+    if (!is_clsid_supported(&CLSID_DOMDocument2, &IID_IXMLDOMDocument2)) return;
+    doc1 = create_document(&IID_IXMLDOMDocument2);
+    doc2 = create_document(&IID_IXMLDOMDocument2);
+
+    ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc2, VARIANT_TRUE));
+    ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc1, &b));
+    ok(b == VARIANT_FALSE, "expected false\n");
+    ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc2, &b));
+    ok(b == VARIANT_TRUE, "expected true\n");
+
+    ole_check(IXMLDOMDocument2_loadXML(doc1, _bstr_(szExampleXML), &b));
+    ok(b == VARIANT_TRUE, "failed to load XML string\n");
+    ole_check(IXMLDOMDocument2_loadXML(doc2, _bstr_(szExampleXML), &b));
+    ok(b == VARIANT_TRUE, "failed to load XML string\n");
+
+    /* switch to XPath */
+    ole_check(IXMLDOMDocument2_setProperty(doc1, _bstr_("SelectionLanguage"), _variantbstr_("XPath")));
+    ole_check(IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionLanguage"), _variantbstr_("XPath")));
+
+    check_ws_ignored(doc1, NULL);
+    check_ws_preserved(doc2, NULL);
+
+    /* new instances copy the property */
+    ole_check(IXMLDOMDocument2_QueryInterface(doc1, &IID_IXMLDOMDocument2, (void**) &doc3));
+    ole_check(IXMLDOMDocument2_QueryInterface(doc2, &IID_IXMLDOMDocument2, (void**) &doc4));
+
+    ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc3, &b));
+    ok(b == VARIANT_FALSE, "expected false\n");
+    ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc4, &b));
+    ok(b == VARIANT_TRUE, "expected true\n");
+
+    check_ws_ignored(doc3, NULL);
+    check_ws_preserved(doc4, NULL);
+
+    /* setting after loading xml affects trimming of leading/trailing ws only */
+    ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc1, VARIANT_TRUE));
+    ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc2, VARIANT_FALSE));
+
+    /* the trailing "\n            " isn't there, because it was ws-only node */
+    check_ws_ignored(doc1, "\n                This is a description. ");
+    check_ws_preserved(doc2, "This is a description.");
+
+    /* it takes effect on reload */
+    ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc1, &b));
+    ok(b == VARIANT_TRUE, "expected true\n");
+    ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc2, &b));
+    ok(b == VARIANT_FALSE, "expected false\n");
+
+    ole_check(IXMLDOMDocument2_loadXML(doc1, _bstr_(szExampleXML), &b));
+    ok(b == VARIANT_TRUE, "failed to load XML string\n");
+    ole_check(IXMLDOMDocument2_loadXML(doc2, _bstr_(szExampleXML), &b));
+    ok(b == VARIANT_TRUE, "failed to load XML string\n");
+
+    check_ws_preserved(doc1, NULL);
+    check_ws_ignored(doc2, NULL);
+
+    /* other instances follow suit */
+    ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc3, &b));
+    ok(b == VARIANT_TRUE, "expected true\n");
+    ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc4, &b));
+    ok(b == VARIANT_FALSE, "expected false\n");
+
+    check_ws_preserved(doc3, NULL);
+    check_ws_ignored(doc4, NULL);
+
+    IXMLDOMDocument2_Release(doc2);
+    IXMLDOMDocument2_Release(doc3);
+    IXMLDOMDocument2_Release(doc4);
+
+    /* text with char references */
+    test_preserve_charref(doc1, VARIANT_TRUE);
+    test_preserve_charref(doc1, VARIANT_FALSE);
+
+    /* formatting whitespaces */
+    hr = IXMLDOMDocument2_put_preserveWhiteSpace(doc1, VARIANT_FALSE);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument2_loadXML(doc1, _bstr_(complete7), &b);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(b == VARIANT_TRUE, "for %x\n", b);
+
+    hr = IXMLDOMDocument2_get_documentElement(doc1, &root);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    hr = IXMLDOMElement_get_childNodes(root, &list);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    len = 0;
+    hr = IXMLDOMNodeList_get_length(list, &len);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(len == 3, "got %d\n", len);
+    IXMLDOMNodeList_Release(list);
+    IXMLDOMElement_Release(root);
+
+    IXMLDOMDocument2_Release(doc1);
+
+    free_bstrs();
+}
+
+typedef struct {
+    const GUID *clsid;
+    const char *name;
+    const char *ns;
+    HRESULT hr;
+} selection_ns_t;
+
+/* supposed to be tested with szExampleXML */
+static const selection_ns_t selection_ns_data[] = {
+    { &CLSID_DOMDocument,   "CLSID_DOMDocument",   "\txmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK },
+    { &CLSID_DOMDocument,   "CLSID_DOMDocument",   "\n\rxmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK },
+    { &CLSID_DOMDocument,   "CLSID_DOMDocument",   " xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK },
+    { &CLSID_DOMDocument,   "CLSID_DOMDocument",   "xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' ", S_OK },
+
+    { &CLSID_DOMDocument2,  "CLSID_DOMDocument2",  "\txmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK },
+    { &CLSID_DOMDocument2,  "CLSID_DOMDocument2",  "\n\rxmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK },
+    { &CLSID_DOMDocument2,  "CLSID_DOMDocument2",  " xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK },
+    { &CLSID_DOMDocument2,  "CLSID_DOMDocument2",  "xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' ", S_OK },
+
+    { &CLSID_DOMDocument30, "CLSID_DOMDocument30", "\txmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK },
+    { &CLSID_DOMDocument30, "CLSID_DOMDocument30", "\n\rxmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK },
+    { &CLSID_DOMDocument30, "CLSID_DOMDocument30", " xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK },
+    { &CLSID_DOMDocument30, "CLSID_DOMDocument30", "xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' ", S_OK },
+
+    { &CLSID_DOMDocument40, "CLSID_DOMDocument40", "\txmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK },
+    { &CLSID_DOMDocument40, "CLSID_DOMDocument40", "\n\rxmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK },
+    { &CLSID_DOMDocument40, "CLSID_DOMDocument40", " xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK },
+    { &CLSID_DOMDocument40, "CLSID_DOMDocument40", "xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' ", S_OK },
+
+    { &CLSID_DOMDocument60, "CLSID_DOMDocument60", "\txmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK },
+    { &CLSID_DOMDocument60, "CLSID_DOMDocument60", "\n\rxmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK },
+    { &CLSID_DOMDocument60, "CLSID_DOMDocument60", " xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK },
+    { &CLSID_DOMDocument60, "CLSID_DOMDocument60", "xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' ", S_OK },
+
+    { NULL }
+};
+
+typedef struct {
+    const char *query;
+    const char *list;
+} xpath_test_t;
+
+static const xpath_test_t xpath_test[] = {
+    { "*/a", "E1.E1.E2.D1 E1.E2.E2.D1 E1.E4.E2.D1" },
+    { "*/b", "E2.E1.E2.D1 E2.E2.E2.D1 E2.E4.E2.D1" },
+    { "*/c", "E3.E1.E2.D1 E3.E2.E2.D1" },
+    { "*/d", "E4.E1.E2.D1 E4.E2.E2.D1 E4.E4.E2.D1" },
+    { "//a", "E1.E1.E2.D1 E1.E2.E2.D1 E1.E4.E2.D1" },
+    { "//b", "E2.E1.E2.D1 E2.E2.E2.D1 E2.E4.E2.D1" },
+    { "//c", "E3.E1.E2.D1 E3.E2.E2.D1" },
+    { "//d", "E4.E1.E2.D1 E4.E2.E2.D1 E4.E4.E2.D1" },
+    { "//c[@type]", "E3.E2.E2.D1" },
+    { "//c[@type]/ancestor::node()[1]", "E2.E2.D1" },
+    { "//c[@type]/ancestor-or-self::node()[1]", "E3.E2.E2.D1" },
+    { "//c[@type]/attribute::node()[1]", "A'type'.E3.E2.E2.D1" },
+    { "//c[@type]/child::node()[1]", "T1.E3.E2.E2.D1"  },
+    { "//c[@type]/descendant::node()[1]", "T1.E3.E2.E2.D1" },
+    { "//c[@type]/descendant-or-self::node()[1]", "E3.E2.E2.D1" },
+    { "//c[@type]/following::node()[1]", "E4.E2.E2.D1" },
+    { "//c[@type]/following-sibling::node()[1]", "E4.E2.E2.D1" },
+    { "//c[@type]/parent::node()[1]", "E2.E2.D1" },
+    { "//c[@type]/preceding::node()[1]", "T1.E2.E2.E2.D1" },
+    { "//c[@type]/self::node()[1]", "E3.E2.E2.D1" },
+    { "child::*", "E1.E2.D1 E2.E2.D1 E3.E2.D1 E4.E2.D1" },
+    { "child::node()", "E1.E2.D1 E2.E2.D1 E3.E2.D1 E4.E2.D1" },
+    { "child::text()", "" },
+    { "child::*/..", "E2.D1" },
+    { "child::*//@*/..", "E2.E5.E1.E2.D1 E3.E2.E2.D1" },
+    { "self::node()", "E2.D1" },
+    { "ancestor::node()", "D1" },
+    { "elem[c][last()]/a", "E1.E2.E2.D1"},
+    { "ancestor-or-self::node()[1]", "E2.D1" },
+    { "((//a)[1])[last()]", "E1.E1.E2.D1" },
+    { NULL }
+};
+
+static void test_XPath(void)
+{
+    const selection_ns_t *ptr = selection_ns_data;
+    const xpath_test_t *xptest = xpath_test;
+    VARIANT var;
+    VARIANT_BOOL b;
+    IXMLDOMDocument2 *doc;
+    IXMLDOMDocument *doc2;
+    IXMLDOMNode *rootNode;
+    IXMLDOMNode *elem1Node;
+    IXMLDOMNode *node;
+    IXMLDOMNodeList *list;
+    IXMLDOMElement *elem;
+    IXMLDOMAttribute *attr;
+    DOMNodeType type;
+    HRESULT hr;
+    LONG len;
+    BSTR str;
+
+    if (!is_clsid_supported(&CLSID_DOMDocument2, &IID_IXMLDOMDocument2)) return;
+    doc = create_document(&IID_IXMLDOMDocument2);
+
+    hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szExampleXML), &b);
+    EXPECT_HR(hr, S_OK);
+    ok(b == VARIANT_TRUE, "failed to load XML string\n");
+
+    /* switch to XPath */
+    ole_check(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), _variantbstr_("XPath")));
+
+    /* some simple queries*/
+    EXPECT_REF(doc, 1);
+    hr = IXMLDOMDocument2_selectNodes(doc, _bstr_("root"), &list);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(doc, 1);
+    EXPECT_LIST_LEN(list, 1);
+
+    EXPECT_REF(list, 1);
+    hr = IXMLDOMNodeList_get_item(list, 0, &rootNode);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(list, 1);
+    EXPECT_REF(rootNode, 1);
+
+    hr = IXMLDOMNodeList_reset(list);
+    EXPECT_HR(hr, S_OK);
+    expect_list_and_release(list, "E2.D1");
+
+    /* peform xpath tests */
+    for ( ; xptest->query ; xptest++ )
+    {
+        char *str;
+
+        hr = IXMLDOMNode_selectNodes(rootNode, _bstr_(xptest->query), &list);
+        ok(hr == S_OK, "query evaluation failed for query=%s\n", xptest->query);
+
+        if (hr != S_OK)
+            continue;
+
+        str = list_to_string(list);
+
+        ok(strcmp(str, xptest->list)==0, "query=%s, invalid node list: %s, expected %s\n",
+            xptest->query, str, xptest->list);
+
+        if (list)
+            IXMLDOMNodeList_Release(list);
+    }
+
+if (0)
+{
+    /* namespace:: axis test is disabled until namespace definitions
+       are supported as attribute nodes, currently it's another node type */
+    hr = IXMLDOMDocument2_selectNodes(doc, _bstr_("/root/namespace::*"), &list);
+    EXPECT_HR(hr, S_OK);
+    len = -1;
+    hr = IXMLDOMNodeList_get_length(list, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(len == 2, "got %d\n", len);
+
+    hr = IXMLDOMNodeList_nextNode(list, &node);
+    EXPECT_HR(hr, S_OK);
+    type = NODE_INVALID;
+    hr = IXMLDOMNode_get_nodeType(node, &type);
+    EXPECT_HR(hr, S_OK);
+    ok(type == NODE_ATTRIBUTE, "got %d\n", type);
+    IXMLDOMNode_Release(node);
+
+    IXMLDOMNodeList_Release(list);
+}
+
+    ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("root//c"), &list));
+    expect_list_and_release(list, "E3.E1.E2.D1 E3.E2.E2.D1");
+
+    ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//c[@type]"), &list));
+    expect_list_and_release(list, "E3.E2.E2.D1");
+
+    ole_check(IXMLDOMNode_selectNodes(rootNode, _bstr_("elem"), &list));
+    /* using get_item for query results advances the position */
+    ole_check(IXMLDOMNodeList_get_item(list, 1, &node));
+    expect_node(node, "E2.E2.D1");
+    IXMLDOMNode_Release(node);
+    ole_check(IXMLDOMNodeList_nextNode(list, &node));
+    expect_node(node, "E4.E2.D1");
+    IXMLDOMNode_Release(node);
+    ole_check(IXMLDOMNodeList_reset(list));
+    expect_list_and_release(list, "E1.E2.D1 E2.E2.D1 E4.E2.D1");
+
+    ole_check(IXMLDOMNode_selectNodes(rootNode, _bstr_("."), &list));
+    expect_list_and_release(list, "E2.D1");
+
+    ole_check(IXMLDOMNode_selectNodes(rootNode, _bstr_("elem[3]/preceding-sibling::*"), &list));
+    ole_check(IXMLDOMNodeList_get_item(list, 0, &elem1Node));
+    ole_check(IXMLDOMNodeList_reset(list));
+    expect_list_and_release(list, "E1.E2.D1 E2.E2.D1 E3.E2.D1");
+
+    /* select an attribute */
+    ole_check(IXMLDOMNode_selectNodes(rootNode, _bstr_(".//@type"), &list));
+    expect_list_and_release(list, "A'type'.E3.E2.E2.D1");
 
     /* would evaluate to a number */
     ole_expect(IXMLDOMNode_selectNodes(rootNode, _bstr_("count(*)"), &list), E_FAIL);
@@ -3008,15 +4624,15 @@ static void test_XPath(void)
     /* no results */
     ole_check(IXMLDOMNode_selectNodes(rootNode, _bstr_("c"), &list));
     expect_list_and_release(list, "");
-    ole_check(IXMLDOMDocument_selectNodes(doc, _bstr_("elem//c"), &list));
+    ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("elem//c"), &list));
     expect_list_and_release(list, "");
-    ole_check(IXMLDOMDocument_selectNodes(doc, _bstr_("//elem[4]"), &list));
+    ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//elem[4]"), &list));
     expect_list_and_release(list, "");
-    ole_check(IXMLDOMDocument_selectNodes(doc, _bstr_("root//elem[0]"), &list));
+    ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("root//elem[0]"), &list));
     expect_list_and_release(list, "");
 
     /* foo undeclared in document node */
-    ole_expect(IXMLDOMDocument_selectNodes(doc, _bstr_("root//foo:c"), &list), E_FAIL);
+    ole_expect(IXMLDOMDocument2_selectNodes(doc, _bstr_("root//foo:c"), &list), E_FAIL);
     /* undeclared in <root> node */
     ole_expect(IXMLDOMNode_selectNodes(rootNode, _bstr_(".//foo:c"), &list), E_FAIL);
     /* undeclared in <elem> node */
@@ -3026,205 +4642,301 @@ static void test_XPath(void)
     expect_list_and_release(list, "E3.E4.E2.D1");
 
     /* it has to be declared in SelectionNamespaces */
-    todo_wine ole_check(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"),
+    ole_check(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"),
         _variantbstr_("xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'")));
 
     /* now the namespace can be used */
-    todo_wine ole_check(IXMLDOMDocument_selectNodes(doc, _bstr_("root//test:c"), &list));
-    todo_wine expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1");
-    todo_wine ole_check(IXMLDOMNode_selectNodes(rootNode, _bstr_(".//test:c"), &list));
-    todo_wine expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1");
-    todo_wine ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_("//test:c"), &list));
-    todo_wine expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1");
-    todo_wine ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_(".//test:x"), &list));
-    todo_wine expect_list_and_release(list, "E5.E1.E4.E1.E2.D1");
+    ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("root//test:c"), &list));
+    expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1");
+    ole_check(IXMLDOMNode_selectNodes(rootNode, _bstr_(".//test:c"), &list));
+    expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1");
+    ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_("//test:c"), &list));
+    expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1");
+    ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_(".//test:x"), &list));
+    expect_list_and_release(list, "E5.E1.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1");
 
     /* SelectionNamespaces syntax error - the namespaces doesn't work anymore but the value is stored */
     ole_expect(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"),
         _variantbstr_("xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' xmlns:foo=###")), E_FAIL);
 
-    ole_expect(IXMLDOMDocument_selectNodes(doc, _bstr_("root//foo:c"), &list), E_FAIL);
+    ole_expect(IXMLDOMDocument2_selectNodes(doc, _bstr_("root//foo:c"), &list), E_FAIL);
 
     VariantInit(&var);
-    todo_wine ole_check(IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionNamespaces"), &var));
-    todo_wine expect_eq(V_VT(&var), VT_BSTR, int, "%x");
+    ole_check(IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionNamespaces"), &var));
+    expect_eq(V_VT(&var), VT_BSTR, int, "%x");
     if (V_VT(&var) == VT_BSTR)
         expect_bstr_eq_and_free(V_BSTR(&var), "xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' xmlns:foo=###");
 
     /* extra attributes - same thing*/
     ole_expect(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"),
         _variantbstr_("xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' param='test'")), E_FAIL);
-    ole_expect(IXMLDOMDocument_selectNodes(doc, _bstr_("root//foo:c"), &list), E_FAIL);
+    ole_expect(IXMLDOMDocument2_selectNodes(doc, _bstr_("root//foo:c"), &list), E_FAIL);
 
     IXMLDOMNode_Release(rootNode);
     IXMLDOMNode_Release(elem1Node);
-    IXMLDOMDocument_Release(doc);
-    free_bstrs();
-}
 
-static void test_cloneNode(void )
-{
-    IXMLDOMDocument *doc = NULL;
-    VARIANT_BOOL b;
-    IXMLDOMNodeList *pList;
-    IXMLDOMNamedNodeMap *mapAttr;
-    LONG nLength = 0, nLength1 = 0;
-    LONG nAttrCnt = 0, nAttrCnt1 = 0;
-    IXMLDOMNode *node;
-    IXMLDOMNode *node_clone;
-    IXMLDOMNode *node_first;
-    HRESULT r;
-    BSTR str;
-    static const WCHAR szSearch[] = { 'l', 'c', '/', 'p', 'r', 0 };
+    /* alter document with already built list */
+    hr = IXMLDOMDocument2_selectNodes(doc, _bstr_("root"), &list);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_LIST_LEN(list, 1);
 
-    r = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc );
-    ok( r == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", r );
-    if( r != S_OK )
-        return;
+    hr = IXMLDOMDocument2_get_lastChild(doc, &rootNode);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(rootNode, 1);
+    EXPECT_REF(doc, 1);
 
-    str = SysAllocString( szComplete4 );
-    ole_check(IXMLDOMDocument_loadXML(doc, str, &b));
-    ok(b == VARIANT_TRUE, "failed to load XML string\n");
-    SysFreeString(str);
+    hr = IXMLDOMDocument2_removeChild(doc, rootNode, NULL);
+    EXPECT_HR(hr, S_OK);
+    IXMLDOMNode_Release(rootNode);
 
-    if(!b)
-        return;
+    EXPECT_LIST_LEN(list, 1);
 
-    str = SysAllocString( szSearch);
-    r = IXMLDOMNode_selectSingleNode(doc, str, &node);
-    ok( r == S_OK, "ret %08x\n", r );
-    ok( node != NULL, "node %p\n", node );
+    hr = IXMLDOMNodeList_get_item(list, 0, &rootNode);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(rootNode, 1);
+
+    IXMLDOMNodeList_Release(list);
+
+    hr = IXMLDOMNode_get_nodeName(rootNode, &str);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(str, _bstr_("root")), "got %s\n", wine_dbgstr_w(str));
     SysFreeString(str);
+    IXMLDOMNode_Release(rootNode);
 
-    if(!node)
-    {
-        IXMLDOMDocument_Release(doc);
-        return;
-    }
+    /* alter node from list and get it another time */
+    hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szExampleXML), &b);
+    EXPECT_HR(hr, S_OK);
+    ok(b == VARIANT_TRUE, "failed to load XML string\n");
 
-    /* Check invalid parameter */
-    r = IXMLDOMNode_cloneNode(node, VARIANT_TRUE, NULL);
-    ok( r == E_INVALIDARG, "ret %08x\n", r );
+    hr = IXMLDOMDocument2_selectNodes(doc, _bstr_("root"), &list);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_LIST_LEN(list, 1);
 
-    /* All Children */
-    r = IXMLDOMNode_cloneNode(node, VARIANT_TRUE, &node_clone);
-    ok( r == S_OK, "ret %08x\n", r );
-    ok( node_clone != NULL, "node %p\n", node );
+    hr = IXMLDOMNodeList_get_item(list, 0, &rootNode);
+    EXPECT_HR(hr, S_OK);
 
-    if(!node_clone)
-    {
-        IXMLDOMDocument_Release(doc);
-        IXMLDOMNode_Release(node);
-        return;
-    }
+    hr = IXMLDOMNode_QueryInterface(rootNode, &IID_IXMLDOMElement, (void**)&elem);
+    EXPECT_HR(hr, S_OK);
 
-    r = IXMLDOMNode_get_firstChild(node_clone, &node_first);
-    ok( r == S_OK, "ret %08x\n", r );
-    if(r == S_OK)
-    {
-        IXMLDOMDocument *doc2;
+    V_VT(&var) = VT_I2;
+    V_I2(&var) = 1;
+    hr = IXMLDOMElement_setAttribute(elem, _bstr_("attrtest"), var);
+    EXPECT_HR(hr, S_OK);
+    IXMLDOMElement_Release(elem);
+    IXMLDOMNode_Release(rootNode);
 
-        r = IXMLDOMNode_get_ownerDocument(node_clone, &doc2);
-        ok( r == S_OK, "ret %08x\n", r );
-        if(r == S_OK)
-            IXMLDOMDocument_Release(doc2);
+    /* now check attribute to be present */
+    hr = IXMLDOMNodeList_get_item(list, 0, &rootNode);
+    EXPECT_HR(hr, S_OK);
 
-        IXMLDOMNode_Release(node_first);
-    }
+    hr = IXMLDOMNode_QueryInterface(rootNode, &IID_IXMLDOMElement, (void**)&elem);
+    EXPECT_HR(hr, S_OK);
 
-    r = IXMLDOMNode_get_childNodes(node, &pList);
-    ok( r == S_OK, "ret %08x\n", r );
-    if (pList)
-       {
-               IXMLDOMNodeList_get_length(pList, &nLength);
-               IXMLDOMNodeList_Release(pList);
-       }
+    hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("attrtest"), &attr);
+    EXPECT_HR(hr, S_OK);
+    IXMLDOMAttribute_Release(attr);
 
-    r = IXMLDOMNode_get_attributes(node, &mapAttr);
-    ok( r == S_OK, "ret %08x\n", r );
-    if(mapAttr)
-    {
-        IXMLDOMNamedNodeMap_get_length(mapAttr, &nAttrCnt);
-        IXMLDOMNamedNodeMap_Release(mapAttr);
-    }
+    IXMLDOMElement_Release(elem);
+    IXMLDOMNode_Release(rootNode);
 
-    r = IXMLDOMNode_get_childNodes(node_clone, &pList);
-    ok( r == S_OK, "ret %08x\n", r );
-    if (pList)
-       {
-               IXMLDOMNodeList_get_length(pList, &nLength1);
-               IXMLDOMNodeList_Release(pList);
-       }
+    /* and now check for attribute in original document */
+    hr = IXMLDOMDocument2_get_documentElement(doc, &elem);
+    EXPECT_HR(hr, S_OK);
 
-    r = IXMLDOMNode_get_attributes(node_clone, &mapAttr);
-    ok( r == S_OK, "ret %08x\n", r );
-    if(mapAttr)
-    {
-        IXMLDOMNamedNodeMap_get_length(mapAttr, &nAttrCnt1);
-        IXMLDOMNamedNodeMap_Release(mapAttr);
-    }
+    hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("attrtest"), &attr);
+    EXPECT_HR(hr, S_OK);
+    IXMLDOMAttribute_Release(attr);
 
-    ok(nLength == nLength1, "wrong Child count (%d, %d)\n", nLength, nLength1);
-    ok(nAttrCnt == nAttrCnt1, "wrong Attribute count (%d, %d)\n", nAttrCnt, nAttrCnt1);
-    IXMLDOMNode_Release(node_clone);
+    IXMLDOMElement_Release(elem);
 
-    /* No Children */
-    r = IXMLDOMNode_cloneNode(node, VARIANT_FALSE, &node_clone);
-    ok( r == S_OK, "ret %08x\n", r );
-    ok( node_clone != NULL, "node %p\n", node );
+    /* attach node from list to another document */
+    doc2 = create_document(&IID_IXMLDOMDocument);
 
-    if(!node_clone)
-    {
-        IXMLDOMDocument_Release(doc);
-        IXMLDOMNode_Release(node);
-        return;
-    }
+    hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szExampleXML), &b);
+    EXPECT_HR(hr, S_OK);
+    ok(b == VARIANT_TRUE, "failed to load XML string\n");
 
-    r = IXMLDOMNode_get_firstChild(node_clone, &node_first);
-    ok( r == S_FALSE, "ret %08x\n", r );
-    if(r == S_OK)
-    {
-        IXMLDOMDocument *doc2;
+    hr = IXMLDOMDocument2_selectNodes(doc, _bstr_("root"), &list);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_LIST_LEN(list, 1);
 
-        r = IXMLDOMNode_get_ownerDocument(node_clone, &doc2);
-        ok( r == S_OK, "ret %08x\n", r );
-        if(r == S_OK)
-            IXMLDOMDocument_Release(doc2);
+    hr = IXMLDOMNodeList_get_item(list, 0, &rootNode);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(rootNode, 1);
 
-        IXMLDOMNode_Release(node_first);
-    }
+    hr = IXMLDOMDocument_appendChild(doc2, rootNode, NULL);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(rootNode, 1);
+    EXPECT_REF(doc2, 1);
+    EXPECT_REF(list, 1);
 
-    r = IXMLDOMNode_get_childNodes(node_clone, &pList);
-    ok( r == S_OK, "ret %08x\n", r );
-    if (pList)
-       {
-               IXMLDOMNodeList_get_length(pList, &nLength1);
-        ok( nLength1 == 0, "Length should be 0 (%d)\n", nLength1);
-               IXMLDOMNodeList_Release(pList);
-       }
-
-    r = IXMLDOMNode_get_attributes(node_clone, &mapAttr);
-    ok( r == S_OK, "ret %08x\n", r );
-    if(mapAttr)
+    EXPECT_LIST_LEN(list, 1);
+
+    IXMLDOMNode_Release(rootNode);
+    IXMLDOMNodeList_Release(list);
+    IXMLDOMDocument_Release(doc2);
+    IXMLDOMDocument2_Release(doc);
+
+    while (ptr->clsid)
     {
-        IXMLDOMNamedNodeMap_get_length(mapAttr, &nAttrCnt1);
-        ok( nAttrCnt1 == 3, "Attribute count should be 3 (%d)\n", nAttrCnt1);
-        IXMLDOMNamedNodeMap_Release(mapAttr);
-    }
+        if (is_clsid_supported(ptr->clsid, &IID_IXMLDOMDocument2))
+        {
+            hr = CoCreateInstance(ptr->clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (void**)&doc);
+            ok(hr == S_OK, "got 0x%08x\n", hr);
+        }
+        else
+        {
+            ptr++;
+            continue;
+        }
 
-    ok(nLength != nLength1, "wrong Child count (%d, %d)\n", nLength, nLength1);
-    ok(nAttrCnt == nAttrCnt1, "wrong Attribute count (%d, %d)\n", nAttrCnt, nAttrCnt1);
-    IXMLDOMNode_Release(node_clone);
+        hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szExampleXML), &b);
+        EXPECT_HR(hr, S_OK);
+        ok(b == VARIANT_TRUE, "failed to load, %s\n", ptr->name);
 
+        hr = IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), _variantbstr_("XPath"));
+        EXPECT_HR(hr, S_OK);
 
-    IXMLDOMNode_Release(node);
-    IXMLDOMDocument_Release(doc);
+        V_VT(&var) = VT_BSTR;
+        V_BSTR(&var) = _bstr_(ptr->ns);
+
+        hr = IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), var);
+        ok(hr == ptr->hr, "got 0x%08x, for %s, %s\n", hr, ptr->name, ptr->ns);
+
+        V_VT(&var) = VT_EMPTY;
+        hr = IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionNamespaces"), &var);
+        EXPECT_HR(hr, S_OK);
+        ok(V_VT(&var) == VT_BSTR, "got wrong property type %d\n", V_VT(&var));
+        ok(!lstrcmpW(V_BSTR(&var), _bstr_(ptr->ns)), "got wrong value %s\n", wine_dbgstr_w(V_BSTR(&var)));
+        VariantClear(&var);
+
+        hr = IXMLDOMDocument2_selectNodes(doc, _bstr_("root//test:c"), &list);
+        EXPECT_HR(hr, S_OK);
+        if (hr == S_OK)
+            expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1");
+
+        IXMLDOMDocument2_Release(doc);
+        ptr++;
+        free_bstrs();
+    }
+
+    free_bstrs();
 }
 
-static void test_xmlTypes(void)
+static void test_cloneNode(void )
 {
-    IXMLDOMDocument *doc = NULL;
-    IXMLDOMElement *pRoot;
+    IXMLDOMDocument *doc, *doc2;
+    VARIANT_BOOL b;
+    IXMLDOMNodeList *pList;
+    IXMLDOMNamedNodeMap *mapAttr;
+    LONG length, length1;
+    LONG attr_cnt, attr_cnt1;
+    IXMLDOMNode *node, *attr;
+    IXMLDOMNode *node_clone;
+    IXMLDOMNode *node_first;
+    HRESULT hr;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    ole_check(IXMLDOMDocument_loadXML(doc, _bstr_(complete4A), &b));
+    ok(b == VARIANT_TRUE, "failed to load XML string\n");
+
+    hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("lc/pr"), &node);
+    ok( hr == S_OK, "ret %08x\n", hr );
+    ok( node != NULL, "node %p\n", node );
+
+    /* Check invalid parameter */
+    hr = IXMLDOMNode_cloneNode(node, VARIANT_TRUE, NULL);
+    ok( hr == E_INVALIDARG, "ret %08x\n", hr );
+
+    /* All Children */
+    hr = IXMLDOMNode_cloneNode(node, VARIANT_TRUE, &node_clone);
+    ok( hr == S_OK, "ret %08x\n", hr );
+    ok( node_clone != NULL, "node %p\n", node );
+
+    hr = IXMLDOMNode_get_firstChild(node_clone, &node_first);
+    ok( hr == S_OK, "ret %08x\n", hr );
+    hr = IXMLDOMNode_get_ownerDocument(node_clone, &doc2);
+    ok( hr == S_OK, "ret %08x\n", hr );
+    IXMLDOMDocument_Release(doc2);
+    IXMLDOMNode_Release(node_first);
+
+    hr = IXMLDOMNode_get_childNodes(node, &pList);
+    ok( hr == S_OK, "ret %08x\n", hr );
+    length = 0;
+    hr = IXMLDOMNodeList_get_length(pList, &length);
+    ok( hr == S_OK, "ret %08x\n", hr );
+    ok(length == 1, "got %d\n", length);
+    IXMLDOMNodeList_Release(pList);
+
+    hr = IXMLDOMNode_get_attributes(node, &mapAttr);
+    ok( hr == S_OK, "ret %08x\n", hr );
+    attr_cnt = 0;
+    hr = IXMLDOMNamedNodeMap_get_length(mapAttr, &attr_cnt);
+    ok( hr == S_OK, "ret %08x\n", hr );
+    ok(attr_cnt == 3, "got %d\n", attr_cnt);
+    IXMLDOMNamedNodeMap_Release(mapAttr);
+
+    hr = IXMLDOMNode_get_childNodes(node_clone, &pList);
+    ok( hr == S_OK, "ret %08x\n", hr );
+    length1 = 0;
+    hr = IXMLDOMNodeList_get_length(pList, &length1);
+    ok(length1 == 1, "got %d\n", length1);
+    ok( hr == S_OK, "ret %08x\n", hr );
+    IXMLDOMNodeList_Release(pList);
+
+    hr = IXMLDOMNode_get_attributes(node_clone, &mapAttr);
+    ok( hr == S_OK, "ret %08x\n", hr );
+    attr_cnt1 = 0;
+    hr = IXMLDOMNamedNodeMap_get_length(mapAttr, &attr_cnt1);
+    ok( hr == S_OK, "ret %08x\n", hr );
+    ok(attr_cnt1 == 3, "got %d\n", attr_cnt1);
+    /* now really get some attributes from cloned element */
+    attr = NULL;
+    hr = IXMLDOMNamedNodeMap_getNamedItem(mapAttr, _bstr_("id"), &attr);
+    ok(hr == S_OK, "ret %08x\n", hr);
+    IXMLDOMNode_Release(attr);
+    IXMLDOMNamedNodeMap_Release(mapAttr);
+
+    ok(length == length1, "wrong Child count (%d, %d)\n", length, length1);
+    ok(attr_cnt == attr_cnt1, "wrong Attribute count (%d, %d)\n", attr_cnt, attr_cnt1);
+    IXMLDOMNode_Release(node_clone);
+
+    /* No Children */
+    hr = IXMLDOMNode_cloneNode(node, VARIANT_FALSE, &node_clone);
+    ok( hr == S_OK, "ret %08x\n", hr );
+    ok( node_clone != NULL, "node %p\n", node );
+
+    hr = IXMLDOMNode_get_firstChild(node_clone, &node_first);
+    ok(hr == S_FALSE, "ret %08x\n", hr );
+
+    hr = IXMLDOMNode_get_childNodes(node_clone, &pList);
+    ok(hr == S_OK, "ret %08x\n", hr );
+    hr = IXMLDOMNodeList_get_length(pList, &length1);
+    ok(hr == S_OK, "ret %08x\n", hr );
+    ok( length1 == 0, "Length should be 0 (%d)\n", length1);
+    IXMLDOMNodeList_Release(pList);
+
+    hr = IXMLDOMNode_get_attributes(node_clone, &mapAttr);
+    ok(hr == S_OK, "ret %08x\n", hr );
+    hr = IXMLDOMNamedNodeMap_get_length(mapAttr, &attr_cnt1);
+    ok(hr == S_OK, "ret %08x\n", hr );
+    ok(attr_cnt1 == 3, "Attribute count should be 3 (%d)\n", attr_cnt1);
+    IXMLDOMNamedNodeMap_Release(mapAttr);
+
+    ok(length != length1, "wrong Child count (%d, %d)\n", length, length1);
+    ok(attr_cnt == attr_cnt1, "wrong Attribute count (%d, %d)\n", attr_cnt, attr_cnt1);
+    IXMLDOMNode_Release(node_clone);
+
+    IXMLDOMNode_Release(node);
+    IXMLDOMDocument_Release(doc);
+    free_bstrs();
+}
+
+static void test_xmlTypes(void)
+{
+    IXMLDOMDocument *doc;
+    IXMLDOMElement *pRoot;
     HRESULT hr;
     IXMLDOMComment *pComment;
     IXMLDOMElement *pElement;
@@ -3235,18 +4947,17 @@ static void test_xmlTypes(void)
     IXMLDOMDocumentFragment *pDocFrag = NULL;
     IXMLDOMEntityReference *pEntityRef = NULL;
     BSTR str;
-    IXMLDOMNode *pNextChild = (IXMLDOMNode *)0x1;   /* Used for testing Siblings */
+    IXMLDOMNode *pNextChild;
     VARIANT v;
     LONG len = 0;
 
-    hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc );
-    ok( hr == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", hr );
-    if( hr != S_OK )
-        return;
+    doc = create_document(&IID_IXMLDOMDocument);
 
+    pNextChild = (void*)0xdeadbeef;
     hr = IXMLDOMDocument_get_nextSibling(doc, NULL);
     ok(hr == E_INVALIDARG, "ret %08x\n", hr );
 
+    pNextChild = (void*)0xdeadbeef;
     hr = IXMLDOMDocument_get_nextSibling(doc, &pNextChild);
     ok(hr == S_FALSE, "ret %08x\n", hr );
     ok(pNextChild == NULL, "pDocChild not NULL\n");
@@ -3255,32 +4966,18 @@ static void test_xmlTypes(void)
     hr = IXMLDOMDocument_get_previousSibling(doc, NULL);
     ok(hr == E_INVALIDARG, "ret %08x\n", hr );
 
-    pNextChild = (IXMLDOMNode *)0x1;
+    pNextChild = (void*)0xdeadbeef;
     hr = IXMLDOMDocument_get_previousSibling(doc, &pNextChild);
     ok(hr == S_FALSE, "ret %08x\n", hr );
     ok(pNextChild == NULL, "pNextChild not NULL\n");
 
-    /* test get_attributes */
-    hr = IXMLDOMDocument_get_attributes( doc, NULL );
-    ok( hr == E_INVALIDARG, "get_attributes returned wrong code\n");
-
-    pAttribs = (IXMLDOMNamedNodeMap*)0x1;
-    hr = IXMLDOMDocument_get_attributes( doc, &pAttribs);
-    ok(hr == S_FALSE, "ret %08x\n", hr );
-    ok( pAttribs == NULL, "pAttribs not NULL\n");
-
     /* test get_dataType */
+    V_VT(&v) = VT_EMPTY;
     hr = IXMLDOMDocument_get_dataType(doc, &v);
     ok(hr == S_FALSE, "ret %08x\n", hr );
     ok( V_VT(&v) == VT_NULL, "incorrect dataType type\n");
     VariantClear(&v);
 
-    /* test nodeTypeString */
-    hr = IXMLDOMDocument_get_nodeTypeString(doc, &str);
-    ok(hr == S_OK, "ret %08x\n", hr );
-    ok( !lstrcmpW( str, _bstr_("document") ), "incorrect nodeTypeString string\n");
-    SysFreeString(str);
-
     /* test implementation */
     hr = IXMLDOMDocument_get_implementation(doc, NULL);
     ok(hr == E_INVALIDARG, "ret %08x\n", hr );
@@ -3359,21 +5056,6 @@ static void test_xmlTypes(void)
             ok(hr == S_OK, "ret %08x\n", hr );
             if(hr == S_OK)
             {
-                /* test get_attributes */
-                hr = IXMLDOMComment_get_attributes( pComment, NULL );
-                ok( hr == E_INVALIDARG, "get_attributes returned wrong code\n");
-
-                pAttribs = (IXMLDOMNamedNodeMap*)0x1;
-                hr = IXMLDOMComment_get_attributes( pComment, &pAttribs);
-                ok(hr == S_FALSE, "ret %08x\n", hr );
-                ok( pAttribs == NULL, "pAttribs not NULL\n");
-
-                /* test nodeTypeString */
-                hr = IXMLDOMComment_get_nodeTypeString(pComment, &str);
-                ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("comment") ), "incorrect nodeTypeString string\n");
-                SysFreeString(str);
-
                 hr = IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pComment, NULL);
                 ok(hr == S_OK, "ret %08x\n", hr );
 
@@ -3387,11 +5069,6 @@ static void test_xmlTypes(void)
                 ok( !lstrcmpW( str, szCommentXML ), "incorrect comment xml\n");
                 SysFreeString(str);
 
-                hr = IXMLDOMComment_get_dataType(pComment, &v);
-                ok(hr == S_FALSE, "ret %08x\n", hr );
-                ok( V_VT(&v) == VT_NULL, "incorrect dataType type\n");
-                VariantClear(&v);
-
                 /* put data Tests */
                 hr = IXMLDOMComment_put_data(pComment, _bstr_("This &is a ; test <>\\"));
                 ok(hr == S_OK, "ret %08x\n", hr );
@@ -3402,13 +5079,6 @@ static void test_xmlTypes(void)
                 ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect get_data string\n");
                 SysFreeString(str);
 
-                /* get data Tests */
-                hr = IXMLDOMComment_get_nodeValue(pComment, &v);
-                ok(hr == S_OK, "ret %08x\n", hr );
-                ok( V_VT(&v) == VT_BSTR, "incorrect dataType type\n");
-                ok( !lstrcmpW( V_BSTR(&v), _bstr_("This &is a ; test <>\\") ), "incorrect get_nodeValue string\n");
-                VariantClear(&v);
-
                 /* Confirm XML text is good */
                 hr = IXMLDOMComment_get_xml(pComment, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
@@ -3484,7 +5154,7 @@ static void test_xmlTypes(void)
 
                 hr = IXMLDOMComment_get_text(pComment, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\Append") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\Append") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 /* test insertData */
@@ -3525,7 +5195,7 @@ static void test_xmlTypes(void)
 
                 hr = IXMLDOMComment_get_text(pComment, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("Begin This &is a Middle; test <>\\Append End") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_("Begin This &is a Middle; test <>\\Append End") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 /* delete data */
@@ -3559,7 +5229,7 @@ static void test_xmlTypes(void)
 
                 hr = IXMLDOMComment_get_text(pComment, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_(" This &is a Middle; test <>\\Append End") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_(" This &is a Middle; test <>\\Append End") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 /* delete from end */
@@ -3572,7 +5242,7 @@ static void test_xmlTypes(void)
 
                 hr = IXMLDOMComment_get_text(pComment, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_(" This &is a Middle; test <>\\Append ") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_(" This &is a Middle; test <>\\Append ") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 /* delete from inside */
@@ -3585,7 +5255,7 @@ static void test_xmlTypes(void)
 
                 hr = IXMLDOMComment_get_text(pComment, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("  ") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_("  ") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 /* delete whole data ... */
@@ -3609,14 +5279,14 @@ static void test_xmlTypes(void)
                 ok(hr == E_INVALIDARG, "ret %08x\n", hr );
                 hr = IXMLDOMComment_get_text(pComment, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("str1") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_("str1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 hr = IXMLDOMComment_replaceData(pComment, 0, 0, NULL);
                 ok(hr == S_OK, "ret %08x\n", hr );
                 hr = IXMLDOMComment_get_text(pComment, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("str1") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_("str1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 /* NULL pointer means delete */
@@ -3624,7 +5294,7 @@ static void test_xmlTypes(void)
                 ok(hr == S_OK, "ret %08x\n", hr );
                 hr = IXMLDOMComment_get_text(pComment, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("tr1") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_("tr1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 /* empty string means delete */
@@ -3632,7 +5302,7 @@ static void test_xmlTypes(void)
                 ok(hr == S_OK, "ret %08x\n", hr );
                 hr = IXMLDOMComment_get_text(pComment, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("r1") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_("r1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 /* zero count means insert */
@@ -3640,7 +5310,7 @@ static void test_xmlTypes(void)
                 ok(hr == S_OK, "ret %08x\n", hr );
                 hr = IXMLDOMComment_get_text(pComment, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("ar1") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_("ar1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 hr = IXMLDOMComment_replaceData(pComment, 0, 2, NULL);
@@ -3650,7 +5320,7 @@ static void test_xmlTypes(void)
                 ok(hr == S_OK, "ret %08x\n", hr );
                 hr = IXMLDOMComment_get_text(pComment, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("m1") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_("m1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 /* nonempty string, count greater than its length */
@@ -3658,7 +5328,7 @@ static void test_xmlTypes(void)
                 ok(hr == S_OK, "ret %08x\n", hr );
                 hr = IXMLDOMComment_get_text(pComment, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("a1.2") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_("a1.2") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 /* nonempty string, count less than its length */
@@ -3666,7 +5336,7 @@ static void test_xmlTypes(void)
                 ok(hr == S_OK, "ret %08x\n", hr );
                 hr = IXMLDOMComment_get_text(pComment, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("wine1.2") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_("wine1.2") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 IXMLDOMComment_Release(pComment);
@@ -3682,12 +5352,6 @@ static void test_xmlTypes(void)
                 hr = IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
                 ok(hr == S_OK, "ret %08x\n", hr );
 
-                /* test nodeTypeString */
-                hr = IXMLDOMDocument_get_nodeTypeString(pElement, &str);
-                ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("element") ), "incorrect nodeTypeString string\n");
-                SysFreeString(str);
-
                 hr = IXMLDOMElement_get_nodeName(pElement, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
                 ok( !lstrcmpW( str, szElement ), "incorrect element node Name\n");
@@ -3698,11 +5362,6 @@ static void test_xmlTypes(void)
                 ok( !lstrcmpW( str, szElementXML ), "incorrect element xml\n");
                 SysFreeString(str);
 
-                hr = IXMLDOMElement_get_dataType(pElement, &v);
-                ok(hr == S_FALSE, "ret %08x\n", hr );
-                ok( V_VT(&v) == VT_NULL, "incorrect dataType type\n");
-                VariantClear(&v);
-
                 /* Attribute */
                 pAttribute = (IXMLDOMAttribute*)0x1;
                 hr = IXMLDOMDocument_createAttribute(doc, NULL, &pAttribute);
@@ -3739,15 +5398,6 @@ static void test_xmlTypes(void)
                     ok(hr == S_FALSE, "ret %08x\n", hr );
                     ok(pNextChild == NULL, "pNextChild not NULL\n");
 
-                    /* test get_attributes */
-                    hr = IXMLDOMAttribute_get_attributes( pAttribute, NULL );
-                    ok( hr == E_INVALIDARG, "get_attributes returned wrong code\n");
-
-                    pAttribs = (IXMLDOMNamedNodeMap*)0x1;
-                    hr = IXMLDOMAttribute_get_attributes( pAttribute, &pAttribs);
-                    ok(hr == S_FALSE, "ret %08x\n", hr );
-                    ok( pAttribs == NULL, "pAttribs not NULL\n");
-
                     hr = IXMLDOMElement_appendChild(pElement, (IXMLDOMNode*)pAttribute, &pNewChild);
                     ok(hr == E_FAIL, "ret %08x\n", hr );
                     ok(pNewChild == NULL, "pNewChild not NULL\n");
@@ -3767,12 +5417,6 @@ static void test_xmlTypes(void)
                     ok( !lstrcmpW( str, szAttribute ), "incorrect attribute node Name\n");
                     SysFreeString(str);
 
-                    /* test nodeTypeString */
-                    hr = IXMLDOMAttribute_get_nodeTypeString(pAttribute, &str);
-                    ok(hr == S_OK, "ret %08x\n", hr );
-                    ok( !lstrcmpW( str, _bstr_("attribute") ), "incorrect nodeTypeString string\n");
-                    SysFreeString(str);
-
                     /* test nodeName */
                     hr = IXMLDOMAttribute_get_nodeName(pAttribute, &str);
                     ok(hr == S_OK, "ret %08x\n", hr );
@@ -3790,11 +5434,6 @@ static void test_xmlTypes(void)
                     ok( !lstrcmpW( str, szAttributeXML ), "incorrect attribute xml\n");
                     SysFreeString(str);
 
-                    hr = IXMLDOMAttribute_get_dataType(pAttribute, &v);
-                    ok(hr == S_FALSE, "ret %08x\n", hr );
-                    ok( V_VT(&v) == VT_NULL, "incorrect dataType type\n");
-                    VariantClear(&v);
-
                     IXMLDOMAttribute_Release(pAttribute);
 
                     /* Check Element again with the Add Attribute*/
@@ -3846,21 +5485,12 @@ static void test_xmlTypes(void)
 
                 VariantInit(&var);
 
-                hr = IXMLDOMCDATASection_QueryInterface(pCDataSec, &IID_IXMLDOMElement, (LPVOID*)&pElement);
+                hr = IXMLDOMCDATASection_QueryInterface(pCDataSec, &IID_IXMLDOMElement, (void**)&pElement);
                 ok(hr == E_NOINTERFACE, "ret %08x\n", hr);
 
                 hr = IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pCDataSec, NULL);
                 ok(hr == S_OK, "ret %08x\n", hr );
 
-                /* get Attribute Tests */
-                hr = IXMLDOMCDATASection_get_attributes(pCDataSec, NULL);
-                ok(hr == E_INVALIDARG, "ret %08x\n", hr );
-
-                pAttribs = (IXMLDOMNamedNodeMap*)0x1;
-                hr = IXMLDOMCDATASection_get_attributes(pCDataSec, &pAttribs);
-                ok(hr == S_FALSE, "ret %08x\n", hr );
-                ok(pAttribs == NULL, "pAttribs != NULL\n");
-
                 hr = IXMLDOMCDATASection_get_nodeName(pCDataSec, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
                 ok( !lstrcmpW( str, szCDataNodeText ), "incorrect cdata node Name\n");
@@ -3877,21 +5507,6 @@ static void test_xmlTypes(void)
                 ok(hr == S_FALSE, "ret %08x\n", hr );
                 ok(pNextChild == NULL, "pNextChild not NULL\n");
 
-                /* test get_dataType */
-                hr = IXMLDOMCDATASection_get_dataType(pCDataSec, NULL);
-                ok(hr == E_INVALIDARG, "ret %08x\n", hr );
-
-                hr = IXMLDOMCDATASection_get_dataType(pCDataSec, &v);
-                ok(hr == S_FALSE, "ret %08x\n", hr );
-                ok( V_VT(&v) == VT_NULL, "incorrect dataType type\n");
-                VariantClear(&v);
-
-                /* test nodeTypeString */
-                hr = IXMLDOMCDATASection_get_nodeTypeString(pCDataSec, &str);
-                ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("cdatasection") ), "incorrect nodeTypeString string\n");
-                SysFreeString(str);
-
                 /* put data Tests */
                 hr = IXMLDOMCDATASection_put_data(pCDataSec, _bstr_("This &is a ; test <>\\"));
                 ok(hr == S_OK, "ret %08x\n", hr );
@@ -3913,13 +5528,6 @@ static void test_xmlTypes(void)
                 ok(hr == S_OK, "ret %08x\n", hr );
                 ok(len == 21, "expected 21 got %d\n", len);
 
-                /* test get nodeValue */
-                hr = IXMLDOMCDATASection_get_nodeValue(pCDataSec, &var);
-                ok(hr == S_OK, "ret %08x\n", hr );
-                ok(V_VT(&var) == VT_BSTR, "got vt %04x\n", V_VT(&var));
-                ok( !lstrcmpW( V_BSTR(&var), _bstr_("This &is a ; test <>\\") ), "incorrect text string\n");
-                VariantClear(&var);
-
                 /* test get data */
                 hr = IXMLDOMCDATASection_get_data(pCDataSec, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
@@ -3984,7 +5592,7 @@ static void test_xmlTypes(void)
 
                 hr = IXMLDOMCDATASection_get_text(pCDataSec, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\Append") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\Append") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 /* test insertData */
@@ -4025,7 +5633,7 @@ static void test_xmlTypes(void)
 
                 hr = IXMLDOMCDATASection_get_text(pCDataSec, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("Begin This &is a Middle; test <>\\Append End") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_("Begin This &is a Middle; test <>\\Append End") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 /* delete data */
@@ -4059,7 +5667,7 @@ static void test_xmlTypes(void)
 
                 hr = IXMLDOMCDATASection_get_text(pCDataSec, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_(" This &is a Middle; test <>\\Append End") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_(" This &is a Middle; test <>\\Append End") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 /* delete from end */
@@ -4072,7 +5680,7 @@ static void test_xmlTypes(void)
 
                 hr = IXMLDOMCDATASection_get_text(pCDataSec, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_(" This &is a Middle; test <>\\Append ") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_(" This &is a Middle; test <>\\Append ") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 /* delete from inside */
@@ -4085,7 +5693,7 @@ static void test_xmlTypes(void)
 
                 hr = IXMLDOMCDATASection_get_text(pCDataSec, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("  ") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_("  ") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 /* delete whole data ... */
@@ -4110,14 +5718,14 @@ static void test_xmlTypes(void)
                 ok(hr == E_INVALIDARG, "ret %08x\n", hr );
                 hr = IXMLDOMCDATASection_get_text(pCDataSec, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("str1") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_("str1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 hr = IXMLDOMCDATASection_replaceData(pCDataSec, 0, 0, NULL);
                 ok(hr == S_OK, "ret %08x\n", hr );
                 hr = IXMLDOMCDATASection_get_text(pCDataSec, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("str1") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_("str1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 /* NULL pointer means delete */
@@ -4125,7 +5733,7 @@ static void test_xmlTypes(void)
                 ok(hr == S_OK, "ret %08x\n", hr );
                 hr = IXMLDOMCDATASection_get_text(pCDataSec, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("tr1") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_("tr1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 /* empty string means delete */
@@ -4133,7 +5741,7 @@ static void test_xmlTypes(void)
                 ok(hr == S_OK, "ret %08x\n", hr );
                 hr = IXMLDOMCDATASection_get_text(pCDataSec, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("r1") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_("r1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 /* zero count means insert */
@@ -4141,7 +5749,7 @@ static void test_xmlTypes(void)
                 ok(hr == S_OK, "ret %08x\n", hr );
                 hr = IXMLDOMCDATASection_get_text(pCDataSec, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("ar1") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_("ar1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 hr = IXMLDOMCDATASection_replaceData(pCDataSec, 0, 2, NULL);
@@ -4151,7 +5759,7 @@ static void test_xmlTypes(void)
                 ok(hr == S_OK, "ret %08x\n", hr );
                 hr = IXMLDOMCDATASection_get_text(pCDataSec, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("m1") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_("m1") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 /* nonempty string, count greater than its length */
@@ -4159,7 +5767,7 @@ static void test_xmlTypes(void)
                 ok(hr == S_OK, "ret %08x\n", hr );
                 hr = IXMLDOMCDATASection_get_text(pCDataSec, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("a1.2") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_("a1.2") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 /* nonempty string, count less than its length */
@@ -4167,7 +5775,7 @@ static void test_xmlTypes(void)
                 ok(hr == S_OK, "ret %08x\n", hr );
                 hr = IXMLDOMCDATASection_get_text(pCDataSec, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("wine1.2") ), "incorrect get_text string\n");
+                ok( !lstrcmpW( str, _bstr_("wine1.2") ), "incorrect get_text string, got '%s'\n", wine_dbgstr_w(str) );
                 SysFreeString(str);
 
                 IXMLDOMCDATASection_Release(pCDataSec);
@@ -4194,15 +5802,6 @@ static void test_xmlTypes(void)
                 hr = IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pDocFrag, NULL);
                 ok(hr == S_OK, "ret %08x\n", hr );
 
-                /* get Attribute Tests */
-                hr = IXMLDOMDocumentFragment_get_attributes(pDocFrag, NULL);
-                ok(hr == E_INVALIDARG, "ret %08x\n", hr );
-
-                pAttribs = (IXMLDOMNamedNodeMap*)0x1;
-                hr = IXMLDOMDocumentFragment_get_attributes(pDocFrag, &pAttribs);
-                ok(hr == S_FALSE, "ret %08x\n", hr );
-                ok(pAttribs == NULL, "pAttribs != NULL\n");
-
                 hr = IXMLDOMDocumentFragment_get_nodeName(pDocFrag, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
                 ok( !lstrcmpW( str, szDocFragmentText ), "incorrect docfragment node Name\n");
@@ -4226,21 +5825,6 @@ static void test_xmlTypes(void)
                 ok(hr == S_FALSE, "ret %08x\n", hr );
                 ok(node == NULL, "previous sibling not NULL\n");
 
-                /* test get_dataType */
-                hr = IXMLDOMDocumentFragment_get_dataType(pDocFrag, NULL);
-                ok(hr == E_INVALIDARG, "ret %08x\n", hr );
-
-                hr = IXMLDOMDocumentFragment_get_dataType(pDocFrag, &v);
-                ok(hr == S_FALSE, "ret %08x\n", hr );
-                ok( V_VT(&v) == VT_NULL, "incorrect dataType type\n");
-                VariantClear(&v);
-
-                /* test nodeTypeString */
-                hr = IXMLDOMDocumentFragment_get_nodeTypeString(pDocFrag, &str);
-                ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("documentfragment") ), "incorrect nodeTypeString string\n");
-                SysFreeString(str);
-
                 IXMLDOMDocumentFragment_Release(pDocFrag);
             }
 
@@ -4262,27 +5846,6 @@ static void test_xmlTypes(void)
                 hr = IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pEntityRef, NULL);
                 ok(hr == S_OK, "ret %08x\n", hr );
 
-                /* get Attribute Tests */
-                hr = IXMLDOMEntityReference_get_attributes(pEntityRef, NULL);
-                ok(hr == E_INVALIDARG, "ret %08x\n", hr );
-
-                pAttribs = (IXMLDOMNamedNodeMap*)0x1;
-                hr = IXMLDOMEntityReference_get_attributes(pEntityRef, &pAttribs);
-                ok(hr == S_FALSE, "ret %08x\n", hr );
-                ok(pAttribs == NULL, "pAttribs != NULL\n");
-
-                /* test dataType */
-                hr = IXMLDOMEntityReference_get_dataType(pEntityRef, &v);
-                ok(hr == S_FALSE, "ret %08x\n", hr );
-                ok( V_VT(&v) == VT_NULL, "incorrect dataType type\n");
-                VariantClear(&v);
-
-                /* test nodeTypeString */
-                hr = IXMLDOMEntityReference_get_nodeTypeString(pEntityRef, &str);
-                ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, _bstr_("entityreference") ), "incorrect nodeTypeString string\n");
-                SysFreeString(str);
-
                 /* test get_xml*/
                 hr = IXMLDOMEntityReference_get_xml(pEntityRef, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
@@ -4301,566 +5864,495 @@ static void test_xmlTypes(void)
     free_bstrs();
 }
 
-static void test_nodeTypeTests( void )
+typedef struct {
+    const char *name;
+    const char *type;
+    HRESULT hr;
+} put_datatype_t;
+
+/* Type test for elements only. Name passed into put_dataType is case-insensitive.
+   So many of the names have been changed to reflect this. */
+static put_datatype_t put_datatype_data[] = {
+    { "test_inval",      "abcdefg",     E_FAIL },
+    { "test_bool",       "Boolean",     S_OK },
+    { "test_string",     "String",      S_OK },
+    { "test_number",     "number",      S_OK },
+    { "test_int",        "InT",         S_OK },
+    { "test_fixed",      "fixed.14.4",  S_OK },
+    { "test_datetime",   "DateTime",    S_OK },
+    { "test_datetimetz", "DateTime.tz", S_OK },
+    { "test_date",       "Date",        S_OK },
+    { "test_time",       "Time",        S_OK },
+    { "test_timetz",     "Time.tz",     S_OK },
+    { "test_I1",         "I1",          S_OK },
+    { "test_I2",         "I2",          S_OK },
+    { "test_I4",         "I4",          S_OK },
+    { "test_UI1",        "UI1",         S_OK },
+    { "test_UI2",        "UI2",         S_OK },
+    { "test_UI4",        "UI4",         S_OK },
+    { "test_r4",         "r4",          S_OK },
+    { "test_r8",         "r8",          S_OK },
+    { "test_float",      "float",       S_OK },
+    { "test_uuid",       "UuId",        S_OK },
+    { "test_binhex",     "bin.hex",     S_OK },
+    { "test_binbase64",  "bin.base64",  S_OK },
+    { NULL }
+};
+
+typedef struct {
+    DOMNodeType type;
+    HRESULT hr;
+} put_datatype_notype_t;
+
+static put_datatype_notype_t put_dt_notype[] = {
+    { NODE_PROCESSING_INSTRUCTION, E_FAIL },
+    { NODE_DOCUMENT_FRAGMENT,      E_FAIL },
+    { NODE_ENTITY_REFERENCE,       E_FAIL },
+    { NODE_CDATA_SECTION,          E_FAIL },
+    { NODE_COMMENT,                E_FAIL },
+    { NODE_INVALID }
+};
+
+static void test_put_dataType( void )
 {
-    IXMLDOMDocument *doc = NULL;
-    IXMLDOMElement *pRoot;
-    IXMLDOMElement *pElement;
+    const put_datatype_notype_t *ptr2 = put_dt_notype;
+    const put_datatype_t *ptr = put_datatype_data;
+    IXMLDOMElement *root, *element;
+    BSTR nameW, type1W, type2W;
+    IXMLDOMDocument *doc;
     HRESULT hr;
 
-    hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc );
-    ok( hr == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", hr );
-    if( hr != S_OK )
-        return;
+    doc = create_document(&IID_IXMLDOMDocument);
 
     hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), NULL);
-    ok(hr == E_INVALIDARG, "ret %08x\n", hr );
+    EXPECT_HR(hr, E_INVALIDARG);
 
-    hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot);
-    ok(hr == S_OK, "ret %08x\n", hr );
-    if(hr == S_OK)
+    hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &root);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)root, NULL);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMElement_put_dataType(root, NULL);
+    EXPECT_HR(hr, E_INVALIDARG);
+
+    while (ptr->name)
     {
-        hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)pRoot, NULL);
-        ok(hr == S_OK, "ret %08x\n", hr );
+        hr = IXMLDOMDocument_createElement(doc, _bstr_(ptr->name), &element);
+        EXPECT_HR(hr, S_OK);
         if(hr == S_OK)
         {
-            hr = IXMLDOMElement_put_dataType(pRoot, NULL);
-            ok(hr == E_INVALIDARG, "ret %08x\n", hr );
+            hr = IXMLDOMElement_appendChild(root, (IXMLDOMNode*)element, NULL);
+            EXPECT_HR(hr, S_OK);
 
-            /* Invalid Value */
-            hr = IXMLDOMElement_put_dataType(pRoot, _bstr_("abcdefg") );
-            ok(hr == E_FAIL, "ret %08x\n", hr );
+            hr = IXMLDOMElement_put_dataType(element, _bstr_(ptr->type));
+            ok(hr == ptr->hr, "failed for %s:%s, 0x%08x\n", ptr->name, ptr->type, ptr->hr);
 
-            /* NOTE:
-             *   The name passed into put_dataType is case-insensitive. So many of the names
-             *     have been changed to reflect this.
-             */
-            /* Boolean */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_Boolean"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
+            IXMLDOMElement_Release(element);
+        }
+        ptr++;
+    }
 
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("Boolean") );
-                ok(hr == S_OK, "ret %08x\n", hr );
+    /* check changing types */
+    hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_Change"), &element);
+    EXPECT_HR(hr, S_OK);
 
-                IXMLDOMElement_Release(pElement);
-            }
+    hr = IXMLDOMElement_appendChild(root, (IXMLDOMNode*)element, NULL);
+    EXPECT_HR(hr, S_OK);
 
-            /* String */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_String"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
+    hr = IXMLDOMElement_put_dataType(element, _bstr_("DateTime.tz"));
+    EXPECT_HR(hr, S_OK);
 
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("String") );
-                ok(hr == S_OK, "ret %08x\n", hr );
+    hr = IXMLDOMElement_put_dataType(element, _bstr_("string"));
+    EXPECT_HR(hr, S_OK);
 
-                IXMLDOMElement_Release(pElement);
-            }
+    IXMLDOMElement_Release(element);
 
-            /* Number */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_Number"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
+    /* try to set type for node without a type */
+    nameW  = _bstr_("testname");
+    type1W = _bstr_("string");
+    type2W = _bstr_("number");
+    while (ptr2->type != NODE_INVALID)
+    {
+        IXMLDOMNode *node;
+        VARIANT type;
 
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("number") );
-                ok(hr == S_OK, "ret %08x\n", hr );
+        V_VT(&type) = VT_I2;
+        V_I2(&type) = ptr2->type;
 
-                IXMLDOMElement_Release(pElement);
-            }
+        hr = IXMLDOMDocument_createNode(doc, type, nameW, NULL, &node);
+        EXPECT_HR(hr, S_OK);
+        if(hr == S_OK)
+        {
+            hr = IXMLDOMElement_appendChild(root, node, NULL);
+            EXPECT_HR(hr, S_OK);
 
-            /* Int */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_Int"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
+            hr = IXMLDOMNode_put_dataType(node, NULL);
+            EXPECT_HR(hr, E_INVALIDARG);
 
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("InT") );
-                ok(hr == S_OK, "ret %08x\n", hr );
+            hr = IXMLDOMNode_put_dataType(node, type1W);
+            ok(hr == ptr2->hr, "failed for type %d, 0x%08x\n", ptr2->type, ptr->hr);
+            hr = IXMLDOMNode_put_dataType(node, type2W);
+            ok(hr == ptr2->hr, "failed for type %d, 0x%08x\n", ptr2->type, ptr->hr);
 
-                IXMLDOMElement_Release(pElement);
-            }
+            IXMLDOMNode_Release(node);
+        }
+        ptr2++;
+    }
 
-            /* Fixed */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_Fixed"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
+    IXMLDOMElement_Release(root);
+    IXMLDOMDocument_Release(doc);
+    free_bstrs();
+}
 
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("fixed.14.4") );
-                ok(hr == S_OK, "ret %08x\n", hr );
+#if CORE_6738_IS_FIXED
+static void test_save(void)
+{
+    IXMLDOMDocument *doc, *doc2;
+    IXMLDOMElement *root;
+    BSTR sOrig, sNew, filename;
+    char buffer[100];
+    IStream *stream;
+    HGLOBAL global;
+    VARIANT_BOOL b;
+    DWORD read = 0;
+    VARIANT dest;
+    HANDLE hfile;
+    HRESULT hr;
+    char *ptr;
 
-                IXMLDOMElement_Release(pElement);
-            }
+    doc = create_document(&IID_IXMLDOMDocument);
+    doc2 = create_document(&IID_IXMLDOMDocument);
 
-            /* DateTime */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_DateTime"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
+    /* save to IXMLDOMDocument */
+    hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &root);
+    EXPECT_HR(hr, S_OK);
 
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("DateTime") );
-                ok(hr == S_OK, "ret %08x\n", hr );
+    hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)root, NULL);
+    EXPECT_HR(hr, S_OK);
 
-                IXMLDOMElement_Release(pElement);
-            }
+    V_VT(&dest) = VT_UNKNOWN;
+    V_UNKNOWN(&dest) = (IUnknown*)doc2;
 
-            /* DateTime TZ */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_DateTime_tz"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
+    hr = IXMLDOMDocument_save(doc, dest);
+    EXPECT_HR(hr, S_OK);
 
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("DateTime.tz") );
-                ok(hr == S_OK, "ret %08x\n", hr );
+    hr = IXMLDOMDocument_get_xml(doc, &sOrig);
+    EXPECT_HR(hr, S_OK);
 
-                IXMLDOMElement_Release(pElement);
-            }
+    hr = IXMLDOMDocument_get_xml(doc2, &sNew);
+    EXPECT_HR(hr, S_OK);
 
-            /* Date */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_Date"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
+    ok( !lstrcmpW( sOrig, sNew ), "New document is not the same as original\n");
 
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("Date") );
-                ok(hr == S_OK, "ret %08x\n", hr );
+    SysFreeString(sOrig);
+    SysFreeString(sNew);
 
-                IXMLDOMElement_Release(pElement);
-            }
+    IXMLDOMElement_Release(root);
+    IXMLDOMDocument_Release(doc2);
 
-            /* Time */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_Time"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
+    /* save to path */
+    V_VT(&dest) = VT_BSTR;
+    V_BSTR(&dest) = _bstr_("test.xml");
 
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("Time") );
-                ok(hr == S_OK, "ret %08x\n", hr );
+    hr = IXMLDOMDocument_save(doc, dest);
+    EXPECT_HR(hr, S_OK);
 
-                IXMLDOMElement_Release(pElement);
-            }
+    hfile = CreateFileA("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
+    ok(hfile != INVALID_HANDLE_VALUE, "Could not open file: %u\n", GetLastError());
+    if(hfile == INVALID_HANDLE_VALUE) return;
 
-            /* Time.tz */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_Time_TZ"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
+    ReadFile(hfile, buffer, sizeof(buffer), &read, NULL);
+    ok(read != 0, "could not read file\n");
+    ok(buffer[0] != '<' || buffer[1] != '?', "File contains processing instruction\n");
 
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("Time.tz") );
-                ok(hr == S_OK, "ret %08x\n", hr );
+    CloseHandle(hfile);
+    DeleteFileA("test.xml");
 
-                IXMLDOMElement_Release(pElement);
-            }
+    /* save to path VT_BSTR | VT_BYREF */
+    filename = _bstr_("test.xml");
+    V_VT(&dest) = VT_BSTR | VT_BYREF;
+    V_BSTRREF(&dest) = &filename;
 
-            /* I1 */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_I1"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
+    hr = IXMLDOMDocument_save(doc, dest);
+    EXPECT_HR(hr, S_OK);
 
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("I1") );
-                ok(hr == S_OK, "ret %08x\n", hr );
+    hfile = CreateFileA("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
+    ok(hfile != INVALID_HANDLE_VALUE, "Could not open file: %u\n", GetLastError());
+    if(hfile == INVALID_HANDLE_VALUE) return;
 
-                IXMLDOMElement_Release(pElement);
-            }
+    if (hfile != INVALID_HANDLE_VALUE)
+    {
+       ReadFile(hfile, buffer, sizeof(buffer), &read, NULL);
+       ok(read != 0, "could not read file\n");
+       ok(buffer[0] != '<' || buffer[1] != '?', "File contains processing instruction\n");
 
-            /* I2 */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_I2"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
+       CloseHandle(hfile);
+       DeleteFileA("test.xml");
+    }
 
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("I2") );
-                ok(hr == S_OK, "ret %08x\n", hr );
+    /* save to stream */
+    V_VT(&dest) = VT_UNKNOWN;
+    V_UNKNOWN(&dest) = (IUnknown*)&savestream;
+
+    hr = IXMLDOMDocument_save(doc, dest);
+    EXPECT_HR(hr, S_OK);
+
+    /* loaded data contains xml declaration */
+    hr = IXMLDOMDocument_loadXML(doc, _bstr_(win1252xml), &b);
+    EXPECT_HR(hr, S_OK);
+
+    CreateStreamOnHGlobal(NULL, TRUE, &stream);
+    V_VT(&dest) = VT_UNKNOWN;
+    V_UNKNOWN(&dest) = (IUnknown*)stream;
+    hr = IXMLDOMDocument_save(doc, dest);
+    EXPECT_HR(hr, S_OK);
+
+    hr = GetHGlobalFromStream(stream, &global);
+    EXPECT_HR(hr, S_OK);
+    ptr = GlobalLock(global);
+    ok(!memcmp(ptr, win1252decl, strlen(win1252decl)), "got wrong xml declaration\n");
+    GlobalUnlock(global);
+    IStream_Release(stream);
+
+    /* loaded data without xml declaration */
+    hr = IXMLDOMDocument_loadXML(doc, _bstr_("<a/>"), &b);
+    EXPECT_HR(hr, S_OK);
+
+    hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    V_VT(&dest) = VT_UNKNOWN;
+    V_UNKNOWN(&dest) = (IUnknown*)stream;
+    hr = IXMLDOMDocument_save(doc, dest);
+    EXPECT_HR(hr, S_OK);
+
+    hr = GetHGlobalFromStream(stream, &global);
+    EXPECT_HR(hr, S_OK);
+    ptr = GlobalLock(global);
+    ok(ptr[0] == '<' && ptr[1] != '?', "got wrong start tag %c%c\n", ptr[0], ptr[1]);
+    GlobalUnlock(global);
+    IStream_Release(stream);
 
-                IXMLDOMElement_Release(pElement);
-            }
+    IXMLDOMDocument_Release(doc);
+    free_bstrs();
+}
+#endif /* CORE_6738_IS_FIXED */
 
-            /* I4 */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_I4"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
+static void test_testTransforms(void)
+{
+    IXMLDOMDocument *doc, *docSS;
+    IXMLDOMNode *pNode;
+    VARIANT_BOOL bSucc;
+    HRESULT hr;
 
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("I4") );
-                ok(hr == S_OK, "ret %08x\n", hr );
+    doc = create_document(&IID_IXMLDOMDocument);
+    docSS = create_document(&IID_IXMLDOMDocument);
 
-                IXMLDOMElement_Release(pElement);
-            }
+    hr = IXMLDOMDocument_loadXML(doc, _bstr_(szTransformXML), &bSucc);
+    ok(hr == S_OK, "ret %08x\n", hr );
 
-            /* UI1 */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_UI1"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
+    hr = IXMLDOMDocument_loadXML(docSS, _bstr_(szTransformSSXML), &bSucc);
+    ok(hr == S_OK, "ret %08x\n", hr );
 
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("UI1") );
-                ok(hr == S_OK, "ret %08x\n", hr );
+    hr = IXMLDOMDocument_QueryInterface(docSS, &IID_IXMLDOMNode, (void**)&pNode );
+    ok(hr == S_OK, "ret %08x\n", hr );
+    if(hr == S_OK)
+    {
+        BSTR bOut;
 
-                IXMLDOMElement_Release(pElement);
-            }
-
-            /* UI2 */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_UI2"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
-
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("UI2") );
-                ok(hr == S_OK, "ret %08x\n", hr );
-
-                IXMLDOMElement_Release(pElement);
-            }
-
-            /* UI4 */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_UI4"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
-
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("UI4") );
-                ok(hr == S_OK, "ret %08x\n", hr );
-
-                IXMLDOMElement_Release(pElement);
-            }
-
-            /* r4 */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_r4"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
-
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("r4") );
-                ok(hr == S_OK, "ret %08x\n", hr );
-
-                IXMLDOMElement_Release(pElement);
-            }
-
-            /* r8 */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_r8"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
-
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("r8") );
-                ok(hr == S_OK, "ret %08x\n", hr );
-
-                IXMLDOMElement_Release(pElement);
-            }
-
-            /* float */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_float"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
-
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("float") );
-                ok(hr == S_OK, "ret %08x\n", hr );
-
-                IXMLDOMElement_Release(pElement);
-            }
-
-            /* uuid */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_uuid"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
-
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("UuId") );
-                ok(hr == S_OK, "ret %08x\n", hr );
-
-                IXMLDOMElement_Release(pElement);
-            }
-
-            /* bin.hex */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_bin_hex"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
-
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("bin.hex") );
-                ok(hr == S_OK, "ret %08x\n", hr );
-
-                IXMLDOMElement_Release(pElement);
-            }
-
-            /* bin.base64 */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_bin_base64"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
-
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("bin.base64") );
-                ok(hr == S_OK, "ret %08x\n", hr );
-
-                IXMLDOMElement_Release(pElement);
-            }
-
-            /* Check changing types */
-            hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_Change"), &pElement);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            if(hr == S_OK)
-            {
-                IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL);
-
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("DateTime.tz") );
-                ok(hr == S_OK, "ret %08x\n", hr );
-
-                hr = IXMLDOMElement_put_dataType(pElement, _bstr_("string") );
-                ok(hr == S_OK, "ret %08x\n", hr );
-
-                IXMLDOMElement_Release(pElement);
-            }
-
-            IXMLDOMElement_Release(pRoot);
+        hr = IXMLDOMDocument_transformNode(doc, pNode, &bOut);
+        ok(hr == S_OK, "ret %08x\n", hr );
+        if(hr == S_OK)
+        {
+            ok( compareIgnoreReturns( bOut, _bstr_(szTransformOutput)), "got output %s\n", wine_dbgstr_w(bOut));
+            SysFreeString(bOut);
         }
+
+        IXMLDOMNode_Release(pNode);
     }
 
+    IXMLDOMDocument_Release(docSS);
     IXMLDOMDocument_Release(doc);
 
     free_bstrs();
 }
 
-static void test_DocumentSaveToDocument(void)
-{
-    IXMLDOMDocument *doc = NULL;
-    IXMLDOMDocument *doc2 = NULL;
-    IXMLDOMElement *pRoot;
-
-    HRESULT hr;
-
-    hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc );
-    ok( hr == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", hr );
-    if( hr != S_OK )
-        return;
-
-    hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc2 );
-    ok( hr == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", hr );
-    if( hr != S_OK )
-    {
-        IXMLDOMDocument_Release(doc);
-        return;
-    }
-
-    hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot);
-    ok(hr == S_OK, "ret %08x\n", hr );
-    if(hr == S_OK)
-    {
-        hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)pRoot, NULL);
-        ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            VARIANT vDoc;
-            BSTR sOrig;
-            BSTR sNew;
-
-            V_VT(&vDoc) = VT_UNKNOWN;
-            V_UNKNOWN(&vDoc) = (IUnknown*)doc2;
-
-            hr = IXMLDOMDocument_save(doc, vDoc);
-            ok(hr == S_OK, "ret %08x\n", hr );
-
-            hr = IXMLDOMDocument_get_xml(doc, &sOrig);
-            ok(hr == S_OK, "ret %08x\n", hr );
-
-            hr = IXMLDOMDocument_get_xml(doc2, &sNew);
-            ok(hr == S_OK, "ret %08x\n", hr );
-
-            ok( !lstrcmpW( sOrig, sNew ), "New document is not the same as origial\n");
-
-            SysFreeString(sOrig);
-            SysFreeString(sNew);
-        }
-    }
+struct namespaces_change_t {
+    const CLSID *clsid;
+    const char *name;
+};
 
-    IXMLDOMDocument_Release(doc2);
-    IXMLDOMDocument_Release(doc);
-}
+static const struct namespaces_change_t namespaces_change_test_data[] = {
+    { &CLSID_DOMDocument,   "CLSID_DOMDocument"   },
+    { &CLSID_DOMDocument2,  "CLSID_DOMDocument2"  },
+    { &CLSID_DOMDocument26, "CLSID_DOMDocument26" },
+    { &CLSID_DOMDocument30, "CLSID_DOMDocument30" },
+    { &CLSID_DOMDocument40, "CLSID_DOMDocument40" },
+    { &CLSID_DOMDocument60, "CLSID_DOMDocument60" },
+    { 0 }
+};
 
-static void test_DocumentSaveToFile(void)
+static void test_namespaces_change(void)
 {
-    IXMLDOMDocument *doc = NULL;
-    IXMLDOMElement *pRoot;
-    HANDLE file;
-    char buffer[100];
-    DWORD read = 0;
-    HRESULT hr;
+    const struct namespaces_change_t *class_ptr = namespaces_change_test_data;
 
-    hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc );
-    ok( hr == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", hr );
-    if( hr != S_OK )
-        return;
-
-    hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot);
-    ok(hr == S_OK, "ret %08x\n", hr );
-    if(hr == S_OK)
+    while (class_ptr->clsid)
     {
-        hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)pRoot, NULL);
-        ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            VARIANT vFile;
+        IXMLDOMDocument *doc = NULL;
+        IXMLDOMElement *elem = NULL;
+        IXMLDOMNode *node = NULL;
 
-            V_VT(&vFile) = VT_BSTR;
-            V_BSTR(&vFile) = _bstr_("test.xml");
+        VARIANT var;
+        HRESULT hr;
+        BSTR str;
 
-            hr = IXMLDOMDocument_save(doc, vFile);
-            ok(hr == S_OK, "ret %08x\n", hr );
+        if (!is_clsid_supported(class_ptr->clsid, &IID_IXMLDOMDocument))
+        {
+            class_ptr++;
+            continue;
         }
-    }
 
-    IXMLDOMElement_Release(pRoot);
-    IXMLDOMDocument_Release(doc);
+        hr = CoCreateInstance(class_ptr->clsid, NULL, CLSCTX_INPROC_SERVER,
+                              &IID_IXMLDOMDocument, (void**)&doc);
+        ok(hr == S_OK, "got 0x%08x\n", hr);
 
-    file = CreateFile("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
-    ok(file != INVALID_HANDLE_VALUE, "Could not open file: %u\n", GetLastError());
-    if(file == INVALID_HANDLE_VALUE)
-        return;
+        V_VT(&var) = VT_I2;
+        V_I2(&var) = NODE_ELEMENT;
 
-    ReadFile(file, buffer, sizeof(buffer), &read, NULL);
-    ok(read != 0, "could not read file\n");
-    ok(buffer[0] != '<' || buffer[1] != '?', "File contains processing instruction\n");
+        hr = IXMLDOMDocument_createNode(doc, var, _bstr_("ns:elem"), _bstr_("ns/uri"), &node);
+        EXPECT_HR(hr, S_OK);
 
-    CloseHandle(file);
-    DeleteFile("test.xml");
-}
+        hr = IXMLDOMDocument_appendChild(doc, node, NULL);
+        EXPECT_HR(hr, S_OK);
 
-static void test_testTransforms(void)
-{
-    IXMLDOMDocument *doc = NULL;
-    IXMLDOMDocument *docSS = NULL;
-    IXMLDOMNode *pNode;
-    VARIANT_BOOL bSucc;
+        hr = IXMLDOMDocument_get_documentElement(doc, &elem);
+        EXPECT_HR(hr, S_OK);
 
-    HRESULT hr;
+        /* try same prefix, different uri */
+        V_VT(&var) = VT_BSTR;
+        V_BSTR(&var) = _bstr_("ns/uri2");
 
-    hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc );
-    ok( hr == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", hr );
-    if( hr != S_OK )
-        return;
+        hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var);
+        EXPECT_HR(hr, E_INVALIDARG);
 
-    hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&docSS );
-    ok( hr == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", hr );
-    if( hr != S_OK )
-    {
-        IXMLDOMDocument_Release(doc);
-        return;
-    }
+        /* try same prefix and uri */
+        V_VT(&var) = VT_BSTR;
+        V_BSTR(&var) = _bstr_("ns/uri");
 
-    hr = IXMLDOMDocument_loadXML(doc, _bstr_(szTransformXML), &bSucc);
-    ok(hr == S_OK, "ret %08x\n", hr );
+        hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var);
+        EXPECT_HR(hr, S_OK);
 
-    hr = IXMLDOMDocument_loadXML(docSS, _bstr_(szTransformSSXML), &bSucc);
-    ok(hr == S_OK, "ret %08x\n", hr );
+        hr = IXMLDOMElement_get_xml(elem, &str);
+        EXPECT_HR(hr, S_OK);
+        ok(!lstrcmpW(str, _bstr_("<ns:elem xmlns:ns=\"ns/uri\"/>")), "got element %s for %s\n",
+           wine_dbgstr_w(str), class_ptr->name);
+        SysFreeString(str);
 
-    hr = IXMLDOMDocument_QueryInterface(docSS, &IID_IXMLDOMNode, (LPVOID*)&pNode );
-    ok(hr == S_OK, "ret %08x\n", hr );
-    if(hr == S_OK)
-    {
-        BSTR bOut;
+        IXMLDOMElement_Release(elem);
+        IXMLDOMDocument_Release(doc);
 
-        hr = IXMLDOMDocument_transformNode(doc, pNode, &bOut);
-        ok(hr == S_OK, "ret %08x\n", hr );
-        ok( compareIgnoreReturns( bOut, _bstr_(szTransformOutput)), "Stylesheet output not correct\n");
-        SysFreeString(bOut);
+        free_bstrs();
 
-        IXMLDOMNode_Release(pNode);
+        class_ptr++;
     }
-
-    IXMLDOMDocument_Release(docSS);
-    IXMLDOMDocument_Release(doc);
-
-    free_bstrs();
 }
 
-static void test_Namespaces(void)
+static void test_namespaces_basic(void)
 {
-    IXMLDOMDocument2 *doc = NULL;
-    IXMLDOMNode *pNode;
-    IXMLDOMNode *pNode2 = NULL;
-    VARIANT_BOOL bSucc;
+    static const CHAR namespaces_xmlA[] =
+        "<?xml version=\"1.0\"?>\n"
+        "<XMI xmi.version=\"1.1\" xmlns:Model=\"http://omg.org/mof.Model/1.3\">"
+        "  <XMI.content>"
+        "    <Model:Package name=\"WinePackage\" Model:name2=\"name2 attr\" />"
+        "  </XMI.content>"
+        "</XMI>";
+
+    IXMLDOMDocument *doc;
+    IXMLDOMElement *elem;
+    IXMLDOMNode *node;
+
+    VARIANT_BOOL b;
     HRESULT hr;
     BSTR str;
-    static  const CHAR szNamespacesXML[] =
-"<?xml version=\"1.0\"?>\n"
-"<root xmlns:WEB='http://www.winehq.org'>\n"
-"<WEB:Site version=\"1.0\" />\n"
-"</root>";
 
-    hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc );
-    ok( hr == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", hr );
-    if( hr != S_OK )
-        return;
+    doc = create_document(&IID_IXMLDOMDocument);
 
-    hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szNamespacesXML), &bSucc);
-    ok(hr == S_OK, "ret %08x\n", hr );
-    ok(bSucc == VARIANT_TRUE, "Expected VARIANT_TRUE got VARIANT_FALSE\n");
+    hr = IXMLDOMDocument_loadXML(doc, _bstr_(namespaces_xmlA), &b);
+    EXPECT_HR(hr, S_OK);
+    ok(b == VARIANT_TRUE, "got %d\n", b);
 
-    hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("root"), &pNode );
-    ok(hr == S_OK, "ret %08x\n", hr );
+    str = (BSTR)0xdeadbeef;
+    hr = IXMLDOMDocument_get_namespaceURI(doc, &str);
+    EXPECT_HR(hr, S_FALSE);
+    ok(str == NULL, "got %p\n", str);
+
+    hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("//XMI.content"), &node );
+    EXPECT_HR(hr, S_OK);
     if(hr == S_OK)
     {
-        hr = IXMLDOMNode_get_firstChild( pNode, &pNode2 );
-        ok( hr == S_OK, "ret %08x\n", hr );
-        ok( pNode2 != NULL, "pNode2 == NULL\n");
+        IXMLDOMAttribute *attr;
+        IXMLDOMNode *node2;
+
+        hr = IXMLDOMNode_get_firstChild(node, &node2);
+        EXPECT_HR(hr, S_OK);
+        ok(node2 != NULL, "got %p\n", node2);
 
         /* Test get_prefix */
-        hr = IXMLDOMNode_get_prefix(pNode2, NULL);
-        ok( hr == E_INVALIDARG, "ret %08x\n", hr );
+        hr = IXMLDOMNode_get_prefix(node2, NULL);
+        EXPECT_HR(hr, E_INVALIDARG);
         /* NOTE: Need to test that arg2 gets cleared on Error. */
 
-        hr = IXMLDOMNode_get_prefix(pNode2, &str);
-        ok( hr == S_OK, "ret %08x\n", hr );
-        ok( !lstrcmpW( str, _bstr_("WEB")), "incorrect prefix string\n");
+        hr = IXMLDOMNode_get_prefix(node2, &str);
+        EXPECT_HR(hr, S_OK);
+        ok( !lstrcmpW( str, _bstr_("Model")), "got %s\n", wine_dbgstr_w(str));
+        SysFreeString(str);
+
+        hr = IXMLDOMNode_get_nodeName(node2, &str);
+        EXPECT_HR(hr, S_OK);
+        ok(!lstrcmpW( str, _bstr_("Model:Package")), "got %s\n", wine_dbgstr_w(str));
         SysFreeString(str);
 
         /* Test get_namespaceURI */
-        hr = IXMLDOMNode_get_namespaceURI(pNode2, NULL);
-        ok( hr == E_INVALIDARG, "ret %08x\n", hr );
+        hr = IXMLDOMNode_get_namespaceURI(node2, NULL);
+        EXPECT_HR(hr, E_INVALIDARG);
         /* NOTE: Need to test that arg2 gets cleared on Error. */
 
-        hr = IXMLDOMNode_get_namespaceURI(pNode2, &str);
-        ok( hr == S_OK, "ret %08x\n", hr );
-        ok( !lstrcmpW( str, _bstr_("http://www.winehq.org")), "incorrect namespaceURI string\n");
+        hr = IXMLDOMNode_get_namespaceURI(node2, &str);
+        EXPECT_HR(hr, S_OK);
+        ok(!lstrcmpW( str, _bstr_("http://omg.org/mof.Model/1.3")), "got %s\n", wine_dbgstr_w(str));
         SysFreeString(str);
 
-        IXMLDOMNode_Release(pNode2);
-        IXMLDOMNode_Release(pNode);
+        hr = IXMLDOMNode_QueryInterface(node2, &IID_IXMLDOMElement, (void**)&elem);
+        EXPECT_HR(hr, S_OK);
+
+        hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("Model:name2"), &attr);
+        EXPECT_HR(hr, S_OK);
+
+        hr = IXMLDOMAttribute_get_nodeName(attr, &str);
+        EXPECT_HR(hr, S_OK);
+        ok(!lstrcmpW( str, _bstr_("Model:name2")), "got %s\n", wine_dbgstr_w(str));
+        SysFreeString(str);
+
+        hr = IXMLDOMAttribute_get_prefix(attr, &str);
+        EXPECT_HR(hr, S_OK);
+        ok(!lstrcmpW( str, _bstr_("Model")), "got %s\n", wine_dbgstr_w(str));
+        SysFreeString(str);
+
+        IXMLDOMAttribute_Release(attr);
+        IXMLDOMElement_Release(elem);
+
+        IXMLDOMNode_Release(node2);
+        IXMLDOMNode_Release(node);
     }
 
-    IXMLDOMDocument2_Release(doc);
+    IXMLDOMDocument_Release(doc);
 
     free_bstrs();
 }
 
 static void test_FormattingXML(void)
 {
-    IXMLDOMDocument2 *doc = NULL;
+    IXMLDOMDocument *doc;
     IXMLDOMElement *pElement;
     VARIANT_BOOL bSucc;
     HRESULT hr;
@@ -4868,18 +6360,15 @@ static void test_FormattingXML(void)
     static const CHAR szLinefeedXML[] = "<?xml version=\"1.0\"?>\n<Root>\n\t<Sub val=\"A\" />\n</Root>";
     static const CHAR szLinefeedRootXML[] = "<Root>\r\n\t<Sub val=\"A\"/>\r\n</Root>";
 
-    hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc );
-    ok( hr == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", hr );
-    if( hr != S_OK )
-        return;
+    doc = create_document(&IID_IXMLDOMDocument);
 
-    hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szLinefeedXML), &bSucc);
+    hr = IXMLDOMDocument_loadXML(doc, _bstr_(szLinefeedXML), &bSucc);
     ok(hr == S_OK, "ret %08x\n", hr );
     ok(bSucc == VARIANT_TRUE, "Expected VARIANT_TRUE got VARIANT_FALSE\n");
 
     if(bSucc == VARIANT_TRUE)
     {
-        hr = IXMLDOMDocument2_get_documentElement(doc, &pElement);
+        hr = IXMLDOMDocument_get_documentElement(doc, &pElement);
         ok(hr == S_OK, "ret %08x\n", hr );
         if(hr == S_OK)
         {
@@ -4892,382 +6381,258 @@ static void test_FormattingXML(void)
         }
     }
 
-    IXMLDOMDocument2_Release(doc);
+    IXMLDOMDocument_Release(doc);
 
     free_bstrs();
 }
 
-static void test_NodeTypeValue(void)
+typedef struct _nodetypedvalue_t {
+    const char *name;
+    VARTYPE type;
+    const char *value; /* value in string format */
+} nodetypedvalue_t;
+
+static const nodetypedvalue_t get_nodetypedvalue[] = {
+    { "root/string",    VT_BSTR, "Wine" },
+    { "root/string2",   VT_BSTR, "String" },
+    { "root/number",    VT_BSTR, "12.44" },
+    { "root/number2",   VT_BSTR, "-3.71e3" },
+    { "root/int",       VT_I4,   "-13" },
+    { "root/fixed",     VT_CY,   "7322.9371" },
+    { "root/bool",      VT_BOOL, "-1" },
+    { "root/datetime",  VT_DATE, "40135.14" },
+    { "root/datetimetz",VT_DATE, "37813.59" },
+    { "root/date",      VT_DATE, "665413" },
+    { "root/time",      VT_DATE, "0.5813889" },
+    { "root/timetz",    VT_DATE, "1.112512" },
+    { "root/i1",        VT_I1,   "-13" },
+    { "root/i2",        VT_I2,   "31915" },
+    { "root/i4",        VT_I4,   "-312232" },
+    { "root/ui1",       VT_UI1,  "123" },
+    { "root/ui2",       VT_UI2,  "48282" },
+    { "root/ui4",       VT_UI4,  "949281" },
+    { "root/r4",        VT_R4,   "213124" },
+    { "root/r8",        VT_R8,   "0.412" },
+    { "root/float",     VT_R8,   "41221.421" },
+    { "root/uuid",      VT_BSTR, "333C7BC4-460F-11D0-BC04-0080C7055a83" },
+    { "root/binbase64", VT_ARRAY|VT_UI1, "base64 test" },
+    { "root/binbase64_1", VT_ARRAY|VT_UI1, "base64 test" },
+    { "root/binbase64_2", VT_ARRAY|VT_UI1, "base64 test" },
+    { 0 }
+};
+
+static void test_nodeTypedValue(void)
 {
-    IXMLDOMDocument2 *doc = NULL;
-    IXMLDOMNode *pNode;
-    VARIANT_BOOL bSucc;
+    const nodetypedvalue_t *entry = get_nodetypedvalue;
+    IXMLDOMDocumentType *doctype, *doctype2;
+    IXMLDOMProcessingInstruction *pi;
+    IXMLDOMDocumentFragment *frag;
+    IXMLDOMDocument *doc, *doc2;
+    IXMLDOMCDATASection *cdata;
+    IXMLDOMComment *comment;
+    IXMLDOMNode *node;
+    VARIANT_BOOL b;
+    VARIANT value;
     HRESULT hr;
-    VARIANT v;
 
-    hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc );
-    ok( hr == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", hr );
-    if( hr != S_OK )
-        return;
+    doc = create_document(&IID_IXMLDOMDocument);
 
-    hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szTypeValueXML), &bSucc);
+    b = VARIANT_FALSE;
+    hr = IXMLDOMDocument_loadXML(doc, _bstr_(szTypeValueXML), &b);
     ok(hr == S_OK, "ret %08x\n", hr );
-    ok(bSucc == VARIANT_TRUE, "Expected VARIANT_TRUE got VARIANT_FALSE\n");
-    if(bSucc == VARIANT_TRUE)
-    {
-        hr = IXMLDOMDocument2_get_nodeValue(doc, NULL);
-        ok(hr == E_INVALIDARG, "ret %08x\n", hr );
+    ok(b == VARIANT_TRUE, "got %d\n", b);
 
-        V_VT(&v) = VT_BSTR;
-        V_BSTR(&v) = NULL;
-        hr = IXMLDOMDocument2_get_nodeValue(doc, &v);
-        ok(hr == S_FALSE, "ret %08x\n", hr );
-        ok(V_VT(&v) == VT_NULL, "expect VT_NULL got %d\n", V_VT(&v));
+    hr = IXMLDOMDocument_get_nodeValue(doc, NULL);
+    ok(hr == E_INVALIDARG, "ret %08x\n", hr );
 
-        hr = IXMLDOMDocument2_get_nodeTypedValue(doc, NULL);
-        ok(hr == E_INVALIDARG, "ret %08x\n", hr );
+    V_VT(&value) = VT_BSTR;
+    V_BSTR(&value) = NULL;
+    hr = IXMLDOMDocument_get_nodeValue(doc, &value);
+    ok(hr == S_FALSE, "ret %08x\n", hr );
+    ok(V_VT(&value) == VT_NULL, "expect VT_NULL got %d\n", V_VT(&value));
 
-        hr = IXMLDOMDocument2_get_nodeTypedValue(doc, &v);
-        ok(hr == S_FALSE, "ret %08x\n", hr );
+    hr = IXMLDOMDocument_get_nodeTypedValue(doc, NULL);
+    ok(hr == E_INVALIDARG, "ret %08x\n", hr );
 
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/string"), &pNode);
-        ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            V_VT(&v) = VT_BSTR;
-            V_BSTR(&v) = NULL;
-            hr = IXMLDOMNode_get_nodeValue(pNode, &v);
-            ok(hr == S_FALSE, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_NULL, "expect VT_NULL got %d\n", V_VT(&v));
+    V_VT(&value) = VT_EMPTY;
+    hr = IXMLDOMDocument_get_nodeTypedValue(doc, &value);
+    ok(hr == S_FALSE, "ret %08x\n", hr );
+    ok(V_VT(&value) == VT_NULL, "got %d\n", V_VT(&value));
 
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, NULL);
-            ok(hr == E_INVALIDARG, "ret %08x\n", hr );
+    hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("root/string"), &node);
+    ok(hr == S_OK, "ret %08x\n", hr );
 
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_BSTR, "incorrect type\n");
-            ok(!lstrcmpW( V_BSTR(&v), _bstr_("Wine") ), "incorrect value\n");
-            VariantClear( &v );
+    V_VT(&value) = VT_BSTR;
+    V_BSTR(&value) = NULL;
+    hr = IXMLDOMNode_get_nodeValue(node, &value);
+    ok(hr == S_FALSE, "ret %08x\n", hr );
+    ok(V_VT(&value) == VT_NULL, "expect VT_NULL got %d\n", V_VT(&value));
 
-            IXMLDOMNode_Release(pNode);
-        }
+    hr = IXMLDOMNode_get_nodeTypedValue(node, NULL);
+    ok(hr == E_INVALIDARG, "ret %08x\n", hr );
 
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/string2"), &pNode);
-        ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_BSTR, "incorrect type\n");
-            ok(!lstrcmpW( V_BSTR(&v), _bstr_("String") ), "incorrect value\n");
-            VariantClear( &v );
+    IXMLDOMNode_Release(node);
 
-            IXMLDOMNode_Release(pNode);
-        }
+    hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("root/binhex"), &node);
+    ok(hr == S_OK, "ret %08x\n", hr );
+    {
+        BYTE bytes[] = {0xff,0xfc,0xa0,0x12,0x00,0x3c};
 
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/number"), &pNode);
+        hr = IXMLDOMNode_get_nodeTypedValue(node, &value);
         ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_BSTR, "incorrect type\n");
-            ok(!lstrcmpW( V_BSTR(&v), _bstr_("12.44") ), "incorrect value\n");
-            VariantClear( &v );
-
-            IXMLDOMNode_Release(pNode);
-        }
-
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/number2"), &pNode);
-        ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_BSTR, "incorrect type\n");
-            ok(!lstrcmpW( V_BSTR(&v), _bstr_("-3.71e3") ), "incorrect value\n");
-            VariantClear( &v );
-
-            IXMLDOMNode_Release(pNode);
-        }
-
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/int"), &pNode);
-        ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_I4, "incorrect type\n");
-            ok(V_I4(&v) == -13, "incorrect value\n");
-            VariantClear( &v );
-
-            IXMLDOMNode_Release(pNode);
-        }
-
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/fixed"), &pNode);
-        ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_CY, "incorrect type\n");
-            VariantClear(&v);
-
-            IXMLDOMNode_Release(pNode);
-        }
-
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/bool"), &pNode);
-        ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_BOOL, "incorrect type\n");
-            ok(V_BOOL(&v) == VARIANT_TRUE, "incorrect value\n");
-            VariantClear( &v );
-
-            IXMLDOMNode_Release(pNode);
-        }
-
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/datetime"), &pNode);
-        ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_DATE, "incorrect type\n");
-            double_eq(40135.13996527778, V_DATE(&v));
-            VariantClear( &v );
-
-            IXMLDOMNode_Release(pNode);
-        }
-
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/datetimetz"), &pNode);
-        ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_DATE, "incorrect type\n");
-            double_eq(37813.59302083334, V_DATE(&v));
-            VariantClear( &v );
-
-            IXMLDOMNode_Release(pNode);
-        }
-
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/date"), &pNode);
-        ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_DATE, "incorrect type\n");
-            double_eq(665413.0, V_DATE(&v));
-            VariantClear( &v );
-
-            IXMLDOMNode_Release(pNode);
-        }
-
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/time"), &pNode);
-        ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_DATE, "incorrect type\n");
-            double_eq(0.5813888888888888, V_DATE(&v));
-            VariantClear( &v );
-
-            IXMLDOMNode_Release(pNode);
-        }
+        ok(V_VT(&value) == (VT_ARRAY|VT_UI1), "incorrect type\n");
+        ok(V_ARRAY(&value)->rgsabound[0].cElements == 6, "incorrect array size\n");
+        if(V_ARRAY(&value)->rgsabound[0].cElements == 6)
+            ok(!memcmp(bytes, V_ARRAY(&value)->pvData, sizeof(bytes)), "incorrect value\n");
+        VariantClear(&value);
+        IXMLDOMNode_Release(node);
+    }
 
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/timetz"), &pNode);
+    hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("foo"), _bstr_("value"), &pi);
+    ok(hr == S_OK, "ret %08x\n", hr );
+    {
+        V_VT(&value) = VT_NULL;
+        V_BSTR(&value) = (void*)0xdeadbeef;
+        hr = IXMLDOMProcessingInstruction_get_nodeTypedValue(pi, &value);
         ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_DATE, "incorrect type\n");
-            double_eq(1.112511574074074, V_DATE(&v));
-            VariantClear( &v );
-
-            IXMLDOMNode_Release(pNode);
-        }
+        ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value));
+        ok(!lstrcmpW(V_BSTR(&value), _bstr_("value")), "got wrong value\n");
+        IXMLDOMProcessingInstruction_Release(pi);
+        VariantClear(&value);
+    }
 
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/i1"), &pNode);
+    hr = IXMLDOMDocument_createCDATASection(doc, _bstr_("[1]*2=3; &gee that's not right!"), &cdata);
+    ok(hr == S_OK, "ret %08x\n", hr );
+    {
+        V_VT(&value) = VT_NULL;
+        V_BSTR(&value) = (void*)0xdeadbeef;
+        hr = IXMLDOMCDATASection_get_nodeTypedValue(cdata, &value);
         ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_I1, "incorrect type\n");
-            ok(V_I1(&v) == -13, "incorrect value\n");
-            VariantClear( &v );
-
-            IXMLDOMNode_Release(pNode);
-        }
+        ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value));
+        ok(!lstrcmpW(V_BSTR(&value), _bstr_("[1]*2=3; &gee that's not right!")), "got wrong value\n");
+        IXMLDOMCDATASection_Release(cdata);
+        VariantClear(&value);
+    }
 
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/i2"), &pNode);
+    hr = IXMLDOMDocument_createComment(doc, _bstr_("comment"), &comment);
+    ok(hr == S_OK, "ret %08x\n", hr );
+    {
+        V_VT(&value) = VT_NULL;
+        V_BSTR(&value) = (void*)0xdeadbeef;
+        hr = IXMLDOMComment_get_nodeTypedValue(comment, &value);
         ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_I2, "incorrect type\n");
-            ok(V_I2(&v) == 31915, "incorrect value\n");
-            VariantClear( &v );
-
-            IXMLDOMNode_Release(pNode);
-        }
+        ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value));
+        ok(!lstrcmpW(V_BSTR(&value), _bstr_("comment")), "got wrong value\n");
+        IXMLDOMComment_Release(comment);
+        VariantClear(&value);
+    }
 
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/i4"), &pNode);
-        ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_I4, "incorrect type\n");
-            ok(V_I4(&v) == -312232, "incorrect value\n");
-            VariantClear(&v);
+    hr = IXMLDOMDocument_createDocumentFragment(doc, &frag);
+    ok(hr == S_OK, "ret %08x\n", hr );
+    {
+        V_VT(&value) = VT_EMPTY;
+        hr = IXMLDOMDocumentFragment_get_nodeTypedValue(frag, &value);
+        ok(hr == S_FALSE, "ret %08x\n", hr );
+        ok(V_VT(&value) == VT_NULL, "got %d\n", V_VT(&value));
+        IXMLDOMDocumentFragment_Release(frag);
+    }
 
-            IXMLDOMNode_Release(pNode);
-        }
+    doc2 = create_document(&IID_IXMLDOMDocument);
 
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/ui1"), &pNode);
-        ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_UI1, "incorrect type\n");
-            ok(V_UI1(&v) == 123, "incorrect value\n");
-            VariantClear(&v);
+    b = VARIANT_FALSE;
+    hr = IXMLDOMDocument_loadXML(doc2, _bstr_(szEmailXML), &b);
+    ok(hr == S_OK, "ret %08x\n", hr );
+    ok(b == VARIANT_TRUE, "got %d\n", b);
 
-            IXMLDOMNode_Release(pNode);
-        }
+    EXPECT_REF(doc2, 1);
 
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/ui2"), &pNode);
-        ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_UI2, "incorrect type\n");
-            ok(V_UI2(&v) == 48282, "incorrect value\n");
-            VariantClear(&v);
+    hr = IXMLDOMDocument_get_doctype(doc2, &doctype);
+    ok(hr == S_OK, "ret %08x\n", hr );
 
-            IXMLDOMNode_Release(pNode);
-        }
+    EXPECT_REF(doc2, 1);
+    todo_wine EXPECT_REF(doctype, 2);
 
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/ui4"), &pNode);
-        ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_UI4, "incorrect type\n");
-            ok(V_UI4(&v) == 949281, "incorrect value\n");
-            VariantClear(&v);
+    {
+        V_VT(&value) = VT_EMPTY;
+        hr = IXMLDOMDocumentType_get_nodeTypedValue(doctype, &value);
+        ok(hr == S_FALSE, "ret %08x\n", hr );
+        ok(V_VT(&value) == VT_NULL, "got %d\n", V_VT(&value));
+    }
 
-            IXMLDOMNode_Release(pNode);
-        }
+    hr = IXMLDOMDocument_get_doctype(doc2, &doctype2);
+    ok(hr == S_OK, "ret %08x\n", hr );
+    ok(doctype != doctype2, "got %p, was %p\n", doctype2, doctype);
 
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/r4"), &pNode);
-        ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_R4, "incorrect type\n");
-            double_eq(213124.0, V_R4(&v));
-            VariantClear(&v);
+    IXMLDOMDocumentType_Release(doctype2);
+    IXMLDOMDocumentType_Release(doctype);
 
-            IXMLDOMNode_Release(pNode);
-        }
+    IXMLDOMDocument_Release(doc2);
 
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/r8"), &pNode);
+    while (entry->name)
+    {
+        hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_(entry->name), &node);
         ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_R8, "incorrect type\n");
-            double_eq(0.412, V_R8(&v));
-            VariantClear(&v);
-
-            IXMLDOMNode_Release(pNode);
-        }
 
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/float"), &pNode);
+        hr = IXMLDOMNode_get_nodeTypedValue(node, &value);
         ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_R8, "incorrect type\n");
-            double_eq(41221.421, V_R8(&v));
-            VariantClear(&v);
-
-            IXMLDOMNode_Release(pNode);
-        }
+        ok(V_VT(&value) == entry->type, "incorrect type, expected %d, got %d\n", entry->type, V_VT(&value));
 
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/uuid"), &pNode);
-        ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
+        if (entry->type == (VT_ARRAY|VT_UI1))
         {
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == VT_BSTR, "incorrect type\n");
-            ok(!lstrcmpW(V_BSTR(&v), _bstr_("333C7BC4-460F-11D0-BC04-0080C7055a83")), "incorrect value\n");
-            VariantClear(&v);
-
-            IXMLDOMNode_Release(pNode);
+            ok(V_ARRAY(&value)->rgsabound[0].cElements == strlen(entry->value),
+               "incorrect array size %d\n", V_ARRAY(&value)->rgsabound[0].cElements);
         }
 
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/binhex"), &pNode);
-        ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
+        if (entry->type != VT_BSTR)
         {
-            BYTE bytes[] = {0xff,0xfc,0xa0,0x12,0x00,0x3c};
-
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == (VT_ARRAY|VT_UI1), "incorrect type\n");
-            ok(V_ARRAY(&v)->rgsabound[0].cElements == 6, "incorrect array size\n");
-            if(V_ARRAY(&v)->rgsabound[0].cElements == 6)
-                ok(!memcmp(bytes, V_ARRAY(&v)->pvData, sizeof(bytes)), "incorrect value\n");
-            VariantClear(&v);
-
-            IXMLDOMNode_Release(pNode);
+           if (entry->type == VT_DATE ||
+               entry->type == VT_R8 ||
+               entry->type == VT_CY)
+           {
+               if (entry->type == VT_DATE)
+               {
+                   hr = VariantChangeType(&value, &value, 0, VT_R4);
+                   ok(hr == S_OK, "ret %08x\n", hr );
+               }
+               hr = VariantChangeTypeEx(&value, &value,
+                                        MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), SORT_DEFAULT),
+                                        VARIANT_NOUSEROVERRIDE, VT_BSTR);
+               ok(hr == S_OK, "ret %08x\n", hr );
+           }
+           else
+           {
+               hr = VariantChangeType(&value, &value, 0, VT_BSTR);
+               ok(hr == S_OK, "ret %08x\n", hr );
+           }
+
+           /* for byte array from VT_ARRAY|VT_UI1 it's not a WCHAR buffer */
+           if (entry->type == (VT_ARRAY|VT_UI1))
+           {
+               ok(!memcmp( V_BSTR(&value), entry->value, strlen(entry->value)),
+                  "expected %s\n", entry->value);
+           }
+           else
+               ok(lstrcmpW( V_BSTR(&value), _bstr_(entry->value)) == 0,
+                  "expected %s, got %s\n", entry->value, wine_dbgstr_w(V_BSTR(&value)));
         }
+        else
+           ok(lstrcmpW( V_BSTR(&value), _bstr_(entry->value)) == 0,
+               "expected %s, got %s\n", entry->value, wine_dbgstr_w(V_BSTR(&value)));
 
-        hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/binbase64"), &pNode);
-        ok(hr == S_OK, "ret %08x\n", hr );
-        if(hr == S_OK)
-        {
-            BYTE bytes[] = {0x62,0x61,0x73,0x65,0x36,0x34,0x20,0x74,0x65,0x73,0x74};
-
-            hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
-            ok(hr == S_OK, "ret %08x\n", hr );
-            ok(V_VT(&v) == (VT_ARRAY|VT_UI1), "incorrect type\n");
-            ok(V_ARRAY(&v)->rgsabound[0].cElements == 11, "incorrect array size\n");
-            if(V_ARRAY(&v)->rgsabound[0].cElements == 11)
-                ok(!memcmp(bytes, V_ARRAY(&v)->pvData, sizeof(bytes)), "incorrect value\n");
-            VariantClear(&v);
+        VariantClear( &value );
+        IXMLDOMNode_Release(node);
 
-            IXMLDOMNode_Release(pNode);
-        }
+        entry++;
     }
 
-    IXMLDOMDocument2_Release(doc);
-
+    IXMLDOMDocument_Release(doc);
     free_bstrs();
 }
 
 static void test_TransformWithLoadingLocalFile(void)
 {
-    IXMLDOMDocument2 *doc = NULL;
-    IXMLDOMDocument2 *xsl = NULL;
+    IXMLDOMDocument *doc;
+    IXMLDOMDocument *xsl;
     IXMLDOMNode *pNode;
     VARIANT_BOOL bSucc;
     HRESULT hr;
@@ -5280,7 +6645,7 @@ static void test_TransformWithLoadingLocalFile(void)
     GetTempPathA(MAX_PATH, lpPathBuffer);
     strcat(lpPathBuffer, "customers.xml" );
 
-    file = CreateFile(lpPathBuffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL );
+    file = CreateFileA(lpPathBuffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL );
     ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError());
     if(file == INVALID_HANDLE_VALUE)
         return;
@@ -5288,27 +6653,17 @@ static void test_TransformWithLoadingLocalFile(void)
     WriteFile(file, szBasicTransformXML, strlen(szBasicTransformXML), &dwWritten, NULL);
     CloseHandle(file);
 
-    /* Correct path to not include a escape character. */
+    /* Correct path to not include an escape character. */
     for(i=0; i < strlen(lpPathBuffer); i++)
     {
         if(lpPathBuffer[i] == '\\')
             lpPathBuffer[i] = '/';
     }
 
-    hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc );
-    ok( hr == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", hr );
-    if( hr != S_OK )
-        return;
-
-    hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&xsl );
-    ok( hr == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", hr );
-    if( hr != S_OK )
-    {
-        IXMLDOMDocument2_Release(doc);
-        return;
-    }
+    doc = create_document(&IID_IXMLDOMDocument);
+    xsl = create_document(&IID_IXMLDOMDocument);
 
-    hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szTypeValueXML), &bSucc);
+    hr = IXMLDOMDocument_loadXML(doc, _bstr_(szTypeValueXML), &bSucc);
     ok(hr == S_OK, "ret %08x\n", hr );
     ok(bSucc == VARIANT_TRUE, "Expected VARIANT_TRUE got VARIANT_FALSE\n");
     if(bSucc == VARIANT_TRUE)
@@ -5324,19 +6679,19 @@ static void test_TransformWithLoadingLocalFile(void)
         lstrcatW(sXSL, sFileName);
         lstrcatW(sXSL, sPart2);
 
-        hr = IXMLDOMDocument2_loadXML(xsl, sXSL, &bSucc);
+        hr = IXMLDOMDocument_loadXML(xsl, sXSL, &bSucc);
         ok(hr == S_OK, "ret %08x\n", hr );
         ok(bSucc == VARIANT_TRUE, "Expected VARIANT_TRUE got VARIANT_FALSE\n");
         if(bSucc == VARIANT_TRUE)
         {
             BSTR sResult;
 
-            hr = IXMLDOMDocument_QueryInterface(xsl, &IID_IXMLDOMNode, (LPVOID*)&pNode );
+            hr = IXMLDOMDocument_QueryInterface(xsl, &IID_IXMLDOMNode, (void**)&pNode );
             ok(hr == S_OK, "ret %08x\n", hr );
             if(hr == S_OK)
             {
                 /* This will load the temp file via the XSL */
-                hr = IXMLDOMDocument2_transformNode(doc, pNode, &sResult);
+                hr = IXMLDOMDocument_transformNode(doc, pNode, &sResult);
                 ok(hr == S_OK, "ret %08x\n", hr );
                 if(hr == S_OK)
                 {
@@ -5351,25 +6706,25 @@ static void test_TransformWithLoadingLocalFile(void)
         SysFreeString(sXSL);
     }
 
-    IXMLDOMDocument2_Release(doc);
-    IXMLDOMDocument2_Release(xsl);
+    IXMLDOMDocument_Release(doc);
+    IXMLDOMDocument_Release(xsl);
 
-    DeleteFile(lpPathBuffer);
+    DeleteFileA(lpPathBuffer);
     free_bstrs();
 }
 
 static void test_put_nodeValue(void)
 {
+    static const WCHAR jeevesW[] = {'J','e','e','v','e','s',' ','&',' ','W','o','o','s','t','e','r',0};
     IXMLDOMDocument *doc;
+    IXMLDOMText *text;
     IXMLDOMEntityReference *entityref;
+    IXMLDOMAttribute *attr;
     IXMLDOMNode *node;
     HRESULT hr;
     VARIANT data, type;
 
-    hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
-    ok( hr == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", hr );
-    if( hr != S_OK )
-        return;
+    doc = create_document(&IID_IXMLDOMDocument);
 
     /* test for unsupported types */
     /* NODE_DOCUMENT */
@@ -5421,234 +6776,5207 @@ static void test_put_nodeValue(void)
     IXMLDOMNode_Release(node);
     IXMLDOMEntityReference_Release(entityref);
 
-    free_bstrs();
-
-    IXMLDOMDocument_Release(doc);
-}
-
-static void test_IObjectSafety_set(IObjectSafety *safety, HRESULT result, HRESULT result2, DWORD set, DWORD mask, DWORD expected, DWORD expected2)
-{
-    HRESULT hr;
-    DWORD enabled, supported;
-
-    trace("testing IObjectSafety: enable=%08x, mask=%08x\n", set, mask);
-
-    hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL, set, mask);
-    if (result == result2)
-        ok(hr == result, "SetInterfaceSafetyOptions: expected %08x, returned %08x\n", result, hr );
-    else
-        ok(broken(hr == result) || hr == result2,
-           "SetInterfaceSafetyOptions: expected %08x, got %08x\n", result2, hr );
-
-    supported = enabled = 0xCAFECAFE;
-    hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled);
+    /* supported types */
+    hr = IXMLDOMDocument_createTextNode(doc, _bstr_(""), &text);
     ok(hr == S_OK, "ret %08x\n", hr );
-    if (expected == expected2)
-        ok(enabled == expected, "Expected %08x, got %08x\n", expected, enabled);
-    else
-        ok(broken(enabled == expected) || enabled == expected2,
-           "Expected %08x, got %08x\n", expected2, enabled);
-
-    /* reset the safety options */
-
-    hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL,
-            INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_SECURITY_MANAGER,
-            0);
+    V_VT(&data) = VT_BSTR;
+    V_BSTR(&data) = _bstr_("Jeeves & Wooster");
+    hr = IXMLDOMText_put_nodeValue(text, data);
     ok(hr == S_OK, "ret %08x\n", hr );
+    IXMLDOMText_Release(text);
 
-    hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled);
+    hr = IXMLDOMDocument_createAttribute(doc, _bstr_("attr"), &attr);
+    ok(hr == S_OK, "ret %08x\n", hr );
+    V_VT(&data) = VT_BSTR;
+    V_BSTR(&data) = _bstr_("Jeeves & Wooster");
+    hr = IXMLDOMAttribute_put_nodeValue(attr, data);
+    ok(hr == S_OK, "ret %08x\n", hr );
+    hr = IXMLDOMAttribute_get_nodeValue(attr, &data);
     ok(hr == S_OK, "ret %08x\n", hr );
-    ok(enabled == 0, "Expected 0, got %08x\n", enabled);
+    ok(memcmp(V_BSTR(&data), jeevesW, sizeof(jeevesW)) == 0, "got %s\n",
+        wine_dbgstr_w(V_BSTR(&data)));
+    VariantClear(&data);
+    IXMLDOMAttribute_Release(attr);
+
+    free_bstrs();
+
+    IXMLDOMDocument_Release(doc);
 }
 
-static void test_document_IObjectSafety(void)
+static void test_IObjectSafety(void)
 {
     IXMLDOMDocument *doc;
     IObjectSafety *safety;
-    DWORD enabled = 0, supported = 0;
     HRESULT hr;
 
-    hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
-    ok( hr == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", hr );
-    if( hr != S_OK )
-        return;
+    doc = create_document(&IID_IXMLDOMDocument);
 
     hr = IXMLDOMDocument_QueryInterface(doc, &IID_IObjectSafety, (void**)&safety);
     ok(hr == S_OK, "ret %08x\n", hr );
 
-    /* get */
-    hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, NULL, &enabled);
-    ok(hr == E_POINTER, "ret %08x\n", hr );
-    hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, NULL);
-    ok(hr == E_POINTER, "ret %08x\n", hr );
+    test_IObjectSafety_common(safety);
 
-    hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled);
-    ok(hr == S_OK, "ret %08x\n", hr );
-    ok(broken(supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA)) ||
-       supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */,
-        "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), "
-             "got %08x\n", supported);
-    ok(enabled == 0, "Expected 0, got %08x\n", enabled);
+    IObjectSafety_Release(safety);
+    IXMLDOMDocument_Release(doc);
 
-    /* set -- individual flags */
+    hr = CoCreateInstance(&CLSID_XMLHTTPRequest, NULL, CLSCTX_INPROC_SERVER,
+        &IID_IObjectSafety, (void**)&safety);
+    ok(hr == S_OK, "Could not create XMLHTTPRequest instance: %08x\n", hr);
 
-    test_IObjectSafety_set(safety, S_OK, S_OK,
-        INTERFACESAFE_FOR_UNTRUSTED_CALLER, INTERFACESAFE_FOR_UNTRUSTED_CALLER,
-        INTERFACESAFE_FOR_UNTRUSTED_CALLER, INTERFACESAFE_FOR_UNTRUSTED_CALLER);
+    test_IObjectSafety_common(safety);
 
-    test_IObjectSafety_set(safety, S_OK, S_OK,
-        INTERFACESAFE_FOR_UNTRUSTED_DATA, INTERFACESAFE_FOR_UNTRUSTED_DATA,
-        INTERFACESAFE_FOR_UNTRUSTED_DATA, INTERFACESAFE_FOR_UNTRUSTED_DATA);
+    IObjectSafety_Release(safety);
 
-    test_IObjectSafety_set(safety, S_OK, S_OK,
-        INTERFACE_USES_SECURITY_MANAGER, INTERFACE_USES_SECURITY_MANAGER,
-        0, INTERFACE_USES_SECURITY_MANAGER /* msxml3 SP8+ */);
+}
 
-    /* set INTERFACE_USES_DISPEX  */
+typedef struct _property_test_t {
+    const GUID *guid;
+    const char *clsid;
+    const char *property;
+    const char *value;
+} property_test_t;
+
+static const property_test_t properties_test_data[] = {
+    { &CLSID_DOMDocument,  "CLSID_DOMDocument" , "SelectionLanguage", "XSLPattern" },
+    { &CLSID_DOMDocument2,  "CLSID_DOMDocument2" , "SelectionLanguage", "XSLPattern" },
+    { &CLSID_DOMDocument30, "CLSID_DOMDocument30", "SelectionLanguage", "XSLPattern" },
+    { &CLSID_DOMDocument40, "CLSID_DOMDocument40", "SelectionLanguage", "XPath" },
+    { &CLSID_DOMDocument60, "CLSID_DOMDocument60", "SelectionLanguage", "XPath" },
+    { 0 }
+};
 
-    test_IObjectSafety_set(safety, S_OK, E_FAIL /* msxml3 SP8+ */,
-        INTERFACE_USES_DISPEX, INTERFACE_USES_DISPEX,
-        0, 0);
+static void test_default_properties(void)
+{
+    const property_test_t *entry = properties_test_data;
 
-    test_IObjectSafety_set(safety, S_OK, E_FAIL /* msxml3 SP8+ */,
-        INTERFACE_USES_DISPEX, 0,
-        0, 0);
+    while (entry->guid)
+    {
+        IXMLDOMDocument2 *doc;
+        VARIANT var;
+        HRESULT hr;
 
-    test_IObjectSafety_set(safety, S_OK, S_OK /* msxml3 SP8+ */,
-        0, INTERFACE_USES_DISPEX,
-        0, 0);
+        if (!is_clsid_supported(entry->guid, &IID_IXMLDOMDocument2))
+        {
+            entry++;
+            continue;
+        }
 
-    /* set option masking */
+        hr = CoCreateInstance(entry->guid, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (void**)&doc);
+        ok(hr == S_OK, "got 0x%08x\n", hr);
 
-    test_IObjectSafety_set(safety, S_OK, S_OK,
-        INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA,
-        INTERFACESAFE_FOR_UNTRUSTED_CALLER,
-        INTERFACESAFE_FOR_UNTRUSTED_CALLER,
-        INTERFACESAFE_FOR_UNTRUSTED_CALLER);
+        hr = IXMLDOMDocument2_getProperty(doc, _bstr_(entry->property), &var);
+        ok(hr == S_OK, "got 0x%08x\n", hr);
+        ok(lstrcmpW(V_BSTR(&var), _bstr_(entry->value)) == 0, "expected %s, for %s\n",
+           entry->value, entry->clsid);
+        VariantClear(&var);
 
-    test_IObjectSafety_set(safety, S_OK, S_OK,
-        INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA,
-        INTERFACESAFE_FOR_UNTRUSTED_DATA,
-        INTERFACESAFE_FOR_UNTRUSTED_DATA,
-        INTERFACESAFE_FOR_UNTRUSTED_DATA);
+        IXMLDOMDocument2_Release(doc);
 
-    test_IObjectSafety_set(safety, S_OK, S_OK,
-        INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA,
-        INTERFACE_USES_SECURITY_MANAGER,
-        0,
-        0);
+        entry++;
+    }
+}
+
+typedef struct {
+    const char *query;
+    const char *list;
+} xslpattern_test_t;
+
+static const xslpattern_test_t xslpattern_test[] = {
+    { "root//elem[0]", "E1.E2.D1" },
+    { "root//elem[index()=1]", "E2.E2.D1" },
+    { "root//elem[index() $eq$ 1]", "E2.E2.D1" },
+    { "root//elem[end()]", "E4.E2.D1" },
+    { "root//elem[$not$ end()]", "E1.E2.D1 E2.E2.D1 E3.E2.D1" },
+    { "root//elem[index() != 0]", "E2.E2.D1 E3.E2.D1 E4.E2.D1" },
+    { "root//elem[index() $ne$ 0]", "E2.E2.D1 E3.E2.D1 E4.E2.D1" },
+    { "root//elem[index() < 2]", "E1.E2.D1 E2.E2.D1" },
+    { "root//elem[index() $lt$ 2]", "E1.E2.D1 E2.E2.D1" },
+    { "root//elem[index() <= 1]", "E1.E2.D1 E2.E2.D1" },
+    { "root//elem[index() $le$ 1]", "E1.E2.D1 E2.E2.D1" },
+    { "root//elem[index() > 1]", "E3.E2.D1 E4.E2.D1" },
+    { "root//elem[index() $gt$ 1]", "E3.E2.D1 E4.E2.D1" },
+    { "root//elem[index() >= 2]", "E3.E2.D1 E4.E2.D1" },
+    { "root//elem[index() $ge$ 2]", "E3.E2.D1 E4.E2.D1" },
+    { "root//elem[a $ieq$ 'a2 field']", "E2.E2.D1" },
+    { "root//elem[a $ine$ 'a2 field']", "E1.E2.D1 E3.E2.D1 E4.E2.D1" },
+    { "root//elem[a $ilt$ 'a3 field']", "E1.E2.D1 E2.E2.D1" },
+    { "root//elem[a $ile$ 'a2 field']", "E1.E2.D1 E2.E2.D1" },
+    { "root//elem[a $igt$ 'a2 field']", "E3.E2.D1 E4.E2.D1" },
+    { "root//elem[a $ige$ 'a3 field']", "E3.E2.D1 E4.E2.D1" },
+    { "root//elem[$any$ *='B2 field']", "E2.E2.D1" },
+    { "root//elem[$all$ *!='B2 field']", "E1.E2.D1 E3.E2.D1 E4.E2.D1" },
+    { "root//elem[index()=0 or end()]", "E1.E2.D1 E4.E2.D1" },
+    { "root//elem[index()=0 $or$ end()]", "E1.E2.D1 E4.E2.D1" },
+    { "root//elem[index()=0 || end()]", "E1.E2.D1 E4.E2.D1" },
+    { "root//elem[index()>0 and $not$ end()]", "E2.E2.D1 E3.E2.D1" },
+    { "root//elem[index()>0 $and$ $not$ end()]", "E2.E2.D1 E3.E2.D1" },
+    { "root//elem[index()>0 && $not$ end()]", "E2.E2.D1 E3.E2.D1" },
+    { "root/elem[0]", "E1.E2.D1" },
+    { "root/elem[index()=1]", "E2.E2.D1" },
+    { "root/elem[index() $eq$ 1]", "E2.E2.D1" },
+    { "root/elem[end()]", "E4.E2.D1" },
+    { "root/elem[$not$ end()]", "E1.E2.D1 E2.E2.D1 E3.E2.D1" },
+    { "root/elem[index() != 0]", "E2.E2.D1 E3.E2.D1 E4.E2.D1" },
+    { "root/elem[index() $ne$ 0]", "E2.E2.D1 E3.E2.D1 E4.E2.D1" },
+    { "root/elem[index() < 2]", "E1.E2.D1 E2.E2.D1" },
+    { "root/elem[index() $lt$ 2]", "E1.E2.D1 E2.E2.D1" },
+    { "root/elem[index() <= 1]", "E1.E2.D1 E2.E2.D1" },
+    { "root/elem[index() $le$ 1]", "E1.E2.D1 E2.E2.D1" },
+    { "root/elem[index() > 1]", "E3.E2.D1 E4.E2.D1" },
+    { "root/elem[index() $gt$ 1]", "E3.E2.D1 E4.E2.D1" },
+    { "root/elem[index() >= 2]", "E3.E2.D1 E4.E2.D1" },
+    { "root/elem[index() $ge$ 2]", "E3.E2.D1 E4.E2.D1" },
+    { "root/elem[a $ieq$ 'a2 field']", "E2.E2.D1" },
+    { "root/elem[a $ine$ 'a2 field']", "E1.E2.D1 E3.E2.D1 E4.E2.D1" },
+    { "root/elem[a $ilt$ 'a3 field']", "E1.E2.D1 E2.E2.D1" },
+    { "root/elem[a $ile$ 'a2 field']", "E1.E2.D1 E2.E2.D1" },
+    { "root/elem[a $igt$ 'a2 field']", "E3.E2.D1 E4.E2.D1" },
+    { "root/elem[a $ige$ 'a3 field']", "E3.E2.D1 E4.E2.D1" },
+    { "root/elem[$any$ *='B2 field']", "E2.E2.D1" },
+    { "root/elem[$all$ *!='B2 field']", "E1.E2.D1 E3.E2.D1 E4.E2.D1" },
+    { "root/elem[index()=0 or end()]", "E1.E2.D1 E4.E2.D1" },
+    { "root/elem[index()=0 $or$ end()]", "E1.E2.D1 E4.E2.D1" },
+    { "root/elem[index()=0 || end()]", "E1.E2.D1 E4.E2.D1" },
+    { "root/elem[index()>0 and $not$ end()]", "E2.E2.D1 E3.E2.D1" },
+    { "root/elem[index()>0 $and$ $not$ end()]", "E2.E2.D1 E3.E2.D1" },
+    { "root/elem[index()>0 && $not$ end()]", "E2.E2.D1 E3.E2.D1" },
+    { "root/elem[d]", "E1.E2.D1 E2.E2.D1 E4.E2.D1" },
+    { NULL }
+};
+
+static const xslpattern_test_t xslpattern_test_no_ns[] = {
+    /* prefixes don't need to be registered, you may use them as they are in the doc */
+    { "//bar:x", "E5.E1.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1" },
+    /* prefixes must be explicitly specified in the name */
+    { "//foo:elem", "" },
+    { "//foo:c", "E3.E4.E2.D1" },
+    { NULL }
+};
+
+static const xslpattern_test_t xslpattern_test_func[] = {
+    { "attribute()", "" },
+    { "attribute('depth')", "" },
+    { "root/attribute('depth')", "A'depth'.E3.D1" },
+    { "//x/attribute()", "A'id'.E3.E3.D1 A'depth'.E3.E3.D1" },
+    { "//x//attribute(id)", NULL },
+    { "//x//attribute('id')", "A'id'.E3.E3.D1 A'id'.E4.E3.E3.D1 A'id'.E5.E3.E3.D1 A'id'.E6.E3.E3.D1" },
+    { "comment()", "C2.D1" },
+    { "//comment()", "C2.D1 C1.E3.D1 C2.E3.E3.D1 C2.E4.E3.D1" },
+    { "element()", "E3.D1" },
+    { "root/y/element()", "E4.E4.E3.D1 E5.E4.E3.D1 E6.E4.E3.D1" },
+    { "//element(a)", NULL },
+    { "//element('a')", "E4.E3.E3.D1 E4.E4.E3.D1" },
+    { "node()", "P1.D1 C2.D1 E3.D1" },
+    { "//x/node()", "P1.E3.E3.D1 C2.E3.E3.D1 T3.E3.E3.D1 E4.E3.E3.D1 E5.E3.E3.D1 E6.E3.E3.D1" },
+    { "//x/node()[nodeType()=1]", "E4.E3.E3.D1 E5.E3.E3.D1 E6.E3.E3.D1" },
+    { "//x/node()[nodeType()=3]", "T3.E3.E3.D1" },
+    { "//x/node()[nodeType()=7]", "P1.E3.E3.D1" },
+    { "//x/node()[nodeType()=8]", "C2.E3.E3.D1" },
+    { "pi()", "P1.D1" },
+    { "//y/pi()", "P1.E4.E3.D1" },
+    { "root/textnode()", "T2.E3.D1" },
+    { "root/element()/textnode()", "T3.E3.E3.D1 T3.E4.E3.D1" },
+    { NULL }
+};
+
+static void test_XSLPattern(void)
+{
+    const xslpattern_test_t *ptr = xslpattern_test;
+    IXMLDOMDocument2 *doc;
+    IXMLDOMNodeList *list;
+    VARIANT_BOOL b;
+    HRESULT hr;
+    LONG len;
+
+    doc = create_document(&IID_IXMLDOMDocument2);
+
+    b = VARIANT_FALSE;
+    hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szExampleXML), &b);
+    EXPECT_HR(hr, S_OK);
+    ok(b == VARIANT_TRUE, "failed to load XML string\n");
+
+    /* switch to XSLPattern */
+    hr = IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), _variantbstr_("XSLPattern"));
+    EXPECT_HR(hr, S_OK);
+
+    /* XPath doesn't select elements with non-null default namespace with unqualified selectors, XSLPattern does */
+    hr = IXMLDOMDocument2_selectNodes(doc, _bstr_("//elem/c"), &list);
+    EXPECT_HR(hr, S_OK);
+
+    len = 0;
+    hr = IXMLDOMNodeList_get_length(list, &len);
+    EXPECT_HR(hr, S_OK);
+    /* should select <elem><c> and <elem xmlns='...'><c> but not <elem><foo:c> */
+    ok(len == 3, "expected 3 entries in list, got %d\n", len);
+    IXMLDOMNodeList_Release(list);
+
+    while (ptr->query)
+    {
+        list = NULL;
+        hr = IXMLDOMDocument2_selectNodes(doc, _bstr_(ptr->query), &list);
+        ok(hr == S_OK, "query=%s, failed with 0x%08x\n", ptr->query, hr);
+        len = 0;
+        hr = IXMLDOMNodeList_get_length(list, &len);
+        ok(len != 0, "query=%s, empty list\n", ptr->query);
+        if (len)
+            expect_list_and_release(list, ptr->list);
+
+        ptr++;
+    }
+
+    /* namespace handling */
+    /* no registered namespaces */
+    hr = IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), _variantbstr_(""));
+    EXPECT_HR(hr, S_OK);
+
+    ptr = xslpattern_test_no_ns;
+    while (ptr->query)
+    {
+        list = NULL;
+        hr = IXMLDOMDocument2_selectNodes(doc, _bstr_(ptr->query), &list);
+        ok(hr == S_OK, "query=%s, failed with 0x%08x\n", ptr->query, hr);
+
+        if (*ptr->list)
+        {
+            len = 0;
+            hr = IXMLDOMNodeList_get_length(list, &len);
+            EXPECT_HR(hr, S_OK);
+            ok(len != 0, "query=%s, empty list\n", ptr->query);
+        }
+        else
+        {
+            len = 1;
+            hr = IXMLDOMNodeList_get_length(list, &len);
+            EXPECT_HR(hr, S_OK);
+            ok(len == 0, "query=%s, empty list\n", ptr->query);
+        }
+        if (len)
+            expect_list_and_release(list, ptr->list);
+
+        ptr++;
+    }
+
+    /* explicitly register prefix foo */
+    ole_check(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), _variantbstr_("xmlns:foo='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'")));
+
+    /* now we get the same behavior as XPath */
+    hr = IXMLDOMDocument2_selectNodes(doc, _bstr_("//foo:c"), &list);
+    EXPECT_HR(hr, S_OK);
+    len = 0;
+    hr = IXMLDOMNodeList_get_length(list, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(len != 0, "expected filled list\n");
+    if (len)
+        expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1");
+
+    /* set prefix foo to some nonexistent namespace */
+    hr = IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), _variantbstr_("xmlns:foo='urn:nonexistent-foo'"));
+    EXPECT_HR(hr, S_OK);
+
+    /* the registered prefix takes precedence */
+    hr = IXMLDOMDocument2_selectNodes(doc, _bstr_("//foo:c"), &list);
+    EXPECT_HR(hr, S_OK);
+    len = 0;
+    hr = IXMLDOMNodeList_get_length(list, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(len == 0, "expected empty list\n");
+    IXMLDOMNodeList_Release(list);
+
+    IXMLDOMDocument2_Release(doc);
+
+    doc = create_document(&IID_IXMLDOMDocument2);
+
+    hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szNodeTypesXML), &b);
+    EXPECT_HR(hr, S_OK);
+    ok(b == VARIANT_TRUE, "failed to load XML string\n");
+
+    ptr = xslpattern_test_func;
+    while (ptr->query)
+    {
+        list = NULL;
+        hr = IXMLDOMDocument2_selectNodes(doc, _bstr_(ptr->query), &list);
+        if (ptr->list)
+        {
+            ok(hr == S_OK, "query=%s, failed with 0x%08x\n", ptr->query, hr);
+            len = 0;
+            hr = IXMLDOMNodeList_get_length(list, &len);
+            if (*ptr->list)
+            {
+                ok(len != 0, "query=%s, empty list\n", ptr->query);
+                if (len)
+                    expect_list_and_release(list, ptr->list);
+            }
+            else
+                ok(len == 0, "query=%s, filled list\n", ptr->query);
+        }
+        else
+            ok(hr == E_FAIL, "query=%s, failed with 0x%08x\n", ptr->query, hr);
+
+        ptr++;
+    }
+
+    IXMLDOMDocument2_Release(doc);
+    free_bstrs();
+}
+
+static void test_splitText(void)
+{
+    IXMLDOMCDATASection *cdata;
+    IXMLDOMElement *root;
+    IXMLDOMDocument *doc;
+    IXMLDOMText *text, *text2;
+    IXMLDOMNode *node;
+    VARIANT var;
+    VARIANT_BOOL success;
+    LONG length;
+    HRESULT hr;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_loadXML(doc, _bstr_("<root></root>"), &success);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument_get_documentElement(doc, &root);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument_createCDATASection(doc, _bstr_("beautiful plumage"), &cdata);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    V_VT(&var) = VT_EMPTY;
+    hr = IXMLDOMElement_appendChild(root, (IXMLDOMNode*)cdata, NULL);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    length = 0;
+    hr = IXMLDOMCDATASection_get_length(cdata, &length);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(length > 0, "got %d\n", length);
+
+    hr = IXMLDOMCDATASection_splitText(cdata, 0, NULL);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+    text = (void*)0xdeadbeef;
+    /* negative offset */
+    hr = IXMLDOMCDATASection_splitText(cdata, -1, &text);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+    ok(text == (void*)0xdeadbeef, "got %p\n", text);
+
+    text = (void*)0xdeadbeef;
+    /* offset outside data */
+    hr = IXMLDOMCDATASection_splitText(cdata, length + 1, &text);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+    ok(text == 0, "got %p\n", text);
+
+    text = (void*)0xdeadbeef;
+    /* offset outside data */
+    hr = IXMLDOMCDATASection_splitText(cdata, length, &text);
+    ok(hr == S_FALSE, "got 0x%08x\n", hr);
+    ok(text == 0, "got %p\n", text);
+
+    /* no empty node created */
+    node = (void*)0xdeadbeef;
+    hr = IXMLDOMCDATASection_get_nextSibling(cdata, &node);
+    ok(hr == S_FALSE, "got 0x%08x\n", hr);
+    ok(node == 0, "got %p\n", text);
+
+    hr = IXMLDOMCDATASection_splitText(cdata, 10, &text);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    length = 0;
+    hr = IXMLDOMText_get_length(text, &length);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(length == 7, "got %d\n", length);
+
+    hr = IXMLDOMCDATASection_get_nextSibling(cdata, &node);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    IXMLDOMNode_Release(node);
+
+    /* split new text node */
+    hr = IXMLDOMText_get_length(text, &length);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    node = (void*)0xdeadbeef;
+    hr = IXMLDOMText_get_nextSibling(text, &node);
+    ok(hr == S_FALSE, "got 0x%08x\n", hr);
+    ok(node == 0, "got %p\n", text);
+
+    hr = IXMLDOMText_splitText(text, 0, NULL);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+    text2 = (void*)0xdeadbeef;
+    /* negative offset */
+    hr = IXMLDOMText_splitText(text, -1, &text2);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+    ok(text2 == (void*)0xdeadbeef, "got %p\n", text2);
+
+    text2 = (void*)0xdeadbeef;
+    /* offset outside data */
+    hr = IXMLDOMText_splitText(text, length + 1, &text2);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+    ok(text2 == 0, "got %p\n", text2);
+
+    text2 = (void*)0xdeadbeef;
+    /* offset outside data */
+    hr = IXMLDOMText_splitText(text, length, &text2);
+    ok(hr == S_FALSE, "got 0x%08x\n", hr);
+    ok(text2 == 0, "got %p\n", text);
+
+    text2 = 0;
+    hr = IXMLDOMText_splitText(text, 4, &text2);
+    todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
+    if (text2) IXMLDOMText_Release(text2);
+
+    node = 0;
+    hr = IXMLDOMText_get_nextSibling(text, &node);
+    todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
+    if (node) IXMLDOMNode_Release(node);
+
+    IXMLDOMText_Release(text);
+    IXMLDOMElement_Release(root);
+    IXMLDOMCDATASection_Release(cdata);
+    free_bstrs();
+}
+
+typedef struct {
+    const char *name;
+    const char *uri;
+    HRESULT hr;
+} ns_item_t;
+
+/* default_ns_doc used */
+static const ns_item_t qualified_item_tests[] = {
+    { "xml:lang", NULL, S_FALSE },
+    { "xml:lang", "http://www.w3.org/XML/1998/namespace", S_FALSE },
+    { "lang", "http://www.w3.org/XML/1998/namespace", S_OK },
+    { "ns:b", NULL, S_FALSE },
+    { "ns:b", "nshref", S_FALSE },
+    { "b", "nshref", S_OK },
+    { "d", NULL, S_OK },
+    { NULL }
+};
+
+static const ns_item_t named_item_tests[] = {
+    { "xml:lang", NULL, S_OK },
+    { "lang", NULL, S_FALSE },
+    { "ns:b", NULL, S_OK },
+    { "b", NULL, S_FALSE },
+    { "d", NULL, S_OK },
+    { NULL }
+};
+
+static void test_getQualifiedItem(void)
+{
+    IXMLDOMNode *pr_node, *node;
+    IXMLDOMNodeList *root_list;
+    IXMLDOMNamedNodeMap *map;
+    IXMLDOMElement *element;
+    const ns_item_t* ptr;
+    IXMLDOMDocument *doc;
+    VARIANT_BOOL b;
+    HRESULT hr;
+    LONG len;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_loadXML( doc, _bstr_(complete4A), &b );
+    EXPECT_HR(hr, S_OK);
+    ok( b == VARIANT_TRUE, "failed to load XML string\n");
+
+    hr = IXMLDOMDocument_get_documentElement(doc, &element);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMElement_get_childNodes(element, &root_list);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMNodeList_get_item(root_list, 1, &pr_node);
+    EXPECT_HR(hr, S_OK);
+    IXMLDOMNodeList_Release(root_list);
+
+    hr = IXMLDOMNode_get_attributes(pr_node, &map);
+    EXPECT_HR(hr, S_OK);
+    IXMLDOMNode_Release(pr_node);
+
+    len = 0;
+    hr = IXMLDOMNamedNodeMap_get_length(map, &len);
+    EXPECT_HR(hr, S_OK);
+    ok( len == 3, "length %d\n", len);
+
+    hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, NULL, NULL, NULL);
+    EXPECT_HR(hr, E_INVALIDARG);
+
+    node = (void*)0xdeadbeef;
+    hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, NULL, NULL, &node);
+    EXPECT_HR(hr, E_INVALIDARG);
+    ok( node == (void*)0xdeadbeef, "got %p\n", node);
+
+    hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, _bstr_("id"), NULL, NULL);
+    EXPECT_HR(hr, E_INVALIDARG);
+
+    hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, _bstr_("id"), NULL, &node);
+    EXPECT_HR(hr, S_OK);
+
+    IXMLDOMNode_Release(node);
+    IXMLDOMNamedNodeMap_Release(map);
+    IXMLDOMElement_Release(element);
+
+    hr = IXMLDOMDocument_loadXML(doc, _bstr_(default_ns_doc), &b);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("a"), &node);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&element);
+    EXPECT_HR(hr, S_OK);
+    IXMLDOMNode_Release(node);
+
+    hr = IXMLDOMElement_get_attributes(element, &map);
+    EXPECT_HR(hr, S_OK);
+
+    ptr = qualified_item_tests;
+    while (ptr->name)
+    {
+       node = (void*)0xdeadbeef;
+       hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, _bstr_(ptr->name), _bstr_(ptr->uri), &node);
+       ok(hr == ptr->hr, "%s, %s: got 0x%08x, expected 0x%08x\n", ptr->name, ptr->uri, hr, ptr->hr);
+       if (hr == S_OK)
+           IXMLDOMNode_Release(node);
+       else
+           ok(node == NULL, "%s, %s: got %p\n", ptr->name, ptr->uri, node);
+       ptr++;
+    }
+
+    ptr = named_item_tests;
+    while (ptr->name)
+    {
+       node = (void*)0xdeadbeef;
+       hr = IXMLDOMNamedNodeMap_getNamedItem(map, _bstr_(ptr->name), &node);
+       ok(hr == ptr->hr, "%s: got 0x%08x, expected 0x%08x\n", ptr->name, hr, ptr->hr);
+       if (hr == S_OK)
+           IXMLDOMNode_Release(node);
+       else
+           ok(node == NULL, "%s: got %p\n", ptr->name, node);
+       ptr++;
+    }
+
+    IXMLDOMNamedNodeMap_Release(map);
+
+    IXMLDOMElement_Release(element);
+    IXMLDOMDocument_Release(doc);
+    free_bstrs();
+}
+
+static void test_removeQualifiedItem(void)
+{
+    IXMLDOMDocument *doc;
+    IXMLDOMElement *element;
+    IXMLDOMNode *pr_node, *node;
+    IXMLDOMNodeList *root_list;
+    IXMLDOMNamedNodeMap *map;
+    VARIANT_BOOL b;
+    LONG len;
+    HRESULT hr;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_loadXML( doc, _bstr_(complete4A), &b );
+    ok( hr == S_OK, "loadXML failed\n");
+    ok( b == VARIANT_TRUE, "failed to load XML string\n");
+
+    hr = IXMLDOMDocument_get_documentElement(doc, &element);
+    ok( hr == S_OK, "ret %08x\n", hr);
+
+    hr = IXMLDOMElement_get_childNodes(element, &root_list);
+    ok( hr == S_OK, "ret %08x\n", hr);
+
+    hr = IXMLDOMNodeList_get_item(root_list, 1, &pr_node);
+    ok( hr == S_OK, "ret %08x\n", hr);
+    IXMLDOMNodeList_Release(root_list);
+
+    hr = IXMLDOMNode_get_attributes(pr_node, &map);
+    ok( hr == S_OK, "ret %08x\n", hr);
+    IXMLDOMNode_Release(pr_node);
+
+    hr = IXMLDOMNamedNodeMap_get_length(map, &len);
+    ok( hr == S_OK, "ret %08x\n", hr);
+    ok( len == 3, "length %d\n", len);
+
+    hr = IXMLDOMNamedNodeMap_removeQualifiedItem(map, NULL, NULL, NULL);
+    ok( hr == E_INVALIDARG, "ret %08x\n", hr);
+
+    node = (void*)0xdeadbeef;
+    hr = IXMLDOMNamedNodeMap_removeQualifiedItem(map, NULL, NULL, &node);
+    ok( hr == E_INVALIDARG, "ret %08x\n", hr);
+    ok( node == (void*)0xdeadbeef, "got %p\n", node);
+
+    /* out pointer is optional */
+    hr = IXMLDOMNamedNodeMap_removeQualifiedItem(map, _bstr_("id"), NULL, NULL);
+    ok( hr == S_OK, "ret %08x\n", hr);
+
+    /* already removed */
+    hr = IXMLDOMNamedNodeMap_removeQualifiedItem(map, _bstr_("id"), NULL, NULL);
+    ok( hr == S_FALSE, "ret %08x\n", hr);
+
+    hr = IXMLDOMNamedNodeMap_removeQualifiedItem(map, _bstr_("vr"), NULL, &node);
+    ok( hr == S_OK, "ret %08x\n", hr);
+    IXMLDOMNode_Release(node);
+
+    IXMLDOMNamedNodeMap_Release( map );
+    IXMLDOMElement_Release( element );
+    IXMLDOMDocument_Release( doc );
+    free_bstrs();
+}
+
+#define check_default_props(doc) _check_default_props(__LINE__, doc)
+static inline void _check_default_props(int line, IXMLDOMDocument2* doc)
+{
+    VARIANT_BOOL b;
+    VARIANT var;
+    HRESULT hr;
+
+    VariantInit(&var);
+    helper_ole_check(IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionLanguage"), &var));
+    ok_(__FILE__, line)(lstrcmpW(V_BSTR(&var), _bstr_("XSLPattern")) == 0, "expected XSLPattern\n");
+    VariantClear(&var);
+
+    helper_ole_check(IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionNamespaces"), &var));
+    ok_(__FILE__, line)(lstrcmpW(V_BSTR(&var), _bstr_("")) == 0, "expected empty string\n");
+    VariantClear(&var);
+
+    helper_ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc, &b));
+    ok_(__FILE__, line)(b == VARIANT_FALSE, "expected FALSE\n");
+
+    hr = IXMLDOMDocument2_get_schemas(doc, &var);
+    ok_(__FILE__, line)(hr == S_FALSE, "got %08x\n", hr);
+    VariantClear(&var);
+}
+
+#define check_set_props(doc) _check_set_props(__LINE__, doc)
+static inline void _check_set_props(int line, IXMLDOMDocument2* doc)
+{
+    VARIANT_BOOL b;
+    VARIANT var;
+
+    VariantInit(&var);
+    helper_ole_check(IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionLanguage"), &var));
+    ok_(__FILE__, line)(lstrcmpW(V_BSTR(&var), _bstr_("XPath")) == 0, "expected XPath\n");
+    VariantClear(&var);
+
+    helper_ole_check(IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionNamespaces"), &var));
+    ok_(__FILE__, line)(lstrcmpW(V_BSTR(&var), _bstr_("xmlns:wi=\'www.winehq.org\'")) == 0, "got %s\n", wine_dbgstr_w(V_BSTR(&var)));
+    VariantClear(&var);
+
+    helper_ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc, &b));
+    ok_(__FILE__, line)(b == VARIANT_TRUE, "expected TRUE\n");
+
+    helper_ole_check(IXMLDOMDocument2_get_schemas(doc, &var));
+    ok_(__FILE__, line)(V_VT(&var) != VT_NULL, "expected pointer\n");
+    VariantClear(&var);
+}
+
+#define set_props(doc, cache) _set_props(__LINE__, doc, cache)
+static inline void _set_props(int line, IXMLDOMDocument2* doc, IXMLDOMSchemaCollection* cache)
+{
+    VARIANT var;
+
+    VariantInit(&var);
+    helper_ole_check(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), _variantbstr_("XPath")));
+    helper_ole_check(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), _variantbstr_("xmlns:wi=\'www.winehq.org\'")));
+    helper_ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc, VARIANT_TRUE));
+    V_VT(&var) = VT_DISPATCH;
+    V_DISPATCH(&var) = NULL;
+    helper_ole_check(IXMLDOMSchemaCollection_QueryInterface(cache, &IID_IDispatch, (void**)&V_DISPATCH(&var)));
+    ok_(__FILE__, line)(V_DISPATCH(&var) != NULL, "expected pointer\n");
+    helper_ole_check(IXMLDOMDocument2_putref_schemas(doc, var));
+    VariantClear(&var);
+}
+
+#define unset_props(doc) _unset_props(__LINE__, doc)
+static inline void _unset_props(int line, IXMLDOMDocument2* doc)
+{
+    VARIANT var;
+
+    VariantInit(&var);
+    helper_ole_check(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), _variantbstr_("XSLPattern")));
+    helper_ole_check(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), _variantbstr_("")));
+    helper_ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc, VARIANT_FALSE));
+    V_VT(&var) = VT_NULL;
+    helper_ole_check(IXMLDOMDocument2_putref_schemas(doc, var));
+    VariantClear(&var);
+}
+
+static void test_get_ownerDocument(void)
+{
+    IXMLDOMDocument *doc1, *doc2, *doc3;
+    IXMLDOMDocument2 *doc, *doc_owner;
+    IXMLDOMNode *node;
+    IXMLDOMSchemaCollection *cache;
+    VARIANT_BOOL b;
+    VARIANT var;
+
+    if (!is_clsid_supported(&CLSID_DOMDocument2, &IID_IXMLDOMDocument2)) return;
+    if (!is_clsid_supported(&CLSID_XMLSchemaCache, &IID_IXMLDOMSchemaCollection)) return;
+
+    doc = create_document(&IID_IXMLDOMDocument2);
+    cache = create_cache(&IID_IXMLDOMSchemaCollection);
+
+    VariantInit(&var);
+
+    ole_check(IXMLDOMDocument2_loadXML(doc, _bstr_(complete4A), &b));
+    ok(b == VARIANT_TRUE, "failed to load XML string\n");
+
+    check_default_props(doc);
+
+    /* set properties and check that new instances use them */
+    set_props(doc, cache);
+    check_set_props(doc);
+
+    ole_check(IXMLDOMDocument2_get_firstChild(doc, &node));
+    ole_check(IXMLDOMNode_get_ownerDocument(node, &doc1));
+
+    /* new interface keeps props */
+    ole_check(IXMLDOMDocument_QueryInterface(doc1, &IID_IXMLDOMDocument2, (void**)&doc_owner));
+    ok( doc_owner != doc, "got %p, doc %p\n", doc_owner, doc);
+    check_set_props(doc_owner);
+    IXMLDOMDocument2_Release(doc_owner);
+
+    ole_check(IXMLDOMNode_get_ownerDocument(node, &doc2));
+    IXMLDOMNode_Release(node);
+
+    ok(doc1 != doc2, "got %p, expected %p. original %p\n", doc2, doc1, doc);
+
+    /* reload */
+    ole_check(IXMLDOMDocument2_loadXML(doc, _bstr_(complete4A), &b));
+    ok(b == VARIANT_TRUE, "failed to load XML string\n");
+
+    /* properties retained even after reload */
+    check_set_props(doc);
+
+    ole_check(IXMLDOMDocument2_get_firstChild(doc, &node));
+    ole_check(IXMLDOMNode_get_ownerDocument(node, &doc3));
+    IXMLDOMNode_Release(node);
+
+    ole_check(IXMLDOMDocument_QueryInterface(doc3, &IID_IXMLDOMDocument2, (void**)&doc_owner));
+    ok(doc3 != doc1 && doc3 != doc2 && doc_owner != doc, "got %p, (%p, %p, %p)\n", doc3, doc, doc1, doc2);
+    check_set_props(doc_owner);
+
+    /* changing properties for one instance changes them for all */
+    unset_props(doc_owner);
+    check_default_props(doc_owner);
+    check_default_props(doc);
+
+    IXMLDOMSchemaCollection_Release(cache);
+    IXMLDOMDocument_Release(doc1);
+    IXMLDOMDocument_Release(doc2);
+    IXMLDOMDocument_Release(doc3);
+    IXMLDOMDocument2_Release(doc);
+    IXMLDOMDocument2_Release(doc_owner);
+    free_bstrs();
+}
+
+static void test_setAttributeNode(void)
+{
+    IXMLDOMDocument *doc, *doc2;
+    IXMLDOMElement *elem, *elem2;
+    IXMLDOMAttribute *attr, *attr2, *ret_attr;
+    VARIANT_BOOL b;
+    HRESULT hr;
+    VARIANT v;
+    BSTR str;
+    ULONG ref1, ref2;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_loadXML( doc, _bstr_(complete4A), &b );
+    ok( hr == S_OK, "loadXML failed\n");
+    ok( b == VARIANT_TRUE, "failed to load XML string\n");
+
+    hr = IXMLDOMDocument_get_documentElement(doc, &elem);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument_get_documentElement(doc, &elem2);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+    ok( elem2 != elem, "got same instance\n");
+
+    ret_attr = (void*)0xdeadbeef;
+    hr = IXMLDOMElement_setAttributeNode(elem, NULL, &ret_attr);
+    ok( hr == E_INVALIDARG, "got 0x%08x\n", hr);
+    ok( ret_attr == (void*)0xdeadbeef, "got %p\n", ret_attr);
+
+    hr = IXMLDOMDocument_createAttribute(doc, _bstr_("attr"), &attr);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+
+    ref1 = IXMLDOMElement_AddRef(elem);
+    IXMLDOMElement_Release(elem);
+
+    ret_attr = (void*)0xdeadbeef;
+    hr = IXMLDOMElement_setAttributeNode(elem, attr, &ret_attr);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+    ok( ret_attr == NULL, "got %p\n", ret_attr);
+
+    /* no reference added */
+    ref2 = IXMLDOMElement_AddRef(elem);
+    IXMLDOMElement_Release(elem);
+    ok(ref2 == ref1, "got %d, expected %d\n", ref2, ref1);
+
+    EXPECT_CHILDREN(elem);
+    EXPECT_CHILDREN(elem2);
+
+    IXMLDOMElement_Release(elem2);
+
+    attr2 = NULL;
+    hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("attr"), &attr2);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+    ok( attr2 != attr, "got same instance %p\n", attr2);
+    IXMLDOMAttribute_Release(attr2);
+
+    /* try to add it another time */
+    ret_attr = (void*)0xdeadbeef;
+    hr = IXMLDOMElement_setAttributeNode(elem, attr, &ret_attr);
+    ok( hr == E_FAIL, "got 0x%08x\n", hr);
+    ok( ret_attr == (void*)0xdeadbeef, "got %p\n", ret_attr);
+
+    IXMLDOMElement_Release(elem);
+
+    /* initially used element is released, attribute still 'has' a container */
+    hr = IXMLDOMDocument_get_documentElement(doc, &elem);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+    ret_attr = (void*)0xdeadbeef;
+    hr = IXMLDOMElement_setAttributeNode(elem, attr, &ret_attr);
+    ok( hr == E_FAIL, "got 0x%08x\n", hr);
+    ok( ret_attr == (void*)0xdeadbeef, "got %p\n", ret_attr);
+    IXMLDOMElement_Release(elem);
+
+    /* add attribute already attached to another document */
+    doc2 = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_loadXML( doc2, _bstr_(complete4A), &b );
+    ok( hr == S_OK, "loadXML failed\n");
+    ok( b == VARIANT_TRUE, "failed to load XML string\n");
+
+    hr = IXMLDOMDocument_get_documentElement(doc2, &elem);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+    hr = IXMLDOMElement_setAttributeNode(elem, attr, NULL);
+    ok( hr == E_FAIL, "got 0x%08x\n", hr);
+    IXMLDOMElement_Release(elem);
+
+    IXMLDOMAttribute_Release(attr);
+
+    /* create element, add attribute, see if it's copied or linked */
+    hr = IXMLDOMDocument_createElement(doc, _bstr_("test"), &elem);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+
+    attr = NULL;
+    hr = IXMLDOMDocument_createAttribute(doc, _bstr_("attr"), &attr);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(attr != NULL, "got %p\n", attr);
+
+    ref1 = IXMLDOMAttribute_AddRef(attr);
+    IXMLDOMAttribute_Release(attr);
+
+    V_VT(&v) = VT_BSTR;
+    V_BSTR(&v) = _bstr_("attrvalue1");
+    hr = IXMLDOMAttribute_put_nodeValue(attr, v);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+
+    str = NULL;
+    hr = IXMLDOMAttribute_get_xml(attr, &str);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+    ok( lstrcmpW(str, _bstr_("attr=\"attrvalue1\"")) == 0,
+        "got %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
+
+    ret_attr = (void*)0xdeadbeef;
+    hr = IXMLDOMElement_setAttributeNode(elem, attr, &ret_attr);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(ret_attr == NULL, "got %p\n", ret_attr);
+
+    /* attribute reference increased */
+    ref2 = IXMLDOMAttribute_AddRef(attr);
+    IXMLDOMAttribute_Release(attr);
+    ok(ref1 == ref2, "got %d, expected %d\n", ref2, ref1);
+
+    hr = IXMLDOMElement_get_xml(elem, &str);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+    ok( lstrcmpW(str, _bstr_("<test attr=\"attrvalue1\"/>")) == 0,
+        "got %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
+
+    V_VT(&v) = VT_BSTR;
+    V_BSTR(&v) = _bstr_("attrvalue2");
+    hr = IXMLDOMAttribute_put_nodeValue(attr, v);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMElement_get_xml(elem, &str);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+    todo_wine ok( lstrcmpW(str, _bstr_("<test attr=\"attrvalue2\"/>")) == 0,
+        "got %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
+
+    IXMLDOMElement_Release(elem);
+    IXMLDOMAttribute_Release(attr);
+    IXMLDOMDocument_Release(doc2);
+    IXMLDOMDocument_Release(doc);
+    free_bstrs();
+}
+
+static void test_createNode(void)
+{
+    IXMLDOMDocument *doc;
+    IXMLDOMElement *elem;
+    IXMLDOMNode *node;
+    VARIANT v, var;
+    BSTR prefix, str;
+    HRESULT hr;
+    ULONG ref;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    EXPECT_REF(doc, 1);
+
+    /* reference count tests */
+    hr = IXMLDOMDocument_createElement(doc, _bstr_("elem"), &elem);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+
+    /* initial reference is 2 */
+todo_wine {
+    EXPECT_REF(elem, 2);
+    ref = IXMLDOMElement_Release(elem);
+    ok(ref == 1, "got %d\n", ref);
+    /* it's released already, attempt to release now will crash it */
+}
+
+    hr = IXMLDOMDocument_createElement(doc, _bstr_("elem"), &elem);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+    todo_wine EXPECT_REF(elem, 2);
+    IXMLDOMDocument_Release(doc);
+    todo_wine EXPECT_REF(elem, 2);
+    IXMLDOMElement_Release(elem);
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    /* NODE_ELEMENT nodes */
+    /* 1. specified namespace */
+    V_VT(&v) = VT_I4;
+    V_I4(&v) = NODE_ELEMENT;
+
+    hr = IXMLDOMDocument_createNode(doc, v, _bstr_("ns1:test"), _bstr_("http://winehq.org"), &node);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+    prefix = NULL;
+    hr = IXMLDOMNode_get_prefix(node, &prefix);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+    ok(lstrcmpW(prefix, _bstr_("ns1")) == 0, "wrong prefix\n");
+    SysFreeString(prefix);
+    IXMLDOMNode_Release(node);
+
+    /* 2. default namespace */
+    hr = IXMLDOMDocument_createNode(doc, v, _bstr_("test"), _bstr_("http://winehq.org/default"), &node);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+    prefix = (void*)0xdeadbeef;
+    hr = IXMLDOMNode_get_prefix(node, &prefix);
+    ok( hr == S_FALSE, "got 0x%08x\n", hr);
+    ok(prefix == 0, "expected empty prefix, got %p\n", prefix);
+    /* check dump */
+    hr = IXMLDOMNode_get_xml(node, &str);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+    ok( lstrcmpW(str, _bstr_("<test xmlns=\"http://winehq.org/default\"/>")) == 0,
+        "got %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
+
+    hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+
+    V_VT(&var) = VT_BSTR;
+    hr = IXMLDOMElement_getAttribute(elem, _bstr_("xmlns"), &var);
+    ok( hr == S_FALSE, "got 0x%08x\n", hr);
+    ok( V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var));
+
+    str = NULL;
+    hr = IXMLDOMElement_get_namespaceURI(elem, &str);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+    ok( lstrcmpW(str, _bstr_("http://winehq.org/default")) == 0, "expected default namespace\n");
+    SysFreeString(str);
+
+    IXMLDOMElement_Release(elem);
+    IXMLDOMNode_Release(node);
+
+    IXMLDOMDocument_Release(doc);
+    free_bstrs();
+}
+
+static const char get_prefix_doc[] =
+    "<?xml version=\"1.0\" ?>"
+    "<a xmlns:ns1=\"ns1 href\" />";
+
+static void test_get_prefix(void)
+{
+    IXMLDOMDocumentFragment *fragment;
+    IXMLDOMCDATASection *cdata;
+    IXMLDOMElement *element;
+    IXMLDOMComment *comment;
+    IXMLDOMDocument *doc;
+    VARIANT_BOOL b;
+    HRESULT hr;
+    BSTR str;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    /* nodes that can't support prefix */
+    /* 1. document */
+    str = (void*)0xdeadbeef;
+    hr = IXMLDOMDocument_get_prefix(doc, &str);
+    EXPECT_HR(hr, S_FALSE);
+    ok(str == NULL, "got %p\n", str);
+
+    hr = IXMLDOMDocument_get_prefix(doc, NULL);
+    EXPECT_HR(hr, E_INVALIDARG);
+
+    /* 2. cdata */
+    hr = IXMLDOMDocument_createCDATASection(doc, NULL, &cdata);
+    ok(hr == S_OK, "got %08x\n", hr );
+
+    str = (void*)0xdeadbeef;
+    hr = IXMLDOMCDATASection_get_prefix(cdata, &str);
+    ok(hr == S_FALSE, "got %08x\n", hr);
+    ok( str == 0, "got %p\n", str);
+
+    hr = IXMLDOMCDATASection_get_prefix(cdata, NULL);
+    ok(hr == E_INVALIDARG, "got %08x\n", hr);
+    IXMLDOMCDATASection_Release(cdata);
+
+    /* 3. comment */
+    hr = IXMLDOMDocument_createComment(doc, NULL, &comment);
+    ok(hr == S_OK, "got %08x\n", hr );
+
+    str = (void*)0xdeadbeef;
+    hr = IXMLDOMComment_get_prefix(comment, &str);
+    ok(hr == S_FALSE, "got %08x\n", hr);
+    ok( str == 0, "got %p\n", str);
+
+    hr = IXMLDOMComment_get_prefix(comment, NULL);
+    ok(hr == E_INVALIDARG, "got %08x\n", hr);
+    IXMLDOMComment_Release(comment);
+
+    /* 4. fragment */
+    hr = IXMLDOMDocument_createDocumentFragment(doc, &fragment);
+    ok(hr == S_OK, "got %08x\n", hr );
+
+    str = (void*)0xdeadbeef;
+    hr = IXMLDOMDocumentFragment_get_prefix(fragment, &str);
+    ok(hr == S_FALSE, "got %08x\n", hr);
+    ok( str == 0, "got %p\n", str);
+
+    hr = IXMLDOMDocumentFragment_get_prefix(fragment, NULL);
+    ok(hr == E_INVALIDARG, "got %08x\n", hr);
+    IXMLDOMDocumentFragment_Release(fragment);
+
+    /* no prefix */
+    hr = IXMLDOMDocument_createElement(doc, _bstr_("elem"), &element);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMElement_get_prefix(element, NULL);
+    ok( hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+    str = (void*)0xdeadbeef;
+    hr = IXMLDOMElement_get_prefix(element, &str);
+    ok( hr == S_FALSE, "got 0x%08x\n", hr);
+    ok( str == 0, "got %p\n", str);
+
+    IXMLDOMElement_Release(element);
+
+    /* with prefix */
+    hr = IXMLDOMDocument_createElement(doc, _bstr_("a:elem"), &element);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+
+    str = (void*)0xdeadbeef;
+    hr = IXMLDOMElement_get_prefix(element, &str);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+    ok( lstrcmpW(str, _bstr_("a")) == 0, "expected prefix \"a\"\n");
+    SysFreeString(str);
+
+    str = (void*)0xdeadbeef;
+    hr = IXMLDOMElement_get_namespaceURI(element, &str);
+    ok( hr == S_FALSE, "got 0x%08x\n", hr);
+    ok( str == 0, "got %p\n", str);
+
+    IXMLDOMElement_Release(element);
+
+    hr = IXMLDOMDocument_loadXML(doc, _bstr_(get_prefix_doc), &b);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMDocument_get_documentElement(doc, &element);
+    EXPECT_HR(hr, S_OK);
+
+    str = (void*)0xdeadbeef;
+    hr = IXMLDOMElement_get_prefix(element, &str);
+    EXPECT_HR(hr, S_FALSE);
+    ok(str == NULL, "got %p\n", str);
+
+    str = (void*)0xdeadbeef;
+    hr = IXMLDOMElement_get_namespaceURI(element, &str);
+    EXPECT_HR(hr, S_FALSE);
+    ok(str == NULL, "got %s\n", wine_dbgstr_w(str));
+
+    IXMLDOMDocument_Release(doc);
+    free_bstrs();
+}
+
+static void test_selectSingleNode(void)
+{
+    IXMLDOMDocument *doc;
+    IXMLDOMNodeList *list;
+    IXMLDOMNode *node;
+    VARIANT_BOOL b;
+    HRESULT hr;
+    LONG len;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_selectSingleNode(doc, NULL, NULL);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument_selectNodes(doc, NULL, NULL);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument_loadXML( doc, _bstr_(complete4A), &b );
+    ok( hr == S_OK, "loadXML failed\n");
+    ok( b == VARIANT_TRUE, "failed to load XML string\n");
+
+    hr = IXMLDOMDocument_selectSingleNode(doc, NULL, NULL);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument_selectNodes(doc, NULL, NULL);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("lc"), NULL);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument_selectNodes(doc, _bstr_("lc"), NULL);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("lc"), &node);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    IXMLDOMNode_Release(node);
+
+    hr = IXMLDOMDocument_selectNodes(doc, _bstr_("lc"), &list);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    IXMLDOMNodeList_Release(list);
+
+    list = (void*)0xdeadbeef;
+    hr = IXMLDOMDocument_selectNodes(doc, NULL, &list);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+    ok(list == (void*)0xdeadbeef, "got %p\n", list);
+
+    node = (void*)0xdeadbeef;
+    hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("nonexistent"), &node);
+    ok(hr == S_FALSE, "got 0x%08x\n", hr);
+    ok(node == 0, "got %p\n", node);
+
+    list = (void*)0xdeadbeef;
+    hr = IXMLDOMDocument_selectNodes(doc, _bstr_("nonexistent"), &list);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    len = 1;
+    hr = IXMLDOMNodeList_get_length(list, &len);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(len == 0, "got %d\n", len);
+    IXMLDOMNodeList_Release(list);
+
+    IXMLDOMDocument_Release(doc);
+    free_bstrs();
+}
+
+static void test_events(void)
+{
+    IConnectionPointContainer *conn;
+    IConnectionPoint *point;
+    IXMLDOMDocument *doc;
+    HRESULT hr;
+    VARIANT v;
+    IDispatch *event;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_QueryInterface(doc, &IID_IConnectionPointContainer, (void**)&conn);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IConnectionPointContainer_FindConnectionPoint(conn, &IID_IDispatch, &point);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    IConnectionPoint_Release(point);
+    hr = IConnectionPointContainer_FindConnectionPoint(conn, &IID_IPropertyNotifySink, &point);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    IConnectionPoint_Release(point);
+    hr = IConnectionPointContainer_FindConnectionPoint(conn, &DIID_XMLDOMDocumentEvents, &point);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    IConnectionPoint_Release(point);
+
+    IConnectionPointContainer_Release(conn);
+
+    /* ready state callback */
+    VariantInit(&v);
+    hr = IXMLDOMDocument_put_onreadystatechange(doc, v);
+    ok(hr == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hr);
+
+    event = create_dispevent();
+    V_VT(&v) = VT_UNKNOWN;
+    V_UNKNOWN(&v) = (IUnknown*)event;
+
+    hr = IXMLDOMDocument_put_onreadystatechange(doc, v);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    EXPECT_REF(event, 2);
+
+    V_VT(&v) = VT_DISPATCH;
+    V_DISPATCH(&v) = event;
+
+    hr = IXMLDOMDocument_put_onreadystatechange(doc, v);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    EXPECT_REF(event, 2);
+
+    /* VT_NULL doesn't reset event handler */
+    V_VT(&v) = VT_NULL;
+    hr = IXMLDOMDocument_put_onreadystatechange(doc, v);
+    ok(hr == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hr);
+    EXPECT_REF(event, 2);
+
+    V_VT(&v) = VT_DISPATCH;
+    V_DISPATCH(&v) = NULL;
+
+    hr = IXMLDOMDocument_put_onreadystatechange(doc, v);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    EXPECT_REF(event, 1);
+
+    V_VT(&v) = VT_UNKNOWN;
+    V_DISPATCH(&v) = NULL;
+    hr = IXMLDOMDocument_put_onreadystatechange(doc, v);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    IDispatch_Release(event);
+
+    IXMLDOMDocument_Release(doc);
+}
+
+static void test_createProcessingInstruction(void)
+{
+    static const WCHAR bodyW[] = {'t','e','s','t',0};
+    IXMLDOMProcessingInstruction *pi;
+    IXMLDOMDocument *doc;
+    WCHAR buff[10];
+    HRESULT hr;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    /* test for BSTR handling, pass broken BSTR */
+    memcpy(&buff[2], bodyW, sizeof(bodyW));
+    /* just a big length */
+    *(DWORD*)buff = 0xf0f0;
+    hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("test"), &buff[2], &pi);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    IXMLDOMProcessingInstruction_Release(pi);
+    IXMLDOMDocument_Release(doc);
+}
+
+static void test_put_nodeTypedValue(void)
+{
+    static const BYTE binhexdata[16] =
+        {0,1,2,3,4,5,6,7,8,9,0xa,0xb,0xc,0xd,0xe,0xf};
+    IXMLDOMDocument *doc;
+    IXMLDOMElement *elem;
+    VARIANT type, value;
+    LONG ubound, lbound;
+    IXMLDOMNode *node;
+    SAFEARRAY *array;
+    HRESULT hr;
+    BYTE *ptr;
+    BSTR str;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_createElement(doc, _bstr_("Element"), &elem);
+    EXPECT_HR(hr, S_OK);
+
+    V_VT(&type) = VT_EMPTY;
+    hr = IXMLDOMElement_get_dataType(elem, &type);
+    EXPECT_HR(hr, S_FALSE);
+    ok(V_VT(&type) == VT_NULL, "got %d, expected VT_NULL\n", V_VT(&type));
+
+    /* set typed value for untyped node */
+    V_VT(&type) = VT_I1;
+    V_I1(&type) = 1;
+    hr = IXMLDOMElement_put_nodeTypedValue(elem, type);
+    EXPECT_HR(hr, S_OK);
+
+    V_VT(&type) = VT_EMPTY;
+    hr = IXMLDOMElement_get_dataType(elem, &type);
+    EXPECT_HR(hr, S_FALSE);
+    ok(V_VT(&type) == VT_NULL, "got %d, expected VT_NULL\n", V_VT(&type));
+
+    /* no type info stored */
+    V_VT(&type) = VT_EMPTY;
+    hr = IXMLDOMElement_get_nodeTypedValue(elem, &type);
+    EXPECT_HR(hr, S_OK);
+    ok(V_VT(&type) == VT_BSTR, "got %d, expected VT_BSTR\n", V_VT(&type));
+    ok(memcmp(V_BSTR(&type), _bstr_("1"), 2*sizeof(WCHAR)) == 0,
+       "got %s, expected \"1\"\n", wine_dbgstr_w(V_BSTR(&type)));
+    VariantClear(&type);
+
+    hr = IXMLDOMElement_get_firstChild(elem, &node);
+    EXPECT_HR(hr, S_OK);
+    hr = IXMLDOMElement_removeChild(elem, node, NULL);
+    EXPECT_HR(hr, S_OK);
+    IXMLDOMNode_Release(node);
+
+    hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)elem, NULL);
+    EXPECT_HR(hr, S_OK);
+
+    /* bin.base64 */
+    hr = IXMLDOMElement_put_dataType(elem, _bstr_("bin.base64"));
+    EXPECT_HR(hr, S_OK);
+
+    V_VT(&value) = VT_BSTR;
+    V_BSTR(&value) = _bstr_("ABCD");
+    hr = IXMLDOMElement_put_nodeTypedValue(elem, value);
+    EXPECT_HR(hr, S_OK);
+
+    V_VT(&value) = VT_EMPTY;
+    hr = IXMLDOMElement_get_nodeTypedValue(elem, &value);
+    EXPECT_HR(hr, S_OK);
+    ok(V_VT(&value) == (VT_UI1|VT_ARRAY), "got %d\n", V_VT(&value));
+    ok(SafeArrayGetDim(V_ARRAY(&value)) == 1, "got wrong dimension\n");
+    ubound = 0;
+    hr = SafeArrayGetUBound(V_ARRAY(&value), 1, &ubound);
+    EXPECT_HR(hr, S_OK);
+    ok(ubound == 2, "got %d\n", ubound);
+    lbound = 0;
+    hr = SafeArrayGetLBound(V_ARRAY(&value), 1, &lbound);
+    EXPECT_HR(hr, S_OK);
+    ok(lbound == 0, "got %d\n", lbound);
+    hr = SafeArrayAccessData(V_ARRAY(&value), (void*)&ptr);
+    EXPECT_HR(hr, S_OK);
+    ok(ptr[0] == 0, "got %x\n", ptr[0]);
+    ok(ptr[1] == 0x10, "got %x\n", ptr[1]);
+    ok(ptr[2] == 0x83, "got %x\n", ptr[2]);
+    SafeArrayUnaccessData(V_ARRAY(&value));
+    VariantClear(&value);
+
+    /* when set as VT_BSTR it's stored as is */
+    hr = IXMLDOMElement_get_firstChild(elem, &node);
+    EXPECT_HR(hr, S_OK);
+    hr = IXMLDOMNode_get_text(node, &str);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(str, _bstr_("ABCD")), "%s\n", wine_dbgstr_w(str));
+    IXMLDOMNode_Release(node);
+
+    array = SafeArrayCreateVector(VT_UI1, 0, 7);
+    hr = SafeArrayAccessData(array, (void*)&ptr);
+    EXPECT_HR(hr, S_OK);
+    memcpy(ptr, "dGVzdA=", strlen("dGVzdA="));
+    SafeArrayUnaccessData(array);
+
+    V_VT(&value) = VT_UI1|VT_ARRAY;
+    V_ARRAY(&value) = array;
+    hr = IXMLDOMElement_put_nodeTypedValue(elem, value);
+    EXPECT_HR(hr, S_OK);
+
+    V_VT(&value) = VT_EMPTY;
+    hr = IXMLDOMElement_get_nodeTypedValue(elem, &value);
+    EXPECT_HR(hr, S_OK);
+    ok(V_VT(&value) == (VT_UI1|VT_ARRAY), "got %d\n", V_VT(&value));
+    ok(SafeArrayGetDim(V_ARRAY(&value)) == 1, "got wrong dimension\n");
+    ubound = 0;
+    hr = SafeArrayGetUBound(V_ARRAY(&value), 1, &ubound);
+    EXPECT_HR(hr, S_OK);
+    ok(ubound == 6, "got %d\n", ubound);
+    lbound = 0;
+    hr = SafeArrayGetLBound(V_ARRAY(&value), 1, &lbound);
+    EXPECT_HR(hr, S_OK);
+    ok(lbound == 0, "got %d\n", lbound);
+    hr = SafeArrayAccessData(V_ARRAY(&value), (void*)&ptr);
+    EXPECT_HR(hr, S_OK);
+    ok(!memcmp(ptr, "dGVzdA=", strlen("dGVzdA=")), "got wrong data, %s\n", ptr);
+    SafeArrayUnaccessData(V_ARRAY(&value));
+    VariantClear(&value);
+
+    /* if set with VT_UI1|VT_ARRAY it's encoded */
+    hr = IXMLDOMElement_get_firstChild(elem, &node);
+    EXPECT_HR(hr, S_OK);
+    hr = IXMLDOMNode_get_text(node, &str);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(str, _bstr_("ZEdWemRBPQ==")), "%s\n", wine_dbgstr_w(str));
+    IXMLDOMNode_Release(node);
+    SafeArrayDestroyData(array);
+
+    /* bin.hex */
+    V_VT(&value) = VT_BSTR;
+    V_BSTR(&value) = _bstr_("");
+    hr = IXMLDOMElement_put_nodeTypedValue(elem, value);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMElement_put_dataType(elem, _bstr_("bin.hex"));
+    EXPECT_HR(hr, S_OK);
+
+    array = SafeArrayCreateVector(VT_UI1, 0, 16);
+    hr = SafeArrayAccessData(array, (void*)&ptr);
+    EXPECT_HR(hr, S_OK);
+    memcpy(ptr, binhexdata, sizeof(binhexdata));
+    SafeArrayUnaccessData(array);
+
+    V_VT(&value) = VT_UI1|VT_ARRAY;
+    V_ARRAY(&value) = array;
+    hr = IXMLDOMElement_put_nodeTypedValue(elem, value);
+    EXPECT_HR(hr, S_OK);
+
+    V_VT(&value) = VT_EMPTY;
+    hr = IXMLDOMElement_get_nodeTypedValue(elem, &value);
+    EXPECT_HR(hr, S_OK);
+    ok(V_VT(&value) == (VT_UI1|VT_ARRAY), "got %d\n", V_VT(&value));
+    ok(SafeArrayGetDim(V_ARRAY(&value)) == 1, "got wrong dimension\n");
+    ubound = 0;
+    hr = SafeArrayGetUBound(V_ARRAY(&value), 1, &ubound);
+    EXPECT_HR(hr, S_OK);
+    ok(ubound == 15, "got %d\n", ubound);
+    lbound = 0;
+    hr = SafeArrayGetLBound(V_ARRAY(&value), 1, &lbound);
+    EXPECT_HR(hr, S_OK);
+    ok(lbound == 0, "got %d\n", lbound);
+    hr = SafeArrayAccessData(V_ARRAY(&value), (void*)&ptr);
+    EXPECT_HR(hr, S_OK);
+    ok(!memcmp(ptr, binhexdata, sizeof(binhexdata)), "got wrong data\n");
+    SafeArrayUnaccessData(V_ARRAY(&value));
+    VariantClear(&value);
+
+    /* if set with VT_UI1|VT_ARRAY it's encoded */
+    hr = IXMLDOMElement_get_firstChild(elem, &node);
+    EXPECT_HR(hr, S_OK);
+    hr = IXMLDOMNode_get_text(node, &str);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(str, _bstr_("000102030405060708090a0b0c0d0e0f")), "%s\n", wine_dbgstr_w(str));
+    IXMLDOMNode_Release(node);
+    SafeArrayDestroyData(array);
+
+    IXMLDOMElement_Release(elem);
+    IXMLDOMDocument_Release(doc);
+    free_bstrs();
+}
+
+static void test_get_xml(void)
+{
+    static const char xmlA[] = "<?xml version=\"1.0\" encoding=\"UTF-16\"?>\r\n<a>test</a>\r\n";
+    static const char attrA[] = "attr=\"&quot;a &amp; b&quot;\"";
+    static const char attr2A[] = "\"a & b\"";
+    static const char attr3A[] = "attr=\"&amp;quot;a\"";
+    static const char attr4A[] = "&quot;a";
+    static const char fooA[] = "<foo/>";
+    IXMLDOMProcessingInstruction *pi;
+    IXMLDOMNode *first;
+    IXMLDOMElement *elem = NULL;
+    IXMLDOMAttribute *attr;
+    IXMLDOMDocument *doc;
+    VARIANT_BOOL b;
+    VARIANT v;
+    BSTR xml;
+    HRESULT hr;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    b = VARIANT_TRUE;
+    hr = IXMLDOMDocument_loadXML( doc, _bstr_("<a>test</a>"), &b );
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok( b == VARIANT_TRUE, "got %d\n", b);
+
+    hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"),
+                             _bstr_("version=\"1.0\" encoding=\"UTF-16\""), &pi);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument_get_firstChild(doc, &first);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    V_UNKNOWN(&v) = (IUnknown*)first;
+    V_VT(&v) = VT_UNKNOWN;
+
+    hr = IXMLDOMDocument_insertBefore(doc, (IXMLDOMNode*)pi, v, NULL);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    IXMLDOMProcessingInstruction_Release(pi);
+    IXMLDOMNode_Release(first);
+
+    hr = IXMLDOMDocument_get_xml(doc, &xml);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    ok(memcmp(xml, _bstr_(xmlA), sizeof(xmlA)*sizeof(WCHAR)) == 0,
+        "got %s, expected %s\n", wine_dbgstr_w(xml), xmlA);
+    SysFreeString(xml);
+
+    IXMLDOMDocument_Release(doc);
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_createElement(doc, _bstr_("foo"), &elem);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument_putref_documentElement(doc, elem);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument_get_xml(doc, &xml);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    ok(memcmp(xml, _bstr_(fooA), (sizeof(fooA)-1)*sizeof(WCHAR)) == 0,
+        "got %s, expected %s\n", wine_dbgstr_w(xml), fooA);
+    SysFreeString(xml);
+
+    IXMLDOMElement_Release(elem);
+
+    /* attribute node */
+    hr = IXMLDOMDocument_createAttribute(doc, _bstr_("attr"), &attr);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    V_VT(&v) = VT_BSTR;
+    V_BSTR(&v) = _bstr_("\"a & b\"");
+    hr = IXMLDOMAttribute_put_value(attr, v);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    xml = NULL;
+    hr = IXMLDOMAttribute_get_xml(attr, &xml);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(!memcmp(xml, _bstr_(attrA), (sizeof(attrA)-1)*sizeof(WCHAR)), "got %s\n", wine_dbgstr_w(xml));
+    SysFreeString(xml);
+
+    VariantInit(&v);
+    hr = IXMLDOMAttribute_get_value(attr, &v);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(V_VT(&v) == VT_BSTR, "got type %d\n", V_VT(&v));
+    ok(!memcmp(V_BSTR(&v), _bstr_(attr2A), (sizeof(attr2A)-1)*sizeof(WCHAR)),
+        "got %s\n", wine_dbgstr_w(V_BSTR(&v)));
+    VariantClear(&v);
+
+    V_VT(&v) = VT_BSTR;
+    V_BSTR(&v) = _bstr_("&quot;a");
+    hr = IXMLDOMAttribute_put_value(attr, v);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    xml = NULL;
+    hr = IXMLDOMAttribute_get_xml(attr, &xml);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(!memcmp(xml, _bstr_(attr3A), (sizeof(attr3A)-1)*sizeof(WCHAR)), "got %s\n", wine_dbgstr_w(xml));
+    SysFreeString(xml);
+
+    VariantInit(&v);
+    hr = IXMLDOMAttribute_get_value(attr, &v);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(V_VT(&v) == VT_BSTR, "got type %d\n", V_VT(&v));
+    ok(!memcmp(V_BSTR(&v), _bstr_(attr4A), (sizeof(attr4A)-1)*sizeof(WCHAR)),
+        "got %s\n", wine_dbgstr_w(V_BSTR(&v)));
+    VariantClear(&v);
+
+    IXMLDOMAttribute_Release(attr);
+
+    IXMLDOMDocument_Release(doc);
+
+    free_bstrs();
+}
+
+static void test_xsltemplate(void)
+{
+    IXSLTemplate *template;
+    IXSLProcessor *processor;
+    IXMLDOMDocument *doc, *doc2;
+    IStream *stream;
+    VARIANT_BOOL b;
+    HRESULT hr;
+    ULONG ref1, ref2;
+    VARIANT v;
+
+    if (!is_clsid_supported(&CLSID_XSLTemplate, &IID_IXSLTemplate)) return;
+    template = create_xsltemplate(&IID_IXSLTemplate);
+
+    /* works as reset */
+    hr = IXSLTemplate_putref_stylesheet(template, NULL);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    b = VARIANT_TRUE;
+    hr = IXMLDOMDocument_loadXML( doc, _bstr_("<a>test</a>"), &b );
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok( b == VARIANT_TRUE, "got %d\n", b);
+
+    /* putref with non-xsl document */
+    hr = IXSLTemplate_putref_stylesheet(template, (IXMLDOMNode*)doc);
+    todo_wine ok(hr == E_FAIL, "got 0x%08x\n", hr);
+
+    b = VARIANT_TRUE;
+    hr = IXMLDOMDocument_loadXML( doc, _bstr_(szTransformSSXML), &b );
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok( b == VARIANT_TRUE, "got %d\n", b);
+
+    /* not a freethreaded document */
+    hr = IXSLTemplate_putref_stylesheet(template, (IXMLDOMNode*)doc);
+    todo_wine ok(hr == E_FAIL, "got 0x%08x\n", hr);
+
+    IXMLDOMDocument_Release(doc);
+
+    if (!is_clsid_supported(&CLSID_FreeThreadedDOMDocument, &IID_IXMLDOMDocument))
+    {
+        IXSLTemplate_Release(template);
+        return;
+    }
+
+    hr = CoCreateInstance(&CLSID_FreeThreadedDOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    b = VARIANT_TRUE;
+    hr = IXMLDOMDocument_loadXML( doc, _bstr_(szTransformSSXML), &b );
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok( b == VARIANT_TRUE, "got %d\n", b);
+
+    /* freethreaded document */
+    ref1 = IXMLDOMDocument_AddRef(doc);
+    IXMLDOMDocument_Release(doc);
+    hr = IXSLTemplate_putref_stylesheet(template, (IXMLDOMNode*)doc);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ref2 = IXMLDOMDocument_AddRef(doc);
+    IXMLDOMDocument_Release(doc);
+    ok(ref2 > ref1, "got %d\n", ref2);
+
+    /* processor */
+    hr = IXSLTemplate_createProcessor(template, NULL);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+    EXPECT_REF(template, 1);
+    hr = IXSLTemplate_createProcessor(template, &processor);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    EXPECT_REF(template, 2);
+
+    /* input no set yet */
+    V_VT(&v) = VT_BSTR;
+    V_BSTR(&v) = NULL;
+    hr = IXSLProcessor_get_input(processor, &v);
+todo_wine {
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(V_VT(&v) == VT_EMPTY, "got %d\n", V_VT(&v));
+}
+
+    hr = IXSLProcessor_get_output(processor, NULL);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+    /* reset before it was set */
+    V_VT(&v) = VT_EMPTY;
+    hr = IXSLProcessor_put_output(processor, v);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    EXPECT_REF(stream, 1);
+
+    V_VT(&v) = VT_UNKNOWN;
+    V_UNKNOWN(&v) = (IUnknown*)stream;
+    hr = IXSLProcessor_put_output(processor, v);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    /* it seems processor grabs 2 references */
+    todo_wine EXPECT_REF(stream, 3);
+
+    V_VT(&v) = VT_EMPTY;
+    hr = IXSLProcessor_get_output(processor, &v);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(V_VT(&v) == VT_UNKNOWN, "got type %d\n", V_VT(&v));
+    ok(V_UNKNOWN(&v) == (IUnknown*)stream, "got %p\n", V_UNKNOWN(&v));
+
+    todo_wine EXPECT_REF(stream, 4);
+    VariantClear(&v);
+
+    hr = IXSLProcessor_transform(processor, NULL);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+    /* reset and check stream refcount */
+    V_VT(&v) = VT_EMPTY;
+    hr = IXSLProcessor_put_output(processor, v);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    EXPECT_REF(stream, 1);
+
+    IStream_Release(stream);
+
+    /* no output interface set, check output */
+    doc2 = create_document(&IID_IXMLDOMDocument);
+
+    b = VARIANT_TRUE;
+    hr = IXMLDOMDocument_loadXML( doc2, _bstr_("<a>test</a>"), &b );
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok( b == VARIANT_TRUE, "got %d\n", b);
+
+    V_VT(&v) = VT_UNKNOWN;
+    V_UNKNOWN(&v) = (IUnknown*)doc2;
+    hr = IXSLProcessor_put_input(processor, v);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXSLProcessor_transform(processor, &b);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    V_VT(&v) = VT_EMPTY;
+    hr = IXSLProcessor_get_output(processor, &v);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(V_VT(&v) == VT_BSTR, "got type %d\n", V_VT(&v));
+    ok(*V_BSTR(&v) == 0, "got %s\n", wine_dbgstr_w(V_BSTR(&v)));
+    IXMLDOMDocument_Release(doc2);
+    VariantClear(&v);
+
+    IXSLProcessor_Release(processor);
+
+    /* drop reference */
+    hr = IXSLTemplate_putref_stylesheet(template, NULL);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ref2 = IXMLDOMDocument_AddRef(doc);
+    IXMLDOMDocument_Release(doc);
+    ok(ref2 == ref1, "got %d\n", ref2);
+
+    IXMLDOMDocument_Release(doc);
+    IXSLTemplate_Release(template);
+    free_bstrs();
+}
+
+static void test_insertBefore(void)
+{
+    IXMLDOMDocument *doc, *doc2, *doc3;
+    IXMLDOMAttribute *attr;
+    IXMLDOMElement *elem1, *elem2, *elem3, *elem4, *elem5;
+    IXMLDOMNode *node, *newnode, *cdata;
+    HRESULT hr;
+    VARIANT v;
+    BSTR p;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+    doc3 = create_document(&IID_IXMLDOMDocument);
+
+    /* document to document */
+    V_VT(&v) = VT_NULL;
+    node = (void*)0xdeadbeef;
+    hr = IXMLDOMDocument_insertBefore(doc, (IXMLDOMNode*)doc3, v, &node);
+    ok(hr == E_FAIL, "got 0x%08x\n", hr);
+    ok(node == NULL, "got %p\n", node);
+
+    /* document to itself */
+    V_VT(&v) = VT_NULL;
+    node = (void*)0xdeadbeef;
+    hr = IXMLDOMDocument_insertBefore(doc, (IXMLDOMNode*)doc, v, &node);
+    ok(hr == E_FAIL, "got 0x%08x\n", hr);
+    ok(node == NULL, "got %p\n", node);
+
+    /* insertBefore behaviour for attribute node */
+    V_VT(&v) = VT_I4;
+    V_I4(&v) = NODE_ATTRIBUTE;
+
+    attr = NULL;
+    hr = IXMLDOMDocument_createNode(doc, v, _bstr_("attr"), NULL, (IXMLDOMNode**)&attr);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(attr != NULL, "got %p\n", attr);
+
+    /* attribute to document */
+    V_VT(&v) = VT_NULL;
+    node = (void*)0xdeadbeef;
+    hr = IXMLDOMDocument_insertBefore(doc3, (IXMLDOMNode*)attr, v, &node);
+    ok(hr == E_FAIL, "got 0x%08x\n", hr);
+    ok(node == NULL, "got %p\n", node);
+
+    /* cdata to document */
+    V_VT(&v) = VT_I4;
+    V_I4(&v) = NODE_CDATA_SECTION;
+
+    cdata = NULL;
+    hr = IXMLDOMDocument_createNode(doc3, v, _bstr_("cdata"), NULL, &cdata);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(cdata != NULL, "got %p\n", cdata);
+
+    EXPECT_NO_CHILDREN(cdata);
+
+    /* attribute to cdata */
+    V_VT(&v) = VT_NULL;
+    node = (void*)0xdeadbeef;
+    hr = IXMLDOMNode_insertBefore(cdata, (IXMLDOMNode*)attr, v, &node);
+    ok(hr == E_FAIL, "got 0x%08x\n", hr);
+    ok(node == NULL, "got %p\n", node);
+
+    /* document to cdata */
+    V_VT(&v) = VT_NULL;
+    node = (void*)0xdeadbeef;
+    hr = IXMLDOMNode_insertBefore(cdata, (IXMLDOMNode*)doc, v, &node);
+    ok(hr == E_FAIL, "got 0x%08x\n", hr);
+    ok(node == NULL, "got %p\n", node);
+
+    V_VT(&v) = VT_NULL;
+    node = (void*)0xdeadbeef;
+    hr = IXMLDOMDocument_insertBefore(doc3, cdata, v, &node);
+    ok(hr == E_FAIL, "got 0x%08x\n", hr);
+    ok(node == NULL, "got %p\n", node);
+
+    IXMLDOMNode_Release(cdata);
+    IXMLDOMDocument_Release(doc3);
+
+    /* attribute to attribute */
+    V_VT(&v) = VT_I4;
+    V_I4(&v) = NODE_ATTRIBUTE;
+    newnode = NULL;
+    hr = IXMLDOMDocument_createNode(doc, v, _bstr_("attr2"), NULL, &newnode);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(newnode != NULL, "got %p\n", newnode);
+
+    V_VT(&v) = VT_NULL;
+    node = (void*)0xdeadbeef;
+    hr = IXMLDOMAttribute_insertBefore(attr, newnode, v, &node);
+    ok(hr == E_FAIL, "got 0x%08x\n", hr);
+    ok(node == NULL, "got %p\n", node);
+
+    V_VT(&v) = VT_UNKNOWN;
+    V_UNKNOWN(&v) = (IUnknown*)attr;
+    node = (void*)0xdeadbeef;
+    hr = IXMLDOMAttribute_insertBefore(attr, newnode, v, &node);
+    todo_wine ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+    ok(node == NULL, "got %p\n", node);
+    IXMLDOMNode_Release(newnode);
+
+    /* cdata to attribute */
+    V_VT(&v) = VT_I4;
+    V_I4(&v) = NODE_CDATA_SECTION;
+    newnode = NULL;
+    hr = IXMLDOMDocument_createNode(doc, v, _bstr_("cdata"), NULL, &newnode);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(newnode != NULL, "got %p\n", newnode);
+
+    V_VT(&v) = VT_NULL;
+    node = (void*)0xdeadbeef;
+    hr = IXMLDOMAttribute_insertBefore(attr, newnode, v, &node);
+    ok(hr == E_FAIL, "got 0x%08x\n", hr);
+    ok(node == NULL, "got %p\n", node);
+    IXMLDOMNode_Release(newnode);
+
+    /* comment to attribute */
+    V_VT(&v) = VT_I4;
+    V_I4(&v) = NODE_COMMENT;
+    newnode = NULL;
+    hr = IXMLDOMDocument_createNode(doc, v, _bstr_("cdata"), NULL, &newnode);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(newnode != NULL, "got %p\n", newnode);
+
+    V_VT(&v) = VT_NULL;
+    node = (void*)0xdeadbeef;
+    hr = IXMLDOMAttribute_insertBefore(attr, newnode, v, &node);
+    ok(hr == E_FAIL, "got 0x%08x\n", hr);
+    ok(node == NULL, "got %p\n", node);
+    IXMLDOMNode_Release(newnode);
+
+    /* element to attribute */
+    V_VT(&v) = VT_I4;
+    V_I4(&v) = NODE_ELEMENT;
+    newnode = NULL;
+    hr = IXMLDOMDocument_createNode(doc, v, _bstr_("cdata"), NULL, &newnode);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(newnode != NULL, "got %p\n", newnode);
+
+    V_VT(&v) = VT_NULL;
+    node = (void*)0xdeadbeef;
+    hr = IXMLDOMAttribute_insertBefore(attr, newnode, v, &node);
+    ok(hr == E_FAIL, "got 0x%08x\n", hr);
+    ok(node == NULL, "got %p\n", node);
+    IXMLDOMNode_Release(newnode);
+
+    /* pi to attribute */
+    V_VT(&v) = VT_I4;
+    V_I4(&v) = NODE_PROCESSING_INSTRUCTION;
+    newnode = NULL;
+    hr = IXMLDOMDocument_createNode(doc, v, _bstr_("cdata"), NULL, &newnode);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(newnode != NULL, "got %p\n", newnode);
+
+    V_VT(&v) = VT_NULL;
+    node = (void*)0xdeadbeef;
+    hr = IXMLDOMAttribute_insertBefore(attr, newnode, v, &node);
+    ok(hr == E_FAIL, "got 0x%08x\n", hr);
+    ok(node == NULL, "got %p\n", node);
+    IXMLDOMNode_Release(newnode);
+    IXMLDOMAttribute_Release(attr);
+
+    /* insertBefore for elements */
+    hr = IXMLDOMDocument_createElement(doc, _bstr_("elem"), &elem1);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument_createElement(doc, _bstr_("elem2"), &elem2);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument_createElement(doc, _bstr_("elem3"), &elem3);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument_createElement(doc, _bstr_("elem3"), &elem3);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument_createElement(doc, _bstr_("elem4"), &elem4);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    EXPECT_NO_CHILDREN(elem1);
+    EXPECT_NO_CHILDREN(elem2);
+    EXPECT_NO_CHILDREN(elem3);
+
+    todo_wine EXPECT_REF(elem2, 2);
+
+    /* document to element */
+    V_VT(&v) = VT_DISPATCH;
+    V_DISPATCH(&v) = NULL;
+    hr = IXMLDOMElement_insertBefore(elem1, (IXMLDOMNode*)doc, v, NULL);
+    ok(hr == E_FAIL, "got 0x%08x\n", hr);
+
+    V_VT(&v) = VT_DISPATCH;
+    V_DISPATCH(&v) = NULL;
+    node = NULL;
+    hr = IXMLDOMElement_insertBefore(elem1, (IXMLDOMNode*)elem4, v, &node);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(node == (void*)elem4, "got %p\n", node);
+
+    EXPECT_CHILDREN(elem1);
+    hr = IXMLDOMElement_removeChild(elem1, (IXMLDOMNode*)elem4, NULL);
+    EXPECT_HR(hr, S_OK);
+    IXMLDOMElement_Release(elem4);
+
+    EXPECT_NO_CHILDREN(elem1);
+
+    V_VT(&v) = VT_NULL;
+    node = NULL;
+    hr = IXMLDOMElement_insertBefore(elem1, (IXMLDOMNode*)elem2, v, &node);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(node == (void*)elem2, "got %p\n", node);
+
+    EXPECT_CHILDREN(elem1);
+    todo_wine EXPECT_REF(elem2, 3);
+    IXMLDOMNode_Release(node);
+
+    /* again for already linked node */
+    V_VT(&v) = VT_NULL;
+    node = NULL;
+    hr = IXMLDOMElement_insertBefore(elem1, (IXMLDOMNode*)elem2, v, &node);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(node == (void*)elem2, "got %p\n", node);
+
+    EXPECT_CHILDREN(elem1);
+
+    /* increments each time */
+    todo_wine EXPECT_REF(elem2, 3);
+    IXMLDOMNode_Release(node);
+
+    /* try to add to another element */
+    V_VT(&v) = VT_NULL;
+    node = (void*)0xdeadbeef;
+    hr = IXMLDOMElement_insertBefore(elem3, (IXMLDOMNode*)elem2, v, &node);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(node == (void*)elem2, "got %p\n", node);
+
+    EXPECT_CHILDREN(elem3);
+    EXPECT_NO_CHILDREN(elem1);
+
+    IXMLDOMNode_Release(node);
+
+    /* cross document case - try to add as child to a node created with other doc */
+    doc2 = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_createElement(doc2, _bstr_("elem4"), &elem4);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    todo_wine EXPECT_REF(elem4, 2);
+
+    /* same name, another instance */
+    hr = IXMLDOMDocument_createElement(doc2, _bstr_("elem4"), &elem5);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    todo_wine EXPECT_REF(elem5, 2);
+
+    todo_wine EXPECT_REF(elem3, 2);
+    V_VT(&v) = VT_NULL;
+    node = NULL;
+    hr = IXMLDOMElement_insertBefore(elem3, (IXMLDOMNode*)elem4, v, &node);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(node == (void*)elem4, "got %p\n", node);
+    todo_wine EXPECT_REF(elem4, 3);
+    todo_wine EXPECT_REF(elem3, 2);
+    IXMLDOMNode_Release(node);
+
+    V_VT(&v) = VT_NULL;
+    node = NULL;
+    hr = IXMLDOMElement_insertBefore(elem3, (IXMLDOMNode*)elem5, v, &node);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(node == (void*)elem5, "got %p\n", node);
+    todo_wine EXPECT_REF(elem4, 2);
+    todo_wine EXPECT_REF(elem5, 3);
+    IXMLDOMNode_Release(node);
+
+    IXMLDOMDocument_Release(doc2);
+
+    IXMLDOMElement_Release(elem1);
+    IXMLDOMElement_Release(elem2);
+    IXMLDOMElement_Release(elem3);
+    IXMLDOMElement_Release(elem4);
+    IXMLDOMElement_Release(elem5);
+
+    /* elements with same default namespace */
+    V_VT(&v) = VT_I4;
+    V_I4(&v) = NODE_ELEMENT;
+    elem1 = NULL;
+    hr = IXMLDOMDocument_createNode(doc, v, _bstr_("elem1"), _bstr_("http://winehq.org/default"), (IXMLDOMNode**)&elem1);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(elem1 != NULL, "got %p\n", elem1);
+
+    V_VT(&v) = VT_I4;
+    V_I4(&v) = NODE_ELEMENT;
+    elem2 = NULL;
+    hr = IXMLDOMDocument_createNode(doc, v, _bstr_("elem2"), _bstr_("http://winehq.org/default"), (IXMLDOMNode**)&elem2);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(elem2 != NULL, "got %p\n", elem2);
+
+    /* check contents so far */
+    p = NULL;
+    hr = IXMLDOMElement_get_xml(elem1, &p);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(!lstrcmpW(p, _bstr_("<elem1 xmlns=\"http://winehq.org/default\"/>")), "got %s\n", wine_dbgstr_w(p));
+    SysFreeString(p);
+
+    p = NULL;
+    hr = IXMLDOMElement_get_xml(elem2, &p);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(!lstrcmpW(p, _bstr_("<elem2 xmlns=\"http://winehq.org/default\"/>")), "got %s\n", wine_dbgstr_w(p));
+    SysFreeString(p);
+
+    V_VT(&v) = VT_NULL;
+    hr = IXMLDOMElement_insertBefore(elem1, (IXMLDOMNode*)elem2, v, NULL);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    /* get_xml depends on context, for top node it omits child namespace attribute,
+       but at child level it's still returned */
+    p = NULL;
+    hr = IXMLDOMElement_get_xml(elem1, &p);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    todo_wine ok(!lstrcmpW(p, _bstr_("<elem1 xmlns=\"http://winehq.org/default\"><elem2/></elem1>")),
+        "got %s\n", wine_dbgstr_w(p));
+    SysFreeString(p);
+
+    p = NULL;
+    hr = IXMLDOMElement_get_xml(elem2, &p);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(!lstrcmpW(p, _bstr_("<elem2 xmlns=\"http://winehq.org/default\"/>")), "got %s\n", wine_dbgstr_w(p));
+    SysFreeString(p);
+
+    IXMLDOMElement_Release(elem1);
+    IXMLDOMElement_Release(elem2);
+
+    /* child without default namespace added to node with default namespace */
+    V_VT(&v) = VT_I4;
+    V_I4(&v) = NODE_ELEMENT;
+    elem1 = NULL;
+    hr = IXMLDOMDocument_createNode(doc, v, _bstr_("elem1"), _bstr_("http://winehq.org/default"), (IXMLDOMNode**)&elem1);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(elem1 != NULL, "got %p\n", elem1);
+
+    V_VT(&v) = VT_I4;
+    V_I4(&v) = NODE_ELEMENT;
+    elem2 = NULL;
+    hr = IXMLDOMDocument_createNode(doc, v, _bstr_("elem2"), NULL, (IXMLDOMNode**)&elem2);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(elem2 != NULL, "got %p\n", elem2);
+
+    EXPECT_REF(elem2, 1);
+    V_VT(&v) = VT_NULL;
+    hr = IXMLDOMElement_insertBefore(elem1, (IXMLDOMNode*)elem2, v, NULL);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    EXPECT_REF(elem2, 1);
+
+    p = NULL;
+    hr = IXMLDOMElement_get_xml(elem2, &p);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(!lstrcmpW(p, _bstr_("<elem2/>")), "got %s\n", wine_dbgstr_w(p));
+    SysFreeString(p);
+
+    hr = IXMLDOMElement_removeChild(elem1, (IXMLDOMNode*)elem2, NULL);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    p = NULL;
+    hr = IXMLDOMElement_get_xml(elem2, &p);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(!lstrcmpW(p, _bstr_("<elem2/>")), "got %s\n", wine_dbgstr_w(p));
+    SysFreeString(p);
+
+    IXMLDOMElement_Release(elem1);
+    IXMLDOMElement_Release(elem2);
+    IXMLDOMDocument_Release(doc);
+}
+
+static void test_appendChild(void)
+{
+    IXMLDOMDocument *doc, *doc2;
+    IXMLDOMElement *elem, *elem2;
+    HRESULT hr;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+    doc2 = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_createElement(doc, _bstr_("elem"), &elem);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument_createElement(doc2, _bstr_("elem2"), &elem2);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    EXPECT_REF(doc, 1);
+    todo_wine EXPECT_REF(elem, 2);
+    EXPECT_REF(doc2, 1);
+    todo_wine EXPECT_REF(elem2, 2);
+    EXPECT_NO_CHILDREN(doc);
+    EXPECT_NO_CHILDREN(doc2);
+
+    hr = IXMLDOMDocument_appendChild(doc2, NULL, NULL);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMElement_appendChild(elem, NULL, NULL);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+    /* append from another document */
+    hr = IXMLDOMDocument_appendChild(doc2, (IXMLDOMNode*)elem, NULL);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    EXPECT_REF(doc, 1);
+    todo_wine EXPECT_REF(elem, 2);
+    EXPECT_REF(doc2, 1);
+    todo_wine EXPECT_REF(elem2, 2);
+    EXPECT_NO_CHILDREN(doc);
+    EXPECT_CHILDREN(doc2);
+
+    IXMLDOMElement_Release(elem);
+    IXMLDOMElement_Release(elem2);
+    IXMLDOMDocument_Release(doc);
+    IXMLDOMDocument_Release(doc2);
+}
+
+static void test_get_doctype(void)
+{
+    IXMLDOMDocumentType *doctype;
+    IXMLDOMDocument *doc;
+    HRESULT hr;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_get_doctype(doc, NULL);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+    doctype = (void*)0xdeadbeef;
+    hr = IXMLDOMDocument_get_doctype(doc, &doctype);
+    ok(hr == S_FALSE, "got 0x%08x\n", hr);
+    ok(doctype == NULL, "got %p\n", doctype);
+
+    IXMLDOMDocument_Release(doc);
+}
+
+static void test_get_tagName(void)
+{
+    IXMLDOMDocument *doc;
+    IXMLDOMElement *elem, *elem2;
+    HRESULT hr;
+    BSTR str;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_createElement(doc, _bstr_("element"), &elem);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMElement_get_tagName(elem, NULL);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+    str = NULL;
+    hr = IXMLDOMElement_get_tagName(elem, &str);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(!lstrcmpW(str, _bstr_("element")), "got %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
+
+    hr = IXMLDOMDocument_createElement(doc, _bstr_("s:element"), &elem2);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    str = NULL;
+    hr = IXMLDOMElement_get_tagName(elem2, &str);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(!lstrcmpW(str, _bstr_("s:element")), "got %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
+
+    IXMLDOMElement_Release(elem);
+    IXMLDOMElement_Release(elem2);
+    IXMLDOMDocument_Release(doc);
+    free_bstrs();
+}
+
+typedef struct {
+    DOMNodeType type;
+    const char *name;
+    VARTYPE vt;
+    HRESULT hr;
+} node_type_t;
+
+static const node_type_t get_datatype[] = {
+    { NODE_ELEMENT,                "element",   VT_NULL, S_FALSE },
+    { NODE_ATTRIBUTE,              "attr",      VT_NULL, S_FALSE },
+    { NODE_TEXT,                   "text",      VT_NULL, S_FALSE },
+    { NODE_CDATA_SECTION ,         "cdata",     VT_NULL, S_FALSE },
+    { NODE_ENTITY_REFERENCE,       "entityref", VT_NULL, S_FALSE },
+    { NODE_PROCESSING_INSTRUCTION, "pi",        VT_NULL, S_FALSE },
+    { NODE_COMMENT,                "comment",   VT_NULL, S_FALSE },
+    { NODE_DOCUMENT_FRAGMENT,      "docfrag",   VT_NULL, S_FALSE },
+    { 0 }
+};
+
+static void test_get_dataType(void)
+{
+    const node_type_t *entry = get_datatype;
+    IXMLDOMDocument *doc;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    while (entry->type)
+    {
+        IXMLDOMNode *node = NULL;
+        VARIANT var, type;
+        HRESULT hr;
+
+        V_VT(&var) = VT_I4;
+        V_I4(&var) = entry->type;
+        hr = IXMLDOMDocument_createNode(doc, var, _bstr_(entry->name), NULL, &node);
+        ok(hr == S_OK, "failed to create node, type %d\n", entry->type);
+
+        hr = IXMLDOMNode_get_dataType(node, NULL);
+        ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+        VariantInit(&type);
+        hr = IXMLDOMNode_get_dataType(node, &type);
+        ok(hr == entry->hr, "got 0x%08x, expected 0x%08x. node type %d\n",
+            hr, entry->hr, entry->type);
+        ok(V_VT(&type) == entry->vt, "got %d, expected %d. node type %d\n",
+            V_VT(&type), entry->vt, entry->type);
+        VariantClear(&type);
+
+        IXMLDOMNode_Release(node);
+
+        entry++;
+    }
+
+    IXMLDOMDocument_Release(doc);
+    free_bstrs();
+}
+
+typedef struct _get_node_typestring_t {
+    DOMNodeType type;
+    const char *string;
+} get_node_typestring_t;
+
+static const get_node_typestring_t get_node_typestring[] = {
+    { NODE_ELEMENT,                "element"               },
+    { NODE_ATTRIBUTE,              "attribute"             },
+    { NODE_TEXT,                   "text"                  },
+    { NODE_CDATA_SECTION ,         "cdatasection"          },
+    { NODE_ENTITY_REFERENCE,       "entityreference"       },
+    { NODE_PROCESSING_INSTRUCTION, "processinginstruction" },
+    { NODE_COMMENT,                "comment"               },
+    { NODE_DOCUMENT_FRAGMENT,      "documentfragment"      },
+    { 0 }
+};
+
+static void test_get_nodeTypeString(void)
+{
+    const get_node_typestring_t *entry = get_node_typestring;
+    IXMLDOMDocument *doc;
+    HRESULT hr;
+    BSTR str;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_get_nodeTypeString(doc, &str);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(!lstrcmpW(str, _bstr_("document")), "got string %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
+
+    while (entry->type)
+    {
+        IXMLDOMNode *node = NULL;
+        VARIANT var;
+
+        V_VT(&var) = VT_I4;
+        V_I4(&var) = entry->type;
+        hr = IXMLDOMDocument_createNode(doc, var, _bstr_("node"), NULL, &node);
+        ok(hr == S_OK, "failed to create node, type %d\n", entry->type);
+
+        hr = IXMLDOMNode_get_nodeTypeString(node, NULL);
+        ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+        hr = IXMLDOMNode_get_nodeTypeString(node, &str);
+        ok(hr == S_OK, "got 0x%08x\n", hr);
+        ok(!lstrcmpW(str, _bstr_(entry->string)), "got string %s, expected %s. node type %d\n",
+            wine_dbgstr_w(str), entry->string, entry->type);
+        SysFreeString(str);
+        IXMLDOMNode_Release(node);
+
+        entry++;
+    }
+
+    IXMLDOMDocument_Release(doc);
+    free_bstrs();
+}
+
+typedef struct _get_attributes_t {
+    DOMNodeType type;
+    HRESULT hr;
+} get_attributes_t;
+
+static const get_attributes_t get_attributes[] = {
+    { NODE_ATTRIBUTE,              S_FALSE },
+    { NODE_TEXT,                   S_FALSE },
+    { NODE_CDATA_SECTION ,         S_FALSE },
+    { NODE_ENTITY_REFERENCE,       S_FALSE },
+    { NODE_PROCESSING_INSTRUCTION, S_FALSE },
+    { NODE_COMMENT,                S_FALSE },
+    { NODE_DOCUMENT_FRAGMENT,      S_FALSE },
+    { 0 }
+};
+
+static void test_get_attributes(void)
+{
+    const get_attributes_t *entry = get_attributes;
+    IXMLDOMNamedNodeMap *map;
+    IXMLDOMDocument *doc;
+    IXMLDOMNode *node, *node2;
+    VARIANT_BOOL b;
+    HRESULT hr;
+    BSTR str;
+    LONG length;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_loadXML(doc, _bstr_(complete4A), &b);
+    ok(hr == S_OK, "got %08x\n", hr);
+
+    hr = IXMLDOMDocument_get_attributes(doc, NULL);
+    ok(hr == E_INVALIDARG, "got %08x\n", hr);
+
+    map = (void*)0xdeadbeef;
+    hr = IXMLDOMDocument_get_attributes(doc, &map);
+    ok(hr == S_FALSE, "got %08x\n", hr);
+    ok(map == NULL, "got %p\n", map);
+
+    /* first child is <?xml ?> */
+    hr = IXMLDOMDocument_get_firstChild(doc, &node);
+    ok(hr == S_OK, "got %08x\n", hr);
+
+    hr = IXMLDOMNode_get_attributes(node, &map);
+    ok(hr == S_OK, "got %08x\n", hr);
+
+    length = -1;
+    hr = IXMLDOMNamedNodeMap_get_length(map, &length);
+    EXPECT_HR(hr, S_OK);
+    todo_wine ok(length == 1, "got %d\n", length);
+
+    if (hr == S_OK && length == 1)
+    {
+        IXMLDOMAttribute *attr;
+        DOMNodeType type;
+        VARIANT v;
+
+        node2 = NULL;
+        hr = IXMLDOMNamedNodeMap_get_item(map, 0, &node2);
+        EXPECT_HR(hr, S_OK);
+        ok(node != NULL, "got %p\n", node2);
+
+        hr = IXMLDOMNode_get_nodeName(node2, &str);
+        EXPECT_HR(hr, S_OK);
+        ok(!lstrcmpW(str, _bstr_("version")), "got %s\n", wine_dbgstr_w(str));
+        SysFreeString(str);
+
+        length = -1;
+        hr = IXMLDOMNamedNodeMap_get_length(map, &length);
+        EXPECT_HR(hr, S_OK);
+        ok(length == 1, "got %d\n", length);
+
+        type = -1;
+        hr = IXMLDOMNode_get_nodeType(node2, &type);
+        EXPECT_HR(hr, S_OK);
+        ok(type == NODE_ATTRIBUTE, "got %d\n", type);
+
+        hr = IXMLDOMNode_get_xml(node, &str);
+        EXPECT_HR(hr, S_OK);
+        ok(!lstrcmpW(str, _bstr_("<?xml version=\"1.0\"?>")), "got %s\n", wine_dbgstr_w(str));
+        SysFreeString(str);
+
+        hr = IXMLDOMNode_get_text(node, &str);
+        EXPECT_HR(hr, S_OK);
+        ok(!lstrcmpW(str, _bstr_("version=\"1.0\"")), "got %s\n", wine_dbgstr_w(str));
+        SysFreeString(str);
+
+        hr = IXMLDOMNamedNodeMap_removeNamedItem(map, _bstr_("version"), NULL);
+        EXPECT_HR(hr, S_OK);
+
+        length = -1;
+        hr = IXMLDOMNamedNodeMap_get_length(map, &length);
+        EXPECT_HR(hr, S_OK);
+        ok(length == 0, "got %d\n", length);
+
+        hr = IXMLDOMNode_get_xml(node, &str);
+        EXPECT_HR(hr, S_OK);
+        ok(!lstrcmpW(str, _bstr_("<?xml version=\"1.0\"?>")), "got %s\n", wine_dbgstr_w(str));
+        SysFreeString(str);
+
+        hr = IXMLDOMNode_get_text(node, &str);
+        EXPECT_HR(hr, S_OK);
+        ok(!lstrcmpW(str, _bstr_("")), "got %s\n", wine_dbgstr_w(str));
+        SysFreeString(str);
+
+        IXMLDOMNamedNodeMap_Release(map);
+
+        hr = IXMLDOMNode_get_attributes(node, &map);
+        ok(hr == S_OK, "got %08x\n", hr);
+
+        length = -1;
+        hr = IXMLDOMNamedNodeMap_get_length(map, &length);
+        EXPECT_HR(hr, S_OK);
+        ok(length == 0, "got %d\n", length);
+
+        hr = IXMLDOMDocument_createAttribute(doc, _bstr_("encoding"), &attr);
+        EXPECT_HR(hr, S_OK);
+
+        V_VT(&v) = VT_BSTR;
+        V_BSTR(&v) = _bstr_("UTF-8");
+        hr = IXMLDOMAttribute_put_nodeValue(attr, v);
+        EXPECT_HR(hr, S_OK);
+
+        EXPECT_REF(attr, 2);
+        hr = IXMLDOMNamedNodeMap_setNamedItem(map, (IXMLDOMNode*)attr, NULL);
+        EXPECT_HR(hr, S_OK);
+        EXPECT_REF(attr, 2);
+
+        hr = IXMLDOMNode_get_attributes(node, &map);
+        ok(hr == S_OK, "got %08x\n", hr);
+
+        length = -1;
+        hr = IXMLDOMNamedNodeMap_get_length(map, &length);
+        EXPECT_HR(hr, S_OK);
+        ok(length == 1, "got %d\n", length);
+
+        hr = IXMLDOMNode_get_xml(node, &str);
+        EXPECT_HR(hr, S_OK);
+        ok(!lstrcmpW(str, _bstr_("<?xml version=\"1.0\"?>")), "got %s\n", wine_dbgstr_w(str));
+        SysFreeString(str);
+
+        hr = IXMLDOMNode_get_text(node, &str);
+        EXPECT_HR(hr, S_OK);
+        ok(!lstrcmpW(str, _bstr_("encoding=\"UTF-8\"")), "got %s\n", wine_dbgstr_w(str));
+        SysFreeString(str);
+
+        IXMLDOMNamedNodeMap_Release(map);
+        IXMLDOMNode_Release(node2);
+    }
+
+    IXMLDOMNode_Release(node);
+
+    /* last child is element */
+    EXPECT_REF(doc, 1);
+    hr = IXMLDOMDocument_get_lastChild(doc, &node);
+    ok(hr == S_OK, "got %08x\n", hr);
+    EXPECT_REF(doc, 1);
+
+    EXPECT_REF(node, 1);
+    hr = IXMLDOMNode_get_attributes(node, &map);
+    ok(hr == S_OK, "got %08x\n", hr);
+    EXPECT_REF(node, 1);
+    EXPECT_REF(doc, 1);
+
+    EXPECT_REF(map, 1);
+    hr = IXMLDOMNamedNodeMap_get_item(map, 0, &node2);
+    ok(hr == S_OK, "got %08x\n", hr);
+    EXPECT_REF(node, 1);
+    EXPECT_REF(node2, 1);
+    EXPECT_REF(map, 1);
+    EXPECT_REF(doc, 1);
+    IXMLDOMNode_Release(node2);
+
+    /* release node before map release, map still works */
+    IXMLDOMNode_Release(node);
+
+    length = 0;
+    hr = IXMLDOMNamedNodeMap_get_length(map, &length);
+    ok(hr == S_OK, "got %08x\n", hr);
+    ok(length == 1, "got %d\n", length);
+
+    node2 = NULL;
+    hr = IXMLDOMNamedNodeMap_get_item(map, 0, &node2);
+    ok(hr == S_OK, "got %08x\n", hr);
+    EXPECT_REF(node2, 1);
+    IXMLDOMNode_Release(node2);
+
+    IXMLDOMNamedNodeMap_Release(map);
+
+    while (entry->type)
+    {
+        VARIANT var;
+
+        node = NULL;
+
+        V_VT(&var) = VT_I4;
+        V_I4(&var) = entry->type;
+        hr = IXMLDOMDocument_createNode(doc, var, _bstr_("node"), NULL, &node);
+        ok(hr == S_OK, "failed to create node, type %d\n", entry->type);
+
+        hr = IXMLDOMNode_get_attributes(node, NULL);
+        ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+        map = (void*)0xdeadbeef;
+        hr = IXMLDOMNode_get_attributes(node, &map);
+        ok(hr == entry->hr, "got 0x%08x, expected 0x%08x. node type %d\n",
+            hr, entry->hr, entry->type);
+        ok(map == NULL, "got %p\n", map);
+
+        IXMLDOMNode_Release(node);
+
+        entry++;
+    }
+
+    IXMLDOMDocument_Release(doc);
+    free_bstrs();
+}
+
+static void test_selection(void)
+{
+    IXMLDOMSelection *selection, *selection2;
+    IEnumVARIANT *enum1, *enum2, *enum3;
+    IXMLDOMNodeList *list;
+    IUnknown *unk1, *unk2;
+    IXMLDOMDocument *doc;
+    IDispatchEx *dispex;
+    IXMLDOMNode *node;
+    IDispatch *disp;
+    VARIANT_BOOL b;
+    HRESULT hr;
+    DISPID did;
+    VARIANT v;
+    BSTR name;
+    ULONG ret;
+    LONG len;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_loadXML(doc, _bstr_(szExampleXML), &b);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMDocument_selectNodes(doc, _bstr_("root"), &list);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMNodeList_QueryInterface(list, &IID_IXMLDOMSelection, (void**)&selection);
+    EXPECT_HR(hr, S_OK);
+    IXMLDOMSelection_Release(selection);
+
+    /* collection disp id */
+    hr = IXMLDOMSelection_QueryInterface(selection, &IID_IDispatchEx, (void**)&dispex);
+    EXPECT_HR(hr, S_OK);
+    did = 0;
+    hr = IDispatchEx_GetDispID(dispex, _bstr_("0"), 0, &did);
+    EXPECT_HR(hr, S_OK);
+    ok(did == DISPID_DOM_COLLECTION_BASE, "got %d\n", did);
+    len = 0;
+    hr = IXMLDOMSelection_get_length(selection, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(len == 1, "got %d\n", len);
+    hr = IDispatchEx_GetDispID(dispex, _bstr_("10"), 0, &did);
+    EXPECT_HR(hr, S_OK);
+    ok(did == DISPID_DOM_COLLECTION_BASE+10, "got %d\n", did);
+    IDispatchEx_Release(dispex);
+
+    /* IEnumVARIANT tests */
+    enum1 = NULL;
+    hr = IXMLDOMSelection_QueryInterface(selection, &IID_IEnumVARIANT, (void**)&enum1);
+    EXPECT_HR(hr, S_OK);
+    ok(enum1 != NULL, "got %p\n", enum1);
+    EXPECT_REF(enum1, 2);
+
+    EXPECT_REF(selection, 1);
+    hr = IXMLDOMSelection_QueryInterface(selection, &IID_IUnknown, (void**)&unk1);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(selection, 2);
+    EXPECT_REF(enum1, 2);
+
+    /* enumerator and selection object return same IUnknown* */
+    hr = IEnumVARIANT_QueryInterface(enum1, &IID_IUnknown, (void**)&unk2);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(selection, 3);
+    EXPECT_REF(enum1, 2);
+    ok(unk2 == unk1, "got %p, %p\n", unk1, unk2);
+    IUnknown_Release(unk2);
+
+    EXPECT_REF(selection, 2);
+    IEnumVARIANT_AddRef(enum1);
+    EXPECT_REF(selection, 2);
+    IEnumVARIANT_Release(enum1);
+
+    enum3 = NULL;
+    hr = IXMLDOMSelection_QueryInterface(selection, &IID_IEnumVARIANT, (void**)&enum3);
+    EXPECT_HR(hr, S_OK);
+    ok(enum3 != NULL, "got %p\n", enum3);
+    ok(enum1 == enum3, "got %p and %p\n", enum1, enum3);
+    EXPECT_REF(enum1, 3);
+    IEnumVARIANT_Release(enum3);
+
+    EXPECT_REF(selection, 2);
+    EXPECT_REF(enum1, 2);
+
+    enum2 = NULL;
+    hr = IXMLDOMSelection_get__newEnum(selection, (IUnknown**)&enum2);
+    EXPECT_HR(hr, S_OK);
+    ok(enum2 != NULL, "got %p\n", enum2);
+
+    EXPECT_REF(selection, 3);
+    EXPECT_REF(enum1, 2);
+    EXPECT_REF(enum2, 1);
+
+    ok(enum1 != enum2, "got %p, %p\n", enum1, enum2);
+
+    hr = IEnumVARIANT_QueryInterface(enum2, &IID_IUnknown, (void**)&unk2);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(selection, 3);
+    EXPECT_REF(enum2, 2);
+    ok(unk2 != unk1, "got %p, %p\n", unk1, unk2);
+    IUnknown_Release(unk2);
+    IUnknown_Release(unk1);
+
+    selection2 = NULL;
+    hr = IEnumVARIANT_QueryInterface(enum1, &IID_IXMLDOMSelection, (void**)&selection2);
+    EXPECT_HR(hr, S_OK);
+    ok(selection2 == selection, "got %p and %p\n", selection, selection2);
+    EXPECT_REF(selection, 3);
+    EXPECT_REF(enum1, 2);
+
+    IXMLDOMSelection_Release(selection2);
+
+    hr = IEnumVARIANT_QueryInterface(enum1, &IID_IDispatch, (void**)&disp);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(selection, 3);
+    IDispatch_Release(disp);
+
+    hr = IEnumVARIANT_QueryInterface(enum1, &IID_IEnumVARIANT, (void**)&enum3);
+    EXPECT_HR(hr, S_OK);
+    ok(enum3 == enum1, "got %p and %p\n", enum3, enum1);
+    EXPECT_REF(selection, 2);
+    EXPECT_REF(enum1, 3);
+
+    IEnumVARIANT_Release(enum1);
+    IEnumVARIANT_Release(enum2);
+
+    enum1 = NULL;
+    hr = IXMLDOMSelection_get__newEnum(selection, (IUnknown**)&enum1);
+    EXPECT_HR(hr, S_OK);
+    ok(enum1 != NULL, "got %p\n", enum1);
+    EXPECT_REF(enum1, 1);
+    EXPECT_REF(selection, 2);
+
+    enum2 = NULL;
+    hr = IXMLDOMSelection_get__newEnum(selection, (IUnknown**)&enum2);
+    EXPECT_HR(hr, S_OK);
+    ok(enum2 != NULL, "got %p\n", enum2);
+    EXPECT_REF(enum2, 1);
+    EXPECT_REF(selection, 3);
+
+    ok(enum1 != enum2, "got %p, %p\n", enum1, enum2);
+
+    IEnumVARIANT_AddRef(enum1);
+    EXPECT_REF(selection, 3);
+    EXPECT_REF(enum1, 2);
+    EXPECT_REF(enum2, 1);
+    IEnumVARIANT_Release(enum1);
+
+    IEnumVARIANT_Release(enum1);
+    IEnumVARIANT_Release(enum2);
+
+    EXPECT_REF(selection, 1);
+
+    IXMLDOMNodeList_Release(list);
+
+    hr = IXMLDOMDocument_get_childNodes(doc, &list);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMNodeList_QueryInterface(list, &IID_IXMLDOMSelection, (void**)&selection);
+    EXPECT_HR(hr, E_NOINTERFACE);
+
+    IXMLDOMNodeList_Release(list);
+
+    /* test if IEnumVARIANT touches selection context */
+    hr = IXMLDOMDocument_loadXML(doc, _bstr_(xpath_simple_list), &b);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMDocument_selectNodes(doc, _bstr_("root/*"), &list);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMNodeList_QueryInterface(list, &IID_IXMLDOMSelection, (void**)&selection);
+    EXPECT_HR(hr, S_OK);
+
+    len = 0;
+    hr = IXMLDOMSelection_get_length(selection, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(len == 4, "got %d\n", len);
+
+    enum1 = NULL;
+    hr = IXMLDOMSelection_get__newEnum(selection, (IUnknown**)&enum1);
+    EXPECT_HR(hr, S_OK);
+
+    /* no-op if zero count */
+    V_VT(&v) = VT_I2;
+    hr = IEnumVARIANT_Next(enum1, 0, &v, NULL);
+    EXPECT_HR(hr, S_OK);
+    ok(V_VT(&v) == VT_I2, "got var type %d\n", V_VT(&v));
+
+    /* positive count, null array pointer */
+    hr = IEnumVARIANT_Next(enum1, 1, NULL, NULL);
+    EXPECT_HR(hr, E_INVALIDARG);
+
+    ret = 1;
+    hr = IEnumVARIANT_Next(enum1, 1, NULL, &ret);
+    EXPECT_HR(hr, E_INVALIDARG);
+    ok(ret == 0, "got %d\n", ret);
+
+    V_VT(&v) = VT_I2;
+    hr = IEnumVARIANT_Next(enum1, 1, &v, 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);
+    EXPECT_HR(hr, S_OK);
+    hr = IXMLDOMNode_get_nodeName(node, &name);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(name, _bstr_("a")), "got node name %s\n", wine_dbgstr_w(name));
+    SysFreeString(name);
+    IXMLDOMNode_Release(node);
+    VariantClear(&v);
+
+    /* list cursor is updated */
+    hr = IXMLDOMSelection_nextNode(selection, &node);
+    EXPECT_HR(hr, S_OK);
+    hr = IXMLDOMNode_get_nodeName(node, &name);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(name, _bstr_("c")), "got node name %s\n", wine_dbgstr_w(name));
+    IXMLDOMNode_Release(node);
+
+    V_VT(&v) = VT_I2;
+    hr = IEnumVARIANT_Next(enum1, 1, &v, 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);
+    EXPECT_HR(hr, S_OK);
+    hr = IXMLDOMNode_get_nodeName(node, &name);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(name, _bstr_("b")), "got node name %s\n", wine_dbgstr_w(name));
+    SysFreeString(name);
+    IXMLDOMNode_Release(node);
+    VariantClear(&v);
+    IEnumVARIANT_Release(enum1);
+
+    hr = IXMLDOMSelection_nextNode(selection, &node);
+    EXPECT_HR(hr, S_OK);
+    hr = IXMLDOMNode_get_nodeName(node, &name);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(name, _bstr_("d")), "got node name %s\n", wine_dbgstr_w(name));
+    IXMLDOMNode_Release(node);
+
+    IXMLDOMSelection_Release(selection);
+    IXMLDOMNodeList_Release(list);
+    IXMLDOMDocument_Release(doc);
+
+    free_bstrs();
+}
+
+static void write_to_file(const char *name, const char *data)
+{
+    DWORD written;
+    HANDLE hfile;
+    BOOL ret;
+
+    hfile = CreateFileA(name, GENERIC_WRITE|GENERIC_READ, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL );
+    ok(hfile != INVALID_HANDLE_VALUE, "failed to create test file: %s\n", name);
+
+    ret = WriteFile(hfile, data, strlen(data), &written, NULL);
+    ok(ret, "WriteFile failed: %s, %d\n", name, GetLastError());
+
+    CloseHandle(hfile);
+}
+
+static void test_load(void)
+{
+    IXMLDOMDocument *doc, *doc2;
+    IXMLDOMNodeList *list;
+    IXMLDOMElement *elem;
+    VARIANT_BOOL b;
+    VARIANT src;
+    HRESULT hr;
+    BSTR path, bstr1, bstr2;
+    void* ptr;
+
+    /* prepare a file */
+    write_to_file("test.xml", win1252xml);
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    /* null pointer as input */
+    V_VT(&src) = VT_UNKNOWN;
+    V_UNKNOWN(&src) = NULL;
+    hr = IXMLDOMDocument_load(doc, src, &b);
+    EXPECT_HR(hr, E_INVALIDARG);
+    ok(b == VARIANT_FALSE, "got %d\n", b);
+
+    path = _bstr_("test.xml");
+
+    /* load from path: VT_BSTR */
+    V_VT(&src) = VT_BSTR;
+    V_BSTR(&src) = path;
+    hr = IXMLDOMDocument_load(doc, src, &b);
+    EXPECT_HR(hr, S_OK);
+    ok(b == VARIANT_TRUE, "got %d\n", b);
+
+    bstr1 = NULL;
+    hr = IXMLDOMDocument_get_url(doc, &bstr1);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    SysFreeString(bstr1);
+
+    /* load from a path: VT_BSTR|VT_BYREF */
+    V_VT(&src) = VT_BSTR | VT_BYREF;
+    V_BSTRREF(&src) = &path;
+    hr = IXMLDOMDocument_load(doc, src, &b);
+    EXPECT_HR(hr, S_OK);
+    ok(b == VARIANT_TRUE, "got %d\n", b);
+
+    bstr1 = NULL;
+    hr = IXMLDOMDocument_get_url(doc, &bstr1);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument_get_documentElement(doc, &elem);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    /* create another instance for the same document, check url */
+    hr = IXMLDOMElement_get_ownerDocument(elem, &doc2);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument_get_url(doc, &bstr2);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(!lstrcmpW(bstr1, bstr2), "got %s\n", wine_dbgstr_w(bstr2));
+
+    IXMLDOMDocument_Release(doc2);
+    IXMLDOMElement_Release(elem);
+
+    SysFreeString(bstr1);
+    SysFreeString(bstr2);
+
+    /* load from a path: VT_BSTR|VT_BYREF, null ptr */
+    V_VT(&src) = VT_BSTR | VT_BYREF;
+    V_BSTRREF(&src) = NULL;
+    hr = IXMLDOMDocument_load(doc, src, &b);
+    EXPECT_HR(hr, E_INVALIDARG);
+    ok(b == VARIANT_FALSE, "got %d\n", b);
+
+    bstr1 = NULL;
+    hr = IXMLDOMDocument_get_url(doc, &bstr1);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    SysFreeString(bstr1);
+
+    DeleteFileA("test.xml");
+
+    /* load from existing path, no xml content */
+    write_to_file("test.xml", nocontent);
+
+    V_VT(&src) = VT_BSTR;
+    V_BSTR(&src) = path;
+    b = VARIANT_TRUE;
+    hr = IXMLDOMDocument_load(doc, src, &b);
+    ok(hr == S_FALSE, "got 0x%08x\n", hr);
+    ok(b == VARIANT_FALSE, "got %d\n", b);
+
+    bstr1 = (BSTR)0x1;
+    hr = IXMLDOMDocument_get_url(doc, &bstr1);
+    ok(hr == S_FALSE, "got 0x%08x\n", hr);
+    ok(bstr1 == NULL, "got %p\n", bstr1);
+
+    DeleteFileA("test.xml");
+    IXMLDOMDocument_Release(doc);
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_loadXML(doc, _bstr_(szExampleXML), &b);
+    EXPECT_HR(hr, S_OK);
+    ok(b == VARIANT_TRUE, "got %d\n", b);
+
+    hr = IXMLDOMDocument_selectNodes(doc, _bstr_("//*"), &list);
+    EXPECT_HR(hr, S_OK);
+    bstr1 = _bstr_(list_to_string(list));
+
+    hr = IXMLDOMNodeList_reset(list);
+    EXPECT_HR(hr, S_OK);
+
+    IXMLDOMDocument_Release(doc);
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    VariantInit(&src);
+    V_ARRAY(&src) = SafeArrayCreateVector(VT_UI1, 0, lstrlenA(szExampleXML));
+    V_VT(&src) = VT_ARRAY|VT_UI1;
+    ok(V_ARRAY(&src) != NULL, "SafeArrayCreateVector() returned NULL\n");
+    ptr = NULL;
+    hr = SafeArrayAccessData(V_ARRAY(&src), &ptr);
+    EXPECT_HR(hr, S_OK);
+    ok(ptr != NULL, "SafeArrayAccessData() returned NULL\n");
+
+    memcpy(ptr, szExampleXML, lstrlenA(szExampleXML));
+    hr = SafeArrayUnlock(V_ARRAY(&src));
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMDocument_load(doc, src, &b);
+    EXPECT_HR(hr, S_OK);
+    ok(b == VARIANT_TRUE, "got %d\n", b);
+
+    hr = IXMLDOMDocument_selectNodes(doc, _bstr_("//*"), &list);
+    EXPECT_HR(hr, S_OK);
+    bstr2 = _bstr_(list_to_string(list));
+
+    hr = IXMLDOMNodeList_reset(list);
+    EXPECT_HR(hr, S_OK);
+
+    ok(lstrcmpW(bstr1, bstr2) == 0, "strings not equal: %s : %s\n",
+       wine_dbgstr_w(bstr1), wine_dbgstr_w(bstr2));
+
+    IXMLDOMDocument_Release(doc);
+    IXMLDOMNodeList_Release(list);
+    VariantClear(&src);
+
+    /* UTF-16 isn't accepted */
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    V_ARRAY(&src) = SafeArrayCreateVector(VT_UI1, 0, lstrlenW(szComplete1) * sizeof(WCHAR));
+    V_VT(&src) = VT_ARRAY|VT_UI1;
+    ok(V_ARRAY(&src) != NULL, "SafeArrayCreateVector() returned NULL\n");
+    ptr = NULL;
+    hr = SafeArrayAccessData(V_ARRAY(&src), &ptr);
+    EXPECT_HR(hr, S_OK);
+    ok(ptr != NULL, "SafeArrayAccessData() returned NULL\n");
+
+    memcpy(ptr, szComplete1, lstrlenW(szComplete1) * sizeof(WCHAR));
+    hr = SafeArrayUnlock(V_ARRAY(&src));
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMDocument_load(doc, src, &b);
+    todo_wine EXPECT_HR(hr, S_FALSE);
+    todo_wine ok(b == VARIANT_FALSE, "got %d\n", b);
+
+    VariantClear(&src);
+
+    /* it doesn't like it as a VT_ARRAY|VT_UI2 either */
+    V_ARRAY(&src) = SafeArrayCreateVector(VT_UI2, 0, lstrlenW(szComplete1));
+    V_VT(&src) = VT_ARRAY|VT_UI2;
+    ok(V_ARRAY(&src) != NULL, "SafeArrayCreateVector() returned NULL\n");
+    ptr = NULL;
+    hr = SafeArrayAccessData(V_ARRAY(&src), &ptr);
+    EXPECT_HR(hr, S_OK);
+    ok(ptr != NULL, "SafeArrayAccessData() returned NULL\n");
+
+    memcpy(ptr, szComplete1, lstrlenW(szComplete1) * sizeof(WCHAR));
+    hr = SafeArrayUnlock(V_ARRAY(&src));
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMDocument_load(doc, src, &b);
+    todo_wine EXPECT_HR(hr, E_INVALIDARG);
+    ok(b == VARIANT_FALSE, "got %d\n", b);
+
+    VariantClear(&src);
+    IXMLDOMDocument_Release(doc);
+
+    free_bstrs();
+}
+
+static void test_domobj_dispex(IUnknown *obj)
+{
+    static const WCHAR testW[] = {'t','e','s','t','p','r','o','p',0};
+    DISPID dispid = DISPID_XMLDOM_NODELIST_RESET;
+    IDispatchEx *dispex;
+    IUnknown *unk;
+    DWORD props;
+    UINT ticnt;
+    HRESULT hr;
+    BSTR name;
+
+    hr = IUnknown_QueryInterface(obj, &IID_IDispatchEx, (void**)&dispex);
+    EXPECT_HR(hr, S_OK);
+    if (FAILED(hr)) return;
+
+    ticnt = 0;
+    hr = IDispatchEx_GetTypeInfoCount(dispex, &ticnt);
+    EXPECT_HR(hr, S_OK);
+    ok(ticnt == 1, "ticnt=%u\n", ticnt);
+
+    name = SysAllocString(szstar);
+    hr = IDispatchEx_DeleteMemberByName(dispex, name, fdexNameCaseSensitive);
+    EXPECT_HR(hr, E_NOTIMPL);
+    SysFreeString(name);
+
+    hr = IDispatchEx_DeleteMemberByDispID(dispex, dispid);
+    EXPECT_HR(hr, E_NOTIMPL);
+
+    props = 0;
+    hr = IDispatchEx_GetMemberProperties(dispex, dispid, grfdexPropCanAll, &props);
+    EXPECT_HR(hr, E_NOTIMPL);
+    ok(props == 0, "expected 0 got %d\n", props);
+
+    hr = IDispatchEx_GetMemberName(dispex, dispid, &name);
+    EXPECT_HR(hr, E_NOTIMPL);
+    if (SUCCEEDED(hr)) SysFreeString(name);
+
+    hr = IDispatchEx_GetNextDispID(dispex, fdexEnumDefault, DISPID_XMLDOM_NODELIST_RESET, &dispid);
+    EXPECT_HR(hr, E_NOTIMPL);
+
+    unk = (IUnknown*)0xdeadbeef;
+    hr = IDispatchEx_GetNameSpaceParent(dispex, &unk);
+    EXPECT_HR(hr, E_NOTIMPL);
+    ok(unk == (IUnknown*)0xdeadbeef, "got %p\n", unk);
+
+    name = SysAllocString(testW);
+    hr = IDispatchEx_GetDispID(dispex, name, fdexNameEnsure, &dispid);
+    ok(hr == DISP_E_UNKNOWNNAME, "got 0x%08x\n", hr);
+    SysFreeString(name);
+
+    IDispatchEx_Release(dispex);
+}
+
+static void test_mxnamespacemanager(void)
+{
+    static const char xmluriA[] = "http://www.w3.org/XML/1998/namespace";
+    IMXNamespacePrefixes *prefixes;
+    IVBMXNamespaceManager *mgr2;
+    IMXNamespaceManager *nsmgr;
+    IUnknown *unk1, *unk2;
+    WCHAR buffW[250];
+    IDispatch *disp;
+    IUnknown *unk;
+    HRESULT hr;
+    INT len;
+
+    hr = CoCreateInstance(&CLSID_MXNamespaceManager40, NULL, CLSCTX_INPROC_SERVER,
+        &IID_IMXNamespaceManager, (void**)&nsmgr);
+    EXPECT_HR(hr, S_OK);
+
+    /* IMXNamespaceManager inherits from IUnknown */
+    hr = IMXNamespaceManager_QueryInterface(nsmgr, &IID_IDispatch, (void**)&disp);
+    EXPECT_HR(hr, S_OK);
+    IDispatch_Release(disp);
+
+    hr = IMXNamespaceManager_QueryInterface(nsmgr, &IID_IVBMXNamespaceManager, (void**)&mgr2);
+    EXPECT_HR(hr, S_OK);
+
+    EXPECT_REF(nsmgr, 2);
+    EXPECT_REF(mgr2, 2);
+    prefixes = NULL;
+    hr = IVBMXNamespaceManager_getDeclaredPrefixes(mgr2, &prefixes);
+todo_wine
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    if (hr == S_OK)
+    {
+        IDispatchEx *dispex;
+        VARIANT arg, ret;
+        DISPPARAMS dispparams;
+
+        ok(prefixes != NULL, "got %p\n", prefixes);
+        EXPECT_REF(nsmgr, 2);
+        EXPECT_REF(mgr2, 2);
+        EXPECT_REF(prefixes, 1);
+
+        IVBMXNamespaceManager_QueryInterface(mgr2, &IID_IUnknown, (void**)&unk1);
+        IMXNamespacePrefixes_QueryInterface(prefixes, &IID_IUnknown, (void**)&unk2);
+
+        EXPECT_REF(mgr2, 3);
+        EXPECT_REF(prefixes, 2);
+
+        IUnknown_Release(unk1);
+        IUnknown_Release(unk2);
+
+        hr = IMXNamespacePrefixes_QueryInterface(prefixes, &IID_IDispatchEx, (void**)&dispex);
+        ok(hr == S_OK, "got 0x%08x\n", hr);
+
+        V_VT(&arg) = VT_I4;
+        V_I4(&arg) = 0;
+        dispparams.cArgs = 1;
+        dispparams.cNamedArgs = 0;
+        dispparams.rgdispidNamedArgs = NULL;
+        dispparams.rgvarg = &arg;
+
+        V_VT(&ret) = VT_EMPTY;
+        V_DISPATCH(&ret) = (void*)0x1;
+        hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL);
+        ok(hr == S_OK, "got 0x%08x\n", hr);
+        ok(V_VT(&ret) == VT_BSTR, "got %d\n", V_VT(&ret));
+        ok(V_BSTR(&ret) != NULL, "got %p\n", V_BSTR(&ret));
+        VariantClear(&ret);
+
+        IDispatchEx_Release(dispex);
+        IMXNamespacePrefixes_Release(prefixes);
+    }
+    IVBMXNamespaceManager_Release(mgr2);
+
+    hr = IMXNamespaceManager_declarePrefix(nsmgr, NULL, NULL);
+    EXPECT_HR(hr, S_OK);
+
+    /* prefix already added */
+    hr = IMXNamespaceManager_declarePrefix(nsmgr, NULL, _bstr_("ns0 uri"));
+    EXPECT_HR(hr, S_FALSE);
+
+    hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns0"), NULL);
+    EXPECT_HR(hr, E_INVALIDARG);
+
+    /* "xml" and "xmlns" are not allowed here */
+    hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("xml"), _bstr_("uri1"));
+    EXPECT_HR(hr, E_INVALIDARG);
+
+    hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("xmlns"), _bstr_("uri1"));
+    EXPECT_HR(hr, E_INVALIDARG);
+todo_wine {
+    hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, -1, NULL, NULL);
+    EXPECT_HR(hr, E_FAIL);
+}
+    hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 0, NULL, NULL);
+    EXPECT_HR(hr, E_POINTER);
+
+    len = -1;
+    hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 0, NULL, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(len == 3, "got %d\n", len);
+
+    len = -1;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 0, buffW, &len);
+    EXPECT_HR(hr, E_XML_BUFFERTOOSMALL);
+    ok(len == -1, "got %d\n", len);
+    ok(buffW[0] == 0x1, "got %x\n", buffW[0]);
+
+    len = 10;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 0, buffW, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(len == 3, "got %d\n", len);
+    ok(!lstrcmpW(buffW, _bstr_("xml")), "got prefix %s\n", wine_dbgstr_w(buffW));
+
+    /* getURI */
+    hr = IMXNamespaceManager_getURI(nsmgr, NULL, NULL, NULL, NULL);
+    EXPECT_HR(hr, E_INVALIDARG);
+
+    len = -1;
+    hr = IMXNamespaceManager_getURI(nsmgr, NULL, NULL, NULL, &len);
+    EXPECT_HR(hr, E_INVALIDARG);
+    ok(len == -1, "got %d\n", len);
+
+    hr = IMXNamespaceManager_getURI(nsmgr, _bstr_("xml"), NULL, NULL, NULL);
+    EXPECT_HR(hr, E_POINTER);
+
+    len = -1;
+    hr = IMXNamespaceManager_getURI(nsmgr, _bstr_("xml"), NULL, NULL, &len);
+    EXPECT_HR(hr, S_OK);
+    /* length of "xml" uri is constant */
+    ok(len == strlen(xmluriA), "got %d\n", len);
+
+    len = 100;
+    hr = IMXNamespaceManager_getURI(nsmgr, _bstr_("xml"), NULL, buffW, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(len == strlen(xmluriA), "got %d\n", len);
+    ok(!lstrcmpW(buffW, _bstr_(xmluriA)), "got prefix %s\n", wine_dbgstr_w(buffW));
+
+    len = strlen(xmluriA)-1;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getURI(nsmgr, _bstr_("xml"), NULL, buffW, &len);
+    EXPECT_HR(hr, E_XML_BUFFERTOOSMALL);
+    ok(len == strlen(xmluriA)-1, "got %d\n", len);
+    ok(buffW[0] == 0x1, "got %x\n", buffW[0]);
+
+    /* prefix xml1 not defined */
+    len = -1;
+    hr = IMXNamespaceManager_getURI(nsmgr, _bstr_("xml1"), NULL, NULL, &len);
+    EXPECT_HR(hr, S_FALSE);
+    ok(len == 0, "got %d\n", len);
+
+    len = 100;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getURI(nsmgr, _bstr_("xml1"), NULL, buffW, &len);
+    EXPECT_HR(hr, S_FALSE);
+    ok(buffW[0] == 0, "got %x\n", buffW[0]);
+    ok(len == 0, "got %d\n", len);
+
+    /* IDispatchEx tests */
+    hr = IMXNamespaceManager_QueryInterface(nsmgr, &IID_IUnknown, (void**)&unk);
+    EXPECT_HR(hr, S_OK);
+    test_domobj_dispex(unk);
+    IUnknown_Release(unk);
+
+    IMXNamespaceManager_Release(nsmgr);
+
+    /* ::getPrefix() */
+    hr = CoCreateInstance(&CLSID_MXNamespaceManager40, NULL, CLSCTX_INPROC_SERVER,
+        &IID_IMXNamespaceManager, (void**)&nsmgr);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IMXNamespaceManager_getPrefix(nsmgr, NULL, 0, NULL, NULL);
+    EXPECT_HR(hr, E_INVALIDARG);
+
+    len = -1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, NULL, 0, NULL, &len);
+    EXPECT_HR(hr, E_INVALIDARG);
+    ok(len == -1, "got %d\n", len);
+
+    len = 100;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns0 uri"), 0, buffW, &len);
+    EXPECT_HR(hr, E_FAIL);
+    ok(buffW[0] == 0x1, "got %x\n", buffW[0]);
+    ok(len == 100, "got %d\n", len);
+
+    len = 0;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns0 uri"), 0, buffW, &len);
+    EXPECT_HR(hr, E_FAIL);
+    ok(buffW[0] == 0x1, "got %x\n", buffW[0]);
+    ok(len == 0, "got %d\n", len);
+
+    hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns1"), _bstr_("ns1 uri"));
+    EXPECT_HR(hr, S_OK);
+
+    len = 100;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 0, buffW, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(buffW, _bstr_("ns1")), "got %s\n", wine_dbgstr_w(buffW));
+    ok(len == 3, "got %d\n", len);
+
+    len = 100;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("http://www.w3.org/XML/1998/namespace"), 0, buffW, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(buffW, _bstr_("xml")), "got %s\n", wine_dbgstr_w(buffW));
+    ok(len == 3, "got %d\n", len);
+
+    /* with null buffer it's possible to get required length */
+    len = 100;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("http://www.w3.org/XML/1998/namespace"), 0, NULL, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(len == 3, "got %d\n", len);
+
+    len = 0;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("http://www.w3.org/XML/1998/namespace"), 0, NULL, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(len == 3, "got %d\n", len);
+
+    len = 100;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 1, buffW, &len);
+    EXPECT_HR(hr, E_FAIL);
+    ok(buffW[0] == 0x1, "got %x\n", buffW[0]);
+    ok(len == 100, "got %d\n", len);
+
+    len = 100;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 2, buffW, &len);
+    EXPECT_HR(hr, E_FAIL);
+    ok(buffW[0] == 0x1, "got %x\n", buffW[0]);
+    ok(len == 100, "got %d\n", len);
+
+    len = 100;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_(""), 0, buffW, &len);
+    EXPECT_HR(hr, E_INVALIDARG);
+    ok(buffW[0] == 0x1, "got %x\n", buffW[0]);
+    ok(len == 100, "got %d\n", len);
+
+    len = 100;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_(""), 1, buffW, &len);
+    EXPECT_HR(hr, E_INVALIDARG);
+    ok(buffW[0] == 0x1, "got %x\n", buffW[0]);
+    ok(len == 100, "got %d\n", len);
+
+    len = 100;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, NULL, 0, buffW, &len);
+    EXPECT_HR(hr, E_INVALIDARG);
+    ok(buffW[0] == 0x1, "got %x\n", buffW[0]);
+    ok(len == 100, "got %d\n", len);
+
+    len = 100;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns0 uri"), 1, buffW, &len);
+    EXPECT_HR(hr, E_FAIL);
+    ok(buffW[0] == 0x1, "got %x\n", buffW[0]);
+    ok(len == 100, "got %d\n", len);
+
+    len = 100;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_(""), 1, buffW, &len);
+    EXPECT_HR(hr, E_INVALIDARG);
+    ok(buffW[0] == 0x1, "got %x\n", buffW[0]);
+    ok(len == 100, "got %d\n", len);
+
+    /* declare another one, indices are shifted */
+    hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns2"), _bstr_("ns2 uri"));
+    EXPECT_HR(hr, S_OK);
+
+    len = 100;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 0, buffW, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(buffW, _bstr_("ns1")), "got %s\n", wine_dbgstr_w(buffW));
+    ok(len == 3, "got %d\n", len);
+
+    len = 100;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns2 uri"), 0, buffW, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(buffW, _bstr_("ns2")), "got %s\n", wine_dbgstr_w(buffW));
+    ok(len == 3, "got %d\n", len);
+
+    len = 100;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns2 uri"), 1, buffW, &len);
+    EXPECT_HR(hr, E_FAIL);
+    ok(buffW[0] == 0x1, "got %x\n", buffW[0]);
+    ok(len == 100, "got %d\n", len);
+
+    len = 100;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_(""), 1, buffW, &len);
+    EXPECT_HR(hr, E_INVALIDARG);
+    ok(buffW[0] == 0x1, "got %x\n", buffW[0]);
+    ok(len == 100, "got %d\n", len);
+
+    IMXNamespaceManager_Release(nsmgr);
+
+    /* push/pop tests */
+    hr = CoCreateInstance(&CLSID_MXNamespaceManager40, NULL, CLSCTX_INPROC_SERVER,
+        &IID_IMXNamespaceManager, (void**)&nsmgr);
+    EXPECT_HR(hr, S_OK);
+
+    /* pop with empty stack */
+    hr = IMXNamespaceManager_popContext(nsmgr);
+    EXPECT_HR(hr, E_FAIL);
+
+    hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns1"), _bstr_("ns1 uri"));
+    EXPECT_HR(hr, S_OK);
+
+    len = 100;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 0, buffW, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(buffW, _bstr_("ns1")), "got %s\n", wine_dbgstr_w(buffW));
+    ok(len == 3, "got %d\n", len);
+
+    hr = IMXNamespaceManager_pushContext(nsmgr);
+    EXPECT_HR(hr, S_OK);
+
+    len = 100;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 0, buffW, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(buffW, _bstr_("ns1")), "got %s\n", wine_dbgstr_w(buffW));
+    ok(len == 3, "got %d\n", len);
+
+    hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns2"), _bstr_("ns2 uri"));
+    EXPECT_HR(hr, S_OK);
+
+    len = 100;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns2 uri"), 0, buffW, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(buffW, _bstr_("ns2")), "got %s\n", wine_dbgstr_w(buffW));
+    ok(len == 3, "got %d\n", len);
+
+    hr = IMXNamespaceManager_pushContext(nsmgr);
+    EXPECT_HR(hr, S_OK);
+    hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns3"), _bstr_("ns3 uri"));
+    EXPECT_HR(hr, S_OK);
+
+    len = 100;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns2 uri"), 0, buffW, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(buffW, _bstr_("ns2")), "got %s\n", wine_dbgstr_w(buffW));
+    ok(len == 3, "got %d\n", len);
+
+    len = 100;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 0, buffW, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(buffW, _bstr_("ns1")), "got %s\n", wine_dbgstr_w(buffW));
+    ok(len == 3, "got %d\n", len);
+
+    hr = IMXNamespaceManager_popContext(nsmgr);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IMXNamespaceManager_popContext(nsmgr);
+    EXPECT_HR(hr, S_OK);
+
+    len = 100;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns2 uri"), 0, buffW, &len);
+    EXPECT_HR(hr, E_FAIL);
+    ok(buffW[0] == 0x1, "got %x\n", buffW[0]);
+    ok(len == 100, "got %d\n", len);
+
+    len = 100;
+    buffW[0] = 0x1;
+    hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 0, buffW, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(buffW, _bstr_("ns1")), "got %s\n", wine_dbgstr_w(buffW));
+    ok(len == 3, "got %d\n", len);
+
+    IMXNamespaceManager_Release(nsmgr);
+
+    free_bstrs();
+}
+
+static void test_mxnamespacemanager_override(void)
+{
+    IMXNamespaceManager *nsmgr;
+    WCHAR buffW[250];
+    VARIANT_BOOL b;
+    HRESULT hr;
+    INT len;
+
+    hr = CoCreateInstance(&CLSID_MXNamespaceManager40, NULL, CLSCTX_INPROC_SERVER,
+        &IID_IMXNamespaceManager, (void**)&nsmgr);
+    EXPECT_HR(hr, S_OK);
+
+    len = sizeof(buffW)/sizeof(WCHAR);
+    buffW[0] = 0;
+    hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 0, buffW, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(buffW, _bstr_("xml")), "got prefix %s\n", wine_dbgstr_w(buffW));
+
+    len = sizeof(buffW)/sizeof(WCHAR);
+    buffW[0] = 0;
+    hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 1, buffW, &len);
+    EXPECT_HR(hr, E_FAIL);
+
+    hr = IMXNamespaceManager_getAllowOverride(nsmgr, NULL);
+    EXPECT_HR(hr, E_POINTER);
+
+    b = VARIANT_FALSE;
+    hr = IMXNamespaceManager_getAllowOverride(nsmgr, &b);
+    EXPECT_HR(hr, S_OK);
+    ok(b == VARIANT_TRUE, "got %d\n", b);
+
+    hr = IMXNamespaceManager_putAllowOverride(nsmgr, VARIANT_FALSE);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IMXNamespaceManager_declarePrefix(nsmgr, NULL, _bstr_("ns0 uri"));
+    EXPECT_HR(hr, S_OK);
+
+    len = sizeof(buffW)/sizeof(WCHAR);
+    buffW[0] = 0;
+    hr = IMXNamespaceManager_getURI(nsmgr, _bstr_(""), NULL, buffW, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(buffW, _bstr_("ns0 uri")), "got uri %s\n", wine_dbgstr_w(buffW));
+
+    hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns0"), _bstr_("ns0 uri"));
+    EXPECT_HR(hr, S_OK);
+
+    len = sizeof(buffW)/sizeof(WCHAR);
+    buffW[0] = 0;
+    hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 0, buffW, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(buffW, _bstr_("xml")), "got prefix %s\n", wine_dbgstr_w(buffW));
+
+    len = sizeof(buffW)/sizeof(WCHAR);
+    buffW[0] = 0;
+    hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 1, buffW, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(buffW, _bstr_("ns0")), "got prefix %s\n", wine_dbgstr_w(buffW));
+
+    len = sizeof(buffW)/sizeof(WCHAR);
+    buffW[0] = 0;
+    hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 2, buffW, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(buffW, _bstr_("")), "got prefix %s\n", wine_dbgstr_w(buffW));
+
+    /* new prefix placed at index 1 always */
+    hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns1"), _bstr_("ns1 uri"));
+    EXPECT_HR(hr, S_OK);
+
+    len = sizeof(buffW)/sizeof(WCHAR);
+    buffW[0] = 0;
+    hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 1, buffW, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(buffW, _bstr_("ns1")), "got prefix %s\n", wine_dbgstr_w(buffW));
+
+    hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_(""), NULL);
+    todo_wine EXPECT_HR(hr, E_FAIL);
+
+    hr = IMXNamespaceManager_declarePrefix(nsmgr, NULL, NULL);
+    EXPECT_HR(hr, E_FAIL);
+
+    hr = IMXNamespaceManager_declarePrefix(nsmgr, NULL, _bstr_("ns0 uri"));
+    EXPECT_HR(hr, E_FAIL);
+
+    hr = IMXNamespaceManager_putAllowOverride(nsmgr, VARIANT_TRUE);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IMXNamespaceManager_declarePrefix(nsmgr, NULL, _bstr_("ns0 uri override"));
+    EXPECT_HR(hr, S_FALSE);
+
+    len = sizeof(buffW)/sizeof(WCHAR);
+    buffW[0] = 0;
+    hr = IMXNamespaceManager_getURI(nsmgr, _bstr_(""), NULL, buffW, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(buffW, _bstr_("ns0 uri override")), "got uri %s\n", wine_dbgstr_w(buffW));
+
+    len = sizeof(buffW)/sizeof(WCHAR);
+    buffW[0] = 0;
+    hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 3, buffW, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(buffW, _bstr_("")), "got prefix %s\n", wine_dbgstr_w(buffW));
+
+    IMXNamespaceManager_Release(nsmgr);
+
+    free_bstrs();
+}
+
+static const DOMNodeType nodetypes_test[] =
+{
+    NODE_ELEMENT,
+    NODE_ATTRIBUTE,
+    NODE_TEXT,
+    NODE_CDATA_SECTION,
+    NODE_ENTITY_REFERENCE,
+    NODE_PROCESSING_INSTRUCTION,
+    NODE_COMMENT,
+    NODE_DOCUMENT_FRAGMENT,
+    NODE_INVALID
+};
+
+static void test_dispex(void)
+{
+    const DOMNodeType *type = nodetypes_test;
+    IXMLDOMImplementation *impl;
+    IXMLDOMNodeList *node_list;
+    IXMLDOMParseError *error;
+    IXMLDOMNamedNodeMap *map;
+    IXSLProcessor *processor;
+    IXSLTemplate *template;
+    IXMLDOMDocument *doc;
+    IXMLHTTPRequest *req;
+    IXMLDOMElement *elem;
+    IDispatchEx *dispex;
+    DISPPARAMS dispparams;
+    IXMLDOMNode *node;
+    VARIANT arg, ret;
+    VARIANT_BOOL b;
+    IUnknown *unk;
+    HRESULT hr;
+    DISPID did;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_QueryInterface(doc, &IID_IUnknown, (void**)&unk);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    test_domobj_dispex(unk);
+    IUnknown_Release(unk);
+
+    for(; *type != NODE_INVALID; type++)
+    {
+        IXMLDOMNode *node;
+        VARIANT v;
+
+        V_VT(&v) = VT_I2;
+        V_I2(&v) = *type;
+
+        hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node);
+        ok(hr == S_OK, "failed to create node type %d\n", *type);
+
+        IXMLDOMNode_QueryInterface(node, &IID_IUnknown, (void**)&unk);
+
+        test_domobj_dispex(unk);
+        IUnknown_Release(unk);
+        IXMLDOMNode_Release(node);
+    }
+
+    /* IXMLDOMNodeList */
+    hr = IXMLDOMDocument_getElementsByTagName(doc, _bstr_("*"), &node_list);
+    EXPECT_HR(hr, S_OK);
+    IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, (void**)&unk);
+    test_domobj_dispex(unk);
+    IUnknown_Release(unk);
+    IXMLDOMNodeList_Release(node_list);
+
+    /* IXMLDOMNodeList for children list */
+    hr = IXMLDOMDocument_get_childNodes(doc, &node_list);
+    EXPECT_HR(hr, S_OK);
+    hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, (void**)&unk);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    test_domobj_dispex(unk);
+    IUnknown_Release(unk);
+
+    /* collection dispex test, empty collection */
+    hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IDispatchEx, (void**)&dispex);
+    EXPECT_HR(hr, S_OK);
+    did = 0;
+    hr = IDispatchEx_GetDispID(dispex, _bstr_("0"), 0, &did);
+    EXPECT_HR(hr, S_OK);
+    ok(did == DISPID_DOM_COLLECTION_BASE, "got 0x%08x\n", did);
+    hr = IDispatchEx_GetDispID(dispex, _bstr_("1"), 0, &did);
+    EXPECT_HR(hr, S_OK);
+    ok(did == DISPID_DOM_COLLECTION_BASE+1, "got 0x%08x\n", did);
+    IDispatchEx_Release(dispex);
+
+    did = -1;
+    hr = IDispatchEx_GetDispID(dispex, _bstr_("item"), 0, &did);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(did == DISPID_VALUE, "got %d\n", did);
+
+    V_VT(&arg) = VT_I4;
+    V_I4(&arg) = 0;
+    dispparams.cArgs = 0;
+    dispparams.cNamedArgs = 0;
+    dispparams.rgdispidNamedArgs = NULL;
+    dispparams.rgvarg = &arg;
+
+    V_VT(&ret) = VT_EMPTY;
+    V_DISPATCH(&ret) = (void*)0x1;
+    hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL);
+    ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr);
+    ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret));
+todo_wine
+    ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret));
+
+    V_VT(&arg) = VT_I4;
+    V_I4(&arg) = 0;
+    dispparams.cArgs = 2;
+    dispparams.cNamedArgs = 0;
+    dispparams.rgdispidNamedArgs = NULL;
+    dispparams.rgvarg = &arg;
+
+    V_VT(&ret) = VT_EMPTY;
+    V_DISPATCH(&ret) = (void*)0x1;
+    hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL);
+    ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr);
+    ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret));
+todo_wine
+    ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret));
+
+    V_VT(&arg) = VT_I4;
+    V_I4(&arg) = 0;
+    dispparams.cArgs = 1;
+    dispparams.cNamedArgs = 0;
+    dispparams.rgdispidNamedArgs = NULL;
+    dispparams.rgvarg = &arg;
+
+    V_VT(&ret) = VT_EMPTY;
+    V_DISPATCH(&ret) = (void*)0x1;
+    hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret));
+    ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret));
+
+    V_VT(&ret) = VT_EMPTY;
+    V_DISPATCH(&ret) = (void*)0x1;
+    hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &ret, NULL, NULL);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret));
+    ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret));
+
+    V_VT(&ret) = VT_EMPTY;
+    V_DISPATCH(&ret) = (void*)0x1;
+    hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dispparams, &ret, NULL, NULL);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret));
+    ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret));
+
+    dispparams.cArgs = 0;
+    dispparams.cNamedArgs = 0;
+    dispparams.rgdispidNamedArgs = NULL;
+    dispparams.rgvarg = NULL;
+
+    V_VT(&ret) = VT_EMPTY;
+    V_I4(&ret) = 1;
+    hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &ret, NULL, NULL);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(V_VT(&ret) == VT_I4, "got %d\n", V_VT(&ret));
+    ok(V_I4(&ret) == 0, "got %d\n", V_I4(&ret));
+
+    dispparams.cArgs = 0;
+    dispparams.cNamedArgs = 0;
+    dispparams.rgdispidNamedArgs = NULL;
+    dispparams.rgvarg = NULL;
+
+    V_VT(&ret) = VT_EMPTY;
+    V_I4(&ret) = 1;
+    hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL);
+    ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr);
+    ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret));
+todo_wine
+    ok(broken(V_I4(&ret) == 1) || (V_I4(&ret) == 0), "got %d\n", V_I4(&ret));
+
+    IXMLDOMNodeList_Release(node_list);
+
+    /* IXMLDOMParseError */
+    hr = IXMLDOMDocument_get_parseError(doc, &error);
+    EXPECT_HR(hr, S_OK);
+    IXMLDOMParseError_QueryInterface(error, &IID_IUnknown, (void**)&unk);
+    test_domobj_dispex(unk);
+
+    hr = IXMLDOMParseError_QueryInterface(error, &IID_IDispatchEx, (void**)&dispex);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    V_VT(&arg) = VT_I4;
+    V_I4(&arg) = 0;
+    dispparams.cArgs = 1;
+    dispparams.cNamedArgs = 0;
+    dispparams.rgdispidNamedArgs = NULL;
+    dispparams.rgvarg = &arg;
+
+    V_VT(&ret) = VT_EMPTY;
+    V_DISPATCH(&ret) = (void*)0x1;
+    hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL);
+    ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr);
+    ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret));
+todo_wine
+    ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret));
+
+    IDispatchEx_Release(dispex);
+
+    IUnknown_Release(unk);
+    IXMLDOMParseError_Release(error);
+
+    /* IXMLDOMNamedNodeMap */
+    hr = IXMLDOMDocument_loadXML(doc, _bstr_(xpath_simple_list), &b);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMDocument_selectNodes(doc, _bstr_("root/a"), &node_list);
+    EXPECT_HR(hr, S_OK);
+    hr = IXMLDOMNodeList_get_item(node_list, 0, &node);
+    EXPECT_HR(hr, S_OK);
+    IXMLDOMNodeList_Release(node_list);
+
+    hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem);
+    EXPECT_HR(hr, S_OK);
+    IXMLDOMNode_Release(node);
+    hr = IXMLDOMElement_get_attributes(elem, &map);
+    EXPECT_HR(hr, S_OK);
+    IXMLDOMNamedNodeMap_QueryInterface(map, &IID_IUnknown, (void**)&unk);
+    test_domobj_dispex(unk);
+    IUnknown_Release(unk);
+    /* collection dispex test */
+    hr = IXMLDOMNamedNodeMap_QueryInterface(map, &IID_IDispatchEx, (void**)&dispex);
+    EXPECT_HR(hr, S_OK);
+    did = 0;
+    hr = IDispatchEx_GetDispID(dispex, _bstr_("0"), 0, &did);
+    EXPECT_HR(hr, S_OK);
+    ok(did == DISPID_DOM_COLLECTION_BASE, "got 0x%08x\n", did);
+    IDispatchEx_Release(dispex);
+
+    hr = IXMLDOMDocument_selectNodes(doc, _bstr_("root/b"), &node_list);
+    EXPECT_HR(hr, S_OK);
+    hr = IXMLDOMNodeList_get_item(node_list, 0, &node);
+    EXPECT_HR(hr, S_OK);
+    IXMLDOMNodeList_Release(node_list);
+    hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem);
+    EXPECT_HR(hr, S_OK);
+    IXMLDOMNode_Release(node);
+    hr = IXMLDOMElement_get_attributes(elem, &map);
+    EXPECT_HR(hr, S_OK);
+    /* collection dispex test, empty collection */
+    hr = IXMLDOMNamedNodeMap_QueryInterface(map, &IID_IDispatchEx, (void**)&dispex);
+    EXPECT_HR(hr, S_OK);
+    did = 0;
+    hr = IDispatchEx_GetDispID(dispex, _bstr_("0"), 0, &did);
+    EXPECT_HR(hr, S_OK);
+    ok(did == DISPID_DOM_COLLECTION_BASE, "got 0x%08x\n", did);
+    hr = IDispatchEx_GetDispID(dispex, _bstr_("1"), 0, &did);
+    EXPECT_HR(hr, S_OK);
+    ok(did == DISPID_DOM_COLLECTION_BASE+1, "got 0x%08x\n", did);
+    IDispatchEx_Release(dispex);
+
+    did = -1;
+    hr = IDispatchEx_GetDispID(dispex, _bstr_("item"), 0, &did);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(did == DISPID_VALUE, "got %d\n", did);
+
+    V_VT(&arg) = VT_I4;
+    V_I4(&arg) = 0;
+    dispparams.cArgs = 0;
+    dispparams.cNamedArgs = 0;
+    dispparams.rgdispidNamedArgs = NULL;
+    dispparams.rgvarg = &arg;
+
+    V_VT(&ret) = VT_EMPTY;
+    V_DISPATCH(&ret) = (void*)0x1;
+    hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL);
+todo_wine {
+    ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr);
+    ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret));
+}
+    ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret));
+
+    V_VT(&arg) = VT_I4;
+    V_I4(&arg) = 0;
+    dispparams.cArgs = 2;
+    dispparams.cNamedArgs = 0;
+    dispparams.rgdispidNamedArgs = NULL;
+    dispparams.rgvarg = &arg;
+
+    V_VT(&ret) = VT_EMPTY;
+    V_DISPATCH(&ret) = (void*)0x1;
+    hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL);
+todo_wine {
+    ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr);
+    ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret));
+}
+    ok(broken(V_DISPATCH(&ret) == (void*)0x1) || (V_DISPATCH(&ret) == NULL), "got %p\n", V_DISPATCH(&ret));
+
+    V_VT(&arg) = VT_I4;
+    V_I4(&arg) = 0;
+    dispparams.cArgs = 1;
+    dispparams.cNamedArgs = 0;
+    dispparams.rgdispidNamedArgs = NULL;
+    dispparams.rgvarg = &arg;
+
+    V_VT(&ret) = VT_EMPTY;
+    V_DISPATCH(&ret) = (void*)0x1;
+    hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL);
+todo_wine
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret));
+    ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret));
+
+    V_VT(&ret) = VT_EMPTY;
+    V_DISPATCH(&ret) = (void*)0x1;
+    hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &ret, NULL, NULL);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret));
+    ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret));
+
+    V_VT(&ret) = VT_EMPTY;
+    V_DISPATCH(&ret) = (void*)0x1;
+    hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dispparams, &ret, NULL, NULL);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret));
+    ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret));
+
+    dispparams.cArgs = 0;
+    dispparams.cNamedArgs = 0;
+    dispparams.rgdispidNamedArgs = NULL;
+    dispparams.rgvarg = NULL;
+
+    V_VT(&ret) = VT_EMPTY;
+    V_I4(&ret) = 1;
+    hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &ret, NULL, NULL);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(V_VT(&ret) == VT_I4, "got %d\n", V_VT(&ret));
+    ok(V_I4(&ret) == 0, "got %d\n", V_I4(&ret));
+
+    dispparams.cArgs = 0;
+    dispparams.cNamedArgs = 0;
+    dispparams.rgdispidNamedArgs = NULL;
+    dispparams.rgvarg = NULL;
+
+    V_VT(&ret) = VT_EMPTY;
+    V_I4(&ret) = 1;
+    hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL);
+    ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr);
+todo_wine
+    ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret));
+    ok(broken(V_I4(&ret) == 1) || (V_I4(&ret) == 0), "got %d\n", V_I4(&ret));
+
+    IXMLDOMNamedNodeMap_Release(map);
+    IXMLDOMElement_Release(elem);
+
+    /* IXMLDOMImplementation */
+    hr = IXMLDOMDocument_get_implementation(doc, &impl);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMImplementation_QueryInterface(impl, &IID_IDispatchEx, (void**)&dispex);
+    EXPECT_HR(hr, S_OK);
+    IDispatchEx_Release(dispex);
+    IXMLDOMImplementation_Release(impl);
+
+    IXMLDOMDocument_Release(doc);
+
+    /* IXMLHTTPRequest */
+    hr = CoCreateInstance(&CLSID_XMLHTTPRequest, NULL, CLSCTX_INPROC_SERVER,
+        &IID_IXMLHttpRequest, (void**)&req);
+    if (hr == S_OK)
+    {
+        hr = IXMLHTTPRequest_QueryInterface(req, &IID_IDispatchEx, (void**)&dispex);
+        EXPECT_HR(hr, E_NOINTERFACE);
+        IXMLHTTPRequest_Release(req);
+    }
+
+    /* IXSLTemplate */
+    template = create_xsltemplate(&IID_IXSLTemplate);
+    hr = IXSLTemplate_QueryInterface(template, &IID_IDispatchEx, (void**)&dispex);
+    EXPECT_HR(hr, S_OK);
+    hr = IDispatchEx_QueryInterface(dispex, &IID_IUnknown, (void**)&unk);
+    EXPECT_HR(hr, S_OK);
+    test_domobj_dispex(unk);
+    IUnknown_Release(unk);
+    IDispatchEx_Release(dispex);
+
+    /* IXSLProcessor */
+    hr = CoCreateInstance(&CLSID_FreeThreadedDOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc);
+    EXPECT_HR(hr, S_OK);
+    b = VARIANT_FALSE;
+    hr = IXMLDOMDocument_loadXML(doc, _bstr_(szTransformSSXML), &b);
+    EXPECT_HR(hr, S_OK);
+    ok(b == VARIANT_TRUE, "got %d\n", b);
+
+    hr = IXSLTemplate_putref_stylesheet(template, (IXMLDOMNode*)doc);
+    EXPECT_HR(hr, S_OK);
+    IXMLDOMDocument_Release(doc);
+
+    hr = IXSLTemplate_createProcessor(template, &processor);
+    EXPECT_HR(hr, S_OK);
+    hr = IXSLProcessor_QueryInterface(processor, &IID_IDispatchEx, (void**)&dispex);
+    EXPECT_HR(hr, S_OK);
+    hr = IDispatchEx_QueryInterface(dispex, &IID_IUnknown, (void**)&unk);
+    EXPECT_HR(hr, S_OK);
+    test_domobj_dispex(unk);
+    IUnknown_Release(unk);
+    IDispatchEx_Release(dispex);
+
+    IXSLProcessor_Release(processor);
+    IXSLTemplate_Release(template);
+
+    if (is_clsid_supported(&CLSID_DOMDocument60, &IID_IXMLDOMDocument))
+    {
+        doc = create_document_version(60, &IID_IXMLDOMDocument);
+        test_domobj_dispex((IUnknown*)doc);
+        IXMLDOMDocument_Release(doc);
+    }
+
+    free_bstrs();
+}
+
+static void test_parseerror(void)
+{
+    IXMLDOMParseError2 *error2;
+    IXMLDOMParseError *error;
+    IXMLDOMDocument *doc;
+    HRESULT hr;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_get_parseError(doc, &error);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMParseError_get_line(error, NULL);
+    EXPECT_HR(hr, E_INVALIDARG);
+
+    hr = IXMLDOMParseError_get_srcText(error, NULL);
+    EXPECT_HR(hr, E_INVALIDARG);
+
+    hr = IXMLDOMParseError_get_linepos(error, NULL);
+    EXPECT_HR(hr, E_INVALIDARG);
+
+    IXMLDOMParseError_Release(error);
+    IXMLDOMDocument_Release(doc);
+
+    if (!is_clsid_supported(&CLSID_DOMDocument60, &IID_IXMLDOMDocument)) return;
+    doc = create_document_version(60, &IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_get_parseError(doc, &error);
+    EXPECT_HR(hr, S_OK);
+    hr = IXMLDOMParseError_QueryInterface(error, &IID_IXMLDOMParseError2, (void**)&error2);
+    EXPECT_HR(hr, S_OK);
+    IXMLDOMParseError2_Release(error2);
+    IXMLDOMParseError_Release(error);
+    IXMLDOMDocument_Release(doc);
+}
+
+static void test_getAttributeNode(void)
+{
+    IXMLDOMAttribute *attr;
+    IXMLDOMDocument *doc;
+    IXMLDOMElement *elem;
+    VARIANT_BOOL v;
+    HRESULT hr;
+    BSTR str;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_loadXML(doc, _bstr_(szExampleXML), &v);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMDocument_get_documentElement(doc, &elem);
+    EXPECT_HR(hr, S_OK);
+
+    str = SysAllocString(nonexistent_fileW);
+    hr = IXMLDOMElement_getAttributeNode(elem, str, NULL);
+    EXPECT_HR(hr, E_FAIL);
+
+    attr = (IXMLDOMAttribute*)0xdeadbeef;
+    hr = IXMLDOMElement_getAttributeNode(elem, str, &attr);
+    EXPECT_HR(hr, E_FAIL);
+    ok(attr == NULL, "got %p\n", attr);
+    SysFreeString(str);
+
+    str = SysAllocString(nonexistent_attrW);
+    hr = IXMLDOMElement_getAttributeNode(elem, str, NULL);
+    EXPECT_HR(hr, S_FALSE);
+
+    attr = (IXMLDOMAttribute*)0xdeadbeef;
+    hr = IXMLDOMElement_getAttributeNode(elem, str, &attr);
+    EXPECT_HR(hr, S_FALSE);
+    ok(attr == NULL, "got %p\n", attr);
+    SysFreeString(str);
+
+    hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("foo:b"), &attr);
+    EXPECT_HR(hr, S_OK);
+    IXMLDOMAttribute_Release(attr);
+
+    hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("b"), &attr);
+    EXPECT_HR(hr, S_FALSE);
+
+    hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("a"), &attr);
+    EXPECT_HR(hr, S_OK);
+    IXMLDOMAttribute_Release(attr);
+
+    IXMLDOMElement_Release(elem);
+    IXMLDOMDocument_Release(doc);
+    free_bstrs();
+}
+
+typedef struct {
+    DOMNodeType type;
+    const char *name;
+    REFIID iids[3];
+} supporterror_t;
+
+static const supporterror_t supporterror_test[] = {
+    { NODE_ELEMENT,                "element",   { &IID_IXMLDOMNode, &IID_IXMLDOMElement } },
+    { NODE_ATTRIBUTE,              "attribute", { &IID_IXMLDOMNode, &IID_IXMLDOMAttribute } },
+    { NODE_CDATA_SECTION,          "cdata",     { &IID_IXMLDOMNode, &IID_IXMLDOMCDATASection } },
+    { NODE_ENTITY_REFERENCE,       "entityref", { &IID_IXMLDOMNode, &IID_IXMLDOMEntityReference } },
+    { NODE_PROCESSING_INSTRUCTION, "pi",        { &IID_IXMLDOMNode, &IID_IXMLDOMProcessingInstruction } },
+    { NODE_COMMENT,                "comment",   { &IID_IXMLDOMNode, &IID_IXMLDOMComment } },
+    { NODE_DOCUMENT_FRAGMENT,      "fragment",  { &IID_IXMLDOMNode, &IID_IXMLDOMDocumentFragment } },
+    { NODE_INVALID }
+};
+
+static void test_supporterrorinfo(void)
+{
+    static REFIID iids[5] = { &IID_IXMLDOMNode, &IID_IXMLDOMDocument,
+                              &IID_IXMLDOMDocument2, &IID_IXMLDOMDocument3 };
+    const supporterror_t *ptr = supporterror_test;
+    ISupportErrorInfo *errorinfo, *info2;
+    IXMLDOMSchemaCollection *schemacache;
+    IXMLDOMNamedNodeMap *map, *map2;
+    IXMLDOMDocument *doc;
+    IXMLDOMElement *elem;
+    VARIANT_BOOL b;
+    IUnknown *unk;
+    REFIID *iid;
+    void *dummy;
+    HRESULT hr;
+
+    if (!is_clsid_supported(&CLSID_DOMDocument60, &IID_IXMLDOMDocument3)) return;
+    doc = create_document_version(60, &IID_IXMLDOMDocument3);
+
+    EXPECT_REF(doc, 1);
+    hr = IXMLDOMDocument_QueryInterface(doc, &IID_ISupportErrorInfo, (void**)&errorinfo);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(doc, 1);
+    ISupportErrorInfo_AddRef(errorinfo);
+    EXPECT_REF(errorinfo, 2);
+    EXPECT_REF(doc, 1);
+    ISupportErrorInfo_Release(errorinfo);
+
+    hr = IXMLDOMDocument_QueryInterface(doc, &IID_ISupportErrorInfo, (void**)&info2);
+    EXPECT_HR(hr, S_OK);
+    ok(errorinfo != info2, "got %p, %p\n", info2, errorinfo);
+
+    /* error interface can't be queried back for DOM interface */
+    hr = ISupportErrorInfo_QueryInterface(info2, &IID_IXMLDOMDocument, &dummy);
+    EXPECT_HR(hr, E_NOINTERFACE);
+    hr = ISupportErrorInfo_QueryInterface(info2, &IID_IXMLDOMNode, &dummy);
+    EXPECT_HR(hr, E_NOINTERFACE);
+
+    ISupportErrorInfo_Release(info2);
+
+    iid = iids;
+    while (*iid)
+    {
+        hr = IXMLDOMDocument_QueryInterface(doc, *iid, (void**)&unk);
+        EXPECT_HR(hr, S_OK);
+        if (hr == S_OK)
+        {
+            hr = ISupportErrorInfo_InterfaceSupportsErrorInfo(errorinfo, *iid);
+            ok(hr == S_OK, "got 0x%08x for %s\n", hr, wine_dbgstr_guid(*iid));
+            IUnknown_Release(unk);
+        }
+
+        iid++;
+    }
+
+    ISupportErrorInfo_Release(errorinfo);
+
+    while (ptr->type != NODE_INVALID)
+    {
+        IXMLDOMNode *node;
+        VARIANT type;
+
+        V_VT(&type) = VT_I1;
+        V_I1(&type) = ptr->type;
+
+        hr = IXMLDOMDocument_createNode(doc, type, _bstr_(ptr->name), NULL, &node);
+        ok(hr == S_OK, "%d: got 0x%08x\n", ptr->type, hr);
+
+        EXPECT_REF(node, 1);
+        hr = IXMLDOMNode_QueryInterface(node, &IID_ISupportErrorInfo, (void**)&errorinfo);
+        ok(hr == S_OK, "%d: got 0x%08x\n", ptr->type, hr);
+        EXPECT_REF(node, 1);
+
+        hr = ISupportErrorInfo_QueryInterface(errorinfo, &IID_IXMLDOMNode, &dummy);
+        ok(hr == E_NOINTERFACE, "%d: got 0x%08x\n", ptr->type, hr);
+
+        iid = ptr->iids;
+
+        while (*iid)
+        {
+            hr = IXMLDOMNode_QueryInterface(node, *iid, (void**)&unk);
+            if (hr == S_OK)
+            {
+                hr = ISupportErrorInfo_InterfaceSupportsErrorInfo(errorinfo, *iid);
+                ok(hr == S_OK, "%d: got 0x%08x for %s\n", ptr->type, hr, wine_dbgstr_guid(*iid));
+                IUnknown_Release(unk);
+            }
+
+            iid++;
+        }
+
+        ISupportErrorInfo_Release(errorinfo);
+        IXMLDOMNode_Release(node);
+        ptr++;
+    }
 
-    /* set -- inheriting previous settings */
+    /* IXMLDOMNamedNodeMap */
+    b = VARIANT_FALSE;
+    hr = IXMLDOMDocument_loadXML(doc, _bstr_(complete4A), &b);
+    EXPECT_HR(hr, S_OK);
+    ok(b == VARIANT_TRUE, "got %d\n", b);
 
-    hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL,
-                                                         INTERFACESAFE_FOR_UNTRUSTED_CALLER,
-                                                         INTERFACESAFE_FOR_UNTRUSTED_CALLER);
-    ok(hr == S_OK, "ret %08x\n", hr );
-    hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled);
-    ok(hr == S_OK, "ret %08x\n", hr );
-    todo_wine
-    ok(broken(enabled == INTERFACESAFE_FOR_UNTRUSTED_CALLER) ||
-       enabled == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */,
-         "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACE_USES_SECURITY_MANAGER), "
-         "got %08x\n", enabled);
+    hr = IXMLDOMDocument_get_documentElement(doc, &elem);
+    EXPECT_HR(hr, S_OK);
 
-    hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL,
-                                                         INTERFACESAFE_FOR_UNTRUSTED_DATA,
-                                                         INTERFACESAFE_FOR_UNTRUSTED_DATA);
+    hr = IXMLDOMElement_get_attributes(elem, &map);
+    EXPECT_HR(hr, S_OK);
+
+    EXPECT_REF(map, 1);
+    hr = IXMLDOMNamedNodeMap_QueryInterface(map, &IID_ISupportErrorInfo, (void**)&errorinfo);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(map, 2);
+
+    hr = ISupportErrorInfo_InterfaceSupportsErrorInfo(errorinfo, &IID_IXMLDOMNamedNodeMap);
+    EXPECT_HR(hr, S_OK);
+
+    hr = ISupportErrorInfo_QueryInterface(errorinfo, &IID_IXMLDOMNamedNodeMap, (void**)&map2);
+    EXPECT_HR(hr, S_OK);
+    ok(map == map2, "got %p\n", map2);
+    IXMLDOMNamedNodeMap_Release(map2);
+
+    EXPECT_REF(errorinfo, 2);
+    hr = ISupportErrorInfo_QueryInterface(errorinfo, &IID_IUnknown, (void**)&unk);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(errorinfo, 3);
+    EXPECT_REF(map, 3);
+    IUnknown_Release(unk);
+
+    ISupportErrorInfo_Release(errorinfo);
+    IXMLDOMNamedNodeMap_Release(map);
+    IXMLDOMElement_Release(elem);
+
+    IXMLDOMDocument_Release(doc);
+
+    /* IXMLDOMSchemaCollection */
+    hr = CoCreateInstance(&CLSID_XMLSchemaCache, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMSchemaCollection, (void**)&schemacache);
+    ok(hr == S_OK, "failed to create schema collection, 0x%08x\n", hr);
+
+    hr = IXMLDOMSchemaCollection_QueryInterface(schemacache, &IID_ISupportErrorInfo, (void**)&errorinfo);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = ISupportErrorInfo_InterfaceSupportsErrorInfo(errorinfo, &IID_IXMLDOMSchemaCollection);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    ISupportErrorInfo_Release(errorinfo);
+    IXMLDOMSchemaCollection_Release(schemacache);
+
+    free_bstrs();
+}
+
+typedef struct {
+    DOMNodeType type;
+    const char *name;
+    const char *put_content;
+    HRESULT put_hr;
+    VARTYPE get_vt;
+    HRESULT get_hr;
+} node_value_t;
+
+static const node_value_t nodevalue_test[] = {
+    { NODE_ELEMENT,                "element",   "",             E_FAIL, VT_NULL, S_FALSE },
+    { NODE_ATTRIBUTE,              "attr",      "value",        S_OK,   VT_BSTR, S_OK },
+    { NODE_TEXT,                   "text",      "textdata",     S_OK,   VT_BSTR, S_OK },
+    { NODE_CDATA_SECTION ,         "cdata",     "cdata data",   S_OK,   VT_BSTR, S_OK },
+    { NODE_ENTITY_REFERENCE,       "entityref", "ref",          E_FAIL, VT_NULL, S_FALSE },
+    { NODE_PROCESSING_INSTRUCTION, "pi",        "instr",        S_OK,   VT_BSTR, S_OK },
+    { NODE_COMMENT,                "comment",   "comment data", S_OK,   VT_BSTR, S_OK },
+    { NODE_DOCUMENT_FRAGMENT,      "docfrag",   "",             E_FAIL, VT_NULL, S_FALSE },
+    { NODE_INVALID }
+};
+
+static void test_nodeValue(void)
+{
+    const node_value_t *ptr = nodevalue_test;
+    IXMLDOMDocument *doc;
+    HRESULT hr;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    while (ptr->type != NODE_INVALID)
+    {
+        IXMLDOMNode *node;
+        VARIANT v;
+
+        V_VT(&v) = VT_I2;
+        V_I2(&v) = ptr->type;
+
+        hr = IXMLDOMDocument_createNode(doc, v, _bstr_(ptr->name), NULL, &node);
+        ok(hr == S_OK, "failed to create node type %d\n", ptr->type);
+
+        hr = IXMLDOMNode_get_nodeValue(node, NULL);
+        ok(hr == E_INVALIDARG, "%d: got 0x%08x\n", ptr->type, hr);
+
+        V_VT(&v) = VT_BSTR;
+        V_BSTR(&v) = _bstr_(ptr->put_content);
+        hr = IXMLDOMNode_put_nodeValue(node, v);
+        ok(hr == ptr->put_hr, "%d: got 0x%08x\n", ptr->type, hr);
+
+        V_VT(&v) = VT_EMPTY;
+        hr = IXMLDOMNode_get_nodeValue(node, &v);
+        ok(hr == ptr->get_hr, "%d: got 0x%08x, expected 0x%08x\n", ptr->type, hr, ptr->get_hr);
+        ok(V_VT(&v) == ptr->get_vt, "%d: got %d, expected %d\n", ptr->type, V_VT(&v), ptr->get_vt);
+        if (hr == S_OK)
+            ok(!lstrcmpW(V_BSTR(&v), _bstr_(ptr->put_content)), "%d: got %s\n", ptr->type,
+                wine_dbgstr_w(V_BSTR(&v)));
+        VariantClear(&v);
+
+        IXMLDOMNode_Release(node);
+
+        ptr++;
+    }
+
+    IXMLDOMDocument_Release(doc);
+}
+
+static void test_xmlns_attribute(void)
+{
+    BSTR str;
+    IXMLDOMDocument *doc;
+    IXMLDOMElement *root;
+    IXMLDOMAttribute *pAttribute;
+    IXMLDOMElement *elem;
+    HRESULT hr;
+    VARIANT v;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &root);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)root, NULL);
+    EXPECT_HR(hr, S_OK);
+
+    str = SysAllocString(szAttribute);
+    hr = IXMLDOMDocument_createAttribute(doc, _bstr_("xmlns:dt"), &pAttribute);
+    ok( hr == S_OK, "returns %08x\n", hr );
+
+    V_VT(&v) = VT_BSTR;
+    V_BSTR(&v) = _bstr_("urn:schemas-microsoft-com:datatypes");
+    hr = IXMLDOMAttribute_put_nodeValue(pAttribute, v);
+
+    hr = IXMLDOMElement_setAttributeNode(root, pAttribute, NULL);
     ok(hr == S_OK, "ret %08x\n", hr );
-    hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled);
+
+    hr = IXMLDOMNode_put_dataType((IXMLDOMNode*)root, _bstr_("bin.base64"));
     ok(hr == S_OK, "ret %08x\n", hr );
-    todo_wine
-    ok(broken(enabled == INTERFACESAFE_FOR_UNTRUSTED_DATA) ||
-       enabled == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA) /* msxml3 SP8+ */,
-        "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA), "
-        "got %08x\n", enabled);
 
-    IObjectSafety_Release(safety);
+    hr = IXMLDOMDocument_get_documentElement(doc, &elem);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMElement_get_xml(elem, &str);
+    ok( hr == S_OK, "got 0x%08x\n", hr);
+    todo_wine ok( lstrcmpW(str, _bstr_("<Testing xmlns:dt=\"urn:schemas-microsoft-com:datatypes\" dt:dt=\"bin.base64\"/>")) == 0,
+    "got %s\n", wine_dbgstr_w(str));
+
+    IXMLDOMElement_Release(elem);
+    IXMLDOMAttribute_Release( pAttribute);
+
+    SysFreeString(str);
 
     IXMLDOMDocument_Release(doc);
+
+    free_bstrs();
 }
 
-static void test_XSLPattern(void)
+static const char namespacesA[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
+"   <ns1:elem1 xmlns:ns1=\"http://blah.org\" b='1' >"
+"     <ns2:elem2 xmlns:ns2=\"http://blah.org\"/>"
+"     <ns1:elem3/>"
+"     <ns1:elem4/>"
+"     <elem5 xmlns=\"http://blahblah.org\"/>"
+"     <ns1:elem6>true</ns1:elem6>"
+"   </ns1:elem1>";
+
+static const char xsd_schema1_uri[] = "x-schema:test1.xsd";
+static const char xsd_schema1_xml[] =
+"<?xml version='1.0'?>"
+"<schema xmlns='http://www.w3.org/2001/XMLSchema'"
+"            targetNamespace='x-schema:test1.xsd'>"
+"   <element name='root'>"
+"       <complexType>"
+"           <sequence maxOccurs='unbounded'>"
+"               <any/>"
+"           </sequence>"
+"       </complexType>"
+"   </element>"
+"</schema>";
+
+static void test_get_namespaces(void)
 {
-    IXMLDOMDocument2 *doc;
-    IXMLDOMNodeList *list;
+    IXMLDOMSchemaCollection *collection, *collection2;
+    IXMLDOMDocument2 *doc, *doc2;
+    IEnumVARIANT *enumv, *enum2;
+    IUnknown *unk1, *unk2;
+    IXMLDOMNode *node;
     VARIANT_BOOL b;
-    HRESULT r;
+    HRESULT hr;
+    VARIANT v;
     LONG len;
+    BSTR s;
+
+    if (!is_clsid_supported(&CLSID_DOMDocument2, &IID_IXMLDOMDocument2)) return;
+    doc = create_document(&IID_IXMLDOMDocument2);
 
-    r = CoCreateInstance( &CLSID_DOMDocument, NULL,
-        CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (void**)&doc );
-    ok( r == S_OK, "CoCreateInstance(CLSID_DOMDocument) should have succeeded instead of failing with 0x%08x\n", r );
-    if( r != S_OK )
+    /* null pointer */
+    hr = IXMLDOMDocument2_get_namespaces(doc, NULL);
+    EXPECT_HR(hr, E_POINTER);
+
+    /* no document loaded */
+    collection = (void*)0xdeadbeef;
+    hr = IXMLDOMDocument2_get_namespaces(doc, &collection);
+    EXPECT_HR(hr, S_OK);
+    if (hr != S_OK)
+    {
+        IXMLDOMDocument2_Release(doc);
         return;
+    }
+    EXPECT_REF(collection, 2);
+
+    collection2 = (void*)0xdeadbeef;
+    hr = IXMLDOMDocument2_get_namespaces(doc, &collection2);
+    EXPECT_HR(hr, S_OK);
+    ok(collection == collection2, "got %p\n", collection2);
+    EXPECT_REF(collection, 3);
+    IXMLDOMSchemaCollection_Release(collection);
+
+    len = -1;
+    hr = IXMLDOMSchemaCollection_get_length(collection, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(len == 0, "got %d\n", len);
+    IXMLDOMSchemaCollection_Release(collection);
+
+    /* now with document */
+    hr = IXMLDOMDocument2_loadXML(doc, _bstr_(namespacesA), &b);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMDocument2_get_namespaces(doc, &collection);
+    EXPECT_HR(hr, S_OK);
+
+    len = -1;
+    hr = IXMLDOMSchemaCollection_get_length(collection, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(len == 2, "got %d\n", len);
+
+    /* try to lookup some uris */
+    node = (void*)0xdeadbeef;
+    hr = IXMLDOMSchemaCollection_get(collection, _bstr_("http://blah.org"), &node);
+    EXPECT_HR(hr, S_OK);
+    ok(node == NULL, "got %p\n", node);
+
+    node = (void*)0xdeadbeef;
+    hr = IXMLDOMSchemaCollection_get(collection, _bstr_("http://blah1.org"), &node);
+    EXPECT_HR(hr, S_OK);
+    ok(node == NULL, "got %p\n", node);
+
+    /* load schema and try to add it */
+    doc2 = create_document(&IID_IXMLDOMDocument2);
+    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);
+    EXPECT_HR(hr, E_FAIL);
+
+    hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 0, &s);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(s, _bstr_("http://blah.org")), "got %s\n", wine_dbgstr_w(s));
+    SysFreeString(s);
+
+    hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 1, &s);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(s, _bstr_("http://blahblah.org")), "got %s\n", wine_dbgstr_w(s));
+    SysFreeString(s);
+
+    s = (void*)0xdeadbeef;
+    hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 2, &s);
+    EXPECT_HR(hr, E_FAIL);
+    ok(s == (void*)0xdeadbeef, "got %p\n", s);
+
+    /* enumerate */
+    enumv = (void*)0xdeadbeef;
+    EXPECT_REF(collection, 2);
+    hr = IXMLDOMSchemaCollection_get__newEnum(collection, (IUnknown**)&enumv);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(collection, 3);
+    ok(enumv != NULL, "got %p\n", enumv);
+
+    hr = IXMLDOMSchemaCollection_QueryInterface(collection, &IID_IUnknown, (void**)&unk1);
+    EXPECT_HR(hr, S_OK);
+    hr = IEnumVARIANT_QueryInterface(enumv, &IID_IUnknown, (void**)&unk2);
+    EXPECT_HR(hr, S_OK);
+    ok(unk1 != unk2, "got %p, %p\n", unk1, unk2);
+    IUnknown_Release(unk1);
+    IUnknown_Release(unk2);
+
+    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);
+    EXPECT_HR(hr, S_OK);
+    ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v));
+    ok(!lstrcmpW(V_BSTR(&v), _bstr_("http://blah.org")), "got %s\n", wine_dbgstr_w(V_BSTR(&v)));
+    VariantClear(&v);
 
-    ole_check(IXMLDOMDocument2_loadXML(doc, _bstr_(szExampleXML), &b));
-    ok(b == VARIANT_TRUE, "failed to load XML string\n");
+    V_VT(&v) = VT_EMPTY;
+    hr = IEnumVARIANT_Next(enumv, 1, &v, NULL);
+    EXPECT_HR(hr, S_OK);
+    ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v));
+    ok(!lstrcmpW(V_BSTR(&v), _bstr_("http://blahblah.org")), "got %s\n", wine_dbgstr_w(V_BSTR(&v)));
+    VariantClear(&v);
 
-    /* switch to XPath */
-    ole_check(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), _variantbstr_("XSLPattern")));
+    V_VT(&v) = VT_NULL;
+    hr = IEnumVARIANT_Next(enumv, 1, &v, NULL);
+    EXPECT_HR(hr, S_FALSE);
+    ok(V_VT(&v) == VT_EMPTY, "got %d\n", V_VT(&v));
 
-    /* for XSLPattern start index is 0, for XPath it's 1 */
-    ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("root//elem[0]"), &list));
-    len = 0;
-    ole_check(IXMLDOMNodeList_get_length(list, &len));
-    todo_wine ok(len != 0, "expected filled list\n");
-    if (len)
-        todo_wine expect_list_and_release(list, "E1.E2.D1");
+    IEnumVARIANT_Release(enumv);
+    IXMLDOMSchemaCollection_Release(collection);
+
+    IXMLDOMDocument2_Release(doc);
+
+    /* now with CLSID_DOMDocument60 */
+    if (!is_clsid_supported(&CLSID_DOMDocument60, &IID_IXMLDOMDocument2)) return;
+    doc = create_document_version(60, &IID_IXMLDOMDocument2);
+
+    /* null pointer */
+    hr = IXMLDOMDocument2_get_namespaces(doc, NULL);
+    EXPECT_HR(hr, E_POINTER);
 
+    /* no document loaded */
+    collection = (void*)0xdeadbeef;
+    hr = IXMLDOMDocument2_get_namespaces(doc, &collection);
+    EXPECT_HR(hr, S_OK);
+    if (hr != S_OK)
+    {
+        IXMLDOMDocument2_Release(doc);
+        return;
+    }
+    EXPECT_REF(collection, 2);
+
+    collection2 = (void*)0xdeadbeef;
+    hr = IXMLDOMDocument2_get_namespaces(doc, &collection2);
+    EXPECT_HR(hr, S_OK);
+    ok(collection == collection2, "got %p\n", collection2);
+    EXPECT_REF(collection, 3);
+    IXMLDOMSchemaCollection_Release(collection);
+
+    len = -1;
+    hr = IXMLDOMSchemaCollection_get_length(collection, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(len == 0, "got %d\n", len);
+    IXMLDOMSchemaCollection_Release(collection);
+
+    /* now with document */
+    hr = IXMLDOMDocument2_loadXML(doc, _bstr_(namespacesA), &b);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMDocument2_get_namespaces(doc, &collection);
+    EXPECT_HR(hr, S_OK);
+
+    len = -1;
+    hr = IXMLDOMSchemaCollection_get_length(collection, &len);
+    EXPECT_HR(hr, S_OK);
+    ok(len == 2, "got %d\n", len);
+
+    /* try to lookup some uris */
+    node = (void*)0xdeadbeef;
+    hr = IXMLDOMSchemaCollection_get(collection, _bstr_("http://blah.org"), &node);
+    EXPECT_HR(hr, E_NOTIMPL);
+    ok(broken(node == (void*)0xdeadbeef) || (node == NULL), "got %p\n", node);
+
+    /* load schema and try to add it */
+    doc2 = create_document(&IID_IXMLDOMDocument2);
+    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);
+    EXPECT_HR(hr, E_FAIL);
+    IXMLDOMDocument2_Release(doc2);
+
+    hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 0, &s);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(s, _bstr_("http://blah.org")), "got %s\n", wine_dbgstr_w(s));
+    SysFreeString(s);
+
+    hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 1, &s);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(s, _bstr_("http://blahblah.org")), "got %s\n", wine_dbgstr_w(s));
+    SysFreeString(s);
+
+    s = (void*)0xdeadbeef;
+    hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 2, &s);
+    EXPECT_HR(hr, E_FAIL);
+    ok(broken(s == (void*)0xdeadbeef) || (s == NULL), "got %p\n", s);
+
+    /* enumerate */
+    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) = VT_EMPTY;
+    hr = IEnumVARIANT_Next(enumv, 1, &v, NULL);
+    EXPECT_HR(hr, S_OK);
+    ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v));
+    ok(!lstrcmpW(V_BSTR(&v), _bstr_("http://blah.org")), "got %s\n", wine_dbgstr_w(V_BSTR(&v)));
+    VariantClear(&v);
+
+    V_VT(&v) = VT_EMPTY;
+    hr = IEnumVARIANT_Next(enumv, 1, &v, NULL);
+    EXPECT_HR(hr, S_OK);
+    ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v));
+    ok(!lstrcmpW(V_BSTR(&v), _bstr_("http://blahblah.org")), "got %s\n", wine_dbgstr_w(V_BSTR(&v)));
+    VariantClear(&v);
+
+    V_VT(&v) = VT_NULL;
+    hr = IEnumVARIANT_Next(enumv, 1, &v, NULL);
+    EXPECT_HR(hr, S_FALSE);
+    ok(V_VT(&v) == VT_EMPTY, "got %d\n", V_VT(&v));
+
+    IEnumVARIANT_Release(enumv);
+    IXMLDOMSchemaCollection_Release(collection);
     IXMLDOMDocument2_Release(doc);
     free_bstrs();
 }
 
-START_TEST(domdoc)
+static DOMNodeType put_data_types[] = {
+    NODE_TEXT,
+    NODE_CDATA_SECTION,
+    NODE_PROCESSING_INSTRUCTION,
+    NODE_COMMENT,
+    NODE_INVALID
+};
+
+static void test_put_data(void)
 {
+    static const WCHAR test_data[] = {'t','e','s','t',' ','n','o','d','e',' ','d','a','t','a',0};
+    WCHAR buff[100], *data;
     IXMLDOMDocument *doc;
-    HRESULT r;
+    DOMNodeType *type;
+    IXMLDOMText *text;
+    IXMLDOMNode *node;
+    VARIANT v;
+    BSTR get_data;
+    HRESULT hr;
 
-    r = CoInitialize( NULL );
-    ok( r == S_OK, "failed to init com\n");
-    if (r != S_OK)
-        return;
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    memcpy(&buff[2], test_data, sizeof(test_data));
+    /* just a big length */
+    *(DWORD*)buff = 0xf0f0;
+    data = &buff[2];
 
-    r = CoCreateInstance( &CLSID_DOMDocument, NULL,
-        CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
-    if (SUCCEEDED(r))
+    type = put_data_types;
+    while (*type != NODE_INVALID)
     {
-        IXMLDOMDocument_Release(doc);
+       V_VT(&v) = VT_I2;
+       V_I2(&v) = *type;
+
+       hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node);
+       EXPECT_HR(hr, S_OK);
+
+       /* put_data() is interface-specific */
+       switch (*type)
+       {
+           case NODE_TEXT:
+           {
+              hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text);
+              EXPECT_HR(hr, S_OK);
+              hr = IXMLDOMText_put_data(text, data);
+              EXPECT_HR(hr, S_OK);
+
+              hr = IXMLDOMText_get_data(text, &get_data);
+              EXPECT_HR(hr, S_OK);
+
+              IXMLDOMText_Release(text);
+              break;
+           }
+           case NODE_CDATA_SECTION:
+           {
+              IXMLDOMCDATASection *cdata;
+
+              hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMCDATASection, (void**)&cdata);
+              EXPECT_HR(hr, S_OK);
+              hr = IXMLDOMCDATASection_put_data(cdata, data);
+              EXPECT_HR(hr, S_OK);
+
+              hr = IXMLDOMCDATASection_get_data(cdata, &get_data);
+              EXPECT_HR(hr, S_OK);
+
+              IXMLDOMCDATASection_Release(cdata);
+              break;
+           }
+           case NODE_PROCESSING_INSTRUCTION:
+           {
+              IXMLDOMProcessingInstruction *pi;
+
+              hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMProcessingInstruction, (void**)&pi);
+              EXPECT_HR(hr, S_OK);
+              hr = IXMLDOMProcessingInstruction_put_data(pi, data);
+              EXPECT_HR(hr, S_OK);
+
+              hr = IXMLDOMProcessingInstruction_get_data(pi, &get_data);
+              EXPECT_HR(hr, S_OK);
+
+              IXMLDOMProcessingInstruction_Release(pi);
+              break;
+           }
+           case NODE_COMMENT:
+           {
+              IXMLDOMComment *comment;
+
+              hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMComment, (void**)&comment);
+              EXPECT_HR(hr, S_OK);
+              hr = IXMLDOMComment_put_data(comment, data);
+              EXPECT_HR(hr, S_OK);
+
+              hr = IXMLDOMComment_get_data(comment, &get_data);
+              EXPECT_HR(hr, S_OK);
+
+              IXMLDOMComment_Release(comment);
+              break;
+           }
+           default:
+              break;
+       }
+
+       /* compare */
+       ok(!lstrcmpW(data, get_data), "%d: got wrong data %s, expected %s\n", *type, wine_dbgstr_w(get_data),
+           wine_dbgstr_w(data));
+       SysFreeString(get_data);
+
+       IXMLDOMNode_Release(node);
+       type++;
+    }
+
+    /* \r\n sequence is never escaped */
+    V_VT(&v) = VT_I2;
+    V_I2(&v) = NODE_TEXT;
+
+    hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text);
+
+    hr = IXMLDOMText_put_data(text, _bstr_("\r\n"));
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMText_get_data(text, &get_data);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+todo_wine
+    ok(!lstrcmpW(get_data, _bstr_("\n")), "got %s\n", wine_dbgstr_w(get_data));
+    SysFreeString(get_data);
+
+    hr = IXMLDOMText_get_xml(text, &get_data);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(!lstrcmpW(get_data, _bstr_("\r\n")), "got %s\n", wine_dbgstr_w(get_data));
+    SysFreeString(get_data);
+
+    IXMLDOMText_Release(text);
+    IXMLDOMNode_Release(node);
+
+    IXMLDOMDocument_Release(doc);
+    free_bstrs();
+}
+
+static void test_putref_schemas(void)
+{
+    IXMLDOMSchemaCollection *cache;
+    IXMLDOMDocument2 *doc;
+    VARIANT schema;
+    HRESULT hr;
+
+    if (!is_clsid_supported(&CLSID_DOMDocument2, &IID_IXMLDOMDocument2)) return;
+    if (!is_clsid_supported(&CLSID_XMLSchemaCache, &IID_IXMLDOMSchemaCollection)) return;
+
+    doc = create_document(&IID_IXMLDOMDocument2);
+    cache = create_cache(&IID_IXMLDOMSchemaCollection);
+
+    /* set to NULL iface when no schema is set */
+    V_VT(&schema) = VT_DISPATCH;
+    V_DISPATCH(&schema) = NULL;
+    hr = IXMLDOMDocument2_putref_schemas(doc, schema);
+    EXPECT_HR(hr, S_OK);
+
+    V_VT(&schema) = VT_UNKNOWN;
+    V_UNKNOWN(&schema) = NULL;
+    hr = IXMLDOMDocument2_putref_schemas(doc, schema);
+    EXPECT_HR(hr, S_OK);
+
+    /* set as VT_DISPATCH, reset with it */
+    V_VT(&schema) = VT_DISPATCH;
+    V_DISPATCH(&schema) = (IDispatch*)cache;
+    hr = IXMLDOMDocument2_putref_schemas(doc, schema);
+    EXPECT_HR(hr, S_OK);
+
+    V_DISPATCH(&schema) = NULL;
+    hr = IXMLDOMDocument2_get_schemas(doc, &schema);
+    EXPECT_HR(hr, S_OK);
+    ok(V_DISPATCH(&schema) == (IDispatch*)cache, "got %p\n", V_DISPATCH(&schema));
+
+    V_VT(&schema) = VT_DISPATCH;
+    V_DISPATCH(&schema) = NULL;
+    hr = IXMLDOMDocument2_putref_schemas(doc, schema);
+    EXPECT_HR(hr, S_OK);
+
+    V_DISPATCH(&schema) = (IDispatch*)0xdeadbeef;
+    V_VT(&schema) = VT_I2;
+    hr = IXMLDOMDocument2_get_schemas(doc, &schema);
+    EXPECT_HR(hr, S_FALSE);
+    ok(V_DISPATCH(&schema) == NULL, "got %p\n", V_DISPATCH(&schema));
+    ok(V_VT(&schema) == VT_NULL, "got %d\n", V_VT(&schema));
+
+    /* set as VT_UNKNOWN, reset with it */
+    V_VT(&schema) = VT_UNKNOWN;
+    V_UNKNOWN(&schema) = (IUnknown*)cache;
+    hr = IXMLDOMDocument2_putref_schemas(doc, schema);
+    EXPECT_HR(hr, S_OK);
+
+    V_DISPATCH(&schema) = NULL;
+    hr = IXMLDOMDocument2_get_schemas(doc, &schema);
+    EXPECT_HR(hr, S_OK);
+    ok(V_DISPATCH(&schema) == (IDispatch*)cache, "got %p\n", V_DISPATCH(&schema));
+
+    V_VT(&schema) = VT_UNKNOWN;
+    V_UNKNOWN(&schema) = NULL;
+    hr = IXMLDOMDocument2_putref_schemas(doc, schema);
+    EXPECT_HR(hr, S_OK);
+
+    V_DISPATCH(&schema) = (IDispatch*)0xdeadbeef;
+    V_VT(&schema) = VT_I2;
+    hr = IXMLDOMDocument2_get_schemas(doc, &schema);
+    EXPECT_HR(hr, S_FALSE);
+    ok(V_DISPATCH(&schema) == NULL, "got %p\n", V_DISPATCH(&schema));
+    ok(V_VT(&schema) == VT_NULL, "got %d\n", V_VT(&schema));
+
+    IXMLDOMSchemaCollection_Release(cache);
+    IXMLDOMDocument2_Release(doc);
+}
+
+static void test_namedmap_newenum(void)
+{
+    IEnumVARIANT *enum1, *enum2, *enum3;
+    IXMLDOMNamedNodeMap *map;
+    IUnknown *unk1, *unk2;
+    IXMLDOMDocument *doc;
+    IXMLDOMElement *elem;
+    IXMLDOMNode *node;
+    VARIANT_BOOL b;
+    HRESULT hr;
+    VARIANT v;
+    BSTR str;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_loadXML(doc, _bstr_(attributes_map), &b);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMDocument_get_documentElement(doc, &elem);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMElement_get_attributes(elem, &map);
+    EXPECT_HR(hr, S_OK);
+    IXMLDOMElement_Release(elem);
+
+    enum1 = NULL;
+    EXPECT_REF(map, 1);
+    hr = IXMLDOMNamedNodeMap_QueryInterface(map, &IID_IEnumVARIANT, (void**)&enum1);
+    EXPECT_HR(hr, S_OK);
+    ok(enum1 != NULL, "got %p\n", enum1);
+    EXPECT_REF(map, 1);
+    EXPECT_REF(enum1, 2);
+
+    enum2 = NULL;
+    hr = IXMLDOMNamedNodeMap_QueryInterface(map, &IID_IEnumVARIANT, (void**)&enum2);
+    EXPECT_HR(hr, S_OK);
+    ok(enum2 == enum1, "got %p\n", enum2);
+
+    IEnumVARIANT_Release(enum2);
+
+    EXPECT_REF(map, 1);
+    hr = IXMLDOMNamedNodeMap__newEnum(map, (IUnknown**)&enum2);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(map, 2);
+    EXPECT_REF(enum2, 1);
+    ok(enum2 != enum1, "got %p, %p\n", enum2, enum1);
+
+    IEnumVARIANT_Release(enum1);
+
+    /* enumerator created with _newEnum() doesn't share IUnknown* with main object */
+    hr = IXMLDOMNamedNodeMap_QueryInterface(map, &IID_IUnknown, (void**)&unk1);
+    EXPECT_HR(hr, S_OK);
+    hr = IEnumVARIANT_QueryInterface(enum2, &IID_IUnknown, (void**)&unk2);
+    EXPECT_HR(hr, S_OK);
+    EXPECT_REF(map, 3);
+    EXPECT_REF(enum2, 2);
+    ok(unk1 != unk2, "got %p, %p\n", unk1, unk2);
+    IUnknown_Release(unk1);
+    IUnknown_Release(unk2);
+
+    hr = IXMLDOMNamedNodeMap__newEnum(map, (IUnknown**)&enum3);
+    EXPECT_HR(hr, S_OK);
+    ok(enum2 != enum3, "got %p, %p\n", enum2, enum3);
+    IEnumVARIANT_Release(enum3);
+
+    /* iteration tests */
+    hr = IXMLDOMNamedNodeMap_get_item(map, 0, &node);
+    EXPECT_HR(hr, S_OK);
+    hr = IXMLDOMNode_get_nodeName(node, &str);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(str, _bstr_("attr1")), "got %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
+    IXMLDOMNode_Release(node);
+
+    hr = IXMLDOMNamedNodeMap_nextNode(map, &node);
+    EXPECT_HR(hr, S_OK);
+    hr = IXMLDOMNode_get_nodeName(node, &str);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(str, _bstr_("attr1")), "got %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
+    IXMLDOMNode_Release(node);
+
+    V_VT(&v) = VT_EMPTY;
+    hr = IEnumVARIANT_Next(enum2, 1, &v, 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);
+    EXPECT_HR(hr, S_OK);
+    hr = IXMLDOMNode_get_nodeName(node, &str);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(str, _bstr_("attr1")), "got node name %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
+    IXMLDOMNode_Release(node);
+    VariantClear(&v);
+
+    hr = IXMLDOMNamedNodeMap_nextNode(map, &node);
+    EXPECT_HR(hr, S_OK);
+    hr = IXMLDOMNode_get_nodeName(node, &str);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(str, _bstr_("attr2")), "got %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
+    IXMLDOMNode_Release(node);
+
+    IEnumVARIANT_Release(enum2);
+    IXMLDOMNamedNodeMap_Release(map);
+    IXMLDOMDocument_Release(doc);
+}
+
+static const char xsltext_xsl[] =
+"<?xml version=\"1.0\"?>"
+"<xsl:stylesheet version=\"1.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" >"
+"<xsl:output method=\"html\" encoding=\"us-ascii\"/>"
+"<xsl:template match=\"/\">"
+"    <xsl:choose>"
+"        <xsl:when test=\"testkey\">"
+"            <xsl:text>testdata</xsl:text>"
+"        </xsl:when>"
+"    </xsl:choose>"
+"</xsl:template>"
+"</xsl:stylesheet>";
+
+static const char omitxmldecl_xsl[] =
+"<?xml version=\"1.0\"?>"
+"<xsl:stylesheet version=\"1.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" >"
+"<xsl:output method=\"xml\" omit-xml-declaration=\"yes\"/>"
+"<xsl:template match=\"/\">"
+"    <xsl:for-each select=\"/a/item\">"
+"        <xsl:element name=\"node\">"
+"            <xsl:value-of select=\"@name\"/>"
+"        </xsl:element>"
+"    </xsl:for-each>"
+"</xsl:template>"
+"</xsl:stylesheet>";
+
+static const char omitxmldecl_doc[] =
+"<?xml version=\"1.0\"?>"
+"<a>"
+"    <item name=\"item1\"/>"
+"    <item name=\"item2\"/>"
+"</a>";
+
+static void test_xsltext(void)
+{
+    IXMLDOMDocument *doc, *doc2;
+    VARIANT_BOOL b;
+    HRESULT hr;
+    BSTR ret;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+    doc2 = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_loadXML(doc, _bstr_(xsltext_xsl), &b);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMDocument_loadXML(doc2, _bstr_("<testkey/>"), &b);
+    EXPECT_HR(hr, S_OK);
+
+    hr = IXMLDOMDocument_transformNode(doc2, (IXMLDOMNode*)doc, &ret);
+    EXPECT_HR(hr, S_OK);
+    ok(!lstrcmpW(ret, _bstr_("testdata")), "transform result %s\n", wine_dbgstr_w(ret));
+    SysFreeString(ret);
+
+    /* omit-xml-declaration */
+    hr = IXMLDOMDocument_loadXML(doc, _bstr_(omitxmldecl_xsl), &b);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    hr = IXMLDOMDocument_loadXML(doc2, _bstr_(omitxmldecl_doc), &b);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMDocument_transformNode(doc2, (IXMLDOMNode*)doc, &ret);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(!lstrcmpW(ret, _bstr_("<node>item1</node><node>item2</node>")), "transform result %s\n", wine_dbgstr_w(ret));
+    SysFreeString(ret);
+
+    IXMLDOMDocument_Release(doc2);
+    IXMLDOMDocument_Release(doc);
+    free_bstrs();
+}
+
+struct attrtest_t {
+    const char *name;
+    const char *uri;
+    const char *prefix;
+    const char *href;
+};
+
+static struct attrtest_t attrtests[] = {
+    { "xmlns", "http://www.w3.org/2000/xmlns/", "xmlns", "xmlns" },
+    { "xmlns", "nondefaulturi", "xmlns", "xmlns" },
+    { "c", "http://www.w3.org/2000/xmlns/", NULL, "http://www.w3.org/2000/xmlns/" },
+    { "c", "nsref1", NULL, "nsref1" },
+    { "ns:c", "nsref1", "ns", "nsref1" },
+    { "xmlns:c", "http://www.w3.org/2000/xmlns/", "xmlns", "" },
+    { "xmlns:c", "nondefaulturi", "xmlns", "" },
+    { 0 }
+};
+
+static void test_create_attribute(void)
+{
+    struct attrtest_t *ptr = attrtests;
+    IXMLDOMElement *el;
+    IXMLDOMDocument *doc;
+    IXMLDOMNode *node, *node2;
+    VARIANT var;
+    HRESULT hr;
+    int i = 0;
+    BSTR str;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    while (ptr->name)
+    {
+        V_VT(&var) = VT_I1;
+        V_I1(&var) = NODE_ATTRIBUTE;
+        hr = IXMLDOMDocument_createNode(doc, var, _bstr_(ptr->name), _bstr_(ptr->uri), &node);
+        ok(hr == S_OK, "got 0x%08x\n", hr);
+
+        str = NULL;
+        hr = IXMLDOMNode_get_prefix(node, &str);
+        if (ptr->prefix)
+        {
+            ok(hr == S_OK, "%d: got 0x%08x\n", i, hr);
+            ok(!lstrcmpW(str, _bstr_(ptr->prefix)), "%d: got prefix %s, expected %s\n", i, wine_dbgstr_w(str), ptr->prefix);
+        }
+        else
+        {
+            ok(hr == S_FALSE, "%d: got 0x%08x\n", i, hr);
+            ok(str == NULL, "%d: got prefix %s\n", i, wine_dbgstr_w(str));
+        }
+
+        str = NULL;
+        hr = IXMLDOMNode_get_namespaceURI(node, &str);
+        ok(hr == S_OK, "%d: got 0x%08x\n", i, hr);
+        ok(!lstrcmpW(str, _bstr_(ptr->href)), "%d: got uri %s, expected %s\n", i, wine_dbgstr_w(str), ptr->href);
+        SysFreeString(str);
+
+        IXMLDOMNode_Release(node);
+        free_bstrs();
 
-        test_domdoc();
-        test_persiststreaminit();
-        test_domnode();
-        test_refs();
-        test_create();
-        test_getElementsByTagName();
-        test_get_text();
-        test_get_childNodes();
-        test_get_firstChild();
-        test_removeChild();
-        test_replaceChild();
-        test_removeNamedItem();
-        test_IXMLDOMDocument2();
-        test_XPath();
-        test_XSLPattern();
-        test_cloneNode();
-        test_xmlTypes();
-        test_nodeTypeTests();
-        test_DocumentSaveToDocument();
-        test_DocumentSaveToFile();
-        test_testTransforms();
-        test_Namespaces();
-        test_FormattingXML();
-        test_NodeTypeValue();
-        test_TransformWithLoadingLocalFile();
-        test_put_nodeValue();
-        test_document_IObjectSafety();
+        i++;
+        ptr++;
     }
-    else
-        win_skip("IXMLDOMDocument is not available (0x%08x)\n", r);
 
-    test_XMLHTTP();
+    V_VT(&var) = VT_I1;
+    V_I1(&var) = NODE_ELEMENT;
+    hr = IXMLDOMDocument_createNode(doc, var, _bstr_("e"), NULL, &node2);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMNode_QueryInterface(node2, &IID_IXMLDOMElement, (void**)&el);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    IXMLDOMNode_Release(node2);
+
+    V_VT(&var) = VT_I1;
+    V_I1(&var) = NODE_ATTRIBUTE;
+    hr = IXMLDOMDocument_createNode(doc, var, _bstr_("xmlns:a"), _bstr_("http://www.w3.org/2000/xmlns/"), &node);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    hr = IXMLDOMElement_setAttributeNode(el, (IXMLDOMAttribute*)node, NULL);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+
+    /* for some reason default namespace uri is not reported */
+    hr = IXMLDOMNode_get_namespaceURI(node, &str);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(!lstrcmpW(str, _bstr_("")), "got uri %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
+
+    IXMLDOMNode_Release(node);
+    IXMLDOMElement_Release(el);
+    IXMLDOMDocument_Release(doc);
+    free_bstrs();
+}
+
+static void test_url(void)
+{
+    IXMLDOMDocument *doc;
+    HRESULT hr;
+    BSTR s;
+
+    doc = create_document(&IID_IXMLDOMDocument);
+
+    hr = IXMLDOMDocument_get_url(doc, NULL);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+
+    s = (BSTR)0x1;
+    hr = IXMLDOMDocument_get_url(doc, &s);
+    ok(hr == S_FALSE, "got 0x%08x\n", hr);
+    ok(s == NULL, "got %s\n", wine_dbgstr_w(s));
+
+    IXMLDOMDocument_Release(doc);
+}
+
+START_TEST(domdoc)
+{
+    HRESULT hr;
+
+    hr = CoInitialize( NULL );
+    ok( hr == S_OK, "failed to init com\n");
+    if (hr != S_OK) return;
+
+    get_class_support_data(domdoc_support_data);
+    if (!is_clsid_supported(&CLSID_DOMDocument2, &IID_IXMLDOMDocument))
+    {
+        win_skip("DOMDocument2 is not supported. Skipping all tests.\n");
+        CoUninitialize();
+        return;
+    }
+
+    test_domdoc();
+    test_persiststreaminit();
+    test_domnode();
+    test_refs();
+    test_create();
+    test_getElementsByTagName();
+    test_get_text();
+    test_get_childNodes();
+    test_get_firstChild();
+    test_get_lastChild();
+    test_removeChild();
+    test_replaceChild();
+    test_removeNamedItem();
+    test_IXMLDOMDocument2();
+    test_whitespace();
+    test_XPath();
+    test_XSLPattern();
+    test_cloneNode();
+    test_xmlTypes();
+#if CORE_6738_IS_FIXED
+    test_save();
+#endif
+    test_testTransforms();
+    test_namespaces_basic();
+    test_namespaces_change();
+    test_FormattingXML();
+    test_nodeTypedValue();
+    test_TransformWithLoadingLocalFile();
+    test_put_nodeValue();
+    test_IObjectSafety();
+    test_splitText();
+    test_getQualifiedItem();
+    test_removeQualifiedItem();
+    test_get_ownerDocument();
+    test_setAttributeNode();
+    test_put_dataType();
+    test_createNode();
+    test_create_attribute();
+    test_get_prefix();
+    test_default_properties();
+    test_selectSingleNode();
+    test_events();
+    test_createProcessingInstruction();
+    test_put_nodeTypedValue();
+    test_get_xml();
+    test_insertBefore();
+    test_appendChild();
+    test_get_doctype();
+    test_get_tagName();
+    test_get_dataType();
+    test_get_nodeTypeString();
+    test_get_attributes();
+    test_selection();
+    test_load();
+    test_dispex();
+    test_parseerror();
+    test_getAttributeNode();
+    test_supporterrorinfo();
+    test_nodeValue();
+    test_get_namespaces();
+    test_put_data();
+    test_putref_schemas();
+    test_namedmap_newenum();
+    test_xmlns_attribute();
+    test_url();
+
+    test_xsltemplate();
+    test_xsltext();
+
+    if (is_clsid_supported(&CLSID_MXNamespaceManager40, &IID_IMXNamespaceManager))
+    {
+        test_mxnamespacemanager();
+        test_mxnamespacemanager_override();
+    }
 
     CoUninitialize();
 }