Nikolay Sivov : xmllite/reader: Return proper name for xml declaration PI.

Alexandre Julliard julliard at winehq.org
Tue Mar 7 15:43:59 CST 2017


Module: wine
Branch: master
Commit: 7c44c65ebb28a0dbc68f874b0d22f482f6c2a04b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7c44c65ebb28a0dbc68f874b0d22f482f6c2a04b

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Tue Mar  7 06:50:55 2017 +0300

xmllite/reader: Return proper name for xml declaration PI.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/xmllite/reader.c       | 4 ++--
 dlls/xmllite/tests/reader.c | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c
index 5f53d3f..9e0d11e 100644
--- a/dlls/xmllite/reader.c
+++ b/dlls/xmllite/reader.c
@@ -1299,8 +1299,8 @@ static HRESULT reader_parse_xmldecl(xmlreader *reader)
     reader_skipn(reader, 2);
 
     reader->nodetype = XmlNodeType_XmlDeclaration;
-    reader_set_strvalue(reader, StringValue_LocalName, &strval_empty);
-    reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty);
+    reader_set_strvalue(reader, StringValue_LocalName, &strval_xml);
+    reader_set_strvalue(reader, StringValue_QualifiedName, &strval_xml);
     reader_set_strvalue(reader, StringValue_Value, &strval_empty);
 
     return S_OK;
diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c
index 07e149f..7153474 100644
--- a/dlls/xmllite/tests/reader.c
+++ b/dlls/xmllite/tests/reader.c
@@ -869,9 +869,14 @@ todo_wine {
     ok(hr == S_OK, "expected S_OK, got %08x\n", hr);
     ok(*val == 0, "got %s\n", wine_dbgstr_w(val));
 
+    val = NULL;
     hr = IXmlReader_GetLocalName(reader, &val, NULL);
     ok(hr == S_OK, "expected S_OK, got %08x\n", hr);
-todo_wine
+    ok(!lstrcmpW(val, xmlW), "got %s\n", wine_dbgstr_w(val));
+
+    val = NULL;
+    hr = IXmlReader_GetQualifiedName(reader, &val, NULL);
+    ok(hr == S_OK, "expected S_OK, got %08x\n", hr);
     ok(!lstrcmpW(val, xmlW), "got %s\n", wine_dbgstr_w(val));
 
     /* check attributes */




More information about the wine-cvs mailing list