[PATCH 2/2] xmllite: Increase depth in MoveToAttributeByName().

Ziqing Hui zhui at codeweavers.com
Thu Jun 2 01:15:48 CDT 2022


Signed-off-by: Ziqing Hui <zhui at codeweavers.com>
---
 dlls/xmllite/reader.c       |  2 ++
 dlls/xmllite/tests/reader.c | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c
index 03bb6c409b7..17f2a264f2a 100644
--- a/dlls/xmllite/reader.c
+++ b/dlls/xmllite/reader.c
@@ -3071,6 +3071,8 @@ static HRESULT WINAPI xmlreader_MoveToAttributeByName(IXmlReader* iface,
         if (name_len == target_name_len && uri_len == target_uri_len &&
                 !wcscmp(name, local_name) && !wcscmp(uri, namespace_uri))
         {
+            if (!This->attr)
+                reader_inc_depth(This);
             reader_set_current_attribute(This, attr);
             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);
-- 
2.25.1




More information about the wine-devel mailing list