[PATCH 2/3] msxml3: Handle Shift_JIS encoding in the parser.

[Nikolay Sivov]

From: Nikolay Sivov <[e-mail]>

Signed-off-by: Nikolay Sivov <[e-mail]>
---
 dlls/msxml3/saxreader.c       | 2 ++
 dlls/msxml3/tests/domdoc.c    | 8 --------
 dlls/msxml3/tests/saxreader.c | 6 ++----
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
index a4aa5728409..0e5548b07de 100644
--- a/dlls/msxml3/saxreader.c
+++ b/dlls/msxml3/saxreader.c
@@ -587,6 +587,8 @@ static bool saxreader_get_encoding_codepage(const WCHAR *name, UINT *codepage)
     }
     encodings[] =
     {
+        { L"shift_jis", 932 },
+        { L"shift-jis", 932 },
         { L"gbk", 936 },
         { L"gb2312", 936 },
         { L"us-ascii", 20127 },
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index 4682565ae0b..1d7e9456561 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -11547,15 +11547,11 @@ static void test_load(void)
     V_VT(&src) = VT_BSTR;
     V_BSTR(&src) = _bstr_(path);
     hr = IXMLDOMDocument_load(doc, src, &b);
-    todo_wine
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-if (hr == S_OK)
-{
     hr = IXMLDOMDocument_get_text(doc, &bstr1);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     ok(!wcscmp(bstr1, L"\u30e9"), "Unexpected text %s.\n", debugstr_w(bstr1));
     SysFreeString(bstr1);
-}
     DeleteFileA(path);
     IXMLDOMDocument_Release(doc);
 
@@ -11567,15 +11563,11 @@ if (hr == S_OK)
     V_VT(&src) = VT_BSTR;
     V_BSTR(&src) = _bstr_(path);
     hr = IXMLDOMDocument_load(doc, src, &b);
-    todo_wine
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-if (hr == S_OK)
-{
     hr = IXMLDOMDocument_get_text(doc, &bstr1);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     ok(!wcscmp(bstr1, L"\u30e9"), "Unexpected text %s.\n", debugstr_w(bstr1));
     SysFreeString(bstr1);
-}
     DeleteFileA(path);
     IXMLDOMDocument_Release(doc);
 
diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c
index 918d62fe3c3..55273818fc8 100644
--- a/dlls/msxml3/tests/saxreader.c
+++ b/dlls/msxml3/tests/saxreader.c
@@ -3513,17 +3513,15 @@ static void test_saxreader_encoding(void)
     create_test_file(testXmlA, xml_shift_jis_test, sizeof(xml_shift_jis_test) - 1);
     set_expected_seq(xml_shift_jis_seq);
     hr = ISAXXMLReader_parseURL(reader, L"test.xml");
-    todo_wine
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok_sequence(sequences, CONTENT_HANDLER_INDEX, xml_shift_jis_seq, "Content test with shift_jis", TRUE);
+    ok_sequence(sequences, CONTENT_HANDLER_INDEX, xml_shift_jis_seq, "Content test with shift_jis", FALSE);
     DeleteFileA(testXmlA);
 
     create_test_file(testXmlA, xml_shift_jis_test2, sizeof(xml_shift_jis_test2) - 1);
     set_expected_seq(xml_shift_jis_seq);
     hr = ISAXXMLReader_parseURL(reader, L"test.xml");
-    todo_wine
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok_sequence(sequences, CONTENT_HANDLER_INDEX, xml_shift_jis_seq, "Content test with shift-jis", TRUE);
+    ok_sequence(sequences, CONTENT_HANDLER_INDEX, xml_shift_jis_seq, "Content test with shift-jis", FALSE);
     DeleteFileA(testXmlA);
 
     ISAXXMLReader_Release(reader);
-- 
GitLab


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