Ros-diffs

ros-diffs@reactos.org

81390 discussions

06/13: [SETUPLIB] Improve an alternate code implementation.
by Hermès Bélusca-Maïto 28 Oct '18

28 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad9e57895ddc4bafb117d… commit ad9e57895ddc4bafb117d68869541c1a025bf47c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Dec 22 23:28:53 2017 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 28 00:59:45 2018 +0200 [SETUPLIB] Improve an alternate code implementation. Comment about the status of two '#if 0'. [SETUPLIB] Fix some uninitialized variables (caught by clang-cl). Also, initialize NtName->Length in return paths in ResolveArcNameManually(). --- base/setup/lib/utils/arcname.c | 57 +++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/base/setup/lib/utils/arcname.c b/base/setup/lib/utils/arcname.c index 2c2308a595..56f44cfef3 100644 --- a/base/setup/lib/utils/arcname.c +++ b/base/setup/lib/utils/arcname.c @@ -281,12 +281,14 @@ ArcMatchToken_UStr( while (TokenTable[Index]) { #if 0 - Length = wcslen(TokenTable[Index])*sizeof(WCHAR); - if (RtlCompareMemory(CandidateToken->Buffer, TokenTable[Index], Length) == Length) + Length = wcslen(TokenTable[Index]); + if ((Length == CandidateToken->Length / sizeof(WCHAR)) && + (_wcsnicmp(CandidateToken->Buffer, TokenTable[Index], Length) == 0)) + { break; + } #else RtlInitUnicodeString(&Token, TokenTable[Index]); - // if (RtlCompareUnicodeString(CandidateToken, &Token, TRUE) == 0) if (RtlEqualUnicodeString(CandidateToken, &Token, TRUE)) break; #endif @@ -376,13 +378,13 @@ ParseArcName( WCHAR TokenBuffer[50]; UNICODE_STRING Token; PCWSTR p, q; - ULONG AdapterKey; - ULONG ControllerKey; - ULONG PeripheralKey; - ULONG PartitionNumber; - ADAPTER_TYPE AdapterType; - CONTROLLER_TYPE ControllerType; - PERIPHERAL_TYPE PeripheralType; + ULONG AdapterKey = 0; + ULONG ControllerKey = 0; + ULONG PeripheralKey = 0; + ULONG PartitionNumber = 0; + ADAPTER_TYPE AdapterType = AdapterTypeMax; + CONTROLLER_TYPE ControllerType = ControllerTypeMax; + PERIPHERAL_TYPE PeripheralType = PeripheralTypeMax; BOOLEAN UseSignature = FALSE; /* @@ -417,7 +419,8 @@ ParseArcName( else { /* Check for regular adapters */ - AdapterType = (ADAPTER_TYPE)/*ArcMatchTokenU*/ArcMatchToken_UStr(/*Token.Buffer*/&Token, AdapterTypes_U); + // ArcMatchTokenU(Token.Buffer, AdapterTypes_U); + AdapterType = (ADAPTER_TYPE)ArcMatchToken_UStr(&Token, AdapterTypes_U); if (AdapterType >= AdapterTypeMax) { DPRINT1("Invalid adapter type %wZ\n", &Token); @@ -449,7 +452,8 @@ ParseArcName( DPRINT1("%S(%lu) adapter doesn't have a controller!\n", AdapterTypes_U[AdapterType], AdapterKey); return STATUS_OBJECT_PATH_SYNTAX_BAD; } - ControllerType = (CONTROLLER_TYPE)/*ArcMatchTokenU*/ArcMatchToken_UStr(/*Token.Buffer*/&Token, ControllerTypes_U); + // ArcMatchTokenU(Token.Buffer, ControllerTypes_U); + ControllerType = (CONTROLLER_TYPE)ArcMatchToken_UStr(&Token, ControllerTypes_U); if (ControllerType >= ControllerTypeMax) { DPRINT1("Invalid controller type %wZ\n", &Token); @@ -494,7 +498,8 @@ ParseArcName( ControllerTypes_U[ControllerType], ControllerKey); return STATUS_OBJECT_PATH_SYNTAX_BAD; } - PeripheralType = (PERIPHERAL_TYPE)/*ArcMatchTokenU*/ArcMatchToken_UStr(/*Token.Buffer*/&Token, PeripheralTypes_U); + // ArcMatchTokenU(Token.Buffer, PeripheralTypes_U); + PeripheralType = (PERIPHERAL_TYPE)ArcMatchToken_UStr(&Token, PeripheralTypes_U); if (PeripheralType >= PeripheralTypeMax) { DPRINT1("Invalid peripheral type %wZ\n", &Token); @@ -588,11 +593,6 @@ ResolveArcNameNtSymLink( if (NtName->MaximumLength < sizeof(UNICODE_NULL)) return STATUS_BUFFER_TOO_SMALL; -#if 0 - *NtName->Buffer = UNICODE_NULL; - NtName->Length = 0; -#endif - /* Open the \ArcName object directory */ RtlInitUnicodeString(&ArcNameDir, L"\\ArcName"); InitializeObjectAttributes(&ObjectAttributes, @@ -692,11 +692,6 @@ ResolveArcNameManually( if (NtName->MaximumLength < sizeof(UNICODE_NULL)) return STATUS_BUFFER_TOO_SMALL; -#if 0 - *NtName->Buffer = UNICODE_NULL; - NtName->Length = 0; -#endif - /* Parse the ARC path */ Status = ParseArcName(ArcNamePath, &AdapterKey, @@ -712,7 +707,7 @@ ResolveArcNameManually( // TODO: Check the partition number in case of fdisks and cdroms?? - /* Check for adapters that don't take any extra controller or peripheral nodes */ + /* Check for adapters that don't take any extra controller or peripheral node */ if (AdapterType == NetAdapter || AdapterType == RamdiskAdapter) { if (AdapterType == NetAdapter) @@ -771,7 +766,7 @@ ResolveArcNameManually( L"\\Device\\Harddisk%lu\\Partition%lu", DiskEntry->DiskNumber, PartitionNumber); } -#if 0 +#if 0 // FIXME: Not implemented yet! else if (PeripheralType == VDiskPeripheral) { @@ -783,7 +778,16 @@ ResolveArcNameManually( #endif if (!NT_SUCCESS(Status)) + { + /* Returned NtName is invalid, so zero it out */ + *NtName->Buffer = UNICODE_NULL; + NtName->Length = 0; + return Status; + } + + /* Update NtName length */ + NtName->Length = wcslen(NtName->Buffer) * sizeof(WCHAR); return STATUS_SUCCESS; } @@ -874,10 +878,11 @@ ArcPathToNtPath( } } NtPath->Length = wcslen(NtPath->Buffer) * sizeof(WCHAR); + return TRUE; } -#if 0 +#if 0 // FIXME: Not implemented yet! PWSTR NtPathToArcPath( IN PWSTR NtPath)

1 0

05/13: [USETUP] Move the SetupExtractFile() function to where it is (only) used.
by Hermès Bélusca-Maïto 28 Oct '18

28 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c3ab29682ad9568a8e333… commit c3ab29682ad9568a8e3339e2d9a9e9e84ca987d4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Sep 4 20:00:22 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 28 00:59:44 2018 +0200 [USETUP] Move the SetupExtractFile() function to where it is (only) used. svn path=/branches/setup_improvements/; revision=75762 --- base/setup/usetup/filequeue.c | 82 +++++++++++++++++++++++++++++++++++++++++++ base/setup/usetup/filequeue.h | 6 ++++ base/setup/usetup/filesup.c | 82 ------------------------------------------- base/setup/usetup/filesup.h | 6 ---- 4 files changed, 88 insertions(+), 88 deletions(-) diff --git a/base/setup/usetup/filequeue.c b/base/setup/usetup/filequeue.c index 2d928fb714..b49e56e9ba 100644 --- a/base/setup/usetup/filequeue.c +++ b/base/setup/usetup/filequeue.c @@ -56,6 +56,88 @@ typedef struct _FILEQUEUEHEADER /* FUNCTIONS ****************************************************************/ +static BOOLEAN HasCurrentCabinet = FALSE; +static WCHAR CurrentCabinetName[MAX_PATH]; +static CAB_SEARCH Search; + +NTSTATUS +SetupExtractFile( + PWCHAR CabinetFileName, + PWCHAR SourceFileName, + PWCHAR DestinationPathName) +{ + ULONG CabStatus; + + DPRINT("SetupExtractFile(CabinetFileName %S, SourceFileName %S, DestinationPathName %S)\n", + CabinetFileName, SourceFileName, DestinationPathName); + + if (HasCurrentCabinet) + { + DPRINT("CurrentCabinetName: %S\n", CurrentCabinetName); + } + + if ((HasCurrentCabinet) && (wcscmp(CabinetFileName, CurrentCabinetName) == 0)) + { + DPRINT("Using same cabinet as last time\n"); + + /* Use our last location because the files should be sequential */ + CabStatus = CabinetFindNextFileSequential(SourceFileName, &Search); + if (CabStatus != CAB_STATUS_SUCCESS) + { + DPRINT("Sequential miss on file: %S\n", SourceFileName); + + /* Looks like we got unlucky */ + CabStatus = CabinetFindFirst(SourceFileName, &Search); + } + } + else + { + DPRINT("Using new cabinet\n"); + + if (HasCurrentCabinet) + { + CabinetCleanup(); + } + + wcscpy(CurrentCabinetName, CabinetFileName); + + CabinetInitialize(); + CabinetSetEventHandlers(NULL, NULL, NULL); + CabinetSetCabinetName(CabinetFileName); + + CabStatus = CabinetOpen(); + if (CabStatus == CAB_STATUS_SUCCESS) + { + DPRINT("Opened cabinet %S\n", CabinetGetCabinetName()); + HasCurrentCabinet = TRUE; + } + else + { + DPRINT("Cannot open cabinet (%d)\n", CabStatus); + return STATUS_UNSUCCESSFUL; + } + + /* We have to start at the beginning here */ + CabStatus = CabinetFindFirst(SourceFileName, &Search); + } + + if (CabStatus != CAB_STATUS_SUCCESS) + { + DPRINT1("Unable to find '%S' in cabinet '%S'\n", SourceFileName, CabinetGetCabinetName()); + return STATUS_UNSUCCESSFUL; + } + + CabinetSetDestinationPath(DestinationPathName); + CabStatus = CabinetExtractFile(&Search); + if (CabStatus != CAB_STATUS_SUCCESS) + { + DPRINT("Cannot extract file %S (%d)\n", SourceFileName, CabStatus); + return STATUS_UNSUCCESSFUL; + } + + return STATUS_SUCCESS; +} + HSPFILEQ WINAPI SetupOpenFileQueue(VOID) diff --git a/base/setup/usetup/filequeue.h b/base/setup/usetup/filequeue.h index f43ef91462..1623440035 100644 --- a/base/setup/usetup/filequeue.h +++ b/base/setup/usetup/filequeue.h @@ -69,6 +69,12 @@ typedef struct _COPYCONTEXT /* FUNCTIONS ****************************************************************/ +NTSTATUS +SetupExtractFile( + PWCHAR CabinetFileName, + PWCHAR SourceFileName, + PWCHAR DestinationFileName); + HSPFILEQ WINAPI SetupOpenFileQueue(VOID); diff --git a/base/setup/usetup/filesup.c b/base/setup/usetup/filesup.c index fa13a0dbe1..b648471084 100644 --- a/base/setup/usetup/filesup.c +++ b/base/setup/usetup/filesup.c @@ -15,10 +15,6 @@ /* FUNCTIONS ****************************************************************/ -static BOOLEAN HasCurrentCabinet = FALSE; -static WCHAR CurrentCabinetName[MAX_PATH]; -static CAB_SEARCH Search; - static NTSTATUS SetupCreateSingleDirectory( @@ -142,84 +138,6 @@ done: return Status; } -NTSTATUS -SetupExtractFile( - PWCHAR CabinetFileName, - PWCHAR SourceFileName, - PWCHAR DestinationPathName) -{ - ULONG CabStatus; - - DPRINT("SetupExtractFile(CabinetFileName %S, SourceFileName %S, DestinationPathName %S)\n", - CabinetFileName, SourceFileName, DestinationPathName); - - if (HasCurrentCabinet) - { - DPRINT("CurrentCabinetName: %S\n", CurrentCabinetName); - } - - if ((HasCurrentCabinet) && (wcscmp(CabinetFileName, CurrentCabinetName) == 0)) - { - DPRINT("Using same cabinet as last time\n"); - - /* Use our last location because the files should be sequential */ - CabStatus = CabinetFindNextFileSequential(SourceFileName, &Search); - if (CabStatus != CAB_STATUS_SUCCESS) - { - DPRINT("Sequential miss on file: %S\n", SourceFileName); - - /* Looks like we got unlucky */ - CabStatus = CabinetFindFirst(SourceFileName, &Search); - } - } - else - { - DPRINT("Using new cabinet\n"); - - if (HasCurrentCabinet) - { - CabinetCleanup(); - } - - wcscpy(CurrentCabinetName, CabinetFileName); - - CabinetInitialize(); - CabinetSetEventHandlers(NULL, NULL, NULL); - CabinetSetCabinetName(CabinetFileName); - - CabStatus = CabinetOpen(); - if (CabStatus == CAB_STATUS_SUCCESS) - { - DPRINT("Opened cabinet %S\n", CabinetGetCabinetName()); - HasCurrentCabinet = TRUE; - } - else - { - DPRINT("Cannot open cabinet (%d)\n", CabStatus); - return STATUS_UNSUCCESSFUL; - } - - /* We have to start at the beginning here */ - CabStatus = CabinetFindFirst(SourceFileName, &Search); - } - - if (CabStatus != CAB_STATUS_SUCCESS) - { - DPRINT1("Unable to find '%S' in cabinet '%S'\n", SourceFileName, CabinetGetCabinetName()); - return STATUS_UNSUCCESSFUL; - } - - CabinetSetDestinationPath(DestinationPathName); - CabStatus = CabinetExtractFile(&Search); - if (CabStatus != CAB_STATUS_SUCCESS) - { - DPRINT("Cannot extract file %S (%d)\n", SourceFileName, CabStatus); - return STATUS_UNSUCCESSFUL; - } - - return STATUS_SUCCESS; -} - BOOLEAN IsValidPath( IN PCWSTR InstallDir) diff --git a/base/setup/usetup/filesup.h b/base/setup/usetup/filesup.h index 884d384efa..a441ea4451 100644 --- a/base/setup/usetup/filesup.h +++ b/base/setup/usetup/filesup.h @@ -12,12 +12,6 @@ NTSTATUS SetupCreateDirectory( PWCHAR DirectoryName); -NTSTATUS -SetupExtractFile( - PWCHAR CabinetFileName, - PWCHAR SourceFileName, - PWCHAR DestinationFileName); - BOOLEAN IsValidPath( IN PCWSTR InstallDir);

1 0

04/13: [SETUPLIB][USETUP] Use NT RTL String Safe functions instead of Win32-oriented ones (and remove usage of HRESULT too).
by Hermès Bélusca-Maïto 28 Oct '18

28 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48aab0fb20330d7cdcdbd… commit 48aab0fb20330d7cdcdbd9733e5c757a607a385b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 3 20:05:11 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 28 00:58:46 2018 +0200 [SETUPLIB][USETUP] Use NT RTL String Safe functions instead of Win32-oriented ones (and remove usage of HRESULT too). Based on: svn path=/branches/setup_improvements/; revision=75755 svn path=/branches/setup_improvements/; revision=75757 --- base/setup/lib/bootsup.c | 6 +++--- base/setup/lib/mui.c | 6 +++--- base/setup/lib/registry.c | 7 ++----- base/setup/lib/settings.c | 26 ++++++++++++++------------ base/setup/lib/setuplib.c | 34 ++++++++++++++++++++-------------- base/setup/lib/utils/arcname_tests.c | 2 -- base/setup/lib/utils/genlist.c | 14 ++++++-------- base/setup/lib/utils/regutil.c | 12 ++++++------ base/setup/usetup/usetup.c | 31 ++++++++++++++----------------- base/setup/usetup/usetup.h | 1 + 10 files changed, 69 insertions(+), 70 deletions(-) diff --git a/base/setup/lib/bootsup.c b/base/setup/lib/bootsup.c index 0ef4e8241e..2f7b43fee3 100644 --- a/base/setup/lib/bootsup.c +++ b/base/setup/lib/bootsup.c @@ -883,9 +883,9 @@ InstallMbrBootCodeToDisk( #if 0 WCHAR DestinationDevicePathBuffer[MAX_PATH]; - StringCchPrintfW(DestinationDevicePathBuffer, ARRAYSIZE(DestinationDevicePathBuffer), - L"\\Device\\Harddisk%d\\Partition0", - DiskNumber); + RtlStringCchPrintfW(DestinationDevicePathBuffer, ARRAYSIZE(DestinationDevicePathBuffer), + L"\\Device\\Harddisk%d\\Partition0", + DiskNumber); #endif CombinePaths(SourceMbrPathBuffer, ARRAYSIZE(SourceMbrPathBuffer), 2, diff --git a/base/setup/lib/mui.c b/base/setup/lib/mui.c index 1e7eb9def8..27b85b46b9 100644 --- a/base/setup/lib/mui.c +++ b/base/setup/lib/mui.c @@ -298,10 +298,10 @@ AddKbLayoutsToRegistry( { if (uIndex > 19) break; - swprintf(szValueName, L"%u", uIndex + 1); + RtlStringCchPrintfW(szValueName, ARRAYSIZE(szValueName), L"%u", uIndex + 1); RtlInitUnicodeString(&ValueName, szValueName); - swprintf(szLangID, L"0000%s", MuiLayouts[uIndex].LangID); + RtlStringCchPrintfW(szLangID, ARRAYSIZE(szLangID), L"0000%s", MuiLayouts[uIndex].LangID); if (_wcsicmp(szLangID, MuiLayouts[uIndex].LayoutID) == 0) { @@ -321,7 +321,7 @@ AddKbLayoutsToRegistry( } else { - swprintf(szLangID, L"d%03lu%s", uCount, MuiLayouts[uIndex].LangID); + RtlStringCchPrintfW(szLangID, ARRAYSIZE(szLangID), L"d%03lu%s", uCount, MuiLayouts[uIndex].LangID); Status = NtSetValueKey(KeyHandle, &ValueName, 0, diff --git a/base/setup/lib/registry.c b/base/setup/lib/registry.c index e36e6a7c76..54655f5108 100644 --- a/base/setup/lib/registry.c +++ b/base/setup/lib/registry.c @@ -34,9 +34,6 @@ #include "registry.h" -// HACK! -#include <strsafe.h> - #define NDEBUG #include <debug.h> @@ -1098,8 +1095,8 @@ RegCleanupRegistry( CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 3, InstallPath->Buffer, L"System32\\config", RegistryHives[i].HiveName); - StringCchCopyW(DstPath, ARRAYSIZE(DstPath), SrcPath); - StringCchCatW(DstPath, ARRAYSIZE(DstPath), L".sav"); + RtlStringCchCopyW(DstPath, ARRAYSIZE(DstPath), SrcPath); + RtlStringCchCatW(DstPath, ARRAYSIZE(DstPath), L".sav"); DPRINT1("Copy hive: %S ==> %S\n", SrcPath, DstPath); Status = SetupCopyFile(SrcPath, DstPath, FALSE); diff --git a/base/setup/lib/settings.c b/base/setup/lib/settings.c index 4e27d0300f..060c671b41 100644 --- a/base/setup/lib/settings.c +++ b/base/setup/lib/settings.c @@ -422,7 +422,7 @@ DefaultProcessEntry( } wcscpy((PWCHAR)*UserData, KeyName); - wcscpy(DisplayText, KeyValue); + RtlStringCbCopyW(DisplayText, DisplayTextSize, KeyValue); *Current = (CompareKey ? !_wcsicmp(KeyName, CompareKey) : FALSE); @@ -483,7 +483,7 @@ CreateComputerTypeList( } DPRINT("Computer key: %S\n", KeyName); - wcscpy(ComputerKey, KeyName); + RtlStringCchCopyW(ComputerKey, ARRAYSIZE(ComputerKey), KeyName); INF_FreeData(KeyName); } while (SetupFindNextLine(&Context, &Context)); @@ -548,7 +548,7 @@ GetDisplayIdentifier( BusInstance = 0; while (TRUE) { - swprintf(Buffer, L"%lu", BusInstance); + RtlStringCchPrintfW(Buffer, ARRAYSIZE(Buffer), L"%lu", BusInstance); RtlInitUnicodeString(&KeyName, Buffer); InitializeObjectAttributes(&ObjectAttributes, &KeyName, @@ -584,7 +584,7 @@ GetDisplayIdentifier( while (TRUE) { /* Open the pointer controller instance key */ - swprintf(Buffer, L"%lu", ControllerInstance); + RtlStringCchPrintfW(Buffer, ARRAYSIZE(Buffer), L"%lu", ControllerInstance); RtlInitUnicodeString(&KeyName, Buffer); InitializeObjectAttributes(&ObjectAttributes, &KeyName, @@ -719,7 +719,7 @@ CreateDisplayDriverList( } DPRINT("Display key: %S\n", KeyName); - wcscpy(DisplayKey, KeyName); + RtlStringCchCopyW(DisplayKey, ARRAYSIZE(DisplayKey), KeyName); INF_FreeData(KeyName); } while (SetupFindNextLine(&Context, &Context)); @@ -764,8 +764,8 @@ ProcessComputerFiles( return FALSE; } - wcscpy(SectionName, L"Files."); - wcscat(SectionName, (const wchar_t*)GetListEntryUserData(Entry)); + RtlStringCchPrintfW(SectionName, ARRAYSIZE(SectionName), + L"Files.%s", (PCWSTR)GetListEntryUserData(Entry)); *AdditionalSectionName = SectionName; return TRUE; @@ -813,7 +813,9 @@ ProcessDisplayRegistry( ASSERT(wcslen(ServiceName) < 10); DPRINT1("Service name: '%S'\n", ServiceName); - swprintf(RegPath, L"System\\CurrentControlSet\\Services\\%s", ServiceName); + RtlStringCchPrintfW(RegPath, ARRAYSIZE(RegPath), + L"System\\CurrentControlSet\\Services\\%s", + ServiceName); RtlInitUnicodeString(&KeyName, RegPath); InitializeObjectAttributes(&ObjectAttributes, &KeyName, @@ -850,9 +852,9 @@ ProcessDisplayRegistry( return FALSE; } - swprintf(RegPath, - L"System\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\%s\\Device0", - ServiceName); + RtlStringCchPrintfW(RegPath, ARRAYSIZE(RegPath), + L"System\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\%s\\Device0", + ServiceName); DPRINT1("RegPath: '%S'\n", RegPath); RtlInitUnicodeString(&KeyName, RegPath); InitializeObjectAttributes(&ObjectAttributes, @@ -1110,7 +1112,7 @@ ProcessLangEntry( } wcscpy((PWCHAR)*UserData, KeyName); - wcscpy(DisplayText, KeyValue); + RtlStringCbCopyW(DisplayText, DisplayTextSize, KeyValue); *Current = FALSE; diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index c5a8a6f981..38d5b58f1f 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -16,9 +16,6 @@ #include "setuplib.h" -// HACK! -#include <strsafe.h> - #define NDEBUG #include <debug.h> @@ -147,7 +144,11 @@ CheckUnattendedSetup( DPRINT("INF_GetData() failed for key 'InstallationDirectory'\n"); goto Quit; } - wcscpy(pSetupData->InstallationDirectory, Value); + + RtlStringCchCopyW(pSetupData->InstallationDirectory, + ARRAYSIZE(pSetupData->InstallationDirectory), + Value); + INF_FreeData(Value); } @@ -189,7 +190,9 @@ CheckUnattendedSetup( if (INF_GetData(&Context, NULL, &Value)) { LONG Id = wcstol(Value, NULL, 16); - swprintf(pSetupData->LocaleID, L"%08lx", Id); + RtlStringCchPrintfW(pSetupData->LocaleID, + ARRAYSIZE(pSetupData->LocaleID), + L"%08lx", Id); INF_FreeData(Value); } } @@ -233,8 +236,8 @@ InstallSetupInfFile( if (IniSection) { /* Key "skipmissingfiles" */ - // StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), - // L"\"%s\"", L"WinNt5.2"); + // RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + // L"\"%s\"", L"WinNt5.2"); // IniCacheInsertKey(IniSection, NULL, INSERT_LAST, // L"Version", PathBuffer); } @@ -242,20 +245,20 @@ InstallSetupInfFile( IniSection = IniCacheAppendSection(IniCache, L"Data"); if (IniSection) { - StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), - L"\"%s\"", IsUnattendedSetup ? L"yes" : L"no"); + RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"\"%s\"", IsUnattendedSetup ? L"yes" : L"no"); IniCacheInsertKey(IniSection, NULL, INSERT_LAST, L"UnattendedInstall", PathBuffer); // "floppylessbootpath" (yes/no) - StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), - L"\"%s\"", L"winnt"); + RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"\"%s\"", L"winnt"); IniCacheInsertKey(IniSection, NULL, INSERT_LAST, L"ProductType", PathBuffer); - StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), - L"\"%s\\\"", pSetupData->SourceRootPath.Buffer); + RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"\"%s\\\"", pSetupData->SourceRootPath.Buffer); IniCacheInsertKey(IniSection, NULL, INSERT_LAST, L"SourcePath", PathBuffer); @@ -561,7 +564,10 @@ LoadSetupInf( if (!INF_GetData(&Context, NULL, &Value)) return ERROR_CORRUPT_TXTSETUPSIF; - wcscpy(pSetupData->InstallationDirectory, Value); + RtlStringCchCopyW(pSetupData->InstallationDirectory, + ARRAYSIZE(pSetupData->InstallationDirectory), + Value); + INF_FreeData(Value); } diff --git a/base/setup/lib/utils/arcname_tests.c b/base/setup/lib/utils/arcname_tests.c index deba131552..4f86546a8b 100644 --- a/base/setup/lib/utils/arcname_tests.c +++ b/base/setup/lib/utils/arcname_tests.c @@ -20,8 +20,6 @@ #include <ntstatus.h> -#include <strsafe.h> - #include "arcname.h" #define OBJ_NAME_PATH_SEPARATOR ((WCHAR)L'\\') diff --git a/base/setup/lib/utils/genlist.c b/base/setup/lib/utils/genlist.c index 919b5243cc..209da60058 100644 --- a/base/setup/lib/utils/genlist.c +++ b/base/setup/lib/utils/genlist.c @@ -21,9 +21,7 @@ CreateGenericList(VOID) { PGENERIC_LIST List; - List = (PGENERIC_LIST)RtlAllocateHeap(ProcessHeap, - 0, - sizeof(GENERIC_LIST)); + List = RtlAllocateHeap(ProcessHeap, 0, sizeof(GENERIC_LIST)); if (List == NULL) return NULL; @@ -70,15 +68,15 @@ AppendGenericListEntry( IN BOOLEAN Current) { PGENERIC_LIST_ENTRY Entry; + SIZE_T TextSize; - Entry = (PGENERIC_LIST_ENTRY)RtlAllocateHeap(ProcessHeap, - 0, - sizeof(GENERIC_LIST_ENTRY) + - (wcslen(Text) + 1) * sizeof(WCHAR)); + TextSize = (wcslen(Text) + 1) * sizeof(WCHAR); + Entry = RtlAllocateHeap(ProcessHeap, 0, + sizeof(GENERIC_LIST_ENTRY) + TextSize); if (Entry == NULL) return FALSE; - wcscpy(Entry->Text, Text); + RtlStringCbCopyW(Entry->Text, TextSize, Text); Entry->List = List; Entry->UserData = UserData; diff --git a/base/setup/lib/utils/regutil.c b/base/setup/lib/utils/regutil.c index 2ede224164..54bc7c260d 100644 --- a/base/setup/lib/utils/regutil.c +++ b/base/setup/lib/utils/regutil.c @@ -13,9 +13,6 @@ #include "regutil.h" -// HACK! -#include <strsafe.h> - #define NDEBUG #include <debug.h> @@ -180,7 +177,8 @@ CreateRegistryFile( // i = 1; /* Try first by just appending the '.old' extension */ - StringCchPrintfW(PathBuffer2, ARRAYSIZE(PathBuffer2), L"%s.%s", PathBuffer, Extension); + RtlStringCchPrintfW(PathBuffer2, ARRAYSIZE(PathBuffer2), + L"%s.%s", PathBuffer, Extension); #if 0 while (DoesFileExist(NULL, PathBuffer2)) { @@ -188,7 +186,8 @@ CreateRegistryFile( if (i <= 0xFFFF) { /* Append '_N.old' extension */ - StringCchPrintfW(PathBuffer2, ARRAYSIZE(PathBuffer2), L"%s_%lu.%s", PathBuffer, i, Extension); + RtlStringCchPrintfW(PathBuffer2, ARRAYSIZE(PathBuffer2), + L"%s_%lu.%s", PathBuffer, i, Extension); ++i; } else @@ -197,7 +196,8 @@ CreateRegistryFile( * Too many old files exist, we will rename the file * using the name of the oldest one. */ - StringCchPrintfW(PathBuffer2, ARRAYSIZE(PathBuffer2), L"%s.%s", PathBuffer, Extension); + RtlStringCchPrintfW(PathBuffer2, ARRAYSIZE(PathBuffer2), + L"%s.%s", PathBuffer, Extension); break; } } diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 9106d0dcab..b9ba8eea2f 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -36,9 +36,6 @@ #define NDEBUG #include <debug.h> -// HACK! -#include <strsafe.h> - /* GLOBALS & LOCALS *********************************************************/ @@ -1679,7 +1676,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) return SELECT_PARTITION_PAGE; } - StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"\\Device\\Harddisk%lu\\Partition%lu\\", PartitionList->CurrentDisk->DiskNumber, PartitionList->CurrentPartition->PartitionNumber); @@ -3007,7 +3004,7 @@ FormatPartitionPage(PINPUT_RECORD Ir) } /* Set PartitionRootPath */ - StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"\\Device\\Harddisk%lu\\Partition%lu", DiskEntry->DiskNumber, PartEntry->PartitionNumber); @@ -3080,7 +3077,7 @@ CheckFileSystemPage(PINPUT_RECORD Ir) } /* Set PartitionRootPath */ - StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"\\Device\\Harddisk%lu\\Partition%lu", DiskEntry->DiskNumber, PartEntry->PartitionNumber); @@ -3171,7 +3168,7 @@ BuildInstallPaths(PWSTR InstallDir, /* Create 'USetupData.DestinationRootPath' string */ RtlFreeUnicodeString(&USetupData.DestinationRootPath); - StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"\\Device\\Harddisk%lu\\Partition%lu\\", DiskEntry->DiskNumber, PartEntry->PartitionNumber); @@ -3188,7 +3185,7 @@ BuildInstallPaths(PWSTR InstallDir, /** Equivalent of 'NTOS_INSTALLATION::SystemArcPath' **/ /* Create 'USetupData.DestinationArcPath' */ RtlFreeUnicodeString(&USetupData.DestinationArcPath); - StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"multi(0)disk(0)rdisk(%lu)partition(%lu)\\", DiskEntry->BiosDiskNumber, PartEntry->PartitionNumber); @@ -3598,8 +3595,8 @@ AddSectionToCopyQueue(HINF InfFile, /* Installation path */ DPRINT("InstallationPath: '%S'\n", DirKeyValue); - StringCchCopyW(CompleteOrigDirName, ARRAYSIZE(CompleteOrigDirName), - USetupData.SourceRootDir.Buffer); + RtlStringCchCopyW(CompleteOrigDirName, ARRAYSIZE(CompleteOrigDirName), + USetupData.SourceRootDir.Buffer); DPRINT("InstallationPath(2): '%S'\n", CompleteOrigDirName); } @@ -3608,8 +3605,8 @@ AddSectionToCopyQueue(HINF InfFile, /* Absolute path */ DPRINT("AbsolutePath: '%S'\n", DirKeyValue); - StringCchCopyW(CompleteOrigDirName, ARRAYSIZE(CompleteOrigDirName), - DirKeyValue); + RtlStringCchCopyW(CompleteOrigDirName, ARRAYSIZE(CompleteOrigDirName), + DirKeyValue); DPRINT("AbsolutePath(2): '%S'\n", CompleteOrigDirName); } @@ -3684,7 +3681,7 @@ PrepareCopyPageInfFile(HINF InfFile, */ /* Get destination path */ - StringCchCopyW(PathBuffer, ARRAYSIZE(PathBuffer), USetupData.DestinationPath.Buffer); + RtlStringCchCopyW(PathBuffer, ARRAYSIZE(PathBuffer), USetupData.DestinationPath.Buffer); DPRINT("FullPath(1): '%S'\n", PathBuffer); @@ -3726,8 +3723,8 @@ PrepareCopyPageInfFile(HINF InfFile, /* Installation path */ DPRINT("InstallationPath: '%S'\n", DirKeyValue); - StringCchCopyW(PathBuffer, ARRAYSIZE(PathBuffer), - USetupData.DestinationPath.Buffer); + RtlStringCchCopyW(PathBuffer, ARRAYSIZE(PathBuffer), + USetupData.DestinationPath.Buffer); DPRINT("InstallationPath(2): '%S'\n", PathBuffer); } @@ -4321,7 +4318,7 @@ BootLoaderPage(PINPUT_RECORD Ir) CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); RtlFreeUnicodeString(&USetupData.SystemRootPath); - StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"\\Device\\Harddisk%lu\\Partition%lu\\", PartitionList->SystemPartition->DiskEntry->DiskNumber, PartitionList->SystemPartition->PartitionNumber); @@ -4620,7 +4617,7 @@ BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) } /* Step 2: Write the MBR */ - StringCchPrintfW(DestinationDevicePathBuffer, ARRAYSIZE(DestinationDevicePathBuffer), + RtlStringCchPrintfW(DestinationDevicePathBuffer, ARRAYSIZE(DestinationDevicePathBuffer), L"\\Device\\Harddisk%d\\Partition0", PartitionList->SystemPartition->DiskEntry->DiskNumber); Status = InstallMbrBootCodeToDisk(&USetupData.SystemRootPath, diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h index 2bbb879c54..61971f1432 100644 --- a/base/setup/usetup/usetup.h +++ b/base/setup/usetup/usetup.h @@ -52,6 +52,7 @@ #include <ntstrsafe.h> + /* Setup library headers */ #include <reactos/rosioctl.h> #include <../lib/setuplib.h>

1 0

03/13: [SETUPLIB][USETUP] Make the GENERIC_LIST store the items display text in UNICODE (and not in ANSI).
by Hermès Bélusca-Maïto 28 Oct '18

28 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=254aa472e823a41a7ca97… commit 254aa472e823a41a7ca979ff82d318badfac04f8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 3 19:46:26 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 28 00:30:54 2018 +0200 [SETUPLIB][USETUP] Make the GENERIC_LIST store the items display text in UNICODE (and not in ANSI). Only convert to ANSI when needed (e.g. in the display code for usetup). The 1st-stage GUI setup will however use the UNICODE strings directly. svn path=/branches/setup_improvements/; revision=75753 --- base/setup/lib/settings.c | 14 +++++++------- base/setup/lib/utils/genlist.c | 9 +++++---- base/setup/lib/utils/genlist.h | 6 +++--- base/setup/lib/utils/osdetect.c | 4 +--- base/setup/usetup/genlist.c | 22 ++++++++++++++++------ base/setup/usetup/genlist.h | 3 +++ base/setup/usetup/usetup.c | 13 +++++++++---- 7 files changed, 44 insertions(+), 27 deletions(-) diff --git a/base/setup/lib/settings.c b/base/setup/lib/settings.c index bf9a804929..4e27d0300f 100644 --- a/base/setup/lib/settings.c +++ b/base/setup/lib/settings.c @@ -323,7 +323,7 @@ typedef UCHAR (NTAPI *PPROCESS_ENTRY_ROUTINE)( IN PWCHAR KeyName, IN PWCHAR KeyValue, - IN PCHAR DisplayText, + OUT PWCHAR DisplayText, IN SIZE_T DisplayTextSize, OUT PVOID* UserData, OUT PBOOLEAN Current, @@ -344,7 +344,7 @@ AddEntriesFromInfSection( PVOID UserData; BOOLEAN Current; UCHAR RetVal; - CHAR DisplayText[128]; + WCHAR DisplayText[128]; if (!SetupFindFirstLineW(InfFile, SectionName, NULL, pContext)) return -1; @@ -404,7 +404,7 @@ NTAPI DefaultProcessEntry( IN PWCHAR KeyName, IN PWCHAR KeyValue, - IN PCHAR DisplayText, + OUT PWCHAR DisplayText, IN SIZE_T DisplayTextSize, OUT PVOID* UserData, OUT PBOOLEAN Current, @@ -422,7 +422,7 @@ DefaultProcessEntry( } wcscpy((PWCHAR)*UserData, KeyName); - sprintf(DisplayText, "%S", KeyValue); + wcscpy(DisplayText, KeyValue); *Current = (CompareKey ? !_wcsicmp(KeyName, CompareKey) : FALSE); @@ -739,7 +739,7 @@ CreateDisplayDriverList( } #if 0 - AppendGenericListEntry(List, "Other display driver", NULL, TRUE); + AppendGenericListEntry(List, L"Other display driver", NULL, TRUE); #endif return List; @@ -1086,7 +1086,7 @@ NTAPI ProcessLangEntry( IN PWCHAR KeyName, IN PWCHAR KeyValue, - IN PCHAR DisplayText, + OUT PWCHAR DisplayText, IN SIZE_T DisplayTextSize, OUT PVOID* UserData, OUT PBOOLEAN Current, @@ -1110,7 +1110,7 @@ ProcessLangEntry( } wcscpy((PWCHAR)*UserData, KeyName); - sprintf(DisplayText, "%S", KeyValue); + wcscpy(DisplayText, KeyValue); *Current = FALSE; diff --git a/base/setup/lib/utils/genlist.c b/base/setup/lib/utils/genlist.c index 1795895a78..919b5243cc 100644 --- a/base/setup/lib/utils/genlist.c +++ b/base/setup/lib/utils/genlist.c @@ -65,7 +65,7 @@ DestroyGenericList( BOOLEAN AppendGenericListEntry( IN OUT PGENERIC_LIST List, - IN PCHAR Text, + IN PCWSTR Text, IN PVOID UserData, IN BOOLEAN Current) { @@ -73,11 +73,12 @@ AppendGenericListEntry( Entry = (PGENERIC_LIST_ENTRY)RtlAllocateHeap(ProcessHeap, 0, - sizeof(GENERIC_LIST_ENTRY) + strlen(Text)); + sizeof(GENERIC_LIST_ENTRY) + + (wcslen(Text) + 1) * sizeof(WCHAR)); if (Entry == NULL) return FALSE; - strcpy (Entry->Text, Text); + wcscpy(Entry->Text, Text); Entry->List = List; Entry->UserData = UserData; @@ -138,7 +139,7 @@ GetListEntryUserData( return Entry->UserData; } -LPCSTR +PCWSTR GetListEntryText( IN PGENERIC_LIST_ENTRY Entry) { diff --git a/base/setup/lib/utils/genlist.h b/base/setup/lib/utils/genlist.h index 56210891c1..ca8696d957 100644 --- a/base/setup/lib/utils/genlist.h +++ b/base/setup/lib/utils/genlist.h @@ -12,7 +12,7 @@ typedef struct _GENERIC_LIST_ENTRY LIST_ENTRY Entry; struct _GENERIC_LIST* List; PVOID UserData; - CHAR Text[1]; // FIXME: UI stuff + WCHAR Text[1]; // FIXME: UI stuff } GENERIC_LIST_ENTRY, *PGENERIC_LIST_ENTRY; @@ -38,7 +38,7 @@ DestroyGenericList( BOOLEAN AppendGenericListEntry( IN OUT PGENERIC_LIST List, - IN PCHAR Text, + IN PCWSTR Text, IN PVOID UserData, IN BOOLEAN Current); @@ -63,7 +63,7 @@ PVOID GetListEntryUserData( IN PGENERIC_LIST_ENTRY Entry); -LPCSTR +PCWSTR GetListEntryText( IN PGENERIC_LIST_ENTRY Entry); diff --git a/base/setup/lib/utils/osdetect.c b/base/setup/lib/utils/osdetect.c index a82b04c291..fdfd5ba02a 100644 --- a/base/setup/lib/utils/osdetect.c +++ b/base/setup/lib/utils/osdetect.c @@ -575,7 +575,6 @@ AddNTOSInstallation( { PNTOS_INSTALLATION NtOsInstall; SIZE_T ArcPathLength, NtPathLength; - CHAR InstallNameA[MAX_PATH]; /* Is there already any installation with these settings? */ NtOsInstall = FindExistingNTOSInstall(List, SystemRootArcPath, SystemRootNtPath); @@ -623,8 +622,7 @@ AddNTOSInstallation( InstallationName); // Having the GENERIC_LIST storing the display item string plainly sucks... - RtlStringCchPrintfA(InstallNameA, ARRAYSIZE(InstallNameA), "%S", InstallationName); - AppendGenericListEntry(List, InstallNameA, NtOsInstall, FALSE); + AppendGenericListEntry(List, InstallationName, NtOsInstall, FALSE); return NtOsInstall; } diff --git a/base/setup/usetup/genlist.c b/base/setup/usetup/genlist.c index 773dd1b14b..d0b7a63875 100644 --- a/base/setup/usetup/genlist.c +++ b/base/setup/usetup/genlist.c @@ -47,6 +47,8 @@ InitGenericListUi( ListUi->Right = 0; ListUi->Bottom = 0; ListUi->Redraw = TRUE; + + ListUi->CurrentItemText[0] = ANSI_NULL; } static @@ -157,6 +159,8 @@ DrawListEntries( break; ListUi->LastShown = Entry; + sprintf(ListUi->CurrentItemText, "%S", ListEntry->Text); + FillConsoleOutputAttribute(StdOutput, (List->CurrentEntry == ListEntry) ? FOREGROUND_BLUE | BACKGROUND_WHITE : @@ -173,8 +177,8 @@ DrawListEntries( coPos.X++; WriteConsoleOutputCharacterA(StdOutput, - ListEntry->Text, - min(strlen(ListEntry->Text), (SIZE_T)Width - 2), + ListUi->CurrentItemText, + min(strlen(ListUi->CurrentItemText), (SIZE_T)Width - 2), coPos, &Written); coPos.X--; @@ -414,7 +418,7 @@ ScrollPageUpGenericList( for (i = ListUi->Bottom - 1; i > ListUi->Top + 1; i--) { - ScrollUpGenericList(ListUi); + ScrollUpGenericList(ListUi); } /* Update user interface */ @@ -489,13 +493,17 @@ GenericListKeyPress( ListUi->Redraw = FALSE; - if ((strlen(ListEntry->Text) > 0) && (tolower(ListEntry->Text[0]) == AsciiChar) && + sprintf(ListUi->CurrentItemText, "%S", ListEntry->Text); + + if ((strlen(ListUi->CurrentItemText) > 0) && (tolower(ListUi->CurrentItemText[0]) == AsciiChar) && (List->CurrentEntry->Entry.Flink != &List->ListHead)) { ScrollDownGenericList(ListUi); ListEntry = List->CurrentEntry; - if ((strlen(ListEntry->Text) > 0) && (tolower(ListEntry->Text[0]) == AsciiChar)) + sprintf(ListUi->CurrentItemText, "%S", ListEntry->Text); + + if ((strlen(ListUi->CurrentItemText) > 0) && (tolower(ListUi->CurrentItemText[0]) == AsciiChar)) goto End; } @@ -506,7 +514,9 @@ GenericListKeyPress( for (;;) { - if ((strlen(ListEntry->Text) > 0) && (tolower(ListEntry->Text[0]) == AsciiChar)) + sprintf(ListUi->CurrentItemText, "%S", ListEntry->Text); + + if ((strlen(ListUi->CurrentItemText) > 0) && (tolower(ListUi->CurrentItemText[0]) == AsciiChar)) { Flag = TRUE; break; diff --git a/base/setup/usetup/genlist.h b/base/setup/usetup/genlist.h index 0799a63ef7..5e85800fd6 100644 --- a/base/setup/usetup/genlist.h +++ b/base/setup/usetup/genlist.h @@ -40,6 +40,9 @@ typedef struct _GENERIC_LIST_UI SHORT Right; SHORT Bottom; BOOL Redraw; + + CHAR CurrentItemText[256]; + } GENERIC_LIST_UI, *PGENERIC_LIST_UI; VOID diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index a5764589ef..9106d0dcab 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -1093,6 +1093,7 @@ static PAGE_NUMBER DeviceSettingsPage(PINPUT_RECORD Ir) { static ULONG Line = 16; + CHAR CurrentItemText[256]; /* Initialize the computer settings list */ if (ComputerList == NULL) @@ -1147,10 +1148,14 @@ DeviceSettingsPage(PINPUT_RECORD Ir) MUIDisplayPage(DEVICE_SETTINGS_PAGE); - CONSOLE_SetTextXY(25, 11, GetListEntryText(GetCurrentListEntry(ComputerList))); - CONSOLE_SetTextXY(25, 12, GetListEntryText(GetCurrentListEntry(DisplayList))); - CONSOLE_SetTextXY(25, 13, GetListEntryText(GetCurrentListEntry(KeyboardList))); - CONSOLE_SetTextXY(25, 14, GetListEntryText(GetCurrentListEntry(LayoutList))); + sprintf(CurrentItemText, "%S", GetListEntryText(GetCurrentListEntry(ComputerList))); + CONSOLE_SetTextXY(25, 11, CurrentItemText); + sprintf(CurrentItemText, "%S", GetListEntryText(GetCurrentListEntry(DisplayList))); + CONSOLE_SetTextXY(25, 12, CurrentItemText); + sprintf(CurrentItemText, "%S", GetListEntryText(GetCurrentListEntry(KeyboardList))); + CONSOLE_SetTextXY(25, 13, CurrentItemText); + sprintf(CurrentItemText, "%S", GetListEntryText(GetCurrentListEntry(LayoutList))); + CONSOLE_SetTextXY(25, 14, CurrentItemText); CONSOLE_InvertTextXY(24, Line, 48, 1);

1 0

02/13: [USETUP] Whitespace fixes only.
by Hermès Bélusca-Maïto 28 Oct '18

28 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b86d19e9369ed7828d144… commit b86d19e9369ed7828d144a486e1bdc10da80848d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 3 19:31:36 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 28 00:26:20 2018 +0200 [USETUP] Whitespace fixes only. svn path=/branches/setup_improvements/; revision=75752 --- base/setup/usetup/genlist.c | 167 ++++++++++++++++++++++---------------------- 1 file changed, 84 insertions(+), 83 deletions(-) diff --git a/base/setup/usetup/genlist.c b/base/setup/usetup/genlist.c index 67f12edebe..773dd1b14b 100644 --- a/base/setup/usetup/genlist.c +++ b/base/setup/usetup/genlist.c @@ -16,7 +16,8 @@ * 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 +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/genlist.c * PURPOSE: Generic list functions @@ -60,75 +61,75 @@ DrawListFrame( /* Draw upper left corner */ coPos.X = ListUi->Left; coPos.Y = ListUi->Top; - FillConsoleOutputCharacterA (StdOutput, - 0xDA, // '+', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xDA, // '+', + 1, + coPos, + &Written); /* Draw upper edge */ coPos.X = ListUi->Left + 1; coPos.Y = ListUi->Top; - FillConsoleOutputCharacterA (StdOutput, - 0xC4, // '-', - ListUi->Right - ListUi->Left - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xC4, // '-', + ListUi->Right - ListUi->Left - 1, + coPos, + &Written); /* Draw upper right corner */ coPos.X = ListUi->Right; coPos.Y = ListUi->Top; - FillConsoleOutputCharacterA (StdOutput, - 0xBF, // '+', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xBF, // '+', + 1, + coPos, + &Written); /* Draw left and right edge */ for (i = ListUi->Top + 1; i < ListUi->Bottom; i++) { coPos.X = ListUi->Left; coPos.Y = i; - FillConsoleOutputCharacterA (StdOutput, - 0xB3, // '|', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xB3, // '|', + 1, + coPos, + &Written); coPos.X = ListUi->Right; - FillConsoleOutputCharacterA (StdOutput, - 0xB3, //'|', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xB3, //'|', + 1, + coPos, + &Written); } /* Draw lower left corner */ coPos.X = ListUi->Left; coPos.Y = ListUi->Bottom; - FillConsoleOutputCharacterA (StdOutput, - 0xC0, // '+', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xC0, // '+', + 1, + coPos, + &Written); /* Draw lower edge */ coPos.X = ListUi->Left + 1; coPos.Y = ListUi->Bottom; - FillConsoleOutputCharacterA (StdOutput, - 0xC4, // '-', - ListUi->Right - ListUi->Left - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xC4, // '-', + ListUi->Right - ListUi->Left - 1, + coPos, + &Written); /* Draw lower right corner */ coPos.X = ListUi->Right; coPos.Y = ListUi->Bottom; - FillConsoleOutputCharacterA (StdOutput, - 0xD9, // '+', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xD9, // '+', + 1, + coPos, + &Written); } static @@ -156,26 +157,26 @@ DrawListEntries( break; ListUi->LastShown = Entry; - FillConsoleOutputAttribute (StdOutput, - (List->CurrentEntry == ListEntry) ? - FOREGROUND_BLUE | BACKGROUND_WHITE : - FOREGROUND_WHITE | BACKGROUND_BLUE, + FillConsoleOutputAttribute(StdOutput, + (List->CurrentEntry == ListEntry) ? + FOREGROUND_BLUE | BACKGROUND_WHITE : + FOREGROUND_WHITE | BACKGROUND_BLUE, + Width, + coPos, + &Written); + + FillConsoleOutputCharacterA(StdOutput, + ' ', Width, coPos, &Written); - FillConsoleOutputCharacterA (StdOutput, - ' ', - Width, + coPos.X++; + WriteConsoleOutputCharacterA(StdOutput, + ListEntry->Text, + min(strlen(ListEntry->Text), (SIZE_T)Width - 2), coPos, &Written); - - coPos.X++; - WriteConsoleOutputCharacterA (StdOutput, - ListEntry->Text, - min (strlen(ListEntry->Text), (SIZE_T)Width - 2), - coPos, - &Written); coPos.X--; coPos.Y++; @@ -184,17 +185,17 @@ DrawListEntries( while (coPos.Y < ListUi->Bottom) { - FillConsoleOutputAttribute (StdOutput, - FOREGROUND_WHITE | BACKGROUND_BLUE, + FillConsoleOutputAttribute(StdOutput, + FOREGROUND_WHITE | BACKGROUND_BLUE, + Width, + coPos, + &Written); + + FillConsoleOutputCharacterA(StdOutput, + ' ', Width, coPos, &Written); - - FillConsoleOutputCharacterA (StdOutput, - ' ', - Width, - coPos, - &Written); coPos.Y++; } } @@ -213,37 +214,37 @@ DrawScrollBarGenericList( if (ListUi->FirstShown != List->ListHead.Flink) { - FillConsoleOutputCharacterA (StdOutput, - '\x18', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + '\x18', + 1, + coPos, + &Written); } else { - FillConsoleOutputCharacterA (StdOutput, - ' ', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + ' ', + 1, + coPos, + &Written); } coPos.Y = ListUi->Bottom; if (ListUi->LastShown != List->ListHead.Blink) { - FillConsoleOutputCharacterA (StdOutput, - '\x19', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + '\x19', + 1, + coPos, + &Written); } else { - FillConsoleOutputCharacterA (StdOutput, - ' ', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + ' ', + 1, + coPos, + &Written); } }

1 0

01/13: [SETUPLIB][USETUP] Move the floppy-disk accessibility check into InstallFatBootcodeToFloppy().
by Hermès Bélusca-Maïto 28 Oct '18

28 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d93100afce502da09c23… commit 9d93100afce502da09c23b583b0e40154c5c181c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 3 16:19:59 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 28 00:25:51 2018 +0200 [SETUPLIB][USETUP] Move the floppy-disk accessibility check into InstallFatBootcodeToFloppy(). svn path=/branches/setup_improvements/; revision=75751 --- base/setup/lib/bootsup.c | 6 +++++- base/setup/usetup/usetup.c | 17 +++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/base/setup/lib/bootsup.c b/base/setup/lib/bootsup.c index 7ea6240b9a..0ef4e8241e 100644 --- a/base/setup/lib/bootsup.c +++ b/base/setup/lib/bootsup.c @@ -2303,7 +2303,11 @@ InstallFatBootcodeToFloppy( WCHAR SrcPath[MAX_PATH]; WCHAR DstPath[MAX_PATH]; - /* Format the floppy first */ + /* Verify that the floppy disk is accessible */ + if (DoesDirExist(NULL, FloppyDevice.Buffer) == FALSE) + return STATUS_DEVICE_NOT_READY; + + /* Format the floppy disk */ FatFS = GetFileSystemByName(L"FAT"); if (!FatFS) { diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index f29935b41b..a5764589ef 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -4532,16 +4532,14 @@ BootLoaderFloppyPage(PINPUT_RECORD Ir) } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { - if (DoesDirExist(NULL, L"\\Device\\Floppy0\\") == FALSE) - { - MUIDisplayError(ERROR_NO_FLOPPY, Ir, POPUP_WAIT_ENTER); - return BOOT_LOADER_FLOPPY_PAGE; - } - - Status = InstallFatBootcodeToFloppy(&USetupData.SourceRootPath, &USetupData.DestinationArcPath); + Status = InstallFatBootcodeToFloppy(&USetupData.SourceRootPath, + &USetupData.DestinationArcPath); if (!NT_SUCCESS(Status)) { - /* Print error message */ + if (Status == STATUS_DEVICE_NOT_READY) + MUIDisplayError(ERROR_NO_FLOPPY, Ir, POPUP_WAIT_ENTER); + + /* TODO: Print error message */ return BOOT_LOADER_FLOPPY_PAGE; } @@ -4625,8 +4623,7 @@ BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) DestinationDevicePathBuffer); if (!NT_SUCCESS(Status)) { - DPRINT1("InstallMbrBootCodeToDisk() failed (Status %lx)\n", - Status); + DPRINT1("InstallMbrBootCodeToDisk() failed (Status %lx)\n", Status); MUIDisplayError(ERROR_INSTALL_BOOTCODE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; }

1 0

02/02: [USETUP] Resources: fix a typo.
by Hermès Bélusca-Maïto 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aab937715b3ef02d9f13d… commit aab937715b3ef02d9f13db6446789236bfedf8c5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 3 12:08:39 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 28 00:13:09 2018 +0200 [USETUP] Resources: fix a typo. svn path=/branches/setup_improvements/; revision=75748 --- base/setup/usetup/lang/bg-BG.h | 2 +- base/setup/usetup/lang/bn-BD.h | 2 +- base/setup/usetup/lang/cs-CZ.h | 2 +- base/setup/usetup/lang/da-DK.h | 2 +- base/setup/usetup/lang/de-DE.h | 2 +- base/setup/usetup/lang/el-GR.h | 2 +- base/setup/usetup/lang/en-US.h | 2 +- base/setup/usetup/lang/es-ES.h | 2 +- base/setup/usetup/lang/et-EE.h | 2 +- base/setup/usetup/lang/fr-FR.h | 2 +- base/setup/usetup/lang/he-IL.h | 2 +- base/setup/usetup/lang/it-IT.h | 2 +- base/setup/usetup/lang/ja-JP.h | 2 +- base/setup/usetup/lang/lt-LT.h | 2 +- base/setup/usetup/lang/ms-MY.h | 2 +- base/setup/usetup/lang/nl-NL.h | 2 +- base/setup/usetup/lang/pl-PL.h | 2 +- base/setup/usetup/lang/pt-BR.h | 2 +- base/setup/usetup/lang/ro-RO.h | 2 +- base/setup/usetup/lang/ru-RU.h | 2 +- base/setup/usetup/lang/sk-SK.h | 2 +- base/setup/usetup/lang/sq-AL.h | 2 +- base/setup/usetup/lang/sv-SE.h | 2 +- base/setup/usetup/lang/tr-TR.h | 2 +- base/setup/usetup/lang/uk-UA.h | 2 +- base/setup/usetup/mui.h | 2 +- base/setup/usetup/usetup.c | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index e493058e21..214ff21bfd 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -1845,7 +1845,7 @@ MUI_STRING bgBGStrings[] = " ��६���� ॣ��୨� ஥��..."}, {STRING_IMPORTFILE, " ��ﭥ �� %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " ��६���� ॣ��஢�� ன�� ࠭�..."}, {STRING_LOCALESETTINGSUPDATE, " ��६���� ⭨� ��ன��..."}, diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index 72e00614d1..a0632f5f5b 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -1833,7 +1833,7 @@ MUI_STRING bnBDStrings[] = " Updating registry hives..."}, {STRING_IMPORTFILE, " Importing %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Updating display registry settings..."}, {STRING_LOCALESETTINGSUPDATE, " Updating locale settings..."}, diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 3d425c9109..81e82c1f5e 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -1839,7 +1839,7 @@ MUI_STRING csCZStrings[] = " Aktualizuji registr..."}, {STRING_IMPORTFILE, " Importuji %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Aktualizuji nastaven� zobrazen� registru..."}, //display registry settings {STRING_LOCALESETTINGSUPDATE, " Aktualizuji m�stn� nastaven�..."}, diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index 4190c9a862..6ad0d8a04c 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -1847,7 +1847,7 @@ MUI_STRING daDKStrings[] = " Opdatere registreringsdatabasen..."}, {STRING_IMPORTFILE, " Importere %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Opdatere indstillinger for registrering af sk�rm..."}, {STRING_LOCALESETTINGSUPDATE, " Opdatere indstillinger for sprog..."}, diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index e245272bdf..729335f9e7 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -1836,7 +1836,7 @@ MUI_STRING deDEStrings[] = " Registrierungseintr�ge werden aktualisiert..."}, {STRING_IMPORTFILE, " Importiere %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Anzeigeeinstellungen werden aktualisiert..."}, {STRING_LOCALESETTINGSUPDATE, " Lokalisierungseinstellungen werden aktualisiert..."}, diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index ae33c5d946..131b9636ba 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -1851,7 +1851,7 @@ MUI_STRING elGRStrings[] = " �夜�� ਫ਼ �� registry hives..."}, {STRING_IMPORTFILE, " �夜�� %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " �夜�� ਫ਼ �� 婜� ��ᤠ�� 馬..."}, {STRING_LOCALESETTINGSUPDATE, " �夜�� ਫ਼ �� 婜� ��驩��..."}, diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index 065753651c..d526d6d70d 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -1834,7 +1834,7 @@ MUI_STRING enUSStrings[] = " Updating registry hives..."}, {STRING_IMPORTFILE, " Importing %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Updating display registry settings..."}, {STRING_LOCALESETTINGSUPDATE, " Updating locale settings..."}, diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 896c856951..55857836ad 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -1836,7 +1836,7 @@ MUI_STRING esESStrings[] = " Actualizando el �rbol del registro..."}, {STRING_IMPORTFILE, " Importando %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Actualizando configuraci�n del tipo de pantalla..."}, {STRING_LOCALESETTINGSUPDATE, " Actualizando configuraci�n regional..."}, diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index 3e89e58ce0..e4f6bfeb4f 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -1833,7 +1833,7 @@ MUI_STRING etEEStrings[] = " Registritarude uuendamine..."}, {STRING_IMPORTFILE, " %S importimine..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Monitori seadistuse uuendamine registris..."}, {STRING_LOCALESETTINGSUPDATE, " Lokaadi seadistuse uuendamine..."}, diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index 00d7977de9..dfaaf3ace1 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -1851,7 +1851,7 @@ MUI_STRING frFRStrings[] = " Mise � jour de la base de registre..."}, {STRING_IMPORTFILE, " Importe %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Mise � jour des param�tres du registre pour l'�cran..."}, {STRING_LOCALESETTINGSUPDATE, " Mise � jour des param�tres r�gionaux..."}, diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index cdc18bd1c5..7318eb50b2 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -1834,7 +1834,7 @@ MUI_STRING heILStrings[] = " Updating registry hives..."}, {STRING_IMPORTFILE, " �� %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Updating display registry settings..."}, {STRING_LOCALESETTINGSUPDATE, " Updating locale settings..."}, diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index 44b1697638..004e1a888a 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -1839,7 +1839,7 @@ MUI_STRING itITStrings[] = " Aggiornamento degli hives del registro..."}, {STRING_IMPORTFILE, " Importazione di %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Aggiornamento delle impostazioni dello schermo nel registro..."}, {STRING_LOCALESETTINGSUPDATE, " Aggiornamento delle impostazioni di regionalizzazione..."}, diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index a384439c91..6446e7a93a 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -1836,7 +1836,7 @@ MUI_STRING jaJPStrings[] = " ڼ޽�� ʲ�� ..."}, {STRING_IMPORTFILE, " %S � ��߰� ��..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " �ި��ڲ ڼ޽�� ò� �� ..."}, {STRING_LOCALESETTINGSUPDATE, " �� ò� �� ..."}, diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index 0a5479e0ec..b729e4ebad 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -1842,7 +1842,7 @@ MUI_STRING ltLTStrings[] = " Updating registry hives..."}, {STRING_IMPORTFILE, " Importing %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Updating display registry settings..."}, {STRING_LOCALESETTINGSUPDATE, " Updating locale settings..."}, diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index a6858e31cf..d9cd9b9dde 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -1722,7 +1722,7 @@ MUI_STRING msMYStrings[] = " Mengemaskini daftaran gatal..."}, {STRING_IMPORTFILE, " Mengimport %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Mengemaskini seting paparan pendaftaran..."}, {STRING_LOCALESETTINGSUPDATE, " Mengemaskini seting tempatan..."}, diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index 7fc8648df8..322644dcdf 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -1861,7 +1861,7 @@ MUI_STRING nlNLStrings[] = " Bijwerken registerbestanden..."}, {STRING_IMPORTFILE, " Importeren %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Bijwerken beeldscherminstellingen..."}, {STRING_LOCALESETTINGSUPDATE, " Bijwerken systeemtaalinstellingen..."}, diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 43c40b489e..fc487024e7 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -1842,7 +1842,7 @@ MUI_STRING plPLStrings[] = " Uaktualnianie..."}, {STRING_IMPORTFILE, " Importowanie %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Zmiana ustawie� ekranu w rejestrze..."}, {STRING_LOCALESETTINGSUPDATE, " Zmiana wersji j�zykowej..."}, diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 1f074384d9..9139c1337f 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -1866,7 +1866,7 @@ MUI_STRING ptBRStrings[] = " Atualizando a estrutura do registro..."}, {STRING_IMPORTFILE, " Importando %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Atualizando as configura��es de v�deo..."}, {STRING_LOCALESETTINGSUPDATE, " Atualizando as configura��es regionais..."}, diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 97892e89cd..9ce336dbe3 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -1880,7 +1880,7 @@ MUI_STRING roROStrings[] = " Registru �n curs de actualizare..."}, {STRING_IMPORTFILE, " �n curs de importare din %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Registru de configura�ie grafic� �n actualizare..."}, {STRING_LOCALESETTINGSUPDATE, " Particularit��i locale �n actualizare..."}, diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 6fcf7a7442..f256b47b53 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -1833,7 +1833,7 @@ MUI_STRING ruRUStrings[] = " �� ⮢ ॥��..."}, {STRING_IMPORTFILE, " ��஢�� %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " �� ࠬ��஢ �࠭� � ॥��..."}, {STRING_LOCALESETTINGSUPDATE, " �� ࠬ��஢ �몠..."}, diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index ac14f87484..e3754eb015 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -1845,7 +1845,7 @@ MUI_STRING skSKStrings[] = " Aktualizujem polo�ky registrov..."}, {STRING_IMPORTFILE, " Importujem %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Aktualizujem nastavenia obrazovky v registrov..."}, //display registry settings {STRING_LOCALESETTINGSUPDATE, " Aktualizujem miestne nastavenia..."}, diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index e30d2e5846..6cfa881266 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -1840,7 +1840,7 @@ MUI_STRING sqALStrings[] = " Apdejtimi i kosheres s� regjistrit..."}, {STRING_IMPORTFILE, " Importimi %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Apdejtimi i regjistrit p�r ekranin..."}, {STRING_LOCALESETTINGSUPDATE, " Apdejtimi i konfigurimit vendas..."}, diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index f1b496d98c..03d001126c 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -1842,7 +1842,7 @@ MUI_STRING svSEStrings[] = " Uppdaterar registerdatafiler..."}, {STRING_IMPORTFILE, " Importerar %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Uppdaterar sk�rmregisterinst�llningar..."}, {STRING_LOCALESETTINGSUPDATE, " Uppdaterar lokala inst�llningar..."}, diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index d7b4feb8a5..4708de4571 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -1812,7 +1812,7 @@ MUI_STRING trTRStrings[] = " De�er y��nlar� �imdikile�tiriliyor..."}, {STRING_IMPORTFILE, " Al�n�yor: %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " G�r�nt� ayarlar� de�erleri �imdikile�tiriliyor..."}, {STRING_LOCALESETTINGSUPDATE, " Yerli ayarlar �imdikile�tiriliyor..."}, diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index 761ed8e0d8..bed8c91d0e 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -1842,7 +1842,7 @@ MUI_STRING ukUAStrings[] = " �� i� ��..."}, {STRING_IMPORTFILE, " I��㢠�� %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " �� ࠬ��i� ��࠭� � ��i..."}, {STRING_LOCALESETTINGSUPDATE, " �� ࠬ��i� ��i..."}, diff --git a/base/setup/usetup/mui.h b/base/setup/usetup/mui.h index 3dd985f670..45daec3c79 100644 --- a/base/setup/usetup/mui.h +++ b/base/setup/usetup/mui.h @@ -88,7 +88,7 @@ MUIGetString( #define STRING_SETUPCOPYINGFILES 17 #define STRING_REGHIVEUPDATE 20 #define STRING_IMPORTFILE 21 -#define STRING_DISPLAYETTINGSUPDATE 22 +#define STRING_DISPLAYSETTINGSUPDATE 22 #define STRING_LOCALESETTINGSUPDATE 23 #define STRING_KEYBOARDSETTINGSUPDATE 24 #define STRING_CODEPAGEINFOUPDATE 25 diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 88142de6bf..f29935b41b 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -4197,7 +4197,7 @@ DoUpdate: /* See the explanation for this test above */ /* Update display registry settings */ - CONSOLE_SetStatusText(MUIGetString(STRING_DISPLAYETTINGSUPDATE)); + CONSOLE_SetStatusText(MUIGetString(STRING_DISPLAYSETTINGSUPDATE)); if (!ProcessDisplayRegistry(SetupInf, DisplayList)) { MUIDisplayError(ERROR_UPDATE_DISPLAY_SETTINGS, Ir, POPUP_WAIT_ENTER);

