ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msxml3: _domtext->element is in fact a IXMLDOMNode.

This commit is contained in:
Michael Karcher 2008-10-09 15:29:27 +02:00 committed by Alexandre Julliard
parent addcf866cb
commit 64e44d1156
1 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
dlls/msxml3/text.c
View File

@ -43,7 +43,7 @@ typedef struct _domtext
const struct IXMLDOMTextVtbl *lpVtbl; const struct IXMLDOMTextVtbl *lpVtbl;
LONG ref; LONG ref;
IUnknown *element_unk; IUnknown *element_unk;
IXMLDOMElement *element; IXMLDOMNode *node;
} domtext; } domtext;
static inline domtext *impl_from_IXMLDOMText( IXMLDOMText *iface ) static inline domtext *impl_from_IXMLDOMText( IXMLDOMText *iface )
@ -187,7 +187,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->element, p ); return IXMLDOMNode_get_nodeName( This->node, p );
} }
static HRESULT WINAPI domtext_get_nodeValue( static HRESULT WINAPI domtext_get_nodeValue(
@ -195,7 +195,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->element, var1 ); return IXMLDOMNode_get_nodeValue( This->node, var1 );
} }
static HRESULT WINAPI domtext_put_nodeValue( static HRESULT WINAPI domtext_put_nodeValue(
@ -203,7 +203,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->element, var1 ); return IXMLDOMNode_put_nodeValue( This->node, var1 );
} }
static HRESULT WINAPI domtext_get_nodeType( static HRESULT WINAPI domtext_get_nodeType(
@ -211,7 +211,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->element, domNodeType ); return IXMLDOMNode_get_nodeType( This->node, domNodeType );
} }
static HRESULT WINAPI domtext_get_parentNode( static HRESULT WINAPI domtext_get_parentNode(
@ -219,7 +219,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->element, parent ); return IXMLDOMNode_get_parentNode( This->node, parent );
} }
static HRESULT WINAPI domtext_get_childNodes( static HRESULT WINAPI domtext_get_childNodes(
@ -227,7 +227,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->element, outList ); return IXMLDOMNode_get_childNodes( This->node, outList );
} }
static HRESULT WINAPI domtext_get_firstChild( static HRESULT WINAPI domtext_get_firstChild(
@ -235,7 +235,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->element, domNode ); return IXMLDOMNode_get_firstChild( This->node, domNode );
} }
static HRESULT WINAPI domtext_get_lastChild( static HRESULT WINAPI domtext_get_lastChild(
@ -243,7 +243,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->element, domNode ); return IXMLDOMNode_get_lastChild( This->node, domNode );
} }
static HRESULT WINAPI domtext_get_previousSibling( static HRESULT WINAPI domtext_get_previousSibling(
@ -251,7 +251,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->element, domNode ); return IXMLDOMNode_get_previousSibling( This->node, domNode );
} }
static HRESULT WINAPI domtext_get_nextSibling( static HRESULT WINAPI domtext_get_nextSibling(
@ -259,7 +259,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->element, domNode ); return IXMLDOMNode_get_nextSibling( This->node, domNode );
} }
static HRESULT WINAPI domtext_get_attributes( static HRESULT WINAPI domtext_get_attributes(
@ -267,7 +267,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->element, attributeMap ); return IXMLDOMNode_get_attributes( This->node, attributeMap );
} }
static HRESULT WINAPI domtext_insertBefore( static HRESULT WINAPI domtext_insertBefore(
@ -276,7 +276,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->element, newNode, var1, outOldNode ); return IXMLDOMNode_insertBefore( This->node, newNode, var1, outOldNode );
} }
static HRESULT WINAPI domtext_replaceChild( static HRESULT WINAPI domtext_replaceChild(
@ -286,7 +286,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->element, newNode, oldNode, outOldNode ); return IXMLDOMNode_replaceChild( This->node, newNode, oldNode, outOldNode );
} }
static HRESULT WINAPI domtext_removeChild( static HRESULT WINAPI domtext_removeChild(
@ -294,7 +294,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->element, domNode, oldNode ); return IXMLDOMNode_removeChild( This->node, domNode, oldNode );
} }
static HRESULT WINAPI domtext_appendChild( static HRESULT WINAPI domtext_appendChild(
@ -302,7 +302,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->element, newNode, outNewNode ); return IXMLDOMNode_appendChild( This->node, newNode, outNewNode );
} }
static HRESULT WINAPI domtext_hasChildNodes( static HRESULT WINAPI domtext_hasChildNodes(
@ -310,7 +310,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->element, pbool ); return IXMLDOMNode_hasChildNodes( This->node, pbool );
} }
static HRESULT WINAPI domtext_get_ownerDocument( static HRESULT WINAPI domtext_get_ownerDocument(
@ -318,7 +318,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->element, domDocument ); return IXMLDOMNode_get_ownerDocument( This->node, domDocument );
} }
static HRESULT WINAPI domtext_cloneNode( static HRESULT WINAPI domtext_cloneNode(
@ -326,7 +326,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->element, pbool, outNode ); return IXMLDOMNode_cloneNode( This->node, pbool, outNode );
} }
static HRESULT WINAPI domtext_get_nodeTypeString( static HRESULT WINAPI domtext_get_nodeTypeString(
@ -334,7 +334,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->element, p ); return IXMLDOMNode_get_nodeTypeString( This->node, p );
} }
static HRESULT WINAPI domtext_get_text( static HRESULT WINAPI domtext_get_text(
@ -342,7 +342,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->element, p ); return IXMLDOMNode_get_text( This->node, p );
} }
static HRESULT WINAPI domtext_put_text( static HRESULT WINAPI domtext_put_text(
@ -350,7 +350,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->element, p ); return IXMLDOMNode_put_text( This->node, p );
} }
static HRESULT WINAPI domtext_get_specified( static HRESULT WINAPI domtext_get_specified(
@ -358,7 +358,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->element, pbool ); return IXMLDOMNode_get_specified( This->node, pbool );
} }
static HRESULT WINAPI domtext_get_definition( static HRESULT WINAPI domtext_get_definition(
@ -366,7 +366,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->element, domNode ); return IXMLDOMNode_get_definition( This->node, domNode );
} }
static HRESULT WINAPI domtext_get_nodeTypedValue( static HRESULT WINAPI domtext_get_nodeTypedValue(
@ -374,7 +374,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->element, var1 ); return IXMLDOMNode_get_nodeTypedValue( This->node, var1 );
} }
static HRESULT WINAPI domtext_put_nodeTypedValue( static HRESULT WINAPI domtext_put_nodeTypedValue(
@ -382,7 +382,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->element, var1 ); return IXMLDOMNode_put_nodeTypedValue( This->node, var1 );
} }
static HRESULT WINAPI domtext_get_dataType( static HRESULT WINAPI domtext_get_dataType(
@ -390,7 +390,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->element, var1 ); return IXMLDOMNode_get_dataType( This->node, var1 );
} }
static HRESULT WINAPI domtext_put_dataType( static HRESULT WINAPI domtext_put_dataType(
@ -398,7 +398,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->element, p ); return IXMLDOMNode_put_dataType( This->node, p );
} }
static HRESULT WINAPI domtext_get_xml( static HRESULT WINAPI domtext_get_xml(
@ -406,7 +406,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->element, p ); return IXMLDOMNode_get_xml( This->node, p );
} }
static HRESULT WINAPI domtext_transformNode( static HRESULT WINAPI domtext_transformNode(
@ -414,7 +414,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->element, domNode, p ); return IXMLDOMNode_transformNode( This->node, domNode, p );
} }
static HRESULT WINAPI domtext_selectNodes( static HRESULT WINAPI domtext_selectNodes(
@ -422,7 +422,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->element, p, outList ); return IXMLDOMNode_selectNodes( This->node, p, outList );
} }
static HRESULT WINAPI domtext_selectSingleNode( static HRESULT WINAPI domtext_selectSingleNode(
@ -430,7 +430,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->element, p, outNode ); return IXMLDOMNode_selectSingleNode( This->node, p, outNode );
} }
static HRESULT WINAPI domtext_get_parsed( static HRESULT WINAPI domtext_get_parsed(
@ -438,7 +438,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->element, pbool ); return IXMLDOMNode_get_parsed( This->node, pbool );
} }
static HRESULT WINAPI domtext_get_namespaceURI( static HRESULT WINAPI domtext_get_namespaceURI(
@ -446,7 +446,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->element, p ); return IXMLDOMNode_get_namespaceURI( This->node, p );
} }
static HRESULT WINAPI domtext_get_prefix( static HRESULT WINAPI domtext_get_prefix(
@ -454,7 +454,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->element, p ); return IXMLDOMNode_get_prefix( This->node, p );
} }
static HRESULT WINAPI domtext_get_baseName( static HRESULT WINAPI domtext_get_baseName(
@ -462,7 +462,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->element, p ); return IXMLDOMNode_get_baseName( This->node, p );
} }
static HRESULT WINAPI domtext_transformNodeToObject( static HRESULT WINAPI domtext_transformNodeToObject(
@ -470,7 +470,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->element, domNode, var1 ); return IXMLDOMNode_transformNodeToObject( This->node, domNode, var1 );
} }
static HRESULT WINAPI domtext_get_data( static HRESULT WINAPI domtext_get_data(
@ -484,7 +484,7 @@ static HRESULT WINAPI domtext_get_data(
if(!p) if(!p)
return E_INVALIDARG; return E_INVALIDARG;
hr = IXMLDOMNode_get_nodeValue( This->element, &vRet ); hr = IXMLDOMNode_get_nodeValue( This->node, &vRet );
if(hr == S_OK) if(hr == S_OK)
{ {
*p = V_BSTR(&vRet); *p = V_BSTR(&vRet);
@ -506,7 +506,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->element, val ); hr = IXMLDOMNode_put_nodeValue( This->node, val );
return hr; return hr;
} }
@ -516,7 +516,7 @@ 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( (IXMLDOMNode*)This->element ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node );
xmlChar *pContent; xmlChar *pContent;
long nLength = 0; long nLength = 0;
@ -542,7 +542,7 @@ 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( (IXMLDOMNode*)This->element ); 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;
@ -587,7 +587,7 @@ 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( (IXMLDOMNode*)This->element ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node );
xmlChar *pContent; xmlChar *pContent;
HRESULT hr = S_FALSE; HRESULT hr = S_FALSE;
@ -616,7 +616,7 @@ 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( (IXMLDOMNode*)This->element ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node );
xmlChar *pXmlContent; xmlChar *pXmlContent;
BSTR sNewString; BSTR sNewString;
HRESULT hr = S_FALSE; HRESULT hr = S_FALSE;
@ -780,15 +780,15 @@ IUnknown* create_text( xmlNodePtr text )
return NULL; return NULL;
} }
hr = IUnknown_QueryInterface(This->element_unk, &IID_IXMLDOMNode, (LPVOID*)&This->element); hr = IUnknown_QueryInterface(This->element_unk, &IID_IXMLDOMNode, (LPVOID*)&This->node);
if(FAILED(hr)) if(FAILED(hr))
{ {
IUnknown_Release(This->element_unk); IUnknown_Release(This->element_unk);
HeapFree( GetProcessHeap(), 0, This ); HeapFree( GetProcessHeap(), 0, This );
return NULL; return NULL;
} }
/* The ref on This->element is actually looped back into this object, so release it */ /* The ref on This->node is actually looped back into this object, so release it */
IXMLDOMNode_Release(This->element); IXMLDOMNode_Release(This->node);
return (IUnknown*) &This->lpVtbl; return (IUnknown*) &This->lpVtbl;
} }