Create a node object and use it to hold libxml2 pointers.

dlls/msxml3/Makefile.in

@@ -13,6 +13,7 @@ C_SRCS = \
 	element.c \
 	factory.c \
 	main.c \
+	node.c \
 	nodemap.c
 
 @MAKE_DLL_RULES@

dlls/msxml3/domdoc.c

@@ -26,6 +26,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
+#include "winnls.h"
 #include "ole2.h"
 #include "ocidl.h"
 #include "msxml.h"
@@ -44,7 +45,7 @@ typedef struct _domdoc
     const struct IXMLDOMDocumentVtbl *lpVtbl;
     LONG ref;
     VARIANT_BOOL async;
-    xmlDocPtr xmldoc;
+    IXMLDOMNode *node;
 } domdoc;
 
 static inline domdoc *impl_from_IXMLDOMDocument( IXMLDOMDocument *iface )
@@ -94,7 +95,7 @@ static ULONG WINAPI domdoc_Release(
     ref = InterlockedDecrement( &This->ref );
     if ( ref == 0 )
     {
-        xmlFreeDoc( This->xmldoc );
+        IXMLDOMElement_Release( This->node );
         HeapFree( GetProcessHeap(), 0, This );
     }
 
@@ -500,10 +501,27 @@ static HRESULT WINAPI domdoc_get_documentElement(
     IXMLDOMElement** DOMElement )
 {
     domdoc *This = impl_from_IXMLDOMDocument( iface );
+    xmlDocPtr xmldoc = NULL;
+    xmlNodePtr root = NULL;
 
-    FIXME("%p\n", This);
+    TRACE("%p\n", This);
 
-    return DOMElement_create(DOMElement, This->xmldoc);
+    *DOMElement = NULL;
+
+    if ( !This->node )
+        return S_FALSE;
+
+    xmldoc = xmldoc_from_xmlnode( This->node );
+    if ( !xmldoc )
+        return S_FALSE;
+
+    root = xmlDocGetRootElement( xmldoc );
+    if ( !root )
+        return S_FALSE;
+
+    *DOMElement = create_element( root );
+ 
+    return S_OK;
 }
 
 
@@ -669,9 +687,15 @@ static HRESULT WINAPI domdoc_load(
 {
     domdoc *This = impl_from_IXMLDOMDocument( iface );
     LPWSTR filename = NULL;
-    xmlDocPtr xd;
+    xmlDocPtr xmldoc;
 
-    TRACE("%p\n", This);
+    TRACE("type %d\n", V_VT(&xmlSource) );
+
+    if ( This->node )
+    {
+        IXMLDOMNode_Release( This->node );
+        This->node = NULL;
+    }
 
     switch( V_VT(&xmlSource) )
     {
@@ -680,17 +704,20 @@ static HRESULT WINAPI domdoc_load(
     }
 
     if ( !filename )
-        return E_FAIL;
+        return S_FALSE;
 
-    xd = doread( filename );
+    xmldoc = doread( filename );
-    if ( !xd )
+    if ( !xmldoc )
-        return E_FAIL;
+        return S_FALSE;
 
-    /* free the old document before overwriting it */
+    This->node = create_domdoc_node( xmldoc );
-    if ( This->xmldoc )
+    if ( !This->node )
-        xmlFreeDoc( This->xmldoc );
+    {
-    This->xmldoc = xd;
+        *isSuccessful = VARIANT_FALSE;
+        return S_FALSE;
+    }
 
+    *isSuccessful = VARIANT_TRUE;
     return S_OK;
 }
 
@@ -942,7 +969,7 @@ HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj)
     doc->lpVtbl = &domdoc_vtbl;
     doc->ref = 1;
     doc->async = 0;
-    doc->xmldoc = NULL;
+    doc->node = NULL;
 
     *ppObj = &doc->lpVtbl;
 

dlls/msxml3/element.c

@@ -44,7 +44,7 @@ typedef struct _domelem
 {
     const struct IXMLDOMElementVtbl *lpVtbl;
     LONG ref;
-    xmlDocPtr xmldoc;
+    IXMLDOMNode *node;
 } domelem;
 
 static inline domelem *impl_from_IXMLDOMElement( IXMLDOMElement *iface )
@@ -90,6 +90,7 @@ static ULONG WINAPI domelem_Release(
     ref = InterlockedDecrement( &This->ref );
     if ( ref == 0 )
     {
+        IXMLDOMNode_Release( This->node );
         HeapFree( GetProcessHeap(), 0, This );
     }
 
@@ -216,14 +217,8 @@ static HRESULT WINAPI domelem_get_attributes(
     IXMLDOMElement *iface,
     IXMLDOMNamedNodeMap** attributeMap)
 {
-    domelem *This = impl_from_IXMLDOMElement( iface );
+    FIXME("\n");
-    xmlNodePtr root;
+    return E_NOTIMPL;
-
-    root = xmlDocGetRootElement( This->xmldoc );
-    if( !root )
-        return E_FAIL;
-
-    return NodeMap_create( attributeMap, This->xmldoc, root );
 }
 
 static HRESULT WINAPI domelem_insertBefore(
@@ -558,21 +553,25 @@ static const struct IXMLDOMElementVtbl domelem_vtbl =
     domelem_normalize,
 };
 
-HRESULT DOMElement_create( IXMLDOMElement** DOMElement, xmlDocPtr xmldoc )
+IXMLDOMElement* create_element( xmlNodePtr element )
 {
-    domelem *elem;
+    domelem *This;
 
-    elem = HeapAlloc( GetProcessHeap(), 0, sizeof *elem );
+    This = HeapAlloc( GetProcessHeap(), 0, sizeof *This );
-    if( !elem )
+    if ( !This )
-        return E_OUTOFMEMORY;
+        return NULL;
 
-    elem->lpVtbl = &domelem_vtbl;
+    This->lpVtbl = &domelem_vtbl;
-    elem->xmldoc = xmldoc;
+    This->node = create_element_node( element );
-    elem->ref = 1;
+    This->ref = 1;
 
-    *DOMElement = (IXMLDOMElement*) &elem->lpVtbl;
+    if ( !This->node )
+    {
+        HeapFree( GetProcessHeap(), 0, This );
+        return NULL;
+    }
 
-    return S_OK;
+    return (IXMLDOMElement*) &This->lpVtbl;
 }
 
 #endif

dlls/msxml3/msxml_private.h

@@ -27,8 +27,21 @@
 
 #include <libxml/parser.h>
 
-extern HRESULT DOMElement_create( IXMLDOMElement** DOMElement, xmlDocPtr xmldoc );
+/* constructors */
-extern HRESULT NodeMap_create(IXMLDOMNamedNodeMap** DomNamedNodeMap, xmlDocPtr xmldoc, xmlNodePtr node );
+extern IXMLDOMNode      *create_domdoc_node( xmlDocPtr node );
+extern IUnknown         *create_domdoc( void );
+extern IXMLDOMNode      *create_attribute_node( xmlAttrPtr attr );
+extern IUnknown         *create_xmldoc( void );
+extern IXMLDOMElement   *create_element( xmlNodePtr element );
+extern IXMLDOMNode      *create_element_node( xmlNodePtr element );
+
+/* data accessors */
+extern xmlDocPtr xmldoc_from_xmlnode( IXMLDOMNode *iface );
+extern xmlNodePtr xmlelement_from_xmlnode( IXMLDOMNode *iface );
+
+/* helpers */
+extern xmlChar *xmlChar_from_wchar( LPWSTR str );
+extern BSTR bstr_from_xmlChar( const xmlChar *buf );
 
 #endif
 

dlls/msxml3/node.c

@@ -0,0 +1,651 @@
+/*
+ *    Node implementation
+ *
+ * Copyright 2005 Mike McCormack
+ *
+ * iface library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * iface library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "config.h"
+
+#define COBJMACROS
+
+#include <stdarg.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "winnls.h"
+#include "ole2.h"
+#include "ocidl.h"
+#include "msxml.h"
+#include "xmldom.h"
+#include "msxml.h"
+
+#include "msxml_private.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
+#ifdef HAVE_LIBXML2
+
+typedef union {
+   xmlDocPtr     doc;
+   xmlNodePtr    node;
+   xmlAttrPtr    attr;
+   xmlElementPtr element;
+} libxml_node;
+
+typedef struct _xmlnode
+{
+    const struct IXMLDOMNodeVtbl *lpVtbl;
+    LONG ref;
+    BOOL free_me;
+    xmlElementType type;
+    libxml_node u;
+} xmlnode;
+
+static inline xmlnode *impl_from_IXMLDOMNode( IXMLDOMNode *iface )
+{
+    return (xmlnode *)((char*)iface - FIELD_OFFSET(xmlnode, lpVtbl));
+}
+
+xmlDocPtr xmldoc_from_xmlnode( IXMLDOMNode *iface )
+{
+    xmlnode *This;
+
+    if ( !iface )
+        return NULL;
+
+    This = impl_from_IXMLDOMNode( iface );
+    if (This->type != XML_DOCUMENT_NODE )
+        return NULL;
+    return This->u.doc;
+}
+
+xmlNodePtr xmlelement_from_xmlnode( IXMLDOMNode *iface )
+{
+    xmlnode *This = impl_from_IXMLDOMNode( iface );
+    if (This->type != XML_ELEMENT_NODE )
+        return NULL;
+    return This->u.node;
+}
+
+static HRESULT WINAPI xmlnode_QueryInterface(
+    IXMLDOMNode *iface,
+    REFIID riid,
+    void** ppvObject )
+{
+    TRACE("%p %p %p\n", iface, debugstr_guid(riid), ppvObject);
+
+    if ( IsEqualGUID( riid, &IID_IUnknown ) ||
+         IsEqualGUID( riid, &IID_IDispatch ) ||
+         IsEqualGUID( riid, &IID_IXMLDOMNode ) )
+    {
+        *ppvObject = iface;
+    }
+    else
+        return E_NOINTERFACE;
+
+    IXMLDOMElement_AddRef( iface );
+
+    return S_OK;
+}
+
+static ULONG WINAPI xmlnode_AddRef(
+    IXMLDOMNode *iface )
+{
+    xmlnode *This = impl_from_IXMLDOMNode( iface );
+    return InterlockedIncrement( &This->ref );
+}
+
+static ULONG WINAPI xmlnode_Release(
+    IXMLDOMNode *iface )
+{
+    xmlnode *This = impl_from_IXMLDOMNode( iface );
+    ULONG ref;
+
+    ref = InterlockedDecrement( &This->ref );
+    if ( ref == 0 )
+    {
+        if ( This->free_me )
+        {
+            switch( This->type )
+            {
+            case XML_DOCUMENT_NODE:
+                xmlFreeDoc( This->u.doc );
+                break;
+            case XML_ATTRIBUTE_NODE:
+            case XML_ELEMENT_NODE:
+                /* don't free these */
+                break;
+            default:
+                ERR("don't know how to free this element\n");
+            }
+        }
+        HeapFree( GetProcessHeap(), 0, This );
+    }
+
+    return ref;
+}
+
+static HRESULT WINAPI xmlnode_GetTypeInfoCount(
+    IXMLDOMNode *iface,
+    UINT* pctinfo )
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_GetTypeInfo(
+    IXMLDOMNode *iface,
+    UINT iTInfo,
+    LCID lcid,
+    ITypeInfo** ppTInfo )
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_GetIDsOfNames(
+    IXMLDOMNode *iface,
+    REFIID riid,
+    LPOLESTR* rgszNames,
+    UINT cNames,
+    LCID lcid,
+    DISPID* rgDispId )
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_Invoke(
+    IXMLDOMNode *iface,
+    DISPID dispIdMember,
+    REFIID riid,
+    LCID lcid,
+    WORD wFlags,
+    DISPPARAMS* pDispParams,
+    VARIANT* pVarResult,
+    EXCEPINFO* pExcepInfo,
+    UINT* puArgErr )
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_get_xmlnodeName(
+    IXMLDOMNode *iface,
+    BSTR* name)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+BSTR bstr_from_xmlChar( const xmlChar *buf )
+{
+    DWORD len;
+    LPWSTR str;
+    BSTR bstr;
+
+    if ( !buf )
+        return NULL;
+
+    len = MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) buf, -1, NULL, 0 );
+    str = (LPWSTR) HeapAlloc( GetProcessHeap(), 0, len * sizeof (WCHAR) );
+    if ( !str )
+        return NULL;
+    MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) buf, -1, str, len );
+    bstr = SysAllocString( str );
+    HeapFree( GetProcessHeap(), 0, str );
+    return bstr;
+}
+
+static HRESULT WINAPI xmlnode_get_xmlnodeValue(
+    IXMLDOMNode *iface,
+    VARIANT* value)
+{
+    xmlnode *This = impl_from_IXMLDOMNode( iface );
+
+    TRACE("%p %p\n", This, value);
+
+    switch ( This->type )
+    {
+    case XML_COMMENT_NODE:
+        FIXME("comment\n");
+        return E_FAIL;
+        break;
+    case XML_ATTRIBUTE_NODE:
+        V_VT(value) = VT_BSTR;
+        V_BSTR(value) = bstr_from_xmlChar( This->u.attr->name );
+        break;
+    case XML_PI_NODE:
+        FIXME("processing instruction\n");
+        return E_FAIL;
+        break;
+    case XML_ELEMENT_NODE:
+    case XML_DOCUMENT_NODE:
+    default:
+        return E_FAIL;
+        break;
+    }
+ 
+    TRACE("%p returned %s\n", This, debugstr_w( V_BSTR(value) ) );
+
+    return S_OK;
+}
+
+static HRESULT WINAPI xmlnode_put_xmlnodeValue(
+    IXMLDOMNode *iface,
+    VARIANT value)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_get_xmlnodeType(
+    IXMLDOMNode *iface,
+    DOMNodeType* type)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_get_parentNode(
+    IXMLDOMNode *iface,
+    IXMLDOMNode** parent)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_get_childNodes(
+    IXMLDOMNode *iface,
+    IXMLDOMNodeList** childList)
+{
+    xmlnode *This = impl_from_IXMLDOMNode( iface );
+    FIXME("%p\n", This);
+    return E_NOTIMPL;
+    /*return NodeList_create( childList, This );*/
+}
+
+static HRESULT WINAPI xmlnode_get_firstChild(
+    IXMLDOMNode *iface,
+    IXMLDOMNode** firstChild)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_get_lastChild(
+    IXMLDOMNode *iface,
+    IXMLDOMNode** lastChild)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_get_previousSibling(
+    IXMLDOMNode *iface,
+    IXMLDOMNode** previousSibling)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_get_nextSibling(
+    IXMLDOMNode *iface,
+    IXMLDOMNode** nextSibling)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_get_attributes(
+    IXMLDOMNode *iface,
+    IXMLDOMNamedNodeMap** attributeMap)
+{
+    xmlnode *This = impl_from_IXMLDOMNode( iface );
+    FIXME("%p\n", This);
+    return E_NOTIMPL;
+    /*return NodeMap_create( attributeMap, This, node ); */
+}
+
+static HRESULT WINAPI xmlnode_insertBefore(
+    IXMLDOMNode *iface,
+    IXMLDOMNode* newChild,
+    VARIANT refChild,
+    IXMLDOMNode** outNewChild)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_replaceChild(
+    IXMLDOMNode *iface,
+    IXMLDOMNode* newChild,
+    IXMLDOMNode* oldChild,
+    IXMLDOMNode** outOldChild)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_removeChild(
+    IXMLDOMNode *iface,
+    IXMLDOMNode* childNode,
+    IXMLDOMNode** oldChild)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_appendChild(
+    IXMLDOMNode *iface,
+    IXMLDOMNode* newChild,
+    IXMLDOMNode** outNewChild)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_hasChildNodes(
+    IXMLDOMNode *iface,
+    VARIANT_BOOL* hasChild)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_get_ownerDocument(
+    IXMLDOMNode *iface,
+    IXMLDOMDocument** DOMDocument)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_cloneNode(
+    IXMLDOMNode *iface,
+    VARIANT_BOOL deep,
+    IXMLDOMNode** cloneRoot)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_get_xmlnodeTypeString(
+    IXMLDOMNode *iface,
+    BSTR* xmlnodeType)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_get_text(
+    IXMLDOMNode *iface,
+    BSTR* text)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_put_text(
+    IXMLDOMNode *iface,
+    BSTR text)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_get_specified(
+    IXMLDOMNode *iface,
+    VARIANT_BOOL* isSpecified)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_get_definition(
+    IXMLDOMNode *iface,
+    IXMLDOMNode** definitionNode)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_get_xmlnodeTypedValue(
+    IXMLDOMNode *iface,
+    VARIANT* typedValue)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_put_xmlnodeTypedValue(
+    IXMLDOMNode *iface,
+    VARIANT typedValue)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_get_dataType(
+    IXMLDOMNode *iface,
+    VARIANT* dataTypeName)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_put_dataType(
+    IXMLDOMNode *iface,
+    BSTR dataTypeName)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_get_xml(
+    IXMLDOMNode *iface,
+    BSTR* xmlString)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_transformNode(
+    IXMLDOMNode *iface,
+    IXMLDOMNode* styleSheet,
+    BSTR* xmlString)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_selectNodes(
+    IXMLDOMNode *iface,
+    BSTR queryString,
+    IXMLDOMNodeList** resultList)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_selectSingleNode(
+    IXMLDOMNode *iface,
+    BSTR queryString,
+    IXMLDOMNode** resultNode)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_get_parsed(
+    IXMLDOMNode *iface,
+    VARIANT_BOOL* isParsed)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_get_namespaceURI(
+    IXMLDOMNode *iface,
+    BSTR* namespaceURI)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_get_prefix(
+    IXMLDOMNode *iface,
+    BSTR* prefixString)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_get_baseName(
+    IXMLDOMNode *iface,
+    BSTR* nameString)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI xmlnode_transformNodeToObject(
+    IXMLDOMNode *iface,
+    IXMLDOMNode* stylesheet,
+    VARIANT outputObject)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static const struct IXMLDOMNodeVtbl xmlnode_vtbl =
+{
+    xmlnode_QueryInterface,
+    xmlnode_AddRef,
+    xmlnode_Release,
+    xmlnode_GetTypeInfoCount,
+    xmlnode_GetTypeInfo,
+    xmlnode_GetIDsOfNames,
+    xmlnode_Invoke,
+    xmlnode_get_xmlnodeName,
+    xmlnode_get_xmlnodeValue,
+    xmlnode_put_xmlnodeValue,
+    xmlnode_get_xmlnodeType,
+    xmlnode_get_parentNode,
+    xmlnode_get_childNodes,
+    xmlnode_get_firstChild,
+    xmlnode_get_lastChild,
+    xmlnode_get_previousSibling,
+    xmlnode_get_nextSibling,
+    xmlnode_get_attributes,
+    xmlnode_insertBefore,
+    xmlnode_replaceChild,
+    xmlnode_removeChild,
+    xmlnode_appendChild,
+    xmlnode_hasChildNodes,
+    xmlnode_get_ownerDocument,
+    xmlnode_cloneNode,
+    xmlnode_get_xmlnodeTypeString,
+    xmlnode_get_text,
+    xmlnode_put_text,
+    xmlnode_get_specified,
+    xmlnode_get_definition,
+    xmlnode_get_xmlnodeTypedValue,
+    xmlnode_put_xmlnodeTypedValue,
+    xmlnode_get_dataType,
+    xmlnode_put_dataType,
+    xmlnode_get_xml,
+    xmlnode_transformNode,
+    xmlnode_selectNodes,
+    xmlnode_selectSingleNode,
+    xmlnode_get_parsed,
+    xmlnode_get_namespaceURI,
+    xmlnode_get_prefix,
+    xmlnode_get_baseName,
+    xmlnode_transformNodeToObject,
+};
+
+static xmlnode *create_node( void )
+{
+    xmlnode *This;
+
+    This = HeapAlloc( GetProcessHeap(), 0, sizeof *This );
+    if ( !This )
+        return NULL;
+
+    This->lpVtbl = &xmlnode_vtbl;
+    This->ref = 1;
+    This->free_me = TRUE;
+    This->u.doc = NULL;
+
+    return This;
+}
+
+IXMLDOMNode *create_domdoc_node( xmlDocPtr node )
+{
+    xmlnode *This;
+
+    if ( !node )
+        return NULL;
+
+    This = create_node();
+    if ( !This )
+        return NULL;
+
+    This->type = XML_DOCUMENT_NODE;
+    This->u.doc = node;
+ 
+    return (IXMLDOMNode*) &This->lpVtbl;
+}
+
+IXMLDOMNode *create_attribute_node( xmlAttrPtr node )
+{
+    xmlnode *This;
+
+    if ( !node )
+        return NULL;
+
+    This = create_node();
+    if ( !This )
+        return NULL;
+
+    This->type = XML_ATTRIBUTE_NODE;
+    This->u.attr = node;
+ 
+    return (IXMLDOMNode*) &This->lpVtbl;
+}
+
+IXMLDOMNode *create_element_node( xmlNodePtr element )
+{
+    xmlnode *This;
+
+    if ( !element )
+        return NULL;
+
+    This = create_node();
+    if ( !This )
+        return NULL;
+
+    This->type = XML_ELEMENT_NODE;
+    This->u.node = element;
+ 
+    return (IXMLDOMNode*) &This->lpVtbl;
+}
+
+#endif

dlls/msxml3/nodemap.c

@@ -133,7 +133,7 @@ static HRESULT WINAPI xmlnodemap_Invoke(
     return E_NOTIMPL;
 }
 
-static xmlChar *xmlChar_from_wchar( LPWSTR str )
+xmlChar *xmlChar_from_wchar( LPWSTR str )
 {
     DWORD len;
     xmlChar *xmlstr;