Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-07 21:25:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

-sync msxml3 with wine 1.1.31

Browse source 
svn path=/trunk/; revision=43619
This commit is contained in:
Christoph von Wittich 2009-10-19 18:58:31 +00:00
parent 25db485c93
commit 3d8e1d4e02
11 changed files with 365 additions and 447 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
reactos/dll/win32/msxml3/attribute.c
View file

@ -41,8 +41,7 @@ typedef struct _domattr
{ {
const struct IXMLDOMAttributeVtbl *lpVtbl; const struct IXMLDOMAttributeVtbl *lpVtbl;
LONG ref; LONG ref;
IUnknown *node_unk; xmlnode *node;
IXMLDOMNode *node;
} domattr; } domattr;
static inline domattr *impl_from_IXMLDOMAttribute( IXMLDOMAttribute *iface ) static inline domattr *impl_from_IXMLDOMAttribute( IXMLDOMAttribute *iface )
@ -66,7 +65,7 @@ static HRESULT WINAPI domattr_QueryInterface(
} }
else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) )
{ {
return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); *ppvObject = IXMLDOMNode_from_impl(This->node);
} }
else else
{ {
@ -74,8 +73,7 @@ static HRESULT WINAPI domattr_QueryInterface(
return E_NOINTERFACE; return E_NOINTERFACE;
} }
IXMLDOMAttribute_AddRef( iface ); IXMLDOMText_AddRef((IUnknown*)*ppvObject);
return S_OK; return S_OK;
} }
@ -95,7 +93,7 @@ static ULONG WINAPI domattr_Release(
ref = InterlockedDecrement( &This->ref ); ref = InterlockedDecrement( &This->ref );
if ( ref == 0 ) if ( ref == 0 )
{ {
IUnknown_Release( This->node_unk ); destroy_xmlnode(This->node);
HeapFree( GetProcessHeap(), 0, This ); HeapFree( GetProcessHeap(), 0, This );
} }
@ -183,7 +181,7 @@ static HRESULT WINAPI domattr_get_nodeName(
BSTR* p ) BSTR* p )
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_nodeName( This->node, p ); return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domattr_get_nodeValue( static HRESULT WINAPI domattr_get_nodeValue(
@ -191,7 +189,7 @@ static HRESULT WINAPI domattr_get_nodeValue(
VARIANT* var1 ) VARIANT* var1 )
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_nodeValue( This->node, var1 ); return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domattr_put_nodeValue( static HRESULT WINAPI domattr_put_nodeValue(
@ -199,7 +197,7 @@ static HRESULT WINAPI domattr_put_nodeValue(
VARIANT var1 ) VARIANT var1 )
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_put_nodeValue( This->node, var1 ); return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domattr_get_nodeType( static HRESULT WINAPI domattr_get_nodeType(
@ -207,7 +205,7 @@ static HRESULT WINAPI domattr_get_nodeType(
DOMNodeType* domNodeType ) DOMNodeType* domNodeType )
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_nodeType( This->node, domNodeType ); return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(This->node), domNodeType );
} }
static HRESULT WINAPI domattr_get_parentNode( static HRESULT WINAPI domattr_get_parentNode(
@ -215,7 +213,7 @@ static HRESULT WINAPI domattr_get_parentNode(
IXMLDOMNode** parent ) IXMLDOMNode** parent )
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_parentNode( This->node, parent ); return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(This->node), parent );
} }
static HRESULT WINAPI domattr_get_childNodes( static HRESULT WINAPI domattr_get_childNodes(
@ -223,7 +221,7 @@ static HRESULT WINAPI domattr_get_childNodes(
IXMLDOMNodeList** outList) IXMLDOMNodeList** outList)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_childNodes( This->node, outList ); return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(This->node), outList );
} }
static HRESULT WINAPI domattr_get_firstChild( static HRESULT WINAPI domattr_get_firstChild(
@ -231,7 +229,7 @@ static HRESULT WINAPI domattr_get_firstChild(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_firstChild( This->node, domNode ); return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domattr_get_lastChild( static HRESULT WINAPI domattr_get_lastChild(
@ -239,7 +237,7 @@ static HRESULT WINAPI domattr_get_lastChild(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_lastChild( This->node, domNode ); return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domattr_get_previousSibling( static HRESULT WINAPI domattr_get_previousSibling(
@ -247,7 +245,7 @@ static HRESULT WINAPI domattr_get_previousSibling(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_previousSibling( This->node, domNode ); return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domattr_get_nextSibling( static HRESULT WINAPI domattr_get_nextSibling(
@ -255,7 +253,7 @@ static HRESULT WINAPI domattr_get_nextSibling(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_nextSibling( This->node, domNode ); return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domattr_get_attributes( static HRESULT WINAPI domattr_get_attributes(
@ -263,7 +261,7 @@ static HRESULT WINAPI domattr_get_attributes(
IXMLDOMNamedNodeMap** attributeMap) IXMLDOMNamedNodeMap** attributeMap)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_attributes( This->node, attributeMap ); return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(This->node), attributeMap );
} }
static HRESULT WINAPI domattr_insertBefore( static HRESULT WINAPI domattr_insertBefore(
@ -272,7 +270,7 @@ static HRESULT WINAPI domattr_insertBefore(
IXMLDOMNode** outOldNode) IXMLDOMNode** outOldNode)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_insertBefore( This->node, newNode, var1, outOldNode ); return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(This->node), newNode, var1, outOldNode );
} }
static HRESULT WINAPI domattr_replaceChild( static HRESULT WINAPI domattr_replaceChild(
@ -282,7 +280,7 @@ static HRESULT WINAPI domattr_replaceChild(
IXMLDOMNode** outOldNode) IXMLDOMNode** outOldNode)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_replaceChild( This->node, newNode, oldNode, outOldNode ); return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(This->node), newNode, oldNode, outOldNode );
} }
static HRESULT WINAPI domattr_removeChild( static HRESULT WINAPI domattr_removeChild(
@ -290,7 +288,7 @@ static HRESULT WINAPI domattr_removeChild(
IXMLDOMNode* domNode, IXMLDOMNode** oldNode) IXMLDOMNode* domNode, IXMLDOMNode** oldNode)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_removeChild( This->node, domNode, oldNode ); return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(This->node), domNode, oldNode );
} }
static HRESULT WINAPI domattr_appendChild( static HRESULT WINAPI domattr_appendChild(
@ -298,7 +296,7 @@ static HRESULT WINAPI domattr_appendChild(
IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) IXMLDOMNode* newNode, IXMLDOMNode** outNewNode)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_appendChild( This->node, newNode, outNewNode ); return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(This->node), newNode, outNewNode );
} }
static HRESULT WINAPI domattr_hasChildNodes( static HRESULT WINAPI domattr_hasChildNodes(
@ -306,7 +304,7 @@ static HRESULT WINAPI domattr_hasChildNodes(
VARIANT_BOOL* pbool) VARIANT_BOOL* pbool)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_hasChildNodes( This->node, pbool ); return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(This->node), pbool );
} }
static HRESULT WINAPI domattr_get_ownerDocument( static HRESULT WINAPI domattr_get_ownerDocument(
@ -314,7 +312,7 @@ static HRESULT WINAPI domattr_get_ownerDocument(
IXMLDOMDocument** domDocument) IXMLDOMDocument** domDocument)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_ownerDocument( This->node, domDocument ); return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(This->node), domDocument );
} }
static HRESULT WINAPI domattr_cloneNode( static HRESULT WINAPI domattr_cloneNode(
@ -322,7 +320,7 @@ static HRESULT WINAPI domattr_cloneNode(
VARIANT_BOOL pbool, IXMLDOMNode** outNode) VARIANT_BOOL pbool, IXMLDOMNode** outNode)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_cloneNode( This->node, pbool, outNode ); return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(This->node), pbool, outNode );
} }
static HRESULT WINAPI domattr_get_nodeTypeString( static HRESULT WINAPI domattr_get_nodeTypeString(
@ -330,7 +328,7 @@ static HRESULT WINAPI domattr_get_nodeTypeString(
BSTR* p) BSTR* p)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_nodeTypeString( This->node, p ); return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domattr_get_text( static HRESULT WINAPI domattr_get_text(
@ -338,7 +336,7 @@ static HRESULT WINAPI domattr_get_text(
BSTR* p) BSTR* p)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_text( This->node, p ); return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domattr_put_text( static HRESULT WINAPI domattr_put_text(
@ -346,7 +344,7 @@ static HRESULT WINAPI domattr_put_text(
BSTR p) BSTR p)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_put_text( This->node, p ); return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domattr_get_specified( static HRESULT WINAPI domattr_get_specified(
@ -354,7 +352,7 @@ static HRESULT WINAPI domattr_get_specified(
VARIANT_BOOL* pbool) VARIANT_BOOL* pbool)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_specified( This->node, pbool ); return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(This->node), pbool );
} }
static HRESULT WINAPI domattr_get_definition( static HRESULT WINAPI domattr_get_definition(
@ -362,7 +360,7 @@ static HRESULT WINAPI domattr_get_definition(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_definition( This->node, domNode ); return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domattr_get_nodeTypedValue( static HRESULT WINAPI domattr_get_nodeTypedValue(
@ -370,7 +368,7 @@ static HRESULT WINAPI domattr_get_nodeTypedValue(
VARIANT* var1) VARIANT* var1)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_nodeTypedValue( This->node, var1 ); return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domattr_put_nodeTypedValue( static HRESULT WINAPI domattr_put_nodeTypedValue(
@ -378,7 +376,7 @@ static HRESULT WINAPI domattr_put_nodeTypedValue(
VARIANT var1) VARIANT var1)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_put_nodeTypedValue( This->node, var1 ); return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domattr_get_dataType( static HRESULT WINAPI domattr_get_dataType(
@ -386,7 +384,7 @@ static HRESULT WINAPI domattr_get_dataType(
VARIANT* var1) VARIANT* var1)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_dataType( This->node, var1 ); return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domattr_put_dataType( static HRESULT WINAPI domattr_put_dataType(
@ -394,7 +392,7 @@ static HRESULT WINAPI domattr_put_dataType(
BSTR p) BSTR p)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_put_dataType( This->node, p ); return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domattr_get_xml( static HRESULT WINAPI domattr_get_xml(
@ -402,7 +400,7 @@ static HRESULT WINAPI domattr_get_xml(
BSTR* p) BSTR* p)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_xml( This->node, p ); return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domattr_transformNode( static HRESULT WINAPI domattr_transformNode(
@ -410,7 +408,7 @@ static HRESULT WINAPI domattr_transformNode(
IXMLDOMNode* domNode, BSTR* p) IXMLDOMNode* domNode, BSTR* p)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_transformNode( This->node, domNode, p ); return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(This->node), domNode, p );
} }
static HRESULT WINAPI domattr_selectNodes( static HRESULT WINAPI domattr_selectNodes(
@ -418,7 +416,7 @@ static HRESULT WINAPI domattr_selectNodes(
BSTR p, IXMLDOMNodeList** outList) BSTR p, IXMLDOMNodeList** outList)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_selectNodes( This->node, p, outList ); return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(This->node), p, outList );
} }
static HRESULT WINAPI domattr_selectSingleNode( static HRESULT WINAPI domattr_selectSingleNode(
@ -426,7 +424,7 @@ static HRESULT WINAPI domattr_selectSingleNode(
BSTR p, IXMLDOMNode** outNode) BSTR p, IXMLDOMNode** outNode)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_selectSingleNode( This->node, p, outNode ); return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(This->node), p, outNode );
} }
static HRESULT WINAPI domattr_get_parsed( static HRESULT WINAPI domattr_get_parsed(
@ -434,7 +432,7 @@ static HRESULT WINAPI domattr_get_parsed(
VARIANT_BOOL* pbool) VARIANT_BOOL* pbool)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_parsed( This->node, pbool ); return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(This->node), pbool );
} }
static HRESULT WINAPI domattr_get_namespaceURI( static HRESULT WINAPI domattr_get_namespaceURI(
@ -442,7 +440,7 @@ static HRESULT WINAPI domattr_get_namespaceURI(
BSTR* p) BSTR* p)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_namespaceURI( This->node, p ); return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domattr_get_prefix( static HRESULT WINAPI domattr_get_prefix(
@ -450,7 +448,7 @@ static HRESULT WINAPI domattr_get_prefix(
BSTR* p) BSTR* p)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_prefix( This->node, p ); return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domattr_get_baseName( static HRESULT WINAPI domattr_get_baseName(
@ -458,7 +456,7 @@ static HRESULT WINAPI domattr_get_baseName(
BSTR* p) BSTR* p)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_baseName( This->node, p ); return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domattr_transformNodeToObject( static HRESULT WINAPI domattr_transformNodeToObject(
@ -466,7 +464,7 @@ static HRESULT WINAPI domattr_transformNodeToObject(
IXMLDOMNode* domNode, VARIANT var1) IXMLDOMNode* domNode, VARIANT var1)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_transformNodeToObject( This->node, domNode, var1 ); return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(This->node), domNode, var1 );
} }
static HRESULT WINAPI domattr_get_name( static HRESULT WINAPI domattr_get_name(
@ -475,7 +473,7 @@ static HRESULT WINAPI domattr_get_name(
{ {
/* name property returns the same value as nodeName */ /* name property returns the same value as nodeName */
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_nodeName( This->node, p ); return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domattr_get_value( static HRESULT WINAPI domattr_get_value(
@ -483,7 +481,7 @@ static HRESULT WINAPI domattr_get_value(
VARIANT *var1) VARIANT *var1)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_get_nodeValue( This->node, var1 ); return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domattr_put_value( static HRESULT WINAPI domattr_put_value(
@ -491,7 +489,7 @@ static HRESULT WINAPI domattr_put_value(
VARIANT var1) VARIANT var1)
{ {
domattr *This = impl_from_IXMLDOMAttribute( iface ); domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_put_nodeValue( This->node, var1 ); return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static const struct IXMLDOMAttributeVtbl domattr_vtbl = static const struct IXMLDOMAttributeVtbl domattr_vtbl =
@ -547,7 +545,6 @@ static const struct IXMLDOMAttributeVtbl domattr_vtbl =
IUnknown* create_attribute( xmlNodePtr attribute ) IUnknown* create_attribute( xmlNodePtr attribute )
{ {
domattr *This; domattr *This;
xmlnode *node;
This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); This = HeapAlloc( GetProcessHeap(), 0, sizeof *This );
if ( !This ) if ( !This )
@ -556,16 +553,13 @@ IUnknown* create_attribute( xmlNodePtr attribute )
This->lpVtbl = &domattr_vtbl; This->lpVtbl = &domattr_vtbl;
This->ref = 1; This->ref = 1;
node = create_basic_node( attribute, (IUnknown*)&This->lpVtbl, NULL ); This->node = create_basic_node( attribute, (IUnknown*)&This->lpVtbl, NULL );
if(!node) if(!This->node)
{ {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
return NULL; return NULL;
} }
This->node_unk = (IUnknown*)&node->lpInternalUnkVtbl;
This->node = IXMLDOMNode_from_impl(node);
return (IUnknown*) &This->lpVtbl; return (IUnknown*) &This->lpVtbl;
} }

108
reactos/dll/win32/msxml3/cdata.c
View file

@ -41,8 +41,7 @@ typedef struct _domcdata
{ {
const struct IXMLDOMCDATASectionVtbl *lpVtbl; const struct IXMLDOMCDATASectionVtbl *lpVtbl;
LONG ref; LONG ref;
IUnknown *node_unk; xmlnode *node;
IXMLDOMNode *node;
} domcdata; } domcdata;
static inline domcdata *impl_from_IXMLDOMCDATASection( IXMLDOMCDATASection *iface ) static inline domcdata *impl_from_IXMLDOMCDATASection( IXMLDOMCDATASection *iface )
@ -67,7 +66,7 @@ static HRESULT WINAPI domcdata_QueryInterface(
} }
else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) )
{ {
return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); *ppvObject = IXMLDOMNode_from_impl(This->node);
} }
else if ( IsEqualGUID( riid, &IID_IXMLDOMText ) || else if ( IsEqualGUID( riid, &IID_IXMLDOMText ) ||
IsEqualGUID( riid, &IID_IXMLDOMElement ) ) IsEqualGUID( riid, &IID_IXMLDOMElement ) )
@ -81,8 +80,7 @@ static HRESULT WINAPI domcdata_QueryInterface(
return E_NOINTERFACE; return E_NOINTERFACE;
} }
IXMLDOMCDATASection_AddRef( iface ); IXMLDOMText_AddRef((IUnknown*)*ppvObject);
return S_OK; return S_OK;
} }
@ -102,7 +100,7 @@ static ULONG WINAPI domcdata_Release(
ref = InterlockedDecrement( &This->ref ); ref = InterlockedDecrement( &This->ref );
if ( ref == 0 ) if ( ref == 0 )
{ {
IUnknown_Release( This->node_unk ); destroy_xmlnode(This->node);
HeapFree( GetProcessHeap(), 0, This ); HeapFree( GetProcessHeap(), 0, This );
} }
@ -191,7 +189,7 @@ static HRESULT WINAPI domcdata_get_nodeName(
BSTR* p ) BSTR* p )
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_nodeName( This->node, p ); return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domcdata_get_nodeValue( static HRESULT WINAPI domcdata_get_nodeValue(
@ -199,7 +197,7 @@ static HRESULT WINAPI domcdata_get_nodeValue(
VARIANT* var1 ) VARIANT* var1 )
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_nodeValue( This->node, var1 ); return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domcdata_put_nodeValue( static HRESULT WINAPI domcdata_put_nodeValue(
@ -207,7 +205,7 @@ static HRESULT WINAPI domcdata_put_nodeValue(
VARIANT var1 ) VARIANT var1 )
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_put_nodeValue( This->node, var1 ); return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domcdata_get_nodeType( static HRESULT WINAPI domcdata_get_nodeType(
@ -215,7 +213,7 @@ static HRESULT WINAPI domcdata_get_nodeType(
DOMNodeType* domNodeType ) DOMNodeType* domNodeType )
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_nodeType( This->node, domNodeType ); return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(This->node), domNodeType );
} }
static HRESULT WINAPI domcdata_get_parentNode( static HRESULT WINAPI domcdata_get_parentNode(
@ -223,7 +221,7 @@ static HRESULT WINAPI domcdata_get_parentNode(
IXMLDOMNode** parent ) IXMLDOMNode** parent )
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_parentNode( This->node, parent ); return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(This->node), parent );
} }
static HRESULT WINAPI domcdata_get_childNodes( static HRESULT WINAPI domcdata_get_childNodes(
@ -231,7 +229,7 @@ static HRESULT WINAPI domcdata_get_childNodes(
IXMLDOMNodeList** outList) IXMLDOMNodeList** outList)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_childNodes( This->node, outList ); return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(This->node), outList );
} }
static HRESULT WINAPI domcdata_get_firstChild( static HRESULT WINAPI domcdata_get_firstChild(
@ -239,7 +237,7 @@ static HRESULT WINAPI domcdata_get_firstChild(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_firstChild( This->node, domNode ); return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domcdata_get_lastChild( static HRESULT WINAPI domcdata_get_lastChild(
@ -247,7 +245,7 @@ static HRESULT WINAPI domcdata_get_lastChild(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_lastChild( This->node, domNode ); return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domcdata_get_previousSibling( static HRESULT WINAPI domcdata_get_previousSibling(
@ -255,7 +253,7 @@ static HRESULT WINAPI domcdata_get_previousSibling(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_previousSibling( This->node, domNode ); return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domcdata_get_nextSibling( static HRESULT WINAPI domcdata_get_nextSibling(
@ -263,7 +261,7 @@ static HRESULT WINAPI domcdata_get_nextSibling(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_nextSibling( This->node, domNode ); return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domcdata_get_attributes( static HRESULT WINAPI domcdata_get_attributes(
@ -271,7 +269,7 @@ static HRESULT WINAPI domcdata_get_attributes(
IXMLDOMNamedNodeMap** attributeMap) IXMLDOMNamedNodeMap** attributeMap)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_attributes( This->node, attributeMap ); return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(This->node), attributeMap );
} }
static HRESULT WINAPI domcdata_insertBefore( static HRESULT WINAPI domcdata_insertBefore(
@ -280,7 +278,7 @@ static HRESULT WINAPI domcdata_insertBefore(
IXMLDOMNode** outOldNode) IXMLDOMNode** outOldNode)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_insertBefore( This->node, newNode, var1, outOldNode ); return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(This->node), newNode, var1, outOldNode );
} }
static HRESULT WINAPI domcdata_replaceChild( static HRESULT WINAPI domcdata_replaceChild(
@ -290,7 +288,7 @@ static HRESULT WINAPI domcdata_replaceChild(
IXMLDOMNode** outOldNode) IXMLDOMNode** outOldNode)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_replaceChild( This->node, newNode, oldNode, outOldNode ); return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(This->node), newNode, oldNode, outOldNode );
} }
static HRESULT WINAPI domcdata_removeChild( static HRESULT WINAPI domcdata_removeChild(
@ -298,7 +296,7 @@ static HRESULT WINAPI domcdata_removeChild(
IXMLDOMNode* domNode, IXMLDOMNode** oldNode) IXMLDOMNode* domNode, IXMLDOMNode** oldNode)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_removeChild( This->node, domNode, oldNode ); return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(This->node), domNode, oldNode );
} }
static HRESULT WINAPI domcdata_appendChild( static HRESULT WINAPI domcdata_appendChild(
@ -306,7 +304,7 @@ static HRESULT WINAPI domcdata_appendChild(
IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) IXMLDOMNode* newNode, IXMLDOMNode** outNewNode)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_appendChild( This->node, newNode, outNewNode ); return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(This->node), newNode, outNewNode );
} }
static HRESULT WINAPI domcdata_hasChildNodes( static HRESULT WINAPI domcdata_hasChildNodes(
@ -314,7 +312,7 @@ static HRESULT WINAPI domcdata_hasChildNodes(
VARIANT_BOOL* pbool) VARIANT_BOOL* pbool)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_hasChildNodes( This->node, pbool ); return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(This->node), pbool );
} }
static HRESULT WINAPI domcdata_get_ownerDocument( static HRESULT WINAPI domcdata_get_ownerDocument(
@ -322,7 +320,7 @@ static HRESULT WINAPI domcdata_get_ownerDocument(
IXMLDOMDocument** domDocument) IXMLDOMDocument** domDocument)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_ownerDocument( This->node, domDocument ); return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(This->node), domDocument );
} }
static HRESULT WINAPI domcdata_cloneNode( static HRESULT WINAPI domcdata_cloneNode(
@ -330,7 +328,7 @@ static HRESULT WINAPI domcdata_cloneNode(
VARIANT_BOOL pbool, IXMLDOMNode** outNode) VARIANT_BOOL pbool, IXMLDOMNode** outNode)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_cloneNode( This->node, pbool, outNode ); return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(This->node), pbool, outNode );
} }
static HRESULT WINAPI domcdata_get_nodeTypeString( static HRESULT WINAPI domcdata_get_nodeTypeString(
@ -338,7 +336,7 @@ static HRESULT WINAPI domcdata_get_nodeTypeString(
BSTR* p) BSTR* p)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_nodeTypeString( This->node, p ); return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domcdata_get_text( static HRESULT WINAPI domcdata_get_text(
@ -346,7 +344,7 @@ static HRESULT WINAPI domcdata_get_text(
BSTR* p) BSTR* p)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_text( This->node, p ); return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domcdata_put_text( static HRESULT WINAPI domcdata_put_text(
@ -354,7 +352,7 @@ static HRESULT WINAPI domcdata_put_text(
BSTR p) BSTR p)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_put_text( This->node, p ); return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domcdata_get_specified( static HRESULT WINAPI domcdata_get_specified(
@ -362,7 +360,7 @@ static HRESULT WINAPI domcdata_get_specified(
VARIANT_BOOL* pbool) VARIANT_BOOL* pbool)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_specified( This->node, pbool ); return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(This->node), pbool );
} }
static HRESULT WINAPI domcdata_get_definition( static HRESULT WINAPI domcdata_get_definition(
@ -370,7 +368,7 @@ static HRESULT WINAPI domcdata_get_definition(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_definition( This->node, domNode ); return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domcdata_get_nodeTypedValue( static HRESULT WINAPI domcdata_get_nodeTypedValue(
@ -378,7 +376,7 @@ static HRESULT WINAPI domcdata_get_nodeTypedValue(
VARIANT* var1) VARIANT* var1)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_nodeTypedValue( This->node, var1 ); return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domcdata_put_nodeTypedValue( static HRESULT WINAPI domcdata_put_nodeTypedValue(
@ -386,7 +384,7 @@ static HRESULT WINAPI domcdata_put_nodeTypedValue(
VARIANT var1) VARIANT var1)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_put_nodeTypedValue( This->node, var1 ); return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domcdata_get_dataType( static HRESULT WINAPI domcdata_get_dataType(
@ -394,7 +392,7 @@ static HRESULT WINAPI domcdata_get_dataType(
VARIANT* var1) VARIANT* var1)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_dataType( This->node, var1 ); return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domcdata_put_dataType( static HRESULT WINAPI domcdata_put_dataType(
@ -402,7 +400,7 @@ static HRESULT WINAPI domcdata_put_dataType(
BSTR p) BSTR p)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_put_dataType( This->node, p ); return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domcdata_get_xml( static HRESULT WINAPI domcdata_get_xml(
@ -410,7 +408,7 @@ static HRESULT WINAPI domcdata_get_xml(
BSTR* p) BSTR* p)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_xml( This->node, p ); return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domcdata_transformNode( static HRESULT WINAPI domcdata_transformNode(
@ -418,7 +416,7 @@ static HRESULT WINAPI domcdata_transformNode(
IXMLDOMNode* domNode, BSTR* p) IXMLDOMNode* domNode, BSTR* p)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_transformNode( This->node, domNode, p ); return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(This->node), domNode, p );
} }
static HRESULT WINAPI domcdata_selectNodes( static HRESULT WINAPI domcdata_selectNodes(
@ -426,7 +424,7 @@ static HRESULT WINAPI domcdata_selectNodes(
BSTR p, IXMLDOMNodeList** outList) BSTR p, IXMLDOMNodeList** outList)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_selectNodes( This->node, p, outList ); return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(This->node), p, outList );
} }
static HRESULT WINAPI domcdata_selectSingleNode( static HRESULT WINAPI domcdata_selectSingleNode(
@ -434,7 +432,7 @@ static HRESULT WINAPI domcdata_selectSingleNode(
BSTR p, IXMLDOMNode** outNode) BSTR p, IXMLDOMNode** outNode)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_selectSingleNode( This->node, p, outNode ); return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(This->node), p, outNode );
} }
static HRESULT WINAPI domcdata_get_parsed( static HRESULT WINAPI domcdata_get_parsed(
@ -442,7 +440,7 @@ static HRESULT WINAPI domcdata_get_parsed(
VARIANT_BOOL* pbool) VARIANT_BOOL* pbool)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_parsed( This->node, pbool ); return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(This->node), pbool );
} }
static HRESULT WINAPI domcdata_get_namespaceURI( static HRESULT WINAPI domcdata_get_namespaceURI(
@ -450,7 +448,7 @@ static HRESULT WINAPI domcdata_get_namespaceURI(
BSTR* p) BSTR* p)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_namespaceURI( This->node, p ); return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domcdata_get_prefix( static HRESULT WINAPI domcdata_get_prefix(
@ -458,7 +456,7 @@ static HRESULT WINAPI domcdata_get_prefix(
BSTR* p) BSTR* p)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_prefix( This->node, p ); return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domcdata_get_baseName( static HRESULT WINAPI domcdata_get_baseName(
@ -466,7 +464,7 @@ static HRESULT WINAPI domcdata_get_baseName(
BSTR* p) BSTR* p)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_get_baseName( This->node, p ); return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domcdata_transformNodeToObject( static HRESULT WINAPI domcdata_transformNodeToObject(
@ -474,7 +472,7 @@ static HRESULT WINAPI domcdata_transformNodeToObject(
IXMLDOMNode* domNode, VARIANT var1) IXMLDOMNode* domNode, VARIANT var1)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_transformNodeToObject( This->node, domNode, var1 ); return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(This->node), domNode, var1 );
} }
static HRESULT WINAPI domcdata_get_data( static HRESULT WINAPI domcdata_get_data(
@ -488,7 +486,7 @@ static HRESULT WINAPI domcdata_get_data(
if(!p) if(!p)
return E_INVALIDARG; return E_INVALIDARG;
hr = IXMLDOMNode_get_nodeValue( This->node, &vRet ); hr = IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), &vRet );
if(hr == S_OK) if(hr == S_OK)
{ {
*p = V_BSTR(&vRet); *p = V_BSTR(&vRet);
@ -510,7 +508,7 @@ static HRESULT WINAPI domcdata_put_data(
V_VT(&val) = VT_BSTR; V_VT(&val) = VT_BSTR;
V_BSTR(&val) = data; V_BSTR(&val) = data;
hr = IXMLDOMNode_put_nodeValue( This->node, val ); hr = IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), val );
return hr; return hr;
} }
@ -520,7 +518,6 @@ static HRESULT WINAPI domcdata_get_length(
LONG *len) LONG *len)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node );
xmlChar *pContent; xmlChar *pContent;
LONG nLength = 0; LONG nLength = 0;
@ -529,7 +526,7 @@ static HRESULT WINAPI domcdata_get_length(
if(!len) if(!len)
return E_INVALIDARG; return E_INVALIDARG;
pContent = xmlNodeGetContent(pDOMNode->node); pContent = xmlNodeGetContent(This->node->node);
if(pContent) if(pContent)
{ {
nLength = xmlStrlen(pContent); nLength = xmlStrlen(pContent);
@ -546,7 +543,6 @@ static HRESULT WINAPI domcdata_substringData(
LONG offset, LONG count, BSTR *p) LONG offset, LONG count, BSTR *p)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node );
xmlChar *pContent; xmlChar *pContent;
LONG nLength = 0; LONG nLength = 0;
HRESULT hr = S_FALSE; HRESULT hr = S_FALSE;
@ -563,7 +559,7 @@ static HRESULT WINAPI domcdata_substringData(
if(count == 0) if(count == 0)
return hr; return hr;
pContent = xmlNodeGetContent(pDOMNode->node); pContent = xmlNodeGetContent(This->node->node);
if(pContent) if(pContent)
{ {
nLength = xmlStrlen(pContent); nLength = xmlStrlen(pContent);
@ -591,7 +587,6 @@ static HRESULT WINAPI domcdata_appendData(
BSTR p) BSTR p)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node );
xmlChar *pContent; xmlChar *pContent;
HRESULT hr = S_FALSE; HRESULT hr = S_FALSE;
@ -604,7 +599,7 @@ static HRESULT WINAPI domcdata_appendData(
pContent = xmlChar_from_wchar( p ); pContent = xmlChar_from_wchar( p );
if(pContent) if(pContent)
{ {
if(xmlTextConcat(pDOMNode->node, pContent, SysStringLen(p) ) == 0) if(xmlTextConcat(This->node->node, pContent, SysStringLen(p) ) == 0)
hr = S_OK; hr = S_OK;
else else
hr = E_FAIL; hr = E_FAIL;
@ -621,7 +616,6 @@ static HRESULT WINAPI domcdata_insertData(
LONG offset, BSTR p) LONG offset, BSTR p)
{ {
domcdata *This = impl_from_IXMLDOMCDATASection( iface ); domcdata *This = impl_from_IXMLDOMCDATASection( iface );
xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node );
xmlChar *pXmlContent; xmlChar *pXmlContent;
BSTR sNewString; BSTR sNewString;
HRESULT hr = S_FALSE; HRESULT hr = S_FALSE;
@ -639,7 +633,7 @@ static HRESULT WINAPI domcdata_insertData(
return E_INVALIDARG; return E_INVALIDARG;
} }
pXmlContent = xmlNodeGetContent(pDOMNode->node); pXmlContent = xmlNodeGetContent(This->node->node);
if(pXmlContent) if(pXmlContent)
{ {
BSTR sContent = bstr_from_xmlChar( pXmlContent ); BSTR sContent = bstr_from_xmlChar( pXmlContent );
@ -670,7 +664,7 @@ static HRESULT WINAPI domcdata_insertData(
str = xmlChar_from_wchar(sNewString); str = xmlChar_from_wchar(sNewString);
if(str) if(str)
{ {
xmlNodeSetContent(pDOMNode->node, str); xmlNodeSetContent(This->node->node, str);
hr = S_OK; hr = S_OK;
} }
HeapFree(GetProcessHeap(), 0, str); HeapFree(GetProcessHeap(), 0, str);
@ -770,7 +764,6 @@ static const struct IXMLDOMCDATASectionVtbl domcdata_vtbl =
IUnknown* create_cdata( xmlNodePtr text ) IUnknown* create_cdata( xmlNodePtr text )
{ {
domcdata *This; domcdata *This;
xmlnode *node;
This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); This = HeapAlloc( GetProcessHeap(), 0, sizeof *This );
if ( !This ) if ( !This )
@ -779,16 +772,13 @@ IUnknown* create_cdata( xmlNodePtr text )
This->lpVtbl = &domcdata_vtbl; This->lpVtbl = &domcdata_vtbl;
This->ref = 1; This->ref = 1;
node = create_basic_node( text, (IUnknown*)&This->lpVtbl, NULL ); This->node = create_basic_node( text, (IUnknown*)&This->lpVtbl, NULL );
if(!node) if(!This->node)
{ {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
return NULL; return NULL;
} }
This->node_unk = (IUnknown*)&node->lpInternalUnkVtbl;
This->node = IXMLDOMNode_from_impl(node);
return (IUnknown*) &This->lpVtbl; return (IUnknown*) &This->lpVtbl;
} }

112
reactos/dll/win32/msxml3/comment.c
View file

@ -41,8 +41,7 @@ typedef struct _domcomment
{ {
const struct IXMLDOMCommentVtbl *lpVtbl; const struct IXMLDOMCommentVtbl *lpVtbl;
LONG ref; LONG ref;
IUnknown *node_unk; xmlnode *node;
IXMLDOMNode *node;
} domcomment; } domcomment;
static inline domcomment *impl_from_IXMLDOMComment( IXMLDOMComment *iface ) static inline domcomment *impl_from_IXMLDOMComment( IXMLDOMComment *iface )
@ -67,7 +66,7 @@ static HRESULT WINAPI domcomment_QueryInterface(
} }
else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) )
{ {
return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); *ppvObject = IXMLDOMNode_from_impl(This->node);
} }
else else
{ {
@ -75,8 +74,7 @@ static HRESULT WINAPI domcomment_QueryInterface(
return E_NOINTERFACE; return E_NOINTERFACE;
} }
IXMLDOMComment_AddRef( iface ); IXMLDOMText_AddRef((IUnknown*)*ppvObject);
return S_OK; return S_OK;
} }
@ -96,7 +94,7 @@ static ULONG WINAPI domcomment_Release(
ref = InterlockedDecrement( &This->ref ); ref = InterlockedDecrement( &This->ref );
if ( ref == 0 ) if ( ref == 0 )
{ {
IUnknown_Release( This->node_unk ); destroy_xmlnode(This->node);
HeapFree( GetProcessHeap(), 0, This ); HeapFree( GetProcessHeap(), 0, This );
} }
@ -185,7 +183,7 @@ static HRESULT WINAPI domcomment_get_nodeName(
BSTR* p ) BSTR* p )
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_nodeName( This->node, p ); return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domcomment_get_nodeValue( static HRESULT WINAPI domcomment_get_nodeValue(
@ -193,7 +191,7 @@ static HRESULT WINAPI domcomment_get_nodeValue(
VARIANT* var1 ) VARIANT* var1 )
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_nodeValue( This->node, var1 ); return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domcomment_put_nodeValue( static HRESULT WINAPI domcomment_put_nodeValue(
@ -201,7 +199,7 @@ static HRESULT WINAPI domcomment_put_nodeValue(
VARIANT var1 ) VARIANT var1 )
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_put_nodeValue( This->node, var1 ); return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domcomment_get_nodeType( static HRESULT WINAPI domcomment_get_nodeType(
@ -209,7 +207,7 @@ static HRESULT WINAPI domcomment_get_nodeType(
DOMNodeType* domNodeType ) DOMNodeType* domNodeType )
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_nodeType( This->node, domNodeType ); return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(This->node), domNodeType );
} }
static HRESULT WINAPI domcomment_get_parentNode( static HRESULT WINAPI domcomment_get_parentNode(
@ -217,7 +215,7 @@ static HRESULT WINAPI domcomment_get_parentNode(
IXMLDOMNode** parent ) IXMLDOMNode** parent )
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_parentNode( This->node, parent ); return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(This->node), parent );
} }
static HRESULT WINAPI domcomment_get_childNodes( static HRESULT WINAPI domcomment_get_childNodes(
@ -225,7 +223,7 @@ static HRESULT WINAPI domcomment_get_childNodes(
IXMLDOMNodeList** outList) IXMLDOMNodeList** outList)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_childNodes( This->node, outList ); return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(This->node), outList );
} }
static HRESULT WINAPI domcomment_get_firstChild( static HRESULT WINAPI domcomment_get_firstChild(
@ -233,7 +231,7 @@ static HRESULT WINAPI domcomment_get_firstChild(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_firstChild( This->node, domNode ); return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domcomment_get_lastChild( static HRESULT WINAPI domcomment_get_lastChild(
@ -241,7 +239,7 @@ static HRESULT WINAPI domcomment_get_lastChild(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_lastChild( This->node, domNode ); return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domcomment_get_previousSibling( static HRESULT WINAPI domcomment_get_previousSibling(
@ -249,7 +247,7 @@ static HRESULT WINAPI domcomment_get_previousSibling(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_previousSibling( This->node, domNode ); return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domcomment_get_nextSibling( static HRESULT WINAPI domcomment_get_nextSibling(
@ -257,7 +255,7 @@ static HRESULT WINAPI domcomment_get_nextSibling(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_nextSibling( This->node, domNode ); return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domcomment_get_attributes( static HRESULT WINAPI domcomment_get_attributes(
@ -265,7 +263,7 @@ static HRESULT WINAPI domcomment_get_attributes(
IXMLDOMNamedNodeMap** attributeMap) IXMLDOMNamedNodeMap** attributeMap)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_attributes( This->node, attributeMap ); return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(This->node), attributeMap );
} }
static HRESULT WINAPI domcomment_insertBefore( static HRESULT WINAPI domcomment_insertBefore(
@ -274,7 +272,7 @@ static HRESULT WINAPI domcomment_insertBefore(
IXMLDOMNode** outOldNode) IXMLDOMNode** outOldNode)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_insertBefore( This->node, newNode, var1, outOldNode ); return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(This->node), newNode, var1, outOldNode );
} }
static HRESULT WINAPI domcomment_replaceChild( static HRESULT WINAPI domcomment_replaceChild(
@ -284,7 +282,7 @@ static HRESULT WINAPI domcomment_replaceChild(
IXMLDOMNode** outOldNode) IXMLDOMNode** outOldNode)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_replaceChild( This->node, newNode, oldNode, outOldNode ); return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(This->node), newNode, oldNode, outOldNode );
} }
static HRESULT WINAPI domcomment_removeChild( static HRESULT WINAPI domcomment_removeChild(
@ -292,7 +290,7 @@ static HRESULT WINAPI domcomment_removeChild(
IXMLDOMNode* domNode, IXMLDOMNode** oldNode) IXMLDOMNode* domNode, IXMLDOMNode** oldNode)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_removeChild( This->node, domNode, oldNode ); return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(This->node), domNode, oldNode );
} }
static HRESULT WINAPI domcomment_appendChild( static HRESULT WINAPI domcomment_appendChild(
@ -300,7 +298,7 @@ static HRESULT WINAPI domcomment_appendChild(
IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) IXMLDOMNode* newNode, IXMLDOMNode** outNewNode)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_appendChild( This->node, newNode, outNewNode ); return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(This->node), newNode, outNewNode );
} }
static HRESULT WINAPI domcomment_hasChildNodes( static HRESULT WINAPI domcomment_hasChildNodes(
@ -308,7 +306,7 @@ static HRESULT WINAPI domcomment_hasChildNodes(
VARIANT_BOOL* pbool) VARIANT_BOOL* pbool)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_hasChildNodes( This->node, pbool ); return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(This->node), pbool );
} }
static HRESULT WINAPI domcomment_get_ownerDocument( static HRESULT WINAPI domcomment_get_ownerDocument(
@ -316,7 +314,7 @@ static HRESULT WINAPI domcomment_get_ownerDocument(
IXMLDOMDocument** domDocument) IXMLDOMDocument** domDocument)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_ownerDocument( This->node, domDocument ); return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(This->node), domDocument );
} }
static HRESULT WINAPI domcomment_cloneNode( static HRESULT WINAPI domcomment_cloneNode(
@ -324,7 +322,7 @@ static HRESULT WINAPI domcomment_cloneNode(
VARIANT_BOOL pbool, IXMLDOMNode** outNode) VARIANT_BOOL pbool, IXMLDOMNode** outNode)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_cloneNode( This->node, pbool, outNode ); return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(This->node), pbool, outNode );
} }
static HRESULT WINAPI domcomment_get_nodeTypeString( static HRESULT WINAPI domcomment_get_nodeTypeString(
@ -332,7 +330,7 @@ static HRESULT WINAPI domcomment_get_nodeTypeString(
BSTR* p) BSTR* p)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_nodeTypeString( This->node, p ); return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domcomment_get_text( static HRESULT WINAPI domcomment_get_text(
@ -340,7 +338,7 @@ static HRESULT WINAPI domcomment_get_text(
BSTR* p) BSTR* p)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_text( This->node, p ); return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domcomment_put_text( static HRESULT WINAPI domcomment_put_text(
@ -348,7 +346,7 @@ static HRESULT WINAPI domcomment_put_text(
BSTR p) BSTR p)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_put_text( This->node, p ); return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domcomment_get_specified( static HRESULT WINAPI domcomment_get_specified(
@ -356,7 +354,7 @@ static HRESULT WINAPI domcomment_get_specified(
VARIANT_BOOL* pbool) VARIANT_BOOL* pbool)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_specified( This->node, pbool ); return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(This->node), pbool );
} }
static HRESULT WINAPI domcomment_get_definition( static HRESULT WINAPI domcomment_get_definition(
@ -364,7 +362,7 @@ static HRESULT WINAPI domcomment_get_definition(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_definition( This->node, domNode ); return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domcomment_get_nodeTypedValue( static HRESULT WINAPI domcomment_get_nodeTypedValue(
@ -372,7 +370,7 @@ static HRESULT WINAPI domcomment_get_nodeTypedValue(
VARIANT* var1) VARIANT* var1)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_nodeTypedValue( This->node, var1 ); return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domcomment_put_nodeTypedValue( static HRESULT WINAPI domcomment_put_nodeTypedValue(
@ -380,7 +378,7 @@ static HRESULT WINAPI domcomment_put_nodeTypedValue(
VARIANT var1) VARIANT var1)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_put_nodeTypedValue( This->node, var1 ); return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domcomment_get_dataType( static HRESULT WINAPI domcomment_get_dataType(
@ -388,7 +386,7 @@ static HRESULT WINAPI domcomment_get_dataType(
VARIANT* var1) VARIANT* var1)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_dataType( This->node, var1 ); return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domcomment_put_dataType( static HRESULT WINAPI domcomment_put_dataType(
@ -396,7 +394,7 @@ static HRESULT WINAPI domcomment_put_dataType(
BSTR p) BSTR p)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_put_dataType( This->node, p ); return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domcomment_get_xml( static HRESULT WINAPI domcomment_get_xml(
@ -404,7 +402,7 @@ static HRESULT WINAPI domcomment_get_xml(
BSTR* p) BSTR* p)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_xml( This->node, p ); return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domcomment_transformNode( static HRESULT WINAPI domcomment_transformNode(
@ -412,7 +410,7 @@ static HRESULT WINAPI domcomment_transformNode(
IXMLDOMNode* domNode, BSTR* p) IXMLDOMNode* domNode, BSTR* p)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_transformNode( This->node, domNode, p ); return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(This->node), domNode, p );
} }
static HRESULT WINAPI domcomment_selectNodes( static HRESULT WINAPI domcomment_selectNodes(
@ -420,7 +418,7 @@ static HRESULT WINAPI domcomment_selectNodes(
BSTR p, IXMLDOMNodeList** outList) BSTR p, IXMLDOMNodeList** outList)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_selectNodes( This->node, p, outList ); return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(This->node), p, outList );
} }
static HRESULT WINAPI domcomment_selectSingleNode( static HRESULT WINAPI domcomment_selectSingleNode(
@ -428,7 +426,7 @@ static HRESULT WINAPI domcomment_selectSingleNode(
BSTR p, IXMLDOMNode** outNode) BSTR p, IXMLDOMNode** outNode)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_selectSingleNode( This->node, p, outNode ); return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(This->node), p, outNode );
} }
static HRESULT WINAPI domcomment_get_parsed( static HRESULT WINAPI domcomment_get_parsed(
@ -436,7 +434,7 @@ static HRESULT WINAPI domcomment_get_parsed(
VARIANT_BOOL* pbool) VARIANT_BOOL* pbool)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_parsed( This->node, pbool ); return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(This->node), pbool );
} }
static HRESULT WINAPI domcomment_get_namespaceURI( static HRESULT WINAPI domcomment_get_namespaceURI(
@ -444,7 +442,7 @@ static HRESULT WINAPI domcomment_get_namespaceURI(
BSTR* p) BSTR* p)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_namespaceURI( This->node, p ); return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domcomment_get_prefix( static HRESULT WINAPI domcomment_get_prefix(
@ -452,7 +450,7 @@ static HRESULT WINAPI domcomment_get_prefix(
BSTR* p) BSTR* p)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_prefix( This->node, p ); return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domcomment_get_baseName( static HRESULT WINAPI domcomment_get_baseName(
@ -460,7 +458,7 @@ static HRESULT WINAPI domcomment_get_baseName(
BSTR* p) BSTR* p)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_get_baseName( This->node, p ); return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domcomment_transformNodeToObject( static HRESULT WINAPI domcomment_transformNodeToObject(
@ -468,7 +466,7 @@ static HRESULT WINAPI domcomment_transformNodeToObject(
IXMLDOMNode* domNode, VARIANT var1) IXMLDOMNode* domNode, VARIANT var1)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_transformNodeToObject( This->node, domNode, var1 ); return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(This->node), domNode, var1 );
} }
static HRESULT WINAPI domcomment_get_data( static HRESULT WINAPI domcomment_get_data(
@ -482,7 +480,7 @@ static HRESULT WINAPI domcomment_get_data(
if(!p) if(!p)
return E_INVALIDARG; return E_INVALIDARG;
hr = IXMLDOMNode_get_nodeValue( This->node, &vRet ); hr = IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), &vRet );
if(hr == S_OK) if(hr == S_OK)
{ {
*p = V_BSTR(&vRet); *p = V_BSTR(&vRet);
@ -504,7 +502,7 @@ static HRESULT WINAPI domcomment_put_data(
V_VT(&val) = VT_BSTR; V_VT(&val) = VT_BSTR;
V_BSTR(&val) = data; V_BSTR(&val) = data;
hr = IXMLDOMNode_put_nodeValue( This->node, val ); hr = IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), val );
return hr; return hr;
} }
@ -514,7 +512,6 @@ static HRESULT WINAPI domcomment_get_length(
LONG *len) LONG *len)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node );
xmlChar *pContent; xmlChar *pContent;
LONG nLength = 0; LONG nLength = 0;
@ -523,7 +520,7 @@ static HRESULT WINAPI domcomment_get_length(
if(!len) if(!len)
return E_INVALIDARG; return E_INVALIDARG;
pContent = xmlNodeGetContent(pDOMNode->node); pContent = xmlNodeGetContent(This->node->node);
if(pContent) if(pContent)
{ {
nLength = xmlStrlen(pContent); nLength = xmlStrlen(pContent);
@ -540,7 +537,6 @@ static HRESULT WINAPI domcomment_substringData(
LONG offset, LONG count, BSTR *p) LONG offset, LONG count, BSTR *p)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node );
xmlChar *pContent; xmlChar *pContent;
LONG nLength = 0; LONG nLength = 0;
HRESULT hr = S_FALSE; HRESULT hr = S_FALSE;
@ -557,7 +553,7 @@ static HRESULT WINAPI domcomment_substringData(
if(count == 0) if(count == 0)
return hr; return hr;
pContent = xmlNodeGetContent(pDOMNode->node); pContent = xmlNodeGetContent(This->node->node);
if(pContent) if(pContent)
{ {
nLength = xmlStrlen(pContent); nLength = xmlStrlen(pContent);
@ -585,7 +581,6 @@ static HRESULT WINAPI domcomment_appendData(
BSTR p) BSTR p)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node );
xmlChar *pContent; xmlChar *pContent;
HRESULT hr = S_FALSE; HRESULT hr = S_FALSE;
@ -602,15 +597,15 @@ static HRESULT WINAPI domcomment_appendData(
xmlTextConcat on Comment nodes. Fallback to setting the xmlTextConcat on Comment nodes. Fallback to setting the
contents directly if xmlTextConcat fails. contents directly if xmlTextConcat fails.
*/ */
if(xmlTextConcat(pDOMNode->node, pContent, SysStringLen(p) ) == 0) if(xmlTextConcat(This->node->node, pContent, SysStringLen(p) ) == 0)
hr = S_OK; hr = S_OK;
else else
{ {
xmlChar *pNew; xmlChar *pNew;
pNew = xmlStrcat(xmlNodeGetContent(pDOMNode->node), pContent); pNew = xmlStrcat(xmlNodeGetContent(This->node->node), pContent);
if(pNew) if(pNew)
{ {
xmlNodeSetContent(pDOMNode->node, pNew); xmlNodeSetContent(This->node->node, pNew);
hr = S_OK; hr = S_OK;
} }
else else
@ -629,7 +624,6 @@ static HRESULT WINAPI domcomment_insertData(
LONG offset, BSTR p) LONG offset, BSTR p)
{ {
domcomment *This = impl_from_IXMLDOMComment( iface ); domcomment *This = impl_from_IXMLDOMComment( iface );
xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node );
xmlChar *pXmlContent; xmlChar *pXmlContent;
BSTR sNewString; BSTR sNewString;
HRESULT hr = S_FALSE; HRESULT hr = S_FALSE;
@ -647,7 +641,7 @@ static HRESULT WINAPI domcomment_insertData(
return E_INVALIDARG; return E_INVALIDARG;
} }
pXmlContent = xmlNodeGetContent(pDOMNode->node); pXmlContent = xmlNodeGetContent(This->node->node);
if(pXmlContent) if(pXmlContent)
{ {
BSTR sContent = bstr_from_xmlChar( pXmlContent ); BSTR sContent = bstr_from_xmlChar( pXmlContent );
@ -678,7 +672,7 @@ static HRESULT WINAPI domcomment_insertData(
str = xmlChar_from_wchar(sNewString); str = xmlChar_from_wchar(sNewString);
if(str) if(str)
{ {
xmlNodeSetContent(pDOMNode->node, str); xmlNodeSetContent(This->node->node, str);
hr = S_OK; hr = S_OK;
} }
HeapFree( GetProcessHeap(), 0, str ); HeapFree( GetProcessHeap(), 0, str );
@ -768,7 +762,6 @@ static const struct IXMLDOMCommentVtbl domcomment_vtbl =
IUnknown* create_comment( xmlNodePtr comment ) IUnknown* create_comment( xmlNodePtr comment )
{ {
domcomment *This; domcomment *This;
xmlnode *node;
This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); This = HeapAlloc( GetProcessHeap(), 0, sizeof *This );
if ( !This ) if ( !This )
@ -777,16 +770,13 @@ IUnknown* create_comment( xmlNodePtr comment )
This->lpVtbl = &domcomment_vtbl; This->lpVtbl = &domcomment_vtbl;
This->ref = 1; This->ref = 1;
node = create_basic_node( comment, (IUnknown*)&This->lpVtbl, NULL ); This->node = create_basic_node( comment, (IUnknown*)&This->lpVtbl, NULL );
if(!node) if(!This->node)
{ {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
return NULL; return NULL;
} }
This->node_unk = (IUnknown*)&node->lpInternalUnkVtbl;
This->node = IXMLDOMNode_from_impl(node);
return (IUnknown*) &This->lpVtbl; return (IUnknown*) &This->lpVtbl;
} }

90
reactos/dll/win32/msxml3/docfrag.c
View file

@ -41,8 +41,7 @@ typedef struct _domfrag
{ {
const struct IXMLDOMDocumentFragmentVtbl *lpVtbl; const struct IXMLDOMDocumentFragmentVtbl *lpVtbl;
LONG ref; LONG ref;
IUnknown *node_unk; xmlnode *node;
IXMLDOMNode *node;
} domfrag; } domfrag;
static inline domfrag *impl_from_IXMLDOMDocumentFragment( IXMLDOMDocumentFragment *iface ) static inline domfrag *impl_from_IXMLDOMDocumentFragment( IXMLDOMDocumentFragment *iface )
@ -66,7 +65,7 @@ static HRESULT WINAPI domfrag_QueryInterface(
} }
else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) )
{ {
return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); *ppvObject = IXMLDOMNode_from_impl(This->node);
} }
else else
{ {
@ -74,8 +73,7 @@ static HRESULT WINAPI domfrag_QueryInterface(
return E_NOINTERFACE; return E_NOINTERFACE;
} }
IXMLDOMDocumentFragment_AddRef( iface ); IXMLDOMText_AddRef((IUnknown*)*ppvObject);
return S_OK; return S_OK;
} }
@ -95,7 +93,7 @@ static ULONG WINAPI domfrag_Release(
ref = InterlockedDecrement( &This->ref ); ref = InterlockedDecrement( &This->ref );
if ( ref == 0 ) if ( ref == 0 )
{ {
IUnknown_Release( This->node_unk ); destroy_xmlnode(This->node);
HeapFree( GetProcessHeap(), 0, This ); HeapFree( GetProcessHeap(), 0, This );
} }
@ -184,7 +182,7 @@ static HRESULT WINAPI domfrag_get_nodeName(
BSTR* p ) BSTR* p )
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_nodeName( This->node, p ); return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domfrag_get_nodeValue( static HRESULT WINAPI domfrag_get_nodeValue(
@ -192,7 +190,7 @@ static HRESULT WINAPI domfrag_get_nodeValue(
VARIANT* var1 ) VARIANT* var1 )
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_nodeValue( This->node, var1 ); return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domfrag_put_nodeValue( static HRESULT WINAPI domfrag_put_nodeValue(
@ -200,7 +198,7 @@ static HRESULT WINAPI domfrag_put_nodeValue(
VARIANT var1 ) VARIANT var1 )
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_put_nodeValue( This->node, var1 ); return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domfrag_get_nodeType( static HRESULT WINAPI domfrag_get_nodeType(
@ -208,7 +206,7 @@ static HRESULT WINAPI domfrag_get_nodeType(
DOMNodeType* domNodeType ) DOMNodeType* domNodeType )
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_nodeType( This->node, domNodeType ); return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(This->node), domNodeType );
} }
static HRESULT WINAPI domfrag_get_parentNode( static HRESULT WINAPI domfrag_get_parentNode(
@ -216,7 +214,7 @@ static HRESULT WINAPI domfrag_get_parentNode(
IXMLDOMNode** parent ) IXMLDOMNode** parent )
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_parentNode( This->node, parent ); return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(This->node), parent );
} }
static HRESULT WINAPI domfrag_get_childNodes( static HRESULT WINAPI domfrag_get_childNodes(
@ -224,7 +222,7 @@ static HRESULT WINAPI domfrag_get_childNodes(
IXMLDOMNodeList** outList) IXMLDOMNodeList** outList)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_childNodes( This->node, outList ); return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(This->node), outList );
} }
static HRESULT WINAPI domfrag_get_firstChild( static HRESULT WINAPI domfrag_get_firstChild(
@ -232,7 +230,7 @@ static HRESULT WINAPI domfrag_get_firstChild(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_firstChild( This->node, domNode ); return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domfrag_get_lastChild( static HRESULT WINAPI domfrag_get_lastChild(
@ -240,7 +238,7 @@ static HRESULT WINAPI domfrag_get_lastChild(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_lastChild( This->node, domNode ); return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domfrag_get_previousSibling( static HRESULT WINAPI domfrag_get_previousSibling(
@ -248,7 +246,7 @@ static HRESULT WINAPI domfrag_get_previousSibling(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_previousSibling( This->node, domNode ); return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domfrag_get_nextSibling( static HRESULT WINAPI domfrag_get_nextSibling(
@ -256,7 +254,7 @@ static HRESULT WINAPI domfrag_get_nextSibling(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_nextSibling( This->node, domNode ); return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domfrag_get_attributes( static HRESULT WINAPI domfrag_get_attributes(
@ -264,7 +262,7 @@ static HRESULT WINAPI domfrag_get_attributes(
IXMLDOMNamedNodeMap** attributeMap) IXMLDOMNamedNodeMap** attributeMap)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_attributes( This->node, attributeMap ); return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(This->node), attributeMap );
} }
static HRESULT WINAPI domfrag_insertBefore( static HRESULT WINAPI domfrag_insertBefore(
@ -273,7 +271,7 @@ static HRESULT WINAPI domfrag_insertBefore(
IXMLDOMNode** outOldNode) IXMLDOMNode** outOldNode)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_insertBefore( This->node, newNode, var1, outOldNode ); return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(This->node), newNode, var1, outOldNode );
} }
static HRESULT WINAPI domfrag_replaceChild( static HRESULT WINAPI domfrag_replaceChild(
@ -283,7 +281,7 @@ static HRESULT WINAPI domfrag_replaceChild(
IXMLDOMNode** outOldNode) IXMLDOMNode** outOldNode)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_replaceChild( This->node, newNode, oldNode, outOldNode ); return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(This->node), newNode, oldNode, outOldNode );
} }
static HRESULT WINAPI domfrag_removeChild( static HRESULT WINAPI domfrag_removeChild(
@ -291,7 +289,7 @@ static HRESULT WINAPI domfrag_removeChild(
IXMLDOMNode* domNode, IXMLDOMNode** oldNode) IXMLDOMNode* domNode, IXMLDOMNode** oldNode)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_removeChild( This->node, domNode, oldNode ); return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(This->node), domNode, oldNode );
} }
static HRESULT WINAPI domfrag_appendChild( static HRESULT WINAPI domfrag_appendChild(
@ -299,7 +297,7 @@ static HRESULT WINAPI domfrag_appendChild(
IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) IXMLDOMNode* newNode, IXMLDOMNode** outNewNode)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_appendChild( This->node, newNode, outNewNode ); return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(This->node), newNode, outNewNode );
} }
static HRESULT WINAPI domfrag_hasChildNodes( static HRESULT WINAPI domfrag_hasChildNodes(
@ -307,7 +305,7 @@ static HRESULT WINAPI domfrag_hasChildNodes(
VARIANT_BOOL* pbool) VARIANT_BOOL* pbool)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_hasChildNodes( This->node, pbool ); return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(This->node), pbool );
} }
static HRESULT WINAPI domfrag_get_ownerDocument( static HRESULT WINAPI domfrag_get_ownerDocument(
@ -315,7 +313,7 @@ static HRESULT WINAPI domfrag_get_ownerDocument(
IXMLDOMDocument** domDocument) IXMLDOMDocument** domDocument)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_ownerDocument( This->node, domDocument ); return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(This->node), domDocument );
} }
static HRESULT WINAPI domfrag_cloneNode( static HRESULT WINAPI domfrag_cloneNode(
@ -323,7 +321,7 @@ static HRESULT WINAPI domfrag_cloneNode(
VARIANT_BOOL pbool, IXMLDOMNode** outNode) VARIANT_BOOL pbool, IXMLDOMNode** outNode)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_cloneNode( This->node, pbool, outNode ); return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(This->node), pbool, outNode );
} }
static HRESULT WINAPI domfrag_get_nodeTypeString( static HRESULT WINAPI domfrag_get_nodeTypeString(
@ -331,7 +329,7 @@ static HRESULT WINAPI domfrag_get_nodeTypeString(
BSTR* p) BSTR* p)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_nodeTypeString( This->node, p ); return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domfrag_get_text( static HRESULT WINAPI domfrag_get_text(
@ -339,7 +337,7 @@ static HRESULT WINAPI domfrag_get_text(
BSTR* p) BSTR* p)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_text( This->node, p ); return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domfrag_put_text( static HRESULT WINAPI domfrag_put_text(
@ -347,7 +345,7 @@ static HRESULT WINAPI domfrag_put_text(
BSTR p) BSTR p)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_put_text( This->node, p ); return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domfrag_get_specified( static HRESULT WINAPI domfrag_get_specified(
@ -355,7 +353,7 @@ static HRESULT WINAPI domfrag_get_specified(
VARIANT_BOOL* pbool) VARIANT_BOOL* pbool)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_specified( This->node, pbool ); return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(This->node), pbool );
} }
static HRESULT WINAPI domfrag_get_definition( static HRESULT WINAPI domfrag_get_definition(
@ -363,7 +361,7 @@ static HRESULT WINAPI domfrag_get_definition(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_definition( This->node, domNode ); return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domfrag_get_nodeTypedValue( static HRESULT WINAPI domfrag_get_nodeTypedValue(
@ -371,7 +369,7 @@ static HRESULT WINAPI domfrag_get_nodeTypedValue(
VARIANT* var1) VARIANT* var1)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_nodeTypedValue( This->node, var1 ); return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domfrag_put_nodeTypedValue( static HRESULT WINAPI domfrag_put_nodeTypedValue(
@ -379,7 +377,7 @@ static HRESULT WINAPI domfrag_put_nodeTypedValue(
VARIANT var1) VARIANT var1)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_put_nodeTypedValue( This->node, var1 ); return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domfrag_get_dataType( static HRESULT WINAPI domfrag_get_dataType(
@ -387,7 +385,7 @@ static HRESULT WINAPI domfrag_get_dataType(
VARIANT* var1) VARIANT* var1)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_dataType( This->node, var1 ); return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domfrag_put_dataType( static HRESULT WINAPI domfrag_put_dataType(
@ -395,7 +393,7 @@ static HRESULT WINAPI domfrag_put_dataType(
BSTR p) BSTR p)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_put_dataType( This->node, p ); return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domfrag_get_xml( static HRESULT WINAPI domfrag_get_xml(
@ -403,7 +401,7 @@ static HRESULT WINAPI domfrag_get_xml(
BSTR* p) BSTR* p)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_xml( This->node, p ); return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domfrag_transformNode( static HRESULT WINAPI domfrag_transformNode(
@ -411,7 +409,7 @@ static HRESULT WINAPI domfrag_transformNode(
IXMLDOMNode* domNode, BSTR* p) IXMLDOMNode* domNode, BSTR* p)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_transformNode( This->node, domNode, p ); return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(This->node), domNode, p );
} }
static HRESULT WINAPI domfrag_selectNodes( static HRESULT WINAPI domfrag_selectNodes(
@ -419,7 +417,7 @@ static HRESULT WINAPI domfrag_selectNodes(
BSTR p, IXMLDOMNodeList** outList) BSTR p, IXMLDOMNodeList** outList)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_selectNodes( This->node, p, outList ); return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(This->node), p, outList );
} }
static HRESULT WINAPI domfrag_selectSingleNode( static HRESULT WINAPI domfrag_selectSingleNode(
@ -427,7 +425,7 @@ static HRESULT WINAPI domfrag_selectSingleNode(
BSTR p, IXMLDOMNode** outNode) BSTR p, IXMLDOMNode** outNode)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_selectSingleNode( This->node, p, outNode ); return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(This->node), p, outNode );
} }
static HRESULT WINAPI domfrag_get_parsed( static HRESULT WINAPI domfrag_get_parsed(
@ -435,7 +433,7 @@ static HRESULT WINAPI domfrag_get_parsed(
VARIANT_BOOL* pbool) VARIANT_BOOL* pbool)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_parsed( This->node, pbool ); return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(This->node), pbool );
} }
static HRESULT WINAPI domfrag_get_namespaceURI( static HRESULT WINAPI domfrag_get_namespaceURI(
@ -443,7 +441,7 @@ static HRESULT WINAPI domfrag_get_namespaceURI(
BSTR* p) BSTR* p)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_namespaceURI( This->node, p ); return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domfrag_get_prefix( static HRESULT WINAPI domfrag_get_prefix(
@ -451,7 +449,7 @@ static HRESULT WINAPI domfrag_get_prefix(
BSTR* p) BSTR* p)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_prefix( This->node, p ); return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domfrag_get_baseName( static HRESULT WINAPI domfrag_get_baseName(
@ -459,7 +457,7 @@ static HRESULT WINAPI domfrag_get_baseName(
BSTR* p) BSTR* p)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_get_baseName( This->node, p ); return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domfrag_transformNodeToObject( static HRESULT WINAPI domfrag_transformNodeToObject(
@ -467,7 +465,7 @@ static HRESULT WINAPI domfrag_transformNodeToObject(
IXMLDOMNode* domNode, VARIANT var1) IXMLDOMNode* domNode, VARIANT var1)
{ {
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_transformNodeToObject( This->node, domNode, var1 ); return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(This->node), domNode, var1 );
} }
static const struct IXMLDOMDocumentFragmentVtbl domfrag_vtbl = static const struct IXMLDOMDocumentFragmentVtbl domfrag_vtbl =
@ -520,7 +518,6 @@ static const struct IXMLDOMDocumentFragmentVtbl domfrag_vtbl =
IUnknown* create_doc_fragment( xmlNodePtr fragment ) IUnknown* create_doc_fragment( xmlNodePtr fragment )
{ {
domfrag *This; domfrag *This;
xmlnode *node;
This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); This = HeapAlloc( GetProcessHeap(), 0, sizeof *This );
if ( !This ) if ( !This )
@ -529,16 +526,13 @@ IUnknown* create_doc_fragment( xmlNodePtr fragment )
This->lpVtbl = &domfrag_vtbl; This->lpVtbl = &domfrag_vtbl;
This->ref = 1; This->ref = 1;
node = create_basic_node( fragment, (IUnknown*)&This->lpVtbl, NULL ); This->node = create_basic_node( fragment, (IUnknown*)&This->lpVtbl, NULL );
if(!node) if(!This->node)
{ {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
return NULL; return NULL;
} }
This->node_unk = (IUnknown*)&node->lpInternalUnkVtbl;
This->node = IXMLDOMNode_from_impl(node);
return (IUnknown*) &This->lpVtbl; return (IUnknown*) &This->lpVtbl;
} }

2
reactos/dll/win32/msxml3/domdoc.c
View file

@ -509,7 +509,7 @@ static ULONG WINAPI domdoc_Release(
if (This->site) if (This->site)
IUnknown_Release( This->site ); IUnknown_Release( This->site );
IXMLDOMNode_Release(IXMLDOMNode_from_impl(This->node)); destroy_xmlnode(This->node);
if(This->schema) IXMLDOMSchemaCollection_Release( This->schema ); if(This->schema) IXMLDOMSchemaCollection_Release( This->schema );
if (This->stream) IStream_Release(This->stream); if (This->stream) IStream_Release(This->stream);
HeapFree( GetProcessHeap(), 0, This ); HeapFree( GetProcessHeap(), 0, This );

2
reactos/dll/win32/msxml3/element.c
View file

@ -108,7 +108,7 @@ static ULONG WINAPI domelem_Release(
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
if(!ref) { if(!ref) {
IXMLDOMNode_Release(IXMLDOMNode_from_impl(This->node)); destroy_xmlnode(This->node);
heap_free(This); heap_free(This);
} }

90
reactos/dll/win32/msxml3/entityref.c
View file

@ -41,8 +41,7 @@ typedef struct _entityref
{ {
const struct IXMLDOMEntityReferenceVtbl *lpVtbl; const struct IXMLDOMEntityReferenceVtbl *lpVtbl;
LONG ref; LONG ref;
IUnknown *node_unk; xmlnode *node;
IXMLDOMNode *node;
} entityref; } entityref;
static inline entityref *impl_from_IXMLDOMEntityReference( IXMLDOMEntityReference *iface ) static inline entityref *impl_from_IXMLDOMEntityReference( IXMLDOMEntityReference *iface )
@ -66,7 +65,7 @@ static HRESULT WINAPI entityref_QueryInterface(
} }
else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) )
{ {
return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); *ppvObject = IXMLDOMNode_from_impl(This->node);
} }
else else
{ {
@ -74,8 +73,7 @@ static HRESULT WINAPI entityref_QueryInterface(
return E_NOINTERFACE; return E_NOINTERFACE;
} }
IXMLDOMEntityReference_AddRef( iface ); IUnknown_AddRef((IUnknown*)*ppvObject);
return S_OK; return S_OK;
} }
@ -95,7 +93,7 @@ static ULONG WINAPI entityref_Release(
ref = InterlockedDecrement( &This->ref ); ref = InterlockedDecrement( &This->ref );
if ( ref == 0 ) if ( ref == 0 )
{ {
IUnknown_Release( This->node_unk ); destroy_xmlnode(This->node);
HeapFree( GetProcessHeap(), 0, This ); HeapFree( GetProcessHeap(), 0, This );
} }
@ -183,7 +181,7 @@ static HRESULT WINAPI entityref_get_nodeName(
BSTR* p ) BSTR* p )
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_nodeName( This->node, p ); return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI entityref_get_nodeValue( static HRESULT WINAPI entityref_get_nodeValue(
@ -191,7 +189,7 @@ static HRESULT WINAPI entityref_get_nodeValue(
VARIANT* var1 ) VARIANT* var1 )
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_nodeValue( This->node, var1 ); return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI entityref_put_nodeValue( static HRESULT WINAPI entityref_put_nodeValue(
@ -199,7 +197,7 @@ static HRESULT WINAPI entityref_put_nodeValue(
VARIANT var1 ) VARIANT var1 )
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_put_nodeValue( This->node, var1 ); return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI entityref_get_nodeType( static HRESULT WINAPI entityref_get_nodeType(
@ -207,7 +205,7 @@ static HRESULT WINAPI entityref_get_nodeType(
DOMNodeType* domNodeType ) DOMNodeType* domNodeType )
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_nodeType( This->node, domNodeType ); return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(This->node), domNodeType );
} }
static HRESULT WINAPI entityref_get_parentNode( static HRESULT WINAPI entityref_get_parentNode(
@ -215,7 +213,7 @@ static HRESULT WINAPI entityref_get_parentNode(
IXMLDOMNode** parent ) IXMLDOMNode** parent )
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_parentNode( This->node, parent ); return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(This->node), parent );
} }
static HRESULT WINAPI entityref_get_childNodes( static HRESULT WINAPI entityref_get_childNodes(
@ -223,7 +221,7 @@ static HRESULT WINAPI entityref_get_childNodes(
IXMLDOMNodeList** outList) IXMLDOMNodeList** outList)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_childNodes( This->node, outList ); return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(This->node), outList );
} }
static HRESULT WINAPI entityref_get_firstChild( static HRESULT WINAPI entityref_get_firstChild(
@ -231,7 +229,7 @@ static HRESULT WINAPI entityref_get_firstChild(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_firstChild( This->node, domNode ); return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI entityref_get_lastChild( static HRESULT WINAPI entityref_get_lastChild(
@ -239,7 +237,7 @@ static HRESULT WINAPI entityref_get_lastChild(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_lastChild( This->node, domNode ); return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI entityref_get_previousSibling( static HRESULT WINAPI entityref_get_previousSibling(
@ -247,7 +245,7 @@ static HRESULT WINAPI entityref_get_previousSibling(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_previousSibling( This->node, domNode ); return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI entityref_get_nextSibling( static HRESULT WINAPI entityref_get_nextSibling(
@ -255,7 +253,7 @@ static HRESULT WINAPI entityref_get_nextSibling(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_nextSibling( This->node, domNode ); return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI entityref_get_attributes( static HRESULT WINAPI entityref_get_attributes(
@ -263,7 +261,7 @@ static HRESULT WINAPI entityref_get_attributes(
IXMLDOMNamedNodeMap** attributeMap) IXMLDOMNamedNodeMap** attributeMap)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_attributes( This->node, attributeMap ); return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(This->node), attributeMap );
} }
static HRESULT WINAPI entityref_insertBefore( static HRESULT WINAPI entityref_insertBefore(
@ -272,7 +270,7 @@ static HRESULT WINAPI entityref_insertBefore(
IXMLDOMNode** outOldNode) IXMLDOMNode** outOldNode)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_insertBefore( This->node, newNode, var1, outOldNode ); return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(This->node), newNode, var1, outOldNode );
} }
static HRESULT WINAPI entityref_replaceChild( static HRESULT WINAPI entityref_replaceChild(
@ -282,7 +280,7 @@ static HRESULT WINAPI entityref_replaceChild(
IXMLDOMNode** outOldNode) IXMLDOMNode** outOldNode)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_replaceChild( This->node, newNode, oldNode, outOldNode ); return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(This->node), newNode, oldNode, outOldNode );
} }
static HRESULT WINAPI entityref_removeChild( static HRESULT WINAPI entityref_removeChild(
@ -290,7 +288,7 @@ static HRESULT WINAPI entityref_removeChild(
IXMLDOMNode* domNode, IXMLDOMNode** oldNode) IXMLDOMNode* domNode, IXMLDOMNode** oldNode)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_removeChild( This->node, domNode, oldNode ); return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(This->node), domNode, oldNode );
} }
static HRESULT WINAPI entityref_appendChild( static HRESULT WINAPI entityref_appendChild(
@ -298,7 +296,7 @@ static HRESULT WINAPI entityref_appendChild(
IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) IXMLDOMNode* newNode, IXMLDOMNode** outNewNode)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_appendChild( This->node, newNode, outNewNode ); return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(This->node), newNode, outNewNode );
} }
static HRESULT WINAPI entityref_hasChildNodes( static HRESULT WINAPI entityref_hasChildNodes(
@ -306,7 +304,7 @@ static HRESULT WINAPI entityref_hasChildNodes(
VARIANT_BOOL* pbool) VARIANT_BOOL* pbool)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_hasChildNodes( This->node, pbool ); return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(This->node), pbool );
} }
static HRESULT WINAPI entityref_get_ownerDocument( static HRESULT WINAPI entityref_get_ownerDocument(
@ -314,7 +312,7 @@ static HRESULT WINAPI entityref_get_ownerDocument(
IXMLDOMDocument** domDocument) IXMLDOMDocument** domDocument)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_ownerDocument( This->node, domDocument ); return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(This->node), domDocument );
} }
static HRESULT WINAPI entityref_cloneNode( static HRESULT WINAPI entityref_cloneNode(
@ -322,7 +320,7 @@ static HRESULT WINAPI entityref_cloneNode(
VARIANT_BOOL pbool, IXMLDOMNode** outNode) VARIANT_BOOL pbool, IXMLDOMNode** outNode)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_cloneNode( This->node, pbool, outNode ); return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(This->node), pbool, outNode );
} }
static HRESULT WINAPI entityref_get_nodeTypeString( static HRESULT WINAPI entityref_get_nodeTypeString(
@ -330,7 +328,7 @@ static HRESULT WINAPI entityref_get_nodeTypeString(
BSTR* p) BSTR* p)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_nodeTypeString( This->node, p ); return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI entityref_get_text( static HRESULT WINAPI entityref_get_text(
@ -338,7 +336,7 @@ static HRESULT WINAPI entityref_get_text(
BSTR* p) BSTR* p)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_text( This->node, p ); return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI entityref_put_text( static HRESULT WINAPI entityref_put_text(
@ -346,7 +344,7 @@ static HRESULT WINAPI entityref_put_text(
BSTR p) BSTR p)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_put_text( This->node, p ); return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI entityref_get_specified( static HRESULT WINAPI entityref_get_specified(
@ -354,7 +352,7 @@ static HRESULT WINAPI entityref_get_specified(
VARIANT_BOOL* pbool) VARIANT_BOOL* pbool)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_specified( This->node, pbool ); return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(This->node), pbool );
} }
static HRESULT WINAPI entityref_get_definition( static HRESULT WINAPI entityref_get_definition(
@ -362,7 +360,7 @@ static HRESULT WINAPI entityref_get_definition(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_definition( This->node, domNode ); return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI entityref_get_nodeTypedValue( static HRESULT WINAPI entityref_get_nodeTypedValue(
@ -370,7 +368,7 @@ static HRESULT WINAPI entityref_get_nodeTypedValue(
VARIANT* var1) VARIANT* var1)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_nodeTypedValue( This->node, var1 ); return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI entityref_put_nodeTypedValue( static HRESULT WINAPI entityref_put_nodeTypedValue(
@ -378,7 +376,7 @@ static HRESULT WINAPI entityref_put_nodeTypedValue(
VARIANT var1) VARIANT var1)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_put_nodeTypedValue( This->node, var1 ); return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI entityref_get_dataType( static HRESULT WINAPI entityref_get_dataType(
@ -386,7 +384,7 @@ static HRESULT WINAPI entityref_get_dataType(
VARIANT* var1) VARIANT* var1)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_dataType( This->node, var1 ); return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI entityref_put_dataType( static HRESULT WINAPI entityref_put_dataType(
@ -394,7 +392,7 @@ static HRESULT WINAPI entityref_put_dataType(
BSTR p) BSTR p)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_put_dataType( This->node, p ); return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI entityref_get_xml( static HRESULT WINAPI entityref_get_xml(
@ -402,7 +400,7 @@ static HRESULT WINAPI entityref_get_xml(
BSTR* p) BSTR* p)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_xml( This->node, p ); return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI entityref_transformNode( static HRESULT WINAPI entityref_transformNode(
@ -410,7 +408,7 @@ static HRESULT WINAPI entityref_transformNode(
IXMLDOMNode* domNode, BSTR* p) IXMLDOMNode* domNode, BSTR* p)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_transformNode( This->node, domNode, p ); return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(This->node), domNode, p );
} }
static HRESULT WINAPI entityref_selectNodes( static HRESULT WINAPI entityref_selectNodes(
@ -418,7 +416,7 @@ static HRESULT WINAPI entityref_selectNodes(
BSTR p, IXMLDOMNodeList** outList) BSTR p, IXMLDOMNodeList** outList)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_selectNodes( This->node, p, outList ); return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(This->node), p, outList );
} }
static HRESULT WINAPI entityref_selectSingleNode( static HRESULT WINAPI entityref_selectSingleNode(
@ -426,7 +424,7 @@ static HRESULT WINAPI entityref_selectSingleNode(
BSTR p, IXMLDOMNode** outNode) BSTR p, IXMLDOMNode** outNode)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_selectSingleNode( This->node, p, outNode ); return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(This->node), p, outNode );
} }
static HRESULT WINAPI entityref_get_parsed( static HRESULT WINAPI entityref_get_parsed(
@ -434,7 +432,7 @@ static HRESULT WINAPI entityref_get_parsed(
VARIANT_BOOL* pbool) VARIANT_BOOL* pbool)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_parsed( This->node, pbool ); return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(This->node), pbool );
} }
static HRESULT WINAPI entityref_get_namespaceURI( static HRESULT WINAPI entityref_get_namespaceURI(
@ -442,7 +440,7 @@ static HRESULT WINAPI entityref_get_namespaceURI(
BSTR* p) BSTR* p)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_namespaceURI( This->node, p ); return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI entityref_get_prefix( static HRESULT WINAPI entityref_get_prefix(
@ -450,7 +448,7 @@ static HRESULT WINAPI entityref_get_prefix(
BSTR* p) BSTR* p)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_prefix( This->node, p ); return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI entityref_get_baseName( static HRESULT WINAPI entityref_get_baseName(
@ -458,7 +456,7 @@ static HRESULT WINAPI entityref_get_baseName(
BSTR* p) BSTR* p)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_get_baseName( This->node, p ); return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI entityref_transformNodeToObject( static HRESULT WINAPI entityref_transformNodeToObject(
@ -466,7 +464,7 @@ static HRESULT WINAPI entityref_transformNodeToObject(
IXMLDOMNode* domNode, VARIANT var1) IXMLDOMNode* domNode, VARIANT var1)
{ {
entityref *This = impl_from_IXMLDOMEntityReference( iface ); entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_transformNodeToObject( This->node, domNode, var1 ); return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(This->node), domNode, var1 );
} }
static const struct IXMLDOMEntityReferenceVtbl entityref_vtbl = static const struct IXMLDOMEntityReferenceVtbl entityref_vtbl =
@ -519,7 +517,6 @@ static const struct IXMLDOMEntityReferenceVtbl entityref_vtbl =
IUnknown* create_doc_entity_ref( xmlNodePtr entity ) IUnknown* create_doc_entity_ref( xmlNodePtr entity )
{ {
entityref *This; entityref *This;
xmlnode *node;
This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); This = HeapAlloc( GetProcessHeap(), 0, sizeof *This );
if ( !This ) if ( !This )
@ -528,16 +525,13 @@ IUnknown* create_doc_entity_ref( xmlNodePtr entity )
This->lpVtbl = &entityref_vtbl; This->lpVtbl = &entityref_vtbl;
This->ref = 1; This->ref = 1;
node = create_basic_node( entity, (IUnknown*)&This->lpVtbl, NULL ); This->node = create_basic_node( entity, (IUnknown*)&This->lpVtbl, NULL );
if(!node) if(!This->node)
{ {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
return NULL; return NULL;
} }
This->node_unk = (IUnknown*)&node->lpInternalUnkVtbl;
This->node = IXMLDOMNode_from_impl(node);
return (IUnknown*) &This->lpVtbl; return (IUnknown*) &This->lpVtbl;
} }

4
reactos/dll/win32/msxml3/msxml_private.h
View file

@ -118,7 +118,7 @@ extern IUnknown *create_comment( xmlNodePtr comment );
extern IUnknown *create_cdata( xmlNodePtr text ); extern IUnknown *create_cdata( xmlNodePtr text );
extern IXMLDOMNodeList *create_children_nodelist( xmlNodePtr ); extern IXMLDOMNodeList *create_children_nodelist( xmlNodePtr );
extern IXMLDOMNamedNodeMap *create_nodemap( IXMLDOMNode *node ); extern IXMLDOMNamedNodeMap *create_nodemap( IXMLDOMNode *node );
extern IUnknown *create_doc_Implementation(); extern IUnknown *create_doc_Implementation(void);
extern IUnknown *create_doc_fragment( xmlNodePtr fragment ); extern IUnknown *create_doc_fragment( xmlNodePtr fragment );
extern IUnknown *create_doc_entity_ref( xmlNodePtr entity ); extern IUnknown *create_doc_entity_ref( xmlNodePtr entity );
@ -144,7 +144,6 @@ typedef struct _xmlnode
{ {
DispatchEx dispex; DispatchEx dispex;
const struct IXMLDOMNodeVtbl *lpVtbl; const struct IXMLDOMNodeVtbl *lpVtbl;
const struct IUnknownVtbl *lpInternalUnkVtbl;
IUnknown *pUnkOuter; IUnknown *pUnkOuter;
LONG ref; LONG ref;
xmlNodePtr node; xmlNodePtr node;
@ -161,6 +160,7 @@ static inline IXMLDOMNode *IXMLDOMNode_from_impl(xmlnode *This)
} }
extern xmlnode *create_basic_node(xmlNodePtr,IUnknown*,dispex_static_data_t*); extern xmlnode *create_basic_node(xmlNodePtr,IUnknown*,dispex_static_data_t*);
extern void destroy_xmlnode(xmlnode*);
extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument2 **document); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument2 **document);

104
reactos/dll/win32/msxml3/node.c
View file

@ -66,11 +66,6 @@ static const WCHAR szFloat[] = {'f','l','o','a','t',0};
static const WCHAR szUUID[] = {'u','u','i','d',0}; static const WCHAR szUUID[] = {'u','u','i','d',0};
static const WCHAR szBinHex[] = {'b','i','n','.','h','e','x',0}; static const WCHAR szBinHex[] = {'b','i','n','.','h','e','x',0};
static inline xmlnode *impl_from_InternalUnknown( IUnknown *iface )
{
return (xmlnode *)((char*)iface - FIELD_OFFSET(xmlnode, lpInternalUnkVtbl));
}
xmlNodePtr xmlNodePtr_from_domnode( IXMLDOMNode *iface, xmlElementType type ) xmlNodePtr xmlNodePtr_from_domnode( IXMLDOMNode *iface, xmlElementType type )
{ {
xmlnode *This; xmlnode *This;
@ -91,23 +86,52 @@ static HRESULT WINAPI xmlnode_QueryInterface(
void** ppvObject ) void** ppvObject )
{ {
xmlnode *This = impl_from_IXMLDOMNode( iface ); xmlnode *This = impl_from_IXMLDOMNode( iface );
TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject);
return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObject); if(This->pUnkOuter)
return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObject);
if (IsEqualGUID(riid, &IID_IUnknown)) {
*ppvObject = iface;
}else if (IsEqualGUID( riid, &IID_IDispatch) ||
IsEqualGUID( riid, &IID_IXMLDOMNode)) {
*ppvObject = &This->lpVtbl;
}else {
FIXME("interface %s not implemented\n", debugstr_guid(riid));
*ppvObject = NULL;
return E_NOINTERFACE;
}
IUnknown_AddRef( (IUnknown*)*ppvObject );
return S_OK;
} }
static ULONG WINAPI xmlnode_AddRef( static ULONG WINAPI xmlnode_AddRef(
IXMLDOMNode *iface ) IXMLDOMNode *iface )
{ {
xmlnode *This = impl_from_IXMLDOMNode( iface ); xmlnode *This = impl_from_IXMLDOMNode( iface );
return IUnknown_AddRef(This->pUnkOuter);
if(This->pUnkOuter)
return IUnknown_AddRef(This->pUnkOuter);
return InterlockedIncrement(&This->ref);
} }
static ULONG WINAPI xmlnode_Release( static ULONG WINAPI xmlnode_Release(
IXMLDOMNode *iface ) IXMLDOMNode *iface )
{ {
xmlnode *This = impl_from_IXMLDOMNode( iface ); xmlnode *This = impl_from_IXMLDOMNode( iface );
return IUnknown_Release(This->pUnkOuter); LONG ref;
if(This->pUnkOuter)
return IUnknown_Release(This->pUnkOuter);
ref = InterlockedDecrement( &This->ref );
if(!ref)
destroy_xmlnode(This);
return ref;
} }
static HRESULT WINAPI xmlnode_GetTypeInfoCount( static HRESULT WINAPI xmlnode_GetTypeInfoCount(
@ -1484,64 +1508,13 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl =
xmlnode_transformNodeToObject, xmlnode_transformNodeToObject,
}; };
static HRESULT WINAPI Internal_QueryInterface( void destroy_xmlnode(xmlnode *This)
IUnknown *iface,
REFIID riid,
void** ppvObject )
{ {
xmlnode *This = impl_from_InternalUnknown( iface ); if(This->node)
xmldoc_release(This->node->doc);
TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); HeapFree( GetProcessHeap(), 0, This );
if ( IsEqualGUID( riid, &IID_IUnknown ))
*ppvObject = iface;
else if ( IsEqualGUID( riid, &IID_IDispatch ) ||
IsEqualGUID( riid, &IID_IXMLDOMNode ) )
*ppvObject = &This->lpVtbl;
else
{
FIXME("interface %s not implemented\n", debugstr_guid(riid));
*ppvObject = NULL;
return E_NOINTERFACE;
}
IUnknown_AddRef( (IUnknown*)*ppvObject );
return S_OK;
} }
static ULONG WINAPI Internal_AddRef(
IUnknown *iface )
{
xmlnode *This = impl_from_InternalUnknown( iface );
return InterlockedIncrement( &This->ref );
}
static ULONG WINAPI Internal_Release(
IUnknown *iface )
{
xmlnode *This = impl_from_InternalUnknown( iface );
ULONG ref;
ref = InterlockedDecrement( &This->ref );
if ( ref == 0 )
{
if( This->node )
xmldoc_release( This->node->doc );
HeapFree( GetProcessHeap(), 0, This );
}
return ref;
}
static const struct IUnknownVtbl internal_unk_vtbl =
{
Internal_QueryInterface,
Internal_AddRef,
Internal_Release
};
xmlnode *create_basic_node( xmlNodePtr node, IUnknown *pUnkOuter, dispex_static_data_t *dispex_data ) xmlnode *create_basic_node( xmlNodePtr node, IUnknown *pUnkOuter, dispex_static_data_t *dispex_data )
{ {
xmlnode *This; xmlnode *This;
@ -1554,12 +1527,11 @@ xmlnode *create_basic_node( xmlNodePtr node, IUnknown *pUnkOuter, dispex_static_
xmldoc_add_ref( node->doc ); xmldoc_add_ref( node->doc );
This->lpVtbl = &xmlnode_vtbl; This->lpVtbl = &xmlnode_vtbl;
This->lpInternalUnkVtbl = &internal_unk_vtbl;
if(pUnkOuter) if(pUnkOuter)
This->pUnkOuter = pUnkOuter; /* Don't take a ref on outer Unknown */ This->pUnkOuter = pUnkOuter; /* Don't take a ref on outer Unknown */
else else
This->pUnkOuter = (IUnknown *)&This->lpInternalUnkVtbl; This->pUnkOuter = NULL;
if(dispex_data) if(dispex_data)
init_dispex(&This->dispex, This->pUnkOuter, dispex_data); init_dispex(&This->dispex, This->pUnkOuter, dispex_data);
@ -1602,7 +1574,7 @@ IXMLDOMNode *create_node( xmlNodePtr node )
break; break;
default: default:
FIXME("only creating basic node for type %d\n", node->type); FIXME("only creating basic node for type %d\n", node->type);
pUnk = (IUnknown*)&create_basic_node( node, NULL, NULL )->lpInternalUnkVtbl; pUnk = (IUnknown*)&create_basic_node( node, NULL, NULL )->lpVtbl;
} }
hr = IUnknown_QueryInterface(pUnk, &IID_IXMLDOMNode, (LPVOID*)&ret); hr = IUnknown_QueryInterface(pUnk, &IID_IXMLDOMNode, (LPVOID*)&ret);

96
reactos/dll/win32/msxml3/pi.c
View file

@ -41,8 +41,7 @@ typedef struct _dom_pi
{ {
const struct IXMLDOMProcessingInstructionVtbl *lpVtbl; const struct IXMLDOMProcessingInstructionVtbl *lpVtbl;
LONG ref; LONG ref;
IUnknown *node_unk; xmlnode *node;
IXMLDOMNode *node;
} dom_pi; } dom_pi;
static inline dom_pi *impl_from_IXMLDOMProcessingInstruction( IXMLDOMProcessingInstruction *iface ) static inline dom_pi *impl_from_IXMLDOMProcessingInstruction( IXMLDOMProcessingInstruction *iface )
@ -66,7 +65,7 @@ static HRESULT WINAPI dom_pi_QueryInterface(
} }
else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) )
{ {
return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); *ppvObject = IXMLDOMNode_from_impl(This->node);
} }
else else
{ {
@ -74,8 +73,7 @@ static HRESULT WINAPI dom_pi_QueryInterface(
return E_NOINTERFACE; return E_NOINTERFACE;
} }
IXMLDOMProcessingInstruction_AddRef( iface ); IUnknown_AddRef((IUnknown*)*ppvObject);
return S_OK; return S_OK;
} }
@ -95,7 +93,7 @@ static ULONG WINAPI dom_pi_Release(
ref = InterlockedDecrement( &This->ref ); ref = InterlockedDecrement( &This->ref );
if ( ref == 0 ) if ( ref == 0 )
{ {
IUnknown_Release( This->node_unk ); destroy_xmlnode(This->node);
HeapFree( GetProcessHeap(), 0, This ); HeapFree( GetProcessHeap(), 0, This );
} }
@ -184,7 +182,7 @@ static HRESULT WINAPI dom_pi_get_nodeName(
BSTR* p ) BSTR* p )
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_nodeName( This->node, p ); return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI dom_pi_get_nodeValue( static HRESULT WINAPI dom_pi_get_nodeValue(
@ -192,7 +190,7 @@ static HRESULT WINAPI dom_pi_get_nodeValue(
VARIANT* var1 ) VARIANT* var1 )
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_nodeValue( This->node, var1 ); return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI dom_pi_put_nodeValue( static HRESULT WINAPI dom_pi_put_nodeValue(
@ -219,7 +217,7 @@ static HRESULT WINAPI dom_pi_put_nodeValue(
SysFreeString(sTarget); SysFreeString(sTarget);
} }
return IXMLDOMNode_put_nodeValue( This->node, var1 ); return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI dom_pi_get_nodeType( static HRESULT WINAPI dom_pi_get_nodeType(
@ -227,7 +225,7 @@ static HRESULT WINAPI dom_pi_get_nodeType(
DOMNodeType* domNodeType ) DOMNodeType* domNodeType )
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_nodeType( This->node, domNodeType ); return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(This->node), domNodeType );
} }
static HRESULT WINAPI dom_pi_get_parentNode( static HRESULT WINAPI dom_pi_get_parentNode(
@ -235,7 +233,7 @@ static HRESULT WINAPI dom_pi_get_parentNode(
IXMLDOMNode** parent ) IXMLDOMNode** parent )
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_parentNode( This->node, parent ); return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(This->node), parent );
} }
static HRESULT WINAPI dom_pi_get_childNodes( static HRESULT WINAPI dom_pi_get_childNodes(
@ -243,7 +241,7 @@ static HRESULT WINAPI dom_pi_get_childNodes(
IXMLDOMNodeList** outList) IXMLDOMNodeList** outList)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_childNodes( This->node, outList ); return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(This->node), outList );
} }
static HRESULT WINAPI dom_pi_get_firstChild( static HRESULT WINAPI dom_pi_get_firstChild(
@ -251,7 +249,7 @@ static HRESULT WINAPI dom_pi_get_firstChild(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_firstChild( This->node, domNode ); return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI dom_pi_get_lastChild( static HRESULT WINAPI dom_pi_get_lastChild(
@ -259,7 +257,7 @@ static HRESULT WINAPI dom_pi_get_lastChild(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_lastChild( This->node, domNode ); return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI dom_pi_get_previousSibling( static HRESULT WINAPI dom_pi_get_previousSibling(
@ -267,7 +265,7 @@ static HRESULT WINAPI dom_pi_get_previousSibling(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_previousSibling( This->node, domNode ); return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI dom_pi_get_nextSibling( static HRESULT WINAPI dom_pi_get_nextSibling(
@ -275,7 +273,7 @@ static HRESULT WINAPI dom_pi_get_nextSibling(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_nextSibling( This->node, domNode ); return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI dom_pi_get_attributes( static HRESULT WINAPI dom_pi_get_attributes(
@ -283,7 +281,7 @@ static HRESULT WINAPI dom_pi_get_attributes(
IXMLDOMNamedNodeMap** attributeMap) IXMLDOMNamedNodeMap** attributeMap)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_attributes( This->node, attributeMap ); return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(This->node), attributeMap );
} }
static HRESULT WINAPI dom_pi_insertBefore( static HRESULT WINAPI dom_pi_insertBefore(
@ -292,7 +290,7 @@ static HRESULT WINAPI dom_pi_insertBefore(
IXMLDOMNode** outOldNode) IXMLDOMNode** outOldNode)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_insertBefore( This->node, newNode, var1, outOldNode ); return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(This->node), newNode, var1, outOldNode );
} }
static HRESULT WINAPI dom_pi_replaceChild( static HRESULT WINAPI dom_pi_replaceChild(
@ -302,7 +300,7 @@ static HRESULT WINAPI dom_pi_replaceChild(
IXMLDOMNode** outOldNode) IXMLDOMNode** outOldNode)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_replaceChild( This->node, newNode, oldNode, outOldNode ); return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(This->node), newNode, oldNode, outOldNode );
} }
static HRESULT WINAPI dom_pi_removeChild( static HRESULT WINAPI dom_pi_removeChild(
@ -310,7 +308,7 @@ static HRESULT WINAPI dom_pi_removeChild(
IXMLDOMNode* domNode, IXMLDOMNode** oldNode) IXMLDOMNode* domNode, IXMLDOMNode** oldNode)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_removeChild( This->node, domNode, oldNode ); return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(This->node), domNode, oldNode );
} }
static HRESULT WINAPI dom_pi_appendChild( static HRESULT WINAPI dom_pi_appendChild(
@ -318,7 +316,7 @@ static HRESULT WINAPI dom_pi_appendChild(
IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) IXMLDOMNode* newNode, IXMLDOMNode** outNewNode)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_appendChild( This->node, newNode, outNewNode ); return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(This->node), newNode, outNewNode );
} }
static HRESULT WINAPI dom_pi_hasChildNodes( static HRESULT WINAPI dom_pi_hasChildNodes(
@ -326,7 +324,7 @@ static HRESULT WINAPI dom_pi_hasChildNodes(
VARIANT_BOOL* pbool) VARIANT_BOOL* pbool)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_hasChildNodes( This->node, pbool ); return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(This->node), pbool );
} }
static HRESULT WINAPI dom_pi_get_ownerDocument( static HRESULT WINAPI dom_pi_get_ownerDocument(
@ -334,7 +332,7 @@ static HRESULT WINAPI dom_pi_get_ownerDocument(
IXMLDOMDocument** domDocument) IXMLDOMDocument** domDocument)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_ownerDocument( This->node, domDocument ); return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(This->node), domDocument );
} }
static HRESULT WINAPI dom_pi_cloneNode( static HRESULT WINAPI dom_pi_cloneNode(
@ -342,7 +340,7 @@ static HRESULT WINAPI dom_pi_cloneNode(
VARIANT_BOOL pbool, IXMLDOMNode** outNode) VARIANT_BOOL pbool, IXMLDOMNode** outNode)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_cloneNode( This->node, pbool, outNode ); return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(This->node), pbool, outNode );
} }
static HRESULT WINAPI dom_pi_get_nodeTypeString( static HRESULT WINAPI dom_pi_get_nodeTypeString(
@ -350,7 +348,7 @@ static HRESULT WINAPI dom_pi_get_nodeTypeString(
BSTR* p) BSTR* p)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_nodeTypeString( This->node, p ); return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI dom_pi_get_text( static HRESULT WINAPI dom_pi_get_text(
@ -358,7 +356,7 @@ static HRESULT WINAPI dom_pi_get_text(
BSTR* p) BSTR* p)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_text( This->node, p ); return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI dom_pi_put_text( static HRESULT WINAPI dom_pi_put_text(
@ -366,7 +364,7 @@ static HRESULT WINAPI dom_pi_put_text(
BSTR p) BSTR p)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_put_text( This->node, p ); return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI dom_pi_get_specified( static HRESULT WINAPI dom_pi_get_specified(
@ -374,7 +372,7 @@ static HRESULT WINAPI dom_pi_get_specified(
VARIANT_BOOL* pbool) VARIANT_BOOL* pbool)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_specified( This->node, pbool ); return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(This->node), pbool );
} }
static HRESULT WINAPI dom_pi_get_definition( static HRESULT WINAPI dom_pi_get_definition(
@ -382,7 +380,7 @@ static HRESULT WINAPI dom_pi_get_definition(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_definition( This->node, domNode ); return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI dom_pi_get_nodeTypedValue( static HRESULT WINAPI dom_pi_get_nodeTypedValue(
@ -390,7 +388,7 @@ static HRESULT WINAPI dom_pi_get_nodeTypedValue(
VARIANT* var1) VARIANT* var1)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_nodeTypedValue( This->node, var1 ); return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI dom_pi_put_nodeTypedValue( static HRESULT WINAPI dom_pi_put_nodeTypedValue(
@ -398,7 +396,7 @@ static HRESULT WINAPI dom_pi_put_nodeTypedValue(
VARIANT var1) VARIANT var1)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_put_nodeTypedValue( This->node, var1 ); return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI dom_pi_get_dataType( static HRESULT WINAPI dom_pi_get_dataType(
@ -406,7 +404,7 @@ static HRESULT WINAPI dom_pi_get_dataType(
VARIANT* var1) VARIANT* var1)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_dataType( This->node, var1 ); return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI dom_pi_put_dataType( static HRESULT WINAPI dom_pi_put_dataType(
@ -414,7 +412,7 @@ static HRESULT WINAPI dom_pi_put_dataType(
BSTR p) BSTR p)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_put_dataType( This->node, p ); return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI dom_pi_get_xml( static HRESULT WINAPI dom_pi_get_xml(
@ -422,7 +420,7 @@ static HRESULT WINAPI dom_pi_get_xml(
BSTR* p) BSTR* p)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_xml( This->node, p ); return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI dom_pi_transformNode( static HRESULT WINAPI dom_pi_transformNode(
@ -430,7 +428,7 @@ static HRESULT WINAPI dom_pi_transformNode(
IXMLDOMNode* domNode, BSTR* p) IXMLDOMNode* domNode, BSTR* p)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_transformNode( This->node, domNode, p ); return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(This->node), domNode, p );
} }
static HRESULT WINAPI dom_pi_selectNodes( static HRESULT WINAPI dom_pi_selectNodes(
@ -438,7 +436,7 @@ static HRESULT WINAPI dom_pi_selectNodes(
BSTR p, IXMLDOMNodeList** outList) BSTR p, IXMLDOMNodeList** outList)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_selectNodes( This->node, p, outList ); return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(This->node), p, outList );
} }
static HRESULT WINAPI dom_pi_selectSingleNode( static HRESULT WINAPI dom_pi_selectSingleNode(
@ -446,7 +444,7 @@ static HRESULT WINAPI dom_pi_selectSingleNode(
BSTR p, IXMLDOMNode** outNode) BSTR p, IXMLDOMNode** outNode)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_selectSingleNode( This->node, p, outNode ); return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(This->node), p, outNode );
} }
static HRESULT WINAPI dom_pi_get_parsed( static HRESULT WINAPI dom_pi_get_parsed(
@ -454,7 +452,7 @@ static HRESULT WINAPI dom_pi_get_parsed(
VARIANT_BOOL* pbool) VARIANT_BOOL* pbool)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_parsed( This->node, pbool ); return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(This->node), pbool );
} }
static HRESULT WINAPI dom_pi_get_namespaceURI( static HRESULT WINAPI dom_pi_get_namespaceURI(
@ -462,7 +460,7 @@ static HRESULT WINAPI dom_pi_get_namespaceURI(
BSTR* p) BSTR* p)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_namespaceURI( This->node, p ); return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI dom_pi_get_prefix( static HRESULT WINAPI dom_pi_get_prefix(
@ -470,7 +468,7 @@ static HRESULT WINAPI dom_pi_get_prefix(
BSTR* p) BSTR* p)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_prefix( This->node, p ); return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI dom_pi_get_baseName( static HRESULT WINAPI dom_pi_get_baseName(
@ -478,7 +476,7 @@ static HRESULT WINAPI dom_pi_get_baseName(
BSTR* p) BSTR* p)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_baseName( This->node, p ); return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI dom_pi_transformNodeToObject( static HRESULT WINAPI dom_pi_transformNodeToObject(
@ -486,7 +484,7 @@ static HRESULT WINAPI dom_pi_transformNodeToObject(
IXMLDOMNode* domNode, VARIANT var1) IXMLDOMNode* domNode, VARIANT var1)
{ {
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_transformNodeToObject( This->node, domNode, var1 ); return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(This->node), domNode, var1 );
} }
static HRESULT WINAPI dom_pi_get_target( static HRESULT WINAPI dom_pi_get_target(
@ -495,7 +493,7 @@ static HRESULT WINAPI dom_pi_get_target(
{ {
/* target returns the same value as nodeName property */ /* target returns the same value as nodeName property */
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_get_nodeName( This->node, p ); return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI dom_pi_get_data( static HRESULT WINAPI dom_pi_get_data(
@ -509,7 +507,7 @@ static HRESULT WINAPI dom_pi_get_data(
if(!p) if(!p)
return E_INVALIDARG; return E_INVALIDARG;
hr = IXMLDOMNode_get_nodeValue( This->node, &vRet ); hr = IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), &vRet );
if(hr == S_OK) if(hr == S_OK)
{ {
*p = V_BSTR(&vRet); *p = V_BSTR(&vRet);
@ -546,7 +544,7 @@ static HRESULT WINAPI dom_pi_put_data(
V_VT(&val) = VT_BSTR; V_VT(&val) = VT_BSTR;
V_BSTR(&val) = data; V_BSTR(&val) = data;
hr = IXMLDOMNode_put_nodeValue( This->node, val ); hr = IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), val );
return hr; return hr;
} }
@ -605,7 +603,6 @@ static const struct IXMLDOMProcessingInstructionVtbl dom_pi_vtbl =
IUnknown* create_pi( xmlNodePtr pi ) IUnknown* create_pi( xmlNodePtr pi )
{ {
dom_pi *This; dom_pi *This;
xmlnode *node;
This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); This = HeapAlloc( GetProcessHeap(), 0, sizeof *This );
if ( !This ) if ( !This )
@ -614,16 +611,13 @@ IUnknown* create_pi( xmlNodePtr pi )
This->lpVtbl = &dom_pi_vtbl; This->lpVtbl = &dom_pi_vtbl;
This->ref = 1; This->ref = 1;
node = create_basic_node( pi, (IUnknown*)&This->lpVtbl, NULL ); This->node = create_basic_node( pi, (IUnknown*)&This->lpVtbl, NULL );
if(!node) if(!This->node)
{ {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
return NULL; return NULL;
} }
This->node_unk = (IUnknown*)&node->lpInternalUnkVtbl;
This->node = IXMLDOMNode_from_impl(node);
return (IUnknown*) &This->lpVtbl; return (IUnknown*) &This->lpVtbl;
} }

108
reactos/dll/win32/msxml3/text.c
View file

@ -42,8 +42,7 @@ typedef struct _domtext
{ {
const struct IXMLDOMTextVtbl *lpVtbl; const struct IXMLDOMTextVtbl *lpVtbl;
LONG ref; LONG ref;
IUnknown *node_unk; xmlnode *node;
IXMLDOMNode *node;
} domtext; } domtext;
static inline domtext *impl_from_IXMLDOMText( IXMLDOMText *iface ) static inline domtext *impl_from_IXMLDOMText( IXMLDOMText *iface )
@ -68,7 +67,7 @@ static HRESULT WINAPI domtext_QueryInterface(
} }
else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) )
{ {
return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); *ppvObject = IXMLDOMNode_from_impl(This->node);
} }
else if ( IsEqualGUID( riid, &IID_IXMLDOMElement ) || else if ( IsEqualGUID( riid, &IID_IXMLDOMElement ) ||
IsEqualGUID( riid, &IID_IXMLDOMCDATASection ) ) IsEqualGUID( riid, &IID_IXMLDOMCDATASection ) )
@ -83,8 +82,7 @@ static HRESULT WINAPI domtext_QueryInterface(
return E_NOINTERFACE; return E_NOINTERFACE;
} }
IXMLDOMText_AddRef( iface ); IXMLDOMText_AddRef((IUnknown*)*ppvObject);
return S_OK; return S_OK;
} }
@ -104,7 +102,7 @@ static ULONG WINAPI domtext_Release(
ref = InterlockedDecrement( &This->ref ); ref = InterlockedDecrement( &This->ref );
if ( ref == 0 ) if ( ref == 0 )
{ {
IUnknown_Release( This->node_unk ); destroy_xmlnode(This->node);
HeapFree( GetProcessHeap(), 0, This ); HeapFree( GetProcessHeap(), 0, This );
} }
@ -193,7 +191,7 @@ static HRESULT WINAPI domtext_get_nodeName(
BSTR* p ) BSTR* p )
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_nodeName( This->node, p ); return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domtext_get_nodeValue( static HRESULT WINAPI domtext_get_nodeValue(
@ -201,7 +199,7 @@ static HRESULT WINAPI domtext_get_nodeValue(
VARIANT* var1 ) VARIANT* var1 )
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_nodeValue( This->node, var1 ); return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domtext_put_nodeValue( static HRESULT WINAPI domtext_put_nodeValue(
@ -209,7 +207,7 @@ static HRESULT WINAPI domtext_put_nodeValue(
VARIANT var1 ) VARIANT var1 )
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_put_nodeValue( This->node, var1 ); return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domtext_get_nodeType( static HRESULT WINAPI domtext_get_nodeType(
@ -217,7 +215,7 @@ static HRESULT WINAPI domtext_get_nodeType(
DOMNodeType* domNodeType ) DOMNodeType* domNodeType )
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_nodeType( This->node, domNodeType ); return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(This->node), domNodeType );
} }
static HRESULT WINAPI domtext_get_parentNode( static HRESULT WINAPI domtext_get_parentNode(
@ -225,7 +223,7 @@ static HRESULT WINAPI domtext_get_parentNode(
IXMLDOMNode** parent ) IXMLDOMNode** parent )
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_parentNode( This->node, parent ); return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(This->node), parent );
} }
static HRESULT WINAPI domtext_get_childNodes( static HRESULT WINAPI domtext_get_childNodes(
@ -233,7 +231,7 @@ static HRESULT WINAPI domtext_get_childNodes(
IXMLDOMNodeList** outList) IXMLDOMNodeList** outList)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_childNodes( This->node, outList ); return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(This->node), outList );
} }
static HRESULT WINAPI domtext_get_firstChild( static HRESULT WINAPI domtext_get_firstChild(
@ -241,7 +239,7 @@ static HRESULT WINAPI domtext_get_firstChild(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_firstChild( This->node, domNode ); return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domtext_get_lastChild( static HRESULT WINAPI domtext_get_lastChild(
@ -249,7 +247,7 @@ static HRESULT WINAPI domtext_get_lastChild(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_lastChild( This->node, domNode ); return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domtext_get_previousSibling( static HRESULT WINAPI domtext_get_previousSibling(
@ -257,7 +255,7 @@ static HRESULT WINAPI domtext_get_previousSibling(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_previousSibling( This->node, domNode ); return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domtext_get_nextSibling( static HRESULT WINAPI domtext_get_nextSibling(
@ -265,7 +263,7 @@ static HRESULT WINAPI domtext_get_nextSibling(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_nextSibling( This->node, domNode ); return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domtext_get_attributes( static HRESULT WINAPI domtext_get_attributes(
@ -273,7 +271,7 @@ static HRESULT WINAPI domtext_get_attributes(
IXMLDOMNamedNodeMap** attributeMap) IXMLDOMNamedNodeMap** attributeMap)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_attributes( This->node, attributeMap ); return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(This->node), attributeMap );
} }
static HRESULT WINAPI domtext_insertBefore( static HRESULT WINAPI domtext_insertBefore(
@ -282,7 +280,7 @@ static HRESULT WINAPI domtext_insertBefore(
IXMLDOMNode** outOldNode) IXMLDOMNode** outOldNode)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_insertBefore( This->node, newNode, var1, outOldNode ); return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(This->node), newNode, var1, outOldNode );
} }
static HRESULT WINAPI domtext_replaceChild( static HRESULT WINAPI domtext_replaceChild(
@ -292,7 +290,7 @@ static HRESULT WINAPI domtext_replaceChild(
IXMLDOMNode** outOldNode) IXMLDOMNode** outOldNode)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_replaceChild( This->node, newNode, oldNode, outOldNode ); return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(This->node), newNode, oldNode, outOldNode );
} }
static HRESULT WINAPI domtext_removeChild( static HRESULT WINAPI domtext_removeChild(
@ -300,7 +298,7 @@ static HRESULT WINAPI domtext_removeChild(
IXMLDOMNode* domNode, IXMLDOMNode** oldNode) IXMLDOMNode* domNode, IXMLDOMNode** oldNode)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_removeChild( This->node, domNode, oldNode ); return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(This->node), domNode, oldNode );
} }
static HRESULT WINAPI domtext_appendChild( static HRESULT WINAPI domtext_appendChild(
@ -308,7 +306,7 @@ static HRESULT WINAPI domtext_appendChild(
IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) IXMLDOMNode* newNode, IXMLDOMNode** outNewNode)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_appendChild( This->node, newNode, outNewNode ); return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(This->node), newNode, outNewNode );
} }
static HRESULT WINAPI domtext_hasChildNodes( static HRESULT WINAPI domtext_hasChildNodes(
@ -316,7 +314,7 @@ static HRESULT WINAPI domtext_hasChildNodes(
VARIANT_BOOL* pbool) VARIANT_BOOL* pbool)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_hasChildNodes( This->node, pbool ); return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(This->node), pbool );
} }
static HRESULT WINAPI domtext_get_ownerDocument( static HRESULT WINAPI domtext_get_ownerDocument(
@ -324,7 +322,7 @@ static HRESULT WINAPI domtext_get_ownerDocument(
IXMLDOMDocument** domDocument) IXMLDOMDocument** domDocument)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_ownerDocument( This->node, domDocument ); return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(This->node), domDocument );
} }
static HRESULT WINAPI domtext_cloneNode( static HRESULT WINAPI domtext_cloneNode(
@ -332,7 +330,7 @@ static HRESULT WINAPI domtext_cloneNode(
VARIANT_BOOL pbool, IXMLDOMNode** outNode) VARIANT_BOOL pbool, IXMLDOMNode** outNode)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_cloneNode( This->node, pbool, outNode ); return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(This->node), pbool, outNode );
} }
static HRESULT WINAPI domtext_get_nodeTypeString( static HRESULT WINAPI domtext_get_nodeTypeString(
@ -340,7 +338,7 @@ static HRESULT WINAPI domtext_get_nodeTypeString(
BSTR* p) BSTR* p)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_nodeTypeString( This->node, p ); return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domtext_get_text( static HRESULT WINAPI domtext_get_text(
@ -348,7 +346,7 @@ static HRESULT WINAPI domtext_get_text(
BSTR* p) BSTR* p)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_text( This->node, p ); return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domtext_put_text( static HRESULT WINAPI domtext_put_text(
@ -356,7 +354,7 @@ static HRESULT WINAPI domtext_put_text(
BSTR p) BSTR p)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_put_text( This->node, p ); return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domtext_get_specified( static HRESULT WINAPI domtext_get_specified(
@ -364,7 +362,7 @@ static HRESULT WINAPI domtext_get_specified(
VARIANT_BOOL* pbool) VARIANT_BOOL* pbool)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_specified( This->node, pbool ); return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(This->node), pbool );
} }
static HRESULT WINAPI domtext_get_definition( static HRESULT WINAPI domtext_get_definition(
@ -372,7 +370,7 @@ static HRESULT WINAPI domtext_get_definition(
IXMLDOMNode** domNode) IXMLDOMNode** domNode)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_definition( This->node, domNode ); return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(This->node), domNode );
} }
static HRESULT WINAPI domtext_get_nodeTypedValue( static HRESULT WINAPI domtext_get_nodeTypedValue(
@ -380,7 +378,7 @@ static HRESULT WINAPI domtext_get_nodeTypedValue(
VARIANT* var1) VARIANT* var1)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_nodeTypedValue( This->node, var1 ); return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domtext_put_nodeTypedValue( static HRESULT WINAPI domtext_put_nodeTypedValue(
@ -388,7 +386,7 @@ static HRESULT WINAPI domtext_put_nodeTypedValue(
VARIANT var1) VARIANT var1)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_put_nodeTypedValue( This->node, var1 ); return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domtext_get_dataType( static HRESULT WINAPI domtext_get_dataType(
@ -396,7 +394,7 @@ static HRESULT WINAPI domtext_get_dataType(
VARIANT* var1) VARIANT* var1)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_dataType( This->node, var1 ); return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(This->node), var1 );
} }
static HRESULT WINAPI domtext_put_dataType( static HRESULT WINAPI domtext_put_dataType(
@ -404,7 +402,7 @@ static HRESULT WINAPI domtext_put_dataType(
BSTR p) BSTR p)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_put_dataType( This->node, p ); return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domtext_get_xml( static HRESULT WINAPI domtext_get_xml(
@ -412,7 +410,7 @@ static HRESULT WINAPI domtext_get_xml(
BSTR* p) BSTR* p)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_xml( This->node, p ); return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domtext_transformNode( static HRESULT WINAPI domtext_transformNode(
@ -420,7 +418,7 @@ static HRESULT WINAPI domtext_transformNode(
IXMLDOMNode* domNode, BSTR* p) IXMLDOMNode* domNode, BSTR* p)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_transformNode( This->node, domNode, p ); return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(This->node), domNode, p );
} }
static HRESULT WINAPI domtext_selectNodes( static HRESULT WINAPI domtext_selectNodes(
@ -428,7 +426,7 @@ static HRESULT WINAPI domtext_selectNodes(
BSTR p, IXMLDOMNodeList** outList) BSTR p, IXMLDOMNodeList** outList)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_selectNodes( This->node, p, outList ); return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(This->node), p, outList );
} }
static HRESULT WINAPI domtext_selectSingleNode( static HRESULT WINAPI domtext_selectSingleNode(
@ -436,7 +434,7 @@ static HRESULT WINAPI domtext_selectSingleNode(
BSTR p, IXMLDOMNode** outNode) BSTR p, IXMLDOMNode** outNode)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_selectSingleNode( This->node, p, outNode ); return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(This->node), p, outNode );
} }
static HRESULT WINAPI domtext_get_parsed( static HRESULT WINAPI domtext_get_parsed(
@ -444,7 +442,7 @@ static HRESULT WINAPI domtext_get_parsed(
VARIANT_BOOL* pbool) VARIANT_BOOL* pbool)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_parsed( This->node, pbool ); return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(This->node), pbool );
} }
static HRESULT WINAPI domtext_get_namespaceURI( static HRESULT WINAPI domtext_get_namespaceURI(
@ -452,7 +450,7 @@ static HRESULT WINAPI domtext_get_namespaceURI(
BSTR* p) BSTR* p)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_namespaceURI( This->node, p ); return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domtext_get_prefix( static HRESULT WINAPI domtext_get_prefix(
@ -460,7 +458,7 @@ static HRESULT WINAPI domtext_get_prefix(
BSTR* p) BSTR* p)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_prefix( This->node, p ); return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domtext_get_baseName( static HRESULT WINAPI domtext_get_baseName(
@ -468,7 +466,7 @@ static HRESULT WINAPI domtext_get_baseName(
BSTR* p) BSTR* p)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_get_baseName( This->node, p ); return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(This->node), p );
} }
static HRESULT WINAPI domtext_transformNodeToObject( static HRESULT WINAPI domtext_transformNodeToObject(
@ -476,7 +474,7 @@ static HRESULT WINAPI domtext_transformNodeToObject(
IXMLDOMNode* domNode, VARIANT var1) IXMLDOMNode* domNode, VARIANT var1)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
return IXMLDOMNode_transformNodeToObject( This->node, domNode, var1 ); return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(This->node), domNode, var1 );
} }
static HRESULT WINAPI domtext_get_data( static HRESULT WINAPI domtext_get_data(
@ -490,7 +488,7 @@ static HRESULT WINAPI domtext_get_data(
if(!p) if(!p)
return E_INVALIDARG; return E_INVALIDARG;
hr = IXMLDOMNode_get_nodeValue( This->node, &vRet ); hr = IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), &vRet );
if(hr == S_OK) if(hr == S_OK)
{ {
*p = V_BSTR(&vRet); *p = V_BSTR(&vRet);
@ -512,7 +510,7 @@ static HRESULT WINAPI domtext_put_data(
V_VT(&val) = VT_BSTR; V_VT(&val) = VT_BSTR;
V_BSTR(&val) = data; V_BSTR(&val) = data;
hr = IXMLDOMNode_put_nodeValue( This->node, val ); hr = IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), val );
return hr; return hr;
} }
@ -522,7 +520,6 @@ static HRESULT WINAPI domtext_get_length(
LONG *len) LONG *len)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node );
xmlChar *pContent; xmlChar *pContent;
LONG nLength = 0; LONG nLength = 0;
@ -531,7 +528,7 @@ static HRESULT WINAPI domtext_get_length(
if(!len) if(!len)
return E_INVALIDARG; return E_INVALIDARG;
pContent = xmlNodeGetContent(pDOMNode->node); pContent = xmlNodeGetContent(This->node->node);
if(pContent) if(pContent)
{ {
nLength = xmlStrlen(pContent); nLength = xmlStrlen(pContent);
@ -548,7 +545,6 @@ static HRESULT WINAPI domtext_substringData(
LONG offset, LONG count, BSTR *p) LONG offset, LONG count, BSTR *p)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node );
xmlChar *pContent; xmlChar *pContent;
LONG nLength = 0; LONG nLength = 0;
HRESULT hr = S_FALSE; HRESULT hr = S_FALSE;
@ -565,7 +561,7 @@ static HRESULT WINAPI domtext_substringData(
if(count == 0) if(count == 0)
return hr; return hr;
pContent = xmlNodeGetContent(pDOMNode->node); pContent = xmlNodeGetContent(This->node->node);
if(pContent) if(pContent)
{ {
nLength = xmlStrlen(pContent); nLength = xmlStrlen(pContent);
@ -593,7 +589,6 @@ static HRESULT WINAPI domtext_appendData(
BSTR p) BSTR p)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node );
xmlChar *pContent; xmlChar *pContent;
HRESULT hr = S_FALSE; HRESULT hr = S_FALSE;
@ -606,7 +601,7 @@ static HRESULT WINAPI domtext_appendData(
pContent = xmlChar_from_wchar( p ); pContent = xmlChar_from_wchar( p );
if(pContent) if(pContent)
{ {
if(xmlTextConcat(pDOMNode->node, pContent, SysStringLen(p) ) == 0) if(xmlTextConcat(This->node->node, pContent, SysStringLen(p) ) == 0)
hr = S_OK; hr = S_OK;
else else
hr = E_FAIL; hr = E_FAIL;
@ -623,7 +618,6 @@ static HRESULT WINAPI domtext_insertData(
LONG offset, BSTR p) LONG offset, BSTR p)
{ {
domtext *This = impl_from_IXMLDOMText( iface ); domtext *This = impl_from_IXMLDOMText( iface );
xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node );
xmlChar *pXmlContent; xmlChar *pXmlContent;
BSTR sNewString; BSTR sNewString;
HRESULT hr = S_FALSE; HRESULT hr = S_FALSE;
@ -641,7 +635,7 @@ static HRESULT WINAPI domtext_insertData(
return E_INVALIDARG; return E_INVALIDARG;
} }
pXmlContent = xmlNodeGetContent(pDOMNode->node); pXmlContent = xmlNodeGetContent(This->node->node);
if(pXmlContent) if(pXmlContent)
{ {
BSTR sContent = bstr_from_xmlChar( pXmlContent ); BSTR sContent = bstr_from_xmlChar( pXmlContent );
@ -672,7 +666,7 @@ static HRESULT WINAPI domtext_insertData(
str = xmlChar_from_wchar(sNewString); str = xmlChar_from_wchar(sNewString);
if(str) if(str)
{ {
xmlNodeSetContent(pDOMNode->node, str); xmlNodeSetContent(This->node->node, str);
hr = S_OK; hr = S_OK;
} }
HeapFree(GetProcessHeap(), 0, str); HeapFree(GetProcessHeap(), 0, str);
@ -772,7 +766,6 @@ static const struct IXMLDOMTextVtbl domtext_vtbl =
IUnknown* create_text( xmlNodePtr text ) IUnknown* create_text( xmlNodePtr text )
{ {
domtext *This; domtext *This;
xmlnode *node;
This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); This = HeapAlloc( GetProcessHeap(), 0, sizeof *This );
if ( !This ) if ( !This )
@ -781,16 +774,13 @@ IUnknown* create_text( xmlNodePtr text )
This->lpVtbl = &domtext_vtbl; This->lpVtbl = &domtext_vtbl;
This->ref = 1; This->ref = 1;
node = create_basic_node( text, (IUnknown*)&This->lpVtbl, NULL ); This->node = create_basic_node( text, (IUnknown*)&This->lpVtbl, NULL );
if(!node) if(!This->node)
{ {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
return NULL; return NULL;
} }
This->node_unk = (IUnknown*)&node->lpInternalUnkVtbl;
This->node = IXMLDOMNode_from_impl(node);
return (IUnknown*) &This->lpVtbl; return (IUnknown*) &This->lpVtbl;
} }