[PATCH v5 0/1] MR4617: msxml3: Allow encoding name "ISO8859-1".

[Bernhard Übelacker]

This fixes eFilmLt.exe when running with builtin msxml6.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55804

--
  v5: msxml3: Allow encoding name "ISO8859-1".
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4617

[PATCH v5 1/1] msxml3: Allow encoding name "ISO8859-1".

[Bernhard Übelacker]

From: Bernhard Übelacker <bernhardu(a)mailbox.org>

This fixes eFilmLt.exe when running with builtin msxml6.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55804
---
 dlls/msxml3/main.c         | 31 +++++++++++++++++++++----------
 dlls/msxml3/tests/domdoc.c | 22 +++++++++++++++++++---
 2 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c
index 5e8de1676cf..b329420eb66 100644
--- a/dlls/msxml3/main.c
+++ b/dlls/msxml3/main.c
@@ -212,6 +212,16 @@ static int utf8_to_gbk(unsigned char *out, int *outlen, const unsigned char *in,
     return from_utf8(936, out, outlen, in, inlen);
 }
 
+static int iso8859_1_to_utf8(unsigned char *out, int *outlen, const unsigned char *in, int *inlen)
+{
+    return to_utf8(28591, out, outlen, in, inlen);
+}
+
+static int utf8_to_iso8859_1(unsigned char *out, int *outlen, const unsigned char *in, int *inlen)
+{
+    return from_utf8(28591, out, outlen, in, inlen);
+}
+
 static int win1250_to_utf8(unsigned char *out, int *outlen, const unsigned char *in, int *inlen)
 {
     return to_utf8(1250, out, outlen, in, inlen);
@@ -310,16 +320,17 @@ static void init_char_encoders(void)
         xmlCharEncodingOutputFunc output;
     } encoder[] =
     {
-        { "gbk",          gbk_to_utf8,     utf8_to_gbk     },
-        { "windows-1250", win1250_to_utf8, utf8_to_win1250 },
-        { "windows-1251", win1251_to_utf8, utf8_to_win1251 },
-        { "windows-1252", win1252_to_utf8, utf8_to_win1252 },
-        { "windows-1253", win1253_to_utf8, utf8_to_win1253 },
-        { "windows-1254", win1254_to_utf8, utf8_to_win1254 },
-        { "windows-1255", win1255_to_utf8, utf8_to_win1255 },
-        { "windows-1256", win1256_to_utf8, utf8_to_win1256 },
-        { "windows-1257", win1257_to_utf8, utf8_to_win1257 },
-        { "windows-1258", win1258_to_utf8, utf8_to_win1258 }
+        { "gbk",          gbk_to_utf8,       utf8_to_gbk       },
+        { "iso8859-1",    iso8859_1_to_utf8, utf8_to_iso8859_1 },
+        { "windows-1250", win1250_to_utf8,   utf8_to_win1250   },
+        { "windows-1251", win1251_to_utf8,   utf8_to_win1251   },
+        { "windows-1252", win1252_to_utf8,   utf8_to_win1252   },
+        { "windows-1253", win1253_to_utf8,   utf8_to_win1253   },
+        { "windows-1254", win1254_to_utf8,   utf8_to_win1254   },
+        { "windows-1255", win1255_to_utf8,   utf8_to_win1255   },
+        { "windows-1256", win1256_to_utf8,   utf8_to_win1256   },
+        { "windows-1257", win1257_to_utf8,   utf8_to_win1257   },
+        { "windows-1258", win1258_to_utf8,   utf8_to_win1258   }
     };
     int i;
 
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index ce2e7e655eb..10be50656d5 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -784,6 +784,13 @@ static const char gbkxml[] =
 DECL_GBK
 "<open></open>";
 
+#define DECL_ISO8859_1 \
+"<?xml version=\"1.0\" encoding=\"ISO8859-1\"?>"
+
+static const char iso8859_1_xml[] =
+DECL_ISO8859_1
+"<open></open>";
+
 #define DECL_WIN_936 \
 "<?xml version=\"1.0\" encoding=\"Windows-936\"?>"
 
@@ -1609,6 +1616,14 @@ if (0)
     ok( b == VARIANT_FALSE, "succeeded in loading XML string\n");
     SysFreeString( str );
 
+    /* try a BSTR containing a ISO8859-1 document */
+    b = VARIANT_TRUE;
+    str = SysAllocStringByteLen( iso8859_1_xml, strlen(iso8859_1_xml) );
+    hr = IXMLDOMDocument_loadXML( doc, str, &b );
+    ok(hr == S_FALSE, "loadXML succeeded\n");
+    ok( b == VARIANT_FALSE, "succeeded in loading XML string\n");
+    SysFreeString( str );
+
     /* try to load something valid */
     b = VARIANT_FALSE;
     str = SysAllocString( szComplete1 );
@@ -10838,9 +10853,10 @@ static void test_load(void)
         VARIANT_BOOL expected_ret;
     } encoding_tests[] =
     {
-        { gbkxml,     S_OK,    VARIANT_TRUE  },
-        { win1252xml, S_OK,    VARIANT_TRUE  },
-        { win936xml,  S_FALSE, VARIANT_FALSE },
+        { gbkxml,        S_OK,    VARIANT_TRUE  },
+        { iso8859_1_xml, S_OK,    VARIANT_TRUE  },
+        { win1252xml,    S_OK,    VARIANT_TRUE  },
+        { win936xml,     S_FALSE, VARIANT_FALSE },
     };
 
 
-- 
GitLab

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

[Bernhard Übelacker]

On Sun Aug 25 19:21:29 2024 +0000, Bernhard Übelacker wrote:
> changed this line in [version 5 of the diff](/wine/wine/-/merge_requests/4617/diffs?diff_id=128374&start_sha=d1426386592f36cb18e9e065368d61886daa2e2e#b1bd9f259fd85c3a5e71c7273ed5b3222fef1be7_317_323)
> Hello, sorry for the delay.

I took the hint by Vijay again too literally.
Please see new version below, I added now helpers using matching codepage for iso8859-1.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4617#note_79938

[Bernhard Übelacker]

Hello, sorry for the delay.

I rebased the patch to wine-9.16.

And added helpers to use instead the better matching codepage 28591 for iso8859-1.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4617#note_79939

[PATCH v5 0/1] MR4617: msxml3: Allow encoding name "ISO8859-1". - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4617