Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 75724: [SETUPLIB]: Addendum to r75720.
by hbelusca＠svn.reactos.org 31 Aug '17

31 Aug '17

Author: hbelusca Date: Thu Aug 31 19:39:52 2017 New Revision: 75724 URL: http://svn.reactos.org/svn/reactos?rev=75724&view=rev Log: [SETUPLIB]: Addendum to r75720. Modified: branches/setup_improvements/base/setup/lib/settings.c branches/setup_improvements/base/setup/lib/settings.h Modified: branches/setup_improvements/base/setup/lib/settings.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/settings.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/settings.c [iso-8859-1] Thu Aug 31 19:39:52 2017 @@ -1178,7 +1178,7 @@ CreateKeyboardLayoutList( IN HINF InfFile, IN PCWSTR LanguageId, - OUT PWCHAR DefaultKBLayout) + OUT PWSTR DefaultKBLayout) { PGENERIC_LIST List; INFCONTEXT Context; Modified: branches/setup_improvements/base/setup/lib/settings.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/settings.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/settings.h [iso-8859-1] Thu Aug 31 19:39:52 2017 @@ -54,7 +54,7 @@ CreateKeyboardLayoutList( IN HINF InfFile, IN PCWSTR LanguageId, - OUT PWCHAR DefaultKBLayout); + OUT PWSTR DefaultKBLayout); PGENERIC_LIST CreateLanguageList(

1 0

[hbelusca] 75723: [USETUP]: Adjust some MUI & settings calls, following the commits r75719, r75720 and r75721.
by hbelusca＠svn.reactos.org 31 Aug '17

31 Aug '17

Author: hbelusca Date: Thu Aug 31 18:49:39 2017 New Revision: 75723 URL: http://svn.reactos.org/svn/reactos?rev=75723&view=rev Log: [USETUP]: Adjust some MUI & settings calls, following the commits r75719, r75720 and r75721. Modified: branches/setup_improvements/base/setup/usetup/usetup.c branches/setup_improvements/base/setup/usetup/usetup.h Modified: branches/setup_improvements/base/setup/usetup/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] Thu Aug 31 18:49:39 2017 @@ -400,13 +400,13 @@ UpdateKBLayout(VOID) { PGENERIC_LIST_ENTRY ListEntry; - LPCWSTR pszNewLayout; - - pszNewLayout = MUIDefaultKeyboardLayout(); + PCWSTR pszNewLayout; + + pszNewLayout = MUIDefaultKeyboardLayout(SelectedLanguageId); if (LayoutList == NULL) { - LayoutList = CreateKeyboardLayoutList(SetupInf, DefaultKBLayout); + LayoutList = CreateKeyboardLayoutList(SetupInf, SelectedLanguageId, DefaultKBLayout); if (LayoutList == NULL) { /* FIXME: Handle error! */ @@ -463,9 +463,10 @@ } } + SelectedLanguageId = DefaultLanguage; + USetupData.LanguageId = 0; + /* Load the font */ - USetupData.LanguageId = 0; - SelectedLanguageId = DefaultLanguage; SetConsoleCodePage(); UpdateKBLayout(); @@ -551,7 +552,7 @@ { NewLanguageId = (PWCHAR)GetListEntryUserData(GetCurrentListEntry(LanguageList)); - if (SelectedLanguageId != NewLanguageId) + if (wcscmp(SelectedLanguageId, NewLanguageId)) { /* Clear the language page */ MUIClearPage(LANGUAGE_PAGE); @@ -642,12 +643,15 @@ ComputerList = CreateComputerTypeList(SetupInf); DisplayList = CreateDisplayDriverList(SetupInf); KeyboardList = CreateKeyboardDriverList(SetupInf); - LayoutList = CreateKeyboardLayoutList(SetupInf, DefaultKBLayout); + LanguageList = CreateLanguageList(SetupInf, DefaultLanguage); /* new part */ + SelectedLanguageId = DefaultLanguage; wcscpy(SelectedLanguageId, USetupData.LocaleID); USetupData.LanguageId = (LANGID)(wcstol(SelectedLanguageId, NULL, 16) & 0xFFFF); + + LayoutList = CreateKeyboardLayoutList(SetupInf, SelectedLanguageId, DefaultKBLayout); /* first we hack LanguageList */ ListEntry = GetFirstListEntry(LanguageList); @@ -1078,7 +1082,7 @@ /* Initialize the keyboard layout list */ if (LayoutList == NULL) { - LayoutList = CreateKeyboardLayoutList(SetupInf, DefaultKBLayout); + LayoutList = CreateKeyboardLayoutList(SetupInf, SelectedLanguageId, DefaultKBLayout); if (LayoutList == NULL) { /* FIXME: report error */ @@ -4032,14 +4036,14 @@ /* Add keyboard layouts */ CONSOLE_SetStatusText(MUIGetString(STRING_ADDKBLAYOUTS)); - if (!AddKeyboardLayouts()) + if (!AddKeyboardLayouts(SelectedLanguageId)) { MUIDisplayError(ERROR_ADDING_KBLAYOUTS, Ir, POPUP_WAIT_ENTER); goto Cleanup; } /* Set GeoID */ - if (!SetGeoID(MUIGetGeoID())) + if (!SetGeoID(MUIGetGeoID(SelectedLanguageId))) { MUIDisplayError(ERROR_UPDATE_GEOID, Ir, POPUP_WAIT_ENTER); goto Cleanup; @@ -4049,7 +4053,7 @@ { /* Update keyboard layout settings */ CONSOLE_SetStatusText(MUIGetString(STRING_KEYBOARDSETTINGSUPDATE)); - if (!ProcessKeyboardLayoutRegistry(LayoutList)) + if (!ProcessKeyboardLayoutRegistry(LayoutList, SelectedLanguageId)) { MUIDisplayError(ERROR_UPDATE_KBSETTINGS, Ir, POPUP_WAIT_ENTER); goto Cleanup; @@ -4058,7 +4062,7 @@ /* Add codepage information to registry */ CONSOLE_SetStatusText(MUIGetString(STRING_CODEPAGEINFOUPDATE)); - if (!AddCodePage()) + if (!AddCodePage(SelectedLanguageId)) { MUIDisplayError(ERROR_ADDING_CODEPAGE, Ir, POPUP_WAIT_ENTER); goto Cleanup; Modified: branches/setup_improvements/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.h [iso-8859-1] Thu Aug 31 18:49:39 2017 @@ -128,4 +128,10 @@ #define POPUP_WAIT_ANY_KEY 1 #define POPUP_WAIT_ENTER 2 +VOID +PopupError(IN PCCH Text, + IN PCCH Status, + IN PINPUT_RECORD Ir, + IN ULONG WaitEvent); + #endif /* _USETUP_PCH_ */

1 0

[hbelusca] 75722: [USETUP]: Adaptations 1: - Transform some do{}while() loops into while(){} ones, since the lists on which we work may only contain one single {NULL} element. - Modify MUIGetOEMCod...
by hbelusca＠svn.reactos.org 31 Aug '17

31 Aug '17

Author: hbelusca Date: Thu Aug 31 18:31:52 2017 New Revision: 75722 URL: http://svn.reactos.org/svn/reactos?rev=75722&view=rev Log: [USETUP]: Adaptations 1: - Transform some do{}while() loops into while(){} ones, since the lists on which we work may only contain one single {NULL} element. - Modify MUIGetOEMCodePage() call after r75719. - Use PCWSTR where needed. Modified: branches/setup_improvements/base/setup/usetup/mui.c branches/setup_improvements/base/setup/usetup/mui.h Modified: branches/setup_improvements/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/mui.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/mui.c [iso-8859-1] Thu Aug 31 18:31:52 2017 @@ -30,13 +30,6 @@ #define NDEBUG #include <debug.h> -extern -VOID -PopupError(IN PCCH Text, - IN PCCH Status, - IN PINPUT_RECORD Ir, - IN ULONG WaitEvent); - static ULONG FindLanguageIndex(VOID) @@ -45,11 +38,12 @@ if (SelectedLanguageId == NULL) { - /* default to english */ - return 0; - } - - do + /* Default to en-US */ + return 0; // FIXME!! + // SelectedLanguageId = L"00000409"; + } + + while (ResourceList[lngIndex].MuiPages != NULL) { if (_wcsicmp(ResourceList[lngIndex].LanguageID, SelectedLanguageId) == 0) { @@ -57,7 +51,7 @@ } lngIndex++; - } while (ResourceList[lngIndex].MuiPages != NULL); + } return 0; } @@ -70,13 +64,13 @@ { ULONG lngIndex = 0; - do + while (ResourceList[lngIndex].MuiPages != NULL) { if (_wcsicmp(ResourceList[lngIndex].LanguageID, LanguageId) == 0) return TRUE; lngIndex++; - } while (ResourceList[lngIndex].MuiPages != NULL); + } return FALSE; } @@ -95,13 +89,13 @@ lngIndex = max(FindLanguageIndex(), 0); Pages = ResourceList[lngIndex].MuiPages; - do + while (Pages[muiIndex].MuiEntry != NULL) { if (Pages[muiIndex].Number == PageNumber) return Pages[muiIndex].MuiEntry; muiIndex++; - } while (Pages[muiIndex].MuiEntry != NULL); + } return NULL; } @@ -128,7 +122,7 @@ IN ULONG page) { const MUI_ENTRY * entry; - int index; + ULONG index; entry = FindMUIEntriesOfPage(page); if (!entry) @@ -141,7 +135,7 @@ } index = 0; - do + while (entry[index].Buffer != NULL) { CONSOLE_ClearStyledText(entry[index].X, entry[index].Y, @@ -149,7 +143,6 @@ strlen(entry[index].Buffer)); index++; } - while (entry[index].Buffer != NULL); } VOID @@ -157,7 +150,7 @@ IN ULONG page) { const MUI_ENTRY * entry; - int index; + ULONG index; entry = FindMUIEntriesOfPage(page); if (!entry) @@ -170,7 +163,7 @@ } index = 0; - do + while (entry[index].Buffer != NULL) { CONSOLE_SetStyledText(entry[index].X, entry[index].Y, @@ -179,7 +172,6 @@ index++; } - while (entry[index].Buffer != NULL); } VOID @@ -261,7 +253,7 @@ #if 0 ULONG lngIndex = 0; - do + while (ResourceList[lngIndex].MuiPages != NULL) { if (_wcsicmp(ResourceList[lngIndex].LanguageID, SelectedLanguageId) == 0) { @@ -272,9 +264,8 @@ lngIndex++; } - while (ResourceList[lngIndex].MuiPages != NULL); #else - wCodePage = (UINT)wcstoul(MUIGetOEMCodePage(), NULL, 10); + wCodePage = (UINT)wcstoul(MUIGetOEMCodePage(SelectedLanguageId), NULL, 10); SetConsoleOutputCP(wCodePage); #endif } Modified: branches/setup_improvements/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/mui.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/mui.h [iso-8859-1] Thu Aug 31 18:31:52 2017 @@ -28,8 +28,8 @@ typedef struct { - PWCHAR LanguageID; - PWCHAR LanguageDescriptor; + PCWSTR LanguageID; + PCWSTR LanguageDescriptor; const MUI_PAGE * MuiPages; const MUI_ERROR * MuiErrors; const MUI_STRING * MuiStrings;

1 0

[hbelusca] 75721: [REACTOS]: We don't need "SelectedLanguageId" anymore.
by hbelusca＠svn.reactos.org 31 Aug '17

31 Aug '17

Author: hbelusca Date: Thu Aug 31 18:27:44 2017 New Revision: 75721 URL: http://svn.reactos.org/svn/reactos?rev=75721&view=rev Log: [REACTOS]: We don't need "SelectedLanguageId" anymore. Modified: branches/setup_improvements/base/setup/reactos/reactos.c branches/setup_improvements/base/setup/reactos/reactos.h Modified: branches/setup_improvements/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/r… ============================================================================== --- branches/setup_improvements/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/reactos/reactos.c [iso-8859-1] Thu Aug 31 18:27:44 2017 @@ -34,10 +34,7 @@ /* GLOBALS ******************************************************************/ HANDLE ProcessHeap; - BOOLEAN IsUnattendedSetup = FALSE; -PWCHAR SelectedLanguageId; - SETUPDATA SetupData; Modified: branches/setup_improvements/base/setup/reactos/reactos.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/r… ============================================================================== --- branches/setup_improvements/base/setup/reactos/reactos.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/reactos/reactos.h [iso-8859-1] Thu Aug 31 18:27:44 2017 @@ -123,7 +123,6 @@ extern HANDLE ProcessHeap; extern BOOLEAN IsUnattendedSetup; -extern PWCHAR SelectedLanguageId; typedef struct _IMGINFO {

1 0

[hbelusca] 75720: [SETUPLIB]: Change some function prototypes so that the usetup-specific "SelectedLanguageId" variable is not used in the library. Also, make AddEntriesFromInfSection(), DefaultPro...
by hbelusca＠svn.reactos.org 31 Aug '17

31 Aug '17

