Michael Stefaniuc : msxml3/tests: Use wide-char string literals.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 21ca8e16485c41d21544065c211eaffd10252ec0
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=21ca8e16485c41d21544065c2...

Author: Michael Stefaniuc 
Date:   Tue Oct 27 00:06:36 2020 +0100

msxml3/tests: Use wide-char string literals.

Signed-off-by: Michael Stefaniuc 
Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard

---

dlls/msxml3/tests/domdoc.c    | 13 +++----------
 dlls/msxml3/tests/saxreader.c | 14 +++++++-------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index c19dd6c430e..02e31b4aafb 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -733,11 +733,7 @@ static void _expect_parse_error(IXMLDOMDocument *doc, HRESULT hr_exp, BOOL hr_to
     IXMLDOMParseError_Release(error);
 }

-static const WCHAR szComplete1[] = {
-    '<','?','x','m','l',' ',
-    'v','e','r','s','i','o','n','=',''','1','.','0',''','?','>','\n',
-    '<','o','p','e','n','>','<','/','o','p','e','n','>','\n',0
-};
+static const WCHAR szComplete1[] = L"<?xml version='1.0'?>\n<open></open>\n";
 static const char complete4A[] =
     "<?xml version=\'1.0\'?>\n"
     "<lc dl='str1'>\n"
@@ -1148,10 +1144,7 @@ static const char attributes_map[] = {

static const WCHAR nonexistent_fileW[] = L"c:\Nonexistent.xml";

-static const WCHAR szElementXML4[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','>',
-                                      '&','a','m','p',';','x',' ',0x2103,'<','/','E','l','e','T','e','s','t','>',0 };
-
-static const WCHAR szStrangeChars[] = {'&','x',' ',0x2103, 0};
+static const WCHAR szStrangeChars[] = L"&x \x2103";

#define expect_bstr_eq_and_free(bstr, expect) { \
     BSTR bstrExp = alloc_str_from_narrow(expect); \
@@ -5872,7 +5865,7 @@ static void test_xmlTypes(void)

hr = IXMLDOMElement_get_xml(pElement, &str);
                 ok(hr == S_OK, "ret %08x\n", hr );
-                ok( !lstrcmpW( str, szElementXML4 ), "incorrect element xml\n");
+                ok( !lstrcmpW( str, L"<EleTest Attr="">&amp;x \x2103</EleTest>" ), "incorrect element xml\n");
                 SysFreeString(str);

hr = IXMLDOMElement_get_text(pElement, &str);
diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c
index 47d158ab3ea..ab814c5f764 100644
--- a/dlls/msxml3/tests/saxreader.c
+++ b/dlls/msxml3/tests/saxreader.c
@@ -1518,9 +1518,9 @@ static HRESULT WINAPI isaxattributes_getQName(
     const WCHAR **QName,
     int *QNameLength)
 {
-    static const WCHAR attrqnamesW[][15] = {{'a',':','a','t','t','r','1','j','u','n','k',0},
-                                            {'a','t','t','r','2','j','u','n','k',0},
-                                            {'a','t','t','r','3',0}};
+    static const WCHAR attrqnamesW[][15] = {L"a:attr1junk",
+                                            L"attr2junk",
+                                            L"attr3"};
     static const int attrqnamelen[] = {7, 5, 5};

ok(index >= 0 && index <= 2, "invalid index received %d\n", index);
@@ -1609,9 +1609,9 @@ static HRESULT WINAPI isaxattributes_getTypeFromQName(
 static HRESULT WINAPI isaxattributes_getValue(ISAXAttributes* iface, int index,
     const WCHAR **value, int *nValue)
 {
-    static const WCHAR attrvaluesW[][10] = {{'a','1','j','u','n','k',0},
-                                            {'a','2','j','u','n','k',0},
-                                            {'<','&','"','>',''',0}};
+    static const WCHAR attrvaluesW[][10] = {L"a1junk",
+                                            L"a2junk",
+                                            L"<&">'"};
     static const int attrvalueslen[] = {2, 2, 5};

ok(index >= 0 && index <= 2, "invalid index received %d\n", index);
@@ -3960,7 +3960,7 @@ static const struct writer_characters_t writer_characters[] = {

static void test_mxwriter_characters(void)
 {
-    static const WCHAR embedded_nullbytes[] = {'a',0,'b',0,0,0,'c',0};
+    static const WCHAR embedded_nullbytes[] = L"a\0b\0\0\0c";
     const struct writer_characters_t *table = writer_characters;
     IVBSAXContentHandler *vb_content;
     ISAXContentHandler *content;