marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msxml3: Return qualified name from get_nodeName().

oldstable
Nikolay Sivov 2011-11-16 00:31:40 +03:00 committed by Alexandre Julliard
parent 12bb4a471f
commit ede880a1c3
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/msxml3/node.c
View File

@ -128,12 +128,33 @@ xmlnode *get_node_obj(IXMLDOMNode *node)
HRESULT node_get_nodeName(xmlnode *This, BSTR *name)
{
BSTR prefix, base;
HRESULT hr;
if (!name)
return E_INVALIDARG;
*name = bstr_from_xmlChar(This->node->name);
if (!*name)
return S_FALSE;
hr = node_get_base_name(This, &base);
if (hr != S_OK) return hr;
hr = node_get_prefix(This, &prefix);
if (hr == S_OK)
{
static const WCHAR colW = ':';
WCHAR *ptr;
/* +1 for ':' */
ptr = *name = SysAllocStringLen(NULL, SysStringLen(base) + SysStringLen(prefix) + 1);
memcpy(ptr, prefix, SysStringByteLen(prefix));
ptr += SysStringLen(prefix);
memcpy(ptr++, &colW, sizeof(WCHAR));
memcpy(ptr, base, SysStringByteLen(base));
SysFreeString(base);
SysFreeString(prefix);
}
else
*name = base;
return S_OK;
}

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

@ -7009,7 +7009,7 @@ static void test_namespaces(void)
hr = IXMLDOMNode_get_nodeName(node2, &str);
EXPECT_HR(hr, S_OK);
todo_wine ok(!lstrcmpW( str, _bstr_("Model:Package")), "got %s\n", wine_dbgstr_w(str));
ok(!lstrcmpW( str, _bstr_("Model:Package")), "got %s\n", wine_dbgstr_w(str));
SysFreeString(str);
/* Test get_namespaceURI */
@ -7030,7 +7030,7 @@ static void test_namespaces(void)
hr = IXMLDOMAttribute_get_nodeName(attr, &str);
EXPECT_HR(hr, S_OK);
todo_wine ok(!lstrcmpW( str, _bstr_("Model:name2")), "got %s\n", wine_dbgstr_w(str));
ok(!lstrcmpW( str, _bstr_("Model:name2")), "got %s\n", wine_dbgstr_w(str));
SysFreeString(str);
hr = IXMLDOMAttribute_get_prefix(attr, &str);