Ros-diffs October 2024

ros-diffs@reactos.org

20 participants
117 discussions

[reactos] 01/01: [VERSION] Fix VerQueryValue when return Value is NULL. (#7449)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=551c74123c11e80b05eda… commit 551c74123c11e80b05edad7dde141a84f1de70e7 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Tue Oct 22 05:28:10 2024 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 22 05:28:10 2024 -0500 [VERSION] Fix VerQueryValue when return Value is NULL. (#7449) CORE-19783 Co-authored-by: Timo Kreuzer <timo.kreuzer(a)reactos.org> --- dll/win32/version/version.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dll/win32/version/version.c b/dll/win32/version/version.c index 0e2f35dd107..8ecabae01a3 100644 --- a/dll/win32/version/version.c +++ b/dll/win32/version/version.c @@ -979,6 +979,14 @@ static BOOL VersionInfo32_QueryValue( const VS_VERSION_INFO_STRUCT32 *info, LPCW /* Return value */ *lplpBuffer = VersionInfo32_Value( info ); + +#ifdef __REACTOS__ + /* If the wValueLength is zero, then set a UNICODE_NULL only return string. + * Use the NULL terminator from the key string for that. This is what Windows does, too. */ + if (!info->wValueLength) + *lplpBuffer = (PVOID)(info->szKey + wcslen(info->szKey)); +#endif + if (puLen) *puLen = info->wValueLength; if (pbText)

2 months

[reactos] 01/01: [CRT] Add C++ const correct overloads

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ba61029e12b780070cbb… commit 8ba61029e12b780070cbb4aebd1b1e203687292d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Oct 11 17:09:28 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Oct 22 08:17:45 2024 +0300 [CRT] Add C++ const correct overloads --- base/applications/rapps/loaddlg.cpp | 2 +- dll/win32/framedyn/chstring.cpp | 4 +- sdk/include/c++/cwchar | 2 + sdk/include/crt/crtdefs.h | 14 +++-- sdk/include/crt/string.h | 100 ++++++++++++++++++++++++++++++++++++ sdk/include/crt/wchar.h | 52 +++++++++++++++++++ 6 files changed, 167 insertions(+), 7 deletions(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 3e477dbe0b5..7e926c3399f 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -635,7 +635,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) { CPathW Path; - PWSTR p, q; + PCWSTR p, q; HWND hDlg = static_cast<DownloadParam *>(param)->Dialog; HWND Item; diff --git a/dll/win32/framedyn/chstring.cpp b/dll/win32/framedyn/chstring.cpp index 89d1b0ed332..d3b9003c2e3 100644 --- a/dll/win32/framedyn/chstring.cpp +++ b/dll/win32/framedyn/chstring.cpp @@ -1001,10 +1001,10 @@ void CHString::ReleaseBuffer(int nNewLength) */ int CHString::ReverseFind(CHSTRING_WCHAR ch) const { - CHSTRING_WCHAR *Last; + CHSTRING_LPCWSTR Last; // Let's use appropriate helper - Last = reinterpret_cast<CHSTRING_WCHAR*>(wcsrchr(reinterpret_cast<LPCWSTR>(m_pchData), ch)); + Last = reinterpret_cast<CHSTRING_LPCWSTR>(wcsrchr(reinterpret_cast<LPCWSTR>(m_pchData), ch)); // We have to return a position, so compute it if (Last) { diff --git a/sdk/include/c++/cwchar b/sdk/include/c++/cwchar index b677e37867d..29534eacab0 100644 --- a/sdk/include/c++/cwchar +++ b/sdk/include/c++/cwchar @@ -130,6 +130,7 @@ namespace std using ::wcsstr; using ::wmemchr; +#ifndef __CORRECT_ISO_CPP_WCHAR_H_PROTO inline wchar_t* wcschr(wchar_t* __p, wchar_t __c) { return wcschr(const_cast<const wchar_t*>(__p), __c); } @@ -149,4 +150,5 @@ namespace std inline wchar_t* wmemchr(wchar_t* __p, wchar_t __c, size_t __n) { return wmemchr(const_cast<const wchar_t*>(__p), __c, __n); } +#endif // __CORRECT_ISO_CPP_WCHAR_H_PROTO } diff --git a/sdk/include/crt/crtdefs.h b/sdk/include/crt/crtdefs.h index e83ed510c35..be29b637cae 100644 --- a/sdk/include/crt/crtdefs.h +++ b/sdk/include/crt/crtdefs.h @@ -37,6 +37,16 @@ #define NO_OLDNAMES #endif +#if defined(__GNUC__) && !defined(__clang__) + #define _CRT_DISABLE_GCC_WARNINGS \ + _Pragma("GCC diagnostic push") \ + _Pragma("GCC diagnostic ignored \"-Wbuiltin-declaration-mismatch\"") \ + _Pragma("GCC diagnostic ignored \"-Wunknown-pragmas\"") + #define _CRT_RESTORE_GCC_WARNINGS _Pragma("GCC diagnostic pop") +#else // __GNUC__ + #define _CRT_DISABLE_GCC_WARNINGS + #define _CRT_RESTORE_GCC_WARNINGS +#endif // __GNUC__ /** Properties ***************************************************************/ @@ -132,10 +142,6 @@ #define _AGLOBAL #endif -#ifndef _CONST_RETURN - #define _CONST_RETURN -#endif - #ifndef UNALIGNED #if defined(__ia64__) || defined(__x86_64) || defined(__arm__) || defined(__arm64__) #define UNALIGNED __unaligned diff --git a/sdk/include/crt/string.h b/sdk/include/crt/string.h index e0b2f09d96b..b5e4cd4a775 100644 --- a/sdk/include/crt/string.h +++ b/sdk/include/crt/string.h @@ -8,6 +8,8 @@ #include <corecrt.h> +#define __CORRECT_ISO_CPP_STRING_H_PROTO // For stl + #ifdef __cplusplus extern "C" { #endif @@ -29,6 +31,7 @@ extern "C" { _In_ int _Val, _In_ size_t _MaxCount); +_CRT_DISABLE_GCC_WARNINGS _Must_inspect_result_ _CRTIMP _CONST_RETURN @@ -38,6 +41,19 @@ extern "C" { _In_reads_bytes_opt_(_MaxCount) const void *_Buf, _In_ int _Val, _In_ size_t _MaxCount); +_CRT_RESTORE_GCC_WARNINGS + +#if defined __cplusplus + extern "C++" _Must_inspect_result_ + inline void* __CRTDECL memchr( + _In_reads_bytes_opt_(_MaxCount) void *_Buf, + _In_ int _Val, + _In_ size_t _MaxCount) + { + const void *_Bufc = _Buf; + return const_cast<void*>(memchr(_Bufc, _Val, _MaxCount)); + } +#endif _Must_inspect_result_ _CRTIMP @@ -174,6 +190,7 @@ extern "C" { _strdup( _In_opt_z_ const char *_Src); +_CRT_DISABLE_GCC_WARNINGS _Check_return_ _CRTIMP _CONST_RETURN @@ -182,6 +199,16 @@ extern "C" { strchr( _In_z_ const char *_Str, _In_ int _Val); +_CRT_RESTORE_GCC_WARNINGS + +#ifdef __cplusplus + extern "C++" + _Check_return_ + inline char* __CRTDECL strchr(_In_z_ char *_String, _In_ int _Ch) + { + return const_cast<char*>(strchr(static_cast<const char*>(_String), _Ch)); + } +#endif // __cplusplus _Check_return_ _CRTIMP @@ -365,6 +392,7 @@ extern "C" { int _Val, size_t _MaxCount); +_CRT_DISABLE_GCC_WARNINGS _Check_return_ _CRTIMP _CONST_RETURN @@ -373,7 +401,18 @@ extern "C" { strpbrk( _In_z_ const char *_Str, _In_z_ const char *_Control); +_CRT_RESTORE_GCC_WARNINGS +#ifdef __cplusplus + extern "C++" + _Check_return_ + inline char* __CRTDECL strpbrk(_In_z_ char *_String, _In_z_ const char *_Control) + { + return const_cast<char*>(strpbrk(static_cast<const char*>(_String), _Control)); + } +#endif // __cplusplus + +_CRT_DISABLE_GCC_WARNINGS _Check_return_ _CRTIMP _CONST_RETURN @@ -382,6 +421,16 @@ extern "C" { strrchr( _In_z_ const char *_Str, _In_ int _Ch); +_CRT_RESTORE_GCC_WARNINGS + +#ifdef __cplusplus + extern "C++" + _Check_return_ + inline char* __CRTDECL strrchr(_In_z_ char *_String, _In_ int _Ch) + { + return const_cast<char*>(strrchr(static_cast<const char*>(_String), _Ch)); + } +#endif // __cplusplus _CRTIMP char* @@ -397,6 +446,7 @@ extern "C" { _In_z_ const char *_Str, _In_z_ const char *_Control); +_CRT_DISABLE_GCC_WARNINGS _Check_return_ _CRTIMP _CONST_RETURN @@ -405,6 +455,16 @@ extern "C" { strstr( _In_z_ const char *_Str, _In_z_ const char *_SubStr); +_CRT_RESTORE_GCC_WARNINGS + +#ifdef __cplusplus + extern "C++" + _Check_return_ _Ret_maybenull_ + inline char* __CRTDECL strstr(_In_z_ char *_String, _In_z_ const char *_SubString) + { + return const_cast<char*>(strstr(static_cast<const char*>(_String), _SubString)); + } +#endif // __cplusplus _Check_return_ _CRTIMP @@ -636,6 +696,16 @@ extern "C" { _In_z_ const wchar_t *_Str, wchar_t _Ch); +#ifdef __cplusplus + extern "C++" + _Check_return_ + _When_(return != NULL, _Ret_range_(_String, _String + _String_length_(_String) - 1)) + inline wchar_t* __CRTDECL wcschr(_In_z_ wchar_t *_String, wchar_t _C) + { + return const_cast<wchar_t*>(wcschr(static_cast<const wchar_t*>(_String), _C)); + } +#endif // __cplusplus + _Check_return_ _CRTIMP int @@ -714,6 +784,15 @@ extern "C" { _In_z_ const wchar_t *_Str, _In_z_ const wchar_t *_Control); +#ifdef __cplusplus + extern "C++" + _Check_return_ + inline wchar_t* __cdecl wcspbrk(_In_z_ wchar_t *_Str, _In_z_ const wchar_t *_Control) + { + return const_cast<wchar_t*>(wcspbrk(static_cast<const wchar_t*>(_Str), _Control)); + } +#endif // __cplusplus + _Check_return_ _CRTIMP _CONST_RETURN @@ -723,6 +802,15 @@ extern "C" { _In_z_ const wchar_t *_Str, _In_ wchar_t _Ch); +#ifdef __cplusplus + extern "C++" + _Check_return_ + inline wchar_t* __CRTDECL wcsrchr(_In_z_ wchar_t *_String, _In_ wchar_t _C) + { + return const_cast<wchar_t*>(wcsrchr(static_cast<const wchar_t*>(_String), _C)); + } +#endif // __cplusplus + _Check_return_ _CRTIMP size_t @@ -731,6 +819,7 @@ extern "C" { _In_z_ const wchar_t *_Str, _In_z_ const wchar_t *_Control); +_CRT_DISABLE_GCC_WARNINGS _When_(return != 0, _Ret_range_(_Str, _Str + _String_length_(_Str) - 1)) _CRTIMP @@ -740,6 +829,17 @@ extern "C" { wcsstr( _In_z_ const wchar_t *_Str, _In_z_ const wchar_t *_SubStr); +_CRT_RESTORE_GCC_WARNINGS + +#ifdef __cplusplus + extern "C++" + _Check_return_ _Ret_maybenull_ + _When_(return != NULL, _Ret_range_(_String, _String + _String_length_(_String) - 1)) + inline wchar_t* __CRTDECL wcsstr(_In_z_ wchar_t *_String, _In_z_ const wchar_t *_SubStr) + { + return const_cast<wchar_t*>(wcsstr(static_cast<const wchar_t*>(_String), _SubStr)); + } +#endif // __cplusplus _Check_return_ _CRTIMP diff --git a/sdk/include/crt/wchar.h b/sdk/include/crt/wchar.h index 765cfd797f4..c558279ed47 100644 --- a/sdk/include/crt/wchar.h +++ b/sdk/include/crt/wchar.h @@ -11,6 +11,8 @@ #define __need___va_list #include <stdarg.h> +#define __CORRECT_ISO_CPP_WCHAR_H_PROTO // For stl + #pragma pack(push,_CRT_PACKING) #ifdef __cplusplus @@ -1926,6 +1928,16 @@ _CRTIMP int __cdecl iswblank(wint_t _C); _In_z_ const wchar_t *_Str, wchar_t _Ch); +#ifdef __cplusplus + extern "C++" + _Check_return_ + _When_(return != NULL, _Ret_range_(_String, _String + _String_length_(_String) - 1)) + inline wchar_t* __cdecl wcschr(_In_z_ wchar_t *_String, wchar_t _C) + { + return const_cast<wchar_t*>(wcschr(static_cast<const wchar_t*>(_String), _C)); + } +#endif // __cplusplus + _Check_return_ int __cdecl @@ -1992,6 +2004,15 @@ _CRTIMP int __cdecl iswblank(wint_t _C); _In_z_ const wchar_t *_Str, _In_z_ const wchar_t *_Control); +#ifdef __cplusplus + extern "C++" + _Check_return_ + inline wchar_t* __cdecl wcspbrk(_In_z_ wchar_t *_Str, _In_z_ const wchar_t *_Control) + { + return const_cast<wchar_t*>(wcspbrk(static_cast<const wchar_t*>(_Str), _Control)); + } +#endif // __cplusplus + _Check_return_ _CONST_RETURN wchar_t* @@ -2000,6 +2021,15 @@ _CRTIMP int __cdecl iswblank(wint_t _C); _In_z_ const wchar_t *_Str, _In_ wchar_t _Ch); +#ifdef __cplusplus + extern "C++" + _Check_return_ + inline wchar_t* __cdecl wcsrchr(_In_z_ wchar_t *_Str, _In_ wchar_t _Ch) + { + return const_cast<wchar_t*>(wcsrchr(static_cast<const wchar_t*>(_Str), _Ch)); + } +#endif // __cplusplus + _Check_return_ size_t __cdecl @@ -2014,6 +2044,16 @@ _CRTIMP int __cdecl iswblank(wint_t _C); _In_z_ const wchar_t *_Str, _In_z_ const wchar_t *_SubStr); +#ifdef __cplusplus + extern "C++" + _Check_return_ _Ret_maybenull_ + _When_(return != NULL, _Ret_range_(_String, _String + _String_length_(_String) - 1)) + inline wchar_t* __cdecl wcsstr(_In_z_ wchar_t *_String, _In_z_ const wchar_t *_SubStr) + { + return const_cast<wchar_t*>(wcsstr(static_cast<const wchar_t*>(_String), _SubStr)); + } +#endif // __cplusplus + _Check_return_ wchar_t* __cdecl @@ -2467,6 +2507,18 @@ __CRT_INLINE wchar_t *__cdecl _wctime(const time_t *_Time) { return _wctime64(_T _In_ wchar_t _C, _In_ size_t _N); +#ifdef __cplusplus + extern "C++" + inline wchar_t* __cdecl wmemchr( + _In_reads_(_N) wchar_t *_S, + _In_ wchar_t _C, + _In_ size_t _N) + { + const wchar_t *_SC = _S; + return const_cast<wchar_t*>(wmemchr(_SC, _C, _N)); + } +#endif // __cplusplus + int __cdecl wmemcmp(

2 months

[reactos] 01/01: [VERSION_APITEST] Add tests for VerQueryValue(A/W)

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c2b8c835a8c58b97e348… commit 8c2b8c835a8c58b97e348e041f02f8218cbfee3d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Oct 10 14:54:03 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Oct 22 00:46:42 2024 +0300 [VERSION_APITEST] Add tests for VerQueryValue(A/W) --- modules/rostests/apitests/CMakeLists.txt | 1 + modules/rostests/apitests/version/CMakeLists.txt | 18 ++ modules/rostests/apitests/version/VerQueryValue.c | 302 ++++++++++++++++++++++ modules/rostests/apitests/version/precomp.h | 15 ++ modules/rostests/apitests/version/testlist.c | 18 ++ 5 files changed, 354 insertions(+) diff --git a/modules/rostests/apitests/CMakeLists.txt b/modules/rostests/apitests/CMakeLists.txt index 18dfedb9538..17a36e94d23 100644 --- a/modules/rostests/apitests/CMakeLists.txt +++ b/modules/rostests/apitests/CMakeLists.txt @@ -56,6 +56,7 @@ add_subdirectory(user32_dynamic) add_subdirectory(userenv) add_subdirectory(utildll) add_subdirectory(uxtheme) +add_subdirectory(version) if(NOT CMAKE_BUILD_TYPE STREQUAL "Release") add_subdirectory(win32u) add_subdirectory(win32nt) diff --git a/modules/rostests/apitests/version/CMakeLists.txt b/modules/rostests/apitests/version/CMakeLists.txt new file mode 100644 index 00000000000..b0ced710e5d --- /dev/null +++ b/modules/rostests/apitests/version/CMakeLists.txt @@ -0,0 +1,18 @@ + +list(APPEND SOURCE + VerQueryValue.c + precomp.h) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) + +add_executable(version_apitest + ${SOURCE} + ${PCH_SKIP_SOURCE}) + +target_link_libraries(version_apitest wine uuid ${PSEH_LIB}) +set_module_type(version_apitest win32cui) +add_importlibs(version_apitest version msvcrt kernel32 ntdll) +add_pch(version_apitest precomp.h "${PCH_SKIP_SOURCE}") + +add_rostests_file(TARGET version_apitest) diff --git a/modules/rostests/apitests/version/VerQueryValue.c b/modules/rostests/apitests/version/VerQueryValue.c new file mode 100644 index 00000000000..215faf4a543 --- /dev/null +++ b/modules/rostests/apitests/version/VerQueryValue.c @@ -0,0 +1,302 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Tests for VerQueryValue[A/W] + * COPYRIGHT: Copyright 2024 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include "precomp.h" + +typedef struct +{ + WORD wLength; + WORD wValueLength; + WORD wType; + WCHAR szKey[16]; // L"VS_VERSION_INFO" + WORD Padding1; + VS_FIXEDFILEINFO Value; + + struct _StringFileInfo + { + WORD wLength; + WORD wValueLength; + WORD wType; + WCHAR szKey[15]; // L"StringFileInfo" + + struct _StringTable + { + WORD wLength; + WORD wValueLength; + WORD wType; + WCHAR szKey[9]; // L"000004B" + + struct _String_CompanyName + { + WORD wLength; + WORD wValueLength; + WORD wType; + WCHAR szKey[12]; // L"CompanyName" + WORD Padding1; + WCHAR Value[16]; // L"ReactOS Project" + } CompanyName; + + struct _String_Comments + { + WORD wLength; + WORD wValueLength; // 0 + WORD wType; + WCHAR szKey[9]; // L"Comments" + } Comments; + + struct _String_Comments2 + { + WORD wLength; + WORD wValueLength; // 0 + WORD wType; + WCHAR szKey[10]; // L"Comments2" + WORD Padding; + } Comments2; + + struct _String_FooBar + { + WORD wLength; + WORD wValueLength; + WORD wType; + WCHAR szKey[7]; // L"FooBar" + WCHAR Value[4]; // L"Bar" + } FooBar; + + } StringTable; + } StringFileInfo; +} TEST_VERSIONINFO; + +static const TEST_VERSIONINFO g_VersionInfo = +{ + .wLength = 298, // Header: 40, Value: 54, StringFileInfo: 204 + .wValueLength = sizeof(VS_FIXEDFILEINFO), + .wType = 0, + .szKey = L"VS_VERSION_INFO", + .Padding1 = 0, + .Value = + { + .dwSignature = VS_FFI_SIGNATURE, + .dwStrucVersion = VS_FFI_STRUCVERSION, + .dwFileVersionMS = 0x00050002, + .dwFileVersionLS = 0x0ECE0000, + .dwProductVersionMS = 0x00050002, + .dwProductVersionLS = 0x0ECE0000, + .dwFileFlagsMask = 0x00000002, + .dwFileFlags = 0x00000000, + .dwFileOS = VOS__WINDOWS32, + .dwFileType = VFT_APP, + .dwFileSubtype = VFT2_UNKNOWN, + .dwFileDateMS = 0x00020074, + .dwFileDateLS = 0x00000000, + }, + .StringFileInfo = + { + .wLength = 204, // Header: 36, StringTable: 168 + .wValueLength = 0, + .wType = 1, + .szKey = L"StringFileInfo", + .StringTable = + { + .wLength = 168, //Header: 24, Children: 144 + .wValueLength = 0, + .wType = 1, + .szKey = L"000004B0", + + .CompanyName = + { + .wLength = 64, + .wValueLength = 16, + .wType = 1, + .szKey = L"CompanyName", + .Padding1 = 0, + .Value = L"ReactOS Project", + }, + .Comments = + { + .wLength = 24, + .wValueLength = 0, + .wType = 1, + .szKey = L"Comments", + }, + .Comments2 = + { + .wLength = 28, + .wValueLength = 0, + .wType = 1, + .szKey = L"Comments2", + .Padding = 0xCC, + }, + .FooBar = + { + .wLength = 28, + .wValueLength = 4, + .wType = 1, + .szKey = L"FooBar", + .Value = L"Bar", + }, + }, + }, +}; + +void +Test_VerQueryValueA(void) +{ + DWORD dwVersionInfoSizeW, dwVersionInfoSizeA; + PVOID pvVersionInfoA, pvData = NULL; + CHAR szSubBlock[256]; + USHORT uLanguage, uCodePage; + UINT cbLen; + BOOL result; + + /* Get the size for the unicode version info */ + dwVersionInfoSizeW = GetFileVersionInfoSizeW(L"kernel32.dll", NULL); + ok(dwVersionInfoSizeW > 0, "GetFileVersionInfoSizeW failed\n"); + + /* Get the size for the ANSI version info */ + dwVersionInfoSizeA = GetFileVersionInfoSizeA("kernel32.dll", NULL); + ok(dwVersionInfoSizeA > 0, "GetFileVersionInfoSizeA failed\n"); + ok(dwVersionInfoSizeA == dwVersionInfoSizeW, "Unexpected size\n"); + + /* Get the ANSI version info from kernel32 */ + pvVersionInfoA = malloc(dwVersionInfoSizeA); + memset(pvVersionInfoA, 0xCC, dwVersionInfoSizeA); + result = GetFileVersionInfoA("kernel32.dll", 0, dwVersionInfoSizeA, pvVersionInfoA); + ok(result, "GetFileVersionInfoA failed\n"); + + /* Query available translations */ + result = VerQueryValueA(pvVersionInfoA, + "\\VarFileInfo\\Translation", + &pvData, + &cbLen); + ok(result, "VerQueryValueA failed\n"); + ok(cbLen >= 4, "Unexpected value\n"); + ok((cbLen & 0x3) == 0, "Unexpected value\n"); + uLanguage = ((USHORT*)pvData)[0]; + uCodePage = ((USHORT*)pvData)[1]; + + /* Query sublock */ + sprintf(szSubBlock, "\\StringFileInfo\\%04X%04X\\CompanyName", uLanguage, uCodePage); + result = VerQueryValueA(pvVersionInfoA, + szSubBlock, + &pvData, + &cbLen); + ok(result, "VerQueryValueA failed\n"); + ok(cbLen >= 2, "Unexpected value\n"); + ok((cbLen & 0x1) == 0, "Unexpected value\n"); + + free(pvVersionInfoA); +} + +void +Test_VerQueryValueW(void) +{ + DWORD dwVersionInfoSizeW; + PVOID pvVersionInfoW, pvData = NULL; + WCHAR szSubBlock[256]; + USHORT uLanguage, uCodePage; + UINT cbLen; + BOOL result; + + /* Get the size for the unicode version info */ + dwVersionInfoSizeW = GetFileVersionInfoSizeW(L"kernel32.dll", NULL); + ok(dwVersionInfoSizeW > 0, "GetFileVersionInfoSizeW failed\n"); + + /* Get the unicode version info from kernel32 */ + pvVersionInfoW = malloc(dwVersionInfoSizeW); + result = GetFileVersionInfoW(L"kernel32.dll", 0, dwVersionInfoSizeW, pvVersionInfoW); + ok(result, "GetFileVersionInfoW failed\n"); + + /* Query available translations */ + result = VerQueryValueW(pvVersionInfoW, + L"\\VarFileInfo\\Translation", + &pvData, + &cbLen); + ok(result, "VerQueryValueA failed\n"); + ok(cbLen >= 4, "Unexpected value\n"); + ok((cbLen & 0x3) == 0, "Unexpected value\n"); + uLanguage = ((USHORT*)pvData)[0]; + uCodePage = ((USHORT*)pvData)[1]; + + /* Query sublock */ + _swprintf(szSubBlock, L"\\StringFileInfo\\%04X%04X\\CompanyName", uLanguage, uCodePage); + result = VerQueryValueW(pvVersionInfoW, + szSubBlock, + &pvData, + &cbLen); + ok(result, "VerQueryValueA failed\n"); + ok(cbLen >= 2, "Unexpected value\n"); + ok((cbLen & 0x1) == 0, "Unexpected value\n"); + + free(pvVersionInfoW); +} + +void +Test_StaticVersionInfo(void) +{ + PVOID pVersionInfo; + PVOID pvData = NULL; + SIZE_T ExpectedOffset; + UINT cbLen; + BOOL result; + + /* Make a copy of the version info. Windows actually writes to it! + We make the buffer twice as big to account for the ANSI copy, + even if we don't use it. */ + pVersionInfo = malloc(2 * sizeof(g_VersionInfo)); + memset(pVersionInfo, 0, 2 * sizeof(g_VersionInfo)); + memcpy(pVersionInfo, &g_VersionInfo, sizeof(g_VersionInfo)); + + /* Test a special static version */ + result = VerQueryValueW(pVersionInfo, + L"\\StringFileInfo\\000004B0\\CompanyName", + &pvData, + &cbLen); + ok(result, "VerQueryValueW failed\n"); + ok_eq_int(cbLen, 16); + ok_eq_wstr((WCHAR*)pvData, L"ReactOS Project"); + ExpectedOffset = FIELD_OFFSET(TEST_VERSIONINFO, StringFileInfo.StringTable.CompanyName.Value); + ok(pvData == (PVOID)((ULONG_PTR)pVersionInfo + ExpectedOffset), "Unexpected offset\n"); + + result = VerQueryValueW(pVersionInfo, + L"\\StringFileInfo\\000004B0\\Comments", + &pvData, + &cbLen); + ok(result, "VerQueryValueW failed\n"); + ok_eq_int(cbLen, 0); + ok_eq_wstr((WCHAR*)pvData, L""); + ExpectedOffset = FIELD_OFFSET(TEST_VERSIONINFO, StringFileInfo.StringTable.Comments.szKey[8]); + ok(pvData == (PVOID)((ULONG_PTR)pVersionInfo + ExpectedOffset), "Unexpected offset\n"); + + result = VerQueryValueW(pVersionInfo, + L"\\StringFileInfo\\000004B0\\Comments2", + &pvData, + &cbLen); + ok(result, "VerQueryValueW failed\n"); + ok_eq_int(cbLen, 0); + ok_eq_wstr((WCHAR*)pvData, L""); + ExpectedOffset = FIELD_OFFSET(TEST_VERSIONINFO, StringFileInfo.StringTable.Comments2.szKey[9]); + ok(pvData == (PVOID)((ULONG_PTR)pVersionInfo + ExpectedOffset), "Unexpected offset\n"); + + result = VerQueryValueW(pVersionInfo, + L"\\StringFileInfo\\000004B0\\FooBar", + &pvData, + &cbLen); + ok(result, "VerQueryValueW failed\n"); + ok_eq_int(cbLen, 4); + ok(wcscmp((WCHAR*)pvData, L"Bar") == 0, "Bar\n"); + ExpectedOffset = FIELD_OFFSET(TEST_VERSIONINFO, StringFileInfo.StringTable.FooBar.Value); + ok(pvData == (PVOID)((ULONG_PTR)pVersionInfo + ExpectedOffset), "Unexpected offset\n"); + + free(pVersionInfo); +} + +START_TEST(VerQueryValue) +{ + Test_VerQueryValueA(); + Test_VerQueryValueW(); + Test_StaticVersionInfo(); +} diff --git a/modules/rostests/apitests/version/precomp.h b/modules/rostests/apitests/version/precomp.h new file mode 100644 index 00000000000..9d04b3bc6c5 --- /dev/null +++ b/modules/rostests/apitests/version/precomp.h @@ -0,0 +1,15 @@ +#pragma once + +#include <stdio.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <apitest.h> +#include <apitest_guard.h> +#include <ndk/ntndk.h> +#include <strsafe.h> +#include <pseh/pseh2.h> +#include <verrsrc.h> +#include <winver.h> diff --git a/modules/rostests/apitests/version/testlist.c b/modules/rostests/apitests/version/testlist.c new file mode 100644 index 00000000000..9e421f0afdf --- /dev/null +++ b/modules/rostests/apitests/version/testlist.c @@ -0,0 +1,18 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Tests for version.dll + * COPYRIGHT: Copyright 2024 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#define STANDALONE +#include <apitest.h> + +extern void func_VerQueryValue(void); + +const struct test winetest_testlist[] = +{ + { "VerQueryValue", func_VerQueryValue }, + + { 0, 0 } +};

2 months

[reactos] 01/01: [SETUP:REACTOS] Improve/Add some translations

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eafa7c68b61ce250aee7c… commit eafa7c68b61ce250aee7c7a0cb498a80f1e2a17b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Oct 21 15:52:54 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 21 15:54:02 2024 +0200 [SETUP:REACTOS] Improve/Add some translations --- base/setup/reactos/lang/bg-BG.rc | 15 ++++--- base/setup/reactos/lang/cs-CZ.rc | 15 ++++--- base/setup/reactos/lang/de-DE.rc | 13 ++++-- base/setup/reactos/lang/el-GR.rc | 13 ++++-- base/setup/reactos/lang/en-US.rc | 15 ++++--- base/setup/reactos/lang/es-ES.rc | 15 ++++--- base/setup/reactos/lang/et-EE.rc | 15 ++++--- base/setup/reactos/lang/eu-ES.rc | 15 ++++--- base/setup/reactos/lang/fi-FI.rc | 15 ++++--- base/setup/reactos/lang/fr-FR.rc | 17 ++++--- base/setup/reactos/lang/he-IL.rc | 15 ++++--- base/setup/reactos/lang/hi-IN.rc | 13 ++++-- base/setup/reactos/lang/hu-HU.rc | 15 ++++--- base/setup/reactos/lang/id-ID.rc | 21 +++++---- base/setup/reactos/lang/it-IT.rc | 15 ++++--- base/setup/reactos/lang/ja-JP.rc | 21 +++++---- base/setup/reactos/lang/ms-MY.rc | 15 ++++--- base/setup/reactos/lang/no-NO.rc | 15 ++++--- base/setup/reactos/lang/pl-PL.rc | 15 ++++--- base/setup/reactos/lang/pt-BR.rc | 15 ++++--- base/setup/reactos/lang/pt-PT.rc | 15 ++++--- base/setup/reactos/lang/ro-RO.rc | 11 +++-- base/setup/reactos/lang/ru-RU.rc | 15 ++++--- base/setup/reactos/lang/sk-SK.rc | 15 ++++--- base/setup/reactos/lang/sq-AL.rc | 15 ++++--- base/setup/reactos/lang/tr-TR.rc | 11 +++-- base/setup/reactos/lang/uk-UA.rc | 15 ++++--- base/setup/reactos/lang/vi-VN.rc | 17 ++++--- base/setup/reactos/lang/zh-CN.rc | 19 +++++--- base/setup/reactos/lang/zh-HK.rc | 17 ++++--- base/setup/reactos/lang/zh-TW.rc | 17 ++++--- base/setup/reactos/reactos.c | 96 ++++++++++++++++++++++++---------------- base/setup/reactos/resource.h | 48 +++++++++++--------- 33 files changed, 398 insertions(+), 221 deletions(-) diff --git a/base/setup/reactos/lang/bg-BG.rc b/base/setup/reactos/lang/bg-BG.rc index 06995ecf1cb..7c230e346b4 100644 --- a/base/setup/reactos/lang/bg-BG.rc +++ b/base/setup/reactos/lang/bg-BG.rc @@ -160,22 +160,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "Настройка на РеактОС" IDS_TYPETITLE "РеактОС ви приветства!" IDS_TYPESUBTITLE "Изберете вид на настройването." IDS_DEVICETITLE "Настройване на основните устройства" IDS_DEVICESUBTITLE "Настройка на екрана и клавиатурата." IDS_DRIVETITLE "Приготвяне на дял за слагане и системна папка" IDS_DRIVESUBTITLE "Приготвяне на дял за слагане, системна папка и зареждач." + IDS_SUMMARYTITLE "Обобщение на слагането" + IDS_SUMMARYSUBTITLE "Списък на възможностите за слагане за проверка преди прилагане върху устройството за слагане." IDS_PROCESSTITLE "Подготвяне на дял, презапис на файлове и настройване на системата" - IDS_PROCESSSUBTITLE "Създаване и оразмеряване на дял, презапис на файлове, слагане и настройка на зареждач" + IDS_PROCESSSUBTITLE "Създаване и оразмеряване на дял, презапис на файлове, слагане и настройка на зареждач." IDS_RESTARTTITLE "Първата степен на настройването приключи" - IDS_RESTARTSUBTITLE "Първата степен приключи, презапуснете, за да продължите към втора степен" - IDS_SUMMARYTITLE "Обобщение на слагането" - IDS_SUMMARYSUBTITLE "Списък на възможностите за слагане за проверка преди прилагане върху устройството за слагане" + IDS_RESTARTSUBTITLE "Първата степен приключи, презапуснете, за да продължите към втора степен." IDS_ABORTSETUP "РеактОС не е напълно сложен на компютъра ви. Ако излезете от настройването сега, ще трябва да пуснете настройването отново, за да сложите Реактос. Наистина ли излизате?" IDS_ABORTSETUP2 "Прекъсване на слагането?" IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." - IDS_CAPTION "Настройка на РеактОС" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -218,12 +219,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/cs-CZ.rc b/base/setup/reactos/lang/cs-CZ.rc index a77b7f2689e..8f1b30091c7 100644 --- a/base/setup/reactos/lang/cs-CZ.rc +++ b/base/setup/reactos/lang/cs-CZ.rc @@ -166,22 +166,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "Instalace systému ReactOS" IDS_TYPETITLE "Vítejte v průvodci instalace systému ReactOS" IDS_TYPESUBTITLE "Volba typu instalace." IDS_DEVICETITLE "Nastavení základních zařízení" IDS_DEVICESUBTITLE "Volba nastavení obrazovky a klávesnice." IDS_DRIVETITLE "Nastavení instalačního oddílu a systémové složky" IDS_DRIVESUBTITLE "Příprava instalačního oddílu, systémové složky a zavaděče." + IDS_SUMMARYTITLE "Shrnutí instalace" + IDS_SUMMARYSUBTITLE "Výpis voleb instalace k ověření před tím, než začne instalace." IDS_PROCESSTITLE "Příprava oddílu, kopírování souborů a nastavení systému" - IDS_PROCESSSUBTITLE "Vytvoření a naformátování oddílu, kopírování souborů, instalace a nastavení zavaděče" + IDS_PROCESSSUBTITLE "Vytvoření a naformátování oddílu, kopírování souborů, instalace a nastavení zavaděče." IDS_RESTARTTITLE "První část instalace dokončena" - IDS_RESTARTSUBTITLE "První část instalace byla dokončena, po restartování počítače se bude pokračovat druhou částí" - IDS_SUMMARYTITLE "Shrnutí instalace" - IDS_SUMMARYSUBTITLE "Výpis voleb instalace k ověření před tím, než začne instalace" + IDS_RESTARTSUBTITLE "První část instalace byla dokončena, po restartování počítače se bude pokračovat druhou částí." IDS_ABORTSETUP "Systém ReactOS není na tomto počítači kompletně nainstalovaný. Pokud nyní ukončíte instalaci, bude ji pro nainstalování systému ReactOS nutné provést znova. Opravdu ukončit?" IDS_ABORTSETUP2 "Přerušit instalaci?" IDS_NO_TXTSETUP_SIF "Soubor 'txtsetup.sif' nenalezen.\nInstalace nemůže pokračovat." - IDS_CAPTION "Instalace systému ReactOS" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -224,12 +225,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/de-DE.rc b/base/setup/reactos/lang/de-DE.rc index e36c9a2adea..ffb2edbd217 100644 --- a/base/setup/reactos/lang/de-DE.rc +++ b/base/setup/reactos/lang/de-DE.rc @@ -160,22 +160,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "ReactOS Setup" IDS_TYPETITLE "Willkommen zum ReactOS-Setup" IDS_TYPESUBTITLE "Wählen Sie einen Setuptypen." IDS_DEVICETITLE "Einstellen der Basisgeräte" IDS_DEVICESUBTITLE "Einstellungen der Anzeigegeräte und der Tastatur." IDS_DRIVETITLE "Richte Installationspartition und Systemverzeichnis ein" IDS_DRIVESUBTITLE "Vorbereiten von Installationspartition, Systemverzeichnis und Bootloader." + IDS_SUMMARYTITLE "Installationszusammenfassung" + IDS_SUMMARYSUBTITLE "Liste alle Installationseinstellungen vor Anwendung auf die Geräte auf." IDS_PROCESSTITLE "Richte Partition ein, kopiere Dateien und richte System ein." - IDS_PROCESSSUBTITLE "Erstelle und formatiere Partition, kopiere Dateien, installiere und konfiguriere Bootloader" + IDS_PROCESSSUBTITLE "Erstelle und formatiere Partition, kopiere Dateien, installiere und konfiguriere Bootloader." IDS_RESTARTTITLE "Erste Stufe des Setup wurde abgeschlossen." IDS_RESTARTSUBTITLE "Die erste Stufe des Setup wurde abgeschlossen, starten Sie den Rechner neu, um mit der zweiten Stufe fortzufahren." - IDS_SUMMARYTITLE "Installationszusammenfassung" - IDS_SUMMARYSUBTITLE "Liste alle Installationseinstellungen vor Anwendung auf die Geräte auf" IDS_ABORTSETUP "ReactOS ist nicht vollständig auf Ihrem Computer installiert. Wenn Sie das Setup verlassen, müssen Sie das Setup nochmals ausführen, um ReactOS zu installieren. Wirklich beenden?" IDS_ABORTSETUP2 "Installation abbrechen?" IDS_NO_TXTSETUP_SIF "Die Datei 'txtsetup.sif' konnte nicht gefunden werden.\nSetup kann nicht fortfahren." - IDS_CAPTION "ReactOS Setup" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -218,12 +219,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/el-GR.rc b/base/setup/reactos/lang/el-GR.rc index fd39462b009..d8f3c06be63 100644 --- a/base/setup/reactos/lang/el-GR.rc +++ b/base/setup/reactos/lang/el-GR.rc @@ -160,22 +160,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "ReactOS Setup" IDS_TYPETITLE "Καλώς ήλθατε στην Εγκατάσταση του ReactOS" IDS_TYPESUBTITLE "Επιλέξτε τύπο εγκατάστασης." IDS_DEVICETITLE "Setup the basic devices" IDS_DEVICESUBTITLE "Ορισμός ρυθμίσεων για εμφάνιση και πληκτρολόγιο." IDS_DRIVETITLE "Ρύθμιση του partition εγκατάστασης και του φακέλου συστήματος" IDS_DRIVESUBTITLE "Προετοιμασία του partition εγκατάστασης, φακέλου συστήματος και bootloader." + IDS_SUMMARYTITLE "Installation Summary" + IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device." IDS_PROCESSTITLE "Prepare partition, copy files and setup system" - IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup bootloader" + IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup bootloader." IDS_RESTARTTITLE "Το πρώτο στάδιο της εγκατάστασης ολοκληρώθηκε" IDS_RESTARTSUBTITLE "Το πρώτο στάδιο της εγκατάστασης ολοκληρώθηκε, κάντε επανεκκίνηση για να συνεχίσετε με το δεύτερο στάδιο." - IDS_SUMMARYTITLE "Installation Summary" - IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." - IDS_CAPTION "ReactOS Setup" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -218,12 +219,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/en-US.rc b/base/setup/reactos/lang/en-US.rc index 4bea2f92b56..0c6d7e32b7c 100644 --- a/base/setup/reactos/lang/en-US.rc +++ b/base/setup/reactos/lang/en-US.rc @@ -160,22 +160,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "ReactOS Setup" IDS_TYPETITLE "Welcome to ReactOS Setup" IDS_TYPESUBTITLE "Choose setup type." IDS_DEVICETITLE "Setup the basic devices" IDS_DEVICESUBTITLE "Set the settings of display and keyboard." IDS_DRIVETITLE "Setup the installation partition and system folder" IDS_DRIVESUBTITLE "Prepare installation partition, system folder and bootloader." + IDS_SUMMARYTITLE "Installation Summary" + IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device." IDS_PROCESSTITLE "Setup partition, copy files and setup system" - IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup bootloader" + IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup bootloader." IDS_RESTARTTITLE "First stage of setup finished" - IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" - IDS_SUMMARYTITLE "Installation Summary" - IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" + IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage." IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." - IDS_CAPTION "ReactOS Setup" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -218,12 +219,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/es-ES.rc b/base/setup/reactos/lang/es-ES.rc index 3dc8d747fa2..acac98fea7c 100644 --- a/base/setup/reactos/lang/es-ES.rc +++ b/base/setup/reactos/lang/es-ES.rc @@ -169,22 +169,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "Instalación de ReactOS" IDS_TYPETITLE "Bienvenido a la instalación de ReactOS" IDS_TYPESUBTITLE "Seleccione el tipo de instalación." IDS_DEVICETITLE "Instalación de los dispositivos básicos" IDS_DEVICESUBTITLE "Seleccione los ajustes de la pantalla y el teclado." IDS_DRIVETITLE "Crear la partición para la instalación y la carpeta del sistema" IDS_DRIVESUBTITLE "Preparar la partición para la instalación, la carpeta del sistema y el cargador de arranque." + IDS_SUMMARYTITLE "Resumen de la instalación" + IDS_SUMMARYSUBTITLE "Lista las propiedades de la instalación para su verificación antes de aplicarlas al dispositivo instalado." IDS_PROCESSTITLE "Preparar partición, copiar archivos e instalar sistema" - IDS_PROCESSSUBTITLE "Crear y formatear partición, copiar archivos, instalar e instalar el cargador de arranque" + IDS_PROCESSSUBTITLE "Crear y formatear partición, copiar archivos, instalar e instalar el cargador de arranque." IDS_RESTARTTITLE "Primera parte de la instalación finalizada" - IDS_RESTARTSUBTITLE "La primera parte de la instalación ha sido completada, reinicie para continuar con la segunda parte" - IDS_SUMMARYTITLE "Resumen de la instalación" - IDS_SUMMARYSUBTITLE "Lista las propiedades de la instalación para su verificación antes de aplicarlas al dispositivo instalado" + IDS_RESTARTSUBTITLE "La primera parte de la instalación ha sido completada, reinicie para continuar con la segunda parte." IDS_ABORTSETUP "ReactOS no está completamente instalado en su equipo. Si sale de la instalación ahora, tendrá que ejecutar el instalador otra vez para instalar ReactOS. ¿Realmente quiere salir?" IDS_ABORTSETUP2 "¿Abortar instalación?" IDS_NO_TXTSETUP_SIF "No se pudo encontrar 'txtsetup.sif'.\nLa instalación no puede continuar." - IDS_CAPTION "Instalación de ReactOS" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -227,12 +228,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/et-EE.rc b/base/setup/reactos/lang/et-EE.rc index 59147fca93b..c880c622caf 100644 --- a/base/setup/reactos/lang/et-EE.rc +++ b/base/setup/reactos/lang/et-EE.rc @@ -160,22 +160,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "ReactOS'i paigaldamine" IDS_TYPETITLE "Tere tulemast ReactOS'i paigaldama" IDS_TYPESUBTITLE "Vali paigalduse tüüp." IDS_DEVICETITLE "Põhiliste seadmete paigaldamine" IDS_DEVICESUBTITLE "Ekraani ja klaviatuuri seadistamine." IDS_DRIVETITLE "Partitsioonide ja süsteemikausta seadistamine" IDS_DRIVESUBTITLE "Sihtpartitsiooni, süsteemikausta ja alglaaduri ettevalmistamine." + IDS_SUMMARYTITLE "Paigaldamise kokkuvõte" + IDS_SUMMARYSUBTITLE "Seadete kontrollimine enne paigaldamise alustamist." IDS_PROCESSTITLE "Partitsiooni ettevalmistamine, failide kopeerimine ja süsteemi üles seadmine" - IDS_PROCESSSUBTITLE "Partitsiooni loomine ja vormindamine, failide kopeerimine, alglaaduri seadistamine" + IDS_PROCESSSUBTITLE "Partitsiooni loomine ja vormindamine, failide kopeerimine, alglaaduri seadistamine." IDS_RESTARTTITLE "Paigaldamise esimene järk lõpetatud" - IDS_RESTARTSUBTITLE "Paigaldamise esimene järk on lõpetatud, teise järgu alustamiseks taaskäivita arvuti" - IDS_SUMMARYTITLE "Paigaldamise kokkuvõte" - IDS_SUMMARYSUBTITLE "Seadete kontrollimine enne paigaldamise alustamist" + IDS_RESTARTSUBTITLE "Paigaldamise esimene järk on lõpetatud, teise järgu alustamiseks taaskäivita arvuti." IDS_ABORTSETUP "ReactOS ei ole veel lõplikult paigaldatud. Kas soovite tõesti lahkuda?" IDS_ABORTSETUP2 "Katkestada paigaldamine?" IDS_NO_TXTSETUP_SIF "Ei leitud faili 'txtsetup.sif'.\nPaigaldust ei saa lõpuni viia." - IDS_CAPTION "ReactOS'i paigaldamine" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -218,12 +219,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/eu-ES.rc b/base/setup/reactos/lang/eu-ES.rc index 515008778f7..5ea81031a37 100644 --- a/base/setup/reactos/lang/eu-ES.rc +++ b/base/setup/reactos/lang/eu-ES.rc @@ -167,22 +167,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "Instalación de ReactOS" IDS_TYPETITLE "Bienvenido a la instalación de ReactOS" IDS_TYPESUBTITLE "Seleccione el tipo de instalación." IDS_DEVICETITLE "Instalación de los dispositivos básicos" IDS_DEVICESUBTITLE "Seleccione los ajustes de la pantalla y el teclado." IDS_DRIVETITLE "Crear la partición para la instalación y la carpeta del sistema" IDS_DRIVESUBTITLE "Preparar la partición para la instalación, la carpeta del sistema y el cargador de arranque." + IDS_SUMMARYTITLE "Resumen de la instalación" + IDS_SUMMARYSUBTITLE "Lista las propiedades de la instalación para su verificación antes de aplicarlas al dispositivo instalado." IDS_PROCESSTITLE "Preparar partición, copiar archivos e instalar sistema" - IDS_PROCESSSUBTITLE "Crear y formatear partición, copiar archivos, instalar e instalar el cargador de arranque" + IDS_PROCESSSUBTITLE "Crear y formatear partición, copiar archivos, instalar e instalar el cargador de arranque." IDS_RESTARTTITLE "Primera parte de la instalación finalizada" - IDS_RESTARTSUBTITLE "La primera parte de la instalación ha sido completada, reinicie para continuar con la segunda parte" - IDS_SUMMARYTITLE "Resumen de la instalación" - IDS_SUMMARYSUBTITLE "Lista las propiedades de la instalación para su verificación antes de aplicarlas al dispositivo instalado" + IDS_RESTARTSUBTITLE "La primera parte de la instalación ha sido completada, reinicie para continuar con la segunda parte." IDS_ABORTSETUP "ReactOS no está completamente instalado en su equipo. Si sale de la instalación ahora, tendrá que ejecutar el instalador otra vez para instalar ReactOS. ¿Realmente quiere salir?" IDS_ABORTSETUP2 "¿Abortar instalación?" IDS_NO_TXTSETUP_SIF "No se pudo encontrar 'txtsetup.sif'.\nLa instalación no puede continuar." - IDS_CAPTION "Instalación de ReactOS" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -225,12 +226,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/fi-FI.rc b/base/setup/reactos/lang/fi-FI.rc index 2060840e4ca..4acfbcce056 100644 --- a/base/setup/reactos/lang/fi-FI.rc +++ b/base/setup/reactos/lang/fi-FI.rc @@ -160,22 +160,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "ReactOS Setup" IDS_TYPETITLE "Welcome to ReactOS Setup" IDS_TYPESUBTITLE "Choose setup type." IDS_DEVICETITLE "Setup the basic devices" IDS_DEVICESUBTITLE "Set the settings of display and keyboard." IDS_DRIVETITLE "Setup the installation partition and system folder" IDS_DRIVESUBTITLE "Prepare installation partition, system folder and bootloader." + IDS_SUMMARYTITLE "Installation Summary" + IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device." IDS_PROCESSTITLE "Setup partition, copy files and setup system" - IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup bootloader" + IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup bootloader." IDS_RESTARTTITLE "First stage of setup finished" - IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" - IDS_SUMMARYTITLE "Installation Summary" - IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" + IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage." IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." - IDS_CAPTION "ReactOS Setup" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -218,12 +219,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/fr-FR.rc b/base/setup/reactos/lang/fr-FR.rc index 8377367c049..a0737ad3a39 100644 --- a/base/setup/reactos/lang/fr-FR.rc +++ b/base/setup/reactos/lang/fr-FR.rc @@ -160,22 +160,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "Installation de ReactOS" IDS_TYPETITLE "Bienvenue dans l'installation de ReactOS" IDS_TYPESUBTITLE "Choisissez un type d'installation." - IDS_DEVICETITLE "Configurer les périphériques de base." + IDS_DEVICETITLE "Configurer les périphériques de base" IDS_DEVICESUBTITLE "Configurer l'affichage et le clavier." - IDS_DRIVETITLE "Configurer la partition d'installation et le dossier système." + IDS_DRIVETITLE "Configurer la partition d'installation et le dossier système" IDS_DRIVESUBTITLE "Préparer la partition d'installation, le dossier système et le chargeur de démarrage." - IDS_PROCESSTITLE "Configurer la partition, copier les fichiers et configurer le système." + IDS_SUMMARYTITLE "Résumé de l'installation" + IDS_SUMMARYSUBTITLE "Lister les propriétés d'installation à vérifier avant application sur le périphérique d'installation." + IDS_PROCESSTITLE "Configurer la partition, copier les fichiers et configurer le système" IDS_PROCESSSUBTITLE "Créer et formatter la partition, copier les fichiers, installer et configurer le chargeur de démarrage." IDS_RESTARTTITLE "Première étape de configuration terminée" IDS_RESTARTSUBTITLE "La première étape de l'installation est terminée. Veuillez redémarrer pour continuer avec la seconde étape." - IDS_SUMMARYTITLE "Résumé de l'installation" - IDS_SUMMARYSUBTITLE "Lister les propriétés d'installation à vérifier avant application sur le périphérique d'installation." IDS_ABORTSETUP "ReactOS n'est pas complètement installé sur votre ordinateur. Si vous quittez l'installation maintenant, vous devrez lancer l'installation de nouveau pour installer ReactOS. Voulez-vous quitter ?" IDS_ABORTSETUP2 "Abandonner l'installation ?" IDS_NO_TXTSETUP_SIF "Impossible de trouver 'txtsetup.sif'.\nL'installation ne peut continuer." - IDS_CAPTION "Installation de ReactOS" + IDS_INSTALLBTN "&Installer" IDS_VOLUME_NOFORMAT "Non formaté" END @@ -218,12 +219,16 @@ BEGIN IDS_RENAMING "Renomme %s en %s" IDS_DELETING "Supprime %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuration de la partition système..." IDS_PREPARE_PARTITIONS "Prépare les partitions..." IDS_PREPARE_FILES "Prépare la liste de fichiers à copier, veuillez patienter..." IDS_COPYING_FILES "Copie les fichiers..." IDS_CREATE_REGISTRY "Crée la base de registres..." IDS_UPDATE_REGISTRY "Mise à jour de la base de registres..." + + // IDS_INSTALL_FINALIZE "Finalisation de l'installation..." + IDS_INSTALL_BOOTLOADER "Installation du chargeur de démarrage..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/he-IL.rc b/base/setup/reactos/lang/he-IL.rc index 4e36e313204..1530d86da94 100644 --- a/base/setup/reactos/lang/he-IL.rc +++ b/base/setup/reactos/lang/he-IL.rc @@ -162,22 +162,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "התקנת ReactOS" IDS_TYPETITLE "ברוכים הבאים לתוכנית ההתקנה של ReactOS" IDS_TYPESUBTITLE "בחירת סוג התקנה." IDS_DEVICETITLE "Setup the basic devices" IDS_DEVICESUBTITLE "Set the settings of display and keyboard." IDS_DRIVETITLE "Setup the installation partition and system folder" IDS_DRIVESUBTITLE "Prepare installation partition, system folder and bootloader." + IDS_SUMMARYTITLE "סיכום ההתקנה" + IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device." IDS_PROCESSTITLE "Setup partition, copy files and setup system" - IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup bootloader" + IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup bootloader." IDS_RESTARTTITLE "First stage of setup finished" - IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" - IDS_SUMMARYTITLE "סיכום ההתקנה" - IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" + IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage." IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "לבטל את ההתקנה?" IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." - IDS_CAPTION "התקנת ReactOS" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -220,12 +221,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/hi-IN.rc b/base/setup/reactos/lang/hi-IN.rc index 787f9dfaca4..e0c2fbc9202 100644 --- a/base/setup/reactos/lang/hi-IN.rc +++ b/base/setup/reactos/lang/hi-IN.rc @@ -138,22 +138,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "रिऐक्ट ओएस सेटअप" IDS_TYPETITLE "रिऐक्ट ओएस सेटअप में आपका स्वागत है" IDS_TYPESUBTITLE "सेटअप प्रकार चुनें।" IDS_DEVICETITLE "बुनियादी डिवाइसों को सेटअप करें" IDS_DEVICESUBTITLE "डिस्प्ले और कीबोर्ड की सेटिंग्स सेट करें।" IDS_DRIVETITLE "इन्स्टलेशन विभाजन और सिस्टम फ़ोल्डर सेटअप करें" IDS_DRIVESUBTITLE "इन्स्टलेशन विभाजन, सिस्टम फ़ोल्डर और बूट लोडर तैयार करें।" + IDS_SUMMARYTITLE "इन्स्टलेशन सारांश" + IDS_SUMMARYSUBTITLE "इन्स्टलेशन डिवाइस पर लागू करने से पहले जांच करने के लिए इन्स्टलेशन गुणों की सूची" IDS_PROCESSTITLE "सेटअप विभाजन, कॉपी फ़ाइलें और सेटअप सिस्टम" IDS_PROCESSSUBTITLE "विभाजन बनाएं और फ़ॉर्मेट करें, फ़ाइलें कॉपी करें, बूट लोडर को इंस्टॉल करें और सेटअप करें" IDS_RESTARTTITLE "सेटअप का पहला चरण समाप्त हो गया" IDS_RESTARTSUBTITLE "सेटअप का पहला चरण पूरा हो गया है, दूसरे चरण के साथ जारी रखने के लिए रीस्टॉर्ट करें" - IDS_SUMMARYTITLE "इन्स्टलेशन सारांश" - IDS_SUMMARYSUBTITLE "इन्स्टलेशन डिवाइस पर लागू करने से पहले जांच करने के लिए इन्स्टलेशन गुणों की सूची" IDS_ABORTSETUP "रिऐक्ट ओएस आपके कंप्यूटर पर पूरी तरह से इंस्टॉल नहीं है। अगर आप अभी सेटअप को छोड़ देते हैं, तो आपको रिऐक्ट ओएस इंस्टॉल करने के लिए सेटअप को फिर से चलाने की आवश्यकता होगी। आपको वास्तव में छोड़ना है?" IDS_ABORTSETUP2 "इन्स्टलेशन रद्द करें?" - IDS_NO_TXTSETUP_SIF "'txtsetup.sif' खोजने में असमर्थ\nसेटअप जारी रखने में असमर्थ है " - IDS_CAPTION "रिऐक्ट ओएस सेटअप" + IDS_NO_TXTSETUP_SIF "'txtsetup.sif' खोजने में असमर्थ\nसेटअप जारी रखने में असमर्थ है" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -188,12 +189,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/hu-HU.rc b/base/setup/reactos/lang/hu-HU.rc index 3624c26ccd6..93e27c3d5ca 100644 --- a/base/setup/reactos/lang/hu-HU.rc +++ b/base/setup/reactos/lang/hu-HU.rc @@ -162,22 +162,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "ReactOS Setup" IDS_TYPETITLE "Welcome to ReactOS Setup" IDS_TYPESUBTITLE "Choose setup type." IDS_DEVICETITLE "Setup the basic devices" IDS_DEVICESUBTITLE "Set the settings of display and keyboard." IDS_DRIVETITLE "Setup the installation partition and system folder" IDS_DRIVESUBTITLE "Prepare installation partition, system folder and bootloader." + IDS_SUMMARYTITLE "Installation Summary" + IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device." IDS_PROCESSTITLE "Setup partition, copy files and setup system" - IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup bootloader" + IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup bootloader." IDS_RESTARTTITLE "First stage of setup finished" - IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" - IDS_SUMMARYTITLE "Installation Summary" - IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" + IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage." IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." - IDS_CAPTION "ReactOS Setup" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -220,12 +221,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/id-ID.rc b/base/setup/reactos/lang/id-ID.rc index 8181054b616..faeb2b7e961 100644 --- a/base/setup/reactos/lang/id-ID.rc +++ b/base/setup/reactos/lang/id-ID.rc @@ -160,22 +160,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "Penyetelan ReactOS" IDS_TYPETITLE "Selamat datang di Penyetelan ReactOS" - IDS_TYPESUBTITLE "Pilih jenis penyetelan" + IDS_TYPESUBTITLE "Pilih jenis penyetelan." IDS_DEVICETITLE "Menyetel perangkat dasar" - IDS_DEVICESUBTITLE "Setel pengaturan tampilan dan papan ketik" + IDS_DEVICESUBTITLE "Setel pengaturan tampilan dan papan ketik." IDS_DRIVETITLE "Penyetelan pemasangan partisi dan folder sistem" - IDS_DRIVESUBTITLE "Menyiapkan pemasangan partisi, folder sistem dan bootloader" + IDS_DRIVESUBTITLE "Menyiapkan pemasangan partisi, folder sistem dan bootloader." + IDS_SUMMARYTITLE "Ringkasan Pemasangan" + IDS_SUMMARYSUBTITLE "Cek daftar properti pemasangan sebelum menerapkan pemasangan perangkat." IDS_PROCESSTITLE "Penyetelan partisi, penyalinan berkas dan sistem" - IDS_PROCESSSUBTITLE "Buat dan format partisi, salin berkas, pasang dan setel bootloader" + IDS_PROCESSSUBTITLE "Buat dan format partisi, salin berkas, pasang dan setel bootloader." IDS_RESTARTTITLE "Penyetelan tahap pertama selesai" - IDS_RESTARTSUBTITLE "Babak pertama dari penyetelan ini telah selesai, mulai ulang untuk meneruskan ke tahap kedua" - IDS_SUMMARYTITLE "Ringkasan Pemasangan" - IDS_SUMMARYSUBTITLE "Cek daftar properti pemasangan sebelum menerapkan pemasangan perangkat" + IDS_RESTARTSUBTITLE "Babak pertama dari penyetelan ini telah selesai, mulai ulang untuk meneruskan ke tahap kedua." IDS_ABORTSETUP "ReactOS tidak sepenuhnya terpasang pada komputer ini. Jika kamu keluar dari penyetelan ini, kamu harus menjalankan lagi penyetelan ini untuk memasang ReactOS. Yakin ingin keluar?" IDS_ABORTSETUP2 "Gugurkan pemasangan?" IDS_NO_TXTSETUP_SIF "Tidak bisa menemukan 'txtsetup.sif'.\nPenyetelan tidak bisa dilanjutkan." - IDS_CAPTION "Penyetelan ReactOS" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -218,12 +219,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/it-IT.rc b/base/setup/reactos/lang/it-IT.rc index f071c217f10..31368d06602 100644 --- a/base/setup/reactos/lang/it-IT.rc +++ b/base/setup/reactos/lang/it-IT.rc @@ -160,22 +160,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "Installazione di ReactOS" IDS_TYPETITLE "Benvenuti nell'installazione di ReactOS" IDS_TYPESUBTITLE "Scegliere il tipo di installazione." IDS_DEVICETITLE "Impostazione dei dispositivi di base" IDS_DEVICESUBTITLE "Impostazione di monitor e tastiera." IDS_DRIVETITLE "Impostazione della partizione e della cartella per la installazione" IDS_DRIVESUBTITLE "Preparazione di partizione, cartella di sistema e Bootloader." + IDS_SUMMARYTITLE "Sintesi della installazione" + IDS_SUMMARYSUBTITLE "Lista delle proprietà della installazione da controllare prima che siano eseguite sul dispositivo di installazione." IDS_PROCESSTITLE "Preparazione della partizione, copia dei file e configurazione del sistema" - IDS_PROCESSSUBTITLE "Creazione e formattazione della partizione, copia dei file, installazione del Bootloader" + IDS_PROCESSSUBTITLE "Creazione e formattazione della partizione, copia dei file, installazione del Bootloader." IDS_RESTARTTITLE "Prima fase della installazione completata" - IDS_RESTARTSUBTITLE "La prima fase della installazione è stata completata, riavviare il computer per procedere alla seconda fase" - IDS_SUMMARYTITLE "Sintesi della installazione" - IDS_SUMMARYSUBTITLE "Lista delle proprietà della installazione da controllare prima che siano eseguite sul dispositivo di installazione" + IDS_RESTARTSUBTITLE "La prima fase della installazione è stata completata, riavviare il computer per procedere alla seconda fase." IDS_ABORTSETUP "ReactOS non è installato completamente sul computer. Se interropete l'installazione ora sarà necessario eseguire l'installazione di nuovo. Volete procedere?" IDS_ABORTSETUP2 "Volete interrompere l'installazione?" IDS_NO_TXTSETUP_SIF "Impossibile trovare 'txtsetup.sif'.\nL'installazione non può continuare." - IDS_CAPTION "Installazione di ReactOS" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -218,12 +219,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/ja-JP.rc b/base/setup/reactos/lang/ja-JP.rc index 9301269e54f..580d42049bc 100644 --- a/base/setup/reactos/lang/ja-JP.rc +++ b/base/setup/reactos/lang/ja-JP.rc @@ -160,22 +160,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "ReactOS セットアップ" IDS_TYPETITLE "ReactOS セットアップにようこそ" - IDS_TYPESUBTITLE "セットアップの種類を選んで下さい" + IDS_TYPESUBTITLE "セットアップの種類を選んで下さい。" IDS_DEVICETITLE "基本デバイスをセットアップします" - IDS_DEVICESUBTITLE "ディスプレイとキーボードの設定をします" + IDS_DEVICESUBTITLE "ディスプレイとキーボードの設定をします。" IDS_DRIVETITLE "インストール先パーティションとシステムフォルダをセットアップします" - IDS_DRIVESUBTITLE "インストール先のパーティション、システムフォルダ、ブートローダを準備します" + IDS_DRIVESUBTITLE "インストール先のパーティション、システムフォルダ、ブートローダを準備します。" + IDS_SUMMARYTITLE "インストールの要約" + IDS_SUMMARYSUBTITLE "インストールするデバイスを適用する前にチェックするインストールプロパティをリストアップします。" IDS_PROCESSTITLE "パーティションをセットアップし、ファイルをコピーし、システムをセットアップします" - IDS_PROCESSSUBTITLE "パーティションを作成・フォーマットし、ファイルをコピーし、ブートローダをインストール・セットアップします" + IDS_PROCESSSUBTITLE "パーティションを作成・フォーマットし、ファイルをコピーし、ブートローダをインストール・セットアップします。" IDS_RESTARTTITLE "最初の段階は完了しました" - IDS_RESTARTSUBTITLE "セットアップの最初の段階が完了しました。第二の段階に進むために再起動します" - IDS_SUMMARYTITLE "インストールの要約" - IDS_SUMMARYSUBTITLE "インストールするデバイスを適用する前にチェックするインストールプロパティをリストアップします" + IDS_RESTARTSUBTITLE "セットアップの最初の段階が完了しました。第二の段階に進むために再起動します。" IDS_ABORTSETUP "ReactOSはあなたのコンピュータへのインストールが完了していません。もしセットアップをここで中断すれば、ReactOSをインストールするために、セットアップを再起動する必要があります。本当に中断しますか?" IDS_ABORTSETUP2 "インストールを中断しますか?" IDS_NO_TXTSETUP_SIF "'txtsetup.sif'が見つかりません。\nセットアップは続行できません。" - IDS_CAPTION "ReactOS セットアップ" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -218,12 +219,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/ms-MY.rc b/base/setup/reactos/lang/ms-MY.rc index 733abf5613f..a7cd0c0921f 100644 --- a/base/setup/reactos/lang/ms-MY.rc +++ b/base/setup/reactos/lang/ms-MY.rc @@ -162,22 +162,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "ReactOS Persediaan" IDS_TYPETITLE "Selamat datang ke persediaan ReactOS" IDS_TYPESUBTITLE "Pilih jenis persediaan." IDS_DEVICETITLE "Sediakan peranti asas" IDS_DEVICESUBTITLE "Setkan seting paparan dan papan kekunci." IDS_DRIVETITLE "Sediakan folder pemasangan partition dan sistem" IDS_DRIVESUBTITLE "Menyediakan pemasangan partition, folder sistem dan bootloader." + IDS_SUMMARYTITLE "Ringkasan pemasangan" + IDS_SUMMARYSUBTITLE "Senarai pemasangan sifat-sifat untuk menyemak sebelum digunakan untuk pemasangan peranti." IDS_PROCESSTITLE "Persediaan partition, salinan fail dan sistem persediaan" - IDS_PROCESSSUBTITLE "Cipta dan format partition, menyalin fail, memasang dan sediakan bootloader" + IDS_PROCESSSUBTITLE "Cipta dan format partition, menyalin fail, memasang dan sediakan bootloader." IDS_RESTARTTITLE "Tahap pertama Persediaan selesai" - IDS_RESTARTSUBTITLE "Tahap pertama persediaan telah selesai, mula semula untuk meneruskan peringkat kedua" - IDS_SUMMARYTITLE "Ringkasan pemasangan" - IDS_SUMMARYSUBTITLE "Senarai pemasangan sifat-sifat untuk menyemak sebelum digunakan untuk pemasangan peranti" + IDS_RESTARTSUBTITLE "Tahap pertama persediaan telah selesai, mula semula untuk meneruskan peringkat kedua." IDS_ABORTSETUP "ReactOS tidak benar-benar dipasang pada komputer anda. Jika anda berhenti persediaan sekarang, anda akan perlu untuk menjalankan persediaan untuk memasang ReactOS lagi. Benar-benar berhenti?" IDS_ABORTSETUP2 "Henti paksa pemasangan?" IDS_NO_TXTSETUP_SIF "Persediaan tidak dapat mencari 'txtsetup.sif'.\nPersediaan tidak dapat meneruskan." - IDS_CAPTION "ReactOS Persediaan" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -220,12 +221,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/no-NO.rc b/base/setup/reactos/lang/no-NO.rc index 1d9447cfc1b..2b4949e4b96 100644 --- a/base/setup/reactos/lang/no-NO.rc +++ b/base/setup/reactos/lang/no-NO.rc @@ -160,22 +160,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "ReactOS installering" IDS_TYPETITLE "Velkommen til ReactOS installering" IDS_TYPESUBTITLE "Velg installering type." IDS_DEVICETITLE "Installer grunnleggende enheter" IDS_DEVICESUBTITLE "Velg innstillingene til skjermen og tastaturet." IDS_DRIVETITLE "Valg av installasjon partisjon og system mappe" IDS_DRIVESUBTITLE "Forbrede installasjon partisjon, system mappe og oppstartslaster." + IDS_SUMMARYTITLE "Installasjon oppsumering" + IDS_SUMMARYSUBTITLE "Sjekk listen av installasjon egenskapene før du fortsetter installasjon av enhetene." IDS_PROCESSTITLE "Forbrede partisjon, kopiere filer og installere system" - IDS_PROCESSSUBTITLE "Opprett og formater partisjon, kopier filer, installere og sett opp oppstartlaster" + IDS_PROCESSSUBTITLE "Opprett og formater partisjon, kopier filer, installere og sett opp oppstartlaster." IDS_RESTARTTITLE "Første steget av installering er fullført" - IDS_RESTARTSUBTITLE "Første steget av installering har blitt fullført, start på nytt for å fortsette til andre steget" - IDS_SUMMARYTITLE "Installasjon oppsumering" - IDS_SUMMARYSUBTITLE "Sjekk listen av installasjon egenskapene før du fortsetter installasjon av enhetene" + IDS_RESTARTSUBTITLE "Første steget av installering har blitt fullført, start på nytt for å fortsette til andre steget." IDS_ABORTSETUP "ReactOS er ikke fullstendig installert på datamaskinen. Hvis du avslutter nå, trenger du å kjøre installeringen på nytt for å installere ReactOS. Vil du virkelig avslutte?" IDS_ABORTSETUP2 "Avbryt installasjonen?" IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." - IDS_CAPTION "ReactOS installering" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -218,12 +219,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/pl-PL.rc b/base/setup/reactos/lang/pl-PL.rc index 5afae2e1781..c077f071a43 100644 --- a/base/setup/reactos/lang/pl-PL.rc +++ b/base/setup/reactos/lang/pl-PL.rc @@ -171,22 +171,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "Instalator systemu ReactOS" IDS_TYPETITLE "Witamy w Kreatorze instalacji systemu ReactOS" IDS_TYPESUBTITLE "Wybierz typ instalacji." IDS_DEVICETITLE "Ustawienia podstawowych urządzeń" IDS_DEVICESUBTITLE "Zmień ustawienia monitora i klawiatury." IDS_DRIVETITLE "Ustaw partycję instalacji i katalog systemowy" IDS_DRIVESUBTITLE "Przygotuj partycje instalacji, katalog systemowy i menedżer rozruchu." + IDS_SUMMARYTITLE "Podsumowanie instalacji" + IDS_SUMMARYSUBTITLE "Sprawdź ustawienia instalacji przed dokonaniem zmian na dysku." IDS_PROCESSTITLE "Przygotuj partycję, skopiuj pliki i zapisz ustawienia systemu" - IDS_PROCESSSUBTITLE "Przygotuj i sformatuj partycję, skopiuj pliki, skopiuj i zainstaluj menedżer rozruchu" + IDS_PROCESSSUBTITLE "Przygotuj i sformatuj partycję, skopiuj pliki, skopiuj i zainstaluj menedżer rozruchu." IDS_RESTARTTITLE "Pierwszy etap instalacji pomyślnie zakończony" - IDS_RESTARTSUBTITLE "Pierwszy etap instalacji został zakończony, uruchom ponownie komputer, aby przejść do drugiego etapu" - IDS_SUMMARYTITLE "Podsumowanie instalacji" - IDS_SUMMARYSUBTITLE "Sprawdź ustawienia instalacji przed dokonaniem zmian na dysku" + IDS_RESTARTSUBTITLE "Pierwszy etap instalacji został zakończony, uruchom ponownie komputer, aby przejść do drugiego etapu." IDS_ABORTSETUP "Instalacja systemu ReactOS nie została ukończona na tym komputerze. Jeśli teraz zakończysz instalację, wymagane będzie ponowne uruchomienie instalatora, aby zainstalować system ReactOS. Czy na pewno chcesz teraz zakończyć?" IDS_ABORTSETUP2 "Czy na pewno chcesz przerwać instalację?" IDS_NO_TXTSETUP_SIF "Nie można znaleźć pliku 'txtsetup.sif'.\nInstalator nie może kontynuować." - IDS_CAPTION "Instalator systemu ReactOS" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -229,12 +230,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/pt-BR.rc b/base/setup/reactos/lang/pt-BR.rc index fa6f3c4b1e6..750fff7a706 100644 --- a/base/setup/reactos/lang/pt-BR.rc +++ b/base/setup/reactos/lang/pt-BR.rc @@ -160,22 +160,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "Instalação do ReactOS" IDS_TYPETITLE "Bem-vindo(a) a Instalação do ReactOS" IDS_TYPESUBTITLE "Escolha o modo de instalação." IDS_DEVICETITLE "Instalar dispositivos básicos" IDS_DEVICESUBTITLE "Definir as configurações de monitor e teclado." IDS_DRIVETITLE "Configurar a partição de instalação e pasta do sistema" IDS_DRIVESUBTITLE "Preparando partição de instalação, pasta do sistema e bootloader." + IDS_SUMMARYTITLE "Sumário de Instalação" + IDS_SUMMARYSUBTITLE "Listar propriedades da instalação para verificação antes de aplicá-las na instalação dos despositivos." IDS_PROCESSTITLE "Preparar partição, copiar arquivos e configurar sistema" - IDS_PROCESSSUBTITLE "Criar e formatar partição, copiar arquivos, instalar e configurar bootloader" + IDS_PROCESSSUBTITLE "Criar e formatar partição, copiar arquivos, instalar e configurar bootloader." IDS_RESTARTTITLE "Primeira etapa de instalação finalizada" - IDS_RESTARTSUBTITLE "A primeira etapada da instalação foi completada, reinicie o computador para prosseguir com a segunda estapa" - IDS_SUMMARYTITLE "Sumário de Instalação" - IDS_SUMMARYSUBTITLE "Listar propriedades da instalação para verificação antes de aplicá-las na instalação dos despositivos" + IDS_RESTARTSUBTITLE "A primeira etapada da instalação foi completada, reinicie o computador para prosseguir com a segunda estapa." IDS_ABORTSETUP "ReactOS não está totalmente instalado em seu computador. Se você sair da Instalação agora, você precisará executar o Instalador novamente para instalar o ReactOS. Tem certeza que deseja sair?" IDS_ABORTSETUP2 "Abortar instalação?" IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." - IDS_CAPTION "Instalação do ReactOS" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -218,12 +219,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/pt-PT.rc b/base/setup/reactos/lang/pt-PT.rc index 26162b708c0..e7867b4b93a 100644 --- a/base/setup/reactos/lang/pt-PT.rc +++ b/base/setup/reactos/lang/pt-PT.rc @@ -160,22 +160,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "Instalação do ReactOS" IDS_TYPETITLE "Bem-vindo(a) a Instalação do ReactOS" IDS_TYPESUBTITLE "Escolha o modo de instalação." IDS_DEVICETITLE "Instalar dispositivos básicos" IDS_DEVICESUBTITLE "Definir as configurações de monitor e teclado." IDS_DRIVETITLE "Configurar a partição de instalação e pasta do sistema" IDS_DRIVESUBTITLE "A preparar a partição de instalação, pasta do sistema e bootloader." + IDS_SUMMARYTITLE "Sumário de Instalação" + IDS_SUMMARYSUBTITLE "Listar propriedades da instalação para verificação antes de aplicá-las na instalação dos despositivos." IDS_PROCESSTITLE "Preparar partição, copiar arquivos e configurar sistema" - IDS_PROCESSSUBTITLE "Criar e formatar partição, copiar arquivos, instalar e configurar bootloader" + IDS_PROCESSSUBTITLE "Criar e formatar partição, copiar arquivos, instalar e configurar bootloader." IDS_RESTARTTITLE "Primeira etapa de instalação finalizada" - IDS_RESTARTSUBTITLE "A primeira etapada da instalação foi completada, reinicie o computador para prosseguir com a segunda estapa" - IDS_SUMMARYTITLE "Sumário de Instalação" - IDS_SUMMARYSUBTITLE "Listar propriedades da instalação para verificação antes de aplicá-las na instalação dos despositivos" + IDS_RESTARTSUBTITLE "A primeira etapada da instalação foi completada, reinicie o computador para prosseguir com a segunda estapa." IDS_ABORTSETUP "ReactOS não está totalmente instalado no seu computador. Se sair da Instalação agora, para instalar o ReactOS precisará executar o Instalador novamente. Tem certeza que deseja sair?" IDS_ABORTSETUP2 "Abortar instalação?" IDS_NO_TXTSETUP_SIF " 'txtsetup.sif' não foi encontrado.\n o programa de instalação não pode continuar." - IDS_CAPTION "Instalação do ReactOS" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -218,12 +219,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/ro-RO.rc b/base/setup/reactos/lang/ro-RO.rc index 209973a0e68..c0122941cfb 100644 --- a/base/setup/reactos/lang/ro-RO.rc +++ b/base/setup/reactos/lang/ro-RO.rc @@ -169,22 +169,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "Expertul de instalare ReactOS" IDS_TYPETITLE "Bun venit la instalarea ReactOS" IDS_TYPESUBTITLE "Alegeți tipul de instalare." IDS_DEVICETITLE "Instalare dispozitive de bază" IDS_DEVICESUBTITLE "Stabilirea parametrilor de afișare și tastatură." IDS_DRIVETITLE "Stabilirea destinației" IDS_DRIVESUBTITLE "Pregătirea partiției de instalare, a folderului de sistem și a inițializatorului." + IDS_SUMMARYTITLE "Rezumat de instalare" + IDS_SUMMARYSUBTITLE "Lista cu opțiuni de instalare ce necesită verificare înainte de a continua instalarea." IDS_PROCESSTITLE "Executare pași de instalare" IDS_PROCESSSUBTITLE "Crearea și formatarea partiției, copierea de fișiere și instalarea inițializatorului." IDS_RESTARTTITLE "Finalizare primă etapă" IDS_RESTARTSUBTITLE "Prima etapă a instalarii a fost încheiată cu succes, reporniți pentru a doua etapă." - IDS_SUMMARYTITLE "Rezumat de instalare" - IDS_SUMMARYSUBTITLE "Lista cu opțiuni de instalare ce necesită verificare înainte de a continua instalarea." IDS_ABORTSETUP "ReactOS încă nu este complet instalat în calculator. Daca întrerupeți procesul de instalare, pentru a instala va fi necesară repetarea pașilor parcurși până acum. Sigur doriți asta?" IDS_ABORTSETUP2 "Abandonați instalarea?" IDS_NO_TXTSETUP_SIF "Fișierului „txtsetup.sif” nu poate fi găsit.\nInstalarea nu poate continua." - IDS_CAPTION "Expertul de instalare ReactOS" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -227,12 +228,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/ru-RU.rc b/base/setup/reactos/lang/ru-RU.rc index db2a6c843e6..eacc18ce39d 100644 --- a/base/setup/reactos/lang/ru-RU.rc +++ b/base/setup/reactos/lang/ru-RU.rc @@ -160,22 +160,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "Установка ReactOS" IDS_TYPETITLE "Вас приветствует программа установки ReactOS" IDS_TYPESUBTITLE "Выберите тип установки." IDS_DEVICETITLE "Установка базовых устройств" IDS_DEVICESUBTITLE "Настройка параметров экрана и клавиатуры." IDS_DRIVETITLE "Выбор расположения на диске и системного каталога" IDS_DRIVESUBTITLE "Подготовка раздела диска, системного каталога и загрузчика." + IDS_SUMMARYTITLE "Сводка" + IDS_SUMMARYSUBTITLE "Проверьте список параметров перед началом установки." IDS_PROCESSTITLE "Подготовка раздела диска, копирование системных файлов" - IDS_PROCESSSUBTITLE "Создание раздела на диске, копирование файлов, установка загрузчика" + IDS_PROCESSSUBTITLE "Создание раздела на диске, копирование файлов, установка загрузчика." IDS_RESTARTTITLE "Первый этап установки закончен" - IDS_RESTARTSUBTITLE "Первый этап закончен, для продолжения требуется перезагрузка" - IDS_SUMMARYTITLE "Сводка" - IDS_SUMMARYSUBTITLE "Проверьте список параметров перед началом установки" + IDS_RESTARTSUBTITLE "Первый этап закончен, для продолжения требуется перезагрузка." IDS_ABORTSETUP "ReactOS установлен на компьютер не полностью. Если вы закроете программу установки сейчас, в дальнейшем вам придется повторить установку ReactOS. Вы уверены, что необходимо прервать установку?" IDS_ABORTSETUP2 "Прервать установку?" IDS_NO_TXTSETUP_SIF "Не удалось найти файл 'txtsetup.sif'.\nПродолжение установки невозможно." - IDS_CAPTION "Установка ReactOS" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -218,12 +219,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/sk-SK.rc b/base/setup/reactos/lang/sk-SK.rc index 1bed0d0a631..d94b765f188 100644 --- a/base/setup/reactos/lang/sk-SK.rc +++ b/base/setup/reactos/lang/sk-SK.rc @@ -165,22 +165,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "ReactOS Setup" IDS_TYPETITLE "Víta Vás inštalátor systému ReactOS" //Welcome to ReactOS Setup IDS_TYPESUBTITLE "Choose setup type." IDS_DEVICETITLE "Setup the basic devices" IDS_DEVICESUBTITLE "Set the settings of display and keyboard." IDS_DRIVETITLE "Setup the installation partition and system folder" IDS_DRIVESUBTITLE "Prepare installation partition, system folder and bootloader." + IDS_SUMMARYTITLE "Zhrnutie inštalácie" + IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device." IDS_PROCESSTITLE "Prepare partition, copy files and setup system" - IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup bootloader" + IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup bootloader." IDS_RESTARTTITLE "First stage of setup finished" - IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" - IDS_SUMMARYTITLE "Zhrnutie inštalácie" - IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" + IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage." IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Naozaj skončiť?" IDS_ABORTSETUP2 "Prerušiť inštaláciu?" IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." - IDS_CAPTION "ReactOS Setup" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -223,12 +224,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/sq-AL.rc b/base/setup/reactos/lang/sq-AL.rc index 0d4641bf045..99b09a3d02c 100644 --- a/base/setup/reactos/lang/sq-AL.rc +++ b/base/setup/reactos/lang/sq-AL.rc @@ -162,22 +162,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "ReactOS Setup" IDS_TYPETITLE "Mirë se vini në instalimin e ReactOS" IDS_TYPESUBTITLE "Zgjidhni llojin e instalimit." IDS_DEVICETITLE "Instaloni pajisjet themelore" IDS_DEVICESUBTITLE "Vendos parametrat e ekranit dhe tastieres." IDS_DRIVETITLE "Konfiguro particionet për instalim dhe dosjet e sistemit" IDS_DRIVESUBTITLE "Pergatit particionet për instalim, dosjet e sistemit dhe bootloaderin." + IDS_SUMMARYTITLE "Përmbajtja e instalimit" + IDS_SUMMARYSUBTITLE "Listo të dhënat e instalimit për të kontrolluar para së të aplikohen për pajisjet e instalimit/kompjuterit." IDS_PROCESSTITLE "Konfiguro particionet, kopjo dokumentat dhe konfiguro sistemin" - IDS_PROCESSSUBTITLE "Krijo dhe formato particionet, kopjo dokumentat, insalo dhe konfiguro bootloaderin" + IDS_PROCESSSUBTITLE "Krijo dhe formato particionet, kopjo dokumentat, insalo dhe konfiguro bootloaderin." IDS_RESTARTTITLE "Faza e pare e instalimit ka perfunduar" - IDS_RESTARTSUBTITLE "Faza e pare e instalimit ka perfunduar, rinisni për të vazhduar me fazen e dytë" - IDS_SUMMARYTITLE "Përmbajtja e instalimit" - IDS_SUMMARYSUBTITLE "Listo të dhënat e instalimit për të kontrolluar para së të aplikohen për pajisjet e instalimit/kompjuterit" + IDS_RESTARTSUBTITLE "Faza e pare e instalimit ka perfunduar, rinisni për të vazhduar me fazen e dytë." IDS_ABORTSETUP "ReactOS nuk është instaluar plotësisht në kompjuterin tuaj. Nëse ju dilni nga instalimi tani, do ju duhet të filloni instalimin përsëri për të instalumar ReactOS. Doni ta mbyllni?" IDS_ABORTSETUP2 "Ndërpritni Instalimin?" IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." - IDS_CAPTION "ReactOS Setup" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -220,12 +221,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/tr-TR.rc b/base/setup/reactos/lang/tr-TR.rc index 7c5196fcdfc..3cba7f7a35f 100644 --- a/base/setup/reactos/lang/tr-TR.rc +++ b/base/setup/reactos/lang/tr-TR.rc @@ -167,22 +167,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "ReactOS Kur" IDS_TYPETITLE "ReactOS Kurulum Yöneticisine Hoş Geldiniz" IDS_TYPESUBTITLE "Kurulum türünü seçiniz." IDS_DEVICETITLE "Ana Aygıtların Kurulumu" IDS_DEVICESUBTITLE "Ekran ve Klavye ayarlarını yapınız." IDS_DRIVETITLE "Kurulum Bölümünün ve Sistem Dizininin Hazırlanması" IDS_DRIVESUBTITLE "Kurulum bölümünü, sistem dizinini ve önyükleyiciyi hazırlayınız." + IDS_SUMMARYTITLE "Kurulum Özeti" + IDS_SUMMARYSUBTITLE "Kurulumdan aygıtına uygulanmadan önce gözden geçirmek için listelenen kurulum seçenekleri." IDS_PROCESSTITLE "Bölümün Biçimlendirilmesi, Dosyaların Kopyalanması ve Önyükleyicinin Kurulması" IDS_PROCESSSUBTITLE "Bölüm oluşturuluyor ve biçimlendiriliyor, dosyalar kopyalanıyor, önyükleyici kuruluyor ve hazırlanıyor." IDS_RESTARTTITLE "Kurulumun İlk Aşaması Bitti" IDS_RESTARTSUBTITLE "Kurulumun ilk aşaması bitirildi, ikinci aşamaya geçmek için yeniden başlatınız." - IDS_SUMMARYTITLE "Kurulum Özeti" - IDS_SUMMARYSUBTITLE "Kurulumdan aygıtına uygulanmadan önce gözden geçirmek için listelenen kurulum seçenekleri." IDS_ABORTSETUP "ReactOS, bilgisayarınıza tümüyle kurulamadı. Eğer şimdi Kurulum Yöneticisinden çıkarsanız, ReactOS'u kurmak için Kurulum Yöneticisini yeniden çalıştırmayı isteybilirsiniz. Gerçekten çıkılsın mı?" IDS_ABORTSETUP2 "Kurulum iptal edilsin mi?" IDS_NO_TXTSETUP_SIF """txtsetup.sif"" bulunamıyor.\nKurulum Yöneticisi sürdüremiyor." - IDS_CAPTION "ReactOS Kur" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -225,12 +226,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/uk-UA.rc b/base/setup/reactos/lang/uk-UA.rc index 80a8f388094..3ddeee167a2 100644 --- a/base/setup/reactos/lang/uk-UA.rc +++ b/base/setup/reactos/lang/uk-UA.rc @@ -168,22 +168,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "Встановлення ReactOS" IDS_TYPETITLE "Вас вітає програма встановлення ReactOS" IDS_TYPESUBTITLE "Виберіть тип встановлення." IDS_DEVICETITLE "Встановлення базових пристроїв" IDS_DEVICESUBTITLE "Налаштування параметрів екрану та клавіатури." IDS_DRIVETITLE "Вибір розташування на диску і системного каталогу" IDS_DRIVESUBTITLE "Підготовка розділу диска, системного каталогу та завантажувача." + IDS_SUMMARYTITLE "Інформація про Встановлення" + IDS_SUMMARYSUBTITLE "Перевірте список властивостей встановлення, перш ніж почати встановлення системи." IDS_PROCESSTITLE "Підготовка розділу диска, копіювання системних файлів" - IDS_PROCESSSUBTITLE "Створення розділу на диску, копіювання файлів, встановлення завантажувача" + IDS_PROCESSSUBTITLE "Створення розділу на диску, копіювання файлів, встановлення завантажувача." IDS_RESTARTTITLE "Перший етап встановлення завершено" - IDS_RESTARTSUBTITLE "Перший етап завершено, для продовження потрібне перезавантаження" - IDS_SUMMARYTITLE "Інформація про Встановлення" - IDS_SUMMARYSUBTITLE "Перевірте список властивостей встановлення, перш ніж почати встановлення системи" + IDS_RESTARTSUBTITLE "Перший етап завершено, для продовження потрібне перезавантаження." IDS_ABORTSETUP "ReactOS встановлений на комп'ютер не повністю. Якщо ви закриєте програму встановлення зараз, в подальшому вам доведеться повторити встановлення ReactOS. Ви впевнені, що необхідно перервати встановлення?" IDS_ABORTSETUP2 "Перервати встановлення?" IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." - IDS_CAPTION "Встановлення ReactOS" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -226,12 +227,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/vi-VN.rc b/base/setup/reactos/lang/vi-VN.rc index 75aa2a299c3..b082e0e475f 100644 --- a/base/setup/reactos/lang/vi-VN.rc +++ b/base/setup/reactos/lang/vi-VN.rc @@ -160,22 +160,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "Cài đặt ReactOS" IDS_TYPETITLE "Chào mừng tới trình Thiết lập ReactOS" IDS_TYPESUBTITLE "Chọn kiểu thiết lập." IDS_DEVICETITLE "Thiết lập các thiết bị cơ bản" IDS_DEVICESUBTITLE "Chọn những cài đặt cho màn hình và bàn phím." IDS_DRIVETITLE "Thiết lập phần ổ cứng để cài đặt và thư mục hệ thống" IDS_DRIVESUBTITLE "Chuẩn bị phần ổ cứng, thư mục hệ thống và bootloader." + IDS_SUMMARYTITLE "Tóm lược quá trình cài đặt" + IDS_SUMMARYSUBTITLE "Liệt kê các thuộc tính đã lựa chọn nhằm kiểm lại trước khi áp dụng vào thiết bị được chọn." IDS_PROCESSTITLE "Thiết lập phần ổ cứng, sao chép tập tin và thiết lập hệ thống" - IDS_PROCESSSUBTITLE "Tạo và định dạng phần ổ đĩa, sao chép thư mục, cài đặt và thiết lập bootloader" + IDS_PROCESSSUBTITLE "Tạo và định dạng phần ổ đĩa, sao chép thư mục, cài đặt và thiết lập bootloader." IDS_RESTARTTITLE "Giai đoạn đầu của việc thiết lập đã hoàn tất" - IDS_RESTARTSUBTITLE "Giai đoạn đầu của việc thiết lập đã được hoàn thành, khởi động lại máy tính để tiếp tuc với giai đoạn hai" - IDS_SUMMARYTITLE "Tóm lược quá trình cài đặt" - IDS_SUMMARYSUBTITLE "Liệt kê các thuộc tính đã lựa chọn nhằm kiểm lại trước khi áp dụng vào thiết bị được chọn" + IDS_RESTARTSUBTITLE "Giai đoạn đầu của việc thiết lập đã được hoàn thành, khởi động lại máy tính để tiếp tuc với giai đoạn hai." IDS_ABORTSETUP "ReactOS vẵn chưa được hoàn tất cài đặt trên máy tính của bạn. Nếu bây giờ bạn hủy trình Thiết lập, lần tới ban sẽ cần phải chạy lại trình Thiết lập để cài đặt ReactOS. Bạn thực sự muốn bỏ?" IDS_ABORTSETUP2 "Hủy bỏ trình Thiết lập?" - IDS_NO_TXTSETUP_SIF "Không thể tìm được tập tin 'txtsetup.sif'.\nTrình Thiết lập không thể tiếp tục" - IDS_CAPTION "Cài đặt ReactOS" + IDS_NO_TXTSETUP_SIF "Không thể tìm được tập tin 'txtsetup.sif'.\nTrình Thiết lập không thể tiếp tục." + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -218,12 +219,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/zh-CN.rc b/base/setup/reactos/lang/zh-CN.rc index 41e7cd8f4f8..dc0cc6494b5 100644 --- a/base/setup/reactos/lang/zh-CN.rc +++ b/base/setup/reactos/lang/zh-CN.rc @@ -160,22 +160,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "ReactOS 安装程序" IDS_TYPETITLE "ReactOS 安装程序" - IDS_TYPESUBTITLE "选择安装类型" + IDS_TYPESUBTITLE "选择安装类型。" IDS_DEVICETITLE "设置基本设备" IDS_DEVICESUBTITLE "指定显示和键盘设置。" IDS_DRIVETITLE "设置安装分区和系统文件夹" - IDS_DRIVESUBTITLE "设置安装分区、系统文件夹和引导程序" + IDS_DRIVESUBTITLE "设置安装分区、系统文件夹和引导程序。" + IDS_SUMMARYTITLE "安装概要" + IDS_SUMMARYSUBTITLE "安装程序将会执行的内容，以供参考。" IDS_PROCESSTITLE "设置分区、复制文件并安装系统" - IDS_PROCESSSUBTITLE "建立并格式化分区，复制文件，安装并设置引导程序" + IDS_PROCESSSUBTITLE "建立并格式化分区，复制文件，安装并设置引导程序。" IDS_RESTARTTITLE "第一阶段安装完成" - IDS_RESTARTSUBTITLE "第一阶段安装已经完成，重新启动进行第二阶段安装" - IDS_SUMMARYTITLE "安装概要" - IDS_SUMMARYSUBTITLE "安装程序将会执行的内容，以供参考" + IDS_RESTARTSUBTITLE "第一阶段安装已经完成，重新启动进行第二阶段安装。" IDS_ABORTSETUP "ReactOS 未在您的电脑上安装完成。如果您现在退出安装程序，您需要再次运行安装程序来安装 ReactOS。确定退出？" IDS_ABORTSETUP2 "终止安装？" IDS_NO_TXTSETUP_SIF "无法找到 'txtsetup.sif'。\n安装程序无法继续。" - IDS_CAPTION "ReactOS 安装程序" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -218,12 +219,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/zh-HK.rc b/base/setup/reactos/lang/zh-HK.rc index 6e658a9976b..689cc84cb68 100644 --- a/base/setup/reactos/lang/zh-HK.rc +++ b/base/setup/reactos/lang/zh-HK.rc @@ -168,22 +168,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "ReactOS 安裝程式" IDS_TYPETITLE "ReactOS 安裝程式" IDS_TYPESUBTITLE "選擇安裝類型。" - IDS_DEVICETITLE "設定基本裝置。" + IDS_DEVICETITLE "設定基本裝置" IDS_DEVICESUBTITLE "指定顯示和鍵盤設定。" IDS_DRIVETITLE "設定安裝磁碟區和系統資料夾" IDS_DRIVESUBTITLE "設定安裝磁碟區，系統資料夾和載入程式。" + IDS_SUMMARYTITLE "安裝概要" + IDS_SUMMARYSUBTITLE "安裝前列出安裝屬性以供檢查。" IDS_PROCESSTITLE "設定磁碟區，複製檔案並安裝系統" - IDS_PROCESSSUBTITLE "建立並格式化磁碟區，複製檔案，安裝並設定載入程式" + IDS_PROCESSSUBTITLE "建立並格式化磁碟區，複製檔案，安裝並設定載入程式。" IDS_RESTARTTITLE "第一階段安裝完成" - IDS_RESTARTSUBTITLE "第一階段安裝已經完成，重新啟動進行第二階段安裝" - IDS_SUMMARYTITLE "安裝概要" - IDS_SUMMARYSUBTITLE "安裝前列出安裝屬性以供檢查" + IDS_RESTARTSUBTITLE "第一階段安裝已經完成，重新啟動進行第二階段安裝。" IDS_ABORTSETUP "ReactOS 尚未完全安裝到您的電腦上。如果您現在結束安裝程式，您需要重新執行安裝程式來安裝 ReactOS。您確定要結束嗎？" IDS_ABORTSETUP2 "終止安裝？" IDS_NO_TXTSETUP_SIF "找不到「txtsetup.sif」。\n安裝程式無法繼續。" - IDS_CAPTION "ReactOS 安裝程式" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -226,12 +227,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/lang/zh-TW.rc b/base/setup/reactos/lang/zh-TW.rc index 2fb700bf3d7..91639246353 100644 --- a/base/setup/reactos/lang/zh-TW.rc +++ b/base/setup/reactos/lang/zh-TW.rc @@ -169,22 +169,23 @@ END STRINGTABLE BEGIN + IDS_CAPTION "ReactOS 安裝程式" IDS_TYPETITLE "ReactOS 安裝程式" IDS_TYPESUBTITLE "選擇安裝類型。" - IDS_DEVICETITLE "設定基本裝置。" + IDS_DEVICETITLE "設定基本裝置" IDS_DEVICESUBTITLE "指定顯示和鍵盤設定。" IDS_DRIVETITLE "設定安裝磁碟區和系統資料夾" IDS_DRIVESUBTITLE "設定安裝磁碟區，系統資料夾和載入程式。" + IDS_SUMMARYTITLE "安裝概要" + IDS_SUMMARYSUBTITLE "正是安裝前列出安裝屬性以供檢查。" IDS_PROCESSTITLE "設定磁碟區，複製檔案並安裝系統" - IDS_PROCESSSUBTITLE "建立並格式化磁碟區，複製檔案，安裝並設定載入程式" + IDS_PROCESSSUBTITLE "建立並格式化磁碟區，複製檔案，安裝並設定載入程式。" IDS_RESTARTTITLE "第一階段安裝完成" - IDS_RESTARTSUBTITLE "第一階段安裝已經完成，重新啟動進行第二階段安裝" - IDS_SUMMARYTITLE "安裝概要" - IDS_SUMMARYSUBTITLE "正是安裝前列出安裝屬性以供檢查" + IDS_RESTARTSUBTITLE "第一階段安裝已經完成，重新啟動進行第二階段安裝。" IDS_ABORTSETUP "ReactOS 尚未完全安裝在您的電腦上。如果您現在結束安裝程式，您需要重新執行安裝程式來安裝 ReactOS。您確定要結束嗎？" IDS_ABORTSETUP2 "終止安裝？" IDS_NO_TXTSETUP_SIF "無法找到「txtsetup.sif」。\n安裝程式無法繼續。" - IDS_CAPTION "ReactOS 安裝程式" + IDS_INSTALLBTN "&Install" IDS_VOLUME_NOFORMAT "Not formatted" END @@ -227,12 +228,16 @@ BEGIN IDS_RENAMING "Renaming %s to %s" IDS_DELETING "Deleting %s" + IDS_CONFIG_SYSTEM_PARTITION "Configuring the system partition..." IDS_PREPARE_PARTITIONS "Preparing partitions..." IDS_PREPARE_FILES "Preparing the list of files to be copied, please wait..." IDS_COPYING_FILES "Copying the files..." IDS_CREATE_REGISTRY "Creating the registry..." IDS_UPDATE_REGISTRY "Updating the registry..." + + // IDS_INSTALL_FINALIZE "Finalizing the installation..." + IDS_INSTALL_BOOTLOADER "Installing the bootloader..." END // Note to translators: please refer to the corresponding usetup/lang/*.h translations. diff --git a/base/setup/reactos/reactos.c b/base/setup/reactos/reactos.c index 5d5ee21cb0f..3909f104e20 100644 --- a/base/setup/reactos/reactos.c +++ b/base/setup/reactos/reactos.c @@ -1117,7 +1117,9 @@ SummaryDlgProc( // PropSheet_SetNextText(GetParent(hwndDlg), ...); GetDlgItemTextW(GetParent(hwndDlg), ID_WIZNEXT, szOrgWizNextBtnText, ARRAYSIZE(szOrgWizNextBtnText)); - SetDlgItemTextW(GetParent(hwndDlg), ID_WIZNEXT, L"Install"); // FIXME: Localize! + SetWindowResTextW(GetDlgItem(GetParent(hwndDlg), ID_WIZNEXT), + pSetupData->hInstance, + IDS_INSTALLBTN); /* * Keep the "Next" button disabled. It will be enabled only @@ -1254,7 +1256,6 @@ FsVolCallback( _In_ ULONG_PTR Param2) { PFSVOL_CONTEXT FsVolContext = (PFSVOL_CONTEXT)Context; - WCHAR Buffer[MAX_PATH]; switch (FormatStatus) { @@ -1480,20 +1481,21 @@ FsVolCallback( /* Set status text */ if (FmtInfo->Volume->Info.DriveLetter) { - StringCchPrintfW(Buffer, ARRAYSIZE(Buffer), - L"Formatting volume %c: (%s) in %s...", // IDS_FORMATTING_PROGRESS1 - FmtInfo->Volume->Info.DriveLetter, - FmtInfo->Volume->Info.DeviceName, - VolCreate->FileSystemName); + SetWindowResPrintfW(GetDlgItem(UiContext.hwndDlg, IDC_ITEM), + SetupData.hInstance, + IDS_FORMATTING_PROGRESS1, // L"Formatting volume %c: (%s) in %s..." + FmtInfo->Volume->Info.DriveLetter, + FmtInfo->Volume->Info.DeviceName, + VolCreate->FileSystemName); } else { - StringCchPrintfW(Buffer, ARRAYSIZE(Buffer), - L"Formatting volume %s in %s...", // IDS_FORMATTING_PROGRESS2 - FmtInfo->Volume->Info.DeviceName, - VolCreate->FileSystemName); + SetWindowResPrintfW(GetDlgItem(UiContext.hwndDlg, IDC_ITEM), + SetupData.hInstance, + IDS_FORMATTING_PROGRESS2, // L"Formatting volume %s in %s..." + FmtInfo->Volume->Info.DeviceName, + VolCreate->FileSystemName); } - SetDlgItemTextW(UiContext.hwndDlg, IDC_ITEM, Buffer); // StartFormat(FmtInfo, FileSystemList->Selected); FmtInfo->FileSystemName = VolCreate->FileSystemName; @@ -1545,18 +1547,19 @@ FsVolCallback( /* Set status text */ if (ChkInfo->Volume->Info.DriveLetter) { - StringCchPrintfW(Buffer, ARRAYSIZE(Buffer), - L"Checking volume %c: (%s)...", // IDS_CHECKING_PROGRESS1 - ChkInfo->Volume->Info.DriveLetter, - ChkInfo->Volume->Info.DeviceName); + SetWindowResPrintfW(GetDlgItem(UiContext.hwndDlg, IDC_ITEM), + SetupData.hInstance, + IDS_CHECKING_PROGRESS1, // L"Checking volume %c: (%s)..." + ChkInfo->Volume->Info.DriveLetter, + ChkInfo->Volume->Info.DeviceName); } else { - StringCchPrintfW(Buffer, ARRAYSIZE(Buffer), - L"Checking volume %s...", // IDS_CHECKING_PROGRESS2 - ChkInfo->Volume->Info.DeviceName); + SetWindowResPrintfW(GetDlgItem(UiContext.hwndDlg, IDC_ITEM), + SetupData.hInstance, + IDS_CHECKING_PROGRESS2, // L"Checking volume %s..." + ChkInfo->Volume->Info.DeviceName); } - SetDlgItemTextW(UiContext.hwndDlg, IDC_ITEM, Buffer); // StartCheck(ChkInfo); // TODO: Think about which values could be defaulted... @@ -1599,7 +1602,6 @@ FileCopyCallback(PVOID Context, PCOPYCONTEXT CopyContext = (PCOPYCONTEXT)Context; PFILEPATHS_W FilePathInfo; PCWSTR SrcFileName, DstFileName; - WCHAR Status[1024]; WaitForSingleObject(CopyContext->pSetupData->hHaltInstallEvent, INFINITE); if (CopyContext->pSetupData->bStopInstall) @@ -1638,12 +1640,15 @@ FileCopyCallback(PVOID Context, if (DstFileName) ++DstFileName; else DstFileName = FilePathInfo->Target; - // STRING_DELETING - StringCchPrintfW(Status, ARRAYSIZE(Status), L"Deleting %s", DstFileName); - SetWindowTextW(UiContext.hWndItem, Status); + SetWindowResPrintfW(UiContext.hWndItem, + SetupData.hInstance, + IDS_DELETING, // STRING_DELETING + DstFileName); } else if (Notification == SPFILENOTIFY_STARTRENAME) { + UINT uMsgID; + /* Display move/rename message */ ASSERT(Param2 == FILEOP_RENAME); @@ -1655,13 +1660,14 @@ FileCopyCallback(PVOID Context, if (DstFileName) ++DstFileName; else DstFileName = FilePathInfo->Target; - // STRING_MOVING or STRING_RENAMING if (!_wcsicmp(SrcFileName, DstFileName)) - StringCchPrintfW(Status, ARRAYSIZE(Status), L"Moving %s to %s", SrcFileName, DstFileName); + uMsgID = IDS_MOVING; // STRING_MOVING else - StringCchPrintfW(Status, ARRAYSIZE(Status), L"Renaming %s to %s", SrcFileName, DstFileName); - - SetWindowTextW(UiContext.hWndItem, Status); + uMsgID = IDS_RENAMING; // STRING_RENAMING + SetWindowResPrintfW(UiContext.hWndItem, + SetupData.hInstance, + uMsgID, + SrcFileName, DstFileName); } else if (Notification == SPFILENOTIFY_STARTCOPY) { @@ -1672,9 +1678,10 @@ FileCopyCallback(PVOID Context, if (DstFileName) ++DstFileName; else DstFileName = FilePathInfo->Target; - // STRING_COPYING - StringCchPrintfW(Status, ARRAYSIZE(Status), L"Copying %s", DstFileName); - SetWindowTextW(UiContext.hWndItem, Status); + SetWindowResPrintfW(UiContext.hWndItem, + SetupData.hInstance, + IDS_COPYING, // STRING_COPYING + DstFileName); } break; } @@ -1799,7 +1806,9 @@ PrepareAndDoCopyThread( FsVolContext.pSetupData = pSetupData; /* Set status text */ - SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L"Setting the system partition..."); + SetWindowResTextW(GetDlgItem(hwndDlg, IDC_ACTIVITY), + pSetupData->hInstance, + IDS_CONFIG_SYSTEM_PARTITION); SetDlgItemTextW(hwndDlg, IDC_ITEM, L""); /* Find or set the active system partition before starting formatting */ @@ -1831,7 +1840,9 @@ PrepareAndDoCopyThread( /* Set status text */ - SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L"Preparing partitions..."); + SetWindowResTextW(GetDlgItem(hwndDlg, IDC_ACTIVITY), + pSetupData->hInstance, + IDS_PREPARE_PARTITIONS); SetDlgItemTextW(hwndDlg, IDC_ITEM, L""); /* Apply all pending operations on partitions: formatting and checking */ @@ -1886,7 +1897,9 @@ PrepareAndDoCopyThread( */ /* Set status text */ - SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L"Preparing the list of files to be copied, please wait..."); + SetWindowResTextW(GetDlgItem(hwndDlg, IDC_ACTIVITY), + pSetupData->hInstance, + IDS_PREPARE_FILES); SetDlgItemTextW(hwndDlg, IDC_ITEM, L""); /* Set progress marquee style and start it up */ @@ -1923,7 +1936,9 @@ PrepareAndDoCopyThread( */ /* Set status text */ - SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L"Copying the files..."); + SetWindowResTextW(GetDlgItem(hwndDlg, IDC_ACTIVITY), + pSetupData->hInstance, + IDS_COPYING_FILES); SetDlgItemTextW(hwndDlg, IDC_ITEM, L""); /* Create context for the copy process */ @@ -1949,7 +1964,9 @@ PrepareAndDoCopyThread( } // /* Set status text */ - // SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L"Finalizing the installation..."); + // SetWindowResTextW(GetDlgItem(hwndDlg, IDC_ACTIVITY), + // pSetupData->hInstance, + // IDS_INSTALL_FINALIZE); // SetDlgItemTextW(hwndDlg, IDC_ITEM, L""); /* Create the $winnt$.inf file */ @@ -1991,7 +2008,9 @@ PrepareAndDoCopyThread( */ /* Set status text */ - SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L"Installing the bootloader..."); + SetWindowResTextW(GetDlgItem(hwndDlg, IDC_ACTIVITY), + pSetupData->hInstance, + IDS_INSTALL_BOOTLOADER); SetDlgItemTextW(hwndDlg, IDC_ITEM, L""); RtlFreeUnicodeString(&pSetupData->USetupData.SystemRootPath); @@ -2149,7 +2168,6 @@ ProcessDlgProc( /* Reset status text */ SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L""); SetDlgItemTextW(hwndDlg, IDC_ITEM, L""); - break; } diff --git a/base/setup/reactos/resource.h b/base/setup/reactos/resource.h index a9e154049b2..a54f4035f8c 100644 --- a/base/setup/reactos/resource.h +++ b/base/setup/reactos/resource.h @@ -80,23 +80,24 @@ /* Strings */ -#define IDS_TYPETITLE 5007 -#define IDS_TYPESUBTITLE 5008 -#define IDS_DEVICETITLE 5012 -#define IDS_DEVICESUBTITLE 5013 -#define IDS_DRIVETITLE 5019 -#define IDS_DRIVESUBTITLE 5020 -#define IDS_PROCESSTITLE 5029 -#define IDS_PROCESSSUBTITLE 5030 -#define IDS_RESTARTTITLE 5035 -#define IDS_RESTARTSUBTITLE 5036 -#define IDS_ABORTSETUP 5039 -#define IDS_ABORTSETUP2 5040 -#define IDS_SUMMARYTITLE 5050 -#define IDS_SUMMARYSUBTITLE 5051 -#define IDS_NO_TXTSETUP_SIF 5053 -#define IDS_CAPTION 5054 -#define IDS_VOLUME_NOFORMAT 5060 +#define IDS_CAPTION 5000 +#define IDS_TYPETITLE 5001 +#define IDS_TYPESUBTITLE 5002 +#define IDS_DEVICETITLE 5003 +#define IDS_DEVICESUBTITLE 5004 +#define IDS_DRIVETITLE 5005 +#define IDS_DRIVESUBTITLE 5006 +#define IDS_SUMMARYTITLE 5007 +#define IDS_SUMMARYSUBTITLE 5008 +#define IDS_PROCESSTITLE 5009 +#define IDS_PROCESSSUBTITLE 5010 +#define IDS_RESTARTTITLE 5011 +#define IDS_RESTARTSUBTITLE 5012 +#define IDS_ABORTSETUP 5020 +#define IDS_ABORTSETUP2 5021 +#define IDS_NO_TXTSETUP_SIF 5022 +#define IDS_INSTALLBTN 5030 +#define IDS_VOLUME_NOFORMAT 5040 #define IDS_INSTALLATION_NAME 5100 #define IDS_INSTALLATION_PATH 5101 @@ -124,11 +125,14 @@ #define IDS_MOVING 5205 #define IDS_RENAMING 5206 #define IDS_DELETING 5207 -#define IDS_PREPARE_PARTITIONS 5208 -#define IDS_PREPARE_FILES 5209 -#define IDS_COPYING_FILES 5210 -#define IDS_CREATE_REGISTRY 5211 -#define IDS_UPDATE_REGISTRY 5212 +#define IDS_CONFIG_SYSTEM_PARTITION 5210 +#define IDS_PREPARE_PARTITIONS 5211 +#define IDS_PREPARE_FILES 5212 +#define IDS_COPYING_FILES 5213 +#define IDS_CREATE_REGISTRY 5214 +#define IDS_UPDATE_REGISTRY 5215 +// #define IDS_INSTALL_FINALIZE 5216 +#define IDS_INSTALL_BOOTLOADER 5217 #define IDS_REG_DONE 5220 #define IDS_REG_REGHIVEUPDATE 5221

2 months

[reactos] 01/01: [CRT] Introduce corecrt.h

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f6b83172277699845cfc… commit 6f6b83172277699845cfc44e1aaf8a78cd379f15 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun May 12 13:11:22 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Oct 21 14:53:29 2024 +0300 [CRT] Introduce corecrt.h Include this instead of crtdefs.h. This is for compatibility with MS headers. --- sdk/include/crt/assert.h | 2 +- sdk/include/crt/complex.h | 2 +- sdk/include/crt/conio.h | 2 +- sdk/include/crt/corecrt.h | 25 +++++++++++++++++++++++++ sdk/include/crt/crtdbg.h | 2 +- sdk/include/crt/crtdefs.h | 12 ------------ sdk/include/crt/ctype.h | 2 +- sdk/include/crt/direct.h | 2 +- sdk/include/crt/dos.h | 2 +- sdk/include/crt/dvec.h | 2 +- sdk/include/crt/eh.h | 2 +- sdk/include/crt/errno.h | 2 +- sdk/include/crt/fcntl.h | 2 +- sdk/include/crt/float.h | 2 +- sdk/include/crt/fpieee.h | 2 +- sdk/include/crt/fvec.h | 2 +- sdk/include/crt/inttypes.h | 2 +- sdk/include/crt/io.h | 2 +- sdk/include/crt/ivec.h | 2 +- sdk/include/crt/libgen.h | 2 +- sdk/include/crt/locale.h | 2 +- sdk/include/crt/malloc.h | 2 +- sdk/include/crt/math.h | 2 +- sdk/include/crt/mbctype.h | 2 +- sdk/include/crt/mbstring.h | 2 +- sdk/include/crt/memory.h | 2 +- sdk/include/crt/process.h | 2 +- sdk/include/crt/search.h | 2 +- sdk/include/crt/signal.h | 2 +- sdk/include/crt/stddef.h | 2 +- sdk/include/crt/stdexcpt.h | 2 +- sdk/include/crt/stdio.h | 2 +- sdk/include/crt/stdlib.h | 2 +- sdk/include/crt/string.h | 2 +- sdk/include/crt/tchar.h | 2 +- sdk/include/crt/time.h | 2 +- sdk/include/crt/typeinfo.h | 2 +- sdk/include/crt/wchar.h | 2 +- sdk/include/crt/wctype.h | 2 +- sdk/include/crt/yvals.h | 4 +--- sdk/lib/crt/include/internal/locale.h | 2 ++ 41 files changed, 65 insertions(+), 52 deletions(-) diff --git a/sdk/include/crt/assert.h b/sdk/include/crt/assert.h index 8f9fa217fe9..ce17f698e3a 100644 --- a/sdk/include/crt/assert.h +++ b/sdk/include/crt/assert.h @@ -6,7 +6,7 @@ #ifndef __ASSERT_H_ #define __ASSERT_H_ -#include <crtdefs.h> +#include <corecrt.h> #ifdef NDEBUG diff --git a/sdk/include/crt/complex.h b/sdk/include/crt/complex.h index c15887d0bd8..e73b0c17784 100644 --- a/sdk/include/crt/complex.h +++ b/sdk/include/crt/complex.h @@ -26,7 +26,7 @@ #ifndef _COMPLEX_H_ #define _COMPLEX_H_ -#include <crtdefs.h> +#include <corecrt.h> #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \ || !defined __STRICT_ANSI__ diff --git a/sdk/include/crt/conio.h b/sdk/include/crt/conio.h index e260cf1969a..631f76bc7d9 100644 --- a/sdk/include/crt/conio.h +++ b/sdk/include/crt/conio.h @@ -6,7 +6,7 @@ #ifndef _INC_CONIO #define _INC_CONIO -#include <crtdefs.h> +#include <corecrt.h> #define __need___va_list #include <stdarg.h> diff --git a/sdk/include/crt/corecrt.h b/sdk/include/crt/corecrt.h new file mode 100644 index 00000000000..4bae8184255 --- /dev/null +++ b/sdk/include/crt/corecrt.h @@ -0,0 +1,25 @@ + +#pragma once + +#include <crtdefs.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef _CRTRESTRICT +#define _CRTRESTRICT +#endif + +#ifndef DEFINED_localeinfo_struct +typedef struct localeinfo_struct +{ + pthreadlocinfo locinfo; + pthreadmbcinfo mbcinfo; +} _locale_tstruct, *_locale_t; +#define DEFINED_localeinfo_struct 1 +#endif + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/sdk/include/crt/crtdbg.h b/sdk/include/crt/crtdbg.h index 13c16f66f50..6b90bc018d5 100644 --- a/sdk/include/crt/crtdbg.h +++ b/sdk/include/crt/crtdbg.h @@ -3,7 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <crtdefs.h> +#include <corecrt.h> #ifndef _INC_CRTDBG #define _INC_CRTDBG diff --git a/sdk/include/crt/crtdefs.h b/sdk/include/crt/crtdefs.h index 2eeb6a7fbd7..e83ed510c35 100644 --- a/sdk/include/crt/crtdefs.h +++ b/sdk/include/crt/crtdefs.h @@ -158,10 +158,6 @@ #define _CRTNOALIAS #endif -#ifndef _CRTRESTRICT -#define _CRTRESTRICT -#endif - #ifndef __CRTDECL #define __CRTDECL __cdecl #endif @@ -437,14 +433,6 @@ typedef struct threadmbcinfostruct *pthreadmbcinfo; struct __lc_time_data; -#ifndef DEFINED_localeinfo_struct -typedef struct localeinfo_struct { - pthreadlocinfo locinfo; - pthreadmbcinfo mbcinfo; -}_locale_tstruct,*_locale_t; -#define DEFINED_localeinfo_struct 1 -#endif - #ifdef __cplusplus } #endif diff --git a/sdk/include/crt/ctype.h b/sdk/include/crt/ctype.h index 618e2107574..3fc23a3b047 100644 --- a/sdk/include/crt/ctype.h +++ b/sdk/include/crt/ctype.h @@ -6,7 +6,7 @@ #ifndef _INC_CTYPE #define _INC_CTYPE -#include <crtdefs.h> +#include <corecrt.h> #ifdef __cplusplus extern "C" { diff --git a/sdk/include/crt/direct.h b/sdk/include/crt/direct.h index 05041796e80..c950824521a 100644 --- a/sdk/include/crt/direct.h +++ b/sdk/include/crt/direct.h @@ -6,7 +6,7 @@ #ifndef _INC_DIRECT #define _INC_DIRECT -#include <crtdefs.h> +#include <corecrt.h> #include <io.h> #pragma pack(push,_CRT_PACKING) diff --git a/sdk/include/crt/dos.h b/sdk/include/crt/dos.h index 867326ab176..0c8c82dd379 100644 --- a/sdk/include/crt/dos.h +++ b/sdk/include/crt/dos.h @@ -6,7 +6,7 @@ #ifndef _INC_DOS #define _INC_DOS -#include <crtdefs.h> +#include <corecrt.h> #include <io.h> #pragma pack(push,_CRT_PACKING) diff --git a/sdk/include/crt/dvec.h b/sdk/include/crt/dvec.h index 5617ffde263..d37b736b7db 100644 --- a/sdk/include/crt/dvec.h +++ b/sdk/include/crt/dvec.h @@ -14,7 +14,7 @@ #include <emmintrin.h> #include <assert.h> #include <fvec.h> -#include <crtdefs.h> +#include <corecrt.h> #pragma pack(push,_CRT_PACKING) diff --git a/sdk/include/crt/eh.h b/sdk/include/crt/eh.h index 8d2264b1db1..a384707e8c7 100644 --- a/sdk/include/crt/eh.h +++ b/sdk/include/crt/eh.h @@ -3,7 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <crtdefs.h> +#include <corecrt.h> #ifndef _EH_H_ #define _EH_H_ diff --git a/sdk/include/crt/errno.h b/sdk/include/crt/errno.h index a0522428a3b..5f67137a09b 100644 --- a/sdk/include/crt/errno.h +++ b/sdk/include/crt/errno.h @@ -6,7 +6,7 @@ #ifndef _INC_ERRNO #define _INC_ERRNO -#include <crtdefs.h> +#include <corecrt.h> #ifdef __cplusplus extern "C" { diff --git a/sdk/include/crt/fcntl.h b/sdk/include/crt/fcntl.h index fc3b00c2514..79d0af2acbc 100644 --- a/sdk/include/crt/fcntl.h +++ b/sdk/include/crt/fcntl.h @@ -3,7 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <crtdefs.h> +#include <corecrt.h> #ifndef _INC_FCNTL #define _INC_FCNTL diff --git a/sdk/include/crt/float.h b/sdk/include/crt/float.h index 8c42b3f9d04..e2e883d1455 100644 --- a/sdk/include/crt/float.h +++ b/sdk/include/crt/float.h @@ -27,7 +27,7 @@ #error #endif -#include <crtdefs.h> +#include <corecrt.h> /* * Functions and definitions for controlling the FPU. diff --git a/sdk/include/crt/fpieee.h b/sdk/include/crt/fpieee.h index 61ffcdd2981..a339808f40c 100644 --- a/sdk/include/crt/fpieee.h +++ b/sdk/include/crt/fpieee.h @@ -6,7 +6,7 @@ #ifndef _INC_FPIEEE #define _INC_FPIEEE -#include <crtdefs.h> +#include <corecrt.h> #pragma pack(push,_CRT_PACKING) diff --git a/sdk/include/crt/fvec.h b/sdk/include/crt/fvec.h index a4c888677ea..2e17c88b7ce 100644 --- a/sdk/include/crt/fvec.h +++ b/sdk/include/crt/fvec.h @@ -14,7 +14,7 @@ #include <xmmintrin.h> #include <assert.h> #include <ivec.h> -#include <crtdefs.h> +#include <corecrt.h> #if defined(_ENABLE_VEC_DEBUG) #include <iostream> diff --git a/sdk/include/crt/inttypes.h b/sdk/include/crt/inttypes.h index a47e2fe2877..c440179aef0 100644 --- a/sdk/include/crt/inttypes.h +++ b/sdk/include/crt/inttypes.h @@ -8,7 +8,7 @@ #ifndef _INTTYPES_H_ #define _INTTYPES_H_ -#include <crtdefs.h> +#include <corecrt.h> #include <stdint.h> #define __need_wchar_t #include <stddef.h> diff --git a/sdk/include/crt/io.h b/sdk/include/crt/io.h index e6a452cc0ac..961f46018ff 100644 --- a/sdk/include/crt/io.h +++ b/sdk/include/crt/io.h @@ -7,7 +7,7 @@ #ifndef _IO_H_ #define _IO_H_ -#include <crtdefs.h> +#include <corecrt.h> #include <string.h> #pragma pack(push,_CRT_PACKING) diff --git a/sdk/include/crt/ivec.h b/sdk/include/crt/ivec.h index 7d10e0317c1..92dd540350f 100644 --- a/sdk/include/crt/ivec.h +++ b/sdk/include/crt/ivec.h @@ -14,7 +14,7 @@ #include <intrin.h> #include <assert.h> #include <dvec.h> -#include <crtdefs.h> +#include <corecrt.h> #pragma pack(push,_CRT_PACKING) diff --git a/sdk/include/crt/libgen.h b/sdk/include/crt/libgen.h index 8e5b95d3521..d42fdf9e56c 100644 --- a/sdk/include/crt/libgen.h +++ b/sdk/include/crt/libgen.h @@ -14,7 +14,7 @@ #define _LIBGEN_H_ /* All the headers include this file. */ -#include <crtdefs.h> +#include <corecrt.h> #ifdef __cplusplus extern "C" { diff --git a/sdk/include/crt/locale.h b/sdk/include/crt/locale.h index d24699d0463..c71f91c983d 100644 --- a/sdk/include/crt/locale.h +++ b/sdk/include/crt/locale.h @@ -6,7 +6,7 @@ #ifndef _INC_LOCALE #define _INC_LOCALE -#include <crtdefs.h> +#include <corecrt.h> #pragma pack(push,_CRT_PACKING) diff --git a/sdk/include/crt/malloc.h b/sdk/include/crt/malloc.h index 16329997837..591b4a6a0f0 100644 --- a/sdk/include/crt/malloc.h +++ b/sdk/include/crt/malloc.h @@ -6,7 +6,7 @@ #ifndef _INC_MALLOC #define _INC_MALLOC -#include <crtdefs.h> +#include <corecrt.h> #pragma pack(push,_CRT_PACKING) diff --git a/sdk/include/crt/math.h b/sdk/include/crt/math.h index f32c2a33a77..bd5d7022523 100644 --- a/sdk/include/crt/math.h +++ b/sdk/include/crt/math.h @@ -4,7 +4,7 @@ #ifndef _INC_MATH #define _INC_MATH -#include "crtdefs.h" +#include <corecrt.h> #pragma pack(push,_CRT_PACKING) diff --git a/sdk/include/crt/mbctype.h b/sdk/include/crt/mbctype.h index 53fc0f2c80a..6dbefc318cf 100644 --- a/sdk/include/crt/mbctype.h +++ b/sdk/include/crt/mbctype.h @@ -6,7 +6,7 @@ #ifndef _INC_MBCTYPE #define _INC_MBCTYPE -#include <crtdefs.h> +#include <corecrt.h> #include <ctype.h> #ifdef __cplusplus diff --git a/sdk/include/crt/mbstring.h b/sdk/include/crt/mbstring.h index b897196a4b6..31e2461cd53 100644 --- a/sdk/include/crt/mbstring.h +++ b/sdk/include/crt/mbstring.h @@ -7,7 +7,7 @@ #ifndef _INC_MBSTRING #define _INC_MBSTRING -#include <crtdefs.h> +#include <corecrt.h> #pragma pack(push,_CRT_PACKING) diff --git a/sdk/include/crt/memory.h b/sdk/include/crt/memory.h index 237b727b8f5..232531d9755 100644 --- a/sdk/include/crt/memory.h +++ b/sdk/include/crt/memory.h @@ -6,7 +6,7 @@ #ifndef _INC_MEMORY #define _INC_MEMORY -#include <crtdefs.h> +#include <corecrt.h> #ifdef __cplusplus extern "C" { diff --git a/sdk/include/crt/process.h b/sdk/include/crt/process.h index 85321ccf4c2..6d19cfc23bc 100644 --- a/sdk/include/crt/process.h +++ b/sdk/include/crt/process.h @@ -6,7 +6,7 @@ #ifndef _INC_PROCESS #define _INC_PROCESS -#include <crtdefs.h> +#include <corecrt.h> /* Includes a definition of _pid_t and pid_t */ #include <sys/types.h> diff --git a/sdk/include/crt/search.h b/sdk/include/crt/search.h index 6fddba84da2..400035d3fc5 100644 --- a/sdk/include/crt/search.h +++ b/sdk/include/crt/search.h @@ -7,7 +7,7 @@ #ifndef _INC_SEARCH #define _INC_SEARCH -#include <crtdefs.h> +#include <corecrt.h> #include <stddef.h> #ifdef __cplusplus diff --git a/sdk/include/crt/signal.h b/sdk/include/crt/signal.h index 8a269971a17..a3157b663db 100644 --- a/sdk/include/crt/signal.h +++ b/sdk/include/crt/signal.h @@ -6,7 +6,7 @@ #ifndef _INC_SIGNAL #define _INC_SIGNAL -#include <crtdefs.h> +#include <corecrt.h> #ifdef __cplusplus extern "C" { diff --git a/sdk/include/crt/stddef.h b/sdk/include/crt/stddef.h index 1ff523e3a06..fe7db25a17b 100644 --- a/sdk/include/crt/stddef.h +++ b/sdk/include/crt/stddef.h @@ -4,7 +4,7 @@ * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <crtdefs.h> +#include <corecrt.h> #ifndef _INC_STDDEF #define _INC_STDDEF diff --git a/sdk/include/crt/stdexcpt.h b/sdk/include/crt/stdexcpt.h index 90a242f2635..c0e6caafaca 100644 --- a/sdk/include/crt/stdexcpt.h +++ b/sdk/include/crt/stdexcpt.h @@ -3,7 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <crtdefs.h> +#include <corecrt.h> #ifndef _INC_STDEXCPT #define _INC_STDEXCPT diff --git a/sdk/include/crt/stdio.h b/sdk/include/crt/stdio.h index e67c3df6351..f740a22ea40 100644 --- a/sdk/include/crt/stdio.h +++ b/sdk/include/crt/stdio.h @@ -6,7 +6,7 @@ #ifndef _INC_STDIO #define _INC_STDIO -#include <crtdefs.h> +#include <corecrt.h> #define __need___va_list #include <stdarg.h> diff --git a/sdk/include/crt/stdlib.h b/sdk/include/crt/stdlib.h index e3548a84a71..fc66c3a6874 100644 --- a/sdk/include/crt/stdlib.h +++ b/sdk/include/crt/stdlib.h @@ -6,7 +6,7 @@ #ifndef _INC_STDLIB #define _INC_STDLIB -#include <crtdefs.h> +#include <corecrt.h> #include <limits.h> #pragma pack(push,_CRT_PACKING) diff --git a/sdk/include/crt/string.h b/sdk/include/crt/string.h index db962ae1c27..e0b2f09d96b 100644 --- a/sdk/include/crt/string.h +++ b/sdk/include/crt/string.h @@ -6,7 +6,7 @@ #ifndef _INC_STRING #define _INC_STRING -#include <crtdefs.h> +#include <corecrt.h> #ifdef __cplusplus extern "C" { diff --git a/sdk/include/crt/tchar.h b/sdk/include/crt/tchar.h index 5143e5961a8..e9c5234d409 100644 --- a/sdk/include/crt/tchar.h +++ b/sdk/include/crt/tchar.h @@ -3,7 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <crtdefs.h> +#include <corecrt.h> #ifndef _INC_TCHAR #define _INC_TCHAR diff --git a/sdk/include/crt/time.h b/sdk/include/crt/time.h index 680c7fd2a1a..ff6dd05b130 100644 --- a/sdk/include/crt/time.h +++ b/sdk/include/crt/time.h @@ -7,7 +7,7 @@ #ifndef _TIME_H_ #define _TIME_H_ -#include <crtdefs.h> +#include <corecrt.h> #ifndef _WIN32 #error Only Win32 target is supported! diff --git a/sdk/include/crt/typeinfo.h b/sdk/include/crt/typeinfo.h index e7bd1187266..fe6b0cad3c3 100644 --- a/sdk/include/crt/typeinfo.h +++ b/sdk/include/crt/typeinfo.h @@ -3,7 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <crtdefs.h> +#include <corecrt.h> #ifndef _INC_TYPEINFO #define _INC_TYPEINFO diff --git a/sdk/include/crt/wchar.h b/sdk/include/crt/wchar.h index c6cd0d7ba92..765cfd797f4 100644 --- a/sdk/include/crt/wchar.h +++ b/sdk/include/crt/wchar.h @@ -6,7 +6,7 @@ #ifndef _INC_WCHAR #define _INC_WCHAR -#include <crtdefs.h> +#include <corecrt.h> #define __need___va_list #include <stdarg.h> diff --git a/sdk/include/crt/wctype.h b/sdk/include/crt/wctype.h index 249f10f9dc8..72419d7e53b 100644 --- a/sdk/include/crt/wctype.h +++ b/sdk/include/crt/wctype.h @@ -10,7 +10,7 @@ #error Only Win32 target is supported! #endif -#include <crtdefs.h> +#include <corecrt.h> #pragma pack(push,_CRT_PACKING) diff --git a/sdk/include/crt/yvals.h b/sdk/include/crt/yvals.h index 10b812dac62..14c27a28c7e 100644 --- a/sdk/include/crt/yvals.h +++ b/sdk/include/crt/yvals.h @@ -7,10 +7,8 @@ #define _YVALS #include <_mingw.h> -/* TODO, don't include crtdef.h. */ -#include <crtdefs.h> -#pragma pack(push,_CRT_PACKING) +#pragma pack(push,8) #define _CPPLIB_VER 405 #define __PURE_APPDOMAIN_GLOBAL diff --git a/sdk/lib/crt/include/internal/locale.h b/sdk/lib/crt/include/internal/locale.h index 23c618ff2cf..f991fa6496b 100644 --- a/sdk/lib/crt/include/internal/locale.h +++ b/sdk/lib/crt/include/internal/locale.h @@ -1,6 +1,8 @@ #ifndef __CRT_INTERNAL_LOCALE_H #define __CRT_INTERNAL_LOCALE_H +#include <crtdefs.h> // for LC_ID + typedef struct MSVCRT_threadlocaleinfostruct { LONG refcount; unsigned int lc_codepage;

2 months

[reactos] 01/01: [RTL/x64] Fix RtlCaptureContext/RtlpRestoreContextInternal in kernel mode

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e3c0529cf2b32be05483… commit 4e3c0529cf2b32be0548371ce3cd2d61d5943988 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Sep 27 15:20:15 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Oct 21 10:17:11 2024 +0300 [RTL/x64] Fix RtlCaptureContext/RtlpRestoreContextInternal in kernel mode According to tests, legacy fp state is not saved in kernel mode. Also add an int 2c to the path that changes cs, as it should not be used and probably never will be. --- sdk/lib/rtl/amd64/except_asm.S | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/sdk/lib/rtl/amd64/except_asm.S b/sdk/lib/rtl/amd64/except_asm.S index b8384b6529b..a45c316ea94 100644 --- a/sdk/lib/rtl/amd64/except_asm.S +++ b/sdk/lib/rtl/amd64/except_asm.S @@ -94,12 +94,20 @@ PUBLIC RtlCaptureContext movaps [rcx + CxXmm14], xmm14 movaps [rcx + CxXmm15], xmm15 + /* Store eflags */ + mov [rcx + CxEFlags], eax + + /* Store mxcsr */ + stmxcsr [rcx + CxMxCsr] + + /* Check if we are in user mode */ + test byte ptr [rcx + CxSegCs], 3 + jz RtlCaptureContextExit + /* Store legacy floating point registers */ fxsave [rcx + CxFltSave] - stmxcsr [rcx + CxMxCsr] - /* Store rflags */ - mov [rcx + CxEFlags], eax +RtlCaptureContextExit: /* Cleanup stack and return */ add rsp, 8 @@ -119,10 +127,6 @@ PUBLIC RtlpRestoreContextInternal .ALLOCSTACK 8 .ENDPROLOG - /* Restore legacy floating point registers (It is slow, so do it first) */ - ldmxcsr [rcx + CxMxCsr] - fxrstor [rcx + CxFltSave] - /* Load the target stack pointer into rdx */ mov rdx, [rcx + CxRsp] @@ -185,6 +189,18 @@ PUBLIC RtlpRestoreContextInternal mov r8, [rcx + CxR8] mov r9, [rcx + CxR9] + /* Restore MXCSR */ + ldmxcsr [rcx + CxMxCsr] + + /* Check if we go to user mode */ + test byte ptr [rcx + CxSegCs], 3 + jz Exit + + /* Restore legacy floating point registers */ + fxrstor [rcx + CxFltSave] + +Exit: + /* Check if we go to a different cs */ mov ax, cs cmp [rcx + CxSegCs], ax @@ -208,6 +224,9 @@ PUBLIC RtlpRestoreContextInternal ReturnFar: + // We should never need this path + int HEX(2c) + /* Put cs on the stack for the far return */ mov ax, [rcx + CxSegCs] mov [rdx - 1 * 8], ax

2 months

[reactos] 06/06: [USETUP] Adjust translations of the BootLoaderRemovableDiskPageEntries page.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=467efcb423880fe2cd8ef… commit 467efcb423880fe2cd8ef890a42a41fb40d0d2b4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Oct 19 21:35:40 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 20 16:51:29 2024 +0200 [USETUP] Adjust translations of the BootLoaderRemovableDiskPageEntries page. The page is shown only when the user wants to install the bootloader on a removable disk; not when there was a problem while installing it. --- base/setup/usetup/lang/bg-BG.h | 9 +-------- base/setup/usetup/lang/bn-BD.h | 2 +- base/setup/usetup/lang/cs-CZ.h | 2 +- base/setup/usetup/lang/da-DK.h | 9 +-------- base/setup/usetup/lang/de-DE.h | 9 +-------- base/setup/usetup/lang/el-GR.h | 9 +-------- base/setup/usetup/lang/en-US.h | 2 +- base/setup/usetup/lang/es-ES.h | 9 +-------- base/setup/usetup/lang/et-EE.h | 2 +- base/setup/usetup/lang/eu-ES.h | 9 +-------- base/setup/usetup/lang/fr-FR.h | 4 ++-- base/setup/usetup/lang/he-IL.h | 9 +-------- base/setup/usetup/lang/hr-HR.h | 4 ++-- base/setup/usetup/lang/hu-HU.h | 9 +-------- base/setup/usetup/lang/id-ID.h | 9 +-------- base/setup/usetup/lang/it-IT.h | 9 +-------- base/setup/usetup/lang/ja-JP.h | 9 +-------- base/setup/usetup/lang/lt-LT.h | 2 +- base/setup/usetup/lang/ms-MY.h | 9 +-------- base/setup/usetup/lang/nl-NL.h | 9 +-------- base/setup/usetup/lang/pl-PL.h | 9 +-------- base/setup/usetup/lang/pt-BR.h | 9 +-------- base/setup/usetup/lang/pt-PT.h | 9 +-------- base/setup/usetup/lang/ro-RO.h | 9 +-------- base/setup/usetup/lang/ru-RU.h | 9 +-------- base/setup/usetup/lang/sk-SK.h | 9 +-------- base/setup/usetup/lang/sq-AL.h | 9 +-------- base/setup/usetup/lang/sv-SE.h | 2 +- base/setup/usetup/lang/tr-TR.h | 6 +++--- base/setup/usetup/lang/uk-UA.h | 9 +-------- 30 files changed, 34 insertions(+), 181 deletions(-) diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 01d6593f20d..c4047ffdf9c 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -1523,14 +1523,7 @@ static MUI_ENTRY bgBGBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "\210\255\341\342\240\253\250\340\240\255\245 \255\240 \247\240\340\245\246\244\240\351\240\342\240 \257\340\256\243\340\240\254\240 (bootloader) \255\240 \244\250\341\252\240 \255\240 \252\256\254\257\356\342\352\340\240 \242\250", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "\241\245 \255\245\343\341\257\245\350\255\256.", + "\217\340\256\342\250\347\240 \250\255\341\342\240\253\250\340\240\255\245\342\256 \255\240 \247\240\340\245\246\244\240\351\240\342\240 \257\340\256\243\340\240\254\240.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index 8b58c3ea11c..b32da9dac66 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -1506,7 +1506,7 @@ static MUI_ENTRY bnBDBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "Setup cannot install the bootloader on your computer's harddisk.", + "Setup is installing the bootloader.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index e56e1965d97..0d8680c64b5 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -1514,7 +1514,7 @@ static MUI_ENTRY csCZBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "Instala\237n\241 aplikace nedok\240\247e nainstalovat zavad\330\237 na tento disk.", + "Instalace nyn\241 nainstaluje zavad\330\237.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index 3fd9627e772..ab5f6671775 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -1508,14 +1508,7 @@ static MUI_ENTRY daDKBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "Installationen kan ikke installere opstartsl\221seren p\206", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "din computers harddisk.", + "Installatione af opstartsl\221ser.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index d4bc90f004d..8e136466df2 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -1508,14 +1508,7 @@ static MUI_ENTRY deDEBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "Der Bootsektor konnte nicht auf der Festplatte Ihres Computers", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "installiert werden.", + "Setup installiert den Bootloader.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index a6a380a4807..c5dc76a9d29 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -1522,14 +1522,7 @@ static MUI_ENTRY elGRBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "\206 \234\232\241\230\253\341\251\253\230\251\236 \233\234 \243\247\246\250\234\345 \244\230 \234\232\241\230\253\230\251\253\343\251\234\240 \253\246\244 bootloader", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "\251\253\246 \251\241\242\236\250\346 \233\345\251\241\246 \253\246\254 \254\247\246\242\246\232\240\251\253\343 \251\230\252.", + "\206 \234\232\241\230\253\341\251\253\230\251\236 \232\250\341\255\234\240 \253\246\244 bootloader.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index 309758f4b5b..261cfd34ccc 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -1506,7 +1506,7 @@ static MUI_ENTRY enUSBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "Setup cannot install the bootloader on your computer's harddisk.", + "Setup is installing the bootloader.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 2c56ef80a82..303b94a3453 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -1520,14 +1520,7 @@ static MUI_ENTRY esESBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "El instalador no pudo instalar el sector de arranque en el disco", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "duro del equipo.", + "En este paso, el instalador crear\240 el sector de arranque.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index 4efdb8a8b50..3b9f8e3780f 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -1509,7 +1509,7 @@ static MUI_ENTRY etEEBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "Alglaadurit ei saanud kettale kirjutada.", + "Alglaaduri paigaldamine.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/eu-ES.h b/base/setup/usetup/lang/eu-ES.h index 3547baf0de9..4a8f52a677c 100644 --- a/base/setup/usetup/lang/eu-ES.h +++ b/base/setup/usetup/lang/eu-ES.h @@ -1507,14 +1507,7 @@ static MUI_ENTRY euESBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "Instalazio ez du ahalmenik bootloader-a instalatu zure ordenagailuaren", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "disko gogorra.", + "Instalazioak bootloader-a sartzen ari du.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index ec0ddef4b33..e014a3deb6a 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -1519,7 +1519,7 @@ static MUI_ENTRY frFRBootLoaderInstallPageEntries[] = { 0, 0, - "Installing the bootloader onto the media, please wait...", + "Installation du chargeur de d\202marrage, veuillez patienter...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -1543,7 +1543,7 @@ static MUI_ENTRY frFRBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "Setup ne peut installer le chargeur sur le disque dur de votre ordinateur.", + "Setup installe le chargeur de d\202marrage.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 485bcadbe3e..d0a09734175 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -1510,14 +1510,7 @@ static MUI_ENTRY heILBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "\207\211\231\227\204 \217\220\205\213\204 \214\222 \214\205\207\232\200\204 \214\204\220\216 \232\200 \217\211\227\232\204\214 \204\214\205\213\211 \204\220\211\200 \204\220\227\232\204\204", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "\212\201\231\207\216\201.", + "\214\205\207\232\200\204 \214\204\220\216 \232\200 \232\222\213 \204\220\211\227\232\216 \204\220\227\232\204\204 \232\211\220\213\232.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/hr-HR.h b/base/setup/usetup/lang/hr-HR.h index d7740a97211..8b48be3b02b 100644 --- a/base/setup/usetup/lang/hr-HR.h +++ b/base/setup/usetup/lang/hr-HR.h @@ -1530,14 +1530,14 @@ static MUI_ENTRY hrHRBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "Instalacijski program ne mo\247e instalirati bootloader (pokreta\237 operativnog sustava) na va\347", + "Instalacijski program instalirava bootloader", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 9, - "tvrdi disk u ra\237unalu.", + "(pokreta\237a operativnog sustava).", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h index 914f559d89d..cc9cc1db683 100644 --- a/base/setup/usetup/lang/hu-HU.h +++ b/base/setup/usetup/lang/hu-HU.h @@ -1400,14 +1400,7 @@ static MUI_ENTRY huHUBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "Nem siker\201lt telep\241teni a rendszerbet\224lt\213t", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "a sz\240m\241t\242g\202p merevlemez\202re.", + "Bootloader telep\241t\202se.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/id-ID.h b/base/setup/usetup/lang/id-ID.h index 2feda13d150..3e51d6fe906 100644 --- a/base/setup/usetup/lang/id-ID.h +++ b/base/setup/usetup/lang/id-ID.h @@ -1506,14 +1506,7 @@ static MUI_ENTRY idIDBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "Penyetelan tidak dapat menasang bootloader pada komputer Anda", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "harddisk.", + "Penyetelan sedang memasang the bootloader.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index f9f5c91e362..7b9c2e44ffe 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -1513,14 +1513,7 @@ static MUI_ENTRY itITBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "Il Setup non ha potuto installare il bootloader nel disco", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "del vostro computer.", + "Setup sta installando il bootloader.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index 2702a013d36..7aa4cdc64bb 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -1509,14 +1509,7 @@ static MUI_ENTRY jaJPBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "\276\257\304\261\257\314\337\312 \314\336\260\304\333\260\300\336\246 \272\335\313\337\255\260\300\311 \312\260\304\336\303\336\250\275\270\274\336\256\263\306 \262\335\275\304\260\331", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "\303\336\267\317\276\335\303\336\274\300.", + "\276\257\304\261\257\314\337\312 \314\336\260\304 \333\260\300\336\246 \262\335\275\304\260\331 \274\317\275.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index 1485b406360..db4cac8d57e 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -1517,7 +1517,7 @@ static MUI_ENTRY ltLTBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "Setup cannot install the bootloader on your computer's harddisk.", + "Setup is installing the bootloader.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index 1b69ece4df8..811a38a833d 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -1505,14 +1505,7 @@ static MUI_ENTRY msMYBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "Persediaan tidak dapat memasang bootloader pada komputer", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "cakera keras anda.", + "Persediaan sedang memasang bootloader.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index cb3f3c58d0b..a0b84a94c59 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -1521,14 +1521,7 @@ static MUI_ENTRY nlNLBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "Setup kan de bootloader niet op de vaste schijf van uw computer", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "installeren.", + "Setup installeert de bootloader.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index d8444f200dc..0ad31328b80 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -1518,14 +1518,7 @@ static MUI_ENTRY plPLBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "Instalator systemu ReactOS nie mo\276e zainstalowa\206", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "mened\276era rozruchu na dysku twardym.", + "Instalator musi teraz zainstalowa\206 mened\276er rozruchu.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 676228cdbdf..bebc0039e01 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -1522,14 +1522,7 @@ static MUI_ENTRY ptBRBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "O instalador n\306o p\223de instalar o ger\210nciador de inicializa\207\306o no disco", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "r\241gido do computador.", + "O instalador ir\240 configurar o ger\210nciador de inicializa\207\306o.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index 01f5ae9c3d5..b425bb62dbe 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -1522,14 +1522,7 @@ static MUI_ENTRY ptPTBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "O instalador n\306o pode instalar o gestor de inicializa\207\306o no disco", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "r\241gido do computador.", + "O instalador ir\240 configurar o gestor de arranque.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index ad29b302ac8..f7af3095fc3 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -1546,14 +1546,7 @@ static MUI_ENTRY roROBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "Programul de instalare nu poate instala modulul de", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "ini\376ializare a calculatorului pe discul local.", + "Instalare modul de ini\376ializare al calculatorului.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 2585660c222..3705eea7b29 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -1529,14 +1529,7 @@ static MUI_ENTRY ruRUBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250 \255\245 \341\254\256\243\253\240 \343\341\342\240\255\256\242\250\342\354 \247\240\243\340\343\247\347\250\252 \255\240", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "\246\361\341\342\252\250\251 \244\250\341\252 \242\240\350\245\243\256 \252\256\254\257\354\356\342\245\340\240.", + "\223\341\342\240\255\256\242\252\240 \247\240\243\340\343\247\347\250\252\240 ReactOS", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index 3e350056413..b39e794e3eb 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -1515,14 +1515,7 @@ static MUI_ENTRY skSKBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "In\347tal\240tor nem\223\247e nain\347talova\234 zav\240dza\237 syst\202mu na pevn\354 disk V\240\347ho", //bootloader = zav�dza\237 syst�mu - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "po\237\241ta\237a.", + "In\347tal\240tor je pripraven\354 nain\347talova\234 zav\240dza\237 opera\237n\202ho syst\202mu.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 82d8048318c..ae8a9e79eaa 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -1512,14 +1512,7 @@ static MUI_ENTRY sqALBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "Instalimi nuk mund t\211 instaloj\211 programin e bootloaderit ne kompjuterin tuaj", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "harddisku.", + "Instalimi po instalon bootloaderin.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 0b5dbf17695..6e4a2933264 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -1515,7 +1515,7 @@ static MUI_ENTRY svSEBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "Setup misslyckades med att installera bootloadern p\206 datorns h\206rddisk.", + "Setup installerar boot-loadern.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index bad8b72b9a2..fdc8e6e0fbe 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -1490,20 +1490,20 @@ static MUI_ENTRY trTRBootLoaderRemovableDiskPageEntries[] = { 6, 8, - "Kur, bilgisayar\215n\215z\215n sabit diskine \224ny\201kleyiciyi kuramad\215.", + "Kur, \224ny\201kleyiciyi kuruyor.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, - 12, + 13, "L\201tfen A: s\201r\201c\201s\201ne bi\207imlendirilmi\237 bir disket tak\215n\215z", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, - 13, + 14, "ve ENTER'e bas\215n\215z.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index fefc81cd259..fc40aba896f 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -1514,14 +1514,7 @@ static MUI_ENTRY ukUABootLoaderRemovableDiskPageEntries[] = { 6, 8, - "\202\341\342\240\255\256\242\253\356\242\240\347 \255\245 \254\256\246\245 \242\341\342\240\255\256\242\250\342\250 bootloader \255\240 \246\256\340\341\342\252\250\251 \244\250\341\252", - TEXT_STYLE_NORMAL, - TEXT_ID_STATIC - }, - { - 6, - 9, - "\202\240\350\256\243\256 \252\256\254\257'\356\342\245\340\240.", + "\202\341\342\240\255\256\242\253\356\242\240\347 \242\341\342\240\255\256\242\253\356\363 \247\240\242\240\255\342\240\246\343\242\240\347.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC },

2 months

[reactos] 05/06: [SETUP:REACTOS] Add bootloader installation support (#7310)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=424278db3ff4ecc261e0c… commit 424278db3ff4ecc261e0c73160d23c3c75cc537e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 21 21:48:55 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 20 16:51:26 2024 +0200 [SETUP:REACTOS] Add bootloader installation support (#7310) CORE-13525 --- base/setup/reactos/lang/bg-BG.rc | 7 ++ base/setup/reactos/lang/cs-CZ.rc | 7 ++ base/setup/reactos/lang/de-DE.rc | 7 ++ base/setup/reactos/lang/el-GR.rc | 7 ++ base/setup/reactos/lang/en-US.rc | 7 ++ base/setup/reactos/lang/es-ES.rc | 7 ++ base/setup/reactos/lang/et-EE.rc | 7 ++ base/setup/reactos/lang/eu-ES.rc | 7 ++ base/setup/reactos/lang/fi-FI.rc | 7 ++ base/setup/reactos/lang/fr-FR.rc | 7 ++ base/setup/reactos/lang/he-IL.rc | 7 ++ base/setup/reactos/lang/hi-IN.rc | 7 ++ base/setup/reactos/lang/hu-HU.rc | 7 ++ base/setup/reactos/lang/id-ID.rc | 7 ++ base/setup/reactos/lang/it-IT.rc | 7 ++ base/setup/reactos/lang/ja-JP.rc | 7 ++ base/setup/reactos/lang/ms-MY.rc | 7 ++ base/setup/reactos/lang/no-NO.rc | 7 ++ base/setup/reactos/lang/pl-PL.rc | 7 ++ base/setup/reactos/lang/pt-BR.rc | 7 ++ base/setup/reactos/lang/pt-PT.rc | 7 ++ base/setup/reactos/lang/ro-RO.rc | 7 ++ base/setup/reactos/lang/ru-RU.rc | 7 ++ base/setup/reactos/lang/sk-SK.rc | 7 ++ base/setup/reactos/lang/sq-AL.rc | 7 ++ base/setup/reactos/lang/tr-TR.rc | 7 ++ base/setup/reactos/lang/uk-UA.rc | 7 ++ base/setup/reactos/lang/vi-VN.rc | 7 ++ base/setup/reactos/lang/zh-CN.rc | 7 ++ base/setup/reactos/lang/zh-HK.rc | 7 ++ base/setup/reactos/lang/zh-TW.rc | 7 ++ base/setup/reactos/reactos.c | 135 ++++++++++++++++++++++++++++++++++++++- base/setup/reactos/resource.h | 10 +++ 33 files changed, 361 insertions(+), 1 deletion(-) diff --git a/base/setup/reactos/lang/bg-BG.rc b/base/setup/reactos/lang/bg-BG.rc index 2f43f74839a..06995ecf1cb 100644 --- a/base/setup/reactos/lang/bg-BG.rc +++ b/base/setup/reactos/lang/bg-BG.rc @@ -280,4 +280,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/cs-CZ.rc b/base/setup/reactos/lang/cs-CZ.rc index 9645e7cbc00..a77b7f2689e 100644 --- a/base/setup/reactos/lang/cs-CZ.rc +++ b/base/setup/reactos/lang/cs-CZ.rc @@ -286,4 +286,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/de-DE.rc b/base/setup/reactos/lang/de-DE.rc index 00b0347afe4..e36c9a2adea 100644 --- a/base/setup/reactos/lang/de-DE.rc +++ b/base/setup/reactos/lang/de-DE.rc @@ -280,4 +280,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/el-GR.rc b/base/setup/reactos/lang/el-GR.rc index 4ef7d7f2485..fd39462b009 100644 --- a/base/setup/reactos/lang/el-GR.rc +++ b/base/setup/reactos/lang/el-GR.rc @@ -280,4 +280,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/en-US.rc b/base/setup/reactos/lang/en-US.rc index f408db08e42..4bea2f92b56 100644 --- a/base/setup/reactos/lang/en-US.rc +++ b/base/setup/reactos/lang/en-US.rc @@ -280,4 +280,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/es-ES.rc b/base/setup/reactos/lang/es-ES.rc index e2f2443cda4..3dc8d747fa2 100644 --- a/base/setup/reactos/lang/es-ES.rc +++ b/base/setup/reactos/lang/es-ES.rc @@ -289,4 +289,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/et-EE.rc b/base/setup/reactos/lang/et-EE.rc index 2173ed3fe83..59147fca93b 100644 --- a/base/setup/reactos/lang/et-EE.rc +++ b/base/setup/reactos/lang/et-EE.rc @@ -280,4 +280,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/eu-ES.rc b/base/setup/reactos/lang/eu-ES.rc index 174b6c36c1f..515008778f7 100644 --- a/base/setup/reactos/lang/eu-ES.rc +++ b/base/setup/reactos/lang/eu-ES.rc @@ -287,4 +287,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/fi-FI.rc b/base/setup/reactos/lang/fi-FI.rc index 2cdadc38d2b..2060840e4ca 100644 --- a/base/setup/reactos/lang/fi-FI.rc +++ b/base/setup/reactos/lang/fi-FI.rc @@ -280,4 +280,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/fr-FR.rc b/base/setup/reactos/lang/fr-FR.rc index c1655ba3a56..8377367c049 100644 --- a/base/setup/reactos/lang/fr-FR.rc +++ b/base/setup/reactos/lang/fr-FR.rc @@ -280,4 +280,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Échec de l'installation du code de démarrage %s sur la partition système." + IDS_ERROR_INSTALL_BOOTCODE "Échec de l'installation du code de démarrage %s sur le disque système." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Échec de l'installation du code de démarrage sur le média amovible." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Le programme d'installation ne supporte pas actuellement l'installation du chargeur de démarrage sur l'ordinateur que vous utilisez.\ +\nCliquez sur OK pour continuer quand même." + IDS_ERROR_BOOTLDR_FAILED "Le programme d'installation n'a pas pu installer le chargeur de démarrage (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/he-IL.rc b/base/setup/reactos/lang/he-IL.rc index bca834654ca..4e36e313204 100644 --- a/base/setup/reactos/lang/he-IL.rc +++ b/base/setup/reactos/lang/he-IL.rc @@ -282,4 +282,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/hi-IN.rc b/base/setup/reactos/lang/hi-IN.rc index 649fbc1c0bc..787f9dfaca4 100644 --- a/base/setup/reactos/lang/hi-IN.rc +++ b/base/setup/reactos/lang/hi-IN.rc @@ -250,4 +250,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/hu-HU.rc b/base/setup/reactos/lang/hu-HU.rc index 21498adb4c4..3624c26ccd6 100644 --- a/base/setup/reactos/lang/hu-HU.rc +++ b/base/setup/reactos/lang/hu-HU.rc @@ -282,4 +282,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/id-ID.rc b/base/setup/reactos/lang/id-ID.rc index 8a02a29a0bb..8181054b616 100644 --- a/base/setup/reactos/lang/id-ID.rc +++ b/base/setup/reactos/lang/id-ID.rc @@ -280,4 +280,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/it-IT.rc b/base/setup/reactos/lang/it-IT.rc index c1415f9b2f2..f071c217f10 100644 --- a/base/setup/reactos/lang/it-IT.rc +++ b/base/setup/reactos/lang/it-IT.rc @@ -280,4 +280,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/ja-JP.rc b/base/setup/reactos/lang/ja-JP.rc index e432ae65f22..9301269e54f 100644 --- a/base/setup/reactos/lang/ja-JP.rc +++ b/base/setup/reactos/lang/ja-JP.rc @@ -280,4 +280,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/ms-MY.rc b/base/setup/reactos/lang/ms-MY.rc index da8c49cc800..733abf5613f 100644 --- a/base/setup/reactos/lang/ms-MY.rc +++ b/base/setup/reactos/lang/ms-MY.rc @@ -282,4 +282,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/no-NO.rc b/base/setup/reactos/lang/no-NO.rc index 8ffecfa7a0e..1d9447cfc1b 100644 --- a/base/setup/reactos/lang/no-NO.rc +++ b/base/setup/reactos/lang/no-NO.rc @@ -280,4 +280,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/pl-PL.rc b/base/setup/reactos/lang/pl-PL.rc index fadc7d1ac62..5afae2e1781 100644 --- a/base/setup/reactos/lang/pl-PL.rc +++ b/base/setup/reactos/lang/pl-PL.rc @@ -291,4 +291,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/pt-BR.rc b/base/setup/reactos/lang/pt-BR.rc index 38fab3d8b8f..fa6f3c4b1e6 100644 --- a/base/setup/reactos/lang/pt-BR.rc +++ b/base/setup/reactos/lang/pt-BR.rc @@ -280,4 +280,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/pt-PT.rc b/base/setup/reactos/lang/pt-PT.rc index 26c8547d453..26162b708c0 100644 --- a/base/setup/reactos/lang/pt-PT.rc +++ b/base/setup/reactos/lang/pt-PT.rc @@ -280,4 +280,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/ro-RO.rc b/base/setup/reactos/lang/ro-RO.rc index efebc60631a..209973a0e68 100644 --- a/base/setup/reactos/lang/ro-RO.rc +++ b/base/setup/reactos/lang/ro-RO.rc @@ -289,4 +289,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/ru-RU.rc b/base/setup/reactos/lang/ru-RU.rc index 1c6ea120e51..db2a6c843e6 100644 --- a/base/setup/reactos/lang/ru-RU.rc +++ b/base/setup/reactos/lang/ru-RU.rc @@ -280,4 +280,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/sk-SK.rc b/base/setup/reactos/lang/sk-SK.rc index 0314a8adb61..1bed0d0a631 100644 --- a/base/setup/reactos/lang/sk-SK.rc +++ b/base/setup/reactos/lang/sk-SK.rc @@ -285,4 +285,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/sq-AL.rc b/base/setup/reactos/lang/sq-AL.rc index 67df75a0690..0d4641bf045 100644 --- a/base/setup/reactos/lang/sq-AL.rc +++ b/base/setup/reactos/lang/sq-AL.rc @@ -282,4 +282,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/tr-TR.rc b/base/setup/reactos/lang/tr-TR.rc index 984d7469379..7c5196fcdfc 100644 --- a/base/setup/reactos/lang/tr-TR.rc +++ b/base/setup/reactos/lang/tr-TR.rc @@ -287,4 +287,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/uk-UA.rc b/base/setup/reactos/lang/uk-UA.rc index 7b3cc3f6368..80a8f388094 100644 --- a/base/setup/reactos/lang/uk-UA.rc +++ b/base/setup/reactos/lang/uk-UA.rc @@ -288,4 +288,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/vi-VN.rc b/base/setup/reactos/lang/vi-VN.rc index 412fbc53fac..75aa2a299c3 100644 --- a/base/setup/reactos/lang/vi-VN.rc +++ b/base/setup/reactos/lang/vi-VN.rc @@ -280,4 +280,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/zh-CN.rc b/base/setup/reactos/lang/zh-CN.rc index ceaab5efa48..41e7cd8f4f8 100644 --- a/base/setup/reactos/lang/zh-CN.rc +++ b/base/setup/reactos/lang/zh-CN.rc @@ -280,4 +280,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/zh-HK.rc b/base/setup/reactos/lang/zh-HK.rc index 0c31f4db676..6e658a9976b 100644 --- a/base/setup/reactos/lang/zh-HK.rc +++ b/base/setup/reactos/lang/zh-HK.rc @@ -288,4 +288,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/lang/zh-TW.rc b/base/setup/reactos/lang/zh-TW.rc index f7860c17214..2fb700bf3d7 100644 --- a/base/setup/reactos/lang/zh-TW.rc +++ b/base/setup/reactos/lang/zh-TW.rc @@ -289,4 +289,11 @@ the Setup program cannot install ReactOS.\ \nClick on CANCEL to quit Setup." IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status 0x%08lx)." + + IDS_ERROR_WRITE_BOOT "Setup failed to install the %s bootcode on the system partition." + IDS_ERROR_INSTALL_BOOTCODE "Setup failed to install the %s bootcode on the boot disk." + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE "Setup failed to install the bootcode on the removable media." + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED "Setup does not currently support installing the bootloader on the computer you are using.\ +\nClick on OK to continue anyway." + IDS_ERROR_BOOTLDR_FAILED "Setup could not install the bootloader (Status 0x%08lx)." END diff --git a/base/setup/reactos/reactos.c b/base/setup/reactos/reactos.c index aab095cc61d..5d5ee21cb0f 100644 --- a/base/setup/reactos/reactos.c +++ b/base/setup/reactos/reactos.c @@ -1769,7 +1769,7 @@ PrepareAndDoCopyThread( NTSTATUS Status; FSVOL_CONTEXT FsVolContext; COPYCONTEXT CopyContext; - // WCHAR PathBuffer[MAX_PATH]; + WCHAR PathBuffer[RTL_NUMBER_OF_FIELD(PARTENTRY, DeviceName) + 1]; /* Retrieve pointer to the global setup data */ pSetupData = (PSETUPDATA)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA); @@ -1986,6 +1986,139 @@ PrepareAndDoCopyThread( DBG_UNREFERENCED_PARAMETER(ErrorNumber); SendMessageW(UiContext.hWndProgress, PBM_SETPOS, 100, 0); + /* + * And finally, install the bootloader + */ + + /* Set status text */ + SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L"Installing the bootloader..."); + SetDlgItemTextW(hwndDlg, IDC_ITEM, L""); + + RtlFreeUnicodeString(&pSetupData->USetupData.SystemRootPath); + StringCchPrintfW(PathBuffer, _countof(PathBuffer), + L"%s\\", SystemPartition->DeviceName); + RtlCreateUnicodeString(&pSetupData->USetupData.SystemRootPath, PathBuffer); + DPRINT1("SystemRootPath: %wZ\n", &pSetupData->USetupData.SystemRootPath); + + switch (pSetupData->USetupData.BootLoaderLocation) + { + /* Install on removable disk */ + case 1: + { + // TODO: So far SETUP only supports the 1st floppy. + // Use a simple UI like comdlg32's DlgDirList* to show + // a list of drives that the user could select. + static const UNICODE_STRING FloppyDrive = RTL_CONSTANT_STRING(L"\\Device\\Floppy0\\"); + static const WCHAR DriveLetter = L'A'; + + INT nRet; + RetryCancel: + nRet = DisplayMessage(GetParent(hwndDlg), + MB_ICONINFORMATION | MB_OKCANCEL, + L"Bootloader installation", + L"Please insert a blank floppy disk in drive %c: .\n" + L"All data in the floppy disk will be erased!\n" + L"\nClick on OK to continue." + L"\nClick on CANCEL to skip bootloader installation.", + DriveLetter); + if (nRet != IDOK) + break; /* Skip installation */ + + Retry: + Status = InstallBootcodeToRemovable(pSetupData->USetupData.ArchType, + &FloppyDrive, + &pSetupData->USetupData.SourceRootPath, + &pSetupData->USetupData.DestinationArcPath); + if (Status == STATUS_SUCCESS) + break; /* Successful installation */ + + if (Status == STATUS_DEVICE_NOT_READY) + { + // ERROR_NO_FLOPPY + nRet = DisplayMessage(GetParent(hwndDlg), + MB_ICONWARNING | MB_RETRYCANCEL, + NULL, // Default to "Error" + L"No disk detected in drive %c: .", + DriveLetter); + if (nRet == IDRETRY) + goto Retry; + } + else if ((Status == ERROR_WRITE_BOOT) || + (Status == ERROR_INSTALL_BOOTCODE)) + { + /* Error when writing the boot code */ + DisplayError(GetParent(hwndDlg), + 0, // Default to "Error" + IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE); + } + else if (!NT_SUCCESS(Status)) + { + /* Any other NTSTATUS failure code */ + DPRINT1("InstallBootcodeToRemovable() failed: Status 0x%lx\n", Status); + DisplayError(GetParent(hwndDlg), + 0, // Default to "Error" + IDS_ERROR_BOOTLDR_FAILED, + Status); + } + goto RetryCancel; + } + + /* Install on hard-disk */ + case 2: // System partition / MBR and VBR (on BIOS-based PC) + case 3: // VBR only (on BIOS-based PC) + { + /* Copy FreeLoader to the disk and save the boot entries */ + Status = InstallBootManagerAndBootEntries( + pSetupData->USetupData.ArchType, + &pSetupData->USetupData.SystemRootPath, + &pSetupData->USetupData.SourceRootPath, + &pSetupData->USetupData.DestinationArcPath, + (pSetupData->USetupData.BootLoaderLocation == 2) + ? 1 /* Install MBR and VBR */ + : 0 /* Install VBR only */); + if (Status == STATUS_SUCCESS) + break; /* Successful installation */ + + if (Status == ERROR_WRITE_BOOT) + { + /* Error when writing the VBR */ + DisplayError(GetParent(hwndDlg), + 0, // Default to "Error" + IDS_ERROR_WRITE_BOOT, + SystemVolume->Info.FileSystem); + } + else if (Status == ERROR_INSTALL_BOOTCODE) + { + /* Error when writing the MBR */ + DisplayError(GetParent(hwndDlg), + 0, // Default to "Error" + IDS_ERROR_INSTALL_BOOTCODE, + L"MBR"); + } + else if (Status == STATUS_NOT_SUPPORTED) + { + DisplayError(GetParent(hwndDlg), + 0, // Default to "Error" + IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED); + } + else if (!NT_SUCCESS(Status)) + { + /* Any other NTSTATUS failure code */ + DPRINT1("InstallBootManagerAndBootEntries() failed: Status 0x%lx\n", Status); + DisplayError(GetParent(hwndDlg), + 0, // Default to "Error" + IDS_ERROR_BOOTLDR_FAILED, + Status); + } + break; + } + + /* Skip installation */ + case 0: + default: + break; + } + /* We are done! Switch to the Terminate page */ PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_RESTARTPAGE); diff --git a/base/setup/reactos/resource.h b/base/setup/reactos/resource.h index fac1ad7b48d..a9e154049b2 100644 --- a/base/setup/reactos/resource.h +++ b/base/setup/reactos/resource.h @@ -178,3 +178,13 @@ // ERROR_CHECKING_PARTITION // TODO #define IDS_ERROR_CHECKING_PARTITION 5315 + +// ERROR_WRITE_BOOT +#define IDS_ERROR_WRITE_BOOT 5316 +// ERROR_INSTALL_BOOTCODE +#define IDS_ERROR_INSTALL_BOOTCODE 5317 +#define IDS_ERROR_INSTALL_BOOTCODE_REMOVABLE 5318 +// STATUS_NOT_SUPPORTED for bootloader +#define IDS_ERROR_BOOTLDR_ARCH_UNSUPPORTED 5319 +// ERROR_BOOTLDR_FAILED // TODO +#define IDS_ERROR_BOOTLDR_FAILED 5320

2 months

[reactos] 04/06: [SETUPLIB][USETUP] Introduce a bootloader installation helper (#7310)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3cd57673785955c7bb06… commit b3cd57673785955c7bb069fb5d41fa379861cb0b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Aug 30 13:40:34 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 20 16:51:25 2024 +0200 [SETUPLIB][USETUP] Introduce a bootloader installation helper (#7310) CORE-13525 This is done so that the caller doesn't need to know details about particular architecture specifics, like VBR, MBR etc. Extra checks and specific handling is also performed for supporting bootloader installation on removable media: - verify whether the media is a floppy or some other removable media, - depending on which, a suitable file system is chosen, - and if the media is not a floppy, do the supplemental partition verifications to determine whether the media is a "super-floppy" (in the partitioning sense). --- base/setup/lib/bootsup.c | 525 +++++++++++++++++++++++++++++++++++++++------ base/setup/lib/bootsup.h | 52 ++--- base/setup/lib/setuplib.h | 21 +- base/setup/usetup/usetup.c | 148 +++++++------ 4 files changed, 563 insertions(+), 183 deletions(-) diff --git a/base/setup/lib/bootsup.c b/base/setup/lib/bootsup.c index 047de38b3cb..030ffd6e54c 100644 --- a/base/setup/lib/bootsup.c +++ b/base/setup/lib/bootsup.c @@ -1,17 +1,19 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Setup Library - * FILE: base/setup/lib/bootsup.c - * PURPOSE: Bootloader support functions - * PROGRAMMERS: ... - * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Bootloader support functions + * COPYRIGHT: ... + * Copyright 2017-2024 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> */ /* INCLUDES *****************************************************************/ #include "precomp.h" +#include <ntddstor.h> // For STORAGE_DEVICE_NUMBER + #include "bldrsup.h" +#include "devutils.h" #include "filesup.h" #include "partlist.h" #include "bootcode.h" @@ -827,11 +829,12 @@ C_ASSERT(sizeof(PARTITION_SECTOR) == SECTORSIZE); return Status; } +static NTSTATUS InstallMbrBootCodeToDisk( - IN PUNICODE_STRING SystemRootPath, - IN PUNICODE_STRING SourceRootPath, - IN PCWSTR DestinationDevicePathBuffer) + _In_ PCUNICODE_STRING SystemRootPath, + _In_ PCUNICODE_STRING SourceRootPath, + _In_ PCWSTR DestinationDevicePathBuffer) { NTSTATUS Status; WCHAR SourceMbrPathBuffer[MAX_PATH]; @@ -906,10 +909,10 @@ InstallBootloaderFiles( static NTSTATUS InstallFatBootcodeToPartition( - IN PUNICODE_STRING SystemRootPath, - IN PUNICODE_STRING SourceRootPath, - IN PUNICODE_STRING DestinationArcPath, - IN PCWSTR FileSystemName) + _In_ PCUNICODE_STRING SystemRootPath, + _In_ PCUNICODE_STRING SourceRootPath, + _In_ PCUNICODE_STRING DestinationArcPath, + _In_ PCWSTR FileSystemName) { NTSTATUS Status; BOOLEAN DoesFreeLdrExist; @@ -1196,9 +1199,9 @@ InstallFatBootcodeToPartition( static NTSTATUS InstallBtrfsBootcodeToPartition( - IN PUNICODE_STRING SystemRootPath, - IN PUNICODE_STRING SourceRootPath, - IN PUNICODE_STRING DestinationArcPath) + _In_ PCUNICODE_STRING SystemRootPath, + _In_ PCUNICODE_STRING SourceRootPath, + _In_ PCUNICODE_STRING DestinationArcPath) { NTSTATUS Status; BOOLEAN DoesFreeLdrExist; @@ -1295,9 +1298,9 @@ InstallBtrfsBootcodeToPartition( static NTSTATUS InstallNtfsBootcodeToPartition( - IN PUNICODE_STRING SystemRootPath, - IN PUNICODE_STRING SourceRootPath, - IN PUNICODE_STRING DestinationArcPath) + _In_ PCUNICODE_STRING SystemRootPath, + _In_ PCUNICODE_STRING SourceRootPath, + _In_ PCUNICODE_STRING DestinationArcPath) { NTSTATUS Status; BOOLEAN DoesFreeLdrExist; @@ -1389,13 +1392,13 @@ InstallNtfsBootcodeToPartition( return STATUS_SUCCESS; } - +static NTSTATUS InstallVBRToPartition( - IN PUNICODE_STRING SystemRootPath, - IN PUNICODE_STRING SourceRootPath, - IN PUNICODE_STRING DestinationArcPath, - IN PCWSTR FileSystemName) + _In_ PCUNICODE_STRING SystemRootPath, + _In_ PCUNICODE_STRING SourceRootPath, + _In_ PCUNICODE_STRING DestinationArcPath, + _In_ PCWSTR FileSystemName) { if (_wcsicmp(FileSystemName, L"FAT") == 0 || _wcsicmp(FileSystemName, L"FAT32") == 0) @@ -1435,74 +1438,464 @@ InstallVBRToPartition( } +/* GENERIC FUNCTIONS *********************************************************/ + +/** + * @brief + * Helper for InstallBootManagerAndBootEntries(). + * + * @param[in] ArchType + * @param[in] SystemRootPath + * See InstallBootManagerAndBootEntries() parameters. + * + * @param[in] DiskNumber + * The NT disk number of the system disk that contains the system partition. + * + * @param[in] DiskStyle + * The partitioning style of the system disk. + * + * @param[in] IsSuperFloppy + * Whether the system disk is a super-floppy. + * + * @param[in] FileSystem + * The file system of the system partition. + * + * @param[in] SourceRootPath + * @param[in] DestinationArcPath + * @param[in] Options + * See InstallBootManagerAndBootEntries() parameters. + * + * @return An NTSTATUS code indicating success or failure. + **/ +static NTSTATUS -InstallFatBootcodeToFloppy( - IN PUNICODE_STRING SourceRootPath, - IN PUNICODE_STRING DestinationArcPath) +InstallBootManagerAndBootEntriesWorker( + _In_ ARCHITECTURE_TYPE ArchType, + _In_ PCUNICODE_STRING SystemRootPath, + _In_ ULONG DiskNumber, // const STORAGE_DEVICE_NUMBER* DeviceNumber, + _In_ PARTITION_STYLE DiskStyle, + _In_ BOOLEAN IsSuperFloppy, + _In_ PCWSTR FileSystem, + _In_ PCUNICODE_STRING SourceRootPath, + _In_ PCUNICODE_STRING DestinationArcPath, + _In_ ULONG_PTR Options) { - static const PCWSTR FloppyDevice = L"\\Device\\Floppy0\\"; + NTSTATUS Status; + BOOLEAN IsBIOS = ((ArchType == ARCH_PcAT) || (ArchType == ARCH_NEC98x86)); + UCHAR InstallType = (Options & 0x03); + // FIXME: We currently only support BIOS-based PCs + // TODO: Support other platforms + if (!IsBIOS) + return STATUS_NOT_SUPPORTED; + + if (InstallType <= 1) + { + /* Step 1: Write the VBR */ + Status = InstallVBRToPartition(SystemRootPath, + SourceRootPath, + DestinationArcPath, + FileSystem); + if (!NT_SUCCESS(Status)) + { + DPRINT1("InstallVBRToPartition() failed (Status 0x%08lx)\n", Status); + return ERROR_WRITE_BOOT; // Status; STATUS_BAD_MASTER_BOOT_RECORD; + } + + /* Step 2: Write the MBR if the disk containing the + * system partition is MBR and not a super-floppy */ + if ((InstallType == 1) && (DiskStyle == PARTITION_STYLE_MBR) && !IsSuperFloppy) + { + WCHAR SystemDiskPath[MAX_PATH]; + RtlStringCchPrintfW(SystemDiskPath, _countof(SystemDiskPath), + L"\\Device\\Harddisk%d\\Partition0", + DiskNumber); + Status = InstallMbrBootCodeToDisk(SystemRootPath, + SourceRootPath, + SystemDiskPath); + if (!NT_SUCCESS(Status)) + { + DPRINT1("InstallMbrBootCodeToDisk() failed (Status 0x%08lx)\n", Status); + return ERROR_INSTALL_BOOTCODE; // Status; STATUS_BAD_MASTER_BOOT_RECORD; + } + } + } + else if (InstallType == 2) + { + WCHAR SrcPath[MAX_PATH]; + + // FIXME: We currently only support FAT12 file system. + if (_wcsicmp(FileSystem, L"FAT") != 0) + return STATUS_NOT_SUPPORTED; + + // TODO: In the future, we'll be able to use InstallVBRToPartition() + // directly, instead of re-doing manually the copy steps below. + + /* Install the bootloader to the boot partition */ + Status = InstallBootloaderFiles(SystemRootPath, SourceRootPath); + if (!NT_SUCCESS(Status)) + { + DPRINT1("InstallBootloaderFiles() failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Create new 'freeldr.ini' */ + DPRINT("Create new 'freeldr.ini'\n"); + Status = CreateFreeLoaderIniForReactOS(SystemRootPath->Buffer, DestinationArcPath->Buffer); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CreateFreeLoaderIniForReactOS() failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Install FAT12 bootsector */ + CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\fat.bin"); + + DPRINT1("Install FAT12 bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer); + Status = InstallBootCodeToDisk(SrcPath, SystemRootPath->Buffer, InstallFat12BootCode); + if (!NT_SUCCESS(Status)) + { + DPRINT1("InstallBootCodeToDisk(FAT12) failed (Status 0x%08lx)\n", Status); + return Status; + } + } + + return Status; +} + + +NTSTATUS +GetDeviceInfo_UStr( + _In_opt_ PCUNICODE_STRING DeviceName, + _In_opt_ HANDLE DeviceHandle, + _Out_ PFILE_FS_DEVICE_INFORMATION DeviceInfo) +{ NTSTATUS Status; - WCHAR SrcPath[MAX_PATH]; - WCHAR DstPath[MAX_PATH]; + IO_STATUS_BLOCK IoStatusBlock; - /* Verify that the floppy disk is accessible */ - if (DoesDirExist(NULL, FloppyDevice) == FALSE) - return STATUS_DEVICE_NOT_READY; + if (DeviceName && DeviceHandle) + return STATUS_INVALID_PARAMETER_MIX; - /* Format the floppy disk */ - // FormatPartition(...) - Status = FormatFileSystem(FloppyDevice, - L"FAT", - FMIFS_FLOPPY, - NULL, - TRUE, - 0, - NULL); - if (!NT_SUCCESS(Status)) + /* Open the device if a name has been given; + * otherwise just use the provided handle. */ + if (DeviceName) { - if (Status == STATUS_NOT_SUPPORTED) - DPRINT1("FAT FS non existent on this system?!\n"); - else - DPRINT1("VfatFormat() failed (Status %lx)\n", Status); + Status = pOpenDeviceEx_UStr(DeviceName, &DeviceHandle, + FILE_READ_ATTRIBUTES, + FILE_SHARE_READ | FILE_SHARE_WRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Cannot open device '%wZ' (Status 0x%08lx)\n", + DeviceName, Status); + return Status; + } + } + + /* Query the device */ + Status = NtQueryVolumeInformationFile(DeviceHandle, + &IoStatusBlock, + DeviceInfo, + sizeof(*DeviceInfo), + FileFsDeviceInformation); + if (!NT_SUCCESS(Status)) + DPRINT1("FileFsDeviceInformation failed (Status 0x%08lx)\n", Status); + + /* Close the device if we've opened it */ + if (DeviceName) + NtClose(DeviceHandle); + + return Status; +} +NTSTATUS +GetDeviceInfo( + _In_opt_ PCWSTR DeviceName, + _In_opt_ HANDLE DeviceHandle, + _Out_ PFILE_FS_DEVICE_INFORMATION DeviceInfo) +{ + UNICODE_STRING DeviceNameU; + + if (DeviceName && DeviceHandle) + return STATUS_INVALID_PARAMETER_MIX; + + if (DeviceName) + RtlInitUnicodeString(&DeviceNameU, DeviceName); + + return GetDeviceInfo_UStr(DeviceName ? &DeviceNameU : NULL, + DeviceName ? NULL : DeviceHandle, + DeviceInfo); +} + + +/** + * @brief + * Installs FreeLoader on the system and configure the boot entries. + * + * @todo + * Split this function into just the InstallBootManager, and a separate one + * for just the boot entries. + * + * @param[in] ArchType + * The target architecture. + * + * @param[in] SystemRootPath + * The system partition path, where the FreeLdr boot manager and its + * settings are saved to. + * + * @param[in] SourceRootPath + * The installation source, where to copy the FreeLdr boot manager from. + * + * @param[in] DestinationArcPath + * The ReactOS installation path in ARC format. + * + * @param[in] Options + * For BIOS-based PCs: + * LOBYTE: + * 0: Install only on VBR; + * 1: Install on both VBR and MBR. + * 2: Install on removable disk. + * + * @return An NTSTATUS code indicating success or failure. + **/ +NTSTATUS +InstallBootManagerAndBootEntries( + _In_ ARCHITECTURE_TYPE ArchType, + _In_ PCUNICODE_STRING SystemRootPath, + _In_ PCUNICODE_STRING SourceRootPath, + _In_ PCUNICODE_STRING DestinationArcPath, + _In_ ULONG_PTR Options) +{ + NTSTATUS Status; + HANDLE DeviceHandle; + FILE_FS_DEVICE_INFORMATION DeviceInfo; + ULONG DiskNumber; + PARTITION_STYLE PartitionStyle; + BOOLEAN IsSuperFloppy; + WCHAR FileSystem[MAX_PATH+1]; + + /* Remove any trailing backslash if needed */ + UNICODE_STRING RootPartition = *SystemRootPath; + TrimTrailingPathSeparators_UStr(&RootPartition); + + /* Open the volume */ + Status = pOpenDeviceEx_UStr(&RootPartition, &DeviceHandle, + GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Cannot open %wZ for bootloader installation (Status 0x%08lx)\n", + &RootPartition, Status); return Status; } - /* Copy FreeLoader to the boot partition */ - CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\freeldr.sys"); - CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, FloppyDevice, L"freeldr.sys"); + /* Retrieve the volume file system (it will also be mounted) */ + Status = GetFileSystemName_UStr(NULL, DeviceHandle, + FileSystem, sizeof(FileSystem)); + if (!NT_SUCCESS(Status) || !*FileSystem) + { + DPRINT1("GetFileSystemName() failed (Status 0x%08lx)\n", Status); + goto Quit; + } - DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); - Status = SetupCopyFile(SrcPath, DstPath, FALSE); + /* Retrieve the device type and characteristics */ + Status = GetDeviceInfo_UStr(NULL, DeviceHandle, &DeviceInfo); if (!NT_SUCCESS(Status)) { - DPRINT1("SetupCopyFile() failed (Status %lx)\n", Status); - return Status; + DPRINT1("FileFsDeviceInformation failed (Status 0x%08lx)\n", Status); + goto Quit; + } + + /* Ignore volumes that are NOT on usual disks */ + if (DeviceInfo.DeviceType != FILE_DEVICE_DISK /*&& + DeviceInfo.DeviceType != FILE_DEVICE_VIRTUAL_DISK*/) + { + DPRINT1("Invalid volume; device type %lu\n", DeviceInfo.DeviceType); + Status = STATUS_INVALID_DEVICE_REQUEST; + goto Quit; + } + + + /* Check whether this is a floppy or a partitionable device */ + if (DeviceInfo.Characteristics & FILE_FLOPPY_DISKETTE) + { + /* Floppies don't have partitions */ + // NOTE: See ntoskrnl/io/iomgr/rawfs.c!RawQueryFsSizeInfo() + DiskNumber = ULONG_MAX; + PartitionStyle = PARTITION_STYLE_MBR; + IsSuperFloppy = TRUE; + } + else + { + IO_STATUS_BLOCK IoStatusBlock; + STORAGE_DEVICE_NUMBER DeviceNumber; + + /* The maximum information a DISK_GEOMETRY_EX dynamic structure can contain */ + typedef struct _DISK_GEOMETRY_EX_INTERNAL + { + DISK_GEOMETRY Geometry; + LARGE_INTEGER DiskSize; + DISK_PARTITION_INFO Partition; + /* Followed by: DISK_DETECTION_INFO Detection; unused here */ + } DISK_GEOMETRY_EX_INTERNAL, *PDISK_GEOMETRY_EX_INTERNAL; + + DISK_GEOMETRY_EX_INTERNAL DiskGeoEx; + PARTITION_INFORMATION PartitionInfo; + + /* Retrieve the disk number. NOTE: Fails for floppy disks. */ + Status = NtDeviceIoControlFile(DeviceHandle, + NULL, NULL, NULL, + &IoStatusBlock, + IOCTL_STORAGE_GET_DEVICE_NUMBER, + NULL, 0, + &DeviceNumber, sizeof(DeviceNumber)); + if (!NT_SUCCESS(Status)) + goto Quit; /* This may be a dynamic volume, which is unsupported */ + ASSERT(DeviceNumber.DeviceType == DeviceInfo.DeviceType); + if (DeviceNumber.DeviceNumber == ULONG_MAX) + { + DPRINT1("Invalid disk number reported, bail out\n"); + Status = STATUS_NOT_FOUND; + goto Quit; + } + + /* Retrieve the drive geometry. NOTE: Fails for floppy disks; + * use IOCTL_DISK_GET_DRIVE_GEOMETRY instead. */ + Status = NtDeviceIoControlFile(DeviceHandle, + NULL, NULL, NULL, + &IoStatusBlock, + IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, + NULL, 0, + &DiskGeoEx, + sizeof(DiskGeoEx)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IOCTL_DISK_GET_DRIVE_GEOMETRY_EX failed (Status 0x%08lx)\n", Status); + goto Quit; + } + + /* + * Retrieve the volume's partition information. + * NOTE: Fails for floppy disks. + * + * NOTE: We can use the non-EX IOCTL because the super-floppy test will + * fail anyway if the disk is NOT MBR-partitioned. (If the disk is GPT, + * the IOCTL would return only the MBR protective partition, but the + * super-floppy test would fail due to the wrong partitioning style.) + */ + Status = NtDeviceIoControlFile(DeviceHandle, + NULL, NULL, NULL, + &IoStatusBlock, + IOCTL_DISK_GET_PARTITION_INFO, + NULL, 0, + &PartitionInfo, + sizeof(PartitionInfo)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IOCTL_DISK_GET_PARTITION_INFO failed (Status 0x%08lx)\n", Status); + goto Quit; + } + + DiskNumber = DeviceNumber.DeviceNumber; + PartitionStyle = DiskGeoEx.Partition.PartitionStyle; + IsSuperFloppy = IsDiskSuperFloppy2(&DiskGeoEx.Partition, + (PULONGLONG)&DiskGeoEx.DiskSize.QuadPart, + &PartitionInfo); } - /* Create new 'freeldr.ini' */ - DPRINT("Create new 'freeldr.ini'\n"); - Status = CreateFreeLoaderIniForReactOS(FloppyDevice, DestinationArcPath->Buffer); + Status = InstallBootManagerAndBootEntriesWorker( + ArchType, SystemRootPath, + DiskNumber, PartitionStyle, IsSuperFloppy, FileSystem, + SourceRootPath, DestinationArcPath, Options); + +Quit: + NtClose(DeviceHandle); + return Status; +} + +NTSTATUS +InstallBootcodeToRemovable( + _In_ ARCHITECTURE_TYPE ArchType, + _In_ PCUNICODE_STRING RemovableRootPath, + _In_ PCUNICODE_STRING SourceRootPath, + _In_ PCUNICODE_STRING DestinationArcPath) +{ + NTSTATUS Status; + FILE_FS_DEVICE_INFORMATION DeviceInfo; + PCWSTR FileSystemName; + BOOLEAN IsFloppy; + + /* Remove any trailing backslash if needed */ + UNICODE_STRING RootDrive = *RemovableRootPath; + TrimTrailingPathSeparators_UStr(&RootDrive); + + /* Verify that the removable disk is accessible */ + if (!DoesDirExist(NULL, RemovableRootPath->Buffer)) + return STATUS_DEVICE_NOT_READY; + + /* Retrieve the device type and characteristics */ + Status = GetDeviceInfo_UStr(&RootDrive, NULL, &DeviceInfo); if (!NT_SUCCESS(Status)) { - DPRINT1("CreateFreeLoaderIniForReactOS() failed (Status %lx)\n", Status); - return Status; + static const UNICODE_STRING DeviceFloppy = RTL_CONSTANT_STRING(L"\\Device\\Floppy"); + + DPRINT1("FileFsDeviceInformation failed (Status 0x%08lx)\n", Status); + + /* Definitively fail if the device is not a floppy */ + if (!RtlPrefixUnicodeString(&DeviceFloppy, &RootDrive, TRUE)) + return Status; /* We cannot cope with a failure */ + + /* Try to fall back to something "sane" if the device may be a floppy */ + DeviceInfo.DeviceType = FILE_DEVICE_DISK; + DeviceInfo.Characteristics = FILE_REMOVABLE_MEDIA | FILE_FLOPPY_DISKETTE; + } + + /* Ignore volumes that are NOT on usual disks */ + if (DeviceInfo.DeviceType != FILE_DEVICE_DISK /*&& + DeviceInfo.DeviceType != FILE_DEVICE_VIRTUAL_DISK*/) + { + DPRINT1("Invalid volume; device type %lu\n", DeviceInfo.DeviceType); + return STATUS_INVALID_DEVICE_REQUEST; } - /* Install FAT12 boosector */ - CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\fat.bin"); - CombinePaths(DstPath, ARRAYSIZE(DstPath), 1, FloppyDevice); + /* Fail if the disk is not removable */ + if (!(DeviceInfo.Characteristics & FILE_REMOVABLE_MEDIA)) + { + DPRINT1("Device is NOT removable!\n"); + return STATUS_INVALID_DEVICE_REQUEST; + } + + /* Check whether this is a floppy or another removable device */ + IsFloppy = !!(DeviceInfo.Characteristics & FILE_FLOPPY_DISKETTE); - DPRINT("Install FAT12 bootcode: %S ==> %S\n", SrcPath, DstPath); - Status = InstallBootCodeToDisk(SrcPath, DstPath, InstallFat12BootCode); + /* Use FAT32, unless the device is a floppy disk */ + FileSystemName = (IsFloppy ? L"FAT" : L"FAT32"); + + /* Format the removable disk */ + Status = FormatFileSystem_UStr(&RootDrive, + FileSystemName, + (IsFloppy ? FMIFS_FLOPPY : FMIFS_REMOVABLE), + NULL, + TRUE, + 0, + NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("InstallBootCodeToDisk(FAT12) failed (Status %lx)\n", Status); + if (Status == STATUS_NOT_SUPPORTED) + DPRINT1("%s FS non-existent on this system!\n", FileSystemName); + else + DPRINT1("FormatFileSystem(%s) failed (Status 0x%08lx)\n", FileSystemName, Status); return Status; } - return STATUS_SUCCESS; + /* Copy FreeLoader to the removable disk and save the boot entries */ + Status = InstallBootManagerAndBootEntries(ArchType, + RemovableRootPath, + SourceRootPath, + DestinationArcPath, + 2 /* Install on removable media */); + if (!NT_SUCCESS(Status)) + DPRINT1("InstallBootManagerAndBootEntries() failed (Status 0x%08lx)\n", Status); + return Status; } /* EOF */ diff --git a/base/setup/lib/bootsup.h b/base/setup/lib/bootsup.h index 3dcb2b6fd03..faacff7fbb1 100644 --- a/base/setup/lib/bootsup.h +++ b/base/setup/lib/bootsup.h @@ -1,47 +1,25 @@ /* - * ReactOS kernel - * Copyright (C) 2002 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 Setup Library - * FILE: base/setup/lib/bootsup.h - * PURPOSE: Bootloader support functions - * PROGRAMMER: + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Bootloader support functions + * COPYRIGHT: Copyright 2017-2024 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> */ #pragma once NTSTATUS -InstallMbrBootCodeToDisk( - IN PUNICODE_STRING SystemRootPath, - IN PUNICODE_STRING SourceRootPath, - IN PCWSTR DestinationDevicePathBuffer); - -NTSTATUS -InstallVBRToPartition( - IN PUNICODE_STRING SystemRootPath, - IN PUNICODE_STRING SourceRootPath, - IN PUNICODE_STRING DestinationArcPath, - IN PCWSTR FileSystemName); +InstallBootManagerAndBootEntries( + _In_ ARCHITECTURE_TYPE ArchType, + _In_ PCUNICODE_STRING SystemRootPath, + _In_ PCUNICODE_STRING SourceRootPath, + _In_ PCUNICODE_STRING DestinationArcPath, + _In_ ULONG_PTR Options); NTSTATUS -InstallFatBootcodeToFloppy( - IN PUNICODE_STRING SourceRootPath, - IN PUNICODE_STRING DestinationArcPath); +InstallBootcodeToRemovable( + _In_ ARCHITECTURE_TYPE ArchType, + _In_ PCUNICODE_STRING RemovableRootPath, + _In_ PCUNICODE_STRING SourceRootPath, + _In_ PCUNICODE_STRING DestinationArcPath); /* EOF */ diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index 02abdedc658..93edbebad14 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -40,6 +40,17 @@ extern HANDLE ProcessHeap; #include "utils/arcname.h" #include "utils/osdetect.h" #include "utils/regutil.h" + +typedef enum _ARCHITECTURE_TYPE +{ + ARCH_PcAT, //< Standard BIOS-based PC-AT + ARCH_NEC98x86, //< NEC PC-98 + ARCH_Xbox, //< Original Xbox + ARCH_Arc, //< ARC-based (MIPS, SGI) + ARCH_Efi, //< EFI and UEFI +// Place other architectures supported by the Setup below. +} ARCHITECTURE_TYPE; + #include "bootcode.h" #include "fsutil.h" #include "bootsup.h" @@ -66,16 +77,6 @@ struct _USETUP_DATA; typedef VOID (__cdecl *PSETUP_ERROR_ROUTINE)(IN struct _USETUP_DATA*, ...); -typedef enum _ARCHITECTURE_TYPE -{ - ARCH_PcAT, //< Standard BIOS-based PC-AT - ARCH_NEC98x86, //< NEC PC-98 - ARCH_Xbox, //< Original Xbox - ARCH_Arc, //< ARC-based (MIPS, SGI) - ARCH_Efi, //< EFI and UEFI -// Place other architectures supported by the Setup below. -} ARCHITECTURE_TYPE; - typedef struct _USETUP_DATA { /* Error handling *****/ diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 8eb4864091a..806353223a8 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -3618,30 +3618,45 @@ Retry: CONSOLE_ConInKey(Ir); if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { if (ConfirmQuit(Ir)) return FALSE; - break; } - else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ + else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { - Status = InstallFatBootcodeToFloppy(&USetupData.SourceRootPath, + // FIXME: So far USETUP only supports the 1st floppy. + static const UNICODE_STRING FloppyDrive = RTL_CONSTANT_STRING(L"\\Device\\Floppy0\\"); + Status = InstallBootcodeToRemovable(USetupData.ArchType, + &FloppyDrive, + &USetupData.SourceRootPath, &USetupData.DestinationArcPath); - if (!NT_SUCCESS(Status)) - { - if (Status == STATUS_DEVICE_NOT_READY) - MUIDisplayError(ERROR_NO_FLOPPY, Ir, POPUP_WAIT_ENTER); + if (Status == STATUS_SUCCESS) + return TRUE; /* Successful installation */ - /* TODO: Print error message */ - goto Retry; + if (Status == STATUS_DEVICE_NOT_READY) + { + MUIDisplayError(ERROR_NO_FLOPPY, Ir, POPUP_WAIT_ENTER); } - - return TRUE; + else if (!NT_SUCCESS(Status)) + { + /* Any other NTSTATUS failure code */ + CHAR Buffer[MAX_PATH]; + + DPRINT1("InstallBootcodeToRemovable() failed: Status 0x%lx\n", Status); + RtlStringCbPrintfA(Buffer, sizeof(Buffer), + "Setup could not install the bootloader.\n" + "(Status 0x%08lx).\n" + "Press ENTER to continue anyway.", + Status); + PopupError(Buffer, + MUIGetString(STRING_CONTINUE), + Ir, POPUP_WAIT_ENTER); + } + goto Retry; } } - goto Retry; } @@ -3652,54 +3667,54 @@ static BOOLEAN BootLoaderHardDiskPage(PINPUT_RECORD Ir) { NTSTATUS Status; - WCHAR DestinationDevicePathBuffer[MAX_PATH]; - if (USetupData.BootLoaderLocation == 2) + /* Copy FreeLoader to the disk and save the boot entries */ + Status = InstallBootManagerAndBootEntries( + USetupData.ArchType, + &USetupData.SystemRootPath, + &USetupData.SourceRootPath, + &USetupData.DestinationArcPath, + (USetupData.BootLoaderLocation == 2) + ? 1 /* Install MBR and VBR */ + : 0 /* Install VBR only */); + if (Status == STATUS_SUCCESS) + return TRUE; /* Successful installation */ + + if (Status == ERROR_WRITE_BOOT) { - /* Step 1: Write the VBR */ - Status = InstallVBRToPartition(&USetupData.SystemRootPath, - &USetupData.SourceRootPath, - &USetupData.DestinationArcPath, - SystemVolume->Info.FileSystem); - if (!NT_SUCCESS(Status)) - { - MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER, - SystemVolume->Info.FileSystem); - return FALSE; - } - - /* Step 2: Write the MBR if the disk containing the system partition is not a super-floppy */ - if (!IsSuperFloppy(SystemPartition->DiskEntry)) - { - RtlStringCchPrintfW(DestinationDevicePathBuffer, ARRAYSIZE(DestinationDevicePathBuffer), - L"\\Device\\Harddisk%d\\Partition0", - SystemPartition->DiskEntry->DiskNumber); - Status = InstallMbrBootCodeToDisk(&USetupData.SystemRootPath, - &USetupData.SourceRootPath, - DestinationDevicePathBuffer); - if (!NT_SUCCESS(Status)) - { - DPRINT1("InstallMbrBootCodeToDisk() failed: Status 0x%lx\n", Status); - MUIDisplayError(ERROR_INSTALL_BOOTCODE, Ir, POPUP_WAIT_ENTER, L"MBR"); - return FALSE; - } - } + /* Error when writing the VBR */ + MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER, + SystemVolume->Info.FileSystem); } - else + else if (Status == ERROR_INSTALL_BOOTCODE) { - Status = InstallVBRToPartition(&USetupData.SystemRootPath, - &USetupData.SourceRootPath, - &USetupData.DestinationArcPath, - SystemVolume->Info.FileSystem); - if (!NT_SUCCESS(Status)) - { - MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER, - SystemVolume->Info.FileSystem); - return FALSE; - } + /* Error when writing the MBR */ + MUIDisplayError(ERROR_INSTALL_BOOTCODE, Ir, POPUP_WAIT_ENTER, L"MBR"); + } + else if (Status == STATUS_NOT_SUPPORTED) + { + PopupError("Setup does not currently support installing\n" + "the bootloader on the computer you are using.\n" + "Press ENTER to continue anyway.", + MUIGetString(STRING_CONTINUE), + Ir, POPUP_WAIT_ENTER); } + else if (!NT_SUCCESS(Status)) + { + /* Any other NTSTATUS failure code */ + CHAR Buffer[MAX_PATH]; - return TRUE; + DPRINT1("InstallBootManagerAndBootEntries() failed: Status 0x%lx\n", Status); + RtlStringCbPrintfA(Buffer, sizeof(Buffer), + "Setup could not install the bootloader.\n" + "(Status 0x%08lx).\n" + "Press ENTER to continue anyway.", + Status); + PopupError(Buffer, + MUIGetString(STRING_CONTINUE), + Ir, POPUP_WAIT_ENTER); + } + return FALSE; } /* @@ -3717,16 +3732,11 @@ BootLoaderHardDiskPage(PINPUT_RECORD Ir) static PAGE_NUMBER BootLoaderInstallPage(PINPUT_RECORD Ir) { - WCHAR PathBuffer[MAX_PATH]; - - // /* We must have a supported system partition by now */ - // ASSERT(SystemPartition && SystemPartition->IsPartitioned && SystemPartition->PartitionNumber != 0); + WCHAR PathBuffer[RTL_NUMBER_OF_FIELD(PARTENTRY, DeviceName) + 1]; RtlFreeUnicodeString(&USetupData.SystemRootPath); - RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), - L"\\Device\\Harddisk%lu\\Partition%lu\\", - SystemPartition->DiskEntry->DiskNumber, - SystemPartition->PartitionNumber); + RtlStringCchPrintfW(PathBuffer, _countof(PathBuffer), + L"%s\\", SystemPartition->DeviceName); RtlCreateUnicodeString(&USetupData.SystemRootPath, PathBuffer); DPRINT1("SystemRootPath: %wZ\n", &USetupData.SystemRootPath); @@ -3735,19 +3745,17 @@ BootLoaderInstallPage(PINPUT_RECORD Ir) switch (USetupData.BootLoaderLocation) { - /* Skip installation */ - case 0: - return SUCCESS_PAGE; - /* Install on removable disk */ case 1: return BootLoaderRemovableDiskPage(Ir) ? SUCCESS_PAGE : QUIT_PAGE; - /* Install on hard-disk (both MBR and VBR, or VBR only) */ - case 2: - case 3: + /* Install on hard-disk */ + case 2: // System partition / MBR and VBR (on BIOS-based PC) + case 3: // VBR only (on BIOS-based PC) return BootLoaderHardDiskPage(Ir) ? SUCCESS_PAGE : QUIT_PAGE; + /* Skip installation */ + case 0: default: return SUCCESS_PAGE; }

2 months

[reactos] 03/06: [SETUPLIB] Introduce a helper for copying bootloader files (#7310)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=636e2e9172f905b376e54… commit 636e2e9172f905b376e543c7b2fefd51300038d6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Oct 17 13:37:25 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 20 16:51:24 2024 +0200 [SETUPLIB] Introduce a helper for copying bootloader files (#7310) This function could be generalized later to copy other files necessary for the bootloader; removing also the currently hardcoded placement in the installation source directory, and instead, using a configurable path (specified in txtsetup.sif); etc. Adapted from a commit by Timo Kreuzer (see PR #7420) Co-Authored-By: Timo Kreuzer <timo.kreuzer(a)reactos.org> --- base/setup/lib/bootsup.c | 55 ++++++++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/base/setup/lib/bootsup.c b/base/setup/lib/bootsup.c index 228376348b4..047de38b3cb 100644 --- a/base/setup/lib/bootsup.c +++ b/base/setup/lib/bootsup.c @@ -878,6 +878,31 @@ InstallMbrBootCodeToDisk( } +static +NTSTATUS +InstallBootloaderFiles( + _In_ PCUNICODE_STRING SystemRootPath, + _In_ PCUNICODE_STRING SourceRootPath) +{ + NTSTATUS Status; + WCHAR SrcPath[MAX_PATH]; + WCHAR DstPath[MAX_PATH]; + + /* Copy FreeLoader to the system partition, always overwriting the older version */ + CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\freeldr.sys"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"freeldr.sys"); + + DPRINT1("Copy: %S ==> %S\n", SrcPath, DstPath); + Status = SetupCopyFile(SrcPath, DstPath, FALSE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SetupCopyFile() failed (Status 0x%08lx)\n", Status); + return Status; + } + + return STATUS_SUCCESS; +} + static NTSTATUS InstallFatBootcodeToPartition( @@ -894,15 +919,11 @@ InstallFatBootcodeToPartition( /* FAT or FAT32 partition */ DPRINT("System path: '%wZ'\n", SystemRootPath); - /* Copy FreeLoader to the system partition, always overwriting the older version */ - CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\freeldr.sys"); - CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"freeldr.sys"); - - DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); - Status = SetupCopyFile(SrcPath, DstPath, FALSE); + /* Install the bootloader */ + Status = InstallBootloaderFiles(SystemRootPath, SourceRootPath); if (!NT_SUCCESS(Status)) { - DPRINT1("SetupCopyFile() failed (Status %lx)\n", Status); + DPRINT1("InstallBootloaderFiles() failed (Status %lx)\n", Status); return Status; } @@ -1187,15 +1208,11 @@ InstallBtrfsBootcodeToPartition( /* BTRFS partition */ DPRINT("System path: '%wZ'\n", SystemRootPath); - /* Copy FreeLoader to the system partition, always overwriting the older version */ - CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\freeldr.sys"); - CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"freeldr.sys"); - - DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); - Status = SetupCopyFile(SrcPath, DstPath, FALSE); + /* Install the bootloader */ + Status = InstallBootloaderFiles(SystemRootPath, SourceRootPath); if (!NT_SUCCESS(Status)) { - DPRINT1("SetupCopyFile() failed (Status %lx)\n", Status); + DPRINT1("InstallBootloaderFiles() failed (Status %lx)\n", Status); return Status; } @@ -1290,15 +1307,11 @@ InstallNtfsBootcodeToPartition( /* NTFS partition */ DPRINT("System path: '%wZ'\n", SystemRootPath); - /* Copy FreeLoader to the system partition, always overwriting the older version */ - CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\freeldr.sys"); - CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"freeldr.sys"); - - DPRINT1("Copy: %S ==> %S\n", SrcPath, DstPath); - Status = SetupCopyFile(SrcPath, DstPath, FALSE); + /* Install the bootloader */ + Status = InstallBootloaderFiles(SystemRootPath, SourceRootPath); if (!NT_SUCCESS(Status)) { - DPRINT1("SetupCopyFile() failed (Status %lx)\n", Status); + DPRINT1("InstallBootloaderFiles() failed (Status %lx)\n", Status); return Status; }

2 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2024