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

msxml3: lastChild not supported for CDATASection, Comment, PI and Text Nodes.

This commit is contained in:
Alistair Leslie-Hughes 2008-01-08 10:28:57 +11:00 committed by Alexandre Julliard
parent 4e908f65fb
commit 91ad27ea25
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/msxml3/node.c
View File

@ -334,7 +334,24 @@ static HRESULT WINAPI xmlnode_get_lastChild(
IXMLDOMNode** lastChild)
{
xmlnode *This = impl_from_IXMLDOMNode( iface );
return get_node( This, "lastChild", This->node->last, lastChild );
TRACE("%p\n", This );
if (!lastChild)
return E_INVALIDARG;
switch( This->node->type )
{
/* CDATASection, Comment, PI and Text Nodes do not support lastChild */
case XML_TEXT_NODE:
case XML_CDATA_SECTION_NODE:
case XML_PI_NODE:
case XML_COMMENT_NODE:
*lastChild = NULL;
return S_FALSE;
default:
return get_node( This, "lastChild", This->node->last, lastChild );
}
}
static HRESULT WINAPI xmlnode_get_previousSibling(

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

@ -347,6 +347,7 @@ static void test_domdoc( void )
IXMLDOMText *nodetext = NULL;
IXMLDOMComment *node_comment = NULL;
IXMLDOMAttribute *node_attr = NULL;
IXMLDOMNode *nodeChild = NULL;
VARIANT_BOOL b;
VARIANT var;
BSTR str;
@ -508,6 +509,17 @@ static void test_domdoc( void )
ok( r == E_INVALIDARG, "returns %08x\n", r );
r = IXMLDOMDocument_createTextNode(doc, str, &nodetext);
ok( r == S_OK, "returns %08x\n", r );
if(nodetext)
{
/* Text Last Child Checks */
r = IXMLDOMText_get_lastChild(nodetext, NULL);
ok(r == E_INVALIDARG, "ret %08x\n", r );
nodeChild = (IXMLDOMNode*)0x1;
r = IXMLDOMText_get_lastChild(nodetext, &nodeChild);
ok(r == S_FALSE, "ret %08x\n", r );
ok(nodeChild == NULL, "nodeChild not NULL\n");
}
IXMLDOMText_Release( nodetext );
SysFreeString( str );
@ -516,6 +528,17 @@ static void test_domdoc( void )
ok( r == E_INVALIDARG, "returns %08x\n", r );
r = IXMLDOMDocument_createComment(doc, szComment, &node_comment);
ok( r == S_OK, "returns %08x\n", r );
if(node_comment)
{
/* Last Child Checks */
r = IXMLDOMComment_get_lastChild(node_comment, NULL);
ok(r == E_INVALIDARG, "ret %08x\n", r );
nodeChild = (IXMLDOMNode*)0x1;
r = IXMLDOMComment_get_lastChild(node_comment, &nodeChild);
ok(r == S_FALSE, "ret %08x\n", r );
ok(nodeChild == NULL, "pLastChild not NULL\n");
}
IXMLDOMText_Release( node_comment );
/* test Create Attribute */