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

msxml3: Corrected getAttributeNode to return correct values.

This commit is contained in:
Alistair Leslie-Hughes 2008-12-13 20:12:02 +11:00 committed by Alexandre Julliard
parent 177767c418
commit 561cf9f746
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/msxml3/element.c
View File

@ -587,23 +587,32 @@ static HRESULT WINAPI domelem_getAttributeNode(
xmlNodePtr element;
xmlAttrPtr attr;
IUnknown *unk;
HRESULT hr = E_FAIL;
HRESULT hr = S_FALSE;
TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), attributeNode);
if(!attributeNode)
return E_FAIL;
*attributeNode = NULL;
element = get_element( This );
if ( !element )
return E_FAIL;
xml_name = xmlChar_from_wchar(p);
if(!xmlValidateNameValue(xml_name))
{
HeapFree(GetProcessHeap(), 0, xml_name);
return E_FAIL;
}
attr = xmlHasProp(element, xml_name);
if(attr) {
unk = create_attribute((xmlNodePtr)attr);
hr = IUnknown_QueryInterface(unk, &IID_IXMLDOMAttribute, (void**)attributeNode);
IUnknown_Release(unk);
}else {
*attributeNode = NULL;
}
HeapFree(GetProcessHeap(), 0, xml_name);

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

@ -958,12 +958,22 @@ static void test_domnode( void )
ok( V_VT(&var) == VT_NULL || V_VT(&var) == VT_EMPTY, "vt = %x\n", V_VT(&var));
VariantClear(&var);
r = IXMLDOMElement_getAttributeNode( element, str, NULL);
ok( r == E_FAIL, "getAttributeNode ret %08x\n", r );
attr = (IXMLDOMAttribute*)0xdeadbeef;
r = IXMLDOMElement_getAttributeNode( element, str, &attr);
ok( r == E_FAIL, "getAttributeNode ret %08x\n", r );
ok( attr == NULL, "getAttributeNode ret %p, expected NULL\n", attr );
SysFreeString( str );
attr = (IXMLDOMAttribute*)0xdeadbeef;
str = _bstr_("nonExisitingAttribute");
r = IXMLDOMElement_getAttributeNode( element, str, &attr);
ok( r == S_FALSE, "getAttributeNode ret %08x\n", r );
ok( attr == NULL, "getAttributeNode ret %p, expected NULL\n", attr );
SysFreeString( str );
str = SysAllocString( szdl );
V_VT(&var) = VT_I4;
V_I4(&var) = 0x1234;