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

msxml3: Simplify IXMLDOMElement_get_tagName(), add null check.

Browse Source
This commit is contained in:
Nikolay Sivov 2010-02-19 18:06:17 +03:00 committed by Alexandre Julliard
parent 6164ce2d82
commit d013991d55
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/msxml3/element.c
View File

@ -489,32 +489,24 @@ static HRESULT WINAPI domelem_get_tagName(
{ {
domelem *This = impl_from_IXMLDOMElement( iface ); domelem *This = impl_from_IXMLDOMElement( iface );
xmlNodePtr element; xmlNodePtr element;
DWORD len; const xmlChar *prefix;
DWORD offset = 0; xmlChar *qname;
LPWSTR str;
TRACE("(%p)->(%p)\n", This, p ); TRACE("(%p)->(%p)\n", This, p );
if (!p) return E_INVALIDARG;
element = get_element( This ); element = get_element( This );
if ( !element ) if ( !element )
return E_FAIL; return E_FAIL;
len = MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) element->name, -1, NULL, 0 ); prefix = element->ns ? element->ns->prefix : NULL;
if (element->ns) qname = xmlBuildQName(element->name, prefix, NULL, 0);
len += MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) element->ns->prefix, -1, NULL, 0 );
str = heap_alloc( len * sizeof (WCHAR) );
if ( !str )
return E_OUTOFMEMORY;
if (element->ns)
{
offset = MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) element->ns->prefix, -1, str, len );
str[offset - 1] = ':';
}
MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) element->name, -1, str + offset, len - offset );
*p = SysAllocString( str );
heap_free( str );
return S_OK; *p = bstr_from_xmlChar(qname);
if (qname != element->name) xmlFree(qname);
return *p ? S_OK : E_OUTOFMEMORY;
} }
static HRESULT WINAPI domelem_getAttribute( static HRESULT WINAPI domelem_getAttribute(

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

@ -639,6 +639,9 @@ static void test_domdoc( void )
r = IXMLDOMElement_QueryInterface( element, &IID_IObjectIdentity, (LPVOID*)&ident ); r = IXMLDOMElement_QueryInterface( element, &IID_IObjectIdentity, (LPVOID*)&ident );
ok( r == E_NOINTERFACE, "ret %08x\n", r); ok( r == E_NOINTERFACE, "ret %08x\n", r);
r = IXMLDOMElement_get_tagName( element, NULL );
ok( r == E_INVALIDARG, "ret %08x\n", r);
/* check if the tag is correct */ /* check if the tag is correct */
r = IXMLDOMElement_get_tagName( element, &tag ); r = IXMLDOMElement_get_tagName( element, &tag );
ok( r == S_OK, "couldn't get tag name\n"); ok( r == S_OK, "couldn't get tag name\n");