system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-06 05:00:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

mlang: Allow encoding name "ISO8859-1".

Browse source 
This fixes eFilmLt.exe when running with native msxml6.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=13340
This commit is contained in:
Bernhard Übelacker 2023-12-06 13:40:06 +01:00 committed by Alexandre Julliard
parent 23111d625b
commit 5a0321ac8c
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/mlang/mlang.c
View file

@ -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 |

19
dlls/mlang/tests/mlang.c
View file

@ -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));
}