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

msxml3: Text node should not aggregate element.

This commit is contained in:
Michael Karcher 2008-10-09 15:36:14 +02:00 committed by Alexandre Julliard
parent 64e44d1156
commit 9fe98546e4
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/msxml3/tests/domdoc.c
View File

@ -559,6 +559,9 @@ static void test_domdoc( void )
{ {
IXMLDOMNamedNodeMap *pAttribs; IXMLDOMNamedNodeMap *pAttribs;
r = IXMLDOMText_QueryInterface(nodetext, &IID_IXMLDOMElement, (LPVOID*)&element);
ok(r == E_NOINTERFACE, "ret %08x\n", r );
/* Text Last Child Checks */ /* Text Last Child Checks */
r = IXMLDOMText_get_lastChild(nodetext, NULL); r = IXMLDOMText_get_lastChild(nodetext, NULL);
ok(r == E_INVALIDARG, "ret %08x\n", r ); ok(r == E_INVALIDARG, "ret %08x\n", r );

17
dlls/msxml3/text.c
View File

@ -42,7 +42,7 @@ typedef struct _domtext
{ {
const struct IXMLDOMTextVtbl *lpVtbl; const struct IXMLDOMTextVtbl *lpVtbl;
LONG ref; LONG ref;
IUnknown *element_unk; IUnknown *node_unk;
IXMLDOMNode *node; IXMLDOMNode *node;
} domtext; } domtext;
@ -66,10 +66,9 @@ static HRESULT WINAPI domtext_QueryInterface(
{ {
*ppvObject = iface; *ppvObject = iface;
} }
else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) || else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) )
IsEqualGUID( riid, &IID_IXMLDOMElement ) )
{ {
return IUnknown_QueryInterface(This->element_unk, riid, ppvObject); return IUnknown_QueryInterface(This->node_unk, riid, ppvObject);
} }
else else
{ {
@ -98,7 +97,7 @@ static ULONG WINAPI domtext_Release(
ref = InterlockedDecrement( &This->ref ); ref = InterlockedDecrement( &This->ref );
if ( ref == 0 ) if ( ref == 0 )
{ {
IUnknown_Release( This->element_unk ); IUnknown_Release( This->node_unk );
HeapFree( GetProcessHeap(), 0, This ); HeapFree( GetProcessHeap(), 0, This );
} }
@ -773,17 +772,17 @@ IUnknown* create_text( xmlNodePtr text )
This->lpVtbl = &domtext_vtbl; This->lpVtbl = &domtext_vtbl;
This->ref = 1; This->ref = 1;
This->element_unk = create_element( text, (IUnknown*)&This->lpVtbl ); This->node_unk = create_basic_node( text, (IUnknown*)&This->lpVtbl );
if(!This->element_unk) if(!This->node_unk)
{ {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
return NULL; return NULL;
} }
hr = IUnknown_QueryInterface(This->element_unk, &IID_IXMLDOMNode, (LPVOID*)&This->node); hr = IUnknown_QueryInterface(This->node_unk, &IID_IXMLDOMNode, (LPVOID*)&This->node);
if(FAILED(hr)) if(FAILED(hr))
{ {
IUnknown_Release(This->element_unk); IUnknown_Release(This->node_unk);
HeapFree( GetProcessHeap(), 0, This ); HeapFree( GetProcessHeap(), 0, This );
return NULL; return NULL;
} }