Author: hbelusca Date: Thu Aug 31 18:27:07 2017 New Revision: 75720 URL: http://svn.reactos.org/svn/reactos?rev=75720&view=rev Log: [SETUPLIB]: Change some function prototypes so that the usetup-specific "SelectedLanguageId" variable is not used in the library. Also, make AddEntriesFromInfSection(), DefaultProcessEntry() and the typedef PPROCESS_ENTRY_ROUTINE private again. Modified: branches/setup_improvements/base/setup/lib/settings.c branches/setup_improvements/base/setup/lib/settings.h Modified: branches/setup_improvements/base/setup/lib/settings.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/settings.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/settings.c [iso-8859-1] Thu Aug 31 18:27:07 2017 @@ -212,8 +212,8 @@ static BOOLEAN GetComputerIdentifier( - PWSTR Identifier, - ULONG IdentifierLength) + OUT PWSTR Identifier, + IN ULONG IdentifierLength) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; @@ -314,7 +314,23 @@ } -LONG +/* + * Return values: + * 0x00: Failure, stop the enumeration; + * 0x01: Add the entry and continue the enumeration; + * 0x02: Skip the entry but continue the enumeration. + */ +typedef UCHAR +(NTAPI *PPROCESS_ENTRY_ROUTINE)( + IN PWCHAR KeyName, + IN PWCHAR KeyValue, + IN PCHAR DisplayText, + IN SIZE_T DisplayTextSize, + OUT PVOID* UserData, + OUT PBOOLEAN Current, + IN PVOID Parameter OPTIONAL); + +static LONG AddEntriesFromInfSection( IN OUT PGENERIC_LIST List, IN HINF InfFile, @@ -384,7 +400,7 @@ return TotalCount; } -UCHAR +static UCHAR NTAPI DefaultProcessEntry( IN PWCHAR KeyName, @@ -418,7 +434,7 @@ PGENERIC_LIST CreateComputerTypeList( - HINF InfFile) + IN HINF InfFile) { PGENERIC_LIST List; INFCONTEXT Context; @@ -493,8 +509,8 @@ static BOOLEAN GetDisplayIdentifier( - PWSTR Identifier, - ULONG IdentifierLength) + OUT PWSTR Identifier, + IN ULONG IdentifierLength) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; @@ -654,7 +670,7 @@ PGENERIC_LIST CreateDisplayDriverList( - HINF InfFile) + IN HINF InfFile) { PGENERIC_LIST List; INFCONTEXT Context; @@ -733,9 +749,9 @@ BOOLEAN ProcessComputerFiles( - HINF InfFile, - PGENERIC_LIST List, - PWCHAR *AdditionalSectionName) + IN HINF InfFile, + IN PGENERIC_LIST List, + OUT PWSTR* AdditionalSectionName) { PGENERIC_LIST_ENTRY Entry; static WCHAR SectionName[128]; @@ -758,8 +774,8 @@ BOOLEAN ProcessDisplayRegistry( - HINF InfFile, - PGENERIC_LIST List) + IN HINF InfFile, + IN PGENERIC_LIST List) { NTSTATUS Status; PGENERIC_LIST_ENTRY Entry; @@ -916,7 +932,7 @@ BOOLEAN ProcessLocaleRegistry( - PGENERIC_LIST List) + IN PGENERIC_LIST List) { PGENERIC_LIST_ENTRY Entry; PWCHAR LanguageId; @@ -1030,7 +1046,7 @@ PGENERIC_LIST CreateKeyboardDriverList( - HINF InfFile) + IN HINF InfFile) { PGENERIC_LIST List; INFCONTEXT Context; @@ -1110,8 +1126,8 @@ PGENERIC_LIST CreateLanguageList( - HINF InfFile, - WCHAR *DefaultLanguage) + IN HINF InfFile, + OUT PWSTR DefaultLanguage) { PGENERIC_LIST List; INFCONTEXT Context; @@ -1130,7 +1146,6 @@ return NULL; wcscpy(DefaultLanguage, KeyValue); - SelectedLanguageId = KeyValue; List = CreateGenericList(); if (List == NULL) @@ -1161,13 +1176,14 @@ PGENERIC_LIST CreateKeyboardLayoutList( - HINF InfFile, - WCHAR *DefaultKBLayout) + IN HINF InfFile, + IN PCWSTR LanguageId, + OUT PWCHAR DefaultKBLayout) { PGENERIC_LIST List; INFCONTEXT Context; PWCHAR KeyValue; - const MUI_LAYOUTS * LayoutsList; + const MUI_LAYOUTS* LayoutsList; ULONG uIndex = 0; /* Get default layout id */ @@ -1183,7 +1199,7 @@ if (List == NULL) return NULL; - LayoutsList = MUIGetLayoutsList(); + LayoutsList = MUIGetLayoutsList(LanguageId); do { @@ -1218,11 +1234,12 @@ BOOLEAN ProcessKeyboardLayoutRegistry( - PGENERIC_LIST List) + IN PGENERIC_LIST List, + IN PCWSTR LanguageId) { PGENERIC_LIST_ENTRY Entry; PWCHAR LayoutId; - const MUI_LAYOUTS * LayoutsList; + const MUI_LAYOUTS* LayoutsList; MUI_LAYOUTS NewLayoutsList[20]; ULONG uIndex; ULONG uOldPos = 0; @@ -1235,39 +1252,37 @@ if (LayoutId == NULL) return FALSE; - LayoutsList = MUIGetLayoutsList(); - - if (_wcsicmp(LayoutsList[0].LayoutID, LayoutId) != 0) - { - for (uIndex = 1; LayoutsList[uIndex].LangID != NULL; uIndex++) - { - if (_wcsicmp(LayoutsList[uIndex].LayoutID, LayoutId) == 0) - { - uOldPos = uIndex; - continue; - } - - NewLayoutsList[uIndex].LangID = LayoutsList[uIndex].LangID; - NewLayoutsList[uIndex].LayoutID = LayoutsList[uIndex].LayoutID; - } - - NewLayoutsList[uIndex].LangID = NULL; - NewLayoutsList[uIndex].LayoutID = NULL; - NewLayoutsList[uOldPos].LangID = LayoutsList[0].LangID; - NewLayoutsList[uOldPos].LayoutID = LayoutsList[0].LayoutID; - NewLayoutsList[0].LangID = LayoutsList[uOldPos].LangID; - NewLayoutsList[0].LayoutID = LayoutsList[uOldPos].LayoutID; - - return AddKbLayoutsToRegistry(NewLayoutsList); - } - - return TRUE; + LayoutsList = MUIGetLayoutsList(LanguageId); + + if (_wcsicmp(LayoutsList[0].LayoutID, LayoutId) == 0) + return TRUE; + + for (uIndex = 1; LayoutsList[uIndex].LangID != NULL; uIndex++) + { + if (_wcsicmp(LayoutsList[uIndex].LayoutID, LayoutId) == 0) + { + uOldPos = uIndex; + continue; + } + + NewLayoutsList[uIndex].LangID = LayoutsList[uIndex].LangID; + NewLayoutsList[uIndex].LayoutID = LayoutsList[uIndex].LayoutID; + } + + NewLayoutsList[uIndex].LangID = NULL; + NewLayoutsList[uIndex].LayoutID = NULL; + NewLayoutsList[uOldPos].LangID = LayoutsList[0].LangID; + NewLayoutsList[uOldPos].LayoutID = LayoutsList[0].LayoutID; + NewLayoutsList[0].LangID = LayoutsList[uOldPos].LangID; + NewLayoutsList[0].LayoutID = LayoutsList[uOldPos].LayoutID; + + return AddKbLayoutsToRegistry(NewLayoutsList); } #if 0 BOOLEAN ProcessKeyboardLayoutFiles( - PGENERIC_LIST List) + IN PGENERIC_LIST List) { return TRUE; } @@ -1275,7 +1290,7 @@ BOOLEAN SetGeoID( - PWCHAR Id) + IN PCWSTR Id) { NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; @@ -1318,7 +1333,7 @@ BOOLEAN SetDefaultPagefile( - WCHAR Drive) + IN WCHAR Drive) { NTSTATUS Status; HANDLE KeyHandle; Modified: branches/setup_improvements/base/setup/lib/settings.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/settings.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/settings.h [iso-8859-1] Thu Aug 31 18:27:07 2017 @@ -27,97 +27,62 @@ #pragma once -/* - * Return values: - * 0x00: Failure, stop the enumeration; - * 0x01: Add the entry and continue the enumeration; - * 0x02: Skip the entry but continue the enumeration. - */ -typedef UCHAR -(NTAPI *PPROCESS_ENTRY_ROUTINE)( - IN PWCHAR KeyName, - IN PWCHAR KeyValue, - IN PCHAR DisplayText, - IN SIZE_T DisplayTextSize, - OUT PVOID* UserData, - OUT PBOOLEAN Current, - IN PVOID Parameter OPTIONAL); - -LONG -AddEntriesFromInfSection( - IN OUT PGENERIC_LIST List, - IN HINF InfFile, - IN PCWSTR SectionName, - IN PINFCONTEXT pContext, - IN PPROCESS_ENTRY_ROUTINE ProcessEntry, - IN PVOID Parameter OPTIONAL); - -UCHAR -NTAPI -DefaultProcessEntry( - IN PWCHAR KeyName, - IN PWCHAR KeyValue, - IN PCHAR DisplayText, - IN SIZE_T DisplayTextSize, - OUT PVOID* UserData, - OUT PBOOLEAN Current, - IN PVOID Parameter OPTIONAL); - - PGENERIC_LIST CreateComputerTypeList( - HINF InfFile); + IN HINF InfFile); PGENERIC_LIST CreateDisplayDriverList( - HINF InfFile); + IN HINF InfFile); BOOLEAN ProcessComputerFiles( - HINF InfFile, - PGENERIC_LIST List, - PWCHAR *AdditionalSectionName); + IN HINF InfFile, + IN PGENERIC_LIST List, + OUT PWSTR* AdditionalSectionName); BOOLEAN ProcessDisplayRegistry( - HINF InfFile, - PGENERIC_LIST List); + IN HINF InfFile, + IN PGENERIC_LIST List); PGENERIC_LIST CreateKeyboardDriverList( - HINF InfFile); + IN HINF InfFile); PGENERIC_LIST CreateKeyboardLayoutList( - HINF InfFile, - WCHAR *DefaultKBLayout); + IN HINF InfFile, + IN PCWSTR LanguageId, + OUT PWCHAR DefaultKBLayout); PGENERIC_LIST CreateLanguageList( - HINF InfFile, - WCHAR *DefaultLanguage); + IN HINF InfFile, + OUT PWSTR DefaultLanguage); ULONG GetDefaultLanguageIndex(VOID); BOOLEAN ProcessKeyboardLayoutRegistry( - PGENERIC_LIST List); + IN PGENERIC_LIST List, + IN PCWSTR LanguageId); BOOLEAN ProcessKeyboardLayoutFiles( - PGENERIC_LIST List); + IN PGENERIC_LIST List); BOOLEAN ProcessLocaleRegistry( - PGENERIC_LIST List); + IN PGENERIC_LIST List); BOOLEAN SetGeoID( - PWCHAR Id); + IN PCWSTR Id); BOOLEAN SetDefaultPagefile( - WCHAR Drive); + IN WCHAR Drive); /* EOF */

1 0

[hbelusca] 75719: [SETUPLIB]: Change some string pointer types & function prototypes so that the usetup-specific "SelectedLanguageId" variable is not used in the library.
by hbelusca＠svn.reactos.org 31 Aug '17

31 Aug '17

