27 Aug
2024
27 Aug
'24
9:20 p.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1573461cec345f0589089…
commit 1573461cec345f05890893b721b9aabea186c043
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: Tue Aug 27 23:18:12 2024 +0200
[SETUP:REACTOS] Add partitioning and formatting support (#7159)
CORE-13525
- Newly-created partitions and unpartitioned space ar reinserted
or updated in correct order in the tree-list. Volume-creation
information data associated with the tree items is persisted
across operations.
- Reliably delete data associated to tree-list items via the
TVN_DELETEITEM notification.
This allows simplifying the cleanup function; keeping simple
the code that deletes items when deleting partitions, etc.
- Make the PrintPartitionData() function call itself recursively on
extended partitions to display the sub-list of logical partitions.
- Handle the new partition size in MB the same way as in USETUP.
- Allow existing partitions/volumes to be re-formatted, using
common code with the partition creation dialog.
- Allow selecting unpartitioned space or non-formatted partitions
for installing ReactOS: unused space will automatically be
partitioned and non-formatted partitions formatted (the user
is prompted for choosing the file system).
- Correctly zero the progress-bar position when starting file copy.
- Add missing file copy error handler in FileCopyCallback:
just copying what USETUP does.
---
base/setup/lib/utils/partlist.c | 1 -
base/setup/lib/utils/partlist.h | 5 +
base/setup/reactos/drivepage.c | 1628 +++++++++++++++++++++++++++++++-------
base/setup/reactos/lang/bg-BG.rc | 106 ++-
base/setup/reactos/lang/cs-CZ.rc | 106 ++-
base/setup/reactos/lang/de-DE.rc | 106 ++-
base/setup/reactos/lang/el-GR.rc | 106 ++-
base/setup/reactos/lang/en-US.rc | 96 ++-
base/setup/reactos/lang/es-ES.rc | 106 ++-
base/setup/reactos/lang/et-EE.rc | 106 ++-
base/setup/reactos/lang/eu-ES.rc | 106 ++-
base/setup/reactos/lang/fi-FI.rc | 106 ++-
base/setup/reactos/lang/fr-FR.rc | 106 ++-
base/setup/reactos/lang/he-IL.rc | 106 ++-
base/setup/reactos/lang/hi-IN.rc | 98 ++-
base/setup/reactos/lang/hu-HU.rc | 106 ++-
base/setup/reactos/lang/id-ID.rc | 96 ++-
base/setup/reactos/lang/it-IT.rc | 106 ++-
base/setup/reactos/lang/ja-JP.rc | 96 ++-
base/setup/reactos/lang/ms-MY.rc | 106 ++-
base/setup/reactos/lang/no-NO.rc | 106 ++-
base/setup/reactos/lang/pl-PL.rc | 106 ++-
base/setup/reactos/lang/pt-BR.rc | 106 ++-
base/setup/reactos/lang/pt-PT.rc | 106 ++-
base/setup/reactos/lang/ro-RO.rc | 106 ++-
base/setup/reactos/lang/ru-RU.rc | 106 ++-
base/setup/reactos/lang/sk-SK.rc | 106 ++-
base/setup/reactos/lang/sq-AL.rc | 106 ++-
base/setup/reactos/lang/tr-TR.rc | 106 ++-
base/setup/reactos/lang/uk-UA.rc | 106 ++-
base/setup/reactos/lang/vi-VN.rc | 96 ++-
base/setup/reactos/lang/zh-CN.rc | 106 ++-
base/setup/reactos/lang/zh-HK.rc | 106 ++-
base/setup/reactos/lang/zh-TW.rc | 106 ++-
base/setup/reactos/reactos.c | 626 ++++++++++++++-
base/setup/reactos/reactos.h | 46 +-
base/setup/reactos/resource.h | 96 ++-
base/setup/usetup/usetup.c | 8 +-
38 files changed, 4680 insertions(+), 968 deletions(-)
diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c
index 466a1826979..4f077440ab2 100644
--- a/base/setup/lib/utils/partlist.c
+++ b/base/setup/lib/utils/partlist.c
@@ -2720,7 +2720,6 @@ UpdateDiskLayout(
*
* @return The adjacent unpartitioned region, if it exists, or NULL.
**/
-static
PPARTENTRY
GetAdjUnpartitionedEntry(
_In_ PPARTENTRY PartEntry,
diff --git a/base/setup/lib/utils/partlist.h b/base/setup/lib/utils/partlist.h
index 967c8385b4d..3b52325cff2 100644
--- a/base/setup/lib/utils/partlist.h
+++ b/base/setup/lib/utils/partlist.h
@@ -316,6 +316,11 @@ GetPrevPartition(
IN PPARTLIST List,
IN PPARTENTRY CurrentPart OPTIONAL);
+PPARTENTRY
+GetAdjUnpartitionedEntry(
+ _In_ PPARTENTRY PartEntry,
+ _In_ BOOLEAN Direction);
+
ERROR_NUMBER
PartitionCreationChecks(
_In_ PPARTENTRY PartEntry);
diff --git a/base/setup/reactos/drivepage.c b/base/setup/reactos/drivepage.c
index 6c9bcc2a963..5afdb57b084 100644
--- a/base/setup/reactos/drivepage.c
+++ b/base/setup/reactos/drivepage.c
@@ -27,6 +27,8 @@
#include "reactos.h"
#include <shlwapi.h>
+#include <math.h> // For pow()
+
// #include <ntdddisk.h>
#include <ntddstor.h>
#include <ntddscsi.h>
@@ -362,33 +364,373 @@ MoreOptDlgProc(
return FALSE;
}
-static INT_PTR CALLBACK
-PartitionDlgProc(HWND hwndDlg,
- UINT uMsg,
- WPARAM wParam,
- LPARAM lParam)
+
+/**
+ * @brief
+ * Data structure stored for each partition item in the TreeList.
+ * (None for disks items.)
+ **/
+typedef struct _PARTITEM
+{
+ PPARTENTRY PartEntry; //< Disk region this structure is associated to.
+ PVOLENTRY Volume; //< Associated file system volume if any, or NULL.
+ PVOL_CREATE_INFO VolCreate; //< Volume create information (allocated).
+} PARTITEM, *PPARTITEM;
+
+/**
+ * @brief
+ * Dialog context structure used by PartitionDlgProc() and FormatDlgProc(Worker)().
+ **/
+typedef struct _PARTCREATE_CTX
+{
+ PPARTITEM PartItem; //< Partition item info stored in the TreeList.
+ ULONG MaxSizeMB; //< Maximum possible partition size in MB.
+ ULONG PartSizeMB; //< Selected partition size in MB.
+ BOOLEAN MBRExtPart; //< Whether to create an MBR extended partition.
+ BOOLEAN ForceFormat; //< Whether to force formatting ('Do not format'
option hidden).
+} PARTCREATE_CTX, *PPARTCREATE_CTX;
+
+static INT_PTR
+CALLBACK
+FormatDlgProcWorker(
+ _In_ PPARTCREATE_CTX PartCreateCtx,
+ _In_ HWND hDlg,
+ _In_ UINT uMsg,
+ _In_ WPARAM wParam,
+ _In_ LPARAM lParam)
{
switch (uMsg)
{
case WM_INITDIALOG:
+ {
+ ULONG Index = 0;
+ INT iItem;
+ PCWSTR FileSystem;
+ PCWSTR DefaultFs;
+ PVOLENTRY Volume;
+ PVOL_CREATE_INFO VolCreate;
+
+ /* List the well-known file systems. We use the same strings
+ * for the displayed FS names and their actual ones. */
+ while (GetRegisteredFileSystems(Index++, &FileSystem))
+ {
+ iItem = SendDlgItemMessageW(hDlg, IDC_FSTYPE, CB_INSERTSTRING, -1,
(LPARAM)FileSystem);
+ if (iItem != CB_ERR && iItem != CB_ERRSPACE)
+ SendDlgItemMessageW(hDlg, IDC_FSTYPE, CB_SETITEMDATA, iItem,
(LPARAM)FileSystem);
+ }
+
+ /* Add the 'Do not format' entry if needed */
+ if (!PartCreateCtx->ForceFormat)
+ {
+ WCHAR szText[50];
+
+ LoadStringW(SetupData.hInstance, IDS_VOLUME_NOFORMAT, szText,
_countof(szText));
+ iItem = SendDlgItemMessageW(hDlg, IDC_FSTYPE, CB_INSERTSTRING, 0,
(LPARAM)szText);
+ if (iItem != CB_ERR && iItem != CB_ERRSPACE)
+ SendDlgItemMessageW(hDlg, IDC_FSTYPE, CB_SETITEMDATA, iItem,
(LPARAM)NULL);
+ }
+
+ // FIXME: Read from SetupData.FsType; select the "FAT" FS
instead.
+ DefaultFs = L"FAT";
+
+ /* Retrieve the selected volume and create information */
+ ASSERT(PartCreateCtx->PartItem->Volume ==
PartCreateCtx->PartItem->PartEntry->Volume);
+ Volume = PartCreateCtx->PartItem->PartEntry->Volume;
+ VolCreate = PartCreateCtx->PartItem->VolCreate;
+
+ /* Select the existing file system in the list if any,
+ * otherwise use the "DefaultFs" */
+ if (VolCreate && *VolCreate->FileSystemName)
+ FileSystem = VolCreate->FileSystemName;
+ else if (Volume && *Volume->Info.FileSystem)
+ FileSystem = Volume->Info.FileSystem;
+ else
+ FileSystem = DefaultFs;
+
+ iItem = SendDlgItemMessageW(hDlg, IDC_FSTYPE, CB_FINDSTRINGEXACT, 0,
(LPARAM)FileSystem);
+ if (iItem == CB_ERR)
+ iItem = 0;
+ SendDlgItemMessageW(hDlg, IDC_FSTYPE, CB_SETCURSEL, (WPARAM)iItem, 0);
+
+ /* Check the quick-format option by default as it speeds up formatting */
+ if (!VolCreate || VolCreate->QuickFormat)
+ CheckDlgButton(hDlg, IDC_CHECK_QUICKFMT, BST_CHECKED);
+ else
+ CheckDlgButton(hDlg, IDC_CHECK_QUICKFMT, BST_UNCHECKED);
+
break;
+ }
case WM_COMMAND:
{
+ //
+ // NOTE:
+ // - CBN_SELCHANGE sent everytime a combobox list item is selected,
+ // *even if* the list is opened.
+ // - CBN_SELENDOK sent only when user finished to select an item
+ // by clicking on it (if the list is opened), or selection changed
+ // (when the list is closed but selection is done with arrow keys).
+ //
+ if ((HIWORD(wParam) == CBN_SELCHANGE /*|| HIWORD(wParam) == CBN_SELENDOK*/)
&&
+ (LOWORD(wParam) == IDC_FSTYPE))
+ {
+ // HWND hWndList = GetDlgItem(hDlg, IDC_FSTYPE);
+ PCWSTR FileSystem;
+ INT iItem;
+
+ /* Retrieve the selected file system. Use the
+ * item data instead of the displayed string. */
+ iItem = SendDlgItemMessageW(hDlg, IDC_FSTYPE, CB_GETCURSEL, 0, 0);
+ if (iItem == CB_ERR)
+ iItem = 0; // Default entry
+ FileSystem = (PCWSTR)SendDlgItemMessageW(hDlg, IDC_FSTYPE,
CB_GETITEMDATA, iItem, 0);
+ if (FileSystem == (PCWSTR)CB_ERR)
+ FileSystem = NULL; // Default data
+
+ /* Enable or disable formatting options,
+ * depending on whether we need to format */
+ EnableDlgItem(hDlg, IDC_CHECK_QUICKFMT, (FileSystem &&
*FileSystem));
+ break;
+ }
+
+ if (HIWORD(wParam) != BN_CLICKED)
+ break;
+
switch (LOWORD(wParam))
{
- case IDOK:
- EndDialog(hwndDlg, IDOK);
+ case IDOK:
+ {
+ PPARTITEM PartItem = PartCreateCtx->PartItem;
+ PVOL_CREATE_INFO VolCreate;
+ PCWSTR FileSystem;
+ INT iItem;
+
+ /*
+ * Retrieve the formatting options
+ */
+
+ /* Retrieve the selected file system. Use the
+ * item data instead of the displayed string. */
+ iItem = SendDlgItemMessageW(hDlg, IDC_FSTYPE, CB_GETCURSEL, 0, 0);
+ if (iItem == CB_ERR)
+ iItem = 0; // Default entry
+ FileSystem = (PCWSTR)SendDlgItemMessageW(hDlg, IDC_FSTYPE,
CB_GETITEMDATA, iItem, 0);
+ if (FileSystem == (PCWSTR)CB_ERR)
+ FileSystem = NULL; // Default data
+
+ VolCreate = PartItem->VolCreate;
+
+ /* Check if we need to format */
+ if (!FileSystem || !*FileSystem)
+ {
+ /* We don't format. If there is an existing
+ * volume-create structure, free it. */
+ if (VolCreate)
+ LocalFree(VolCreate);
+ PartItem->VolCreate = NULL;
+
+ /* And return */
return TRUE;
- case IDCANCEL:
- EndDialog(hwndDlg, IDCANCEL);
+ }
+
+ /* We will format: allocate and initialize
+ * a volume-create structure if needed */
+ if (!VolCreate)
+ VolCreate = LocalAlloc(LPTR, sizeof(*VolCreate));
+ if (!VolCreate)
+ {
+ DPRINT1("Failed to allocate volume-create structure\n");
return TRUE;
+ }
+
+ /* Cached input information that will be set to
+ * the FORMAT_VOLUME_INFO structure given to the
+ * 'FSVOLNOTIFY_STARTFORMAT' step */
+ // TODO: Think about which values could be defaulted...
+ StringCchCopyW(VolCreate->FileSystemName,
+ _countof(VolCreate->FileSystemName),
+ FileSystem);
+ VolCreate->MediaFlag = FMIFS_HARDDISK;
+ VolCreate->Label = NULL;
+ VolCreate->QuickFormat =
+ (IsDlgButtonChecked(hDlg, IDC_CHECK_QUICKFMT) == BST_CHECKED);
+ VolCreate->ClusterSize = 0;
+
+ /* Set the volume associated to the new create information */
+ VolCreate->Volume = PartItem->Volume;
+
+ /* Associate the new, or update the volume create information */
+ PartItem->VolCreate = VolCreate;
+ return TRUE;
+ }
}
}
}
return FALSE;
}
+static INT_PTR
+CALLBACK
+FormatDlgProc(
+ _In_ HWND hDlg,
+ _In_ UINT uMsg,
+ _In_ WPARAM wParam,
+ _In_ LPARAM lParam)
+{
+ PPARTCREATE_CTX PartCreateCtx;
+
+ /* Retrieve dialog context pointer */
+ PartCreateCtx = (PPARTCREATE_CTX)GetWindowLongPtrW(hDlg, GWLP_USERDATA);
+
+ switch (uMsg)
+ {
+ case WM_INITDIALOG:
+ {
+ /* Save dialog context pointer */
+ PartCreateCtx = (PPARTCREATE_CTX)lParam;
+ SetWindowLongPtrW(hDlg, GWLP_USERDATA, (LONG_PTR)PartCreateCtx);
+
+ /* We actually want to format, so set the flag */
+ PartCreateCtx->ForceFormat = TRUE;
+ break;
+ }
+
+ case WM_COMMAND:
+ {
+ if (HIWORD(wParam) != BN_CLICKED)
+ break;
+
+ switch (LOWORD(wParam))
+ {
+ case IDOK:
+ {
+ /* Retrieve the formatting options */
+ FormatDlgProcWorker(PartCreateCtx, hDlg, uMsg, wParam, lParam);
+ EndDialog(hDlg, IDOK);
+ return TRUE;
+ }
+
+ case IDCANCEL:
+ {
+ EndDialog(hDlg, IDCANCEL);
+ return TRUE;
+ }
+ }
+ }
+ }
+
+ return FormatDlgProcWorker(PartCreateCtx, hDlg, uMsg, wParam, lParam);
+}
+
+static INT_PTR
+CALLBACK
+PartitionDlgProc(
+ _In_ HWND hDlg,
+ _In_ UINT uMsg,
+ _In_ WPARAM wParam,
+ _In_ LPARAM lParam)
+{
+ PPARTCREATE_CTX PartCreateCtx;
+
+ /* Retrieve dialog context pointer */
+ PartCreateCtx = (PPARTCREATE_CTX)GetWindowLongPtrW(hDlg, GWLP_USERDATA);
+
+ switch (uMsg)
+ {
+ case WM_INITDIALOG:
+ {
+ PPARTENTRY PartEntry;
+ PDISKENTRY DiskEntry;
+ ULONG MaxSizeMB;
+
+ /* Save dialog context pointer */
+ PartCreateCtx = (PPARTCREATE_CTX)lParam;
+ SetWindowLongPtrW(hDlg, GWLP_USERDATA, (LONG_PTR)PartCreateCtx);
+
+ /* Retrieve the selected partition */
+ PartEntry = PartCreateCtx->PartItem->PartEntry;
+ DiskEntry = PartEntry->DiskEntry;
+
+ /* Set the spinner to the maximum size in MB the partition can have */
+ MaxSizeMB = PartCreateCtx->MaxSizeMB;
+ SendDlgItemMessageW(hDlg, IDC_UPDOWN_PARTSIZE, UDM_SETRANGE32, (WPARAM)1,
(LPARAM)MaxSizeMB);
+ SendDlgItemMessageW(hDlg, IDC_UPDOWN_PARTSIZE, UDM_SETPOS32, 0,
(LPARAM)MaxSizeMB);
+
+ /* Default to regular partition (non-extended on MBR disks) */
+ CheckDlgButton(hDlg, IDC_CHECK_MBREXTPART, BST_UNCHECKED);
+
+ /* Also, disable and hide IDC_CHECK_MBREXTPART
+ * if space is logical or the disk is not MBR */
+ if ((DiskEntry->DiskStyle == PARTITION_STYLE_MBR) &&
+ !PartEntry->LogicalPartition)
+ {
+ ShowDlgItem(hDlg, IDC_CHECK_MBREXTPART, SW_SHOW);
+ EnableDlgItem(hDlg, IDC_CHECK_MBREXTPART, TRUE);
+ }
+ else
+ {
+ ShowDlgItem(hDlg, IDC_CHECK_MBREXTPART, SW_HIDE);
+ EnableDlgItem(hDlg, IDC_CHECK_MBREXTPART, FALSE);
+ }
+
+ break;
+ }
+
+ case WM_COMMAND:
+ {
+ if (HIWORD(wParam) != BN_CLICKED)
+ break;
+
+ switch (LOWORD(wParam))
+ {
+ case IDC_CHECK_MBREXTPART:
+ {
+ /* Check for MBR-extended (container) partition */
+ // BST_UNCHECKED or BST_INDETERMINATE => FALSE
+ if (IsDlgButtonChecked(hDlg, IDC_CHECK_MBREXTPART) == BST_CHECKED)
+ {
+ /* It is, disable formatting options */
+ EnableDlgItem(hDlg, IDC_FS_STATIC, FALSE);
+ EnableDlgItem(hDlg, IDC_FSTYPE, FALSE);
+ EnableDlgItem(hDlg, IDC_CHECK_QUICKFMT, FALSE);
+ }
+ else
+ {
+ /* It is not, re-enable formatting options */
+ EnableDlgItem(hDlg, IDC_FS_STATIC, TRUE);
+ EnableDlgItem(hDlg, IDC_FSTYPE, TRUE);
+ EnableDlgItem(hDlg, IDC_CHECK_QUICKFMT, TRUE);
+ }
+ break;
+ }
+
+ case IDOK:
+ {
+ /* Collect all the information and return it
+ * to the caller for creating the partition */
+ PartCreateCtx->PartSizeMB = (ULONG)SendDlgItemMessageW(hDlg,
IDC_UPDOWN_PARTSIZE, UDM_GETPOS32, 0, (LPARAM)NULL);
+ PartCreateCtx->PartSizeMB = min(max(PartCreateCtx->PartSizeMB, 1),
PartCreateCtx->MaxSizeMB);
+ PartCreateCtx->MBRExtPart = (IsDlgButtonChecked(hDlg,
IDC_CHECK_MBREXTPART) == BST_CHECKED);
+
+ /* Retrieve the formatting options */
+ FormatDlgProcWorker(PartCreateCtx, hDlg, uMsg, wParam, lParam);
+
+ EndDialog(hDlg, IDOK);
+ return TRUE;
+ }
+
+ case IDCANCEL:
+ {
+ EndDialog(hDlg, IDCANCEL);
+ return TRUE;
+ }
+ }
+ }
+ }
+
+ return FormatDlgProcWorker(PartCreateCtx, hDlg, uMsg, wParam, lParam);
+}
+
BOOL
CreateTreeListColumns(
@@ -423,71 +765,25 @@ CreateTreeListColumns(
return TRUE;
}
-// unused
-VOID
-DisplayStuffUsingWin32Setup(HWND hwndDlg)
-{
- HDEVINFO h;
- HWND hList;
- SP_DEVINFO_DATA DevInfoData;
- DWORD i;
-
- h = SetupDiGetClassDevs(&GUID_DEVCLASS_DISKDRIVE, NULL, NULL, DIGCF_PRESENT);
- if (h == INVALID_HANDLE_VALUE)
- return;
-
- hList = GetDlgItem(hwndDlg, IDC_PARTITION);
- DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA);
- for (i=0; SetupDiEnumDeviceInfo(h, i, &DevInfoData); i++)
- {
- DWORD DataT;
- LPTSTR buffer = NULL;
- DWORD buffersize = 0;
-
- while (!SetupDiGetDeviceRegistryProperty(h,
- &DevInfoData,
- SPDRP_DEVICEDESC,
- &DataT,
- (PBYTE)buffer,
- buffersize,
- &buffersize))
- {
- if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
- {
- if (buffer) LocalFree(buffer);
- buffer = LocalAlloc(LPTR, buffersize * 2);
- }
- else
- {
- return;
- }
- }
- if (buffer)
- {
- SendMessageW(hList, LB_ADDSTRING, (WPARAM)0, (LPARAM)buffer);
- LocalFree(buffer);
- }
- }
- SetupDiDestroyDeviceInfoList(h);
-}
-
HTLITEM
-TreeListAddItem(IN HWND hTreeList,
- IN HTLITEM hParent,
- IN LPWSTR lpText,
- IN INT iImage,
- IN INT iSelectedImage,
- IN LPARAM lParam)
+TreeListAddItem(
+ _In_ HWND hTreeList,
+ _In_opt_ HTLITEM hParent,
+ _In_opt_ HTLITEM hInsertAfter,
+ _In_ LPCWSTR lpText,
+ _In_ INT iImage,
+ _In_ INT iSelectedImage,
+ _In_ LPARAM lParam)
{
- TL_INSERTSTRUCTW Insert;
+ TLINSERTSTRUCTW Insert;
ZeroMemory(&Insert, sizeof(Insert));
Insert.item.mask = TVIF_TEXT | TVIF_PARAM | TVIF_IMAGE | TVIF_SELECTEDIMAGE;
- Insert.hInsertAfter = TVI_LAST;
Insert.hParent = hParent;
- Insert.item.pszText = lpText;
+ Insert.hInsertAfter = (hInsertAfter ? hInsertAfter : TVI_LAST);
+ Insert.item.pszText = (LPWSTR)lpText;
Insert.item.iImage = iImage;
Insert.item.iSelectedImage = iSelectedImage;
Insert.item.lParam = lParam;
@@ -499,6 +795,87 @@ TreeListAddItem(IN HWND hTreeList,
return TreeList_InsertItem(hTreeList, &Insert);
}
+LPARAM
+TreeListGetItemData(
+ _In_ HWND hTreeList,
+ _In_ HTLITEM hItem)
+{
+ TLITEMW tlItem;
+
+ tlItem.mask = TVIF_PARAM;
+ tlItem.hItem = hItem;
+
+ TreeList_GetItem(hTreeList, &tlItem);
+
+ return tlItem.lParam;
+}
+
+static
+PPARTITEM
+GetItemPartition(
+ _In_ HWND hTreeList,
+ _In_ HTLITEM hItem)
+{
+ HTLITEM hParentItem;
+ PPARTITEM PartItem;
+
+ hParentItem = TreeList_GetParent(hTreeList, hItem);
+ /* May or may not be a PPARTITEM: this is a PPARTITEM only when hParentItem != NULL
*/
+ PartItem = (PPARTITEM)TreeListGetItemData(hTreeList, hItem);
+ if (!hParentItem || !PartItem)
+ return NULL;
+
+ return PartItem;
+}
+
+static
+PPARTITEM
+GetSelectedPartition(
+ _In_ HWND hTreeList,
+ _Out_opt_ HTLITEM* phItem)
+{
+ HTLITEM hItem;
+ PPARTITEM PartItem;
+
+ hItem = TreeList_GetSelection(hTreeList);
+ if (!hItem)
+ return NULL;
+
+ PartItem = GetItemPartition(hTreeList, hItem);
+ if (PartItem && phItem)
+ *phItem = hItem;
+
+ return PartItem;
+}
+
+PVOL_CREATE_INFO
+FindVolCreateInTreeByVolume(
+ _In_ HWND hTreeList,
+ _In_ PVOLENTRY Volume)
+{
+ HTLITEM hItem;
+
+ /* Enumerate every cached data in the TreeList, and for each, check
+ * whether its corresponding PPARTENTRY is the one we are looking for */
+ // for (hItem = TVI_ROOT; hItem; hItem = TreeList_GetNextItem(...)) { }
+ hItem = TVI_ROOT;
+ while ((hItem = TreeList_GetNextItem(hTreeList, hItem, TVGN_NEXTITEM)))
+ {
+ PPARTITEM PartItem = GetItemPartition(hTreeList, hItem);
+ if (!PartItem || !PartItem->VolCreate /* || !PartItem->Volume */)
+ continue;
+
+ if (PartItem->Volume == Volume)
+ {
+ /* Found it, return the associated volume-create structure */
+ return PartItem->VolCreate;
+ }
+ }
+
+ /* Nothing was found */
+ return NULL;
+}
+
VOID
GetPartitionTypeString(
@@ -511,6 +888,7 @@ GetPartitionTypeString(
StringCchCopyA(strBuffer, cchBuffer,
"Unused" /* MUIGetString(STRING_FORMATUNUSED) */);
}
+ // else if (PartEntry == PartEntry->DiskEntry->ExtendedPartition)
else if (IsContainerPartition(PartEntry->PartitionType))
{
StringCchCopyA(strBuffer, cchBuffer,
@@ -562,17 +940,71 @@ GetPartitionTypeString(
}
}
+
+static VOID
+PrettifySize1(
+ _Inout_ PULONGLONG Size,
+ _Out_ PCWSTR* Unit)
+{
+ ULONGLONG DiskSize = *Size;
+
+ if (DiskSize >= 10 * GB) /* 10 GB */
+ {
+ DiskSize = RoundingDivide(DiskSize, GB);
+ *Unit = L"GB"; // MUIGetString(STRING_GB);
+ }
+ else
+ {
+ DiskSize = RoundingDivide(DiskSize, MB);
+ if (DiskSize == 0)
+ DiskSize = 1;
+ *Unit = L"MB"; // MUIGetString(STRING_MB);
+ }
+
+ *Size = DiskSize;
+}
+
+static VOID
+PrettifySize2(
+ _Inout_ PULONGLONG Size,
+ _Out_ PCWSTR* Unit)
+{
+ ULONGLONG PartSize = *Size;
+
+#if 0
+ if (PartSize >= 10 * GB) /* 10 GB */
+ {
+ PartSize = RoundingDivide(PartSize, GB);
+ *Unit = L"GB"; // MUIGetString(STRING_GB);
+ }
+ else
+#endif
+ if (PartSize >= 10 * MB) /* 10 MB */
+ {
+ PartSize = RoundingDivide(PartSize, MB);
+ *Unit = L"MB"; // MUIGetString(STRING_MB);
+ }
+ else
+ {
+ PartSize = RoundingDivide(PartSize, KB);
+ *Unit = L"KB"; // MUIGetString(STRING_KB);
+ }
+
+ *Size = PartSize;
+}
+
static
HTLITEM
PrintPartitionData(
- IN HWND hWndList,
- IN PPARTLIST List,
- IN HTLITEM htiParent,
- IN PDISKENTRY DiskEntry,
- IN PPARTENTRY PartEntry)
+ _In_ HWND hWndList,
+ _In_ HTLITEM htiParent,
+ _In_opt_ HTLITEM hInsertAfter,
+ _In_ PPARTENTRY PartEntry)
{
+ PDISKENTRY DiskEntry = PartEntry->DiskEntry;
PVOLINFO VolInfo = (PartEntry->Volume ? &PartEntry->Volume->Info :
NULL);
- LARGE_INTEGER PartSize;
+ PPARTITEM PartItem;
+ ULONGLONG PartSize;
HTLITEM htiPart;
CHAR PartTypeString[32];
PCHAR PartType = PartTypeString;
@@ -581,12 +1013,26 @@ PrintPartitionData(
/* Volume name */
if (PartEntry->IsPartitioned == FALSE)
{
+ /* Unpartitioned space: Just display the description */
StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer),
- // MUIGetString(STRING_UNPSPACE),
+ // MUIGetString(STRING_UNPSPACE)
L"Unpartitioned space");
}
else
+//
+// NOTE: This could be done with the next case.
+//
+ if ((DiskEntry->DiskStyle == PARTITION_STYLE_MBR) &&
+ IsContainerPartition(PartEntry->PartitionType))
+ {
+ /* Extended partition container: Just display the partition's type */
+ StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer),
+ // MUIGetString(STRING_EXTENDED_PARTITION)
+ L"Extended Partition");
+ }
+ else
{
+ /* Drive letter and partition number */
StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer),
// MUIGetString(STRING_HDDINFOUNK5),
L"%s (%c%c)",
@@ -595,26 +1041,75 @@ PrintPartitionData(
!(VolInfo && VolInfo->DriveLetter) ? L'-' :
L':');
}
- htiPart = TreeListAddItem(hWndList, htiParent, LineBuffer,
- 1, 1,
- (LPARAM)PartEntry);
+ /* Allocate and initialize a partition-info structure */
+ PartItem = LocalAlloc(LPTR, sizeof(*PartItem));
+ if (!PartItem)
+ {
+ DPRINT1("Failed to allocate partition-info structure\n");
+ // return NULL;
+ // We'll store a NULL pointer?!
+ }
+
+ PartItem->PartEntry = PartEntry;
+ PartItem->Volume = PartEntry->Volume;
+
+ htiPart = TreeListAddItem(hWndList, htiParent, hInsertAfter,
+ LineBuffer, 1, 1,
+ (LPARAM)PartItem);
- /* Determine partition type */
*LineBuffer = 0;
if (PartEntry->IsPartitioned)
{
PartTypeString[0] = '\0';
- if (PartEntry->New == TRUE)
+
+ /*
+ * If the volume's file system is recognized, display the volume label
+ * (if any) and the file system name. Otherwise, display the partition
+ * type if it's not a new partition.
+ */
+ if (VolInfo && *VolInfo->FileSystem &&
+ _wcsicmp(VolInfo->FileSystem, L"RAW") != 0)
+ {
+ // TODO: Group this part together with the similar one
+ // from below once the strings are in the same encoding...
+ if (PartEntry->New)
+ {
+ StringCchPrintfA(PartTypeString,
+ ARRAYSIZE(PartTypeString),
+ "New (%S)",
+ VolInfo->FileSystem);
+ }
+ else
+ {
+ StringCchPrintfA(PartTypeString,
+ ARRAYSIZE(PartTypeString),
+ "%S",
+ VolInfo->FileSystem);
+ }
+ PartType = PartTypeString;
+ }
+ else
+ /* Determine partition type */
+ if (PartEntry->New)
{
+ /* Use this description if the partition is new and not planned for
formatting */
PartType = "New (Unformatted)"; //
MUIGetString(STRING_UNFORMATTED);
}
- else if (PartEntry->IsPartitioned == TRUE)
+ else
{
+ /* If the partition is not new but its file system is not recognized
+ * (or is not formatted), use the partition type description. */
GetPartitionTypeString(PartEntry,
PartTypeString,
ARRAYSIZE(PartTypeString));
PartType = PartTypeString;
}
+#if 0
+ if (!PartType || !*PartType)
+ {
+ PartType = MUIGetString(STRING_FORMATUNKNOWN);
+ }
+#endif
StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer),
L"%S",
@@ -622,39 +1117,16 @@ PrintPartitionData(
}
TreeList_SetItemText(hWndList, htiPart, 1, LineBuffer);
- /* Format the disk size in KBs, MBs, etc... */
- PartSize.QuadPart = PartEntry->SectorCount.QuadPart *
DiskEntry->BytesPerSector;
- if (StrFormatByteSizeW(PartSize.QuadPart, LineBuffer, ARRAYSIZE(LineBuffer)) ==
NULL)
+ /* Format the partition size */
+ PartSize = GetPartEntrySizeInBytes(PartEntry);
+ if (!StrFormatByteSizeW(PartSize, LineBuffer, ARRAYSIZE(LineBuffer)))
{
/* We failed for whatever reason, do the hardcoded way */
- PWCHAR Unit;
-
-#if 0
- if (PartSize.QuadPart >= 10 * GB) /* 10 GB */
- {
- PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, GB);
- // Unit = MUIGetString(STRING_GB);
- Unit = L"GB";
- }
- else
-#endif
- if (PartSize.QuadPart >= 10 * MB) /* 10 MB */
- {
- PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, MB);
- // Unit = MUIGetString(STRING_MB);
- Unit = L"MB";
- }
- else
- {
- PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, KB);
- // Unit = MUIGetString(STRING_KB);
- Unit = L"KB";
- }
-
+ PCWSTR Unit;
+ PrettifySize2(&PartSize, &Unit);
StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer),
- L"%6lu %s",
- PartSize.u.LowPart,
- Unit);
+ L"%6I64u %s",
+ PartSize, Unit);
}
TreeList_SetItemText(hWndList, htiPart, 2, LineBuffer);
@@ -668,24 +1140,70 @@ PrintPartitionData(
}
TreeList_SetItemText(hWndList, htiPart, 3, LineBuffer);
+
+ /* If this is the single extended partition of an MBR disk,
+ * recursively display its logical partitions */
+ if (PartEntry == DiskEntry->ExtendedPartition)
+ {
+ PLIST_ENTRY LogicalEntry;
+ PPARTENTRY LogicalPartEntry;
+
+ for (LogicalEntry = DiskEntry->LogicalPartListHead.Flink;
+ LogicalEntry != &DiskEntry->LogicalPartListHead;
+ LogicalEntry = LogicalEntry->Flink)
+ {
+ LogicalPartEntry = CONTAINING_RECORD(LogicalEntry, PARTENTRY, ListEntry);
+ PrintPartitionData(hWndList, htiPart, NULL, LogicalPartEntry);
+ }
+
+ /* Expand the extended partition node */
+ TreeList_Expand(hWndList, htiPart, TVE_EXPAND);
+ }
+
return htiPart;
}
+/**
+ * @brief
+ * Called on response to the TVN_DELETEITEM notification sent by the TreeList.
+ **/
+static
+VOID
+DeleteTreeItem(
+ _In_ HWND hWndList,
+ _In_ TLITEMW* ptlItem)
+{
+ PPARTITEM PartItem;
+
+ /* Code below is equivalent to: PartItem = GetItemPartition(hWndList,
ptlItem->hItem);
+ * except that we already have the data structure in ptlItem->lParam, so there
is
+ * no need to call extra helpers as GetItemPartition() does. */
+ HTLITEM hParentItem = TreeList_GetParent(hWndList, ptlItem->hItem);
+ /* May or may not be a PPARTITEM: this is a PPARTITEM only when hParentItem != NULL
*/
+ PartItem = (PPARTITEM)ptlItem->lParam;
+ if (!hParentItem || !PartItem)
+ return;
+
+ if (PartItem->VolCreate)
+ LocalFree(PartItem->VolCreate);
+ LocalFree(PartItem);
+}
+
static
VOID
PrintDiskData(
- IN HWND hWndList,
- IN PPARTLIST List,
- IN PDISKENTRY DiskEntry)
+ _In_ HWND hWndList,
+ _In_opt_ HTLITEM hInsertAfter,
+ _In_ PDISKENTRY DiskEntry)
{
BOOL Success;
HANDLE hDevice;
PCHAR DiskName = NULL;
ULONG Length = 0;
- PPARTENTRY PrimaryPartEntry, LogicalPartEntry;
- PLIST_ENTRY PrimaryEntry, LogicalEntry;
- ULARGE_INTEGER DiskSize;
- HTLITEM htiDisk, htiPart;
+ PPARTENTRY PrimaryPartEntry;
+ PLIST_ENTRY PrimaryEntry;
+ ULONGLONG DiskSize;
+ HTLITEM htiDisk;
WCHAR LineBuffer[128];
UCHAR outBuf[512];
@@ -784,8 +1302,8 @@ PrintDiskData(
}
}
- htiDisk = TreeListAddItem(hWndList, NULL, LineBuffer,
- 0, 0,
+ htiDisk = TreeListAddItem(hWndList, NULL, hInsertAfter,
+ LineBuffer, 0, 0,
(LPARAM)DiskEntry);
/* Disk type: MBR, GPT or RAW (Uninitialized) */
@@ -794,36 +1312,19 @@ PrintDiskData(
DiskEntry->DiskStyle == PARTITION_STYLE_GPT ?
L"GPT" :
L"RAW");
- /* Format the disk size in KBs, MBs, etc... */
- DiskSize.QuadPart = DiskEntry->SectorCount.QuadPart *
DiskEntry->BytesPerSector;
- if (StrFormatByteSizeW(DiskSize.QuadPart, LineBuffer, ARRAYSIZE(LineBuffer)) ==
NULL)
+ /* Format the disk size */
+ DiskSize = GetDiskSizeInBytes(DiskEntry);
+ if (!StrFormatByteSizeW(DiskSize, LineBuffer, ARRAYSIZE(LineBuffer)))
{
/* We failed for whatever reason, do the hardcoded way */
- PWCHAR Unit;
-
- if (DiskSize.QuadPart >= 10 * GB) /* 10 GB */
- {
- DiskSize.QuadPart = RoundingDivide(DiskSize.QuadPart, GB);
- // Unit = MUIGetString(STRING_GB);
- Unit = L"GB";
- }
- else
- {
- DiskSize.QuadPart = RoundingDivide(DiskSize.QuadPart, MB);
- if (DiskSize.QuadPart == 0)
- DiskSize.QuadPart = 1;
- // Unit = MUIGetString(STRING_MB);
- Unit = L"MB";
- }
-
+ PCWSTR Unit;
+ PrettifySize1(&DiskSize, &Unit);
StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer),
- L"%6lu %s",
- DiskSize.u.LowPart,
- Unit);
+ L"%6I64u %s",
+ DiskSize, Unit);
}
TreeList_SetItemText(hWndList, htiDisk, 2, LineBuffer);
-
/* Print partition lines */
for (PrimaryEntry = DiskEntry->PrimaryPartListHead.Flink;
PrimaryEntry != &DiskEntry->PrimaryPartListHead;
@@ -831,38 +1332,63 @@ PrintDiskData(
{
PrimaryPartEntry = CONTAINING_RECORD(PrimaryEntry, PARTENTRY, ListEntry);
- htiPart = PrintPartitionData(hWndList, List, htiDisk,
- DiskEntry, PrimaryPartEntry);
-
- if (IsContainerPartition(PrimaryPartEntry->PartitionType))
- {
- for (LogicalEntry = DiskEntry->LogicalPartListHead.Flink;
- LogicalEntry != &DiskEntry->LogicalPartListHead;
- LogicalEntry = LogicalEntry->Flink)
- {
- LogicalPartEntry = CONTAINING_RECORD(LogicalEntry, PARTENTRY,
ListEntry);
-
- PrintPartitionData(hWndList, List, htiPart,
- DiskEntry, LogicalPartEntry);
- }
-
- /* Expand the extended partition node */
- TreeList_Expand(hWndList, htiPart, TVE_EXPAND);
- }
+ /* If this is an extended partition, recursively print the logical partitions
*/
+ PrintPartitionData(hWndList, htiDisk, NULL, PrimaryPartEntry);
}
/* Expand the disk node */
TreeList_Expand(hWndList, htiDisk, TVE_EXPAND);
}
-VOID
+static VOID
+InitPartitionList(
+ _In_ HINSTANCE hInstance,
+ _In_ HWND hWndList)
+{
+ const DWORD dwStyle = TVS_HASBUTTONS | /*TVS_HASLINES | TVS_LINESATROOT |*/
TVS_SHOWSELALWAYS | TVS_FULLROWSELECT;
+ const DWORD dwExStyle = TVS_EX_FULLROWMARK /* | TVS_EX_FULLROWITEMS*/;
+ HIMAGELIST hSmall;
+
+ /* Set the TreeList styles and fixup the item selection color */
+ TreeList_SetStyle(hWndList, TreeList_GetStyle(hWndList) | dwStyle);
+ // TreeList_SetStyleEx(hWndList, dwStyle, dwStyle);
+ TreeList_SetExtendedStyle(hWndList, dwExStyle);
+ TreeList_SetColor(hWndList, TVC_MARK, GetSysColor(COLOR_HIGHLIGHT));
+
+ /* Initialize its columns */
+ CreateTreeListColumns(hInstance,
+ hWndList,
+ column_ids,
+ column_widths,
+ column_alignment,
+ MAX_LIST_COLUMNS);
+
+ /* Create the ImageList */
+ hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON),
+ GetSystemMetrics(SM_CYSMICON),
+ ILC_COLOR32 | ILC_MASK, // ILC_COLOR24
+ 1, 1);
+
+ /* Add event type icons to the ImageList */
+ ImageList_AddIcon(hSmall, LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_DISKDRIVE)));
+ ImageList_AddIcon(hSmall, LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_PARTITION)));
+
+ /* Assign the ImageList to the List View */
+ TreeList_SetImageList(hWndList, hSmall, TVSIL_NORMAL);
+}
+
+static VOID
DrawPartitionList(
- IN HWND hWndList,
- IN PPARTLIST List)
+ _In_ HWND hWndList,
+ _In_ PPARTLIST List)
{
PLIST_ENTRY Entry;
PDISKENTRY DiskEntry;
+ /* Clear the list first */
+ TreeList_DeleteAllItems(hWndList);
+
+ /* Insert all the detected disks and partitions */
for (Entry = List->DiskListHead.Flink;
Entry != &List->DiskListHead;
Entry = Entry->Flink)
@@ -870,23 +1396,249 @@ DrawPartitionList(
DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry);
/* Print disk entry */
- PrintDiskData(hWndList, List, DiskEntry);
+ PrintDiskData(hWndList, NULL, DiskEntry);
}
+
+ /* Select the first item */
+ // TreeList_SetFocusItem(hWndList, 1, 1);
+ TreeList_SelectItem(hWndList, 1);
}
+static VOID
+CleanupPartitionList(
+ _In_ HWND hWndList)
+{
+ HIMAGELIST hSmall;
+
+ /* Cleanup all the items. Their cached data will be automatically deleted
+ * on response to the TVN_DELETEITEM notification sent by the TreeList
+ * by DeleteTreeItem() */
+ TreeList_DeleteAllItems(hWndList);
+
+ /* And cleanup the imagelist */
+ hSmall = TreeList_GetImageList(hWndList, TVSIL_NORMAL);
+ TreeList_SetImageList(hWndList, NULL, TVSIL_NORMAL);
+ ImageList_Destroy(hSmall);
+}
+
+
+/**
+ * @brief
+ * Create a partition in the selected disk region in the partition list,
+ * and update the partition list UI.
+ **/
+static BOOLEAN
+DoCreatePartition(
+ _In_ HWND hList,
+ _In_ PPARTLIST List,
+ _Inout_ HTLITEM* phItem,
+ _Inout_opt_ PPARTITEM* pPartItem,
+ _In_opt_ ULONGLONG SizeBytes,
+ _In_opt_ ULONG_PTR PartitionInfo)
+{
+ BOOLEAN Success;
+ PPARTITEM PartItem;
+ PPARTENTRY PartEntry;
+ HTLITEM hParentItem;
+ HTLITEM hInsertAfter;
+ PPARTENTRY NextPart;
+
+ PartItem = (pPartItem ? *pPartItem : GetItemPartition(hList, *phItem));
+ if (!PartItem)
+ {
+ /* We must have a disk region... */
+ ASSERT(FALSE);
+ return FALSE;
+ }
+ PartEntry = PartItem->PartEntry;
+#if 0
+ if (PartEntry->IsPartitioned)
+ {
+ /* Don't create a partition when one already exists */
+ ASSERT(FALSE);
+ return FALSE;
+ }
+ ASSERT(!PartEntry->Volume);
+#endif
+
+ Success = CreatePartition(List,
+ PartEntry,
+ SizeBytes,
+ PartitionInfo);
+ if (!Success)
+ return Success;
+
+ /* Retrieve the parent item (disk or MBR extended partition) */
+ hParentItem = TreeList_GetParent(hList, *phItem);
+ hInsertAfter = TreeList_GetPrevSibling(hList, *phItem);
+ if (!hInsertAfter)
+ hInsertAfter = TVI_FIRST;
+
+ /*
+ * The current entry has been recreated and maybe split
+ * in two: new partition and remaining unused space.
+ * Thus, recreate the current entry.
+ *
+ * NOTE: Since we create a partition we don't care
+ * about its previous PartItem, so it can be deleted.
+ */
+ {
+ /* Cache out the original item's volume create info */
+ PVOL_CREATE_INFO VolCreate = PartItem->VolCreate;
+ PartItem->VolCreate = NULL;
+
+ /* Remove the current item */
+ TreeList_DeleteItem(hList, *phItem);
+
+ /* Recreate the entry */
+ *phItem = PrintPartitionData(hList, hParentItem, hInsertAfter, PartEntry);
+
+ /* Retrieve the new PartItem and restore the volume create
+ * information associated to the newly-created partition */
+ PartItem = GetItemPartition(hList, *phItem);
+ ASSERT(PartItem);
+
+ /* Update the volume associated to the create information */
+ if (VolCreate)
+ VolCreate->Volume = PartItem->Volume;
+
+ /* Restore the volume create information */
+ PartItem->VolCreate = VolCreate;
+
+ if (pPartItem)
+ *pPartItem = PartItem;
+ }
+
+ /* Add also the following unused space, if any */
+ // NextPart = GetAdjDiskRegion(NULL, PartEntry, ENUM_REGION_NEXT);
+ NextPart = GetAdjUnpartitionedEntry(PartEntry, TRUE);
+ if (NextPart /*&& !NextPart->IsPartitioned*/)
+ PrintPartitionData(hList, hParentItem, *phItem, NextPart);
+
+ /* Give the focus on and select the created partition */
+ // TreeList_SetFocusItem(hList, 1, 1);
+ TreeList_SelectItem(hList, *phItem);
+
+ return TRUE;
+}
+
+/**
+ * @brief
+ * Delete the selected partition in the partition list,
+ * and update the partition list UI.
+ **/
+static BOOLEAN
+DoDeletePartition(
+ _In_ HWND hList,
+ _In_ PPARTLIST List,
+ _Inout_ HTLITEM* phItem,
+ _In_ PPARTITEM PartItem)
+{
+ PPARTENTRY PartEntry = PartItem->PartEntry;
+ PPARTENTRY PrevPart, NextPart;
+ BOOLEAN PrevIsPartitioned, NextIsPartitioned;
+ BOOLEAN Success;
+
+ HTLITEM hParentItem;
+ HTLITEM hInsertAfter;
+ HTLITEM hAdjItem;
+ PPARTITEM AdjPartItem;
+
+#if 0
+ if (!PartEntry->IsPartitioned)
+ {
+ /* Don't delete an unpartitioned disk region */
+ ASSERT(FALSE);
+ return FALSE;
+ }
+#endif
+
+ /*
+ * Determine the nature of the previous and next disk regions,
+ * in order to know what to do on the corresponding tree items
+ * after the selected partition has been deleted.
+ *
+ * NOTE: Don't reference these pointers after DeletePartition(),
+ * since these disk regions might have been coalesced/reallocated.
+ * However we can check whether they were NULL or not.
+ */
+ // PrevPart = GetAdjDiskRegion(NULL, PartEntry, ENUM_REGION_PREV);
+ // NextPart = GetAdjDiskRegion(NULL, PartEntry, ENUM_REGION_NEXT);
+ PrevPart = GetAdjUnpartitionedEntry(PartEntry, FALSE);
+ NextPart = GetAdjUnpartitionedEntry(PartEntry, TRUE);
+
+ PrevIsPartitioned = (PrevPart && PrevPart->IsPartitioned);
+ NextIsPartitioned = (NextPart && NextPart->IsPartitioned);
+
+ ASSERT(PartEntry->IsPartitioned); // The current partition must be partitioned.
+ Success = DeletePartition(List,
+ PartEntry,
+ &PartEntry);
+ if (!Success)
+ return Success;
+
+ /* Retrieve the parent item (disk or MBR extended partition) */
+ hParentItem = TreeList_GetParent(hList, *phItem);
+
+ /* If previous sibling isn't partitioned, remove it */
+ if (PrevPart && !PrevIsPartitioned)
+ {
+ hAdjItem = TreeList_GetPrevSibling(hList, *phItem);
+ ASSERT(hAdjItem); // TODO: Investigate
+ if (hAdjItem)
+ {
+ AdjPartItem = GetItemPartition(hList, hAdjItem);
+ ASSERT(AdjPartItem && (AdjPartItem->PartEntry == PrevPart));
+ AdjPartItem = NULL;
+ TreeList_DeleteItem(hList, hAdjItem);
+ }
+ }
+ /* If next sibling isn't partitioned, remove it */
+ if (NextPart && !NextIsPartitioned)
+ {
+ hAdjItem = TreeList_GetNextSibling(hList, *phItem);
+ ASSERT(hAdjItem); // TODO: Investigate
+ if (hAdjItem)
+ {
+ AdjPartItem = GetItemPartition(hList, hAdjItem);
+ ASSERT(AdjPartItem && (AdjPartItem->PartEntry == NextPart));
+ AdjPartItem = NULL;
+ TreeList_DeleteItem(hList, hAdjItem);
+ }
+ }
+
+ /* We are going to insert the updated entry after
+ * either, the original previous sibling (if it is
+ * partitioned), or the second-previous sibling
+ * (if the first one was already removed, see above) */
+ hInsertAfter = TreeList_GetPrevSibling(hList, *phItem);
+ if (!hInsertAfter)
+ hInsertAfter = TVI_FIRST;
+
+ /* Remove the current item */
+ TreeList_DeleteItem(hList, *phItem);
+
+ /* Add back the "new" unpartitioned space */
+ *phItem = PrintPartitionData(hList, hParentItem, hInsertAfter, PartEntry);
+
+ /* Give the focus on and select the unpartitioned space */
+ // TreeList_SetFocusItem(hList, 1, 1);
+ TreeList_SelectItem(hList, *phItem);
+
+ return TRUE;
+}
INT_PTR
CALLBACK
DriveDlgProc(
- HWND hwndDlg,
- UINT uMsg,
- WPARAM wParam,
- LPARAM lParam)
+ _In_ HWND hwndDlg,
+ _In_ UINT uMsg,
+ _In_ WPARAM wParam,
+ _In_ LPARAM lParam)
{
PSETUPDATA pSetupData;
HWND hList;
- HIMAGELIST hSmall;
/* Retrieve pointer to the global setup data */
pSetupData = (PSETUPDATA)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA);
@@ -897,50 +1649,39 @@ DriveDlgProc(
{
/* Save pointer to the global setup data */
pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam;
- SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData);
-
- /*
- * Keep the "Next" button disabled. It will be enabled only
- * when the user selects a valid partition.
- */
- PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK);
-
+ SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)pSetupData);
+
+ /* Initially hide and disable all partitioning buttons */
+ ShowDlgItem(hwndDlg, IDC_INITDISK, SW_HIDE);
+ EnableDlgItem(hwndDlg, IDC_INITDISK, FALSE);
+ ShowDlgItem(hwndDlg, IDC_PARTCREATE, SW_HIDE);
+ EnableDlgItem(hwndDlg, IDC_PARTCREATE, FALSE);
+ ShowDlgItem(hwndDlg, IDC_PARTFORMAT, SW_HIDE);
+ EnableDlgItem(hwndDlg, IDC_PARTFORMAT, FALSE);
+ ShowDlgItem(hwndDlg, IDC_PARTDELETE, SW_HIDE);
+ EnableDlgItem(hwndDlg, IDC_PARTDELETE, FALSE);
+
+ /* Initialize the partitions list */
hList = GetDlgItem(hwndDlg, IDC_PARTITION);
-
- TreeList_SetExtendedStyleEx(hList, TVS_EX_FULLROWMARK, TVS_EX_FULLROWMARK);
- // TreeList_SetExtendedStyleEx(hList, TVS_EX_FULLROWITEMS,
TVS_EX_FULLROWITEMS);
-
- CreateTreeListColumns(pSetupData->hInstance,
- hList,
- column_ids,
- column_widths,
- column_alignment,
- MAX_LIST_COLUMNS);
-
- /* Create the ImageList */
- hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON),
- GetSystemMetrics(SM_CYSMICON),
- ILC_COLOR32 | ILC_MASK, // ILC_COLOR24
- 1, 1);
-
- /* Add event type icons to the ImageList */
- ImageList_AddIcon(hSmall, LoadIconW(pSetupData->hInstance,
MAKEINTRESOURCEW(IDI_DISKDRIVE)));
- ImageList_AddIcon(hSmall, LoadIconW(pSetupData->hInstance,
MAKEINTRESOURCEW(IDI_PARTITION)));
-
- /* Assign the ImageList to the List View */
- TreeList_SetImageList(hList, hSmall, TVSIL_NORMAL);
-
- // DisplayStuffUsingWin32Setup(hwndDlg);
+ UiContext.hPartList = hList;
+ InitPartitionList(pSetupData->hInstance, hList);
DrawPartitionList(hList, pSetupData->PartitionList);
+
+ // HACK: Wine "kwality" code doesn't still implement
+ // PSN_QUERYINITIALFOCUS so we "emulate" its call there...
+ {
+ PSHNOTIFY pshn = {{hwndDlg, GetWindowLong(hwndDlg, GWL_ID),
PSN_QUERYINITIALFOCUS}, (LPARAM)hList};
+ SendMessageW(hwndDlg, WM_NOTIFY, (WPARAM)pshn.hdr.idFrom,
(LPARAM)&pshn);
+ }
break;
}
case WM_DESTROY:
{
hList = GetDlgItem(hwndDlg, IDC_PARTITION);
- hSmall = TreeList_GetImageList(hList, TVSIL_NORMAL);
- TreeList_SetImageList(hList, NULL, TVSIL_NORMAL);
- ImageList_Destroy(hSmall);
+ ASSERT(UiContext.hPartList == hList);
+ UiContext.hPartList = NULL;
+ CleanupPartitionList(hList);
return TRUE;
}
@@ -949,22 +1690,181 @@ DriveDlgProc(
switch (LOWORD(wParam))
{
case IDC_PARTMOREOPTS:
+ {
DialogBoxParamW(pSetupData->hInstance,
MAKEINTRESOURCEW(IDD_ADVINSTOPTS),
hwndDlg,
MoreOptDlgProc,
(LPARAM)pSetupData);
break;
+ }
+
+ case IDC_INITDISK:
+ {
+ // TODO: Implement disk partitioning initialization
+ break;
+ }
case IDC_PARTCREATE:
- DialogBoxW(pSetupData->hInstance,
- MAKEINTRESOURCEW(IDD_PARTITION),
- hwndDlg,
- PartitionDlgProc);
+ {
+ HTLITEM hItem;
+ PPARTITEM PartItem;
+ PPARTENTRY PartEntry;
+ ULONGLONG PartSize;
+ ULONGLONG MaxPartSize;
+ ULONG MaxSizeMB;
+ INT_PTR ret;
+ PARTCREATE_CTX PartCreateCtx = {0};
+
+ hList = GetDlgItem(hwndDlg, IDC_PARTITION);
+ PartItem = GetSelectedPartition(hList, &hItem);
+ if (!PartItem)
+ {
+ /* If the button was clicked, an empty disk
+ * region should have been selected first */
+ ASSERT(FALSE);
+ break;
+ }
+ PartEntry = PartItem->PartEntry;
+ if (PartEntry->IsPartitioned)
+ {
+ /* Don't create a partition when one already exists */
+ ASSERT(FALSE);
+ break;
+ }
+ ASSERT(!PartEntry->Volume);
+
+ /* Get the partition info stored in the TreeList */
+ PartCreateCtx.PartItem = PartItem;
+
+ /* Retrieve the maximum size in MB (rounded up) the partition can
have */
+ MaxPartSize = GetPartEntrySizeInBytes(PartEntry);
+ MaxSizeMB = (ULONG)RoundingDivide(MaxPartSize, MB);
+ PartCreateCtx.MaxSizeMB = MaxSizeMB;
+
+ /* Don't force formatting by default */
+ PartCreateCtx.ForceFormat = FALSE;
+
+ /* Show the partitioning dialog */
+ ret = DialogBoxParamW(pSetupData->hInstance,
+ MAKEINTRESOURCEW(IDD_PARTITION),
+ hwndDlg,
+ PartitionDlgProc,
+ (LPARAM)&PartCreateCtx);
+ if (ret != IDOK)
+ break;
+
+ /*
+ * If the input size, given in MB, specifies the maximum partition
+ * size, it may slightly under- or over-estimate the latter due to
+ * rounding error. In this case, use all of the unpartitioned
space.
+ * Otherwise, directly convert the size to bytes.
+ */
+ PartSize = PartCreateCtx.PartSizeMB;
+ if (PartSize == MaxSizeMB)
+ PartSize = MaxPartSize;
+ else // if (PartSize < MaxSizeMB)
+ PartSize *= MB;
+
+ ASSERT(PartSize <= MaxPartSize);
+
+ if (!DoCreatePartition(hList, pSetupData->PartitionList,
+ &hItem, &PartItem,
+ PartSize,
+ !PartCreateCtx.MBRExtPart
+ ? 0 : PARTITION_EXTENDED))
+ {
+ DisplayError(GetParent(hwndDlg),
+ IDS_ERROR_CREATE_PARTITION_TITLE,
+ IDS_ERROR_CREATE_PARTITION);
+ }
+
break;
+ }
+
+ case IDC_PARTFORMAT:
+ {
+ HTLITEM hItem;
+ PPARTITEM PartItem;
+ PPARTENTRY PartEntry;
+ INT_PTR ret;
+ PARTCREATE_CTX PartCreateCtx = {0};
+
+ hList = GetDlgItem(hwndDlg, IDC_PARTITION);
+ PartItem = GetSelectedPartition(hList, &hItem);
+ if (!PartItem)
+ {
+ /* If the button was clicked, an empty disk
+ * region should have been selected first */
+ ASSERT(FALSE);
+ break;
+ }
+ PartEntry = PartItem->PartEntry;
+ if (!PartEntry->Volume)
+ {
+ /* Don't format an unformattable partition */
+ ASSERT(FALSE);
+ break;
+ }
+
+ /* Show the formatting dialog */
+ PartCreateCtx.PartItem = PartItem;
+ ret = DialogBoxParamW(pSetupData->hInstance,
+ MAKEINTRESOURCEW(IDD_FORMAT),
+ hwndDlg,
+ FormatDlgProc,
+ (LPARAM)&PartCreateCtx);
+ DBG_UNREFERENCED_PARAMETER(ret);
+ break;
+ }
case IDC_PARTDELETE:
+ {
+ PPARTITEM PartItem;
+ PPARTENTRY PartEntry;
+ HTLITEM hItem;
+ UINT uIDWarnMsg;
+
+ hList = GetDlgItem(hwndDlg, IDC_PARTITION);
+ PartItem = GetSelectedPartition(hList, &hItem);
+ if (!PartItem)
+ {
+ // If the button was clicked, a partition
+ // should have been selected first...
+ ASSERT(FALSE);
+ break;
+ }
+ PartEntry = PartItem->PartEntry;
+ if (!PartEntry->IsPartitioned)
+ {
+ /* Don't delete an unpartitioned disk region */
+ ASSERT(FALSE);
+ break;
+ }
+
+ /* Choose the correct warning message to display:
+ * MBR-extended (container) vs. standard partition */
+ if (PartEntry == PartEntry->DiskEntry->ExtendedPartition)
+ uIDWarnMsg = IDS_WARN_DELETE_MBR_EXTENDED_PARTITION;
+ else
+ uIDWarnMsg = IDS_WARN_DELETE_PARTITION;
+
+ /* If the user really wants to delete the partition... */
+ if (DisplayMessage(GetParent(hwndDlg),
+ MB_YESNO | MB_DEFBUTTON2 | MB_ICONWARNING,
+
MAKEINTRESOURCEW(IDS_WARN_DELETE_PARTITION_TITLE),
+ MAKEINTRESOURCEW(uIDWarnMsg)) == IDYES)
+ {
+ /* ... make it so! */
+ if (!DoDeletePartition(hList, pSetupData->PartitionList,
+ &hItem, PartItem))
+ {
+ // TODO: Show error if partition couldn't be deleted?
+ }
+ }
+
break;
+ }
}
break;
}
@@ -973,73 +1873,148 @@ DriveDlgProc(
{
LPNMHDR lpnm = (LPNMHDR)lParam;
- // On Vista+ we can use TVN_ITEMCHANGED instead, with NMTVITEMCHANGE*
pointer
+ // On Vista+ we can use TVN_ITEMCHANGED instead, with NMTVITEMCHANGE*
pointer
if (lpnm->idFrom == IDC_PARTITION && lpnm->code ==
TVN_SELCHANGED)
{
LPNMTREEVIEW pnmv = (LPNMTREEVIEW)lParam;
- // if (pnmv->uChanged & TVIF_STATE) /* The state has changed */
- if (pnmv->itemNew.mask & TVIF_STATE)
+ // if (!(pnmv->uChanged & TVIF_STATE)) /* The state has changed
*/
+ if (!(pnmv->itemNew.mask & TVIF_STATE))
+ break;
+
+ /* The item has been (de)selected */
+ // if (pnmv->uNewState & TVIS_SELECTED)
+ if (pnmv->itemNew.state & TVIS_SELECTED)
{
- /* The item has been (de)selected */
- // if (pnmv->uNewState & TVIS_SELECTED)
- if (pnmv->itemNew.state & TVIS_SELECTED)
+ HTLITEM hParentItem = TreeList_GetParent(lpnm->hwndFrom,
pnmv->itemNew.hItem);
+ /* May or may not be a PPARTENTRY: this is a PPARTENTRY only when
hParentItem != NULL */
+
+ if (!hParentItem)
{
- HTLITEM hParentItem = TreeList_GetParent(lpnm->hwndFrom,
pnmv->itemNew.hItem);
- /* May or may not be a PPARTENTRY: this is a PPARTENTRY only when
hParentItem != NULL */
- PPARTENTRY PartEntry = (PPARTENTRY)pnmv->itemNew.lParam;
+ /* Hard disk */
+ PDISKENTRY DiskEntry = (PDISKENTRY)pnmv->itemNew.lParam;
+ ASSERT(DiskEntry);
+
+ /* Show the "Initialize" disk button and hide and
disable the others */
+ ShowDlgItem(hwndDlg, IDC_INITDISK, SW_SHOW);
+
+#if 0 // FIXME: Init disk not implemented yet!
+ EnableDlgItem(hwndDlg, IDC_INITDISK,
+ DiskEntry->DiskStyle == PARTITION_STYLE_RAW);
+#else
+ EnableDlgItem(hwndDlg, IDC_INITDISK, FALSE);
+#endif
+
+ ShowDlgItem(hwndDlg, IDC_PARTCREATE, SW_HIDE);
+ EnableDlgItem(hwndDlg, IDC_PARTCREATE, FALSE);
- if (!hParentItem || !PartEntry)
+ ShowDlgItem(hwndDlg, IDC_PARTFORMAT, SW_HIDE);
+ EnableDlgItem(hwndDlg, IDC_PARTFORMAT, FALSE);
+
+ ShowDlgItem(hwndDlg, IDC_PARTDELETE, SW_HIDE);
+ EnableDlgItem(hwndDlg, IDC_PARTDELETE, FALSE);
+
+ /* Disable the "Next" button */
+ goto DisableWizNext;
+ }
+ else
+ {
+ /* Partition or unpartitioned space */
+ PPARTITEM PartItem = (PPARTITEM)pnmv->itemNew.lParam;
+ PPARTENTRY PartEntry;
+ ASSERT(PartItem);
+ PartEntry = PartItem->PartEntry;
+ ASSERT(PartEntry);
+
+ /* Hide and disable the "Initialize" disk button */
+ ShowDlgItem(hwndDlg, IDC_INITDISK, SW_HIDE);
+ EnableDlgItem(hwndDlg, IDC_INITDISK, FALSE);
+
+ if (!PartEntry->IsPartitioned)
{
- EnableWindow(GetDlgItem(hwndDlg, IDC_PARTCREATE), TRUE);
- EnableWindow(GetDlgItem(hwndDlg, IDC_PARTDELETE), FALSE);
- goto DisableWizNext;
+ /* Show and enable the "Create" partition button
*/
+ ShowDlgItem(hwndDlg, IDC_PARTCREATE, SW_SHOW);
+ EnableDlgItem(hwndDlg, IDC_PARTCREATE, TRUE);
+
+ /* Hide and disable the "Format" button */
+ ShowDlgItem(hwndDlg, IDC_PARTFORMAT, SW_HIDE);
+ EnableDlgItem(hwndDlg, IDC_PARTFORMAT, FALSE);
}
- else // if (hParentItem && PartEntry)
+ else
{
- EnableWindow(GetDlgItem(hwndDlg, IDC_PARTCREATE),
!PartEntry->IsPartitioned);
- EnableWindow(GetDlgItem(hwndDlg, IDC_PARTDELETE),
PartEntry->IsPartitioned);
-
- if (PartEntry->IsPartitioned &&
- !IsContainerPartition(PartEntry->PartitionType) /*
alternatively: PartEntry->PartitionNumber != 0 */ &&
- PartEntry->Volume && //
!PartEntry->Volume->New &&
- (PartEntry->Volume->FormatState == Formatted))
- {
- PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK |
PSWIZB_NEXT);
- }
- else
- {
- goto DisableWizNext;
- }
+ /* Hide and disable the "Create" partition button
*/
+ ShowDlgItem(hwndDlg, IDC_PARTCREATE, SW_HIDE);
+ EnableDlgItem(hwndDlg, IDC_PARTCREATE, FALSE);
+
+ /* Show the "Format" button, but enable or disable
it if a formattable volume is present */
+ ShowDlgItem(hwndDlg, IDC_PARTFORMAT, SW_SHOW);
+ EnableDlgItem(hwndDlg, IDC_PARTFORMAT,
!!PartEntry->Volume);
}
- }
- else
- {
-DisableWizNext:
+
+ /* Show the "Delete" partition button, but enable or
disable it if the disk region is partitioned */
+ ShowDlgItem(hwndDlg, IDC_PARTDELETE, SW_SHOW);
+ EnableDlgItem(hwndDlg, IDC_PARTDELETE,
PartEntry->IsPartitioned);
+
/*
- * Keep the "Next" button disabled. It will be enabled
only
- * when the user selects a valid partition.
+ * Enable the "Next" button if:
+ *
+ * 1. the selected disk region is partitioned:
+ * it can either have a volume attached (and be either
+ * formatted or ready to be formatted),
+ * or it's not yet formatted (the installer will prompt
+ * for formatting parameters).
+ *
+ * 2. Or, the selected disk region is not partitioned but
+ * can be partitioned according to the disk's
partitioning
+ * scheme (the installer will auto-partition the region
+ * and prompt for formatting parameters).
+ *
+ * In all other cases, the "Next" button is disabled.
*/
- PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK);
+
+ // TODO: In the future: first test needs to be augmented with:
+ // (... && PartEntry->Volume->IsSimpleVolume)
+ if ((PartEntry->IsPartitioned && PartEntry->Volume)
||
+ (!PartEntry->IsPartitioned &&
(PartitionCreationChecks(PartEntry) == NOT_AN_ERROR)))
+ {
+ // ASSERT(PartEntry !=
PartEntry->DiskEntry->ExtendedPartition);
+ ASSERT(!IsContainerPartition(PartEntry->PartitionType));
+ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK |
PSWIZB_NEXT);
+ }
+ else
+ {
+ goto DisableWizNext;
+ }
}
}
+ else
+ {
+DisableWizNext:
+ /* Keep the "Next" button disabled. It will be enabled
+ * only when the user selects a valid partition. */
+ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK);
+ }
+
+ break;
+ }
+ if (lpnm->idFrom == IDC_PARTITION && lpnm->code ==
TVN_DELETEITEM)
+ {
+ /* Deleting an item from the partition list */
+ LPNMTREEVIEW pnmv = (LPNMTREEVIEW)lParam;
+ DeleteTreeItem(lpnm->hwndFrom, (TLITEMW*)&pnmv->itemOld);
break;
}
switch (lpnm->code)
{
-#if 0
case PSN_SETACTIVE:
{
- /*
- * Keep the "Next" button disabled. It will be enabled
only
- * when the user selects a valid partition.
- */
+ /* Keep the "Next" button disabled. It will be enabled
+ * only when the user selects a valid partition. */
PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK);
break;
}
-#endif
case PSN_QUERYINITIALFOCUS:
{
@@ -1053,10 +2028,10 @@ DisableWizNext:
case PSN_QUERYCANCEL:
{
- if (MessageBoxW(GetParent(hwndDlg),
- pSetupData->szAbortMessage,
- pSetupData->szAbortTitle,
- MB_YESNO | MB_ICONQUESTION) == IDYES)
+ if (DisplayMessage(GetParent(hwndDlg),
+ MB_YESNO | MB_ICONQUESTION,
+ MAKEINTRESOURCEW(IDS_ABORTSETUP2),
+ MAKEINTRESOURCEW(IDS_ABORTSETUP)) == IDYES)
{
/* Go to the Terminate page */
PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_RESTARTPAGE);
@@ -1069,37 +2044,140 @@ DisableWizNext:
case PSN_WIZNEXT: /* Set the selected data */
{
- NTSTATUS Status;
-
- /****/
- // FIXME: This is my test disk encoding!
- DISKENTRY DiskEntry;
- PARTENTRY PartEntry;
- DiskEntry.DiskNumber = 0;
- DiskEntry.HwDiskNumber = 0;
- DiskEntry.HwFixedDiskNumber = 0;
- PartEntry.DiskEntry = &DiskEntry;
- PartEntry.PartitionNumber = 1; // 4;
- PartEntry.Volume = NULL;
- /****/
-
- Status = InitDestinationPaths(&pSetupData->USetupData,
- NULL, //
pSetupData->USetupData.InstallationDirectory,
- PartEntry.Volume);
-
- if (!NT_SUCCESS(Status))
+ HTLITEM hItem;
+ PPARTITEM PartItem;
+ PPARTENTRY PartEntry;
+
+ hList = GetDlgItem(hwndDlg, IDC_PARTITION);
+ PartItem = GetSelectedPartition(hList, &hItem);
+ if (!PartItem)
+ {
+ /* Fail and don't continue the installation */
+ SetWindowLongPtrW(hwndDlg, DWLP_MSGRESULT, -1);
+ return TRUE;
+ }
+ PartEntry = PartItem->PartEntry;
+ ASSERT(PartEntry);
+
+ /*
+ * Check whether the user wants to install ReactOS on a disk that
+ * is not recognized by the computer's firmware and if so,
display
+ * a warning since such disks may not be bootable.
+ */
+ if (PartEntry->DiskEntry->MediaType == FixedMedia &&
+ !PartEntry->DiskEntry->BiosFound)
+ {
+ INT nRet;
+
+ nRet = DisplayMessage(hwndDlg,
+ MB_OKCANCEL | MB_ICONWARNING,
+ L"Warning",
+ L"The disk you have selected for
installing ReactOS\n"
+ L"is not visible by the firmware of
your computer,\n"
+ L"and so may not be
bootable.\n"
+ L"\nClick on OK to continue
anyway."
+ L"\nClick on CANCEL to go back to the
partitions list.");
+ if (nRet != IDOK)
+ {
+ /* Fail and don't continue the installation */
+ SetWindowLongPtrW(hwndDlg, DWLP_MSGRESULT, -1);
+ return TRUE;
+ }
+ }
+
+ /* If this is an empty region, auto-create the partition if
conditions are OK */
+ if (!PartEntry->IsPartitioned)
{
- DPRINT1("InitDestinationPaths() failed with status
0x%08lx\n", Status);
+ ULONG Error;
+
+ Error = PartitionCreationChecks(PartEntry);
+ if (Error != NOT_AN_ERROR)
+ {
+ // MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY);
+ DisplayMessage(hwndDlg, MB_OK | MB_ICONERROR, NULL,
+ L"Could not create a partition on the
selected disk region");
+
+ /* Fail and don't continue the installation */
+ SetWindowLongPtrW(hwndDlg, DWLP_MSGRESULT, -1);
+ return TRUE;
+ }
+
+ /* Automatically create the partition on the whole empty space;
+ * it will be formatted later with default parameters */
+ if (!DoCreatePartition(hList, pSetupData->PartitionList,
+ &hItem, &PartItem,
+ 0ULL,
+ 0))
+ {
+ DisplayError(GetParent(hwndDlg),
+ IDS_ERROR_CREATE_PARTITION_TITLE,
+ IDS_ERROR_CREATE_PARTITION);
+
+ /* Fail and don't continue the installation */
+ SetWindowLongPtrW(hwndDlg, DWLP_MSGRESULT, -1);
+ return TRUE;
+ }
+ /* Update PartEntry */
+ PartEntry = PartItem->PartEntry;
}
+ ASSERT(PartEntry->IsPartitioned);
+ // ASSERT(PartEntry !=
PartEntry->DiskEntry->ExtendedPartition);
+ ASSERT(!IsContainerPartition(PartEntry->PartitionType));
+ ASSERT(PartEntry->Volume);
+
+#if 0 // TODO: Implement!
+ if (!IsPartitionLargeEnough(PartEntry))
+ {
+ MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir,
POPUP_WAIT_ANY_KEY,
+ USetupData.RequiredPartitionDiskSpace);
+
+ /* Fail and don't continue the installation */
+ SetWindowLongPtrW(hwndDlg, DWLP_MSGRESULT, -1);
+ return TRUE;
+ }
+#endif
+
+ /* Force formatting only if the partition doesn't have a volume
(may or may not be formatted) */
+ if (PartEntry->Volume &&
+ ((PartEntry->Volume->FormatState == Formatted) ||
+ (PartItem->VolCreate &&
*PartItem->VolCreate->FileSystemName)))
+ {
+ /*NOTHING*/;
+ }
+ else /* Request formatting of the selected region if it's not
already formatted */
+ {
+ INT_PTR ret;
+ PARTCREATE_CTX PartCreateCtx = {0};
+
+ /* Show the formatting dialog */
+ PartCreateCtx.PartItem = PartItem;
+ ret = DialogBoxParamW(pSetupData->hInstance,
+ MAKEINTRESOURCEW(IDD_FORMAT),
+ hwndDlg,
+ FormatDlgProc,
+ (LPARAM)&PartCreateCtx);
+
+ /* If the user refuses to format the partition,
+ * fail and don't continue the installation */
+ if (ret != IDOK)
+ {
+ SetWindowLongPtrW(hwndDlg, DWLP_MSGRESULT, -1);
+ return TRUE;
+ }
+
+ /* The partition will be formatted */
+ }
+
+ InstallPartition = PartEntry;
break;
}
default:
break;
}
+ break;
}
- break;
default:
break;
diff --git a/base/setup/reactos/lang/bg-BG.rc b/base/setup/reactos/lang/bg-BG.rc
index 1b7a166b42f..e1f401df9c1 100644
--- a/base/setup/reactos/lang/bg-BG.rc
+++ b/base/setup/reactos/lang/bg-BG.rc
@@ -55,27 +55,43 @@ CAPTION "Настройка на РеактОС"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
- PUSHBUTTON "&Създаване", IDC_PARTCREATE, 7, 122, 50, 15
- PUSHBUTTON "Из&триване", IDC_PARTDELETE, 63, 122, 50, 15
- PUSHBUTTON "Драйвер", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
- PUSHBUTTON "Раз&ширани възможности...", IDC_PARTMOREOPTS, 230, 122, 80,
15
- // LTEXT "Натиснете „Напред“, за да започне слагането.", IDC_STATIC, 10,
180, 277, 20
+ PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Създаване", IDC_PARTCREATE, 7, 122, 50, 14
+ PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "Из&триване", IDC_PARTDELETE, 63, 122, 50, 14
+ PUSHBUTTON "Драйвер", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+ PUSHBUTTON "Раз&ширани възможности...", IDC_PARTMOREOPTS, 230, 122, 80,
14
+ // LTEXT "Натиснете „Напред“, за да започне слагането.", IDC_STATIC, 7,
128, 277, 8
END
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Създаване на дял"
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Създаване и форматиране на дял"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "&Размер:", IDC_STATIC, 7, 9, 70, 9
+ EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
+ CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
+ UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
+ LTEXT "Мб", IDC_UNIT, 134, 9, 14, 9
+ AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180,
14
+ LTEXT "&Файлова система:", IDC_FS_STATIC, 7, 46, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+ PUSHBUTTON "Добре", IDOK, 88, 98, 50, 14
+ PUSHBUTTON "Отказ", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Форматиране на дял"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22,
9, 13
- CONTROL "Създаване и форматиране на дял", IDC_STATIC, "Button",
BS_GROUPBOX, 7, 5, 129, 57
- LTEXT "Размер:", IDC_STATIC, 13, 24, 27, 9
- EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
- LTEXT "ГБ", IDC_UNIT, 117, 24, 14, 9
- LTEXT "Файлова система:", IDC_STATIC, 13, 46, 42, 9
- CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST, 58, 42, 73, 50
- PUSHBUTTON "&Добре", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
- PUSHBUTTON "&Отказ", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
+ LTEXT "&Файлова система:", IDC_FS_STATIC, 7, 9, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+ PUSHBUTTON "Добре", IDOK, 88, 61, 50, 14
+ PUSHBUTTON "Отказ", IDCANCEL, 143, 61, 50, 14
END
IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
FONT 8, "MS Shell Dlg"
BEGIN
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
+ EDITTEXT IDC_PATH, 7, 23, 291, 13
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
+ DEFPUSHBUTTON "Добре", IDOK, 193, 113, 50, 14
+ PUSHBUTTON "Отказ", IDCANCEL, 248, 113, 50, 14
END
IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
IDS_ABORTSETUP2 "Прекъсване на слагането?"
IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to
continue."
IDS_CAPTION "Настройка на РеактОС"
+ IDS_VOLUME_NOFORMAT "Not formatted"
END
STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
IDS_BOOTLOADER_VBRONLY "Само VBR"
END
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+ IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+ IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+ IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+ IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+ IDS_COPYING "Copying %s"
+ IDS_MOVING "Moving %s to %s"
+ IDS_RENAMING "Renaming %s to %s"
+ IDS_DELETING "Deleting %s"
+
+ IDS_PREPARE_PARTITIONS "Preparing partitions..."
+ IDS_PREPARE_FILES "Preparing the list of files to be copied, please
wait..."
+ IDS_COPYING_FILES "Copying the files..."
+END
+
/* Error Strings */
STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
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."
+
+ IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+ IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+ IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+ IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected
partition?"
+ IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the
selected extended partition and ALL the logical partitions it contains?"
+
+ IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+ IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system
partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+ IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to
format the partition."
+
+ IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in
%s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n
%s\n"
+
+ IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition
formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status
0x%08lx)."
END
diff --git a/base/setup/reactos/lang/cs-CZ.rc b/base/setup/reactos/lang/cs-CZ.rc
index e1086e727ef..ed499e1caf5 100644
--- a/base/setup/reactos/lang/cs-CZ.rc
+++ b/base/setup/reactos/lang/cs-CZ.rc
@@ -61,27 +61,43 @@ CAPTION "Instalace systému ReactOS"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
- PUSHBUTTON "&Vytvořit", IDC_PARTCREATE, 7, 122, 50, 15
- PUSHBUTTON "&Smazat", IDC_PARTDELETE, 63, 122, 50, 15
- PUSHBUTTON "&Ovladač", IDC_DEVICEDRIVER, 174, 122, 50, 15,
WS_DISABLED
- PUSHBUTTON "&Pokročilé volby...", IDC_PARTMOREOPTS, 230, 122, 80, 15
- // LTEXT "Po klepnutí na Další bude možné zkontrolovat všechna nastavení.",
IDC_STATIC, 10, 180, 277, 20
+ PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Vytvořit", IDC_PARTCREATE, 7, 122, 50, 14
+ PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Smazat", IDC_PARTDELETE, 63, 122, 50, 14
+ PUSHBUTTON "&Ovladač", IDC_DEVICEDRIVER, 174, 122, 50, 14,
WS_DISABLED
+ PUSHBUTTON "&Pokročilé volby...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+ // LTEXT "Po klepnutí na Další bude možné zkontrolovat všechna nastavení.",
IDC_STATIC, 7, 128, 277, 8
END
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Vytvořit oddíl"
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Vytvořit a naformátovat oddíl"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "&Velikost:", IDC_STATIC, 7, 9, 70, 9
+ EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
+ CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
+ UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
+ LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
+ AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180,
14
+ LTEXT "Sou&borový systém:", IDC_FS_STATIC, 7, 46, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+ PUSHBUTTON "Storno", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Naformátovat oddíl"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22,
9, 13
- CONTROL "Vytvořit a naformátovat oddíl", IDC_STATIC, "Button",
BS_GROUPBOX, 7, 5, 129, 57
- LTEXT "Velikost:", IDC_STATIC, 13, 24, 27, 9
- EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
- LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
- LTEXT "Souborový systém:", IDC_STATIC, 13, 46, 42, 9
- CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST, 58, 42, 73, 50
- PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
- PUSHBUTTON "&Storno", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
+ LTEXT "Sou&borový systém:", IDC_FS_STATIC, 7, 9, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+ PUSHBUTTON "Storno", IDCANCEL, 143, 61, 50, 14
END
IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -90,12 +106,12 @@ CAPTION "Advanced Installation Options"
FONT 8, "MS Shell Dlg"
BEGIN
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
+ EDITTEXT IDC_PATH, 7, 23, 291, 13
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
+ DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
+ PUSHBUTTON "Storno", IDCANCEL, 248, 113, 50, 14
END
IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -166,6 +182,7 @@ BEGIN
IDS_ABORTSETUP2 "Přerušit instalaci?"
IDS_NO_TXTSETUP_SIF "Soubor 'txtsetup.sif' nenalezen.\nInstalace nemůže
pokračovat."
IDS_CAPTION "Instalace systému ReactOS"
+ IDS_VOLUME_NOFORMAT "Not formatted"
END
STRINGTABLE
@@ -192,6 +209,26 @@ BEGIN
IDS_BOOTLOADER_VBRONLY "Jen VBR"
END
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+ IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+ IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+ IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+ IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+ IDS_COPYING "Copying %s"
+ IDS_MOVING "Moving %s to %s"
+ IDS_RENAMING "Renaming %s to %s"
+ IDS_DELETING "Deleting %s"
+
+ IDS_PREPARE_PARTITIONS "Preparing partitions..."
+ IDS_PREPARE_FILES "Preparing the list of files to be copied, please
wait..."
+ IDS_COPYING_FILES "Copying the files..."
+END
+
/* Error Strings */
STRINGTABLE
@@ -201,8 +238,35 @@ BEGIN
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."
+
+ IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+ IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+ IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+ IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected
partition?"
+ IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the
selected extended partition and ALL the logical partitions it contains?"
+
+ IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+ IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system
partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+ IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to
format the partition."
+
+ IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in
%s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n
%s\n"
+
+ IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition
formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status
0x%08lx)."
END
diff --git a/base/setup/reactos/lang/de-DE.rc b/base/setup/reactos/lang/de-DE.rc
index d360cf75027..5423229f2a5 100644
--- a/base/setup/reactos/lang/de-DE.rc
+++ b/base/setup/reactos/lang/de-DE.rc
@@ -55,27 +55,43 @@ CAPTION "ReactOS-Setup"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
- PUSHBUTTON "&Erstellen", IDC_PARTCREATE, 7, 122, 50, 15
- PUSHBUTTON "&Löschen", IDC_PARTDELETE, 63, 122, 50, 15
- PUSHBUTTON "&Treiber", IDC_DEVICEDRIVER, 174, 122, 50, 15,
WS_DISABLED
- PUSHBUTTON "E&rweiterte Optionen...", IDC_PARTMOREOPTS, 230, 122, 80,
15
- // LTEXT "Klicken Sie auf Weiter um die Zusammenfassung zu überprüfen.",
IDC_STATIC, 10, 180, 277, 20
+ PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Erstellen", IDC_PARTCREATE, 7, 122, 50, 14
+ PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Löschen", IDC_PARTDELETE, 63, 122, 50, 14
+ PUSHBUTTON "&Treiber", IDC_DEVICEDRIVER, 174, 122, 50, 14,
WS_DISABLED
+ PUSHBUTTON "E&rweiterte Optionen...", IDC_PARTMOREOPTS, 230, 122, 80,
14
+ // LTEXT "Klicken Sie auf Weiter um die Zusammenfassung zu überprüfen.",
IDC_STATIC, 7, 128, 277, 8
END
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Erstelle Partition"
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Erstelle und formatiere Partition"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "&Größe:", IDC_STATIC, 7, 9, 70, 9
+ EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
+ CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
+ UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
+ LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
+ AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180,
14
+ LTEXT "&Dateisystem:", IDC_FS_STATIC, 7, 46, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+ PUSHBUTTON "Abbrechen", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Formatiere Partition"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22,
9, 13
- CONTROL "Erstelle und formatiere Partition", IDC_STATIC,
"Button", BS_GROUPBOX, 7, 5, 129, 57
- LTEXT "Größe:", IDC_STATIC, 13, 24, 27, 9
- EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
- LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
- LTEXT "Dateisystem:", IDC_STATIC, 13, 46, 42, 9
- CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST, 58, 42, 73, 50
- PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
- PUSHBUTTON "&Abbrechen", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
+ LTEXT "&Dateisystem:", IDC_FS_STATIC, 7, 9, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+ PUSHBUTTON "Abbrechen", IDCANCEL, 143, 61, 50, 14
END
IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Erweiterte Installationseinstellungen"
FONT 8, "MS Shell Dlg"
BEGIN
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
+ EDITTEXT IDC_PATH, 7, 23, 291, 13
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
+ DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
+ PUSHBUTTON "Abbrechen", IDCANCEL, 248, 113, 50, 14
END
IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
IDS_ABORTSETUP2 "Installation abbrechen?"
IDS_NO_TXTSETUP_SIF "Die Datei 'txtsetup.sif' konnte nicht gefunden
werden.\nSetup kann nicht fortfahren."
IDS_CAPTION "ReactOS Setup"
+ IDS_VOLUME_NOFORMAT "Not formatted"
END
STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
IDS_BOOTLOADER_VBRONLY "Nur VBR"
END
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+ IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+ IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+ IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+ IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+ IDS_COPYING "Copying %s"
+ IDS_MOVING "Moving %s to %s"
+ IDS_RENAMING "Renaming %s to %s"
+ IDS_DELETING "Deleting %s"
+
+ IDS_PREPARE_PARTITIONS "Preparing partitions..."
+ IDS_PREPARE_FILES "Preparing the list of files to be copied, please
wait..."
+ IDS_COPYING_FILES "Copying the files..."
+END
+
/* Error Strings */
STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
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."
+
+ IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+ IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+ IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+ IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected
partition?"
+ IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the
selected extended partition and ALL the logical partitions it contains?"
+
+ IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+ IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system
partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+ IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to
format the partition."
+
+ IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in
%s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n
%s\n"
+
+ IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition
formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status
0x%08lx)."
END
diff --git a/base/setup/reactos/lang/el-GR.rc b/base/setup/reactos/lang/el-GR.rc
index 0950302332f..e547eaebf4d 100644
--- a/base/setup/reactos/lang/el-GR.rc
+++ b/base/setup/reactos/lang/el-GR.rc
@@ -55,27 +55,43 @@ CAPTION "Εγκατάσταση του ReactOS"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
- PUSHBUTTON "&Δημιουργία", IDC_PARTCREATE, 7, 122, 50, 15
- PUSHBUTTON "&Διαγραφή", IDC_PARTDELETE, 63, 122, 50, 15
- PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
- PUSHBUTTON "&Επιλογές για προχωρημένους...", IDC_PARTMOREOPTS, 230,
122, 80, 15
- // LTEXT "Πατήστε Επόμενο για να ξεκινήσετε τη διαδικασία εγκατάστασης.",
IDC_STATIC, 10, 180, 277, 20
+ PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Δημιουργία", IDC_PARTCREATE, 7, 122, 50, 14
+ PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "Δ&ιαγραφή", IDC_PARTDELETE, 63, 122, 50, 14
+ PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+ PUSHBUTTON "&Επιλογές για προχωρημένους...", IDC_PARTMOREOPTS, 230,
122, 80, 14
+ // LTEXT "Πατήστε Επόμενο για να ξεκινήσετε τη διαδικασία εγκατάστασης.",
IDC_STATIC, 7, 128, 277, 8
END
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Δημιουργία Partition"
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Create and Format partition"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "&Μέγεθος:", IDC_STATIC, 7, 9, 70, 9
+ EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
+ CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
+ UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
+ LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
+ AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180,
14
+ LTEXT "&Τύπος συστήματος:", IDC_FS_STATIC, 7, 46, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+ PUSHBUTTON "Άκυρο", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Format Partition"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22,
9, 13
- CONTROL "Create and format partition", IDC_STATIC, "Button",
BS_GROUPBOX, 7, 5, 129, 57
- LTEXT "Μέγεθος:", IDC_STATIC, 13, 24, 27, 9
- EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
- LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
- LTEXT "Τύπος συστήματος:", IDC_STATIC, 13, 46, 42, 9
- CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST, 58, 42, 73, 50
- PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
- PUSHBUTTON "&Άκυρο", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
+ LTEXT "&Τύπος συστήματος:", IDC_FS_STATIC, 7, 9, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+ PUSHBUTTON "Άκυρο", IDCANCEL, 143, 61, 50, 14
END
IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
FONT 8, "MS Shell Dlg"
BEGIN
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
+ EDITTEXT IDC_PATH, 7, 23, 291, 13
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
+ DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
+ PUSHBUTTON "Άκυρο", IDCANCEL, 248, 113, 50, 14
END
IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
IDS_ABORTSETUP2 "Abort installation?"
IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to
continue."
IDS_CAPTION "ReactOS Setup"
+ IDS_VOLUME_NOFORMAT "Not formatted"
END
STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
IDS_BOOTLOADER_VBRONLY "VBR only"
END
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+ IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+ IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+ IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+ IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+ IDS_COPYING "Copying %s"
+ IDS_MOVING "Moving %s to %s"
+ IDS_RENAMING "Renaming %s to %s"
+ IDS_DELETING "Deleting %s"
+
+ IDS_PREPARE_PARTITIONS "Preparing partitions..."
+ IDS_PREPARE_FILES "Preparing the list of files to be copied, please
wait..."
+ IDS_COPYING_FILES "Copying the files..."
+END
+
/* Error Strings */
STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
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."
+
+ IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+ IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+ IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+ IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected
partition?"
+ IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the
selected extended partition and ALL the logical partitions it contains?"
+
+ IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+ IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system
partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+ IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to
format the partition."
+
+ IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in
%s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n
%s\n"
+
+ IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition
formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status
0x%08lx)."
END
diff --git a/base/setup/reactos/lang/en-US.rc b/base/setup/reactos/lang/en-US.rc
index 71e8bfc02a9..a118f6f4f51 100644
--- a/base/setup/reactos/lang/en-US.rc
+++ b/base/setup/reactos/lang/en-US.rc
@@ -55,27 +55,43 @@ CAPTION "ReactOS Setup"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+ PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 14
+ PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 14
PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 14
// LTEXT "Click Next to check the summary.", IDC_STATIC, 7, 128, 277, 8
END
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Create Partition"
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Create and Format Partition"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "&Size:", IDC_STATIC, 7, 9, 70, 9
+ EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
+ CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
+ UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
+ LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
+ AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180,
14
+ LTEXT "&File System:", IDC_FS_STATIC, 7, 46, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Format Partition"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22,
9, 13
- CONTROL "Create and format partition", IDC_STATIC, "Button",
BS_GROUPBOX, 7, 5, 129, 57
- LTEXT "Size:", IDC_STATIC, 13, 24, 27, 9
- EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
- LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
- LTEXT "File System:", IDC_STATIC, 13, 46, 42, 9
- CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST, 58, 42, 73, 50
- PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
- PUSHBUTTON "&Cancel", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
+ LTEXT "&File System:", IDC_FS_STATIC, 7, 9, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 143, 61, 50, 14
END
IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
FONT 8, "MS Shell Dlg"
BEGIN
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
+ EDITTEXT IDC_PATH, 7, 23, 291, 13
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
+ DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 248, 113, 50, 14
END
IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
IDS_ABORTSETUP2 "Abort installation?"
IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to
continue."
IDS_CAPTION "ReactOS Setup"
+ IDS_VOLUME_NOFORMAT "Not formatted"
END
STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
IDS_BOOTLOADER_VBRONLY "VBR only"
END
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+ IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+ IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+ IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+ IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+ IDS_COPYING "Copying %s"
+ IDS_MOVING "Moving %s to %s"
+ IDS_RENAMING "Renaming %s to %s"
+ IDS_DELETING "Deleting %s"
+
+ IDS_PREPARE_PARTITIONS "Preparing partitions..."
+ IDS_PREPARE_FILES "Preparing the list of files to be copied, please
wait..."
+ IDS_COPYING_FILES "Copying the files..."
+END
+
/* Error Strings */
STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
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."
+
+ IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+ IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+ IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+ IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected
partition?"
+ IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the
selected extended partition and ALL the logical partitions it contains?"
+
+ IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+ IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system
partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+ IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to
format the partition."
+
+ IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in
%s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n
%s\n"
+
+ IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition
formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status
0x%08lx)."
END
diff --git a/base/setup/reactos/lang/es-ES.rc b/base/setup/reactos/lang/es-ES.rc
index 50d9e6629b9..fb875e1f0e4 100644
--- a/base/setup/reactos/lang/es-ES.rc
+++ b/base/setup/reactos/lang/es-ES.rc
@@ -64,27 +64,43 @@ CAPTION "Instalación de ReactOS"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
- PUSHBUTTON "&Crear", IDC_PARTCREATE, 7, 122, 50, 15
- PUSHBUTTON "&Borrar", IDC_PARTDELETE, 63, 122, 50, 15
- PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
- PUSHBUTTON "&Opciones avanzadas...", IDC_PARTMOREOPTS, 230, 122, 80,
15
- // LTEXT "Presione Siguiente para verificar el resumen.", IDC_STATIC, 10,
180, 277, 20
+ PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Crear", IDC_PARTCREATE, 7, 122, 50, 14
+ PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Borrar", IDC_PARTDELETE, 63, 122, 50, 14
+ PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+ PUSHBUTTON "&Opciones avanzadas...", IDC_PARTMOREOPTS, 230, 122, 80,
14
+ // LTEXT "Presione Siguiente para verificar el resumen.", IDC_STATIC, 7,
128, 277, 8
END
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Crear Partición"
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Crear y formatear una partición"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "&Tamaño:", IDC_STATIC, 7, 9, 70, 9
+ EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
+ CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
+ UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
+ LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
+ AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180,
14
+ LTEXT "&Sistema de archivos:", IDC_FS_STATIC, 7, 46, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+ PUSHBUTTON "Aceptar", IDOK, 88, 98, 50, 14
+ PUSHBUTTON "Cancelar", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Formatear una partición"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22,
9, 13
- CONTROL "Crear y formatear una partición", IDC_STATIC, "Button",
BS_GROUPBOX, 7, 5, 129, 57
- LTEXT "Tamaño:", IDC_STATIC, 13, 24, 27, 9
- EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
- LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
- LTEXT "Sistema de archivos:", IDC_STATIC, 13, 46, 42, 9
- CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST, 58, 42, 73, 50
- PUSHBUTTON "&Aceptar", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
- PUSHBUTTON "&Cancelar", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
+ LTEXT "&Sistema de archivos:", IDC_FS_STATIC, 7, 9, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+ PUSHBUTTON "Aceptar", IDOK, 88, 61, 50, 14
+ PUSHBUTTON "Cancelar", IDCANCEL, 143, 61, 50, 14
END
IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -93,12 +109,12 @@ CAPTION "Advanced Installation Options"
FONT 8, "MS Shell Dlg"
BEGIN
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
+ EDITTEXT IDC_PATH, 7, 23, 291, 13
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
+ DEFPUSHBUTTON "Aceptar", IDOK, 193, 113, 50, 14
+ PUSHBUTTON "Cancelar", IDCANCEL, 248, 113, 50, 14
END
IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -169,6 +185,7 @@ BEGIN
IDS_ABORTSETUP2 "¿Abortar instalación?"
IDS_NO_TXTSETUP_SIF "No se pudo encontrar 'txtsetup.sif'.\nLa
instalación no puede continuar."
IDS_CAPTION "Instalación de ReactOS"
+ IDS_VOLUME_NOFORMAT "Not formatted"
END
STRINGTABLE
@@ -195,6 +212,26 @@ BEGIN
IDS_BOOTLOADER_VBRONLY "Solo VBR"
END
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+ IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+ IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+ IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+ IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+ IDS_COPYING "Copying %s"
+ IDS_MOVING "Moving %s to %s"
+ IDS_RENAMING "Renaming %s to %s"
+ IDS_DELETING "Deleting %s"
+
+ IDS_PREPARE_PARTITIONS "Preparing partitions..."
+ IDS_PREPARE_FILES "Preparing the list of files to be copied, please
wait..."
+ IDS_COPYING_FILES "Copying the files..."
+END
+
/* Error Strings */
STRINGTABLE
@@ -204,8 +241,35 @@ BEGIN
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."
+
+ IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+ IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+ IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+ IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected
partition?"
+ IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the
selected extended partition and ALL the logical partitions it contains?"
+
+ IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+ IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system
partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+ IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to
format the partition."
+
+ IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in
%s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n
%s\n"
+
+ IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition
formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status
0x%08lx)."
END
diff --git a/base/setup/reactos/lang/et-EE.rc b/base/setup/reactos/lang/et-EE.rc
index 3439a95a272..f524373aaf3 100644
--- a/base/setup/reactos/lang/et-EE.rc
+++ b/base/setup/reactos/lang/et-EE.rc
@@ -55,27 +55,43 @@ CAPTION "ReactOS'i paigaldamine"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
- PUSHBUTTON "&Loo uus", IDC_PARTCREATE, 7, 122, 50, 15
- PUSHBUTTON "&Kustuta", IDC_PARTDELETE, 63, 122, 50, 15
- PUSHBUTTON "D&raiver", IDC_DEVICEDRIVER, 174, 122, 50, 15,
WS_DISABLED
- PUSHBUTTON "&Täpsemad seaded...", IDC_PARTMOREOPTS, 230, 122, 80, 15
- // LTEXT "Vajuta Järgmine, et seaded üle kontrollida.", IDC_STATIC, 10,
180, 277, 20
+ PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Loo uus", IDC_PARTCREATE, 7, 122, 50, 14
+ PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Kustuta", IDC_PARTDELETE, 63, 122, 50, 14
+ PUSHBUTTON "D&raiver", IDC_DEVICEDRIVER, 174, 122, 50, 14,
WS_DISABLED
+ PUSHBUTTON "&Täpsemad seaded...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+ // LTEXT "Vajuta Järgmine, et seaded üle kontrollida.", IDC_STATIC, 7, 128,
277, 8
END
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Partitsiooni loomine"
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Loo ja vorminda partitsioon"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "&Suurus:", IDC_STATIC, 7, 9, 70, 9
+ EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
+ CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
+ UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
+ LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
+ AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180,
14
+ LTEXT "&Failisüsteem:", IDC_FS_STATIC, 7, 46, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+ PUSHBUTTON "Olgu", IDOK, 88, 98, 50, 14
+ PUSHBUTTON "Tühista", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Vorminda partitsioon"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22,
9, 13
- CONTROL "Loo ja vorminda ketas", IDC_STATIC, "Button",
BS_GROUPBOX, 7, 5, 129, 57
- LTEXT "Suurus:", IDC_STATIC, 13, 24, 27, 9
- EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
- LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
- LTEXT "Failisüsteem:", IDC_STATIC, 13, 46, 42, 9
- CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST, 58, 42, 73, 50
- PUSHBUTTON "&Olgu", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
- PUSHBUTTON "&Tühista", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
+ LTEXT "&Failisüsteem:", IDC_FS_STATIC, 7, 9, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+ PUSHBUTTON "Olgu", IDOK, 88, 61, 50, 14
+ PUSHBUTTON "Tühista", IDCANCEL, 143, 61, 50, 14
END
IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
FONT 8, "MS Shell Dlg"
BEGIN
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
+ EDITTEXT IDC_PATH, 7, 23, 291, 13
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
+ DEFPUSHBUTTON "Olgu", IDOK, 193, 113, 50, 14
+ PUSHBUTTON "Tühista", IDCANCEL, 248, 113, 50, 14
END
IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
IDS_ABORTSETUP2 "Katkestada paigaldamine?"
IDS_NO_TXTSETUP_SIF "Ei leitud faili 'txtsetup.sif'.\nPaigaldust ei saa
lõpuni viia."
IDS_CAPTION "ReactOS'i paigaldamine"
+ IDS_VOLUME_NOFORMAT "Not formatted"
END
STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
IDS_BOOTLOADER_VBRONLY "Ainult VBR"
END
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+ IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+ IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+ IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+ IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+ IDS_COPYING "Copying %s"
+ IDS_MOVING "Moving %s to %s"
+ IDS_RENAMING "Renaming %s to %s"
+ IDS_DELETING "Deleting %s"
+
+ IDS_PREPARE_PARTITIONS "Preparing partitions..."
+ IDS_PREPARE_FILES "Preparing the list of files to be copied, please
wait..."
+ IDS_COPYING_FILES "Copying the files..."
+END
+
/* Error Strings */
STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
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."
+
+ IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+ IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+ IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+ IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected
partition?"
+ IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the
selected extended partition and ALL the logical partitions it contains?"
+
+ IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+ IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system
partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+ IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to
format the partition."
+
+ IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in
%s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n
%s\n"
+
+ IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition
formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status
0x%08lx)."
END
diff --git a/base/setup/reactos/lang/eu-ES.rc b/base/setup/reactos/lang/eu-ES.rc
index e4920a947b0..75ce0cf14ee 100644
--- a/base/setup/reactos/lang/eu-ES.rc
+++ b/base/setup/reactos/lang/eu-ES.rc
@@ -62,27 +62,43 @@ CAPTION "Instalación de ReactOS"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
- PUSHBUTTON "&Crear", IDC_PARTCREATE, 7, 122, 50, 15
- PUSHBUTTON "&Borrar", IDC_PARTDELETE, 63, 122, 50, 15
- PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
- PUSHBUTTON "&Opciones avanzadas...", IDC_PARTMOREOPTS, 230, 122, 80,
15
- // LTEXT "Presione Siguiente para verificar el resumen.", IDC_STATIC, 10,
180, 277, 20
+ PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Crear", IDC_PARTCREATE, 7, 122, 50, 14
+ PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Borrar", IDC_PARTDELETE, 63, 122, 50, 14
+ PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+ PUSHBUTTON "&Opciones avanzadas...", IDC_PARTMOREOPTS, 230, 122, 80,
14
+ // LTEXT "Presione Siguiente para verificar el resumen.", IDC_STATIC, 7,
128, 277, 8
END
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Crear Partición"
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Crear y formatear una partición"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "&Tamaño:", IDC_STATIC, 7, 9, 70, 9
+ EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
+ CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
+ UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
+ LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
+ AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180,
14
+ LTEXT "&Sistema de archivos:", IDC_FS_STATIC, 7, 46, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+ PUSHBUTTON "Aceptar", IDOK, 88, 98, 50, 14
+ PUSHBUTTON "Cancelar", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Formatear una partición"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22,
9, 13
- CONTROL "Crear y formatear una partición", IDC_STATIC, "Button",
BS_GROUPBOX, 7, 5, 129, 57
- LTEXT "Tamaño:", IDC_STATIC, 13, 24, 27, 9
- EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
- LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
- LTEXT "Sistema de archivos:", IDC_STATIC, 13, 46, 42, 9
- CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST, 58, 42, 73, 50
- PUSHBUTTON "&Aceptar", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
- PUSHBUTTON "&Cancelar", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
+ LTEXT "&Sistema de archivos:", IDC_FS_STATIC, 7, 9, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+ PUSHBUTTON "Aceptar", IDOK, 88, 61, 50, 14
+ PUSHBUTTON "Cancelar", IDCANCEL, 143, 61, 50, 14
END
IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -91,12 +107,12 @@ CAPTION "Advanced Installation Options"
FONT 8, "MS Shell Dlg"
BEGIN
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
+ EDITTEXT IDC_PATH, 7, 23, 291, 13
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
+ DEFPUSHBUTTON "Aceptar", IDOK, 193, 113, 50, 14
+ PUSHBUTTON "Cancelar", IDCANCEL, 248, 113, 50, 14
END
IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -167,6 +183,7 @@ BEGIN
IDS_ABORTSETUP2 "¿Abortar instalación?"
IDS_NO_TXTSETUP_SIF "No se pudo encontrar 'txtsetup.sif'.\nLa
instalación no puede continuar."
IDS_CAPTION "Instalación de ReactOS"
+ IDS_VOLUME_NOFORMAT "Not formatted"
END
STRINGTABLE
@@ -193,6 +210,26 @@ BEGIN
IDS_BOOTLOADER_VBRONLY "Solo VBR"
END
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+ IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+ IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+ IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+ IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+ IDS_COPYING "Copying %s"
+ IDS_MOVING "Moving %s to %s"
+ IDS_RENAMING "Renaming %s to %s"
+ IDS_DELETING "Deleting %s"
+
+ IDS_PREPARE_PARTITIONS "Preparing partitions..."
+ IDS_PREPARE_FILES "Preparing the list of files to be copied, please
wait..."
+ IDS_COPYING_FILES "Copying the files..."
+END
+
/* Error Strings */
STRINGTABLE
@@ -202,8 +239,35 @@ BEGIN
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."
+
+ IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+ IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+ IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+ IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected
partition?"
+ IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the
selected extended partition and ALL the logical partitions it contains?"
+
+ IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+ IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system
partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+ IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to
format the partition."
+
+ IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in
%s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n
%s\n"
+
+ IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition
formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status
0x%08lx)."
END
diff --git a/base/setup/reactos/lang/fi-FI.rc b/base/setup/reactos/lang/fi-FI.rc
index 4f6ec76096f..abc7cbe9162 100644
--- a/base/setup/reactos/lang/fi-FI.rc
+++ b/base/setup/reactos/lang/fi-FI.rc
@@ -55,27 +55,43 @@ CAPTION "ReactOS Setup"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
- PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 15
- PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 15
- PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
- PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 15
- // LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20
+ PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 14
+ PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 14
+ PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+ PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+ // LTEXT "Click Next to check the summary.", IDC_STATIC, 7, 128, 277, 8
END
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Create Partition"
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Create and Format Partition"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "&Size:", IDC_STATIC, 7, 9, 70, 9
+ EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
+ CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
+ UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
+ LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
+ AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180,
14
+ LTEXT "&File System:", IDC_FS_STATIC, 7, 46, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Format Partition"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22,
9, 13
- CONTROL "Create and format partition", IDC_STATIC, "Button",
BS_GROUPBOX, 7, 5, 129, 57
- LTEXT "Size:", IDC_STATIC, 13, 24, 27, 9
- EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
- LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
- LTEXT "File System:", IDC_STATIC, 13, 46, 42, 9
- CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST, 58, 42, 73, 50
- PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
- PUSHBUTTON "&Cancel", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
+ LTEXT "&File System:", IDC_FS_STATIC, 7, 9, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 143, 61, 50, 14
END
IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
FONT 8, "MS Shell Dlg"
BEGIN
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
+ EDITTEXT IDC_PATH, 7, 23, 291, 13
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
+ DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 248, 113, 50, 14
END
IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
IDS_ABORTSETUP2 "Abort installation?"
IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to
continue."
IDS_CAPTION "ReactOS Setup"
+ IDS_VOLUME_NOFORMAT "Not formatted"
END
STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
IDS_BOOTLOADER_VBRONLY "VBR only"
END
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+ IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+ IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+ IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+ IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+ IDS_COPYING "Copying %s"
+ IDS_MOVING "Moving %s to %s"
+ IDS_RENAMING "Renaming %s to %s"
+ IDS_DELETING "Deleting %s"
+
+ IDS_PREPARE_PARTITIONS "Preparing partitions..."
+ IDS_PREPARE_FILES "Preparing the list of files to be copied, please
wait..."
+ IDS_COPYING_FILES "Copying the files..."
+END
+
/* Error Strings */
STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
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."
+
+ IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+ IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+ IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+ IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected
partition?"
+ IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the
selected extended partition and ALL the logical partitions it contains?"
+
+ IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+ IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system
partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+ IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to
format the partition."
+
+ IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in
%s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n
%s\n"
+
+ IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition
formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status
0x%08lx)."
END
diff --git a/base/setup/reactos/lang/fr-FR.rc b/base/setup/reactos/lang/fr-FR.rc
index 1317b545f77..90d9d5a3a9c 100644
--- a/base/setup/reactos/lang/fr-FR.rc
+++ b/base/setup/reactos/lang/fr-FR.rc
@@ -55,27 +55,43 @@ CAPTION "Installation de ReactOS"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
- PUSHBUTTON "&Créer", IDC_PARTCREATE, 7, 122, 50, 15
- PUSHBUTTON "&Supprimer", IDC_PARTDELETE, 63, 122, 50, 15
- PUSHBUTTON "&Pilote", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
- PUSHBUTTON "&Options avancées...", IDC_PARTMOREOPTS, 230, 122, 80, 15
- // LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20
+ PUSHBUTTON "&Initialiser", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At
same position as IDC_PARTCREATE
+ PUSHBUTTON "&Créer", IDC_PARTCREATE, 7, 122, 50, 14
+ PUSHBUTTON "&Formatter", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At
same position as IDC_PARTCREATE
+ PUSHBUTTON "&Supprimer", IDC_PARTDELETE, 63, 122, 50, 14
+ PUSHBUTTON "&Pilote", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+ PUSHBUTTON "&Options avancées...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+ // LTEXT "Click Next to check the summary.", IDC_STATIC, 7, 128, 277, 8
END
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Créer une partition"
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Créer et formatter une partition"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "&Taille :", IDC_STATIC, 7, 9, 70, 9
+ EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
+ CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
+ UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
+ LTEXT "Mo", IDC_UNIT, 134, 9, 14, 9
+ AUTOCHECKBOX "Partition étendu&e", IDC_CHECK_MBREXTPART, 7, 22, 180,
14
+ LTEXT "&Système de fichier :", IDC_FS_STATIC, 7, 46, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "Formatage &rapide", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+ PUSHBUTTON "Annuler", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Formatter une partition"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22,
9, 13
- CONTROL "Créer et formatter une partition", IDC_STATIC, "Button",
BS_GROUPBOX, 7, 5, 129, 57
- LTEXT "Taille :", IDC_STATIC, 13, 24, 27, 9
- EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
- LTEXT "Go", IDC_UNIT, 117, 24, 14, 9
- LTEXT "Système de fichier :", IDC_STATIC, 13, 46, 42, 9
- CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST, 58, 42, 73, 50
- PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
- PUSHBUTTON "&Annuler", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
+ LTEXT "&Système de fichier :", IDC_FS_STATIC, 7, 9, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "Formatage &rapide", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+ PUSHBUTTON "Annuler", IDCANCEL, 143, 61, 50, 14
END
IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Paramètres d'installation avancés"
FONT 8, "MS Shell Dlg"
BEGIN
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
+ EDITTEXT IDC_PATH, 7, 23, 291, 13
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
+ DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
+ PUSHBUTTON "Annuler", IDCANCEL, 248, 113, 50, 14
END
IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
IDS_ABORTSETUP2 "Abandonner l'installation ?"
IDS_NO_TXTSETUP_SIF "Impossible de trouver
'txtsetup.sif'.\nL'installation ne peut continuer."
IDS_CAPTION "Installation de ReactOS"
+ IDS_VOLUME_NOFORMAT "Non formaté"
END
STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
IDS_BOOTLOADER_VBRONLY "VBR seulement"
END
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+ IDS_FORMATTING_PROGRESS1 "Formate le volume %c: (%s) sur %s..."
+ IDS_FORMATTING_PROGRESS2 "Formate le volume %s sur %s..."
+
+ IDS_CHECKING_PROGRESS1 "Vérifie le volume %c: (%s)..."
+ IDS_CHECKING_PROGRESS2 "Vérifie le volume %s..."
+
+ IDS_COPYING "Copie %s"
+ IDS_MOVING "Déplace %s vers %s"
+ IDS_RENAMING "Renomme %s en %s"
+ IDS_DELETING "Supprime %s"
+
+ IDS_PREPARE_PARTITIONS "Prépare les partitions..."
+ IDS_PREPARE_FILES "Prépare la liste de fichiers à copier, veuillez
patienter..."
+ IDS_COPYING_FILES "Copie les fichiers..."
+END
+
/* Error Strings */
STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
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."
+
+ IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+ IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+ IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+ IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected
partition?"
+ IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the
selected extended partition and ALL the logical partitions it contains?"
+
+ IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+ IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system
partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+ IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to
format the partition."
+
+ IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in
%s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n
%s\n"
+
+ IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition
formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status
0x%08lx)."
END
diff --git a/base/setup/reactos/lang/he-IL.rc b/base/setup/reactos/lang/he-IL.rc
index daa367cb314..da55c6c1206 100644
--- a/base/setup/reactos/lang/he-IL.rc
+++ b/base/setup/reactos/lang/he-IL.rc
@@ -57,27 +57,43 @@ CAPTION "התקנת ReactOS"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
- PUSHBUTTON "צור", IDC_PARTCREATE, 7, 122, 50, 15
- PUSHBUTTON "מחק", IDC_PARTDELETE, 63, 122, 50, 15
- PUSHBUTTON "טעינת מנהל התקן", IDC_DEVICEDRIVER, 174, 122, 50, 15,
WS_DISABLED
- PUSHBUTTON "אפשרויות מתקדמות...", IDC_PARTMOREOPTS, 230, 122, 80, 15
- // LTEXT "לחץ על 'הבא' כדי לראות סיכום.", IDC_STATIC, 10, 180, 277,
20
+ PUSHBUTTON "Initialize(&I)", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At
same position as IDC_PARTCREATE
+ PUSHBUTTON "צור", IDC_PARTCREATE, 7, 122, 50, 14
+ PUSHBUTTON "Format(&F)", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At
same position as IDC_PARTCREATE
+ PUSHBUTTON "מחק", IDC_PARTDELETE, 63, 122, 50, 14
+ PUSHBUTTON "טעינת מנהל התקן", IDC_DEVICEDRIVER, 174, 122, 50, 14,
WS_DISABLED
+ PUSHBUTTON "אפשרויות מתקדמות...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+ // LTEXT "לחץ על 'הבא' כדי לראות סיכום.", IDC_STATIC, 7, 128, 277,
8
END
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "יצירת מחיצה"
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "יצירה ואתחול מחיצה"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "גודל(&S):", IDC_STATIC, 7, 9, 70, 9
+ EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
+ CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
+ UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
+ LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
+ AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180,
14
+ LTEXT "מערכת קבצים(&F):", IDC_FS_STATIC, 7, 46, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+ PUSHBUTTON "אישור", IDOK, 88, 98, 50, 14
+ PUSHBUTTON "ביטול", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Format Partition"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22,
9, 13
- CONTROL "יצירה ואתחול מחיצה", IDC_STATIC, "Button", BS_GROUPBOX,
7, 5, 129, 57
- LTEXT "גודל:", IDC_STATIC, 13, 24, 27, 9
- EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
- LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
- LTEXT "מערכת קבצים:", IDC_STATIC, 13, 46, 42, 9
- CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST, 58, 42, 73, 50
- PUSHBUTTON "אישור", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
- PUSHBUTTON "ביטול", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+ LTEXT "מערכת קבצים(&F):", IDC_FS_STATIC, 7, 9, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+ PUSHBUTTON "אישור", IDOK, 88, 61, 50, 14
+ PUSHBUTTON "ביטול", IDCANCEL, 143, 61, 50, 14
END
IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -86,12 +102,12 @@ CAPTION "Advanced Installation Options"
FONT 8, "MS Shell Dlg"
BEGIN
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
+ EDITTEXT IDC_PATH, 7, 23, 291, 13
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
+ DEFPUSHBUTTON "אישור", IDOK, 193, 113, 50, 14
+ PUSHBUTTON "ביטול", IDCANCEL, 248, 113, 50, 14
END
IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -162,6 +178,7 @@ BEGIN
IDS_ABORTSETUP2 "לבטל את ההתקנה?"
IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to
continue."
IDS_CAPTION "התקנת ReactOS"
+ IDS_VOLUME_NOFORMAT "Not formatted"
END
STRINGTABLE
@@ -188,6 +205,26 @@ BEGIN
IDS_BOOTLOADER_VBRONLY "VBR only"
END
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+ IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+ IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+ IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+ IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+ IDS_COPYING "Copying %s"
+ IDS_MOVING "Moving %s to %s"
+ IDS_RENAMING "Renaming %s to %s"
+ IDS_DELETING "Deleting %s"
+
+ IDS_PREPARE_PARTITIONS "Preparing partitions..."
+ IDS_PREPARE_FILES "Preparing the list of files to be copied, please
wait..."
+ IDS_COPYING_FILES "Copying the files..."
+END
+
/* Error Strings */
STRINGTABLE
@@ -197,8 +234,35 @@ BEGIN
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."
+
+ IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+ IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+ IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+ IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected
partition?"
+ IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the
selected extended partition and ALL the logical partitions it contains?"
+
+ IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+ IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system
partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+ IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to
format the partition."
+
+ IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in
%s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n
%s\n"
+
+ IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition
formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status
0x%08lx)."
END
diff --git a/base/setup/reactos/lang/hi-IN.rc b/base/setup/reactos/lang/hi-IN.rc
index a7bf1eaad7a..1922772dea2 100644
--- a/base/setup/reactos/lang/hi-IN.rc
+++ b/base/setup/reactos/lang/hi-IN.rc
@@ -51,27 +51,43 @@ CAPTION "रिऐक्ट ओएस सेटअप"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+ PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
PUSHBUTTON "&बनाएं", IDC_PARTCREATE, 7, 122, 50, 14
+ PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
PUSHBUTTON "&डिलीट", IDC_PARTDELETE, 63, 122, 50, 14
PUSHBUTTON "&ड्राइवर", IDC_DEVICEDRIVER, 174, 122, 50, 14,
WS_DISABLED
PUSHBUTTON "&उन्नत विकल्प...", IDC_PARTMOREOPTS, 230, 122, 80, 14
-/* LTEXT "Click Next to check the summary.", IDC_STATIC, 7, 128, 277, 8 */
+ // LTEXT "Click Next to check the summary.", IDC_STATIC, 7, 128, 277, 8
END
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "विभाजन बनाएं"
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "विभाजन बनाएं और फ़ॉर्मेट करें"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "साइज़(&S):", IDC_STATIC, 7, 9, 70, 9
+ EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
+ CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
+ UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
+ LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
+ AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180,
14
+ LTEXT "फाइल सिस्टम(&F):", IDC_FS_STATIC, 7, 46, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+ PUSHBUTTON "ओके", IDOK, 88, 98, 50, 14
+ PUSHBUTTON "रद्द करे", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Format Partition"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22,
9, 13
- CONTROL "विभाजन बनाएं और फ़ॉर्मेट करें", IDC_STATIC, "Button",
BS_GROUPBOX, 7, 5, 129, 57
- LTEXT "साइज़:", IDC_STATIC, 13, 24, 27, 9
- EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
- LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
- LTEXT "फाइल सिस्टम:", IDC_STATIC, 13, 46, 42, 9
- CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST, 58, 42, 73, 50
- PUSHBUTTON "&ओके", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
- PUSHBUTTON "&रद्द करे", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
+ LTEXT "फाइल सिस्टम(&F):", IDC_FS_STATIC, 7, 9, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+ PUSHBUTTON "ओके", IDOK, 88, 61, 50, 14
+ PUSHBUTTON "रद्द करे", IDCANCEL, 143, 61, 50, 14
END
IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -80,12 +96,12 @@ CAPTION "Advanced Installation Options"
FONT 8, "MS Shell Dlg"
BEGIN
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
+ EDITTEXT IDC_PATH, 7, 23, 291, 13
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
+ DEFPUSHBUTTON "ओके", IDOK, 193, 113, 50, 14
+ PUSHBUTTON "रद्द करे", IDCANCEL, 248, 113, 50, 14
END
IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -138,6 +154,7 @@ BEGIN
IDS_ABORTSETUP2 "इन्स्टलेशन रद्द करें?"
IDS_NO_TXTSETUP_SIF "'txtsetup.sif' खोजने में असमर्थ\nसेटअप जारी रखने
में असमर्थ है "
IDS_CAPTION "रिऐक्ट ओएस सेटअप"
+ IDS_VOLUME_NOFORMAT "Not formatted"
END
STRINGTABLE
@@ -156,6 +173,26 @@ BEGIN
IDS_BOOTLOADER_VBRONLY "केवल VBR"
END
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+ IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+ IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+ IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+ IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+ IDS_COPYING "Copying %s"
+ IDS_MOVING "Moving %s to %s"
+ IDS_RENAMING "Renaming %s to %s"
+ IDS_DELETING "Deleting %s"
+
+ IDS_PREPARE_PARTITIONS "Preparing partitions..."
+ IDS_PREPARE_FILES "Preparing the list of files to be copied, please
wait..."
+ IDS_COPYING_FILES "Copying the files..."
+END
+
/* Error Strings */
STRINGTABLE
@@ -165,8 +202,35 @@ BEGIN
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."
+
+ IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+ IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+ IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+ IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected
partition?"
+ IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the
selected extended partition and ALL the logical partitions it contains?"
+
+ IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+ IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system
partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+ IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to
format the partition."
+
+ IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in
%s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n
%s\n"
+
+ IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition
formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status
0x%08lx)."
END
diff --git a/base/setup/reactos/lang/hu-HU.rc b/base/setup/reactos/lang/hu-HU.rc
index ca71160468d..3b7da052e54 100644
--- a/base/setup/reactos/lang/hu-HU.rc
+++ b/base/setup/reactos/lang/hu-HU.rc
@@ -57,27 +57,43 @@ CAPTION "ReactOS telepítõ"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
- PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 15
- PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 15
- PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
- PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 15
- // LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20
+ PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 14
+ PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 14
+ PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+ PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+ // LTEXT "Click Next to check the summary.", IDC_STATIC, 7, 128, 277, 8
END
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Create Partition"
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Create and Format Partition"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "&Size:", IDC_STATIC, 7, 9, 70, 9
+ EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
+ CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
+ UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
+ LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
+ AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180,
14
+ LTEXT "&File System:", IDC_FS_STATIC, 7, 46, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Format Partition"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22,
9, 13
- CONTROL "Create and format partition", IDC_STATIC, "Button",
BS_GROUPBOX, 7, 5, 129, 57
- LTEXT "Size:", IDC_STATIC, 13, 24, 27, 9
- EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
- LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
- LTEXT "File System:", IDC_STATIC, 13, 46, 42, 9
- CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST, 58, 42, 73, 50
- PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
- PUSHBUTTON "&Cancel", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
+ LTEXT "&File System:", IDC_FS_STATIC, 7, 9, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 143, 61, 50, 14
END
IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -86,12 +102,12 @@ CAPTION "Advanced Installation Options"
FONT 8, "MS Shell Dlg"
BEGIN
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
+ EDITTEXT IDC_PATH, 7, 23, 291, 13
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
+ DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 248, 113, 50, 14
END
IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -162,6 +178,7 @@ BEGIN
IDS_ABORTSETUP2 "Abort installation?"
IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to
continue."
IDS_CAPTION "ReactOS Setup"
+ IDS_VOLUME_NOFORMAT "Not formatted"
END
STRINGTABLE
@@ -188,6 +205,26 @@ BEGIN
IDS_BOOTLOADER_VBRONLY "VBR only"
END
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+ IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+ IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+ IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+ IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+ IDS_COPYING "Copying %s"
+ IDS_MOVING "Moving %s to %s"
+ IDS_RENAMING "Renaming %s to %s"
+ IDS_DELETING "Deleting %s"
+
+ IDS_PREPARE_PARTITIONS "Preparing partitions..."
+ IDS_PREPARE_FILES "Preparing the list of files to be copied, please
wait..."
+ IDS_COPYING_FILES "Copying the files..."
+END
+
/* Error Strings */
STRINGTABLE
@@ -197,8 +234,35 @@ BEGIN
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."
+
+ IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+ IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+ IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+ IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected
partition?"
+ IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the
selected extended partition and ALL the logical partitions it contains?"
+
+ IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+ IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system
partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+ IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to
format the partition."
+
+ IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in
%s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n
%s\n"
+
+ IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition
formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status
0x%08lx)."
END
diff --git a/base/setup/reactos/lang/id-ID.rc b/base/setup/reactos/lang/id-ID.rc
index a9aa9ad1304..606cc28bda5 100644
--- a/base/setup/reactos/lang/id-ID.rc
+++ b/base/setup/reactos/lang/id-ID.rc
@@ -55,27 +55,43 @@ CAPTION "Penyetelan ReactOS"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+ PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
PUSHBUTTON "&Buat", IDC_PARTCREATE, 7, 122, 50, 14
+ PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
PUSHBUTTON "&Hapus", IDC_PARTDELETE, 63, 122, 50, 14
PUSHBUTTON "&Perangkat", IDC_DEVICEDRIVER, 174, 122, 50, 14,
WS_DISABLED
PUSHBUTTON "Pilihan &Tingkat Lanjut...", IDC_PARTMOREOPTS, 230, 122,
80, 14
// LTEXT "Click Next to check the summary.", IDC_STATIC, 7, 128, 277, 8
END
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Buat Partisi"
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Buat dan format partisi"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "&Ukuran:", IDC_STATIC, 7, 9, 70, 9
+ EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
+ CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
+ UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
+ LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
+ AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180,
14
+ LTEXT "&Sistem Berkas:", IDC_FS_STATIC, 7, 46, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+ PUSHBUTTON "Batal", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Format partisi"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22,
9, 13
- CONTROL "Buat dan format partisi", IDC_STATIC, "Button",
BS_GROUPBOX, 7, 5, 129, 57
- LTEXT "Ukuran:", IDC_STATIC, 13, 24, 27, 9
- EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
- LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
- LTEXT "Sistem Berkas:", IDC_STATIC, 13, 46, 42, 9
- CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST, 58, 42, 73, 50
- PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
- PUSHBUTTON "&Batal", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
+ LTEXT "&Sistem Berkas:", IDC_FS_STATIC, 7, 9, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+ PUSHBUTTON "Batal", IDCANCEL, 143, 61, 50, 14
END
IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
FONT 8, "MS Shell Dlg"
BEGIN
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
+ EDITTEXT IDC_PATH, 7, 23, 291, 13
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
+ DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
+ PUSHBUTTON "Batal", IDCANCEL, 248, 113, 50, 14
END
IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
IDS_ABORTSETUP2 "Gugurkan pemasangan?"
IDS_NO_TXTSETUP_SIF "Tidak bisa menemukan 'txtsetup.sif'.\nPenyetelan
tidak bisa dilanjutkan."
IDS_CAPTION "Penyetelan ReactOS"
+ IDS_VOLUME_NOFORMAT "Not formatted"
END
STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
IDS_BOOTLOADER_VBRONLY "Hanya VBR"
END
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+ IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+ IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+ IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+ IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+ IDS_COPYING "Copying %s"
+ IDS_MOVING "Moving %s to %s"
+ IDS_RENAMING "Renaming %s to %s"
+ IDS_DELETING "Deleting %s"
+
+ IDS_PREPARE_PARTITIONS "Preparing partitions..."
+ IDS_PREPARE_FILES "Preparing the list of files to be copied, please
wait..."
+ IDS_COPYING_FILES "Copying the files..."
+END
+
/* Error Strings */
STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
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."
+
+ IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+ IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+ IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+ IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected
partition?"
+ IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the
selected extended partition and ALL the logical partitions it contains?"
+
+ IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+ IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system
partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+ IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to
format the partition."
+
+ IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in
%s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n
%s\n"
+
+ IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition
formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status
0x%08lx)."
END
diff --git a/base/setup/reactos/lang/it-IT.rc b/base/setup/reactos/lang/it-IT.rc
index 710591ef1f4..639097aba5b 100644
--- a/base/setup/reactos/lang/it-IT.rc
+++ b/base/setup/reactos/lang/it-IT.rc
@@ -55,27 +55,43 @@ CAPTION "Installazione di ReactOS"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
- PUSHBUTTON "&Crea", IDC_PARTCREATE, 7, 122, 50, 15
- PUSHBUTTON "&Rimuovi", IDC_PARTDELETE, 63, 122, 50, 15
- PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
- PUSHBUTTON "&Opzioni avanzate...", IDC_PARTMOREOPTS, 230, 122, 80, 15
- // LTEXT "Cliccare Avanti per iniziare l'installazione.", IDC_STATIC,
10, 180, 277, 20
+ PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Crea", IDC_PARTCREATE, 7, 122, 50, 14
+ PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Rimuovi", IDC_PARTDELETE, 63, 122, 50, 14
+ PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+ PUSHBUTTON "&Opzioni avanzate...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+ // LTEXT "Cliccare Avanti per iniziare l'installazione.", IDC_STATIC,
7, 128, 277, 8
END
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Creazione Partizioni"
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Crea e formatta la partizione"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "&Dimensione:", IDC_STATIC, 7, 9, 70, 9
+ EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
+ CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
+ UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
+ LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
+ AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180,
14
+ LTEXT "&Filesystem:", IDC_FS_STATIC, 7, 46, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+ PUSHBUTTON "Annulla", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Formatta la partizione"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22,
9, 13
- CONTROL "Crea e formatta la partizione", IDC_STATIC, "Button",
BS_GROUPBOX, 7, 5, 129, 57
- LTEXT "Dimensione:", IDC_STATIC, 13, 24, 27, 9
- EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
- LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
- LTEXT "Filesystem:", IDC_STATIC, 13, 46, 42, 9
- CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST, 58, 42, 73, 50
- PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
- PUSHBUTTON "&Annulla", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
+ LTEXT "&Filesystem:", IDC_FS_STATIC, 7, 9, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+ PUSHBUTTON "Annulla", IDCANCEL, 143, 61, 50, 14
END
IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
FONT 8, "MS Shell Dlg"
BEGIN
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
+ EDITTEXT IDC_PATH, 7, 23, 291, 13
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
+ DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
+ PUSHBUTTON "Annulla", IDCANCEL, 248, 113, 50, 14
END
IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
IDS_ABORTSETUP2 "Volete interrompere l'installazione?"
IDS_NO_TXTSETUP_SIF "Impossibile trovare
'txtsetup.sif'.\nL'installazione non può continuare."
IDS_CAPTION "Installazione di ReactOS"
+ IDS_VOLUME_NOFORMAT "Not formatted"
END
STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
IDS_BOOTLOADER_VBRONLY "Solo VBR"
END
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+ IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+ IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+ IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+ IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+ IDS_COPYING "Copying %s"
+ IDS_MOVING "Moving %s to %s"
+ IDS_RENAMING "Renaming %s to %s"
+ IDS_DELETING "Deleting %s"
+
+ IDS_PREPARE_PARTITIONS "Preparing partitions..."
+ IDS_PREPARE_FILES "Preparing the list of files to be copied, please
wait..."
+ IDS_COPYING_FILES "Copying the files..."
+END
+
/* Error Strings */
STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
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."
+
+ IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+ IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+ IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+ IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected
partition?"
+ IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the
selected extended partition and ALL the logical partitions it contains?"
+
+ IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+ IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system
partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+ IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to
format the partition."
+
+ IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in
%s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n
%s\n"
+
+ IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition
formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status
0x%08lx)."
END
diff --git a/base/setup/reactos/lang/ja-JP.rc b/base/setup/reactos/lang/ja-JP.rc
index f8ecbc3cd37..844dee36824 100644
--- a/base/setup/reactos/lang/ja-JP.rc
+++ b/base/setup/reactos/lang/ja-JP.rc
@@ -55,27 +55,43 @@ CAPTION "ReactOS セットアップ"
FONT 9, "MS UI Gothic"
BEGIN
CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+ PUSHBUTTON "Initialize(&I)", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At
same position as IDC_PARTCREATE
PUSHBUTTON "作成(&C)", IDC_PARTCREATE, 7, 122, 50, 14
+ PUSHBUTTON "Format(&F)", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At
same position as IDC_PARTCREATE
PUSHBUTTON "削除(&D)", IDC_PARTDELETE, 63, 122, 50, 14
PUSHBUTTON "ドライバ(&R)", IDC_DEVICEDRIVER, 174, 122, 50, 14,
WS_DISABLED
PUSHBUTTON "上級者向け(&A)...", IDC_PARTMOREOPTS, 230, 122, 80, 14
// LTEXT "次へをクリックすれば、要約をチェックできます。", IDC_STATIC, 7, 128, 277, 8
END
-IDD_PARTITION DIALOGEX 0, 0, 175, 90
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "パーティションの作成"
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "パーティションを作成し、フォーマットします"
FONT 9, "MS UI Gothic"
BEGIN
- CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 129, 22,
9, 13
- CONTROL "パーティションを作成し、フォーマットします", IDC_STATIC, "Button",
BS_GROUPBOX, 6, 5, 161, 57
- LTEXT "サイズ:", IDC_STATIC, 13, 24, 27, 9
- EDITTEXT IDC_PARTSIZE, 83, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
- LTEXT "GB", IDC_UNIT, 142, 24, 14, 9
- LTEXT "ファイルシステム:", IDC_STATIC, 13, 46, 63, 9
- CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST, 83, 42, 73, 50
- PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
- PUSHBUTTON "キャンセル(&C)", IDCANCEL, 89, 68, 55, 15, WS_VISIBLE |
WS_TABSTOP
+ LTEXT "サイズ(&S):", IDC_STATIC, 7, 9, 70, 9
+ EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
+ CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
+ UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
+ LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
+ AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180,
14
+ LTEXT "ファイルシステム(&F):", IDC_FS_STATIC, 7, 46, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+ PUSHBUTTON "キャンセル", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Format Partition"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "ファイルシステム(&F):", IDC_FS_STATIC, 7, 9, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+ PUSHBUTTON "キャンセル", IDCANCEL, 143, 61, 50, 14
END
IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
FONT 9, "MS UI Gothic"
BEGIN
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
+ EDITTEXT IDC_PATH, 7, 23, 291, 13
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
+ DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
+ PUSHBUTTON "キャンセル", IDCANCEL, 248, 113, 50, 14
END
IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
IDS_ABORTSETUP2 "インストールを中断しますか?"
IDS_NO_TXTSETUP_SIF "'txtsetup.sif'が見つかりません。\nセットアップは続行できません。"
IDS_CAPTION "ReactOS セットアップ"
+ IDS_VOLUME_NOFORMAT "Not formatted"
END
STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
IDS_BOOTLOADER_VBRONLY "VBRのみ"
END
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+ IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+ IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+ IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+ IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+ IDS_COPYING "Copying %s"
+ IDS_MOVING "Moving %s to %s"
+ IDS_RENAMING "Renaming %s to %s"
+ IDS_DELETING "Deleting %s"
+
+ IDS_PREPARE_PARTITIONS "Preparing partitions..."
+ IDS_PREPARE_FILES "Preparing the list of files to be copied, please
wait..."
+ IDS_COPYING_FILES "Copying the files..."
+END
+
/* Error Strings */
STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
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."
+
+ IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+ IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+ IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+ IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected
partition?"
+ IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the
selected extended partition and ALL the logical partitions it contains?"
+
+ IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+ IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system
partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+ IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to
format the partition."
+
+ IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in
%s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n
%s\n"
+
+ IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition
formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status
0x%08lx)."
END
diff --git a/base/setup/reactos/lang/ms-MY.rc b/base/setup/reactos/lang/ms-MY.rc
index 30ba678c20e..0a217d2e948 100644
--- a/base/setup/reactos/lang/ms-MY.rc
+++ b/base/setup/reactos/lang/ms-MY.rc
@@ -57,27 +57,43 @@ CAPTION "ReactOS Persediaan"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
- PUSHBUTTON "Men&cipta", IDC_PARTCREATE, 7, 122, 50, 15
- PUSHBUTTON "Hapus(&D)", IDC_PARTDELETE, 63, 122, 50, 15
- PUSHBUTTON "Pemacu(&R)", IDC_DEVICEDRIVER, 174, 122, 50, 15,
WS_DISABLED
- PUSHBUTTON "Opsyen l&anjutan...", IDC_PARTMOREOPTS, 230, 122, 80, 15
- // LTEXT "Klik Seterusnya untuk menyemak ringkasan.", IDC_STATIC, 10, 180,
277, 20
+ PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "Men&cipta", IDC_PARTCREATE, 7, 122, 50, 14
+ PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "Hapus(&D)", IDC_PARTDELETE, 63, 122, 50, 14
+ PUSHBUTTON "Pemacu(&R)", IDC_DEVICEDRIVER, 174, 122, 50, 14,
WS_DISABLED
+ PUSHBUTTON "Opsyen l&anjutan...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+ // LTEXT "Klik Seterusnya untuk menyemak ringkasan.", IDC_STATIC, 7, 128,
277, 8
END
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Membuat Partition"
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Cipta dan format partition"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "&Saiz:", IDC_STATIC, 7, 9, 70, 9
+ EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
+ CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
+ UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
+ LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
+ AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180,
14
+ LTEXT "Sistem &fail:", IDC_FS_STATIC, 7, 46, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+ PUSHBUTTON "Batal", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Format partition"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22,
9, 13
- CONTROL "Cipta dan format partition", IDC_STATIC, "Button",
BS_GROUPBOX, 7, 5, 129, 57
- LTEXT "Saiz:", IDC_STATIC, 13, 24, 27, 9
- EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
- LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
- LTEXT "Sistem fail:", IDC_STATIC, 13, 46, 42, 9
- CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST, 58, 42, 73, 50
- PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
- PUSHBUTTON "Batal(&C)", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
+ LTEXT "Sistem &fail:", IDC_FS_STATIC, 7, 9, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+ PUSHBUTTON "Batal", IDCANCEL, 143, 61, 50, 14
END
IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -86,12 +102,12 @@ CAPTION "Advanced Installation Options"
FONT 8, "MS Shell Dlg"
BEGIN
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
+ EDITTEXT IDC_PATH, 7, 23, 291, 13
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
+ DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
+ PUSHBUTTON "Batal", IDCANCEL, 248, 113, 50, 14
END
IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -162,6 +178,7 @@ BEGIN
IDS_ABORTSETUP2 "Henti paksa pemasangan?"
IDS_NO_TXTSETUP_SIF "Persediaan tidak dapat mencari
'txtsetup.sif'.\nPersediaan tidak dapat meneruskan."
IDS_CAPTION "ReactOS Persediaan"
+ IDS_VOLUME_NOFORMAT "Not formatted"
END
STRINGTABLE
@@ -188,6 +205,26 @@ BEGIN
IDS_BOOTLOADER_VBRONLY "VBR sahaja"
END
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+ IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+ IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+ IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+ IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+ IDS_COPYING "Copying %s"
+ IDS_MOVING "Moving %s to %s"
+ IDS_RENAMING "Renaming %s to %s"
+ IDS_DELETING "Deleting %s"
+
+ IDS_PREPARE_PARTITIONS "Preparing partitions..."
+ IDS_PREPARE_FILES "Preparing the list of files to be copied, please
wait..."
+ IDS_COPYING_FILES "Copying the files..."
+END
+
/* Error Strings */
STRINGTABLE
@@ -197,8 +234,35 @@ BEGIN
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."
+
+ IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+ IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+ IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+ IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected
partition?"
+ IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the
selected extended partition and ALL the logical partitions it contains?"
+
+ IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+ IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system
partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+ IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to
format the partition."
+
+ IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in
%s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n
%s\n"
+
+ IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition
formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status
0x%08lx)."
END
diff --git a/base/setup/reactos/lang/no-NO.rc b/base/setup/reactos/lang/no-NO.rc
index 703cc2054ed..4dd353f5505 100644
--- a/base/setup/reactos/lang/no-NO.rc
+++ b/base/setup/reactos/lang/no-NO.rc
@@ -55,27 +55,43 @@ CAPTION "ReactOS installering"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
- PUSHBUTTON "&Opprett", IDC_PARTCREATE, 7, 122, 50, 15
- PUSHBUTTON "&Slett", IDC_PARTDELETE, 63, 122, 50, 15
- PUSHBUTTON "S&tasjon", IDC_DEVICEDRIVER, 174, 122, 50, 15,
WS_DISABLED
- PUSHBUTTON "&Avansert valg...", IDC_PARTMOREOPTS, 230, 122, 80, 15
- // LTEXT "Trykk på Neste for å starte installasjon prosessen.", IDC_STATIC,
10, 180, 277, 20
+ PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Opprett", IDC_PARTCREATE, 7, 122, 50, 14
+ PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Slett", IDC_PARTDELETE, 63, 122, 50, 14
+ PUSHBUTTON "S&tasjon", IDC_DEVICEDRIVER, 174, 122, 50, 14,
WS_DISABLED
+ PUSHBUTTON "&Avansert valg...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+ // LTEXT "Trykk på Neste for å starte installasjon prosessen.", IDC_STATIC,
7, 128, 277, 8
END
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Opprett partisjon"
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Opprett og formater partisjon"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "&Størrelse:", IDC_STATIC, 7, 9, 70, 9
+ EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
+ CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
+ UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
+ LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
+ AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180,
14
+ LTEXT "&Filsystem:", IDC_FS_STATIC, 7, 46, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+ PUSHBUTTON "Avbryt", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Formater partisjon"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22,
9, 13
- CONTROL "Opprett og formater partisjon", IDC_STATIC, "Button",
BS_GROUPBOX, 7, 5, 129, 57
- LTEXT "Størrelse:", IDC_STATIC, 13, 24, 27, 9
- EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
- LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
- LTEXT "Filsystem:", IDC_STATIC, 13, 46, 42, 9
- CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST, 58, 42, 73, 50
- PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
- PUSHBUTTON "&Avbryt", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
+ LTEXT "&Filsystem:", IDC_FS_STATIC, 7, 9, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+ PUSHBUTTON "Avbryt", IDCANCEL, 143, 61, 50, 14
END
IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
FONT 8, "MS Shell Dlg"
BEGIN
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
+ EDITTEXT IDC_PATH, 7, 23, 291, 13
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
+ DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
+ PUSHBUTTON "Avbryt", IDCANCEL, 248, 113, 50, 14
END
IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
IDS_ABORTSETUP2 "Avbryt installasjonen?"
IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to
continue."
IDS_CAPTION "ReactOS installering"
+ IDS_VOLUME_NOFORMAT "Not formatted"
END
STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
IDS_BOOTLOADER_VBRONLY "Bare VBR"
END
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+ IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+ IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+ IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+ IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+ IDS_COPYING "Copying %s"
+ IDS_MOVING "Moving %s to %s"
+ IDS_RENAMING "Renaming %s to %s"
+ IDS_DELETING "Deleting %s"
+
+ IDS_PREPARE_PARTITIONS "Preparing partitions..."
+ IDS_PREPARE_FILES "Preparing the list of files to be copied, please
wait..."
+ IDS_COPYING_FILES "Copying the files..."
+END
+
/* Error Strings */
STRINGTABLE
@@ -195,8 +232,35 @@ BEGIN
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."
+
+ IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+ IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+ IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+ IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected
partition?"
+ IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the
selected extended partition and ALL the logical partitions it contains?"
+
+ IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+ IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system
partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+ IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to
format the partition."
+
+ IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in
%s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n
%s\n"
+
+ IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition
formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status
0x%08lx)."
END
diff --git a/base/setup/reactos/lang/pl-PL.rc b/base/setup/reactos/lang/pl-PL.rc
index b359f7a75ed..b9cc2a83c7a 100644
--- a/base/setup/reactos/lang/pl-PL.rc
+++ b/base/setup/reactos/lang/pl-PL.rc
@@ -66,27 +66,43 @@ CAPTION "Instalator systemu ReactOS"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
- PUSHBUTTON "&Utwórz", IDC_PARTCREATE, 7, 122, 50, 15
- PUSHBUTTON "U&suń", IDC_PARTDELETE, 63, 122, 50, 15
- PUSHBUTTON "S&terownik", IDC_DEVICEDRIVER, 169, 122, 50, 15,
WS_DISABLED
- PUSHBUTTON "&Opcje zaawansowane...", IDC_PARTMOREOPTS, 225, 122, 86,
15
- // LTEXT "Kliknij Dalej, aby rozpocząć proces instalacji.", IDC_STATIC, 10,
180, 277, 20
+ PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Utwórz", IDC_PARTCREATE, 7, 122, 50, 14
+ PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "U&suń", IDC_PARTDELETE, 63, 122, 50, 14
+ PUSHBUTTON "S&terownik", IDC_DEVICEDRIVER, 169, 122, 50, 14,
WS_DISABLED
+ PUSHBUTTON "&Opcje zaawansowane...", IDC_PARTMOREOPTS, 225, 122, 86,
14
+ // LTEXT "Kliknij Dalej, aby rozpocząć proces instalacji.", IDC_STATIC, 7,
128, 277, 8
END
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Utwórz partycję"
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Utwórz i sformatuj partycję"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "&Rozmiar:",IDC_STATIC, 7, 9, 70, 9
+ EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
+ CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
+ UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
+ LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
+ AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180,
14
+ LTEXT "&System plików:", IDC_FS_STATIC, 7, 46, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+ PUSHBUTTON "Anuluj", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Sformatuj partycję"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22,
9, 13
- CONTROL "Utwórz i sformatuj partycję", IDC_STATIC, "Button",
BS_GROUPBOX, 7, 5, 129, 57
- LTEXT "Rozmiar:",IDC_STATIC, 13, 24, 27, 9
- EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
- LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
- LTEXT "System plików:", IDC_STATIC, 13, 46, 42, 9
- CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST, 58, 42, 73, 50
- PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
- PUSHBUTTON "&Anuluj", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
+ LTEXT "&System plików:", IDC_FS_STATIC, 7, 9, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+ PUSHBUTTON "Anuluj", IDCANCEL, 143, 61, 50, 14
END
IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -95,12 +111,12 @@ CAPTION "Advanced Installation Options"
FONT 8, "MS Shell Dlg"
BEGIN
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
+ EDITTEXT IDC_PATH, 7, 23, 291, 13
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
+ DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
+ PUSHBUTTON "Anuluj", IDCANCEL, 248, 113, 50, 14
END
IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -171,6 +187,7 @@ BEGIN
IDS_ABORTSETUP2 "Czy na pewno chcesz przerwać instalację?"
IDS_NO_TXTSETUP_SIF "Nie można znaleźć pliku 'txtsetup.sif'.\nInstalator
nie może kontynuować."
IDS_CAPTION "Instalator systemu ReactOS"
+ IDS_VOLUME_NOFORMAT "Not formatted"
END
STRINGTABLE
@@ -197,6 +214,26 @@ BEGIN
IDS_BOOTLOADER_VBRONLY "Tylko VBR"
END
+/* Progress Strings */
+
+STRINGTABLE
+BEGIN
+ IDS_FORMATTING_PROGRESS1 "Formatting volume %c: (%s) in %s..."
+ IDS_FORMATTING_PROGRESS2 "Formatting volume %s in %s..."
+
+ IDS_CHECKING_PROGRESS1 "Checking volume %c: (%s)..."
+ IDS_CHECKING_PROGRESS2 "Checking volume %s..."
+
+ IDS_COPYING "Copying %s"
+ IDS_MOVING "Moving %s to %s"
+ IDS_RENAMING "Renaming %s to %s"
+ IDS_DELETING "Deleting %s"
+
+ IDS_PREPARE_PARTITIONS "Preparing partitions..."
+ IDS_PREPARE_FILES "Preparing the list of files to be copied, please
wait..."
+ IDS_COPYING_FILES "Copying the files..."
+END
+
/* Error Strings */
STRINGTABLE
@@ -206,8 +243,35 @@ BEGIN
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."
+
+ IDS_ERROR_CREATE_PARTITION_TITLE "Create partition"
+ IDS_ERROR_CREATE_PARTITION "Failed to create a new partition."
+
+ IDS_WARN_DELETE_PARTITION_TITLE "Delete partition?"
+ IDS_WARN_DELETE_PARTITION "Are you sure you want to delete the selected
partition?"
+ IDS_WARN_DELETE_MBR_EXTENDED_PARTITION "Are you sure you want to delete the
selected extended partition and ALL the logical partitions it contains?"
+
+ IDS_ERROR_WRITE_PTABLE "Setup failed to write partition tables."
+
+ IDS_ERROR_SYSTEM_PARTITION "The ReactOS Setup could not find a supported system
partition\n\
+on your system or could not create a new one. Without such a partition\n\
+the Setup program cannot install ReactOS.\
+\nClick on OK to return to the partition selection list."
+
+ IDS_ERROR_FORMAT_UNRECOGNIZED_VOLUME "Unrecognized volume while attempting to
format the partition."
+
+ IDS_ERROR_COULD_NOT_FORMAT "Setup is currently unable to format a partition in
%s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_FORMATTING_PARTITION "Setup is unable to format the partition:\n
%s\n"
+
+ IDS_ERROR_COULD_NOT_CHECK "Setup is currently unable to check a partition
formatted in %s.\n\
+\nClick on OK to continue Setup.\
+\nClick on CANCEL to quit Setup."
+
+ IDS_ERROR_CHECKING_PARTITION "ChkDsk detected some disk errors.\n(Status
0x%08lx)."
END
diff --git a/base/setup/reactos/lang/pt-BR.rc b/base/setup/reactos/lang/pt-BR.rc
index b20113bb5cc..a912761ebbc 100644
--- a/base/setup/reactos/lang/pt-BR.rc
+++ b/base/setup/reactos/lang/pt-BR.rc
@@ -55,27 +55,43 @@ CAPTION "Instalação do ReactOS"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER |
WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
- PUSHBUTTON "&Criar", IDC_PARTCREATE, 7, 122, 50, 15
- PUSHBUTTON "&Apagar", IDC_PARTDELETE, 63, 122, 50, 15
- PUSHBUTTON "D&rivers", IDC_DEVICEDRIVER, 174, 122, 50, 15,
WS_DISABLED
- PUSHBUTTON "&Opções Avançadas...", IDC_PARTMOREOPTS, 230, 122, 80, 15
- // LTEXT "Clique em Próximo para verificar o sumário.", IDC_STATIC, 10,
180, 277, 20
+ PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Criar", IDC_PARTCREATE, 7, 122, 50, 14
+ PUSHBUTTON "&Format", IDC_PARTFORMAT, 7, 122, 50, 14 // NOTE: At same
position as IDC_PARTCREATE
+ PUSHBUTTON "&Apagar", IDC_PARTDELETE, 63, 122, 50, 14
+ PUSHBUTTON "D&rivers", IDC_DEVICEDRIVER, 174, 122, 50, 14,
WS_DISABLED
+ PUSHBUTTON "&Opções Avançadas...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+ // LTEXT "Clique em Próximo para verificar o sumário.", IDC_STATIC, 7, 128,
277, 8
END
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
-STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Criar Partição"
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Criar e formatar partição"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "&Tamanho:", IDC_STATIC, 7, 9, 70, 9
+ EDITTEXT IDC_EDIT_PARTSIZE, 82, 7, 47, 13, ES_RIGHT | ES_NUMBER | WS_GROUP
+ CONTROL "", IDC_UPDOWN_PARTSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
+ UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 22, 9, 13
+ LTEXT "MB", IDC_UNIT, 134, 9, 14, 9
+ AUTOCHECKBOX "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180,
14
+ LTEXT "&Sistema de arquivo:", IDC_FS_STATIC, 7, 46, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 98, 50, 14
+ PUSHBUTTON "Cancelar", IDCANCEL, 143, 98, 50, 14
+END
+
+IDD_FORMAT DIALOGEX 0, 0, 200, 83
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Formatar partição"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22,
9, 13
- CONTROL "Criar e formatar partição", IDC_STATIC, "Button",
BS_GROUPBOX, 7, 5, 129, 57
- LTEXT "Tamanho:", IDC_STATIC, 13, 24, 27, 9
- EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
- LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
- LTEXT "Sistema de arquivo:", IDC_STATIC, 13, 46, 42, 9
- CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP |
CBS_DROPDOWNLIST, 58, 42, 73, 50
- PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
- PUSHBUTTON "&Cancelar", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE |
WS_TABSTOP
+ LTEXT "&Sistema de arquivo:", IDC_FS_STATIC, 7, 9, 70, 9
+ COMBOBOX IDC_FSTYPE, 82, 7, 100, 50, CBS_DROPDOWNLIST | WS_TABSTOP
+ AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 22, 180, 14
+ PUSHBUTTON "OK", IDOK, 88, 61, 50, 14
+ PUSHBUTTON "Cancelar", IDCANCEL, 143, 61, 50, 14
END
IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
@@ -84,12 +100,12 @@ CAPTION "Advanced Installation Options"
FONT 8, "MS Shell Dlg"
BEGIN
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
+ EDITTEXT IDC_PATH, 7, 23, 291, 13
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
+ DEFPUSHBUTTON "OK", IDOK, 193, 113, 50, 14
+ PUSHBUTTON "Cancelar", IDCANCEL, 248, 113, 50, 14
END
IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -160,6 +176,7 @@ BEGIN
IDS_ABORTSETUP2 "Abortar instalação?"
IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to
continue."
IDS_CAPTION "Instalação do ReactOS"
+ IDS_VOLUME_NOFORMAT "Not formatted"
END
STRINGTABLE
@@ -186,6 +203,26 @@ BEGIN
IDS_BOOTLOADER_VBRONLY "Apenas VBR"
END
+/* Progress Strings */
... 2769 lines suppressed ...