Bernhard Übelacker : mlang: Allow encoding name "ISO8859-1".

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5a0321ac8cb956cddbad760c5fb803bdb3c04913
URL:    https://gitlab.winehq.org/wine/wine/-/commit/5a0321ac8cb956cddbad760c5fb803b...

Author: Bernhard Übelacker 
Date:   Wed Dec  6 13:40:06 2023 +0100

mlang: Allow encoding name "ISO8859-1".

This fixes eFilmLt.exe when running with native msxml6.

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

---

dlls/mlang/mlang.c       |  2 +-
 dlls/mlang/tests/mlang.c | 19 ++++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c
index 9846e3ad0e4..f424c87b860 100644
--- a/dlls/mlang/mlang.c
+++ b/dlls/mlang/mlang.c
@@ -447,7 +447,7 @@ static const MIME_CP_INFO western_cp[] =
              MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_SAVABLE_BROWSER |
              MIMECONTF_EXPORT | MIMECONTF_VALID | MIMECONTF_VALID_NLS |
              MIMECONTF_MIME_LATEST,
-      L"iso-8859-1", L"iso-8859-1", L"iso-8859-1" },
+      L"iso-8859-1", L"iso-8859-1", L"iso-8859-1", L"iso8859-1" },
     { L"Latin 9 (ISO)",
       28605, MIMECONTF_MAILNEWS | MIMECONTF_IMPORT |
              MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_SAVABLE_BROWSER |
diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c
index 704576005d2..ee5ef5af738 100644
--- a/dlls/mlang/tests/mlang.c
+++ b/dlls/mlang/tests/mlang.c
@@ -1021,19 +1021,18 @@ static void test_GetCharsetInfo_other(IMultiLanguage *ml)
     WCHAR iso88591_6W[] =    {'-','I','S','O','8','8','5','9','1',0};
     WCHAR iso88591_7W[] =    {' ','I','S','O','-','8','8','5','9','-','1',0};
     struct other {
-        int todo;
         HRESULT hr;
         WCHAR* charset;
         WCHAR* ret_charset;
     } other[] = {
-        { 0, S_OK,   asciiW, asciiW },
-        { 0, S_OK,   iso88591_1W, iso88591_1retW },
-        { 1, S_OK,   iso88591_2W, iso88591_2retW },
-        { 0, E_FAIL, iso88591_3W, 0 },
-        { 0, E_FAIL, iso88591_4W, 0 },
-        { 0, E_FAIL, iso88591_5W, 0 },
-        { 0, E_FAIL, iso88591_6W, 0 },
-        { 0, E_FAIL, iso88591_7W, 0 },
+        { S_OK,   asciiW, asciiW },
+        { S_OK,   iso88591_1W, iso88591_1retW },
+        { S_OK,   iso88591_2W, iso88591_2retW },
+        { E_FAIL, iso88591_3W, 0 },
+        { E_FAIL, iso88591_4W, 0 },
+        { E_FAIL, iso88591_5W, 0 },
+        { E_FAIL, iso88591_6W, 0 },
+        { E_FAIL, iso88591_7W, 0 },
     };
     MIMECSETINFO info;
     HRESULT hr;
@@ -1043,11 +1042,9 @@ static void test_GetCharsetInfo_other(IMultiLanguage *ml)
     {
         hr = IMultiLanguage_GetCharsetInfo(ml, other[i].charset, &info);

-        todo_wine_if(other[i].todo)
         ok(hr == other[i].hr, "#%d: got %08lx, expected %08lx\n", i, hr, other[i].hr);

if (hr == S_OK)
-            todo_wine_if(other[i].todo)
             ok(!lstrcmpW(info.wszCharset, other[i].ret_charset), "#%d: got %s, expected %s\n",
                 i, wine_dbgstr_w(info.wszCharset), wine_dbgstr_w(other[i].ret_charset));
     }