1 0

01/02: [SETUPLIB][USETUP][INPUT.CPL] MUI integration with setuplib.
by Hermès Bélusca-Maïto 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e405ad257c0611d115f3f… commit e405ad257c0611d115f3fa7d82c9ca6cf00e6f75 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 30 11:28:52 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 28 00:13:07 2018 +0200 [SETUPLIB][USETUP][INPUT.CPL] MUI integration with setuplib. [SETUPLIB] Copy the mui* files from usetup into the setuplib for later usage, and add mui.c to build. svn path=/branches/setup_improvements/; revision=75711 [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). It may be interesting to retrieve the language parameters from INF file (e.g. intl.inf) (suggested by Giannis). svn path=/branches/setup_improvements/; revision=75715 [SETUPLIB] Add the necessary headers to mui.c to be able to compile. [USETUP] Comment out the languages that don't have any resources. svn path=/branches/setup_improvements/; revision=75716 [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. svn path=/branches/setup_improvements/; revision=75717 [SETUPLIB] Change some string pointer types & function prototypes so that the usetup-specific "SelectedLanguageId" variable is not used in the library. svn path=/branches/setup_improvements/; revision=75719 [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. svn path=/branches/setup_improvements/; revision=75720 svn path=/branches/setup_improvements/; revision=75724 [USETUP] Code adaptations. - 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. svn path=/branches/setup_improvements/; revision=75722 [USETUP] Adjust some MUI & settings calls, following the commits r75719, r75720 and r75721. svn path=/branches/setup_improvements/; revision=75723 [INPUT.CPL] Adjust inclusion of "muifonts.h" (commit 3dbd44f) due to changes introduced in r75711 and r75715. --- base/setup/lib/CMakeLists.txt | 3 + base/setup/{usetup => lib}/lang/af-ZA.h | 0 base/setup/{usetup => lib}/lang/ar-AE.h | 0 base/setup/{usetup => lib}/lang/ar-BH.h | 0 base/setup/{usetup => lib}/lang/ar-DZ.h | 0 base/setup/{usetup => lib}/lang/ar-EG.h | 0 base/setup/{usetup => lib}/lang/ar-IQ.h | 0 base/setup/{usetup => lib}/lang/ar-JO.h | 0 base/setup/{usetup => lib}/lang/ar-KW.h | 0 base/setup/{usetup => lib}/lang/ar-LB.h | 0 base/setup/{usetup => lib}/lang/ar-LY.h | 0 base/setup/{usetup => lib}/lang/ar-MA.h | 0 base/setup/{usetup => lib}/lang/ar-OM.h | 0 base/setup/{usetup => lib}/lang/ar-QA.h | 0 base/setup/{usetup => lib}/lang/ar-SA.h | 0 base/setup/{usetup => lib}/lang/ar-SY.h | 0 base/setup/{usetup => lib}/lang/ar-TN.h | 0 base/setup/{usetup => lib}/lang/ar-YE.h | 0 base/setup/{usetup => lib}/lang/az-AZ.h | 0 base/setup/{usetup => lib}/lang/be-BY.h | 0 base/setup/lib/lang/bg-BG.h | 10 + base/setup/lib/lang/bn-BD.h | 7 + base/setup/{usetup => lib}/lang/bn-IN.h | 0 base/setup/{usetup => lib}/lang/ca-ES.h | 0 .../{usetup/lang/rm-CH.h => lib/lang/cs-CZ.h} | 5 +- base/setup/lib/lang/da-DK.h | 7 + base/setup/{usetup => lib}/lang/de-AT.h | 0 base/setup/{usetup => lib}/lang/de-CH.h | 0 .../{usetup/lang/af-ZA.h => lib/lang/de-DE.h} | 4 +- base/setup/{usetup => lib}/lang/de-LI.h | 0 base/setup/{usetup => lib}/lang/de-LU.h | 0 base/setup/{usetup => lib}/lang/dv-MV.h | 0 .../{usetup/lang/af-ZA.h => lib/lang/el-GR.h} | 4 +- base/setup/{usetup => lib}/lang/en-AU.h | 0 base/setup/{usetup => lib}/lang/en-BZ.h | 0 base/setup/{usetup => lib}/lang/en-CA.h | 0 base/setup/{usetup => lib}/lang/en-CB.h | 0 base/setup/{usetup => lib}/lang/en-GB.h | 0 base/setup/{usetup => lib}/lang/en-IE.h | 0 base/setup/{usetup => lib}/lang/en-JM.h | 0 base/setup/{usetup => lib}/lang/en-NZ.h | 0 base/setup/{usetup => lib}/lang/en-PH.h | 0 base/setup/{usetup => lib}/lang/en-TT.h | 0 .../{usetup/lang/ms-BN.h => lib/lang/en-US.h} | 2 +- base/setup/{usetup => lib}/lang/en-ZA.h | 0 base/setup/{usetup => lib}/lang/en-ZW.h | 0 base/setup/{usetup => lib}/lang/eo-AA.h | 0 base/setup/{usetup => lib}/lang/es-AR.h | 0 base/setup/{usetup => lib}/lang/es-BO.h | 0 base/setup/{usetup => lib}/lang/es-CL.h | 0 base/setup/{usetup => lib}/lang/es-CO.h | 0 base/setup/{usetup => lib}/lang/es-CR.h | 0 base/setup/{usetup => lib}/lang/es-DO.h | 0 base/setup/{usetup => lib}/lang/es-EC.h | 0 .../{usetup/lang/af-ZA.h => lib/lang/es-ES.h} | 4 +- base/setup/{usetup => lib}/lang/es-GT.h | 0 base/setup/{usetup => lib}/lang/es-HN.h | 0 base/setup/{usetup => lib}/lang/es-MX.h | 0 base/setup/{usetup => lib}/lang/es-NI.h | 0 base/setup/{usetup => lib}/lang/es-PA.h | 0 base/setup/{usetup => lib}/lang/es-PE.h | 0 base/setup/{usetup => lib}/lang/es-PR.h | 0 base/setup/{usetup => lib}/lang/es-PY.h | 0 base/setup/{usetup => lib}/lang/es-SV.h | 0 base/setup/{usetup => lib}/lang/es-UY.h | 0 base/setup/{usetup => lib}/lang/es-VE.h | 0 base/setup/lib/lang/et-EE.h | 7 + base/setup/{usetup => lib}/lang/eu-ES.h | 0 base/setup/{usetup => lib}/lang/fa-IR.h | 0 base/setup/{usetup => lib}/lang/fi-FI.h | 0 base/setup/{usetup => lib}/lang/fo-FO.h | 0 base/setup/{usetup => lib}/lang/fr-BE.h | 0 base/setup/{usetup => lib}/lang/fr-CA.h | 0 base/setup/{usetup => lib}/lang/fr-CH.h | 0 .../{usetup/lang/af-ZA.h => lib/lang/fr-FR.h} | 4 +- base/setup/{usetup => lib}/lang/fr-LU.h | 0 base/setup/{usetup => lib}/lang/fr-MC.h | 0 base/setup/{usetup => lib}/lang/gl-ES.h | 0 base/setup/{usetup => lib}/lang/gu-IN.h | 0 .../{usetup/lang/af-ZA.h => lib/lang/he-IL.h} | 4 +- base/setup/{usetup => lib}/lang/hi-IN.h | 0 base/setup/{usetup => lib}/lang/hr-HR.h | 0 base/setup/{usetup => lib}/lang/hu-HU.h | 0 base/setup/{usetup => lib}/lang/hy-AM.h | 0 base/setup/{usetup => lib}/lang/id-ID.h | 0 base/setup/{usetup => lib}/lang/is-IS.h | 0 base/setup/{usetup => lib}/lang/it-CH.h | 0 .../{usetup/lang/af-ZA.h => lib/lang/it-IT.h} | 4 +- base/setup/lib/lang/ja-JP.h | 8 + base/setup/{usetup => lib}/lang/ka-GE.h | 0 base/setup/{usetup => lib}/lang/kk-KZ.h | 0 base/setup/{usetup => lib}/lang/kn-IN.h | 0 base/setup/{usetup => lib}/lang/ko-KR.h | 0 base/setup/{usetup => lib}/lang/kok-IN.h | 0 base/setup/{usetup => lib}/lang/ky-KG.h | 0 .../{usetup/lang/af-ZA.h => lib/lang/lt-LT.h} | 4 +- base/setup/{usetup => lib}/lang/lv-LV.h | 0 base/setup/{usetup => lib}/lang/mk-MK.h | 0 base/setup/{usetup => lib}/lang/mn-MN.h | 0 base/setup/{usetup => lib}/lang/mr-IN.h | 0 base/setup/{usetup => lib}/lang/ms-BN.h | 0 .../{usetup/lang/ms-BN.h => lib/lang/ms-MY.h} | 2 +- base/setup/{usetup => lib}/lang/my-MM.h | 0 base/setup/{usetup => lib}/lang/nl-BE.h | 0 base/setup/lib/lang/nl-NL.h | 9 + base/setup/{usetup => lib}/lang/nn-NO.h | 0 base/setup/{usetup => lib}/lang/pa-IN.h | 0 base/setup/lib/lang/pl-PL.h | 9 + .../{usetup/lang/af-ZA.h => lib/lang/pt-BR.h} | 4 +- base/setup/{usetup => lib}/lang/pt-PT.h | 0 base/setup/{usetup => lib}/lang/rm-CH.h | 0 .../{usetup/lang/af-ZA.h => lib/lang/ro-RO.h} | 4 +- .../{usetup/lang/be-BY.h => lib/lang/ru-RU.h} | 5 +- base/setup/{usetup => lib}/lang/sa-IN.h | 0 base/setup/lib/lang/sk-SK.h | 9 + base/setup/{usetup => lib}/lang/sl-SI.h | 0 base/setup/lib/lang/sq-AL.h | 7 + base/setup/{usetup => lib}/lang/sr-SP.h | 0 base/setup/{usetup => lib}/lang/sv-FI.h | 0 .../{usetup/lang/af-ZA.h => lib/lang/sv-SE.h} | 4 +- base/setup/{usetup => lib}/lang/sw-KE.h | 0 base/setup/{usetup => lib}/lang/syr-SY.h | 0 base/setup/{usetup => lib}/lang/ta-IN.h | 0 base/setup/{usetup => lib}/lang/te-IN.h | 0 base/setup/{usetup => lib}/lang/th-TH.h | 0 base/setup/lib/lang/tr-TR.h | 9 + base/setup/{usetup => lib}/lang/tt-TA.h | 0 .../{usetup/lang/af-ZA.h => lib/lang/uk-UA.h} | 4 +- base/setup/{usetup => lib}/lang/ur-PK.h | 0 base/setup/{usetup => lib}/lang/uz-UZ.h | 0 base/setup/{usetup => lib}/lang/vi-VN.h | 0 base/setup/{usetup => lib}/lang/wa-BE.h | 0 base/setup/{usetup => lib}/lang/zh-CN.h | 0 base/setup/{usetup => lib}/lang/zh-HK.h | 0 base/setup/{usetup => lib}/lang/zh-MO.h | 0 base/setup/{usetup => lib}/lang/zh-SG.h | 0 base/setup/{usetup => lib}/lang/zh-TW.h | 0 base/setup/{usetup => lib}/mui.c | 319 ++----- base/setup/lib/mui.h | 58 ++ base/setup/{usetup => lib}/muifonts.h | 0 base/setup/{usetup => lib}/muilanguages.h | 290 ++++--- base/setup/lib/settings.c | 118 +-- base/setup/lib/settings.h | 77 +- base/setup/lib/setuplib.h | 1 + base/setup/usetup/CMakeLists.txt | 1 - base/setup/usetup/lang/bg-BG.h | 9 - base/setup/usetup/lang/bn-BD.h | 6 - base/setup/usetup/lang/cs-CZ.h | 8 - base/setup/usetup/lang/da-DK.h | 6 - base/setup/usetup/lang/de-DE.h | 7 - base/setup/usetup/lang/el-GR.h | 7 - base/setup/usetup/lang/en-US.h | 6 - base/setup/usetup/lang/es-ES.h | 7 - base/setup/usetup/lang/et-EE.h | 6 - base/setup/usetup/lang/fr-FR.h | 7 - base/setup/usetup/lang/he-IL.h | 7 - base/setup/usetup/lang/it-IT.h | 7 - base/setup/usetup/lang/ja-JP.h | 7 - base/setup/usetup/lang/lt-LT.h | 7 - base/setup/usetup/lang/ms-MY.h | 6 - base/setup/usetup/lang/nl-NL.h | 8 - base/setup/usetup/lang/pl-PL.h | 8 - base/setup/usetup/lang/pt-BR.h | 7 - base/setup/usetup/lang/ro-RO.h | 7 - base/setup/usetup/lang/ru-RU.h | 7 - base/setup/usetup/lang/sk-SK.h | 8 - base/setup/usetup/lang/sq-AL.h | 6 - base/setup/usetup/lang/sv-SE.h | 7 - base/setup/usetup/lang/tr-TR.h | 8 - base/setup/usetup/lang/uk-UA.h | 7 - base/setup/usetup/mui.c | 541 +----------- base/setup/usetup/mui.h | 57 +- base/setup/usetup/muilanguages.h | 956 ++++++++++----------- base/setup/usetup/settings.c | 258 ------ base/setup/usetup/settings.h | 50 -- base/setup/usetup/usetup.c | 29 +- base/setup/usetup/usetup.h | 6 + dll/cpl/input/input_list.c | 2 +- 178 files changed, 1006 insertions(+), 2076 deletions(-) diff --git a/base/setup/lib/CMakeLists.txt b/base/setup/lib/CMakeLists.txt index 965dd1f0a7..199dffd86b 100644 --- a/base/setup/lib/CMakeLists.txt +++ b/base/setup/lib/CMakeLists.txt @@ -1,4 +1,6 @@ +add_definitions(${I18N_DEFS}) + include_directories(utils) list(APPEND SOURCE @@ -14,6 +16,7 @@ list(APPEND SOURCE utils/regutil.c bootsup.c fsutil.c + mui.c registry.c settings.c setuplib.c diff --git a/base/setup/usetup/lang/af-ZA.h b/base/setup/lib/lang/af-ZA.h similarity index 100% copy from base/setup/usetup/lang/af-ZA.h copy to base/setup/lib/lang/af-ZA.h diff --git a/base/setup/usetup/lang/ar-AE.h b/base/setup/lib/lang/ar-AE.h similarity index 100% rename from base/setup/usetup/lang/ar-AE.h rename to base/setup/lib/lang/ar-AE.h diff --git a/base/setup/usetup/lang/ar-BH.h b/base/setup/lib/lang/ar-BH.h similarity index 100% rename from base/setup/usetup/lang/ar-BH.h rename to base/setup/lib/lang/ar-BH.h diff --git a/base/setup/usetup/lang/ar-DZ.h b/base/setup/lib/lang/ar-DZ.h similarity index 100% rename from base/setup/usetup/lang/ar-DZ.h rename to base/setup/lib/lang/ar-DZ.h diff --git a/base/setup/usetup/lang/ar-EG.h b/base/setup/lib/lang/ar-EG.h similarity index 100% rename from base/setup/usetup/lang/ar-EG.h rename to base/setup/lib/lang/ar-EG.h diff --git a/base/setup/usetup/lang/ar-IQ.h b/base/setup/lib/lang/ar-IQ.h similarity index 100% rename from base/setup/usetup/lang/ar-IQ.h rename to base/setup/lib/lang/ar-IQ.h diff --git a/base/setup/usetup/lang/ar-JO.h b/base/setup/lib/lang/ar-JO.h similarity index 100% rename from base/setup/usetup/lang/ar-JO.h rename to base/setup/lib/lang/ar-JO.h diff --git a/base/setup/usetup/lang/ar-KW.h b/base/setup/lib/lang/ar-KW.h similarity index 100% rename from base/setup/usetup/lang/ar-KW.h rename to base/setup/lib/lang/ar-KW.h diff --git a/base/setup/usetup/lang/ar-LB.h b/base/setup/lib/lang/ar-LB.h similarity index 100% rename from base/setup/usetup/lang/ar-LB.h rename to base/setup/lib/lang/ar-LB.h diff --git a/base/setup/usetup/lang/ar-LY.h b/base/setup/lib/lang/ar-LY.h similarity index 100% rename from base/setup/usetup/lang/ar-LY.h rename to base/setup/lib/lang/ar-LY.h diff --git a/base/setup/usetup/lang/ar-MA.h b/base/setup/lib/lang/ar-MA.h similarity index 100% rename from base/setup/usetup/lang/ar-MA.h rename to base/setup/lib/lang/ar-MA.h diff --git a/base/setup/usetup/lang/ar-OM.h b/base/setup/lib/lang/ar-OM.h similarity index 100% rename from base/setup/usetup/lang/ar-OM.h rename to base/setup/lib/lang/ar-OM.h diff --git a/base/setup/usetup/lang/ar-QA.h b/base/setup/lib/lang/ar-QA.h similarity index 100% rename from base/setup/usetup/lang/ar-QA.h rename to base/setup/lib/lang/ar-QA.h diff --git a/base/setup/usetup/lang/ar-SA.h b/base/setup/lib/lang/ar-SA.h similarity index 100% rename from base/setup/usetup/lang/ar-SA.h rename to base/setup/lib/lang/ar-SA.h diff --git a/base/setup/usetup/lang/ar-SY.h b/base/setup/lib/lang/ar-SY.h similarity index 100% rename from base/setup/usetup/lang/ar-SY.h rename to base/setup/lib/lang/ar-SY.h diff --git a/base/setup/usetup/lang/ar-TN.h b/base/setup/lib/lang/ar-TN.h similarity index 100% rename from base/setup/usetup/lang/ar-TN.h rename to base/setup/lib/lang/ar-TN.h diff --git a/base/setup/usetup/lang/ar-YE.h b/base/setup/lib/lang/ar-YE.h similarity index 100% rename from base/setup/usetup/lang/ar-YE.h rename to base/setup/lib/lang/ar-YE.h diff --git a/base/setup/usetup/lang/az-AZ.h b/base/setup/lib/lang/az-AZ.h similarity index 100% rename from base/setup/usetup/lang/az-AZ.h rename to base/setup/lib/lang/az-AZ.h diff --git a/base/setup/usetup/lang/be-BY.h b/base/setup/lib/lang/be-BY.h similarity index 100% copy from base/setup/usetup/lang/be-BY.h copy to base/setup/lib/lang/be-BY.h diff --git a/base/setup/lib/lang/bg-BG.h b/base/setup/lib/lang/bg-BG.h new file mode 100644 index 0000000000..8b6b7883c3 --- /dev/null +++ b/base/setup/lib/lang/bg-BG.h @@ -0,0 +1,10 @@ +#pragma once + +MUI_LAYOUTS bgBGLayouts[] = +{ + { L"0402", L"00000402" }, + { L"0402", L"00020402" }, + { L"0402", L"00030402" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; diff --git a/base/setup/lib/lang/bn-BD.h b/base/setup/lib/lang/bn-BD.h new file mode 100644 index 0000000000..2d2c510828 --- /dev/null +++ b/base/setup/lib/lang/bn-BD.h @@ -0,0 +1,7 @@ +#pragma once + +MUI_LAYOUTS bnBDLayouts[] = +{ + { L"0845", L"00000845" }, + { NULL, NULL } +}; diff --git a/base/setup/usetup/lang/bn-IN.h b/base/setup/lib/lang/bn-IN.h similarity index 100% rename from base/setup/usetup/lang/bn-IN.h rename to base/setup/lib/lang/bn-IN.h diff --git a/base/setup/usetup/lang/ca-ES.h b/base/setup/lib/lang/ca-ES.h similarity index 100% rename from base/setup/usetup/lang/ca-ES.h rename to base/setup/lib/lang/ca-ES.h diff --git a/base/setup/usetup/lang/rm-CH.h b/base/setup/lib/lang/cs-CZ.h similarity index 61% copy from base/setup/usetup/lang/rm-CH.h copy to base/setup/lib/lang/cs-CZ.h index d36a5e632d..ef5eb7ad2d 100644 --- a/base/setup/usetup/lang/rm-CH.h +++ b/base/setup/lib/lang/cs-CZ.h @@ -1,8 +1,9 @@ #pragma once -MUI_LAYOUTS rmCHLayouts[] = +MUI_LAYOUTS csCZLayouts[] = { - { L"0417", L"00000410" }, + { L"0405", L"00000405" }, + { L"0405", L"00010405" }, { L"0409", L"00000409" }, { NULL, NULL } }; diff --git a/base/setup/lib/lang/da-DK.h b/base/setup/lib/lang/da-DK.h new file mode 100644 index 0000000000..cce5930c21 --- /dev/null +++ b/base/setup/lib/lang/da-DK.h @@ -0,0 +1,7 @@ +#pragma once + +MUI_LAYOUTS daDKLayouts[] = +{ + { L"0406", L"00000406" }, + { NULL, NULL } +}; diff --git a/base/setup/usetup/lang/de-AT.h b/base/setup/lib/lang/de-AT.h similarity index 100% rename from base/setup/usetup/lang/de-AT.h rename to base/setup/lib/lang/de-AT.h diff --git a/base/setup/usetup/lang/de-CH.h b/base/setup/lib/lang/de-CH.h similarity index 100% rename from base/setup/usetup/lang/de-CH.h rename to base/setup/lib/lang/de-CH.h diff --git a/base/setup/usetup/lang/af-ZA.h b/base/setup/lib/lang/de-DE.h similarity index 53% copy from base/setup/usetup/lang/af-ZA.h copy to base/setup/lib/lang/de-DE.h index 53d9a03c96..a1c1d25777 100644 --- a/base/setup/usetup/lang/af-ZA.h +++ b/base/setup/lib/lang/de-DE.h @@ -1,8 +1,8 @@ #pragma once -MUI_LAYOUTS afZALayouts[] = +MUI_LAYOUTS deDELayouts[] = { - { L"0436", L"00000409" }, + { L"0407", L"00000407" }, { L"0409", L"00000409" }, { NULL, NULL } }; diff --git a/base/setup/usetup/lang/de-LI.h b/base/setup/lib/lang/de-LI.h similarity index 100% rename from base/setup/usetup/lang/de-LI.h rename to base/setup/lib/lang/de-LI.h diff --git a/base/setup/usetup/lang/de-LU.h b/base/setup/lib/lang/de-LU.h similarity index 100% rename from base/setup/usetup/lang/de-LU.h rename to base/setup/lib/lang/de-LU.h diff --git a/base/setup/usetup/lang/dv-MV.h b/base/setup/lib/lang/dv-MV.h similarity index 100% rename from base/setup/usetup/lang/dv-MV.h rename to base/setup/lib/lang/dv-MV.h diff --git a/base/setup/usetup/lang/af-ZA.h b/base/setup/lib/lang/el-GR.h similarity index 53% copy from base/setup/usetup/lang/af-ZA.h copy to base/setup/lib/lang/el-GR.h index 53d9a03c96..2718d439b0 100644 --- a/base/setup/usetup/lang/af-ZA.h +++ b/base/setup/lib/lang/el-GR.h @@ -1,8 +1,8 @@ #pragma once -MUI_LAYOUTS afZALayouts[] = +MUI_LAYOUTS elGRLayouts[] = { - { L"0436", L"00000409" }, + { L"0408", L"00000408" }, { L"0409", L"00000409" }, { NULL, NULL } }; diff --git a/base/setup/usetup/lang/en-AU.h b/base/setup/lib/lang/en-AU.h similarity index 100% rename from base/setup/usetup/lang/en-AU.h rename to base/setup/lib/lang/en-AU.h diff --git a/base/setup/usetup/lang/en-BZ.h b/base/setup/lib/lang/en-BZ.h similarity index 100% rename from base/setup/usetup/lang/en-BZ.h rename to base/setup/lib/lang/en-BZ.h diff --git a/base/setup/usetup/lang/en-CA.h b/base/setup/lib/lang/en-CA.h similarity index 100% rename from base/setup/usetup/lang/en-CA.h rename to base/setup/lib/lang/en-CA.h diff --git a/base/setup/usetup/lang/en-CB.h b/base/setup/lib/lang/en-CB.h similarity index 100% rename from base/setup/usetup/lang/en-CB.h rename to base/setup/lib/lang/en-CB.h diff --git a/base/setup/usetup/lang/en-GB.h b/base/setup/lib/lang/en-GB.h similarity index 100% rename from base/setup/usetup/lang/en-GB.h rename to base/setup/lib/lang/en-GB.h diff --git a/base/setup/usetup/lang/en-IE.h b/base/setup/lib/lang/en-IE.h similarity index 100% rename from base/setup/usetup/lang/en-IE.h rename to base/setup/lib/lang/en-IE.h diff --git a/base/setup/usetup/lang/en-JM.h b/base/setup/lib/lang/en-JM.h similarity index 100% rename from base/setup/usetup/lang/en-JM.h rename to base/setup/lib/lang/en-JM.h diff --git a/base/setup/usetup/lang/en-NZ.h b/base/setup/lib/lang/en-NZ.h similarity index 100% rename from base/setup/usetup/lang/en-NZ.h rename to base/setup/lib/lang/en-NZ.h diff --git a/base/setup/usetup/lang/en-PH.h b/base/setup/lib/lang/en-PH.h similarity index 100% rename from base/setup/usetup/lang/en-PH.h rename to base/setup/lib/lang/en-PH.h diff --git a/base/setup/usetup/lang/en-TT.h b/base/setup/lib/lang/en-TT.h similarity index 100% rename from base/setup/usetup/lang/en-TT.h rename to base/setup/lib/lang/en-TT.h diff --git a/base/setup/usetup/lang/ms-BN.h b/base/setup/lib/lang/en-US.h similarity index 70% copy from base/setup/usetup/lang/ms-BN.h copy to base/setup/lib/lang/en-US.h index e0563c8665..b175c6d179 100644 --- a/base/setup/usetup/lang/ms-BN.h +++ b/base/setup/lib/lang/en-US.h @@ -1,6 +1,6 @@ #pragma once -MUI_LAYOUTS msBNLayouts[] = +MUI_LAYOUTS enUSLayouts[] = { { L"0409", L"00000409" }, { NULL, NULL } diff --git a/base/setup/usetup/lang/en-ZA.h b/base/setup/lib/lang/en-ZA.h similarity index 100% rename from base/setup/usetup/lang/en-ZA.h rename to base/setup/lib/lang/en-ZA.h diff --git a/base/setup/usetup/lang/en-ZW.h b/base/setup/lib/lang/en-ZW.h similarity index 100% rename from base/setup/usetup/lang/en-ZW.h rename to base/setup/lib/lang/en-ZW.h diff --git a/base/setup/usetup/lang/eo-AA.h b/base/setup/lib/lang/eo-AA.h similarity index 100% rename from base/setup/usetup/lang/eo-AA.h rename to base/setup/lib/lang/eo-AA.h diff --git a/base/setup/usetup/lang/es-AR.h b/base/setup/lib/lang/es-AR.h similarity index 100% rename from base/setup/usetup/lang/es-AR.h rename to base/setup/lib/lang/es-AR.h diff --git a/base/setup/usetup/lang/es-BO.h b/base/setup/lib/lang/es-BO.h similarity index 100% rename from base/setup/usetup/lang/es-BO.h rename to base/setup/lib/lang/es-BO.h diff --git a/base/setup/usetup/lang/es-CL.h b/base/setup/lib/lang/es-CL.h similarity index 100% rename from base/setup/usetup/lang/es-CL.h rename to base/setup/lib/lang/es-CL.h diff --git a/base/setup/usetup/lang/es-CO.h b/base/setup/lib/lang/es-CO.h similarity index 100% rename from base/setup/usetup/lang/es-CO.h rename to base/setup/lib/lang/es-CO.h diff --git a/base/setup/usetup/lang/es-CR.h b/base/setup/lib/lang/es-CR.h similarity index 100% rename from base/setup/usetup/lang/es-CR.h rename to base/setup/lib/lang/es-CR.h diff --git a/base/setup/usetup/lang/es-DO.h b/base/setup/lib/lang/es-DO.h similarity index 100% rename from base/setup/usetup/lang/es-DO.h rename to base/setup/lib/lang/es-DO.h diff --git a/base/setup/usetup/lang/es-EC.h b/base/setup/lib/lang/es-EC.h similarity index 100% rename from base/setup/usetup/lang/es-EC.h rename to base/setup/lib/lang/es-EC.h diff --git a/base/setup/usetup/lang/af-ZA.h b/base/setup/lib/lang/es-ES.h similarity index 53% copy from base/setup/usetup/lang/af-ZA.h copy to base/setup/lib/lang/es-ES.h index 53d9a03c96..756e7243a1 100644 --- a/base/setup/usetup/lang/af-ZA.h +++ b/base/setup/lib/lang/es-ES.h @@ -1,8 +1,8 @@ #pragma once -MUI_LAYOUTS afZALayouts[] = +MUI_LAYOUTS esESLayouts[] = { - { L"0436", L"00000409" }, + { L"040A", L"0000040A" }, { L"0409", L"00000409" }, { NULL, NULL } }; diff --git a/base/setup/usetup/lang/es-GT.h b/base/setup/lib/lang/es-GT.h similarity index 100% rename from base/setup/usetup/lang/es-GT.h rename to base/setup/lib/lang/es-GT.h diff --git a/base/setup/usetup/lang/es-HN.h b/base/setup/lib/lang/es-HN.h similarity index 100% rename from base/setup/usetup/lang/es-HN.h rename to base/setup/lib/lang/es-HN.h diff --git a/base/setup/usetup/lang/es-MX.h b/base/setup/lib/lang/es-MX.h similarity index 100% rename from base/setup/usetup/lang/es-MX.h rename to base/setup/lib/lang/es-MX.h diff --git a/base/setup/usetup/lang/es-NI.h b/base/setup/lib/lang/es-NI.h similarity index 100% rename from base/setup/usetup/lang/es-NI.h rename to base/setup/lib/lang/es-NI.h diff --git a/base/setup/usetup/lang/es-PA.h b/base/setup/lib/lang/es-PA.h similarity index 100% rename from base/setup/usetup/lang/es-PA.h rename to base/setup/lib/lang/es-PA.h diff --git a/base/setup/usetup/lang/es-PE.h b/base/setup/lib/lang/es-PE.h similarity index 100% rename from base/setup/usetup/lang/es-PE.h rename to base/setup/lib/lang/es-PE.h diff --git a/base/setup/usetup/lang/es-PR.h b/base/setup/lib/lang/es-PR.h similarity index 100% rename from base/setup/usetup/lang/es-PR.h rename to base/setup/lib/lang/es-PR.h diff --git a/base/setup/usetup/lang/es-PY.h b/base/setup/lib/lang/es-PY.h similarity index 100% rename from base/setup/usetup/lang/es-PY.h rename to base/setup/lib/lang/es-PY.h diff --git a/base/setup/usetup/lang/es-SV.h b/base/setup/lib/lang/es-SV.h similarity index 100% rename from base/setup/usetup/lang/es-SV.h rename to base/setup/lib/lang/es-SV.h diff --git a/base/setup/usetup/lang/es-UY.h b/base/setup/lib/lang/es-UY.h similarity index 100% rename from base/setup/usetup/lang/es-UY.h rename to base/setup/lib/lang/es-UY.h diff --git a/base/setup/usetup/lang/es-VE.h b/base/setup/lib/lang/es-VE.h similarity index 100% rename from base/setup/usetup/lang/es-VE.h rename to base/setup/lib/lang/es-VE.h diff --git a/base/setup/lib/lang/et-EE.h b/base/setup/lib/lang/et-EE.h new file mode 100644 index 0000000000..bed36d40f5 --- /dev/null +++ b/base/setup/lib/lang/et-EE.h @@ -0,0 +1,7 @@ +#pragma once + +MUI_LAYOUTS etEELayouts[] = +{ + { L"0425", L"00000425" }, + { NULL, NULL } +}; diff --git a/base/setup/usetup/lang/eu-ES.h b/base/setup/lib/lang/eu-ES.h similarity index 100% rename from base/setup/usetup/lang/eu-ES.h rename to base/setup/lib/lang/eu-ES.h diff --git a/base/setup/usetup/lang/fa-IR.h b/base/setup/lib/lang/fa-IR.h similarity index 100% rename from base/setup/usetup/lang/fa-IR.h rename to base/setup/lib/lang/fa-IR.h diff --git a/base/setup/usetup/lang/fi-FI.h b/base/setup/lib/lang/fi-FI.h similarity index 100% rename from base/setup/usetup/lang/fi-FI.h rename to base/setup/lib/lang/fi-FI.h diff --git a/base/setup/usetup/lang/fo-FO.h b/base/setup/lib/lang/fo-FO.h similarity index 100% rename from base/setup/usetup/lang/fo-FO.h rename to base/setup/lib/lang/fo-FO.h diff --git a/base/setup/usetup/lang/fr-BE.h b/base/setup/lib/lang/fr-BE.h similarity index 100% rename from base/setup/usetup/lang/fr-BE.h rename to base/setup/lib/lang/fr-BE.h diff --git a/base/setup/usetup/lang/fr-CA.h b/base/setup/lib/lang/fr-CA.h similarity index 100% rename from base/setup/usetup/lang/fr-CA.h rename to base/setup/lib/lang/fr-CA.h diff --git a/base/setup/usetup/lang/fr-CH.h b/base/setup/lib/lang/fr-CH.h similarity index 100% rename from base/setup/usetup/lang/fr-CH.h rename to base/setup/lib/lang/fr-CH.h diff --git a/base/setup/usetup/lang/af-ZA.h b/base/setup/lib/lang/fr-FR.h similarity index 53% copy from base/setup/usetup/lang/af-ZA.h copy to base/setup/lib/lang/fr-FR.h index 53d9a03c96..771cabbfe2 100644 --- a/base/setup/usetup/lang/af-ZA.h +++ b/base/setup/lib/lang/fr-FR.h @@ -1,8 +1,8 @@ #pragma once -MUI_LAYOUTS afZALayouts[] = +MUI_LAYOUTS frFRLayouts[] = { - { L"0436", L"00000409" }, + { L"040C", L"0000040C" }, { L"0409", L"00000409" }, { NULL, NULL } }; diff --git a/base/setup/usetup/lang/fr-LU.h b/base/setup/lib/lang/fr-LU.h similarity index 100% rename from base/setup/usetup/lang/fr-LU.h rename to base/setup/lib/lang/fr-LU.h diff --git a/base/setup/usetup/lang/fr-MC.h b/base/setup/lib/lang/fr-MC.h similarity index 100% rename from base/setup/usetup/lang/fr-MC.h rename to base/setup/lib/lang/fr-MC.h diff --git a/base/setup/usetup/lang/gl-ES.h b/base/setup/lib/lang/gl-ES.h similarity index 100% rename from base/setup/usetup/lang/gl-ES.h rename to base/setup/lib/lang/gl-ES.h diff --git a/base/setup/usetup/lang/gu-IN.h b/base/setup/lib/lang/gu-IN.h similarity index 100% rename from base/setup/usetup/lang/gu-IN.h rename to base/setup/lib/lang/gu-IN.h diff --git a/base/setup/usetup/lang/af-ZA.h b/base/setup/lib/lang/he-IL.h similarity index 53% copy from base/setup/usetup/lang/af-ZA.h copy to base/setup/lib/lang/he-IL.h index 53d9a03c96..9c18824630 100644 --- a/base/setup/usetup/lang/af-ZA.h +++ b/base/setup/lib/lang/he-IL.h @@ -1,8 +1,8 @@ #pragma once -MUI_LAYOUTS afZALayouts[] = +MUI_LAYOUTS heILLayouts[] = { - { L"0436", L"00000409" }, { L"0409", L"00000409" }, + { L"040D", L"0000040D" }, { NULL, NULL } }; diff --git a/base/setup/usetup/lang/hi-IN.h b/base/setup/lib/lang/hi-IN.h similarity index 100% rename from base/setup/usetup/lang/hi-IN.h rename to base/setup/lib/lang/hi-IN.h diff --git a/base/setup/usetup/lang/hr-HR.h b/base/setup/lib/lang/hr-HR.h similarity index 100% rename from base/setup/usetup/lang/hr-HR.h rename to base/setup/lib/lang/hr-HR.h diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/lib/lang/hu-HU.h similarity index 100% rename from base/setup/usetup/lang/hu-HU.h rename to base/setup/lib/lang/hu-HU.h diff --git a/base/setup/usetup/lang/hy-AM.h b/base/setup/lib/lang/hy-AM.h similarity index 100% rename from base/setup/usetup/lang/hy-AM.h rename to base/setup/lib/lang/hy-AM.h diff --git a/base/setup/usetup/lang/id-ID.h b/base/setup/lib/lang/id-ID.h similarity index 100% rename from base/setup/usetup/lang/id-ID.h rename to base/setup/lib/lang/id-ID.h diff --git a/base/setup/usetup/lang/is-IS.h b/base/setup/lib/lang/is-IS.h similarity index 100% rename from base/setup/usetup/lang/is-IS.h rename to base/setup/lib/lang/is-IS.h diff --git a/base/setup/usetup/lang/it-CH.h b/base/setup/lib/lang/it-CH.h similarity index 100% rename from base/setup/usetup/lang/it-CH.h rename to base/setup/lib/lang/it-CH.h diff --git a/base/setup/usetup/lang/af-ZA.h b/base/setup/lib/lang/it-IT.h similarity index 53% copy from base/setup/usetup/lang/af-ZA.h copy to base/setup/lib/lang/it-IT.h index 53d9a03c96..6add5cae6d 100644 --- a/base/setup/usetup/lang/af-ZA.h +++ b/base/setup/lib/lang/it-IT.h @@ -1,8 +1,8 @@ #pragma once -MUI_LAYOUTS afZALayouts[] = +MUI_LAYOUTS itITLayouts[] = { - { L"0436", L"00000409" }, + { L"0410", L"00000410" }, { L"0409", L"00000409" }, { NULL, NULL } }; diff --git a/base/setup/lib/lang/ja-JP.h b/base/setup/lib/lang/ja-JP.h new file mode 100644 index 0000000000..2d8a6eb2ba --- /dev/null +++ b/base/setup/lib/lang/ja-JP.h @@ -0,0 +1,8 @@ +#pragma once + +MUI_LAYOUTS jaJPLayouts[] = +{ +// { L"0411", L"e0010411" }, + { L"0411", L"00000411" }, + { NULL, NULL } +}; diff --git a/base/setup/usetup/lang/ka-GE.h b/base/setup/lib/lang/ka-GE.h similarity index 100% rename from base/setup/usetup/lang/ka-GE.h rename to base/setup/lib/lang/ka-GE.h diff --git a/base/setup/usetup/lang/kk-KZ.h b/base/setup/lib/lang/kk-KZ.h similarity index 100% rename from base/setup/usetup/lang/kk-KZ.h rename to base/setup/lib/lang/kk-KZ.h diff --git a/base/setup/usetup/lang/kn-IN.h b/base/setup/lib/lang/kn-IN.h similarity index 100% rename from base/setup/usetup/lang/kn-IN.h rename to base/setup/lib/lang/kn-IN.h diff --git a/base/setup/usetup/lang/ko-KR.h b/base/setup/lib/lang/ko-KR.h similarity index 100% rename from base/setup/usetup/lang/ko-KR.h rename to base/setup/lib/lang/ko-KR.h diff --git a/base/setup/usetup/lang/kok-IN.h b/base/setup/lib/lang/kok-IN.h similarity index 100% rename from base/setup/usetup/lang/kok-IN.h rename to base/setup/lib/lang/kok-IN.h diff --git a/base/setup/usetup/lang/ky-KG.h b/base/setup/lib/lang/ky-KG.h similarity index 100% rename from base/setup/usetup/lang/ky-KG.h rename to base/setup/lib/lang/ky-KG.h diff --git a/base/setup/usetup/lang/af-ZA.h b/base/setup/lib/lang/lt-LT.h similarity index 53% copy from base/setup/usetup/lang/af-ZA.h copy to base/setup/lib/lang/lt-LT.h index 53d9a03c96..1c1207e137 100644 --- a/base/setup/usetup/lang/af-ZA.h +++ b/base/setup/lib/lang/lt-LT.h @@ -1,8 +1,8 @@ #pragma once -MUI_LAYOUTS afZALayouts[] = +MUI_LAYOUTS ltLTLayouts[] = { - { L"0436", L"00000409" }, + { L"0427", L"00010427" }, { L"0409", L"00000409" }, { NULL, NULL } }; diff --git a/base/setup/usetup/lang/lv-LV.h b/base/setup/lib/lang/lv-LV.h similarity index 100% rename from base/setup/usetup/lang/lv-LV.h rename to base/setup/lib/lang/lv-LV.h diff --git a/base/setup/usetup/lang/mk-MK.h b/base/setup/lib/lang/mk-MK.h similarity index 100% rename from base/setup/usetup/lang/mk-MK.h rename to base/setup/lib/lang/mk-MK.h diff --git a/base/setup/usetup/lang/mn-MN.h b/base/setup/lib/lang/mn-MN.h similarity index 100% rename from base/setup/usetup/lang/mn-MN.h rename to base/setup/lib/lang/mn-MN.h diff --git a/base/setup/usetup/lang/mr-IN.h b/base/setup/lib/lang/mr-IN.h similarity index 100% rename from base/setup/usetup/lang/mr-IN.h rename to base/setup/lib/lang/mr-IN.h diff --git a/base/setup/usetup/lang/ms-BN.h b/base/setup/lib/lang/ms-BN.h similarity index 100% copy from base/setup/usetup/lang/ms-BN.h copy to base/setup/lib/lang/ms-BN.h diff --git a/base/setup/usetup/lang/ms-BN.h b/base/setup/lib/lang/ms-MY.h similarity index 70% rename from base/setup/usetup/lang/ms-BN.h rename to base/setup/lib/lang/ms-MY.h index e0563c8665..646eb6a90f 100644 --- a/base/setup/usetup/lang/ms-BN.h +++ b/base/setup/lib/lang/ms-MY.h @@ -1,6 +1,6 @@ #pragma once -MUI_LAYOUTS msBNLayouts[] = +MUI_LAYOUTS msMYLayouts[] = { { L"0409", L"00000409" }, { NULL, NULL } diff --git a/base/setup/usetup/lang/my-MM.h b/base/setup/lib/lang/my-MM.h similarity index 100% rename from base/setup/usetup/lang/my-MM.h rename to base/setup/lib/lang/my-MM.h diff --git a/base/setup/usetup/lang/nl-BE.h b/base/setup/lib/lang/nl-BE.h similarity index 100% rename from base/setup/usetup/lang/nl-BE.h rename to base/setup/lib/lang/nl-BE.h diff --git a/base/setup/lib/lang/nl-NL.h b/base/setup/lib/lang/nl-NL.h new file mode 100644 index 0000000000..ead630c988 --- /dev/null +++ b/base/setup/lib/lang/nl-NL.h @@ -0,0 +1,9 @@ +#pragma once + +MUI_LAYOUTS nlNLLayouts[] = +{ + { L"0413", L"00020409" }, + { L"0413", L"00000413" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; diff --git a/base/setup/usetup/lang/nn-NO.h b/base/setup/lib/lang/nn-NO.h similarity index 100% rename from base/setup/usetup/lang/nn-NO.h rename to base/setup/lib/lang/nn-NO.h diff --git a/base/setup/usetup/lang/pa-IN.h b/base/setup/lib/lang/pa-IN.h similarity index 100% rename from base/setup/usetup/lang/pa-IN.h rename to base/setup/lib/lang/pa-IN.h diff --git a/base/setup/lib/lang/pl-PL.h b/base/setup/lib/lang/pl-PL.h new file mode 100644 index 0000000000..1e720e7e62 --- /dev/null +++ b/base/setup/lib/lang/pl-PL.h @@ -0,0 +1,9 @@ +#pragma once + +MUI_LAYOUTS plPLLayouts[] = +{ + { L"0415", L"00000415" }, + { L"0415", L"00010415" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; diff --git a/base/setup/usetup/lang/af-ZA.h b/base/setup/lib/lang/pt-BR.h similarity index 53% copy from base/setup/usetup/lang/af-ZA.h copy to base/setup/lib/lang/pt-BR.h index 53d9a03c96..6c545ad785 100644 --- a/base/setup/usetup/lang/af-ZA.h +++ b/base/setup/lib/lang/pt-BR.h @@ -1,8 +1,8 @@ #pragma once -MUI_LAYOUTS afZALayouts[] = +MUI_LAYOUTS ptBRLayouts[] = { - { L"0436", L"00000409" }, + { L"0416", L"00000416" }, { L"0409", L"00000409" }, { NULL, NULL } }; diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/lib/lang/pt-PT.h similarity index 100% rename from base/setup/usetup/lang/pt-PT.h rename to base/setup/lib/lang/pt-PT.h diff --git a/base/setup/usetup/lang/rm-CH.h b/base/setup/lib/lang/rm-CH.h similarity index 100% rename from base/setup/usetup/lang/rm-CH.h rename to base/setup/lib/lang/rm-CH.h diff --git a/base/setup/usetup/lang/af-ZA.h b/base/setup/lib/lang/ro-RO.h similarity index 53% copy from base/setup/usetup/lang/af-ZA.h copy to base/setup/lib/lang/ro-RO.h index 53d9a03c96..f8f17441a2 100644 --- a/base/setup/usetup/lang/af-ZA.h +++ b/base/setup/lib/lang/ro-RO.h @@ -1,8 +1,8 @@ #pragma once -MUI_LAYOUTS afZALayouts[] = +MUI_LAYOUTS roROLayouts[] = { - { L"0436", L"00000409" }, + { L"0418", L"00000418" }, { L"0409", L"00000409" }, { NULL, NULL } }; diff --git a/base/setup/usetup/lang/be-BY.h b/base/setup/lib/lang/ru-RU.h similarity index 62% rename from base/setup/usetup/lang/be-BY.h rename to base/setup/lib/lang/ru-RU.h index de08d3e0c1..c9c502cfc2 100644 --- a/base/setup/usetup/lang/be-BY.h +++ b/base/setup/lib/lang/ru-RU.h @@ -1,9 +1,8 @@ #pragma once -MUI_LAYOUTS beBYLayouts[] = +MUI_LAYOUTS ruRULayouts[] = { - { L"0423", L"00000423" }, - { L"0409", L"00000409" }, { L"0419", L"00000419" }, + { L"0409", L"00000409" }, { NULL, NULL } }; diff --git a/base/setup/usetup/lang/sa-IN.h b/base/setup/lib/lang/sa-IN.h similarity index 100% rename from base/setup/usetup/lang/sa-IN.h rename to base/setup/lib/lang/sa-IN.h diff --git a/base/setup/lib/lang/sk-SK.h b/base/setup/lib/lang/sk-SK.h new file mode 100644 index 0000000000..005dcd3afd --- /dev/null +++ b/base/setup/lib/lang/sk-SK.h @@ -0,0 +1,9 @@ +#pragma once + +MUI_LAYOUTS skSKLayouts[] = +{ + { L"041B", L"0000041B" }, + { L"041B", L"0001041B" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; diff --git a/base/setup/usetup/lang/sl-SI.h b/base/setup/lib/lang/sl-SI.h similarity index 100% rename from base/setup/usetup/lang/sl-SI.h rename to base/setup/lib/lang/sl-SI.h diff --git a/base/setup/lib/lang/sq-AL.h b/base/setup/lib/lang/sq-AL.h new file mode 100644 index 0000000000..195368a0ab --- /dev/null +++ b/base/setup/lib/lang/sq-AL.h @@ -0,0 +1,7 @@ +#pragma once + +MUI_LAYOUTS sqALLayouts[] = +{ + { L"041C", L"0000041C" }, + { NULL, NULL } +}; diff --git a/base/setup/usetup/lang/sr-SP.h b/base/setup/lib/lang/sr-SP.h similarity index 100% rename from base/setup/usetup/lang/sr-SP.h rename to base/setup/lib/lang/sr-SP.h diff --git a/base/setup/usetup/lang/sv-FI.h b/base/setup/lib/lang/sv-FI.h similarity index 100% rename from base/setup/usetup/lang/sv-FI.h rename to base/setup/lib/lang/sv-FI.h diff --git a/base/setup/usetup/lang/af-ZA.h b/base/setup/lib/lang/sv-SE.h similarity index 53% copy from base/setup/usetup/lang/af-ZA.h copy to base/setup/lib/lang/sv-SE.h index 53d9a03c96..6672804516 100644 --- a/base/setup/usetup/lang/af-ZA.h +++ b/base/setup/lib/lang/sv-SE.h @@ -1,8 +1,8 @@ #pragma once -MUI_LAYOUTS afZALayouts[] = +MUI_LAYOUTS svSELayouts[] = { - { L"0436", L"00000409" }, + { L"041D", L"0000041D" }, { L"0409", L"00000409" }, { NULL, NULL } }; diff --git a/base/setup/usetup/lang/sw-KE.h b/base/setup/lib/lang/sw-KE.h similarity index 100% rename from base/setup/usetup/lang/sw-KE.h rename to base/setup/lib/lang/sw-KE.h diff --git a/base/setup/usetup/lang/syr-SY.h b/base/setup/lib/lang/syr-SY.h similarity index 100% rename from base/setup/usetup/lang/syr-SY.h rename to base/setup/lib/lang/syr-SY.h diff --git a/base/setup/usetup/lang/ta-IN.h b/base/setup/lib/lang/ta-IN.h similarity index 100% rename from base/setup/usetup/lang/ta-IN.h rename to base/setup/lib/lang/ta-IN.h diff --git a/base/setup/usetup/lang/te-IN.h b/base/setup/lib/lang/te-IN.h similarity index 100% rename from base/setup/usetup/lang/te-IN.h rename to base/setup/lib/lang/te-IN.h diff --git a/base/setup/usetup/lang/th-TH.h b/base/setup/lib/lang/th-TH.h similarity index 100% rename from base/setup/usetup/lang/th-TH.h rename to base/setup/lib/lang/th-TH.h diff --git a/base/setup/lib/lang/tr-TR.h b/base/setup/lib/lang/tr-TR.h new file mode 100644 index 0000000000..cedb76c993 --- /dev/null +++ b/base/setup/lib/lang/tr-TR.h @@ -0,0 +1,9 @@ +#pragma once + +MUI_LAYOUTS trTRLayouts[] = +{ + { L"041F", L"0000041F" }, + { L"041F", L"0001041F" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; diff --git a/base/setup/usetup/lang/tt-TA.h b/base/setup/lib/lang/tt-TA.h similarity index 100% rename from base/setup/usetup/lang/tt-TA.h rename to base/setup/lib/lang/tt-TA.h diff --git a/base/setup/usetup/lang/af-ZA.h b/base/setup/lib/lang/uk-UA.h similarity index 53% rename from base/setup/usetup/lang/af-ZA.h rename to base/setup/lib/lang/uk-UA.h index 53d9a03c96..a5d98c1e3c 100644 --- a/base/setup/usetup/lang/af-ZA.h +++ b/base/setup/lib/lang/uk-UA.h @@ -1,8 +1,8 @@ #pragma once -MUI_LAYOUTS afZALayouts[] = +MUI_LAYOUTS ukUALayouts[] = { - { L"0436", L"00000409" }, + { L"0422", L"00000422" }, { L"0409", L"00000409" }, { NULL, NULL } }; diff --git a/base/setup/usetup/lang/ur-PK.h b/base/setup/lib/lang/ur-PK.h similarity index 100% rename from base/setup/usetup/lang/ur-PK.h rename to base/setup/lib/lang/ur-PK.h diff --git a/base/setup/usetup/lang/uz-UZ.h b/base/setup/lib/lang/uz-UZ.h similarity index 100% rename from base/setup/usetup/lang/uz-UZ.h rename to base/setup/lib/lang/uz-UZ.h diff --git a/base/setup/usetup/lang/vi-VN.h b/base/setup/lib/lang/vi-VN.h similarity index 100% rename from base/setup/usetup/lang/vi-VN.h rename to base/setup/lib/lang/vi-VN.h diff --git a/base/setup/usetup/lang/wa-BE.h b/base/setup/lib/lang/wa-BE.h similarity index 100% rename from base/setup/usetup/lang/wa-BE.h rename to base/setup/lib/lang/wa-BE.h diff --git a/base/setup/usetup/lang/zh-CN.h b/base/setup/lib/lang/zh-CN.h similarity index 100% rename from base/setup/usetup/lang/zh-CN.h rename to base/setup/lib/lang/zh-CN.h diff --git a/base/setup/usetup/lang/zh-HK.h b/base/setup/lib/lang/zh-HK.h similarity index 100% rename from base/setup/usetup/lang/zh-HK.h rename to base/setup/lib/lang/zh-HK.h diff --git a/base/setup/usetup/lang/zh-MO.h b/base/setup/lib/lang/zh-MO.h similarity index 100% rename from base/setup/usetup/lang/zh-MO.h rename to base/setup/lib/lang/zh-MO.h diff --git a/base/setup/usetup/lang/zh-SG.h b/base/setup/lib/lang/zh-SG.h similarity index 100% rename from base/setup/usetup/lang/zh-SG.h rename to base/setup/lib/lang/zh-SG.h diff --git a/base/setup/usetup/lang/zh-TW.h b/base/setup/lib/lang/zh-TW.h similarity index 100% rename from base/setup/usetup/lang/zh-TW.h rename to base/setup/lib/lang/zh-TW.h diff --git a/base/setup/usetup/mui.c b/base/setup/lib/mui.c similarity index 71% copy from base/setup/usetup/mui.c copy to base/setup/lib/mui.c index b7d2ab8be8..1e7eb9def8 100644 --- a/base/setup/usetup/mui.c +++ b/base/setup/lib/mui.c @@ -24,270 +24,104 @@ * 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> -extern -VOID -PopupError(IN PCCH Text, - IN PCCH Status, - IN PINPUT_RECORD Ir, - IN ULONG WaitEvent); + +/* FUNCTIONS ****************************************************************/ static ULONG -FindLanguageIndex(VOID) +FindLanguageIndex( + IN PCWSTR LanguageId) { ULONG lngIndex = 0; - if (SelectedLanguageId == NULL) + if (LanguageId == NULL) { - /* default to english */ - return 0; + /* Default to en-US */ + // return 0; // FIXME!! + LanguageId = L"00000409"; } - do + while (MUILanguageList[lngIndex].LanguageID != NULL) { - if (_wcsicmp(MUILanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + if (_wcsicmp(MUILanguageList[lngIndex].LanguageID, LanguageId) == 0) { return lngIndex; } lngIndex++; - } while (MUILanguageList[lngIndex].MuiPages != NULL); + } return 0; } - BOOLEAN IsLanguageAvailable( - PWCHAR LanguageId) + IN PCWSTR LanguageId) { ULONG lngIndex = 0; - do + while (MUILanguageList[lngIndex].LanguageID != NULL) { - if (_wcsicmp(MUILanguageList[lngIndex].LanguageID , LanguageId) == 0) + if (_wcsicmp(MUILanguageList[lngIndex].LanguageID, LanguageId) == 0) return TRUE; lngIndex++; - } while (MUILanguageList[lngIndex].MuiPages != 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 = MUILanguageList[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) +PCWSTR +MUIDefaultKeyboardLayout( + IN PCWSTR LanguageId) { - ULONG lngIndex = max(FindLanguageIndex(), 0); - return MUILanguageList[lngIndex].MuiErrors; -} - - -static -const MUI_STRING * -FindMUIStringEntries(VOID) -{ - ULONG lngIndex = max(FindLanguageIndex(), 0); - return MUILanguageList[lngIndex].MuiStrings; + ULONG lngIndex = max(FindLanguageIndex(LanguageId), 0); + return MUILanguageList[lngIndex].MuiLayouts[0].LayoutID; } - -LPCWSTR -MUIDefaultKeyboardLayout(VOID) +PCWSTR +MUIGetOEMCodePage( + IN PCWSTR LanguageId) { - ULONG lngIndex = max(FindLanguageIndex(), 0); - return MUILanguageList[lngIndex].MuiLayouts[0].LayoutID; + ULONG lngIndex = max(FindLanguageIndex(LanguageId), 0); + return MUILanguageList[lngIndex].OEMCPage; } - -PWCHAR -MUIGetGeoID(VOID) +PCWSTR +MUIGetGeoID( + IN PCWSTR LanguageId) { - ULONG lngIndex = max(FindLanguageIndex(), 0); + ULONG lngIndex = max(FindLanguageIndex(LanguageId), 0); return MUILanguageList[lngIndex].GeoID; } - -const MUI_LAYOUTS * -MUIGetLayoutsList(VOID) +const MUI_LAYOUTS* +MUIGetLayoutsList( + IN PCWSTR LanguageId) { - ULONG lngIndex = max(FindLanguageIndex(), 0); + ULONG lngIndex = max(FindLanguageIndex(LanguageId), 0); return MUILanguageList[lngIndex].MuiLayouts; } -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; @@ -311,8 +145,7 @@ AddHotkeySettings( NULL, REG_OPTION_NON_VOLATILE, &Disposition); - - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); return FALSE; @@ -370,7 +203,6 @@ AddHotkeySettings( return TRUE; } - BOOLEAN AddKbLayoutsToRegistry( IN const MUI_LAYOUTS *MuiLayouts) @@ -403,15 +235,14 @@ AddKbLayoutsToRegistry( 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"); @@ -435,7 +266,6 @@ AddKbLayoutsToRegistry( NULL, REG_OPTION_NON_VOLATILE, &Disposition); - if (!NT_SUCCESS(Status)) { DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); @@ -456,8 +286,7 @@ AddKbLayoutsToRegistry( NULL, REG_OPTION_NON_VOLATILE, &Disposition); - - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); NtClose(SubKeyHandle); @@ -465,7 +294,7 @@ AddKbLayoutsToRegistry( return FALSE; } - do + while (MuiLayouts[uIndex].LangID != NULL) { if (uIndex > 19) break; @@ -528,7 +357,6 @@ AddKbLayoutsToRegistry( uIndex++; } - while (MuiLayouts[uIndex].LangID != NULL); if (uIndex > 1) AddHotkeySettings(L"2", L"2", L"1"); @@ -540,33 +368,31 @@ AddKbLayoutsToRegistry( return TRUE; } - BOOLEAN -AddKeyboardLayouts(VOID) +AddKeyboardLayouts( + IN PCWSTR LanguageId) { ULONG lngIndex = 0; - do + while (MUILanguageList[lngIndex].LanguageID != NULL) { - if (_wcsicmp(MUILanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + if (_wcsicmp(MUILanguageList[lngIndex].LanguageID, LanguageId) == 0) { return AddKbLayoutsToRegistry(MUILanguageList[lngIndex].MuiLayouts); } lngIndex++; } - while (MUILanguageList[lngIndex].MuiPages != 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; @@ -641,7 +467,6 @@ AddCodepageToRegistry( return TRUE; } - static BOOLEAN AddFontsSettingsToRegistry( @@ -670,7 +495,7 @@ AddFontsSettingsToRegistry( return FALSE; } - do + while (MuiSubFonts[uIndex].FontName != NULL) { RtlInitUnicodeString(&ValueName, MuiSubFonts[uIndex].FontName); Status = NtSetValueKey(KeyHandle, @@ -688,25 +513,25 @@ AddFontsSettingsToRegistry( uIndex++; } - while (MuiSubFonts[uIndex].FontName != NULL); NtClose(KeyHandle); return TRUE; } - BOOLEAN -AddCodePage(VOID) +AddCodePage( + IN PCWSTR LanguageId) { ULONG lngIndex = 0; - do + + while (MUILanguageList[lngIndex].LanguageID != NULL) { - if (_wcsicmp(MUILanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + if (_wcsicmp(MUILanguageList[lngIndex].LanguageID, LanguageId) == 0) { if (AddCodepageToRegistry(MUILanguageList[lngIndex].ACPage, MUILanguageList[lngIndex].OEMCPage, - MUILanguageList[lngIndex].MACCPage)&& + MUILanguageList[lngIndex].MACCPage) && AddFontsSettingsToRegistry(MUILanguageList[lngIndex].MuiSubFonts)) { return TRUE; @@ -719,30 +544,8 @@ AddCodePage(VOID) lngIndex++; } - while (MUILanguageList[lngIndex].MuiPages != NULL); return FALSE; } - -VOID -SetConsoleCodePage(VOID) -{ - ULONG lngIndex = 0; - UINT wCodePage; - - do - { - if (_wcsicmp(MUILanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) - { - wCodePage = (UINT) wcstoul(MUILanguageList[lngIndex].OEMCPage, NULL, 10); - SetConsoleOutputCP(wCodePage); - return; - } - - lngIndex++; - } - while (MUILanguageList[lngIndex].MuiPages != NULL); -} - /* EOF */ diff --git a/base/setup/lib/mui.h b/base/setup/lib/mui.h new file mode 100644 index 0000000000..f48d94c53e --- /dev/null +++ b/base/setup/lib/mui.h @@ -0,0 +1,58 @@ +#pragma once + +typedef struct +{ + PCWSTR FontName; + PCWSTR SubFontName; +} MUI_SUBFONT; + +typedef struct +{ + PCWSTR LangID; // Language ID (like "0409") + PCWSTR LayoutID; // Layout ID (like "00000409") +} MUI_LAYOUTS; + +typedef struct +{ + PCWSTR LanguageID; + PCWSTR ACPage; + PCWSTR OEMCPage; + PCWSTR MACCPage; + PCWSTR LanguageDescriptor; + PCWSTR GeoID; + const MUI_SUBFONT * MuiSubFonts; + const MUI_LAYOUTS * MuiLayouts; +} MUI_LANGUAGE; + + +BOOLEAN +IsLanguageAvailable( + IN PCWSTR LanguageId); + +PCWSTR +MUIDefaultKeyboardLayout( + IN PCWSTR LanguageId); + +PCWSTR +MUIGetOEMCodePage( + IN PCWSTR LanguageId); + +PCWSTR +MUIGetGeoID( + IN PCWSTR LanguageId); + +const MUI_LAYOUTS* +MUIGetLayoutsList( + IN PCWSTR LanguageId); + +BOOLEAN +AddKbLayoutsToRegistry( + IN const MUI_LAYOUTS *MuiLayouts); + +BOOLEAN +AddKeyboardLayouts( + IN PCWSTR LanguageId); + +BOOLEAN +AddCodePage( + IN PCWSTR LanguageId); diff --git a/base/setup/usetup/muifonts.h b/base/setup/lib/muifonts.h similarity index 100% rename from base/setup/usetup/muifonts.h rename to base/setup/lib/muifonts.h diff --git a/base/setup/usetup/muilanguages.h b/base/setup/lib/muilanguages.h similarity index 61% copy from base/setup/usetup/muilanguages.h copy to base/setup/lib/muilanguages.h index c5c4519838..503d9c2e33 100644 --- a/base/setup/usetup/muilanguages.h +++ b/base/setup/lib/muilanguages.h @@ -1,7 +1,5 @@ #pragma once -#include <reactos/buildno.h> - #ifdef LANGUAGE_AF_ZA #include "lang/af-ZA.h" #endif @@ -413,432 +411,432 @@ const MUI_LANGUAGE MUILanguageList[] = { - /* Lang ID, ANSI CP, OEM CP, MAC CP, Language Name, GeoID page strgs,error strings, other strings, fonts, kb layouts */ + /* Lang ID, ANSI CP, OEM CP, MAC CP, Language Name, GeoID, Fonts, KB Layouts */ #ifdef LANGUAGE_AF_ZA - {L"00000436", L"1252", L"850", L"10000", L"Afrikaans", L"209", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, afZALayouts }, + {L"00000436", L"1252", L"850", L"10000", L"Afrikaans", L"209", LatinFonts, afZALayouts}, #endif #ifdef LANGUAGE_SQ_AL - {L"0000041C", L"1250", L"852", L"10029", L"Albanian (Albania)", L"6", sqALPages, sqALErrorEntries, sqALStrings, LatinFonts, sqALLayouts }, + {L"0000041C", L"1250", L"852", L"10029", L"Albanian (Albania)", L"6", LatinFonts, sqALLayouts}, #endif #ifdef LANGUAGE_AR_SA - {L"00000401", L"1256", L"720", L"10004", L"Arabic (Saudi Arabia)", L"205", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arSALayouts }, + {L"00000401", L"1256", L"720", L"10004", L"Arabic (Saudi Arabia)", L"205", UnicodeFonts, arSALayouts}, #endif #ifdef LANGUAGE_AR_IQ - {L"00000801", L"1256", L"720", L"10004", L"Arabic (Iraq)", L"121", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arIQLayouts }, + {L"00000801", L"1256", L"720", L"10004", L"Arabic (Iraq)", L"121", UnicodeFonts, arIQLayouts}, #endif #ifdef LANGUAGE_AR_EG - {L"00000C01", L"1256", L"720", L"10004", L"Arabic (Egypt)", L"67", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arEGLayouts }, + {L"00000C01", L"1256", L"720", L"10004", L"Arabic (Egypt)", L"67", UnicodeFonts, arEGLayouts}, #endif #ifdef LANGUAGE_AR_LY - {L"00001001", L"1256", L"720", L"10004", L"Arabic (Libya)", L"148", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arLYLayouts }, + {L"00001001", L"1256", L"720", L"10004", L"Arabic (Libya)", L"148", UnicodeFonts, arLYLayouts}, #endif #ifdef LANGUAGE_AR_DZ - {L"00001401", L"1256", L"720", L"10004", L"Arabic (Algeria)", L"4", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arDZLayouts }, + {L"00001401", L"1256", L"720", L"10004", L"Arabic (Algeria)", L"4", UnicodeFonts, arDZLayouts}, #endif #ifdef LANGUAGE_AR_MA - {L"00001801", L"1256", L"720", L"10004", L"Arabic (Morocco)", L"149", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arMALayouts }, + {L"00001801", L"1256", L"720", L"10004", L"Arabic (Morocco)", L"149", UnicodeFonts, arMALayouts}, #endif #ifdef LANGUAGE_AR_TN - {L"00001C01", L"1256", L"720", L"10004", L"Arabic (Tunisia)", L"234", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arTNLayouts }, + {L"00001C01", L"1256", L"720", L"10004", L"Arabic (Tunisia)", L"234", UnicodeFonts, arTNLayouts}, #endif #ifdef LANGUAGE_AR_OM - {L"00002001", L"1256", L"720", L"10004", L"Arabic (Oman)", L"164", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arOMLayouts }, + {L"00002001", L"1256", L"720", L"10004", L"Arabic (Oman)", L"164", UnicodeFonts, arOMLayouts}, #endif #ifdef LANGUAGE_AR_YE - {L"00002401", L"1256", L"720", L"10004", L"Arabic (Yemen)", L"261", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arYELayouts }, + {L"00002401", L"1256", L"720", L"10004", L"Arabic (Yemen)", L"261", UnicodeFonts, arYELayouts}, #endif #ifdef LANGUAGE_AR_SY - {L"00002801", L"1256", L"720", L"10004", L"Arabic (Syria)", L"222", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arSYLayouts }, + {L"00002801", L"1256", L"720", L"10004", L"Arabic (Syria)", L"222", UnicodeFonts, arSYLayouts}, #endif #ifdef LANGUAGE_AR_JO - {L"00002C01", L"1256", L"720", L"10004", L"Arabic (Jordan)", L"126", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arJOLayouts }, + {L"00002C01", L"1256", L"720", L"10004", L"Arabic (Jordan)", L"126", UnicodeFonts, arJOLayouts}, #endif #ifdef LANGUAGE_AR_LB - {L"00003001", L"1256", L"720", L"10004", L"Arabic (Lebanon)", L"139", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arLBLayouts }, + {L"00003001", L"1256", L"720", L"10004", L"Arabic (Lebanon)", L"139", UnicodeFonts, arLBLayouts}, #endif #ifdef LANGUAGE_AR_KW - {L"00003401", L"1256", L"720", L"10004", L"Arabic (Kuwait)", L"136", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arKWLayouts }, + {L"00003401", L"1256", L"720", L"10004", L"Arabic (Kuwait)", L"136", UnicodeFonts, arKWLayouts}, #endif #ifdef LANGUAGE_AR_AE - {L"00003801", L"1256", L"720", L"10004", L"Arabic (U.A.E.)", L"224", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arAELayouts }, + {L"00003801", L"1256", L"720", L"10004", L"Arabic (U.A.E.)", L"224", UnicodeFonts, arAELayouts}, #endif #ifdef LANGUAGE_AR_BH - {L"00003C01", L"1256", L"720", L"10004", L"Arabic (Bahrain)", L"17", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arBHLayouts }, + {L"00003C01", L"1256", L"720", L"10004", L"Arabic (Bahrain)", L"17", UnicodeFonts, arBHLayouts}, #endif #ifdef LANGUAGE_AR_QA - {L"00004001", L"1256", L"720", L"10004", L"Arabic (Qatar)", L"197", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arQALayouts }, + {L"00004001", L"1256", L"720", L"10004", L"Arabic (Qatar)", L"197", UnicodeFonts, arQALayouts}, #endif #ifdef LANGUAGE_HY_AM - {L"0000042B", L"0", L"1", L"2", L"Armenian", L"7", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, hyAMLayouts }, + {L"0000042B", L"0", L"1", L"2", L"Armenian", L"7", UnicodeFonts, hyAMLayouts}, #endif #ifdef LANGUAGE_AZ_AZ - {L"0000082C", L"1251", L"866", L"10007", L"Azeri (Cyrillic)", L"5", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, azAZLayouts }, + {L"0000082C", L"1251", L"866", L"10007", L"Azeri (Cyrillic)", L"5", CyrillicFonts, azAZLayouts}, #endif #ifdef LANGUAGE_AZ_AZ - {L"0000042C", L"1254", L"857", L"10081", L"Azeri (Latin)", L"5", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, azAZLayouts }, + {L"0000042C", L"1254", L"857", L"10081", L"Azeri (Latin)", L"5", LatinFonts, azAZLayouts}, #endif #ifdef LANGUAGE_EU_ES - {L"0000042D", L"1252", L"850", L"10000", L"Basque", L"217", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, euESLayouts }, + {L"0000042D", L"1252", L"850", L"10000", L"Basque", L"217", LatinFonts, euESLayouts}, #endif #ifdef LANGUAGE_BE_BY - {L"00000423", L"1251", L"866", L"10007", L"Belarusian", L"29", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, beBYLayouts }, + {L"00000423", L"1251", L"866", L"10007", L"Belarusian", L"29", CyrillicFonts, beBYLayouts}, #endif #ifdef LANGUAGE_BN_BD - {L"00000845", L"0", L"1", L"2", L"Bengali (Bangladesh)", L"23", bnBDPages, bnBDErrorEntries, bnBDStrings, UnicodeFonts, bnBDLayouts }, + {L"00000845", L"0", L"1", L"2", L"Bengali (Bangladesh)", L"23", UnicodeFonts, bnBDLayouts}, #endif #ifdef LANGUAGE_BN_IN - {L"00000445", L"0", L"1", L"2", L"Bengali (India)", L"113", bnBDPages, bnBDErrorEntries, bnBDStrings, UnicodeFonts, bnINLayouts }, + {L"00000445", L"0", L"1", L"2", L"Bengali (India)", L"113", UnicodeFonts, bnINLayouts}, #endif #ifdef LANGUAGE_BG_BG - {L"00000402", L"1251", L"866", L"10007", L"Bulgarian", L"35", bgBGPages, bgBGErrorEntries, bgBGStrings, CyrillicFonts, bgBGLayouts }, + {L"00000402", L"1251", L"866", L"10007", L"Bulgarian", L"35", CyrillicFonts, bgBGLayouts}, #endif #ifdef LANGUAGE_MY_MM - {L"00000455", L"0", L"1", L"2", L"Burmese", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, myMMLayouts }, + {L"00000455", L"0", L"1", L"2", L"Burmese", L"1", UnicodeFonts, myMMLayouts}, #endif #ifdef LANGUAGE_CA_ES - {L"00000403", L"1252", L"850", L"10000", L"Catalan", L"217", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, caESLayouts }, + {L"00000403", L"1252", L"850", L"10000", L"Catalan", L"217", LatinFonts, caESLayouts}, #endif #ifdef LANGUAGE_ZH_TW - {L"00000404", L"950", L"950", L"10008", L"Chinese (Taiwan)", L"237", enUSPages, enUSErrorEntries, enUSStrings, ChineseTraditionalFonts, zhTWLayouts }, + {L"00000404", L"950", L"950", L"10008", L"Chinese (Taiwan)", L"237", ChineseTraditionalFonts, zhTWLayouts}, #endif #ifdef LANGUAGE_ZH_CN - {L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", L"45", enUSPages, enUSErrorEntries, enUSStrings, ChineseSimplifiedFonts, zhCNLayouts }, + {L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", L"45", ChineseSimplifiedFonts, zhCNLayouts}, #endif #ifdef LANGUAGE_ZH_HK - {L"00000C04", L"950", L"950", L"10008", L"Chinese (Hong Kong S.A.R.)", L"104", enUSPages, enUSErrorEntries, enUSStrings, ChineseTraditionalFonts, zhHKLayouts }, + {L"00000C04", L"950", L"950", L"10008", L"Chinese (Hong Kong S.A.R.)", L"104", ChineseTraditionalFonts, zhHKLayouts}, #endif #ifdef LANGUAGE_ZH_SG - {L"00001004", L"936", L"936", L"10008", L"Chinese (Singapore)", L"215", enUSPages, enUSErrorEntries, enUSStrings, ChineseSimplifiedFonts, zhSGLayouts }, + {L"00001004", L"936", L"936", L"10008", L"Chinese (Singapore)", L"215", ChineseSimplifiedFonts, zhSGLayouts}, #endif #ifdef LANGUAGE_ZH_MO - {L"00001404", L"950", L"950", L"10002", L"Chinese (Macau S.A.R.)", L"151", enUSPages, enUSErrorEntries, enUSStrings, ChineseSimplifiedFonts, zhMOLayouts }, + {L"00001404", L"950", L"950", L"10002", L"Chinese (Macau S.A.R.)", L"151", ChineseSimplifiedFonts, zhMOLayouts}, #endif #ifdef LANGUAGE_HR_HR - {L"0000041A", L"1250", L"852", L"10029", L"Croatian", L"108", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, hrHRLayouts }, + {L"0000041A", L"1250", L"852", L"10029", L"Croatian", L"108", LatinFonts, hrHRLayouts}, #endif #ifdef LANGUAGE_CS_CZ - {L"00000405", L"1250", L"852", L"10029", L"Czech", L"75", csCZPages, csCZErrorEntries, csCZStrings, LatinFonts, csCZLayouts }, + {L"00000405", L"1250", L"852", L"10029", L"Czech", L"75", LatinFonts, csCZLayouts}, #endif #ifdef LANGUAGE_DA_DK - {L"00000406", L"1252", L"850", L"10000", L"Danish", L"61", daDKPages, daDKErrorEntries, daDKStrings, LatinFonts, daDKLayouts }, + {L"00000406", L"1252", L"850", L"10000", L"Danish", L"61", LatinFonts, daDKLayouts}, #endif #ifdef LANGUAGE_DV_MV - {L"00000465", L"0", L"1", L"2", L"Dhivehi (Maldives)", L"165", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, dvMVLayouts }, + {L"00000465", L"0", L"1", L"2", L"Dhivehi (Maldives)", L"165", UnicodeFonts, dvMVLayouts}, #endif #ifdef LANGUAGE_NL_NL - {L"00000413", L"1252", L"850", L"10000", L"Dutch (Netherlands)", L"176", nlNLPages, nlNLErrorEntries, nlNLStrings, LatinFonts, nlNLLayouts }, + {L"00000413", L"1252", L"850", L"10000", L"Dutch (Netherlands)", L"176", LatinFonts, nlNLLayouts}, #endif #ifdef LANGUAGE_NL_BE - {L"00000813", L"1252", L"850", L"10000", L"Dutch (Belgium)", L"21", nlNLPages, nlNLErrorEntries, nlNLStrings, LatinFonts, nlBELayouts }, + {L"00000813", L"1252", L"850", L"10000", L"Dutch (Belgium)", L"21", LatinFonts, nlBELayouts}, #endif #ifdef LANGUAGE_EN_US - {L"00000409", L"1252", L"437", L"10000", L"English (United States)", L"244", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enUSLayouts }, + {L"00000409", L"1252", L"437", L"10000", L"English (United States)", L"244", LatinFonts, enUSLayouts}, #endif #ifdef LANGUAGE_EN_GB - {L"00000809", L"1252", L"850", L"10000", L"English (United Kingdom)", L"242", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enGBLayouts }, + {L"00000809", L"1252", L"850", L"10000", L"English (United Kingdom)", L"242", LatinFonts, enGBLayouts}, #endif #ifdef LANGUAGE_EN_AU - {L"00000C09", L"1252", L"850", L"10000", L"English (Australia)", L"12", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enAULayouts }, + {L"00000C09", L"1252", L"850", L"10000", L"English (Australia)", L"12", LatinFonts, enAULayouts}, #endif #ifdef LANGUAGE_EN_CA - {L"00001009", L"1252", L"850", L"10000", L"English (Canada)", L"39", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enCALayouts }, + {L"00001009", L"1252", L"850", L"10000", L"English (Canada)", L"39", LatinFonts, enCALayouts}, #endif #ifdef LANGUAGE_EN_NZ - {L"00001409", L"1252", L"850", L"10000", L"English (New Zealand)", L"183", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enNZLayouts }, + {L"00001409", L"1252", L"850", L"10000", L"English (New Zealand)", L"183", LatinFonts, enNZLayouts}, #endif #ifdef LANGUAGE_EN_IE - {L"00001809", L"1252", L"850", L"10000", L"English (Ireland)", L"68", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enIELayouts }, + {L"00001809", L"1252", L"850", L"10000", L"English (Ireland)", L"68", LatinFonts, enIELayouts}, #endif #ifdef LANGUAGE_EN_ZA - {L"00001C09", L"1252", L"437", L"10000", L"English (South Africa)", L"209", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enZALayouts }, + {L"00001C09", L"1252", L"437", L"10000", L"English (South Africa)", L"209", LatinFonts, enZALayouts}, #endif #ifdef LANGUAGE_EN_JM - {L"00002009", L"1252", L"850", L"10000", L"English (Jamaica)", L"124", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enJMLayouts }, + {L"00002009", L"1252", L"850", L"10000", L"English (Jamaica)", L"124", LatinFonts, enJMLayouts}, #endif #ifdef LANGUAGE_EN_CB - {L"00002409", L"1252", L"850", L"10000", L"English (Caribbean)", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enCBLayouts }, + {L"00002409", L"1252", L"850", L"10000", L"English (Caribbean)", L"1", LatinFonts, enCBLayouts}, #endif #ifdef LANGUAGE_EN_BZ - {L"00002809", L"1252", L"850", L"10000", L"English (Belize)", L"24", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enBZLayouts }, + {L"00002809", L"1252", L"850", L"10000", L"English (Belize)", L"24", LatinFonts, enBZLayouts}, #endif #ifdef LANGUAGE_EN_TT - {L"00002C09", L"1252", L"850", L"10000", L"English (Trinidad)", L"225", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enTTLayouts }, + {L"00002C09", L"1252", L"850", L"10000", L"English (Trinidad)", L"225", LatinFonts, enTTLayouts}, #endif #ifdef LANGUAGE_EN_ZW - {L"00003009", L"1252", L"437", L"10000", L"English (Zimbabwe)", L"264", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enZWLayouts }, + {L"00003009", L"1252", L"437", L"10000", L"English (Zimbabwe)", L"264", LatinFonts, enZWLayouts}, #endif #ifdef LANGUAGE_EN_PH - {L"00003409", L"1252", L"437", L"10000", L"English (Philippines)", L"201", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enPHLayouts }, + {L"00003409", L"1252", L"437", L"10000", L"English (Philippines)", L"201", LatinFonts, enPHLayouts}, #endif #ifdef LANGUAGE_EO_AA - {L"0000048F", L"1252", L"437", L"10000", L"Esperanto", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, eoAALayouts }, + {L"0000048F", L"1252", L"437", L"10000", L"Esperanto", L"1", LatinFonts, eoAALayouts}, #endif #ifdef LANGUAGE_ET_EE - {L"00000425", L"1252", L"775", L"10029", L"Estonian", L"70", etEEPages, etEEErrorEntries, etEEStrings, LatinFonts, etEELayouts }, + {L"00000425", L"1252", L"775", L"10029", L"Estonian", L"70", LatinFonts, etEELayouts}, #endif #ifdef LANGUAGE_FO_FO - {L"00000438", L"1252", L"850", L"10079", L"Faeroese", L"81", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, foFOLayouts }, + {L"00000438", L"1252", L"850", L"10079", L"Faeroese", L"81", LatinFonts, foFOLayouts}, #endif #ifdef LANGUAGE_FA_IR - {L"00000429", L"1256", L"720", L"10004", L"Farsi", L"116", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, faIRLayouts }, + {L"00000429", L"1256", L"720", L"10004", L"Farsi", L"116", UnicodeFonts, faIRLayouts}, #endif #ifdef LANGUAGE_FI_FI - {L"0000040B", L"1252", L"850", L"10000", L"Finnish", L"77", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, fiFILayouts }, + {L"0000040B", L"1252", L"850", L"10000", L"Finnish", L"77", LatinFonts, fiFILayouts}, #endif #ifdef LANGUAGE_FR_CA - {L"00000C0C", L"1252", L"850", L"10000", L"French (Canada)", L"39", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frCALayouts }, + {L"00000C0C", L"1252", L"850", L"10000", L"French (Canada)", L"39", LatinFonts, frCALayouts}, #endif #ifdef LANGUAGE_FR_FR - {L"0000040C", L"1252", L"850", L"10000", L"French (France)", L"84", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frFRLayouts }, + {L"0000040C", L"1252", L"850", L"10000", L"French (France)", L"84", LatinFonts, frFRLayouts}, #endif #ifdef LANGUAGE_FR_BE - {L"0000080C", L"1252", L"850", L"10000", L"French (Belgium)", L"21", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frBELayouts }, + {L"0000080C", L"1252", L"850", L"10000", L"French (Belgium)", L"21", LatinFonts, frBELayouts}, #endif #ifdef LANGUAGE_FR_CH - {L"0000100C", L"1252", L"850", L"10000", L"French (Switzerland)", L"223", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frCHLayouts }, + {L"0000100C", L"1252", L"850", L"10000", L"French (Switzerland)", L"223", LatinFonts, frCHLayouts}, #endif #ifdef LANGUAGE_FR_LU - {L"0000140C", L"1252", L"850", L"10000", L"French (Luxembourg)", L"147", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frLULayouts }, + {L"0000140C", L"1252", L"850", L"10000", L"French (Luxembourg)", L"147", LatinFonts, frLULayouts}, #endif #ifdef LANGUAGE_FR_MC - {L"0000180C", L"1252", L"850", L"10000", L"French (Monaco)", L"158", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frMCLayouts }, + {L"0000180C", L"1252", L"850", L"10000", L"French (Monaco)", L"158", LatinFonts, frMCLayouts}, #endif #ifdef LANGUAGE_GL_ES - {L"00000456", L"1252", L"850", L"10000", L"Galician (Spain)", L"217", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, glESLayouts }, + {L"00000456", L"1252", L"850", L"10000", L"Galician (Spain)", L"217", LatinFonts, glESLayouts}, #endif #ifdef LANGUAGE_KA_GE - {L"00000437", L"0", L"1", L"2", L"Georgian", L"88", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, kaGELayouts }, + {L"00000437", L"0", L"1", L"2", L"Georgian", L"88", UnicodeFonts, kaGELayouts}, #endif #ifdef LANGUAGE_DE_DE - {L"00000407", L"1252", L"850", L"10000", L"German (Germany)", L"94", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deDELayouts }, + {L"00000407", L"1252", L"850", L"10000", L"German (Germany)", L"94", LatinFonts, deDELayouts}, #endif #ifdef LANGUAGE_DE_CH - {L"00000807", L"1252", L"850", L"10000", L"German (Switzerland)", L"223", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deCHLayouts }, + {L"00000807", L"1252", L"850", L"10000", L"German (Switzerland)", L"223", LatinFonts, deCHLayouts}, #endif #ifdef LANGUAGE_DE_AT - {L"00000C07", L"1252", L"850", L"10000", L"German (Austria)", L"14", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deATLayouts }, + {L"00000C07", L"1252", L"850", L"10000", L"German (Austria)", L"14", LatinFonts, deATLayouts}, #endif #ifdef LANGUAGE_DE_LU - {L"00001007", L"1252", L"850", L"10000", L"German (Luxembourg)", L"147", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deLULayouts }, + {L"00001007", L"1252", L"850", L"10000", L"German (Luxembourg)", L"147", LatinFonts, deLULayouts}, #endif #ifdef LANGUAGE_DE_LI - {L"00001407", L"1252", L"850", L"10000", L"German (Liechtenstein)", L"145", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deLILayouts }, + {L"00001407", L"1252", L"850", L"10000", L"German (Liechtenstein)", L"145", LatinFonts, deLILayouts}, #endif #ifdef LANGUAGE_EL_GR - {L"00000408", L"1253", L"737", L"10006", L"Greek", L"98", elGRPages, elGRErrorEntries, elGRStrings, GreekFonts, elGRLayouts }, + {L"00000408", L"1253", L"737", L"10006", L"Greek", L"98", GreekFonts, elGRLayouts}, #endif #ifdef LANGUAGE_GU_IN - {L"00000447", L"0", L"1", L"2", L"Gujarati (India)", L"113", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, guINLayouts }, + {L"00000447", L"0", L"1", L"2", L"Gujarati (India)", L"113", UnicodeFonts, guINLayouts}, #endif #ifdef LANGUAGE_HE_IL - {L"0000040D", L"1255", L"862", L"10005", L"Hebrew", L"117", heILPages, heILErrorEntries, heILStrings, HebrewFonts, heILLayouts }, + {L"0000040D", L"1255", L"862", L"10005", L"Hebrew", L"117", HebrewFonts, heILLayouts}, #endif #ifdef LANGUAGE_HI_IN - {L"00000439", L"1252", L"437", L"10000", L"Hindi", L"113", enUSPages, enUSErrorEntries, enUSStrings, HindiFonts, hiINLayouts }, + {L"00000439", L"1252", L"437", L"10000", L"Hindi", L"113", HindiFonts, hiINLayouts }, #endif #ifdef LANGUAGE_HU_HU - {L"0000040E", L"1250", L"852", L"10029", L"Hungarian", L"109", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, huHULayouts }, + {L"0000040E", L"1250", L"852", L"10029", L"Hungarian", L"109", LatinFonts, huHULayouts}, #endif #ifdef LANGUAGE_IS_IS - {L"0000040F", L"1252", L"850", L"10079", L"Icelandic", L"110", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, isISLayouts }, + {L"0000040F", L"1252", L"850", L"10079", L"Icelandic", L"110", LatinFonts, isISLayouts}, #endif #ifdef LANGUAGE_ID_ID - {L"00000421", L"1252", L"850", L"10079", L"Indonesian", L"111", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, idIDLayouts }, + {L"00000421", L"1252", L"850", L"10079", L"Indonesian", L"111", LatinFonts, idIDLayouts}, #endif #ifdef LANGUAGE_IT_IT - {L"00000410", L"1252", L"850", L"10000", L"Italian (Italy)", L"118", itITPages, itITErrorEntries, itITStrings, LatinFonts, itITLayouts }, + {L"00000410", L"1252", L"850", L"10000", L"Italian (Italy)", L"118", LatinFonts, itITLayouts}, #endif #ifdef LANGUAGE_IT_CH - {L"00000810", L"1252", L"850", L"10000", L"Italian (Switzerland)", L"223", itITPages, itITErrorEntries, itITStrings, LatinFonts, itCHLayouts }, + {L"00000810", L"1252", L"850", L"10000", L"Italian (Switzerland)", L"223", LatinFonts, itCHLayouts}, #endif #ifdef LANGUAGE_JA_JP - {L"00000411", L"932", L"932", L"10001", L"Japanese", L"122", jaJPPages, jaJPErrorEntries, jaJPStrings, JapaneseFonts, jaJPLayouts }, + {L"00000411", L"932", L"932", L"10001", L"Japanese", L"122", JapaneseFonts, jaJPLayouts}, #endif #ifdef LANGUAGE_KN_IN - {L"0000044B", L"1252", L"437", L"10079", L"Kannada (India)", L"113", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, knINLayouts }, + {L"0000044B", L"1252", L"437", L"10079", L"Kannada (India)", L"113", LatinFonts, knINLayouts}, #endif #ifdef LANGUAGE_KK_KZ - {L"0000043F", L"1251", L"866", L"10007", L"Kazakh", L"137", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, kkKZLayouts }, + {L"0000043F", L"1251", L"866", L"10007", L"Kazakh", L"137", CyrillicFonts, kkKZLayouts}, #endif #ifdef LANGUAGE_KOK_IN - {L"00000457", L"0", L"437", L"2", L"Konkani", L"113", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, kokINLayouts}, + {L"00000457", L"0", L"437", L"2", L"Konkani", L"113", UnicodeFonts, kokINLayouts}, #endif #ifdef LANGUAGE_KO_KR - {L"00000412", L"949", L"949", L"10003", L"Korean", L"134", enUSPages, enUSErrorEntries, enUSStrings, KoreanFonts, koKRLayouts }, + {L"00000412", L"949", L"949", L"10003", L"Korean", L"134", KoreanFonts, koKRLayouts}, #endif #ifdef LANGUAGE_KY_KG - {L"00000440", L"1251", L"866", L"10007", L"Kyrgyz (Kyrgyzstan)", L"130", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, kyKGLayouts }, + {L"00000440", L"1251", L"866", L"10007", L"Kyrgyz (Kyrgyzstan)", L"130", CyrillicFonts, kyKGLayouts}, #endif #ifdef LANGUAGE_LV_LV - {L"00000426", L"1257", L"775", L"10029", L"Latvian", L"140", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, lvLVLayouts }, + {L"00000426", L"1257", L"775", L"10029", L"Latvian", L"140", LatinFonts, lvLVLayouts}, #endif #ifdef LANGUAGE_LT_LT - {L"00000427", L"1257", L"775", L"10029", L"Lithuanian", L"141", ltLTPages, ltLTErrorEntries, ltLTStrings, LatinFonts, ltLTLayouts }, + {L"00000427", L"1257", L"775", L"10029", L"Lithuanian", L"141", LatinFonts, ltLTLayouts}, #endif #ifdef LANGUAGE_MK_MK - {L"0000042F", L"1251", L"866", L"10007", L"FYRO Macedonian", L"19618", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, mkMKLayouts }, + {L"0000042F", L"1251", L"866", L"10007", L"FYRO Macedonian", L"19618", CyrillicFonts, mkMKLayouts}, #endif #ifdef LANGUAGE_MS_BN - {L"0000083E", L"1252", L"850", L"10000", L"Malay (Brunei Darussalam)", L"37", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, msBNLayouts }, + {L"0000083E", L"1252", L"850", L"10000", L"Malay (Brunei Darussalam)", L"37", LatinFonts, msBNLayouts}, #endif #ifdef LANGUAGE_MS_MY - {L"0000043E", L"1252", L"850", L"10000", L"Malay (Malaysia)", L"167", msMYPages, msMYErrorEntries, msMYStrings, LatinFonts, msMYLayouts }, + {L"0000043E", L"1252", L"850", L"10000", L"Malay (Malaysia)", L"167", LatinFonts, msMYLayouts}, #endif #ifdef LANGUAGE_MR_IN - {L"0000044E", L"0", L"1", L"2", L"Marathi", L"113", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, mrINLayouts }, + {L"0000044E", L"0", L"1", L"2", L"Marathi", L"113", UnicodeFonts, mrINLayouts}, #endif #ifdef LANGUAGE_MN_MN - {L"00000450", L"1251", L"866", L"10007", L"Mongolian (Mongolia)", L"154", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, mnMNLayouts }, + {L"00000450", L"1251", L"866", L"10007", L"Mongolian (Mongolia)", L"154", CyrillicFonts, mnMNLayouts}, #endif #ifdef LANGUAGE_NB_NO - {L"00000414", L"1252", L"850", L"10000", L"Norwegian (Bokmal)", L"177", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, nbNOLayouts }, + {L"00000414", L"1252", L"850", L"10000", L"Norwegian (Bokmal)", L"177", LatinFonts, nbNOLayouts}, #endif #ifdef LANGUAGE_NN_NO - {L"00000814", L"1252", L"850", L"10000", L"Norwegian (Nynorsk)", L"177", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, nnNOLayouts }, + {L"00000814", L"1252", L"850", L"10000", L"Norwegian (Nynorsk)", L"177", LatinFonts, nnNOLayouts}, #endif #ifdef LANGUAGE_PL_PL - {L"00000415", L"1250", L"852", L"10029", L"Polish", L"191", plPLPages, plPLErrorEntries, plPLStrings, LatinFonts, plPLLayouts }, + {L"00000415", L"1250", L"852", L"10029", L"Polish", L"191", LatinFonts, plPLLayouts}, #endif #ifdef LANGUAGE_PT_PT - {L"00000816", L"1252", L"850", L"10000", L"Portuguese (Portugal)", L"193", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, ptPTLayouts }, + {L"00000816", L"1252", L"850", L"10000", L"Portuguese (Portugal)", L"193", LatinFonts, ptPTLayouts}, #endif #ifdef LANGUAGE_PT_BR - {L"00000416", L"1252", L"850", L"10000", L"Portuguese (Brazil)", L"32", ptBRPages, ptBRErrorEntries, ptBRStrings, LatinFonts, ptBRLayouts }, + {L"00000416", L"1252", L"850", L"10000", L"Portuguese (Brazil)", L"32", LatinFonts, ptBRLayouts}, #endif #ifdef LANGUAGE_PA_IN - {L"00000446", L"0", L"1", L"2", L"Punjabi (India)", L"113", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, paINLayouts }, + {L"00000446", L"0", L"1", L"2", L"Punjabi (India)", L"113", UnicodeFonts, paINLayouts}, #endif #ifdef LANGUAGE_RO_RO - {L"00000418", L"28606", L"28606", L"10029", L"Romanian", L"200", roROPages, roROErrorEntries, roROStrings, LatinFonts, roROLayouts }, + {L"00000418", L"28606", L"28606", L"10029", L"Romanian", L"200", LatinFonts, roROLayouts}, #endif #ifdef LANGUAGE_RM_CH - {L"00000417", L"1252", L"850", L"10000", L"Romansh", L"223", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, rmCHLayouts }, + {L"00000417", L"1252", L"850", L"10000", L"Romansh", L"223", LatinFonts, rmCHLayouts}, #endif #ifdef LANGUAGE_RU_RU - {L"00000419", L"1251", L"866", L"10007", L"Russian", L"203", ruRUPages, ruRUErrorEntries, ruRUStrings, CyrillicFonts, ruRULayouts }, + {L"00000419", L"1251", L"866", L"10007", L"Russian", L"203", CyrillicFonts, ruRULayouts}, #endif #ifdef LANGUAGE_SA_IN - {L"0000044F", L"0", L"1", L"2", L"Sanskrit", L"113", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, saINLayouts }, + {L"0000044F", L"0", L"1", L"2", L"Sanskrit", L"113", UnicodeFonts, saINLayouts}, #endif #ifdef LANGUAGE_SR_SP - {L"00000C1A", L"1251", L"855", L"10007", L"Serbian (Cyrillic)", L"271", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, srSPLayouts }, + {L"00000C1A", L"1251", L"855", L"10007", L"Serbian (Cyrillic)", L"271", CyrillicFonts, srSPLayouts}, #endif #ifdef LANGUAGE_SR_SP - {L"0000081A", L"1250", L"852", L"10029", L"Serbian (Latin)", L"271", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, srSPLayouts }, + {L"0000081A", L"1250", L"852", L"10029", L"Serbian (Latin)", L"271", LatinFonts, srSPLayouts}, #endif #ifdef LANGUAGE_SK_SK - {L"0000041B", L"1250", L"852", L"10029", L"Slovak", L"143", skSKPages, skSKErrorEntries, skSKStrings, LatinFonts, skSKLayouts }, + {L"0000041B", L"1250", L"852", L"10029", L"Slovak", L"143", LatinFonts, skSKLayouts}, #endif #ifdef LANGUAGE_SL_SI - {L"00000424", L"1250", L"852", L"10029", L"Slovenian", L"212", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, slSILayouts }, + {L"00000424", L"1250", L"852", L"10029", L"Slovenian", L"212", LatinFonts, slSILayouts}, #endif #ifdef LANGUAGE_ES_ES - {L"0000040A", L"1252", L"850", L"10000", L"Spanish (Traditional Sort)", L"217", esESPages, esESErrorEntries, esESStrings, LatinFonts, esESLayouts }, + {L"0000040A", L"1252", L"850", L"10000", L"Spanish (Traditional Sort)", L"217", LatinFonts, esESLayouts}, #endif #ifdef LANGUAGE_ES_MX - {L"0000080A", L"1252", L"850", L"10000", L"Spanish (Mexico)", L"166", esESPages, esESErrorEntries, esESStrings, LatinFonts, esMXLayouts }, + {L"0000080A", L"1252", L"850", L"10000", L"Spanish (Mexico)", L"166", LatinFonts, esMXLayouts}, #endif #ifdef LANGUAGE_ES_ES - {L"00000C0A", L"1252", L"850", L"10000", L"Spanish (International Sort)", L"217", esESPages, esESErrorEntries, esESStrings, LatinFonts, esESLayouts }, + {L"00000C0A", L"1252", L"850", L"10000", L"Spanish (International Sort)", L"217", LatinFonts, esESLayouts}, #endif #ifdef LANGUAGE_ES_GT - {L"0000100A", L"1252", L"850", L"10000", L"Spanish (Guatemala)", L"99", esESPages, esESErrorEntries, esESStrings, LatinFonts, esGTLayouts }, + {L"0000100A", L"1252", L"850", L"10000", L"Spanish (Guatemala)", L"99", LatinFonts, esGTLayouts}, #endif #ifdef LANGUAGE_ES_CR - {L"0000140A", L"1252", L"850", L"10000", L"Spanish (Costa Rica)", L"54", esESPages, esESErrorEntries, esESStrings, LatinFonts, esCRLayouts }, + {L"0000140A", L"1252", L"850", L"10000", L"Spanish (Costa Rica)", L"54", LatinFonts, esCRLayouts}, #endif #ifdef LANGUAGE_ES_PA - {L"0000180A", L"1252", L"850", L"10000", L"Spanish (Panama)", L"192", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPALayouts }, + {L"0000180A", L"1252", L"850", L"10000", L"Spanish (Panama)", L"192", LatinFonts, esPALayouts}, #endif #ifdef LANGUAGE_ES_DO - {L"00001C0A", L"1252", L"850", L"10000", L"Spanish (Dominican Republic)", L"65", esESPages, esESErrorEntries, esESStrings, LatinFonts, esDOLayouts }, + {L"00001C0A", L"1252", L"850", L"10000", L"Spanish (Dominican Republic)", L"65", LatinFonts, esDOLayouts}, #endif #ifdef LANGUAGE_ES_VE - {L"0000200A", L"1252", L"850", L"10000", L"Spanish (Venezuela)", L"249", esESPages, esESErrorEntries, esESStrings, LatinFonts, esVELayouts }, + {L"0000200A", L"1252", L"850", L"10000", L"Spanish (Venezuela)", L"249", LatinFonts, esVELayouts}, #endif #ifdef LANGUAGE_ES_CO - {L"0000240A", L"1252", L"850", L"10000", L"Spanish (Colombia)", L"51", esESPages, esESErrorEntries, esESStrings, LatinFonts, esCOLayouts }, + {L"0000240A", L"1252", L"850", L"10000", L"Spanish (Colombia)", L"51", LatinFonts, esCOLayouts}, #endif #ifdef LANGUAGE_ES_PE - {L"0000280A", L"1252", L"850", L"10000", L"Spanish (Peru)", L"187", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPELayouts }, + {L"0000280A", L"1252", L"850", L"10000", L"Spanish (Peru)", L"187", LatinFonts, esPELayouts}, #endif #ifdef LANGUAGE_ES_AR - {L"00002C0A", L"1252", L"850", L"10000", L"Spanish (Argentina)", L"11", esESPages, esESErrorEntries, esESStrings, LatinFonts, esARLayouts }, + {L"00002C0A", L"1252", L"850", L"10000", L"Spanish (Argentina)", L"11", LatinFonts, esARLayouts}, #endif #ifdef LANGUAGE_ES_EC - {L"0000300A", L"1252", L"850", L"10000", L"Spanish (Ecuador)", L"66", esESPages, esESErrorEntries, esESStrings, LatinFonts, esECLayouts }, + {L"0000300A", L"1252", L"850", L"10000", L"Spanish (Ecuador)", L"66", LatinFonts, esECLayouts}, #endif #ifdef LANGUAGE_ES_CL - {L"0000340A", L"1252", L"850", L"10000", L"Spanish (Chile)", L"46", esESPages, esESErrorEntries, esESStrings, LatinFonts, esCLLayouts }, + {L"0000340A", L"1252", L"850", L"10000", L"Spanish (Chile)", L"46", LatinFonts, esCLLayouts}, #endif #ifdef LANGUAGE_ES_UY - {L"0000380A", L"1252", L"850", L"10000", L"Spanish (Uruguay)", L"246", esESPages, esESErrorEntries, esESStrings, LatinFonts, esUYLayouts }, + {L"0000380A", L"1252", L"850", L"10000", L"Spanish (Uruguay)", L"246", LatinFonts, esUYLayouts}, #endif #ifdef LANGUAGE_ES_PY - {L"00003C0A", L"1252", L"850", L"10000", L"Spanish (Paraguay)", L"185", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPYLayouts }, + {L"00003C0A", L"1252", L"850", L"10000", L"Spanish (Paraguay)", L"185", LatinFonts, esPYLayouts}, #endif #ifdef LANGUAGE_ES_BO - {L"0000400A", L"1252", L"850", L"10000", L"Spanish (Bolivia)", L"26", esESPages, esESErrorEntries, esESStrings, LatinFonts, esBOLayouts }, + {L"0000400A", L"1252", L"850", L"10000", L"Spanish (Bolivia)", L"26", LatinFonts, esBOLayouts}, #endif #ifdef LANGUAGE_ES_SV - {L"0000440A", L"1252", L"850", L"10000", L"Spanish (El Salvador)", L"72", esESPages, esESErrorEntries, esESStrings, LatinFonts, esSVLayouts }, + {L"0000440A", L"1252", L"850", L"10000", L"Spanish (El Salvador)", L"72", LatinFonts, esSVLayouts}, #endif #ifdef LANGUAGE_ES_HN - {L"0000480A", L"1252", L"850", L"10000", L"Spanish (Honduras)", L"106", esESPages, esESErrorEntries, esESStrings, LatinFonts, esHNLayouts }, + {L"0000480A", L"1252", L"850", L"10000", L"Spanish (Honduras)", L"106", LatinFonts, esHNLayouts}, #endif #ifdef LANGUAGE_ES_NI - {L"00004C0A", L"1252", L"850", L"10000", L"Spanish (Nicaragua)", L"182", esESPages, esESErrorEntries, esESStrings, LatinFonts, esNILayouts }, + {L"00004C0A", L"1252", L"850", L"10000", L"Spanish (Nicaragua)", L"182", LatinFonts, esNILayouts}, #endif #ifdef LANGUAGE_ES_PR - {L"0000500A", L"1252", L"850", L"10000", L"Spanish (Puerto Rico)", L"202", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPRLayouts }, + {L"0000500A", L"1252", L"850", L"10000", L"Spanish (Puerto Rico)", L"202", LatinFonts, esPRLayouts}, #endif #ifdef LANGUAGE_SW_KE - {L"00000441", L"1252", L"437", L"10000", L"Swahili", L"129", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, swKELayouts }, + {L"00000441", L"1252", L"437", L"10000", L"Swahili", L"129", LatinFonts, swKELayouts}, #endif #ifdef LANGUAGE_SV_SE - {L"0000041D", L"1252", L"850", L"10000", L"Swedish", L"221", svSEPages, svSEErrorEntries, svSEStrings, LatinFonts, svSELayouts }, + {L"0000041D", L"1252", L"850", L"10000", L"Swedish", L"221", LatinFonts, svSELayouts}, #endif #ifdef LANGUAGE_SV_FI - {L"0000081D", L"1252", L"850", L"10000", L"Swedish (Finland)", L"77", svSEPages, svSEErrorEntries, svSEStrings, LatinFonts, svFILayouts }, + {L"0000081D", L"1252", L"850", L"10000", L"Swedish (Finland)", L"77", LatinFonts, svFILayouts}, #endif #ifdef LANGUAGE_SYR_SY - {L"0000045A", L"0", L"1", L"2", L"Syriac (Syria)", L"222", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, syrSYLayouts}, + {L"0000045A", L"0", L"1", L"2", L"Syriac (Syria)", L"222", UnicodeFonts, syrSYLayouts}, #endif #ifdef LANGUAGE_TA_IN - {L"00000449", L"0", L"1", L"2", L"Tamil", L"113", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, taINLayouts }, + {L"00000449", L"0", L"1", L"2", L"Tamil", L"113", UnicodeFonts, taINLayouts}, #endif #ifdef LANGUAGE_TT_TA - {L"00000444", L"1251", L"866", L"10007", L"Tatar", L"1", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, ttTALayouts }, + {L"00000444", L"1251", L"866", L"10007", L"Tatar", L"1", CyrillicFonts, ttTALayouts}, #endif #ifdef LANGUAGE_TE_IN - {L"0000044A", L"0", L"1", L"2", L"Telugu (India)", L"113", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, teINLayouts }, + {L"0000044A", L"0", L"1", L"2", L"Telugu (India)", L"113", UnicodeFonts, teINLayouts}, #endif #ifdef LANGUAGE_TH_TH - {L"0000041E", L"874", L"874", L"10021", L"Thai", L"227", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, thTHLayouts }, + {L"0000041E", L"874", L"874", L"10021", L"Thai", L"227", UnicodeFonts, thTHLayouts}, #endif #ifdef LANGUAGE_TR_TR - {L"0000041F", L"1254", L"857", L"10081", L"Turkish", L"235", trTRPages, trTRErrorEntries, trTRStrings, LatinFonts, trTRLayouts }, + {L"0000041F", L"1254", L"857", L"10081", L"Turkish", L"235", LatinFonts, trTRLayouts}, #endif #ifdef LANGUAGE_UK_UA - {L"00000422", L"1251", L"866", L"10017", L"Ukrainian", L"241", ukUAPages, ukUAErrorEntries, ukUAStrings, CyrillicFonts, ukUALayouts }, + {L"00000422", L"1251", L"866", L"10017", L"Ukrainian", L"241", CyrillicFonts, ukUALayouts}, #endif #ifdef LANGUAGE_UR_PK - {L"00000420", L"1256", L"720", L"10004", L"Urdu", L"190", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, urPKLayouts }, + {L"00000420", L"1256", L"720", L"10004", L"Urdu", L"190", UnicodeFonts, urPKLayouts}, #endif #ifdef LANGUAGE_UZ_UZ - {L"00000443", L"1254", L"857", L"10029", L"Uzbek (Latin)", L"247", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, uzUZLayouts }, + {L"00000443", L"1254", L"857", L"10029", L"Uzbek (Latin)", L"247", LatinFonts, uzUZLayouts}, #endif #ifdef LANGUAGE_UZ_UZ - {L"00000843", L"1251", L"866", L"10007", L"Uzbek (Cyrillic)", L"247", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, uzUZLayouts }, + {L"00000843", L"1251", L"866", L"10007", L"Uzbek (Cyrillic)", L"247", CyrillicFonts, uzUZLayouts}, #endif #ifdef LANGUAGE_VI_VN - {L"0000042A", L"1258", L"1258",L"10000", L"Vietnamese", L"251", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, viVNLayouts }, + {L"0000042A", L"1258", L"1258", L"10000", L"Vietnamese", L"251", UnicodeFonts, viVNLayouts}, #endif #ifdef LANGUAGE_WA_BE - {L"00000490", L"1252", L"850", L"10000", L"Walon", L"21", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, waBELayouts }, + {L"00000490", L"1252", L"850", L"10000", L"Walon", L"21", LatinFonts, waBELayouts}, #endif #ifdef LANGUAGE_ZU_ZU - {L"00000435", L"1252", L"850", L"10000", L"Zulu", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, zuZULayouts }, + {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} }; diff --git a/base/setup/lib/settings.c b/base/setup/lib/settings.c index ab005d290c..bf9a804929 100644 --- a/base/setup/lib/settings.c +++ b/base/setup/lib/settings.c @@ -28,6 +28,7 @@ #include "precomp.h" #include "genlist.h" #include "infsupp.h" +#include "mui.h" #include "registry.h" #include "settings.h" @@ -37,9 +38,7 @@ /* GLOBALS ******************************************************************/ -#if 0 // FIXME: Disabled for now because it uses MUI* functions from usetup -ULONG DefaultLanguageIndex = 0; -#endif +static ULONG DefaultLanguageIndex = 0; /* FUNCTIONS ****************************************************************/ @@ -212,8 +211,8 @@ cleanup: static BOOLEAN GetComputerIdentifier( - PWSTR Identifier, - ULONG IdentifierLength) + OUT PWSTR Identifier, + IN ULONG IdentifierLength) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; @@ -314,7 +313,23 @@ GetComputerIdentifier( } -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 +399,7 @@ AddEntriesFromInfSection( return TotalCount; } -UCHAR +static UCHAR NTAPI DefaultProcessEntry( IN PWCHAR KeyName, @@ -418,7 +433,7 @@ DefaultProcessEntry( PGENERIC_LIST CreateComputerTypeList( - HINF InfFile) + IN HINF InfFile) { PGENERIC_LIST List; INFCONTEXT Context; @@ -493,8 +508,8 @@ CreateComputerTypeList( static BOOLEAN GetDisplayIdentifier( - PWSTR Identifier, - ULONG IdentifierLength) + OUT PWSTR Identifier, + IN ULONG IdentifierLength) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; @@ -654,7 +669,7 @@ GetDisplayIdentifier( PGENERIC_LIST CreateDisplayDriverList( - HINF InfFile) + IN HINF InfFile) { PGENERIC_LIST List; INFCONTEXT Context; @@ -733,9 +748,9 @@ CreateDisplayDriverList( 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 +773,8 @@ ProcessComputerFiles( BOOLEAN ProcessDisplayRegistry( - HINF InfFile, - PGENERIC_LIST List) + IN HINF InfFile, + IN PGENERIC_LIST List) { NTSTATUS Status; PGENERIC_LIST_ENTRY Entry; @@ -916,7 +931,7 @@ ProcessDisplayRegistry( BOOLEAN ProcessLocaleRegistry( - PGENERIC_LIST List) + IN PGENERIC_LIST List) { PGENERIC_LIST_ENTRY Entry; PWCHAR LanguageId; @@ -1030,7 +1045,7 @@ ProcessLocaleRegistry( PGENERIC_LIST CreateKeyboardDriverList( - HINF InfFile) + IN HINF InfFile) { PGENERIC_LIST List; INFCONTEXT Context; @@ -1054,8 +1069,6 @@ CreateKeyboardDriverList( } -#if 0 // FIXME: Disabled for now because it uses MUI* functions from usetup - ULONG GetDefaultLanguageIndex(VOID) { @@ -1112,8 +1125,8 @@ ProcessLangEntry( PGENERIC_LIST CreateLanguageList( - HINF InfFile, - WCHAR *DefaultLanguage) + IN HINF InfFile, + OUT PWSTR DefaultLanguage) { PGENERIC_LIST List; INFCONTEXT Context; @@ -1132,7 +1145,6 @@ CreateLanguageList( return NULL; wcscpy(DefaultLanguage, KeyValue); - SelectedLanguageId = KeyValue; List = CreateGenericList(); if (List == NULL) @@ -1163,13 +1175,14 @@ CreateLanguageList( PGENERIC_LIST CreateKeyboardLayoutList( - HINF InfFile, - WCHAR *DefaultKBLayout) + IN HINF InfFile, + IN PCWSTR LanguageId, + OUT PWSTR DefaultKBLayout) { PGENERIC_LIST List; INFCONTEXT Context; PWCHAR KeyValue; - const MUI_LAYOUTS * LayoutsList; + const MUI_LAYOUTS* LayoutsList; ULONG uIndex = 0; /* Get default layout id */ @@ -1185,7 +1198,7 @@ CreateKeyboardLayoutList( if (List == NULL) return NULL; - LayoutsList = MUIGetLayoutsList(); + LayoutsList = MUIGetLayoutsList(LanguageId); do { @@ -1220,11 +1233,12 @@ CreateKeyboardLayoutList( 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; @@ -1237,41 +1251,37 @@ ProcessKeyboardLayoutRegistry( if (LayoutId == NULL) return FALSE; - LayoutsList = MUIGetLayoutsList(); + LayoutsList = MUIGetLayoutsList(LanguageId); + + if (_wcsicmp(LayoutsList[0].LayoutID, LayoutId) == 0) + return TRUE; - if (_wcsicmp(LayoutsList[0].LayoutID, LayoutId) != 0) + for (uIndex = 1; LayoutsList[uIndex].LangID != NULL; uIndex++) { - for (uIndex = 1; LayoutsList[uIndex].LangID != NULL; uIndex++) + if (_wcsicmp(LayoutsList[uIndex].LayoutID, LayoutId) == 0) { - if (_wcsicmp(LayoutsList[uIndex].LayoutID, LayoutId) == 0) - { - uOldPos = uIndex; - continue; - } - - NewLayoutsList[uIndex].LangID = LayoutsList[uIndex].LangID; - NewLayoutsList[uIndex].LayoutID = LayoutsList[uIndex].LayoutID; + uOldPos = uIndex; + continue; } - 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); + NewLayoutsList[uIndex].LangID = LayoutsList[uIndex].LangID; + NewLayoutsList[uIndex].LayoutID = LayoutsList[uIndex].LayoutID; } - return TRUE; -} + 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; -#endif + return AddKbLayoutsToRegistry(NewLayoutsList); +} #if 0 BOOLEAN ProcessKeyboardLayoutFiles( - PGENERIC_LIST List) + IN PGENERIC_LIST List) { return TRUE; } @@ -1279,7 +1289,7 @@ ProcessKeyboardLayoutFiles( BOOLEAN SetGeoID( - PWCHAR Id) + IN PCWSTR Id) { NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; @@ -1322,7 +1332,7 @@ SetGeoID( BOOLEAN SetDefaultPagefile( - WCHAR Drive) + IN WCHAR Drive) { NTSTATUS Status; HANDLE KeyHandle; diff --git a/base/setup/lib/settings.h b/base/setup/lib/settings.h index bbdfd8d09d..ce66383aba 100644 --- a/base/setup/lib/settings.h +++ b/base/setup/lib/settings.h @@ -26,101 +26,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); - -#if 0 // FIXME: Disabled for now because it uses MUI* functions from usetup + IN HINF InfFile); PGENERIC_LIST CreateKeyboardLayoutList( - HINF InfFile, - WCHAR *DefaultKBLayout); + IN HINF InfFile, + IN PCWSTR LanguageId, + OUT PWSTR 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); - -#endif + 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 */ diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index 033a4c8235..2e231bdd0e 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -40,6 +40,7 @@ extern HANDLE ProcessHeap; #include "utils/osdetect.h" #include "utils/regutil.h" #include "registry.h" +#include "mui.h" #include "settings.h" diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt index d82f1c2f75..0d83835a36 100644 --- a/base/setup/usetup/CMakeLists.txt +++ b/base/setup/usetup/CMakeLists.txt @@ -26,7 +26,6 @@ list(APPEND SOURCE mui.c partlist.c progress.c - settings.c usetup.c usetup.h) diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 6191c1f857..e493058e21 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -1,14 +1,5 @@ #pragma once -MUI_LAYOUTS bgBGLayouts[] = -{ - { L"0402", L"00000402" }, - { L"0402", L"00020402" }, - { L"0402", L"00030402" }, - { L"0409", L"00000409" }, - { NULL, NULL } -}; - static MUI_ENTRY bgBGLanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index 847c53b712..72e00614d1 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -1,11 +1,5 @@ #pragma once -MUI_LAYOUTS bnBDLayouts[] = -{ - { L"0845", L"00000845" }, - { NULL, NULL } -}; - static MUI_ENTRY bnBDLanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 7972b8603f..3d425c9109 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -6,14 +6,6 @@ #pragma once -MUI_LAYOUTS csCZLayouts[] = -{ - { L"0405", L"00000405" }, - { L"0405", L"00010405" }, - { L"0409", L"00000409" }, - { NULL, NULL } -}; - static MUI_ENTRY csCZLanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index a58f2db920..4190c9a862 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -1,11 +1,5 @@ #pragma once -MUI_LAYOUTS daDKLayouts[] = -{ - { L"0406", L"00000406" }, - { NULL, NULL } -}; - static MUI_ENTRY daDKLanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index 2e2d66ea7a..e245272bdf 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -1,12 +1,5 @@ #pragma once -MUI_LAYOUTS deDELayouts[] = -{ - { L"0407", L"00000407" }, - { L"0409", L"00000409" }, - { NULL, NULL } -}; - static MUI_ENTRY deDELanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index 4052a8997d..ae33c5d946 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -1,12 +1,5 @@ #pragma once -MUI_LAYOUTS elGRLayouts[] = -{ - { L"0408", L"00000408" }, - { L"0409", L"00000409" }, - { NULL, NULL } -}; - static MUI_ENTRY elGRLanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index 5905590a33..065753651c 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -1,11 +1,5 @@ #pragma once -MUI_LAYOUTS enUSLayouts[] = -{ - { L"0409", L"00000409" }, - { NULL, NULL } -}; - static MUI_ENTRY enUSLanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index c60e0daddb..896c856951 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -2,13 +2,6 @@ #pragma once -MUI_LAYOUTS esESLayouts[] = -{ - { L"040A", L"0000040A" }, - { L"0409", L"00000409" }, - { NULL, NULL } -}; - static MUI_ENTRY esESLanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index ff36b11d59..3e89e58ce0 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -1,11 +1,5 @@ #pragma once -MUI_LAYOUTS etEELayouts[] = -{ - { L"0425", L"00000425" }, - { NULL, NULL } -}; - static MUI_ENTRY etEELanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index 3cf8aa7600..00d7977de9 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -1,12 +1,5 @@ #pragma once -MUI_LAYOUTS frFRLayouts[] = -{ - { L"040C", L"0000040C" }, - { L"0409", L"00000409" }, - { NULL, NULL } -}; - static MUI_ENTRY frFRLanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 29260ab128..cdc18bd1c5 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -1,12 +1,5 @@ #pragma once -MUI_LAYOUTS heILLayouts[] = -{ - { L"0409", L"00000409" }, - { L"040D", L"0000040D" }, - { NULL, NULL } -}; - static MUI_ENTRY heILLanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index 8d4987fcf3..44b1697638 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -1,12 +1,5 @@ #pragma once -MUI_LAYOUTS itITLayouts[] = -{ - { L"0410", L"00000410" }, - { L"0409", L"00000409" }, - { NULL, NULL } -}; - static MUI_ENTRY itITLanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index f71e340231..a384439c91 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -1,12 +1,5 @@ #pragma once -MUI_LAYOUTS jaJPLayouts[] = -{ -// { L"0411", L"e0010411" }, - { L"0411", L"00000411" }, - { NULL, NULL } -}; - static MUI_ENTRY jaJPLanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index d2cb29527c..0a5479e0ec 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -9,13 +9,6 @@ #pragma once -MUI_LAYOUTS ltLTLayouts[] = -{ - { L"0427", L"00010427" }, - { L"0409", L"00000409" }, - { NULL, NULL } -}; - static MUI_ENTRY ltLTLanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index e8ae583e4d..a6858e31cf 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -1,11 +1,5 @@ #pragma once -MUI_LAYOUTS msMYLayouts[] = -{ - { L"0409", L"00000409" }, - { NULL, NULL } -}; - static MUI_ENTRY msMYLanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index f8b6711972..7fc8648df8 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -8,14 +8,6 @@ #pragma once -MUI_LAYOUTS nlNLLayouts[] = -{ - { L"0413", L"00020409" }, - { L"0413", L"00000413" }, - { L"0409", L"00000409" }, - { NULL, NULL } -}; - static MUI_ENTRY nlNLLanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 1df2488272..43c40b489e 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -9,14 +9,6 @@ #pragma once -MUI_LAYOUTS plPLLayouts[] = -{ - { L"0415", L"00000415" }, - { L"0415", L"00010415" }, - { L"0409", L"00000409" }, - { NULL, NULL } -}; - static MUI_ENTRY plPLLanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 6f3cba11ce..1f074384d9 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -1,12 +1,5 @@ #pragma once -MUI_LAYOUTS ptBRLayouts[] = -{ - { L"0416", L"00000416" }, - { L"0409", L"00000409" }, - { NULL, NULL } -}; - static MUI_ENTRY ptBRLanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 2a4f788617..97892e89cd 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -1,13 +1,6 @@ /* �tefan Fulea (stefan dot fulea at mail dot com) */ #pragma once -MUI_LAYOUTS roROLayouts[] = -{ - { L"0418", L"00000418" }, - { L"0409", L"00000409" }, - { NULL, NULL } -}; - static MUI_ENTRY roROLanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 3d809a189d..6fcf7a7442 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -1,12 +1,5 @@ #pragma once -MUI_LAYOUTS ruRULayouts[] = -{ - { L"0419", L"00000419" }, - { L"0409", L"00000409" }, - { NULL, NULL } -}; - static MUI_ENTRY ruRULanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index efb9d0c9f0..ac14f87484 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -6,14 +6,6 @@ #pragma once -MUI_LAYOUTS skSKLayouts[] = -{ - { L"041B", L"0000041B" }, - { L"041B", L"0001041B" }, - { L"0409", L"00000409" }, - { NULL, NULL } -}; - static MUI_ENTRY skSKLanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 01b6e61a5c..e30d2e5846 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -4,12 +4,6 @@ #pragma once -MUI_LAYOUTS sqALLayouts[] = -{ - { L"041C", L"0000041C" }, - { NULL, NULL } -}; - static MUI_ENTRY sqALLanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 897fbcca62..f1b496d98c 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -6,13 +6,6 @@ */ #pragma once -MUI_LAYOUTS svSELayouts[] = -{ - { L"041D", L"0000041D" }, - { L"0409", L"00000409" }, - { NULL, NULL } -}; - static MUI_ENTRY svSELanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index e9e3d8b6de..d7b4feb8a5 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -2,14 +2,6 @@ #pragma once -MUI_LAYOUTS trTRLayouts[] = -{ - { L"041F", L"0000041F" }, - { L"041F", L"0001041f" }, - { L"0409", L"00000409" }, - { NULL, NULL } -}; - static MUI_ENTRY trTRLanguagePageEntries[] = { { diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index eebea803ca..761ed8e0d8 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -5,13 +5,6 @@ #pragma once -MUI_LAYOUTS ukUALayouts[] = -{ - { L"0422", L"00000422" }, - { L"0409", L"00000409" }, - { NULL, NULL } -}; - static MUI_ENTRY ukUALanguagePageEntries[] = { { diff --git a/base/setup/usetup/mui.c b/base/setup/usetup/mui.c index b7d2ab8be8..5d07307244 100644 --- a/base/setup/usetup/mui.c +++ b/base/setup/usetup/mui.c @@ -25,19 +25,11 @@ */ #include "usetup.h" -#include "muifonts.h" #include "muilanguages.h" #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) @@ -46,40 +38,43 @@ FindLanguageIndex(VOID) if (SelectedLanguageId == NULL) { - /* default to english */ - return 0; + /* Default to en-US */ + return 0; // FIXME!! + // SelectedLanguageId = L"00000409"; } - do + while (ResourceList[lngIndex].MuiPages != NULL) { - if (_wcsicmp(MUILanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + if (_wcsicmp(ResourceList[lngIndex].LanguageID, SelectedLanguageId) == 0) { return lngIndex; } lngIndex++; - } while (MUILanguageList[lngIndex].MuiPages != NULL); + } return 0; } +#if 0 BOOLEAN IsLanguageAvailable( PWCHAR LanguageId) { ULONG lngIndex = 0; - do + while (ResourceList[lngIndex].MuiPages != NULL) { - if (_wcsicmp(MUILanguageList[lngIndex].LanguageID , LanguageId) == 0) + if (_wcsicmp(ResourceList[lngIndex].LanguageID, LanguageId) == 0) return TRUE; lngIndex++; - } while (MUILanguageList[lngIndex].MuiPages != NULL); + } return FALSE; } +#endif static @@ -92,59 +87,33 @@ FindMUIEntriesOfPage( const MUI_PAGE * Pages = NULL; lngIndex = max(FindLanguageIndex(), 0); - Pages = MUILanguageList[lngIndex].MuiPages; + Pages = ResourceList[lngIndex].MuiPages; - do + while (Pages[muiIndex].MuiEntry != NULL) { - if (Pages[muiIndex].Number == PageNumber) - return Pages[muiIndex].MuiEntry; + if (Pages[muiIndex].Number == PageNumber) + return Pages[muiIndex].MuiEntry; - muiIndex++; - } while (Pages[muiIndex].MuiEntry != NULL); + muiIndex++; + } return NULL; } - static const MUI_ERROR * FindMUIErrorEntries(VOID) { ULONG lngIndex = max(FindLanguageIndex(), 0); - return MUILanguageList[lngIndex].MuiErrors; + return ResourceList[lngIndex].MuiErrors; } - static const MUI_STRING * FindMUIStringEntries(VOID) { ULONG lngIndex = max(FindLanguageIndex(), 0); - return MUILanguageList[lngIndex].MuiStrings; -} - - -LPCWSTR -MUIDefaultKeyboardLayout(VOID) -{ - ULONG lngIndex = max(FindLanguageIndex(), 0); - return MUILanguageList[lngIndex].MuiLayouts[0].LayoutID; -} - - -PWCHAR -MUIGetGeoID(VOID) -{ - ULONG lngIndex = max(FindLanguageIndex(), 0); - return MUILanguageList[lngIndex].GeoID; -} - - -const MUI_LAYOUTS * -MUIGetLayoutsList(VOID) -{ - ULONG lngIndex = max(FindLanguageIndex(), 0); - return MUILanguageList[lngIndex].MuiLayouts; + return ResourceList[lngIndex].MuiStrings; } @@ -153,7 +122,7 @@ MUIClearPage( IN ULONG page) { const MUI_ENTRY * entry; - int index; + ULONG index; entry = FindMUIEntriesOfPage(page); if (!entry) @@ -166,7 +135,7 @@ MUIClearPage( } index = 0; - do + while (entry[index].Buffer != NULL) { CONSOLE_ClearStyledText(entry[index].X, entry[index].Y, @@ -174,16 +143,14 @@ MUIClearPage( strlen(entry[index].Buffer)); index++; } - while (entry[index].Buffer != NULL); } - VOID MUIDisplayPage( IN ULONG page) { const MUI_ENTRY * entry; - int index; + ULONG index; entry = FindMUIEntriesOfPage(page); if (!entry) @@ -196,7 +163,7 @@ MUIDisplayPage( } index = 0; - do + while (entry[index].Buffer != NULL) { CONSOLE_SetStyledText(entry[index].X, entry[index].Y, @@ -205,10 +172,8 @@ MUIDisplayPage( index++; } - while (entry[index].Buffer != NULL); } - VOID MUIDisplayError( IN ULONG ErrorNum, @@ -250,7 +215,6 @@ MUIDisplayError( WaitEvent); } - LPSTR MUIGetString( ULONG Number) @@ -281,468 +245,29 @@ MUIGetString( 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) - { - 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(MUILanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) - { - return AddKbLayoutsToRegistry(MUILanguageList[lngIndex].MuiLayouts); - } - - lngIndex++; - } - while (MUILanguageList[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(MUILanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) - { - if (AddCodepageToRegistry(MUILanguageList[lngIndex].ACPage, - MUILanguageList[lngIndex].OEMCPage, - MUILanguageList[lngIndex].MACCPage)&& - AddFontsSettingsToRegistry(MUILanguageList[lngIndex].MuiSubFonts)) - { - return TRUE; - } - else - { - return FALSE; - } - } - - lngIndex++; - } - while (MUILanguageList[lngIndex].MuiPages != NULL); - - return FALSE; -} - - VOID SetConsoleCodePage(VOID) { - ULONG lngIndex = 0; UINT wCodePage; - do +#if 0 + ULONG lngIndex = 0; + + while (ResourceList[lngIndex].MuiPages != NULL) { - if (_wcsicmp(MUILanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + if (_wcsicmp(ResourceList[lngIndex].LanguageID, SelectedLanguageId) == 0) { - wCodePage = (UINT) wcstoul(MUILanguageList[lngIndex].OEMCPage, NULL, 10); + wCodePage = (UINT) wcstoul(ResourceList[lngIndex].OEMCPage, NULL, 10); SetConsoleOutputCP(wCodePage); return; } lngIndex++; } - while (MUILanguageList[lngIndex].MuiPages != NULL); +#else + wCodePage = (UINT)wcstoul(MUIGetOEMCodePage(SelectedLanguageId), NULL, 10); + SetConsoleOutputCP(wCodePage); +#endif } /* EOF */ diff --git a/base/setup/usetup/mui.h b/base/setup/usetup/mui.h index a823c33206..3dd985f670 100644 --- a/base/setup/usetup/mui.h +++ b/base/setup/usetup/mui.h @@ -2,17 +2,17 @@ typedef struct { - BYTE X; - BYTE Y; - LPCSTR Buffer; - DWORD Flags; -}MUI_ENTRY, *PMUI_ENTRY; + BYTE X; + BYTE Y; + LPCSTR Buffer; + DWORD Flags; +} MUI_ENTRY, *PMUI_ENTRY; typedef struct { LPCSTR ErrorText; LPCSTR ErrorStatus; -}MUI_ERROR; +} MUI_ERROR; typedef struct { @@ -28,34 +28,18 @@ typedef struct typedef struct { - PWCHAR FontName; - PWCHAR SubFontName; -} MUI_SUBFONT; - -typedef struct -{ - PWCHAR LangID; // Language ID (like "0409") - PWCHAR LayoutID; // Layout ID (like "00000409") -} MUI_LAYOUTS; - -typedef struct -{ - PWCHAR LanguageID; - PWCHAR ACPage; - PWCHAR OEMCPage; - PWCHAR MACCPage; - PWCHAR LanguageDescriptor; - PWCHAR GeoID; + PCWSTR LanguageID; + PCWSTR LanguageDescriptor; const MUI_PAGE * MuiPages; const MUI_ERROR * MuiErrors; const MUI_STRING * MuiStrings; - const MUI_SUBFONT * MuiSubFonts; - const MUI_LAYOUTS * MuiLayouts; -} MUI_LANGUAGE; +} MUI_LANGUAGE_RESOURCE; +#if 0 BOOLEAN IsLanguageAvailable( PWCHAR LanguageId); +#endif VOID MUIDisplayPage( @@ -72,25 +56,6 @@ MUIDisplayError( ULONG WaitEvent, ...); -LPCWSTR -MUIDefaultKeyboardLayout(VOID); - -PWCHAR -MUIGetGeoID(VOID); - -const MUI_LAYOUTS * -MUIGetLayoutsList(VOID); - -BOOLEAN -AddKbLayoutsToRegistry( - IN const MUI_LAYOUTS *MuiLayouts); - -BOOLEAN -AddCodePage(VOID); - -BOOLEAN -AddKeyboardLayouts(VOID); - VOID SetConsoleCodePage(VOID); diff --git a/base/setup/usetup/muilanguages.h b/base/setup/usetup/muilanguages.h index c5c4519838..2dca81c300 100644 --- a/base/setup/usetup/muilanguages.h +++ b/base/setup/usetup/muilanguages.h @@ -2,843 +2,843 @@ #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 MUILanguageList[] = +const MUI_LANGUAGE_RESOURCE ResourceList[] = { - /* Lang ID, ANSI CP, OEM CP, MAC CP, Language Name, GeoID page strgs,error strings, other strings, fonts, kb layouts */ + /* Lang ID, Language Name, Page strings, Error strings, Other strings */ #ifdef LANGUAGE_AF_ZA - {L"00000436", L"1252", L"850", L"10000", L"Afrikaans", L"209", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, afZALayouts }, + {L"00000436", L"Afrikaans", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_SQ_AL - {L"0000041C", L"1250", L"852", L"10029", L"Albanian (Albania)", L"6", sqALPages, sqALErrorEntries, sqALStrings, LatinFonts, sqALLayouts }, + {L"0000041C", L"Albanian (Albania)", sqALPages, sqALErrorEntries, sqALStrings}, #endif #ifdef LANGUAGE_AR_SA - {L"00000401", L"1256", L"720", L"10004", L"Arabic (Saudi Arabia)", L"205", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arSALayouts }, + {L"00000401", L"Arabic (Saudi Arabia)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_AR_IQ - {L"00000801", L"1256", L"720", L"10004", L"Arabic (Iraq)", L"121", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arIQLayouts }, + {L"00000801", L"Arabic (Iraq)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_AR_EG - {L"00000C01", L"1256", L"720", L"10004", L"Arabic (Egypt)", L"67", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arEGLayouts }, + {L"00000C01", L"Arabic (Egypt)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_AR_LY - {L"00001001", L"1256", L"720", L"10004", L"Arabic (Libya)", L"148", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arLYLayouts }, + {L"00001001", L"Arabic (Libya)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_AR_DZ - {L"00001401", L"1256", L"720", L"10004", L"Arabic (Algeria)", L"4", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arDZLayouts }, + {L"00001401", L"Arabic (Algeria)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_AR_MA - {L"00001801", L"1256", L"720", L"10004", L"Arabic (Morocco)", L"149", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arMALayouts }, + {L"00001801", L"Arabic (Morocco)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_AR_TN - {L"00001C01", L"1256", L"720", L"10004", L"Arabic (Tunisia)", L"234", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arTNLayouts }, + {L"00001C01", L"Arabic (Tunisia)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_AR_OM - {L"00002001", L"1256", L"720", L"10004", L"Arabic (Oman)", L"164", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arOMLayouts }, + {L"00002001", L"Arabic (Oman)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_AR_YE - {L"00002401", L"1256", L"720", L"10004", L"Arabic (Yemen)", L"261", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arYELayouts }, + {L"00002401", L"Arabic (Yemen)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_AR_SY - {L"00002801", L"1256", L"720", L"10004", L"Arabic (Syria)", L"222", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arSYLayouts }, + {L"00002801", L"Arabic (Syria)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_AR_JO - {L"00002C01", L"1256", L"720", L"10004", L"Arabic (Jordan)", L"126", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arJOLayouts }, + {L"00002C01", L"Arabic (Jordan)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_AR_LB - {L"00003001", L"1256", L"720", L"10004", L"Arabic (Lebanon)", L"139", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arLBLayouts }, + {L"00003001", L"Arabic (Lebanon)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_AR_KW - {L"00003401", L"1256", L"720", L"10004", L"Arabic (Kuwait)", L"136", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arKWLayouts }, + {L"00003401", L"Arabic (Kuwait)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_AR_AE - {L"00003801", L"1256", L"720", L"10004", L"Arabic (U.A.E.)", L"224", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arAELayouts }, + {L"00003801", L"Arabic (U.A.E.)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_AR_BH - {L"00003C01", L"1256", L"720", L"10004", L"Arabic (Bahrain)", L"17", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arBHLayouts }, + {L"00003C01", L"Arabic (Bahrain)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_AR_QA - {L"00004001", L"1256", L"720", L"10004", L"Arabic (Qatar)", L"197", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arQALayouts }, + {L"00004001", L"Arabic (Qatar)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_HY_AM - {L"0000042B", L"0", L"1", L"2", L"Armenian", L"7", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, hyAMLayouts }, + {L"0000042B", L"Armenian", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_AZ_AZ - {L"0000082C", L"1251", L"866", L"10007", L"Azeri (Cyrillic)", L"5", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, azAZLayouts }, + {L"0000082C", L"Azeri (Cyrillic)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_AZ_AZ - {L"0000042C", L"1254", L"857", L"10081", L"Azeri (Latin)", L"5", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, azAZLayouts }, + {L"0000042C", L"Azeri (Latin)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_EU_ES - {L"0000042D", L"1252", L"850", L"10000", L"Basque", L"217", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, euESLayouts }, + {L"0000042D", L"Basque", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_BE_BY - {L"00000423", L"1251", L"866", L"10007", L"Belarusian", L"29", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, beBYLayouts }, + {L"00000423", L"Belarusian", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_BN_BD - {L"00000845", L"0", L"1", L"2", L"Bengali (Bangladesh)", L"23", bnBDPages, bnBDErrorEntries, bnBDStrings, UnicodeFonts, bnBDLayouts }, + {L"00000845", L"Bengali (Bangladesh)", bnBDPages, bnBDErrorEntries, bnBDStrings}, #endif #ifdef LANGUAGE_BN_IN - {L"00000445", L"0", L"1", L"2", L"Bengali (India)", L"113", bnBDPages, bnBDErrorEntries, bnBDStrings, UnicodeFonts, bnINLayouts }, + {L"00000445", L"Bengali (India)", bnBDPages, bnBDErrorEntries, bnBDStrings}, #endif #ifdef LANGUAGE_BG_BG - {L"00000402", L"1251", L"866", L"10007", L"Bulgarian", L"35", bgBGPages, bgBGErrorEntries, bgBGStrings, CyrillicFonts, bgBGLayouts }, + {L"00000402", L"Bulgarian", bgBGPages, bgBGErrorEntries, bgBGStrings}, #endif #ifdef LANGUAGE_MY_MM - {L"00000455", L"0", L"1", L"2", L"Burmese", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, myMMLayouts }, + {L"00000455", L"Burmese", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_CA_ES - {L"00000403", L"1252", L"850", L"10000", L"Catalan", L"217", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, caESLayouts }, + {L"00000403", L"Catalan", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_ZH_TW - {L"00000404", L"950", L"950", L"10008", L"Chinese (Taiwan)", L"237", enUSPages, enUSErrorEntries, enUSStrings, ChineseTraditionalFonts, zhTWLayouts }, + {L"00000404", L"Chinese (Taiwan)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_ZH_CN - {L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", L"45", enUSPages, enUSErrorEntries, enUSStrings, ChineseSimplifiedFonts, zhCNLayouts }, + {L"00000804", L"Chinese (PRC)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_ZH_HK - {L"00000C04", L"950", L"950", L"10008", L"Chinese (Hong Kong S.A.R.)", L"104", enUSPages, enUSErrorEntries, enUSStrings, ChineseTraditionalFonts, zhHKLayouts }, + {L"00000C04", L"Chinese (Hong Kong S.A.R.)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_ZH_SG - {L"00001004", L"936", L"936", L"10008", L"Chinese (Singapore)", L"215", enUSPages, enUSErrorEntries, enUSStrings, ChineseSimplifiedFonts, zhSGLayouts }, + {L"00001004", L"Chinese (Singapore)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_ZH_MO - {L"00001404", L"950", L"950", L"10002", L"Chinese (Macau S.A.R.)", L"151", enUSPages, enUSErrorEntries, enUSStrings, ChineseSimplifiedFonts, zhMOLayouts }, + {L"00001404", L"Chinese (Macau S.A.R.)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_HR_HR - {L"0000041A", L"1250", L"852", L"10029", L"Croatian", L"108", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, hrHRLayouts }, + {L"0000041A", L"Croatian", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_CS_CZ - {L"00000405", L"1250", L"852", L"10029", L"Czech", L"75", csCZPages, csCZErrorEntries, csCZStrings, LatinFonts, csCZLayouts }, + {L"00000405", L"Czech", csCZPages, csCZErrorEntries, csCZStrings}, #endif #ifdef LANGUAGE_DA_DK - {L"00000406", L"1252", L"850", L"10000", L"Danish", L"61", daDKPages, daDKErrorEntries, daDKStrings, LatinFonts, daDKLayouts }, + {L"00000406", L"Danish", daDKPages, daDKErrorEntries, daDKStrings}, #endif #ifdef LANGUAGE_DV_MV - {L"00000465", L"0", L"1", L"2", L"Dhivehi (Maldives)", L"165", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, dvMVLayouts }, + {L"00000465", L"Dhivehi (Maldives)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_NL_NL - {L"00000413", L"1252", L"850", L"10000", L"Dutch (Netherlands)", L"176", nlNLPages, nlNLErrorEntries, nlNLStrings, LatinFonts, nlNLLayouts }, + {L"00000413", L"Dutch (Netherlands)", nlNLPages, nlNLErrorEntries, nlNLStrings}, #endif #ifdef LANGUAGE_NL_BE - {L"00000813", L"1252", L"850", L"10000", L"Dutch (Belgium)", L"21", nlNLPages, nlNLErrorEntries, nlNLStrings, LatinFonts, nlBELayouts }, + {L"00000813", L"Dutch (Belgium)", nlNLPages, nlNLErrorEntries, nlNLStrings}, #endif #ifdef LANGUAGE_EN_US - {L"00000409", L"1252", L"437", L"10000", L"English (United States)", L"244", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enUSLayouts }, + {L"00000409", L"English (United States)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_EN_GB - {L"00000809", L"1252", L"850", L"10000", L"English (United Kingdom)", L"242", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enGBLayouts }, + {L"00000809", L"English (United Kingdom)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_EN_AU - {L"00000C09", L"1252", L"850", L"10000", L"English (Australia)", L"12", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enAULayouts }, + {L"00000C09", L"English (Australia)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_EN_CA - {L"00001009", L"1252", L"850", L"10000", L"English (Canada)", L"39", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enCALayouts }, + {L"00001009", L"English (Canada)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_EN_NZ - {L"00001409", L"1252", L"850", L"10000", L"English (New Zealand)", L"183", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enNZLayouts }, + {L"00001409", L"English (New Zealand)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_EN_IE - {L"00001809", L"1252", L"850", L"10000", L"English (Ireland)", L"68", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enIELayouts }, + {L"00001809", L"English (Ireland)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_EN_ZA - {L"00001C09", L"1252", L"437", L"10000", L"English (South Africa)", L"209", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enZALayouts }, + {L"00001C09", L"English (South Africa)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_EN_JM - {L"00002009", L"1252", L"850", L"10000", L"English (Jamaica)", L"124", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enJMLayouts }, + {L"00002009", L"English (Jamaica)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_EN_CB - {L"00002409", L"1252", L"850", L"10000", L"English (Caribbean)", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enCBLayouts }, + {L"00002409", L"English (Caribbean)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_EN_BZ - {L"00002809", L"1252", L"850", L"10000", L"English (Belize)", L"24", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enBZLayouts }, + {L"00002809", L"English (Belize)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_EN_TT - {L"00002C09", L"1252", L"850", L"10000", L"English (Trinidad)", L"225", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enTTLayouts }, + {L"00002C09", L"English (Trinidad)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_EN_ZW - {L"00003009", L"1252", L"437", L"10000", L"English (Zimbabwe)", L"264", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enZWLayouts }, + {L"00003009", L"English (Zimbabwe)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_EN_PH - {L"00003409", L"1252", L"437", L"10000", L"English (Philippines)", L"201", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enPHLayouts }, + {L"00003409", L"English (Philippines)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_EO_AA - {L"0000048F", L"1252", L"437", L"10000", L"Esperanto", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, eoAALayouts }, + {L"0000048F", L"Esperanto", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_ET_EE - {L"00000425", L"1252", L"775", L"10029", L"Estonian", L"70", etEEPages, etEEErrorEntries, etEEStrings, LatinFonts, etEELayouts }, + {L"00000425", L"Estonian", etEEPages, etEEErrorEntries, etEEStrings}, #endif #ifdef LANGUAGE_FO_FO - {L"00000438", L"1252", L"850", L"10079", L"Faeroese", L"81", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, foFOLayouts }, + {L"00000438", L"Faeroese", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_FA_IR - {L"00000429", L"1256", L"720", L"10004", L"Farsi", L"116", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, faIRLayouts }, + {L"00000429", L"Farsi", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_FI_FI - {L"0000040B", L"1252", L"850", L"10000", L"Finnish", L"77", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, fiFILayouts }, + {L"0000040B", L"Finnish", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_FR_CA - {L"00000C0C", L"1252", L"850", L"10000", L"French (Canada)", L"39", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frCALayouts }, + {L"00000C0C", L"French (Canada)", frFRPages, frFRErrorEntries, frFRStrings}, #endif #ifdef LANGUAGE_FR_FR - {L"0000040C", L"1252", L"850", L"10000", L"French (France)", L"84", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frFRLayouts }, + {L"0000040C", L"French (France)", frFRPages, frFRErrorEntries, frFRStrings}, #endif #ifdef LANGUAGE_FR_BE - {L"0000080C", L"1252", L"850", L"10000", L"French (Belgium)", L"21", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frBELayouts }, + {L"0000080C", L"French (Belgium)", frFRPages, frFRErrorEntries, frFRStrings}, #endif #ifdef LANGUAGE_FR_CH - {L"0000100C", L"1252", L"850", L"10000", L"French (Switzerland)", L"223", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frCHLayouts }, + {L"0000100C", L"French (Switzerland)", frFRPages, frFRErrorEntries, frFRStrings}, #endif #ifdef LANGUAGE_FR_LU - {L"0000140C", L"1252", L"850", L"10000", L"French (Luxembourg)", L"147", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frLULayouts }, + {L"0000140C", L"French (Luxembourg)", frFRPages, frFRErrorEntries, frFRStrings}, #endif #ifdef LANGUAGE_FR_MC - {L"0000180C", L"1252", L"850", L"10000", L"French (Monaco)", L"158", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frMCLayouts }, + {L"0000180C", L"French (Monaco)", frFRPages, frFRErrorEntries, frFRStrings}, #endif #ifdef LANGUAGE_GL_ES - {L"00000456", L"1252", L"850", L"10000", L"Galician (Spain)", L"217", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, glESLayouts }, + {L"00000456", L"Galician (Spain)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_KA_GE - {L"00000437", L"0", L"1", L"2", L"Georgian", L"88", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, kaGELayouts }, + {L"00000437", L"Georgian", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_DE_DE - {L"00000407", L"1252", L"850", L"10000", L"German (Germany)", L"94", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deDELayouts }, + {L"00000407", L"German (Germany)", deDEPages, deDEErrorEntries, deDEStrings}, #endif #ifdef LANGUAGE_DE_CH - {L"00000807", L"1252", L"850", L"10000", L"German (Switzerland)", L"223", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deCHLayouts }, + {L"00000807", L"German (Switzerland)", deDEPages, deDEErrorEntries, deDEStrings}, #endif #ifdef LANGUAGE_DE_AT - {L"00000C07", L"1252", L"850", L"10000", L"German (Austria)", L"14", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deATLayouts }, + {L"00000C07", L"German (Austria)", deDEPages, deDEErrorEntries, deDEStrings}, #endif #ifdef LANGUAGE_DE_LU - {L"00001007", L"1252", L"850", L"10000", L"German (Luxembourg)", L"147", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deLULayouts }, + {L"00001007", L"German (Luxembourg)", deDEPages, deDEErrorEntries, deDEStrings}, #endif #ifdef LANGUAGE_DE_LI - {L"00001407", L"1252", L"850", L"10000", L"German (Liechtenstein)", L"145", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deLILayouts }, + {L"00001407", L"German (Liechtenstein)", deDEPages, deDEErrorEntries, deDEStrings}, #endif #ifdef LANGUAGE_EL_GR - {L"00000408", L"1253", L"737", L"10006", L"Greek", L"98", elGRPages, elGRErrorEntries, elGRStrings, GreekFonts, elGRLayouts }, + {L"00000408", L"Greek", elGRPages, elGRErrorEntries, elGRStrings}, #endif #ifdef LANGUAGE_GU_IN - {L"00000447", L"0", L"1", L"2", L"Gujarati (India)", L"113", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, guINLayouts }, + {L"00000447", L"Gujarati (India)", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_HE_IL - {L"0000040D", L"1255", L"862", L"10005", L"Hebrew", L"117", heILPages, heILErrorEntries, heILStrings, HebrewFonts, heILLayouts }, + {L"0000040D", L"Hebrew", heILPages, heILErrorEntries, heILStrings}, #endif #ifdef LANGUAGE_HI_IN - {L"00000439", L"1252", L"437", L"10000", L"Hindi", L"113", enUSPages, enUSErrorEntries, enUSStrings, HindiFonts, hiINLayouts }, + {L"00000439", L"Hindi", enUSPages, enUSErrorEntries, enUSStrings}, #endif #ifdef LANGUAGE_HU_HU - {L"0000040E", L"1250", L"852", L"10029", L"Hungarian", L"109", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, huHULayouts }, + {L"0000040E", L"Hungarian", enUSPages, enUSErrorEntries, enUSStrings}, #endif ... 732 lines suppressed ...

