Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-30 14:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USETUP] LanguageList => MUILanguageList. #179

Browse source
This commit is contained in:
Amine Khaldi 2017-12-09 23:33:02 +01:00
parent 1c4f4818ea
commit 3449296f7b
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
base/setup/usetup/mui.c
View file

@ -52,13 +52,13 @@ FindLanguageIndex(VOID)
do do
{ {
if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) if (_wcsicmp(MUILanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0)
{ {
return lngIndex; return lngIndex;
} }
lngIndex++; lngIndex++;
}while (LanguageList[lngIndex].MuiPages != NULL); } while (MUILanguageList[lngIndex].MuiPages != NULL);
return 0; return 0;
} }
@ -72,11 +72,11 @@ IsLanguageAvailable(
do do
{ {
if (_wcsicmp(LanguageList[lngIndex].LanguageID , LanguageId) == 0) if (_wcsicmp(MUILanguageList[lngIndex].LanguageID , LanguageId) == 0)
return TRUE; return TRUE;
lngIndex++; lngIndex++;
}while (LanguageList[lngIndex].MuiPages != NULL); } while (MUILanguageList[lngIndex].MuiPages != NULL);
return FALSE; return FALSE;
} }
@ -92,7 +92,7 @@ FindMUIEntriesOfPage(
const MUI_PAGE * Pages = NULL; const MUI_PAGE * Pages = NULL;
lngIndex = max(FindLanguageIndex(), 0); lngIndex = max(FindLanguageIndex(), 0);
Pages = LanguageList[lngIndex].MuiPages; Pages = MUILanguageList[lngIndex].MuiPages;
do do
{ {
@ -111,7 +111,7 @@ const MUI_ERROR *
FindMUIErrorEntries(VOID) FindMUIErrorEntries(VOID)
{ {
ULONG lngIndex = max(FindLanguageIndex(), 0); ULONG lngIndex = max(FindLanguageIndex(), 0);
return LanguageList[lngIndex].MuiErrors; return MUILanguageList[lngIndex].MuiErrors;
} }
@ -120,7 +120,7 @@ const MUI_STRING *
FindMUIStringEntries(VOID) FindMUIStringEntries(VOID)
{ {
ULONG lngIndex = max(FindLanguageIndex(), 0); ULONG lngIndex = max(FindLanguageIndex(), 0);
return LanguageList[lngIndex].MuiStrings; return MUILanguageList[lngIndex].MuiStrings;
} }
@ -128,7 +128,7 @@ LPCWSTR
MUIDefaultKeyboardLayout(VOID) MUIDefaultKeyboardLayout(VOID)
{ {
ULONG lngIndex = max(FindLanguageIndex(), 0); ULONG lngIndex = max(FindLanguageIndex(), 0);
return LanguageList[lngIndex].MuiLayouts[0].LayoutID; return MUILanguageList[lngIndex].MuiLayouts[0].LayoutID;
} }
@ -136,7 +136,7 @@ PWCHAR
MUIGetGeoID(VOID) MUIGetGeoID(VOID)
{ {
ULONG lngIndex = max(FindLanguageIndex(), 0); ULONG lngIndex = max(FindLanguageIndex(), 0);
return LanguageList[lngIndex].GeoID; return MUILanguageList[lngIndex].GeoID;
} }
@ -144,7 +144,7 @@ const MUI_LAYOUTS *
MUIGetLayoutsList(VOID) MUIGetLayoutsList(VOID)
{ {
ULONG lngIndex = max(FindLanguageIndex(), 0); ULONG lngIndex = max(FindLanguageIndex(), 0);
return LanguageList[lngIndex].MuiLayouts; return MUILanguageList[lngIndex].MuiLayouts;
} }
@ -549,14 +549,14 @@ AddKeyboardLayouts(VOID)
do 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++; lngIndex++;
} }
while (LanguageList[lngIndex].MuiPages != NULL); while (MUILanguageList[lngIndex].MuiPages != NULL);
return FALSE; return FALSE;
} }
@ -703,12 +703,12 @@ AddCodePage(VOID)
ULONG lngIndex = 0; ULONG lngIndex = 0;
do do
{ {
if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) if (_wcsicmp(MUILanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0)
{ {
if (AddCodepageToRegistry(LanguageList[lngIndex].ACPage, if (AddCodepageToRegistry(MUILanguageList[lngIndex].ACPage,
LanguageList[lngIndex].OEMCPage, MUILanguageList[lngIndex].OEMCPage,
LanguageList[lngIndex].MACCPage)&& MUILanguageList[lngIndex].MACCPage)&&
AddFontsSettingsToRegistry(LanguageList[lngIndex].MuiSubFonts)) AddFontsSettingsToRegistry(MUILanguageList[lngIndex].MuiSubFonts))
{ {
return TRUE; return TRUE;
} }
@ -720,7 +720,7 @@ AddCodePage(VOID)
lngIndex++; lngIndex++;
} }
while (LanguageList[lngIndex].MuiPages != NULL); while (MUILanguageList[lngIndex].MuiPages != NULL);
return FALSE; return FALSE;
} }
@ -734,16 +734,16 @@ SetConsoleCodePage(VOID)
do 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); SetConsoleOutputCP(wCodePage);
return; return;
} }
lngIndex++; lngIndex++;
} }
while (LanguageList[lngIndex].MuiPages != NULL); while (MUILanguageList[lngIndex].MuiPages != NULL);
} }
/* EOF */ /* EOF */

2
base/setup/usetup/muilanguages.h
View file

@ -411,7 +411,7 @@
#include "lang/zh-TW.h" #include "lang/zh-TW.h"
#endif #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 */ /* Lang ID, ANSI CP, OEM CP, MAC CP, Language Name, GeoID page strgs,error strings, other strings, fonts, kb layouts */
#ifdef LANGUAGE_AF_ZA #ifdef LANGUAGE_AF_ZA