Author: hbelusca Date: Thu Aug 31 18:25:38 2017 New Revision: 75719 URL: http://svn.reactos.org/svn/reactos?rev=75719&view=rev Log: [SETUPLIB]: Change some string pointer types & function prototypes so that the usetup-specific "SelectedLanguageId" variable is not used in the library. Modified: branches/setup_improvements/base/setup/lib/mui.c branches/setup_improvements/base/setup/lib/mui.h Modified: branches/setup_improvements/base/setup/lib/mui.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/mui.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/mui.c [iso-8859-1] Thu Aug 31 18:25:38 2017 @@ -40,72 +40,78 @@ static ULONG -FindLanguageIndex(VOID) +FindLanguageIndex( + IN PCWSTR LanguageId) { ULONG lngIndex = 0; - if (SelectedLanguageId == NULL) - { - /* default to english */ - return 0; - } - - do - { - if (_wcsicmp(LanguageList[lngIndex].LanguageID, SelectedLanguageId) == 0) + if (LanguageId == NULL) + { + /* Default to en-US */ + // return 0; // FIXME!! + LanguageId = L"00000409"; + } + + while (LanguageList[lngIndex].LanguageID != NULL) + { + if (_wcsicmp(LanguageList[lngIndex].LanguageID, LanguageId) == 0) { return lngIndex; } lngIndex++; - } while (LanguageList[lngIndex].LanguageID != NULL); + } return 0; } BOOLEAN IsLanguageAvailable( - PWCHAR LanguageId) + IN PCWSTR LanguageId) { ULONG lngIndex = 0; - do + while (LanguageList[lngIndex].LanguageID != NULL) { if (_wcsicmp(LanguageList[lngIndex].LanguageID, LanguageId) == 0) return TRUE; lngIndex++; - } while (LanguageList[lngIndex].LanguageID != NULL); + } return FALSE; } PCWSTR -MUIDefaultKeyboardLayout(VOID) -{ - ULONG lngIndex = max(FindLanguageIndex(), 0); +MUIDefaultKeyboardLayout( + IN PCWSTR LanguageId) +{ + ULONG lngIndex = max(FindLanguageIndex(LanguageId), 0); return LanguageList[lngIndex].MuiLayouts[0].LayoutID; } -PWCHAR -MUIGetOEMCodePage(VOID) -{ - ULONG lngIndex = max(FindLanguageIndex(), 0); +PCWSTR +MUIGetOEMCodePage( + IN PCWSTR LanguageId) +{ + ULONG lngIndex = max(FindLanguageIndex(LanguageId), 0); return LanguageList[lngIndex].OEMCPage; } -PWCHAR -MUIGetGeoID(VOID) -{ - ULONG lngIndex = max(FindLanguageIndex(), 0); +PCWSTR +MUIGetGeoID( + IN PCWSTR LanguageId) +{ + ULONG lngIndex = max(FindLanguageIndex(LanguageId), 0); return LanguageList[lngIndex].GeoID; } -const MUI_LAYOUTS * -MUIGetLayoutsList(VOID) -{ - ULONG lngIndex = max(FindLanguageIndex(), 0); +const MUI_LAYOUTS* +MUIGetLayoutsList( + IN PCWSTR LanguageId) +{ + ULONG lngIndex = max(FindLanguageIndex(LanguageId), 0); return LanguageList[lngIndex].MuiLayouts; } @@ -139,8 +145,7 @@ NULL, REG_OPTION_NON_VOLATILE, &Disposition); - - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); return FALSE; @@ -230,14 +235,13 @@ NULL, REG_OPTION_NON_VOLATILE, &Disposition); - - if(NT_SUCCESS(Status)) - NtClose(KeyHandle); - else + if (!NT_SUCCESS(Status)) { DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); return FALSE; } + + NtClose(KeyHandle); KeyName.MaximumLength = sizeof(szKeyName); Status = RtlAppendUnicodeToString(&KeyName, L"\\Preload"); @@ -262,7 +266,6 @@ NULL, REG_OPTION_NON_VOLATILE, &Disposition); - if (!NT_SUCCESS(Status)) { DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); @@ -283,8 +286,7 @@ NULL, REG_OPTION_NON_VOLATILE, &Disposition); - - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); NtClose(SubKeyHandle); @@ -292,7 +294,7 @@ return FALSE; } - do + while (MuiLayouts[uIndex].LangID != NULL) { if (uIndex > 19) break; @@ -355,7 +357,6 @@ uIndex++; } - while (MuiLayouts[uIndex].LangID != NULL); if (uIndex > 1) AddHotkeySettings(L"2", L"2", L"1"); @@ -368,20 +369,20 @@ } BOOLEAN -AddKeyboardLayouts(VOID) +AddKeyboardLayouts( + IN PCWSTR LanguageId) { ULONG lngIndex = 0; - do - { - if (_wcsicmp(LanguageList[lngIndex].LanguageID, SelectedLanguageId) == 0) + while (LanguageList[lngIndex].LanguageID != NULL) + { + if (_wcsicmp(LanguageList[lngIndex].LanguageID, LanguageId) == 0) { return AddKbLayoutsToRegistry(LanguageList[lngIndex].MuiLayouts); } lngIndex++; } - while (LanguageList[lngIndex].LanguageID != NULL); return FALSE; } @@ -494,7 +495,7 @@ return FALSE; } - do + while (MuiSubFonts[uIndex].FontName != NULL) { RtlInitUnicodeString(&ValueName, MuiSubFonts[uIndex].FontName); Status = NtSetValueKey(KeyHandle, @@ -512,7 +513,6 @@ uIndex++; } - while (MuiSubFonts[uIndex].FontName != NULL); NtClose(KeyHandle); @@ -520,12 +520,14 @@ } BOOLEAN -AddCodePage(VOID) +AddCodePage( + IN PCWSTR LanguageId) { ULONG lngIndex = 0; - do - { - if (_wcsicmp(LanguageList[lngIndex].LanguageID, SelectedLanguageId) == 0) + + while (LanguageList[lngIndex].LanguageID != NULL) + { + if (_wcsicmp(LanguageList[lngIndex].LanguageID, LanguageId) == 0) { if (AddCodepageToRegistry(LanguageList[lngIndex].ACPage, LanguageList[lngIndex].OEMCPage, @@ -542,7 +544,6 @@ lngIndex++; } - while (LanguageList[lngIndex].LanguageID != NULL); return FALSE; } Modified: branches/setup_improvements/base/setup/lib/mui.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/mui.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/mui.h [iso-8859-1] Thu Aug 31 18:25:38 2017 @@ -2,55 +2,57 @@ typedef struct { - PWCHAR FontName; - PWCHAR SubFontName; + PCWSTR FontName; + PCWSTR SubFontName; } MUI_SUBFONT; typedef struct { - PWCHAR LangID; // Language ID (like "0409") - PWCHAR LayoutID; // Layout ID (like "00000409") + PCWSTR LangID; // Language ID (like "0409") + PCWSTR LayoutID; // Layout ID (like "00000409") } MUI_LAYOUTS; typedef struct { - PWCHAR LanguageID; - PWCHAR ACPage; - PWCHAR OEMCPage; - PWCHAR MACCPage; - PWCHAR LanguageDescriptor; - PWCHAR GeoID; + PCWSTR LanguageID; + PCWSTR ACPage; + PCWSTR OEMCPage; + PCWSTR MACCPage; + PCWSTR LanguageDescriptor; + PCWSTR GeoID; const MUI_SUBFONT * MuiSubFonts; const MUI_LAYOUTS * MuiLayouts; } MUI_LANGUAGE; -// HACK HACK HACK!! -extern PWCHAR SelectedLanguageId; - - BOOLEAN IsLanguageAvailable( - PWCHAR LanguageId); + IN PCWSTR LanguageId); PCWSTR -MUIDefaultKeyboardLayout(VOID); +MUIDefaultKeyboardLayout( + IN PCWSTR LanguageId); -PWCHAR -MUIGetOEMCodePage(VOID); +PCWSTR +MUIGetOEMCodePage( + IN PCWSTR LanguageId); -PWCHAR -MUIGetGeoID(VOID); +PCWSTR +MUIGetGeoID( + IN PCWSTR LanguageId); -const MUI_LAYOUTS * -MUIGetLayoutsList(VOID); +const MUI_LAYOUTS* +MUIGetLayoutsList( + IN PCWSTR LanguageId); BOOLEAN AddKbLayoutsToRegistry( IN const MUI_LAYOUTS *MuiLayouts); BOOLEAN -AddCodePage(VOID); +AddKeyboardLayouts( + IN PCWSTR LanguageId); BOOLEAN -AddKeyboardLayouts(VOID); +AddCodePage( + IN PCWSTR LanguageId);

1 0

[ashaposhnikov] 75718: [RAPPS] Adjusted splitter values a bit. CORE-13163
by ashaposhnikov＠svn.reactos.org 30 Aug '17

30 Aug '17

Author: ashaposhnikov Date: Wed Aug 30 22:22:38 2017 New Revision: 75718 URL: http://svn.reactos.org/svn/reactos?rev=75718&view=rev Log: [RAPPS] Adjusted splitter values a bit. CORE-13163 Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Wed Aug 30 22:22:38 2017 @@ -789,9 +789,9 @@ m_HSplitter->m_HorizontalAlignment = UiAlign_Stretch; m_HSplitter->m_DynamicFirst = TRUE; m_HSplitter->m_Horizontal = TRUE; - m_HSplitter->m_Pos = 150; + m_HSplitter->m_Pos = INT_MAX; //set INT_MAX to use lowest possible position (m_MinSecond) m_HSplitter->m_MinFirst = 10; - m_HSplitter->m_MinSecond = 10; + m_HSplitter->m_MinSecond = 140; m_VSplitter->Second().Append(m_HSplitter); return m_HSplitter->Create(m_hWnd) != NULL; @@ -1533,7 +1533,6 @@ ImageList_Destroy(hImageListBuf); } - //if previous one was INSTALLED purge the list if (IS_INSTALLED_ENUM(EnumType)) { if (!bWasInInstalled)

1 0

[hbelusca] 75717: [SETUPLIB][USETUP]: Adjust MUI and settings code. - Re-enable settings code concerning language, keyboards & layout in the setuplib, and remove the old code in usetup. - Remove us...
by hbelusca＠svn.reactos.org 30 Aug '17

30 Aug '17

