Ziqing Hui : xmllite: Increase depth in reader_set_current_attribute().
Alexandre Julliard
julliard at winehq.org
Thu Jun 2 16:26:08 CDT 2022
Module: wine
Branch: master
Commit: e2ae7ccb794beb8043a3eaaffc2fe0840085d1ec
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2ae7ccb794beb8043a3eaaffc2fe0840085d1ec
Author: Ziqing Hui <zhui at codeweavers.com>
Date: Thu Jun 2 15:10:00 2022 +0800
xmllite: Increase depth in reader_set_current_attribute().
Signed-off-by: Ziqing Hui <zhui at codeweavers.com>
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/xmllite/reader.c | 5 ++---
dlls/xmllite/tests/reader.c | 14 +++++++-------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c
index 03bb6c409b7..4045b4dfcca 100644
--- a/dlls/xmllite/reader.c
+++ b/dlls/xmllite/reader.c
@@ -2931,6 +2931,8 @@ static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node
static void reader_set_current_attribute(xmlreader *reader, struct attribute *attr)
{
+ if (!reader->attr)
+ reader_inc_depth(reader);
reader->attr = attr;
reader->chunk_read_off = 0;
reader_set_strvalue(reader, StringValue_Prefix, &attr->prefix);
@@ -2943,9 +2945,6 @@ static HRESULT reader_move_to_first_attribute(xmlreader *reader)
if (!reader->attr_count)
return S_FALSE;
- if (!reader->attr)
- reader_inc_depth(reader);
-
reader_set_current_attribute(reader, LIST_ENTRY(list_head(&reader->attrs), struct attribute, entry));
return S_OK;
diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c
index 7b68365ac48..2ea781ce992 100644
--- a/dlls/xmllite/tests/reader.c
+++ b/dlls/xmllite/tests/reader.c
@@ -2592,17 +2592,17 @@ static void test_attribute_by_name(void)
hr = IXmlReader_MoveToAttributeByName(reader, L"xmlns", xmlns_uriW);
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
- todo_wine TEST_DEPTH(reader, 2);
+ TEST_DEPTH(reader, 2);
reader_value(reader, L"myns");
hr = IXmlReader_MoveToAttributeByName(reader, L"a", NULL);
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
- todo_wine TEST_DEPTH(reader, 2);
+ TEST_DEPTH(reader, 2);
reader_value(reader, L"value a");
hr = IXmlReader_MoveToAttributeByName(reader, L"b", NULL);
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
- todo_wine TEST_DEPTH(reader, 2);
+ TEST_DEPTH(reader, 2);
reader_value(reader, L"value b");
hr = IXmlReader_MoveToAttributeByName(reader, L"a", L"myns");
@@ -2613,22 +2613,22 @@ static void test_attribute_by_name(void)
hr = IXmlReader_MoveToAttributeByName(reader, L"ns", xmlns_uriW);
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
- todo_wine TEST_DEPTH(reader, 2);
+ TEST_DEPTH(reader, 2);
reader_value(reader, L"ns uri");
hr = IXmlReader_MoveToAttributeByName(reader, L"b", L"");
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
- todo_wine TEST_DEPTH(reader, 2);
+ TEST_DEPTH(reader, 2);
reader_value(reader, L"value b");
hr = IXmlReader_MoveToAttributeByName(reader, L"c", NULL);
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
- todo_wine TEST_DEPTH(reader, 2);
+ TEST_DEPTH(reader, 2);
reader_value(reader, L"value c2");
hr = IXmlReader_MoveToAttributeByName(reader, L"c", L"ns uri");
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
- todo_wine TEST_DEPTH(reader, 2);
+ TEST_DEPTH(reader, 2);
reader_value(reader, L"value c");
IXmlReader_Release(reader);
More information about the wine-cvs
mailing list