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

msxml3: Fix ::selectSingleNode() behaviour on invalid arguments.

This commit is contained in:
Nikolay Sivov 2010-09-16 23:41:00 +04:00 committed by Alexandre Julliard
parent a6bfb91a7a
commit a930084d86
2 changed files with 71 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/msxml3/node.c
View File

@ -1363,6 +1363,8 @@ static HRESULT WINAPI xmlnode_selectNodes(
TRACE("(%p)->(%s %p)\n", This, debugstr_w(queryString), resultList ); TRACE("(%p)->(%s %p)\n", This, debugstr_w(queryString), resultList );
if (!queryString || !resultList) return E_INVALIDARG;
return queryresult_create( This->node, queryString, resultList ); return queryresult_create( This->node, queryString, resultList );
} }
@ -1377,7 +1379,6 @@ static HRESULT WINAPI xmlnode_selectSingleNode(
TRACE("(%p)->(%s %p)\n", This, debugstr_w(queryString), resultNode ); TRACE("(%p)->(%s %p)\n", This, debugstr_w(queryString), resultNode );
*resultNode = NULL;
r = IXMLDOMNode_selectNodes(This->iface, queryString, &list); r = IXMLDOMNode_selectNodes(This->iface, queryString, &list);
if(r == S_OK) if(r == S_OK)
{ {

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

@ -6218,6 +6218,74 @@ static void test_get_prefix(void)
free_bstrs(); free_bstrs();
} }
static void test_selectSingleNode(void)
{
IXMLDOMDocument *doc;
IXMLDOMNodeList *list;
IXMLDOMNode *node;
VARIANT_BOOL b;
HRESULT hr;
LONG len;
BSTR str;
doc = create_document(&IID_IXMLDOMDocument);
if (!doc) return;
hr = IXMLDOMDocument_selectSingleNode(doc, NULL, NULL);
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
hr = IXMLDOMDocument_selectNodes(doc, NULL, NULL);
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
str = SysAllocString( szComplete4 );
hr = IXMLDOMDocument_loadXML( doc, str, &b );
ok( hr == S_OK, "loadXML failed\n");
ok( b == VARIANT_TRUE, "failed to load XML string\n");
SysFreeString( str );
hr = IXMLDOMDocument_selectSingleNode(doc, NULL, NULL);
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
hr = IXMLDOMDocument_selectNodes(doc, NULL, NULL);
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("lc"), NULL);
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
hr = IXMLDOMDocument_selectNodes(doc, _bstr_("lc"), NULL);
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("lc"), &node);
ok(hr == S_OK, "got 0x%08x\n", hr);
IXMLDOMNode_Release(node);
hr = IXMLDOMDocument_selectNodes(doc, _bstr_("lc"), &list);
ok(hr == S_OK, "got 0x%08x\n", hr);
IXMLDOMNodeList_Release(list);
list = (void*)0xdeadbeef;
hr = IXMLDOMDocument_selectNodes(doc, NULL, &list);
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
ok(list == (void*)0xdeadbeef, "got %p\n", list);
node = (void*)0xdeadbeef;
hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("nonexistent"), &node);
ok(hr == S_FALSE, "got 0x%08x\n", hr);
ok(node == 0, "got %p\n", node);
list = (void*)0xdeadbeef;
hr = IXMLDOMDocument_selectNodes(doc, _bstr_("nonexistent"), &list);
ok(hr == S_OK, "got 0x%08x\n", hr);
len = 1;
hr = IXMLDOMNodeList_get_length(list, &len);
ok(hr == S_OK, "got 0x%08x\n", hr);
ok(len == 0, "got %d\n", len);
IXMLDOMNodeList_Release(list);
IXMLDOMDocument_Release(doc);
free_bstrs();
}
START_TEST(domdoc) START_TEST(domdoc)
{ {
IXMLDOMDocument *doc; IXMLDOMDocument *doc;
@ -6276,6 +6344,7 @@ START_TEST(domdoc)
test_createNode(); test_createNode();
test_get_prefix(); test_get_prefix();
test_default_properties(); test_default_properties();
test_selectSingleNode();
CoUninitialize(); CoUninitialize();
} }