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

msxml3: Corrected getAttribute to return current value and assign output var.

This commit is contained in:
Alistair Leslie-Hughes 2008-01-14 21:13:01 +11:00 committed by Alexandre Julliard
parent b57a7e01d6
commit 83300893a2
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/msxml3/element.c
View File

@ -459,15 +459,20 @@ static HRESULT WINAPI domelem_getAttribute(
domelem *This = impl_from_IXMLDOMElement( iface ); domelem *This = impl_from_IXMLDOMElement( iface );
xmlNodePtr element; xmlNodePtr element;
xmlChar *xml_name, *xml_value; xmlChar *xml_name, *xml_value;
HRESULT hr = E_FAIL; HRESULT hr = S_FALSE;
TRACE("(%p)->(%s,%p)\n", This, debugstr_w(name), value); TRACE("(%p)->(%s,%p)\n", This, debugstr_w(name), value);
if(!value || !name)
return E_INVALIDARG;
element = get_element( This ); element = get_element( This );
if ( !element ) if ( !element )
return E_FAIL; return E_FAIL;
VariantInit(value); V_BSTR(value) = NULL;
V_VT(value) = VT_NULL;
xml_name = xmlChar_from_wchar( name ); xml_name = xmlChar_from_wchar( name );
xml_value = xmlGetNsProp(element, xml_name, NULL); xml_value = xmlGetNsProp(element, xml_name, NULL);
HeapFree(GetProcessHeap(), 0, xml_name); HeapFree(GetProcessHeap(), 0, xml_name);

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

@ -697,8 +697,8 @@ static void test_domnode( void )
V_VT(&var) = VT_I4; V_VT(&var) = VT_I4;
V_I4(&var) = 0x1234; V_I4(&var) = 0x1234;
r = IXMLDOMElement_getAttribute( element, str, &var ); r = IXMLDOMElement_getAttribute( element, str, &var );
ok( r == E_FAIL, "getAttribute ret %08x\n", r ); ok( r == S_FALSE, "getAttribute ret %08x\n", r );
ok( V_VT(&var) == VT_EMPTY, "vt = %x\n", V_VT(&var)); ok( V_VT(&var) == VT_NULL, "vt = %x\n", V_VT(&var));
VariantClear(&var); VariantClear(&var);
SysFreeString( str ); SysFreeString( str );
@ -710,6 +710,13 @@ static void test_domnode( void )
ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var));
ok( !lstrcmpW(V_BSTR(&var), szstr1), "wrong attr value\n"); ok( !lstrcmpW(V_BSTR(&var), szstr1), "wrong attr value\n");
VariantClear( &var ); VariantClear( &var );
r = IXMLDOMElement_getAttribute( element, NULL, &var );
ok( r == E_INVALIDARG, "getAttribute ret %08x\n", r );
r = IXMLDOMElement_getAttribute( element, str, NULL );
ok( r == E_INVALIDARG, "getAttribute ret %08x\n", r );
SysFreeString( str ); SysFreeString( str );
r = IXMLDOMElement_get_attributes( element, &map ); r = IXMLDOMElement_get_attributes( element, &map );