commit d013991d55956dc9d624ccc63b44129bb7d7714e
author Nikolay Sivov <bunglehead@gmail.com> Fri Feb 19 18:06:17 2010 +0300
committer Alexandre Julliard <julliard@winehq.org> Mon Feb 22 11:41:05 2010 +0100
tree 395e54c12b753a7e947b3a22a98f4e8e27999fea
parent 6164ce2d820546ae5b26eb504bc108091c5679ea

msxml3: Simplify IXMLDOMElement_get_tagName(), add null check.

dlls/msxml3/element.c

diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c
index 0154770..b6caf73 100644
--- a/dlls/msxml3/element.c
+++ b/dlls/msxml3/element.c
@@ -489,32 +489,24 @@
 {
     domelem *This = impl_from_IXMLDOMElement( iface );
     xmlNodePtr element;
-    DWORD len;
-    DWORD offset = 0;
-    LPWSTR str;
+    const xmlChar *prefix;
+    xmlChar *qname;
 
     TRACE("(%p)->(%p)\n", This, p );
 
+    if (!p) return E_INVALIDARG;
+
     element = get_element( This );
     if ( !element )
         return E_FAIL;
 
-    len = MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) element->name, -1, NULL, 0 );
-    if (element->ns)
-        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 );
+    prefix = element->ns ? element->ns->prefix : NULL;
+    qname = xmlBuildQName(element->name, prefix, NULL, 0);
 
-    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(