ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mlang: Add more Chinese code pages support. 

Signed-off-by: Ziqing Hui <zhui@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Ziqing Hui 2017-11-09 21:17:49 +08:00 committed by Alexandre Julliard
parent 1f88a35a90
commit 88cc2d114a
2 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dlls/mlang/mlang.c
View File

@ -118,13 +118,33 @@ static const MIME_CP_INFO baltic_cp[] =
}; };
static const MIME_CP_INFO chinese_simplified_cp[] = static const MIME_CP_INFO chinese_simplified_cp[] =
{ {
{ "Chinese Simplified (Auto-Select)",
50936, MIMECONTF_IMPORT | MIMECONTF_VALID | MIMECONTF_VALID_NLS |
MIMECONTF_MIME_LATEST,
"_autodetect_chs", "_autodetect_chs", "_autodetect_chs" },
{ "Chinese Simplified (GB2312)", { "Chinese Simplified (GB2312)",
936, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_MINIMAL | 936, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_MINIMAL |
MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_VALID |
MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | MIMECONTF_VALID_NLS | MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | MIMECONTF_VALID_NLS |
MIMECONTF_MIME_IE4 | MIMECONTF_MIME_LATEST, MIMECONTF_MIME_IE4 | MIMECONTF_MIME_LATEST,
"gb2312", "gb2312", "gb2312" }, "gb2312", "gb2312", "gb2312" },
{ "Chinese Simplified (GBK)", { "Chinese Simplified (GB2312-80)",
20936, MIMECONTF_IMPORT | MIMECONTF_EXPORT | MIMECONTF_VALID |
MIMECONTF_VALID_NLS | MIMECONTF_MIME_LATEST,
"x-cp20936", "x-cp20936", "x-cp20936" },
{ "Chinese Simplified (HZ)",
52936, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_IMPORT |
MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT |
MIMECONTF_VALID | MIMECONTF_VALID_NLS | MIMECONTF_MIME_IE4 |
MIMECONTF_MIME_LATEST,
"hz-gb-2312", "hz-gb-2312", "hz-gb-2312" },
{ "Chinese Simplified (GB18030)",
54936, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_MINIMAL |
MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_SAVABLE_BROWSER |
MIMECONTF_EXPORT | MIMECONTF_VALID | MIMECONTF_VALID_NLS |
MIMECONTF_MIME_LATEST,
"GB18030", "GB18030", "GB18030" },
{ "Chinese Simplified (GBK)",
936, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_MINIMAL | 936, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_MINIMAL |
MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS |
MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | MIMECONTF_VALID_NLS | MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | MIMECONTF_VALID_NLS |
@ -133,12 +153,20 @@ static const MIME_CP_INFO chinese_simplified_cp[] =
}; };
static const MIME_CP_INFO chinese_traditional_cp[] = static const MIME_CP_INFO chinese_traditional_cp[] =
{ {
{ "Chinese Traditional (Auto-Select)",
50950, MIMECONTF_IMPORT | MIMECONTF_VALID | MIMECONTF_VALID_NLS |
MIMECONTF_MIME_LATEST,
"_autodetect_cht", "_autodetect_cht", "_autodetect_cht" },
{ "Chinese Traditional (Big5)", { "Chinese Traditional (Big5)",
950, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_MINIMAL | 950, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_MINIMAL |
MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS |
MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | MIMECONTF_VALID |
MIMECONTF_VALID_NLS | MIMECONTF_MIME_IE4 | MIMECONTF_MIME_LATEST, MIMECONTF_VALID_NLS | MIMECONTF_MIME_IE4 | MIMECONTF_MIME_LATEST,
"big5", "big5", "big5" } "big5", "big5", "big5" },
{ "Chinese Traditional (CNS)",
20000, MIMECONTF_IMPORT | MIMECONTF_EXPORT | MIMECONTF_VALID |
MIMECONTF_VALID_NLS | MIMECONTF_MIME_LATEST,
"x-Chinese-CNS", "x-Chinese-CNS", "x-Chinese-CNS" }
}; };
static const MIME_CP_INFO central_european_cp[] = static const MIME_CP_INFO central_european_cp[] =
{ {

6
dlls/mlang/tests/mlang.c
View File

@ -254,7 +254,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] =
{'S','i','m','s','u','n',0}, {'S','i','m','s','u','n',0},
{'S','i','m','s','u','n',0}, 134 {'S','i','m','s','u','n',0}, 134
}, },
TRUE
}, },
/* 1. Chinese Simplified (GB2312) */ /* 1. Chinese Simplified (GB2312) */
{ {
@ -282,7 +281,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] =
{'S','i','m','s','u','n',0}, {'S','i','m','s','u','n',0},
{'S','i','m','s','u','n',0}, 134 {'S','i','m','s','u','n',0}, 134
}, },
TRUE
}, },
/* 3. Chinese Simplified (HZ) */ /* 3. Chinese Simplified (HZ) */
{ {
@ -297,7 +295,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] =
{'S','i','m','s','u','n',0}, {'S','i','m','s','u','n',0},
{'S','i','m','s','u','n',0}, 134 {'S','i','m','s','u','n',0}, 134
}, },
TRUE
}, },
/* 4. Chinese Simplified (GB18030) */ /* 4. Chinese Simplified (GB18030) */
{ {
@ -312,7 +309,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] =
{'S','i','m','s','u','n',0}, {'S','i','m','s','u','n',0},
{'S','i','m','s','u','n',0}, 134 {'S','i','m','s','u','n',0}, 134
}, },
TRUE
}, },
/* 5. Chinese Traditional (Auto-Select) */ /* 5. Chinese Traditional (Auto-Select) */
{ {
@ -325,7 +321,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] =
{'M','i','n','g','L','i','u',0}, {'M','i','n','g','L','i','u',0},
{'N','e','w',' ','M','i','n','g','L','i','u',0}, 136 {'N','e','w',' ','M','i','n','g','L','i','u',0}, 136
}, },
TRUE
}, },
/* 6. Chinese Traditional (Big5) */ /* 6. Chinese Traditional (Big5) */
{ {
@ -353,7 +348,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] =
{'M','i','n','g','L','i','u',0}, {'M','i','n','g','L','i','u',0},
{'N','e','w',' ','M','i','n','g','L','i','u',0}, 136 {'N','e','w',' ','M','i','n','g','L','i','u',0}, 136
}, },
TRUE
} }
}; };