[PATCH v2 1/1] xmllite/writer: Handle surrogate pairs

[David Kahurani]

From: David Kahurani

Surrogates have to be written in pairs. Also, handle related errors.

Signed-off-by: David Kahurani 
---
 dlls/xmllite/tests/writer.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c
index c4ab079373c..1777bf0f40e 100644
--- a/dlls/xmllite/tests/writer.c
+++ b/dlls/xmllite/tests/writer.c
@@ -1339,6 +1339,7 @@ static void test_WriteRaw(void)
     IXmlWriter *writer;
     IStream *stream;
     HRESULT hr;
+    WCHAR surrogates[] = {0xdc00, 0xd800, '\0'};

hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
@@ -1351,6 +1352,9 @@ static void test_WriteRaw(void)

stream = writer_set_output(writer);

+    hr = IXmlWriter_WriteRaw(writer, surrogates);
+    ok(hr == WR_E_INVALIDSURROGATEPAIR, "Unexpected hr %#lx.\n", hr);
+
     hr = IXmlWriter_WriteRaw(writer, NULL);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

@@ -1888,6 +1892,7 @@ static void test_WriteString(void)
     IXmlWriter *writer;
     IStream *stream;
     HRESULT hr;
+    WCHAR surrogates[] = {0xd800, 0xdc00, 'x', 'y', '\0'};

hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
@@ -1905,6 +1910,21 @@ static void test_WriteString(void)

stream = writer_set_output(writer);

+    hr = IXmlWriter_WriteStartElement(writer, NULL, L"sub", NULL);
+    ok(hr == S_OK, "Unexpected hr #%lx.\n", hr);
+
+    hr = IXmlWriter_WriteString(writer, surrogates);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    hr = IXmlWriter_Flush(writer);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+    CHECK_OUTPUT(stream,
+        "<sub>\U00010000xy");
+    IStream_Release(stream);
+
+    stream = writer_set_output(writer);
+
     hr = IXmlWriter_WriteStartElement(writer, NULL, L"b", NULL);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);