Module: wine Branch: master Commit: 875c9c71ab8d8b8e3695ebea277b87b39ddd49f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=875c9c71ab8d8b8e3695ebea27...
Author: Nikolay Sivov bunglehead@gmail.com Date: Wed Feb 10 15:12:39 2010 +0300
msxml3: Accept PI node in on base name request.
---
dlls/msxml3/node.c | 17 +++++++++-------- dlls/msxml3/tests/domdoc.c | 7 +++++++ 2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index d486bd9..da9afd2 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -250,16 +250,16 @@ static HRESULT WINAPI xmlnode_get_nodeName( str = (const xmlChar*) "#document-fragment"; break; case XML_TEXT_NODE: - str = (const xmlChar*) "#text"; - break; + str = (const xmlChar*) "#text"; + break; case XML_DOCUMENT_NODE: - str = (const xmlChar*) "#document"; - break; - case XML_ATTRIBUTE_NODE: - case XML_ELEMENT_NODE: - case XML_PI_NODE: + str = (const xmlChar*) "#document"; + break; + case XML_ATTRIBUTE_NODE: + case XML_ELEMENT_NODE: + case XML_PI_NODE: str = This->node->name; - break; + break; default: FIXME("nodeName not mapped correctly (%d)\n", This->node->type); str = This->node->name; @@ -1622,6 +1622,7 @@ static HRESULT WINAPI xmlnode_get_baseName( { case XML_ELEMENT_NODE: case XML_ATTRIBUTE_NODE: + case XML_PI_NODE: str = bstr_from_xmlChar( This->node->name ); r = S_OK; break; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index bf2e234..1b134af 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1032,6 +1032,13 @@ static void test_domdoc( void ) ok( !lstrcmpW( str, _bstr_("xml") ), "incorrect nodeName string\n"); SysFreeString(str);
+ /* test baseName */ + str = (BSTR)0x1; + r = IXMLDOMProcessingInstruction_get_baseName(nodePI, &str); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( str, _bstr_("xml") ), "incorrect nodeName string\n"); + SysFreeString(str); + /* test Target */ r = IXMLDOMProcessingInstruction_get_target(nodePI, &str); ok(r == S_OK, "ret %08x\n", r );