Nikolay Sivov : xmllite/reader: Improve xml declaration node parsing.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 31aac84ad0271e9cf3c0d4d7f39f9a51b386c5a7
URL:    https://gitlab.winehq.org/wine/wine/-/commit/31aac84ad0271e9cf3c0d4d7f39f9a5...

Author: Nikolay Sivov 
Date:   Wed Sep 14 23:29:27 2022 +0300

xmllite/reader: Improve xml declaration node parsing.

Signed-off-by: Nikolay Sivov

---

dlls/xmllite/reader.c       | 16 ++++++++--------
 dlls/xmllite/tests/reader.c | 21 +++++++++++++++++++++
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c
index 118b7bd5ea2..6e5e08734bc 100644
--- a/dlls/xmllite/reader.c
+++ b/dlls/xmllite/reader.c
@@ -1296,13 +1296,13 @@ static HRESULT reader_parse_encname(xmlreader *reader, strval *val)
 }

/* [80] EncodingDecl ::= S 'encoding' Eq ('"' EncName '"' | "'" EncName "'" ) */
-static HRESULT reader_parse_encdecl(xmlreader *reader)
+static HRESULT reader_parse_encdecl(xmlreader *reader, BOOL *spaces)
 {
     struct reader_position position;
     strval name, val;
     HRESULT hr;

-    if (!reader_skipspaces(reader)) return S_FALSE;
+    if (!(*spaces = reader_skipspaces(reader))) return S_FALSE;

position = reader->position;
     if (reader_cmp(reader, L"encoding")) return S_FALSE;
@@ -1328,19 +1328,20 @@ static HRESULT reader_parse_encdecl(xmlreader *reader)

/* skip "'"|'"' */
     reader_skipn(reader, 1);
+    *spaces = FALSE;

return reader_add_attr(reader, NULL, &name, NULL, &val, &position, 0);
 }

/* [32] SDDecl ::= S 'standalone' Eq (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no') '"')) */
-static HRESULT reader_parse_sddecl(xmlreader *reader)
+static HRESULT reader_parse_sddecl(xmlreader *reader, BOOL spaces)
 {
     struct reader_position position;
     strval name, val;
     UINT start;
     HRESULT hr;

-    if (!reader_skipspaces(reader)) return S_FALSE;
+    if (!spaces && !reader_skipspaces(reader)) return S_FALSE;

position = reader->position;
     if (reader_cmp(reader, L"standalone")) return S_FALSE;
@@ -1377,6 +1378,7 @@ static HRESULT reader_parse_sddecl(xmlreader *reader)
 static HRESULT reader_parse_xmldecl(xmlreader *reader)
 {
     struct reader_position position;
+    BOOL spaces;
     HRESULT hr;

if (reader_cmp(reader, L"<?xml "))
@@ -1389,12 +1391,10 @@ static HRESULT reader_parse_xmldecl(xmlreader *reader)
     if (FAILED(hr))
         return hr;

-    hr = reader_parse_encdecl(reader);
-    if (FAILED(hr))
+    if (FAILED(hr = reader_parse_encdecl(reader, &spaces)))
         return hr;

-    hr = reader_parse_sddecl(reader);
-    if (FAILED(hr))
+    if (FAILED(hr = reader_parse_sddecl(reader, spaces)))
         return hr;

reader_skipspaces(reader);
diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c
index 2ea781ce992..8bb30f730a4 100644
--- a/dlls/xmllite/tests/reader.c
+++ b/dlls/xmllite/tests/reader.c
@@ -1019,6 +1019,27 @@ todo_wine {
     TEST_READER_STATE(reader, XmlReadState_Error);

IStream_Release(stream);
+
+    /* No encoding attribute. */
+    set_input_string(reader, "<?xml version=\"1.0\" standalone=\"yes\"?><a/>");
+    hr = IXmlReader_Read(reader, &type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(type == XmlNodeType_XmlDeclaration, "got %d\n", type);
+
+    /* Just version attribute, no spaces. */
+    set_input_string(reader, "<?xml version=\"1.0\"?><a/>");
+    hr = IXmlReader_Read(reader, &type);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(type == XmlNodeType_XmlDeclaration, "got %d\n", type);
+
+    set_input_string(reader, "<?xml version=\"1.0\"encoding=\"UTF-8\"?><a/>");
+    hr = IXmlReader_Read(reader, &type);
+    ok(hr == WC_E_XMLDECL, "Unexpected hr %#lx.\n", hr);
+
+    set_input_string(reader, "<?xml version=\"1.0\"standalone=\"yes\"?><a/>");
+    hr = IXmlReader_Read(reader, &type);
+    ok(hr == WC_E_XMLDECL, "Unexpected hr %#lx.\n", hr);
+
     IXmlReader_Release(reader);
 }