1 0

01/01: [SCHEDSVC] Improvements to the scheduler service
by Eric Kohl 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e4d79e514a43fa9ef3b5c… commit e4d79e514a43fa9ef3b5c92c8d9f0eba307c8706 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Oct 28 00:02:18 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Oct 28 00:04:20 2018 +0200 [SCHEDSVC] Improvements to the scheduler service Use WaitForMultipleObjects in the mail scheduler loop: - Use events to signal service stop and job update events to the main loop. - Use the timeout timer to start the next job. --- base/services/schedsvc/job.c | 55 ++++++++++++++++++++++++++++--- base/services/schedsvc/precomp.h | 5 +++ base/services/schedsvc/rpcserver.c | 16 ++++----- base/services/schedsvc/schedsvc.c | 66 ++++++++++++++++++++++++++------------ 4 files changed, 109 insertions(+), 33 deletions(-) diff --git a/base/services/schedsvc/job.c b/base/services/schedsvc/job.c index b7abac0873..cc97f4b46b 100644 --- a/base/services/schedsvc/job.c +++ b/base/services/schedsvc/job.c @@ -35,6 +35,54 @@ RTL_RESOURCE StartListLock; /* FUNCTIONS *****************************************************************/ +DWORD +GetNextJobTimeout(VOID) +{ + FILETIME FileTime; + SYSTEMTIME SystemTime; + ULARGE_INTEGER CurrentTime, Timeout; + PJOB pNextJob; + + if (IsListEmpty(&StartListHead)) + { + TRACE("No job in list! Wait until next update.\n"); + return INFINITE; + } + + pNextJob = CONTAINING_RECORD((&StartListHead)->Flink, JOB, StartEntry); + + FileTime.dwLowDateTime = pNextJob->StartTime.u.LowPart; + FileTime.dwHighDateTime = pNextJob->StartTime.u.HighPart; + FileTimeToSystemTime(&FileTime, &SystemTime); + + TRACE("Start next job (%lu) at %02hu:%02hu %02hu.%02hu.%hu\n", + pNextJob->JobId, SystemTime.wHour, SystemTime.wMinute, + SystemTime.wDay, SystemTime.wMonth, SystemTime.wYear); + + GetLocalTime(&SystemTime); + SystemTimeToFileTime(&SystemTime, &FileTime); + + CurrentTime.u.LowPart = FileTime.dwLowDateTime; + CurrentTime.u.HighPart = FileTime.dwHighDateTime; + + if (CurrentTime.QuadPart >= pNextJob->StartTime.QuadPart) + { + TRACE("Next event has already gone by!\n"); + return 0; + } + + Timeout.QuadPart = (pNextJob->StartTime.QuadPart - CurrentTime.QuadPart) / 10000; + if (Timeout.u.HighPart != 0) + { + TRACE("Event happens too far in the future!\n"); + return INFINITE; + } + + TRACE("Timeout: %lu\n", Timeout.u.LowPart); + return Timeout.u.LowPart; +} + + static VOID GetJobName( @@ -276,8 +324,6 @@ LoadJobs(VOID) pJob->JobId = dwNextJobId++; dwJobCount++; - // Cancel the start timer - /* Append the new job to the job list */ InsertTailList(&JobListHead, &pJob->JobEntry); @@ -290,8 +336,6 @@ LoadJobs(VOID) DumpStartList(&StartListHead); #endif - // Update the start timer - /* Release the job list lock */ RtlReleaseResource(&JobListLock); @@ -333,7 +377,8 @@ DaysOfMonth( VOID -CalculateNextStartTime(PJOB pJob) +CalculateNextStartTime( + _In_ PJOB pJob) { SYSTEMTIME StartTime; FILETIME FileTime; diff --git a/base/services/schedsvc/precomp.h b/base/services/schedsvc/precomp.h index 6b8e7480e5..405a0dd61e 100644 --- a/base/services/schedsvc/precomp.h +++ b/base/services/schedsvc/precomp.h @@ -52,9 +52,14 @@ extern RTL_RESOURCE JobListLock; extern LIST_ENTRY StartListHead; extern RTL_RESOURCE StartListLock; +extern HANDLE Events[2]; + /* job.c */ +DWORD +GetNextJobTimeout(VOID); + LONG SaveJob( PJOB pJob); diff --git a/base/services/schedsvc/rpcserver.c b/base/services/schedsvc/rpcserver.c index 1ca2b353ee..4ae657f6a2 100644 --- a/base/services/schedsvc/rpcserver.c +++ b/base/services/schedsvc/rpcserver.c @@ -112,8 +112,6 @@ NetrJobAdd( pJob->JobId = dwNextJobId++; dwJobCount++; - // Cancel the start timer - /* Append the new job to the job list */ InsertTailList(&JobListHead, &pJob->JobEntry); @@ -129,11 +127,13 @@ NetrJobAdd( DumpStartList(&StartListHead); #endif - // Update the start timer - /* Release the job list lock */ RtlReleaseResource(&JobListLock); + /* Set the update event */ + if (Events[1] != NULL) + SetEvent(Events[1]); + /* Return the new job ID */ *pJobId = pJob->JobId; @@ -162,8 +162,6 @@ NetrJobDel( /* Acquire the job list lock exclusively */ RtlAcquireResourceExclusive(&JobListLock, TRUE); - // Cancel the start timer - JobEntry = JobListHead.Flink; while (JobEntry != &JobListHead) { @@ -193,11 +191,13 @@ NetrJobDel( JobEntry = JobEntry->Flink; } - // Update the start timer - /* Release the job list lock */ RtlReleaseResource(&JobListLock); + /* Set the update event */ + if (Events[1] != NULL) + SetEvent(Events[1]); + return ERROR_SUCCESS; } diff --git a/base/services/schedsvc/schedsvc.c b/base/services/schedsvc/schedsvc.c index 76f0418ad6..28e639a5a1 100644 --- a/base/services/schedsvc/schedsvc.c +++ b/base/services/schedsvc/schedsvc.c @@ -37,7 +37,8 @@ static WCHAR ServiceName[] = L"Schedule"; static SERVICE_STATUS_HANDLE ServiceStatusHandle; static SERVICE_STATUS ServiceStatus; -static BOOL bStopService = FALSE; +HANDLE Events[2] = {NULL, NULL}; // StopEvent, UpdateEvent + /* FUNCTIONS *****************************************************************/ @@ -77,7 +78,7 @@ ServiceControlHandler(DWORD dwControl, LPVOID lpEventData, LPVOID lpContext) { - TRACE("ServiceControlHandler() called\n"); + TRACE("ServiceControlHandler()\n"); switch (dwControl) { @@ -87,7 +88,8 @@ ServiceControlHandler(DWORD dwControl, UpdateServiceStatus(SERVICE_STOP_PENDING); /* Stop listening to incoming RPC messages */ RpcMgmtStopServerListening(NULL); - bStopService = TRUE; + if (Events[0] != NULL) + SetEvent(Events[0]); return ERROR_SUCCESS; case SERVICE_CONTROL_PAUSE: @@ -106,6 +108,7 @@ ServiceControlHandler(DWORD dwControl, &ServiceStatus); return ERROR_SUCCESS; +#if 0 case 128: TRACE(" Start Shell control received\n"); return ERROR_SUCCESS; @@ -113,6 +116,7 @@ ServiceControlHandler(DWORD dwControl, case 129: TRACE(" Logoff control received\n"); return ERROR_SUCCESS; +#endif default: TRACE(" Control %lu received\n", dwControl); @@ -123,7 +127,7 @@ ServiceControlHandler(DWORD dwControl, static DWORD -ServiceInit(PHANDLE phEvent) +ServiceInit(VOID) { HANDLE hThread; DWORD dwError; @@ -160,11 +164,20 @@ ServiceInit(PHANDLE phEvent) CloseHandle(hThread); - /* Create the scheduler event */ - *phEvent = CreateEvent(NULL, FALSE, FALSE, NULL); - if (*phEvent == NULL) + /* Create the stop event */ + Events[0] = CreateEvent(NULL, FALSE, FALSE, NULL); + if (Events[0] == NULL) + { + ERR("Could not create the stop event\n"); + return GetLastError(); + } + + /* Create the update event */ + Events[1] = CreateEvent(NULL, FALSE, FALSE, NULL); + if (Events[1] == NULL) { - ERR("Could not create the scheduler event\n"); + ERR("Could not create the update event\n"); + CloseHandle(Events[0]); return GetLastError(); } @@ -175,13 +188,12 @@ ServiceInit(PHANDLE phEvent) VOID WINAPI SchedServiceMain(DWORD argc, LPTSTR *argv) { - HANDLE hEvent = NULL; - DWORD dwError; + DWORD dwWait, dwTimeout, dwError; UNREFERENCED_PARAMETER(argc); UNREFERENCED_PARAMETER(argv); - TRACE("SchedServiceMain() called\n"); + TRACE("SchedServiceMain()\n"); ServiceStatusHandle = RegisterServiceCtrlHandlerExW(ServiceName, ServiceControlHandler, @@ -194,7 +206,7 @@ SchedServiceMain(DWORD argc, LPTSTR *argv) UpdateServiceStatus(SERVICE_START_PENDING); - dwError = ServiceInit(&hEvent); + dwError = ServiceInit(); if (dwError != ERROR_SUCCESS) { ERR("Service stopped (dwError: %lu\n", dwError); @@ -204,19 +216,33 @@ SchedServiceMain(DWORD argc, LPTSTR *argv) UpdateServiceStatus(SERVICE_RUNNING); + dwTimeout = GetNextJobTimeout(); + for (;;) { - /* Leave the loop, if the service has to be stopped */ - if (bStopService) + /* Wait for the next event */ + TRACE("Wait for next event!\n"); + dwWait = WaitForMultipleObjects(2, Events, FALSE, dwTimeout); + if (dwWait == WAIT_OBJECT_0) + { + TRACE("Stop event signaled!\n"); break; - - /* Wait for the next timeout */ - WaitForSingleObject(hEvent, 5000); - TRACE("Service running!\n"); + } + else if (dwWait == WAIT_OBJECT_0 + 1) + { + TRACE("Update event signaled!\n"); + dwTimeout = GetNextJobTimeout(); + } + else if (dwWait == WAIT_TIMEOUT) + { + TRACE("Timeout: Start the next job!\n"); + + } } - /* Close the scheduler event handle */ - CloseHandle(hEvent); + /* Close the start and update event handles */ + CloseHandle(Events[0]); + CloseHandle(Events[1]); /* Stop the service */ UpdateServiceStatus(SERVICE_STOPPED);

1 0

01/01: [NTOSKRNL] Rewrite IoCheckEaBufferValidity() so that it's less magic
by Pierre Schweitzer 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=03294dd09763d8d2b4979… commit 03294dd09763d8d2b4979a413c018ccd2a16fdde Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 27 21:54:55 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 27 22:16:37 2018 +0200 [NTOSKRNL] Rewrite IoCheckEaBufferValidity() so that it's less magic And make its coding style consistent with our rules --- ntoskrnl/io/iomgr/util.c | 127 +++++++++++++++++++++++------------------------ 1 file changed, 62 insertions(+), 65 deletions(-) diff --git a/ntoskrnl/io/iomgr/util.c b/ntoskrnl/io/iomgr/util.c index 7329dbf8f1..fb56f8d170 100644 --- a/ntoskrnl/io/iomgr/util.c +++ b/ntoskrnl/io/iomgr/util.c @@ -192,82 +192,79 @@ IoCheckEaBufferValidity(IN PFILE_FULL_EA_INFORMATION EaBuffer, IN ULONG EaLength, OUT PULONG ErrorOffset) { - PFILE_FULL_EA_INFORMATION EaBufferEnd; - ULONG NextEaBufferOffset; - LONG IntEaLength; + ULONG NextEntryOffset; + UCHAR EaNameLength; + ULONG ComputedLength; + PFILE_FULL_EA_INFORMATION Current; PAGED_CODE(); - /* Length of the rest */ - IntEaLength = EaLength; - EaBufferEnd = EaBuffer; - - /* The rest length of the buffer */ - while (IntEaLength >= FIELD_OFFSET(FILE_FULL_EA_INFORMATION, EaName[0])) + /* We will browse all the entries */ + for (Current = EaBuffer; ; Current = (PFILE_FULL_EA_INFORMATION)((ULONG_PTR)Current + NextEntryOffset)) { - /* - * The rest of buffer must greater than - * sizeof(FILE_FULL_EA_INFORMATION) + buffer - */ - NextEaBufferOffset = - EaBufferEnd->EaNameLength + EaBufferEnd->EaValueLength + - FIELD_OFFSET(FILE_FULL_EA_INFORMATION, EaName[0]) + 1; - - if ((ULONG)IntEaLength >= NextEaBufferOffset) + /* Check that we have enough bits left for the current entry */ + if (EaLength < FIELD_OFFSET(FILE_FULL_EA_INFORMATION, EaName)) + { + goto FailPath; + } + + EaNameLength = Current->EaNameLength; + ComputedLength = Current->EaValueLength + EaNameLength + FIELD_OFFSET(FILE_FULL_EA_INFORMATION, EaName) + 1; + /* Check that we have enough bits left for storing the name and its value */ + if (EaLength < ComputedLength) + { + goto FailPath; + } + + /* Make sure the name is null terminated */ + if (Current->EaName[EaNameLength] != ANSI_NULL) + { + goto FailPath; + } + + /* Get the next entry offset */ + NextEntryOffset = Current->NextEntryOffset; + /* If it's 0, it's a termination case */ + if (NextEntryOffset == 0) { - /* is the EaBufferName terminated with zero? */ - if (EaBufferEnd->EaName[EaBufferEnd->EaNameLength]==0) + /* If we don't overflow! */ + if (EaLength - ComputedLength < 0) { - /* more EaBuffers ahead */ - if (EaBufferEnd->NextEntryOffset == 0) - { - /* test the rest buffersize */ - IntEaLength = IntEaLength - NextEaBufferOffset; - if (IntEaLength >= 0) - { - return STATUS_SUCCESS; - } - } - else - { - /* - * From MSDN: - * http://msdn2.microsoft.com/en-us/library/ms795740.aspx - * For all entries except the last one, the value of - * NextEntryOffset must be greater than zero and - * must fall on a ULONG boundary. - */ - NextEaBufferOffset = ((NextEaBufferOffset + 3) & ~3); - if ((EaBufferEnd->NextEntryOffset == NextEaBufferOffset) && - ((LONG)EaBufferEnd->NextEntryOffset > 0)) - { - /* - * The rest of buffer must be greater - * than the following offset. - */ - IntEaLength = - IntEaLength - EaBufferEnd->NextEntryOffset; - - if (IntEaLength >= 0) - { - EaBufferEnd = (PFILE_FULL_EA_INFORMATION) - ((ULONG_PTR)EaBufferEnd + - EaBufferEnd->NextEntryOffset); - continue; - } - } - } + goto FailPath; } + + break; } - break; - } - if (ErrorOffset != NULL) - { - /* Calculate the error offset */ - *ErrorOffset = (ULONG)((ULONG_PTR)EaBufferEnd - (ULONG_PTR)EaBuffer); + /* Compare the next offset we computed with the provided one, they must match */ + if (ALIGN_UP_BY(ComputedLength, sizeof(ULONG)) != NextEntryOffset) + { + goto FailPath; + } + + /* Check next entry offset value is positive */ + if (NextEntryOffset < 0) + { + goto FailPath; + } + + /* Compute the remaining bits */ + EaLength -= NextEntryOffset; + /* We must have bits left */ + if (EaLength < 0) + { + goto FailPath; + } + + /* Move to the next entry */ } + /* If we end here, everything went OK */ + return STATUS_SUCCESS; + +FailPath: + /* If we end here, we failed, set failed offset */ + *ErrorOffset = (ULONG_PTR)Current - (ULONG_PTR)EaBuffer; return STATUS_EA_LIST_INCONSISTENT; }

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