Jacek Caban : xmllite: Return local name stored in namespace for prefixed namespace attribute values.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Fri Mar 31 15:58:29 2017 +0200

xmllite: Return local name stored in namespace for prefixed namespace attribute values.

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

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

diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c
index e7b8364..b4b455b 100644
--- a/dlls/xmllite/reader.c
+++ b/dlls/xmllite/reader.c
@@ -3225,6 +3225,12 @@ static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, U
             *name = xmlnsW;
             *len = 5;
         }
+        else if (This->attr->flags & ATTRIBUTE_NS_DEFINITION)
+        {
+            const struct ns *ns = reader_lookup_ns(This, &This->attr->localname);
+            *name = ns->prefix.str;
+            *len = ns->prefix.len;
+        }
         else
         {
             *name = This->attr->localname.str;
diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c
index ea163de..819f812 100644
--- a/dlls/xmllite/tests/reader.c
+++ b/dlls/xmllite/tests/reader.c
@@ -2550,13 +2550,13 @@ static void test_string_pointers(void)
     ok(xmlns_ns == reader_namespace(reader, "http://www.w3.org/2000/xmlns/"), "xmlns_ns != namespace\n");
 
     read_node(reader, XmlNodeType_Element);
-    ptr = reader_prefix(reader, "p"); todo_wine ok(p == ptr, "p != prefix\n");
+    ok(p == reader_prefix(reader, "p"), "p != prefix\n");
     ok(ns == reader_namespace(reader, "myns"), "empty != namespace\n");
     name = reader_qname(reader, "p:elem2");
 
     next_attribute(reader);
     ok(empty != reader_value(reader, ""), "empty == value\n");
-    ptr = reader_prefix(reader, "q"); todo_wine ok(q == ptr, "q != prefix\n");
+    ok(q == reader_prefix(reader, "q"), "q != prefix\n");
     ok(nsq == reader_namespace(reader, "mynsq"), "nsq != namespace\n");
 
     read_node(reader, XmlNodeType_EndElement);