From c26a2e89ebd59eb83767159c505b13b95e30bbfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Fri, 9 Feb 2024 22:06:39 +0100 Subject: [PATCH] [SETUPLIB][USETUP] Convert MUI_LANGUAGE codepages to numbers. --- base/setup/lib/mui.c | 78 ++++++---- base/setup/lib/mui.h | 10 +- base/setup/lib/muilanguages.h | 286 +++++++++++++++++----------------- base/setup/usetup/mui.c | 4 +- 4 files changed, 194 insertions(+), 184 deletions(-) diff --git a/base/setup/lib/mui.c b/base/setup/lib/mui.c index c8d1ea8cfda..9d677f8d307 100644 --- a/base/setup/lib/mui.c +++ b/base/setup/lib/mui.c @@ -92,7 +92,7 @@ MUIDefaultKeyboardLayout( return MUILanguageList[lngIndex].MuiLayouts[0].LayoutID; } -PCWSTR +UINT MUIGetOEMCodePage( IN PCWSTR LanguageId) { @@ -380,21 +380,25 @@ AddKeyboardLayouts( static BOOLEAN AddCodepageToRegistry( - IN PCWSTR ACPage, - IN PCWSTR OEMCPage, - IN PCWSTR MACCPage) + _In_ UINT ACPage, + _In_ UINT OEMCPage, + _In_ UINT MACCPage) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; - HANDLE KeyHandle; NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING Name; + HANDLE KeyHandle; + /* + * Buffer big enough to hold the NULL-terminated string L"4294967295", + * corresponding to the literal 0xFFFFFFFF (MAXULONG) in decimal. + */ + WCHAR Value[sizeof("4294967295")]; - // Open the nls codepage key - RtlInitUnicodeString(&KeyName, + /* Open the NLS CodePage key */ + RtlInitUnicodeString(&Name, L"SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"); InitializeObjectAttributes(&ObjectAttributes, - &KeyName, + &Name, OBJ_CASE_INSENSITIVE, GetRootKeyByPredefKey(HKEY_LOCAL_MACHINE, NULL), NULL); @@ -407,54 +411,60 @@ AddCodepageToRegistry( return FALSE; } - // Set ANSI codepage - RtlInitUnicodeString(&ValueName, L"ACP"); + /* Set ANSI codepage */ + Status = RtlStringCchPrintfW(Value, _countof(Value), L"%lu", ACPage); + ASSERT(NT_SUCCESS(Status)); + + RtlInitUnicodeString(&Name, L"ACP"); Status = NtSetValueKey(KeyHandle, - &ValueName, + &Name, 0, REG_SZ, - (PVOID)ACPage, - (wcslen(ACPage)+1) * sizeof(WCHAR)); + (PVOID)Value, + (wcslen(Value)+1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; + goto Quit; } - // Set OEM codepage - RtlInitUnicodeString(&ValueName, L"OEMCP"); + /* Set OEM codepage */ + Status = RtlStringCchPrintfW(Value, _countof(Value), L"%lu", OEMCPage); + ASSERT(NT_SUCCESS(Status)); + + RtlInitUnicodeString(&Name, L"OEMCP"); Status = NtSetValueKey(KeyHandle, - &ValueName, + &Name, 0, REG_SZ, - (PVOID)OEMCPage, - (wcslen(OEMCPage)+1) * sizeof(WCHAR)); + (PVOID)Value, + (wcslen(Value)+1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; + goto Quit; } - // Set MAC codepage - RtlInitUnicodeString(&ValueName, L"MACCP"); + /* Set MAC codepage */ + Status = RtlStringCchPrintfW(Value, _countof(Value), L"%lu", MACCPage); + ASSERT(NT_SUCCESS(Status)); + + RtlInitUnicodeString(&Name, L"MACCP"); Status = NtSetValueKey(KeyHandle, - &ValueName, + &Name, 0, REG_SZ, - (PVOID)MACCPage, - (wcslen(MACCPage)+1) * sizeof(WCHAR)); + (PVOID)Value, + (wcslen(Value)+1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; + goto Quit; } +Quit: NtClose(KeyHandle); - - return TRUE; + return NT_SUCCESS(Status); } static diff --git a/base/setup/lib/mui.h b/base/setup/lib/mui.h index 215dbfe06eb..fe2f206f659 100644 --- a/base/setup/lib/mui.h +++ b/base/setup/lib/mui.h @@ -11,7 +11,7 @@ typedef ULONG KLID; /* * See http://archives.miloush.net/michkap/archive/2006/10/14/825404.html - * and the intl.inf file map: + * and the intl.inf LCID map: * * ; List of locales. * ; = ,,,,,... @@ -28,9 +28,9 @@ typedef struct typedef struct { PCWSTR LanguageID; - PCWSTR ACPage; - PCWSTR OEMCPage; - PCWSTR MACCPage; + UINT ACPage; + UINT OEMCPage; + UINT MACCPage; PCWSTR LanguageDescriptor; PCWSTR GeoID; const MUI_SUBFONT* MuiSubFonts; @@ -46,7 +46,7 @@ KLID MUIDefaultKeyboardLayout( IN PCWSTR LanguageId); -PCWSTR +UINT MUIGetOEMCodePage( IN PCWSTR LanguageId); diff --git a/base/setup/lib/muilanguages.h b/base/setup/lib/muilanguages.h index 36c0b4cd222..f4871f0c7e8 100644 --- a/base/setup/lib/muilanguages.h +++ b/base/setup/lib/muilanguages.h @@ -413,430 +413,430 @@ const MUI_LANGUAGE MUILanguageList[] = { /* Lang ID, ANSI CP, OEM CP, MAC CP, Language Name, GeoID, Fonts, KB Layouts */ #ifdef LANGUAGE_AF_ZA - {L"00000436", L"1252", L"850", L"10000", L"Afrikaans", L"209", LatinFonts, afZALayouts}, + {L"00000436", 1252, 850, 10000, L"Afrikaans", L"209", LatinFonts, afZALayouts}, #endif #ifdef LANGUAGE_SQ_AL - {L"0000041C", L"1250", L"852", L"10029", L"Albanian (Albania)", L"6", LatinFonts, sqALLayouts}, + {L"0000041C", 1250, 852, 10029, L"Albanian (Albania)", L"6", LatinFonts, sqALLayouts}, #endif #ifdef LANGUAGE_AR_SA - {L"00000401", L"1256", L"720", L"10004", L"Arabic (Saudi Arabia)", L"205", UnicodeFonts, arSALayouts}, + {L"00000401", 1256, 720, 10004, L"Arabic (Saudi Arabia)", L"205", UnicodeFonts, arSALayouts}, #endif #ifdef LANGUAGE_AR_IQ - {L"00000801", L"1256", L"720", L"10004", L"Arabic (Iraq)", L"121", UnicodeFonts, arIQLayouts}, + {L"00000801", 1256, 720, 10004, L"Arabic (Iraq)", L"121", UnicodeFonts, arIQLayouts}, #endif #ifdef LANGUAGE_AR_EG - {L"00000C01", L"1256", L"720", L"10004", L"Arabic (Egypt)", L"67", UnicodeFonts, arEGLayouts}, + {L"00000C01", 1256, 720, 10004, L"Arabic (Egypt)", L"67", UnicodeFonts, arEGLayouts}, #endif #ifdef LANGUAGE_AR_LY - {L"00001001", L"1256", L"720", L"10004", L"Arabic (Libya)", L"148", UnicodeFonts, arLYLayouts}, + {L"00001001", 1256, 720, 10004, L"Arabic (Libya)", L"148", UnicodeFonts, arLYLayouts}, #endif #ifdef LANGUAGE_AR_DZ - {L"00001401", L"1256", L"720", L"10004", L"Arabic (Algeria)", L"4", UnicodeFonts, arDZLayouts}, + {L"00001401", 1256, 720, 10004, L"Arabic (Algeria)", L"4", UnicodeFonts, arDZLayouts}, #endif #ifdef LANGUAGE_AR_MA - {L"00001801", L"1256", L"720", L"10004", L"Arabic (Morocco)", L"149", UnicodeFonts, arMALayouts}, + {L"00001801", 1256, 720, 10004, L"Arabic (Morocco)", L"149", UnicodeFonts, arMALayouts}, #endif #ifdef LANGUAGE_AR_TN - {L"00001C01", L"1256", L"720", L"10004", L"Arabic (Tunisia)", L"234", UnicodeFonts, arTNLayouts}, + {L"00001C01", 1256, 720, 10004, L"Arabic (Tunisia)", L"234", UnicodeFonts, arTNLayouts}, #endif #ifdef LANGUAGE_AR_OM - {L"00002001", L"1256", L"720", L"10004", L"Arabic (Oman)", L"164", UnicodeFonts, arOMLayouts}, + {L"00002001", 1256, 720, 10004, L"Arabic (Oman)", L"164", UnicodeFonts, arOMLayouts}, #endif #ifdef LANGUAGE_AR_YE - {L"00002401", L"1256", L"720", L"10004", L"Arabic (Yemen)", L"261", UnicodeFonts, arYELayouts}, + {L"00002401", 1256, 720, 10004, L"Arabic (Yemen)", L"261", UnicodeFonts, arYELayouts}, #endif #ifdef LANGUAGE_AR_SY - {L"00002801", L"1256", L"720", L"10004", L"Arabic (Syria)", L"222", UnicodeFonts, arSYLayouts}, + {L"00002801", 1256, 720, 10004, L"Arabic (Syria)", L"222", UnicodeFonts, arSYLayouts}, #endif #ifdef LANGUAGE_AR_JO - {L"00002C01", L"1256", L"720", L"10004", L"Arabic (Jordan)", L"126", UnicodeFonts, arJOLayouts}, + {L"00002C01", 1256, 720, 10004, L"Arabic (Jordan)", L"126", UnicodeFonts, arJOLayouts}, #endif #ifdef LANGUAGE_AR_LB - {L"00003001", L"1256", L"720", L"10004", L"Arabic (Lebanon)", L"139", UnicodeFonts, arLBLayouts}, + {L"00003001", 1256, 720, 10004, L"Arabic (Lebanon)", L"139", UnicodeFonts, arLBLayouts}, #endif #ifdef LANGUAGE_AR_KW - {L"00003401", L"1256", L"720", L"10004", L"Arabic (Kuwait)", L"136", UnicodeFonts, arKWLayouts}, + {L"00003401", 1256, 720, 10004, L"Arabic (Kuwait)", L"136", UnicodeFonts, arKWLayouts}, #endif #ifdef LANGUAGE_AR_AE - {L"00003801", L"1256", L"720", L"10004", L"Arabic (U.A.E.)", L"224", UnicodeFonts, arAELayouts}, + {L"00003801", 1256, 720, 10004, L"Arabic (U.A.E.)", L"224", UnicodeFonts, arAELayouts}, #endif #ifdef LANGUAGE_AR_BH - {L"00003C01", L"1256", L"720", L"10004", L"Arabic (Bahrain)", L"17", UnicodeFonts, arBHLayouts}, + {L"00003C01", 1256, 720, 10004, L"Arabic (Bahrain)", L"17", UnicodeFonts, arBHLayouts}, #endif #ifdef LANGUAGE_AR_QA - {L"00004001", L"1256", L"720", L"10004", L"Arabic (Qatar)", L"197", UnicodeFonts, arQALayouts}, + {L"00004001", 1256, 720, 10004, L"Arabic (Qatar)", L"197", UnicodeFonts, arQALayouts}, #endif #ifdef LANGUAGE_HY_AM - {L"0000042B", L"0", L"1", L"2", L"Armenian", L"7", UnicodeFonts, hyAMLayouts}, + {L"0000042B", 0, 1, 2, L"Armenian", L"7", UnicodeFonts, hyAMLayouts}, #endif #ifdef LANGUAGE_AZ_AZ - {L"0000082C", L"1251", L"866", L"10007", L"Azeri (Cyrillic)", L"5", CyrillicFonts, azAZLayouts}, + {L"0000082C", 1251, 866, 10007, L"Azeri (Cyrillic)", L"5", CyrillicFonts, azAZLayouts}, #endif #ifdef LANGUAGE_AZ_AZ - {L"0000042C", L"1254", L"857", L"10081", L"Azeri (Latin)", L"5", LatinFonts, azAZLayouts}, + {L"0000042C", 1254, 857, 10081, L"Azeri (Latin)", L"5", LatinFonts, azAZLayouts}, #endif #ifdef LANGUAGE_EU_ES - {L"0000042D", L"1252", L"850", L"10000", L"Basque", L"217", LatinFonts, euESLayouts}, + {L"0000042D", 1252, 850, 10000, L"Basque", L"217", LatinFonts, euESLayouts}, #endif #ifdef LANGUAGE_BE_BY - {L"00000423", L"1251", L"866", L"10007", L"Belarusian", L"29", CyrillicFonts, beBYLayouts}, + {L"00000423", 1251, 866, 10007, L"Belarusian", L"29", CyrillicFonts, beBYLayouts}, #endif #ifdef LANGUAGE_BN_BD - {L"00000845", L"0", L"1", L"2", L"Bengali (Bangladesh)", L"23", UnicodeFonts, bnBDLayouts}, + {L"00000845", 0, 1, 2, L"Bengali (Bangladesh)", L"23", UnicodeFonts, bnBDLayouts}, #endif #ifdef LANGUAGE_BN_IN - {L"00000445", L"0", L"1", L"2", L"Bengali (India)", L"113", UnicodeFonts, bnINLayouts}, + {L"00000445", 0, 1, 2, L"Bengali (India)", L"113", UnicodeFonts, bnINLayouts}, #endif #ifdef LANGUAGE_BG_BG - {L"00000402", L"1251", L"866", L"10007", L"Bulgarian", L"35", CyrillicFonts, bgBGLayouts}, + {L"00000402", 1251, 866, 10007, L"Bulgarian", L"35", CyrillicFonts, bgBGLayouts}, #endif #ifdef LANGUAGE_MY_MM - {L"00000455", L"0", L"1", L"2", L"Burmese", L"1", UnicodeFonts, myMMLayouts}, + {L"00000455", 0, 1, 2, L"Burmese", L"1", UnicodeFonts, myMMLayouts}, #endif #ifdef LANGUAGE_CA_ES - {L"00000403", L"1252", L"850", L"10000", L"Catalan", L"217", LatinFonts, caESLayouts}, + {L"00000403", 1252, 850, 10000, L"Catalan", L"217", LatinFonts, caESLayouts}, #endif #ifdef LANGUAGE_ZH_TW - {L"00000404", L"950", L"950", L"10008", L"Chinese (Taiwan)", L"237", ChineseTraditionalFonts, zhTWLayouts}, + {L"00000404", 950, 950, 10008, L"Chinese (Taiwan)", L"237", ChineseTraditionalFonts, zhTWLayouts}, #endif #ifdef LANGUAGE_ZH_CN - {L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", L"45", ChineseSimplifiedFonts, zhCNLayouts}, + {L"00000804", 936, 936, 10008, L"Chinese (PRC)", L"45", ChineseSimplifiedFonts, zhCNLayouts}, #endif #ifdef LANGUAGE_ZH_HK - {L"00000C04", L"950", L"950", L"10008", L"Chinese (Hong Kong S.A.R.)", L"104", ChineseTraditionalFonts, zhHKLayouts}, + {L"00000C04", 950, 950, 10008, L"Chinese (Hong Kong S.A.R.)", L"104", ChineseTraditionalFonts, zhHKLayouts}, #endif #ifdef LANGUAGE_ZH_SG - {L"00001004", L"936", L"936", L"10008", L"Chinese (Singapore)", L"215", ChineseSimplifiedFonts, zhSGLayouts}, + {L"00001004", 936, 936, 10008, L"Chinese (Singapore)", L"215", ChineseSimplifiedFonts, zhSGLayouts}, #endif #ifdef LANGUAGE_ZH_MO - {L"00001404", L"950", L"950", L"10002", L"Chinese (Macau S.A.R.)", L"151", ChineseTraditionalFonts, zhMOLayouts}, + {L"00001404", 950, 950, 10002, L"Chinese (Macau S.A.R.)", L"151", ChineseTraditionalFonts, zhMOLayouts}, #endif #ifdef LANGUAGE_HR_HR - {L"0000041A", L"1250", L"852", L"10029", L"Croatian", L"108", LatinFonts, hrHRLayouts}, + {L"0000041A", 1250, 852, 10029, L"Croatian", L"108", LatinFonts, hrHRLayouts}, #endif #ifdef LANGUAGE_CS_CZ - {L"00000405", L"1250", L"852", L"10029", L"Czech", L"75", LatinFonts, csCZLayouts}, + {L"00000405", 1250, 852, 10029, L"Czech", L"75", LatinFonts, csCZLayouts}, #endif #ifdef LANGUAGE_DA_DK - {L"00000406", L"1252", L"850", L"10000", L"Danish", L"61", LatinFonts, daDKLayouts}, + {L"00000406", 1252, 850, 10000, L"Danish", L"61", LatinFonts, daDKLayouts}, #endif #ifdef LANGUAGE_DV_MV - {L"00000465", L"0", L"1", L"2", L"Dhivehi (Maldives)", L"165", UnicodeFonts, dvMVLayouts}, + {L"00000465", 0, 1, 2, L"Dhivehi (Maldives)", L"165", UnicodeFonts, dvMVLayouts}, #endif #ifdef LANGUAGE_NL_NL - {L"00000413", L"1252", L"850", L"10000", L"Dutch (Netherlands)", L"176", LatinFonts, nlNLLayouts}, + {L"00000413", 1252, 850, 10000, L"Dutch (Netherlands)", L"176", LatinFonts, nlNLLayouts}, #endif #ifdef LANGUAGE_NL_BE - {L"00000813", L"1252", L"850", L"10000", L"Dutch (Belgium)", L"21", LatinFonts, nlBELayouts}, + {L"00000813", 1252, 850, 10000, L"Dutch (Belgium)", L"21", LatinFonts, nlBELayouts}, #endif #ifdef LANGUAGE_EN_US - {L"00000409", L"1252", L"437", L"10000", L"English (United States)", L"244", LatinFonts, enUSLayouts}, + {L"00000409", 1252, 437, 10000, L"English (United States)", L"244", LatinFonts, enUSLayouts}, #endif #ifdef LANGUAGE_EN_GB - {L"00000809", L"1252", L"850", L"10000", L"English (United Kingdom)", L"242", LatinFonts, enGBLayouts}, + {L"00000809", 1252, 850, 10000, L"English (United Kingdom)", L"242", LatinFonts, enGBLayouts}, #endif #ifdef LANGUAGE_EN_AU - {L"00000C09", L"1252", L"850", L"10000", L"English (Australia)", L"12", LatinFonts, enAULayouts}, + {L"00000C09", 1252, 850, 10000, L"English (Australia)", L"12", LatinFonts, enAULayouts}, #endif #ifdef LANGUAGE_EN_CA - {L"00001009", L"1252", L"850", L"10000", L"English (Canada)", L"39", LatinFonts, enCALayouts}, + {L"00001009", 1252, 850, 10000, L"English (Canada)", L"39", LatinFonts, enCALayouts}, #endif #ifdef LANGUAGE_EN_NZ - {L"00001409", L"1252", L"850", L"10000", L"English (New Zealand)", L"183", LatinFonts, enNZLayouts}, + {L"00001409", 1252, 850, 10000, L"English (New Zealand)", L"183", LatinFonts, enNZLayouts}, #endif #ifdef LANGUAGE_EN_IE - {L"00001809", L"1252", L"850", L"10000", L"English (Ireland)", L"68", LatinFonts, enIELayouts}, + {L"00001809", 1252, 850, 10000, L"English (Ireland)", L"68", LatinFonts, enIELayouts}, #endif #ifdef LANGUAGE_EN_ZA - {L"00001C09", L"1252", L"437", L"10000", L"English (South Africa)", L"209", LatinFonts, enZALayouts}, + {L"00001C09", 1252, 437, 10000, L"English (South Africa)", L"209", LatinFonts, enZALayouts}, #endif #ifdef LANGUAGE_EN_JM - {L"00002009", L"1252", L"850", L"10000", L"English (Jamaica)", L"124", LatinFonts, enJMLayouts}, + {L"00002009", 1252, 850, 10000, L"English (Jamaica)", L"124", LatinFonts, enJMLayouts}, #endif #ifdef LANGUAGE_EN_CB - {L"00002409", L"1252", L"850", L"10000", L"English (Caribbean)", L"1", LatinFonts, enCBLayouts}, + {L"00002409", 1252, 850, 10000, L"English (Caribbean)", L"1", LatinFonts, enCBLayouts}, #endif #ifdef LANGUAGE_EN_BZ - {L"00002809", L"1252", L"850", L"10000", L"English (Belize)", L"24", LatinFonts, enBZLayouts}, + {L"00002809", 1252, 850, 10000, L"English (Belize)", L"24", LatinFonts, enBZLayouts}, #endif #ifdef LANGUAGE_EN_TT - {L"00002C09", L"1252", L"850", L"10000", L"English (Trinidad)", L"225", LatinFonts, enTTLayouts}, + {L"00002C09", 1252, 850, 10000, L"English (Trinidad)", L"225", LatinFonts, enTTLayouts}, #endif #ifdef LANGUAGE_EN_ZW - {L"00003009", L"1252", L"437", L"10000", L"English (Zimbabwe)", L"264", LatinFonts, enZWLayouts}, + {L"00003009", 1252, 437, 10000, L"English (Zimbabwe)", L"264", LatinFonts, enZWLayouts}, #endif #ifdef LANGUAGE_EN_PH - {L"00003409", L"1252", L"437", L"10000", L"English (Philippines)", L"201", LatinFonts, enPHLayouts}, + {L"00003409", 1252, 437, 10000, L"English (Philippines)", L"201", LatinFonts, enPHLayouts}, #endif #ifdef LANGUAGE_EO_AA - {L"0000048F", L"1252", L"437", L"10000", L"Esperanto", L"1", LatinFonts, eoAALayouts}, + {L"0000048F", 1252, 437, 10000, L"Esperanto", L"1", LatinFonts, eoAALayouts}, #endif #ifdef LANGUAGE_ET_EE - {L"00000425", L"1252", L"775", L"10029", L"Estonian", L"70", LatinFonts, etEELayouts}, + {L"00000425", 1252, 775, 10029, L"Estonian", L"70", LatinFonts, etEELayouts}, #endif #ifdef LANGUAGE_FO_FO - {L"00000438", L"1252", L"850", L"10079", L"Faeroese", L"81", LatinFonts, foFOLayouts}, + {L"00000438", 1252, 850, 10079, L"Faeroese", L"81", LatinFonts, foFOLayouts}, #endif #ifdef LANGUAGE_FA_IR - {L"00000429", L"1256", L"720", L"10004", L"Farsi", L"116", UnicodeFonts, faIRLayouts}, + {L"00000429", 1256, 720, 10004, L"Farsi", L"116", UnicodeFonts, faIRLayouts}, #endif #ifdef LANGUAGE_FI_FI - {L"0000040B", L"1252", L"850", L"10000", L"Finnish", L"77", LatinFonts, fiFILayouts}, + {L"0000040B", 1252, 850, 10000, L"Finnish", L"77", LatinFonts, fiFILayouts}, #endif #ifdef LANGUAGE_FR_CA - {L"00000C0C", L"1252", L"850", L"10000", L"French (Canada)", L"39", LatinFonts, frCALayouts}, + {L"00000C0C", 1252, 850, 10000, L"French (Canada)", L"39", LatinFonts, frCALayouts}, #endif #ifdef LANGUAGE_FR_FR - {L"0000040C", L"1252", L"850", L"10000", L"French (France)", L"84", LatinFonts, frFRLayouts}, + {L"0000040C", 1252, 850, 10000, L"French (France)", L"84", LatinFonts, frFRLayouts}, #endif #ifdef LANGUAGE_FR_BE - {L"0000080C", L"1252", L"850", L"10000", L"French (Belgium)", L"21", LatinFonts, frBELayouts}, + {L"0000080C", 1252, 850, 10000, L"French (Belgium)", L"21", LatinFonts, frBELayouts}, #endif #ifdef LANGUAGE_FR_CH - {L"0000100C", L"1252", L"850", L"10000", L"French (Switzerland)", L"223", LatinFonts, frCHLayouts}, + {L"0000100C", 1252, 850, 10000, L"French (Switzerland)", L"223", LatinFonts, frCHLayouts}, #endif #ifdef LANGUAGE_FR_LU - {L"0000140C", L"1252", L"850", L"10000", L"French (Luxembourg)", L"147", LatinFonts, frLULayouts}, + {L"0000140C", 1252, 850, 10000, L"French (Luxembourg)", L"147", LatinFonts, frLULayouts}, #endif #ifdef LANGUAGE_FR_MC - {L"0000180C", L"1252", L"850", L"10000", L"French (Monaco)", L"158", LatinFonts, frMCLayouts}, + {L"0000180C", 1252, 850, 10000, L"French (Monaco)", L"158", LatinFonts, frMCLayouts}, #endif #ifdef LANGUAGE_GL_ES - {L"00000456", L"1252", L"850", L"10000", L"Galician (Spain)", L"217", LatinFonts, glESLayouts}, + {L"00000456", 1252, 850, 10000, L"Galician (Spain)", L"217", LatinFonts, glESLayouts}, #endif #ifdef LANGUAGE_KA_GE - {L"00000437", L"0", L"1", L"2", L"Georgian", L"88", UnicodeFonts, kaGELayouts}, + {L"00000437", 0, 1, 2, L"Georgian", L"88", UnicodeFonts, kaGELayouts}, #endif #ifdef LANGUAGE_DE_DE - {L"00000407", L"1252", L"850", L"10000", L"German (Germany)", L"94", LatinFonts, deDELayouts}, + {L"00000407", 1252, 850, 10000, L"German (Germany)", L"94", LatinFonts, deDELayouts}, #endif #ifdef LANGUAGE_DE_CH - {L"00000807", L"1252", L"850", L"10000", L"German (Switzerland)", L"223", LatinFonts, deCHLayouts}, + {L"00000807", 1252, 850, 10000, L"German (Switzerland)", L"223", LatinFonts, deCHLayouts}, #endif #ifdef LANGUAGE_DE_AT - {L"00000C07", L"1252", L"850", L"10000", L"German (Austria)", L"14", LatinFonts, deATLayouts}, + {L"00000C07", 1252, 850, 10000, L"German (Austria)", L"14", LatinFonts, deATLayouts}, #endif #ifdef LANGUAGE_DE_LU - {L"00001007", L"1252", L"850", L"10000", L"German (Luxembourg)", L"147", LatinFonts, deLULayouts}, + {L"00001007", 1252, 850, 10000, L"German (Luxembourg)", L"147", LatinFonts, deLULayouts}, #endif #ifdef LANGUAGE_DE_LI - {L"00001407", L"1252", L"850", L"10000", L"German (Liechtenstein)", L"145", LatinFonts, deLILayouts}, + {L"00001407", 1252, 850, 10000, L"German (Liechtenstein)", L"145", LatinFonts, deLILayouts}, #endif #ifdef LANGUAGE_EL_GR - {L"00000408", L"1253", L"737", L"10006", L"Greek", L"98", GreekFonts, elGRLayouts}, + {L"00000408", 1253, 737, 10006, L"Greek", L"98", GreekFonts, elGRLayouts}, #endif #ifdef LANGUAGE_GU_IN - {L"00000447", L"0", L"1", L"2", L"Gujarati (India)", L"113", UnicodeFonts, guINLayouts}, + {L"00000447", 0, 1, 2, L"Gujarati (India)", L"113", UnicodeFonts, guINLayouts}, #endif #ifdef LANGUAGE_HE_IL - {L"0000040D", L"1255", L"862", L"10005", L"Hebrew", L"117", HebrewFonts, heILLayouts}, + {L"0000040D", 1255, 862, 10005, L"Hebrew", L"117", HebrewFonts, heILLayouts}, #endif #ifdef LANGUAGE_HI_IN - {L"00000439", L"1252", L"437", L"10000", L"Hindi", L"113", HindiFonts, hiINLayouts }, + {L"00000439", 1252, 437, 10000, L"Hindi", L"113", HindiFonts, hiINLayouts }, #endif #ifdef LANGUAGE_HU_HU - {L"0000040E", L"1250", L"852", L"10029", L"Hungarian", L"109", LatinFonts, huHULayouts}, + {L"0000040E", 1250, 852, 10029, L"Hungarian", L"109", LatinFonts, huHULayouts}, #endif #ifdef LANGUAGE_IS_IS - {L"0000040F", L"1252", L"850", L"10079", L"Icelandic", L"110", LatinFonts, isISLayouts}, + {L"0000040F", 1252, 850, 10079, L"Icelandic", L"110", LatinFonts, isISLayouts}, #endif #ifdef LANGUAGE_ID_ID - {L"00000421", L"1252", L"850", L"10079", L"Indonesian", L"111", LatinFonts, idIDLayouts}, + {L"00000421", 1252, 850, 10079, L"Indonesian", L"111", LatinFonts, idIDLayouts}, #endif #ifdef LANGUAGE_IT_IT - {L"00000410", L"1252", L"850", L"10000", L"Italian (Italy)", L"118", LatinFonts, itITLayouts}, + {L"00000410", 1252, 850, 10000, L"Italian (Italy)", L"118", LatinFonts, itITLayouts}, #endif #ifdef LANGUAGE_IT_CH - {L"00000810", L"1252", L"850", L"10000", L"Italian (Switzerland)", L"223", LatinFonts, itCHLayouts}, + {L"00000810", 1252, 850, 10000, L"Italian (Switzerland)", L"223", LatinFonts, itCHLayouts}, #endif #ifdef LANGUAGE_JA_JP - {L"00000411", L"932", L"932", L"10001", L"Japanese", L"122", JapaneseFonts, jaJPLayouts}, + {L"00000411", 932, 932, 10001, L"Japanese", L"122", JapaneseFonts, jaJPLayouts}, #endif #ifdef LANGUAGE_KN_IN - {L"0000044B", L"1252", L"437", L"10079", L"Kannada (India)", L"113", LatinFonts, knINLayouts}, + {L"0000044B", 1252, 437, 10079, L"Kannada (India)", L"113", LatinFonts, knINLayouts}, #endif #ifdef LANGUAGE_KK_KZ - {L"0000043F", L"1251", L"866", L"10007", L"Kazakh", L"137", CyrillicFonts, kkKZLayouts}, + {L"0000043F", 1251, 866, 10007, L"Kazakh", L"137", CyrillicFonts, kkKZLayouts}, #endif #ifdef LANGUAGE_KOK_IN - {L"00000457", L"0", L"437", L"2", L"Konkani", L"113", UnicodeFonts, kokINLayouts}, + {L"00000457", 0, 437, 2, L"Konkani", L"113", UnicodeFonts, kokINLayouts}, #endif #ifdef LANGUAGE_KO_KR - {L"00000412", L"949", L"949", L"10003", L"Korean", L"134", KoreanFonts, koKRLayouts}, + {L"00000412", 949, 949, 10003, L"Korean", L"134", KoreanFonts, koKRLayouts}, #endif #ifdef LANGUAGE_KY_KG - {L"00000440", L"1251", L"866", L"10007", L"Kyrgyz (Kyrgyzstan)", L"130", CyrillicFonts, kyKGLayouts}, + {L"00000440", 1251, 866, 10007, L"Kyrgyz (Kyrgyzstan)", L"130", CyrillicFonts, kyKGLayouts}, #endif #ifdef LANGUAGE_LV_LV - {L"00000426", L"1257", L"775", L"10029", L"Latvian", L"140", LatinFonts, lvLVLayouts}, + {L"00000426", 1257, 775, 10029, L"Latvian", L"140", LatinFonts, lvLVLayouts}, #endif #ifdef LANGUAGE_LT_LT - {L"00000427", L"1257", L"775", L"10029", L"Lithuanian", L"141", LatinFonts, ltLTLayouts}, + {L"00000427", 1257, 775, 10029, L"Lithuanian", L"141", LatinFonts, ltLTLayouts}, #endif #ifdef LANGUAGE_MK_MK - {L"0000042F", L"1251", L"866", L"10007", L"FYRO Macedonian", L"19618", CyrillicFonts, mkMKLayouts}, + {L"0000042F", 1251, 866, 10007, L"FYRO Macedonian", L"19618", CyrillicFonts, mkMKLayouts}, #endif #ifdef LANGUAGE_MS_BN - {L"0000083E", L"1252", L"850", L"10000", L"Malay (Brunei Darussalam)", L"37", LatinFonts, msBNLayouts}, + {L"0000083E", 1252, 850, 10000, L"Malay (Brunei Darussalam)", L"37", LatinFonts, msBNLayouts}, #endif #ifdef LANGUAGE_MS_MY - {L"0000043E", L"1252", L"850", L"10000", L"Malay (Malaysia)", L"167", LatinFonts, msMYLayouts}, + {L"0000043E", 1252, 850, 10000, L"Malay (Malaysia)", L"167", LatinFonts, msMYLayouts}, #endif #ifdef LANGUAGE_MR_IN - {L"0000044E", L"0", L"1", L"2", L"Marathi", L"113", UnicodeFonts, mrINLayouts}, + {L"0000044E", 0, 1, 2, L"Marathi", L"113", UnicodeFonts, mrINLayouts}, #endif #ifdef LANGUAGE_MN_MN - {L"00000450", L"1251", L"866", L"10007", L"Mongolian (Mongolia)", L"154", CyrillicFonts, mnMNLayouts}, + {L"00000450", 1251, 866, 10007, L"Mongolian (Mongolia)", L"154", CyrillicFonts, mnMNLayouts}, #endif #ifdef LANGUAGE_NB_NO - {L"00000414", L"1252", L"850", L"10000", L"Norwegian (Bokmal)", L"177", LatinFonts, nbNOLayouts}, + {L"00000414", 1252, 850, 10000, L"Norwegian (Bokmal)", L"177", LatinFonts, nbNOLayouts}, #endif #ifdef LANGUAGE_NN_NO - {L"00000814", L"1252", L"850", L"10000", L"Norwegian (Nynorsk)", L"177", LatinFonts, nnNOLayouts}, + {L"00000814", 1252, 850, 10000, L"Norwegian (Nynorsk)", L"177", LatinFonts, nnNOLayouts}, #endif #ifdef LANGUAGE_PL_PL - {L"00000415", L"1250", L"852", L"10029", L"Polish", L"191", LatinFonts, plPLLayouts}, + {L"00000415", 1250, 852, 10029, L"Polish", L"191", LatinFonts, plPLLayouts}, #endif #ifdef LANGUAGE_PT_PT - {L"00000816", L"1252", L"850", L"10000", L"Portuguese (Portugal)", L"193", LatinFonts, ptPTLayouts}, + {L"00000816", 1252, 850, 10000, L"Portuguese (Portugal)", L"193", LatinFonts, ptPTLayouts}, #endif #ifdef LANGUAGE_PT_BR - {L"00000416", L"1252", L"850", L"10000", L"Portuguese (Brazil)", L"32", LatinFonts, ptBRLayouts}, + {L"00000416", 1252, 850, 10000, L"Portuguese (Brazil)", L"32", LatinFonts, ptBRLayouts}, #endif #ifdef LANGUAGE_PA_IN - {L"00000446", L"0", L"1", L"2", L"Punjabi (India)", L"113", UnicodeFonts, paINLayouts}, + {L"00000446", 0, 1, 2, L"Punjabi (India)", L"113", UnicodeFonts, paINLayouts}, #endif #ifdef LANGUAGE_RO_RO - {L"00000418", L"28606", L"28606", L"10029", L"Romanian", L"200", LatinFonts, roROLayouts}, + {L"00000418", 28606, 28606, 10029, L"Romanian", L"200", LatinFonts, roROLayouts}, #endif #ifdef LANGUAGE_RM_CH - {L"00000417", L"1252", L"850", L"10000", L"Romansh", L"223", LatinFonts, rmCHLayouts}, + {L"00000417", 1252, 850, 10000, L"Romansh", L"223", LatinFonts, rmCHLayouts}, #endif #ifdef LANGUAGE_RU_RU - {L"00000419", L"1251", L"866", L"10007", L"Russian", L"203", CyrillicFonts, ruRULayouts}, + {L"00000419", 1251, 866, 10007, L"Russian", L"203", CyrillicFonts, ruRULayouts}, #endif #ifdef LANGUAGE_SA_IN - {L"0000044F", L"0", L"1", L"2", L"Sanskrit", L"113", UnicodeFonts, saINLayouts}, + {L"0000044F", 0, 1, 2, L"Sanskrit", L"113", UnicodeFonts, saINLayouts}, #endif #ifdef LANGUAGE_SR_SP - {L"00000C1A", L"1251", L"855", L"10007", L"Serbian (Cyrillic)", L"271", CyrillicFonts, srSPLayouts}, + {L"00000C1A", 1251, 855, 10007, L"Serbian (Cyrillic)", L"271", CyrillicFonts, srSPLayouts}, #endif #ifdef LANGUAGE_SR_SP - {L"0000081A", L"1250", L"852", L"10029", L"Serbian (Latin)", L"271", LatinFonts, srSPLayouts}, + {L"0000081A", 1250, 852, 10029, L"Serbian (Latin)", L"271", LatinFonts, srSPLayouts}, #endif #ifdef LANGUAGE_SK_SK - {L"0000041B", L"1250", L"852", L"10029", L"Slovak", L"143", LatinFonts, skSKLayouts}, + {L"0000041B", 1250, 852, 10029, L"Slovak", L"143", LatinFonts, skSKLayouts}, #endif #ifdef LANGUAGE_SL_SI - {L"00000424", L"1250", L"852", L"10029", L"Slovenian", L"212", LatinFonts, slSILayouts}, + {L"00000424", 1250, 852, 10029, L"Slovenian", L"212", LatinFonts, slSILayouts}, #endif #ifdef LANGUAGE_ES_ES - {L"0000040A", L"1252", L"850", L"10000", L"Spanish (Traditional Sort)", L"217", LatinFonts, esESLayouts}, + {L"0000040A", 1252, 850, 10000, L"Spanish (Traditional Sort)", L"217", LatinFonts, esESLayouts}, #endif #ifdef LANGUAGE_ES_MX - {L"0000080A", L"1252", L"850", L"10000", L"Spanish (Mexico)", L"166", LatinFonts, esMXLayouts}, + {L"0000080A", 1252, 850, 10000, L"Spanish (Mexico)", L"166", LatinFonts, esMXLayouts}, #endif #ifdef LANGUAGE_ES_ES - {L"00000C0A", L"1252", L"850", L"10000", L"Spanish (International Sort)", L"217", LatinFonts, esESLayouts}, + {L"00000C0A", 1252, 850, 10000, L"Spanish (International Sort)", L"217", LatinFonts, esESLayouts}, #endif #ifdef LANGUAGE_ES_GT - {L"0000100A", L"1252", L"850", L"10000", L"Spanish (Guatemala)", L"99", LatinFonts, esGTLayouts}, + {L"0000100A", 1252, 850, 10000, L"Spanish (Guatemala)", L"99", LatinFonts, esGTLayouts}, #endif #ifdef LANGUAGE_ES_CR - {L"0000140A", L"1252", L"850", L"10000", L"Spanish (Costa Rica)", L"54", LatinFonts, esCRLayouts}, + {L"0000140A", 1252, 850, 10000, L"Spanish (Costa Rica)", L"54", LatinFonts, esCRLayouts}, #endif #ifdef LANGUAGE_ES_PA - {L"0000180A", L"1252", L"850", L"10000", L"Spanish (Panama)", L"192", LatinFonts, esPALayouts}, + {L"0000180A", 1252, 850, 10000, L"Spanish (Panama)", L"192", LatinFonts, esPALayouts}, #endif #ifdef LANGUAGE_ES_DO - {L"00001C0A", L"1252", L"850", L"10000", L"Spanish (Dominican Republic)", L"65", LatinFonts, esDOLayouts}, + {L"00001C0A", 1252, 850, 10000, L"Spanish (Dominican Republic)", L"65", LatinFonts, esDOLayouts}, #endif #ifdef LANGUAGE_ES_VE - {L"0000200A", L"1252", L"850", L"10000", L"Spanish (Venezuela)", L"249", LatinFonts, esVELayouts}, + {L"0000200A", 1252, 850, 10000, L"Spanish (Venezuela)", L"249", LatinFonts, esVELayouts}, #endif #ifdef LANGUAGE_ES_CO - {L"0000240A", L"1252", L"850", L"10000", L"Spanish (Colombia)", L"51", LatinFonts, esCOLayouts}, + {L"0000240A", 1252, 850, 10000, L"Spanish (Colombia)", L"51", LatinFonts, esCOLayouts}, #endif #ifdef LANGUAGE_ES_PE - {L"0000280A", L"1252", L"850", L"10000", L"Spanish (Peru)", L"187", LatinFonts, esPELayouts}, + {L"0000280A", 1252, 850, 10000, L"Spanish (Peru)", L"187", LatinFonts, esPELayouts}, #endif #ifdef LANGUAGE_ES_AR - {L"00002C0A", L"1252", L"850", L"10000", L"Spanish (Argentina)", L"11", LatinFonts, esARLayouts}, + {L"00002C0A", 1252, 850, 10000, L"Spanish (Argentina)", L"11", LatinFonts, esARLayouts}, #endif #ifdef LANGUAGE_ES_EC - {L"0000300A", L"1252", L"850", L"10000", L"Spanish (Ecuador)", L"66", LatinFonts, esECLayouts}, + {L"0000300A", 1252, 850, 10000, L"Spanish (Ecuador)", L"66", LatinFonts, esECLayouts}, #endif #ifdef LANGUAGE_ES_CL - {L"0000340A", L"1252", L"850", L"10000", L"Spanish (Chile)", L"46", LatinFonts, esCLLayouts}, + {L"0000340A", 1252, 850, 10000, L"Spanish (Chile)", L"46", LatinFonts, esCLLayouts}, #endif #ifdef LANGUAGE_ES_UY - {L"0000380A", L"1252", L"850", L"10000", L"Spanish (Uruguay)", L"246", LatinFonts, esUYLayouts}, + {L"0000380A", 1252, 850, 10000, L"Spanish (Uruguay)", L"246", LatinFonts, esUYLayouts}, #endif #ifdef LANGUAGE_ES_PY - {L"00003C0A", L"1252", L"850", L"10000", L"Spanish (Paraguay)", L"185", LatinFonts, esPYLayouts}, + {L"00003C0A", 1252, 850, 10000, L"Spanish (Paraguay)", L"185", LatinFonts, esPYLayouts}, #endif #ifdef LANGUAGE_ES_BO - {L"0000400A", L"1252", L"850", L"10000", L"Spanish (Bolivia)", L"26", LatinFonts, esBOLayouts}, + {L"0000400A", 1252, 850, 10000, L"Spanish (Bolivia)", L"26", LatinFonts, esBOLayouts}, #endif #ifdef LANGUAGE_ES_SV - {L"0000440A", L"1252", L"850", L"10000", L"Spanish (El Salvador)", L"72", LatinFonts, esSVLayouts}, + {L"0000440A", 1252, 850, 10000, L"Spanish (El Salvador)", L"72", LatinFonts, esSVLayouts}, #endif #ifdef LANGUAGE_ES_HN - {L"0000480A", L"1252", L"850", L"10000", L"Spanish (Honduras)", L"106", LatinFonts, esHNLayouts}, + {L"0000480A", 1252, 850, 10000, L"Spanish (Honduras)", L"106", LatinFonts, esHNLayouts}, #endif #ifdef LANGUAGE_ES_NI - {L"00004C0A", L"1252", L"850", L"10000", L"Spanish (Nicaragua)", L"182", LatinFonts, esNILayouts}, + {L"00004C0A", 1252, 850, 10000, L"Spanish (Nicaragua)", L"182", LatinFonts, esNILayouts}, #endif #ifdef LANGUAGE_ES_PR - {L"0000500A", L"1252", L"850", L"10000", L"Spanish (Puerto Rico)", L"202", LatinFonts, esPRLayouts}, + {L"0000500A", 1252, 850, 10000, L"Spanish (Puerto Rico)", L"202", LatinFonts, esPRLayouts}, #endif #ifdef LANGUAGE_SW_KE - {L"00000441", L"1252", L"437", L"10000", L"Swahili", L"129", LatinFonts, swKELayouts}, + {L"00000441", 1252, 437, 10000, L"Swahili", L"129", LatinFonts, swKELayouts}, #endif #ifdef LANGUAGE_SV_SE - {L"0000041D", L"1252", L"850", L"10000", L"Swedish", L"221", LatinFonts, svSELayouts}, + {L"0000041D", 1252, 850, 10000, L"Swedish", L"221", LatinFonts, svSELayouts}, #endif #ifdef LANGUAGE_SV_FI - {L"0000081D", L"1252", L"850", L"10000", L"Swedish (Finland)", L"77", LatinFonts, svFILayouts}, + {L"0000081D", 1252, 850, 10000, L"Swedish (Finland)", L"77", LatinFonts, svFILayouts}, #endif #ifdef LANGUAGE_SYR_SY - {L"0000045A", L"0", L"1", L"2", L"Syriac (Syria)", L"222", UnicodeFonts, syrSYLayouts}, + {L"0000045A", 0, 1, 2, L"Syriac (Syria)", L"222", UnicodeFonts, syrSYLayouts}, #endif #ifdef LANGUAGE_TA_IN - {L"00000449", L"0", L"1", L"2", L"Tamil", L"113", UnicodeFonts, taINLayouts}, + {L"00000449", 0, 1, 2, L"Tamil", L"113", UnicodeFonts, taINLayouts}, #endif #ifdef LANGUAGE_TT_TA - {L"00000444", L"1251", L"866", L"10007", L"Tatar", L"1", CyrillicFonts, ttTALayouts}, + {L"00000444", 1251, 866, 10007, L"Tatar", L"1", CyrillicFonts, ttTALayouts}, #endif #ifdef LANGUAGE_TE_IN - {L"0000044A", L"0", L"1", L"2", L"Telugu (India)", L"113", UnicodeFonts, teINLayouts}, + {L"0000044A", 0, 1, 2, L"Telugu (India)", L"113", UnicodeFonts, teINLayouts}, #endif #ifdef LANGUAGE_TH_TH - {L"0000041E", L"874", L"874", L"10021", L"Thai", L"227", UnicodeFonts, thTHLayouts}, + {L"0000041E", 874, 874, 10021, L"Thai", L"227", UnicodeFonts, thTHLayouts}, #endif #ifdef LANGUAGE_TR_TR - {L"0000041F", L"1254", L"857", L"10081", L"Turkish", L"235", LatinFonts, trTRLayouts}, + {L"0000041F", 1254, 857, 10081, L"Turkish", L"235", LatinFonts, trTRLayouts}, #endif #ifdef LANGUAGE_UK_UA - {L"00000422", L"1251", L"866", L"10017", L"Ukrainian", L"241", CyrillicFonts, ukUALayouts}, + {L"00000422", 1251, 866, 10017, L"Ukrainian", L"241", CyrillicFonts, ukUALayouts}, #endif #ifdef LANGUAGE_UR_PK - {L"00000420", L"1256", L"720", L"10004", L"Urdu", L"190", UnicodeFonts, urPKLayouts}, + {L"00000420", 1256, 720, 10004, L"Urdu", L"190", UnicodeFonts, urPKLayouts}, #endif #ifdef LANGUAGE_UZ_UZ - {L"00000443", L"1254", L"857", L"10029", L"Uzbek (Latin)", L"247", LatinFonts, uzUZLayouts}, + {L"00000443", 1254, 857, 10029, L"Uzbek (Latin)", L"247", LatinFonts, uzUZLayouts}, #endif #ifdef LANGUAGE_UZ_UZ - {L"00000843", L"1251", L"866", L"10007", L"Uzbek (Cyrillic)", L"247", CyrillicFonts, uzUZLayouts}, + {L"00000843", 1251, 866, 10007, L"Uzbek (Cyrillic)", L"247", CyrillicFonts, uzUZLayouts}, #endif #ifdef LANGUAGE_VI_VN - {L"0000042A", L"1258", L"1258", L"10000", L"Vietnamese", L"251", UnicodeFonts, viVNLayouts}, + {L"0000042A", 1258, 1258, 10000, L"Vietnamese", L"251", UnicodeFonts, viVNLayouts}, #endif #ifdef LANGUAGE_WA_BE - {L"00000490", L"1252", L"850", L"10000", L"Walon", L"21", LatinFonts, waBELayouts}, + {L"00000490", 1252, 850, 10000, L"Walon", L"21", LatinFonts, waBELayouts}, #endif #ifdef LANGUAGE_ZU_ZU - {L"00000435", L"1252", L"850", L"10000", L"Zulu", L"1", LatinFonts, zuZULayouts}, + {L"00000435", 1252, 850, 10000, L"Zulu", L"1", LatinFonts, zuZULayouts}, #endif - {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL} + {NULL, 0, 0, 0, NULL, NULL, NULL, NULL} }; diff --git a/base/setup/usetup/mui.c b/base/setup/usetup/mui.c index 7fab3ab131b..afe99d91ab3 100644 --- a/base/setup/usetup/mui.c +++ b/base/setup/usetup/mui.c @@ -545,7 +545,7 @@ SetConsoleCodePage(VOID) { if (_wcsicmp(ResourceList[lngIndex].LanguageID, SelectedLanguageId) == 0) { - wCodePage = (UINT) wcstoul(ResourceList[lngIndex].OEMCPage, NULL, 10); + wCodePage = ResourceList[lngIndex].OEMCPage; SetConsoleOutputCP(wCodePage); return; } @@ -553,7 +553,7 @@ SetConsoleCodePage(VOID) lngIndex++; } #else - wCodePage = (UINT)wcstoul(MUIGetOEMCodePage(SelectedLanguageId), NULL, 10); + wCodePage = MUIGetOEMCodePage(SelectedLanguageId); SetConsoleOutputCP(wCodePage); #endif