Ros-diffs

ros-diffs@reactos.org

81390 discussions

03/04: [KERNEL32] Directly use UnhandledExceptionFilter in BaseProcessStartup
by Mark Jansen 28 Oct '18

28 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=824e5dba51aca08204045… commit 824e5dba51aca08204045e440be9c253a8469ac2 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Oct 20 15:38:21 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 28 13:01:38 2018 +0100 [KERNEL32] Directly use UnhandledExceptionFilter in BaseProcessStartup --- dll/win32/kernel32/client/proc.c | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/dll/win32/kernel32/client/proc.c b/dll/win32/kernel32/client/proc.c index dbd5c10d0f..f36219457b 100644 --- a/dll/win32/kernel32/client/proc.c +++ b/dll/win32/kernel32/client/proc.c @@ -445,33 +445,6 @@ BasepSxsCloseHandles(IN PBASE_MSG_SXS_HANDLES Handles) } } -static -LONG BaseExceptionFilter(EXCEPTION_POINTERS *ExceptionInfo) -{ - LONG ExceptionDisposition = EXCEPTION_EXECUTE_HANDLER; - LPTOP_LEVEL_EXCEPTION_FILTER RealFilter; - RealFilter = RtlDecodePointer(GlobalTopLevelExceptionFilter); - - if (RealFilter != NULL) - { - _SEH2_TRY - { - ExceptionDisposition = RealFilter(ExceptionInfo); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - } - _SEH2_END; - } - if ((ExceptionDisposition == EXCEPTION_CONTINUE_SEARCH || ExceptionDisposition == EXCEPTION_EXECUTE_HANDLER) && - RealFilter != UnhandledExceptionFilter) - { - ExceptionDisposition = UnhandledExceptionFilter(ExceptionInfo); - } - - return ExceptionDisposition; -} - VOID WINAPI BaseProcessStartup(PPROCESS_START_ROUTINE lpStartAddress) @@ -489,7 +462,7 @@ BaseProcessStartup(PPROCESS_START_ROUTINE lpStartAddress) /* Call the Start Routine */ ExitThread(lpStartAddress()); } - _SEH2_EXCEPT(BaseExceptionFilter(_SEH2_GetExceptionInformation())) + _SEH2_EXCEPT(UnhandledExceptionFilter(_SEH2_GetExceptionInformation())) { /* Get the Exit code from the SEH Handler */ if (!BaseRunningInServerProcess)

1 0

02/04: [KERNEL32] Use the default UnhandledExceptionFilter in BaseThreadStartup. This should allow unhandled exceptions in a thread to trigger our crash reporter, instead of killing the process directly.
by Mark Jansen 28 Oct '18

28 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40549483f60aa00e9fc95… commit 40549483f60aa00e9fc952ba831027028f6df107 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Oct 18 22:07:37 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 28 13:01:38 2018 +0100 [KERNEL32] Use the default UnhandledExceptionFilter in BaseThreadStartup. This should allow unhandled exceptions in a thread to trigger our crash reporter, instead of killing the process directly. --- dll/win32/kernel32/client/thread.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/dll/win32/kernel32/client/thread.c b/dll/win32/kernel32/client/thread.c index 8fc5a7ad61..2ff0102483 100644 --- a/dll/win32/kernel32/client/thread.c +++ b/dll/win32/kernel32/client/thread.c @@ -26,29 +26,6 @@ BasepNotifyCsrOfThread(IN HANDLE ThreadHandle, /* FUNCTIONS ******************************************************************/ -static -LONG BaseThreadExceptionFilter(EXCEPTION_POINTERS * ExceptionInfo) -{ - LONG ExceptionDisposition = EXCEPTION_EXECUTE_HANDLER; - LPTOP_LEVEL_EXCEPTION_FILTER RealFilter; - - RealFilter = RtlDecodePointer(GlobalTopLevelExceptionFilter); - if (RealFilter != NULL) - { - _SEH2_TRY - { - ExceptionDisposition = RealFilter(ExceptionInfo); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - ExceptionDisposition = UnhandledExceptionFilter(ExceptionInfo); - } - _SEH2_END; - } - - return ExceptionDisposition; -} - __declspec(noreturn) VOID WINAPI @@ -68,7 +45,7 @@ BaseThreadStartup(IN LPTHREAD_START_ROUTINE lpStartAddress, /* Get the exit code from the Thread Start */ ExitThread((lpStartAddress)((PVOID)lpParameter)); } - _SEH2_EXCEPT(BaseThreadExceptionFilter(_SEH2_GetExceptionInformation())) + _SEH2_EXCEPT(UnhandledExceptionFilter(_SEH2_GetExceptionInformation())) { /* Get the Exit code from the SEH Handler */ if (!BaseRunningInServerProcess)

1 0

01/04: [DRWTSN32] Improve stack dumping
by Mark Jansen 28 Oct '18

28 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1fa4e5f29cdccc1a444f7… commit 1fa4e5f29cdccc1a444f7118d42eb970d6165f6a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Oct 21 14:46:44 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 28 13:00:44 2018 +0100 [DRWTSN32] Improve stack dumping --- base/applications/drwtsn32/stacktrace.cpp | 35 ++++++++++++++++++------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/base/applications/drwtsn32/stacktrace.cpp b/base/applications/drwtsn32/stacktrace.cpp index 5c93f78834..0dbd5d06f4 100644 --- a/base/applications/drwtsn32/stacktrace.cpp +++ b/base/applications/drwtsn32/stacktrace.cpp @@ -2,12 +2,14 @@ * PROJECT: Dr. Watson crash reporter * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Print a stacktrace - * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2017,2018 Mark Jansen (mark.jansen(a)reactos.org) */ #include "precomp.h" #include <dbghelp.h> +#define STACK_MAX_RECURSION_DEPTH 50 + void BeginStackBacktrace(DumpData& data) { @@ -59,23 +61,28 @@ void PrintStackBacktrace(FILE* output, DumpData& data, ThreadData& thread) char buf[sizeof(SYMBOL_INFO) + STACKWALK_MAX_NAMELEN] = {0}; SYMBOL_INFO* sym = (SYMBOL_INFO *)buf; IMAGEHLP_MODULE64 Module = { 0 }; + LONG RecursionDepth = 0; sym->SizeOfStruct = sizeof(sym); - /* FIXME: Disasm function! */ + /* FIXME: dump x bytes at EIP here + disasm it! */ xfprintf(output, NEWLINE "*----> Stack Back Trace <----*" NEWLINE NEWLINE); bool first = true; - ULONG_PTR LastFrame = StackFrame.AddrFrame.Offset - 8; - while(StackWalk64(MachineType, data.ProcessHandle, thread.Handle, &StackFrame, &thread.Context, - NULL, SymFunctionTableAccess64, SymGetModuleBase64, NULL)) + while (StackWalk64(MachineType, data.ProcessHandle, thread.Handle, &StackFrame, &thread.Context, + NULL, SymFunctionTableAccess64, SymGetModuleBase64, NULL)) { - if (!StackFrame.AddrPC.Offset) - break; - - if (LastFrame >= StackFrame.AddrFrame.Offset) - break; - - LastFrame = StackFrame.AddrFrame.Offset; + if (StackFrame.AddrPC.Offset == StackFrame.AddrReturn.Offset) + { + if (RecursionDepth++ > STACK_MAX_RECURSION_DEPTH) + { + xfprintf(output, "- Aborting stackwalk -" NEWLINE); + break; + } + } + else + { + RecursionDepth = 0; + } if (first) { @@ -85,7 +92,7 @@ void PrintStackBacktrace(FILE* output, DumpData& data, ThreadData& thread) Module.SizeOfStruct = sizeof(Module); DWORD64 ModBase = SymGetModuleBase64(data.ProcessHandle, StackFrame.AddrPC.Offset); - if (!SymGetModuleInfo64(data.ProcessHandle, ModBase, &Module)) + if (!ModBase || !SymGetModuleInfo64(data.ProcessHandle, ModBase, &Module)) strcpy(Module.ModuleName, "<nomod>"); memset(sym, '\0', sizeof(*sym) + STACKWALK_MAX_NAMELEN); @@ -93,7 +100,7 @@ void PrintStackBacktrace(FILE* output, DumpData& data, ThreadData& thread) sym->MaxNameLen = STACKWALK_MAX_NAMELEN; DWORD64 displacement; - if (!SymFromAddr(data.ProcessHandle, StackFrame.AddrPC.Offset, &displacement, sym)) + if (!StackFrame.AddrPC.Offset || !SymFromAddr(data.ProcessHandle, StackFrame.AddrPC.Offset, &displacement, sym)) strcpy(sym->Name, "<nosymbols>"); xfprintf(output, "%p %p %p %p %p %p %s!%s" NEWLINE,

1 0

13/13: [SETUPLIB] Store the vendor name for each discovered NTOS installation.
by Hermès Bélusca-Maïto 28 Oct '18

28 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f80ec8b82282c4ae3f253… commit f80ec8b82282c4ae3f25356a722b5c951e136b3f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Dec 29 19:37:28 2017 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 28 01:58:59 2018 +0200 [SETUPLIB] Store the vendor name for each discovered NTOS installation. Take also the opportunity to simplify a little bit the code. --- base/setup/lib/utils/osdetect.c | 150 +++++++++++++++++++++------------------- base/setup/lib/utils/osdetect.h | 14 +++- 2 files changed, 93 insertions(+), 71 deletions(-) diff --git a/base/setup/lib/utils/osdetect.c b/base/setup/lib/utils/osdetect.c index fdfd5ba02a..e654312c48 100644 --- a/base/setup/lib/utils/osdetect.c +++ b/base/setup/lib/utils/osdetect.c @@ -26,18 +26,15 @@ /* GLOBALS ******************************************************************/ /* Language-independent Vendor strings */ -static const PCWSTR KnownVendors[] = { L"ReactOS", L"Microsoft" }; +static const PCWSTR KnownVendors[] = { VENDOR_REACTOS, VENDOR_MICROSOFT }; /* FUNCTIONS ****************************************************************/ static BOOLEAN -IsValidNTOSInstallation_UStr( - IN PUNICODE_STRING SystemRootPath); - -/*static*/ BOOLEAN IsValidNTOSInstallation( - IN PCWSTR SystemRoot); + IN PUNICODE_STRING SystemRootPath, + OUT PUNICODE_STRING VendorName OPTIONAL); static PNTOS_INSTALLATION FindExistingNTOSInstall( @@ -49,13 +46,14 @@ FindExistingNTOSInstall( static PNTOS_INSTALLATION AddNTOSInstallation( IN PGENERIC_LIST List, + IN PCWSTR InstallationName, + IN PCWSTR VendorName, IN PCWSTR SystemRootArcPath, IN PUNICODE_STRING SystemRootNtPath, // or PCWSTR ? IN PCWSTR PathComponent, // Pointer inside SystemRootNtPath buffer IN ULONG DiskNumber, IN ULONG PartitionNumber, - IN PPARTENTRY PartEntry OPTIONAL, - IN PCWSTR InstallationName); + IN PPARTENTRY PartEntry OPTIONAL); typedef struct _ENUM_INSTALLS_DATA { @@ -74,17 +72,20 @@ EnumerateInstallations( { PENUM_INSTALLS_DATA Data = (PENUM_INSTALLS_DATA)Parameter; PNTOS_OPTIONS Options = (PNTOS_OPTIONS)&BootEntry->OsOptions; - PNTOS_INSTALLATION NtOsInstall; - UNICODE_STRING SystemRootPath; - WCHAR SystemRoot[MAX_PATH]; - WCHAR InstallNameW[MAX_PATH]; ULONG DiskNumber = 0, PartitionNumber = 0; PCWSTR PathComponent = NULL; PDISKENTRY DiskEntry = NULL; PPARTENTRY PartEntry = NULL; + UNICODE_STRING SystemRootPath; + WCHAR SystemRoot[MAX_PATH]; + + UNICODE_STRING VendorName; + WCHAR VendorNameBuffer[MAX_PATH]; + + /* We have a boot entry */ /* Check for supported boot type "Windows2003" */ @@ -126,8 +127,8 @@ EnumerateInstallations( NtOsInstall = FindExistingNTOSInstall(Data->List, Options->OsLoadPath, NULL); if (NtOsInstall) { - DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", - NtOsInstall->InstallationName, &NtOsInstall->SystemArcPath); + DPRINT1(" An NTOS installation with name \"%S\" from vendor \"%S\" already exists in SystemRoot '%wZ'\n", + NtOsInstall->InstallationName, NtOsInstall->VendorName, &NtOsInstall->SystemArcPath); /* Continue the enumeration */ return STATUS_SUCCESS; } @@ -155,8 +156,8 @@ EnumerateInstallations( NtOsInstall = FindExistingNTOSInstall(Data->List, NULL /*Options->OsLoadPath*/, &SystemRootPath); if (NtOsInstall) { - DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", - NtOsInstall->InstallationName, &NtOsInstall->SystemNtPath); + DPRINT1(" An NTOS installation with name \"%S\" from vendor \"%S\" already exists in SystemRoot '%wZ'\n", + NtOsInstall->InstallationName, NtOsInstall->VendorName, &NtOsInstall->SystemNtPath); /* Continue the enumeration */ return STATUS_SUCCESS; } @@ -164,7 +165,8 @@ EnumerateInstallations( DPRINT1("EnumerateInstallations: SystemRootPath: '%wZ'\n", &SystemRootPath); /* Check if this is a valid NTOS installation; stop there if it isn't one */ - if (!IsValidNTOSInstallation_UStr(&SystemRootPath)) + RtlInitEmptyUnicodeString(&VendorName, VendorNameBuffer, sizeof(VendorNameBuffer)); + if (!IsValidNTOSInstallation(&SystemRootPath, &VendorName)) { /* Continue the enumeration */ return STATUS_SUCCESS; @@ -192,27 +194,12 @@ EnumerateInstallations( } /* Add the discovered NTOS installation into the list */ - if (PartEntry && PartEntry->DriveLetter) - { - /* We have retrieved a partition that is mounted */ - RtlStringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), - L"%C:%s \"%s\"", - PartEntry->DriveLetter, - PathComponent, - BootEntry->FriendlyName); - } - else - { - /* We failed somewhere, just show the NT path */ - RtlStringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), - L"%wZ \"%s\"", - &SystemRootPath, - BootEntry->FriendlyName); - } - AddNTOSInstallation(Data->List, Options->OsLoadPath, + AddNTOSInstallation(Data->List, + BootEntry->FriendlyName, + VendorName.Buffer, // FIXME: What if it's not NULL-terminated? + Options->OsLoadPath, &SystemRootPath, PathComponent, - DiskNumber, PartitionNumber, PartEntry, - InstallNameW); + DiskNumber, PartitionNumber, PartEntry); /* Continue the enumeration */ return STATUS_SUCCESS; @@ -348,14 +335,28 @@ UnmapCloseFile: // static BOOLEAN IsValidNTOSInstallationByHandle( - IN HANDLE SystemRootDirectory) + IN HANDLE SystemRootDirectory, + OUT PUNICODE_STRING VendorName OPTIONAL) { BOOLEAN Success = FALSE; PCWSTR PathName; USHORT i; - UNICODE_STRING VendorName; + UNICODE_STRING LocalVendorName; WCHAR VendorNameBuffer[MAX_PATH]; + /* Check for VendorName validity */ + if (VendorName->MaximumLength < sizeof(UNICODE_NULL)) + { + /* Don't use it, invalidate the pointer */ + VendorName = NULL; + } + else + { + /* Zero it out */ + *VendorName->Buffer = UNICODE_NULL; + VendorName->Length = 0; + } + /* Check for the existence of \SystemRoot\System32 */ PathName = L"System32\\"; if (!DoesDirExist(SystemRootDirectory, PathName)) @@ -399,11 +400,11 @@ IsValidNTOSInstallationByHandle( } #endif - RtlInitEmptyUnicodeString(&VendorName, VendorNameBuffer, sizeof(VendorNameBuffer)); + RtlInitEmptyUnicodeString(&LocalVendorName, VendorNameBuffer, sizeof(VendorNameBuffer)); /* Check for the existence of \SystemRoot\System32\ntoskrnl.exe and retrieves its vendor name */ PathName = L"System32\\ntoskrnl.exe"; - Success = CheckForValidPEAndVendor(SystemRootDirectory, PathName, &VendorName); + Success = CheckForValidPEAndVendor(SystemRootDirectory, PathName, &LocalVendorName); if (!Success) DPRINT1("Kernel executable '%S' is either not a PE file, or does not have any vendor?\n", PathName); @@ -412,7 +413,7 @@ IsValidNTOSInstallationByHandle( { for (i = 0; i < ARRAYSIZE(KnownVendors); ++i) { - Success = !!FindSubStrI(VendorName.Buffer, KnownVendors[i]); + Success = !!FindSubStrI(LocalVendorName.Buffer, KnownVendors[i]); if (Success) { /* We have found a correct vendor combination */ @@ -422,18 +423,26 @@ IsValidNTOSInstallationByHandle( } } + /* Return the vendor name */ + if (VendorName) + { + /* Copy the string and invalidate the pointer */ + RtlCopyUnicodeString(VendorName, &LocalVendorName); + VendorName = NULL; + } + /* OPTIONAL: Check for the existence of \SystemRoot\System32\ntkrnlpa.exe */ /* Check for the existence of \SystemRoot\System32\ntdll.dll and retrieves its vendor name */ PathName = L"System32\\ntdll.dll"; - Success = CheckForValidPEAndVendor(SystemRootDirectory, PathName, &VendorName); + Success = CheckForValidPEAndVendor(SystemRootDirectory, PathName, &LocalVendorName); if (!Success) DPRINT1("User-mode DLL '%S' is either not a PE file, or does not have any vendor?\n", PathName); if (Success) { for (i = 0; i < ARRAYSIZE(KnownVendors); ++i) { - if (!!FindSubStrI(VendorName.Buffer, KnownVendors[i])) + if (!!FindSubStrI(LocalVendorName.Buffer, KnownVendors[i])) { /* We have found a correct vendor combination */ DPRINT1("IsValidNTOSInstallation: The user-mode DLL '%S' is from %S\n", PathName, KnownVendors[i]); @@ -442,12 +451,21 @@ IsValidNTOSInstallationByHandle( } } + /* Return the vendor name if not already obtained */ + if (VendorName) + { + /* Copy the string and invalidate the pointer */ + RtlCopyUnicodeString(VendorName, &LocalVendorName); + VendorName = NULL; + } + return Success; } static BOOLEAN -IsValidNTOSInstallation_UStr( - IN PUNICODE_STRING SystemRootPath) +IsValidNTOSInstallation( + IN PUNICODE_STRING SystemRootPath, + OUT PUNICODE_STRING VendorName OPTIONAL) { NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; @@ -473,22 +491,13 @@ IsValidNTOSInstallation_UStr( return FALSE; } - Success = IsValidNTOSInstallationByHandle(SystemRootDirectory); + Success = IsValidNTOSInstallationByHandle(SystemRootDirectory, VendorName); /* Done! */ NtClose(SystemRootDirectory); return Success; } -/*static*/ BOOLEAN -IsValidNTOSInstallation( - IN PCWSTR SystemRoot) -{ - UNICODE_STRING SystemRootPath; - RtlInitUnicodeString(&SystemRootPath, SystemRoot); - return IsValidNTOSInstallationByHandle(&SystemRootPath); -} - static VOID DumpNTOSInstalls( IN PGENERIC_LIST List) @@ -502,11 +511,9 @@ DumpNTOSInstalls( NtOsInstallsCount, NtOsInstallsCount >= 2 ? "s" : ""); - Entry = GetFirstListEntry(List); - while (Entry) + for (Entry = GetFirstListEntry(List); Entry; Entry = GetNextListEntry(Entry)) { - NtOsInstall = (PNTOS_INSTALLATION)GetListEntryUserData(Entry); - Entry = GetNextListEntry(Entry); + NtOsInstall = (PNTOS_INSTALLATION)GetListEntryData(Entry); DPRINT1(" On disk #%d, partition #%d: Installation \"%S\" in SystemRoot '%wZ'\n", NtOsInstall->DiskNumber, NtOsInstall->PartitionNumber, @@ -536,11 +543,9 @@ FindExistingNTOSInstall( RtlInitUnicodeString(&SystemArcPath, SystemRootArcPath); - Entry = GetFirstListEntry(List); - while (Entry) + for (Entry = GetFirstListEntry(List); Entry; Entry = GetNextListEntry(Entry)) { - NtOsInstall = (PNTOS_INSTALLATION)GetListEntryUserData(Entry); - Entry = GetNextListEntry(Entry); + NtOsInstall = (PNTOS_INSTALLATION)GetListEntryData(Entry); /* * Note that if both ARC paths are equal, then the corresponding @@ -565,13 +570,14 @@ FindExistingNTOSInstall( static PNTOS_INSTALLATION AddNTOSInstallation( IN PGENERIC_LIST List, + IN PCWSTR InstallationName, + IN PCWSTR VendorName, IN PCWSTR SystemRootArcPath, IN PUNICODE_STRING SystemRootNtPath, // or PCWSTR ? IN PCWSTR PathComponent, // Pointer inside SystemRootNtPath buffer IN ULONG DiskNumber, IN ULONG PartitionNumber, - IN PPARTENTRY PartEntry OPTIONAL, - IN PCWSTR InstallationName) + IN PPARTENTRY PartEntry OPTIONAL) { PNTOS_INSTALLATION NtOsInstall; SIZE_T ArcPathLength, NtPathLength; @@ -580,8 +586,9 @@ AddNTOSInstallation( NtOsInstall = FindExistingNTOSInstall(List, SystemRootArcPath, SystemRootNtPath); if (NtOsInstall) { - DPRINT1("An NTOS installation with name \"%S\" already exists on disk #%d, partition #%d, in SystemRoot '%wZ'\n", - NtOsInstall->InstallationName, NtOsInstall->DiskNumber, NtOsInstall->PartitionNumber, &NtOsInstall->SystemNtPath); + DPRINT1("An NTOS installation with name \"%S\" from vendor \"%S\" already exists on disk #%d, partition #%d, in SystemRoot '%wZ'\n", + NtOsInstall->InstallationName, NtOsInstall->VendorName, + NtOsInstall->DiskNumber, NtOsInstall->PartitionNumber, &NtOsInstall->SystemNtPath); // // NOTE: We may use its "IsDefault" attribute, and only keep the entries that have IsDefault == TRUE... // Setting IsDefault to TRUE would imply searching for the "Default" entry in the loader configuration file. @@ -621,8 +628,11 @@ AddNTOSInstallation( ARRAYSIZE(NtOsInstall->InstallationName), InstallationName); - // Having the GENERIC_LIST storing the display item string plainly sucks... - AppendGenericListEntry(List, InstallationName, NtOsInstall, FALSE); + RtlStringCchCopyW(NtOsInstall->VendorName, + ARRAYSIZE(NtOsInstall->VendorName), + VendorName); + + AppendGenericListEntry(List, NtOsInstall, FALSE); return NtOsInstall; } diff --git a/base/setup/lib/utils/osdetect.h b/base/setup/lib/utils/osdetect.h index b20fc427b7..7151d6feb8 100644 --- a/base/setup/lib/utils/osdetect.h +++ b/base/setup/lib/utils/osdetect.h @@ -8,11 +8,14 @@ #pragma once +/* Language-independent Vendor strings */ +#define VENDOR_REACTOS L"ReactOS" +#define VENDOR_MICROSOFT L"Microsoft" + typedef struct _NTOS_INSTALLATION { LIST_ENTRY ListEntry; // BOOLEAN IsDefault; // TRUE / FALSE whether this installation is marked as "default" in its corresponding loader configuration file. -// Vendor???? (Microsoft / ReactOS) UNICODE_STRING SystemArcPath; // Normalized ARC path UNICODE_STRING SystemNtPath; // Corresponding NT path PCWSTR PathComponent; // Pointer inside SystemNtPath.Buffer @@ -20,6 +23,8 @@ typedef struct _NTOS_INSTALLATION ULONG PartitionNumber; PPARTENTRY PartEntry; WCHAR InstallationName[MAX_PATH]; + WCHAR VendorName[MAX_PATH]; + // CHAR Data[ANYSIZE_ARRAY]; } NTOS_INSTALLATION, *PNTOS_INSTALLATION; // EnumerateNTOSInstallations @@ -27,4 +32,11 @@ PGENERIC_LIST CreateNTOSInstallationsList( IN PPARTLIST List); +/* + * FindSubStrI(PCWSTR str, PCWSTR strSearch) : + * Searches for a sub-string 'strSearch' inside 'str', similarly to what + * wcsstr(str, strSearch) does, but ignores the case during the comparisons. + */ +PCWSTR FindSubStrI(PCWSTR str, PCWSTR strSearch); + /* EOF */

1 0

12/13: [USETUP] Add new file-operation-related messages for deletion, moving and renaming.
by Hermès Bélusca-Maïto 28 Oct '18

28 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5bcd956fac51f8c275fe… commit a5bcd956fac51f8c275feb4499f2d45e388ccfb6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jan 5 01:49:09 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 28 01:58:55 2018 +0200 [USETUP] Add new file-operation-related messages for deletion, moving and renaming. --- base/setup/usetup/lang/bg-BG.h | 6 ++++++ base/setup/usetup/lang/bn-BD.h | 10 ++++++++-- base/setup/usetup/lang/cs-CZ.h | 6 ++++++ base/setup/usetup/lang/da-DK.h | 6 ++++++ base/setup/usetup/lang/de-DE.h | 6 ++++++ base/setup/usetup/lang/el-GR.h | 6 ++++++ base/setup/usetup/lang/en-US.h | 10 ++++++++-- base/setup/usetup/lang/es-ES.h | 6 ++++++ base/setup/usetup/lang/et-EE.h | 6 ++++++ base/setup/usetup/lang/fr-FR.h | 8 +++++++- base/setup/usetup/lang/he-IL.h | 10 ++++++++-- base/setup/usetup/lang/it-IT.h | 6 ++++++ base/setup/usetup/lang/ja-JP.h | 6 ++++++ base/setup/usetup/lang/lt-LT.h | 10 ++++++++-- base/setup/usetup/lang/ms-MY.h | 6 ++++++ base/setup/usetup/lang/nl-NL.h | 6 ++++++ base/setup/usetup/lang/pl-PL.h | 6 ++++++ base/setup/usetup/lang/pt-BR.h | 6 ++++++ base/setup/usetup/lang/ro-RO.h | 6 ++++++ base/setup/usetup/lang/ru-RU.h | 6 ++++++ base/setup/usetup/lang/sk-SK.h | 6 ++++++ base/setup/usetup/lang/sq-AL.h | 6 ++++++ base/setup/usetup/lang/sv-SE.h | 6 ++++++ base/setup/usetup/lang/tr-TR.h | 8 +++++++- base/setup/usetup/lang/uk-UA.h | 6 ++++++ base/setup/usetup/mui.h | 7 +++++-- 26 files changed, 165 insertions(+), 12 deletions(-) diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index ad8ca21c37..4a76249242 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -1829,6 +1829,12 @@ MUI_STRING bgBGStrings[] = "F3 = ��室 ENTER = �தꫦ��"}, {STRING_REBOOTCOMPUTER, "ENTER = �१��᪠�� "}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " �� 䠩�: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index 7bd3756922..d0aed0dc7a 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -1582,7 +1582,7 @@ MUI_ERROR bnBDErrorEntries[] = }, { // ERROR_CREATE_DIR, - "Setup could not create install directories.", + "Setup could not create the installation directories.", "ENTER = Reboot computer" }, { @@ -1599,7 +1599,7 @@ MUI_ERROR bnBDErrorEntries[] = }, { // ERROR_CREATE_INSTALL_DIR - "Setup could not create the install directory.", + "Setup could not create the installation directory.", "ENTER = Reboot computer" }, { @@ -1817,6 +1817,12 @@ MUI_STRING bnBDStrings[] = "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER, "ENTER = Reboot computer"}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " Copying file: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 1b83285d49..c331544aba 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -1823,6 +1823,12 @@ MUI_STRING csCZStrings[] = "F3 = Ukon�it ENTER = Pokra�ovat"}, {STRING_REBOOTCOMPUTER, "ENTER = Restartovat po��ta�"}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " Kop�ruji soubor: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index bf356241e2..e891c4652f 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -1831,6 +1831,12 @@ MUI_STRING daDKStrings[] = "F3 = Afslut ENTER = Forts�t"}, {STRING_REBOOTCOMPUTER, "ENTER = Genstart"}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " Kopiere filen: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index 23d7be3947..baeae441fc 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -1820,6 +1820,12 @@ MUI_STRING deDEStrings[] = "F3 = Beenden EINGABETASTE = Fortsetzen"}, {STRING_REBOOTCOMPUTER, "EINGABETASTE = Computer neu starten"}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " Kopiere Datei: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index 11da4ef39d..b01a3e07a1 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -1835,6 +1835,12 @@ MUI_STRING elGRStrings[] = "F3 = ��騞�� ENTER = ��⮜��"}, {STRING_REBOOTCOMPUTER, "ENTER = ��夞�� "}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " ��᭜�� : %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index dc030656ca..a2671e3b75 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -1583,7 +1583,7 @@ MUI_ERROR enUSErrorEntries[] = }, { // ERROR_CREATE_DIR, - "Setup could not create install directories.", + "Setup could not create the installation directories.", "ENTER = Reboot computer" }, { @@ -1600,7 +1600,7 @@ MUI_ERROR enUSErrorEntries[] = }, { // ERROR_CREATE_INSTALL_DIR - "Setup could not create the install directory.", + "Setup could not create the installation directory.", "ENTER = Reboot computer" }, { @@ -1818,6 +1818,12 @@ MUI_STRING enUSStrings[] = "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER, "ENTER = Reboot computer"}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " Copying file: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index dca719b51b..050fd07644 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -1820,6 +1820,12 @@ MUI_STRING esESStrings[] = "F3 = Salir INTRO = Continuar"}, {STRING_REBOOTCOMPUTER, "INTRO = Reiniciar el equipo"}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " Copiando archivo: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index d18d609d34..056a99caf0 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -1818,6 +1818,12 @@ MUI_STRING etEEStrings[] = "F3 = V�lju ENTER = J�tka"}, {STRING_REBOOTCOMPUTER, "ENTER = Taask�ivita arvuti"}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " Kopeerimine: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index 64014bf160..0bae4fdd95 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -1835,8 +1835,14 @@ MUI_STRING frFRStrings[] = "F3 = Quitter ENTR�E = Continuer"}, {STRING_REBOOTCOMPUTER, "ENTR�E = Red�marrer l'ordinateur"}, + {STRING_DELETING, + " Suppression du fichier : %S"}, + {STRING_MOVING, + " D�placement du fichier : %S vers : %S"}, + {STRING_RENAMING, + " Renommage du fichier : %S vers : %S"}, {STRING_COPYING, - " Copie du fichier: %S"}, + " Copie du fichier : %S"}, {STRING_SETUPCOPYINGFILES, "Setup copie les fichiers..."}, {STRING_REGHIVEUPDATE, diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 868ab1dc38..7a5e583a2f 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -1582,7 +1582,7 @@ MUI_ERROR heILErrorEntries[] = }, { // ERROR_CREATE_DIR, - "Setup could not create install directories.", + "Setup could not create the installation directories.", "ENTER = Reboot computer" }, { @@ -1599,7 +1599,7 @@ MUI_ERROR heILErrorEntries[] = }, { // ERROR_CREATE_INSTALL_DIR - "Setup could not create the install directory.", + "Setup could not create the installation directory.", "ENTER = Reboot computer" }, { @@ -1818,6 +1818,12 @@ MUI_STRING heILStrings[] = "F3 = �� ENTER = ��"}, {STRING_REBOOTCOMPUTER, "ENTER = �� "}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " �� : %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index 4a2621706b..0a98d31cb3 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -1823,6 +1823,12 @@ MUI_STRING itITStrings[] = "F3 = Esci INVIO = Continua"}, {STRING_REBOOTCOMPUTER, "INVIO = Riavvia il computer"}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " Copia di: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index 8c3098c941..94809539b3 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -1820,6 +1820,12 @@ MUI_STRING jaJPStrings[] = "F3 = �� ENTER = �ޯ��"}, {STRING_REBOOTCOMPUTER, "ENTER = ��߭�� ޳"}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " ��߰ �� ̧��: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index 6094090ec2..d1128d9f72 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -1591,7 +1591,7 @@ MUI_ERROR ltLTErrorEntries[] = }, { // ERROR_CREATE_DIR, - "Setup could not create install directories.", + "Setup could not create the installation directories.", "ENTER = Reboot computer" }, { @@ -1608,7 +1608,7 @@ MUI_ERROR ltLTErrorEntries[] = }, { // ERROR_CREATE_INSTALL_DIR - "Setup could not create the install directory.", + "Setup could not create the installation directory.", "ENTER = Reboot computer" }, { @@ -1826,6 +1826,12 @@ MUI_STRING ltLTStrings[] = "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER, "ENTER = Reboot computer"}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " Copying file: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index abfed391f0..88abb235e6 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -1706,6 +1706,12 @@ MUI_STRING msMYStrings[] = "F3 = Keluar ENTER = Teruskan"}, {STRING_REBOOTCOMPUTER, "ENTER = Memulakan semuala komputer"}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " Menyalin fail: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index 2a98762306..2a836cc042 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -1845,6 +1845,12 @@ MUI_STRING nlNLStrings[] = "F3 = Afsluiten ENTER = Doorgaan"}, {STRING_REBOOTCOMPUTER, "ENTER = Computer opnieuw opstarten"}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " Kopi\x89ren bestand: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 6c43d3b368..3a86222683 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -1826,6 +1826,12 @@ MUI_STRING plPLStrings[] = "F3 = Wyj�cie ENTER = Kontynuacja"}, {STRING_REBOOTCOMPUTER, "ENTER = Restart komputera"}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " Kopiowanie plik�w: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index dc0c9d60f5..69f5b4ff46 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -1850,6 +1850,12 @@ MUI_STRING ptBRStrings[] = "F3=Sair ENTER=Continuar"}, {STRING_REBOOTCOMPUTER, "ENTER=Reiniciar"}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " Copiando arquivo: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 956bd55391..398a307c7a 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -1864,6 +1864,12 @@ MUI_STRING roROStrings[] = "F3 = Ie�ire ENTER = Continuare"}, {STRING_REBOOTCOMPUTER, "ENTER = Repornire calculator"}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " Fi�ierul curent: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 04b3f7a67f..f779c897ca 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -1817,6 +1817,12 @@ MUI_STRING ruRUStrings[] = "F3 = ��室 ENTER = �த��"}, {STRING_REBOOTCOMPUTER, "ENTER = ��१��㧪�"}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " ��஢�� 䠩��: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index 0215001ab8..54d1ac7008 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -1829,6 +1829,12 @@ MUI_STRING skSKStrings[] = "F3 = Skon�i� ENTER = Pokra�ova�"}, {STRING_REBOOTCOMPUTER, "ENTER = Re�tart po��ta�a"}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " Kop�ruje sa s�bor: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 414bf2bdb7..9dcc7ef242 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -1830,6 +1830,12 @@ MUI_STRING sqALStrings[] = "F3 = Dil ENTER = Vazhdo"}, {STRING_REBOOTCOMPUTER, "ENTER = Ristarto kompjuterin"}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " Kopjo dokumentat: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 1d3588a8fa..dbb6d40ef9 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -1826,6 +1826,12 @@ MUI_STRING svSEStrings[] = "F3 = Avsluta ENTER = Forts�tt"}, {STRING_REBOOTCOMPUTER, "ENTER = Starta om datorn"}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " Kopierar fil: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 924a676ea8..01ff1d037b 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -1796,8 +1796,14 @@ MUI_STRING trTRStrings[] = "F3 = ��k Giri� = S�rd�r"}, {STRING_REBOOTCOMPUTER, "Giri� = Bilgisayar� Yeniden Ba�lat"}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, - " K�t�k �o�alt�l�yor: %S..."}, + " K�t�k �o�alt�l�yor: %S"}, {STRING_SETUPCOPYINGFILES, "Kur, k�t�kleri �o�alt�yor..."}, {STRING_REGHIVEUPDATE, diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index 891be611ce..6a53992182 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -1826,6 +1826,12 @@ MUI_STRING ukUAStrings[] = "F3 = �� ENTER = �த��"}, {STRING_REBOOTCOMPUTER, "ENTER = ��१��⠦�� '��"}, + {STRING_DELETING, + " Deleting file: %S"}, + {STRING_MOVING, + " Moving file: %S to: %S"}, + {STRING_RENAMING, + " Renaming file: %S to: %S"}, {STRING_COPYING, " ��i��: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/mui.h b/base/setup/usetup/mui.h index cefe017558..52d492bc3b 100644 --- a/base/setup/usetup/mui.h +++ b/base/setup/usetup/mui.h @@ -91,8 +91,11 @@ MUIGetString( #define STRING_CONTINUE 12 #define STRING_QUITCONTINUE 13 #define STRING_REBOOTCOMPUTER 14 -#define STRING_COPYING 16 -#define STRING_SETUPCOPYINGFILES 17 +#define STRING_DELETING 15 +#define STRING_MOVING 16 +#define STRING_RENAMING 17 +#define STRING_COPYING 18 +#define STRING_SETUPCOPYINGFILES 19 #define STRING_REGHIVEUPDATE 20 #define STRING_IMPORTFILE 21 #define STRING_DISPLAYSETTINGSUPDATE 22

1 0

11/13: [SETUPLIB] Remove a deprecated error number (that gets merged with ERROR_TXTSETUP_SECTION).
by Hermès Bélusca-Maïto 28 Oct '18

28 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a7afba7703a348c110bf7… commit a7afba7703a348c110bf78ebf36c7da7b094ab6b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Dec 30 18:21:42 2017 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 28 01:43:56 2018 +0200 [SETUPLIB] Remove a deprecated error number (that gets merged with ERROR_TXTSETUP_SECTION). [USETUP] Improve usage of ERROR_TXTSETUP_SECTION and ERROR_CABINET_SECTION error codes, correctly display associated error message, and remove a deprecated string. --- base/setup/lib/errorcode.h | 1 - base/setup/usetup/lang/bg-BG.h | 94 ++++++++++++++++++---------------------- base/setup/usetup/lang/bn-BD.h | 94 ++++++++++++++++++---------------------- base/setup/usetup/lang/cs-CZ.h | 94 ++++++++++++++++++---------------------- base/setup/usetup/lang/da-DK.h | 96 +++++++++++++++++++---------------------- base/setup/usetup/lang/de-DE.h | 98 +++++++++++++++++++----------------------- base/setup/usetup/lang/el-GR.h | 92 ++++++++++++++++++--------------------- base/setup/usetup/lang/en-US.h | 94 ++++++++++++++++++---------------------- base/setup/usetup/lang/es-ES.h | 94 ++++++++++++++++++---------------------- base/setup/usetup/lang/et-EE.h | 93 ++++++++++++++++++--------------------- base/setup/usetup/lang/fr-FR.h | 94 ++++++++++++++++++---------------------- base/setup/usetup/lang/he-IL.h | 94 ++++++++++++++++++---------------------- base/setup/usetup/lang/it-IT.h | 94 ++++++++++++++++++---------------------- base/setup/usetup/lang/ja-JP.h | 94 ++++++++++++++++++---------------------- base/setup/usetup/lang/lt-LT.h | 94 ++++++++++++++++++---------------------- base/setup/usetup/lang/ms-MY.h | 92 ++++++++++++++++++--------------------- base/setup/usetup/lang/nl-NL.h | 94 ++++++++++++++++++---------------------- base/setup/usetup/lang/pl-PL.h | 94 ++++++++++++++++++---------------------- base/setup/usetup/lang/pt-BR.h | 94 ++++++++++++++++++---------------------- base/setup/usetup/lang/ro-RO.h | 98 +++++++++++++++++++----------------------- base/setup/usetup/lang/ru-RU.h | 94 ++++++++++++++++++---------------------- base/setup/usetup/lang/sk-SK.h | 98 +++++++++++++++++++----------------------- base/setup/usetup/lang/sq-AL.h | 88 ++++++++++++++++++------------------- base/setup/usetup/lang/sv-SE.h | 94 ++++++++++++++++++---------------------- base/setup/usetup/lang/tr-TR.h | 94 ++++++++++++++++++---------------------- base/setup/usetup/lang/uk-UA.h | 94 ++++++++++++++++++---------------------- base/setup/usetup/mui.c | 27 ++++++++---- base/setup/usetup/mui.h | 9 +++- base/setup/usetup/usetup.c | 16 ++----- 29 files changed, 1111 insertions(+), 1295 deletions(-) diff --git a/base/setup/lib/errorcode.h b/base/setup/lib/errorcode.h index b440e4e8d3..a7fd84e95f 100644 --- a/base/setup/lib/errorcode.h +++ b/base/setup/lib/errorcode.h @@ -46,7 +46,6 @@ typedef enum _ERROR_NUMBER ERROR_TXTSETUP_SECTION, ERROR_CABINET_SECTION, ERROR_CREATE_INSTALL_DIR, - ERROR_FIND_SETUPDATA, ERROR_WRITE_PTABLE, ERROR_ADDING_CODEPAGE, ERROR_UPDATE_LOCALESETTINGS, diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 214ff21bfd..ad8ca21c37 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -1438,7 +1438,7 @@ MUI_ERROR bgBGErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "��⎑ �� ꫭ� ᫮�� \n" "��. �� ᥣ� �� ᫠��, � ���\n" "�� ᭥� ��ன�� ⭮��, �� ⠫�� ⎑.\n" @@ -1448,62 +1448,62 @@ MUI_ERROR bgBGErrorEntries[] = "F3 = ��室 ENTER = �தꫦ��" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "��ன�� .\n", "ENTER = �१��᪠�� " }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "��ன�� 室�� ன�⢮.\n", "ENTER = �१��᪠�� " }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "��ன�� 䠩� TXTSETUP.SIF.\n", "ENTER = �१��᪠�� " }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "��ன�� ।�� 䠩� TXTSETUP.SIF.\n", "ENTER = �१��᪠�� " }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "��ன�� ।�� TXTSETUP.SIF.\n", "ENTER = �१��᪠�� " }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "��ன�� ਥ ᢥ�� ⥬�� ன�⢮.\n", "ENTER = �१��᪠�� " }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "��ᯥ譮 ᫠�� 砢�� (bootcode) �� FAT � ��⥬�� .", "ENTER = �१��᪠�� " }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "��ன�� ।� ᯨ�ꪠ � �� .\n", "ENTER = �१��᪠�� " }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "��ன�� ।� ᯨ�ꪠ � ��ன�� .\n", "ENTER = �१��᪠�� " }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "��ன�� ।� ᯨ�ꪠ � �� .\n", "ENTER = �१��᪠�� " }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "��ன�� ।� ᯨ�ꪠ � ��୨� ��।��.\n", "ENTER = �१��᪠�� " }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "��ன�� ⠭��, � �� ঠ ��ꢬ��⨬�\n" "�﫮�� ⠡��, � �� ࠡ�� ࠢ��!\n" "\n" @@ -1514,7 +1514,7 @@ MUI_ERROR bgBGErrorEntries[] = "F3 = ��室 ENTER = �தꫦ��" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "�� ꧤ�� ,\n" "�� 㢠!\n" "\n" @@ -1522,135 +1522,129 @@ MUI_ERROR bgBGErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "�� ਥ� ��ࠧ�।�� ᪮�� !\n" "\n" " * ��᭥� ��, �� தꫦ��.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, //"Setup failed to install the FAT bootcode on the system partition.", "��ᯥ譮 ᫠�� 㢠�� FAT �� ⥬�� .", "ENTER = �१��᪠�� " }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "� ��ன�⢮ A: �ﬠ ��⥫.", "ENTER = �தꫦ��" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "��ᯥ譮 ���� ன�� ୠ� ��।��.", "ENTER = �१��᪠�� " }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "��ᯥ譮 ���� ॣ��୨ ��ன�� .", "ENTER = �१��᪠�� " }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "��ᯥ譮 ��ﭥ �� ஥�� 䠩�.", "ENTER = �१��᪠�� " }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "�� 䠩�� ॣ��୨ ��.", "ENTER = �१��᪠�� " }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "��ன�� ꧤ�� ॣ��୨� ஥��.", "ENTER = �१��᪠�� " }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, //There is something wrong with this line. "��ᯥ譮 �� 砫�� ⮩�� ॣ��.", "ENTER = �१��᪠�� " }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Cab 䠩�� ﬠ �ࠢ�� inf 䠩�.\n", "ENTER = �१��᪠�� " }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cab 䠩�� .\n", "ENTER = �१��᪠�� " }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cab 䠩�� ﬠ ��஥筮 ��ᠭ��.\n", "ENTER = �१��᪠�� " }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "��ᯥ譮 �⢠�ﭥ �� 誠� �� 䠩�� .\n", "ENTER = �१��᪠�� " }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "��ᯥ譮 �ꧤ�� ᫠��.", "ENTER = �१��᪠�� " }, { - //ERROR_TXTSETUP_SECTION, - "�� 'Directories' �� \n" + // ERROR_TXTSETUP_SECTION, + "�� '%S' �� \n" "� TXTSETUP.SIF.\n", "ENTER = �१��᪠�� " }, { - //ERROR_CABINET_SECTION, - "�� 'Directories' �� \n" + // ERROR_CABINET_SECTION, + "�� '%S' �� \n" "� cab 䠩��.\n", "ENTER = �१��᪠�� " }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "��ᯥ譮 �ꧤ�� ᫠��.", "ENTER = �१��᪠�� " }, { - //ERROR_FIND_SETUPDATA, - "�� 'SetupData' �� \n" - "� TXTSETUP.SIF.\n", - "ENTER = �१��᪠�� " - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "��ᯥ譮 ��ᢠ�� 﫮�� ⠡��.\n" "ENTER = �१��᪠�� " }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "��ᯥ譮 ��ﭥ �� ॣ��.\n" "ENTER = �१��᪠�� " }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "��ᯥ譮 ��⠭���� ⭨� ��ன��.\n" "ENTER = �१��᪠�� " }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "��ᯥ譮 ��ﭥ �� ୨� ��।�� ॣ��.\n" "ENTER = �१��᪠�� " }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "��ன�� ⠭�� ⥫� �� ᪮� ��.\n" "ENTER = �१��᪠�� " }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1658,20 +1652,20 @@ MUI_ERROR bgBGErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1835,8 +1829,6 @@ MUI_STRING bgBGStrings[] = "F3 = ��室 ENTER = �தꫦ��"}, {STRING_REBOOTCOMPUTER, "ENTER = �१��᪠�� "}, - {STRING_TXTSETUPFAILED, - "�� ७ ࠧ�� '%S'\n� TXTSETUP.SIF.\n"}, {STRING_COPYING, " �� 䠩�: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index a0632f5f5b..7bd3756922 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -1430,7 +1430,7 @@ MUI_ERROR bnBDErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS is not completely installed on your\n" "computer. If you quit Setup now, you will need to\n" "run Setup again to install ReactOS.\n" @@ -1440,62 +1440,62 @@ MUI_ERROR bnBDErrorEntries[] = "F3 = Quit ENTER = Continue" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Setup could not find a harddisk.\n", "ENTER = Reboot computer" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Setup could not find its source drive.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Setup failed to load the file TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Setup found a corrupt TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Setup found an invalid signature in TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Setup could not retrieve system drive information.\n", "ENTER = Reboot computer" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Setup failed to install FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Setup failed to load the computer type list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Setup failed to load the display settings list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Setup failed to load the keyboard type list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Setup failed to load the keyboard layout list.\n", "ENTER = Reboot computer" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Setup found that at least one harddisk contains an incompatible\n" "partition table that can not be handled properly!\n" "\n" @@ -1506,7 +1506,7 @@ MUI_ERROR bnBDErrorEntries[] = "F3 = Quit ENTER = Continue" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "You can not create a new Partition inside\n" "of an already existing Partition!\n" "\n" @@ -1514,133 +1514,127 @@ MUI_ERROR bnBDErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "You can not delete unpartitioned disk space!\n" "\n" " * Press any key to continue.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Setup failed to install the FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "No disk in drive A:.", "ENTER = Continue" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Setup failed to update keyboard layout settings.", "ENTER = Reboot computer" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Setup failed to update display registry settings.", "ENTER = Reboot computer" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Setup failed to import a hive file.", "ENTER = Reboot computer" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Setup failed to find the registry data files.", "ENTER = Reboot computer" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Setup failed to create the registry hives.", "ENTER = Reboot computer" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Setup failed to initialize the registry.", "ENTER = Reboot computer" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Cabinet has no valid inf file.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet not found.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cabinet has no setup script.\n", "ENTER = Reboot computer" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Setup failed to open the copy file queue.\n", "ENTER = Reboot computer" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Setup could not create install directories.", "ENTER = Reboot computer" }, { - //ERROR_TXTSETUP_SECTION, - "Setup failed to find the 'Directories' section\n" + // ERROR_TXTSETUP_SECTION, + "Setup failed to find the '%S' section\n" "in TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_SECTION, - "Setup failed to find the 'Directories' section\n" + // ERROR_CABINET_SECTION, + "Setup failed to find the '%S' section\n" "in the cabinet.\n", "ENTER = Reboot computer" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Setup could not create the install directory.", "ENTER = Reboot computer" }, { - //ERROR_FIND_SETUPDATA, - "Setup failed to find the 'SetupData' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Setup failed to write partition tables.\n" "ENTER = Reboot computer" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Setup failed to add codepage to registry.\n" "ENTER = Reboot computer" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Setup could not set the system locale.\n" "ENTER = Reboot computer" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Setup failed to add keyboard layouts to registry.\n" "ENTER = Reboot computer" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Setup could not set the geo id.\n" "ENTER = Reboot computer" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1648,20 +1642,20 @@ MUI_ERROR bnBDErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1823,8 +1817,6 @@ MUI_STRING bnBDStrings[] = "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER, "ENTER = Reboot computer"}, - {STRING_TXTSETUPFAILED, - "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " Copying file: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 81e82c1f5e..1b83285d49 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -1436,7 +1436,7 @@ MUI_ERROR csCZErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS nen� ve va�em po��ta�i kompletn� nainstalov�n.\n" "Pokud nyn� instalaci ukon��te, budete ji muset pro\n" "nainstalov�n� ReactOS spustit znovu.\n" @@ -1446,62 +1446,62 @@ MUI_ERROR csCZErrorEntries[] = "F3 = Ukon�it ENTER = Pokra�ovat" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Instalace nedok�zala naj�t harddisk.\n", "ENTER = Restartovat po��ta�" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Instalace nedok�zala naj�t svou zdrojovou mechaniku.\n", "ENTER = Restartovat po��ta�" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Nepoda�ilo se na��st soubor TXTSETUP.SIF.\n", "ENTER = Restartovat po��ta�" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Soubor TXTSETUP.SIF je po�kozen.\n", "ENTER = Restartovat po��ta�" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Soubor TXTSETUP.SIF je neplatn� podepsan�.\n", "ENTER = Restartovat po��ta�" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Instalace nedok�zala z�skat informace o syst�mov�ch disc�ch.\n", "ENTER = Restartovat po��ta�" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Nepoda�ilo se nainstalovat FAT zavad؟ na syst�mov� odd�l.", "ENTER = Restartovat po��ta�" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Nepoda�ilo se na��st seznam typ� po��ta�e.\n", "ENTER = Restartovat po��ta�" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Nepoda�ilo se na��st seznam nastaven� obrazovek.\n", "ENTER = Restartovat po��ta�" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Nepoda�ilo se na��st seznam typ� kl�vesnic.\n", "ENTER = Restartovat po��ta�" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Nepoda�ilo se na��st seznam rozlo�en� kl�ves.\n", "ENTER = Restartovat po��ta�" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Instalace zjistila, �e alespo� jeden pevn� disk obsahuje\n" "nekompatibiln� tabulku odd�l�, kter� nem��e b�t spr�vn� zpracov�na!\n" "\n" @@ -1512,7 +1512,7 @@ MUI_ERROR csCZErrorEntries[] = "F3 = Ukon�it ENTER = Pokra�ovat" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "Nelze vytvo�it nov� odd�l uvnit� ji�\n" "existuj�c�ho odd�lu!\n" "\n" @@ -1520,133 +1520,127 @@ MUI_ERROR csCZErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "Nelze vymazat m�sto na disku, kter� nepat�� dn�mu odd�lu!\n" "\n" " * Pokra�ujte stisknut�m libovoln� kl�vesy.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Nepoda�ilo se nainstalovat FAT zavad؟ na syst�mov� odd�l.", "ENTER = Restartovat po��ta�" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "V jednotce A: nen� disketa.", "ENTER = Pokra�ovat" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Nepoda�ilo se aktualizovat nastaven� rozlo�en� kl�ves.", "ENTER = Restartovat po��ta�" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Nepoda�ilo se aktualizovat nastaven� zobrazen� registru.", //display registry settings "ENTER = Restartovat po��ta�" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Nepoda�ilo se naimportovat soubor registru.", "ENTER = Restartovat po��ta�" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Nepoda�ilo se nal�zt datov� soubory registru.", "ENTER = Restartovat po��ta�" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Nepoda�ilo se zalo�it registr.", "ENTER = Restartovat po��ta�" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Nepoda�ilo se inicializovat registry.", "ENTER = Restartovat po��ta�" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "V archivu nen� platn� soubor inf.\n", "ENTER = Restartovat po��ta�" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Archiv nebyl nalezen.\n", "ENTER = Restartovat po��ta�" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Archiv neobsahuje instala�n� skript.\n", "ENTER = Restartovat po��ta�" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Nepoda�ilo se otev��t frontu kop�rov�n�.\n", "ENTER = Restartovat po��ta�" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Nepoda�ilo se vytvo�it instala�n� adres��e.", "ENTER = Restartovat po��ta�" }, { - //ERROR_TXTSETUP_SECTION, - "Nepoda�ilo se nal�zt sekci 'Directories' v souboru\n" + // ERROR_TXTSETUP_SECTION, + "Nepoda�ilo se nal�zt sekci '%S' v souboru\n" "TXTSETUP.SIF.\n", "ENTER = Restartovat po��ta�" }, { - //ERROR_CABINET_SECTION, - "Nepoda�ilo se nal�zt sekci 'Directories' v archivu.\n" + // ERROR_CABINET_SECTION, + "Nepoda�ilo se nal�zt sekci '%S' v archivu.\n" "\n", "ENTER = Restartovat po��ta�" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Nepoda�ilo se vytvo�it instala�n� adres��.", "ENTER = Restartovat po��ta�" }, { - //ERROR_FIND_SETUPDATA, - "Nepoda�ilo se nal�zt sekci 'SetupData' v souboru\n" - "TXTSETUP.SIF.\n", - "ENTER = Restartovat po��ta�" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Nepoda�ilo se zapsat tabulky odd�l�.\n" "ENTER = Restartovat po��ta�" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Nepoda�ilo se p�idat k�dovou str�nku do registru.\n" "ENTER = Restartovat po��ta�" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Nepoda�ilo se nastavit m�stn� nastaven�.\n" "ENTER = Restartovat po��ta�" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Nepoda�ilo se p�idat rozlo�en� kl�vesnice do registru.\n" "ENTER = Restartovat po��ta�" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Nepoda�ilo se nastavit geo id.\n" "ENTER = Restartovat po��ta�" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Neplatn� n�zev adres��e.\n" "\n" " * Pokra�ujte stisknut�m libovoln� kl�vesy." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "Zvolen� odd�l nen� pro instalaci ReactOS dostate�n� velk�.\n" "Instala�n� odd�l mus� m�t velikost alespo� %lu MB.\n" "\n" @@ -1654,20 +1648,20 @@ MUI_ERROR csCZErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "Nepoda�ilo se vytvo�it nov� prim�rn� nebo roz��en� odd�l\n" "v tabulce odd�l� na zvolen�m disku, proto�e tabulka odd�l� je pln�.\n" "\n" " * Pokra�ujte stisknut�m libovoln� kl�vesy." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "Nen� mo�n� vytvo�it v�ce ne� jeden roz��en� odd�l na disk.\n" "\n" " * Pokra�ujte stisknut�m libovoln� kl�vesy." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1829,8 +1823,6 @@ MUI_STRING csCZStrings[] = "F3 = Ukon�it ENTER = Pokra�ovat"}, {STRING_REBOOTCOMPUTER, "ENTER = Restartovat po��ta�"}, - {STRING_TXTSETUPFAILED, - "Nepoda�ilo se naj�t sekci '%S' v souboru\n TXTSETUP.SIF.\n"}, {STRING_COPYING, " Kop�ruji soubor: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index 6ad0d8a04c..bf356241e2 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -1443,7 +1443,7 @@ MUI_ERROR daDKErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS er endnu ikke f�rdiginstalleret p�\n" "din computer. Hvis du afslutter installationen nu skal\n" "du k�rer installationen igen for at installere ReactOS.\n" @@ -1453,62 +1453,62 @@ MUI_ERROR daDKErrorEntries[] = "F3 = Afslut ENTER = Forts�t" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Installationen kunne ikke finde en harddisk.\n", "ENTER = Genstart" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Installationen kunne ikke finde dets kildedrev.\n", "ENTER = Genstart" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Installationen kunne ikke indl�st TXTSETUP.SIF.\n", "ENTER = Genstart" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Installationen fasdt en �delagt TXTSETUP.SIF.\n", "ENTER = Genstart" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Installationen fandt en ubrugbar signatur i TXTSETUP.SIF.\n", "ENTER = Genstart" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Installationen kunne ikke hente information fra registreringsdatabasen.\n", "ENTER = Genstart" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Installationen kunne ikke installere FAT-startkode p� systempartitionen.", "ENTER = Genstart" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Installationen kunne ikke indl�se listen over computertyper.\n", "ENTER = Genstart" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Installationen kunne ikke indl�ste listen over sk�rmindstillinger.\n", "ENTER = Genstart" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Installationen kunne ikke indl�se listen over tastaturtyper.\n", "ENTER = Genstart" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Installationen kunne ikke indl�se listen over tastaturlayouts.\n", "ENTER = Genstart" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Installationen fandt ud af at midst en harddisk indeholder en\n" "indkompatibel partitionstabel og kan ikke h�ndteeres korrekt!\n" "\n" @@ -1519,7 +1519,7 @@ MUI_ERROR daDKErrorEntries[] = "F3 = Afslut ENTER = Forts�t" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "Du kan ikke lave en partitionstabel\n" "inde i en allerede eksisterende partition!\n" "\n" @@ -1527,133 +1527,127 @@ MUI_ERROR daDKErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "Du kan ikke slette upartitionernet diskplads!\n" "\n" " * Tryk p� en vilk�rligtast for at forts�tte.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Installationen kunne ikke installere FAT-startkode p� systempartitionen.", "ENTER = Genstart" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "Der er ingen diskette i drev A:.", "ENTER = Forts�t" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Installationen kunne ikke opdatere indstillingene for tastaturlayout.", "ENTER = Genstart" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Installationen kunne ikke opdatere indstillingerne for sk�rmregistrereing", "ENTER = Genstart" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Installationen kunne ikke importere registreringsdatabasen.", "ENTER = Genstart" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Installationen kunne ikke finde filerne til registreringsdatabasen.", "ENTER = Genstart" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Installationen kunne ikke lave registreringsdatabasen.", "ENTER = Genstart" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Installationen kunne ikke indl�e registreringsdatabasen.", "ENTER = Genstart" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Cabinet-filen indeholder ingen brugbar inf-fil.\n", "ENTER = Genstart" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet-filen blev ikke fundet.\n", "ENTER = Genstart" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cabinet-filen har ingen installationsscript.\n", "ENTER = Genstart" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Installationen kunne ikke �bne filkopieringsk�en.\n", "ENTER = Genstart" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Installationen kunne ikke lave installationsmapperne.", "ENTER = Genstart" }, { - //ERROR_TXTSETUP_SECTION, - "Installationen kunne ikke finde 'Directories'-sektionen\n" - "in TXTSETUP.SIF.\n", + // ERROR_TXTSETUP_SECTION, + "Installationen kunne ikke finde '%S'-sektionen\n" + "i TXTSETUP.SIF.\n", "ENTER = Genstart" }, { - //ERROR_CABINET_SECTION, - "Installationen kunne ikke finde 'Directories'-sektionen\n" + // ERROR_CABINET_SECTION, + "Installationen kunne ikke finde '%S'-sektionen\n" "i cabinet-filen.\n", "ENTER = Genstart" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Installationen kunne ikke lave installationsmappen.", "ENTER = Genstart" }, { - //ERROR_FIND_SETUPDATA, - "Installationen kunne ikkde finde 'SetupData'-sektionen\n" - "i TXTSETUP.SIF.\n", - "ENTER = Genstart" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Installationen kunne ikke skrive partitionstabllerne.\n" "ENTER = Genstart" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Installationen kunne ikke tilf�je en tegntabel til registreringsdatabasen.\n" "ENTER = Genstart" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Installationen kunne ikke s�tte systemsproget.\n" "ENTER = Genstart" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Installationen kunne ikke tilf�je tastaturlayouts til registrereingsdatabasen.\n" "ENTER = Genstart" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Installationen kunne ikke s�tte geo id'et.\n" "ENTER = Genstart" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Ubrugligt mappenavn.\n" "\n" " * Tryk p� en vilk�rligtast for at forts�tte." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "Den valgte partition er ikke stor nok til at installere ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "installationspartitionen skal mindst have %lu MB ledig.\n" @@ -1662,20 +1656,20 @@ MUI_ERROR daDKErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "Du kan ikke lave en ny prim�r eller udviddet partition i\n" "partitionstabellen p� denne disk da den er fuld..\n" "\n" " * Tryk p� en vilk�rligtast for at forts�tte." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "Du kan ikke lave mere end en udviddet partition per disk.\n" "\n" " * Tryk p� en vilk�rligtast for at forts�tte." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Installationen kan ikke formatere partitionen:\n" " %S\n" "\n" @@ -1837,8 +1831,6 @@ MUI_STRING daDKStrings[] = "F3 = Afslut ENTER = Forts�t"}, {STRING_REBOOTCOMPUTER, "ENTER = Genstart"}, - {STRING_TXTSETUPFAILED, - "Installationen kunne ikke finde '%S'-sektionen\ni TXTSETUP.SIF.\n"}, {STRING_COPYING, " Kopiere filen: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index 729335f9e7..23d7be3947 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -1430,7 +1430,7 @@ MUI_ERROR deDEErrorEntries[] = "Erfolg\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS wurde nicht vollst�ndig auf Ihrem System installiert.\n" "Wenn Sie die Installation jetzt beenden, m�ssen Sie diese\n" "erneut starten, um ReactOS zu installieren.\n" @@ -1440,62 +1440,62 @@ MUI_ERROR deDEErrorEntries[] = "F3 = Beenden EINGABETASTE = Fortsetzen" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Es konnte keine Festplatte gefunden werden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Es konnte kein Installationsmedium gefunden werden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "TXTSETUP.SIF konnte nicht gefunden werden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "TXTSETUP.SIF scheint besch�digt zu sein.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Es wurde eine ung�ltige Signatur in TXTSETUP.SIF gefunden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Es konnten keine Laufwerksinformationen abgefragt werden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Der FAT-Bootcode konnte nicht auf der Partition installiert werden.", "EINGABETASTE = Computer neu starten" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Computertypenliste konnte nicht geladen werden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Displayeinstellungsliste konnte nicht geladen werden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Tastaturtypenliste konnte nicht geladen werden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Die Liste der Tastaturlayouts konnte nicht geladen werden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Es wurde mindestens eine Festplatte mit einer inkompatiblen\n" "Partitionstabelle gefunden, die nicht richtig verwendet werden kann.\n" "\n" @@ -1506,7 +1506,7 @@ MUI_ERROR deDEErrorEntries[] = "F3 = Beenden ENTER = EINGABETASTE" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "Sie k�nnen keine neue Partition in einer bereits\n" "vorhandenen Partition erstellen!\n" "\n" @@ -1514,136 +1514,130 @@ MUI_ERROR deDEErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "Sie k�nnen unpartitionierten Speicher nicht l�schen!\n" "\n" " * Eine beliebige Taste zum Fortsetzen dr�cken.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Der FAT-Bootcode konnte nicht auf der Partition installiert werden.", "EINGABETASTE = Computer neu starten" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "Keine Diskette in Laufwerk A: gefunden.", "EINGABETASTE = Fortsetzen" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Das Tastaturlayout konnte nicht aktualisiert werden.", "EINGABETASTE = Computer neu starten" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Die Registrierungseintr�ge der Anzeigeeinstellungen\n" "konnten nicht aktualisiert werden.", "EINGABETASTER = Computer neu starten" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Es konnte keine Hive-Datei importiert werden.", "EINGABETASTE = Computer neu starten" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Die Registrierungsdateien konnten nicht gefunden werden.", "EINGABETASTE = Computer neu starten" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Die Zweige in der Registrierung konnten nicht erstellt werden.", "EINGABETASTE = Computer neu starten" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Die Registrierung konnte nicht initialisiert werden.", "EINGABETASTE = Computer neu starten" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Das CAB-Archiv besitzt keine g�ltige INF-Datei.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Das CAB-Archiv wurde nicht gefunden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Das CAB-Archiv enth�lt kein Setup-Skript.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Die Liste mit den zu kopierenden Dateien\n" "konnte nicht gefunden werden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Die Installationspfade konnten nicht erstellt werden.", "EINGABETASTE = Computer neu starten" }, { - //ERROR_TXTSETUP_SECTION, - "Der Abschnitt 'Ordner' konnte in\n" - "TXTSETUP.SIF nicht gefunden werden.\n", + // ERROR_TXTSETUP_SECTION, + "Setup konnte die '%S'-Sektion in\n" + "TXTSETUP.SIF nicht finden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_CABINET_SECTION, - "Der Abschnitt 'Ordner' konnte\n" - "im im CAB-Archiv nicht gefunden werden.\n", + // ERROR_CABINET_SECTION, + "Setup konnte die '%S'-Sektion im\n" + "CAB-Archiv nicht finden.\n", "EINGABETASTE = Computer neu starten" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Setup konnte den Installationspfad nicht erstellen.", "EINGABETASTE = Computer neu starten" }, { - //ERROR_FIND_SETUPDATA, - "Setup konnte die 'SetupData'-Sektion in\n" - "TXTSETUP.SIF nicht finden.\n", - "EINGABETASTE = Computer neu starten" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Die Partitionstabellen konnten nicht geschrieben werden.\n" "EINGABETASTE = Computer neu starten" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Es konnte kein Codepage-Eintrag hinzugef�gt werden.\n" "EINGABETASTE = Computer neu starten" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Die Systemsprache konnte nicht eingestellt werden.\n" "EINGABETASTE = Computer neu starten" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Die Tastaturlayouts konnten nicht in die Registrierung\n" "eingetragen werden.\n" "EINGABETASTE = Computer neu starten" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Der geografische Standort konnte nicht eingestellt werden.\n" "EINGABETASTE = Computer neu starten" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Unzul�ssiger Verzeichnisname.\n" "\n" " * Eine beliebige Taste zum Fortsetzen dr�cken." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "Die gew�hlten Partition ist nicht gro� genug, um ReactOS zu installieren.\n" "Die Installationspartition muss mindestens %lu MB gro� sein.\n" "\n" @@ -1651,20 +1645,20 @@ MUI_ERROR deDEErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "Sie k�nnen keine weitere prim�re oder erweiterte Partition in\n" "der Partitionstabelle erstellen, weil die Tabelle voll ist.\n" "\n" " * Eine beliebige Taste zum Fortsetzen dr�cken." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "Sie k�nnen nur eine erweiterte Partition auf jeder Festplatte anlegen.\n" "\n" " * Eine beliebige Taste zum Fortsetzen dr�cken." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1826,8 +1820,6 @@ MUI_STRING deDEStrings[] = "F3 = Beenden EINGABETASTE = Fortsetzen"}, {STRING_REBOOTCOMPUTER, "EINGABETASTE = Computer neu starten"}, - {STRING_TXTSETUPFAILED, - "Der Abschnitt '%S'in TXTSETUP.SIF\nkonnte nicht gefunden werden.\n"}, {STRING_COPYING, " Kopiere Datei: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index 131b9636ba..11da4ef39d 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -1454,7 +1454,7 @@ MUI_ERROR elGRErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "�� ReactOS �� ៞�� \n" "�� . �� 㩜�� ᩫ�� 騘, �� ⧜� ��\n" "��⥜�� ᩫ�� 㩜� �� ReactOS.\n" @@ -1464,62 +1464,62 @@ MUI_ERROR elGRErrorEntries[] = "F3 = ��騞�� ENTER = ��⮜��" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "� ��ᩫ�� 樜�� ᧦�� 婡�.\n", "ENTER = ��夞�� " }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Setup could not find its source drive.\n", "ENTER = ��夞�� " }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "� ��ᩫ�� 樜�� 驜� �� TXTSETUP.SIF.\n", "ENTER = ��夞�� " }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "� ��ᩫ�� 㡜 ⤘ ��⤦ �� TXTSETUP.SIF.\n", "ENTER = ��夞�� " }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "� ��ᩫ�� 㡜 �� ⚡�� TXTSETUP.SIF.\n", "ENTER = ��夞�� " }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "� ��ᩫ�� 樜�� 驜� �� 圪 �� 婡�� 㣘��.\n", "ENTER = ��夞�� " }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Setup failed to install FAT bootcode on the system partition.", "ENTER = ��夞�� " }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "� ��ᩫ�� 樜�� 驜� �� 婫� �� .\n", "ENTER = ��夞�� " }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "� ��ᩫ�� 樜�� 驜� �� 婫� �� ᤠ��.\n", "ENTER = ��夞�� " }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "� ��ᩫ�� 樜�� 驜� �� 婫� �� 妬.\n", "ENTER = ��夞�� " }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "� ��ᩫ�� 樜�� 驜� �� 婫� ��ᥜ� ��妬.\n", "ENTER = ��夞�� " }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "� ��ᩫ�� 㡜櫠 ��ᮠ�� ⤘� �� 婡�� ⮜� ⤘ �� \n" "partition table �� ੫�!\n" "\n" @@ -1530,7 +1530,7 @@ MUI_ERROR elGRErrorEntries[] = "F3 = ��騞�� ENTER = ��⮜��" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "�� 嫜 �� 㩜�� ⤘ Partition �⩘ ��\n" "⤘ ᢢ� ��ᨮ�� Partition!\n" "\n" @@ -1538,146 +1538,140 @@ MUI_ERROR elGRErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "�� 嫜 �� ᯜ�� ⤘� �� ⤦ �騦 �婡��!\n" "\n" " * ��㩫� ��㧦�� 㡫�� 婜��.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Setup failed to install the FAT bootcode on the system partition.", "ENTER = ��夞�� " }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "�� ᨮ�� ⫘ �� A:.", "ENTER = ��⮜��" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "� ��ᩘ�� ⫬�� 驜� �� 婜�� ᫘�� 妬.", "ENTER = ��夞�� " }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "� ��ᩫ�� ⫬�� 驜� �� 婜�� 馬 �� ᤠ��.", "ENTER = ��夞�� " }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "� ��ᩫ�� ⫬�� 驜� ⤘ hive ��.", "ENTER = ��夞�� " }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "� ��ᩘ�� ⫬�� 馬.", "ENTER = ��夞�� " }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "� ��ᩫ�� ⫬�� 㩜� �� registry hives.", "ENTER = ��夞�� " }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "� ��ᩫ�� ⫬�� 㩜� �� .", "ENTER = ��夞�� " }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "�� cabinet �� ⮜� ⚡�� inf.\n", "ENTER = ��夞�� " }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "�� cabinet �� ⟞��.\n", "ENTER = ��夞�� " }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "�� cabinet �� ⮜� ��⤘ �� ᩫ��.\n", "ENTER = ��夞�� " }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "� ��ᩫ�� ⫬�� 奜� �� .\n", "ENTER = ��夞�� " }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "� ��ᩫ�� 樜�� 㩜� �� 暦�� ᩫ��.", "ENTER = ��夞�� " }, { - //ERROR_TXTSETUP_SECTION, - "� ��ᩫ�� ⫬�� 'Directories'\n" + // ERROR_TXTSETUP_SECTION, + "� ��ᩫ�� ⫬�� '%S'\n" "�� TXTSETUP.SIF.\n", "ENTER = ��夞�� " }, { - //ERROR_CABINET_SECTION, - "� ��ᩫ�� ⫬�� 'Directories'\n" + // ERROR_CABINET_SECTION, + "� ��ᩫ�� ⫬�� '%S'\n" "�� cabinet.\n", "ENTER = ��夞�� " }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "� ��ᩫ�� 樜�� 㩜� �� ᢦ�� ᩫ��.", "ENTER = ��夞�� " }, { - //ERROR_FIND_SETUPDATA, - "� ��ᩫ�� ⫬�� 'SetupData'\n" - "�� TXTSETUP.SIF.\n", - "ENTER = ��夞�� " - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "� ��ᩫ�� ⫬�� ᯜ� �� partition tables.\n" "ENTER = ��夞�� " }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Setup failed to add codepage to registry.\n" "ENTER = ��夞�� " }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Setup could not set the system locale.\n" "ENTER = ��夞�� " }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "� ��ᩫ�� ⫬�� ⩜� �� ᥜ�� .\n" "ENTER = ��夞�� " }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Setup could not set the geo id.\n" "ENTER = Reboot computer" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1841,8 +1835,6 @@ MUI_STRING elGRStrings[] = "F3 = ��騞�� ENTER = ��⮜��"}, {STRING_REBOOTCOMPUTER, "ENTER = ��夞�� "}, - {STRING_TXTSETUPFAILED, - "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " ��᭜�� : %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index d526d6d70d..dc030656ca 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -1431,7 +1431,7 @@ MUI_ERROR enUSErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS is not completely installed on your\n" "computer. If you quit Setup now, you will need to\n" "run Setup again to install ReactOS.\n" @@ -1441,62 +1441,62 @@ MUI_ERROR enUSErrorEntries[] = "F3 = Quit ENTER = Continue" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Setup could not find a harddisk.\n", "ENTER = Reboot computer" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Setup could not find its source drive.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Setup failed to load the file TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Setup found a corrupt TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Setup found an invalid signature in TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Setup could not retrieve system drive information.\n", "ENTER = Reboot computer" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Setup failed to install FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Setup failed to load the computer type list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Setup failed to load the display settings list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Setup failed to load the keyboard type list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Setup failed to load the keyboard layout list.\n", "ENTER = Reboot computer" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Setup found that at least one harddisk contains an incompatible\n" "partition table that can not be handled properly!\n" "\n" @@ -1507,7 +1507,7 @@ MUI_ERROR enUSErrorEntries[] = "F3 = Quit ENTER = Continue" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "You can not create a new Partition inside\n" "of an already existing Partition!\n" "\n" @@ -1515,133 +1515,127 @@ MUI_ERROR enUSErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "You can not delete unpartitioned disk space!\n" "\n" " * Press any key to continue.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Setup failed to install the FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "No disk in drive A:.", "ENTER = Continue" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Setup failed to update keyboard layout settings.", "ENTER = Reboot computer" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Setup failed to update display registry settings.", "ENTER = Reboot computer" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Setup failed to import a hive file.", "ENTER = Reboot computer" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Setup failed to find the registry data files.", "ENTER = Reboot computer" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Setup failed to create the registry hives.", "ENTER = Reboot computer" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Setup failed to initialize the registry.", "ENTER = Reboot computer" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Cabinet has no valid inf file.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet not found.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cabinet has no setup script.\n", "ENTER = Reboot computer" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Setup failed to open the copy file queue.\n", "ENTER = Reboot computer" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Setup could not create install directories.", "ENTER = Reboot computer" }, { - //ERROR_TXTSETUP_SECTION, - "Setup failed to find the 'Directories' section\n" + // ERROR_TXTSETUP_SECTION, + "Setup failed to find the '%S' section\n" "in TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_SECTION, - "Setup failed to find the 'Directories' section\n" + // ERROR_CABINET_SECTION, + "Setup failed to find the '%S' section\n" "in the cabinet.\n", "ENTER = Reboot computer" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Setup could not create the install directory.", "ENTER = Reboot computer" }, { - //ERROR_FIND_SETUPDATA, - "Setup failed to find the 'SetupData' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Setup failed to write partition tables.\n" "ENTER = Reboot computer" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Setup failed to add codepage to registry.\n" "ENTER = Reboot computer" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Setup could not set the system locale.\n" "ENTER = Reboot computer" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Setup failed to add keyboard layouts to registry.\n" "ENTER = Reboot computer" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Setup could not set the geo id.\n" "ENTER = Reboot computer" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1649,20 +1643,20 @@ MUI_ERROR enUSErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1824,8 +1818,6 @@ MUI_STRING enUSStrings[] = "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER, "ENTER = Reboot computer"}, - {STRING_TXTSETUPFAILED, - "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " Copying file: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 55857836ad..dca719b51b 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -1433,7 +1433,7 @@ MUI_ERROR esESErrorEntries[] = "Completado correctamente\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS no est� completamente instalado en su\n" "equipo. Si cierra ahora el Instalador, necesitar�\n" "ejecutarlo otra vez para instalar ReactOS.\n" @@ -1443,62 +1443,62 @@ MUI_ERROR esESErrorEntries[] = "F3 = Salir INTRO = Continuar" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "El instalador no pudo encontrar un disco duro.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "El instalador no pudo encontrar su unidad fuente.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "El instalador fall� al cargar el archivo TXTSETUP.SIF.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "El instalador encontr� un archivo TXTSETUP.SIF corrupto.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "El instalador encontr� una firma incorrecta en TXTSETUP.SIF.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "El instalador no pudo recibir informaci�n del disco del sistema.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "El instalador fall� al instalar el c�digo de inicio FAT en la partici�n del sistema.", "INTRO = Reiniciar el equipo" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "El instalador fall� al cargar la lista de tipos de equipos.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "El instalador fall� al cargar la lista de resoluciones de pantalla.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "El instalador fall� al cargar la lista de teclados.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "El instalador fall� al cargar la lista de distribuciones de teclado.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "�El instalador encontr� que al menos un disco duro contiene una tabla\n" "de partici�n incompatible que no puede ser manejada correctamente!\n" "\n" @@ -1509,7 +1509,7 @@ MUI_ERROR esESErrorEntries[] = "F3 = Salir INTRO = Continuar" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "�No puede crear una nueva partici�n dentro\n" "de una partici�n existente!\n" "\n" @@ -1517,133 +1517,127 @@ MUI_ERROR esESErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "�No se puede borrar un espacio de disco sin particionar!\n" "\n" " * Presione cualquier tecla para continuar.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "El instalador fall� al instalar el c�digo de inicio FAT en la partici�n del sistema.", "INTRO = Reiniciar el equipo" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "No hay disco en la unidad A:.", "INTRO = Continuar" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "El instalador fall� al actualizar la configuraci�n de distribuci�n de teclado.", "INTRO = Reiniciar el equipo" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "El instalador fall� al actualizar la configuraci�n de la pantalla.", "INTRO = Reiniciar el equipo" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "El instalador fall� al importar un archivo de la estructura.", "INTRO = Reiniciar el equipo" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "El instalador fall� al buscar los archivos de datos registrados.", "INTRO = Reiniciar el equipo" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "El instalador fall� al crear el registro de la estructura.", "INTRO = Reiniciar el equipo" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "El instalador fall� al configurar el registro de inicio.", "INTRO = Reiniciar el equipo" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Cabinet no tiene un archivo inf v�lido.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet no encontrado.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cabinet no tiene ning�n script de instalaci�n.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "El instalador fall� al abrir la lista de archivos a copiar.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "El instalador no puede crear los directorios de instalaci�n.", "INTRO = Reiniciar el equipo" }, { - //ERROR_TXTSETUP_SECTION, - "El instalador fall� al buscar la secci�n 'Directorios'\n" + // ERROR_TXTSETUP_SECTION, + "El instalador fall� al buscar la secci�n '%S'\n" "en TXTSETUP.SIF.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_CABINET_SECTION, - "El instalador fall� al buscar la secci�n 'Directorios'\n" + // ERROR_CABINET_SECTION, + "El instalador fall� al buscar la secci�n '%S'\n" "en el cabinet.\n", "INTRO = Reiniciar el equipo" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "El instalador no puede crear el directorio de instalaci�n.", "INTRO = Reiniciar el equipo" }, { - //ERROR_FIND_SETUPDATA, - "El instalador fall� al buscar la secci�n 'SetupData'\n" - "en TXTSETUP.SIF.\n", - "INTRO = Reiniciar el equipo" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "El instalador fall� al escribir la tabla de particiones.\n" "INTRO = Reiniciar el equipo" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "El instalador fall� al a�adir el c�digo de p�ginas al registro.\n" "INTRO = Reiniciar el equipo" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "El instalador no pudo configurar el idioma del sistema.\n" "INTRO = Reiniciar el equipo" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "El instalador no ha podido agregar los layouts de teclado al registro.\n" "INTRO = Reiniciar el equipo" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "El instalador no ha podido configurar el ID geogr�fico.\n" "INTRO = Reiniciar el equipo" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Nombre de carpeta no v�lido.\n" "\n" " * Presione una tecla para continuar." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "La partici�n selecionada no es lo suficientemente grande como para.\n" "instalar ReactOS. Se necesita una partici�n de al menos %lu MB.\n" "\n" @@ -1651,20 +1645,20 @@ MUI_ERROR esESErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "No es posible a�adir una partici�n primaria o extendida en la\n" "tabla de partici�n de este disco, ya que est� completamente llena.\n" "\n" " * Presione una tecla para continuar." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "No es posible crear m�s de una partici�n extendida por disco.\n" "\n" " * Presione una tecla para continuar." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "El instalador es incapaz de formatear la partici�n:\n" " %S\n" "\n" @@ -1826,8 +1820,6 @@ MUI_STRING esESStrings[] = "F3 = Salir INTRO = Continuar"}, {STRING_REBOOTCOMPUTER, "INTRO = Reiniciar el equipo"}, - {STRING_TXTSETUPFAILED, - "El instalador fall� al buscar la secci�n\nen TXTSETUP.SIF.\n"}, {STRING_COPYING, " Copiando archivo: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index e4f6bfeb4f..d18d609d34 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -1431,7 +1431,7 @@ MUI_ERROR etEEErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS ei ole t�ielikult paigaldatud.\n" "Kui paigaldamine praegu katkestada, siis tuleb\n" "ReactOSi paigaldamiseks paigaldusprogramm uuesti k�ivitada.\n" @@ -1441,62 +1441,62 @@ MUI_ERROR etEEErrorEntries[] = "F3 = V�lju ENTER = J�tka" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "K�vaketast ei leitud.\n", "ENTER = Taask�ivita arvuti" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Paigaldusprogramm ei leidnud ketast, millelt see k�ivitati.\n", "ENTER = Taask�ivita arvuti" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "TXTSETUP.SIF faili ei �nnestunud laadida.\n", "ENTER = Taask�ivita arvuti" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "TXTSETUP.SIF on vigane.\n", "ENTER = Taask�ivita arvuti" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "TXTSETUP.SIF faili signatuur on vigane.\n", "ENTER = Taask�ivita arvuti" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "S�steemiketta parameetreid ei �nnestunud lugeda.\n", "ENTER = Taask�ivita arvuti" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "S�steemikettale ei �nnestunud kirjutada FAT alglaadimiskoodi.", "ENTER = Taask�ivita arvuti" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Arvutit��pide nimekirja ei �nnestunud laadida.\n", "ENTER = Taask�ivita arvuti" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Monitoride nimekirja ei �nnestunud laadida.\n", "ENTER = Taask�ivita arvuti" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Klaviatuuri t��pide nimekirja ei �nnestunud laadida.\n", "ENTER = Taask�ivita arvuti" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Klaviatuuriasetuste nimekirja ei �nnestunud laadida.\n", "ENTER = Taask�ivita arvuti" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Leiti v�hemalt �ks k�vaketas, millel on �hildamatu partitsioonitabel,\n" "millega ei saanud korralikult �mber k�ia!\n" "\n" @@ -1507,7 +1507,7 @@ MUI_ERROR etEEErrorEntries[] = "F3 = V�lju ENTER = J�tka" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "Uut partitsioonitabelit ei saa juba olemasoleva\n" "partitsiooni sisse tekitada!\n" "\n" @@ -1515,130 +1515,125 @@ MUI_ERROR etEEErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "Partitsioneerimata kettaruumi ei saa kustutada!\n" "\n" " * Vajuta suvalist klahvi, et j�tkata.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "S�steemikettale ei �nnestunud paigaldada FAT alglaadimiskoodi.", "ENTER = Taask�ivita arvuti" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "Draivis A: ei ole flopiketast.", "ENTER = J�tka" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Klaviatuuriasetuse seadistust ei �nnestunud uuendada.", "ENTER = Taask�ivita arvuti" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Monitori seadistust registris ei �nnestunud uuendada.", "ENTER = Taask�ivita arvuti" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Tarufaili ei �nnestunud importida.", "ENTER = Taask�ivita arvuti" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Registri andmete faile ei leitud.", "ENTER = Taask�ivita arvuti" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Registri tarusid ei �nnestunud luua.", "ENTER = Taask�ivita arvuti" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Registrit ei �nnestunud luua.", "ENTER = Taask�ivita arvuti" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Kapifailis ei olnud p�devaid inf faile.\n", "ENTER = Taask�ivita arvuti" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Kapifaili ei leitud.\n", "ENTER = Taask�ivita arvuti" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Kapifailis puudub paigaldusskript.\n", "ENTER = Taask�ivita arvuti" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Kopeeritavate failide nimekirja ei �nnestunud avada.\n", "ENTER = Taask�ivita arvuti" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Paigalduskaustu ei �nnestunud luua.", "ENTER = Taask�ivita arvuti" }, { - //ERROR_TXTSETUP_SECTION, - "TXTSETUP.SIF failist ei leitud 'Directories' sektsiooni.", + // ERROR_TXTSETUP_SECTION, + "TXTSETUP.SIF failist ei leitud '%S' sektsiooni.", "ENTER = Taask�ivita arvuti" }, { - //ERROR_CABINET_SECTION, - "Kapifailist ei leitud 'Directories' sektsiooni.", + // ERROR_CABINET_SECTION, + "Kapifailist ei leitud '%S' sektsiooni.", "ENTER = Taask�ivita arvuti" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Paigalduskausta ei �nnestunud luua.", "ENTER = Taask�ivita arvuti" }, { - //ERROR_FIND_SETUPDATA, - "TXTSETUP.SIF failist ei leitud 'SetupData' sektsiooni", - "ENTER = Taask�ivita arvuti" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Partitsioonitabeleid ei �nnestunud kirjutada.\n" "ENTER = Taask�ivita arvuti" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Kooditabelit ei �nnestunud registrisse lisada.\n" "ENTER = Taask�ivita arvuti" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "S�steemilokaati ei �nnestunud sedistada.\n" "ENTER = Taask�ivita arvuti" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Klaviatuuriasetusi ei �nnestunud registrisse lisada.\n" "ENTER = Taask�ivita arvuti" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Geograafilist asukohta ei �nnestunud seadistada.\n" "ENTER = Taask�ivita arvuti" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1646,20 +1641,20 @@ MUI_ERROR etEEErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1823,8 +1818,6 @@ MUI_STRING etEEStrings[] = "F3 = V�lju ENTER = J�tka"}, {STRING_REBOOTCOMPUTER, "ENTER = Taask�ivita arvuti"}, - {STRING_TXTSETUPFAILED, - "TXTSETUP.SIF failist ei leitud '%S' sektsiooni\n"}, {STRING_COPYING, " Kopeerimine: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index dfaaf3ace1..64014bf160 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -1448,7 +1448,7 @@ MUI_ERROR frFRErrorEntries[] = "Succ�s\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS n'est pas compl�tement install� sur votre\n" "ordinateur. Si vous quittez Setup maintenant, vous devrez\n" "lancer Setup de nouveau pour installer ReactOS.\n" @@ -1458,62 +1458,62 @@ MUI_ERROR frFRErrorEntries[] = "F3 = Quitter ENTR�E = Continuer" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Setup n'a pu trouver un disque dur.\n", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Setup n'a pu trouver son lecteur source.\n", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Setup n'a pas r�ussi � charger le fichier TXTSETUP.SIF.\n", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Setup a trouv� un fichier TXTSETUP.SIF corrompu.\n", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Setup a trouv� une signature invalide dans TXTSETUP.SIF.\n", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Setup n'a pu r�cup�rer les informations du disque syst�me.\n", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Echec de l'installation du code de d�marrage FAT sur la partition syst�me.", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Setup n'a pu charger la liste de type d'ordinateurs.\n", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Setup n'a pu charger la liste de r�glages des �crans.\n", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Setup n'a pu charger la liste de types de claviers.\n", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Setup n'a pu charger la liste de dispositions de claviers.\n", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Setup a d�tect� qu'au moins un disque dur contient une table\n" "de partition incompatible qui ne peut �tre prise en compte!\n" "\n" @@ -1524,7 +1524,7 @@ MUI_ERROR frFRErrorEntries[] = "F3 = Quitter ENTR�E = Continuer" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "Vous ne pouvez cr�er une nouvelle Partition � l'int�rieur\n" "d'une Partition d�j� existante!\n" "\n" @@ -1532,133 +1532,127 @@ MUI_ERROR frFRErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "Vous ne pouvez supprimer de l'espace disque non partitionn�!\n" "\n" " * Appuyer sur une touche pour continuer.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Echec de l'installation du code de d�marrage FAT sur la partition syst�me.", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "Pas de disque dans le lecteur A:.", "ENTR�E = Continuer" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Setup n'a pu mettre � jour les r�glages de disposition du clavier.", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Setup n'a pu mettre � jour les r�glages de l'�cran.", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Setup n'a pu importer un fichier ruche.", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Setup n'a pu trouver les fichiers de la base de registres.", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Setup n'a pu cr�er les ruches de la base de registres.", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Setup n'a pu initialiser la base de registres.", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Le Cabinet n'a pas de fichier inf valide.\n", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet non trouv�.\n", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cabinet n'a pas de script de setup.\n", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Setup n'a pu ouvrir la file d'attente de copie de fichiers.\n", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Setup n'a pu cr�er les r�pertoires d'installation.", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_TXTSETUP_SECTION, - "Setup n'a pu trouver la section 'Directories'\n" + // ERROR_TXTSETUP_SECTION, + "Setup n'a pu trouver la section '%S'\n" "dans TXTSETUP.SIF.\n", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_CABINET_SECTION, - "Setup n'a pu trouver la section 'Directories\n" + // ERROR_CABINET_SECTION, + "Setup n'a pu trouver la section '%S\n" "dans le cabinet.\n", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Setup n'a pu cr�er le r�pertoire d'installation.", "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_FIND_SETUPDATA, - "Setup n'a pu trouver la section 'SetupData'\n" - "dans TXTSETUP.SIF.\n", - "ENTR�E = Red�marrer l'ordinateur" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Setup n'a pu �crire les tables de partition.\n" "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Setup n'a pu ajouter la page de codes � la base de registres.\n" "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Setup n'a pu changer la langue syst�me.\n" "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Setup n'a pas pu ajouter les dispositions de clavier au registre.\n" "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Setup n'a pas pu d�finir la geo id.\n" "ENTR�E = Red�marrer l'ordinateur" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Nom de r�pertoire invalide.\n" "\n" " * Appuyer sur une touche pour continuer." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1666,20 +1660,20 @@ MUI_ERROR frFRErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "Impossible de cr�er une nouvelle partition primaire ou �tendue\n" "sur ce disque parce que sa table de partition est pleine.\n" "\n" " * Appuyer sur une touche pour continuer." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "Impossible de cr�er plus d'une partition �tendue par disque.\n" "\n" " * Appuyer sur une touche pour continuer." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1841,8 +1835,6 @@ MUI_STRING frFRStrings[] = "F3 = Quitter ENTR�E = Continuer"}, {STRING_REBOOTCOMPUTER, "ENTR�E = Red�marrer l'ordinateur"}, - {STRING_TXTSETUPFAILED, - "Setup n'a pu trouver la section '%S'\ndans TXTSETUP.SIF.\n"}, {STRING_COPYING, " Copie du fichier: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 7318eb50b2..868ab1dc38 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -1430,7 +1430,7 @@ MUI_ERROR heILErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS is not completely installed on your\n" "computer. If you quit Setup now, you will need to\n" "run Setup again to install ReactOS.\n" @@ -1440,62 +1440,62 @@ MUI_ERROR heILErrorEntries[] = "F3 = Quit ENTER = Continue" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Setup could not find a harddisk.\n", "ENTER = Reboot computer" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Setup could not find its source drive.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Setup failed to load the file TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Setup found a corrupt TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Setup found an invalid signature in TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Setup could not retrieve system drive information.\n", "ENTER = Reboot computer" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Setup failed to install FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Setup failed to load the computer type list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Setup failed to load the display settings list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Setup failed to load the keyboard type list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Setup failed to load the keyboard layout list.\n", "ENTER = Reboot computer" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Setup found that at least one harddisk contains an incompatible\n" "partition table that can not be handled properly!\n" "\n" @@ -1506,7 +1506,7 @@ MUI_ERROR heILErrorEntries[] = "F3 = Quit ENTER = Continue" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "You can not create a new Partition inside\n" "of an already existing Partition!\n" "\n" @@ -1514,133 +1514,127 @@ MUI_ERROR heILErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "You can not delete unpartitioned disk space!\n" "\n" " * Press any key to continue.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Setup failed to install the FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "No disk in drive A:.", "ENTER = Continue" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Setup failed to update keyboard layout settings.", "ENTER = Reboot computer" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Setup failed to update display registry settings.", "ENTER = Reboot computer" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Setup failed to import a hive file.", "ENTER = Reboot computer" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Setup failed to find the registry data files.", "ENTER = Reboot computer" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Setup failed to create the registry hives.", "ENTER = Reboot computer" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Setup failed to initialize the registry.", "ENTER = Reboot computer" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Cabinet has no valid inf file.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet not found.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cabinet has no setup script.\n", "ENTER = Reboot computer" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Setup failed to open the copy file queue.\n", "ENTER = Reboot computer" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Setup could not create install directories.", "ENTER = Reboot computer" }, { - //ERROR_TXTSETUP_SECTION, - "Setup failed to find the 'Directories' section\n" + // ERROR_TXTSETUP_SECTION, + "Setup failed to find the '%S' section\n" "in TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_SECTION, - "Setup failed to find the 'Directories' section\n" + // ERROR_CABINET_SECTION, + "Setup failed to find the '%S' section\n" "in the cabinet.\n", "ENTER = Reboot computer" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Setup could not create the install directory.", "ENTER = Reboot computer" }, { - //ERROR_FIND_SETUPDATA, - "Setup failed to find the 'SetupData' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Setup failed to write partition tables.\n" "ENTER = Reboot computer" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Setup failed to add codepage to registry.\n" "ENTER = Reboot computer" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Setup could not set the system locale.\n" "ENTER = Reboot computer" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Setup failed to add keyboard layouts to registry.\n" "ENTER = Reboot computer" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Setup could not set the geo id.\n" "ENTER = Reboot computer" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1648,20 +1642,20 @@ MUI_ERROR heILErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1824,8 +1818,6 @@ MUI_STRING heILStrings[] = "F3 = �� ENTER = ��"}, {STRING_REBOOTCOMPUTER, "ENTER = �� "}, - {STRING_TXTSETUPFAILED, - "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " �� : %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index 004e1a888a..4a2621706b 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -1436,7 +1436,7 @@ MUI_ERROR itITErrorEntries[] = "Successo\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS non \x8A stato installato completamente nel \n" "vostro computer. Se esce adesso, dovr\x85 eseguire il \n" "Setup nuovamente per installare ReactOS.\n" @@ -1446,62 +1446,62 @@ MUI_ERROR itITErrorEntries[] = "F3 = Uscire INVIO = Continuare" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Setup non ha trovato un disco fisso.\n", "INVIO = Riavviare il computer" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Setup non ha trovato l'unit\x85 di origine.\n", "INVIO = Riavviare il computer" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Setup non ha potuto caricare il file TXTSETUP.SIF.\n", "INVIO = Riavviare il computer" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Setup ha trovato un file TXTSETUP.SIF corrotto.\n", "INVIO = Riavviare il computer" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Setup ha trovato una firma invalida in TXTSETUP.SIF.\n", "INVIO = Riavviare il computer" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Setup non ha potuto recuperare le informazioni dell'unit\x85 di sistema.\n", "INVIO = Riavviare il computer" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Impossibile installare il bootcode FAT nella partizione di sistema.", "INVIO = Riavviare il computer" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Setup non ha potuto caricare l'elenco di tipi di computer.\n", "INVIO = Riavviare il computer" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Setup non ha potuto caricare l'elenco di tipi di schermo.\n", "INVIO = Riavviare il computer" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Setup non ha potuto caricare l'elenco di tipi di tastiera.\n", "INVIO = Riavviare il computer" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Setup non ha potuto caricare l'elenco delle nazionalit\x85 di tastiera.\n", "INVIO = Riavviare il computer" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Setup ha trovato che almeno un disco fisso contiene una tabella delle\n" "partizioni incompatibile che non pu\x95 essere gestita correttamente!\n" "\n" @@ -1512,7 +1512,7 @@ MUI_ERROR itITErrorEntries[] = "F3 = Uscire INVIO = Continuare" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "Non si pu\x95 creare una nuova partizione all'interno\n" "di una partizione gi\x85 esistente!\n" "\n" @@ -1520,133 +1520,127 @@ MUI_ERROR itITErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "Non si pu\x95 cancellare spazio in un disco non partizionato!\n" "\n" " * Premere un tasto qualsiasi per continuare.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Impossibile installare il bootcode FAT nella partizione di sistema.", "INVIO = Riavviare il computer" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "Non c'\x8A un disco nell'unit\x85 A:.", "ENTER = Continue" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Setup non ha potuto aggiornare la nazionalit\x85 della tastiera.", "INVIO = Riavviare il computer" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Setup non ha potuto aggiornare la configurazione di registro dello schermo.", "INVIO = Riavviare il computer" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Setup non ha potuto importare un file hive.", "INVIO = Riavviare il computer" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Setup non ha potuto trovare i file di dati del registro.", "INVIO = Riavviare il computer" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Setup non ha potuto creare gli hive del registro.", "INVIO = Riavviare il computer" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Setup non ha potuto inizializzare il registro.", "INVIO = Riavviare il computer" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Il Cabinet non ha un file inf valido.\n", "INVIO = Riavviare il computer" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet non trovato.\n", "INVIO = Riavviare il computer" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Il Cabinet non ha uno script di setup.\n", "INVIO = Riavviare il computer" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Setup non ha potuto aprire la coda di copia di file.\n", "INVIO = Riavviare il computer" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Setup non ha potuto creare le cartelle d'installazione.", "INVIO = Riavviare il computer" }, { - //ERROR_TXTSETUP_SECTION, - "Setup non ha potuto trovare le sezioni 'Cartelle'\n" + // ERROR_TXTSETUP_SECTION, + "Setup non ha potuto trovare le sezioni '%S'\n" "in TXTSETUP.SIF.\n", "INVIO = Riavviare il computer" }, { - //ERROR_CABINET_SECTION, - "Setup non ha potuto trovare le sezioni 'Cartelle'\n" + // ERROR_CABINET_SECTION, + "Setup non ha potuto trovare le sezioni '%S'\n" "nel cabinet.\n", "INVIO = Riavviare il computer" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Setup non ha potuto creare la cartella d'installazione.", "INVIO = Riavviare il computer" }, { - //ERROR_FIND_SETUPDATA, - "Setup non ha trovato la sezione 'SetupData'\n" - "in TXTSETUP.SIF.\n", - "INVIO = Riavviare il computer" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Setup non ha potuto scrivere le tabelle delle partizioni.\n" "INVIO = Riavviare il computer" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Setup non ha potuto aggiungere la codepage al registro.\n" "INVIO = Riavviare il computer" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Setup non ha potuto impostare la regionalizzazione del sistema.\n" "INVIO = Riavviare il computer" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Impossibile aggiungere le nazionalit\x85 di tastiera al registro.\n" "INVIO = Riavviare il computer" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Setup non ha potuto impostare l'id geografico.\n" "INVIO = Riavviare il computer" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Nome della cartella non valido.\n" "\n" " * Premere un tasto qualsiasi per continuare." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "Spazio nella partizione insufficiente per installare ReactOS.\n" "La partizione deve avere una dimensione di almeno %lu MB.\n" "\n" @@ -1654,20 +1648,20 @@ MUI_ERROR itITErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "Non \x8A possibile creare una partizione primaria o secondaria nella\n" "tabella delle partizioni del disco perch\x8A questa \x8A piena.\n" "\n" " * Premere un tasto qualsiasi per continuare." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "Impossibile creare pi\x97 di una partizione primaria per disco.\n" "\n" " * Premere un tasto qualsiasi per continuare." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup non \x8A riuscito a formattare la partizione:\n" " %S\n" "\n" @@ -1829,8 +1823,6 @@ MUI_STRING itITStrings[] = "F3 = Esci INVIO = Continua"}, {STRING_REBOOTCOMPUTER, "INVIO = Riavvia il computer"}, - {STRING_TXTSETUPFAILED, - "Setup non ha trovato la sezione '%S' \nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " Copia di: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index 6446e7a93a..8c3098c941 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -1431,7 +1431,7 @@ MUI_ERROR jaJPErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS � ��߭�� ݾ�� ݽİ�\n" "��Ͼݡ ��ı��ߦ �� ޱ�� ReactOS � �ݽİ� �� ı��ߦ\n" "ӳ�� ޯ�� ֳ�� Ͻ�\n" @@ -1441,62 +1441,62 @@ MUI_ERROR jaJPErrorEntries[] = "F3 = �� ENTER = �ޯ��" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "��ı�� ʰ��ި�� ݼ�� ޷Ͼ� �޼��\n", "ENTER = ��߭�� ޳" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "��ı�� ײ�ަ �ݼ�� ޷Ͼ� �޼��\n", "ENTER = ��߭�� ޳" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "��ı�� ̧�� TXTSETUP.SIF � �к�� ߲ �ϼ��\n", "ENTER = ��߭�� ޳" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "��ı�� TXTSETUP.SIF �� ʿ� �ò� �Ħ �ݼ�� ϼ��\n", "ENTER = ��߭�� ޳" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "��ı�� TXTSETUP.SIF � Ѻ�� Ҳ� �ݼ�� ϼ��\n", "ENTER = ��߭�� ޳" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "��ı�� ײ�� ޮ�γ� �� ޷Ͼ� �޼��\n", "ENTER = ��߭�� ޳" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "��ı�� ߰è�� ޮ�� FAT �ްĺ�� ݽİ�� ߲ �ϼ��", "ENTER = ��߭�� ޳" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "��ı�� ߭�� ٲ ؽ�� к�� ߲ �ϼ��\n", "ENTER = ��߭�� ޳" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "��ı�� ި��ڲ� ��ò ؽ�� к�� ߲ �ϼ��\n", "ENTER = ��߭�� ޳" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "��ı�� ް�� ٲ ؽ�� к�� ߲ �ϼ��\n", "ENTER = ��߭�� ޳" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "��ı�� ް�� ڲ�� ؽ�� к�� ߲ �ϼ��\n", "ENTER = ��߭�� ޳" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "��ı�� Ÿ�� 1�� ʰ��ި�� ÷�� ¶�Ų �޶ݾ�� Ų\n" "�߰è�� ð��٦ ̸� �Ħ �ݼ�� ϼ�!\n" "\n" @@ -1507,7 +1507,7 @@ MUI_ERROR jaJPErrorEntries[] = "F3 = �� ENTER = �ޯ��" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "��׼� �߰è��ݦ �� ݻ޲��\n" "�߰è�� Ų�� ٺ�� ޷Ͼ�!\n" "\n" @@ -1515,133 +1515,127 @@ MUI_ERROR jaJPErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "��ݶ� � �ި�� ߰� � ��ޮ �ٺ�� ޷Ͼ�!\n" "\n" " * �ޯ�� ƶ �� ޻��", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "��ı�� ߰è�� ޮ�� FAT �ް� ں�� ݽİ�� ߲ �ϼ��", "ENTER = ��߭�� ޳" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "��ײ�� A: � �ި�� Ͼݡ", "ENTER = �ޯ��" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "��ı�� ް�� ڲ�� ò� �� ߲ �ϼ��", "ENTER = ��߭�� ޳" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "��ı�� ި��ڲ� ڼ޽�� ò� �� ߲ �ϼ��", "ENTER = ��߭�� ޳" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "��ı�� ʲ�� ̧�� ߰�� ߲ �ϼ��", "ENTER = ��߭�� ޳" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "��ı�� ڼ޽�� ް� ̧�� ݼ�� ߲ �ϼ��", "ENTER = ��߭�� ޳" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "��ı�� ڼ޽�� ʲ�� ߲ �ϼ��", "ENTER = ��߭�� ޳" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "��ı�� ڼ޽�� ߲ �ϼ��", "ENTER = ��߭�� ޳" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "��ȯ�� Ѻ�� inf ̧�ٶ� ̸�� Ͻ�\n", "ENTER = ��߭�� ޳" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "��ȯĶ� �¶�Ͼݡ\n", "ENTER = ��߭�� ޳" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "��ȯ�Ų� ��ı�� Ķ� �¶�Ͼݡ\n", "ENTER = ��߭�� ޳" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "��ı�� ߰ ̧�� ߲ �ϼ��\n", "ENTER = ��߭�� ޳" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "��ı�� ݽİ� �ިڸ�ئ �� ޷Ͼ� �޼��", "ENTER = ��߭�� ޳" }, { - //ERROR_TXTSETUP_SECTION, - "��ı�� TXTSETUP.SIF Ų� 'Directories' �� ݻ��\n" + // ERROR_TXTSETUP_SECTION, + "��ı�� TXTSETUP.SIF Ų� '%S' �� ݻ��\n" "��߲ �ϼ��\n", "ENTER = ��߭�� ޳" }, { - //ERROR_CABINET_SECTION, - "��ı�� ȯ�Ų� 'Directories' �� ݻ��\n" + // ERROR_CABINET_SECTION, + "��ı�� ȯ�Ų� '%S' �� ݻ��\n" "��߲ �ϼ��\n", "ENTER = ��߭�� ޳" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "��ı�� ݽİ� �ިڸ�ئ �� ޷Ͼ� �޼��", "ENTER = ��߭�� ޳" }, { - //ERROR_FIND_SETUPDATA, - "��ı�� TXTSETUP.SIF Ų� 'SetupData' �� ݻ��\n" - "��߲ �ϼ��\n", - "ENTER = ��߭�� ޳" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "��ı�� ߰è�� ð�� ߲ �ϼ��\n" "ENTER = ��߭�� ޳" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "��ı�� ڼ޽�� ߰�� ²�� ߲ �ϼ��\n" "ENTER = ��߭�� ޳" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "��ı�� ۹�٦ ��ò �޷Ͼ� �޼��\n" "ENTER = ��߭�� ޳" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "��ı�� ڼ޽�� ް�� ڲ�� ²�� ߲ �ϼ��\n" "ENTER = ��߭�� ޳" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "��ı�� geo id � ��ò �޷Ͼ� �޼��\n" "ENTER = ��߭�� ޳" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1649,20 +1643,20 @@ MUI_ERROR jaJPErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1826,8 +1820,6 @@ MUI_STRING jaJPStrings[] = "F3 = �� ENTER = �ޯ��"}, {STRING_REBOOTCOMPUTER, "ENTER = ��߭�� ޳"}, - {STRING_TXTSETUPFAILED, - "��ı�� TXTSETUP.SIF � '%S' �� ݼ��\n��߲ �ϼ��\n"}, {STRING_COPYING, " ��߰ �� ̧��: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index b729e4ebad..6094090ec2 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -1439,7 +1439,7 @@ MUI_ERROR ltLTErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS is not completely installed on your\n" "computer. If you quit Setup now, you will need to\n" "run Setup again to install ReactOS.\n" @@ -1449,62 +1449,62 @@ MUI_ERROR ltLTErrorEntries[] = "F3 = Quit ENTER = Continue" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Setup could not find a harddisk.\n", "ENTER = Reboot computer" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Setup could not find its source drive.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Setup failed to load the file TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Setup found a corrupt TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Setup found an invalid signature in TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Setup could not retrieve system drive information.\n", "ENTER = Reboot computer" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Setup failed to install FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Setup failed to load the computer type list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Setup failed to load the display settings list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Setup failed to load the keyboard type list.\n", "ENTER = Reboot computer" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Setup failed to load the keyboard layout list.\n", "ENTER = Reboot computer" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Setup found that at least one harddisk contains an incompatible\n" "partition table that can not be handled properly!\n" "\n" @@ -1515,7 +1515,7 @@ MUI_ERROR ltLTErrorEntries[] = "F3 = Quit ENTER = Continue" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "You can not create a new Partition inside\n" "of an already existing Partition!\n" "\n" @@ -1523,133 +1523,127 @@ MUI_ERROR ltLTErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "You can not delete unpartitioned disk space!\n" "\n" " * Press any key to continue.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Setup failed to install the FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "No disk in drive A:.", "ENTER = Continue" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Setup failed to update keyboard layout settings.", "ENTER = Reboot computer" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Setup failed to update display registry settings.", "ENTER = Reboot computer" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Setup failed to import a hive file.", "ENTER = Reboot computer" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Setup failed to find the registry data files.", "ENTER = Reboot computer" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Setup failed to create the registry hives.", "ENTER = Reboot computer" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Setup failed to initialize the registry.", "ENTER = Reboot computer" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Cabinet has no valid inf file.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet not found.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cabinet has no setup script.\n", "ENTER = Reboot computer" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Setup failed to open the copy file queue.\n", "ENTER = Reboot computer" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Setup could not create install directories.", "ENTER = Reboot computer" }, { - //ERROR_TXTSETUP_SECTION, - "Setup failed to find the 'Directories' section\n" + // ERROR_TXTSETUP_SECTION, + "Setup failed to find the '%S' section\n" "in TXTSETUP.SIF.\n", "ENTER = Reboot computer" }, { - //ERROR_CABINET_SECTION, - "Setup failed to find the 'Directories' section\n" + // ERROR_CABINET_SECTION, + "Setup failed to find the '%S' section\n" "in the cabinet.\n", "ENTER = Reboot computer" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Setup could not create the install directory.", "ENTER = Reboot computer" }, { - //ERROR_FIND_SETUPDATA, - "Setup failed to find the 'SetupData' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Setup failed to write partition tables.\n" "ENTER = Reboot computer" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Setup failed to add codepage to registry.\n" "ENTER = Reboot computer" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Setup could not set the system locale.\n" "ENTER = Reboot computer" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Setup failed to add keyboard layouts to registry.\n" "ENTER = Reboot computer" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Setup could not set the geo id.\n" "ENTER = Reboot computer" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1657,20 +1651,20 @@ MUI_ERROR ltLTErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1832,8 +1826,6 @@ MUI_STRING ltLTStrings[] = "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER, "ENTER = Reboot computer"}, - {STRING_TXTSETUPFAILED, - "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " Copying file: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index d9cd9b9dde..abfed391f0 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -1330,7 +1330,7 @@ MUI_ERROR msMYErrorEntries[] = "Berjaya\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS tidak benar-benar dipasang pada\n" "komputer anda. Jika anda berhenti persediaan sekarang, anda akan perlu\n" "untuk menjalankan persediaan untuk memasang ReactOS lagi.\n" @@ -1340,62 +1340,62 @@ MUI_ERROR msMYErrorEntries[] = "F3 = Keluar ENTER = Teruskan" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Persediaan tidak dapat mencari cakera keras.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Persediaan tidak dapat mencari sumber cakera.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Persediaan gagal untuk memuatkan fail TXTSETUP.SIF.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Persediaan mendapati TXTSETUP.SIF yang rosak.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Persediaan ditemui untuk tandatangan tidak sah dalam TXTSETUP.SIF.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Persediaan tidak dapat mendapatkan semula maklumat sistem cakera.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Persediaan gagal memasang bootcode FAT pada partition sistem.", "ENTER = Memulakan semula komputer" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Persediaan gagal untuk memuatkan senarai jenis komputer.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Persediaan gagal untuk memuatkan pengesetan paparan senarai.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Persediaan gagal untuk memuatkan senarai jenis papan kekunci.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Persediaan gagal untuk memuatkan senarai susun atur papan kekunci.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Persediaan mendapati bahawa sekurang-kurangnya satu cakera keras mengandungi\n" "jadual partition yang sesuai untuk yang tidak boleh dikendalikan dengan betul!\n" "\n" @@ -1406,7 +1406,7 @@ MUI_ERROR msMYErrorEntries[] = "F3 = Keluar ENTER = Teruskan" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "Anda tidak boleh mencipta satu partition baru\n" "dalam partition yang telah sedia ada!\n" "\n" @@ -1414,133 +1414,127 @@ MUI_ERROR msMYErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "Anda tidak boleh menghapuskan ruang cakera yang tiada partition!\n" "\n" " * Tekan sebarang kunci untuk meneruskan.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Persediaan gagal memasang bootcode FAT pada partition sistem.", "ENTER = Memulakan semula komputer" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "Tiada cakera dalam cakera A:.", "ENTER = Teruskan" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Persediaan gagal mengemaskini seting susun atur papan kekunci.", "ENTER = Memulakan semula komputer" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Persediaan gagal mengemaskini daftaran seting paparan.", "ENTER = Memulakan semula komputer" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Persediaan gagal untuk mengimport fail gatal.", "ENTER = Memulakan semula komputer" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Persediaan gagal untuk mencari pendaftaran fail data.", "ENTER = Memulakan semula komputer" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Persediaan gagal mencipta gatal daftaran.", "ENTER = Memulakan semula komputer" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Persediaan gagal untuk diawalkan daftaran.", "ENTER = Memulakan semula komputer" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Kabinet mempunyai fail inf tidak sah.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Kabinet tidak dijumpai.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Kabinet mempunyai skrip tiada persediaan.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Persediaan gagal membuka baris gilir fail salinan.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Persediaan tidak dapat mencipta direktori pasang.", "ENTER = Memulakan semula komputer" }, { - //ERROR_TXTSETUP_SECTION, - "Persediaan gagal untuk mencari bahagian 'Direktori'\n" + // ERROR_TXTSETUP_SECTION, + "Persediaan gagal untuk mencari bahagian '%S'\n" "dalam TXTSETUP. SIF.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_CABINET_SECTION, - "Persediaan gagal menemui bahagian 'Direktori'\n" + // ERROR_CABINET_SECTION, + "Persediaan gagal menemui bahagian '%S'\n" "dalam kabinet.\n", "ENTER = Memulakan semula komputer" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Persediaan tidak dapat mencipta direktori pasang.", "ENTER = Memulakan semula komputer" }, { - //ERROR_FIND_SETUPDATA, - "Persediaan gagal untuk mencari bahagian 'SetupData'\n" - "dalam TXTSETUP.SIF.\n", - "ENTER = Memulakan semula komputer" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Persediaan gagal menulis jadual partition.\n" "ENTER = Memulakan semula komputer" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Persediaan gagal untuk menambah codepage ke daftaran.\n" "ENTER = Memulakan semula komputer" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Persediaan tidak dapat menyediakan penempatan sistem.\n" "ENTER = Memulakan semula komputer" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Persediaan gagal untuk menambah susun atur papan kekunci daftaran.\n" "ENTER = Memulakan semula komputer" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Persediaan tidak dapat disetkan geo id.\n" "ENTER = Memulakan semula komputer" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Nama direktori tidak sah.\n" "\n" " * Tekan sebarang kunci untuk meneruskan." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "Partition yang dipilih adalah tidak cukup besar untuk memasang ReactOS.\n" "Partition yang pasang hendaklah mempunyai saiz sekurang-kurangnya %lu MB.\n" "\n" @@ -1548,14 +1542,14 @@ MUI_ERROR msMYErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "Anda tidak boleh mencipta satu partition baru utama atau yang dilanjutkan\n" "dalam jadual partition cakera ini kerana jadual partition telah penuh.\n" "\n" " * Tekan sebarang kunci untuk meneruskan." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "Anda tidak boleh mencipta lebih daripada satu petak lanjutan setiap cakera.\n" "\n" " * Tekan sebarang kunci untuk meneruskan." @@ -1712,8 +1706,6 @@ MUI_STRING msMYStrings[] = "F3 = Keluar ENTER = Teruskan"}, {STRING_REBOOTCOMPUTER, "ENTER = Memulakan semuala komputer"}, - {STRING_TXTSETUPFAILED, - "Persediaan yang gagal menemui bahagian '%S'\ndalam TXTSETUP.SIF.\n"}, {STRING_COPYING, " Menyalin fail: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index 322644dcdf..2a98762306 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -1452,7 +1452,7 @@ MUI_ERROR nlNLErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS is niet geheel ge\x8Bnstalleerd op uw\n" "computer. Als u Setup nu afsluit moet u\n" "Setup opnieuw starten om ReactOS te installeren.\n" @@ -1462,62 +1462,62 @@ MUI_ERROR nlNLErrorEntries[] = "F3 = Afsluiten ENTER = Doorgaan" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Setup kan geen vaste schijf vinden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Setup kan zijn station met bronbestanden niet vinden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Setup kan het bestand TXTSETUP.SIF niet laden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Setup heeft een ongeldig TXTSETUP.SIF gevonden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Setup heeft een ongeldige signatuur in TXTSETUP.SIF gevonden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Setup kan de stationsinformatie niet laden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Setup kan de FAT bootcode op de systeempartitie niet installeren.", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Setup kan de computertype-lijst niet laden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Setup kan de beeldscherminstellingen-lijst niet laden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Setup kan de toetsenbordtype-lijst niet laden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Setup kan de toetsenbordindeling-lijst niet laden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Setup ontdekte dat ten minste \x82\x82n vaste schijf een niet compatibele\n" "partitietabel bevat dat niet goed wordt ondersteund!\n" "\n" @@ -1529,7 +1529,7 @@ MUI_ERROR nlNLErrorEntries[] = "F3 = Afsluiten ENTER = Doorgaan" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "U kunt geen nieuwe partitie aanmaken binnen\n" "een reeds bestaande partitie!\n" "\n" @@ -1537,39 +1537,39 @@ MUI_ERROR nlNLErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "U kunt ongebruikte schijfruimte voor partities niet verwijderen!\n" "\n" " * Druk op een willekeurige toets om door te gaan.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Setup kan de FAT bootcode op de systeempartitie niet installeren.", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "Geen diskette in station A:.", "ENTER = Doorgaan" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Setup kan de toetsenbordindeling instellingen niet bijwerken.", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Setup kan de beeldscherminstellingen niet bijwerken.", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Setup kan een registerbestand niet importeren.", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY /* This is about the hives, no? */ @@ -1577,96 +1577,90 @@ MUI_ERROR nlNLErrorEntries[] = "ENTER = Computer opnieuw opstarten" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Setup kan de registerbestanden niet aanmaken.", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Setup kan het register niet initialiseren.", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Cabinet bevat geen geldig .inf bestand.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet bestand niet gevonden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cabinet bestand heeft geen setup script.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Setup kan de lijst met te kopi\x89ren bestanden niet vinden.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Setup kan de installatiemappen niet aanmaken.", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_TXTSETUP_SECTION, - "Setup kan de 'Directories' sectie niet vinden\n" + // ERROR_TXTSETUP_SECTION, + "Setup kan de '%S' sectie niet vinden\n" "in TXTSETUP.SIF.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_CABINET_SECTION, - "Setup kan de 'Directories' sectie niet vinden\n" + // ERROR_CABINET_SECTION, + "Setup kan de '%S' sectie niet vinden\n" "in het cabinet bestand.\n", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Setup kan de installatiemap niet aanmaken.", "ENTER = Computer opnieuw opstarten" }, { - //ERROR_FIND_SETUPDATA, - "Setup kan de 'SetupData' sectie niet vinden\n" - "in TXTSETUP.SIF.\n", - "ENTER = Computer opnieuw opstarten" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Setup kan de partitietabellen niet schrijven.\n" "ENTER = Computer opnieuw opstarten" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Setup kan de codepagina niet toevoegen aan het register.\n" "ENTER = Computer opnieuw opstarten" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Setup kan de systeemtaal niet instellen.\n" "ENTER = Computer opnieuw opstarten" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Setup kan de toetsenbordindelingen niet toevoegen aan het register.\n" "ENTER = Computer opnieuw opstarten" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Setup kan de geografische positie niet instellen.\n" "ENTER = Computer opnieuw opstarten" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Invalid directory name.\n" "\n" " * Press any key to continue." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" @@ -1674,20 +1668,20 @@ MUI_ERROR nlNLErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" " * Press any key to continue." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Setup is unable to format the partition:\n" " %S\n" "\n" @@ -1851,8 +1845,6 @@ MUI_STRING nlNLStrings[] = "F3 = Afsluiten ENTER = Doorgaan"}, {STRING_REBOOTCOMPUTER, "ENTER = Computer opnieuw opstarten"}, - {STRING_TXTSETUPFAILED, - "Setup kan de '%S' sectie niet vinden\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, " Kopi\x89ren bestand: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index fc487024e7..6c43d3b368 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -1439,7 +1439,7 @@ MUI_ERROR plPLErrorEntries[] = "Sukces\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "ReactOS nie zosta� w pe�ni zainstalowany na twoim\n" "komputerze. Je�li wyjdziesz teraz, trzeba b�dzie\n" "ponownie uruchomi� instalator, by zainstalowa� ReactOS.\n" @@ -1449,62 +1449,62 @@ MUI_ERROR plPLErrorEntries[] = "F3 = Wyj�cie ENTER = Kontynuacja" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "Instalator nie znalaz� �adnego dysku twardego.\n", "ENTER = Restart komputera" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE "Instalator nie znalaz� nap�du �r�d�owego.\n", "ENTER = Restart komputera" }, { - //ERROR_LOAD_TXTSETUPSIF + // ERROR_LOAD_TXTSETUPSIF "Instalator nie m�g� za�adowa� pliku TXTSETUP.SIF.\n", "ENTER = Restart komputera" }, { - //ERROR_CORRUPT_TXTSETUPSIF + // ERROR_CORRUPT_TXTSETUPSIF "Instalator znalaz� uszkodzony plik TXTSETUP.SIF.\n", "ENTER = Restart komputera" }, { - //ERROR_SIGNATURE_TXTSETUPSIF, + // ERROR_SIGNATURE_TXTSETUPSIF, "Instalator znalaz� nieprawid�owy wpis w TXTSETUP.SIF.\n", "ENTER = Restart komputera" }, { - //ERROR_DRIVE_INFORMATION + // ERROR_DRIVE_INFORMATION "Instalator nie m�g� odczyta� informacji o nap�dzie.\n", "ENTER = Restart komputera" }, { - //ERROR_WRITE_BOOT, + // ERROR_WRITE_BOOT, "Nieudane zapisanie FAT bootcode na partycji systemowej.", "ENTER = Restart komputera" }, { - //ERROR_LOAD_COMPUTER, + // ERROR_LOAD_COMPUTER, "Instalator nie m�g� za�adowa� listy typ�w komputera.\n", "ENTER = Restart komputera" }, { - //ERROR_LOAD_DISPLAY, + // ERROR_LOAD_DISPLAY, "Instalator nie m�g� za�adowa� listy ustawie� ekranu.\n", "ENTER = Restart komputera" }, { - //ERROR_LOAD_KEYBOARD, + // ERROR_LOAD_KEYBOARD, "Instalator nie m�g� za�adowa� listy typ�w klawiatury.\n", "ENTER = Restart komputera" }, { - //ERROR_LOAD_KBLAYOUT, + // ERROR_LOAD_KBLAYOUT, "Instalator nie m�g� za�adowa� listy uk�ad�w klawiatury.\n", "ENTER = Restart komputera" }, { - //ERROR_WARN_PARTITION, + // ERROR_WARN_PARTITION, "Instalator wykry�, �e co najmniej jeden dysk twardy zawiera niekompatybiln� \n" "tablic� partycji, kt�ra nie b�dzie poprawnie obs�ugiwana!\n" "\n" @@ -1515,7 +1515,7 @@ MUI_ERROR plPLErrorEntries[] = "F3 = Wyj�cie ENTER = Kontynuacja" }, { - //ERROR_NEW_PARTITION, + // ERROR_NEW_PARTITION, "Nie mo�esz stworzy� nowej partycji w miejscu ju�\n" "istniej�cej!\n" "\n" @@ -1523,133 +1523,127 @@ MUI_ERROR plPLErrorEntries[] = NULL }, { - //ERROR_DELETE_SPACE, + // ERROR_DELETE_SPACE, "Nie mo�esz usun�� pustej przestrzeni, gdzie nie ma �adnej partycji!\n" "\n" " * Naci�nij dowolny klawisz, aby kontynuowa�.", NULL }, { - //ERROR_INSTALL_BOOTCODE, + // ERROR_INSTALL_BOOTCODE, "Nieudana instalacja FAT bootcode na partycji systemowej.", "ENTER = Restart komputera" }, { - //ERROR_NO_FLOPPY, + // ERROR_NO_FLOPPY, "Brak dyskietki w nap�dzie A:.", "ENTER = Kontynuacja" }, { - //ERROR_UPDATE_KBSETTINGS, + // ERROR_UPDATE_KBSETTINGS, "Instalator nie m�g� zmieni� uk�adu klawiatury.", "ENTER = Restart komputera" }, { - //ERROR_UPDATE_DISPLAY_SETTINGS, + // ERROR_UPDATE_DISPLAY_SETTINGS, "Instalator nie m�g� zmieni� ustawie� ekranu w rejestrze.", "ENTER = Restart komputera" }, { - //ERROR_IMPORT_HIVE, + // ERROR_IMPORT_HIVE, "Instalator nie by� w stanie zaimportowa� pliku ga��zi rejestru.", "ENTER = Restart komputera" }, { - //ERROR_FIND_REGISTRY + // ERROR_FIND_REGISTRY "Instalator nie by� w stanie znale�� plik�w z danymi rejestru.", "ENTER = Restart komputera" }, { - //ERROR_CREATE_HIVE, + // ERROR_CREATE_HIVE, "Instalator nie m�g� stworzy� ga��zi rejestru.", "ENTER = Restart komputera" }, { - //ERROR_INITIALIZE_REGISTRY, + // ERROR_INITIALIZE_REGISTRY, "Instalator nie by� w stanie ustawi� inicjalizacji rejestru.", "ENTER = Restart komputera" }, { - //ERROR_INVALID_CABINET_INF, + // ERROR_INVALID_CABINET_INF, "Cabinet nie zawiera prawid�owego pliku inf.\n", "ENTER = Restart komputera" }, { - //ERROR_CABINET_MISSING, + // ERROR_CABINET_MISSING, "Cabinet nie zosta� znaleziony.\n", "ENTER = Restart komputera" }, { - //ERROR_CABINET_SCRIPT, + // ERROR_CABINET_SCRIPT, "Cabinet nie zawiera skryptu instalacji.\n", "ENTER = Restart komputera" }, { - //ERROR_COPY_QUEUE, + // ERROR_COPY_QUEUE, "Instalator nie by� w stanie otworzy� kolejki kopiowania pliku.\n", "ENTER = Restart komputera" }, { - //ERROR_CREATE_DIR, + // ERROR_CREATE_DIR, "Instalator nie m�g� stworzy� katalog�w.", "ENTER = Restart komputera" }, { - //ERROR_TXTSETUP_SECTION, - "Instalator nie by� w stanie znale�� sekcji 'Directories'\n" + // ERROR_TXTSETUP_SECTION, + "Instalator nie by� w stanie znale�� sekcji '%S'\n" "w pliku TXTSETUP.SIF.\n", "ENTER = Restart komputera" }, { - //ERROR_CABINET_SECTION, - "Instalator nie by� w stanie znale�� sekcji 'Directories'\n" + // ERROR_CABINET_SECTION, + "Instalator nie by� w stanie znale�� sekcji '%S'\n" "w pliku cabinet.\n", "ENTER = Restart komputera" }, { - //ERROR_CREATE_INSTALL_DIR + // ERROR_CREATE_INSTALL_DIR "Instalator nie m�g� stworzy� katalogu instalacji.", "ENTER = Restart komputera" }, { - //ERROR_FIND_SETUPDATA, - "Instalator nie by� w stanie znale�� sekcji 'SetupData'\n" - "w pliku TXTSETUP.SIF.\n", - "ENTER = Restart komputera" - }, - { - //ERROR_WRITE_PTABLE, + // ERROR_WRITE_PTABLE, "Instalator nie m�g� zapisa� zmian w tablicy partycji.\n" "ENTER = Restart komputera" }, { - //ERROR_ADDING_CODEPAGE, + // ERROR_ADDING_CODEPAGE, "Instalator nie m�g� doda� strony kodowania do rejestru.\n" "ENTER = Restart komputera" }, { - //ERROR_UPDATE_LOCALESETTINGS, + // ERROR_UPDATE_LOCALESETTINGS, "Instalator nie m�g� ustawi� wersji j�zykowej.\n" "ENTER = Restart komputera" }, { - //ERROR_ADDING_KBLAYOUTS, + // ERROR_ADDING_KBLAYOUTS, "Instalator nie m�g� doda� uk�ad�w klawiatury do rejestru.\n" "ENTER = Restart komputera" }, { - //ERROR_UPDATE_GEOID, + // ERROR_UPDATE_GEOID, "Instalator nie m�g� ustawi� lokalizacji geograficznej.\n" "ENTER = Restart komputera" }, { - //ERROR_DIRECTORY_NAME, + // ERROR_DIRECTORY_NAME, "Nieprawid�owa nazwa katalogu.\n" "\n" " * Naci�nij dowolny klawisz, aby kontynuowa�." }, { - //ERROR_INSUFFICIENT_PARTITION_SIZE, + // ERROR_INSUFFICIENT_PARTITION_SIZE, "Wybrana partycja nie jest wystarczaj�co du�a, aby zainstalowa� ReactOS.\n" "Instalacyjna partycja musi mie� rozmiar co najmniej %lu MB.\n" "\n" @@ -1657,20 +1651,20 @@ MUI_ERROR plPLErrorEntries[] = NULL }, { - //ERROR_PARTITION_TABLE_FULL, + // ERROR_PARTITION_TABLE_FULL, "Nie mo�na utworzy� na tym dysku partycji podstawowej lub\n" // FIXME "rozszerzonej, poniewa� tabela partycji jest pe�na.\n" "\n" " * Naci�nij dowolny klawisz, aby kontynuowa�." }, { - //ERROR_ONLY_ONE_EXTENDED, + // ERROR_ONLY_ONE_EXTENDED, "Nie mo�esz utworzy� wi�cej ni� jednej partycji rozszerzonej na dysku.\n" "\n" " * Naci�nij dowolny klawisz, aby kontynuowa�." }, { - //ERROR_FORMATTING_PARTITION, + // ERROR_FORMATTING_PARTITION, "Instalator nie m�g� sformatowa� partycji:\n" " %S\n" "\n" @@ -1832,8 +1826,6 @@ MUI_STRING plPLStrings[] = "F3 = Wyj�cie ENTER = Kontynuacja"}, {STRING_REBOOTCOMPUTER, "ENTER = Restart komputera"}, - {STRING_TXTSETUPFAILED, - "Instalator nie by� w stanie odnale�� sekcji '%S'\nw pliku TXTSETUP.SIF.\n"}, {STRING_COPYING, " Kopiowanie plik�w: %S"}, {STRING_SETUPCOPYINGFILES, diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 9139c1337f..dc0c9d60f5 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -1461,7 +1461,7 @@ MUI_ERROR ptBRErrorEntries[] = "Success\n" }, { - //ERROR_NOT_INSTALLED + // ERROR_NOT_INSTALLED "O ReactOS n�o est� completamente instalado no computador.\n" "Se voc� sair da instala��o agora, precisar� executa-la\n" "novamente para instalar o ReactOS.\n" @@ -1471,62 +1471,62 @@ MUI_ERROR ptBRErrorEntries[] = "F3=Sair ENTER=Continuar" }, { - //ERROR_NO_HDD + // ERROR_NO_HDD "N�o foi poss�vel localizar um disco r�digo.\n", "ENTER=Reiniciar" }, { - //ERROR_NO_SOURCE_DRIVE + // ERROR_NO_SOURCE_DRIVE ... 2445 lines suppressed ...

1 0

10/13: [USETUP] Remove now-redundant file (already used with SETUPLIB).
by Hermès Bélusca-Maïto 28 Oct '18

28 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b148bcaf272fcd5d5be6… commit 4b148bcaf272fcd5d5be66132d14adcc98cb58fc Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Dec 30 18:09:37 2017 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 28 01:32:37 2018 +0200 [USETUP] Remove now-redundant file (already used with SETUPLIB). --- base/setup/usetup/errorcode.h | 78 ------------------------------------------- base/setup/usetup/usetup.h | 1 - 2 files changed, 79 deletions(-) diff --git a/base/setup/usetup/errorcode.h b/base/setup/usetup/errorcode.h deleted file mode 100644 index 9e93cf60d5..0000000000 --- a/base/setup/usetup/errorcode.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/errorcode.h - * PURPOSE: - * PROGRAMMER: - */ - -#pragma once - -typedef enum -{ - NOT_AN_ERROR = 0, - ERROR_NOT_INSTALLED, - ERROR_NO_HDD, - ERROR_NO_SOURCE_DRIVE, - ERROR_LOAD_TXTSETUPSIF, - ERROR_CORRUPT_TXTSETUPSIF, - ERROR_SIGNATURE_TXTSETUPSIF, - ERROR_DRIVE_INFORMATION, - ERROR_WRITE_BOOT, - ERROR_LOAD_COMPUTER, - ERROR_LOAD_DISPLAY, - ERROR_LOAD_KEYBOARD, - ERROR_LOAD_KBLAYOUT, - ERROR_WARN_PARTITION, - ERROR_NEW_PARTITION, - ERROR_DELETE_SPACE, - ERROR_INSTALL_BOOTCODE, - ERROR_NO_FLOPPY, - ERROR_UPDATE_KBSETTINGS, - ERROR_UPDATE_DISPLAY_SETTINGS, - ERROR_IMPORT_HIVE, - ERROR_FIND_REGISTRY, - ERROR_CREATE_HIVE, - ERROR_INITIALIZE_REGISTRY, - ERROR_INVALID_CABINET_INF, - ERROR_CABINET_MISSING, - ERROR_CABINET_SCRIPT, - ERROR_COPY_QUEUE, - ERROR_CREATE_DIR, - ERROR_TXTSETUP_SECTION, - ERROR_CABINET_SECTION, - ERROR_CREATE_INSTALL_DIR, - ERROR_FIND_SETUPDATA, - ERROR_WRITE_PTABLE, - ERROR_ADDING_CODEPAGE, - ERROR_UPDATE_LOCALESETTINGS, - ERROR_ADDING_KBLAYOUTS, - ERROR_UPDATE_GEOID, - ERROR_DIRECTORY_NAME, - ERROR_INSUFFICIENT_PARTITION_SIZE, - ERROR_PARTITION_TABLE_FULL, - ERROR_ONLY_ONE_EXTENDED, - ERROR_FORMATTING_PARTITION, - - ERROR_LAST_ERROR_CODE -} ERROR_NUMBER; - -/* EOF */ diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h index 572defaae1..f9ff6f4f16 100644 --- a/base/setup/usetup/usetup.h +++ b/base/setup/usetup/usetup.h @@ -56,7 +56,6 @@ /* Setup library headers */ #include <reactos/rosioctl.h> #include <../lib/setuplib.h> -// #include "errorcode.h" /* Internal Headers */ #include "consup.h"

1 0

09/13: [SETUPLIB][USETUP] Don't store UI-related display strings in GENERIC_LIST_ENTRY-ies, + other code adaptations.
by Hermès Bélusca-Maïto 28 Oct '18

28 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f4cb0977a324859f8d4b… commit 1f4cb0977a324859f8d4ba0e27a0a63cae8f96aa Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Dec 29 19:09:56 2017 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 28 01:32:15 2018 +0200 [SETUPLIB][USETUP] Don't store UI-related display strings in GENERIC_LIST_ENTRY-ies, + other code adaptations. - Apart from allowing a UI cache variable that may be used when displaying GENERIC_LIST_ENTRY-ies, do not store any display strings associated to these list entries. They should be instead computed only when initializing a list UI (or a combo-box or list control if the code is used in Win32 environment). For this matter a callback is provided to InitGenericListUi() that does the job of computing the displayed string corresponding to a given GENERIC_LIST_ENTRY. - Simplify the calls to InitGenericListUi(), and refactor the RestoreGenericListUiState() function. - Use for-loops for iterating over GENERIC_LIST items. - Adapt the storage data format for lists of settings items. - The txtsetup.sif INF format specified in LoadSetupInf() should not be INF_STYLE_WIN4 (to be investigated...). --- base/setup/lib/settings.c | 81 ++++++++++++---------- base/setup/lib/settings.h | 7 ++ base/setup/lib/setuplib.c | 2 +- base/setup/lib/utils/genlist.c | 68 ++++++------------ base/setup/lib/utils/genlist.h | 27 ++------ base/setup/usetup/console.c | 2 +- base/setup/usetup/genlist.c | 68 ++++++++++++++++-- base/setup/usetup/genlist.h | 23 +++++- base/setup/usetup/usetup.c | 154 +++++++++++++++++++++++++---------------- base/setup/usetup/usetup.h | 2 +- 10 files changed, 264 insertions(+), 170 deletions(-) diff --git a/base/setup/lib/settings.c b/base/setup/lib/settings.c index 060c671b41..f0a5200fe9 100644 --- a/base/setup/lib/settings.c +++ b/base/setup/lib/settings.c @@ -321,10 +321,8 @@ GetComputerIdentifier( */ typedef UCHAR (NTAPI *PPROCESS_ENTRY_ROUTINE)( - IN PWCHAR KeyName, - IN PWCHAR KeyValue, - OUT PWCHAR DisplayText, - IN SIZE_T DisplayTextSize, + IN PCWSTR KeyName, + IN PCWSTR KeyValue, OUT PVOID* UserData, OUT PBOOLEAN Current, IN PVOID Parameter OPTIONAL); @@ -344,7 +342,6 @@ AddEntriesFromInfSection( PVOID UserData; BOOLEAN Current; UCHAR RetVal; - WCHAR DisplayText[128]; if (!SetupFindFirstLineW(InfFile, SectionName, NULL, pContext)) return -1; @@ -374,8 +371,6 @@ AddEntriesFromInfSection( Current = FALSE; RetVal = ProcessEntry(KeyName, KeyValue, - DisplayText, - sizeof(DisplayText), &UserData, &Current, Parameter); @@ -389,7 +384,7 @@ AddEntriesFromInfSection( } else if (RetVal == 1) { - AppendGenericListEntry(List, DisplayText, UserData, Current); + AppendGenericListEntry(List, UserData, Current); ++TotalCount; } // else if (RetVal == 2), skip the entry. @@ -402,29 +397,36 @@ AddEntriesFromInfSection( static UCHAR NTAPI DefaultProcessEntry( - IN PWCHAR KeyName, - IN PWCHAR KeyValue, - OUT PWCHAR DisplayText, - IN SIZE_T DisplayTextSize, + IN PCWSTR KeyName, + IN PCWSTR KeyValue, OUT PVOID* UserData, OUT PBOOLEAN Current, IN PVOID Parameter OPTIONAL) { PWSTR CompareKey = (PWSTR)Parameter; - *UserData = RtlAllocateHeap(ProcessHeap, 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (*UserData == NULL) + PGENENTRY GenEntry; + SIZE_T IdSize, ValueSize; + + IdSize = (wcslen(KeyName) + 1) * sizeof(WCHAR); + ValueSize = (wcslen(KeyValue) + 1) * sizeof(WCHAR); + + GenEntry = RtlAllocateHeap(ProcessHeap, 0, + sizeof(*GenEntry) + IdSize + ValueSize); + if (GenEntry == NULL) { /* Failure, stop enumeration */ DPRINT1("RtlAllocateHeap() failed\n"); return 0; } - wcscpy((PWCHAR)*UserData, KeyName); - RtlStringCbCopyW(DisplayText, DisplayTextSize, KeyValue); + GenEntry->Id = (PCWSTR)((ULONG_PTR)GenEntry + sizeof(*GenEntry)); + GenEntry->Value = (PCWSTR)((ULONG_PTR)GenEntry + sizeof(*GenEntry) + IdSize); + RtlStringCbCopyW((PWSTR)GenEntry->Id, IdSize, KeyName); + RtlStringCbCopyW((PWSTR)GenEntry->Value, ValueSize, KeyValue); - *Current = (CompareKey ? !_wcsicmp(KeyName, CompareKey) : FALSE); + *UserData = GenEntry; + *Current = (CompareKey ? !_wcsicmp(KeyName, CompareKey) : FALSE); /* Add the entry */ return 1; @@ -765,7 +767,7 @@ ProcessComputerFiles( } RtlStringCchPrintfW(SectionName, ARRAYSIZE(SectionName), - L"Files.%s", (PCWSTR)GetListEntryUserData(Entry)); + L"Files.%s", ((PGENENTRY)GetListEntryData(Entry))->Id); *AdditionalSectionName = SectionName; return TRUE; @@ -797,7 +799,9 @@ ProcessDisplayRegistry( return FALSE; } - if (!SetupFindFirstLineW(InfFile, L"Display", (WCHAR*)GetListEntryUserData(Entry), &Context)) + if (!SetupFindFirstLineW(InfFile, L"Display", + ((PGENENTRY)GetListEntryData(Entry))->Id, + &Context)) { DPRINT1("SetupFindFirstLineW() failed\n"); return FALSE; @@ -936,7 +940,7 @@ ProcessLocaleRegistry( IN PGENERIC_LIST List) { PGENERIC_LIST_ENTRY Entry; - PWCHAR LanguageId; + PCWSTR LanguageId; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; UNICODE_STRING ValueName; @@ -948,7 +952,7 @@ ProcessLocaleRegistry( if (Entry == NULL) return FALSE; - LanguageId = (PWCHAR)GetListEntryUserData(Entry); + LanguageId = ((PGENENTRY)GetListEntryData(Entry))->Id; if (LanguageId == NULL) return FALSE; @@ -1086,35 +1090,42 @@ typedef struct _LANG_ENTRY_PARAM static UCHAR NTAPI ProcessLangEntry( - IN PWCHAR KeyName, - IN PWCHAR KeyValue, - OUT PWCHAR DisplayText, - IN SIZE_T DisplayTextSize, + IN PCWSTR KeyName, + IN PCWSTR KeyValue, OUT PVOID* UserData, OUT PBOOLEAN Current, IN PVOID Parameter OPTIONAL) { PLANG_ENTRY_PARAM LangEntryParam = (PLANG_ENTRY_PARAM)Parameter; + PGENENTRY GenEntry; + SIZE_T IdSize, ValueSize; + if (!IsLanguageAvailable(KeyName)) { /* The specified language is unavailable, skip the entry */ return 2; } - *UserData = RtlAllocateHeap(ProcessHeap, 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (*UserData == NULL) + IdSize = (wcslen(KeyName) + 1) * sizeof(WCHAR); + ValueSize = (wcslen(KeyValue) + 1) * sizeof(WCHAR); + + GenEntry = RtlAllocateHeap(ProcessHeap, 0, + sizeof(*GenEntry) + IdSize + ValueSize); + if (GenEntry == NULL) { /* Failure, stop enumeration */ DPRINT1("RtlAllocateHeap() failed\n"); return 0; } - wcscpy((PWCHAR)*UserData, KeyName); - RtlStringCbCopyW(DisplayText, DisplayTextSize, KeyValue); + GenEntry->Id = (PCWSTR)((ULONG_PTR)GenEntry + sizeof(*GenEntry)); + GenEntry->Value = (PCWSTR)((ULONG_PTR)GenEntry + sizeof(*GenEntry) + IdSize); + RtlStringCbCopyW((PWSTR)GenEntry->Id, IdSize, KeyName); + RtlStringCbCopyW((PWSTR)GenEntry->Value, ValueSize, KeyValue); - *Current = FALSE; + *UserData = GenEntry; + *Current = FALSE; if (!_wcsicmp(KeyName, LangEntryParam->DefaultLanguage)) DefaultLanguageIndex = LangEntryParam->uIndex; @@ -1168,7 +1179,7 @@ CreateLanguageList( { DefaultLanguageIndex = 0; wcscpy(DefaultLanguage, - (PWSTR)GetListEntryUserData(GetFirstListEntry(List))); + ((PGENENTRY)GetListEntryData(GetFirstListEntry(List)))->Id); } return List; @@ -1239,7 +1250,7 @@ ProcessKeyboardLayoutRegistry( IN PCWSTR LanguageId) { PGENERIC_LIST_ENTRY Entry; - PWCHAR LayoutId; + PCWSTR LayoutId; const MUI_LAYOUTS* LayoutsList; MUI_LAYOUTS NewLayoutsList[20]; ULONG uIndex; @@ -1249,7 +1260,7 @@ ProcessKeyboardLayoutRegistry( if (Entry == NULL) return FALSE; - LayoutId = (PWCHAR)GetListEntryUserData(Entry); + LayoutId = ((PGENENTRY)GetListEntryData(Entry))->Id; if (LayoutId == NULL) return FALSE; diff --git a/base/setup/lib/settings.h b/base/setup/lib/settings.h index ce66383aba..9c46123e43 100644 --- a/base/setup/lib/settings.h +++ b/base/setup/lib/settings.h @@ -26,6 +26,13 @@ #pragma once +/* Settings entries with simple 1:1 mapping */ +typedef struct _GENENTRY +{ + PCWSTR Id; + PCWSTR Value; +} GENENTRY, *PGENENTRY; + PGENERIC_LIST CreateComputerTypeList( IN HINF InfFile); diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index 2d9a6bba80..aba1533ceb 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -516,7 +516,7 @@ LoadSetupInf( *SetupInf = SetupOpenInfFileExW(FileNameBuffer, NULL, - INF_STYLE_WIN4 | INF_STYLE_OLDNT, + /* INF_STYLE_WIN4 | */ INF_STYLE_OLDNT, pSetupData->LanguageId, &ErrorLine); diff --git a/base/setup/lib/utils/genlist.c b/base/setup/lib/utils/genlist.c index 209da60058..a322914cd8 100644 --- a/base/setup/lib/utils/genlist.c +++ b/base/setup/lib/utils/genlist.c @@ -27,9 +27,7 @@ CreateGenericList(VOID) InitializeListHead(&List->ListHead); List->NumOfEntries = 0; - List->CurrentEntry = NULL; - List->BackupEntry = NULL; return List; } @@ -37,7 +35,7 @@ CreateGenericList(VOID) VOID DestroyGenericList( IN OUT PGENERIC_LIST List, - IN BOOLEAN FreeUserData) + IN BOOLEAN FreeData) { PGENERIC_LIST_ENTRY ListEntry; PLIST_ENTRY Entry; @@ -49,8 +47,8 @@ DestroyGenericList( ListEntry = CONTAINING_RECORD(Entry, GENERIC_LIST_ENTRY, Entry); /* Release user data */ - if (FreeUserData && ListEntry->UserData != NULL) - RtlFreeHeap(ProcessHeap, 0, ListEntry->UserData); + if (FreeData && ListEntry->Data != NULL) + RtlFreeHeap(ProcessHeap, 0, ListEntry->Data); /* Release list entry */ RtlFreeHeap(ProcessHeap, 0, ListEntry); @@ -63,30 +61,24 @@ DestroyGenericList( BOOLEAN AppendGenericListEntry( IN OUT PGENERIC_LIST List, - IN PCWSTR Text, - IN PVOID UserData, + IN PVOID Data, IN BOOLEAN Current) { PGENERIC_LIST_ENTRY Entry; - SIZE_T TextSize; - TextSize = (wcslen(Text) + 1) * sizeof(WCHAR); - Entry = RtlAllocateHeap(ProcessHeap, 0, - sizeof(GENERIC_LIST_ENTRY) + TextSize); + Entry = RtlAllocateHeap(ProcessHeap, 0, sizeof(GENERIC_LIST_ENTRY)); if (Entry == NULL) return FALSE; - RtlStringCbCopyW(Entry->Text, TextSize, Text); Entry->List = List; - Entry->UserData = UserData; + Entry->Data = Data; + Entry->UiData = 0; InsertTailList(&List->ListHead, &Entry->Entry); - List->NumOfEntries++; + ++List->NumOfEntries; if (Current || List->CurrentEntry == NULL) - { List->CurrentEntry = Entry; - } return TRUE; } @@ -112,11 +104,10 @@ PGENERIC_LIST_ENTRY GetFirstListEntry( IN PGENERIC_LIST List) { - PLIST_ENTRY Entry = List->ListHead.Flink; - - if (Entry == &List->ListHead) + if (IsListEmpty(&List->ListHead)) return NULL; - return CONTAINING_RECORD(Entry, GENERIC_LIST_ENTRY, Entry); + + return CONTAINING_RECORD(List->ListHead.Flink, GENERIC_LIST_ENTRY, Entry); } PGENERIC_LIST_ENTRY @@ -127,21 +118,22 @@ GetNextListEntry( if (Next == &Entry->List->ListHead) return NULL; + return CONTAINING_RECORD(Next, GENERIC_LIST_ENTRY, Entry); } PVOID -GetListEntryUserData( +GetListEntryData( IN PGENERIC_LIST_ENTRY Entry) { - return Entry->UserData; + return Entry->Data; } -PCWSTR -GetListEntryText( +ULONG_PTR +GetListEntryUiData( IN PGENERIC_LIST_ENTRY Entry) { - return Entry->Text; + return Entry->UiData; } ULONG @@ -151,30 +143,16 @@ GetNumberOfListEntries( return List->NumOfEntries; } -VOID -SaveGenericListState( - IN PGENERIC_LIST List) -{ - List->BackupEntry = List->CurrentEntry; -} - -VOID -RestoreGenericListState( - IN PGENERIC_LIST List) -{ - List->CurrentEntry = List->BackupEntry; -} - BOOLEAN GenericListHasSingleEntry( IN PGENERIC_LIST List) { - if (!IsListEmpty(&List->ListHead) && List->ListHead.Flink == List->ListHead.Blink) - return TRUE; - - /* if both list head pointers (which normally point to the first and last list member, respectively) - point to the same entry then it means that there's just a single thing in there, otherwise... false! */ - return FALSE; + /* + * If both list head pointers (which normally point to the first and last + * list member, respectively) point to the same entry then it means that + * there is just a single thing in there, otherwise... false! + */ + return (!IsListEmpty(&List->ListHead) && (List->ListHead.Flink == List->ListHead.Blink)); } /* EOF */ diff --git a/base/setup/lib/utils/genlist.h b/base/setup/lib/utils/genlist.h index ca8696d957..5d145a4c46 100644 --- a/base/setup/lib/utils/genlist.h +++ b/base/setup/lib/utils/genlist.h @@ -11,19 +11,15 @@ typedef struct _GENERIC_LIST_ENTRY { LIST_ENTRY Entry; struct _GENERIC_LIST* List; - PVOID UserData; - WCHAR Text[1]; // FIXME: UI stuff - + PVOID Data; + ULONG_PTR UiData; // Cache variable for any UI list that displays these items } GENERIC_LIST_ENTRY, *PGENERIC_LIST_ENTRY; typedef struct _GENERIC_LIST { LIST_ENTRY ListHead; ULONG NumOfEntries; - PGENERIC_LIST_ENTRY CurrentEntry; - PGENERIC_LIST_ENTRY BackupEntry; - } GENERIC_LIST, *PGENERIC_LIST; @@ -33,13 +29,12 @@ CreateGenericList(VOID); VOID DestroyGenericList( IN OUT PGENERIC_LIST List, - IN BOOLEAN FreeUserData); + IN BOOLEAN FreeData); BOOLEAN AppendGenericListEntry( IN OUT PGENERIC_LIST List, - IN PCWSTR Text, - IN PVOID UserData, + IN PVOID Data, IN BOOLEAN Current); VOID @@ -60,25 +55,17 @@ GetNextListEntry( IN PGENERIC_LIST_ENTRY Entry); PVOID -GetListEntryUserData( +GetListEntryData( IN PGENERIC_LIST_ENTRY Entry); -PCWSTR -GetListEntryText( +ULONG_PTR +GetListEntryUiData( IN PGENERIC_LIST_ENTRY Entry); ULONG GetNumberOfListEntries( IN PGENERIC_LIST List); -VOID -SaveGenericListState( - IN PGENERIC_LIST List); - -VOID -RestoreGenericListState( - IN PGENERIC_LIST List); - BOOLEAN GenericListHasSingleEntry( IN PGENERIC_LIST List); diff --git a/base/setup/usetup/console.c b/base/setup/usetup/console.c index 14a0564c6b..ec73f38221 100644 --- a/base/setup/usetup/console.c +++ b/base/setup/usetup/console.c @@ -417,7 +417,7 @@ WriteConsoleOutputCharacterW( UnicodeString.Length = nLength * sizeof(WCHAR); UnicodeString.MaximumLength = nLength * sizeof(WCHAR); - UnicodeString.Buffer = (LPWSTR)lpCharacter; + UnicodeString.Buffer = (PWSTR)lpCharacter; OemLength = RtlUnicodeStringToOemSize(&UnicodeString); diff --git a/base/setup/usetup/genlist.c b/base/setup/usetup/genlist.c index d0b7a63875..8e8baffacd 100644 --- a/base/setup/usetup/genlist.c +++ b/base/setup/usetup/genlist.c @@ -36,11 +36,15 @@ VOID InitGenericListUi( IN OUT PGENERIC_LIST_UI ListUi, - IN PGENERIC_LIST List) + IN PGENERIC_LIST List, + IN PGET_ENTRY_DESCRIPTION GetEntryDescriptionProc) { ListUi->List = List; ListUi->FirstShown = NULL; ListUi->LastShown = NULL; + ListUi->BackupEntry = NULL; + + ListUi->GetEntryDescriptionProc = GetEntryDescriptionProc; ListUi->Left = 0; ListUi->Top = 0; @@ -49,6 +53,16 @@ InitGenericListUi( ListUi->Redraw = TRUE; ListUi->CurrentItemText[0] = ANSI_NULL; + + /* SaveGenericListUiState(ListUi); */ + ListUi->BackupEntry = ListUi->List->CurrentEntry; +} + +VOID +RestoreGenericListUiState( + IN PGENERIC_LIST_UI ListUi) +{ + ListUi->List->CurrentEntry = ListUi->BackupEntry; } static @@ -159,7 +173,13 @@ DrawListEntries( break; ListUi->LastShown = Entry; - sprintf(ListUi->CurrentItemText, "%S", ListEntry->Text); + ListUi->CurrentItemText[0] = ANSI_NULL; + if (ListUi->GetEntryDescriptionProc) + { + ListUi->GetEntryDescriptionProc(ListEntry, + ListUi->CurrentItemText, + ARRAYSIZE(ListUi->CurrentItemText)); + } FillConsoleOutputAttribute(StdOutput, (List->CurrentEntry == ListEntry) ? @@ -329,6 +349,26 @@ DrawGenericList( DrawScrollBarGenericList(ListUi); } +VOID +DrawGenericListCurrentItem( + IN PGENERIC_LIST List, + IN PGET_ENTRY_DESCRIPTION GetEntryDescriptionProc, + IN SHORT Left, + IN SHORT Top) +{ + // + // FIXME: That stuff crashes when the list is empty!! + // + CHAR CurrentItemText[256]; + if (GetEntryDescriptionProc) + { + GetEntryDescriptionProc(GetCurrentListEntry(List), + CurrentItemText, + ARRAYSIZE(CurrentItemText)); + CONSOLE_SetTextXY(Left, Top, CurrentItemText); + } +} + VOID ScrollDownGenericList( IN PGENERIC_LIST_UI ListUi) @@ -493,7 +533,13 @@ GenericListKeyPress( ListUi->Redraw = FALSE; - sprintf(ListUi->CurrentItemText, "%S", ListEntry->Text); + ListUi->CurrentItemText[0] = ANSI_NULL; + if (ListUi->GetEntryDescriptionProc) + { + ListUi->GetEntryDescriptionProc(ListEntry, + ListUi->CurrentItemText, + ARRAYSIZE(ListUi->CurrentItemText)); + } if ((strlen(ListUi->CurrentItemText) > 0) && (tolower(ListUi->CurrentItemText[0]) == AsciiChar) && (List->CurrentEntry->Entry.Flink != &List->ListHead)) @@ -501,7 +547,13 @@ GenericListKeyPress( ScrollDownGenericList(ListUi); ListEntry = List->CurrentEntry; - sprintf(ListUi->CurrentItemText, "%S", ListEntry->Text); + ListUi->CurrentItemText[0] = ANSI_NULL; + if (ListUi->GetEntryDescriptionProc) + { + ListUi->GetEntryDescriptionProc(ListEntry, + ListUi->CurrentItemText, + ARRAYSIZE(ListUi->CurrentItemText)); + } if ((strlen(ListUi->CurrentItemText) > 0) && (tolower(ListUi->CurrentItemText[0]) == AsciiChar)) goto End; @@ -514,7 +566,13 @@ GenericListKeyPress( for (;;) { - sprintf(ListUi->CurrentItemText, "%S", ListEntry->Text); + ListUi->CurrentItemText[0] = ANSI_NULL; + if (ListUi->GetEntryDescriptionProc) + { + ListUi->GetEntryDescriptionProc(ListEntry, + ListUi->CurrentItemText, + ARRAYSIZE(ListUi->CurrentItemText)); + } if ((strlen(ListUi->CurrentItemText) > 0) && (tolower(ListUi->CurrentItemText[0]) == AsciiChar)) { diff --git a/base/setup/usetup/genlist.h b/base/setup/usetup/genlist.h index 5e85800fd6..80aa86786a 100644 --- a/base/setup/usetup/genlist.h +++ b/base/setup/usetup/genlist.h @@ -28,12 +28,21 @@ // #include "../lib/utils/genlist.h" +typedef NTSTATUS +(NTAPI *PGET_ENTRY_DESCRIPTION)( + IN PGENERIC_LIST_ENTRY Entry, + OUT PSTR Buffer, + IN SIZE_T cchBufferSize); + typedef struct _GENERIC_LIST_UI { PGENERIC_LIST List; PLIST_ENTRY FirstShown; PLIST_ENTRY LastShown; + PGENERIC_LIST_ENTRY BackupEntry; + + PGET_ENTRY_DESCRIPTION GetEntryDescriptionProc; SHORT Left; SHORT Top; @@ -48,7 +57,12 @@ typedef struct _GENERIC_LIST_UI VOID InitGenericListUi( IN OUT PGENERIC_LIST_UI ListUi, - IN PGENERIC_LIST List); + IN PGENERIC_LIST List, + IN PGET_ENTRY_DESCRIPTION GetEntryDescriptionProc); + +VOID +RestoreGenericListUiState( + IN PGENERIC_LIST_UI ListUi); VOID DrawGenericList( @@ -58,6 +72,13 @@ DrawGenericList( IN SHORT Right, IN SHORT Bottom); +VOID +DrawGenericListCurrentItem( + IN PGENERIC_LIST List, + IN PGET_ENTRY_DESCRIPTION GetEntryDescriptionProc, + IN SHORT Left, + IN SHORT Top); + VOID ScrollDownGenericList( IN PGENERIC_LIST_UI ListUi); diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 35d83ab2a5..99ea1c8d6b 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -56,7 +56,7 @@ static WCHAR DestinationDriveLetter; /* OTHER Stuff *****/ -PWCHAR SelectedLanguageId; +PCWSTR SelectedLanguageId; static WCHAR DefaultLanguage[20]; // Copy of string inside LanguageList static WCHAR DefaultKBLayout[20]; // Copy of string inside KeyboardList @@ -414,25 +414,63 @@ UpdateKBLayout(VOID) } } - ListEntry = GetFirstListEntry(LayoutList); - /* Search for default layout (if provided) */ if (pszNewLayout != NULL) { - while (ListEntry != NULL) + for (ListEntry = GetFirstListEntry(LayoutList); ListEntry; + ListEntry = GetNextListEntry(ListEntry)) { - if (!wcscmp(pszNewLayout, GetListEntryUserData(ListEntry))) + if (!wcscmp(pszNewLayout, ((PGENENTRY)GetListEntryData(ListEntry))->Id)) { SetCurrentListEntry(LayoutList, ListEntry); break; } - - ListEntry = GetNextListEntry(ListEntry); } } } +static NTSTATUS +NTAPI +GetSettingDescription( + IN PGENERIC_LIST_ENTRY Entry, + OUT PSTR Buffer, + IN SIZE_T cchBufferSize) +{ + return RtlStringCchPrintfA(Buffer, cchBufferSize, "%S", + ((PGENENTRY)GetListEntryData(Entry))->Value); +} + +static NTSTATUS +NTAPI +GetNTOSInstallationName( + IN PGENERIC_LIST_ENTRY Entry, + OUT PSTR Buffer, + IN SIZE_T cchBufferSize) +{ + PNTOS_INSTALLATION NtOsInstall = (PNTOS_INSTALLATION)GetListEntryData(Entry); + PPARTENTRY PartEntry = NtOsInstall->PartEntry; + + if (PartEntry && PartEntry->DriveLetter) + { + /* We have retrieved a partition that is mounted */ + return RtlStringCchPrintfA(Buffer, cchBufferSize, + "%c:%S \"%S\"", + PartEntry->DriveLetter, + NtOsInstall->PathComponent, + NtOsInstall->InstallationName); + } + else + { + /* We failed somewhere, just show the NT path */ + return RtlStringCchPrintfA(Buffer, cchBufferSize, + "%wZ \"%S\"", + &NtOsInstall->SystemNtPath, + NtOsInstall->InstallationName); + } +} + + /* * Displays the LanguagePage. * @@ -449,7 +487,7 @@ static PAGE_NUMBER LanguagePage(PINPUT_RECORD Ir) { GENERIC_LIST_UI ListUi; - PWCHAR NewLanguageId; + PCWSTR NewLanguageId; BOOL RefreshPage = FALSE; /* Initialize the computer settings list */ @@ -478,10 +516,9 @@ LanguagePage(PINPUT_RECORD Ir) return WELCOME_PAGE; } - InitGenericListUi(&ListUi, LanguageList); + InitGenericListUi(&ListUi, LanguageList, GetSettingDescription); DrawGenericList(&ListUi, - 2, - 18, + 2, 18, xScreen - 3, yScreen - 3); @@ -527,7 +564,11 @@ LanguagePage(PINPUT_RECORD Ir) } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { - SelectedLanguageId = (PWCHAR)GetListEntryUserData(GetCurrentListEntry(LanguageList)); + // + // FIXME: That stuff crashes when the list is empty!! + // + SelectedLanguageId = + ((PGENENTRY)GetListEntryData(GetCurrentListEntry(LanguageList)))->Id; USetupData.LanguageId = (LANGID)(wcstol(SelectedLanguageId, NULL, 16) & 0xFFFF); @@ -550,7 +591,11 @@ LanguagePage(PINPUT_RECORD Ir) if (RefreshPage) { - NewLanguageId = (PWCHAR)GetListEntryUserData(GetCurrentListEntry(LanguageList)); + // + // FIXME: That stuff crashes when the list is empty!! + // + NewLanguageId = + ((PGENENTRY)GetListEntryData(GetCurrentListEntry(LanguageList)))->Id; if (wcscmp(SelectedLanguageId, NewLanguageId)) { @@ -603,6 +648,7 @@ SetupStartPage(PINPUT_RECORD Ir) NTSTATUS Status; ULONG Error; PGENERIC_LIST_ENTRY ListEntry; + PCWSTR LocaleId; CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); @@ -640,6 +686,8 @@ SetupStartPage(PINPUT_RECORD Ir) if (IsUnattendedSetup) { // TODO: Read options from inf + /* Load the hardware, language and keyboard layout lists */ + ComputerList = CreateComputerTypeList(SetupInf); DisplayList = CreateDisplayDriverList(SetupInf); KeyboardList = CreateKeyboardDriverList(SetupInf); @@ -648,37 +696,35 @@ SetupStartPage(PINPUT_RECORD Ir) /* new part */ SelectedLanguageId = DefaultLanguage; - wcscpy(SelectedLanguageId, USetupData.LocaleID); + wcscpy(DefaultLanguage, USetupData.LocaleID); USetupData.LanguageId = (LANGID)(wcstol(SelectedLanguageId, NULL, 16) & 0xFFFF); LayoutList = CreateKeyboardLayoutList(SetupInf, SelectedLanguageId, DefaultKBLayout); /* first we hack LanguageList */ - ListEntry = GetFirstListEntry(LanguageList); - while (ListEntry != NULL) + for (ListEntry = GetFirstListEntry(LanguageList); ListEntry; + ListEntry = GetNextListEntry(ListEntry)) { - if (!wcsicmp(USetupData.LocaleID, GetListEntryUserData(ListEntry))) + LocaleId = ((PGENENTRY)GetListEntryData(ListEntry))->Id; + if (!wcsicmp(USetupData.LocaleID, LocaleId)) { - DPRINT("found %S in LanguageList\n",GetListEntryUserData(ListEntry)); + DPRINT("found %S in LanguageList\n", LocaleId); SetCurrentListEntry(LanguageList, ListEntry); break; } - - ListEntry = GetNextListEntry(ListEntry); } /* now LayoutList */ - ListEntry = GetFirstListEntry(LayoutList); - while (ListEntry != NULL) + for (ListEntry = GetFirstListEntry(LayoutList); ListEntry; + ListEntry = GetNextListEntry(ListEntry)) { - if (!wcsicmp(USetupData.LocaleID, GetListEntryUserData(ListEntry))) + LocaleId = ((PGENENTRY)GetListEntryData(ListEntry))->Id; + if (!wcsicmp(USetupData.LocaleID, LocaleId)) { - DPRINT("found %S in LayoutList\n",GetListEntryUserData(ListEntry)); + DPRINT("found %S in LayoutList\n", LocaleId); SetCurrentListEntry(LayoutList, ListEntry); break; } - - ListEntry = GetNextListEntry(ListEntry); } SetConsoleCodePage(); @@ -862,14 +908,12 @@ UpgradeRepairPage(PINPUT_RECORD Ir) MUIDisplayPage(UPGRADE_REPAIR_PAGE); - InitGenericListUi(&ListUi, NtOsInstallsList); + InitGenericListUi(&ListUi, NtOsInstallsList, GetNTOSInstallationName); DrawGenericList(&ListUi, 2, 23, xScreen - 3, yScreen - 3); - SaveGenericListState(NtOsInstallsList); - // return HandleGenericList(&ListUi, DEVICE_SETTINGS_PAGE, Ir); while (TRUE) { @@ -901,7 +945,7 @@ UpgradeRepairPage(PINPUT_RECORD Ir) } case VK_ESCAPE: /* ESC */ { - RestoreGenericListState(NtOsInstallsList); + RestoreGenericListUiState(&ListUi); // return nextPage; // prevPage; // return INSTALL_INTRO_PAGE; @@ -917,7 +961,12 @@ UpgradeRepairPage(PINPUT_RECORD Ir) if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'U') /* U */ { /* Retrieve the current installation */ - CurrentInstallation = (PNTOS_INSTALLATION)GetListEntryUserData(GetCurrentListEntry(NtOsInstallsList)); + // + // FIXME: That stuff crashes when the list is empty!! + // + CurrentInstallation = + (PNTOS_INSTALLATION)GetListEntryData(GetCurrentListEntry(NtOsInstallsList)); + DPRINT1("Selected installation for repair: \"%S\" ; DiskNumber = %d , PartitionNumber = %d\n", CurrentInstallation->InstallationName, CurrentInstallation->DiskNumber, CurrentInstallation->PartitionNumber); @@ -1090,7 +1139,6 @@ static PAGE_NUMBER DeviceSettingsPage(PINPUT_RECORD Ir) { static ULONG Line = 16; - CHAR CurrentItemText[256]; /* Initialize the computer settings list */ if (ComputerList == NULL) @@ -1145,14 +1193,10 @@ DeviceSettingsPage(PINPUT_RECORD Ir) MUIDisplayPage(DEVICE_SETTINGS_PAGE); - 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); + DrawGenericListCurrentItem(ComputerList, GetSettingDescription, 25, 11); + DrawGenericListCurrentItem(DisplayList , GetSettingDescription, 25, 12); + DrawGenericListCurrentItem(KeyboardList, GetSettingDescription, 25, 13); + DrawGenericListCurrentItem(LayoutList , GetSettingDescription, 25, 14); CONSOLE_InvertTextXY(24, Line, 48, 1); @@ -1263,7 +1307,7 @@ HandleGenericList(PGENERIC_LIST_UI ListUi, else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ { - RestoreGenericListState(ListUi->List); + RestoreGenericListUiState(ListUi); return nextPage; // Use some "prevPage;" instead? } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ @@ -1295,15 +1339,12 @@ ComputerSettingsPage(PINPUT_RECORD Ir) GENERIC_LIST_UI ListUi; MUIDisplayPage(COMPUTER_SETTINGS_PAGE); - InitGenericListUi(&ListUi, ComputerList); + InitGenericListUi(&ListUi, ComputerList, GetSettingDescription); DrawGenericList(&ListUi, - 2, - 18, + 2, 18, xScreen - 3, yScreen - 3); - SaveGenericListState(ComputerList); - return HandleGenericList(&ListUi, DEVICE_SETTINGS_PAGE, Ir); } @@ -1324,15 +1365,12 @@ DisplaySettingsPage(PINPUT_RECORD Ir) GENERIC_LIST_UI ListUi; MUIDisplayPage(DISPLAY_SETTINGS_PAGE); - InitGenericListUi(&ListUi, DisplayList); + InitGenericListUi(&ListUi, DisplayList, GetSettingDescription); DrawGenericList(&ListUi, - 2, - 18, + 2, 18, xScreen - 3, yScreen - 3); - SaveGenericListState(DisplayList); - return HandleGenericList(&ListUi, DEVICE_SETTINGS_PAGE, Ir); } @@ -1353,15 +1391,12 @@ KeyboardSettingsPage(PINPUT_RECORD Ir) GENERIC_LIST_UI ListUi; MUIDisplayPage(KEYBOARD_SETTINGS_PAGE); - InitGenericListUi(&ListUi, KeyboardList); + InitGenericListUi(&ListUi, KeyboardList, GetSettingDescription); DrawGenericList(&ListUi, - 2, - 18, + 2, 18, xScreen - 3, yScreen - 3); - SaveGenericListState(KeyboardList); - return HandleGenericList(&ListUi, DEVICE_SETTINGS_PAGE, Ir); } @@ -1382,15 +1417,12 @@ LayoutSettingsPage(PINPUT_RECORD Ir) GENERIC_LIST_UI ListUi; MUIDisplayPage(LAYOUT_SETTINGS_PAGE); - InitGenericListUi(&ListUi, LayoutList); + InitGenericListUi(&ListUi, LayoutList, GetSettingDescription); DrawGenericList(&ListUi, - 2, - 18, + 2, 18, xScreen - 3, yScreen - 3); - SaveGenericListState(LayoutList); - return HandleGenericList(&ListUi, DEVICE_SETTINGS_PAGE, Ir); } diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h index 61971f1432..572defaae1 100644 --- a/base/setup/usetup/usetup.h +++ b/base/setup/usetup/usetup.h @@ -72,7 +72,7 @@ extern HANDLE ProcessHeap; extern BOOLEAN IsUnattendedSetup; -extern PWCHAR SelectedLanguageId; +extern PCWSTR SelectedLanguageId; typedef enum _PAGE_NUMBER {

1 0

08/13: [SETUPLIB][USETUP] Bring some suggestions from PR #59 in.
by Hermès Bélusca-Maïto 28 Oct '18

28 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=765994c9e34fc60b3b4f0… commit 765994c9e34fc60b3b4f084cae8a3af1d7ef60c4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Dec 23 20:17:38 2017 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 28 01:08:57 2018 +0200 [SETUPLIB][USETUP] Bring some suggestions from PR #59 in. - Use OBJ_CASE_INSENSITIVE when initializing object attributes (no actual reason why to keep case sensitivity there). - Check the success of a RtlStringCchPrintfW call in EnumerateReactOSEntries(). - Explicitly check for returned STATUS_NOT_SUPPORTED from ChkdskPartition() or FormatPartition(), and display an appropriate error message. - Remove some left-over comments but also explain why I kept some commented code (mainly for future reference). --- base/setup/lib/bootsup.c | 50 +++++++++++++++++--------- base/setup/lib/fsutil.c | 4 ++- base/setup/lib/setuplib.c | 6 ++-- base/setup/lib/utils/filesup.c | 4 --- base/setup/lib/utils/partlist.c | 6 ++-- base/setup/usetup/devinst.c | 4 +-- base/setup/usetup/usetup.c | 79 ++++++++++++++++++++++++++++------------- 7 files changed, 99 insertions(+), 54 deletions(-) diff --git a/base/setup/lib/bootsup.c b/base/setup/lib/bootsup.c index 5f0f694779..3059d0c884 100644 --- a/base/setup/lib/bootsup.c +++ b/base/setup/lib/bootsup.c @@ -341,6 +341,7 @@ EnumerateReactOSEntries( IN PBOOT_STORE_ENTRY BootEntry, IN PVOID Parameter OPTIONAL) { + NTSTATUS Status; PENUM_REACTOS_ENTRIES_DATA Data = (PENUM_REACTOS_ENTRIES_DATA)Parameter; PNTOS_OPTIONS Options = (PNTOS_OPTIONS)&BootEntry->OsOptions; WCHAR SystemPath[MAX_PATH]; @@ -372,16 +373,19 @@ EnumerateReactOSEntries( goto SkipThisEntry; } - RtlStringCchPrintfW(SystemPath, ARRAYSIZE(SystemPath), L"\"%s\"", Data->ArcPath); - if ((_wcsicmp(Options->OsLoadPath, Data->ArcPath) != 0) && - (_wcsicmp(Options->OsLoadPath, SystemPath) != 0)) + if (_wcsicmp(Options->OsLoadPath, Data->ArcPath) != 0) { - /* - * This entry is a ReactOS entry, but the SystemRoot - * does not match the one we are looking for. - */ - /* Continue the enumeration */ - goto SkipThisEntry; + /* Not found, retry with a quoted path */ + Status = RtlStringCchPrintfW(SystemPath, ARRAYSIZE(SystemPath), L"\"%s\"", Data->ArcPath); + if (!NT_SUCCESS(Status) || _wcsicmp(Options->OsLoadPath, SystemPath) != 0) + { + /* + * This entry is a ReactOS entry, but the SystemRoot + * does not match the one we are looking for. + */ + /* Continue the enumeration */ + goto SkipThisEntry; + } } DPRINT1(" Found a candidate Win2k3 install '%S' with ARC path '%S'\n", @@ -668,10 +672,9 @@ SaveBootSector( /* Write bootsector to DstPath */ RtlInitUnicodeString(&Name, DstPath); - InitializeObjectAttributes(&ObjectAttributes, &Name, - 0, + OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -780,7 +783,6 @@ InstallMbrBootCodeToDiskHelper( /* Read new bootsector from SrcPath */ RtlInitUnicodeString(&Name, SrcPath); - InitializeObjectAttributes(&ObjectAttributes, &Name, OBJ_CASE_INSENSITIVE, @@ -835,7 +837,7 @@ InstallMbrBootCodeToDiskHelper( InitializeObjectAttributes(&ObjectAttributes, &Name, - 0, + OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -882,6 +884,12 @@ InstallMbrBootCodeToDisk( WCHAR DstPath[MAX_PATH]; #if 0 + /* + * The DestinationDevicePathBuffer parameter has been built with + * the following instruction by the caller; I'm not yet sure whether + * I actually want this function to build the path instead, hence + * I keep this code here but disabled for now... + */ WCHAR DestinationDevicePathBuffer[MAX_PATH]; RtlStringCchPrintfW(DestinationDevicePathBuffer, ARRAYSIZE(DestinationDevicePathBuffer), L"\\Device\\Harddisk%d\\Partition0", @@ -1038,7 +1046,7 @@ InstallFat12BootCodeToFloppy( InitializeObjectAttributes(&ObjectAttributes, &Name, - 0, + OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -1127,6 +1135,7 @@ InstallFat16BootCode( OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtOpenFile(&FileHandle, GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, @@ -1211,6 +1220,7 @@ InstallFat16BootCodeToFile( OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtOpenFile(&PartitionHandle, GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, @@ -1224,9 +1234,10 @@ InstallFat16BootCodeToFile( RtlInitUnicodeString(&Name, DstPath); InitializeObjectAttributes(&ObjectAttributes, &Name, - 0, // OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtCreateFile(&FileHandle, GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, @@ -1280,6 +1291,7 @@ InstallFat16BootCodeToDisk( OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtOpenFile(&PartitionHandle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, @@ -1353,6 +1365,7 @@ InstallFat32BootCode( OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtOpenFile(&FileHandle, GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, @@ -1503,6 +1516,7 @@ InstallFat32BootCodeToFile( OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtOpenFile(&PartitionHandle, GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, @@ -1516,9 +1530,10 @@ InstallFat32BootCodeToFile( RtlInitUnicodeString(&Name, DstPath); InitializeObjectAttributes(&ObjectAttributes, &Name, - 0, // OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtCreateFile(&FileHandle, GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, @@ -1572,6 +1587,7 @@ InstallFat32BootCodeToDisk( OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtOpenFile(&PartitionHandle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, @@ -1721,7 +1737,7 @@ InstallBtrfsBootCodeToDisk( InitializeObjectAttributes(&ObjectAttributes, &Name, - 0, + OBJ_CASE_INSENSITIVE, NULL, NULL); diff --git a/base/setup/lib/fsutil.c b/base/setup/lib/fsutil.c index db1f3073be..2fb61bf0ea 100644 --- a/base/setup/lib/fsutil.c +++ b/base/setup/lib/fsutil.c @@ -34,9 +34,11 @@ FILE_SYSTEM RegisteredFileSystems[] = { + /* NOTE: The FAT formatter automatically determines + * whether it will use FAT-16 or FAT-32. */ { L"FAT" , VfatFormat, VfatChkdsk }, -// { L"FAT32", VfatFormat, VfatChkdsk }, #if 0 + { L"FAT32", VfatFormat, VfatChkdsk }, // Do we support specific FAT sub-formats specifications? { L"FATX" , VfatxFormat, VfatxChkdsk }, { L"NTFS" , NtfsFormat, NtfsChkdsk }, diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index 38d5b58f1f..2d9a6bba80 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -212,8 +212,8 @@ InstallSetupInfFile( PINICACHE UnattendCache; PINICACHEITERATOR Iterator; #else - // PCWSTR CrLf = L"\r\n"; - PCSTR CrLf = "\r\n"; + // WCHAR CrLf[] = {L'\r', L'\n'}; + CHAR CrLf[] = {'\r', '\n'}; HANDLE FileHandle, UnattendFileHandle, SectionHandle; FILE_STANDARD_INFORMATION FileInfo; ULONG FileSize; @@ -360,7 +360,7 @@ Quit: NULL, &IoStatusBlock, (PVOID)CrLf, - 2 * sizeof(CHAR), // 2 * sizeof(WCHAR), + sizeof(CrLf), &FileInfo.EndOfFile, NULL); diff --git a/base/setup/lib/utils/filesup.c b/base/setup/lib/utils/filesup.c index 61cc1b4c5e..7755ad38fc 100644 --- a/base/setup/lib/utils/filesup.c +++ b/base/setup/lib/utils/filesup.c @@ -135,7 +135,6 @@ SetupCopyFile( LARGE_INTEGER ByteOffset; RtlInitUnicodeString(&FileName, SourceFileName); - InitializeObjectAttributes(&ObjectAttributes, &FileName, OBJ_CASE_INSENSITIVE, @@ -206,7 +205,6 @@ SetupCopyFile( } RtlInitUnicodeString(&FileName, DestinationFileName); - InitializeObjectAttributes(&ObjectAttributes, &FileName, OBJ_CASE_INSENSITIVE, @@ -594,7 +592,6 @@ DoesPathExist( IO_STATUS_BLOCK IoStatusBlock; RtlInitUnicodeString(&Name, PathName); - InitializeObjectAttributes(&ObjectAttributes, &Name, OBJ_CASE_INSENSITIVE, @@ -756,7 +753,6 @@ OpenAndMapFile( /* Open the file */ RtlInitUnicodeString(&FileName, PathNameToFile); - InitializeObjectAttributes(&ObjectAttributes, &FileName, OBJ_CASE_INSENSITIVE, diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index d9aa3b8469..6976e1ee97 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -1249,7 +1249,7 @@ CreatePartitionList(VOID) InitializeObjectAttributes(&ObjectAttributes, &Name, - 0, + OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -2777,9 +2777,10 @@ WritePartitions( L"\\Device\\Harddisk%lu\\Partition0", DiskEntry->DiskNumber); RtlInitUnicodeString(&Name, DstPath); + InitializeObjectAttributes(&ObjectAttributes, &Name, - 0, + OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -2882,6 +2883,7 @@ SetMountedDeviceValue( OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtOpenKey(&KeyHandle, KEY_ALL_ACCESS, &ObjectAttributes); diff --git a/base/setup/usetup/devinst.c b/base/setup/usetup/devinst.c index 3a8dec424d..15483a31d0 100644 --- a/base/setup/usetup/devinst.c +++ b/base/setup/usetup/devinst.c @@ -107,7 +107,7 @@ InstallDriver( /* Create service key */ RtlInitUnicodeString(&StringU, Driver); - InitializeObjectAttributes(&ObjectAttributes, &StringU, 0, hServices, NULL); + InitializeObjectAttributes(&ObjectAttributes, &StringU, OBJ_CASE_INSENSITIVE, hServices, NULL); Status = NtCreateKey(&hService, KEY_SET_VALUE, &ObjectAttributes, 0, NULL, REG_OPTION_NON_VOLATILE, &Disposition); if (!NT_SUCCESS(Status)) { @@ -218,7 +218,7 @@ InstallDevice( NTSTATUS Status; RtlInitUnicodeString(&DeviceIdU, DeviceId); - InitializeObjectAttributes(&ObjectAttributes, &DeviceIdU, 0, hEnum, NULL); + InitializeObjectAttributes(&ObjectAttributes, &DeviceIdU, OBJ_CASE_INSENSITIVE, hEnum, NULL); Status = NtOpenKey(&hDeviceKey, KEY_QUERY_VALUE | KEY_SET_VALUE, &ObjectAttributes); if (!NT_SUCCESS(Status)) { diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index b9ba8eea2f..35d83ab2a5 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -2915,12 +2915,13 @@ SelectFileSystemPage(PINPUT_RECORD Ir) static PAGE_NUMBER FormatPartitionPage(PINPUT_RECORD Ir) { - UNICODE_STRING PartitionRootPath; - WCHAR PathBuffer[MAX_PATH]; + NTSTATUS Status; PDISKENTRY DiskEntry; PPARTENTRY PartEntry; PFILE_SYSTEM_ITEM SelectedFileSystem; - NTSTATUS Status; + UNICODE_STRING PartitionRootPath; + WCHAR PathBuffer[MAX_PATH]; + CHAR Buffer[MAX_PATH]; #ifndef NDEBUG ULONG Line; @@ -3016,7 +3017,38 @@ FormatPartitionPage(PINPUT_RECORD Ir) { Status = FormatPartition(&PartitionRootPath, SelectedFileSystem); - if (!NT_SUCCESS(Status)) + if (Status == STATUS_NOT_SUPPORTED) + { + sprintf(Buffer, + "Setup is currently unable to format a partition in %S.\n" + "\n" + " \x07 Press ENTER to continue Setup.\n" + " \x07 Press F3 to quit Setup.", + SelectedFileSystem->FileSystem->FileSystemName); + + PopupError(Buffer, + MUIGetString(STRING_QUITCONTINUE), + NULL, POPUP_WAIT_NONE); + + while (TRUE) + { + CONSOLE_ConInKey(Ir); + + if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x00 && + Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3) /* F3 */ + { + if (ConfirmQuit(Ir)) + return QUIT_PAGE; + else + return SELECT_FILE_SYSTEM_PAGE; + } + else if (Ir->Event.KeyEvent.uChar.AsciiChar == VK_RETURN) /* ENTER */ + { + return SELECT_FILE_SYSTEM_PAGE; + } + } + } + else if (!NT_SUCCESS(Status)) { DPRINT1("FormatPartition() failed with status 0x%08lx\n", Status); MUIDisplayError(ERROR_FORMATTING_PARTITION, Ir, POPUP_WAIT_ANY_KEY, PathBuffer); @@ -3057,13 +3089,13 @@ FormatPartitionPage(PINPUT_RECORD Ir) static PAGE_NUMBER CheckFileSystemPage(PINPUT_RECORD Ir) { + NTSTATUS Status; + PDISKENTRY DiskEntry; + PPARTENTRY PartEntry; PFILE_SYSTEM CurrentFileSystem; UNICODE_STRING PartitionRootPath; WCHAR PathBuffer[MAX_PATH]; CHAR Buffer[MAX_PATH]; - PDISKENTRY DiskEntry; - PPARTENTRY PartEntry; - NTSTATUS Status; if (PartitionList == NULL) { @@ -3099,7 +3131,8 @@ CheckFileSystemPage(PINPUT_RECORD Ir) return CHECK_FILE_SYSTEM_PAGE; } - if (CurrentFileSystem->ChkdskFunc == NULL) + Status = ChkdskPartition(&PartitionRootPath, CurrentFileSystem); + if (Status == STATUS_NOT_SUPPORTED) { sprintf(Buffer, "Setup is currently unable to check a partition formatted in %S.\n" @@ -3131,26 +3164,22 @@ CheckFileSystemPage(PINPUT_RECORD Ir) } } } - else + else if (!NT_SUCCESS(Status)) { - Status = ChkdskPartition(&PartitionRootPath, CurrentFileSystem); - if (!NT_SUCCESS(Status)) - { - DPRINT("ChkdskPartition() failed with status 0x%08lx\n", Status); - // sprintf(Buffer, "Setup failed to verify the selected partition.\n" - sprintf(Buffer, "ChkDsk detected some disk errors.\n" - "(Status 0x%08lx).\n", Status); - PopupError(Buffer, - // MUIGetString(STRING_REBOOTCOMPUTER), - MUIGetString(STRING_CONTINUE), - Ir, POPUP_WAIT_ENTER); - - // return QUIT_PAGE; - } + DPRINT("ChkdskPartition() failed with status 0x%08lx\n", Status); + // sprintf(Buffer, "Setup failed to verify the selected partition.\n" + sprintf(Buffer, "ChkDsk detected some disk errors.\n" + "(Status 0x%08lx).\n", Status); + PopupError(Buffer, + // MUIGetString(STRING_REBOOTCOMPUTER), + MUIGetString(STRING_CONTINUE), + Ir, POPUP_WAIT_ENTER); - PartEntry->NeedsCheck = FALSE; - return CHECK_FILE_SYSTEM_PAGE; + // return QUIT_PAGE; } + + PartEntry->NeedsCheck = FALSE; + return CHECK_FILE_SYSTEM_PAGE; }

1 0

07/13: [SETUPLIB] Improve the bootloader 'validity' checks -- Addendum to f06734e5 (r74512).
by Hermès Bélusca-Maïto 28 Oct '18

28 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a7a11dd60db9f244e1a10… commit a7a11dd60db9f244e1a10bd0d5aecc041f36161f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 24 22:37:19 2017 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 28 00:59:46 2018 +0200 [SETUPLIB] Improve the bootloader 'validity' checks -- Addendum to f06734e5 (r74512). Adapted from PR #89 by Serge Gautherie. This should improve the situation described in CORE-12672 and CORE-4870. --- base/setup/lib/bootsup.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/base/setup/lib/bootsup.c b/base/setup/lib/bootsup.c index 2f7b43fee3..5f0f694779 100644 --- a/base/setup/lib/bootsup.c +++ b/base/setup/lib/bootsup.c @@ -551,7 +551,6 @@ IsThereAValidBootSector( HANDLE FileHandle; LARGE_INTEGER FileOffset; PUCHAR BootSector; - ULONG Instruction; /* Allocate buffer for bootsector */ BootSector = RtlAllocateHeap(ProcessHeap, 0, SECTORSIZE); @@ -593,17 +592,18 @@ IsThereAValidBootSector( if (!NT_SUCCESS(Status)) goto Quit; - /* Check the instruction; we use a ULONG to read three bytes */ - Instruction = (*(PULONG)BootSector) & 0x00FFFFFF; - IsValid = (Instruction != 0x00000000); - - /* Check the bootsector signature */ - IsValid &= (*(PUSHORT)(BootSector + 0x1fe) == 0xaa55); + /* Check for the existence of the bootsector signature */ + IsValid = (*(PUSHORT)(BootSector + 0x1FE) == 0xAA55); + if (IsValid) + { + /* Check for the first instruction encoded on three bytes */ + IsValid = (((*(PULONG)BootSector) & 0x00FFFFFF) != 0x00000000); + } Quit: /* Free the boot sector */ RtlFreeHeap(ProcessHeap, 0, BootSector); - return IsValid; // Status; + return IsValid; } static

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