https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3449296f7bc910db69a80f782d4a86b8f0eea9b7
commit 3449296f7bc910db69a80f782d4a86b8f0eea9b7 Author: Amine Khaldi <[email protected]> AuthorDate: Sat Dec 9 23:33:02 2017 +0100 [USETUP] LanguageList => MUILanguageList. #179 --- base/setup/usetup/mui.c | 44 ++++++++++++++++++++-------------------- base/setup/usetup/muilanguages.h | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/base/setup/usetup/mui.c b/base/setup/usetup/mui.c index 8a9df44b30..0ddbdfebbb 100644 --- a/base/setup/usetup/mui.c +++ b/base/setup/usetup/mui.c @@ -52,13 +52,13 @@ FindLanguageIndex(VOID) do { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + if (_wcsicmp(MUILanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) { return lngIndex; } lngIndex++; - }while (LanguageList[lngIndex].MuiPages != NULL); + } while (MUILanguageList[lngIndex].MuiPages != NULL); return 0; } @@ -72,11 +72,11 @@ IsLanguageAvailable( do { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , LanguageId) == 0) + if (_wcsicmp(MUILanguageList[lngIndex].LanguageID , LanguageId) == 0) return TRUE; lngIndex++; - }while (LanguageList[lngIndex].MuiPages != NULL); + } while (MUILanguageList[lngIndex].MuiPages != NULL); return FALSE; } @@ -92,7 +92,7 @@ FindMUIEntriesOfPage( const MUI_PAGE * Pages = NULL; lngIndex = max(FindLanguageIndex(), 0); - Pages = LanguageList[lngIndex].MuiPages; + Pages = MUILanguageList[lngIndex].MuiPages; do { @@ -111,7 +111,7 @@ const MUI_ERROR * FindMUIErrorEntries(VOID) { ULONG lngIndex = max(FindLanguageIndex(), 0); - return LanguageList[lngIndex].MuiErrors; + return MUILanguageList[lngIndex].MuiErrors; } @@ -120,7 +120,7 @@ const MUI_STRING * FindMUIStringEntries(VOID) { ULONG lngIndex = max(FindLanguageIndex(), 0); - return LanguageList[lngIndex].MuiStrings; + return MUILanguageList[lngIndex].MuiStrings; } @@ -128,7 +128,7 @@ LPCWSTR MUIDefaultKeyboardLayout(VOID) { ULONG lngIndex = max(FindLanguageIndex(), 0); - return LanguageList[lngIndex].MuiLayouts[0].LayoutID; + return MUILanguageList[lngIndex].MuiLayouts[0].LayoutID; } @@ -136,7 +136,7 @@ PWCHAR MUIGetGeoID(VOID) { ULONG lngIndex = max(FindLanguageIndex(), 0); - return LanguageList[lngIndex].GeoID; + return MUILanguageList[lngIndex].GeoID; } @@ -144,7 +144,7 @@ const MUI_LAYOUTS * MUIGetLayoutsList(VOID) { ULONG lngIndex = max(FindLanguageIndex(), 0); - return LanguageList[lngIndex].MuiLayouts; + return MUILanguageList[lngIndex].MuiLayouts; } @@ -549,14 +549,14 @@ AddKeyboardLayouts(VOID) do { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + if (_wcsicmp(MUILanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) { - return AddKbLayoutsToRegistry(LanguageList[lngIndex].MuiLayouts); + return AddKbLayoutsToRegistry(MUILanguageList[lngIndex].MuiLayouts); } lngIndex++; } - while (LanguageList[lngIndex].MuiPages != NULL); + while (MUILanguageList[lngIndex].MuiPages != NULL); return FALSE; } @@ -703,12 +703,12 @@ AddCodePage(VOID) ULONG lngIndex = 0; do { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + if (_wcsicmp(MUILanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) { - if (AddCodepageToRegistry(LanguageList[lngIndex].ACPage, - LanguageList[lngIndex].OEMCPage, - LanguageList[lngIndex].MACCPage)&& - AddFontsSettingsToRegistry(LanguageList[lngIndex].MuiSubFonts)) + if (AddCodepageToRegistry(MUILanguageList[lngIndex].ACPage, + MUILanguageList[lngIndex].OEMCPage, + MUILanguageList[lngIndex].MACCPage)&& + AddFontsSettingsToRegistry(MUILanguageList[lngIndex].MuiSubFonts)) { return TRUE; } @@ -720,7 +720,7 @@ AddCodePage(VOID) lngIndex++; } - while (LanguageList[lngIndex].MuiPages != NULL); + while (MUILanguageList[lngIndex].MuiPages != NULL); return FALSE; } @@ -734,16 +734,16 @@ SetConsoleCodePage(VOID) do { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + if (_wcsicmp(MUILanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) { - wCodePage = (UINT) wcstoul(LanguageList[lngIndex].OEMCPage, NULL, 10); + wCodePage = (UINT) wcstoul(MUILanguageList[lngIndex].OEMCPage, NULL, 10); SetConsoleOutputCP(wCodePage); return; } lngIndex++; } - while (LanguageList[lngIndex].MuiPages != NULL); + while (MUILanguageList[lngIndex].MuiPages != NULL); } /* EOF */ diff --git a/base/setup/usetup/muilanguages.h b/base/setup/usetup/muilanguages.h index d0505caeab..dcb00a2cc4 100644 --- a/base/setup/usetup/muilanguages.h +++ b/base/setup/usetup/muilanguages.h @@ -411,7 +411,7 @@ #include "lang/zh-TW.h" #endif -const MUI_LANGUAGE LanguageList[] = +const MUI_LANGUAGE MUILanguageList[] = { /* Lang ID, ANSI CP, OEM CP, MAC CP, Language Name, GeoID page strgs,error strings, other strings, fonts, kb layouts */ #ifdef LANGUAGE_AF_ZA
