From 63c489fab5c669b5a976c33ebcc9f2ee5eb1695a Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov@codeweavers.com>
Date: Wed, 8 Mar 2017 07:07:08 +0300
Subject: [PATCH] xmllite/reader: Fix GetValue() for comments.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/xmllite/reader.c       |  2 +-
 dlls/xmllite/tests/reader.c | 35 ++++++++++++++++++++++++++++++++---
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c
index a52e928be41..4ea0a2a8df0 100644
--- a/dlls/xmllite/reader.c
+++ b/dlls/xmllite/reader.c
@@ -3060,7 +3060,7 @@ static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value,
 
     *value = NULL;
 
-    if ((reader->nodetype == XmlNodeType_Comment && !val->str) || is_reader_pending(reader))
+    if ((reader->nodetype == XmlNodeType_Comment && !val->str && !val->len) || is_reader_pending(reader))
     {
         XmlNodeType type;
         HRESULT hr;
diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c
index ebf4f5d7e5c..8c686101dfc 100644
--- a/dlls/xmllite/tests/reader.c
+++ b/dlls/xmllite/tests/reader.c
@@ -954,18 +954,47 @@ static struct test_entry comment_tests[] = {
 
 static void test_read_comment(void)
 {
+    static const char *teststr = "<a>text<!-- comment --></a>";
     struct test_entry *test = comment_tests;
+    static const XmlNodeType types[] =
+    {
+        XmlNodeType_Element,
+        XmlNodeType_Text,
+        XmlNodeType_Comment,
+        XmlNodeType_EndElement,
+    };
+    unsigned int i = 0;
     IXmlReader *reader;
+    XmlNodeType type;
+    IStream *stream;
     HRESULT hr;
 
     hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
     ok(hr == S_OK, "S_OK, got %08x\n", hr);
 
+    stream = create_stream_on_data(teststr, strlen(teststr));
+    hr = IXmlReader_SetInput(reader, (IUnknown*)stream);
+    ok(hr == S_OK, "got %08x\n", hr);
+
+    while (IXmlReader_Read(reader, &type) == S_OK)
+    {
+        const WCHAR *value;
+
+        ok(type == types[i], "%d: unexpected node type %d\n", i, type);
+
+        if (type == XmlNodeType_Text || type == XmlNodeType_Comment)
+        {
+            hr = IXmlReader_GetValue(reader, &value, NULL);
+            ok(hr == S_OK, "got %08x\n", hr);
+            ok(*value != 0, "Expected node value\n");
+        }
+        i++;
+    }
+
+    IStream_Release(stream);
+
     while (test->xml)
     {
-        XmlNodeType type;
-        IStream *stream;
-
         stream = create_stream_on_data(test->xml, strlen(test->xml)+1);
         hr = IXmlReader_SetInput(reader, (IUnknown*)stream);
         ok(hr == S_OK, "got %08x\n", hr);