Author: hbelusca Date: Wed Aug 30 19:00:17 2017 New Revision: 75717 URL: http://svn.reactos.org/svn/reactos?rev=75717&view=rev Log: [SETUPLIB][USETUP]: Adjust MUI and settings code. - Re-enable settings code concerning language, keyboards & layout in the setuplib, and remove the old code in usetup. - Remove useless code in setuplib's mui.c - Rename usetup's MUI "LanguageList" into "ResourceList" so as to avoid colliding with the "LanguageList" of setuplib. - Add the magic CMakeLists line "add_definitions(${I18N_DEFS})" that I forgot previously, that caused the "LanguageList" of setuplib to be empty! The code compiles and works during my tests. Removed: branches/setup_improvements/base/setup/usetup/settings.c branches/setup_improvements/base/setup/usetup/settings.h Modified: branches/setup_improvements/base/setup/lib/CMakeLists.txt branches/setup_improvements/base/setup/lib/mui.c branches/setup_improvements/base/setup/lib/mui.h branches/setup_improvements/base/setup/lib/muilanguages.h branches/setup_improvements/base/setup/lib/settings.c branches/setup_improvements/base/setup/lib/settings.h branches/setup_improvements/base/setup/lib/setuplib.h branches/setup_improvements/base/setup/usetup/CMakeLists.txt branches/setup_improvements/base/setup/usetup/mui.c branches/setup_improvements/base/setup/usetup/muilanguages.h branches/setup_improvements/base/setup/usetup/usetup.c Modified: branches/setup_improvements/base/setup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/CMakeLists.txt [iso-8859-1] Wed Aug 30 19:00:17 2017 @@ -1,3 +1,5 @@ + +add_definitions(${I18N_DEFS}) include_directories(utils) Modified: branches/setup_improvements/base/setup/lib/mui.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/mui.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/mui.c [iso-8859-1] Wed Aug 30 19:00:17 2017 @@ -38,13 +38,6 @@ /* FUNCTIONS ****************************************************************/ -extern -VOID -PopupError(IN PCCH Text, - IN PCCH Status, - IN PINPUT_RECORD Ir, - IN ULONG WaitEvent); - static ULONG FindLanguageIndex(VOID) @@ -59,17 +52,16 @@ do { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + if (_wcsicmp(LanguageList[lngIndex].LanguageID, SelectedLanguageId) == 0) { return lngIndex; } lngIndex++; - } while (LanguageList[lngIndex].MuiPages != NULL); + } while (LanguageList[lngIndex].LanguageID != NULL); return 0; } - BOOLEAN IsLanguageAvailable( @@ -79,65 +71,29 @@ do { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , LanguageId) == 0) + if (_wcsicmp(LanguageList[lngIndex].LanguageID, LanguageId) == 0) return TRUE; lngIndex++; - } while (LanguageList[lngIndex].MuiPages != NULL); + } while (LanguageList[lngIndex].LanguageID != NULL); return FALSE; } -static -const MUI_ENTRY * -FindMUIEntriesOfPage( - IN ULONG PageNumber) -{ - ULONG muiIndex = 0; - ULONG lngIndex; - const MUI_PAGE * Pages = NULL; - - lngIndex = max(FindLanguageIndex(), 0); - Pages = LanguageList[lngIndex].MuiPages; - - do - { - if (Pages[muiIndex].Number == PageNumber) - return Pages[muiIndex].MuiEntry; - - muiIndex++; - } while (Pages[muiIndex].MuiEntry != NULL); - - return NULL; -} - - -static -const MUI_ERROR * -FindMUIErrorEntries(VOID) -{ - ULONG lngIndex = max(FindLanguageIndex(), 0); - return LanguageList[lngIndex].MuiErrors; -} - - -static -const MUI_STRING * -FindMUIStringEntries(VOID) -{ - ULONG lngIndex = max(FindLanguageIndex(), 0); - return LanguageList[lngIndex].MuiStrings; -} - - -LPCWSTR +PCWSTR MUIDefaultKeyboardLayout(VOID) { ULONG lngIndex = max(FindLanguageIndex(), 0); return LanguageList[lngIndex].MuiLayouts[0].LayoutID; } +PWCHAR +MUIGetOEMCodePage(VOID) +{ + ULONG lngIndex = max(FindLanguageIndex(), 0); + return LanguageList[lngIndex].OEMCPage; +} PWCHAR MUIGetGeoID(VOID) @@ -146,7 +102,6 @@ return LanguageList[lngIndex].GeoID; } - const MUI_LAYOUTS * MUIGetLayoutsList(VOID) { @@ -155,146 +110,12 @@ } -VOID -MUIClearPage( - IN ULONG page) -{ - const MUI_ENTRY * entry; - int index; - - entry = FindMUIEntriesOfPage(page); - if (!entry) - { - PopupError("Error: Failed to find translated page", - NULL, - NULL, - POPUP_WAIT_NONE); - return; - } - - index = 0; - do - { - CONSOLE_ClearStyledText(entry[index].X, - entry[index].Y, - entry[index].Flags, - strlen(entry[index].Buffer)); - index++; - } - while (entry[index].Buffer != NULL); -} - - -VOID -MUIDisplayPage( - IN ULONG page) -{ - const MUI_ENTRY * entry; - int index; - - entry = FindMUIEntriesOfPage(page); - if (!entry) - { - PopupError("Error: Failed to find translated page", - NULL, - NULL, - POPUP_WAIT_NONE); - return; - } - - index = 0; - do - { - CONSOLE_SetStyledText(entry[index].X, - entry[index].Y, - entry[index].Flags, - entry[index].Buffer); - - index++; - } - while (entry[index].Buffer != NULL); -} - - -VOID -MUIDisplayError( - IN ULONG ErrorNum, - OUT PINPUT_RECORD Ir, - IN ULONG WaitEvent, - ...) -{ - const MUI_ERROR * entry; - CHAR Buffer[2048]; - va_list ap; - - if (ErrorNum >= ERROR_LAST_ERROR_CODE) - { - PopupError("Invalid error number provided", - "Press ENTER to continue", - Ir, - POPUP_WAIT_ENTER); - - return; - } - - entry = FindMUIErrorEntries(); - if (!entry) - { - PopupError("Error: Failed to find translated error message", - NULL, - NULL, - POPUP_WAIT_NONE); - return; - } - - va_start(ap, WaitEvent); - vsprintf(Buffer, entry[ErrorNum].ErrorText, ap); - va_end(ap); - - PopupError(Buffer, - entry[ErrorNum].ErrorStatus, - Ir, - WaitEvent); -} - - -LPSTR -MUIGetString( - ULONG Number) -{ - ULONG i; - const MUI_STRING * entry; - CHAR szErr[128]; - - entry = FindMUIStringEntries(); - if (entry) - { - for (i = 0; entry[i].Number != 0; i++) - { - if (entry[i].Number == Number) - { - return entry[i].String; - } - } - } - - sprintf(szErr, "Error: failed find string id %lu for language index %lu\n", Number, FindLanguageIndex()); - - PopupError(szErr, - NULL, - NULL, - POPUP_WAIT_NONE); - - return "<nostring>"; -} - - static BOOLEAN AddHotkeySettings( - IN LPCWSTR Hotkey, - IN LPCWSTR LangHotkey, - IN LPCWSTR LayoutHotkey) + IN PCWSTR Hotkey, + IN PCWSTR LangHotkey, + IN PCWSTR LayoutHotkey) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; @@ -376,7 +197,6 @@ NtClose(KeyHandle); return TRUE; } - BOOLEAN AddKbLayoutsToRegistry( @@ -547,7 +367,6 @@ return TRUE; } - BOOLEAN AddKeyboardLayouts(VOID) { @@ -555,25 +374,24 @@ do { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + if (_wcsicmp(LanguageList[lngIndex].LanguageID, SelectedLanguageId) == 0) { return AddKbLayoutsToRegistry(LanguageList[lngIndex].MuiLayouts); } lngIndex++; } - while (LanguageList[lngIndex].MuiPages != NULL); + while (LanguageList[lngIndex].LanguageID != NULL); return FALSE; } - static BOOLEAN AddCodepageToRegistry( - IN LPCWSTR ACPage, - IN LPCWSTR OEMCPage, - IN LPCWSTR MACCPage) + IN PCWSTR ACPage, + IN PCWSTR OEMCPage, + IN PCWSTR MACCPage) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; @@ -647,7 +465,6 @@ return TRUE; } - static BOOLEAN @@ -702,14 +519,13 @@ return TRUE; } - BOOLEAN AddCodePage(VOID) { ULONG lngIndex = 0; do { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + if (_wcsicmp(LanguageList[lngIndex].LanguageID, SelectedLanguageId) == 0) { if (AddCodepageToRegistry(LanguageList[lngIndex].ACPage, LanguageList[lngIndex].OEMCPage, @@ -726,30 +542,9 @@ lngIndex++; } - while (LanguageList[lngIndex].MuiPages != NULL); + while (LanguageList[lngIndex].LanguageID != NULL); return FALSE; } - -VOID -SetConsoleCodePage(VOID) -{ - ULONG lngIndex = 0; - UINT wCodePage; - - do - { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) - { - wCodePage = (UINT) wcstoul(LanguageList[lngIndex].OEMCPage, NULL, 10); - SetConsoleOutputCP(wCodePage); - return; - } - - lngIndex++; - } - while (LanguageList[lngIndex].MuiPages != NULL); -} - /* EOF */ Modified: branches/setup_improvements/base/setup/lib/mui.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/mui.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/mui.h [iso-8859-1] Wed Aug 30 19:00:17 2017 @@ -24,12 +24,20 @@ const MUI_LAYOUTS * MuiLayouts; } MUI_LANGUAGE; + +// HACK HACK HACK!! +extern PWCHAR SelectedLanguageId; + + BOOLEAN IsLanguageAvailable( PWCHAR LanguageId); PCWSTR MUIDefaultKeyboardLayout(VOID); + +PWCHAR +MUIGetOEMCodePage(VOID); PWCHAR MUIGetGeoID(VOID); Modified: branches/setup_improvements/base/setup/lib/muilanguages.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/muilanguages.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/muilanguages.h [iso-8859-1] Wed Aug 30 19:00:17 2017 @@ -838,5 +838,5 @@ #ifdef LANGUAGE_ZU_ZU {L"00000435", L"1252", L"850", L"10000", L"Zulu", L"1", LatinFonts, zuZULayouts}, #endif - {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, + {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL} }; Modified: branches/setup_improvements/base/setup/lib/settings.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/settings.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/settings.c [iso-8859-1] Wed Aug 30 19:00:17 2017 @@ -29,6 +29,7 @@ #include "precomp.h" #include "genlist.h" #include "infsupp.h" +#include "mui.h" #include "registry.h" #include "settings.h" @@ -38,9 +39,7 @@ /* GLOBALS ******************************************************************/ -#if 0 // FIXME: Disabled for now because it uses MUI* functions from usetup -ULONG DefaultLanguageIndex = 0; -#endif +static ULONG DefaultLanguageIndex = 0; /* FUNCTIONS ****************************************************************/ @@ -1055,8 +1054,6 @@ } -#if 0 // FIXME: Disabled for now because it uses MUI* functions from usetup - ULONG GetDefaultLanguageIndex(VOID) { @@ -1267,8 +1264,6 @@ return TRUE; } -#endif - #if 0 BOOLEAN ProcessKeyboardLayoutFiles( Modified: branches/setup_improvements/base/setup/lib/settings.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/settings.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/settings.h [iso-8859-1] Wed Aug 30 19:00:17 2017 @@ -87,8 +87,6 @@ CreateKeyboardDriverList( HINF InfFile); -#if 0 // FIXME: Disabled for now because it uses MUI* functions from usetup - PGENERIC_LIST CreateKeyboardLayoutList( HINF InfFile, @@ -110,8 +108,6 @@ ProcessKeyboardLayoutFiles( PGENERIC_LIST List); -#endif - BOOLEAN ProcessLocaleRegistry( PGENERIC_LIST List); Modified: branches/setup_improvements/base/setup/lib/setuplib.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/setuplib.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/setuplib.h [iso-8859-1] Wed Aug 30 19:00:17 2017 @@ -41,6 +41,7 @@ #include "utils/osdetect.h" #include "utils/regutil.h" #include "registry.h" +#include "mui.h" #include "settings.h" Modified: branches/setup_improvements/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/CMakeLists.txt [iso-8859-1] Wed Aug 30 19:00:17 2017 @@ -27,7 +27,6 @@ mui.c partlist.c progress.c - settings.c usetup.c usetup.h) Modified: branches/setup_improvements/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/mui.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/mui.c [iso-8859-1] Wed Aug 30 19:00:17 2017 @@ -51,18 +51,19 @@ do { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + if (_wcsicmp(ResourceList[lngIndex].LanguageID, SelectedLanguageId) == 0) { return lngIndex; } lngIndex++; - } while (LanguageList[lngIndex].MuiPages != NULL); + } while (ResourceList[lngIndex].MuiPages != NULL); return 0; } +#if 0 BOOLEAN IsLanguageAvailable( PWCHAR LanguageId) @@ -71,14 +72,15 @@ do { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , LanguageId) == 0) + if (_wcsicmp(ResourceList[lngIndex].LanguageID, LanguageId) == 0) return TRUE; lngIndex++; - } while (LanguageList[lngIndex].MuiPages != NULL); + } while (ResourceList[lngIndex].MuiPages != NULL); return FALSE; } +#endif static @@ -91,59 +93,33 @@ const MUI_PAGE * Pages = NULL; lngIndex = max(FindLanguageIndex(), 0); - Pages = LanguageList[lngIndex].MuiPages; - - do - { - if (Pages[muiIndex].Number == PageNumber) - return Pages[muiIndex].MuiEntry; - - muiIndex++; + Pages = ResourceList[lngIndex].MuiPages; + + do + { + if (Pages[muiIndex].Number == PageNumber) + return Pages[muiIndex].MuiEntry; + + muiIndex++; } while (Pages[muiIndex].MuiEntry != NULL); return NULL; } - static const MUI_ERROR * FindMUIErrorEntries(VOID) { ULONG lngIndex = max(FindLanguageIndex(), 0); - return LanguageList[lngIndex].MuiErrors; -} - + return ResourceList[lngIndex].MuiErrors; +} static const MUI_STRING * FindMUIStringEntries(VOID) { ULONG lngIndex = max(FindLanguageIndex(), 0); - return LanguageList[lngIndex].MuiStrings; -} - - -LPCWSTR -MUIDefaultKeyboardLayout(VOID) -{ - ULONG lngIndex = max(FindLanguageIndex(), 0); - return LanguageList[lngIndex].MuiLayouts[0].LayoutID; -} - - -PWCHAR -MUIGetGeoID(VOID) -{ - ULONG lngIndex = max(FindLanguageIndex(), 0); - return LanguageList[lngIndex].GeoID; -} - - -const MUI_LAYOUTS * -MUIGetLayoutsList(VOID) -{ - ULONG lngIndex = max(FindLanguageIndex(), 0); - return LanguageList[lngIndex].MuiLayouts; + return ResourceList[lngIndex].MuiStrings; } @@ -176,7 +152,6 @@ while (entry[index].Buffer != NULL); } - VOID MUIDisplayPage( IN ULONG page) @@ -206,7 +181,6 @@ } while (entry[index].Buffer != NULL); } - VOID MUIDisplayError( @@ -248,7 +222,6 @@ Ir, WaitEvent); } - LPSTR MUIGetString( @@ -280,468 +253,30 @@ return "<nostring>"; } - -static -BOOLEAN -AddHotkeySettings( - IN LPCWSTR Hotkey, - IN LPCWSTR LangHotkey, - IN LPCWSTR LayoutHotkey) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; - HANDLE KeyHandle; - ULONG Disposition; - NTSTATUS Status; - - RtlInitUnicodeString(&KeyName, - L".DEFAULT\\Keyboard Layout\\Toggle"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_USERS, NULL), - NULL); - - Status = NtCreateKey(&KeyHandle, - KEY_SET_VALUE, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - &Disposition); - - if(!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); - return FALSE; - } - - RtlInitUnicodeString(&ValueName, - L"Hotkey"); - - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)Hotkey, - (1 + 1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - RtlInitUnicodeString(&ValueName, - L"Language Hotkey"); - - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)LangHotkey, - (1 + 1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - RtlInitUnicodeString(&ValueName, - L"Layout Hotkey"); - - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)LayoutHotkey, - (1 + 1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - NtClose(KeyHandle); - return TRUE; -} - - -BOOLEAN -AddKbLayoutsToRegistry( - IN const MUI_LAYOUTS *MuiLayouts) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; - HANDLE KeyHandle; - HANDLE SubKeyHandle; - NTSTATUS Status; - ULONG Disposition; - ULONG uIndex = 0; - ULONG uCount = 0; - WCHAR szKeyName[48] = L".DEFAULT\\Keyboard Layout"; - WCHAR szValueName[3 + 1]; - WCHAR szLangID[8 + 1]; - - // Open the keyboard layout key - RtlInitUnicodeString(&KeyName, szKeyName); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_USERS, NULL), - NULL); - - Status = NtCreateKey(&KeyHandle, - KEY_CREATE_SUB_KEY, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - &Disposition); - - if(NT_SUCCESS(Status)) - NtClose(KeyHandle); - else - { - DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); - return FALSE; - } - - KeyName.MaximumLength = sizeof(szKeyName); - Status = RtlAppendUnicodeToString(&KeyName, L"\\Preload"); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlAppend failed! (%lx)\n", Status); - DPRINT1("String is %wZ\n", &KeyName); - return FALSE; - } - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_USERS, NULL), - NULL); - - Status = NtCreateKey(&KeyHandle, - KEY_SET_VALUE, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - &Disposition); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); - return FALSE; - } - - RtlInitUnicodeString(&KeyName, L".DEFAULT\\Keyboard Layout\\Substitutes"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_USERS, NULL), - NULL); - - Status = NtCreateKey(&SubKeyHandle, - KEY_SET_VALUE, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - &Disposition); - - if(!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); - NtClose(SubKeyHandle); - NtClose(KeyHandle); - return FALSE; - } - - do - { - if (uIndex > 19) break; - - swprintf(szValueName, L"%u", uIndex + 1); - RtlInitUnicodeString(&ValueName, szValueName); - - swprintf(szLangID, L"0000%s", MuiLayouts[uIndex].LangID); - - if (_wcsicmp(szLangID, MuiLayouts[uIndex].LayoutID) == 0) +VOID +SetConsoleCodePage(VOID) +{ + UINT wCodePage; + +#if 0 + ULONG lngIndex = 0; + + do + { + if (_wcsicmp(ResourceList[lngIndex].LanguageID, SelectedLanguageId) == 0) { - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)MuiLayouts[uIndex].LayoutID, - (wcslen(MuiLayouts[uIndex].LayoutID)+1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status = %lx, uIndex = %d)\n", Status, uIndex); - NtClose(SubKeyHandle); - NtClose(KeyHandle); - return FALSE; - } - } - else - { - swprintf(szLangID, L"d%03lu%s", uCount, MuiLayouts[uIndex].LangID); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)szLangID, - (wcslen(szLangID)+1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status = %lx, uIndex = %d)\n", Status, uIndex); - NtClose(SubKeyHandle); - NtClose(KeyHandle); - return FALSE; - } - - RtlInitUnicodeString(&ValueName, szLangID); - - Status = NtSetValueKey(SubKeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)MuiLayouts[uIndex].LayoutID, - (wcslen(MuiLayouts[uIndex].LayoutID)+1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status = %lx, uIndex = %u)\n", Status, uIndex); - NtClose(SubKeyHandle); - NtClose(KeyHandle); - return FALSE; - } - - uCount++; - } - - uIndex++; - } - while (MuiLayouts[uIndex].LangID != NULL); - - if (uIndex > 1) - AddHotkeySettings(L"2", L"2", L"1"); - else - AddHotkeySettings(L"3", L"3", L"3"); - - NtClose(SubKeyHandle); - NtClose(KeyHandle); - return TRUE; -} - - -BOOLEAN -AddKeyboardLayouts(VOID) -{ - ULONG lngIndex = 0; - - do - { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) - { - return AddKbLayoutsToRegistry(LanguageList[lngIndex].MuiLayouts); - } - - lngIndex++; - } - while (LanguageList[lngIndex].MuiPages != NULL); - - return FALSE; -} - - -static -BOOLEAN -AddCodepageToRegistry( - IN LPCWSTR ACPage, - IN LPCWSTR OEMCPage, - IN LPCWSTR MACCPage) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; - HANDLE KeyHandle; - NTSTATUS Status; - - // Open the nls codepage key - RtlInitUnicodeString(&KeyName, - L"SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_LOCAL_MACHINE, NULL), - NULL); - Status = NtOpenKey(&KeyHandle, - KEY_WRITE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); - return FALSE; - } - - // Set ANSI codepage - RtlInitUnicodeString(&ValueName, L"ACP"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)ACPage, - (wcslen(ACPage)+1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - // Set OEM codepage - RtlInitUnicodeString(&ValueName, L"OEMCP"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)OEMCPage, - (wcslen(OEMCPage)+1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - // Set MAC codepage - RtlInitUnicodeString(&ValueName, L"MACCP"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)MACCPage, - (wcslen(MACCPage)+1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - NtClose(KeyHandle); - - return TRUE; -} - - -static -BOOLEAN -AddFontsSettingsToRegistry( - IN const MUI_SUBFONT * MuiSubFonts) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; - HANDLE KeyHandle; - NTSTATUS Status; - ULONG uIndex = 0; - - RtlInitUnicodeString(&KeyName, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_LOCAL_MACHINE, NULL), - NULL); - Status = NtOpenKey(&KeyHandle, - KEY_WRITE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); - return FALSE; - } - - do - { - RtlInitUnicodeString(&ValueName, MuiSubFonts[uIndex].FontName); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)MuiSubFonts[uIndex].SubFontName, - (wcslen(MuiSubFonts[uIndex].SubFontName)+1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status = %lx, uIndex = %d)\n", Status, uIndex); - NtClose(KeyHandle); - return FALSE; - } - - uIndex++; - } - while (MuiSubFonts[uIndex].FontName != NULL); - - NtClose(KeyHandle); - - return TRUE; -} - - -BOOLEAN -AddCodePage(VOID) -{ - ULONG lngIndex = 0; - do - { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) - { - if (AddCodepageToRegistry(LanguageList[lngIndex].ACPage, - LanguageList[lngIndex].OEMCPage, - LanguageList[lngIndex].MACCPage)&& - AddFontsSettingsToRegistry(LanguageList[lngIndex].MuiSubFonts)) - { - return TRUE; - } - else - { - return FALSE; - } - } - - lngIndex++; - } - while (LanguageList[lngIndex].MuiPages != NULL); - - return FALSE; -} - - -VOID -SetConsoleCodePage(VOID) -{ - ULONG lngIndex = 0; - UINT wCodePage; - - do - { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) - { - wCodePage = (UINT) wcstoul(LanguageList[lngIndex].OEMCPage, NULL, 10); + wCodePage = (UINT) wcstoul(ResourceList[lngIndex].OEMCPage, NULL, 10); SetConsoleOutputCP(wCodePage); return; } lngIndex++; } - while (LanguageList[lngIndex].MuiPages != NULL); + while (ResourceList[lngIndex].MuiPages != NULL); +#else + wCodePage = (UINT)wcstoul(MUIGetOEMCodePage(), NULL, 10); + SetConsoleOutputCP(wCodePage); +#endif } /* EOF */ Modified: branches/setup_improvements/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/muilanguages.h [iso-8859-1] Wed Aug 30 19:00:17 2017 @@ -411,7 +411,7 @@ // #include "lang/zh-TW.h" // #endif -const MUI_LANGUAGE_RESOURCE LanguageList[] = +const MUI_LANGUAGE_RESOURCE ResourceList[] = { /* Lang ID, Language Name, Page strings, Error strings, Other strings */ #ifdef LANGUAGE_AF_ZA @@ -840,5 +840,5 @@ #ifdef LANGUAGE_ZU_ZU {L"00000435", L"Zulu", enUSPages, enUSErrorEntries, enUSStrings}, #endif - {NULL, NULL, NULL, NULL, NULL}, + {NULL, NULL, NULL, NULL, NULL} }; Removed: branches/setup_improvements/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/settings.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/settings.c (removed) @@ -1,259 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/settings.c - * PURPOSE: Device settings support functions - * PROGRAMMERS: Eric Kohl - * Colin Finck - */ - -/* INCLUDES *****************************************************************/ - -#include "usetup.h" - -#define NDEBUG -#include <debug.h> - -/* GLOBALS ******************************************************************/ - -ULONG DefaultLanguageIndex = 0; - -/* FUNCTIONS ****************************************************************/ - -ULONG -GetDefaultLanguageIndex(VOID) -{ - return DefaultLanguageIndex; -} - -typedef struct _LANG_ENTRY_PARAM -{ - ULONG uIndex; - PWCHAR DefaultLanguage; -} LANG_ENTRY_PARAM, *PLANG_ENTRY_PARAM; - -static UCHAR -NTAPI -ProcessLangEntry( - IN PWCHAR KeyName, - IN PWCHAR KeyValue, - IN PCHAR DisplayText, - IN SIZE_T DisplayTextSize, - OUT PVOID* UserData, - OUT PBOOLEAN Current, - IN PVOID Parameter OPTIONAL) -{ - PLANG_ENTRY_PARAM LangEntryParam = (PLANG_ENTRY_PARAM)Parameter; - - if (!IsLanguageAvailable(KeyName)) - { - /* The specified language is unavailable, skip the entry */ - return 2; - } - - *UserData = RtlAllocateHeap(ProcessHeap, 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (*UserData == NULL) - { - /* Failure, stop enumeration */ - DPRINT1("RtlAllocateHeap() failed\n"); - return 0; - } - - wcscpy((PWCHAR)*UserData, KeyName); - sprintf(DisplayText, "%S", KeyValue); - - *Current = FALSE; - - if (!_wcsicmp(KeyName, LangEntryParam->DefaultLanguage)) - DefaultLanguageIndex = LangEntryParam->uIndex; - - LangEntryParam->uIndex++; - - /* Add the entry */ - return 1; -} - -PGENERIC_LIST -CreateLanguageList( - HINF InfFile, - WCHAR *DefaultLanguage) -{ - PGENERIC_LIST List; - INFCONTEXT Context; - PWCHAR KeyValue; - - LANG_ENTRY_PARAM LangEntryParam; - - LangEntryParam.uIndex = 0; - LangEntryParam.DefaultLanguage = DefaultLanguage; - - /* Get default language id */ - if (!SetupFindFirstLineW(InfFile, L"NLS", L"DefaultLanguage", &Context)) - return NULL; - - if (!INF_GetData(&Context, NULL, &KeyValue)) - return NULL; - - wcscpy(DefaultLanguage, KeyValue); - SelectedLanguageId = KeyValue; - - List = CreateGenericList(); - if (List == NULL) - return NULL; - - if (AddEntriesFromInfSection(List, - InfFile, - L"Language", - &Context, - ProcessLangEntry, - &LangEntryParam) == -1) - { - DestroyGenericList(List, TRUE); - return NULL; - } - - /* Only one language available, make it the default one */ - if (LangEntryParam.uIndex == 1) - { - DefaultLanguageIndex = 0; - wcscpy(DefaultLanguage, - (PWSTR)GetListEntryUserData(GetFirstListEntry(List))); - } - - return List; -} - - -PGENERIC_LIST -CreateKeyboardLayoutList( - HINF InfFile, - WCHAR *DefaultKBLayout) -{ - PGENERIC_LIST List; - INFCONTEXT Context; - PWCHAR KeyValue; - const MUI_LAYOUTS * LayoutsList; - ULONG uIndex = 0; - - /* Get default layout id */ - if (!SetupFindFirstLineW(InfFile, L"NLS", L"DefaultLayout", &Context)) - return NULL; - - if (!INF_GetData(&Context, NULL, &KeyValue)) - return NULL; - - wcscpy(DefaultKBLayout, KeyValue); - - List = CreateGenericList(); - if (List == NULL) - return NULL; - - LayoutsList = MUIGetLayoutsList(); - - do - { - // NOTE: See https://svn.reactos.org/svn/reactos?view=revision&revision=68354 - if (AddEntriesFromInfSection(List, - InfFile, - L"KeyboardLayout", - &Context, - DefaultProcessEntry, - DefaultKBLayout) == -1) - { - DestroyGenericList(List, TRUE); - return NULL; - } - - uIndex++; - - } while (LayoutsList[uIndex].LangID != NULL); - - /* Check whether some keyboard layouts have been found */ - /* FIXME: Handle this case */ - if (GetNumberOfListEntries(List) == 0) - { - DPRINT1("No keyboard layouts have been found\n"); - DestroyGenericList(List, TRUE); - return NULL; - } - - return List; -} - - -BOOLEAN -ProcessKeyboardLayoutRegistry( - PGENERIC_LIST List) -{ - PGENERIC_LIST_ENTRY Entry; - PWCHAR LayoutId; - const MUI_LAYOUTS * LayoutsList; - MUI_LAYOUTS NewLayoutsList[20]; - ULONG uIndex; - ULONG uOldPos = 0; - - Entry = GetCurrentListEntry(List); - if (Entry == NULL) - return FALSE; - - LayoutId = (PWCHAR)GetListEntryUserData(Entry); - if (LayoutId == NULL) - return FALSE; - - LayoutsList = MUIGetLayoutsList(); - - if (_wcsicmp(LayoutsList[0].LayoutID, LayoutId) != 0) - { - for (uIndex = 1; LayoutsList[uIndex].LangID != NULL; uIndex++) - { - if (_wcsicmp(LayoutsList[uIndex].LayoutID, LayoutId) == 0) - { - uOldPos = uIndex; - continue; - } - - NewLayoutsList[uIndex].LangID = LayoutsList[uIndex].LangID; - NewLayoutsList[uIndex].LayoutID = LayoutsList[uIndex].LayoutID; - } - - NewLayoutsList[uIndex].LangID = NULL; - NewLayoutsList[uIndex].LayoutID = NULL; - NewLayoutsList[uOldPos].LangID = LayoutsList[0].LangID; - NewLayoutsList[uOldPos].LayoutID = LayoutsList[0].LayoutID; - NewLayoutsList[0].LangID = LayoutsList[uOldPos].LangID; - NewLayoutsList[0].LayoutID = LayoutsList[uOldPos].LayoutID; - - return AddKbLayoutsToRegistry(NewLayoutsList); - } - - return TRUE; -} - -#if 0 -BOOLEAN -ProcessKeyboardLayoutFiles( - PGENERIC_LIST List) -{ - return TRUE; -} -#endif - -/* EOF */ Removed: branches/setup_improvements/base/setup/usetup/settings.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/settings.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/settings.h (removed) @@ -1,51 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/settings.h - * PURPOSE: Device settings support functions - * PROGRAMMERS: Eric Kohl - * Colin Finck - */ - -#pragma once - -PGENERIC_LIST -CreateKeyboardLayoutList( - HINF InfFile, - WCHAR *DefaultKBLayout); - -PGENERIC_LIST -CreateLanguageList( - HINF InfFile, - WCHAR *DefaultLanguage); - -ULONG -GetDefaultLanguageIndex(VOID); - -BOOLEAN -ProcessKeyboardLayoutRegistry( - PGENERIC_LIST List); - -BOOLEAN -ProcessKeyboardLayoutFiles( - PGENERIC_LIST List); - -/* EOF */ Modified: branches/setup_improvements/base/setup/usetup/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] Wed Aug 30 19:00:17 2017 @@ -32,7 +32,6 @@ #include "chkdsk.h" #include "cmdcons.h" #include "format.h" -#include "settings.h" #define NDEBUG #include <debug.h>

