[PATCH 0/2] MR10973: msxml3/sax: Fix UTF-16 BE decoder.

[Nikolay Sivov (＠nsivov)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59774
Signed-off-by: Nikolay Sivov <[e-mail]>

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10973

[PATCH 1/2] msxml3/sax: Fix UTF-16 BE decoder.

[Nikolay Sivov]

From: Nikolay Sivov <[e-mail]>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59774
Signed-off-by: Nikolay Sivov <[e-mail]>
---
 dlls/msxml3/saxreader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
index c257ed8f367..bfb430e64a6 100644
--- a/dlls/msxml3/saxreader.c
+++ b/dlls/msxml3/saxreader.c
@@ -657,7 +657,7 @@ static int convert_utf16be(UINT cp, const char *src, int src_size, WCHAR *buffer
     if (!buffer) return src_size / 2;
 
     for (int i = 0; i < size; ++i)
-        buffer[i] = src[i + 1] | src[i];
+        buffer[i] = src[2 * i + 1] | (src[2 * i] << 8);
 
     return size;
 }
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/10973

[PATCH 2/2] msxml3/sax: Remove commented out code.

[Nikolay Sivov]

From: Nikolay Sivov <[e-mail]>

Signed-off-by: Nikolay Sivov <[e-mail]>
---
 dlls/msxml3/saxreader.c | 37 -------------------------------------
 1 file changed, 37 deletions(-)

diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
index bfb430e64a6..a759d39a417 100644
--- a/dlls/msxml3/saxreader.c
+++ b/dlls/msxml3/saxreader.c
@@ -3356,43 +3356,6 @@ static void saxreader_parse_sddecl(struct saxlocator *locator, const struct pars
         saxreader_set_error(locator, E_SAX_INVALID_STANDALONE);
 }
 
-/*
-static bool saxreader_parse_xmldecl(struct saxlocator *locator)
-{
-    WCHAR ch;
-
-    saxreader_more(locator);
-
-    ch = saxreader_get_char(locator, 5);
-    if (!saxreader_peek(locator, L"<?xml", 5) || !saxreader_is_space(ch))
-        return false;
-    saxreader_skip(locator, 5);
-    saxreader_skipspaces(locator);
-
-    saxreader_parse_versioninfo(locator);
-
-    if (saxreader_cmp(locator, L"?>"))
-        return true;
-
-    saxreader_parse_encdecl(locator);
-
-    if (locator->saxreader->xmldecl_encoding)
-    {
-        if (saxreader_cmp(locator, L"?>"))
-            return true;
-        saxreader_skip_required_spaces(locator);
-    }
-
-    saxreader_skipspaces(locator);
-    saxreader_parse_sddecl(locator);
-    saxreader_skipspaces(locator);
-
-    if (!saxreader_cmp(locator, L"?>"))
-        saxreader_set_error(locator, E_SAX_BAD_XMLDECL);
-
-    return true;
-}
-*/
 static BSTR saxreader_parse_xmldecl_attribute(struct saxlocator *locator, struct parsed_name *name);
 
 /* [85] BaseChar ::= ... */
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10973