From 0ed9c0cca311e905600ba24c0775d24a58f1ece3 Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Sun, 25 Oct 2009 20:21:51 +0000 Subject: [PATCH] -sync msxml3 with wine 1.1.32 svn path=/trunk/; revision=43751 --- reactos/dll/win32/msxml3/attribute.c | 91 +++++++++---------- reactos/dll/win32/msxml3/cdata.c | 99 ++++++++++----------- reactos/dll/win32/msxml3/comment.c | 103 +++++++++++----------- reactos/dll/win32/msxml3/docfrag.c | 85 +++++++++--------- reactos/dll/win32/msxml3/domdoc.c | 107 +++++++++++------------ reactos/dll/win32/msxml3/element.c | 92 +++++++++---------- reactos/dll/win32/msxml3/entityref.c | 85 +++++++++--------- reactos/dll/win32/msxml3/msxml_private.h | 2 +- reactos/dll/win32/msxml3/node.c | 39 ++++----- reactos/dll/win32/msxml3/pi.c | 91 +++++++++---------- reactos/dll/win32/msxml3/text.c | 99 ++++++++++----------- 11 files changed, 421 insertions(+), 472 deletions(-) diff --git a/reactos/dll/win32/msxml3/attribute.c b/reactos/dll/win32/msxml3/attribute.c index 426fdcbb0e3..6df849ee373 100644 --- a/reactos/dll/win32/msxml3/attribute.c +++ b/reactos/dll/win32/msxml3/attribute.c @@ -39,9 +39,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _domattr { + xmlnode node; const struct IXMLDOMAttributeVtbl *lpVtbl; LONG ref; - xmlnode *node; } domattr; static inline domattr *impl_from_IXMLDOMAttribute( IXMLDOMAttribute *iface ) @@ -65,7 +65,7 @@ static HRESULT WINAPI domattr_QueryInterface( } else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { - *ppvObject = IXMLDOMNode_from_impl(This->node); + *ppvObject = IXMLDOMNode_from_impl(&This->node); } else { @@ -93,7 +93,7 @@ static ULONG WINAPI domattr_Release( ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { - destroy_xmlnode(This->node); + destroy_xmlnode(&This->node); HeapFree( GetProcessHeap(), 0, This ); } @@ -181,7 +181,7 @@ static HRESULT WINAPI domattr_get_nodeName( BSTR* p ) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domattr_get_nodeValue( @@ -189,7 +189,7 @@ static HRESULT WINAPI domattr_get_nodeValue( VARIANT* var1 ) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domattr_put_nodeValue( @@ -197,7 +197,7 @@ static HRESULT WINAPI domattr_put_nodeValue( VARIANT var1 ) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domattr_get_nodeType( @@ -205,7 +205,7 @@ static HRESULT WINAPI domattr_get_nodeType( DOMNodeType* domNodeType ) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(This->node), domNodeType ); + return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(&This->node), domNodeType ); } static HRESULT WINAPI domattr_get_parentNode( @@ -213,7 +213,7 @@ static HRESULT WINAPI domattr_get_parentNode( IXMLDOMNode** parent ) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(This->node), parent ); + return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(&This->node), parent ); } static HRESULT WINAPI domattr_get_childNodes( @@ -221,7 +221,7 @@ static HRESULT WINAPI domattr_get_childNodes( IXMLDOMNodeList** outList) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(This->node), outList ); + return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); } static HRESULT WINAPI domattr_get_firstChild( @@ -229,7 +229,7 @@ static HRESULT WINAPI domattr_get_firstChild( IXMLDOMNode** domNode) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domattr_get_lastChild( @@ -237,7 +237,7 @@ static HRESULT WINAPI domattr_get_lastChild( IXMLDOMNode** domNode) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domattr_get_previousSibling( @@ -245,7 +245,7 @@ static HRESULT WINAPI domattr_get_previousSibling( IXMLDOMNode** domNode) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domattr_get_nextSibling( @@ -253,7 +253,7 @@ static HRESULT WINAPI domattr_get_nextSibling( IXMLDOMNode** domNode) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domattr_get_attributes( @@ -261,7 +261,7 @@ static HRESULT WINAPI domattr_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(This->node), attributeMap ); + return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); } static HRESULT WINAPI domattr_insertBefore( @@ -270,7 +270,7 @@ static HRESULT WINAPI domattr_insertBefore( IXMLDOMNode** outOldNode) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(This->node), newNode, var1, outOldNode ); + return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(&This->node), newNode, var1, outOldNode ); } static HRESULT WINAPI domattr_replaceChild( @@ -280,7 +280,7 @@ static HRESULT WINAPI domattr_replaceChild( IXMLDOMNode** outOldNode) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(This->node), newNode, oldNode, outOldNode ); + return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(&This->node), newNode, oldNode, outOldNode ); } static HRESULT WINAPI domattr_removeChild( @@ -288,7 +288,7 @@ static HRESULT WINAPI domattr_removeChild( IXMLDOMNode* domNode, IXMLDOMNode** oldNode) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(This->node), domNode, oldNode ); + return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(&This->node), domNode, oldNode ); } static HRESULT WINAPI domattr_appendChild( @@ -296,7 +296,7 @@ static HRESULT WINAPI domattr_appendChild( IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(This->node), newNode, outNewNode ); + return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(&This->node), newNode, outNewNode ); } static HRESULT WINAPI domattr_hasChildNodes( @@ -304,7 +304,7 @@ static HRESULT WINAPI domattr_hasChildNodes( VARIANT_BOOL* pbool) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI domattr_get_ownerDocument( @@ -312,7 +312,7 @@ static HRESULT WINAPI domattr_get_ownerDocument( IXMLDOMDocument** domDocument) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(This->node), domDocument ); + return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(&This->node), domDocument ); } static HRESULT WINAPI domattr_cloneNode( @@ -320,7 +320,7 @@ static HRESULT WINAPI domattr_cloneNode( VARIANT_BOOL pbool, IXMLDOMNode** outNode) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(This->node), pbool, outNode ); + return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(&This->node), pbool, outNode ); } static HRESULT WINAPI domattr_get_nodeTypeString( @@ -328,7 +328,7 @@ static HRESULT WINAPI domattr_get_nodeTypeString( BSTR* p) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domattr_get_text( @@ -336,7 +336,7 @@ static HRESULT WINAPI domattr_get_text( BSTR* p) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domattr_put_text( @@ -344,7 +344,7 @@ static HRESULT WINAPI domattr_put_text( BSTR p) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domattr_get_specified( @@ -352,7 +352,7 @@ static HRESULT WINAPI domattr_get_specified( VARIANT_BOOL* pbool) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI domattr_get_definition( @@ -360,7 +360,7 @@ static HRESULT WINAPI domattr_get_definition( IXMLDOMNode** domNode) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domattr_get_nodeTypedValue( @@ -368,7 +368,7 @@ static HRESULT WINAPI domattr_get_nodeTypedValue( VARIANT* var1) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domattr_put_nodeTypedValue( @@ -376,7 +376,7 @@ static HRESULT WINAPI domattr_put_nodeTypedValue( VARIANT var1) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domattr_get_dataType( @@ -384,7 +384,7 @@ static HRESULT WINAPI domattr_get_dataType( VARIANT* var1) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domattr_put_dataType( @@ -392,7 +392,7 @@ static HRESULT WINAPI domattr_put_dataType( BSTR p) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domattr_get_xml( @@ -400,7 +400,7 @@ static HRESULT WINAPI domattr_get_xml( BSTR* p) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domattr_transformNode( @@ -408,7 +408,7 @@ static HRESULT WINAPI domattr_transformNode( IXMLDOMNode* domNode, BSTR* p) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(This->node), domNode, p ); + return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(&This->node), domNode, p ); } static HRESULT WINAPI domattr_selectNodes( @@ -416,7 +416,7 @@ static HRESULT WINAPI domattr_selectNodes( BSTR p, IXMLDOMNodeList** outList) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(This->node), p, outList ); + return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(&This->node), p, outList ); } static HRESULT WINAPI domattr_selectSingleNode( @@ -424,7 +424,7 @@ static HRESULT WINAPI domattr_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(This->node), p, outNode ); + return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(&This->node), p, outNode ); } static HRESULT WINAPI domattr_get_parsed( @@ -432,7 +432,7 @@ static HRESULT WINAPI domattr_get_parsed( VARIANT_BOOL* pbool) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI domattr_get_namespaceURI( @@ -440,7 +440,7 @@ static HRESULT WINAPI domattr_get_namespaceURI( BSTR* p) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domattr_get_prefix( @@ -448,7 +448,7 @@ static HRESULT WINAPI domattr_get_prefix( BSTR* p) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domattr_get_baseName( @@ -456,7 +456,7 @@ static HRESULT WINAPI domattr_get_baseName( BSTR* p) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domattr_transformNodeToObject( @@ -464,7 +464,7 @@ static HRESULT WINAPI domattr_transformNodeToObject( IXMLDOMNode* domNode, VARIANT var1) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(This->node), domNode, var1 ); + return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(&This->node), domNode, var1 ); } static HRESULT WINAPI domattr_get_name( @@ -473,7 +473,7 @@ static HRESULT WINAPI domattr_get_name( { /* name property returns the same value as nodeName */ domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domattr_get_value( @@ -481,7 +481,7 @@ static HRESULT WINAPI domattr_get_value( VARIANT *var1) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domattr_put_value( @@ -489,7 +489,7 @@ static HRESULT WINAPI domattr_put_value( VARIANT var1) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static const struct IXMLDOMAttributeVtbl domattr_vtbl = @@ -553,12 +553,7 @@ IUnknown* create_attribute( xmlNodePtr attribute ) This->lpVtbl = &domattr_vtbl; This->ref = 1; - This->node = create_basic_node( attribute, (IUnknown*)&This->lpVtbl, NULL ); - if(!This->node) - { - HeapFree(GetProcessHeap(), 0, This); - return NULL; - } + init_xmlnode(&This->node, attribute, (IUnknown*)&This->lpVtbl, NULL); return (IUnknown*) &This->lpVtbl; } diff --git a/reactos/dll/win32/msxml3/cdata.c b/reactos/dll/win32/msxml3/cdata.c index b4882034b34..04b539d70bc 100644 --- a/reactos/dll/win32/msxml3/cdata.c +++ b/reactos/dll/win32/msxml3/cdata.c @@ -39,9 +39,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _domcdata { + xmlnode node; const struct IXMLDOMCDATASectionVtbl *lpVtbl; LONG ref; - xmlnode *node; } domcdata; static inline domcdata *impl_from_IXMLDOMCDATASection( IXMLDOMCDATASection *iface ) @@ -66,7 +66,7 @@ static HRESULT WINAPI domcdata_QueryInterface( } else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { - *ppvObject = IXMLDOMNode_from_impl(This->node); + *ppvObject = IXMLDOMNode_from_impl(&This->node); } else if ( IsEqualGUID( riid, &IID_IXMLDOMText ) || IsEqualGUID( riid, &IID_IXMLDOMElement ) ) @@ -100,7 +100,7 @@ static ULONG WINAPI domcdata_Release( ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { - destroy_xmlnode(This->node); + destroy_xmlnode(&This->node); HeapFree( GetProcessHeap(), 0, This ); } @@ -189,7 +189,7 @@ static HRESULT WINAPI domcdata_get_nodeName( BSTR* p ) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domcdata_get_nodeValue( @@ -197,7 +197,7 @@ static HRESULT WINAPI domcdata_get_nodeValue( VARIANT* var1 ) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domcdata_put_nodeValue( @@ -205,7 +205,7 @@ static HRESULT WINAPI domcdata_put_nodeValue( VARIANT var1 ) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domcdata_get_nodeType( @@ -213,7 +213,7 @@ static HRESULT WINAPI domcdata_get_nodeType( DOMNodeType* domNodeType ) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(This->node), domNodeType ); + return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(&This->node), domNodeType ); } static HRESULT WINAPI domcdata_get_parentNode( @@ -221,7 +221,7 @@ static HRESULT WINAPI domcdata_get_parentNode( IXMLDOMNode** parent ) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(This->node), parent ); + return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(&This->node), parent ); } static HRESULT WINAPI domcdata_get_childNodes( @@ -229,7 +229,7 @@ static HRESULT WINAPI domcdata_get_childNodes( IXMLDOMNodeList** outList) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(This->node), outList ); + return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); } static HRESULT WINAPI domcdata_get_firstChild( @@ -237,7 +237,7 @@ static HRESULT WINAPI domcdata_get_firstChild( IXMLDOMNode** domNode) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domcdata_get_lastChild( @@ -245,7 +245,7 @@ static HRESULT WINAPI domcdata_get_lastChild( IXMLDOMNode** domNode) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domcdata_get_previousSibling( @@ -253,7 +253,7 @@ static HRESULT WINAPI domcdata_get_previousSibling( IXMLDOMNode** domNode) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domcdata_get_nextSibling( @@ -261,7 +261,7 @@ static HRESULT WINAPI domcdata_get_nextSibling( IXMLDOMNode** domNode) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domcdata_get_attributes( @@ -269,7 +269,7 @@ static HRESULT WINAPI domcdata_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(This->node), attributeMap ); + return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); } static HRESULT WINAPI domcdata_insertBefore( @@ -278,7 +278,7 @@ static HRESULT WINAPI domcdata_insertBefore( IXMLDOMNode** outOldNode) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(This->node), newNode, var1, outOldNode ); + return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(&This->node), newNode, var1, outOldNode ); } static HRESULT WINAPI domcdata_replaceChild( @@ -288,7 +288,7 @@ static HRESULT WINAPI domcdata_replaceChild( IXMLDOMNode** outOldNode) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(This->node), newNode, oldNode, outOldNode ); + return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(&This->node), newNode, oldNode, outOldNode ); } static HRESULT WINAPI domcdata_removeChild( @@ -296,7 +296,7 @@ static HRESULT WINAPI domcdata_removeChild( IXMLDOMNode* domNode, IXMLDOMNode** oldNode) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(This->node), domNode, oldNode ); + return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(&This->node), domNode, oldNode ); } static HRESULT WINAPI domcdata_appendChild( @@ -304,7 +304,7 @@ static HRESULT WINAPI domcdata_appendChild( IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(This->node), newNode, outNewNode ); + return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(&This->node), newNode, outNewNode ); } static HRESULT WINAPI domcdata_hasChildNodes( @@ -312,7 +312,7 @@ static HRESULT WINAPI domcdata_hasChildNodes( VARIANT_BOOL* pbool) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI domcdata_get_ownerDocument( @@ -320,7 +320,7 @@ static HRESULT WINAPI domcdata_get_ownerDocument( IXMLDOMDocument** domDocument) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(This->node), domDocument ); + return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(&This->node), domDocument ); } static HRESULT WINAPI domcdata_cloneNode( @@ -328,7 +328,7 @@ static HRESULT WINAPI domcdata_cloneNode( VARIANT_BOOL pbool, IXMLDOMNode** outNode) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(This->node), pbool, outNode ); + return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(&This->node), pbool, outNode ); } static HRESULT WINAPI domcdata_get_nodeTypeString( @@ -336,7 +336,7 @@ static HRESULT WINAPI domcdata_get_nodeTypeString( BSTR* p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domcdata_get_text( @@ -344,7 +344,7 @@ static HRESULT WINAPI domcdata_get_text( BSTR* p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domcdata_put_text( @@ -352,7 +352,7 @@ static HRESULT WINAPI domcdata_put_text( BSTR p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domcdata_get_specified( @@ -360,7 +360,7 @@ static HRESULT WINAPI domcdata_get_specified( VARIANT_BOOL* pbool) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI domcdata_get_definition( @@ -368,7 +368,7 @@ static HRESULT WINAPI domcdata_get_definition( IXMLDOMNode** domNode) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domcdata_get_nodeTypedValue( @@ -376,7 +376,7 @@ static HRESULT WINAPI domcdata_get_nodeTypedValue( VARIANT* var1) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domcdata_put_nodeTypedValue( @@ -384,7 +384,7 @@ static HRESULT WINAPI domcdata_put_nodeTypedValue( VARIANT var1) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domcdata_get_dataType( @@ -392,7 +392,7 @@ static HRESULT WINAPI domcdata_get_dataType( VARIANT* var1) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domcdata_put_dataType( @@ -400,7 +400,7 @@ static HRESULT WINAPI domcdata_put_dataType( BSTR p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domcdata_get_xml( @@ -408,7 +408,7 @@ static HRESULT WINAPI domcdata_get_xml( BSTR* p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domcdata_transformNode( @@ -416,7 +416,7 @@ static HRESULT WINAPI domcdata_transformNode( IXMLDOMNode* domNode, BSTR* p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(This->node), domNode, p ); + return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(&This->node), domNode, p ); } static HRESULT WINAPI domcdata_selectNodes( @@ -424,7 +424,7 @@ static HRESULT WINAPI domcdata_selectNodes( BSTR p, IXMLDOMNodeList** outList) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(This->node), p, outList ); + return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(&This->node), p, outList ); } static HRESULT WINAPI domcdata_selectSingleNode( @@ -432,7 +432,7 @@ static HRESULT WINAPI domcdata_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(This->node), p, outNode ); + return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(&This->node), p, outNode ); } static HRESULT WINAPI domcdata_get_parsed( @@ -440,7 +440,7 @@ static HRESULT WINAPI domcdata_get_parsed( VARIANT_BOOL* pbool) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI domcdata_get_namespaceURI( @@ -448,7 +448,7 @@ static HRESULT WINAPI domcdata_get_namespaceURI( BSTR* p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domcdata_get_prefix( @@ -456,7 +456,7 @@ static HRESULT WINAPI domcdata_get_prefix( BSTR* p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domcdata_get_baseName( @@ -464,7 +464,7 @@ static HRESULT WINAPI domcdata_get_baseName( BSTR* p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domcdata_transformNodeToObject( @@ -472,7 +472,7 @@ static HRESULT WINAPI domcdata_transformNodeToObject( IXMLDOMNode* domNode, VARIANT var1) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(This->node), domNode, var1 ); + return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(&This->node), domNode, var1 ); } static HRESULT WINAPI domcdata_get_data( @@ -486,7 +486,7 @@ static HRESULT WINAPI domcdata_get_data( if(!p) return E_INVALIDARG; - hr = IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), &vRet ); + hr = IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), &vRet ); if(hr == S_OK) { *p = V_BSTR(&vRet); @@ -508,7 +508,7 @@ static HRESULT WINAPI domcdata_put_data( V_VT(&val) = VT_BSTR; V_BSTR(&val) = data; - hr = IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), val ); + hr = IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(&This->node), val ); return hr; } @@ -526,7 +526,7 @@ static HRESULT WINAPI domcdata_get_length( if(!len) return E_INVALIDARG; - pContent = xmlNodeGetContent(This->node->node); + pContent = xmlNodeGetContent(This->node.node); if(pContent) { nLength = xmlStrlen(pContent); @@ -559,7 +559,7 @@ static HRESULT WINAPI domcdata_substringData( if(count == 0) return hr; - pContent = xmlNodeGetContent(This->node->node); + pContent = xmlNodeGetContent(This->node.node); if(pContent) { nLength = xmlStrlen(pContent); @@ -599,7 +599,7 @@ static HRESULT WINAPI domcdata_appendData( pContent = xmlChar_from_wchar( p ); if(pContent) { - if(xmlTextConcat(This->node->node, pContent, SysStringLen(p) ) == 0) + if(xmlTextConcat(This->node.node, pContent, SysStringLen(p) ) == 0) hr = S_OK; else hr = E_FAIL; @@ -633,7 +633,7 @@ static HRESULT WINAPI domcdata_insertData( return E_INVALIDARG; } - pXmlContent = xmlNodeGetContent(This->node->node); + pXmlContent = xmlNodeGetContent(This->node.node); if(pXmlContent) { BSTR sContent = bstr_from_xmlChar( pXmlContent ); @@ -664,7 +664,7 @@ static HRESULT WINAPI domcdata_insertData( str = xmlChar_from_wchar(sNewString); if(str) { - xmlNodeSetContent(This->node->node, str); + xmlNodeSetContent(This->node.node, str); hr = S_OK; } HeapFree(GetProcessHeap(), 0, str); @@ -772,12 +772,7 @@ IUnknown* create_cdata( xmlNodePtr text ) This->lpVtbl = &domcdata_vtbl; This->ref = 1; - This->node = create_basic_node( text, (IUnknown*)&This->lpVtbl, NULL ); - if(!This->node) - { - HeapFree(GetProcessHeap(), 0, This); - return NULL; - } + init_xmlnode(&This->node, text, (IUnknown*)&This->lpVtbl, NULL); return (IUnknown*) &This->lpVtbl; } diff --git a/reactos/dll/win32/msxml3/comment.c b/reactos/dll/win32/msxml3/comment.c index 86712f3978e..09e3c8a4e18 100644 --- a/reactos/dll/win32/msxml3/comment.c +++ b/reactos/dll/win32/msxml3/comment.c @@ -39,9 +39,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _domcomment { + xmlnode node; const struct IXMLDOMCommentVtbl *lpVtbl; LONG ref; - xmlnode *node; } domcomment; static inline domcomment *impl_from_IXMLDOMComment( IXMLDOMComment *iface ) @@ -66,7 +66,7 @@ static HRESULT WINAPI domcomment_QueryInterface( } else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { - *ppvObject = IXMLDOMNode_from_impl(This->node); + *ppvObject = IXMLDOMNode_from_impl(&This->node); } else { @@ -94,7 +94,7 @@ static ULONG WINAPI domcomment_Release( ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { - destroy_xmlnode(This->node); + destroy_xmlnode(&This->node); HeapFree( GetProcessHeap(), 0, This ); } @@ -183,7 +183,7 @@ static HRESULT WINAPI domcomment_get_nodeName( BSTR* p ) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domcomment_get_nodeValue( @@ -191,7 +191,7 @@ static HRESULT WINAPI domcomment_get_nodeValue( VARIANT* var1 ) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domcomment_put_nodeValue( @@ -199,7 +199,7 @@ static HRESULT WINAPI domcomment_put_nodeValue( VARIANT var1 ) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domcomment_get_nodeType( @@ -207,7 +207,7 @@ static HRESULT WINAPI domcomment_get_nodeType( DOMNodeType* domNodeType ) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(This->node), domNodeType ); + return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(&This->node), domNodeType ); } static HRESULT WINAPI domcomment_get_parentNode( @@ -215,7 +215,7 @@ static HRESULT WINAPI domcomment_get_parentNode( IXMLDOMNode** parent ) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(This->node), parent ); + return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(&This->node), parent ); } static HRESULT WINAPI domcomment_get_childNodes( @@ -223,7 +223,7 @@ static HRESULT WINAPI domcomment_get_childNodes( IXMLDOMNodeList** outList) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(This->node), outList ); + return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); } static HRESULT WINAPI domcomment_get_firstChild( @@ -231,7 +231,7 @@ static HRESULT WINAPI domcomment_get_firstChild( IXMLDOMNode** domNode) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domcomment_get_lastChild( @@ -239,7 +239,7 @@ static HRESULT WINAPI domcomment_get_lastChild( IXMLDOMNode** domNode) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domcomment_get_previousSibling( @@ -247,7 +247,7 @@ static HRESULT WINAPI domcomment_get_previousSibling( IXMLDOMNode** domNode) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domcomment_get_nextSibling( @@ -255,7 +255,7 @@ static HRESULT WINAPI domcomment_get_nextSibling( IXMLDOMNode** domNode) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domcomment_get_attributes( @@ -263,7 +263,7 @@ static HRESULT WINAPI domcomment_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(This->node), attributeMap ); + return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); } static HRESULT WINAPI domcomment_insertBefore( @@ -272,7 +272,7 @@ static HRESULT WINAPI domcomment_insertBefore( IXMLDOMNode** outOldNode) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(This->node), newNode, var1, outOldNode ); + return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(&This->node), newNode, var1, outOldNode ); } static HRESULT WINAPI domcomment_replaceChild( @@ -282,7 +282,7 @@ static HRESULT WINAPI domcomment_replaceChild( IXMLDOMNode** outOldNode) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(This->node), newNode, oldNode, outOldNode ); + return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(&This->node), newNode, oldNode, outOldNode ); } static HRESULT WINAPI domcomment_removeChild( @@ -290,7 +290,7 @@ static HRESULT WINAPI domcomment_removeChild( IXMLDOMNode* domNode, IXMLDOMNode** oldNode) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(This->node), domNode, oldNode ); + return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(&This->node), domNode, oldNode ); } static HRESULT WINAPI domcomment_appendChild( @@ -298,7 +298,7 @@ static HRESULT WINAPI domcomment_appendChild( IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(This->node), newNode, outNewNode ); + return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(&This->node), newNode, outNewNode ); } static HRESULT WINAPI domcomment_hasChildNodes( @@ -306,7 +306,7 @@ static HRESULT WINAPI domcomment_hasChildNodes( VARIANT_BOOL* pbool) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI domcomment_get_ownerDocument( @@ -314,7 +314,7 @@ static HRESULT WINAPI domcomment_get_ownerDocument( IXMLDOMDocument** domDocument) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(This->node), domDocument ); + return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(&This->node), domDocument ); } static HRESULT WINAPI domcomment_cloneNode( @@ -322,7 +322,7 @@ static HRESULT WINAPI domcomment_cloneNode( VARIANT_BOOL pbool, IXMLDOMNode** outNode) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(This->node), pbool, outNode ); + return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(&This->node), pbool, outNode ); } static HRESULT WINAPI domcomment_get_nodeTypeString( @@ -330,7 +330,7 @@ static HRESULT WINAPI domcomment_get_nodeTypeString( BSTR* p) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domcomment_get_text( @@ -338,7 +338,7 @@ static HRESULT WINAPI domcomment_get_text( BSTR* p) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domcomment_put_text( @@ -346,7 +346,7 @@ static HRESULT WINAPI domcomment_put_text( BSTR p) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domcomment_get_specified( @@ -354,7 +354,7 @@ static HRESULT WINAPI domcomment_get_specified( VARIANT_BOOL* pbool) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI domcomment_get_definition( @@ -362,7 +362,7 @@ static HRESULT WINAPI domcomment_get_definition( IXMLDOMNode** domNode) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domcomment_get_nodeTypedValue( @@ -370,7 +370,7 @@ static HRESULT WINAPI domcomment_get_nodeTypedValue( VARIANT* var1) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domcomment_put_nodeTypedValue( @@ -378,7 +378,7 @@ static HRESULT WINAPI domcomment_put_nodeTypedValue( VARIANT var1) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domcomment_get_dataType( @@ -386,7 +386,7 @@ static HRESULT WINAPI domcomment_get_dataType( VARIANT* var1) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domcomment_put_dataType( @@ -394,7 +394,7 @@ static HRESULT WINAPI domcomment_put_dataType( BSTR p) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domcomment_get_xml( @@ -402,7 +402,7 @@ static HRESULT WINAPI domcomment_get_xml( BSTR* p) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domcomment_transformNode( @@ -410,7 +410,7 @@ static HRESULT WINAPI domcomment_transformNode( IXMLDOMNode* domNode, BSTR* p) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(This->node), domNode, p ); + return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(&This->node), domNode, p ); } static HRESULT WINAPI domcomment_selectNodes( @@ -418,7 +418,7 @@ static HRESULT WINAPI domcomment_selectNodes( BSTR p, IXMLDOMNodeList** outList) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(This->node), p, outList ); + return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(&This->node), p, outList ); } static HRESULT WINAPI domcomment_selectSingleNode( @@ -426,7 +426,7 @@ static HRESULT WINAPI domcomment_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(This->node), p, outNode ); + return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(&This->node), p, outNode ); } static HRESULT WINAPI domcomment_get_parsed( @@ -434,7 +434,7 @@ static HRESULT WINAPI domcomment_get_parsed( VARIANT_BOOL* pbool) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI domcomment_get_namespaceURI( @@ -442,7 +442,7 @@ static HRESULT WINAPI domcomment_get_namespaceURI( BSTR* p) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domcomment_get_prefix( @@ -450,7 +450,7 @@ static HRESULT WINAPI domcomment_get_prefix( BSTR* p) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domcomment_get_baseName( @@ -458,7 +458,7 @@ static HRESULT WINAPI domcomment_get_baseName( BSTR* p) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domcomment_transformNodeToObject( @@ -466,7 +466,7 @@ static HRESULT WINAPI domcomment_transformNodeToObject( IXMLDOMNode* domNode, VARIANT var1) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(This->node), domNode, var1 ); + return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(&This->node), domNode, var1 ); } static HRESULT WINAPI domcomment_get_data( @@ -480,7 +480,7 @@ static HRESULT WINAPI domcomment_get_data( if(!p) return E_INVALIDARG; - hr = IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), &vRet ); + hr = IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), &vRet ); if(hr == S_OK) { *p = V_BSTR(&vRet); @@ -502,7 +502,7 @@ static HRESULT WINAPI domcomment_put_data( V_VT(&val) = VT_BSTR; V_BSTR(&val) = data; - hr = IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), val ); + hr = IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(&This->node), val ); return hr; } @@ -520,7 +520,7 @@ static HRESULT WINAPI domcomment_get_length( if(!len) return E_INVALIDARG; - pContent = xmlNodeGetContent(This->node->node); + pContent = xmlNodeGetContent(This->node.node); if(pContent) { nLength = xmlStrlen(pContent); @@ -553,7 +553,7 @@ static HRESULT WINAPI domcomment_substringData( if(count == 0) return hr; - pContent = xmlNodeGetContent(This->node->node); + pContent = xmlNodeGetContent(This->node.node); if(pContent) { nLength = xmlStrlen(pContent); @@ -597,15 +597,15 @@ static HRESULT WINAPI domcomment_appendData( xmlTextConcat on Comment nodes. Fallback to setting the contents directly if xmlTextConcat fails. */ - if(xmlTextConcat(This->node->node, pContent, SysStringLen(p) ) == 0) + if(xmlTextConcat(This->node.node, pContent, SysStringLen(p) ) == 0) hr = S_OK; else { xmlChar *pNew; - pNew = xmlStrcat(xmlNodeGetContent(This->node->node), pContent); + pNew = xmlStrcat(xmlNodeGetContent(This->node.node), pContent); if(pNew) { - xmlNodeSetContent(This->node->node, pNew); + xmlNodeSetContent(This->node.node, pNew); hr = S_OK; } else @@ -641,7 +641,7 @@ static HRESULT WINAPI domcomment_insertData( return E_INVALIDARG; } - pXmlContent = xmlNodeGetContent(This->node->node); + pXmlContent = xmlNodeGetContent(This->node.node); if(pXmlContent) { BSTR sContent = bstr_from_xmlChar( pXmlContent ); @@ -672,7 +672,7 @@ static HRESULT WINAPI domcomment_insertData( str = xmlChar_from_wchar(sNewString); if(str) { - xmlNodeSetContent(This->node->node, str); + xmlNodeSetContent(This->node.node, str); hr = S_OK; } HeapFree( GetProcessHeap(), 0, str ); @@ -770,12 +770,7 @@ IUnknown* create_comment( xmlNodePtr comment ) This->lpVtbl = &domcomment_vtbl; This->ref = 1; - This->node = create_basic_node( comment, (IUnknown*)&This->lpVtbl, NULL ); - if(!This->node) - { - HeapFree(GetProcessHeap(), 0, This); - return NULL; - } + init_xmlnode(&This->node, comment, (IUnknown*)&This->lpVtbl, NULL); return (IUnknown*) &This->lpVtbl; } diff --git a/reactos/dll/win32/msxml3/docfrag.c b/reactos/dll/win32/msxml3/docfrag.c index 10a35b34d8f..f5ac1aa7e55 100644 --- a/reactos/dll/win32/msxml3/docfrag.c +++ b/reactos/dll/win32/msxml3/docfrag.c @@ -39,9 +39,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _domfrag { + xmlnode node; const struct IXMLDOMDocumentFragmentVtbl *lpVtbl; LONG ref; - xmlnode *node; } domfrag; static inline domfrag *impl_from_IXMLDOMDocumentFragment( IXMLDOMDocumentFragment *iface ) @@ -65,7 +65,7 @@ static HRESULT WINAPI domfrag_QueryInterface( } else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { - *ppvObject = IXMLDOMNode_from_impl(This->node); + *ppvObject = IXMLDOMNode_from_impl(&This->node); } else { @@ -93,7 +93,7 @@ static ULONG WINAPI domfrag_Release( ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { - destroy_xmlnode(This->node); + destroy_xmlnode(&This->node); HeapFree( GetProcessHeap(), 0, This ); } @@ -182,7 +182,7 @@ static HRESULT WINAPI domfrag_get_nodeName( BSTR* p ) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domfrag_get_nodeValue( @@ -190,7 +190,7 @@ static HRESULT WINAPI domfrag_get_nodeValue( VARIANT* var1 ) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domfrag_put_nodeValue( @@ -198,7 +198,7 @@ static HRESULT WINAPI domfrag_put_nodeValue( VARIANT var1 ) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domfrag_get_nodeType( @@ -206,7 +206,7 @@ static HRESULT WINAPI domfrag_get_nodeType( DOMNodeType* domNodeType ) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(This->node), domNodeType ); + return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(&This->node), domNodeType ); } static HRESULT WINAPI domfrag_get_parentNode( @@ -214,7 +214,7 @@ static HRESULT WINAPI domfrag_get_parentNode( IXMLDOMNode** parent ) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(This->node), parent ); + return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(&This->node), parent ); } static HRESULT WINAPI domfrag_get_childNodes( @@ -222,7 +222,7 @@ static HRESULT WINAPI domfrag_get_childNodes( IXMLDOMNodeList** outList) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(This->node), outList ); + return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); } static HRESULT WINAPI domfrag_get_firstChild( @@ -230,7 +230,7 @@ static HRESULT WINAPI domfrag_get_firstChild( IXMLDOMNode** domNode) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domfrag_get_lastChild( @@ -238,7 +238,7 @@ static HRESULT WINAPI domfrag_get_lastChild( IXMLDOMNode** domNode) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domfrag_get_previousSibling( @@ -246,7 +246,7 @@ static HRESULT WINAPI domfrag_get_previousSibling( IXMLDOMNode** domNode) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domfrag_get_nextSibling( @@ -254,7 +254,7 @@ static HRESULT WINAPI domfrag_get_nextSibling( IXMLDOMNode** domNode) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domfrag_get_attributes( @@ -262,7 +262,7 @@ static HRESULT WINAPI domfrag_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(This->node), attributeMap ); + return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); } static HRESULT WINAPI domfrag_insertBefore( @@ -271,7 +271,7 @@ static HRESULT WINAPI domfrag_insertBefore( IXMLDOMNode** outOldNode) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(This->node), newNode, var1, outOldNode ); + return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(&This->node), newNode, var1, outOldNode ); } static HRESULT WINAPI domfrag_replaceChild( @@ -281,7 +281,7 @@ static HRESULT WINAPI domfrag_replaceChild( IXMLDOMNode** outOldNode) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(This->node), newNode, oldNode, outOldNode ); + return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(&This->node), newNode, oldNode, outOldNode ); } static HRESULT WINAPI domfrag_removeChild( @@ -289,7 +289,7 @@ static HRESULT WINAPI domfrag_removeChild( IXMLDOMNode* domNode, IXMLDOMNode** oldNode) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(This->node), domNode, oldNode ); + return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(&This->node), domNode, oldNode ); } static HRESULT WINAPI domfrag_appendChild( @@ -297,7 +297,7 @@ static HRESULT WINAPI domfrag_appendChild( IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(This->node), newNode, outNewNode ); + return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(&This->node), newNode, outNewNode ); } static HRESULT WINAPI domfrag_hasChildNodes( @@ -305,7 +305,7 @@ static HRESULT WINAPI domfrag_hasChildNodes( VARIANT_BOOL* pbool) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI domfrag_get_ownerDocument( @@ -313,7 +313,7 @@ static HRESULT WINAPI domfrag_get_ownerDocument( IXMLDOMDocument** domDocument) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(This->node), domDocument ); + return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(&This->node), domDocument ); } static HRESULT WINAPI domfrag_cloneNode( @@ -321,7 +321,7 @@ static HRESULT WINAPI domfrag_cloneNode( VARIANT_BOOL pbool, IXMLDOMNode** outNode) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(This->node), pbool, outNode ); + return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(&This->node), pbool, outNode ); } static HRESULT WINAPI domfrag_get_nodeTypeString( @@ -329,7 +329,7 @@ static HRESULT WINAPI domfrag_get_nodeTypeString( BSTR* p) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domfrag_get_text( @@ -337,7 +337,7 @@ static HRESULT WINAPI domfrag_get_text( BSTR* p) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domfrag_put_text( @@ -345,7 +345,7 @@ static HRESULT WINAPI domfrag_put_text( BSTR p) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domfrag_get_specified( @@ -353,7 +353,7 @@ static HRESULT WINAPI domfrag_get_specified( VARIANT_BOOL* pbool) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI domfrag_get_definition( @@ -361,7 +361,7 @@ static HRESULT WINAPI domfrag_get_definition( IXMLDOMNode** domNode) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domfrag_get_nodeTypedValue( @@ -369,7 +369,7 @@ static HRESULT WINAPI domfrag_get_nodeTypedValue( VARIANT* var1) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domfrag_put_nodeTypedValue( @@ -377,7 +377,7 @@ static HRESULT WINAPI domfrag_put_nodeTypedValue( VARIANT var1) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domfrag_get_dataType( @@ -385,7 +385,7 @@ static HRESULT WINAPI domfrag_get_dataType( VARIANT* var1) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domfrag_put_dataType( @@ -393,7 +393,7 @@ static HRESULT WINAPI domfrag_put_dataType( BSTR p) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domfrag_get_xml( @@ -401,7 +401,7 @@ static HRESULT WINAPI domfrag_get_xml( BSTR* p) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domfrag_transformNode( @@ -409,7 +409,7 @@ static HRESULT WINAPI domfrag_transformNode( IXMLDOMNode* domNode, BSTR* p) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(This->node), domNode, p ); + return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(&This->node), domNode, p ); } static HRESULT WINAPI domfrag_selectNodes( @@ -417,7 +417,7 @@ static HRESULT WINAPI domfrag_selectNodes( BSTR p, IXMLDOMNodeList** outList) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(This->node), p, outList ); + return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(&This->node), p, outList ); } static HRESULT WINAPI domfrag_selectSingleNode( @@ -425,7 +425,7 @@ static HRESULT WINAPI domfrag_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(This->node), p, outNode ); + return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(&This->node), p, outNode ); } static HRESULT WINAPI domfrag_get_parsed( @@ -433,7 +433,7 @@ static HRESULT WINAPI domfrag_get_parsed( VARIANT_BOOL* pbool) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI domfrag_get_namespaceURI( @@ -441,7 +441,7 @@ static HRESULT WINAPI domfrag_get_namespaceURI( BSTR* p) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domfrag_get_prefix( @@ -449,7 +449,7 @@ static HRESULT WINAPI domfrag_get_prefix( BSTR* p) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domfrag_get_baseName( @@ -457,7 +457,7 @@ static HRESULT WINAPI domfrag_get_baseName( BSTR* p) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domfrag_transformNodeToObject( @@ -465,7 +465,7 @@ static HRESULT WINAPI domfrag_transformNodeToObject( IXMLDOMNode* domNode, VARIANT var1) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(This->node), domNode, var1 ); + return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(&This->node), domNode, var1 ); } static const struct IXMLDOMDocumentFragmentVtbl domfrag_vtbl = @@ -526,12 +526,7 @@ IUnknown* create_doc_fragment( xmlNodePtr fragment ) This->lpVtbl = &domfrag_vtbl; This->ref = 1; - This->node = create_basic_node( fragment, (IUnknown*)&This->lpVtbl, NULL ); - if(!This->node) - { - HeapFree(GetProcessHeap(), 0, This); - return NULL; - } + init_xmlnode(&This->node, fragment, (IUnknown*)&This->lpVtbl, NULL); return (IUnknown*) &This->lpVtbl; } diff --git a/reactos/dll/win32/msxml3/domdoc.c b/reactos/dll/win32/msxml3/domdoc.c index b6bc189c481..be19e566ff4 100644 --- a/reactos/dll/win32/msxml3/domdoc.c +++ b/reactos/dll/win32/msxml3/domdoc.c @@ -53,6 +53,7 @@ static const WCHAR SZ_VALUE_XSLPATTERN[] = {'X','S','L','P','a','t','t','e','r', typedef struct _domdoc { + xmlnode node; const struct IXMLDOMDocument2Vtbl *lpVtbl; const struct IPersistStreamVtbl *lpvtblIPersistStream; const struct IObjectWithSiteVtbl *lpvtblIObjectWithSite; @@ -64,7 +65,6 @@ typedef struct _domdoc VARIANT_BOOL resolving; VARIANT_BOOL preserving; BOOL bUseXPath; - xmlnode *node; IXMLDOMSchemaCollection *schema; bsc_t *bsc; HRESULT error; @@ -225,7 +225,7 @@ static inline domdoc *impl_from_IXMLDOMDocument2( IXMLDOMDocument2 *iface ) static inline xmlDocPtr get_doc( domdoc *This ) { - return (xmlDocPtr)This->node->node; + return (xmlDocPtr)This->node.node; } static inline domdoc *impl_from_IPersistStream(IPersistStream *iface) @@ -345,7 +345,7 @@ static HRESULT WINAPI xmldoc_IPersistStream_Load( xmldoc->_private = create_priv(); - return attach_xmldoc( This->node, xmldoc ); + return attach_xmldoc( &This->node, xmldoc ); } static HRESULT WINAPI xmldoc_IPersistStream_Save( @@ -357,7 +357,7 @@ static HRESULT WINAPI xmldoc_IPersistStream_Save( TRACE("(%p, %p, %d)\n", iface, pStm, fClearDirty); - hr = IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(This->node), &xmlString ); + hr = IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(&This->node), &xmlString ); if(hr == S_OK) { DWORD count; @@ -449,7 +449,7 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument2 *iface, REFIID rii } else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { - *ppvObject = IXMLDOMNode_from_impl(This->node); + *ppvObject = IXMLDOMNode_from_impl(&This->node); } else if (IsEqualGUID(&IID_IPersistStream, riid)) { @@ -463,7 +463,7 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument2 *iface, REFIID rii { *ppvObject = &This->lpvtblISupportErrorInfo; } - else if(dispex_query_interface(&This->node->dispex, riid, ppvObject)) + else if(dispex_query_interface(&This->node.dispex, riid, ppvObject)) { return *ppvObject ? S_OK : E_NOINTERFACE; } @@ -509,7 +509,7 @@ static ULONG WINAPI domdoc_Release( if (This->site) IUnknown_Release( This->site ); - destroy_xmlnode(This->node); + destroy_xmlnode(&This->node); if(This->schema) IXMLDOMSchemaCollection_Release( This->schema ); if (This->stream) IStream_Release(This->stream); HeapFree( GetProcessHeap(), 0, This ); @@ -607,7 +607,7 @@ static HRESULT WINAPI domdoc_get_nodeName( BSTR* name ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(This->node), name ); + return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), name ); } @@ -616,7 +616,7 @@ static HRESULT WINAPI domdoc_get_nodeValue( VARIANT* value ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), value ); + return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), value ); } @@ -625,7 +625,7 @@ static HRESULT WINAPI domdoc_put_nodeValue( VARIANT value) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), value ); + return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(&This->node), value ); } @@ -634,7 +634,7 @@ static HRESULT WINAPI domdoc_get_nodeType( DOMNodeType* type ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(This->node), type ); + return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(&This->node), type ); } @@ -643,7 +643,7 @@ static HRESULT WINAPI domdoc_get_parentNode( IXMLDOMNode** parent ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(This->node), parent ); + return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(&This->node), parent ); } @@ -652,7 +652,7 @@ static HRESULT WINAPI domdoc_get_childNodes( IXMLDOMNodeList** childList ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(This->node), childList ); + return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), childList ); } @@ -661,7 +661,7 @@ static HRESULT WINAPI domdoc_get_firstChild( IXMLDOMNode** firstChild ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(This->node), firstChild ); + return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(&This->node), firstChild ); } @@ -670,7 +670,7 @@ static HRESULT WINAPI domdoc_get_lastChild( IXMLDOMNode** lastChild ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(This->node), lastChild ); + return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(&This->node), lastChild ); } @@ -679,7 +679,7 @@ static HRESULT WINAPI domdoc_get_previousSibling( IXMLDOMNode** previousSibling ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(This->node), previousSibling ); + return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(&This->node), previousSibling ); } @@ -688,7 +688,7 @@ static HRESULT WINAPI domdoc_get_nextSibling( IXMLDOMNode** nextSibling ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(This->node), nextSibling ); + return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(&This->node), nextSibling ); } @@ -697,7 +697,7 @@ static HRESULT WINAPI domdoc_get_attributes( IXMLDOMNamedNodeMap** attributeMap ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(This->node), attributeMap ); + return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); } @@ -708,7 +708,7 @@ static HRESULT WINAPI domdoc_insertBefore( IXMLDOMNode** outNewChild ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(This->node), newChild, refChild, outNewChild ); + return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(&This->node), newChild, refChild, outNewChild ); } @@ -719,7 +719,7 @@ static HRESULT WINAPI domdoc_replaceChild( IXMLDOMNode** outOldChild) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(This->node), newChild, oldChild, outOldChild ); + return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(&This->node), newChild, oldChild, outOldChild ); } @@ -729,7 +729,7 @@ static HRESULT WINAPI domdoc_removeChild( IXMLDOMNode** oldChild) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(This->node), childNode, oldChild ); + return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(&This->node), childNode, oldChild ); } @@ -739,7 +739,7 @@ static HRESULT WINAPI domdoc_appendChild( IXMLDOMNode** outNewChild) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(This->node), newChild, outNewChild ); + return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(&This->node), newChild, outNewChild ); } @@ -748,7 +748,7 @@ static HRESULT WINAPI domdoc_hasChildNodes( VARIANT_BOOL* hasChild) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(This->node), hasChild ); + return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(&This->node), hasChild ); } @@ -757,7 +757,7 @@ static HRESULT WINAPI domdoc_get_ownerDocument( IXMLDOMDocument** DOMDocument) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(This->node), DOMDocument ); + return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(&This->node), DOMDocument ); } @@ -767,7 +767,7 @@ static HRESULT WINAPI domdoc_cloneNode( IXMLDOMNode** cloneRoot) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(This->node), deep, cloneRoot ); + return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(&This->node), deep, cloneRoot ); } @@ -776,7 +776,7 @@ static HRESULT WINAPI domdoc_get_nodeTypeString( BSTR* nodeType ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(This->node), nodeType ); + return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(&This->node), nodeType ); } @@ -785,7 +785,7 @@ static HRESULT WINAPI domdoc_get_text( BSTR* text ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(This->node), text ); + return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(&This->node), text ); } @@ -794,7 +794,7 @@ static HRESULT WINAPI domdoc_put_text( BSTR text ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(This->node), text ); + return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(&This->node), text ); } @@ -803,7 +803,7 @@ static HRESULT WINAPI domdoc_get_specified( VARIANT_BOOL* isSpecified ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(This->node), isSpecified ); + return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(&This->node), isSpecified ); } @@ -812,7 +812,7 @@ static HRESULT WINAPI domdoc_get_definition( IXMLDOMNode** definitionNode ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(This->node), definitionNode ); + return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(&This->node), definitionNode ); } @@ -821,7 +821,7 @@ static HRESULT WINAPI domdoc_get_nodeTypedValue( VARIANT* typedValue ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(This->node), typedValue ); + return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), typedValue ); } static HRESULT WINAPI domdoc_put_nodeTypedValue( @@ -829,7 +829,7 @@ static HRESULT WINAPI domdoc_put_nodeTypedValue( VARIANT typedValue ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(This->node), typedValue ); + return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), typedValue ); } @@ -838,7 +838,7 @@ static HRESULT WINAPI domdoc_get_dataType( VARIANT* dataTypeName ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(This->node), dataTypeName ); + return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(&This->node), dataTypeName ); } @@ -847,7 +847,7 @@ static HRESULT WINAPI domdoc_put_dataType( BSTR dataTypeName ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(This->node), dataTypeName ); + return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(&This->node), dataTypeName ); } @@ -856,7 +856,7 @@ static HRESULT WINAPI domdoc_get_xml( BSTR* xmlString ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(This->node), xmlString ); + return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(&This->node), xmlString ); } @@ -866,7 +866,7 @@ static HRESULT WINAPI domdoc_transformNode( BSTR* xmlString ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(This->node), styleSheet, xmlString ); + return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(&This->node), styleSheet, xmlString ); } @@ -876,7 +876,7 @@ static HRESULT WINAPI domdoc_selectNodes( IXMLDOMNodeList** resultList ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(This->node), queryString, resultList ); + return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(&This->node), queryString, resultList ); } @@ -886,7 +886,7 @@ static HRESULT WINAPI domdoc_selectSingleNode( IXMLDOMNode** resultNode ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(This->node), queryString, resultNode ); + return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(&This->node), queryString, resultNode ); } @@ -895,7 +895,7 @@ static HRESULT WINAPI domdoc_get_parsed( VARIANT_BOOL* isParsed ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(This->node), isParsed ); + return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(&This->node), isParsed ); } @@ -904,7 +904,7 @@ static HRESULT WINAPI domdoc_get_namespaceURI( BSTR* namespaceURI ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(This->node), namespaceURI ); + return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), namespaceURI ); } @@ -913,7 +913,7 @@ static HRESULT WINAPI domdoc_get_prefix( BSTR* prefixString ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(This->node), prefixString ); + return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(&This->node), prefixString ); } @@ -922,7 +922,7 @@ static HRESULT WINAPI domdoc_get_baseName( BSTR* nameString ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(This->node), nameString ); + return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), nameString ); } @@ -932,7 +932,7 @@ static HRESULT WINAPI domdoc_transformNodeToObject( VARIANT outputObject) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(This->node), stylesheet, outputObject ); + return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(&This->node), stylesheet, outputObject ); } @@ -967,7 +967,7 @@ static HRESULT WINAPI domdoc_get_documentElement( IXMLDOMNode *element_node; HRESULT hr; - TRACE("%p %p\n", This, This->node); + TRACE("%p\n", This); if(!DOMElement) return E_INVALIDARG; @@ -1387,7 +1387,7 @@ static HRESULT domdoc_onDataAvailable(void *obj, char *ptr, DWORD len) xmldoc = doparse( ptr, len ); if(xmldoc) { xmldoc->_private = create_priv(); - return attach_xmldoc(This->node, xmldoc); + return attach_xmldoc(&This->node, xmldoc); } return S_OK; @@ -1425,7 +1425,7 @@ static HRESULT WINAPI domdoc_load( *isSuccessful = VARIANT_FALSE; - assert( This->node ); + assert( &This->node ); switch( V_VT(&xmlSource) ) { @@ -1440,7 +1440,7 @@ static HRESULT WINAPI domdoc_load( { domdoc *newDoc = impl_from_IXMLDOMDocument2( pNewDoc ); xmldoc = xmlCopyDoc(get_doc(newDoc), 1); - hr = attach_xmldoc(This->node, xmldoc); + hr = attach_xmldoc(&This->node, xmldoc); if(SUCCEEDED(hr)) *isSuccessful = VARIANT_TRUE; @@ -1502,7 +1502,7 @@ static HRESULT WINAPI domdoc_load( if(!filename || FAILED(hr)) { xmldoc = xmlNewDoc(NULL); xmldoc->_private = create_priv(); - hr = attach_xmldoc(This->node, xmldoc); + hr = attach_xmldoc(&This->node, xmldoc); if(SUCCEEDED(hr)) hr = S_FALSE; } @@ -1610,7 +1610,7 @@ static HRESULT WINAPI domdoc_loadXML( TRACE("%p %s %p\n", This, debugstr_w( bstrXML ), isSuccessful ); - assert ( This->node ); + assert ( &This->node ); if ( isSuccessful ) { @@ -1633,7 +1633,7 @@ static HRESULT WINAPI domdoc_loadXML( xmldoc = xmlNewDoc(NULL); xmldoc->_private = create_priv(); - hr2 = attach_xmldoc( This->node, xmldoc ); + hr2 = attach_xmldoc( &This->node, xmldoc ); if( FAILED(hr2) ) hr = hr2; @@ -2215,12 +2215,7 @@ HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument2 **docu doc->safeopt = 0; doc->bsc = NULL; - doc->node = create_basic_node( (xmlNodePtr)xmldoc, (IUnknown*)&doc->lpVtbl, &domdoc_dispex ); - if(!doc->node) - { - HeapFree(GetProcessHeap(), 0, doc); - return E_FAIL; - } + init_xmlnode(&doc->node, (xmlNodePtr)xmldoc, (IUnknown*)&doc->lpVtbl, &domdoc_dispex); *document = (IXMLDOMDocument2*)&doc->lpVtbl; diff --git a/reactos/dll/win32/msxml3/element.c b/reactos/dll/win32/msxml3/element.c index accd0edfef5..63bf7af1d4b 100644 --- a/reactos/dll/win32/msxml3/element.c +++ b/reactos/dll/win32/msxml3/element.c @@ -40,9 +40,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _domelem { + xmlnode node; const struct IXMLDOMElementVtbl *lpVtbl; LONG ref; - xmlnode *node; } domelem; static inline domelem *impl_from_IXMLDOMElement( IXMLDOMElement *iface ) @@ -52,7 +52,7 @@ static inline domelem *impl_from_IXMLDOMElement( IXMLDOMElement *iface ) static inline xmlNodePtr get_element( domelem *This ) { - return This->node->node; + return This->node.node; } static HRESULT WINAPI domelem_QueryInterface( @@ -72,9 +72,9 @@ static HRESULT WINAPI domelem_QueryInterface( } else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { - *ppvObject = IXMLDOMNode_from_impl(This->node); + *ppvObject = IXMLDOMNode_from_impl(&This->node); } - else if(dispex_query_interface(&This->node->dispex, riid, ppvObject)) + else if(dispex_query_interface(&This->node.dispex, riid, ppvObject)) { return *ppvObject ? S_OK : E_NOINTERFACE; } @@ -108,7 +108,7 @@ static ULONG WINAPI domelem_Release( TRACE("(%p) ref=%d\n", This, ref); if(!ref) { - destroy_xmlnode(This->node); + destroy_xmlnode(&This->node); heap_free(This); } @@ -197,7 +197,7 @@ static HRESULT WINAPI domelem_get_nodeName( BSTR* p ) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domelem_get_nodeValue( @@ -205,7 +205,7 @@ static HRESULT WINAPI domelem_get_nodeValue( VARIANT* var1 ) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domelem_put_nodeValue( @@ -213,7 +213,7 @@ static HRESULT WINAPI domelem_put_nodeValue( VARIANT var1 ) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domelem_get_nodeType( @@ -221,7 +221,7 @@ static HRESULT WINAPI domelem_get_nodeType( DOMNodeType* domNodeType ) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(This->node), domNodeType ); + return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(&This->node), domNodeType ); } static HRESULT WINAPI domelem_get_parentNode( @@ -229,7 +229,7 @@ static HRESULT WINAPI domelem_get_parentNode( IXMLDOMNode** parent ) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(This->node), parent ); + return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(&This->node), parent ); } static HRESULT WINAPI domelem_get_childNodes( @@ -237,7 +237,7 @@ static HRESULT WINAPI domelem_get_childNodes( IXMLDOMNodeList** outList) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(This->node), outList ); + return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); } static HRESULT WINAPI domelem_get_firstChild( @@ -245,7 +245,7 @@ static HRESULT WINAPI domelem_get_firstChild( IXMLDOMNode** domNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domelem_get_lastChild( @@ -253,7 +253,7 @@ static HRESULT WINAPI domelem_get_lastChild( IXMLDOMNode** domNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domelem_get_previousSibling( @@ -261,7 +261,7 @@ static HRESULT WINAPI domelem_get_previousSibling( IXMLDOMNode** domNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domelem_get_nextSibling( @@ -269,7 +269,7 @@ static HRESULT WINAPI domelem_get_nextSibling( IXMLDOMNode** domNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domelem_get_attributes( @@ -277,7 +277,7 @@ static HRESULT WINAPI domelem_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(This->node), attributeMap ); + return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); } static HRESULT WINAPI domelem_insertBefore( @@ -286,7 +286,7 @@ static HRESULT WINAPI domelem_insertBefore( IXMLDOMNode** outOldNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(This->node), newNode, var1, outOldNode ); + return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(&This->node), newNode, var1, outOldNode ); } static HRESULT WINAPI domelem_replaceChild( @@ -296,7 +296,7 @@ static HRESULT WINAPI domelem_replaceChild( IXMLDOMNode** outOldNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(This->node), newNode, oldNode, outOldNode ); + return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(&This->node), newNode, oldNode, outOldNode ); } static HRESULT WINAPI domelem_removeChild( @@ -304,7 +304,7 @@ static HRESULT WINAPI domelem_removeChild( IXMLDOMNode* domNode, IXMLDOMNode** oldNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(This->node), domNode, oldNode ); + return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(&This->node), domNode, oldNode ); } static HRESULT WINAPI domelem_appendChild( @@ -312,7 +312,7 @@ static HRESULT WINAPI domelem_appendChild( IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(This->node), newNode, outNewNode ); + return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(&This->node), newNode, outNewNode ); } static HRESULT WINAPI domelem_hasChildNodes( @@ -320,7 +320,7 @@ static HRESULT WINAPI domelem_hasChildNodes( VARIANT_BOOL* pbool) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI domelem_get_ownerDocument( @@ -328,7 +328,7 @@ static HRESULT WINAPI domelem_get_ownerDocument( IXMLDOMDocument** domDocument) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(This->node), domDocument ); + return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(&This->node), domDocument ); } static HRESULT WINAPI domelem_cloneNode( @@ -336,7 +336,7 @@ static HRESULT WINAPI domelem_cloneNode( VARIANT_BOOL pbool, IXMLDOMNode** outNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(This->node), pbool, outNode ); + return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(&This->node), pbool, outNode ); } static HRESULT WINAPI domelem_get_nodeTypeString( @@ -344,7 +344,7 @@ static HRESULT WINAPI domelem_get_nodeTypeString( BSTR* p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domelem_get_text( @@ -352,7 +352,7 @@ static HRESULT WINAPI domelem_get_text( BSTR* p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domelem_put_text( @@ -360,7 +360,7 @@ static HRESULT WINAPI domelem_put_text( BSTR p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domelem_get_specified( @@ -368,7 +368,7 @@ static HRESULT WINAPI domelem_get_specified( VARIANT_BOOL* pbool) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI domelem_get_definition( @@ -376,7 +376,7 @@ static HRESULT WINAPI domelem_get_definition( IXMLDOMNode** domNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domelem_get_nodeTypedValue( @@ -384,7 +384,7 @@ static HRESULT WINAPI domelem_get_nodeTypedValue( VARIANT* var1) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domelem_put_nodeTypedValue( @@ -392,7 +392,7 @@ static HRESULT WINAPI domelem_put_nodeTypedValue( VARIANT var1) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domelem_get_dataType( @@ -400,7 +400,7 @@ static HRESULT WINAPI domelem_get_dataType( VARIANT* var1) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domelem_put_dataType( @@ -408,7 +408,7 @@ static HRESULT WINAPI domelem_put_dataType( BSTR p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domelem_get_xml( @@ -416,7 +416,7 @@ static HRESULT WINAPI domelem_get_xml( BSTR* p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domelem_transformNode( @@ -424,7 +424,7 @@ static HRESULT WINAPI domelem_transformNode( IXMLDOMNode* domNode, BSTR* p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(This->node), domNode, p ); + return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(&This->node), domNode, p ); } static HRESULT WINAPI domelem_selectNodes( @@ -432,7 +432,7 @@ static HRESULT WINAPI domelem_selectNodes( BSTR p, IXMLDOMNodeList** outList) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(This->node), p, outList ); + return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(&This->node), p, outList ); } static HRESULT WINAPI domelem_selectSingleNode( @@ -440,7 +440,7 @@ static HRESULT WINAPI domelem_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(This->node), p, outNode ); + return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(&This->node), p, outNode ); } static HRESULT WINAPI domelem_get_parsed( @@ -448,7 +448,7 @@ static HRESULT WINAPI domelem_get_parsed( VARIANT_BOOL* pbool) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI domelem_get_namespaceURI( @@ -456,7 +456,7 @@ static HRESULT WINAPI domelem_get_namespaceURI( BSTR* p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domelem_get_prefix( @@ -464,7 +464,7 @@ static HRESULT WINAPI domelem_get_prefix( BSTR* p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domelem_get_baseName( @@ -472,7 +472,7 @@ static HRESULT WINAPI domelem_get_baseName( BSTR* p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domelem_transformNodeToObject( @@ -480,7 +480,7 @@ static HRESULT WINAPI domelem_transformNodeToObject( IXMLDOMNode* domNode, VARIANT var1) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(This->node), domNode, var1 ); + return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(&This->node), domNode, var1 ); } static HRESULT WINAPI domelem_get_tagName( @@ -495,9 +495,6 @@ static HRESULT WINAPI domelem_get_tagName( TRACE("%p\n", This ); - if ( !This->node ) - return E_FAIL; - element = get_element( This ); if ( !element ) return E_FAIL; @@ -778,12 +775,7 @@ IUnknown* create_element( xmlNodePtr element ) This->lpVtbl = &domelem_vtbl; This->ref = 1; - This->node = create_basic_node( element, (IUnknown*)&This->lpVtbl, &domelem_dispex ); - if(!This->node) - { - HeapFree(GetProcessHeap(), 0, This); - return NULL; - } + init_xmlnode(&This->node, element, (IUnknown*)&This->lpVtbl, &domelem_dispex); return (IUnknown*) &This->lpVtbl; } diff --git a/reactos/dll/win32/msxml3/entityref.c b/reactos/dll/win32/msxml3/entityref.c index 820edc72e57..7ba06c3d09b 100644 --- a/reactos/dll/win32/msxml3/entityref.c +++ b/reactos/dll/win32/msxml3/entityref.c @@ -39,9 +39,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _entityref { + xmlnode node; const struct IXMLDOMEntityReferenceVtbl *lpVtbl; LONG ref; - xmlnode *node; } entityref; static inline entityref *impl_from_IXMLDOMEntityReference( IXMLDOMEntityReference *iface ) @@ -65,7 +65,7 @@ static HRESULT WINAPI entityref_QueryInterface( } else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { - *ppvObject = IXMLDOMNode_from_impl(This->node); + *ppvObject = IXMLDOMNode_from_impl(&This->node); } else { @@ -93,7 +93,7 @@ static ULONG WINAPI entityref_Release( ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { - destroy_xmlnode(This->node); + destroy_xmlnode(&This->node); HeapFree( GetProcessHeap(), 0, This ); } @@ -181,7 +181,7 @@ static HRESULT WINAPI entityref_get_nodeName( BSTR* p ) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI entityref_get_nodeValue( @@ -189,7 +189,7 @@ static HRESULT WINAPI entityref_get_nodeValue( VARIANT* var1 ) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI entityref_put_nodeValue( @@ -197,7 +197,7 @@ static HRESULT WINAPI entityref_put_nodeValue( VARIANT var1 ) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI entityref_get_nodeType( @@ -205,7 +205,7 @@ static HRESULT WINAPI entityref_get_nodeType( DOMNodeType* domNodeType ) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(This->node), domNodeType ); + return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(&This->node), domNodeType ); } static HRESULT WINAPI entityref_get_parentNode( @@ -213,7 +213,7 @@ static HRESULT WINAPI entityref_get_parentNode( IXMLDOMNode** parent ) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(This->node), parent ); + return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(&This->node), parent ); } static HRESULT WINAPI entityref_get_childNodes( @@ -221,7 +221,7 @@ static HRESULT WINAPI entityref_get_childNodes( IXMLDOMNodeList** outList) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(This->node), outList ); + return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); } static HRESULT WINAPI entityref_get_firstChild( @@ -229,7 +229,7 @@ static HRESULT WINAPI entityref_get_firstChild( IXMLDOMNode** domNode) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI entityref_get_lastChild( @@ -237,7 +237,7 @@ static HRESULT WINAPI entityref_get_lastChild( IXMLDOMNode** domNode) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI entityref_get_previousSibling( @@ -245,7 +245,7 @@ static HRESULT WINAPI entityref_get_previousSibling( IXMLDOMNode** domNode) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI entityref_get_nextSibling( @@ -253,7 +253,7 @@ static HRESULT WINAPI entityref_get_nextSibling( IXMLDOMNode** domNode) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI entityref_get_attributes( @@ -261,7 +261,7 @@ static HRESULT WINAPI entityref_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(This->node), attributeMap ); + return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); } static HRESULT WINAPI entityref_insertBefore( @@ -270,7 +270,7 @@ static HRESULT WINAPI entityref_insertBefore( IXMLDOMNode** outOldNode) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(This->node), newNode, var1, outOldNode ); + return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(&This->node), newNode, var1, outOldNode ); } static HRESULT WINAPI entityref_replaceChild( @@ -280,7 +280,7 @@ static HRESULT WINAPI entityref_replaceChild( IXMLDOMNode** outOldNode) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(This->node), newNode, oldNode, outOldNode ); + return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(&This->node), newNode, oldNode, outOldNode ); } static HRESULT WINAPI entityref_removeChild( @@ -288,7 +288,7 @@ static HRESULT WINAPI entityref_removeChild( IXMLDOMNode* domNode, IXMLDOMNode** oldNode) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(This->node), domNode, oldNode ); + return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(&This->node), domNode, oldNode ); } static HRESULT WINAPI entityref_appendChild( @@ -296,7 +296,7 @@ static HRESULT WINAPI entityref_appendChild( IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(This->node), newNode, outNewNode ); + return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(&This->node), newNode, outNewNode ); } static HRESULT WINAPI entityref_hasChildNodes( @@ -304,7 +304,7 @@ static HRESULT WINAPI entityref_hasChildNodes( VARIANT_BOOL* pbool) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI entityref_get_ownerDocument( @@ -312,7 +312,7 @@ static HRESULT WINAPI entityref_get_ownerDocument( IXMLDOMDocument** domDocument) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(This->node), domDocument ); + return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(&This->node), domDocument ); } static HRESULT WINAPI entityref_cloneNode( @@ -320,7 +320,7 @@ static HRESULT WINAPI entityref_cloneNode( VARIANT_BOOL pbool, IXMLDOMNode** outNode) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(This->node), pbool, outNode ); + return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(&This->node), pbool, outNode ); } static HRESULT WINAPI entityref_get_nodeTypeString( @@ -328,7 +328,7 @@ static HRESULT WINAPI entityref_get_nodeTypeString( BSTR* p) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI entityref_get_text( @@ -336,7 +336,7 @@ static HRESULT WINAPI entityref_get_text( BSTR* p) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI entityref_put_text( @@ -344,7 +344,7 @@ static HRESULT WINAPI entityref_put_text( BSTR p) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI entityref_get_specified( @@ -352,7 +352,7 @@ static HRESULT WINAPI entityref_get_specified( VARIANT_BOOL* pbool) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI entityref_get_definition( @@ -360,7 +360,7 @@ static HRESULT WINAPI entityref_get_definition( IXMLDOMNode** domNode) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI entityref_get_nodeTypedValue( @@ -368,7 +368,7 @@ static HRESULT WINAPI entityref_get_nodeTypedValue( VARIANT* var1) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI entityref_put_nodeTypedValue( @@ -376,7 +376,7 @@ static HRESULT WINAPI entityref_put_nodeTypedValue( VARIANT var1) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI entityref_get_dataType( @@ -384,7 +384,7 @@ static HRESULT WINAPI entityref_get_dataType( VARIANT* var1) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI entityref_put_dataType( @@ -392,7 +392,7 @@ static HRESULT WINAPI entityref_put_dataType( BSTR p) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI entityref_get_xml( @@ -400,7 +400,7 @@ static HRESULT WINAPI entityref_get_xml( BSTR* p) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI entityref_transformNode( @@ -408,7 +408,7 @@ static HRESULT WINAPI entityref_transformNode( IXMLDOMNode* domNode, BSTR* p) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(This->node), domNode, p ); + return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(&This->node), domNode, p ); } static HRESULT WINAPI entityref_selectNodes( @@ -416,7 +416,7 @@ static HRESULT WINAPI entityref_selectNodes( BSTR p, IXMLDOMNodeList** outList) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(This->node), p, outList ); + return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(&This->node), p, outList ); } static HRESULT WINAPI entityref_selectSingleNode( @@ -424,7 +424,7 @@ static HRESULT WINAPI entityref_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(This->node), p, outNode ); + return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(&This->node), p, outNode ); } static HRESULT WINAPI entityref_get_parsed( @@ -432,7 +432,7 @@ static HRESULT WINAPI entityref_get_parsed( VARIANT_BOOL* pbool) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI entityref_get_namespaceURI( @@ -440,7 +440,7 @@ static HRESULT WINAPI entityref_get_namespaceURI( BSTR* p) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI entityref_get_prefix( @@ -448,7 +448,7 @@ static HRESULT WINAPI entityref_get_prefix( BSTR* p) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI entityref_get_baseName( @@ -456,7 +456,7 @@ static HRESULT WINAPI entityref_get_baseName( BSTR* p) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI entityref_transformNodeToObject( @@ -464,7 +464,7 @@ static HRESULT WINAPI entityref_transformNodeToObject( IXMLDOMNode* domNode, VARIANT var1) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(This->node), domNode, var1 ); + return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(&This->node), domNode, var1 ); } static const struct IXMLDOMEntityReferenceVtbl entityref_vtbl = @@ -525,12 +525,7 @@ IUnknown* create_doc_entity_ref( xmlNodePtr entity ) This->lpVtbl = &entityref_vtbl; This->ref = 1; - This->node = create_basic_node( entity, (IUnknown*)&This->lpVtbl, NULL ); - if(!This->node) - { - HeapFree(GetProcessHeap(), 0, This); - return NULL; - } + init_xmlnode(&This->node, entity, (IUnknown*)&This->lpVtbl, NULL); return (IUnknown*) &This->lpVtbl; } diff --git a/reactos/dll/win32/msxml3/msxml_private.h b/reactos/dll/win32/msxml3/msxml_private.h index 4a991aec474..d62a8a467d2 100644 --- a/reactos/dll/win32/msxml3/msxml_private.h +++ b/reactos/dll/win32/msxml3/msxml_private.h @@ -159,7 +159,7 @@ static inline IXMLDOMNode *IXMLDOMNode_from_impl(xmlnode *This) return (IXMLDOMNode*)&This->lpVtbl; } -extern xmlnode *create_basic_node(xmlNodePtr,IUnknown*,dispex_static_data_t*); +extern void init_xmlnode(xmlnode*,xmlNodePtr,IUnknown*,dispex_static_data_t*); extern void destroy_xmlnode(xmlnode*); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument2 **document); diff --git a/reactos/dll/win32/msxml3/node.c b/reactos/dll/win32/msxml3/node.c index 643f99efafb..93d80320958 100644 --- a/reactos/dll/win32/msxml3/node.c +++ b/reactos/dll/win32/msxml3/node.c @@ -128,8 +128,10 @@ static ULONG WINAPI xmlnode_Release( return IUnknown_Release(This->pUnkOuter); ref = InterlockedDecrement( &This->ref ); - if(!ref) + if(!ref) { destroy_xmlnode(This); + HeapFree( GetProcessHeap(), 0, This ); + } return ref; } @@ -1512,34 +1514,20 @@ void destroy_xmlnode(xmlnode *This) { if(This->node) xmldoc_release(This->node->doc); - HeapFree( GetProcessHeap(), 0, This ); } -xmlnode *create_basic_node( xmlNodePtr node, IUnknown *pUnkOuter, dispex_static_data_t *dispex_data ) +void init_xmlnode(xmlnode *This, xmlNodePtr node, IUnknown *outer, dispex_static_data_t *dispex_data ) { - xmlnode *This; - - This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); - if ( !This ) - return NULL; - if(node) xmldoc_add_ref( node->doc ); This->lpVtbl = &xmlnode_vtbl; - - if(pUnkOuter) - This->pUnkOuter = pUnkOuter; /* Don't take a ref on outer Unknown */ - else - This->pUnkOuter = NULL; + This->ref = 1; + This->node = node; + This->pUnkOuter = outer; if(dispex_data) init_dispex(&This->dispex, This->pUnkOuter, dispex_data); - - This->ref = 1; - This->node = node; - - return This; } IXMLDOMNode *create_node( xmlNodePtr node ) @@ -1572,9 +1560,18 @@ IXMLDOMNode *create_node( xmlNodePtr node ) case XML_DOCUMENT_NODE: pUnk = create_domdoc( node ); break; - default: + default: { + xmlnode *new_node; + FIXME("only creating basic node for type %d\n", node->type); - pUnk = (IUnknown*)&create_basic_node( node, NULL, NULL )->lpVtbl; + + new_node = heap_alloc(sizeof(xmlnode)); + if(!new_node) + return NULL; + + init_xmlnode(new_node, node, NULL, NULL); + pUnk = (IUnknown*)IXMLDOMNode_from_impl(new_node); + } } hr = IUnknown_QueryInterface(pUnk, &IID_IXMLDOMNode, (LPVOID*)&ret); diff --git a/reactos/dll/win32/msxml3/pi.c b/reactos/dll/win32/msxml3/pi.c index 859e12838be..e814b8d1910 100644 --- a/reactos/dll/win32/msxml3/pi.c +++ b/reactos/dll/win32/msxml3/pi.c @@ -39,9 +39,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _dom_pi { + xmlnode node; const struct IXMLDOMProcessingInstructionVtbl *lpVtbl; LONG ref; - xmlnode *node; } dom_pi; static inline dom_pi *impl_from_IXMLDOMProcessingInstruction( IXMLDOMProcessingInstruction *iface ) @@ -65,7 +65,7 @@ static HRESULT WINAPI dom_pi_QueryInterface( } else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { - *ppvObject = IXMLDOMNode_from_impl(This->node); + *ppvObject = IXMLDOMNode_from_impl(&This->node); } else { @@ -93,7 +93,7 @@ static ULONG WINAPI dom_pi_Release( ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { - destroy_xmlnode(This->node); + destroy_xmlnode(&This->node); HeapFree( GetProcessHeap(), 0, This ); } @@ -182,7 +182,7 @@ static HRESULT WINAPI dom_pi_get_nodeName( BSTR* p ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI dom_pi_get_nodeValue( @@ -190,7 +190,7 @@ static HRESULT WINAPI dom_pi_get_nodeValue( VARIANT* var1 ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI dom_pi_put_nodeValue( @@ -217,7 +217,7 @@ static HRESULT WINAPI dom_pi_put_nodeValue( SysFreeString(sTarget); } - return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI dom_pi_get_nodeType( @@ -225,7 +225,7 @@ static HRESULT WINAPI dom_pi_get_nodeType( DOMNodeType* domNodeType ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(This->node), domNodeType ); + return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(&This->node), domNodeType ); } static HRESULT WINAPI dom_pi_get_parentNode( @@ -233,7 +233,7 @@ static HRESULT WINAPI dom_pi_get_parentNode( IXMLDOMNode** parent ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(This->node), parent ); + return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(&This->node), parent ); } static HRESULT WINAPI dom_pi_get_childNodes( @@ -241,7 +241,7 @@ static HRESULT WINAPI dom_pi_get_childNodes( IXMLDOMNodeList** outList) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(This->node), outList ); + return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); } static HRESULT WINAPI dom_pi_get_firstChild( @@ -249,7 +249,7 @@ static HRESULT WINAPI dom_pi_get_firstChild( IXMLDOMNode** domNode) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI dom_pi_get_lastChild( @@ -257,7 +257,7 @@ static HRESULT WINAPI dom_pi_get_lastChild( IXMLDOMNode** domNode) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI dom_pi_get_previousSibling( @@ -265,7 +265,7 @@ static HRESULT WINAPI dom_pi_get_previousSibling( IXMLDOMNode** domNode) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI dom_pi_get_nextSibling( @@ -273,7 +273,7 @@ static HRESULT WINAPI dom_pi_get_nextSibling( IXMLDOMNode** domNode) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI dom_pi_get_attributes( @@ -281,7 +281,7 @@ static HRESULT WINAPI dom_pi_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(This->node), attributeMap ); + return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); } static HRESULT WINAPI dom_pi_insertBefore( @@ -290,7 +290,7 @@ static HRESULT WINAPI dom_pi_insertBefore( IXMLDOMNode** outOldNode) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(This->node), newNode, var1, outOldNode ); + return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(&This->node), newNode, var1, outOldNode ); } static HRESULT WINAPI dom_pi_replaceChild( @@ -300,7 +300,7 @@ static HRESULT WINAPI dom_pi_replaceChild( IXMLDOMNode** outOldNode) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(This->node), newNode, oldNode, outOldNode ); + return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(&This->node), newNode, oldNode, outOldNode ); } static HRESULT WINAPI dom_pi_removeChild( @@ -308,7 +308,7 @@ static HRESULT WINAPI dom_pi_removeChild( IXMLDOMNode* domNode, IXMLDOMNode** oldNode) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(This->node), domNode, oldNode ); + return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(&This->node), domNode, oldNode ); } static HRESULT WINAPI dom_pi_appendChild( @@ -316,7 +316,7 @@ static HRESULT WINAPI dom_pi_appendChild( IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(This->node), newNode, outNewNode ); + return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(&This->node), newNode, outNewNode ); } static HRESULT WINAPI dom_pi_hasChildNodes( @@ -324,7 +324,7 @@ static HRESULT WINAPI dom_pi_hasChildNodes( VARIANT_BOOL* pbool) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI dom_pi_get_ownerDocument( @@ -332,7 +332,7 @@ static HRESULT WINAPI dom_pi_get_ownerDocument( IXMLDOMDocument** domDocument) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(This->node), domDocument ); + return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(&This->node), domDocument ); } static HRESULT WINAPI dom_pi_cloneNode( @@ -340,7 +340,7 @@ static HRESULT WINAPI dom_pi_cloneNode( VARIANT_BOOL pbool, IXMLDOMNode** outNode) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(This->node), pbool, outNode ); + return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(&This->node), pbool, outNode ); } static HRESULT WINAPI dom_pi_get_nodeTypeString( @@ -348,7 +348,7 @@ static HRESULT WINAPI dom_pi_get_nodeTypeString( BSTR* p) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI dom_pi_get_text( @@ -356,7 +356,7 @@ static HRESULT WINAPI dom_pi_get_text( BSTR* p) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI dom_pi_put_text( @@ -364,7 +364,7 @@ static HRESULT WINAPI dom_pi_put_text( BSTR p) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI dom_pi_get_specified( @@ -372,7 +372,7 @@ static HRESULT WINAPI dom_pi_get_specified( VARIANT_BOOL* pbool) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI dom_pi_get_definition( @@ -380,7 +380,7 @@ static HRESULT WINAPI dom_pi_get_definition( IXMLDOMNode** domNode) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI dom_pi_get_nodeTypedValue( @@ -388,7 +388,7 @@ static HRESULT WINAPI dom_pi_get_nodeTypedValue( VARIANT* var1) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI dom_pi_put_nodeTypedValue( @@ -396,7 +396,7 @@ static HRESULT WINAPI dom_pi_put_nodeTypedValue( VARIANT var1) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI dom_pi_get_dataType( @@ -404,7 +404,7 @@ static HRESULT WINAPI dom_pi_get_dataType( VARIANT* var1) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI dom_pi_put_dataType( @@ -412,7 +412,7 @@ static HRESULT WINAPI dom_pi_put_dataType( BSTR p) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI dom_pi_get_xml( @@ -420,7 +420,7 @@ static HRESULT WINAPI dom_pi_get_xml( BSTR* p) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI dom_pi_transformNode( @@ -428,7 +428,7 @@ static HRESULT WINAPI dom_pi_transformNode( IXMLDOMNode* domNode, BSTR* p) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(This->node), domNode, p ); + return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(&This->node), domNode, p ); } static HRESULT WINAPI dom_pi_selectNodes( @@ -436,7 +436,7 @@ static HRESULT WINAPI dom_pi_selectNodes( BSTR p, IXMLDOMNodeList** outList) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(This->node), p, outList ); + return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(&This->node), p, outList ); } static HRESULT WINAPI dom_pi_selectSingleNode( @@ -444,7 +444,7 @@ static HRESULT WINAPI dom_pi_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(This->node), p, outNode ); + return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(&This->node), p, outNode ); } static HRESULT WINAPI dom_pi_get_parsed( @@ -452,7 +452,7 @@ static HRESULT WINAPI dom_pi_get_parsed( VARIANT_BOOL* pbool) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI dom_pi_get_namespaceURI( @@ -460,7 +460,7 @@ static HRESULT WINAPI dom_pi_get_namespaceURI( BSTR* p) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI dom_pi_get_prefix( @@ -468,7 +468,7 @@ static HRESULT WINAPI dom_pi_get_prefix( BSTR* p) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI dom_pi_get_baseName( @@ -476,7 +476,7 @@ static HRESULT WINAPI dom_pi_get_baseName( BSTR* p) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI dom_pi_transformNodeToObject( @@ -484,7 +484,7 @@ static HRESULT WINAPI dom_pi_transformNodeToObject( IXMLDOMNode* domNode, VARIANT var1) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(This->node), domNode, var1 ); + return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(&This->node), domNode, var1 ); } static HRESULT WINAPI dom_pi_get_target( @@ -493,7 +493,7 @@ static HRESULT WINAPI dom_pi_get_target( { /* target returns the same value as nodeName property */ dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI dom_pi_get_data( @@ -507,7 +507,7 @@ static HRESULT WINAPI dom_pi_get_data( if(!p) return E_INVALIDARG; - hr = IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), &vRet ); + hr = IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), &vRet ); if(hr == S_OK) { *p = V_BSTR(&vRet); @@ -544,7 +544,7 @@ static HRESULT WINAPI dom_pi_put_data( V_VT(&val) = VT_BSTR; V_BSTR(&val) = data; - hr = IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), val ); + hr = IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(&This->node), val ); return hr; } @@ -611,12 +611,7 @@ IUnknown* create_pi( xmlNodePtr pi ) This->lpVtbl = &dom_pi_vtbl; This->ref = 1; - This->node = create_basic_node( pi, (IUnknown*)&This->lpVtbl, NULL ); - if(!This->node) - { - HeapFree(GetProcessHeap(), 0, This); - return NULL; - } + init_xmlnode(&This->node, pi, (IUnknown*)&This->lpVtbl, NULL); return (IUnknown*) &This->lpVtbl; } diff --git a/reactos/dll/win32/msxml3/text.c b/reactos/dll/win32/msxml3/text.c index a384beae7c3..6380a0e50ce 100644 --- a/reactos/dll/win32/msxml3/text.c +++ b/reactos/dll/win32/msxml3/text.c @@ -40,9 +40,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _domtext { + xmlnode node; const struct IXMLDOMTextVtbl *lpVtbl; LONG ref; - xmlnode *node; } domtext; static inline domtext *impl_from_IXMLDOMText( IXMLDOMText *iface ) @@ -67,7 +67,7 @@ static HRESULT WINAPI domtext_QueryInterface( } else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { - *ppvObject = IXMLDOMNode_from_impl(This->node); + *ppvObject = IXMLDOMNode_from_impl(&This->node); } else if ( IsEqualGUID( riid, &IID_IXMLDOMElement ) || IsEqualGUID( riid, &IID_IXMLDOMCDATASection ) ) @@ -102,7 +102,7 @@ static ULONG WINAPI domtext_Release( ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { - destroy_xmlnode(This->node); + destroy_xmlnode(&This->node); HeapFree( GetProcessHeap(), 0, This ); } @@ -191,7 +191,7 @@ static HRESULT WINAPI domtext_get_nodeName( BSTR* p ) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domtext_get_nodeValue( @@ -199,7 +199,7 @@ static HRESULT WINAPI domtext_get_nodeValue( VARIANT* var1 ) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domtext_put_nodeValue( @@ -207,7 +207,7 @@ static HRESULT WINAPI domtext_put_nodeValue( VARIANT var1 ) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domtext_get_nodeType( @@ -215,7 +215,7 @@ static HRESULT WINAPI domtext_get_nodeType( DOMNodeType* domNodeType ) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(This->node), domNodeType ); + return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(&This->node), domNodeType ); } static HRESULT WINAPI domtext_get_parentNode( @@ -223,7 +223,7 @@ static HRESULT WINAPI domtext_get_parentNode( IXMLDOMNode** parent ) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(This->node), parent ); + return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(&This->node), parent ); } static HRESULT WINAPI domtext_get_childNodes( @@ -231,7 +231,7 @@ static HRESULT WINAPI domtext_get_childNodes( IXMLDOMNodeList** outList) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(This->node), outList ); + return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); } static HRESULT WINAPI domtext_get_firstChild( @@ -239,7 +239,7 @@ static HRESULT WINAPI domtext_get_firstChild( IXMLDOMNode** domNode) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domtext_get_lastChild( @@ -247,7 +247,7 @@ static HRESULT WINAPI domtext_get_lastChild( IXMLDOMNode** domNode) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domtext_get_previousSibling( @@ -255,7 +255,7 @@ static HRESULT WINAPI domtext_get_previousSibling( IXMLDOMNode** domNode) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domtext_get_nextSibling( @@ -263,7 +263,7 @@ static HRESULT WINAPI domtext_get_nextSibling( IXMLDOMNode** domNode) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domtext_get_attributes( @@ -271,7 +271,7 @@ static HRESULT WINAPI domtext_get_attributes( IXMLDOMNamedNodeMap** attributeMap) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(This->node), attributeMap ); + return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(&This->node), attributeMap ); } static HRESULT WINAPI domtext_insertBefore( @@ -280,7 +280,7 @@ static HRESULT WINAPI domtext_insertBefore( IXMLDOMNode** outOldNode) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(This->node), newNode, var1, outOldNode ); + return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(&This->node), newNode, var1, outOldNode ); } static HRESULT WINAPI domtext_replaceChild( @@ -290,7 +290,7 @@ static HRESULT WINAPI domtext_replaceChild( IXMLDOMNode** outOldNode) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(This->node), newNode, oldNode, outOldNode ); + return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(&This->node), newNode, oldNode, outOldNode ); } static HRESULT WINAPI domtext_removeChild( @@ -298,7 +298,7 @@ static HRESULT WINAPI domtext_removeChild( IXMLDOMNode* domNode, IXMLDOMNode** oldNode) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(This->node), domNode, oldNode ); + return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(&This->node), domNode, oldNode ); } static HRESULT WINAPI domtext_appendChild( @@ -306,7 +306,7 @@ static HRESULT WINAPI domtext_appendChild( IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(This->node), newNode, outNewNode ); + return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(&This->node), newNode, outNewNode ); } static HRESULT WINAPI domtext_hasChildNodes( @@ -314,7 +314,7 @@ static HRESULT WINAPI domtext_hasChildNodes( VARIANT_BOOL* pbool) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI domtext_get_ownerDocument( @@ -322,7 +322,7 @@ static HRESULT WINAPI domtext_get_ownerDocument( IXMLDOMDocument** domDocument) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(This->node), domDocument ); + return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(&This->node), domDocument ); } static HRESULT WINAPI domtext_cloneNode( @@ -330,7 +330,7 @@ static HRESULT WINAPI domtext_cloneNode( VARIANT_BOOL pbool, IXMLDOMNode** outNode) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(This->node), pbool, outNode ); + return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(&This->node), pbool, outNode ); } static HRESULT WINAPI domtext_get_nodeTypeString( @@ -338,7 +338,7 @@ static HRESULT WINAPI domtext_get_nodeTypeString( BSTR* p) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domtext_get_text( @@ -346,7 +346,7 @@ static HRESULT WINAPI domtext_get_text( BSTR* p) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domtext_put_text( @@ -354,7 +354,7 @@ static HRESULT WINAPI domtext_put_text( BSTR p) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domtext_get_specified( @@ -362,7 +362,7 @@ static HRESULT WINAPI domtext_get_specified( VARIANT_BOOL* pbool) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI domtext_get_definition( @@ -370,7 +370,7 @@ static HRESULT WINAPI domtext_get_definition( IXMLDOMNode** domNode) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(This->node), domNode ); + return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(&This->node), domNode ); } static HRESULT WINAPI domtext_get_nodeTypedValue( @@ -378,7 +378,7 @@ static HRESULT WINAPI domtext_get_nodeTypedValue( VARIANT* var1) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domtext_put_nodeTypedValue( @@ -386,7 +386,7 @@ static HRESULT WINAPI domtext_put_nodeTypedValue( VARIANT var1) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domtext_get_dataType( @@ -394,7 +394,7 @@ static HRESULT WINAPI domtext_get_dataType( VARIANT* var1) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(This->node), var1 ); + return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(&This->node), var1 ); } static HRESULT WINAPI domtext_put_dataType( @@ -402,7 +402,7 @@ static HRESULT WINAPI domtext_put_dataType( BSTR p) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domtext_get_xml( @@ -410,7 +410,7 @@ static HRESULT WINAPI domtext_get_xml( BSTR* p) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domtext_transformNode( @@ -418,7 +418,7 @@ static HRESULT WINAPI domtext_transformNode( IXMLDOMNode* domNode, BSTR* p) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(This->node), domNode, p ); + return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(&This->node), domNode, p ); } static HRESULT WINAPI domtext_selectNodes( @@ -426,7 +426,7 @@ static HRESULT WINAPI domtext_selectNodes( BSTR p, IXMLDOMNodeList** outList) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(This->node), p, outList ); + return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(&This->node), p, outList ); } static HRESULT WINAPI domtext_selectSingleNode( @@ -434,7 +434,7 @@ static HRESULT WINAPI domtext_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(This->node), p, outNode ); + return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(&This->node), p, outNode ); } static HRESULT WINAPI domtext_get_parsed( @@ -442,7 +442,7 @@ static HRESULT WINAPI domtext_get_parsed( VARIANT_BOOL* pbool) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(This->node), pbool ); + return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(&This->node), pbool ); } static HRESULT WINAPI domtext_get_namespaceURI( @@ -450,7 +450,7 @@ static HRESULT WINAPI domtext_get_namespaceURI( BSTR* p) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domtext_get_prefix( @@ -458,7 +458,7 @@ static HRESULT WINAPI domtext_get_prefix( BSTR* p) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domtext_get_baseName( @@ -466,7 +466,7 @@ static HRESULT WINAPI domtext_get_baseName( BSTR* p) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(This->node), p ); + return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); } static HRESULT WINAPI domtext_transformNodeToObject( @@ -474,7 +474,7 @@ static HRESULT WINAPI domtext_transformNodeToObject( IXMLDOMNode* domNode, VARIANT var1) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(This->node), domNode, var1 ); + return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(&This->node), domNode, var1 ); } static HRESULT WINAPI domtext_get_data( @@ -488,7 +488,7 @@ static HRESULT WINAPI domtext_get_data( if(!p) return E_INVALIDARG; - hr = IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), &vRet ); + hr = IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), &vRet ); if(hr == S_OK) { *p = V_BSTR(&vRet); @@ -510,7 +510,7 @@ static HRESULT WINAPI domtext_put_data( V_VT(&val) = VT_BSTR; V_BSTR(&val) = data; - hr = IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), val ); + hr = IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(&This->node), val ); return hr; } @@ -528,7 +528,7 @@ static HRESULT WINAPI domtext_get_length( if(!len) return E_INVALIDARG; - pContent = xmlNodeGetContent(This->node->node); + pContent = xmlNodeGetContent(This->node.node); if(pContent) { nLength = xmlStrlen(pContent); @@ -561,7 +561,7 @@ static HRESULT WINAPI domtext_substringData( if(count == 0) return hr; - pContent = xmlNodeGetContent(This->node->node); + pContent = xmlNodeGetContent(This->node.node); if(pContent) { nLength = xmlStrlen(pContent); @@ -601,7 +601,7 @@ static HRESULT WINAPI domtext_appendData( pContent = xmlChar_from_wchar( p ); if(pContent) { - if(xmlTextConcat(This->node->node, pContent, SysStringLen(p) ) == 0) + if(xmlTextConcat(This->node.node, pContent, SysStringLen(p)) == 0) hr = S_OK; else hr = E_FAIL; @@ -635,7 +635,7 @@ static HRESULT WINAPI domtext_insertData( return E_INVALIDARG; } - pXmlContent = xmlNodeGetContent(This->node->node); + pXmlContent = xmlNodeGetContent(This->node.node); if(pXmlContent) { BSTR sContent = bstr_from_xmlChar( pXmlContent ); @@ -666,7 +666,7 @@ static HRESULT WINAPI domtext_insertData( str = xmlChar_from_wchar(sNewString); if(str) { - xmlNodeSetContent(This->node->node, str); + xmlNodeSetContent(This->node.node, str); hr = S_OK; } HeapFree(GetProcessHeap(), 0, str); @@ -774,12 +774,7 @@ IUnknown* create_text( xmlNodePtr text ) This->lpVtbl = &domtext_vtbl; This->ref = 1; - This->node = create_basic_node( text, (IUnknown*)&This->lpVtbl, NULL ); - if(!This->node) - { - HeapFree(GetProcessHeap(), 0, This); - return NULL; - } + init_xmlnode(&This->node, text, (IUnknown*)&This->lpVtbl, NULL); return (IUnknown*) &This->lpVtbl; }