1 0

[hbelusca] 75716: [SETUPLIB]: Add the necessary headers to mui.c to be able to compile. [USETUP]: Comment out the languages that don't have any resources.
by hbelusca＠svn.reactos.org 30 Aug '17

30 Aug '17

Author: hbelusca Date: Wed Aug 30 13:41:52 2017 New Revision: 75716 URL: http://svn.reactos.org/svn/reactos?rev=75716&view=rev Log: [SETUPLIB]: Add the necessary headers to mui.c to be able to compile. [USETUP]: Comment out the languages that don't have any resources. Modified: branches/setup_improvements/base/setup/lib/mui.c branches/setup_improvements/base/setup/usetup/muilanguages.h Modified: branches/setup_improvements/base/setup/lib/mui.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/mui.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/mui.c [iso-8859-1] Wed Aug 30 13:41:52 2017 @@ -24,12 +24,19 @@ * PROGRAMMER: */ -#include "usetup.h" +/* INCLUDES *****************************************************************/ + +#include "precomp.h" +#include "mui.h" #include "muifonts.h" #include "muilanguages.h" +#include "registry.h" #define NDEBUG #include <debug.h> + + +/* FUNCTIONS ****************************************************************/ extern VOID Modified: branches/setup_improvements/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/muilanguages.h [iso-8859-1] Wed Aug 30 13:41:52 2017 @@ -2,414 +2,414 @@ #include <reactos/buildno.h> -#ifdef LANGUAGE_AF_ZA - #include "lang/af-ZA.h" -#endif -#ifdef LANGUAGE_AR_AE - #include "lang/ar-AE.h" -#endif -#ifdef LANGUAGE_AR_BH - #include "lang/ar-BH.h" -#endif -#ifdef LANGUAGE_AR_DZ - #include "lang/ar-DZ.h" -#endif -#ifdef LANGUAGE_AR_EG - #include "lang/ar-EG.h" -#endif -#ifdef LANGUAGE_AR_IQ - #include "lang/ar-IQ.h" -#endif -#ifdef LANGUAGE_AR_JO - #include "lang/ar-JO.h" -#endif -#ifdef LANGUAGE_AR_KW - #include "lang/ar-KW.h" -#endif -#ifdef LANGUAGE_AR_LB - #include "lang/ar-LB.h" -#endif -#ifdef LANGUAGE_AR_LY - #include "lang/ar-LY.h" -#endif -#ifdef LANGUAGE_AR_MA - #include "lang/ar-MA.h" -#endif -#ifdef LANGUAGE_AR_OM - #include "lang/ar-OM.h" -#endif -#ifdef LANGUAGE_AR_QA - #include "lang/ar-QA.h" -#endif -#ifdef LANGUAGE_AR_SA - #include "lang/ar-SA.h" -#endif -#ifdef LANGUAGE_AR_SY - #include "lang/ar-SY.h" -#endif -#ifdef LANGUAGE_AR_TN - #include "lang/ar-TN.h" -#endif -#ifdef LANGUAGE_AR_YE - #include "lang/ar-YE.h" -#endif -#ifdef LANGUAGE_AZ_AZ - #include "lang/az-AZ.h" -#endif -#ifdef LANGUAGE_BE_BY - #include "lang/be-BY.h" -#endif +// #ifdef LANGUAGE_AF_ZA + // #include "lang/af-ZA.h" +// #endif +// #ifdef LANGUAGE_AR_AE + // #include "lang/ar-AE.h" +// #endif +// #ifdef LANGUAGE_AR_BH + // #include "lang/ar-BH.h" +// #endif +// #ifdef LANGUAGE_AR_DZ + // #include "lang/ar-DZ.h" +// #endif +// #ifdef LANGUAGE_AR_EG + // #include "lang/ar-EG.h" +// #endif +// #ifdef LANGUAGE_AR_IQ + // #include "lang/ar-IQ.h" +// #endif +// #ifdef LANGUAGE_AR_JO + // #include "lang/ar-JO.h" +// #endif +// #ifdef LANGUAGE_AR_KW + // #include "lang/ar-KW.h" +// #endif +// #ifdef LANGUAGE_AR_LB + // #include "lang/ar-LB.h" +// #endif +// #ifdef LANGUAGE_AR_LY + // #include "lang/ar-LY.h" +// #endif +// #ifdef LANGUAGE_AR_MA + // #include "lang/ar-MA.h" +// #endif +// #ifdef LANGUAGE_AR_OM + // #include "lang/ar-OM.h" +// #endif +// #ifdef LANGUAGE_AR_QA + // #include "lang/ar-QA.h" +// #endif +// #ifdef LANGUAGE_AR_SA + // #include "lang/ar-SA.h" +// #endif +// #ifdef LANGUAGE_AR_SY + // #include "lang/ar-SY.h" +// #endif +// #ifdef LANGUAGE_AR_TN + // #include "lang/ar-TN.h" +// #endif +// #ifdef LANGUAGE_AR_YE + // #include "lang/ar-YE.h" +// #endif +// #ifdef LANGUAGE_AZ_AZ + // #include "lang/az-AZ.h" +// #endif +// #ifdef LANGUAGE_BE_BY + // #include "lang/be-BY.h" +// #endif #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.h" #endif #ifdef LANGUAGE_BN_BD #include "lang/bn-BD.h" #endif -#ifdef LANGUAGE_BN_IN - #include "lang/bn-IN.h" -#endif -#ifdef LANGUAGE_CA_ES - #include "lang/ca-ES.h" -#endif +// #ifdef LANGUAGE_BN_IN + // #include "lang/bn-IN.h" +// #endif +// #ifdef LANGUAGE_CA_ES + // #include "lang/ca-ES.h" +// #endif #ifdef LANGUAGE_CS_CZ #include "lang/cs-CZ.h" #endif #ifdef LANGUAGE_DA_DK #include "lang/da-DK.h" #endif -#ifdef LANGUAGE_DE_AT - #include "lang/de-AT.h" -#endif -#ifdef LANGUAGE_DE_CH - #include "lang/de-CH.h" -#endif +// #ifdef LANGUAGE_DE_AT + // #include "lang/de-AT.h" +// #endif +// #ifdef LANGUAGE_DE_CH + // #include "lang/de-CH.h" +// #endif #ifdef LANGUAGE_DE_DE #include "lang/de-DE.h" #endif -#ifdef LANGUAGE_DE_LI - #include "lang/de-LI.h" -#endif -#ifdef LANGUAGE_DE_LU - #include "lang/de-LU.h" -#endif -#ifdef LANGUAGE_DV_MV - #include "lang/dv-MV.h" -#endif +// #ifdef LANGUAGE_DE_LI + // #include "lang/de-LI.h" +// #endif +// #ifdef LANGUAGE_DE_LU + // #include "lang/de-LU.h" +// #endif +// #ifdef LANGUAGE_DV_MV + // #include "lang/dv-MV.h" +// #endif #ifdef LANGUAGE_EL_GR #include "lang/el-GR.h" #endif -#ifdef LANGUAGE_EN_AU - #include "lang/en-AU.h" -#endif -#ifdef LANGUAGE_EN_BZ - #include "lang/en-BZ.h" -#endif -#ifdef LANGUAGE_EN_CA - #include "lang/en-CA.h" -#endif -#ifdef LANGUAGE_EN_CB - #include "lang/en-CB.h" -#endif -#ifdef LANGUAGE_EN_GB - #include "lang/en-GB.h" -#endif -#ifdef LANGUAGE_EN_IE - #include "lang/en-IE.h" -#endif -#ifdef LANGUAGE_EN_JM - #include "lang/en-JM.h" -#endif -#ifdef LANGUAGE_EN_NZ - #include "lang/en-NZ.h" -#endif -#ifdef LANGUAGE_EN_PH - #include "lang/en-PH.h" -#endif -#ifdef LANGUAGE_EN_TT - #include "lang/en-TT.h" -#endif +// #ifdef LANGUAGE_EN_AU + // #include "lang/en-AU.h" +// #endif +// #ifdef LANGUAGE_EN_BZ + // #include "lang/en-BZ.h" +// #endif +// #ifdef LANGUAGE_EN_CA + // #include "lang/en-CA.h" +// #endif +// #ifdef LANGUAGE_EN_CB + // #include "lang/en-CB.h" +// #endif +// #ifdef LANGUAGE_EN_GB + // #include "lang/en-GB.h" +// #endif +// #ifdef LANGUAGE_EN_IE + // #include "lang/en-IE.h" +// #endif +// #ifdef LANGUAGE_EN_JM + // #include "lang/en-JM.h" +// #endif +// #ifdef LANGUAGE_EN_NZ + // #include "lang/en-NZ.h" +// #endif +// #ifdef LANGUAGE_EN_PH + // #include "lang/en-PH.h" +// #endif +// #ifdef LANGUAGE_EN_TT + // #include "lang/en-TT.h" +// #endif #ifdef LANGUAGE_EN_US #include "lang/en-US.h" #endif -#ifdef LANGUAGE_EN_ZA - #include "lang/en-ZA.h" -#endif -#ifdef LANGUAGE_EN_ZW - #include "lang/en-ZW.h" -#endif -#ifdef LANGUAGE_EO_AA - #include "lang/eo-AA.h" -#endif -#ifdef LANGUAGE_ES_AR - #include "lang/es-AR.h" -#endif -#ifdef LANGUAGE_ES_BO - #include "lang/es-BO.h" -#endif -#ifdef LANGUAGE_ES_CL - #include "lang/es-CL.h" -#endif -#ifdef LANGUAGE_ES_CO - #include "lang/es-CO.h" -#endif -#ifdef LANGUAGE_ES_CR - #include "lang/es-CR.h" -#endif -#ifdef LANGUAGE_ES_DO - #include "lang/es-DO.h" -#endif -#ifdef LANGUAGE_ES_EC - #include "lang/es-EC.h" -#endif +// #ifdef LANGUAGE_EN_ZA + // #include "lang/en-ZA.h" +// #endif +// #ifdef LANGUAGE_EN_ZW + // #include "lang/en-ZW.h" +// #endif +// #ifdef LANGUAGE_EO_AA + // #include "lang/eo-AA.h" +// #endif +// #ifdef LANGUAGE_ES_AR + // #include "lang/es-AR.h" +// #endif +// #ifdef LANGUAGE_ES_BO + // #include "lang/es-BO.h" +// #endif +// #ifdef LANGUAGE_ES_CL + // #include "lang/es-CL.h" +// #endif +// #ifdef LANGUAGE_ES_CO + // #include "lang/es-CO.h" +// #endif +// #ifdef LANGUAGE_ES_CR + // #include "lang/es-CR.h" +// #endif +// #ifdef LANGUAGE_ES_DO + // #include "lang/es-DO.h" +// #endif +// #ifdef LANGUAGE_ES_EC + // #include "lang/es-EC.h" +// #endif #ifdef LANGUAGE_ES_ES #include "lang/es-ES.h" #endif -#ifdef LANGUAGE_ES_GT - #include "lang/es-GT.h" -#endif -#ifdef LANGUAGE_ES_HN - #include "lang/es-HN.h" -#endif -#ifdef LANGUAGE_ES_MX - #include "lang/es-MX.h" -#endif -#ifdef LANGUAGE_ES_NI - #include "lang/es-NI.h" -#endif -#ifdef LANGUAGE_ES_PA - #include "lang/es-PA.h" -#endif -#ifdef LANGUAGE_ES_PE - #include "lang/es-PE.h" -#endif -#ifdef LANGUAGE_ES_PR - #include "lang/es-PR.h" -#endif -#ifdef LANGUAGE_ES_PY - #include "lang/es-PY.h" -#endif -#ifdef LANGUAGE_ES_SV - #include "lang/es-SV.h" -#endif -#ifdef LANGUAGE_ES_UY - #include "lang/es-UY.h" -#endif -#ifdef LANGUAGE_ES_VE - #include "lang/es-VE.h" -#endif +// #ifdef LANGUAGE_ES_GT + // #include "lang/es-GT.h" +// #endif +// #ifdef LANGUAGE_ES_HN + // #include "lang/es-HN.h" +// #endif +// #ifdef LANGUAGE_ES_MX + // #include "lang/es-MX.h" +// #endif +// #ifdef LANGUAGE_ES_NI + // #include "lang/es-NI.h" +// #endif +// #ifdef LANGUAGE_ES_PA + // #include "lang/es-PA.h" +// #endif +// #ifdef LANGUAGE_ES_PE + // #include "lang/es-PE.h" +// #endif +// #ifdef LANGUAGE_ES_PR + // #include "lang/es-PR.h" +// #endif +// #ifdef LANGUAGE_ES_PY + // #include "lang/es-PY.h" +// #endif +// #ifdef LANGUAGE_ES_SV + // #include "lang/es-SV.h" +// #endif +// #ifdef LANGUAGE_ES_UY + // #include "lang/es-UY.h" +// #endif +// #ifdef LANGUAGE_ES_VE + // #include "lang/es-VE.h" +// #endif #ifdef LANGUAGE_ET_EE #include "lang/et-EE.h" #endif -#ifdef LANGUAGE_EU_ES - #include "lang/eu-ES.h" -#endif -#ifdef LANGUAGE_FA_IR - #include "lang/fa-IR.h" -#endif -#ifdef LANGUAGE_FI_FI - #include "lang/fi-FI.h" -#endif -#ifdef LANGUAGE_FO_FO - #include "lang/fo-FO.h" -#endif -#ifdef LANGUAGE_FR_BE - #include "lang/fr-BE.h" -#endif -#ifdef LANGUAGE_FR_CA - #include "lang/fr-CA.h" -#endif -#ifdef LANGUAGE_FR_CH - #include "lang/fr-CH.h" -#endif +// #ifdef LANGUAGE_EU_ES + // #include "lang/eu-ES.h" +// #endif +// #ifdef LANGUAGE_FA_IR + // #include "lang/fa-IR.h" +// #endif +// #ifdef LANGUAGE_FI_FI + // #include "lang/fi-FI.h" +// #endif +// #ifdef LANGUAGE_FO_FO + // #include "lang/fo-FO.h" +// #endif +// #ifdef LANGUAGE_FR_BE + // #include "lang/fr-BE.h" +// #endif +// #ifdef LANGUAGE_FR_CA + // #include "lang/fr-CA.h" +// #endif +// #ifdef LANGUAGE_FR_CH + // #include "lang/fr-CH.h" +// #endif #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.h" #endif -#ifdef LANGUAGE_FR_LU - #include "lang/fr-LU.h" -#endif -#ifdef LANGUAGE_FR_MC - #include "lang/fr-MC.h" -#endif -#ifdef LANGUAGE_GL_ES - #include "lang/gl-ES.h" -#endif -#ifdef LANGUAGE_GU_IN - #include "lang/gu-IN.h" -#endif +// #ifdef LANGUAGE_FR_LU + // #include "lang/fr-LU.h" +// #endif +// #ifdef LANGUAGE_FR_MC + // #include "lang/fr-MC.h" +// #endif +// #ifdef LANGUAGE_GL_ES + // #include "lang/gl-ES.h" +// #endif +// #ifdef LANGUAGE_GU_IN + // #include "lang/gu-IN.h" +// #endif #ifdef LANGUAGE_HE_IL #include "lang/he-IL.h" #endif -#ifdef LANGUAGE_HI_IN - #include "lang/hi-IN.h" -#endif -#ifdef LANGUAGE_HR_HR - #include "lang/hr-HR.h" -#endif -#ifdef LANGUAGE_HU_HU - #include "lang/hu-HU.h" -#endif -#ifdef LANGUAGE_HY_AM - #include "lang/hy-AM.h" -#endif -#ifdef LANGUAGE_ID_ID - #include "lang/id-ID.h" -#endif -#ifdef LANGUAGE_IS_IS - #include "lang/is-IS.h" -#endif -#ifdef LANGUAGE_IT_CH - #include "lang/it-CH.h" -#endif +// #ifdef LANGUAGE_HI_IN + // #include "lang/hi-IN.h" +// #endif +// #ifdef LANGUAGE_HR_HR + // #include "lang/hr-HR.h" +// #endif +// #ifdef LANGUAGE_HU_HU + // #include "lang/hu-HU.h" +// #endif +// #ifdef LANGUAGE_HY_AM + // #include "lang/hy-AM.h" +// #endif +// #ifdef LANGUAGE_ID_ID + // #include "lang/id-ID.h" +// #endif +// #ifdef LANGUAGE_IS_IS + // #include "lang/is-IS.h" +// #endif +// #ifdef LANGUAGE_IT_CH + // #include "lang/it-CH.h" +// #endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.h" #endif #ifdef LANGUAGE_JA_JP #include "lang/ja-JP.h" #endif -#ifdef LANGUAGE_KA_GE - #include "lang/ka-GE.h" -#endif -#ifdef LANGUAGE_KK_KZ - #include "lang/kk-KZ.h" -#endif -#ifdef LANGUAGE_KN_IN - #include "lang/kn-IN.h" -#endif -#ifdef LANGUAGE_KOK_IN - #include "lang/kok-IN.h" -#endif -#ifdef LANGUAGE_KO_KR - #include "lang/ko-KR.h" -#endif -#ifdef LANGUAGE_KY_KG - #include "lang/ky-KG.h" -#endif +// #ifdef LANGUAGE_KA_GE + // #include "lang/ka-GE.h" +// #endif +// #ifdef LANGUAGE_KK_KZ + // #include "lang/kk-KZ.h" +// #endif +// #ifdef LANGUAGE_KN_IN + // #include "lang/kn-IN.h" +// #endif +// #ifdef LANGUAGE_KOK_IN + // #include "lang/kok-IN.h" +// #endif +// #ifdef LANGUAGE_KO_KR + // #include "lang/ko-KR.h" +// #endif +// #ifdef LANGUAGE_KY_KG + // #include "lang/ky-KG.h" +// #endif #ifdef LANGUAGE_LT_LT #include "lang/lt-LT.h" #endif -#ifdef LANGUAGE_LV_LV - #include "lang/lv-LV.h" -#endif -#ifdef LANGUAGE_MK_MK - #include "lang/mk-MK.h" -#endif -#ifdef LANGUAGE_MN_MN - #include "lang/mn-MN.h" -#endif -#ifdef LANGUAGE_MR_IN - #include "lang/mr-IN.h" -#endif -#ifdef LANGUAGE_MS_BN - #include "lang/ms-BN.h" -#endif +// #ifdef LANGUAGE_LV_LV + // #include "lang/lv-LV.h" +// #endif +// #ifdef LANGUAGE_MK_MK + // #include "lang/mk-MK.h" +// #endif +// #ifdef LANGUAGE_MN_MN + // #include "lang/mn-MN.h" +// #endif +// #ifdef LANGUAGE_MR_IN + // #include "lang/mr-IN.h" +// #endif +// #ifdef LANGUAGE_MS_BN + // #include "lang/ms-BN.h" +// #endif #ifdef LANGUAGE_MS_MY #include "lang/ms-MY.h" #endif -#ifdef LANGUAGE_MY_MM - #include "lang/my-MM.h" -#endif -#ifdef LANGUAGE_NL_BE - #include "lang/nl-BE.h" -#endif +// #ifdef LANGUAGE_MY_MM + // #include "lang/my-MM.h" +// #endif +// #ifdef LANGUAGE_NL_BE + // #include "lang/nl-BE.h" +// #endif #ifdef LANGUAGE_NL_NL #include "lang/nl-NL.h" #endif -#ifdef LANGUAGE_NN_NO - #include "lang/nn-NO.h" -#endif -#ifdef LANGUAGE_PA_IN - #include "lang/pa-IN.h" -#endif +// #ifdef LANGUAGE_NN_NO + // #include "lang/nn-NO.h" +// #endif +// #ifdef LANGUAGE_PA_IN + // #include "lang/pa-IN.h" +// #endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.h" #endif #ifdef LANGUAGE_PT_BR #include "lang/pt-BR.h" #endif -#ifdef LANGUAGE_PT_PT - #include "lang/pt-PT.h" -#endif -#ifdef LANGUAGE_RM_CH - #include "lang/rm-CH.h" -#endif +// #ifdef LANGUAGE_PT_PT + // #include "lang/pt-PT.h" +// #endif +// #ifdef LANGUAGE_RM_CH + // #include "lang/rm-CH.h" +// #endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.h" #endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.h" #endif -#ifdef LANGUAGE_SA_IN - #include "lang/sa-IN.h" -#endif +// #ifdef LANGUAGE_SA_IN + // #include "lang/sa-IN.h" +// #endif #ifdef LANGUAGE_SK_SK #include "lang/sk-SK.h" #endif -#ifdef LANGUAGE_SL_SI - #include "lang/sl-SI.h" -#endif +// #ifdef LANGUAGE_SL_SI + // #include "lang/sl-SI.h" +// #endif #ifdef LANGUAGE_SQ_AL #include "lang/sq-AL.h" #endif -#ifdef LANGUAGE_SR_SP - #include "lang/sr-SP.h" -#endif -#ifdef LANGUAGE_SV_FI - #include "lang/sv-FI.h" -#endif +// #ifdef LANGUAGE_SR_SP + // #include "lang/sr-SP.h" +// #endif +// #ifdef LANGUAGE_SV_FI + // #include "lang/sv-FI.h" +// #endif #ifdef LANGUAGE_SV_SE #include "lang/sv-SE.h" #endif -#ifdef LANGUAGE_SW_KE - #include "lang/sw-KE.h" -#endif -#ifdef LANGUAGE_SYR_SY - #include "lang/syr-SY.h" -#endif -#ifdef LANGUAGE_TA_IN - #include "lang/ta-IN.h" -#endif -#ifdef LANGUAGE_TE_IN - #include "lang/te-IN.h" -#endif -#ifdef LANGUAGE_TH_TH - #include "lang/th-TH.h" -#endif +// #ifdef LANGUAGE_SW_KE + // #include "lang/sw-KE.h" +// #endif +// #ifdef LANGUAGE_SYR_SY + // #include "lang/syr-SY.h" +// #endif +// #ifdef LANGUAGE_TA_IN + // #include "lang/ta-IN.h" +// #endif +// #ifdef LANGUAGE_TE_IN + // #include "lang/te-IN.h" +// #endif +// #ifdef LANGUAGE_TH_TH + // #include "lang/th-TH.h" +// #endif #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.h" #endif -#ifdef LANGUAGE_TT_TA - #include "lang/tt-TA.h" -#endif +// #ifdef LANGUAGE_TT_TA + // #include "lang/tt-TA.h" +// #endif #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.h" #endif -#ifdef LANGUAGE_UR_PK - #include "lang/ur-PK.h" -#endif -#ifdef LANGUAGE_UZ_UZ - #include "lang/uz-UZ.h" -#endif -#ifdef LANGUAGE_VI_VN - #include "lang/vi-VN.h" -#endif -#ifdef LANGUAGE_WA_BE - #include "lang/wa-BE.h" -#endif -#ifdef LANGUAGE_ZH_CN - #include "lang/zh-CN.h" -#endif -#ifdef LANGUAGE_ZH_HK - #include "lang/zh-HK.h" -#endif -#ifdef LANGUAGE_ZH_MO - #include "lang/zh-MO.h" -#endif -#ifdef LANGUAGE_ZH_SG - #include "lang/zh-SG.h" -#endif -#ifdef LANGUAGE_ZH_TW - #include "lang/zh-TW.h" -#endif +// #ifdef LANGUAGE_UR_PK + // #include "lang/ur-PK.h" +// #endif +// #ifdef LANGUAGE_UZ_UZ + // #include "lang/uz-UZ.h" +// #endif +// #ifdef LANGUAGE_VI_VN + // #include "lang/vi-VN.h" +// #endif +// #ifdef LANGUAGE_WA_BE + // #include "lang/wa-BE.h" +// #endif +// #ifdef LANGUAGE_ZH_CN + // #include "lang/zh-CN.h" +// #endif +// #ifdef LANGUAGE_ZH_HK + // #include "lang/zh-HK.h" +// #endif +// #ifdef LANGUAGE_ZH_MO + // #include "lang/zh-MO.h" +// #endif +// #ifdef LANGUAGE_ZH_SG + // #include "lang/zh-SG.h" +// #endif +// #ifdef LANGUAGE_ZH_TW + // #include "lang/zh-TW.h" +// #endif const MUI_LANGUAGE_RESOURCE LanguageList[] = {

