msxml: Add attribute node implementation.

dlls/msxml3/Makefile.in

@@ -9,6 +9,7 @@ EXTRALIBS = -luuid $(LIBUNICODE) @XML2LIBS@ @XSLTLIBS@
 EXTRAINCL = @XML2INCL@ @XSLTINCL@
 
 C_SRCS = \
+	attribute.c \
 	domdoc.c \
 	element.c \
 	factory.c \

dlls/msxml3/attribute.c

+/*
+ *    DOM Attribute implementation
+ *
+ * Copyright 2006 Huw Davies
+ *
+ * This 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.
+ *
+ * This 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
+ */
+
+#define COBJMACROS
+
+#include "config.h"
+
+#include <stdarg.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "ole2.h"
+#include "msxml2.h"
+
+#include "msxml_private.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
+#ifdef HAVE_LIBXML2
+
+typedef struct _domattr
+{
+    const struct IXMLDOMAttributeVtbl *lpVtbl;
+    LONG ref;
+    IUnknown *node_unk;
+    IXMLDOMNode *node;
+} domattr;
+
+static inline domattr *impl_from_IXMLDOMAttribute( IXMLDOMAttribute *iface )
+{
+    return (domattr *)((char*)iface - FIELD_OFFSET(domattr, lpVtbl));
+}
+
+static inline xmlNodePtr get_attribute( domattr *This )
+{
+    return xmlNodePtr_from_domnode( This->node, XML_ATTRIBUTE_NODE );
+}
+
+static HRESULT WINAPI domattr_QueryInterface(
+    IXMLDOMAttribute *iface,
+    REFIID riid,
+    void** ppvObject )
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject);
+
+    if ( IsEqualGUID( riid, &IID_IXMLDOMAttribute ) ||
+         IsEqualGUID( riid, &IID_IUnknown ) )
+    {
+        *ppvObject = iface;
+    }
+    else if ( IsEqualGUID( riid, &IID_IDispatch ) ||
+              IsEqualGUID( riid, &IID_IXMLDOMNode ) )
+    {
+        return IUnknown_QueryInterface(This->node_unk, riid, ppvObject);
+    }
+    else
+    {
+        FIXME("Unsupported inteferace %s\n", debugstr_guid(riid));
+        return E_NOINTERFACE;
+    }
+
+    IXMLDOMAttribute_AddRef( iface );
+
+    return S_OK;
+}
+
+static ULONG WINAPI domattr_AddRef(
+    IXMLDOMAttribute *iface )
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return InterlockedIncrement( &This->ref );
+}
+
+static ULONG WINAPI domattr_Release(
+    IXMLDOMAttribute *iface )
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    ULONG ref;
+
+    ref = InterlockedDecrement( &This->ref );
+    if ( ref == 0 )
+    {
+        IUnknown_Release( This->node_unk );
+        HeapFree( GetProcessHeap(), 0, This );
+    }
+
+    return ref;
+}
+
+static HRESULT WINAPI domattr_GetTypeInfoCount(
+    IXMLDOMAttribute *iface,
+    UINT* pctinfo )
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI domattr_GetTypeInfo(
+    IXMLDOMAttribute *iface,
+    UINT iTInfo, LCID lcid,
+    ITypeInfo** ppTInfo )
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI domattr_GetIDsOfNames(
+    IXMLDOMAttribute *iface,
+    REFIID riid, LPOLESTR* rgszNames,
+    UINT cNames, LCID lcid, DISPID* rgDispId )
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI domattr_Invoke(
+    IXMLDOMAttribute *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 domattr_get_nodeName(
+    IXMLDOMAttribute *iface,
+    BSTR* p )
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_get_nodeName( This->node, p );
+}
+
+static HRESULT WINAPI domattr_get_nodeValue(
+    IXMLDOMAttribute *iface,
+    VARIANT* var1 )
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_get_nodeValue( This->node, var1 );
+}
+
+static HRESULT WINAPI domattr_put_nodeValue(
+    IXMLDOMAttribute *iface,
+    VARIANT var1 )
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_put_nodeValue( This->node, var1 );
+}
+
+static HRESULT WINAPI domattr_get_nodeType(
+    IXMLDOMAttribute *iface,
+    DOMNodeType* domNodeType )
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_get_nodeType( This->node, domNodeType );
+}
+
+static HRESULT WINAPI domattr_get_parentNode(
+    IXMLDOMAttribute *iface,
+    IXMLDOMNode** parent )
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_get_parentNode( This->node, parent );
+}
+
+static HRESULT WINAPI domattr_get_childNodes(
+    IXMLDOMAttribute *iface,
+    IXMLDOMNodeList** outList)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_get_childNodes( This->node, outList );
+}
+
+static HRESULT WINAPI domattr_get_firstChild(
+    IXMLDOMAttribute *iface,
+    IXMLDOMNode** domNode)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_get_firstChild( This->node, domNode );
+}
+
+static HRESULT WINAPI domattr_get_lastChild(
+    IXMLDOMAttribute *iface,
+    IXMLDOMNode** domNode)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_get_lastChild( This->node, domNode );
+}
+
+static HRESULT WINAPI domattr_get_previousSibling(
+    IXMLDOMAttribute *iface,
+    IXMLDOMNode** domNode)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_get_previousSibling( This->node, domNode );
+}
+
+static HRESULT WINAPI domattr_get_nextSibling(
+    IXMLDOMAttribute *iface,
+    IXMLDOMNode** domNode)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_get_nextSibling( This->node, domNode );
+}
+
+static HRESULT WINAPI domattr_get_attributes(
+    IXMLDOMAttribute *iface,
+    IXMLDOMNamedNodeMap** attributeMap)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_get_attributes( This->node, attributeMap );
+}
+
+static HRESULT WINAPI domattr_insertBefore(
+    IXMLDOMAttribute *iface,
+    IXMLDOMNode* newNode, VARIANT var1,
+    IXMLDOMNode** outOldNode)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_insertBefore( This->node, newNode, var1, outOldNode );
+}
+
+static HRESULT WINAPI domattr_replaceChild(
+    IXMLDOMAttribute *iface,
+    IXMLDOMNode* newNode,
+    IXMLDOMNode* oldNode,
+    IXMLDOMNode** outOldNode)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_replaceChild( This->node, newNode, oldNode, outOldNode );
+}
+
+static HRESULT WINAPI domattr_removeChild(
+    IXMLDOMAttribute *iface,
+    IXMLDOMNode* domNode, IXMLDOMNode** oldNode)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_removeChild( This->node, domNode, oldNode );
+}
+
+static HRESULT WINAPI domattr_appendChild(
+    IXMLDOMAttribute *iface,
+    IXMLDOMNode* newNode, IXMLDOMNode** outNewNode)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_appendChild( This->node, newNode, outNewNode );
+}
+
+static HRESULT WINAPI domattr_hasChildNodes(
+    IXMLDOMAttribute *iface,
+    VARIANT_BOOL* pbool)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_hasChildNodes( This->node, pbool );
+}
+
+static HRESULT WINAPI domattr_get_ownerDocument(
+    IXMLDOMAttribute *iface,
+    IXMLDOMDocument** domDocument)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_get_ownerDocument( This->node, domDocument );
+}
+
+static HRESULT WINAPI domattr_cloneNode(
+    IXMLDOMAttribute *iface,
+    VARIANT_BOOL pbool, IXMLDOMNode** outNode)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_cloneNode( This->node, pbool, outNode );
+}
+
+static HRESULT WINAPI domattr_get_nodeTypeString(
+    IXMLDOMAttribute *iface,
+    BSTR* p)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_get_nodeTypeString( This->node, p );
+}
+
+static HRESULT WINAPI domattr_get_text(
+    IXMLDOMAttribute *iface,
+    BSTR* p)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_get_text( This->node, p );
+}
+
+static HRESULT WINAPI domattr_put_text(
+    IXMLDOMAttribute *iface,
+    BSTR p)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_put_text( This->node, p );
+}
+
+static HRESULT WINAPI domattr_get_specified(
+    IXMLDOMAttribute *iface,
+    VARIANT_BOOL* pbool)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_get_specified( This->node, pbool );
+}
+
+static HRESULT WINAPI domattr_get_definition(
+    IXMLDOMAttribute *iface,
+    IXMLDOMNode** domNode)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_get_definition( This->node, domNode );
+}
+
+static HRESULT WINAPI domattr_get_nodeTypedValue(
+    IXMLDOMAttribute *iface,
+    VARIANT* var1)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_get_nodeTypedValue( This->node, var1 );
+}
+
+static HRESULT WINAPI domattr_put_nodeTypedValue(
+    IXMLDOMAttribute *iface,
+    VARIANT var1)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_put_nodeTypedValue( This->node, var1 );
+}
+
+static HRESULT WINAPI domattr_get_dataType(
+    IXMLDOMAttribute *iface,
+    VARIANT* var1)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_get_dataType( This->node, var1 );
+}
+
+static HRESULT WINAPI domattr_put_dataType(
+    IXMLDOMAttribute *iface,
+    BSTR p)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_put_dataType( This->node, p );
+}
+
+static HRESULT WINAPI domattr_get_xml(
+    IXMLDOMAttribute *iface,
+    BSTR* p)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_get_xml( This->node, p );
+}
+
+static HRESULT WINAPI domattr_transformNode(
+    IXMLDOMAttribute *iface,
+    IXMLDOMNode* domNode, BSTR* p)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_transformNode( This->node, domNode, p );
+}
+
+static HRESULT WINAPI domattr_selectNodes(
+    IXMLDOMAttribute *iface,
+    BSTR p, IXMLDOMNodeList** outList)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_selectNodes( This->node, p, outList );
+}
+
+static HRESULT WINAPI domattr_selectSingleNode(
+    IXMLDOMAttribute *iface,
+    BSTR p, IXMLDOMNode** outNode)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_selectSingleNode( This->node, p, outNode );
+}
+
+static HRESULT WINAPI domattr_get_parsed(
+    IXMLDOMAttribute *iface,
+    VARIANT_BOOL* pbool)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_get_parsed( This->node, pbool );
+}
+
+static HRESULT WINAPI domattr_get_namespaceURI(
+    IXMLDOMAttribute *iface,
+    BSTR* p)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_get_namespaceURI( This->node, p );
+}
+
+static HRESULT WINAPI domattr_get_prefix(
+    IXMLDOMAttribute *iface,
+    BSTR* p)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_get_prefix( This->node, p );
+}
+
+static HRESULT WINAPI domattr_get_baseName(
+    IXMLDOMAttribute *iface,
+    BSTR* p)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_get_baseName( This->node, p );
+}
+
+static HRESULT WINAPI domattr_transformNodeToObject(
+    IXMLDOMAttribute *iface,
+    IXMLDOMNode* domNode, VARIANT var1)
+{
+    domattr *This = impl_from_IXMLDOMAttribute( iface );
+    return IXMLDOMNode_transformNodeToObject( This->node, domNode, var1 );
+}
+
+static HRESULT WINAPI domattr_get_name(
+    IXMLDOMAttribute *iface,
+    BSTR *p)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI domattr_get_value(
+    IXMLDOMAttribute *iface,
+    VARIANT *var1)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI domattr_put_value(
+    IXMLDOMAttribute *iface,
+    VARIANT var1)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
+static const struct IXMLDOMAttributeVtbl domattr_vtbl =
+{
+    domattr_QueryInterface,
+    domattr_AddRef,
+    domattr_Release,
+    domattr_GetTypeInfoCount,
+    domattr_GetTypeInfo,
+    domattr_GetIDsOfNames,
+    domattr_Invoke,
+    domattr_get_nodeName,
+    domattr_get_nodeValue,
+    domattr_put_nodeValue,
+    domattr_get_nodeType,
+    domattr_get_parentNode,
+    domattr_get_childNodes,
+    domattr_get_firstChild,
+    domattr_get_lastChild,
+    domattr_get_previousSibling,
+    domattr_get_nextSibling,
+    domattr_get_attributes,
+    domattr_insertBefore,
+    domattr_replaceChild,
+    domattr_removeChild,
+    domattr_appendChild,
+    domattr_hasChildNodes,
+    domattr_get_ownerDocument,
+    domattr_cloneNode,
+    domattr_get_nodeTypeString,
+    domattr_get_text,
+    domattr_put_text,
+    domattr_get_specified,
+    domattr_get_definition,
+    domattr_get_nodeTypedValue,
+    domattr_put_nodeTypedValue,
+    domattr_get_dataType,
+    domattr_put_dataType,
+    domattr_get_xml,
+    domattr_transformNode,
+    domattr_selectNodes,
+    domattr_selectSingleNode,
+    domattr_get_parsed,
+    domattr_get_namespaceURI,
+    domattr_get_prefix,
+    domattr_get_baseName,
+    domattr_transformNodeToObject,
+    domattr_get_name,
+    domattr_get_value,
+    domattr_put_value
+};
+
+IUnknown* create_attribute( xmlNodePtr attribute )
+{
+    domattr *This;
+    HRESULT hr;
+
+    This = HeapAlloc( GetProcessHeap(), 0, sizeof *This );
+    if ( !This )
+        return NULL;
+
+    This->lpVtbl = &domattr_vtbl;
+    This->ref = 1;
+
+    This->node_unk = create_basic_node( attribute, (IUnknown*)&This->lpVtbl );
+    if(!This->node_unk)
+    {
+        HeapFree(GetProcessHeap(), 0, This);
+        return NULL;
+    }
+
+    hr = IUnknown_QueryInterface(This->node_unk, &IID_IXMLDOMNode, (LPVOID*)&This->node);
+    if(FAILED(hr))
+    {
+        IUnknown_Release(This->node_unk);
+        HeapFree( GetProcessHeap(), 0, This );
+        return NULL;
+    }
+    /* The ref on This->node is actually looped back into this object, so release it */
+    IXMLDOMNode_Release(This->node);
+
+    return (IUnknown*) &This->lpVtbl;
+}
+
+#endif

dlls/msxml3/msxml_private.h

@@ -32,6 +32,7 @@ extern IUnknown         *create_domdoc( void );
 extern IUnknown         *create_xmldoc( void );
 extern IXMLDOMNode      *create_node( xmlNodePtr node );
 extern IUnknown         *create_basic_node( xmlNodePtr node, IUnknown *pUnkOuter );
+extern IUnknown         *create_attribute( xmlNodePtr attribute );
 extern IUnknown         *create_element( xmlNodePtr element );
 extern IXMLDOMNodeList  *create_nodelist( xmlNodePtr node );
 extern IXMLDOMNamedNodeMap *create_nodemap( IXMLDOMNode *node );

dlls/msxml3/node.c

@@ -852,6 +852,9 @@ IXMLDOMNode *create_node( xmlNodePtr node )
     TRACE("type %d\n", node->type);
     switch(node->type)
     {
+    case XML_ATTRIBUTE_NODE:
+        pUnk = create_attribute( node );
+        break;
     case XML_ELEMENT_NODE:
         pUnk = create_element( node );
         break;