Ros-diffs

ros-diffs@reactos.org

11 participants
81011 discussions

[reactos] 07/07: [SETUP:REACTOS] Validate the installation path (#7162) CORE-13525

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=daee508516ac190e7e219… commit daee508516ac190e7e2197e7cc051b2968d031b4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jul 30 13:34:56 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Aug 12 12:46:22 2024 +0200 [SETUP:REACTOS] Validate the installation path (#7162) CORE-13525 --- base/setup/reactos/drivepage.c | 226 +++++++++++++++++++++++++++++++++++++-- base/setup/reactos/lang/bg-BG.rc | 19 ++++ base/setup/reactos/lang/cs-CZ.rc | 19 ++++ base/setup/reactos/lang/de-DE.rc | 19 ++++ base/setup/reactos/lang/el-GR.rc | 19 ++++ base/setup/reactos/lang/en-US.rc | 19 ++++ base/setup/reactos/lang/es-ES.rc | 19 ++++ base/setup/reactos/lang/et-EE.rc | 19 ++++ base/setup/reactos/lang/eu-ES.rc | 19 ++++ base/setup/reactos/lang/fi-FI.rc | 19 ++++ base/setup/reactos/lang/fr-FR.rc | 19 ++++ base/setup/reactos/lang/he-IL.rc | 19 ++++ base/setup/reactos/lang/hi-IN.rc | 19 ++++ base/setup/reactos/lang/hu-HU.rc | 19 ++++ base/setup/reactos/lang/id-ID.rc | 19 ++++ base/setup/reactos/lang/it-IT.rc | 19 ++++ base/setup/reactos/lang/ja-JP.rc | 19 ++++ base/setup/reactos/lang/ms-MY.rc | 19 ++++ base/setup/reactos/lang/no-NO.rc | 19 ++++ base/setup/reactos/lang/pl-PL.rc | 19 ++++ base/setup/reactos/lang/pt-BR.rc | 19 ++++ base/setup/reactos/lang/pt-PT.rc | 19 ++++ base/setup/reactos/lang/ro-RO.rc | 19 ++++ base/setup/reactos/lang/ru-RU.rc | 19 ++++ base/setup/reactos/lang/sk-SK.rc | 19 ++++ base/setup/reactos/lang/sq-AL.rc | 19 ++++ base/setup/reactos/lang/tr-TR.rc | 19 ++++ base/setup/reactos/lang/uk-UA.rc | 19 ++++ base/setup/reactos/lang/vi-VN.rc | 19 ++++ base/setup/reactos/lang/zh-CN.rc | 19 ++++ base/setup/reactos/lang/zh-HK.rc | 19 ++++ base/setup/reactos/lang/zh-TW.rc | 19 ++++ base/setup/reactos/resource.h | 9 ++ 33 files changed, 818 insertions(+), 6 deletions(-) diff --git a/base/setup/reactos/drivepage.c b/base/setup/reactos/drivepage.c index ce038f5887d..320e0c62fa3 100644 --- a/base/setup/reactos/drivepage.c +++ b/base/setup/reactos/drivepage.c @@ -48,6 +48,182 @@ static const INT column_alignment[MAX_LIST_COLUMNS] = {LVCFMT_LEFT, LVCFMT_LEFT /* FUNCTIONS ****************************************************************/ +/** + * @brief + * Sanitize a given string in-place, by + * removing any invalid character found in it. + **/ +static BOOL +DoSanitizeText( + _Inout_ PWSTR pszSanitized) +{ + PWCHAR pch1, pch2; + BOOL bSanitized = FALSE; + + for (pch1 = pch2 = pszSanitized; *pch1; ++pch1) + { + /* Skip any invalid character found */ + if (!IS_VALID_INSTALL_PATH_CHAR(*pch1)) + { + bSanitized = TRUE; + continue; + } + + /* Copy over the valid ones */ + *pch2 = *pch1; + ++pch2; + } + *pch2 = 0; + + return bSanitized; +} + +/** + * @brief + * Sanitize in-place any text found in the clipboard. + **/ +static BOOL +DoSanitizeClipboard( + _In_ HWND hWnd) +{ + HGLOBAL hData; + LPWSTR pszText, pszSanitized; + BOOL bSanitized; + + /* Protect read-only edit control from modification */ + if (GetWindowLongPtrW(hWnd, GWL_STYLE) & ES_READONLY) + return FALSE; + + if (!OpenClipboard(hWnd)) + return FALSE; + + hData = GetClipboardData(CF_UNICODETEXT); + pszText = GlobalLock(hData); + if (!pszText) + { + CloseClipboard(); + return FALSE; + } + + pszSanitized = _wcsdup(pszText); + GlobalUnlock(hData); + bSanitized = (pszSanitized && DoSanitizeText(pszSanitized)); + if (bSanitized) + { + /* Update clipboard text */ + SIZE_T cbData = (wcslen(pszSanitized) + 1) * sizeof(WCHAR); + hData = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, cbData); + pszText = GlobalLock(hData); + if (pszText) + { + CopyMemory(pszText, pszSanitized, cbData); + GlobalUnlock(hData); + SetClipboardData(CF_UNICODETEXT, hData); + } + } + free(pszSanitized); + + CloseClipboard(); + return bSanitized; +} + +static VOID +ShowErrorTip( + _In_ HWND hEdit) +{ + EDITBALLOONTIP balloon; + WCHAR szTitle[512]; + WCHAR szText[512]; + + /* Load the resources */ + LoadStringW(SetupData.hInstance, IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE, szTitle, _countof(szTitle)); + LoadStringW(SetupData.hInstance, IDS_ERROR_INVALID_INSTALLDIR_CHAR, szText, _countof(szText)); + + /* Show a warning balloon */ + balloon.cbStruct = sizeof(balloon); + balloon.pszTitle = szTitle; + balloon.pszText = szText; +#if (_WIN32_WINNT < _WIN32_WINNT_VISTA) + balloon.ttiIcon = TTI_ERROR; +#else + balloon.ttiIcon = TTI_ERROR_LARGE; +#endif + + MessageBeep(MB_ICONERROR); + Edit_ShowBalloonTip(hEdit, &balloon); + + // NOTE: There is no need to hide it when other keys are pressed; + // the EDIT control will deal with that itself. +} + +/** + * @brief + * Subclass edit window procedure to filter allowed characters + * for the ReactOS installation directory. + **/ +static LRESULT +CALLBACK +InstallDirEditProc( + _In_ HWND hWnd, + _In_ UINT uMsg, + _In_ WPARAM wParam, + _In_ LPARAM lParam) +{ + WNDPROC orgEditProc = (WNDPROC)GetWindowLongPtrW(hWnd, GWLP_USERDATA); + + switch (uMsg) + { + case WM_UNICHAR: + if (wParam == UNICODE_NOCHAR) + return TRUE; + __fallthrough; + + case WM_IME_CHAR: + case WM_CHAR: + { + WCHAR wch = (WCHAR)wParam; + + /* Let the EDIT control deal with Control characters. + * It won't emit them as raw data in the text. */ + if (wParam < ' ') + break; + + /* Ignore Ctrl-Backspace */ + if (wParam == '\x7F') + return 0; + + /* Protect read-only edit control from modification */ + if (GetWindowLongPtrW(hWnd, GWL_STYLE) & ES_READONLY) + break; + + if (uMsg == WM_IME_CHAR) + { + if (!IsWindowUnicode(hWnd) && HIBYTE(wch) != 0) + { + CHAR data[] = {HIBYTE(wch), LOBYTE(wch)}; + MultiByteToWideChar(CP_ACP, 0, data, 2, &wch, 1); + } + } + + /* Show an error and ignore input character if it's invalid */ + if (!IS_VALID_INSTALL_PATH_CHAR(wch)) + { + ShowErrorTip(hWnd); + return 0; + } + break; + } + + case WM_PASTE: + /* Verify the text being pasted; if it was sanitized, show an error */ + if (DoSanitizeClipboard(hWnd)) + ShowErrorTip(hWnd); + break; + } + + return CallWindowProcW(orgEditProc, hWnd, uMsg, wParam, lParam); +} + static INT_PTR CALLBACK MoreOptDlgProc( @@ -65,6 +241,8 @@ MoreOptDlgProc( { case WM_INITDIALOG: { + HWND hEdit; + WNDPROC orgEditProc; BOOL bIsBIOS; UINT uID; INT iItem, iCurrent = CB_ERR, iDefault = 0; @@ -74,8 +252,14 @@ MoreOptDlgProc( pSetupData = (PSETUPDATA)lParam; SetWindowLongPtrW(hDlg, GWLP_USERDATA, (LONG_PTR)pSetupData); - SetDlgItemTextW(hDlg, IDC_PATH, - pSetupData->USetupData.InstallationDirectory); + /* Subclass the install-dir edit control */ + hEdit = GetDlgItem(hDlg, IDC_PATH); + orgEditProc = (WNDPROC)GetWindowLongPtrW(hEdit, GWLP_WNDPROC); + SetWindowLongPtrW(hEdit, GWLP_USERDATA, (LONG_PTR)orgEditProc); + SetWindowLongPtrW(hEdit, GWLP_WNDPROC, (LONG_PTR)InstallDirEditProc); + + /* Set the current installation directory */ + SetWindowTextW(hEdit, pSetupData->USetupData.InstallationDirectory); /* Initialize the list of available bootloader locations */ @@ -112,18 +296,48 @@ MoreOptDlgProc( break; } + case WM_DESTROY: + { + /* Unsubclass the edit control */ + HWND hEdit = GetDlgItem(hDlg, IDC_PATH); + WNDPROC orgEditProc = (WNDPROC)GetWindowLongPtrW(hEdit, GWLP_USERDATA); + if (orgEditProc) SetWindowLongPtrW(hEdit, GWLP_WNDPROC, (LONG_PTR)orgEditProc); + break; + } + case WM_COMMAND: switch (LOWORD(wParam)) { case IDOK: { + HWND hEdit; + BOOL bIsValid; + WCHAR InstallDir[MAX_PATH]; INT iItem; UINT uBldrLoc = CB_ERR; - /* Retrieve the installation path */ - GetDlgItemTextW(hDlg, IDC_PATH, - pSetupData->USetupData.InstallationDirectory, - ARRAYSIZE(pSetupData->USetupData.InstallationDirectory)); + /* + * Retrieve the installation path and verify its validity. + * Check for the validity of the installation directory and + * pop up an error if this is not the case. + */ + hEdit = GetDlgItem(hDlg, IDC_PATH); + bIsValid = (GetWindowTextLengthW(hEdit) < _countof(InstallDir)); // && IsValidInstallDirectory(InstallDir); + GetWindowTextW(hEdit, InstallDir, _countof(InstallDir)); + bIsValid = bIsValid && IsValidInstallDirectory(InstallDir); + + if (!bIsValid) + { + // ERROR_DIRECTORY_NAME + DisplayError(hDlg, + IDS_ERROR_DIRECTORY_NAME_TITLE, + IDS_ERROR_DIRECTORY_NAME); + break; // Go back to the dialog. + } + + StringCchCopyW(pSetupData->USetupData.InstallationDirectory, + _countof(pSetupData->USetupData.InstallationDirectory), + InstallDir); /* Retrieve the bootloader location */ iItem = SendDlgItemMessageW(hDlg, IDC_INSTFREELDR, CB_GETCURSEL, 0, 0); diff --git a/base/setup/reactos/lang/bg-BG.rc b/base/setup/reactos/lang/bg-BG.rc index fe86ea0ae03..cde5d823099 100644 --- a/base/setup/reactos/lang/bg-BG.rc +++ b/base/setup/reactos/lang/bg-BG.rc @@ -1,5 +1,7 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Настройка на РеактОС" @@ -138,6 +140,8 @@ BEGIN LTEXT "Ако в устройството има КД, го извадете. След това натиснете „Приключване“, за да презапуснете компютъра.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "РеактОС ви приветства!" @@ -181,3 +185,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR и VBR (Default)" IDS_BOOTLOADER_VBRONLY "Само VBR" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/cs-CZ.rc b/base/setup/reactos/lang/cs-CZ.rc index d66d5577122..1c8bcd68ec4 100644 --- a/base/setup/reactos/lang/cs-CZ.rc +++ b/base/setup/reactos/lang/cs-CZ.rc @@ -6,6 +6,8 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalace systému ReactOS" @@ -144,6 +146,8 @@ BEGIN LTEXT "Pokud je v mechanice instalační CD, vyjměte jej. Poté kliknutím na Dokončit restartujte počítač.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Vítejte v průvodci instalace systému ReactOS" @@ -187,3 +191,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR a VBR (Default)" IDS_BOOTLOADER_VBRONLY "Jen VBR" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/de-DE.rc b/base/setup/reactos/lang/de-DE.rc index a32b0f4f1c8..0a76599772f 100644 --- a/base/setup/reactos/lang/de-DE.rc +++ b/base/setup/reactos/lang/de-DE.rc @@ -1,5 +1,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS-Setup" @@ -138,6 +140,8 @@ BEGIN LTEXT "Wenn eine CD im Laufwerk ist, entfernen Sie diese. Klicken Sie zum Neustart auf Beenden.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Willkommen zum ReactOS-Setup" @@ -181,3 +185,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR und VBR (Default)" IDS_BOOTLOADER_VBRONLY "Nur VBR" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/el-GR.rc b/base/setup/reactos/lang/el-GR.rc index f6141126f83..8348a9b228f 100644 --- a/base/setup/reactos/lang/el-GR.rc +++ b/base/setup/reactos/lang/el-GR.rc @@ -1,5 +1,7 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Εγκατάσταση του ReactOS" @@ -138,6 +140,8 @@ BEGIN LTEXT "Αν υπάρχει κάποιο CD, αφαιρέστε το. Έπειτα, για να γίνει επανεκκίνηση, πατήστε Ολοκλήρωση.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Καλώς ήλθατε στην Εγκατάσταση του ReactOS" @@ -181,3 +185,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR and VBR (Default)" IDS_BOOTLOADER_VBRONLY "VBR only" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/en-US.rc b/base/setup/reactos/lang/en-US.rc index 0dc8e4daf55..b6ae3997385 100644 --- a/base/setup/reactos/lang/en-US.rc +++ b/base/setup/reactos/lang/en-US.rc @@ -1,5 +1,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -138,6 +140,8 @@ BEGIN LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Welcome to ReactOS Setup" @@ -181,3 +185,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR and VBR (Default)" IDS_BOOTLOADER_VBRONLY "VBR only" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/es-ES.rc b/base/setup/reactos/lang/es-ES.rc index bda7084c568..96d5468de4d 100644 --- a/base/setup/reactos/lang/es-ES.rc +++ b/base/setup/reactos/lang/es-ES.rc @@ -9,6 +9,8 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalación de ReactOS" @@ -147,6 +149,8 @@ BEGIN LTEXT "Si tiene CDs en alguna unidad, retírelos. Luego, reinicie el equipo haciendo clic en Finalizar.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Bienvenido a la instalación de ReactOS" @@ -190,3 +194,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR y VBR (Default)" IDS_BOOTLOADER_VBRONLY "Solo VBR" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/et-EE.rc b/base/setup/reactos/lang/et-EE.rc index e00f6578256..c0ee1855144 100644 --- a/base/setup/reactos/lang/et-EE.rc +++ b/base/setup/reactos/lang/et-EE.rc @@ -1,5 +1,7 @@ LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS'i paigaldamine" @@ -138,6 +140,8 @@ BEGIN LTEXT "Võta CD välja ja vajuta Lõpeta, et arvuti taaskäivitada.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Tere tulemast ReactOS'i paigaldama" @@ -181,3 +185,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR ja VBR (Default)" IDS_BOOTLOADER_VBRONLY "Ainult VBR" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/eu-ES.rc b/base/setup/reactos/lang/eu-ES.rc index e5cdc518447..812d2d2d26e 100644 --- a/base/setup/reactos/lang/eu-ES.rc +++ b/base/setup/reactos/lang/eu-ES.rc @@ -7,6 +7,8 @@ LANGUAGE LANG_BASQUE, SUBLANG_NEUTRAL +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalación de ReactOS" @@ -145,6 +147,8 @@ BEGIN LTEXT "Si tiene CDs en alguna unidad, retírelos. Luego, reinicie el equipo haciendo clic en Finalizar.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Bienvenido a la instalación de ReactOS" @@ -188,3 +192,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR y VBR (Default)" IDS_BOOTLOADER_VBRONLY "Solo VBR" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/fi-FI.rc b/base/setup/reactos/lang/fi-FI.rc index 2e609008b04..55e67edafea 100644 --- a/base/setup/reactos/lang/fi-FI.rc +++ b/base/setup/reactos/lang/fi-FI.rc @@ -1,5 +1,7 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Asennus" @@ -138,6 +140,8 @@ BEGIN LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Welcome to ReactOS Setup" @@ -181,3 +185,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR and VBR (Default)" IDS_BOOTLOADER_VBRONLY "VBR only" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/fr-FR.rc b/base/setup/reactos/lang/fr-FR.rc index 9e5f79d46d3..a6d6a7f5957 100644 --- a/base/setup/reactos/lang/fr-FR.rc +++ b/base/setup/reactos/lang/fr-FR.rc @@ -1,5 +1,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installation de ReactOS" @@ -138,6 +140,8 @@ BEGIN LTEXT "S'il y a un CD dans le lecteur, retirez le. Appuyez ensuite sur Terminer pour redémarrer votre ordinateur.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Bienvenue dans l'installation de ReactOS" @@ -181,3 +185,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR et VBR (par défaut)" IDS_BOOTLOADER_VBRONLY "VBR seulement" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Caractère invalide" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "Les seuls caractères valides sont :\n\ +alphanumériques (a-z, A-Z, 0-9), et\n . \\ - _\n\ +Les caractères d'espacement ne sont pas autorisés." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Chemin d'installation invalide" + IDS_ERROR_DIRECTORY_NAME "Le chemin d'installation de ReactOS doit être au format DOS de noms 8.3, \ +et contenir seulement des lettres, chiffres, tirets et points. Les caractères d'espacement ne sont pas autorisés." +END diff --git a/base/setup/reactos/lang/he-IL.rc b/base/setup/reactos/lang/he-IL.rc index 58c7163ef60..f8a1f9f4efa 100644 --- a/base/setup/reactos/lang/he-IL.rc +++ b/base/setup/reactos/lang/he-IL.rc @@ -2,6 +2,8 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "התקנת ReactOS" @@ -140,6 +142,8 @@ BEGIN LTEXT "'אם יש דיסק בכונן, הסר אותו ואז, בשביל מחדש את המחשב לחץ על 'סיום", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "ברוכים הבאים לתוכנית ההתקנה של ReactOS" @@ -183,3 +187,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR and VBR (Default)" IDS_BOOTLOADER_VBRONLY "VBR only" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/hi-IN.rc b/base/setup/reactos/lang/hi-IN.rc index a56e99168e7..5508057de90 100644 --- a/base/setup/reactos/lang/hi-IN.rc +++ b/base/setup/reactos/lang/hi-IN.rc @@ -7,6 +7,8 @@ LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "रिऐक्ट ओएस सेटअप" @@ -116,6 +118,8 @@ BEGIN LTEXT "यदि ड्राइव में सीडी है, तो इसे हटा दें। फिर, अपने कंप्यूटर को पुनरारंभ करने के लिए, समाप्त क्लिक करें।", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "रिऐक्ट ओएस सेटअप में आपका स्वागत है" @@ -151,3 +155,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR और VBR (Default)" IDS_BOOTLOADER_VBRONLY "केवल VBR" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/hu-HU.rc b/base/setup/reactos/lang/hu-HU.rc index 11f8196ad90..2721b9976a4 100644 --- a/base/setup/reactos/lang/hu-HU.rc +++ b/base/setup/reactos/lang/hu-HU.rc @@ -2,6 +2,8 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS telepítõ" @@ -140,6 +142,8 @@ BEGIN LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Welcome to ReactOS Setup" @@ -183,3 +187,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR and VBR (Default)" IDS_BOOTLOADER_VBRONLY "VBR only" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/id-ID.rc b/base/setup/reactos/lang/id-ID.rc index 6cf0daafc68..297baa680c9 100644 --- a/base/setup/reactos/lang/id-ID.rc +++ b/base/setup/reactos/lang/id-ID.rc @@ -1,5 +1,7 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Penyetelan ReactOS" @@ -138,6 +140,8 @@ BEGIN LTEXT "Jika terdapat CD pada drive, keluarkan. Lalu, untuk memulai ulang komputer, klik Selesai.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Selamat datang di Penyetelan ReactOS" @@ -181,3 +185,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR dan VBR (Default)" IDS_BOOTLOADER_VBRONLY "Hanya VBR" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/it-IT.rc b/base/setup/reactos/lang/it-IT.rc index c31d0adbbe8..a5600a36ac1 100644 --- a/base/setup/reactos/lang/it-IT.rc +++ b/base/setup/reactos/lang/it-IT.rc @@ -1,5 +1,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installazione di ReactOS" @@ -138,6 +140,8 @@ BEGIN LTEXT "Se presente rimuovere il CD dal lettore e cliccare Fine per riavviare il computer.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Benvenuti nell'installazione di ReactOS" @@ -181,3 +185,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR e VBR (Default)" IDS_BOOTLOADER_VBRONLY "Solo VBR" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/ja-JP.rc b/base/setup/reactos/lang/ja-JP.rc index cde8c5caea0..fa99cb5920f 100644 --- a/base/setup/reactos/lang/ja-JP.rc +++ b/base/setup/reactos/lang/ja-JP.rc @@ -1,5 +1,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS セットアップ" @@ -138,6 +140,8 @@ BEGIN LTEXT "もしCDがドライブにあれば、取り除いて下さい。その後、あなたのコンピュータを再起動するには、完了をクリックして下さい。", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "ReactOS セットアップにようこそ" @@ -181,3 +185,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBRとVBR (Default)" IDS_BOOTLOADER_VBRONLY "VBRのみ" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/ms-MY.rc b/base/setup/reactos/lang/ms-MY.rc index 657ca65a88f..8f9fa05cf93 100644 --- a/base/setup/reactos/lang/ms-MY.rc +++ b/base/setup/reactos/lang/ms-MY.rc @@ -2,6 +2,8 @@ LANGUAGE LANG_MALAY, SUBLANG_DEFAULT +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Persediaan" @@ -140,6 +142,8 @@ BEGIN LTEXT "Jika ada CD ke dalam pemacu, mengeluarkannya. Kemudian, untuk memulakan semula komputer anda, klik selesai.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Selamat datang ke persediaan ReactOS" @@ -183,3 +187,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR dan VBR (Default)" IDS_BOOTLOADER_VBRONLY "VBR sahaja" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/no-NO.rc b/base/setup/reactos/lang/no-NO.rc index 81ecddef3e1..532c69978c8 100644 --- a/base/setup/reactos/lang/no-NO.rc +++ b/base/setup/reactos/lang/no-NO.rc @@ -1,5 +1,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS installering" @@ -138,6 +140,8 @@ BEGIN LTEXT "Hvis du fortsatt har CD platen i stasjon, fjern denne. For å starte din datamaskin på nytt, trykk på Fullført.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Velkommen til ReactOS installering" @@ -181,3 +185,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR og VBR (Default)" IDS_BOOTLOADER_VBRONLY "Bare VBR" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/pl-PL.rc b/base/setup/reactos/lang/pl-PL.rc index a533c9f4a16..4da8e183ba1 100644 --- a/base/setup/reactos/lang/pl-PL.rc +++ b/base/setup/reactos/lang/pl-PL.rc @@ -11,6 +11,8 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalator systemu ReactOS" @@ -149,6 +151,8 @@ BEGIN LTEXT "Jeśli w napędzie jest płyta CD, wyjmij ją. Następnie Kliknij Zakończ, aby ponownie uruchomić komputer.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Witamy w Kreatorze instalacji systemu ReactOS" @@ -192,3 +196,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR i VBR (Default)" IDS_BOOTLOADER_VBRONLY "Tylko VBR" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/pt-BR.rc b/base/setup/reactos/lang/pt-BR.rc index ca70662eb17..df377f37d10 100644 --- a/base/setup/reactos/lang/pt-BR.rc +++ b/base/setup/reactos/lang/pt-BR.rc @@ -1,5 +1,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalação do ReactOS" @@ -138,6 +140,8 @@ BEGIN LTEXT "Se houver um CD no drive, remova-o. Após isto, clique em Finalizar para reiniciar o computador.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Bem-vindo(a) a Instalação do ReactOS" @@ -181,3 +185,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR e VBR (Default)" IDS_BOOTLOADER_VBRONLY "Apenas VBR" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/pt-PT.rc b/base/setup/reactos/lang/pt-PT.rc index d780714347c..751d706b438 100644 --- a/base/setup/reactos/lang/pt-PT.rc +++ b/base/setup/reactos/lang/pt-PT.rc @@ -1,5 +1,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalação do ReactOS" @@ -138,6 +140,8 @@ BEGIN LTEXT "Se houver um CD no drive, remova-o. Após isto, clique em Finalizar para reiniciar o computador.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Bem-vindo(a) a Instalação do ReactOS" @@ -181,3 +185,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR e VBR (Default)" IDS_BOOTLOADER_VBRONLY "Apenas VBR" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/ro-RO.rc b/base/setup/reactos/lang/ro-RO.rc index 3ccc473806f..ef91e785bb8 100644 --- a/base/setup/reactos/lang/ro-RO.rc +++ b/base/setup/reactos/lang/ro-RO.rc @@ -9,6 +9,8 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Expert de instalare ReactOS" @@ -147,6 +149,8 @@ BEGIN LTEXT "Dacă aveți vreun CD în calculator, scoateți-l, după care apăsați Sfârșit pentru a reporni.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Bun venit la instalarea ReactOS" @@ -190,3 +194,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR și VBR (Default)" IDS_BOOTLOADER_VBRONLY "Numai VBR" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/ru-RU.rc b/base/setup/reactos/lang/ru-RU.rc index f2b7d48f67b..04217686a9c 100644 --- a/base/setup/reactos/lang/ru-RU.rc +++ b/base/setup/reactos/lang/ru-RU.rc @@ -1,5 +1,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Установка ReactOS" @@ -138,6 +140,8 @@ BEGIN LTEXT "Вы можете извлечь установочный диск. Для перезагрузки компьютера нажмите клавишу ""Завершить"".", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Вас приветствует программа установки ReactOS" @@ -181,3 +185,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR и VBR (Default)" IDS_BOOTLOADER_VBRONLY "Только VBR" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/sk-SK.rc b/base/setup/reactos/lang/sk-SK.rc index c6f9489e2da..54e8d573ced 100644 --- a/base/setup/reactos/lang/sk-SK.rc +++ b/base/setup/reactos/lang/sk-SK.rc @@ -5,6 +5,8 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Inštalácia systému ReactOS" //ReactOS Setup @@ -143,6 +145,8 @@ BEGIN LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Víta Vás inštalátor systému ReactOS" //Welcome to ReactOS Setup @@ -186,3 +190,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR a VBR (Default)" IDS_BOOTLOADER_VBRONLY "Iba VBR" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/sq-AL.rc b/base/setup/reactos/lang/sq-AL.rc index 4ab67eaa818..4d15c901b4a 100644 --- a/base/setup/reactos/lang/sq-AL.rc +++ b/base/setup/reactos/lang/sq-AL.rc @@ -2,6 +2,8 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalimi i ReactOS" @@ -140,6 +142,8 @@ BEGIN LTEXT "Nëse keni nje CD në drive, hiqeni. Pastaj, për ta rinist kompjuterin tuaj, klikoni mbaroj.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Mirë se vini në instalimin e ReactOS" @@ -183,3 +187,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR dhe VBR (Default)" IDS_BOOTLOADER_VBRONLY "VBR veq" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/tr-TR.rc b/base/setup/reactos/lang/tr-TR.rc index 24e7ea6be9c..493d081789b 100644 --- a/base/setup/reactos/lang/tr-TR.rc +++ b/base/setup/reactos/lang/tr-TR.rc @@ -7,6 +7,8 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Kur" @@ -145,6 +147,8 @@ BEGIN LTEXT "Eğer bir sürücüde bir CD varsa onu çıkartınız. Sonra, bilgisayarınızı yeniden başlatmak için Bitir'e tıklayınız.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "ReactOS Kurulum Yöneticisine Hoş Geldiniz" @@ -188,3 +192,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR ve VBR (Default)" IDS_BOOTLOADER_VBRONLY "Yalnızca VBR" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/uk-UA.rc b/base/setup/reactos/lang/uk-UA.rc index 9bcb3709db9..7f0cb5977c3 100644 --- a/base/setup/reactos/lang/uk-UA.rc +++ b/base/setup/reactos/lang/uk-UA.rc @@ -8,6 +8,8 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Встановлення ReactOS" @@ -146,6 +148,8 @@ BEGIN LTEXT "Ви можете витягнути інсталяційний диск. Для перезавантаження комп'ютера натисніть Завершити", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Вас вітає програма встановлення ReactOS" @@ -189,3 +193,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR та VBR (Default)" IDS_BOOTLOADER_VBRONLY "Лише VBR" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/vi-VN.rc b/base/setup/reactos/lang/vi-VN.rc index 478268f2286..e12feda590e 100644 --- a/base/setup/reactos/lang/vi-VN.rc +++ b/base/setup/reactos/lang/vi-VN.rc @@ -1,5 +1,7 @@ LANGUAGE LANG_VIETNAMESE, SUBLANG_VIETNAMESE_VIETNAM +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Cài đặt ReactOS" @@ -138,6 +140,8 @@ BEGIN LTEXT "Nếu ổ đĩa của bạn còn chứa dĩa CD cài đặt, hãy lấy nó ra. Sau đó, ấn Hoàn tất để khởi động lại máy tính của bạn.", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "Chào mừng tới trình Thiết lập ReactOS" @@ -181,3 +185,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR và VBR (Default)" IDS_BOOTLOADER_VBRONLY "Chỉ VBR" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/zh-CN.rc b/base/setup/reactos/lang/zh-CN.rc index 72de7f21c9b..57a8675061c 100644 --- a/base/setup/reactos/lang/zh-CN.rc +++ b/base/setup/reactos/lang/zh-CN.rc @@ -1,5 +1,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 安装程序" @@ -138,6 +140,8 @@ BEGIN LTEXT "请从光盘驱动器取出所有光盘。然后点击完成来重启您的电脑。", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "ReactOS 安装程序" @@ -181,3 +185,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR 和 VBR (Default)" IDS_BOOTLOADER_VBRONLY "仅 VBR" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/zh-HK.rc b/base/setup/reactos/lang/zh-HK.rc index 4d73e0b1510..dfdde50e38b 100644 --- a/base/setup/reactos/lang/zh-HK.rc +++ b/base/setup/reactos/lang/zh-HK.rc @@ -8,6 +8,8 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 安裝程式" @@ -146,6 +148,8 @@ BEGIN LTEXT "如果光碟機內仍然有光碟，請將其取出。然後按［完成］，重新啟動您的電腦。", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "ReactOS 安裝程式" @@ -189,3 +193,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR 和 VBR (Default)" IDS_BOOTLOADER_VBRONLY "僅 VBR" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/lang/zh-TW.rc b/base/setup/reactos/lang/zh-TW.rc index 4124c4a2035..26f9362eda8 100644 --- a/base/setup/reactos/lang/zh-TW.rc +++ b/base/setup/reactos/lang/zh-TW.rc @@ -9,6 +9,8 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL +/* Dialogs */ + IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 安裝程式" @@ -147,6 +149,8 @@ BEGIN LTEXT "如果光碟機裡還有光碟，請將其取出。然後按［完成］，重新啟動您的電腦。", IDC_STATIC, 115, 169, 195, 17 END +/* Strings */ + STRINGTABLE BEGIN IDS_TYPETITLE "ReactOS 安裝程式" @@ -190,3 +194,18 @@ BEGIN IDS_BOOTLOADER_MBRVBR "MBR 和 VBR (Default)" IDS_BOOTLOADER_VBRONLY "僅 VBR" END + +/* Error Strings */ + +STRINGTABLE +BEGIN + IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE "Invalid character" + IDS_ERROR_INVALID_INSTALLDIR_CHAR "The only valid characters are:\n\ +alphanumericals (a-z, A-Z, 0-9), and\n . \\ - _\n\ +Spaces are not allowed." + +// ERROR_DIRECTORY_NAME + IDS_ERROR_DIRECTORY_NAME_TITLE "Invalid installation path" + IDS_ERROR_DIRECTORY_NAME "The ReactOS installation path must follow the DOS 8.3 naming scheme, \ +and only contain letters, digits, dashes and periods. Spaces are not allowed." +END diff --git a/base/setup/reactos/resource.h b/base/setup/reactos/resource.h index 427410ff334..ba999844251 100644 --- a/base/setup/reactos/resource.h +++ b/base/setup/reactos/resource.h @@ -105,3 +105,12 @@ #define IDS_BOOTLOADER_SYSTEM 5302 // For non-MBR disks #define IDS_BOOTLOADER_MBRVBR 5303 // For MBR disks only #define IDS_BOOTLOADER_VBRONLY 5304 // "" + + +/* Error Strings */ +#define IDS_ERROR_INVALID_INSTALLDIR_CHAR_TITLE 5400 +#define IDS_ERROR_INVALID_INSTALLDIR_CHAR 5401 + +// ERROR_DIRECTORY_NAME +#define IDS_ERROR_DIRECTORY_NAME_TITLE 5402 +#define IDS_ERROR_DIRECTORY_NAME 5403

5 months

[reactos] 06/07: [SETUP:REACTOS] Redesign the "Advanced Installation Options" dialog (#7162) CORE-13525

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6c69abafd643968ce004… commit a6c69abafd643968ce0044f92a14bfcd33eb52a6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 2 19:38:03 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Aug 12 12:17:29 2024 +0200 [SETUP:REACTOS] Redesign the "Advanced Installation Options" dialog (#7162) CORE-13525 In particular, use now a dynamic combo-box for listing the possible locations where the bootloader can be installed. --- base/setup/reactos/drivepage.c | 79 +++++++++++++++++++++++++++++++++------- base/setup/reactos/lang/bg-BG.rc | 28 +++++++++----- base/setup/reactos/lang/cs-CZ.rc | 28 +++++++++----- base/setup/reactos/lang/de-DE.rc | 28 +++++++++----- base/setup/reactos/lang/el-GR.rc | 32 ++++++++++------ base/setup/reactos/lang/en-US.rc | 32 ++++++++++------ base/setup/reactos/lang/es-ES.rc | 28 +++++++++----- base/setup/reactos/lang/et-EE.rc | 28 +++++++++----- base/setup/reactos/lang/eu-ES.rc | 28 +++++++++----- base/setup/reactos/lang/fi-FI.rc | 32 ++++++++++------ base/setup/reactos/lang/fr-FR.rc | 28 +++++++++----- base/setup/reactos/lang/he-IL.rc | 32 ++++++++++------ base/setup/reactos/lang/hi-IN.rc | 28 +++++++++----- base/setup/reactos/lang/hu-HU.rc | 32 ++++++++++------ base/setup/reactos/lang/id-ID.rc | 28 +++++++++----- base/setup/reactos/lang/it-IT.rc | 32 ++++++++++------ base/setup/reactos/lang/ja-JP.rc | 28 +++++++++----- base/setup/reactos/lang/ms-MY.rc | 32 ++++++++++------ base/setup/reactos/lang/no-NO.rc | 28 +++++++++----- base/setup/reactos/lang/pl-PL.rc | 28 +++++++++----- base/setup/reactos/lang/pt-BR.rc | 32 ++++++++++------ base/setup/reactos/lang/pt-PT.rc | 32 ++++++++++------ base/setup/reactos/lang/ro-RO.rc | 28 +++++++++----- base/setup/reactos/lang/ru-RU.rc | 28 +++++++++----- base/setup/reactos/lang/sk-SK.rc | 32 ++++++++++------ base/setup/reactos/lang/sq-AL.rc | 32 ++++++++++------ base/setup/reactos/lang/tr-TR.rc | 28 +++++++++----- base/setup/reactos/lang/uk-UA.rc | 28 +++++++++----- base/setup/reactos/lang/vi-VN.rc | 32 ++++++++++------ base/setup/reactos/lang/zh-CN.rc | 28 +++++++++----- base/setup/reactos/lang/zh-HK.rc | 28 +++++++++----- base/setup/reactos/lang/zh-TW.rc | 28 +++++++++----- base/setup/reactos/resource.h | 11 ++++-- 33 files changed, 656 insertions(+), 350 deletions(-) diff --git a/base/setup/reactos/drivepage.c b/base/setup/reactos/drivepage.c index dd14e330779..ce038f5887d 100644 --- a/base/setup/reactos/drivepage.c +++ b/base/setup/reactos/drivepage.c @@ -48,28 +48,67 @@ static const INT column_alignment[MAX_LIST_COLUMNS] = {LVCFMT_LEFT, LVCFMT_LEFT /* FUNCTIONS ****************************************************************/ -static INT_PTR CALLBACK -MoreOptDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) +static INT_PTR +CALLBACK +MoreOptDlgProc( + _In_ HWND hDlg, + _In_ UINT uMsg, + _In_ WPARAM wParam, + _In_ LPARAM lParam) { PSETUPDATA pSetupData; /* Retrieve pointer to the global setup data */ - pSetupData = (PSETUPDATA)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA); + pSetupData = (PSETUPDATA)GetWindowLongPtrW(hDlg, GWLP_USERDATA); switch (uMsg) { case WM_INITDIALOG: { + BOOL bIsBIOS; + UINT uID; + INT iItem, iCurrent = CB_ERR, iDefault = 0; + WCHAR szText[50]; + /* Save pointer to the global setup data */ pSetupData = (PSETUPDATA)lParam; - SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); + SetWindowLongPtrW(hDlg, GWLP_USERDATA, (LONG_PTR)pSetupData); - CheckDlgButton(hwndDlg, IDC_INSTFREELDR, BST_CHECKED); - SetDlgItemTextW(hwndDlg, IDC_PATH, + SetDlgItemTextW(hDlg, IDC_PATH, pSetupData->USetupData.InstallationDirectory); + + + /* Initialize the list of available bootloader locations */ + bIsBIOS = ((pSetupData->USetupData.ArchType == ARCH_PcAT) || + (pSetupData->USetupData.ArchType == ARCH_NEC98x86)); + for (uID = IDS_BOOTLOADER_NOINST; uID <= IDS_BOOTLOADER_VBRONLY; ++uID) + { + if ( ( bIsBIOS && (uID == IDS_BOOTLOADER_SYSTEM)) || + (!bIsBIOS && (uID == IDS_BOOTLOADER_MBRVBR || uID == IDS_BOOTLOADER_VBRONLY)) ) + { + continue; // Skip this choice. + } + + LoadStringW(pSetupData->hInstance, uID, szText, ARRAYSIZE(szText)); + iItem = SendDlgItemMessageW(hDlg, IDC_INSTFREELDR, CB_ADDSTRING, 0, (LPARAM)szText); + if (iItem != CB_ERR && iItem != CB_ERRSPACE) + { + UINT uBldrLoc = uID - IDS_BOOTLOADER_NOINST + - (bIsBIOS && (uID >= IDS_BOOTLOADER_SYSTEM) ? 1 : 0); + SendDlgItemMessageW(hDlg, IDC_INSTFREELDR, CB_SETITEMDATA, iItem, uBldrLoc); + + /* Find the index of the current and default locations */ + if (uBldrLoc == pSetupData->USetupData.BootLoaderLocation) + iCurrent = iItem; + if (uBldrLoc == (IDS_BOOTLOADER_SYSTEM - IDS_BOOTLOADER_NOINST)) + iDefault = iItem; + } + } + /* Select the current location or fall back to the default one */ + if (iCurrent == CB_ERR) + iCurrent = iDefault; + SendDlgItemMessageW(hDlg, IDC_INSTFREELDR, CB_SETCURSEL, iCurrent, 0); + break; } @@ -78,15 +117,29 @@ MoreOptDlgProc(HWND hwndDlg, { case IDOK: { - GetDlgItemTextW(hwndDlg, IDC_PATH, + INT iItem; + UINT uBldrLoc = CB_ERR; + + /* Retrieve the installation path */ + GetDlgItemTextW(hDlg, IDC_PATH, pSetupData->USetupData.InstallationDirectory, ARRAYSIZE(pSetupData->USetupData.InstallationDirectory)); - EndDialog(hwndDlg, IDOK); + + /* Retrieve the bootloader location */ + iItem = SendDlgItemMessageW(hDlg, IDC_INSTFREELDR, CB_GETCURSEL, 0, 0); + if (iItem != CB_ERR) + uBldrLoc = SendDlgItemMessageW(hDlg, IDC_INSTFREELDR, CB_GETITEMDATA, iItem, 0); + if (uBldrLoc == CB_ERR) // Default location: System partition / MBR & VBR + uBldrLoc = (IDS_BOOTLOADER_SYSTEM - IDS_BOOTLOADER_NOINST); + uBldrLoc = min(max(uBldrLoc, 0), 3); + pSetupData->USetupData.BootLoaderLocation = uBldrLoc; + + EndDialog(hDlg, IDOK); return TRUE; } case IDCANCEL: - EndDialog(hwndDlg, IDCANCEL); + EndDialog(hDlg, IDCANCEL); return TRUE; } break; @@ -682,7 +735,7 @@ DriveDlgProc( { case IDC_PARTMOREOPTS: DialogBoxParamW(pSetupData->hInstance, - MAKEINTRESOURCEW(IDD_BOOTOPTIONS), + MAKEINTRESOURCEW(IDD_ADVINSTOPTS), hwndDlg, MoreOptDlgProc, (LPARAM)pSetupData); diff --git a/base/setup/reactos/lang/bg-BG.rc b/base/setup/reactos/lang/bg-BG.rc index 0e50934d1ba..fe86ea0ae03 100644 --- a/base/setup/reactos/lang/bg-BG.rc +++ b/base/setup/reactos/lang/bg-BG.rc @@ -76,19 +76,18 @@ BEGIN PUSHBUTTON "&Отказ", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Разширени дялови настройски" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Папка за слагане", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Слагане на зареждач", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Слагане на начален зареждач (MBR и VBR) на твърдия диск", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Слагане на начален зареждач (само VBR) на твърдия диск", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "Без слагане на начален зареждач", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&Добре", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Отказ", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "Добре", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Отказ", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -173,3 +172,12 @@ BEGIN IDS_PARTITION_SIZE "Size" IDS_PARTITION_STATUS "Status" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "No installation" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR и VBR (Default)" + IDS_BOOTLOADER_VBRONLY "Само VBR" +END diff --git a/base/setup/reactos/lang/cs-CZ.rc b/base/setup/reactos/lang/cs-CZ.rc index 501d81ca87a..d66d5577122 100644 --- a/base/setup/reactos/lang/cs-CZ.rc +++ b/base/setup/reactos/lang/cs-CZ.rc @@ -82,19 +82,18 @@ BEGIN PUSHBUTTON "&Storno", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Pokročilá nastavení oddílu" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Instalační složka", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Instalace zavaděče", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Nainstalovat zavaděč na pevný disk (MBR a VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Nainstalovat zavaděč na pevný disk (jen VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "Zavaděč neinstalovat", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Storno", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Storno", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -179,3 +178,12 @@ BEGIN IDS_PARTITION_SIZE "Size" IDS_PARTITION_STATUS "Status" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "No installation" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR a VBR (Default)" + IDS_BOOTLOADER_VBRONLY "Jen VBR" +END diff --git a/base/setup/reactos/lang/de-DE.rc b/base/setup/reactos/lang/de-DE.rc index 6c3d1415f33..a32b0f4f1c8 100644 --- a/base/setup/reactos/lang/de-DE.rc +++ b/base/setup/reactos/lang/de-DE.rc @@ -76,19 +76,18 @@ BEGIN PUSHBUTTON "&Abbrechen", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Erweiterte Partitionseinstellungen" +CAPTION "Erweiterte Installationseinstellungen" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installationsverzeichnis", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Bootloader-Installation", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Installiere Bootloader auf Festplatte (MBR und VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Installiere Bootloader auf Festplatte (nur VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "Keine Bootloader-Installation", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Abbrechen", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Abbrechen", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -173,3 +172,12 @@ BEGIN IDS_PARTITION_SIZE "Size" IDS_PARTITION_STATUS "Status" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "Keine Installation" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR und VBR (Default)" + IDS_BOOTLOADER_VBRONLY "Nur VBR" +END diff --git a/base/setup/reactos/lang/el-GR.rc b/base/setup/reactos/lang/el-GR.rc index 097de2895cf..f6141126f83 100644 --- a/base/setup/reactos/lang/el-GR.rc +++ b/base/setup/reactos/lang/el-GR.rc @@ -76,19 +76,18 @@ BEGIN PUSHBUTTON "&Άκυρο", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Ρυθμίσεις Partition για προχωρημένους" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Φάκελος εγκατάστασης", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Εγκατάσταση Boot loader", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Εγκατάσταση boot loader στο σκληρό δίσκο (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Εγκατάσταση boot loader στο σκληρό δίσκο (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "Να μη γίνει εγκατάσταση του bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Άκυρο", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Άκυρο", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -146,9 +145,9 @@ BEGIN IDS_DEVICETITLE "Setup the basic devices" IDS_DEVICESUBTITLE "Ορισμός ρυθμίσεων για εμφάνιση και πληκτρολόγιο." IDS_DRIVETITLE "Ρύθμιση του partition εγκατάστασης και του φακέλου συστήματος" - IDS_DRIVESUBTITLE "Προετοιμασία του partition εγκατάστασης, φακέλου συστήματος και boot loader." + IDS_DRIVESUBTITLE "Προετοιμασία του partition εγκατάστασης, φακέλου συστήματος και bootloader." IDS_PROCESSTITLE "Prepare partition, copy files and setup system" - IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" + IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup bootloader" IDS_RESTARTTITLE "Το πρώτο στάδιο της εγκατάστασης ολοκληρώθηκε" IDS_RESTARTSUBTITLE "Το πρώτο στάδιο της εγκατάστασης ολοκληρώθηκε, κάντε επανεκκίνηση για να συνεχίσετε με το δεύτερο στάδιο." IDS_SUMMARYTITLE "Installation Summary" @@ -173,3 +172,12 @@ BEGIN IDS_PARTITION_SIZE "Size" IDS_PARTITION_STATUS "Status" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "No installation" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR and VBR (Default)" + IDS_BOOTLOADER_VBRONLY "VBR only" +END diff --git a/base/setup/reactos/lang/en-US.rc b/base/setup/reactos/lang/en-US.rc index b5df44b2e01..0dc8e4daf55 100644 --- a/base/setup/reactos/lang/en-US.rc +++ b/base/setup/reactos/lang/en-US.rc @@ -76,19 +76,18 @@ BEGIN PUSHBUTTON "&Cancel", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Advanced Partition Settings" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Cancel", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -146,9 +145,9 @@ BEGIN 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 boot loader." + IDS_DRIVESUBTITLE "Prepare installation partition, system folder and bootloader." IDS_PROCESSTITLE "Setup partition, copy files and setup system" - IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" + 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" @@ -173,3 +172,12 @@ BEGIN IDS_PARTITION_SIZE "Size" IDS_PARTITION_STATUS "Status" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "No installation" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR and VBR (Default)" + IDS_BOOTLOADER_VBRONLY "VBR only" +END diff --git a/base/setup/reactos/lang/es-ES.rc b/base/setup/reactos/lang/es-ES.rc index 5e71a78118e..bda7084c568 100644 --- a/base/setup/reactos/lang/es-ES.rc +++ b/base/setup/reactos/lang/es-ES.rc @@ -85,19 +85,18 @@ BEGIN PUSHBUTTON "&Cancelar", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Ajustes avanzados de la partición" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Carpeta de instalación", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Instalación del cargador de arranque", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Instalar el cargador de arranque en el disco duro (MBR y VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Instalar el cargador de arranque en el disco duro (solo VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "No instalar el cargador de arranque", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&Aceptar", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancelar", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Cargador de arranque", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "Aceptar", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Cancelar", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -182,3 +181,12 @@ BEGIN IDS_PARTITION_SIZE "Tamaño" IDS_PARTITION_STATUS "Estado" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "No instalar" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR y VBR (Default)" + IDS_BOOTLOADER_VBRONLY "Solo VBR" +END diff --git a/base/setup/reactos/lang/et-EE.rc b/base/setup/reactos/lang/et-EE.rc index ae936d14da9..e00f6578256 100644 --- a/base/setup/reactos/lang/et-EE.rc +++ b/base/setup/reactos/lang/et-EE.rc @@ -76,19 +76,18 @@ BEGIN PUSHBUTTON "&Tühista", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Täpsemad vormindamise seaded" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Paigaldamise kaust", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Alglaaduri paigaldamine", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Paigalda alglaadur kõvakettale (MBR ja VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Paigalda alglaadur kõvakettale (ainult VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "Ära paigalda alglaadurit", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&Olgu", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Tühista", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "Olgu", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Tühista", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -173,3 +172,12 @@ BEGIN IDS_PARTITION_SIZE "Suurus" IDS_PARTITION_STATUS "Olek" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "No installation" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR ja VBR (Default)" + IDS_BOOTLOADER_VBRONLY "Ainult VBR" +END diff --git a/base/setup/reactos/lang/eu-ES.rc b/base/setup/reactos/lang/eu-ES.rc index 827298f5198..e5cdc518447 100644 --- a/base/setup/reactos/lang/eu-ES.rc +++ b/base/setup/reactos/lang/eu-ES.rc @@ -83,19 +83,18 @@ BEGIN PUSHBUTTON "&Cancelar", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Ajustes avanzados de la partición" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Carpeta de instalación", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Instalación del cargador de arranque", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Instalar el cargador de arranque en el disco duro (MBR y VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Instalar el cargador de arranque en el disco duro (solo VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "No instalar el cargador de arranque", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&Aceptar", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancelar", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Cargador de arranque", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "Aceptar", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Cancelar", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -180,3 +179,12 @@ BEGIN IDS_PARTITION_SIZE "Tamaño" IDS_PARTITION_STATUS "Estado" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "No instalar" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR y VBR (Default)" + IDS_BOOTLOADER_VBRONLY "Solo VBR" +END diff --git a/base/setup/reactos/lang/fi-FI.rc b/base/setup/reactos/lang/fi-FI.rc index 737be4048ff..2e609008b04 100644 --- a/base/setup/reactos/lang/fi-FI.rc +++ b/base/setup/reactos/lang/fi-FI.rc @@ -76,19 +76,18 @@ BEGIN PUSHBUTTON "&Cancel", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Advanced Partition Settings" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Cancel", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -146,9 +145,9 @@ BEGIN 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 boot loader." + IDS_DRIVESUBTITLE "Prepare installation partition, system folder and bootloader." IDS_PROCESSTITLE "Setup partition, copy files and setup system" - IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" + 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" @@ -173,3 +172,12 @@ BEGIN IDS_PARTITION_SIZE "Size" IDS_PARTITION_STATUS "Status" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "No installation" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR and VBR (Default)" + IDS_BOOTLOADER_VBRONLY "VBR only" +END diff --git a/base/setup/reactos/lang/fr-FR.rc b/base/setup/reactos/lang/fr-FR.rc index d08f495e85c..9e5f79d46d3 100644 --- a/base/setup/reactos/lang/fr-FR.rc +++ b/base/setup/reactos/lang/fr-FR.rc @@ -76,19 +76,18 @@ BEGIN PUSHBUTTON "&Annuler", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Paramètres de partition avancés" +CAPTION "Paramètres d'installation avancés" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Dossier d'installation", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Installation du chargeur de démarrage", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Installer le chargeur de démarrage sur le disque dur (MBR et VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Installer le chargeur de démarrage sur le disque dur (VBR uniquement)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "Ne pas installer le chargeur de démarrage", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Annuler", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choisissez un &répertoire où vous voulez installer ReactOS :", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Chargeur de démarrage", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Sélectionnez l'endroit où le chargeur de\ndémarrage FreeLoader doit être installé.\n\nPar défaut, il est installé sur la partition système du disque de démarrage (et sur le Master ou le Volume Boot Record pour les ordinateurs basés sur le BIOS).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Annuler", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -173,3 +172,12 @@ BEGIN IDS_PARTITION_SIZE "Taille" IDS_PARTITION_STATUS "Statut" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "Ne pas installer" + IDS_BOOTLOADER_REMOVABLE "Média amovible" + IDS_BOOTLOADER_SYSTEM "Partition système (par défaut)" + IDS_BOOTLOADER_MBRVBR "MBR et VBR (par défaut)" + IDS_BOOTLOADER_VBRONLY "VBR seulement" +END diff --git a/base/setup/reactos/lang/he-IL.rc b/base/setup/reactos/lang/he-IL.rc index fa669eb0e05..58c7163ef60 100644 --- a/base/setup/reactos/lang/he-IL.rc +++ b/base/setup/reactos/lang/he-IL.rc @@ -78,19 +78,18 @@ BEGIN PUSHBUTTON "ביטול", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "הגדרות מחיצה מתקדמות" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "תיקיית התקנה", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "אישור", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "ביטול", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "אישור", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "ביטול", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -148,9 +147,9 @@ BEGIN 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 boot loader." + IDS_DRIVESUBTITLE "Prepare installation partition, system folder and bootloader." IDS_PROCESSTITLE "Setup partition, copy files and setup system" - IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" + 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 "סיכום ההתקנה" @@ -175,3 +174,12 @@ BEGIN IDS_PARTITION_SIZE "גודל" IDS_PARTITION_STATUS "מצב" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "No installation" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR and VBR (Default)" + IDS_BOOTLOADER_VBRONLY "VBR only" +END diff --git a/base/setup/reactos/lang/hi-IN.rc b/base/setup/reactos/lang/hi-IN.rc index e32cdf3ef35..a56e99168e7 100644 --- a/base/setup/reactos/lang/hi-IN.rc +++ b/base/setup/reactos/lang/hi-IN.rc @@ -72,19 +72,18 @@ BEGIN PUSHBUTTON "&रद्द करे", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "उन्नत विभाजन सेटिंग्स" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "इन्स्टलेशन फ़ोल्डर", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "बूट लोडर इन्स्टलेशन", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "हार्ड डिस्क पर बूट लोडर इंस्टॉल करें (MBR और VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "हार्ड डिस्क पर बूट लोडर इंस्टॉल करें (केवल VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "बूटलोडर की कोई इन्स्टलेशन नहीं", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&ओके", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&रद्द करे", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "ओके", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "रद्द करे", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -143,3 +142,12 @@ BEGIN IDS_PARTITION_SIZE "साइज़" IDS_PARTITION_TYPE "प्रकार" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "No installation" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR और VBR (Default)" + IDS_BOOTLOADER_VBRONLY "केवल VBR" +END diff --git a/base/setup/reactos/lang/hu-HU.rc b/base/setup/reactos/lang/hu-HU.rc index 1d9edc48a84..11f8196ad90 100644 --- a/base/setup/reactos/lang/hu-HU.rc +++ b/base/setup/reactos/lang/hu-HU.rc @@ -78,19 +78,18 @@ BEGIN PUSHBUTTON "&Cancel", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Advanced Partition Settings" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Cancel", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -148,9 +147,9 @@ BEGIN 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 boot loader." + IDS_DRIVESUBTITLE "Prepare installation partition, system folder and bootloader." IDS_PROCESSTITLE "Setup partition, copy files and setup system" - IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" + 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" @@ -175,3 +174,12 @@ BEGIN IDS_PARTITION_SIZE "Size" IDS_PARTITION_STATUS "Status" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "No installation" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR and VBR (Default)" + IDS_BOOTLOADER_VBRONLY "VBR only" +END diff --git a/base/setup/reactos/lang/id-ID.rc b/base/setup/reactos/lang/id-ID.rc index 6a5c1165a31..6cf0daafc68 100644 --- a/base/setup/reactos/lang/id-ID.rc +++ b/base/setup/reactos/lang/id-ID.rc @@ -76,19 +76,18 @@ BEGIN PUSHBUTTON "&Batal", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Pengaturan Partisi Tingkat Lanjut" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Folder pemasangan", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Pemasangan bootloader", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Pasang bootloader pada hard disk (MBR dan VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Pasang bootloader pada hard disk (hanya VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "Tidak ada pemasangan bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Batal", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Batal", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -173,3 +172,12 @@ BEGIN IDS_PARTITION_SIZE "Ukuran" IDS_PARTITION_STATUS "Status" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "No installation" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR dan VBR (Default)" + IDS_BOOTLOADER_VBRONLY "Hanya VBR" +END diff --git a/base/setup/reactos/lang/it-IT.rc b/base/setup/reactos/lang/it-IT.rc index 23e48251893..c31d0adbbe8 100644 --- a/base/setup/reactos/lang/it-IT.rc +++ b/base/setup/reactos/lang/it-IT.rc @@ -76,19 +76,18 @@ BEGIN PUSHBUTTON "&Annulla", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Impostazioni avanzate delle partizioni" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Cartella di installazione", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Installazione del Boot loader", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Installazione del Boot loader sul disco fisso (MBR e VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Installazione del Boot loader sul disco fisso (solo VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "Non installare il Boot loader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Annulla", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Annulla", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -146,9 +145,9 @@ BEGIN 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 Boot loader." + IDS_DRIVESUBTITLE "Preparazione di partizione, cartella di sistema e Bootloader." IDS_PROCESSTITLE "Preparazione della partizione, copia dei file e configurazione del sistema" - IDS_PROCESSSUBTITLE "Creazione e formattazione della partizione, copia dei file, installazione del Boot loader" + 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" @@ -173,3 +172,12 @@ BEGIN IDS_PARTITION_SIZE "Dimensione" IDS_PARTITION_STATUS "Status" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "Non installare" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR e VBR (Default)" + IDS_BOOTLOADER_VBRONLY "Solo VBR" +END diff --git a/base/setup/reactos/lang/ja-JP.rc b/base/setup/reactos/lang/ja-JP.rc index 6d3ce4402dd..cde8c5caea0 100644 --- a/base/setup/reactos/lang/ja-JP.rc +++ b/base/setup/reactos/lang/ja-JP.rc @@ -76,19 +76,18 @@ BEGIN PUSHBUTTON "キャンセル(&C)", IDCANCEL, 89, 68, 55, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "上級者向けパーティション設定" +CAPTION "Advanced Installation Options" FONT 9, "MS UI Gothic" BEGIN - CONTROL "インストール先フォルダ", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "ブートローダのインストール", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "ハードディスクにブートローダをインストールする (MBRとVBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "ハードディスクにブートローダをインストールする (VBRのみ)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "ブートローダをインストールしない", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "キャンセル(&C)", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "キャンセル", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -173,3 +172,12 @@ BEGIN IDS_PARTITION_SIZE "サイズ" IDS_PARTITION_STATUS "状態" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "No installation" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBRとVBR (Default)" + IDS_BOOTLOADER_VBRONLY "VBRのみ" +END diff --git a/base/setup/reactos/lang/ms-MY.rc b/base/setup/reactos/lang/ms-MY.rc index e9033b4f4ef..657ca65a88f 100644 --- a/base/setup/reactos/lang/ms-MY.rc +++ b/base/setup/reactos/lang/ms-MY.rc @@ -78,19 +78,18 @@ BEGIN PUSHBUTTON "Batal(&C)", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Seting lanjutan Partition" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Folder pemasangan", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Boot loader pemasangan", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Memasang boot loader pada cakera keras (MBR dan VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Memasang boot loader pada cakera keras (VBR sahaja)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "Tiada pemasangan boot loader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "Batal(&C)", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Batal", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -148,9 +147,9 @@ BEGIN 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 boot loader." + IDS_DRIVESUBTITLE "Menyediakan pemasangan partition, folder sistem dan bootloader." IDS_PROCESSTITLE "Persediaan partition, salinan fail dan sistem persediaan" - IDS_PROCESSSUBTITLE "Cipta dan format partition, menyalin fail, memasang dan sediakan boot loader" + 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" @@ -175,3 +174,12 @@ BEGIN IDS_PARTITION_SIZE "Size" IDS_PARTITION_STATUS "Status" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "Tiada pemasangan" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR dan VBR (Default)" + IDS_BOOTLOADER_VBRONLY "VBR sahaja" +END diff --git a/base/setup/reactos/lang/no-NO.rc b/base/setup/reactos/lang/no-NO.rc index 699e0d55396..81ecddef3e1 100644 --- a/base/setup/reactos/lang/no-NO.rc +++ b/base/setup/reactos/lang/no-NO.rc @@ -76,19 +76,18 @@ BEGIN PUSHBUTTON "&Avbryt", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Avansert partisjon innstillinger" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installasjon mappe", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Oppstartslaster installasjon", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Installer oppstartslaster på harddiskens (MBR og VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Installer oppstartslaster på harddiskens (bare VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "Ikke installer oppstartslaster", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Avbryt", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Oppstartslaster", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Avbryt", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -173,3 +172,12 @@ BEGIN IDS_PARTITION_SIZE "Size" IDS_PARTITION_STATUS "Status" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "No installation" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR og VBR (Default)" + IDS_BOOTLOADER_VBRONLY "Bare VBR" +END diff --git a/base/setup/reactos/lang/pl-PL.rc b/base/setup/reactos/lang/pl-PL.rc index f5649f40523..a533c9f4a16 100644 --- a/base/setup/reactos/lang/pl-PL.rc +++ b/base/setup/reactos/lang/pl-PL.rc @@ -87,19 +87,18 @@ BEGIN PUSHBUTTON "&Anuluj", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Zaawansowane ustawienia partycji" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Folder instalacji", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Instalacja menedżera rozruchu", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Instaluj menedżer rozruchu na dysku twardym (MBR i VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Instaluj menedżer rozruchu na dysku twardym (tylko VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "Pomiń instalację menedżera rozruchu", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Anuluj", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Anuluj", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -184,3 +183,12 @@ BEGIN IDS_PARTITION_SIZE "Rozmiar" IDS_PARTITION_STATUS "Stan" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "Pomiń instalację" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR i VBR (Default)" + IDS_BOOTLOADER_VBRONLY "Tylko VBR" +END diff --git a/base/setup/reactos/lang/pt-BR.rc b/base/setup/reactos/lang/pt-BR.rc index 79a1d6d711a..ca70662eb17 100644 --- a/base/setup/reactos/lang/pt-BR.rc +++ b/base/setup/reactos/lang/pt-BR.rc @@ -76,19 +76,18 @@ BEGIN PUSHBUTTON "&Cancelar", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Configurações Avançadas de Particionamento" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Pasta de instalação", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Instalação do boot loader", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Instalar boot loader no disco rígido (MBR e VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Instalar boot loader no disco rígido (apenas VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "Não instalar boot loader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancelar", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Cancelar", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -146,9 +145,9 @@ BEGIN 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 boot loader." + IDS_DRIVESUBTITLE "Preparando partição de instalação, pasta do sistema e bootloader." IDS_PROCESSTITLE "Preparar partição, copiar arquivos e configurar sistema" - IDS_PROCESSSUBTITLE "Criar e formatar partição, copiar arquivos, instalar e configurar boot loader" + 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" @@ -173,3 +172,12 @@ BEGIN IDS_PARTITION_SIZE "Size" IDS_PARTITION_STATUS "Status" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "Não instalar" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR e VBR (Default)" + IDS_BOOTLOADER_VBRONLY "Apenas VBR" +END diff --git a/base/setup/reactos/lang/pt-PT.rc b/base/setup/reactos/lang/pt-PT.rc index 1b9c0069e90..d780714347c 100644 --- a/base/setup/reactos/lang/pt-PT.rc +++ b/base/setup/reactos/lang/pt-PT.rc @@ -76,19 +76,18 @@ BEGIN PUSHBUTTON "&Cancelar", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Configurações Avançadas de Particionamento" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Pasta de instalação", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Instalação do boot loader", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Instalar boot loader no disco rígido (MBR e VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Instalar boot loader no disco rígido (apenas VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "Não instalar boot loader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancelar", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Cancelar", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -146,9 +145,9 @@ BEGIN 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 boot loader." + IDS_DRIVESUBTITLE "A preparar a partição de instalação, pasta do sistema e bootloader." IDS_PROCESSTITLE "Preparar partição, copiar arquivos e configurar sistema" - IDS_PROCESSSUBTITLE "Criar e formatar partição, copiar arquivos, instalar e configurar boot loader" + 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" @@ -173,3 +172,12 @@ BEGIN IDS_PARTITION_SIZE "Tamanho" IDS_PARTITION_STATUS "Estado" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "Não instalar" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR e VBR (Default)" + IDS_BOOTLOADER_VBRONLY "Apenas VBR" +END diff --git a/base/setup/reactos/lang/ro-RO.rc b/base/setup/reactos/lang/ro-RO.rc index 26333fc82ef..3ccc473806f 100644 --- a/base/setup/reactos/lang/ro-RO.rc +++ b/base/setup/reactos/lang/ro-RO.rc @@ -85,19 +85,18 @@ BEGIN PUSHBUTTON "&Revocare", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Opțiuni avansate partiție" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Folderul de instalare", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Instalare secvență de inițializare", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Instalează inițializatorul pe hard disc (MBR și VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Instalează inițializatorul pe hard disc (numai VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "Omite instalarea inițializatorului", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Revocare", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Revocare", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -182,3 +181,12 @@ BEGIN IDS_PARTITION_SIZE "Dimensiune" IDS_PARTITION_STATUS "Stare" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "No installation" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR și VBR (Default)" + IDS_BOOTLOADER_VBRONLY "Numai VBR" +END diff --git a/base/setup/reactos/lang/ru-RU.rc b/base/setup/reactos/lang/ru-RU.rc index bc010049b0b..f2b7d48f67b 100644 --- a/base/setup/reactos/lang/ru-RU.rc +++ b/base/setup/reactos/lang/ru-RU.rc @@ -76,19 +76,18 @@ BEGIN PUSHBUTTON "&Отставить", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Дополнительные параметры установки" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Основной каталог", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 12, 283, 14, WS_VISIBLE - CONTROL "Установка загрузчика", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Установить загрузчик на диск (MBR и VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 49, 278, 11 - CONTROL "Установить загрузчик на диск (только VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 59, 278, 11 - CONTROL "Не устанавливать загрузчик", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 69, 278, 11 - PUSHBUTTON "&OK", IDOK, 184, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Отмена", IDCANCEL, 244, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Загрузчик", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "ОК", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Отмена", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -173,3 +172,12 @@ BEGIN IDS_PARTITION_SIZE "Размер" IDS_PARTITION_STATUS "Status" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "Не устанавливать" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR и VBR (Default)" + IDS_BOOTLOADER_VBRONLY "Только VBR" +END diff --git a/base/setup/reactos/lang/sk-SK.rc b/base/setup/reactos/lang/sk-SK.rc index a85503aef94..c6f9489e2da 100644 --- a/base/setup/reactos/lang/sk-SK.rc +++ b/base/setup/reactos/lang/sk-SK.rc @@ -81,19 +81,18 @@ BEGIN PUSHBUTTON "&Zrušiť", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Rozšírené nastavenia partície" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Inštalačný priečinok", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Inštalácia zavádzača systému", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Nainštalovať zavádzač systému na pevný disk (MBR a VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Nainštalovať zavádzač systému na pevný disk (iba VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "Nenainštalovať zavádzač systému", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Zrušiť", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Zavádzač systému", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Zrušiť", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -151,9 +150,9 @@ BEGIN 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 boot loader." + IDS_DRIVESUBTITLE "Prepare installation partition, system folder and bootloader." IDS_PROCESSTITLE "Prepare partition, copy files and setup system" - IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" + 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" @@ -178,3 +177,12 @@ BEGIN IDS_PARTITION_SIZE "Size" IDS_PARTITION_STATUS "Status" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "No installation" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR a VBR (Default)" + IDS_BOOTLOADER_VBRONLY "Iba VBR" +END diff --git a/base/setup/reactos/lang/sq-AL.rc b/base/setup/reactos/lang/sq-AL.rc index c204b6609b3..4ab67eaa818 100644 --- a/base/setup/reactos/lang/sq-AL.rc +++ b/base/setup/reactos/lang/sq-AL.rc @@ -78,19 +78,18 @@ BEGIN PUSHBUTTON "&Anulo", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Krijimi i Avancuar i Particioneve" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Skeda e Instalimit", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Instalimi i Boot loaderit", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Instalo boot loaderin në hard disk (MBR dhe VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Instalo boot loaderin në hard disk (VBR veq)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "Mos instalo bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&Dakord", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Anulo", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Anulo", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -148,9 +147,9 @@ BEGIN 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 boot loaderin." + IDS_DRIVESUBTITLE "Pergatit particionet për instalim, dosjet e sistemit dhe bootloaderin." IDS_PROCESSTITLE "Konfiguro particionet, kopjo dokumentat dhe konfiguro sistemin" - IDS_PROCESSSUBTITLE "Krijo dhe formato particionet, kopjo dokumentat, insalo dhe konfiguro book loaderin" + 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" @@ -175,3 +174,12 @@ BEGIN IDS_PARTITION_SIZE "Size" IDS_PARTITION_STATUS "Status" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "Mos instalo" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR dhe VBR (Default)" + IDS_BOOTLOADER_VBRONLY "VBR veq" +END diff --git a/base/setup/reactos/lang/tr-TR.rc b/base/setup/reactos/lang/tr-TR.rc index 1443a70524c..24e7ea6be9c 100644 --- a/base/setup/reactos/lang/tr-TR.rc +++ b/base/setup/reactos/lang/tr-TR.rc @@ -83,19 +83,18 @@ BEGIN PUSHBUTTON "İptal", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Gelişmiş Bölümlendirme Seçenekleri" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Kurulum Dizini", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Önyükleyici Kurulumu", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Önyükleyiciyi sabit diskin üzerine kur. (MBR ve VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Önyükleyiciyi sabit diskin üzerine kur. (Yalnızca VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "Önyükleyici kurulumunu atla.", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "Tamam", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "İptal", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "Tamam", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "İptal", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -180,3 +179,12 @@ BEGIN IDS_PARTITION_SIZE "Boyut" IDS_PARTITION_STATUS "Durum" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "No installation" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR ve VBR (Default)" + IDS_BOOTLOADER_VBRONLY "Yalnızca VBR" +END diff --git a/base/setup/reactos/lang/uk-UA.rc b/base/setup/reactos/lang/uk-UA.rc index fefc19c1db6..9bcb3709db9 100644 --- a/base/setup/reactos/lang/uk-UA.rc +++ b/base/setup/reactos/lang/uk-UA.rc @@ -84,19 +84,18 @@ BEGIN PUSHBUTTON "&Скасувати", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Розширені параметри розділу" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Тека встановлення", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Встановлення завантажувача", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Встановити завантажувач на жосткий диск (MBR та VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Встановити завантажувач на жосткий диск (лише VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "Не встановлювати завантажувач", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Скасувати", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Завантажувач", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Скасувати", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -181,3 +180,12 @@ BEGIN IDS_PARTITION_SIZE "Size" IDS_PARTITION_STATUS "Status" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "Не встановлювати" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR та VBR (Default)" + IDS_BOOTLOADER_VBRONLY "Лише VBR" +END diff --git a/base/setup/reactos/lang/vi-VN.rc b/base/setup/reactos/lang/vi-VN.rc index 0d67ca9f335..478268f2286 100644 --- a/base/setup/reactos/lang/vi-VN.rc +++ b/base/setup/reactos/lang/vi-VN.rc @@ -76,19 +76,18 @@ BEGIN PUSHBUTTON "&Hủy", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "Tùy chọn phân chia ổ đĩa nâng cao" +CAPTION "Advanced Installation Options" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Thư mục cài đặt", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "Cài đặt Boot loader", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "Cài boot loader trên ổ cứng (MBR-MasterBootRecord- và VBR-VolumeBootRecord)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "Cài boot loader (chỉ VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "Không cài bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "&Đồng ý", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Hủy", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "Đồng ý", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Hủy", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -146,9 +145,9 @@ BEGIN 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à boot loader." + IDS_DRIVESUBTITLE "Chuẩn bị phần ổ cứng, thư mục hệ thống và bootloader." 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 boot loader" + 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" @@ -173,3 +172,12 @@ BEGIN IDS_PARTITION_SIZE "Kích cỡ" IDS_PARTITION_STATUS "Status" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "No installation" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR và VBR (Default)" + IDS_BOOTLOADER_VBRONLY "Chỉ VBR" +END diff --git a/base/setup/reactos/lang/zh-CN.rc b/base/setup/reactos/lang/zh-CN.rc index 03b0a20ec5e..72de7f21c9b 100644 --- a/base/setup/reactos/lang/zh-CN.rc +++ b/base/setup/reactos/lang/zh-CN.rc @@ -76,19 +76,18 @@ BEGIN PUSHBUTTON "取消(&C)", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "高级分区设置" +CAPTION "Advanced Installation Options" FONT 9, "宋体" BEGIN - CONTROL "安装文件夹", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "引导程序安装", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "安装引导程序到硬盘 (MBR 和 VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "安装引导程序到硬盘 (仅 VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "不安装引导程序", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "确定(&O)", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "取消(&C)", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "确定", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "取消", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -173,3 +172,12 @@ BEGIN IDS_PARTITION_SIZE "大小" IDS_PARTITION_STATUS "状态" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "No installation" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR 和 VBR (Default)" + IDS_BOOTLOADER_VBRONLY "仅 VBR" +END diff --git a/base/setup/reactos/lang/zh-HK.rc b/base/setup/reactos/lang/zh-HK.rc index 7e7ec6d7420..4d73e0b1510 100644 --- a/base/setup/reactos/lang/zh-HK.rc +++ b/base/setup/reactos/lang/zh-HK.rc @@ -84,19 +84,18 @@ BEGIN PUSHBUTTON "取消(&C)", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "進階磁碟區設定" +CAPTION "Advanced Installation Options" FONT 9, "新細明體" BEGIN - CONTROL "安裝資料夾", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "安裝啟動程式", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "安裝啟動程式到硬碟（MBR 和 VBR）", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "安裝啟動程式到硬碟（僅 VBR）", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "不安裝啟動程式", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "確定(&O)", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "取消(&C)", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "確定", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "取消", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -181,3 +180,12 @@ BEGIN IDS_PARTITION_SIZE "大小" IDS_PARTITION_STATUS "狀態" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "No installation" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR 和 VBR (Default)" + IDS_BOOTLOADER_VBRONLY "僅 VBR" +END diff --git a/base/setup/reactos/lang/zh-TW.rc b/base/setup/reactos/lang/zh-TW.rc index baa23c4dd9c..4124c4a2035 100644 --- a/base/setup/reactos/lang/zh-TW.rc +++ b/base/setup/reactos/lang/zh-TW.rc @@ -85,19 +85,18 @@ BEGIN PUSHBUTTON "取消(&C)", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 +IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION -CAPTION "進階磁碟區設定" +CAPTION "Advanced Installation Options" FONT 9, "新細明體" BEGIN - CONTROL "安裝資料夾", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 - EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "安裝啟動程式", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 - CONTROL "安裝啟動程式到硬碟（MBR 和 VBR）", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 - CONTROL "安裝啟動程式到硬碟（僅 VBR）", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 - CONTROL "不安裝啟動程式", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 - PUSHBUTTON "確定(&O)", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "取消(&C)", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE + LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10 + EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE + GROUPBOX "Bootloader", IDC_STATIC, 7, 45, 291, 60 + LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44 + COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "確定", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "取消", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143 @@ -182,3 +181,12 @@ BEGIN IDS_PARTITION_SIZE "大小" IDS_PARTITION_STATUS "狀態" END + +STRINGTABLE +BEGIN + IDS_BOOTLOADER_NOINST "No installation" + IDS_BOOTLOADER_REMOVABLE "Removable media" + IDS_BOOTLOADER_SYSTEM "System partition (Default)" + IDS_BOOTLOADER_MBRVBR "MBR 和 VBR (Default)" + IDS_BOOTLOADER_VBRONLY "僅 VBR" +END diff --git a/base/setup/reactos/resource.h b/base/setup/reactos/resource.h index 11d855ce49d..427410ff334 100644 --- a/base/setup/reactos/resource.h +++ b/base/setup/reactos/resource.h @@ -61,11 +61,9 @@ #define IDC_RESTART_PROGRESS 2072 #define IDC_PARTMOREOPTS 2073 -#define IDD_BOOTOPTIONS 2080 +#define IDD_ADVINSTOPTS 2080 #define IDC_PATH 2081 #define IDC_INSTFREELDR 2082 -#define IDC_INSTVBRONLY 2083 -#define IDC_NOINSTFREELDR 2084 #define IDD_PARTITION 2090 #define IDC_UPDOWN1 2091 @@ -100,3 +98,10 @@ #define IDS_PARTITION_TYPE 5201 #define IDS_PARTITION_SIZE 5202 #define IDS_PARTITION_STATUS 5203 + +// WARNING: These IDs *MUST* stay in increasing order! +#define IDS_BOOTLOADER_NOINST 5300 +#define IDS_BOOTLOADER_REMOVABLE 5301 +#define IDS_BOOTLOADER_SYSTEM 5302 // For non-MBR disks +#define IDS_BOOTLOADER_MBRVBR 5303 // For MBR disks only +#define IDS_BOOTLOADER_VBRONLY 5304 // ""

5 months

[reactos] 05/07: [SETUP:REACTOS] Add new DisplayMessage(V) helpers and reimplement DisplayError around it

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf368261f11a9628d7631… commit bf368261f11a9628d76317b29c21994ac2c3a5a9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Mar 7 02:30:08 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Aug 12 12:17:27 2024 +0200 [SETUP:REACTOS] Add new DisplayMessage(V) helpers and reimplement DisplayError around it The variadic DisplayMessage(V) helpers display a message box, where both the title and message can be specified either as explicit strings or via resource IDs. It also supports the message to be a printf-like format string, in which case the additional formatting arguments are subsequently specified. --- base/setup/reactos/reactos.c | 144 ++++++++++++++++++++++++++++++++++++++++--- base/setup/reactos/reactos.h | 44 ++++++++++--- 2 files changed, 172 insertions(+), 16 deletions(-) diff --git a/base/setup/reactos/reactos.c b/base/setup/reactos/reactos.c index 2448f418888..67034f93ea5 100644 --- a/base/setup/reactos/reactos.c +++ b/base/setup/reactos/reactos.c @@ -92,17 +92,145 @@ CreateTitleFont(VOID) return hFont; } -INT DisplayError( - IN HWND hParentWnd OPTIONAL, - IN UINT uIDTitle, - IN UINT uIDMessage) +INT +DisplayMessageV( + _In_opt_ HWND hWnd, + _In_ UINT uType, + _In_opt_ PCWSTR pszTitle, + _In_opt_ PCWSTR pszFormatMessage, + _In_ va_list args) { - WCHAR message[512], caption[64]; + INT iRes; + HINSTANCE hInstance = NULL; + MSGBOXPARAMSW mb = {0}; + LPWSTR Format; + size_t MsgLen; + WCHAR StaticBuffer[256]; + LPWSTR Buffer = StaticBuffer; // Use the static buffer by default. + + /* We need to retrieve the current module's instance handle if either + * the title or the format message is specified by a resource ID */ + if ((pszTitle && IS_INTRESOURCE(pszTitle)) || IS_INTRESOURCE(pszFormatMessage)) + hInstance = GetModuleHandleW(NULL); // SetupData.hInstance; + + /* Retrieve the format message string if this is a resource */ + if (pszFormatMessage && IS_INTRESOURCE(pszFormatMessage)) do + { + // LoadAllocStringW() + PCWSTR pStr; + + /* Try to load the string from the resource */ + MsgLen = LoadStringW(hInstance, PtrToUlong(pszFormatMessage), (LPWSTR)&pStr, 0); + if (MsgLen == 0) + { + /* No resource string was found, return NULL */ + Format = NULL; + break; + } + + /* Allocate a new buffer, adding a NULL-terminator */ + Format = HeapAlloc(GetProcessHeap(), 0, (MsgLen + 1) * sizeof(WCHAR)); + if (!Format) + { + MsgLen = 0; + break; + } + + /* Copy the string, NULL-terminated */ + StringCchCopyNW(Format, MsgLen + 1, pStr, MsgLen); + } while (0); + else + { + Format = (LPWSTR)pszFormatMessage; + } + + if (Format) + { + /* + * Retrieve the message length. If it is too long, allocate + * an auxiliary buffer; otherwise use the static buffer. + * The string is built to be NULL-terminated. + */ + MsgLen = _vscwprintf(Format, args); + if (MsgLen >= _countof(StaticBuffer)) + { + Buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (MsgLen + 1) * sizeof(WCHAR)); + if (!Buffer) + { + /* Allocation failed, use the original format string verbatim */ + Buffer = Format; + } + } + if (Buffer != Format) + { + /* Do the printf as we use the caller's format string */ + StringCchVPrintfW(Buffer, MsgLen + 1, Format, args); + } + } + else + { + Format = (LPWSTR)pszFormatMessage; + Buffer = Format; + } + + /* Display the message */ + mb.cbSize = sizeof(mb); + mb.hwndOwner = hWnd; + mb.hInstance = hInstance; + mb.lpszText = Buffer; + mb.lpszCaption = pszTitle; + mb.dwStyle = uType; + mb.dwLanguageId = MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT); + iRes = MessageBoxIndirectW(&mb); + + /* Free the buffers if needed */ + if ((Buffer != StaticBuffer) && (Buffer != Format)) + HeapFree(GetProcessHeap(), 0, Buffer); + + if (Format && (Format != pszFormatMessage)) + HeapFree(GetProcessHeap(), 0, Format); + + return iRes; +} + +INT +__cdecl +DisplayMessage( + _In_opt_ HWND hWnd, + _In_ UINT uType, + _In_opt_ PCWSTR pszTitle, + _In_opt_ PCWSTR pszFormatMessage, + ...) +{ + INT iRes; + va_list args; + + va_start(args, pszFormatMessage); + iRes = DisplayMessageV(hWnd, uType, pszTitle, pszFormatMessage, args); + va_end(args); + + return iRes; +} + +INT +__cdecl +DisplayError( + _In_opt_ HWND hWnd, + _In_ UINT uIDTitle, + _In_ UINT uIDMessage, + ...) +{ + INT iRes; + va_list args; - LoadStringW(SetupData.hInstance, uIDMessage, message, ARRAYSIZE(message)); - LoadStringW(SetupData.hInstance, uIDTitle, caption, ARRAYSIZE(caption)); + va_start(args, uIDMessage); + iRes = DisplayMessageV(hWnd, MB_OK | MB_ICONERROR, + MAKEINTRESOURCEW(uIDTitle), + MAKEINTRESOURCEW(uIDMessage), + args); + va_end(args); - return MessageBoxW(hParentWnd, message, caption, MB_OK | MB_ICONERROR); + return iRes; } static INT_PTR CALLBACK diff --git a/base/setup/reactos/reactos.h b/base/setup/reactos/reactos.h index 071d642d713..24ebf661bcd 100644 --- a/base/setup/reactos/reactos.h +++ b/base/setup/reactos/reactos.h @@ -166,6 +166,17 @@ ConvertNtPathToWin32Path( /* drivepage.c */ +INT_PTR +CALLBACK +DriveDlgProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam); + + +/* reactos.c */ + BOOL CreateListViewColumns( IN HINSTANCE hInstance, @@ -175,14 +186,31 @@ CreateListViewColumns( IN const INT* pColsAlign, IN UINT nNumOfColumns); -INT_PTR -CALLBACK -DriveDlgProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam); +INT +DisplayMessageV( + _In_opt_ HWND hWnd, + _In_ UINT uType, + _In_opt_ PCWSTR pszTitle, + _In_opt_ PCWSTR pszFormatMessage, + _In_ va_list args); + +INT +__cdecl +DisplayMessage( + _In_opt_ HWND hWnd, + _In_ UINT uType, + _In_opt_ PCWSTR pszTitle, + _In_opt_ PCWSTR pszFormatMessage, + ...); + +INT +__cdecl +DisplayError( + _In_opt_ HWND hWnd, + _In_ UINT uIDTitle, + _In_ UINT uIDMessage, + ...); #endif /* _REACTOS_PCH_ */ -/* EOP */ +/* EOF */

5 months

[reactos] 04/07: [SETUPLIB] Store a machine architecture type

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8056081c2f6764bfe401e… commit 8056081c2f6764bfe401e819b484612ea861be6b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 20 22:15:47 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Aug 12 12:16:56 2024 +0200 [SETUPLIB] Store a machine architecture type It will be used to determine how the bootloader has to be installed, etc. Currently hardcoded for XBOX, or rnutime-determined for NEC PC-98 and BIOS-based PC-AT. More thorough runtime determination will be added in the future. --- base/setup/lib/setuplib.c | 11 +++++++++++ base/setup/lib/setuplib.h | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index c8767c09375..ea190cece3c 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -1028,6 +1028,17 @@ InitializeSetup( DPRINT1("SourceRootPath (2): '%wZ'\n", &pSetupData->SourceRootPath); DPRINT1("SourceRootDir (2): '%wZ'\n", &pSetupData->SourceRootDir); + /* Retrieve the target machine architecture type */ + // FIXME: This should be determined at runtime!! + // FIXME: Allow for (pre-)installing on an architecture + // different from the current one? +#if defined(SARCH_XBOX) + pSetupData->ArchType = ARCH_Xbox; +// #elif defined(SARCH_PC98) +#else // TODO: Arc, UEFI + pSetupData->ArchType = (IsNEC_98 ? ARCH_NEC98x86 : ARCH_PcAT); +#endif + return ERROR_SUCCESS; } diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index 79a1692eea6..99c02ba86a1 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -66,6 +66,16 @@ 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 *****/ @@ -123,6 +133,7 @@ typedef struct _USETUP_DATA PGENERIC_LIST LanguageList; /* Settings *****/ + ARCHITECTURE_TYPE ArchType; //< Target architecture (MachineType) PCWSTR ComputerType; PCWSTR DisplayType; // PCWSTR KeyboardDriver;

5 months

[reactos] 03/07: [SETUPLIB] Move the initialization of other default values into InitializeSetup()

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9b9065df522be35a5b00a… commit 9b9065df522be35a5b00a1d34e5425fc37a858b9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Dec 16 12:52:39 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Aug 12 12:04:39 2024 +0200 [SETUPLIB] Move the initialization of other default values into InitializeSetup() --- base/setup/lib/setuplib.c | 54 ++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index 94f43cac05f..c8767c09375 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -104,7 +104,7 @@ CheckUnattendedSetup( INF_FreeData(Value); - /* Search for 'DestinationDiskNumber' in the 'Unattend' section */ + /* Search for 'DestinationDiskNumber' */ if (!SpInfFindFirstLine(UnattendInf, L"Unattend", L"DestinationDiskNumber", &Context)) { DPRINT("SpInfFindFirstLine() failed for key 'DestinationDiskNumber'\n"); @@ -119,7 +119,7 @@ CheckUnattendedSetup( pSetupData->DestinationDiskNumber = (LONG)IntValue; - /* Search for 'DestinationPartitionNumber' in the 'Unattend' section */ + /* Search for 'DestinationPartitionNumber' */ if (!SpInfFindFirstLine(UnattendInf, L"Unattend", L"DestinationPartitionNumber", &Context)) { DPRINT("SpInfFindFirstLine() failed for key 'DestinationPartitionNumber'\n"); @@ -134,56 +134,47 @@ CheckUnattendedSetup( pSetupData->DestinationPartitionNumber = (LONG)IntValue; - /* Search for 'InstallationDirectory' in the 'Unattend' section (optional) */ + /* Search for 'InstallationDirectory' (optional) */ if (SpInfFindFirstLine(UnattendInf, L"Unattend", L"InstallationDirectory", &Context)) { - /* Get pointer 'InstallationDirectory' key */ - if (!INF_GetData(&Context, NULL, &Value)) + if (INF_GetData(&Context, NULL, &Value)) + { + RtlStringCchCopyW(pSetupData->InstallationDirectory, + ARRAYSIZE(pSetupData->InstallationDirectory), + Value); + INF_FreeData(Value); + } + else { DPRINT("INF_GetData() failed for key 'InstallationDirectory'\n"); - goto Quit; } - - RtlStringCchCopyW(pSetupData->InstallationDirectory, - ARRAYSIZE(pSetupData->InstallationDirectory), - Value); - - INF_FreeData(Value); } IsUnattendedSetup = TRUE; DPRINT("Running unattended setup\n"); - /* Search for 'BootLoaderLocation' in the 'Unattend' section */ - pSetupData->BootLoaderLocation = 2; // Default to "system partition" + /* Search for 'BootLoaderLocation' (optional) */ if (SpInfFindFirstLine(UnattendInf, L"Unattend", L"BootLoaderLocation", &Context)) { if (SpInfGetIntField(&Context, 1, &IntValue)) - { pSetupData->BootLoaderLocation = IntValue; - } } - /* Search for 'FormatPartition' in the 'Unattend' section */ - pSetupData->FormatPartition = 0; + /* Search for 'FormatPartition' (optional) */ if (SpInfFindFirstLine(UnattendInf, L"Unattend", L"FormatPartition", &Context)) { if (SpInfGetIntField(&Context, 1, &IntValue)) - { pSetupData->FormatPartition = IntValue; - } } - pSetupData->AutoPartition = 0; + /* Search for 'AutoPartition' (optional) */ if (SpInfFindFirstLine(UnattendInf, L"Unattend", L"AutoPartition", &Context)) { if (SpInfGetIntField(&Context, 1, &IntValue)) - { pSetupData->AutoPartition = IntValue; - } } - /* Search for LocaleID in the 'Unattend' section */ + /* Search for 'LocaleID' (optional) */ if (SpInfFindFirstLine(UnattendInf, L"Unattend", L"LocaleID", &Context)) { if (INF_GetData(&Context, NULL, &Value)) @@ -193,17 +184,14 @@ CheckUnattendedSetup( ARRAYSIZE(pSetupData->LocaleID), L"%08lx", Id); INF_FreeData(Value); - } + } } - /* Search for FsType in the 'Unattend' section */ - pSetupData->FsType = 0; + /* Search for 'FsType' (optional) */ if (SpInfFindFirstLine(UnattendInf, L"Unattend", L"FsType", &Context)) { if (SpInfGetIntField(&Context, 1, &IntValue)) - { pSetupData->FsType = IntValue; - } } Quit: @@ -1021,6 +1009,14 @@ InitializeSetup( DPRINT1("SourceRootPath (1): '%wZ'\n", &pSetupData->SourceRootPath); DPRINT1("SourceRootDir (1): '%wZ'\n", &pSetupData->SourceRootDir); + /* Set up default values */ + pSetupData->DestinationDiskNumber = 0; + pSetupData->DestinationPartitionNumber = 1; + pSetupData->BootLoaderLocation = 2; // Default to "System partition" + pSetupData->FormatPartition = 0; + pSetupData->AutoPartition = 0; + pSetupData->FsType = 0; + /* Load 'txtsetup.sif' from the installation media */ Error = LoadSetupInf(pSetupData); if (Error != ERROR_SUCCESS)

5 months

[reactos] 02/07: [SETUPLIB][BOOTDATA] Rename "MBRInstallType" to "BootLoaderLocation"

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c9c5fd1a1824a7d466121… commit c9c5fd1a1824a7d4661212b6d0ca72d72e2bf38d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 2 15:22:02 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Aug 12 12:04:38 2024 +0200 [SETUPLIB][BOOTDATA] Rename "MBRInstallType" to "BootLoaderLocation" Less hardcoded references to "MBR" for code that should be generic is always better. --- base/setup/lib/setuplib.c | 8 ++++---- base/setup/lib/setuplib.h | 2 +- base/setup/usetup/usetup.c | 26 +++++++++++++------------- boot/bootdata/bootcd/unattend.inf | 9 +++++---- boot/bootdata/bootcdregtest/unattend.inf | 9 +++++---- 5 files changed, 28 insertions(+), 26 deletions(-) diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index e7c46c433ed..94f43cac05f 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -154,13 +154,13 @@ CheckUnattendedSetup( IsUnattendedSetup = TRUE; DPRINT("Running unattended setup\n"); - /* Search for 'MBRInstallType' in the 'Unattend' section */ - pSetupData->MBRInstallType = -1; - if (SpInfFindFirstLine(UnattendInf, L"Unattend", L"MBRInstallType", &Context)) + /* Search for 'BootLoaderLocation' in the 'Unattend' section */ + pSetupData->BootLoaderLocation = 2; // Default to "system partition" + if (SpInfFindFirstLine(UnattendInf, L"Unattend", L"BootLoaderLocation", &Context)) { if (SpInfGetIntField(&Context, 1, &IntValue)) { - pSetupData->MBRInstallType = IntValue; + pSetupData->BootLoaderLocation = IntValue; } } diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index 4272138cac6..79a1692eea6 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -110,7 +110,7 @@ typedef struct _USETUP_DATA LONG DestinationDiskNumber; LONG DestinationPartitionNumber; - LONG MBRInstallType; + LONG BootLoaderLocation; LONG FormatPartition; LONG AutoPartition; LONG FsType; diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index e6025854e8e..fb6de2eb614 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -3470,15 +3470,15 @@ BootLoaderSelectPage(PINPUT_RECORD Ir) */ if (RepairUpdateFlag) { - USetupData.MBRInstallType = 0; + USetupData.BootLoaderLocation = 0; goto Quit; } /* For unattended setup, skip MBR installation or install on removable disk if needed */ if (IsUnattendedSetup) { - if ((USetupData.MBRInstallType == 0) || - (USetupData.MBRInstallType == 1)) + if ((USetupData.BootLoaderLocation == 0) || + (USetupData.BootLoaderLocation == 1)) { goto Quit; } @@ -3493,7 +3493,7 @@ BootLoaderSelectPage(PINPUT_RECORD Ir) if ((SystemPartition->DiskEntry->DiskStyle != PARTITION_STYLE_MBR) || !IsRecognizedPartition(SystemPartition->PartitionType)) { - USetupData.MBRInstallType = 1; + USetupData.BootLoaderLocation = 1; goto Quit; } #endif @@ -3501,8 +3501,8 @@ BootLoaderSelectPage(PINPUT_RECORD Ir) /* Is it an unattended install on hdd? */ if (IsUnattendedSetup) { - if ((USetupData.MBRInstallType == 2) || - (USetupData.MBRInstallType == 3)) + if ((USetupData.BootLoaderLocation == 2) || + (USetupData.BootLoaderLocation == 3)) { goto Quit; } @@ -3574,25 +3574,25 @@ BootLoaderSelectPage(PINPUT_RECORD Ir) if (Line == 12) { /* Install on both MBR and VBR */ - USetupData.MBRInstallType = 2; + USetupData.BootLoaderLocation = 2; break; } else if (Line == 13) { /* Install on VBR only */ - USetupData.MBRInstallType = 3; + USetupData.BootLoaderLocation = 3; break; } else if (Line == 14) { /* Install on removable disk */ - USetupData.MBRInstallType = 1; + USetupData.BootLoaderLocation = 1; break; } else if (Line == 15) { /* Skip installation */ - USetupData.MBRInstallType = 0; + USetupData.BootLoaderLocation = 0; break; } @@ -3661,7 +3661,7 @@ BootLoaderHardDiskPage(PINPUT_RECORD Ir) NTSTATUS Status; WCHAR DestinationDevicePathBuffer[MAX_PATH]; - if (USetupData.MBRInstallType == 2) + if (USetupData.BootLoaderLocation == 2) { /* Step 1: Write the VBR */ Status = InstallVBRToPartition(&USetupData.SystemRootPath, @@ -3737,10 +3737,10 @@ BootLoaderInstallPage(PINPUT_RECORD Ir) RtlCreateUnicodeString(&USetupData.SystemRootPath, PathBuffer); DPRINT1("SystemRootPath: %wZ\n", &USetupData.SystemRootPath); - if (USetupData.MBRInstallType != 0) + if (USetupData.BootLoaderLocation != 0) MUIDisplayPage(BOOTLOADER_INSTALL_PAGE); - switch (USetupData.MBRInstallType) + switch (USetupData.BootLoaderLocation) { /* Skip installation */ case 0: diff --git a/boot/bootdata/bootcd/unattend.inf b/boot/bootdata/bootcd/unattend.inf index dcf98b732f4..ec41adcc97b 100644 --- a/boot/bootdata/bootcd/unattend.inf +++ b/boot/bootdata/bootcd/unattend.inf @@ -11,10 +11,11 @@ DestinationDiskNumber = 0 DestinationPartitionNumber = 1 InstallationDirectory=ReactOS -; MBRInstallType=0 skips MBR installation -; MBRInstallType=1 install MBR on floppy -; MBRInstallType=2 install MBR on hdd -MBRInstallType=2 +; BootLoaderLocation=0 Skip installation +; BootLoaderLocation=1 Install on removable media (floppy) +; BootLoaderLocation=2 Install on system partition (for MBR disks: MBR and VBR) +; BootLoaderLocation=3 Install on VBR only (for MBR disks) +BootLoaderLocation=2 FullName="MyName" ;OrgName="MyOrg" diff --git a/boot/bootdata/bootcdregtest/unattend.inf b/boot/bootdata/bootcdregtest/unattend.inf index c96371bbed5..6617f40b3a4 100644 --- a/boot/bootdata/bootcdregtest/unattend.inf +++ b/boot/bootdata/bootcdregtest/unattend.inf @@ -11,10 +11,11 @@ DestinationDiskNumber = 0 DestinationPartitionNumber = 1 InstallationDirectory=ReactOS -; MBRInstallType=0 skips MBR installation -; MBRInstallType=1 install MBR on floppy -; MBRInstallType=2 install MBR on hdd -MBRInstallType=2 +; BootLoaderLocation=0 Skip installation +; BootLoaderLocation=1 Install on removable media (floppy) +; BootLoaderLocation=2 Install on system partition (for MBR disks: MBR and VBR) +; BootLoaderLocation=3 Install on VBR only (for MBR disks) +BootLoaderLocation=2 FullName="MyName" ;OrgName="MyOrg"

5 months

[reactos] 01/07: [SETUPLIB] Fix the class of characters valid for the installation directory

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=259abe59dccbdc481ac49… commit 259abe59dccbdc481ac498a7342b438a2b30c192 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Aug 11 21:04:18 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Aug 12 12:04:37 2024 +0200 [SETUPLIB] Fix the class of characters valid for the installation directory Commit 7c3f4c94a4 (r68307) mentions the valid characters: these are: ASCII alphanumericals (a-z, A-Z, 0-9) (hence the iswalnum() -> isalnum() change), and: '.', '\\', '-', '_' . Spaces are not accepted. Addendum to commit 785cc21598. --- base/setup/lib/setuplib.c | 3 +-- base/setup/lib/setuplib.h | 9 ++++++++- base/setup/usetup/usetup.c | 4 +--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index 9fb91b24f80..e7c46c433ed 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -731,8 +731,7 @@ IsValidInstallDirectory( if (!*p || (IS_PATH_SEPARATOR(*p) && !*(p + 1))) return FALSE; - /* The path must contain only valid characters (alpha-numeric, - * '.', '\\', '-' and '_'). Spaces are not accepted. */ + /* The path must contain only valid characters */ for (p = InstallDir; *p; ++p) { if (!IS_VALID_INSTALL_PATH_CHAR(*p)) diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index 43fe3a866f9..4272138cac6 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -177,8 +177,15 @@ InitSystemPartition( _In_opt_ PFSVOL_CALLBACK FsVolCallback, _In_opt_ PVOID Context); +/** + * @brief + * Defines the class of characters valid for the installation directory. + * + * The valid characters are: ASCII alphanumericals (a-z, A-Z, 0-9), + * and: '.', '\\', '-', '_' . Spaces are not allowed. + **/ #define IS_VALID_INSTALL_PATH_CHAR(c) \ - (iswalnum(c) || (c) == L'.' || (c) == L'\\' || (c) == L'-' || (c) == L'_') + (isalnum(c) || (c) == L'.' || (c) == L'\\' || (c) == L'-' || (c) == L'_') BOOLEAN IsValidInstallDirectory( diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 204c92715c1..e6025854e8e 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -3060,9 +3060,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) { if (Length < 50) { - /* Only accept valid characters for installation path - * (alpha-numeric, '.', '\', '-' and '_'). Note that - * spaces are not accepted. */ + /* Only accept valid characters for the installation path */ c = (WCHAR)Ir->Event.KeyEvent.uChar.AsciiChar; if (IS_VALID_INSTALL_PATH_CHAR(c)) {

5 months

[reactos] 04/04: [CMBATT] Implement CmBattVerifyStaticInfo

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30ac80f36b927dfa35007… commit 30ac80f36b927dfa35007268ad72ce9a46201fda Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Feb 14 22:25:44 2024 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Aug 12 11:56:18 2024 +0200 [CMBATT] Implement CmBattVerifyStaticInfo --- drivers/bus/acpi/cmbatt/cmbatt.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/drivers/bus/acpi/cmbatt/cmbatt.c b/drivers/bus/acpi/cmbatt/cmbatt.c index f0e7b04a39e..09d9c81d837 100644 --- a/drivers/bus/acpi/cmbatt/cmbatt.c +++ b/drivers/bus/acpi/cmbatt/cmbatt.c @@ -278,8 +278,38 @@ NTAPI CmBattVerifyStaticInfo(PCMBATT_DEVICE_EXTENSION DeviceExtension, ULONG BatteryTag) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + ACPI_BIF_DATA BifData; + PBATTERY_INFORMATION Info = &DeviceExtension->BatteryInformation; + NTSTATUS Status; + + Status = CmBattGetBifData(DeviceExtension, &BifData); + if (NT_SUCCESS(Status)) + { + RtlZeroMemory(Info, sizeof(*Info)); + Info->Capabilities = BATTERY_SYSTEM_BATTERY; + Info->Technology = BifData.BatteryTechnology; + RtlCopyMemory(Info->Chemistry, BifData.BatteryType, 4); + // FIXME: take from _BIX method: Info->CycleCount + DeviceExtension->BifData = BifData; + + if (BifData.PowerUnit == 1) + { + DPRINT1("FIXME: need to convert mAh into mWh\n"); + Info->DesignedCapacity = BATTERY_UNKNOWN_CAPACITY; + Info->FullChargedCapacity = BATTERY_UNKNOWN_CAPACITY; + Info->DefaultAlert1 = BATTERY_UNKNOWN_CAPACITY; + Info->DefaultAlert2 = BATTERY_UNKNOWN_CAPACITY; + } + else + { + Info->DesignedCapacity = BifData.DesignCapacity; + Info->FullChargedCapacity = BifData.LastFullCapacity; + Info->DefaultAlert1 = BifData.DesignCapacityLow; + Info->DefaultAlert2 = BifData.DesignCapacityWarning; + } + } + + return Status; } NTSTATUS

5 months

[reactos] 03/04: [CMBATT] Remove useless fields in device extension

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ff683fa334290dac838f… commit 2ff683fa334290dac838fc92074e3de26b2f8111 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Feb 14 22:24:22 2024 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Aug 12 11:56:18 2024 +0200 [CMBATT] Remove useless fields in device extension Information is already present in BifData, and those fields were never filled. --- drivers/bus/acpi/cmbatt/cmbatt.c | 12 ++++++------ drivers/bus/acpi/cmbatt/cmbatt.h | 6 ------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/bus/acpi/cmbatt/cmbatt.c b/drivers/bus/acpi/cmbatt/cmbatt.c index 9d3a459525e..f0e7b04a39e 100644 --- a/drivers/bus/acpi/cmbatt/cmbatt.c +++ b/drivers/bus/acpi/cmbatt/cmbatt.c @@ -1120,7 +1120,7 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, case BatteryDeviceName: /* Build the model number string */ - RtlInitAnsiString(&TempString, FdoExtension->ModelNumber); + RtlInitAnsiString(&TempString, FdoExtension->BifData.ModelNumber); /* Convert it to Unicode */ InfoString.Buffer = InfoBuffer; @@ -1142,7 +1142,7 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, case BatteryManufactureName: /* Build the OEM info string */ - RtlInitAnsiString(&TempString, FdoExtension->OemInfo); + RtlInitAnsiString(&TempString, FdoExtension->BifData.OemInfo); /* Convert it to Unicode */ InfoString.Buffer = InfoBuffer; @@ -1157,7 +1157,7 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, case BatteryUniqueID: /* Build the serial number string */ - RtlInitAnsiString(&TempString, FdoExtension->SerialNumber); + RtlInitAnsiString(&TempString, FdoExtension->BifData.SerialNumber); /* Convert it to Unicode */ InfoString.Buffer = InfoBuffer; @@ -1169,10 +1169,10 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, TempString2.MaximumLength = sizeof(TempBuffer); /* Check if there's an OEM string */ - if (FdoExtension->OemInfo[0]) + if (FdoExtension->BifData.OemInfo[0]) { /* Build the OEM info string */ - RtlInitAnsiString(&TempString, FdoExtension->OemInfo); + RtlInitAnsiString(&TempString, FdoExtension->BifData.OemInfo); /* Convert it to Unicode and append it */ RtlAnsiStringToUnicodeString(&TempString2, &TempString, 0); @@ -1180,7 +1180,7 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, } /* Build the model number string */ - RtlInitAnsiString(&TempString, FdoExtension->ModelNumber); + RtlInitAnsiString(&TempString, FdoExtension->BifData.ModelNumber); /* Convert it to Unicode and append it */ RtlAnsiStringToUnicodeString(&TempString2, &TempString, 0); diff --git a/drivers/bus/acpi/cmbatt/cmbatt.h b/drivers/bus/acpi/cmbatt/cmbatt.h index feec959fb42..bb130208763 100644 --- a/drivers/bus/acpi/cmbatt/cmbatt.h +++ b/drivers/bus/acpi/cmbatt/cmbatt.h @@ -124,12 +124,6 @@ typedef struct _CMBATT_DEVICE_EXTENSION LONG ArLockValue; ULONG TagData; ULONG Tag; - ULONG ModelNumberLength; - PCHAR ModelNumber; - ULONG SerialNumberLength; - PCHAR SerialNumber; - ULONG OemInfoLength; - PCHAR OemInfo; ACPI_BST_DATA BstData; ACPI_BIF_DATA BifData; ULONG Id;

5 months

[reactos] 02/04: [CMBATT] Implement CmBattGetBifData/CmBattGetBstData

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=359e73d055200a3aaba21… commit 359e73d055200a3aaba21ee3df05964f842303cf Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Feb 14 22:23:17 2024 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Aug 12 11:56:18 2024 +0200 [CMBATT] Implement CmBattGetBifData/CmBattGetBstData --- drivers/bus/acpi/cmbatt/cmexec.c | 141 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 137 insertions(+), 4 deletions(-) diff --git a/drivers/bus/acpi/cmbatt/cmexec.c b/drivers/bus/acpi/cmbatt/cmexec.c index 284bd3cb449..b1d294ae9ef 100644 --- a/drivers/bus/acpi/cmbatt/cmexec.c +++ b/drivers/bus/acpi/cmbatt/cmexec.c @@ -13,6 +13,13 @@ #include <acpiioct.h> #include <debug.h> +typedef struct +{ + LPSTR Name; + BOOLEAN IsString; + PVOID Data; +} ACPI_PACKAGE_FIELD, *PACPI_PACKAGE_FIELD; + /* FUNCTIONS ******************************************************************/ NTSTATUS @@ -151,6 +158,86 @@ CmBattSendDownStreamIrp(IN PDEVICE_OBJECT DeviceObject, return Status; } +static +NTSTATUS +CmBattCallAcpiPackage( + _In_ LPCSTR FunctionName, + _In_ PCMBATT_DEVICE_EXTENSION DeviceExtension, + _In_ ULONG PackageName, + _In_ ULONG OutputBufferSize, + _In_ PACPI_PACKAGE_FIELD PackageFields, + _In_ ULONG PackageFieldCount) +{ + NTSTATUS Status; + PACPI_EVAL_OUTPUT_BUFFER OutputBuffer; + ACPI_EVAL_INPUT_BUFFER InputBuffer; + PACPI_METHOD_ARGUMENT Argument; + ULONG i; + PAGED_CODE(); + + OutputBuffer = ExAllocatePoolWithTag(PagedPool, + OutputBufferSize, + 'MtaB'); + if (!OutputBuffer) + { + if (CmBattDebug & (CMBATT_ACPI_ENTRY_EXIT | CMBATT_ACPI_WARNING | CMBATT_GENERIC_WARNING)) + DbgPrint("%s: Failed to allocate Buffer\n", FunctionName); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Initialize to zero */ + RtlZeroMemory(OutputBuffer, OutputBufferSize); + + /* Request the ACPI method */ + *(PULONG)InputBuffer.MethodName = PackageName; + InputBuffer.Signature = ACPI_EVAL_INPUT_BUFFER_SIGNATURE; + + /* Send it to ACPI */ + Status = CmBattSendDownStreamIrp(DeviceExtension->AttachedDevice, + IOCTL_ACPI_EVAL_METHOD, + &InputBuffer, + sizeof(InputBuffer), + OutputBuffer, + OutputBufferSize); + if (!NT_SUCCESS(Status)) + { + if (CmBattDebug & (CMBATT_ACPI_ASSERT | CMBATT_ACPI_ENTRY_EXIT | CMBATT_ACPI_WARNING | CMBATT_GENERIC_WARNING)) + DbgPrint("%s: Failed 0x%08x method on device %x - Status (0x%x)\n", + FunctionName, PackageName, DeviceExtension->DeviceId, Status); + ExFreePoolWithTag(OutputBuffer, 'MtaB'); + return Status; + } + + /* Check if we got the right number of elements */ + if (OutputBuffer->Count != PackageFieldCount) + { + if (CmBattDebug & (CMBATT_ACPI_ASSERT | CMBATT_ACPI_ENTRY_EXIT | CMBATT_ACPI_WARNING | CMBATT_GENERIC_WARNING)) + DbgPrint("%s: 0x%08x method returned %d elements (requires %d)\n", + FunctionName, PackageName, OutputBuffer->Count, PackageFieldCount); + ExFreePoolWithTag(OutputBuffer, 'MtaB'); + return STATUS_ACPI_INVALID_DATA; + } + + Argument = OutputBuffer->Argument; + for (i = 0; i < PackageFieldCount && NT_SUCCESS(Status); i++) + { + if (PackageFields[i].IsString) + Status = GetStringElement(Argument, PackageFields[i].Data); + else + Status = GetDwordElement(Argument, PackageFields[i].Data); + if (!NT_SUCCESS(Status)) + { + if (CmBattDebug & (CMBATT_ACPI_ASSERT | CMBATT_ACPI_ENTRY_EXIT | CMBATT_ACPI_WARNING | CMBATT_GENERIC_WARNING)) + DbgPrint("%s: Failed to get %s\n", FunctionName, PackageFields[i].Name); + break; + } + Argument = ACPI_METHOD_NEXT_ARGUMENT(Argument); + } + + ExFreePoolWithTag(OutputBuffer, 'MtaB'); + return Status; +} + NTSTATUS NTAPI CmBattGetPsrData(IN PDEVICE_OBJECT DeviceObject, @@ -325,8 +412,37 @@ NTAPI CmBattGetBifData(PCMBATT_DEVICE_EXTENSION DeviceExtension, PACPI_BIF_DATA BifData) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + ACPI_PACKAGE_FIELD BifFields[] = { + { "PowerUnit", FALSE, &BifData->PowerUnit }, + { "DesignCapacity", FALSE, &BifData->DesignCapacity }, + { "LastFullCapacity", FALSE, &BifData->LastFullCapacity }, + { "BatteryTechnology", FALSE, &BifData->BatteryTechnology }, + { "DesignVoltage", FALSE, &BifData->DesignVoltage }, + { "DesignCapacityWarning", FALSE, &BifData->DesignCapacityWarning }, + { "DesignCapacityLow", FALSE, &BifData->DesignCapacityLow }, + { "BatteryCapacityGranularity1", FALSE, &BifData->BatteryCapacityGranularity1 }, + { "BatteryCapacityGranularity2", FALSE, &BifData->BatteryCapacityGranularity2 }, + { "ModelNumber", TRUE, &BifData->ModelNumber }, + { "SerialNumber", TRUE, &BifData->SerialNumber }, + { "BatteryType", TRUE, &BifData->BatteryType }, + { "OemInfo", TRUE, &BifData->OemInfo }, + }; + PAGED_CODE(); + + if (CmBattDebug & CMBATT_ACPI_ENTRY_EXIT) + DbgPrint("CmBattGetBifData: Buffer (0x%x) Device %x Tid %x\n", + BifData, DeviceExtension->DeviceId, KeGetCurrentThread()); + + /* Request the _BIF method */ + /* Note that _BIF method is deprecated since ACPI 4.0, and replaced by _BIX method. + * However, VirtualBox 7.0 only support _BIF method. + */ + return CmBattCallAcpiPackage("CmBattGetBifData", + DeviceExtension, + 'FIB_', + 512, + BifFields, + RTL_NUMBER_OF(BifFields)); } NTSTATUS @@ -334,8 +450,25 @@ NTAPI CmBattGetBstData(PCMBATT_DEVICE_EXTENSION DeviceExtension, PACPI_BST_DATA BstData) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + ACPI_PACKAGE_FIELD BstFields[] = { + { "State", FALSE, &BstData->State }, + { "PresentRate", FALSE, &BstData->PresentRate }, + { "RemainingCapacity", FALSE, &BstData->RemainingCapacity }, + { "PresentVoltage", FALSE, &BstData->PresentVoltage }, + }; + PAGED_CODE(); + + if (CmBattDebug & CMBATT_ACPI_ENTRY_EXIT) + DbgPrint("CmBattGetBstData: Buffer (0x%x) Device %x Tid %x\n", + BstData, DeviceExtension->DeviceId, KeGetCurrentThread()); + + + return CmBattCallAcpiPackage("CmBattGetBstData", + DeviceExtension, + 'TSB_', + 512, + BstFields, + RTL_NUMBER_OF(BstFields)); } /* EOF */

5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs