msxml3: Implement comment node
Huw D M Davies
h.davies1 at physics.ox.ac.uk
Thu Feb 16 09:55:25 CST 2006
Huw Davies <huw at codeweavers.com>
msxml3: Implement comment node.
--
Huw Davies
huw at codeweavers.com
diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in
index f5f7785..874d593 100644
--- a/dlls/msxml3/Makefile.in
+++ b/dlls/msxml3/Makefile.in
@@ -10,6 +10,7 @@ EXTRAINCL = @XML2INCL@ @XSLTINCL@
C_SRCS = \
attribute.c \
+ comment.c \
domdoc.c \
element.c \
factory.c \
diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c
new file mode 100644
index 0000000..6fd7346
--- /dev/null
+++ b/dlls/msxml3/comment.c
@@ -0,0 +1,588 @@
+/*
+ * DOM comment node 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 _domcomment
+{
+ const struct IXMLDOMCommentVtbl *lpVtbl;
+ LONG ref;
+ IUnknown *node_unk;
+ IXMLDOMNode *node;
+} domcomment;
+
+static inline domcomment *impl_from_IXMLDOMComment( IXMLDOMComment *iface )
+{
+ return (domcomment *)((char*)iface - FIELD_OFFSET(domcomment, lpVtbl));
+}
+
+static inline xmlNodePtr get_comment( domcomment *This )
+{
+ return xmlNodePtr_from_domnode( This->node, XML_COMMENT_NODE );
+}
+
+static HRESULT WINAPI domcomment_QueryInterface(
+ IXMLDOMComment *iface,
+ REFIID riid,
+ void** ppvObject )
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject);
+
+ if ( IsEqualGUID( riid, &IID_IXMLDOMComment ) ||
+ 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;
+ }
+
+ IXMLDOMComment_AddRef( iface );
+
+ return S_OK;
+}
+
+static ULONG WINAPI domcomment_AddRef(
+ IXMLDOMComment *iface )
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return InterlockedIncrement( &This->ref );
+}
+
+static ULONG WINAPI domcomment_Release(
+ IXMLDOMComment *iface )
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ ULONG ref;
+
+ ref = InterlockedDecrement( &This->ref );
+ if ( ref == 0 )
+ {
+ IUnknown_Release( This->node_unk );
+ HeapFree( GetProcessHeap(), 0, This );
+ }
+
+ return ref;
+}
+
+static HRESULT WINAPI domcomment_GetTypeInfoCount(
+ IXMLDOMComment *iface,
+ UINT* pctinfo )
+{
+ FIXME("\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI domcomment_GetTypeInfo(
+ IXMLDOMComment *iface,
+ UINT iTInfo, LCID lcid,
+ ITypeInfo** ppTInfo )
+{
+ FIXME("\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI domcomment_GetIDsOfNames(
+ IXMLDOMComment *iface,
+ REFIID riid, LPOLESTR* rgszNames,
+ UINT cNames, LCID lcid, DISPID* rgDispId )
+{
+ FIXME("\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI domcomment_Invoke(
+ IXMLDOMComment *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 domcomment_get_nodeName(
+ IXMLDOMComment *iface,
+ BSTR* p )
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_get_nodeName( This->node, p );
+}
+
+static HRESULT WINAPI domcomment_get_nodeValue(
+ IXMLDOMComment *iface,
+ VARIANT* var1 )
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_get_nodeValue( This->node, var1 );
+}
+
+static HRESULT WINAPI domcomment_put_nodeValue(
+ IXMLDOMComment *iface,
+ VARIANT var1 )
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_put_nodeValue( This->node, var1 );
+}
+
+static HRESULT WINAPI domcomment_get_nodeType(
+ IXMLDOMComment *iface,
+ DOMNodeType* domNodeType )
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_get_nodeType( This->node, domNodeType );
+}
+
+static HRESULT WINAPI domcomment_get_parentNode(
+ IXMLDOMComment *iface,
+ IXMLDOMNode** parent )
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_get_parentNode( This->node, parent );
+}
+
+static HRESULT WINAPI domcomment_get_childNodes(
+ IXMLDOMComment *iface,
+ IXMLDOMNodeList** outList)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_get_childNodes( This->node, outList );
+}
+
+static HRESULT WINAPI domcomment_get_firstChild(
+ IXMLDOMComment *iface,
+ IXMLDOMNode** domNode)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_get_firstChild( This->node, domNode );
+}
+
+static HRESULT WINAPI domcomment_get_lastChild(
+ IXMLDOMComment *iface,
+ IXMLDOMNode** domNode)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_get_lastChild( This->node, domNode );
+}
+
+static HRESULT WINAPI domcomment_get_previousSibling(
+ IXMLDOMComment *iface,
+ IXMLDOMNode** domNode)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_get_previousSibling( This->node, domNode );
+}
+
+static HRESULT WINAPI domcomment_get_nextSibling(
+ IXMLDOMComment *iface,
+ IXMLDOMNode** domNode)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_get_nextSibling( This->node, domNode );
+}
+
+static HRESULT WINAPI domcomment_get_attributes(
+ IXMLDOMComment *iface,
+ IXMLDOMNamedNodeMap** attributeMap)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_get_attributes( This->node, attributeMap );
+}
+
+static HRESULT WINAPI domcomment_insertBefore(
+ IXMLDOMComment *iface,
+ IXMLDOMNode* newNode, VARIANT var1,
+ IXMLDOMNode** outOldNode)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_insertBefore( This->node, newNode, var1, outOldNode );
+}
+
+static HRESULT WINAPI domcomment_replaceChild(
+ IXMLDOMComment *iface,
+ IXMLDOMNode* newNode,
+ IXMLDOMNode* oldNode,
+ IXMLDOMNode** outOldNode)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_replaceChild( This->node, newNode, oldNode, outOldNode );
+}
+
+static HRESULT WINAPI domcomment_removeChild(
+ IXMLDOMComment *iface,
+ IXMLDOMNode* domNode, IXMLDOMNode** oldNode)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_removeChild( This->node, domNode, oldNode );
+}
+
+static HRESULT WINAPI domcomment_appendChild(
+ IXMLDOMComment *iface,
+ IXMLDOMNode* newNode, IXMLDOMNode** outNewNode)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_appendChild( This->node, newNode, outNewNode );
+}
+
+static HRESULT WINAPI domcomment_hasChildNodes(
+ IXMLDOMComment *iface,
+ VARIANT_BOOL* pbool)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_hasChildNodes( This->node, pbool );
+}
+
+static HRESULT WINAPI domcomment_get_ownerDocument(
+ IXMLDOMComment *iface,
+ IXMLDOMDocument** domDocument)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_get_ownerDocument( This->node, domDocument );
+}
+
+static HRESULT WINAPI domcomment_cloneNode(
+ IXMLDOMComment *iface,
+ VARIANT_BOOL pbool, IXMLDOMNode** outNode)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_cloneNode( This->node, pbool, outNode );
+}
+
+static HRESULT WINAPI domcomment_get_nodeTypeString(
+ IXMLDOMComment *iface,
+ BSTR* p)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_get_nodeTypeString( This->node, p );
+}
+
+static HRESULT WINAPI domcomment_get_text(
+ IXMLDOMComment *iface,
+ BSTR* p)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_get_text( This->node, p );
+}
+
+static HRESULT WINAPI domcomment_put_text(
+ IXMLDOMComment *iface,
+ BSTR p)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_put_text( This->node, p );
+}
+
+static HRESULT WINAPI domcomment_get_specified(
+ IXMLDOMComment *iface,
+ VARIANT_BOOL* pbool)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_get_specified( This->node, pbool );
+}
+
+static HRESULT WINAPI domcomment_get_definition(
+ IXMLDOMComment *iface,
+ IXMLDOMNode** domNode)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_get_definition( This->node, domNode );
+}
+
+static HRESULT WINAPI domcomment_get_nodeTypedValue(
+ IXMLDOMComment *iface,
+ VARIANT* var1)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_get_nodeTypedValue( This->node, var1 );
+}
+
+static HRESULT WINAPI domcomment_put_nodeTypedValue(
+ IXMLDOMComment *iface,
+ VARIANT var1)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_put_nodeTypedValue( This->node, var1 );
+}
+
+static HRESULT WINAPI domcomment_get_dataType(
+ IXMLDOMComment *iface,
+ VARIANT* var1)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_get_dataType( This->node, var1 );
+}
+
+static HRESULT WINAPI domcomment_put_dataType(
+ IXMLDOMComment *iface,
+ BSTR p)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_put_dataType( This->node, p );
+}
+
+static HRESULT WINAPI domcomment_get_xml(
+ IXMLDOMComment *iface,
+ BSTR* p)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_get_xml( This->node, p );
+}
+
+static HRESULT WINAPI domcomment_transformNode(
+ IXMLDOMComment *iface,
+ IXMLDOMNode* domNode, BSTR* p)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_transformNode( This->node, domNode, p );
+}
+
+static HRESULT WINAPI domcomment_selectNodes(
+ IXMLDOMComment *iface,
+ BSTR p, IXMLDOMNodeList** outList)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_selectNodes( This->node, p, outList );
+}
+
+static HRESULT WINAPI domcomment_selectSingleNode(
+ IXMLDOMComment *iface,
+ BSTR p, IXMLDOMNode** outNode)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_selectSingleNode( This->node, p, outNode );
+}
+
+static HRESULT WINAPI domcomment_get_parsed(
+ IXMLDOMComment *iface,
+ VARIANT_BOOL* pbool)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_get_parsed( This->node, pbool );
+}
+
+static HRESULT WINAPI domcomment_get_namespaceURI(
+ IXMLDOMComment *iface,
+ BSTR* p)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_get_namespaceURI( This->node, p );
+}
+
+static HRESULT WINAPI domcomment_get_prefix(
+ IXMLDOMComment *iface,
+ BSTR* p)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_get_prefix( This->node, p );
+}
+
+static HRESULT WINAPI domcomment_get_baseName(
+ IXMLDOMComment *iface,
+ BSTR* p)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_get_baseName( This->node, p );
+}
+
+static HRESULT WINAPI domcomment_transformNodeToObject(
+ IXMLDOMComment *iface,
+ IXMLDOMNode* domNode, VARIANT var1)
+{
+ domcomment *This = impl_from_IXMLDOMComment( iface );
+ return IXMLDOMNode_transformNodeToObject( This->node, domNode, var1 );
+}
+
+static HRESULT WINAPI domcomment_get_data(
+ IXMLDOMComment *iface,
+ BSTR *p)
+{
+ FIXME("\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI domcomment_put_data(
+ IXMLDOMComment *iface,
+ BSTR data)
+{
+ FIXME("\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI domcomment_get_length(
+ IXMLDOMComment *iface,
+ long *len)
+{
+ FIXME("\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI domcomment_substringData(
+ IXMLDOMComment *iface,
+ long offset, long count, BSTR *p)
+{
+ FIXME("\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI domcomment_appendData(
+ IXMLDOMComment *iface,
+ BSTR p)
+{
+ FIXME("\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI domcomment_insertData(
+ IXMLDOMComment *iface,
+ long offset, BSTR p)
+{
+ FIXME("\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI domcomment_deleteData(
+ IXMLDOMComment *iface,
+ long offset, long count)
+{
+ FIXME("\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI domcomment_replaceData(
+ IXMLDOMComment *iface,
+ long offset, long count, BSTR p)
+{
+ FIXME("\n");
+ return E_NOTIMPL;
+}
+
+static const struct IXMLDOMCommentVtbl domcomment_vtbl =
+{
+ domcomment_QueryInterface,
+ domcomment_AddRef,
+ domcomment_Release,
+ domcomment_GetTypeInfoCount,
+ domcomment_GetTypeInfo,
+ domcomment_GetIDsOfNames,
+ domcomment_Invoke,
+ domcomment_get_nodeName,
+ domcomment_get_nodeValue,
+ domcomment_put_nodeValue,
+ domcomment_get_nodeType,
+ domcomment_get_parentNode,
+ domcomment_get_childNodes,
+ domcomment_get_firstChild,
+ domcomment_get_lastChild,
+ domcomment_get_previousSibling,
+ domcomment_get_nextSibling,
+ domcomment_get_attributes,
+ domcomment_insertBefore,
+ domcomment_replaceChild,
+ domcomment_removeChild,
+ domcomment_appendChild,
+ domcomment_hasChildNodes,
+ domcomment_get_ownerDocument,
+ domcomment_cloneNode,
+ domcomment_get_nodeTypeString,
+ domcomment_get_text,
+ domcomment_put_text,
+ domcomment_get_specified,
+ domcomment_get_definition,
+ domcomment_get_nodeTypedValue,
+ domcomment_put_nodeTypedValue,
+ domcomment_get_dataType,
+ domcomment_put_dataType,
+ domcomment_get_xml,
+ domcomment_transformNode,
+ domcomment_selectNodes,
+ domcomment_selectSingleNode,
+ domcomment_get_parsed,
+ domcomment_get_namespaceURI,
+ domcomment_get_prefix,
+ domcomment_get_baseName,
+ domcomment_transformNodeToObject,
+ domcomment_get_data,
+ domcomment_put_data,
+ domcomment_get_length,
+ domcomment_substringData,
+ domcomment_appendData,
+ domcomment_insertData,
+ domcomment_deleteData,
+ domcomment_replaceData
+};
+
+IUnknown* create_comment( xmlNodePtr comment )
+{
+ domcomment *This;
+ HRESULT hr;
+
+ This = HeapAlloc( GetProcessHeap(), 0, sizeof *This );
+ if ( !This )
+ return NULL;
+
+ This->lpVtbl = &domcomment_vtbl;
+ This->ref = 1;
+
+ This->node_unk = create_basic_node( comment, (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
diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h
index 220460c..364b55c 100644
--- a/dlls/msxml3/msxml_private.h
+++ b/dlls/msxml3/msxml_private.h
@@ -32,9 +32,10 @@ extern IUnknown *create_domdoc(
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 IUnknown *create_attribute( xmlNodePtr attribute );
extern IUnknown *create_text( xmlNodePtr text );
+extern IUnknown *create_comment( xmlNodePtr comment );
extern IXMLDOMNodeList *create_nodelist( xmlNodePtr node );
extern IXMLDOMNamedNodeMap *create_nodemap( IXMLDOMNode *node );
extern IXMLDOMNodeList *create_filtered_nodelist( xmlNodePtr, const xmlChar *, BOOL );
diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c
index e9ed366..3be8fc0 100644
--- a/dlls/msxml3/node.c
+++ b/dlls/msxml3/node.c
@@ -867,15 +867,18 @@ IXMLDOMNode *create_node( xmlNodePtr nod
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;
+ case XML_ATTRIBUTE_NODE:
+ pUnk = create_attribute( node );
+ break;
case XML_TEXT_NODE:
pUnk = create_text( node );
break;
+ case XML_COMMENT_NODE:
+ pUnk = create_comment( node );
+ break;
case XML_DOCUMENT_NODE:
ERR("shouldn't be here!\n");
return NULL;
More information about the wine-patches
mailing list