1 0

[hbelusca] 75715: [SETUPLIB][USETUP]: Start massaging the MUI files and split up what concerns only the usetup "resources", and what concerns general language parameters (in the setuplib). May be i...
by hbelusca＠svn.reactos.org 30 Aug '17

30 Aug '17

Author: hbelusca Date: Wed Aug 30 13:30:29 2017 New Revision: 75715 URL: http://svn.reactos.org/svn/reactos?rev=75715&view=rev Log: [SETUPLIB][USETUP]: Start massaging the MUI files and split up what concerns only the usetup "resources", and what concerns general language parameters (in the setuplib). May be interesting to retrieve that from INF file (e.g. intl.inf) (suggested by Giannis). Added: branches/setup_improvements/base/setup/lib/lang/ - copied from r75714, branches/setup_improvements/base/setup/usetup/lang/ Removed: branches/setup_improvements/base/setup/usetup/lang/af-ZA.h branches/setup_improvements/base/setup/usetup/lang/ar-AE.h branches/setup_improvements/base/setup/usetup/lang/ar-BH.h branches/setup_improvements/base/setup/usetup/lang/ar-DZ.h branches/setup_improvements/base/setup/usetup/lang/ar-EG.h branches/setup_improvements/base/setup/usetup/lang/ar-IQ.h branches/setup_improvements/base/setup/usetup/lang/ar-JO.h branches/setup_improvements/base/setup/usetup/lang/ar-KW.h branches/setup_improvements/base/setup/usetup/lang/ar-LB.h branches/setup_improvements/base/setup/usetup/lang/ar-LY.h branches/setup_improvements/base/setup/usetup/lang/ar-MA.h branches/setup_improvements/base/setup/usetup/lang/ar-OM.h branches/setup_improvements/base/setup/usetup/lang/ar-QA.h branches/setup_improvements/base/setup/usetup/lang/ar-SA.h branches/setup_improvements/base/setup/usetup/lang/ar-SY.h branches/setup_improvements/base/setup/usetup/lang/ar-TN.h branches/setup_improvements/base/setup/usetup/lang/ar-YE.h branches/setup_improvements/base/setup/usetup/lang/az-AZ.h branches/setup_improvements/base/setup/usetup/lang/be-BY.h branches/setup_improvements/base/setup/usetup/lang/bn-IN.h branches/setup_improvements/base/setup/usetup/lang/ca-ES.h branches/setup_improvements/base/setup/usetup/lang/de-AT.h branches/setup_improvements/base/setup/usetup/lang/de-CH.h branches/setup_improvements/base/setup/usetup/lang/de-LI.h branches/setup_improvements/base/setup/usetup/lang/de-LU.h branches/setup_improvements/base/setup/usetup/lang/dv-MV.h branches/setup_improvements/base/setup/usetup/lang/en-AU.h branches/setup_improvements/base/setup/usetup/lang/en-BZ.h branches/setup_improvements/base/setup/usetup/lang/en-CA.h branches/setup_improvements/base/setup/usetup/lang/en-CB.h branches/setup_improvements/base/setup/usetup/lang/en-GB.h branches/setup_improvements/base/setup/usetup/lang/en-IE.h branches/setup_improvements/base/setup/usetup/lang/en-JM.h branches/setup_improvements/base/setup/usetup/lang/en-NZ.h branches/setup_improvements/base/setup/usetup/lang/en-PH.h branches/setup_improvements/base/setup/usetup/lang/en-TT.h branches/setup_improvements/base/setup/usetup/lang/en-ZA.h branches/setup_improvements/base/setup/usetup/lang/en-ZW.h branches/setup_improvements/base/setup/usetup/lang/eo-AA.h branches/setup_improvements/base/setup/usetup/lang/es-AR.h branches/setup_improvements/base/setup/usetup/lang/es-BO.h branches/setup_improvements/base/setup/usetup/lang/es-CL.h branches/setup_improvements/base/setup/usetup/lang/es-CO.h branches/setup_improvements/base/setup/usetup/lang/es-CR.h branches/setup_improvements/base/setup/usetup/lang/es-DO.h branches/setup_improvements/base/setup/usetup/lang/es-EC.h branches/setup_improvements/base/setup/usetup/lang/es-GT.h branches/setup_improvements/base/setup/usetup/lang/es-HN.h branches/setup_improvements/base/setup/usetup/lang/es-MX.h branches/setup_improvements/base/setup/usetup/lang/es-NI.h branches/setup_improvements/base/setup/usetup/lang/es-PA.h branches/setup_improvements/base/setup/usetup/lang/es-PE.h branches/setup_improvements/base/setup/usetup/lang/es-PR.h branches/setup_improvements/base/setup/usetup/lang/es-PY.h branches/setup_improvements/base/setup/usetup/lang/es-SV.h branches/setup_improvements/base/setup/usetup/lang/es-UY.h branches/setup_improvements/base/setup/usetup/lang/es-VE.h branches/setup_improvements/base/setup/usetup/lang/eu-ES.h branches/setup_improvements/base/setup/usetup/lang/fa-IR.h branches/setup_improvements/base/setup/usetup/lang/fi-FI.h branches/setup_improvements/base/setup/usetup/lang/fo-FO.h branches/setup_improvements/base/setup/usetup/lang/fr-BE.h branches/setup_improvements/base/setup/usetup/lang/fr-CA.h branches/setup_improvements/base/setup/usetup/lang/fr-CH.h branches/setup_improvements/base/setup/usetup/lang/fr-LU.h branches/setup_improvements/base/setup/usetup/lang/fr-MC.h branches/setup_improvements/base/setup/usetup/lang/gl-ES.h branches/setup_improvements/base/setup/usetup/lang/gu-IN.h branches/setup_improvements/base/setup/usetup/lang/hi-IN.h branches/setup_improvements/base/setup/usetup/lang/hr-HR.h branches/setup_improvements/base/setup/usetup/lang/hu-HU.h branches/setup_improvements/base/setup/usetup/lang/hy-AM.h branches/setup_improvements/base/setup/usetup/lang/id-ID.h branches/setup_improvements/base/setup/usetup/lang/is-IS.h branches/setup_improvements/base/setup/usetup/lang/it-CH.h branches/setup_improvements/base/setup/usetup/lang/ka-GE.h branches/setup_improvements/base/setup/usetup/lang/kk-KZ.h branches/setup_improvements/base/setup/usetup/lang/kn-IN.h branches/setup_improvements/base/setup/usetup/lang/ko-KR.h branches/setup_improvements/base/setup/usetup/lang/kok-IN.h branches/setup_improvements/base/setup/usetup/lang/ky-KG.h branches/setup_improvements/base/setup/usetup/lang/lv-LV.h branches/setup_improvements/base/setup/usetup/lang/mk-MK.h branches/setup_improvements/base/setup/usetup/lang/mn-MN.h branches/setup_improvements/base/setup/usetup/lang/mr-IN.h branches/setup_improvements/base/setup/usetup/lang/ms-BN.h branches/setup_improvements/base/setup/usetup/lang/my-MM.h branches/setup_improvements/base/setup/usetup/lang/nl-BE.h branches/setup_improvements/base/setup/usetup/lang/nn-NO.h branches/setup_improvements/base/setup/usetup/lang/pa-IN.h branches/setup_improvements/base/setup/usetup/lang/pt-PT.h branches/setup_improvements/base/setup/usetup/lang/rm-CH.h branches/setup_improvements/base/setup/usetup/lang/sa-IN.h branches/setup_improvements/base/setup/usetup/lang/sl-SI.h branches/setup_improvements/base/setup/usetup/lang/sr-SP.h branches/setup_improvements/base/setup/usetup/lang/sv-FI.h branches/setup_improvements/base/setup/usetup/lang/sw-KE.h branches/setup_improvements/base/setup/usetup/lang/syr-SY.h branches/setup_improvements/base/setup/usetup/lang/ta-IN.h branches/setup_improvements/base/setup/usetup/lang/te-IN.h branches/setup_improvements/base/setup/usetup/lang/th-TH.h branches/setup_improvements/base/setup/usetup/lang/tt-TA.h branches/setup_improvements/base/setup/usetup/lang/ur-PK.h branches/setup_improvements/base/setup/usetup/lang/uz-UZ.h branches/setup_improvements/base/setup/usetup/lang/vi-VN.h branches/setup_improvements/base/setup/usetup/lang/wa-BE.h branches/setup_improvements/base/setup/usetup/lang/zh-CN.h branches/setup_improvements/base/setup/usetup/lang/zh-HK.h branches/setup_improvements/base/setup/usetup/lang/zh-MO.h branches/setup_improvements/base/setup/usetup/lang/zh-SG.h branches/setup_improvements/base/setup/usetup/lang/zh-TW.h branches/setup_improvements/base/setup/usetup/muifonts.h Modified: branches/setup_improvements/base/setup/lib/lang/bg-BG.h branches/setup_improvements/base/setup/lib/lang/bn-BD.h branches/setup_improvements/base/setup/lib/lang/cs-CZ.h branches/setup_improvements/base/setup/lib/lang/da-DK.h branches/setup_improvements/base/setup/lib/lang/de-DE.h branches/setup_improvements/base/setup/lib/lang/el-GR.h branches/setup_improvements/base/setup/lib/lang/en-US.h branches/setup_improvements/base/setup/lib/lang/es-ES.h branches/setup_improvements/base/setup/lib/lang/et-EE.h branches/setup_improvements/base/setup/lib/lang/fr-FR.h branches/setup_improvements/base/setup/lib/lang/he-IL.h branches/setup_improvements/base/setup/lib/lang/it-IT.h branches/setup_improvements/base/setup/lib/lang/ja-JP.h branches/setup_improvements/base/setup/lib/lang/lt-LT.h branches/setup_improvements/base/setup/lib/lang/ms-MY.h branches/setup_improvements/base/setup/lib/lang/nl-NL.h branches/setup_improvements/base/setup/lib/lang/pl-PL.h branches/setup_improvements/base/setup/lib/lang/pt-BR.h branches/setup_improvements/base/setup/lib/lang/ro-RO.h branches/setup_improvements/base/setup/lib/lang/ru-RU.h branches/setup_improvements/base/setup/lib/lang/sk-SK.h branches/setup_improvements/base/setup/lib/lang/sq-AL.h branches/setup_improvements/base/setup/lib/lang/sv-SE.h branches/setup_improvements/base/setup/lib/lang/tr-TR.h branches/setup_improvements/base/setup/lib/lang/uk-UA.h branches/setup_improvements/base/setup/lib/mui.h branches/setup_improvements/base/setup/lib/muilanguages.h branches/setup_improvements/base/setup/lib/setuplib.c branches/setup_improvements/base/setup/usetup/lang/bg-BG.h branches/setup_improvements/base/setup/usetup/lang/bn-BD.h branches/setup_improvements/base/setup/usetup/lang/cs-CZ.h branches/setup_improvements/base/setup/usetup/lang/da-DK.h branches/setup_improvements/base/setup/usetup/lang/de-DE.h branches/setup_improvements/base/setup/usetup/lang/el-GR.h branches/setup_improvements/base/setup/usetup/lang/en-US.h branches/setup_improvements/base/setup/usetup/lang/es-ES.h branches/setup_improvements/base/setup/usetup/lang/et-EE.h branches/setup_improvements/base/setup/usetup/lang/fr-FR.h branches/setup_improvements/base/setup/usetup/lang/he-IL.h branches/setup_improvements/base/setup/usetup/lang/it-IT.h branches/setup_improvements/base/setup/usetup/lang/ja-JP.h branches/setup_improvements/base/setup/usetup/lang/lt-LT.h branches/setup_improvements/base/setup/usetup/lang/ms-MY.h branches/setup_improvements/base/setup/usetup/lang/nl-NL.h branches/setup_improvements/base/setup/usetup/lang/pl-PL.h branches/setup_improvements/base/setup/usetup/lang/pt-BR.h branches/setup_improvements/base/setup/usetup/lang/ro-RO.h branches/setup_improvements/base/setup/usetup/lang/ru-RU.h branches/setup_improvements/base/setup/usetup/lang/sk-SK.h branches/setup_improvements/base/setup/usetup/lang/sq-AL.h branches/setup_improvements/base/setup/usetup/lang/sv-SE.h branches/setup_improvements/base/setup/usetup/lang/tr-TR.h branches/setup_improvements/base/setup/usetup/lang/uk-UA.h branches/setup_improvements/base/setup/usetup/mui.c branches/setup_improvements/base/setup/usetup/mui.h branches/setup_improvements/base/setup/usetup/muilanguages.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/setup_improvements/base/setup/lib/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/da-DK.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/ms-MY.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/mui.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/muilanguages.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/lib/setuplib.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Removed: branches/setup_improvements/base/setup/usetup/lang/af-ZA.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ar-AE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ar-BH.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ar-DZ.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ar-EG.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ar-IQ.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ar-JO.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ar-KW.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ar-LB.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ar-LY.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ar-MA.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ar-OM.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ar-QA.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ar-SA.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ar-SY.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ar-TN.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ar-YE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/az-AZ.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/be-BY.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/bn-IN.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ca-ES.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/da-DK.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/de-AT.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/de-CH.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/de-LI.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/de-LU.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/dv-MV.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/en-AU.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/en-BZ.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/en-CA.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/en-CB.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/en-GB.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/en-IE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/en-JM.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/en-NZ.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/en-PH.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/en-TT.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/en-ZA.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/en-ZW.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/eo-AA.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/es-AR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/es-BO.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/es-CL.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/es-CO.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/es-CR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/es-DO.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/es-EC.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/es-GT.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/es-HN.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/es-MX.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/es-NI.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/es-PA.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/es-PE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/es-PR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/es-PY.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/es-SV.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/es-UY.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/es-VE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/eu-ES.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/fa-IR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/fi-FI.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/fo-FO.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/fr-BE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/fr-CA.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/fr-CH.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/fr-LU.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/fr-MC.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/gl-ES.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/gu-IN.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/hi-IN.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/hr-HR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/hu-HU.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/hy-AM.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/id-ID.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/is-IS.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/it-CH.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ka-GE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/kk-KZ.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/kn-IN.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ko-KR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/kok-IN.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ky-KG.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/lv-LV.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/mk-MK.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/mn-MN.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/mr-IN.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ms-BN.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/ms-MY.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/my-MM.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/nl-BE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/nn-NO.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/pa-IN.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/pt-PT.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/rm-CH.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/sa-IN.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/sl-SI.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/sr-SP.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/sv-FI.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/sw-KE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/syr-SY.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ta-IN.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/te-IN.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/th-TH.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/tt-TA.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/ur-PK.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/uz-UZ.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/vi-VN.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/wa-BE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/zh-CN.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/zh-HK.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/zh-MO.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/zh-SG.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/lang/zh-TW.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/muifonts.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs