https://git.reactos.org/?p=reactos.git;a=commitdiff;h=26408144a16c13c81d4971...
commit 26408144a16c13c81d4971052060ddfc89cb69d8 Author: Katayama Hirofumi MZ katayama.hirofumi.mz@gmail.com AuthorDate: Fri Oct 14 07:17:24 2022 +0900 Commit: GitHub noreply@github.com CommitDate: Fri Oct 14 07:17:24 2022 +0900
[INF][INTL.INF][SETUPLIB] We don't have preinstalled IMEs (#4774)
Don't write the preinstalled IME keyboard layouts in Chinese, Japanese and Korean (CJK). CORE-18506 --- base/setup/lib/lang/ja-JP.h | 2 +- base/setup/lib/lang/ko-KR.h | 2 +- base/setup/lib/lang/zh-CN.h | 8 ++++---- base/setup/lib/lang/zh-HK.h | 2 +- base/setup/lib/lang/zh-MO.h | 6 +++--- base/setup/lib/lang/zh-SG.h | 8 ++++---- base/setup/lib/lang/zh-TW.h | 4 ++-- media/inf/intl.inf | 16 ++++++++-------- 8 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/base/setup/lib/lang/ja-JP.h b/base/setup/lib/lang/ja-JP.h index 2d8a6eb2bab..f73c488758b 100644 --- a/base/setup/lib/lang/ja-JP.h +++ b/base/setup/lib/lang/ja-JP.h @@ -2,7 +2,7 @@
MUI_LAYOUTS jaJPLayouts[] = { -// { L"0411", L"e0010411" }, +// { L"0411", L"E0010411" }, // We don't have preinstalled IMEs. { L"0411", L"00000411" }, { NULL, NULL } }; diff --git a/base/setup/lib/lang/ko-KR.h b/base/setup/lib/lang/ko-KR.h index 799ae3ab1f1..578c53a9c3f 100644 --- a/base/setup/lib/lang/ko-KR.h +++ b/base/setup/lib/lang/ko-KR.h @@ -2,7 +2,7 @@
MUI_LAYOUTS koKRLayouts[] = { -// { L"0412", L"E0010412" }, +// { L"0412", L"E0010412" }, // We don't have preinstalled IMEs. { L"0412", L"00000412" }, { NULL, NULL } }; diff --git a/base/setup/lib/lang/zh-CN.h b/base/setup/lib/lang/zh-CN.h index d538e74d92a..5f5e74bfc4a 100644 --- a/base/setup/lib/lang/zh-CN.h +++ b/base/setup/lib/lang/zh-CN.h @@ -4,9 +4,9 @@ MUI_LAYOUTS zhCNLayouts[] = { { L"0409", L"00000409" }, { L"0804", L"00000804" }, - { L"0804", L"E00E0804" }, - { L"0804", L"E0010804" }, - { L"0804", L"E0030804" }, - { L"0804", L"E0040804" }, +// { L"0804", L"E00E0804" }, // We don't have preinstalled IMEs. +// { L"0804", L"E0010804" }, // We don't have preinstalled IMEs. +// { L"0804", L"E0030804" }, // We don't have preinstalled IMEs. +// { L"0804", L"E0040804" }, // We don't have preinstalled IMEs. { NULL, NULL } }; diff --git a/base/setup/lib/lang/zh-HK.h b/base/setup/lib/lang/zh-HK.h index 82905a3a22d..4e7c99fe7f7 100644 --- a/base/setup/lib/lang/zh-HK.h +++ b/base/setup/lib/lang/zh-HK.h @@ -3,6 +3,6 @@ MUI_LAYOUTS zhHKLayouts[] = { { L"0409", L"00000409" }, - { L"0C04", L"E0080404" }, +// { L"0C04", L"E0080404" }, // We don't have preinstalled IMEs. { NULL, NULL } }; diff --git a/base/setup/lib/lang/zh-MO.h b/base/setup/lib/lang/zh-MO.h index b12866fc0d2..31e8cb8672f 100644 --- a/base/setup/lib/lang/zh-MO.h +++ b/base/setup/lib/lang/zh-MO.h @@ -3,8 +3,8 @@ MUI_LAYOUTS zhMOLayouts[] = { { L"0409", L"00000409" }, - { L"0804", L"E00E0804" }, - { L"0404", L"E0020404" }, - { L"0404", L"E0080404" }, +// { L"0804", L"E00E0804" }, // We don't have preinstalled IMEs. +// { L"0404", L"E0020404" }, // We don't have preinstalled IMEs. +// { L"0404", L"E0080404" }, // We don't have preinstalled IMEs. { NULL, NULL } }; diff --git a/base/setup/lib/lang/zh-SG.h b/base/setup/lib/lang/zh-SG.h index f59b1d98c49..5e4934b3d87 100644 --- a/base/setup/lib/lang/zh-SG.h +++ b/base/setup/lib/lang/zh-SG.h @@ -3,9 +3,9 @@ MUI_LAYOUTS zhSGLayouts[] = { { L"0409", L"00000409" }, - { L"0804", L"E00E0804" }, - { L"0804", L"E0010804" }, - { L"0804", L"E0030804" }, - { L"0804", L"E0040804" }, +// { L"0804", L"E00E0804" }, // We don't have preinstalled IMEs. +// { L"0804", L"E0010804" }, // We don't have preinstalled IMEs. +// { L"0804", L"E0030804" }, // We don't have preinstalled IMEs. +// { L"0804", L"E0040804" }, // We don't have preinstalled IMEs. { NULL, NULL } }; diff --git a/base/setup/lib/lang/zh-TW.h b/base/setup/lib/lang/zh-TW.h index a1d3dad959c..7f05999fadf 100644 --- a/base/setup/lib/lang/zh-TW.h +++ b/base/setup/lib/lang/zh-TW.h @@ -4,7 +4,7 @@ MUI_LAYOUTS zhTWLayouts[] = { { L"0409", L"00000409" }, { L"0404", L"00000404" }, - { L"0404", L"E0080404" }, - { L"0404", L"E0010404" }, +// { L"0404", L"E0080404" }, // We don't have preinstalled IMEs. +// { L"0404", L"E0010404" }, // We don't have preinstalled IMEs. { NULL, NULL } }; diff --git a/media/inf/intl.inf b/media/inf/intl.inf index 35c441ac10e..1b09fbc522e 100644 --- a/media/inf/intl.inf +++ b/media/inf/intl.inf @@ -35,11 +35,11 @@ DriverVer = 05/29/2008,0.1 0000201a = %Bosnian_Cyrillic%, 855, 5, , 201a:0000201a,0409:00000409 00000402 = %Bulgarian%, 866, 5, , 0402:00000402,0409:00000409 00000403 = %Catalan%, 850, 1, , 0403:0000040a,0409:00000409 -00000404 = %Chinese_Taiwan%, 950, 9, , 0404:00000404,0404:e0080404,0404:E0010404 -00000804 = %Chinese_PRC%, 936, 10, , 0804:00000804,0804:e00e0804,0804:e0010804,0804:e0030804,0804:e0040804 -00000c04 = %Chinese_Hong_Kong%, 950, 10, 9, 0409:00000409,0c04:e0080404 -00001004 = %Chinese_Singapore%, 936, 10, , 0409:00000409,0804:e00e0804,0804:e0010804,0804:e0030804,0804:e0040804 -00001404 = %Chinese_Macau%, 950, 10, 9, 0409:00000409,0804:e00e0804,0404:e0020404,0404:e0080404 +00000404 = %Chinese_Taiwan%, 950, 9, , 0404:00000404,0409:00000409 +00000804 = %Chinese_PRC%, 936, 10, , 0804:00000804,0409:00000409 +00000c04 = %Chinese_Hong_Kong%, 950, 10, 9, 0409:00000409 +00001004 = %Chinese_Singapore%, 936, 10, , 0409:00000409 +00001404 = %Chinese_Macau%, 950, 10, 9, 0409:00000409 0000041a = %Croatian%, 852, 2, , 041a:0000041a,0409:00000409 0000101a = %Croatian_Bosnia%, 852, 2, , 101a:0000041a,0409:00000409 00000405 = %Czech%, 852, 2, , 0405:00000405,0409:00000409 @@ -91,12 +91,12 @@ DriverVer = 05/29/2008,0.1 0000083c = %Irish%, 850, 1, , 083c:00001809 00000410 = %Italian_Italy%, 850, 1, , 0410:00000410,0409:00000409 00000810 = %Italian_Switzerland%, 850, 1, , 0810:00000410,0409:00000409 -00000411 = %Japanese%, 932, 7, , 0411:e0010411 +00000411 = %Japanese%, 932, 7, , 0411:00000411 0000044b = %Kannada_India%, 437, 15, , 0409:00000409,044b:0000044b,0439:00010439 0000043f = %Kazakh%, 866, 5, , 043f:0000043f,0409:00000409,0419:00000419 00000457 = %Konkani%, 437, 15, , 0409:00000409,0457:00000439 -00000412 = %Korean%, 949, 8, , 0412:E0010412 -00000812 = %Korean_Johab%, 1361, 8, , 0812:E0010412 +00000412 = %Korean%, 949, 8, , 0412:00000412 +00000812 = %Korean_Johab%, 1361, 8, , 0812:00000412 00000440 = %Kyrgyz_Kyrgyzstan%, 866, 5, , 0440:00000440,0409:00000409 00000426 = %Latvian%, 775, 3, , 0426:00010426 00000427 = %Lithuanian%, 775, 3, , 0427:00010427
-
Katayama Hirofumi MZ