Nikolay Sivov : xmllite/reader: Fix GetValue() for comments.
Alexandre Julliard
julliard at winehq.org
Wed Mar 8 16:01:37 CST 2017
Module: wine
Branch: master
Commit: 63c489fab5c669b5a976c33ebcc9f2ee5eb1695a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=63c489fab5c669b5a976c33ebcc9f2ee5eb1695a
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Wed Mar 8 07:07:08 2017 +0300
xmllite/reader: Fix GetValue() for comments.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at 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 a52e928..4ea0a2a 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 ebf4f5d..8c68610 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);
- while (test->xml)
+ 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)
{
- XmlNodeType type;
- IStream *stream;
+ 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)
+ {
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);
More information about the wine-cvs
mailing list