** WIP ** Investigate whether it's good to reset the RewritePartition flag once the partition layout has been committed...

[SETUPLIB][BOOTDATA] Rename "MBRInstallType" to "BootLoaderLocation"

Less hardcoded references to "MBR" for code that should be generic
is always better.

[SETUPLIB] Move the initialization of other default values into InitializeSetup()

[SETUPLIB] Store a machine architecture type to determine e.g. how the bootloader has to be installed, etc.

Currently hardcoded for BIOS-based PC-AT; will be determined
at runtime in the future.

It will be used in later commits.

[SETUP:REACTOS] Redesign the "Advanced Installation Options" dialog.

In particular, use now a dynamic combo-box for listing the possible
locations where the bootloader can be installed.

base/setup/lib/fsutil.c

@@ -1025,112 +1025,45 @@ EndCheck:
     return Result;
 }
 
-static BOOLEAN
+static
+PPARTENTRY
 GetNextUnformattedPartition(
-    IN PPARTLIST List,
-    OUT PPARTENTRY *pPartEntry)
+    _In_ PPARTLIST List,
+    _In_opt_ PPARTENTRY CurrentPart)
 {
-    PLIST_ENTRY Entry1, Entry2;
-    PDISKENTRY DiskEntry;
-    PPARTENTRY PartEntry;
-
-    for (Entry1 = List->DiskListHead.Flink;
-         Entry1 != &List->DiskListHead;
-         Entry1 = Entry1->Flink)
+    /* Loop each available disk and partition */
+    while ((CurrentPart = GetAdjPartition(List, CurrentPart,
+                                          ENUM_REGION_NEXT | ENUM_REGION_PARTITIONED)))
     {
-        DiskEntry = CONTAINING_RECORD(Entry1,
-                                      DISKENTRY,
-                                      ListEntry);
-
-        if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT)
+        if (CurrentPart->New /**/&& (CurrentPart->Volume.FormatState == Unformatted)/**/)
         {
-            DPRINT("GPT-partitioned disk detected, not currently supported by SETUP!\n");
-            continue;
-        }
-
-        for (Entry2 = DiskEntry->PrimaryPartListHead.Flink;
-             Entry2 != &DiskEntry->PrimaryPartListHead;
-             Entry2 = Entry2->Flink)
-        {
-            PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry);
-            if (PartEntry->IsPartitioned && PartEntry->New)
-            {
-                ASSERT(DiskEntry == PartEntry->DiskEntry);
-                *pPartEntry = PartEntry;
-                return TRUE;
-            }
-        }
-
-        for (Entry2 = DiskEntry->LogicalPartListHead.Flink;
-             Entry2 != &DiskEntry->LogicalPartListHead;
-             Entry2 = Entry2->Flink)
-        {
-            PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry);
-            if (PartEntry->IsPartitioned && PartEntry->New)
-            {
-                ASSERT(DiskEntry == PartEntry->DiskEntry);
-                *pPartEntry = PartEntry;
-                return TRUE;
-            }
+            /* Found a candidate, return it */
+            return CurrentPart;
         }
     }
 
-    *pPartEntry = NULL;
-    return FALSE;
+    return NULL;
 }
 
-static BOOLEAN
+static
+PPARTENTRY
 GetNextUncheckedPartition(
-    IN PPARTLIST List,
-    OUT PPARTENTRY *pPartEntry)
+    _In_ PPARTLIST List,
+    _In_opt_ PPARTENTRY CurrentPart)
 {
-    PLIST_ENTRY Entry1, Entry2;
-    PDISKENTRY DiskEntry;
-    PPARTENTRY PartEntry;
-
-    for (Entry1 = List->DiskListHead.Flink;
-         Entry1 != &List->DiskListHead;
-         Entry1 = Entry1->Flink)
+    /* Loop each available disk and partition */
+    while ((CurrentPart = GetAdjPartition(List, CurrentPart,
+                                          ENUM_REGION_NEXT | ENUM_REGION_PARTITIONED)))
     {
-        DiskEntry = CONTAINING_RECORD(Entry1,
-                                      DISKENTRY,
-                                      ListEntry);
-
-        if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT)
+        if (CurrentPart->Volume.NeedsCheck)
         {
-            DPRINT("GPT-partitioned disk detected, not currently supported by SETUP!\n");
-            continue;
-        }
-
-        for (Entry2 = DiskEntry->PrimaryPartListHead.Flink;
-             Entry2 != &DiskEntry->PrimaryPartListHead;
-             Entry2 = Entry2->Flink)
-        {
-            PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry);
-            if (PartEntry->IsPartitioned && PartEntry->NeedsCheck)
-            {
-                ASSERT(DiskEntry == PartEntry->DiskEntry);
-                *pPartEntry = PartEntry;
-                return TRUE;
-            }
-        }
-
-        for (Entry2 = DiskEntry->LogicalPartListHead.Flink;
-             Entry2 != &DiskEntry->LogicalPartListHead;
-             Entry2 = Entry2->Flink)
-        {
-            PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry);
-            if (PartEntry->IsPartitioned && PartEntry->NeedsCheck)
-            {
-                ASSERT(DiskEntry == PartEntry->DiskEntry);
-                *pPartEntry = PartEntry;
-                return TRUE;
-            }
+            /* Found a candidate, return it */
+            ASSERT(CurrentPart->Volume.FormatState == Formatted);
+            return CurrentPart;
         }
     }
 
-    *pPartEntry = NULL;
-    return FALSE;
+    return NULL;
 }
 
 BOOLEAN
@@ -1261,15 +1194,16 @@ NextFormat:
         }
 
         case FormatInstallVolume:
+            /* Restart partition enumeration */
+            PartEntry = NULL;
         case FormatOtherVolume:
         {
-            BOOLEAN Found = GetNextUnformattedPartition(PartitionList, &PartEntry);
-            if (Found) ASSERT(PartEntry);
+            PartEntry = GetNextUnformattedPartition(PartitionList, PartEntry);
 
             FormatState = (PartEntry ? FormatOtherVolume : FormatDone);
             DPRINT1("FormatState: %s --> %s\n",
                     FormatStateNames[OldFormatState], FormatStateNames[FormatState]);
-            if (Found)
+            if (PartEntry)
                 break;
             __fallthrough;
         }
@@ -1314,14 +1248,15 @@ StartCheckQueue:
     if (Result == FSVOL_ABORT)
         return FALSE;
 
+    PartEntry = NULL;
 NextCheck:
-    if (!GetNextUncheckedPartition(PartitionList, &PartEntry))
+    PartEntry = GetNextUncheckedPartition(PartitionList, PartEntry);
+    if (!PartEntry)
     {
         Success = TRUE;
         goto EndCheck;
     }
 
-    ASSERT(PartEntry);
     Result = DoChecking(PartEntry, Context, FsVolCallback);
     if (Result == FSVOL_ABORT)
     {

base/setup/lib/setuplib.c

@@ -104,7 +104,7 @@ CheckUnattendedSetup(
 
     INF_FreeData(Value);
 
-    /* Search for 'DestinationDiskNumber' in the 'Unattend' section */
+    /* Search for 'DestinationDiskNumber' */
     if (!SpInfFindFirstLine(UnattendInf, L"Unattend", L"DestinationDiskNumber", &Context))
     {
         DPRINT("SpInfFindFirstLine() failed for key 'DestinationDiskNumber'\n");
@@ -119,7 +119,7 @@ CheckUnattendedSetup(
 
     pSetupData->DestinationDiskNumber = (LONG)IntValue;
 
-    /* Search for 'DestinationPartitionNumber' in the 'Unattend' section */
+    /* Search for 'DestinationPartitionNumber' */
     if (!SpInfFindFirstLine(UnattendInf, L"Unattend", L"DestinationPartitionNumber", &Context))
     {
         DPRINT("SpInfFindFirstLine() failed for key 'DestinationPartitionNumber'\n");
@@ -134,56 +134,47 @@ CheckUnattendedSetup(
 
     pSetupData->DestinationPartitionNumber = (LONG)IntValue;
 
-    /* Search for 'InstallationDirectory' in the 'Unattend' section (optional) */
+    /* Search for 'InstallationDirectory' (optional) */
     if (SpInfFindFirstLine(UnattendInf, L"Unattend", L"InstallationDirectory", &Context))
     {
-        /* Get pointer 'InstallationDirectory' key */
-        if (!INF_GetData(&Context, NULL, &Value))
+        if (INF_GetData(&Context, NULL, &Value))
+        {
+            RtlStringCchCopyW(pSetupData->InstallationDirectory,
+                              ARRAYSIZE(pSetupData->InstallationDirectory),
+                              Value);
+            INF_FreeData(Value);
+        }
+        else
         {
             DPRINT("INF_GetData() failed for key 'InstallationDirectory'\n");
-            goto Quit;
         }
-
-        RtlStringCchCopyW(pSetupData->InstallationDirectory,
-                          ARRAYSIZE(pSetupData->InstallationDirectory),
-                          Value);
-
-        INF_FreeData(Value);
     }
 
     IsUnattendedSetup = TRUE;
     DPRINT("Running unattended setup\n");
 
-    /* Search for 'MBRInstallType' in the 'Unattend' section */
-    pSetupData->MBRInstallType = -1;
-    if (SpInfFindFirstLine(UnattendInf, L"Unattend", L"MBRInstallType", &Context))
+    /* Search for 'BootLoaderLocation' (optional) */
+    if (SpInfFindFirstLine(UnattendInf, L"Unattend", L"BootLoaderLocation", &Context))
     {
         if (SpInfGetIntField(&Context, 1, &IntValue))
-        {
-            pSetupData->MBRInstallType = IntValue;
-        }
+            pSetupData->BootLoaderLocation = IntValue;
     }
 
-    /* Search for 'FormatPartition' in the 'Unattend' section */
-    pSetupData->FormatPartition = 0;
+    /* Search for 'FormatPartition' (optional) */
     if (SpInfFindFirstLine(UnattendInf, L"Unattend", L"FormatPartition", &Context))
     {
         if (SpInfGetIntField(&Context, 1, &IntValue))
-        {
             pSetupData->FormatPartition = IntValue;
-        }
     }
 
-    pSetupData->AutoPartition = 0;
+    /* Search for 'AutoPartition' (optional) */
     if (SpInfFindFirstLine(UnattendInf, L"Unattend", L"AutoPartition", &Context))
     {
         if (SpInfGetIntField(&Context, 1, &IntValue))
-        {
             pSetupData->AutoPartition = IntValue;
-        }
     }
 
-    /* Search for LocaleID in the 'Unattend' section */
+    /* Search for 'LocaleID' (optional) */
     if (SpInfFindFirstLine(UnattendInf, L"Unattend", L"LocaleID", &Context))
     {
         if (INF_GetData(&Context, NULL, &Value))
@@ -193,17 +184,14 @@ CheckUnattendedSetup(
                                 ARRAYSIZE(pSetupData->LocaleID),
                                 L"%08lx", Id);
             INF_FreeData(Value);
-       }
+        }
     }
 
-    /* Search for FsType in the 'Unattend' section */
-    pSetupData->FsType = 0;
+    /* Search for 'FsType' (optional) */
     if (SpInfFindFirstLine(UnattendInf, L"Unattend", L"FsType", &Context))
     {
         if (SpInfGetIntField(&Context, 1, &IntValue))
-        {
             pSetupData->FsType = IntValue;
-        }
     }
 
 Quit:
@@ -929,6 +917,14 @@ InitializeSetup(
         DPRINT1("SourceRootPath (1): '%wZ'\n", &pSetupData->SourceRootPath);
         DPRINT1("SourceRootDir (1): '%wZ'\n", &pSetupData->SourceRootDir);
 
+        /* Set up default values */
+        pSetupData->DestinationDiskNumber = 0;
+        pSetupData->DestinationPartitionNumber = 1;
+        pSetupData->BootLoaderLocation = 2; // Default to "System partition"
+        pSetupData->FormatPartition = 0;
+        pSetupData->AutoPartition = 0;
+        pSetupData->FsType = 0;
+
         /* Load 'txtsetup.sif' from the installation media */
         Error = LoadSetupInf(pSetupData);
         if (Error != ERROR_SUCCESS)
@@ -940,6 +936,16 @@ InitializeSetup(
         DPRINT1("SourceRootPath (2): '%wZ'\n", &pSetupData->SourceRootPath);
         DPRINT1("SourceRootDir (2): '%wZ'\n", &pSetupData->SourceRootDir);
 
+        /* Retrieve the target machine architecture type */
+        // FIXME: This should be determined at runtime!!
+        // FIXME: Allow for (pre-)installing on an architecture
+        //        different from the current one?
+#if defined(SARCH_PC98)
+        pSetupData->ArchType = ARCH_NEC98x86;
+#else // SARCH_XBOX also? TODO: UEFI
+        pSetupData->ArchType = ARCH_PcAT;
+#endif
+
         return ERROR_SUCCESS;
     }
 

base/setup/lib/setuplib.h

@@ -66,6 +66,15 @@ struct _USETUP_DATA;
 typedef VOID
 (__cdecl *PSETUP_ERROR_ROUTINE)(IN struct _USETUP_DATA*, ...);
 
+typedef enum _ARCHITECTURE_TYPE
+{
+    ARCH_PcAT,      //< Standard BIOS-based PC-AT
+    ARCH_NEC98x86,  //< NEC PC-98
+    ARCH_Arc,       //< ARC-based (MIPS, SGI)
+    ARCH_Efi,       //< EFI and UEFI
+// Place other architectures supported by the Setup below.
+} ARCHITECTURE_TYPE;
+
 typedef struct _USETUP_DATA
 {
 /* Error handling *****/
@@ -110,7 +119,7 @@ typedef struct _USETUP_DATA
     LONG DestinationDiskNumber;
     LONG DestinationPartitionNumber;
 
-    LONG MBRInstallType;
+    LONG BootLoaderLocation;
     LONG FormatPartition;
     LONG AutoPartition;
     LONG FsType;
@@ -123,6 +132,7 @@ typedef struct _USETUP_DATA
     PGENERIC_LIST LanguageList;
 
 /* Settings *****/
+    ARCHITECTURE_TYPE ArchType; //< Target architecture (MachineType)
     PCWSTR ComputerType;
     PCWSTR DisplayType;
     // PCWSTR KeyboardDriver;

base/setup/lib/utils/osdetect.c

@@ -46,22 +46,20 @@ FindExistingNTOSInstall(
 
 static PNTOS_INSTALLATION
 AddNTOSInstallation(
-    IN PGENERIC_LIST List,
-    IN PCWSTR InstallationName,
-    IN USHORT Machine,
-    IN PCWSTR VendorName,
-    IN PCWSTR SystemRootArcPath,
-    IN PUNICODE_STRING SystemRootNtPath, // or PCWSTR ?
-    IN PCWSTR PathComponent,    // Pointer inside SystemRootNtPath buffer
-    IN ULONG DiskNumber,
-    IN ULONG PartitionNumber,
-    IN PPARTENTRY PartEntry OPTIONAL);
+    _In_ PGENERIC_LIST List,
+    _In_ PCWSTR InstallationName,
+    _In_ USHORT Machine,
+    _In_ PCWSTR VendorName,
+    _In_ PCWSTR SystemRootArcPath,
+    _In_ PUNICODE_STRING SystemRootNtPath, // or PCWSTR ?
+    _In_ PCWSTR PathComponent,    // Pointer inside SystemRootNtPath buffer
+    _In_ ULONG DiskNumber,
+    _In_ ULONG PartitionNumber);
 
 typedef struct _ENUM_INSTALLS_DATA
 {
     IN OUT PGENERIC_LIST List;
     IN PPARTLIST PartList;
-    // IN PPARTENTRY PartEntry;
 } ENUM_INSTALLS_DATA, *PENUM_INSTALLS_DATA;
 
 // PENUM_BOOT_ENTRIES_ROUTINE
@@ -78,7 +76,6 @@ EnumerateInstallations(
 
     ULONG DiskNumber = 0, PartitionNumber = 0;
     PCWSTR PathComponent = NULL;
-    PPARTENTRY PartEntry = NULL;
 
     UNICODE_STRING SystemRootPath;
     WCHAR SystemRoot[MAX_PATH];
@@ -136,9 +133,9 @@ EnumerateInstallations(
     }
 
     /*
-     * Convert the ARC path into an NT path, from which we will deduce
-     * the real disk drive & partition on which the candidate installation
-     * resides, as well verifying whether it is indeed an NTOS installation.
+     * Convert the ARC path into an NT path, from which we will deduce the
+     * real disk drive & partition on which the candidate installation resides,
+     * as well as verifying whether it is indeed an NTOS installation.
      */
     RtlInitEmptyUnicodeString(&SystemRootPath, SystemRoot, sizeof(SystemRoot));
     if (!ArcPathToNtPath(&SystemRootPath, Options->OsLoadPath, Data->PartList))
@@ -182,14 +179,6 @@ EnumerateInstallations(
     {
         DPRINT("SystemRootPath = '%wZ' points to disk #%d, partition #%d, path '%S'\n",
                &SystemRootPath, DiskNumber, PartitionNumber, PathComponent);
-
-        /* Retrieve the corresponding partition */
-        PartEntry = SelectPartition(Data->PartList, DiskNumber, PartitionNumber);
-        if (!PartEntry)
-        {
-            DPRINT1("SelectPartition(disk #%d, partition #%d) failed\n",
-                    DiskNumber, PartitionNumber);
-        }
     }
     else
     {
@@ -203,7 +192,7 @@ EnumerateInstallations(
                         VendorName.Buffer, // FIXME: What if it's not NULL-terminated?
                         Options->OsLoadPath,
                         &SystemRootPath, PathComponent,
-                        DiskNumber, PartitionNumber, PartEntry);
+                        DiskNumber, PartitionNumber);
 
     /* Continue the enumeration */
     return STATUS_SUCCESS;
@@ -607,16 +596,15 @@ FindExistingNTOSInstall(
 
 static PNTOS_INSTALLATION
 AddNTOSInstallation(
-    IN PGENERIC_LIST List,
-    IN PCWSTR InstallationName,
-    IN USHORT Machine,
-    IN PCWSTR VendorName,
-    IN PCWSTR SystemRootArcPath,
-    IN PUNICODE_STRING SystemRootNtPath, // or PCWSTR ?
-    IN PCWSTR PathComponent,    // Pointer inside SystemRootNtPath buffer
-    IN ULONG DiskNumber,
-    IN ULONG PartitionNumber,
-    IN PPARTENTRY PartEntry OPTIONAL)
+    _In_ PGENERIC_LIST List,
+    _In_ PCWSTR InstallationName,
+    _In_ USHORT Machine,
+    _In_ PCWSTR VendorName,
+    _In_ PCWSTR SystemRootArcPath,
+    _In_ PUNICODE_STRING SystemRootNtPath, // or PCWSTR ?
+    _In_ PCWSTR PathComponent,    // Pointer inside SystemRootNtPath buffer
+    _In_ ULONG DiskNumber,
+    _In_ ULONG PartitionNumber)
 {
     PNTOS_INSTALLATION NtOsInstall;
     SIZE_T ArcPathLength, NtPathLength;
@@ -648,7 +636,6 @@ AddNTOSInstallation(
 
     NtOsInstall->DiskNumber = DiskNumber;
     NtOsInstall->PartitionNumber = PartitionNumber;
-    NtOsInstall->PartEntry = PartEntry;
 
     NtOsInstall->Machine = Machine;
 
@@ -759,86 +746,32 @@ FindNTOSInstallations(
     NtClose(PartitionDirectoryHandle);
 }
 
-// static
-FORCEINLINE BOOLEAN
-ShouldICheckThisPartition(
-    IN PPARTENTRY PartEntry)
-{
-    if (!PartEntry)
-        return FALSE;
-
-    return PartEntry->IsPartitioned &&
-           !IsContainerPartition(PartEntry->PartitionType) /* alternatively: PartEntry->PartitionNumber != 0 */ &&
-           !PartEntry->New &&
-           (PartEntry->FormatState == Preformatted /* || PartEntry->FormatState == Formatted */);
-}
-
 // EnumerateNTOSInstallations
 PGENERIC_LIST
 CreateNTOSInstallationsList(
     IN PPARTLIST PartList)
 {
     PGENERIC_LIST List;
-    PLIST_ENTRY Entry, Entry2;
-    PDISKENTRY DiskEntry;
-    PPARTENTRY PartEntry;
+    PPARTENTRY PartEntry = NULL;
 
     List = CreateGenericList();
-    if (List == NULL)
+    if (!List)
         return NULL;
 
-    /* Loop each available disk ... */
-    Entry = PartList->DiskListHead.Flink;
-    while (Entry != &PartList->DiskListHead)
+    /* Loop each available disk and partition */
+    while ((PartEntry = GetAdjPartition(PartList, PartEntry,
+                                        ENUM_REGION_NEXT | ENUM_REGION_PARTITIONED)))
     {
-        DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry);
-        Entry = Entry->Flink;
+        BOOLEAN CheckPartition =
+            (PartEntry->IsPartitioned &&
+             !IsContainerPartition(PartEntry->PartitionType) /* alternatively: PartEntry->PartitionNumber != 0 */ &&
+             !PartEntry->New &&
+             (PartEntry->Volume.FormatState == Formatted));
 
-        DPRINT("Disk #%d\n", DiskEntry->DiskNumber);
+        DPRINT("   -- Should I check it? %s\n", CheckPartition ? "YES!" : "NO!");
 
-        /* ... and for each disk, loop each available partition */
-
-        /* First, the primary partitions */
-        Entry2 = DiskEntry->PrimaryPartListHead.Flink;
-        while (Entry2 != &DiskEntry->PrimaryPartListHead)
-        {
-            PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry);
-            Entry2 = Entry2->Flink;
-
-            ASSERT(PartEntry->DiskEntry == DiskEntry);
-
-            DPRINT("   Primary Partition #%d, index %d - Type 0x%02x, IsLogical = %s, IsPartitioned = %s, IsNew = %s, FormatState = %lu -- Should I check it? %s\n",
-                   PartEntry->PartitionNumber, PartEntry->PartitionIndex,
-                   PartEntry->PartitionType, PartEntry->LogicalPartition ? "TRUE" : "FALSE",
-                   PartEntry->IsPartitioned ? "TRUE" : "FALSE",
-                   PartEntry->New ? "Yes" : "No",
-                   PartEntry->FormatState,
-                   ShouldICheckThisPartition(PartEntry) ? "YES!" : "NO!");
-
-            if (ShouldICheckThisPartition(PartEntry))
-                FindNTOSInstallations(List, PartList, PartEntry);
-        }
-
-        /* Then, the logical partitions (present in the extended partition) */
-        Entry2 = DiskEntry->LogicalPartListHead.Flink;
-        while (Entry2 != &DiskEntry->LogicalPartListHead)
-        {
-            PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry);
-            Entry2 = Entry2->Flink;
-
-            ASSERT(PartEntry->DiskEntry == DiskEntry);
-
-            DPRINT("   Logical Partition #%d, index %d - Type 0x%02x, IsLogical = %s, IsPartitioned = %s, IsNew = %s, FormatState = %lu -- Should I check it? %s\n",
-                   PartEntry->PartitionNumber, PartEntry->PartitionIndex,
-                   PartEntry->PartitionType, PartEntry->LogicalPartition ? "TRUE" : "FALSE",
-                   PartEntry->IsPartitioned ? "TRUE" : "FALSE",
-                   PartEntry->New ? "Yes" : "No",
-                   PartEntry->FormatState,
-                   ShouldICheckThisPartition(PartEntry) ? "YES!" : "NO!");
-
-            if (ShouldICheckThisPartition(PartEntry))
-                FindNTOSInstallations(List, PartList, PartEntry);
-        }
+        if (CheckPartition)
+            FindNTOSInstallations(List, PartList, PartEntry);
     }
 
 #ifndef NDEBUG

base/setup/lib/utils/osdetect.h

@@ -22,7 +22,6 @@ typedef struct _NTOS_INSTALLATION
     PCWSTR PathComponent;           // Pointer inside SystemNtPath.Buffer
     ULONG DiskNumber;
     ULONG PartitionNumber;
-    PPARTENTRY PartEntry;
     WCHAR InstallationName[MAX_PATH];
     WCHAR VendorName[MAX_PATH];
     // CHAR Data[ANYSIZE_ARRAY];

base/setup/lib/utils/partlist.h

@@ -12,6 +12,9 @@
 
 // NOTE: They should be moved into some global header.
 
+// /* We have to define it there, because it is not in the MS DDK */
+// #define PARTITION_LINUX 0x83
+
 /* OEM MBR partition types recognized by NT (see [MS-DMRP] Appendix B) */
 #define PARTITION_EISA          0x12    // EISA partition
 #define PARTITION_HIBERNATION   0x84    // Hibernation partition for laptops
@@ -108,8 +111,9 @@ typedef struct _DISKENTRY
     ULONG DiskNumber;
 //  SCSI_ADDRESS;
     USHORT Port;
-    USHORT Bus;
-    USHORT Id;
+    USHORT Bus;  // PathId;
+    USHORT Id;   // TargetId;
+    // USHORT Lun;
 
     /* Has the partition list been modified? */
     BOOLEAN Dirty;
@@ -234,6 +238,34 @@ RoundingDivide(
     ((DiskEntry)->SectorCount.QuadPart * (DiskEntry)->BytesPerSector)
 
 
+#define ENUM_REGION_NEXT                0x00 //< Enumerate the next region (default)
+#define ENUM_REGION_PREV                0x01 //< Enumerate the previous region
+#define ENUM_REGION_PARTITIONED         0x02 //< Enumerate only partitioned regions (otherwise, enumerate all regions, including free space)
+// 0x04, 0x08 reserved
+#define ENUM_REGION_MBR_PRIMARY_ONLY    0x10 //< MBR disks only: Enumerate only primary regions
+#define ENUM_REGION_MBR_LOGICAL_ONLY    0x20 //< MBR disks only: Enumerate only logical regions
+#define ENUM_REGION_MBR_BY_ORDER        0x40 //< MBR disks only: Enumerate by order on disk (may traverse extended partitions to enumerate the logical ones in-between), instead of by type (first all primary, then all logical)
+/*
+they are listed in actual
+order of appearance on a given disk. For example for MBR disks, all
+_primary_ partitions are enumerated first, before _logical_ partitions.
+*/
+// 0x80 reserved
+
+PPARTENTRY
+GetAdjDiskRegion(
+    _In_opt_ PDISKENTRY CurrentDisk,
+    _In_opt_ PPARTENTRY CurrentPart,
+    _In_ ULONG EnumFlags);
+
+PPARTENTRY
+GetAdjPartition(
+    _In_ PPARTLIST List,
+    _In_opt_ PPARTENTRY CurrentPart,
+    _In_ ULONG EnumFlags);
+
+
+
 BOOLEAN
 IsSuperFloppy(
     IN PDISKENTRY DiskEntry);
@@ -282,16 +314,6 @@ SelectPartition(
     _In_ ULONG DiskNumber,
     _In_ ULONG PartitionNumber);
 
-PPARTENTRY
-GetNextPartition(
-    IN PPARTLIST List,
-    IN PPARTENTRY CurrentPart OPTIONAL);
-
-PPARTENTRY
-GetPrevPartition(
-    IN PPARTLIST List,
-    IN PPARTENTRY CurrentPart OPTIONAL);
-
 ERROR_NUMBER
 PartitionCreationChecks(
     _In_ PPARTENTRY PartEntry);

base/setup/lib/utils/vollist.c

@@ -0,0 +1,418 @@
+/*
+ * PROJECT:         ReactOS DiskPart
+ * LICENSE:         GPL - See COPYING in the top level directory
+ * FILE:            base/system/diskpart/partlist.c
+ * PURPOSE:         Manages all the partitions of the OS in an interactive way.
+ * PROGRAMMERS:     Eric Kohl
+ */
+
+/* INCLUDES *******************************************************************/
+
+#include "diskpart.h"
+#include <ntddscsi.h>
+
+#define NDEBUG
+#include <debug.h>
+
+/* GLOBALS ********************************************************************/
+
+LIST_ENTRY VolumeListHead;
+
+/* FUNCTIONS THAT CAME FROM PARTLIST TODO USE THEM ****************************/
+
+// AssignDriveLetters
+
+// DetectFileSystem
+
+
+/* FUNCTIONS ******************************************************************/
+
+#if 0 // FIXME
+//
+// FIXME: Improve
+//
+static
+VOID
+GetVolumeExtents(
+    _In_ HANDLE VolumeHandle,
+    _In_ PVOLENTRY VolumeEntry)
+{
+    DWORD dwBytesReturned = 0, dwLength, i;
+    PVOLUME_DISK_EXTENTS pExtents;
+    BOOL bResult;
+    DWORD dwError;
+
+    dwLength = sizeof(VOLUME_DISK_EXTENTS);
+    pExtents = RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, dwLength);
+    if (pExtents == NULL)
+        return;
+
+    bResult = DeviceIoControl(VolumeHandle,
+                              IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS,
+                              NULL,
+                              0,
+                              pExtents,
+                              dwLength,
+                              &dwBytesReturned,
+                              NULL);
+    if (!bResult)
+    {
+        dwError = GetLastError();
+
+        if (dwError != ERROR_MORE_DATA)
+        {
+            RtlFreeHeap(ProcessHeap, 0, pExtents);
+            return;
+        }
+        else
+        {
+            dwLength = sizeof(VOLUME_DISK_EXTENTS) + ((pExtents->NumberOfDiskExtents - 1) * sizeof(DISK_EXTENT));
+            RtlFreeHeap(ProcessHeap, 0, pExtents);
+            pExtents = RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, dwLength);
+            if (pExtents == NULL)
+            {
+                return;
+            }
+
+            bResult = DeviceIoControl(VolumeHandle,
+                                      IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS,
+                                      NULL,
+                                      0,
+                                      pExtents,
+                                      dwLength,
+                                      &dwBytesReturned,
+                                      NULL);
+            if (!bResult)
+            {
+                RtlFreeHeap(ProcessHeap, 0, pExtents);
+                return;
+            }
+        }
+    }
+
+    for (i = 0; i < pExtents->NumberOfDiskExtents; i++)
+        VolumeEntry->Size.QuadPart += pExtents->Extents[i].ExtentLength.QuadPart;
+
+    VolumeEntry->pExtents = pExtents;
+}
+
+//
+// FIXME: Improve
+//
+static
+VOID
+GetVolumeType(
+    _In_ HANDLE VolumeHandle,
+    _In_ PVOLENTRY VolumeEntry)
+{
+    FILE_FS_DEVICE_INFORMATION DeviceInfo;
+    IO_STATUS_BLOCK IoStatusBlock;
+    NTSTATUS Status;
+
+    Status = NtQueryVolumeInformationFile(VolumeHandle,
+                                          &IoStatusBlock,
+                                          &DeviceInfo,
+                                          sizeof(FILE_FS_DEVICE_INFORMATION),
+                                          FileFsDeviceInformation);
+    if (!NT_SUCCESS(Status))
+        return;
+
+    switch (DeviceInfo.DeviceType)
+    {
+        case FILE_DEVICE_CD_ROM:
+        case FILE_DEVICE_CD_ROM_FILE_SYSTEM:
+            VolumeEntry->VolumeType = VOLUME_TYPE_CDROM;
+            break;
+
+        case FILE_DEVICE_DISK:
+        case FILE_DEVICE_DISK_FILE_SYSTEM:
+            if (DeviceInfo.Characteristics & FILE_REMOVABLE_MEDIA)
+                VolumeEntry->VolumeType = VOLUME_TYPE_REMOVABLE;
+            else
+                VolumeEntry->VolumeType = VOLUME_TYPE_PARTITION;
+            break;
+
+        default:
+            VolumeEntry->VolumeType = VOLUME_TYPE_UNKNOWN;
+            break;
+    }
+}
+
+//
+// FIXME: Improve
+//
+static
+VOID
+AddVolumeToList(
+    ULONG ulVolumeNumber,
+    PWSTR pszVolumeName)
+{
+    PVOLENTRY VolumeEntry;
+    HANDLE VolumeHandle;
+
+    DWORD dwError, dwLength;
+    WCHAR szPathNames[MAX_PATH + 1];
+    WCHAR szVolumeName[MAX_PATH + 1];
+    WCHAR szFilesystem[MAX_PATH + 1];
+
+    DWORD  CharCount            = 0;
+    size_t Index                = 0;
+
+    OBJECT_ATTRIBUTES ObjectAttributes;
+    UNICODE_STRING Name;
+    IO_STATUS_BLOCK Iosb;
+    NTSTATUS Status;
+
+    DPRINT("AddVolumeToList(%S)\n", pszVolumeName);
+
+    VolumeEntry = RtlAllocateHeap(ProcessHeap,
+                                  HEAP_ZERO_MEMORY,
+                                  sizeof(VOLENTRY));
+    if (VolumeEntry == NULL)
+        return;
+
+    VolumeEntry->VolumeNumber = ulVolumeNumber;
+    wcscpy(VolumeEntry->VolumeName, pszVolumeName);
+
+    Index = wcslen(pszVolumeName) - 1;
+
+    pszVolumeName[Index] = L'\0';
+
+    CharCount = QueryDosDeviceW(&pszVolumeName[4], VolumeEntry->DeviceName, ARRAYSIZE(VolumeEntry->DeviceName)); 
+
+    pszVolumeName[Index] = L'\\';
+
+    if (CharCount == 0)
+    {
+        RtlFreeHeap(ProcessHeap, 0, VolumeEntry);
+        return;
+    }
+
+    DPRINT("DeviceName: %S\n", VolumeEntry->DeviceName);
+
+    RtlInitUnicodeString(&Name, VolumeEntry->DeviceName);
+
+    InitializeObjectAttributes(&ObjectAttributes,
+                               &Name,
+                               0,
+                               NULL,
+                               NULL);
+
+    Status = NtOpenFile(&VolumeHandle,
+                        SYNCHRONIZE,
+                        &ObjectAttributes,
+                        &Iosb,
+                        0,
+                        FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT);
+    if (NT_SUCCESS(Status))
+    {
+        GetVolumeType(VolumeHandle, VolumeEntry);
+        GetVolumeExtents(VolumeHandle, VolumeEntry);
+        NtClose(VolumeHandle);
+    }
+
+    if (GetVolumeInformationW(pszVolumeName,
+                              szVolumeName,
+                              MAX_PATH + 1,
+                              NULL, //  [out, optional] LPDWORD lpVolumeSerialNumber,
+                              NULL, //  [out, optional] LPDWORD lpMaximumComponentLength,
+                              NULL, //  [out, optional] LPDWORD lpFileSystemFlags,
+                              szFilesystem,
+                              MAX_PATH + 1))
+    {
+        VolumeEntry->pszLabel = RtlAllocateHeap(ProcessHeap,
+                                                0,
+                                                (wcslen(szVolumeName) + 1) * sizeof(WCHAR));
+        if (VolumeEntry->pszLabel)
+            wcscpy(VolumeEntry->pszLabel, szVolumeName);
+
+        VolumeEntry->pszFilesystem = RtlAllocateHeap(ProcessHeap,
+                                                     0,
+                                                     (wcslen(szFilesystem) + 1) * sizeof(WCHAR));
+        if (VolumeEntry->pszFilesystem)
+            wcscpy(VolumeEntry->pszFilesystem, szFilesystem);
+    }
+    else
+    {
+        dwError = GetLastError();
+        if (dwError == ERROR_UNRECOGNIZED_VOLUME)
+        {
+            VolumeEntry->pszFilesystem = RtlAllocateHeap(ProcessHeap,
+                                                         0,
+                                                         (3 + 1) * sizeof(WCHAR));
+            if (VolumeEntry->pszFilesystem)
+                wcscpy(VolumeEntry->pszFilesystem, L"RAW");
+        }
+    }
+
+    if (GetVolumePathNamesForVolumeNameW(pszVolumeName,
+                                         szPathNames,
+                                         ARRAYSIZE(szPathNames),
+                                         &dwLength))
+    {
+        VolumeEntry->DriveLetter = szPathNames[0];
+    }
+
+    InsertTailList(&VolumeListHead,
+                   &VolumeEntry->ListEntry);
+}
+#endif
+
+//
+// FIXME: Improve; for the moment a temporary function is written below.
+//
+#if 0
+NTSTATUS
+CreateVolumeList(
+    _Out_ PLIST_ENTRY VolumeListHead)
+{
+    BOOL Success;
+    HANDLE hVolume = INVALID_HANDLE_VALUE;
+    ULONG ulVolumeNumber = 0;
+    WCHAR szVolumeName[MAX_PATH];
+
+    InitializeListHead(VolumeListHead);
+
+    hVolume = FindFirstVolumeW(szVolumeName, ARRAYSIZE(szVolumeName));
+    if (hVolume == INVALID_HANDLE_VALUE)
+    {
+        return STATUS_UNSUCCESSFUL;
+    }
+
+    AddVolumeToList(ulVolumeNumber++, szVolumeName);
+
+    for (;;)
+    {
+        Success = FindNextVolumeW(hVolume, szVolumeName, ARRAYSIZE(szVolumeName));
+        if (!Success)
+        {
+            break;
+        }
+
+        AddVolumeToList(ulVolumeNumber++, szVolumeName);
+    }
+
+    FindVolumeClose(hVolume);
+
+    return STATUS_SUCCESS;
+}
+#else
+NTSTATUS
+CreateVolumeList(
+    _Out_ PLIST_ENTRY VolumeListHead)
+{
+}
+#endif
+
+
+//
+// FIXME: Improve, see also DestroyVolumeList
+//
+#if 0
+VOID
+RemoveVolume(
+    _In_ PVOLENTRY VolumeEntry)
+{
+    RemoveEntryList(&VolumeEntry->ListEntry);
+
+    if (VolumeEntry->pszLabel)
+        RtlFreeHeap(ProcessHeap, 0, VolumeEntry->pszLabel);
+
+    if (VolumeEntry->pszFilesystem)
+        RtlFreeHeap(ProcessHeap, 0, VolumeEntry->pszFilesystem);
+
+    if (VolumeEntry->pExtents)
+        RtlFreeHeap(ProcessHeap, 0, VolumeEntry->pExtents);
+
+    /* Release volume entry */
+    RtlFreeHeap(ProcessHeap, 0, VolumeEntry);
+}
+#else
+VOID
+RemoveVolume(
+    _In_ PVOLENTRY VolumeEntry)
+{
+    // VolumeEntry->FormatState = Unformatted;
+    // VolumeEntry->FileSystem[0] = L'\0';
+    // VolumeEntry->DriveLetter = 0;
+    // RtlZeroMemory(VolumeEntry->VolumeLabel, sizeof(VolumeEntry->VolumeLabel));
+    RtlFreeHeap(ProcessHeap, 0, VolumeEntry);
+}
+#endif
+
+//
+// TODO: Improve, see also RemoveVolume
+//
+VOID
+DestroyVolumeList(
+    _In_ PLIST_ENTRY VolumeListHead)
+{
+    PLIST_ENTRY Entry;
+    PVOLENTRY VolumeEntry;
+
+    /* Release volume info */
+    while (!IsListEmpty(VolumeListHead))
+    {
+        Entry = RemoveHeadList(VolumeListHead);
+        VolumeEntry = CONTAINING_RECORD(Entry, VOLENTRY, ListEntry);
+
+        if (VolumeEntry->pszLabel)
+            RtlFreeHeap(ProcessHeap, 0, VolumeEntry->pszLabel);
+
+        if (VolumeEntry->pszFilesystem)
+            RtlFreeHeap(ProcessHeap, 0, VolumeEntry->pszFilesystem);
+
+        if (VolumeEntry->pExtents)
+            RtlFreeHeap(ProcessHeap, 0, VolumeEntry->pExtents);
+
+        /* Release volume entry */
+        RtlFreeHeap(ProcessHeap, 0, VolumeEntry);
+    }
+}
+
+// DismountVolume
+
+//
+// TODO: Improve. For example, do this calculation lookup while
+// listing the volumes during list creation, then here, just do
+// a quick lookup (for example each VOLENTRY could contain a
+// linked-list to the partition(s) on which it is based upon).
+//
+PVOLENTRY
+GetVolumeFromPartition(
+    _In_ PLIST_ENTRY VolumeListHead,
+    _In_ PPARTENTRY PartEntry)
+{
+    PLIST_ENTRY Entry;
+    PVOLENTRY VolumeEntry;
+    ULONG i;
+
+    if (!PartEntry || !PartEntry->DiskEntry)
+        return NULL;
+
+    for (Entry = VolumeListHead->Flink;
+         Entry != VolumeListHead;
+         Entry = Entry->Flink)
+    {
+        VolumeEntry = CONTAINING_RECORD(Entry, VOLENTRY, ListEntry);
+
+        if (VolumeEntry->pExtents == NULL)
+            return NULL;
+
+        for (i = 0; i < VolumeEntry->pExtents->NumberOfDiskExtents; i++)
+        {
+            if (VolumeEntry->pExtents->Extents[i].DiskNumber == PartEntry->DiskEntry->DiskNumber)
+            {
+                if ((VolumeEntry->pExtents->Extents[i].StartingOffset.QuadPart == PartEntry->StartSector.QuadPart * PartEntry->DiskEntry->BytesPerSector) &&
+                    (VolumeEntry->pExtents->Extents[i].ExtentLength.QuadPart == PartEntry->SectorCount.QuadPart * PartEntry->DiskEntry->BytesPerSector))
+                {
+                    return VolumeEntry;
+                }
+            }
+        }
+    }
+
+    return NULL;
+}
+
+/* EOF */

base/setup/lib/utils/vollist.h

@@ -0,0 +1,122 @@
+/*
+ * PROJECT:     ReactOS Setup Library
+ * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE:     Volume list functions
+ * COPYRIGHT:   Copyright 2018-2019 Hermes Belusca-Maito
+ */
+
+#pragma once
+
+/* EXTRA HANDFUL MACROS *****************************************************/
+
+// NOTE: They should be moved into some global header.
+
+// /* We have to define it there, because it is not in the MS DDK */
+// #define PARTITION_LINUX 0x83
+
+/* OEM MBR partition types recognized by NT (see [MS-DMRP] Appendix B) */
+#define PARTITION_EISA          0x12    // EISA partition
+#define PARTITION_HIBERNATION   0x84    // Hibernation partition for laptops
+#define PARTITION_DIAGNOSTIC    0xA0    // Diagnostic partition on some Hewlett-Packard (HP) notebooks
+#define PARTITION_DELL          0xDE    // Dell partition
+#define PARTITION_IBM           0xFE    // IBM Initial Microprogram Load (IML) partition
+
+#define IsOEMPartition(PartitionType) \
+    ( ((PartitionType) == PARTITION_EISA)        || \
+      ((PartitionType) == PARTITION_HIBERNATION) || \
+      ((PartitionType) == PARTITION_DIAGNOSTIC)  || \
+      ((PartitionType) == PARTITION_DELL)        || \
+      ((PartitionType) == PARTITION_IBM) )
+
+
+/* VOLUME UTILITY FUNCTIONS *************************************************/
+
+// FORMATSTATE
+
+typedef enum _VOLUME_TYPE
+{
+    VOLUME_TYPE_CDROM,
+    VOLUME_TYPE_PARTITION,
+    VOLUME_TYPE_REMOVABLE,
+    VOLUME_TYPE_UNKNOWN
+} VOLUME_TYPE, *PVOLUME_TYPE;
+
+#if 0
+//
+// This is the structure from diskpart
+//
+typedef struct _VOLENTRY
+{
+    LIST_ENTRY ListEntry;
+
+    ULONG VolumeNumber;
+    WCHAR VolumeName[MAX_PATH];
+    WCHAR DeviceName[MAX_PATH];
+
+    WCHAR DriveLetter;
+
+    PWSTR pszLabel;
+    PWSTR pszFilesystem;
+    VOLUME_TYPE VolumeType;
+    ULARGE_INTEGER Size;
+
+    PVOLUME_DISK_EXTENTS pExtents;
+
+} VOLENTRY, *PVOLENTRY;
+#else
+
+typedef struct _VOLENTRY_TEMP
+{
+    LIST_ENTRY ListEntry;
+
+    // ULONG PartitionNumber;       /* Current partition number, only valid for the currently running NTOS instance */
+
+    WCHAR DriveLetter;
+    WCHAR VolumeLabel[20];
+    WCHAR FileSystem[MAX_PATH+1];
+    FORMATSTATE FormatState;
+
+/** The following three properties may be replaced by flags **/
+
+    /* Volume is new and has not yet been actually formatted and mounted */
+    BOOLEAN New;
+
+    /* Volume must be checked */
+    BOOLEAN NeedsCheck;
+
+} VOLENTRY_TEMP, *PVOLENTRY_TEMP;
+
+#define VOLENTRY  VOLENTRY_TEMP
+#define PVOLENTRY PVOLENTRY_TEMP
+
+#endif
+
+// CreatePartition
+
+
+// static
+VOID
+AssignDriveLetters(
+    IN PPARTLIST List);
+
+NTSTATUS
+DetectFileSystem(
+    _Inout_ PPARTENTRY PartEntry) // FIXME: Replace by volume entry
+;
+
+NTSTATUS
+DismountVolume(
+    _In_ PPARTENTRY PartEntry) // FIXME: Replace by volume entry
+;
+
+// BOOLEAN
+// SetMountedDeviceValue(
+//     IN WCHAR Letter,
+//     IN ULONG Signature,
+//     IN LARGE_INTEGER StartingOffset);
+
+// BOOLEAN
+// SetMountedDeviceValues(
+//     IN PPARTLIST List);
+
+/* EOF */

base/setup/reactos/CMakeLists.txt

@@ -17,8 +17,8 @@ list(APPEND SOURCE
 file(GLOB reactos_rc_deps res/*.*)
 add_rc_deps(reactos.rc ${reactos_rc_deps})
 add_executable(reactos ${SOURCE} reactos.rc)
-set_module_type(reactos win32gui UNICODE)
 add_pch(reactos reactos.h SOURCE)
+set_module_type(reactos win32gui UNICODE)
 target_link_libraries(reactos uuid setuplib ext2lib vfatlib btrfslib)
 target_link_libraries(reactos zlib_solo) ## We use USETUP's cabinet implementation
 add_importlibs(reactos advapi32 gdi32 user32 comctl32 shlwapi setupapi msvcrt kernel32 ntdll)

base/setup/reactos/lang/bg-BG.rc

@@ -53,42 +53,44 @@ 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
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "&Създаване", IDC_PARTCREATE, 7, 122, 50, 14
+    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, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Създаване на дял"
+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_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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "&Файлова система:", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&Добре", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Отказ", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Разширени дялови настройски"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Папка за слагане", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Слагане на зареждач", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Слагане на начален зареждач (MBR и VBR) на твърдия диск", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Слагане на начален зареждач (само VBR) на твърдия диск", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Без слагане на начален зареждач", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&Добре", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Отказ", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Слагане на зареждач", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&Добре", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Отказ", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -173,3 +175,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR и VBR (Default)"        // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "Само VBR"                   // ""
+END

base/setup/reactos/lang/cs-CZ.rc

@@ -59,42 +59,44 @@ 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
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "&Vytvořit", IDC_PARTCREATE, 7, 122, 50, 14
+    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, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Vytvořit oddíl"
+CAPTION "Vytvořit a 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 "&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 (MBR disks only)", 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, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&OK", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Storno", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Pokročilá nastavení oddílu"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Instalační složka", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Instalace zavaděče", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Nainstalovat zavaděč na pevný disk (MBR a VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Nainstalovat zavaděč na pevný disk (jen VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Zavaděč neinstalovat", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Storno", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Instalace zavaděče", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Storno", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -179,3 +181,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR a VBR (Default)"        // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "Jen VBR"                    // ""
+END

base/setup/reactos/lang/de-DE.rc

@@ -53,42 +53,44 @@ 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
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "&Erstellen", IDC_PARTCREATE, 7, 122, 50, 14
+    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, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Erstelle Partition"
+CAPTION "Erstelle und 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 "&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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "&Dateisystem:", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&OK", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Abbrechen", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Erweiterte Partitionseinstellungen"
+CAPTION "Erweiterte Installationseinstellungen"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Installationsverzeichnis", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Bootloader-Installation", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Installiere Bootloader auf Festplatte (MBR und VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Installiere Bootloader auf Festplatte (nur VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Keine Bootloader-Installation", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Abbrechen", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader-Installation", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Abbrechen", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -173,3 +175,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "Keine Installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR und VBR (Default)"      // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "Nur VBR"                    // ""
+END

base/setup/reactos/lang/el-GR.rc

@@ -53,42 +53,44 @@ 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
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "&Δημιουργία", IDC_PARTCREATE, 7, 122, 50, 14
+    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, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Δημιουργία Partition"
+CAPTION "Create and 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_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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "&Τύπος συστήματος:", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&OK", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Άκυρο", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Ρυθμίσεις Partition για προχωρημένους"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Φάκελος εγκατάστασης", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Εγκατάσταση Boot loader", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Εγκατάσταση boot loader στο σκληρό δίσκο (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Εγκατάσταση boot loader στο σκληρό δίσκο (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Να μη γίνει εγκατάσταση του bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Άκυρο", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Εγκατάσταση Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Άκυρο", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -146,9 +148,9 @@ BEGIN
     IDS_DEVICETITLE "Setup the basic devices"
     IDS_DEVICESUBTITLE "Ορισμός ρυθμίσεων για εμφάνιση και πληκτρολόγιο."
     IDS_DRIVETITLE "Ρύθμιση του partition εγκατάστασης και του φακέλου συστήματος"
-    IDS_DRIVESUBTITLE "Προετοιμασία του partition εγκατάστασης, φακέλου συστήματος και boot loader."
+    IDS_DRIVESUBTITLE "Προετοιμασία του partition εγκατάστασης, φακέλου συστήματος και bootloader."
     IDS_PROCESSTITLE "Prepare partition, copy files and setup system"
-    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader"
+    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup bootloader"
     IDS_RESTARTTITLE "Το πρώτο στάδιο της εγκατάστασης ολοκληρώθηκε"
     IDS_RESTARTSUBTITLE "Το πρώτο στάδιο της εγκατάστασης ολοκληρώθηκε, κάντε επανεκκίνηση για να συνεχίσετε με το δεύτερο στάδιο."
     IDS_SUMMARYTITLE "Installation Summary"
@@ -173,3 +175,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR and VBR (Default)"      // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "VBR only"                   // ""
+END

base/setup/reactos/lang/en-US.rc

@@ -53,6 +53,7 @@ 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 the next button!
     PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 14
     PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 14
     PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
@@ -60,35 +61,36 @@ BEGIN
     // LTEXT "Click Next to check the summary.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Create Partition"
+CAPTION "Create and 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 "&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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "&File System:", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&OK", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Cancel", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Advanced Partition Settings"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Cancel", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader installation", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Cancel", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -146,9 +148,9 @@ BEGIN
     IDS_DEVICETITLE "Setup the basic devices"
     IDS_DEVICESUBTITLE "Set the settings of display and keyboard."
     IDS_DRIVETITLE "Setup the installation partition and system folder"
-    IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot loader."
+    IDS_DRIVESUBTITLE "Prepare installation partition, system folder and bootloader."
     IDS_PROCESSTITLE "Setup partition, copy files and setup system"
-    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader"
+    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup bootloader"
     IDS_RESTARTTITLE "First stage of setup finished"
     IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage"
     IDS_SUMMARYTITLE "Installation Summary"
@@ -173,3 +175,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR and VBR (Default)"      // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "VBR only"                   // ""
+END

base/setup/reactos/lang/es-ES.rc

@@ -62,42 +62,44 @@ 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
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "&Crear", IDC_PARTCREATE, 7, 122, 50, 14
+    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, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Crear Partición"
+CAPTION "Crear y 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 "&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 (MBR disks only)", 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, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&Aceptar", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Cancelar", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Ajustes avanzados de la partición"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Carpeta de instalación", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Instalación del cargador de arranque", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Instalar el cargador de arranque en el disco duro (MBR y VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Instalar el cargador de arranque en el disco duro (solo VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "No instalar el cargador de arranque", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&Aceptar", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Cancelar", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Instalación del cargador de arranque", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&Aceptar", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Cancelar", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -182,3 +184,12 @@ BEGIN
     IDS_PARTITION_SIZE "Tamaño"
     IDS_PARTITION_STATUS "Estado"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "No instalar"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR y VBR (Default)"        // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "Solo VBR"                   // ""
+END

base/setup/reactos/lang/et-EE.rc

@@ -53,42 +53,44 @@ 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
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "&Loo uus", IDC_PARTCREATE, 7, 122, 50, 14
+    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, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Partitsiooni loomine"
+CAPTION "Loo ja 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 "&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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "&Failisüsteem:", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&Olgu", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Tühista", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Täpsemad vormindamise seaded"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Paigaldamise kaust", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Alglaaduri paigaldamine", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Paigalda alglaadur kõvakettale (MBR ja VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Paigalda alglaadur kõvakettale (ainult VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Ära paigalda alglaadurit", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&Olgu", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Tühista", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Alglaaduri paigaldamine", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&Olgu", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Tühista", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -173,3 +175,12 @@ BEGIN
     IDS_PARTITION_SIZE "Suurus"
     IDS_PARTITION_STATUS "Olek"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR ja VBR (Default)"       // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "Ainult VBR"                 // ""
+END

base/setup/reactos/lang/eu-ES.rc

@@ -60,42 +60,44 @@ 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
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "&Crear", IDC_PARTCREATE, 7, 122, 50, 14
+    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, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Crear Partición"
+CAPTION "Crear y 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 "&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 (MBR disks only)", 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, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&Aceptar", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Cancelar", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Ajustes avanzados de la partición"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Carpeta de instalación", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Instalación del cargador de arranque", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Instalar el cargador de arranque en el disco duro (MBR y VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Instalar el cargador de arranque en el disco duro (solo VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "No instalar el cargador de arranque", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&Aceptar", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Cancelar", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Instalación del cargador de arranque", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&Aceptar", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Cancelar", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -180,3 +182,12 @@ BEGIN
     IDS_PARTITION_SIZE "Tamaño"
     IDS_PARTITION_STATUS "Estado"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "No instalar"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR y VBR (Default)"        // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "Solo VBR"                   // ""
+END

base/setup/reactos/lang/fi-FI.rc

@@ -53,42 +53,44 @@ 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
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 14
+    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, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Create Partition"
+CAPTION "Create and 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 "&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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "&File System:", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&OK", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Cancel", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Advanced Partition Settings"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Cancel", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader installation", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Cancel", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -146,9 +148,9 @@ BEGIN
     IDS_DEVICETITLE "Setup the basic devices"
     IDS_DEVICESUBTITLE "Set the settings of display and keyboard."
     IDS_DRIVETITLE "Setup the installation partition and system folder"
-    IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot loader."
+    IDS_DRIVESUBTITLE "Prepare installation partition, system folder and bootloader."
     IDS_PROCESSTITLE "Setup partition, copy files and setup system"
-    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader"
+    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup bootloader"
     IDS_RESTARTTITLE "First stage of setup finished"
     IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage"
     IDS_SUMMARYTITLE "Installation Summary"
@@ -173,3 +175,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR and VBR (Default)"      // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "VBR only"                   // ""
+END

base/setup/reactos/lang/fr-FR.rc

@@ -53,42 +53,44 @@ 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
+    PUSHBUTTON "&Initialiser", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "&Créer", IDC_PARTCREATE, 7, 122, 50, 14
+    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, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Créer une partition"
+CAPTION "Créer et 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 "&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 (disques MBR seulement)", 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, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "Formatage &rapide", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&OK", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Annuler", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Paramètres de partition avancés"
+CAPTION "Paramètres d'installation avancés"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Dossier d'installation", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Installation du chargeur de démarrage", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Installer le chargeur de démarrage sur le disque dur (MBR et VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Installer le chargeur de démarrage sur le disque dur (VBR uniquement)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Ne pas installer le chargeur de démarrage", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Annuler", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choisissez un &répertoire où vous voulez installer ReactOS :", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Installation du chargeur de démarrage", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Sélectionnez l'endroit où le chargeur de\ndémarrage FreeLoader doit être installé.\n\nPar défaut, il est installé sur la partition système du disque de démarrage (et sur le Master ou le Volume Boot Record pour les ordinateurs basés sur le BIOS).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Annuler", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -173,3 +175,12 @@ BEGIN
     IDS_PARTITION_SIZE "Taille"
     IDS_PARTITION_STATUS "Statut"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "Ne pas installer"
+    IDS_BOOTLOADER_REMOVABLE "Média amovible"
+    IDS_BOOTLOADER_SYSTEM    "Partition système (par défaut)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR et VBR (par défaut)"        // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "VBR seulement"                  // ""
+END

base/setup/reactos/lang/he-IL.rc

@@ -55,42 +55,44 @@ 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
+    PUSHBUTTON "Initialize(&I)", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "צור", IDC_PARTCREATE, 7, 122, 50, 14
+    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, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "יצירת מחיצה"
+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 "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 "גודל(&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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "מערכת קבצים(&F):", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "אישור(&O)", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "ביטול(&C)", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "הגדרות מחיצה מתקדמות"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "תיקיית התקנה", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "אישור", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "ביטול", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader installation", 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 "אישור(&O)", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "ביטול(&C)", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -148,9 +150,9 @@ BEGIN
     IDS_DEVICETITLE "Setup the basic devices"
     IDS_DEVICESUBTITLE "Set the settings of display and keyboard."
     IDS_DRIVETITLE "Setup the installation partition and system folder"
-    IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot loader."
+    IDS_DRIVESUBTITLE "Prepare installation partition, system folder and bootloader."
     IDS_PROCESSTITLE "Setup partition, copy files and setup system"
-    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader"
+    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup bootloader"
     IDS_RESTARTTITLE "First stage of setup finished"
     IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage"
     IDS_SUMMARYTITLE "סיכום ההתקנה"
@@ -175,3 +177,12 @@ BEGIN
     IDS_PARTITION_SIZE "גודל"
     IDS_PARTITION_STATUS "מצב"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR and VBR (Default)"      // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "VBR only"                   // ""
+END

base/setup/reactos/lang/hi-IN.rc

@@ -49,6 +49,7 @@ 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 the next button!
     PUSHBUTTON "&बनाएं", IDC_PARTCREATE, 7, 122, 50, 14
     PUSHBUTTON "&डिलीट", IDC_PARTDELETE, 63, 122, 50, 14
     PUSHBUTTON "&ड्राइवर", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
@@ -56,35 +57,36 @@ BEGIN
 /*    LTEXT "Click Next to check the summary.", IDC_STATIC, 7, 128, 277, 8 */
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "विभाजन बनाएं"
+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 "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 "साइज़(&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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "फाइल सिस्टम(&F):", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&ओके", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&रद्द करे", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "उन्नत विभाजन सेटिंग्स"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "इन्स्टलेशन फ़ोल्डर", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "बूट लोडर इन्स्टलेशन", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "हार्ड डिस्क पर बूट लोडर इंस्टॉल करें (MBR और VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "हार्ड डिस्क पर बूट लोडर इंस्टॉल करें (केवल VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "बूटलोडर की कोई इन्स्टलेशन नहीं", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&ओके", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&रद्द करे", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "बूट लोडर इन्स्टलेशन", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&ओके", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&रद्द करे", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -143,3 +145,12 @@ BEGIN
     IDS_PARTITION_SIZE "साइज़"
     IDS_PARTITION_TYPE "प्रकार"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR और VBR (Default)"       // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "केवल VBR"                    // ""
+END

base/setup/reactos/lang/hu-HU.rc

@@ -55,42 +55,44 @@ 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
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 14
+    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, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Create Partition"
+CAPTION "Create and 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 "&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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "&File System:", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&OK", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Cancel", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Advanced Partition Settings"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Cancel", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader installation", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Cancel", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -148,9 +150,9 @@ BEGIN
     IDS_DEVICETITLE "Setup the basic devices"
     IDS_DEVICESUBTITLE "Set the settings of display and keyboard."
     IDS_DRIVETITLE "Setup the installation partition and system folder"
-    IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot loader."
+    IDS_DRIVESUBTITLE "Prepare installation partition, system folder and bootloader."
     IDS_PROCESSTITLE "Setup partition, copy files and setup system"
-    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader"
+    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup bootloader"
     IDS_RESTARTTITLE "First stage of setup finished"
     IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage"
     IDS_SUMMARYTITLE "Installation Summary"
@@ -175,3 +177,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR and VBR (Default)"      // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "VBR only"                   // ""
+END

base/setup/reactos/lang/id-ID.rc

@@ -53,6 +53,7 @@ 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 the next button!
     PUSHBUTTON "&Buat", IDC_PARTCREATE, 7, 122, 50, 14
     PUSHBUTTON "&Hapus", IDC_PARTDELETE, 63, 122, 50, 14
     PUSHBUTTON "&Perangkat", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
@@ -60,35 +61,36 @@ BEGIN
     // LTEXT "Click Next to check the summary.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Buat Partisi"
+CAPTION "Buat dan 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 "&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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "&Sistem Berkas:", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&OK", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Batal", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Pengaturan Partisi Tingkat Lanjut"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Folder pemasangan", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Pemasangan bootloader", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Pasang bootloader pada hard disk (MBR dan VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Pasang bootloader pada hard disk (hanya VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Tidak ada pemasangan bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Batal", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Pemasangan bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Batal", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -173,3 +175,12 @@ BEGIN
     IDS_PARTITION_SIZE "Ukuran"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR dan VBR (Default)"      // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "Hanya VBR"                  // ""
+END

base/setup/reactos/lang/it-IT.rc

@@ -53,42 +53,44 @@ 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
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "&Crea", IDC_PARTCREATE, 7, 122, 50, 14
+    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, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Creazione Partizioni"
+CAPTION "Crea e 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 "&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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "&Filesystem:", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&OK", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Annulla", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Impostazioni avanzate delle partizioni"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Cartella di installazione", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Installazione del Boot loader", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Installazione del Boot loader sul disco fisso (MBR e VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Installazione del Boot loader sul disco fisso (solo VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Non installare il Boot loader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Annulla", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Installazione del Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Annulla", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -146,9 +148,9 @@ BEGIN
     IDS_DEVICETITLE "Impostazione dei dispositivi di base"
     IDS_DEVICESUBTITLE "Impostazione di monitor e tastiera."
     IDS_DRIVETITLE "Impostazione della partizione e della cartella per la installazione"
-    IDS_DRIVESUBTITLE "Preparazione di partizione, cartella di sistema e Boot loader."
+    IDS_DRIVESUBTITLE "Preparazione di partizione, cartella di sistema e Bootloader."
     IDS_PROCESSTITLE "Preparazione della partizione, copia dei file e configurazione del sistema"
-    IDS_PROCESSSUBTITLE "Creazione e formattazione della partizione, copia dei file, installazione del Boot loader"
+    IDS_PROCESSSUBTITLE "Creazione e formattazione della partizione, copia dei file, installazione del Bootloader"
     IDS_RESTARTTITLE "Prima fase della installazione completata"
     IDS_RESTARTSUBTITLE "La prima fase della installazione è stata completata, riavviare il computer per procedere alla seconda fase"
     IDS_SUMMARYTITLE "Sintesi della installazione"
@@ -173,3 +175,12 @@ BEGIN
     IDS_PARTITION_SIZE "Dimensione"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "Non installare"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR e VBR (Default)"        // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "Solo VBR"                   // ""
+END

base/setup/reactos/lang/ja-JP.rc

@@ -53,6 +53,7 @@ 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 the next button!
     PUSHBUTTON "作成(&C)", IDC_PARTCREATE, 7, 122, 50, 14
     PUSHBUTTON "削除(&D)", IDC_PARTDELETE, 63, 122, 50, 14
     PUSHBUTTON "ドライバ(&R)", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
@@ -60,35 +61,36 @@ BEGIN
     // LTEXT "次へをクリックすれば、要約をチェックできます。", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 175, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "パーティションの作成"
+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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "ファイルシステム(&F):", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&OK", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "キャンセル(&C)", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "上級者向けパーティション設定"
+CAPTION "Advanced Installation Options"
 FONT 9, "MS UI Gothic"
 BEGIN
-    CONTROL "インストール先フォルダ", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "ブートローダのインストール", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "ハードディスクにブートローダをインストールする (MBRとVBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "ハードディスクにブートローダをインストールする (VBRのみ)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "ブートローダをインストールしない", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "キャンセル(&C)", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "ブートローダのインストール", 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 "キャンセル(&C)", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -173,3 +175,12 @@ BEGIN
     IDS_PARTITION_SIZE "サイズ"
     IDS_PARTITION_STATUS "状態"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBRとVBR (Default)"          // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "VBRのみ"                     // ""
+END

base/setup/reactos/lang/ms-MY.rc

@@ -55,42 +55,44 @@ 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
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "Men&cipta", IDC_PARTCREATE, 7, 122, 50, 14
+    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, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Membuat Partition"
+CAPTION "Cipta dan 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 "&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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "Sistem &fail:", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&OK", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "Batal(&C)", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Seting lanjutan Partition"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Folder pemasangan", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Boot loader pemasangan", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Memasang boot loader pada cakera keras (MBR dan VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Memasang boot loader pada cakera keras (VBR sahaja)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Tiada pemasangan boot loader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "Batal(&C)", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Bootloader pemasangan", 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(&C)", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -148,9 +150,9 @@ BEGIN
     IDS_DEVICETITLE "Sediakan peranti asas"
     IDS_DEVICESUBTITLE "Setkan seting paparan dan papan kekunci."
     IDS_DRIVETITLE "Sediakan folder pemasangan partition dan sistem"
-    IDS_DRIVESUBTITLE "Menyediakan pemasangan partition, folder sistem dan boot loader."
+    IDS_DRIVESUBTITLE "Menyediakan pemasangan partition, folder sistem dan bootloader."
     IDS_PROCESSTITLE "Persediaan partition, salinan fail dan sistem persediaan"
-    IDS_PROCESSSUBTITLE "Cipta dan format partition, menyalin fail, memasang dan sediakan boot loader"
+    IDS_PROCESSSUBTITLE "Cipta dan format partition, menyalin fail, memasang dan sediakan bootloader"
     IDS_RESTARTTITLE "Tahap pertama Persediaan selesai"
     IDS_RESTARTSUBTITLE "Tahap pertama persediaan telah selesai, mula semula untuk meneruskan peringkat kedua"
     IDS_SUMMARYTITLE "Ringkasan pemasangan"
@@ -175,3 +177,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "Tiada pemasangan"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR dan VBR (Default)"      // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "VBR sahaja"                 // ""
+END

base/setup/reactos/lang/no-NO.rc

@@ -53,42 +53,44 @@ 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
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "&Opprett", IDC_PARTCREATE, 7, 122, 50, 14
+    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, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Opprett partisjon"
+CAPTION "Opprett og 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 "&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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "&Filsystem:", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&OK", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Avbryt", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Avansert partisjon innstillinger"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Installasjon mappe", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Oppstartslaster installasjon", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Installer oppstartslaster på harddiskens (MBR og VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Installer oppstartslaster på harddiskens (bare VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Ikke installer oppstartslaster", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Avbryt", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Oppstartslaster installasjon", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Avbryt", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -173,3 +175,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR og VBR (Default)"       // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "Bare VBR"                   // ""
+END

base/setup/reactos/lang/pl-PL.rc

@@ -64,42 +64,44 @@ 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
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "&Utwórz", IDC_PARTCREATE, 7, 122, 50, 14
+    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, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Utwórz partycję"
+CAPTION "Utwórz i 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 "&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 (MBR disks only)", 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, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&OK", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Anuluj", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Zaawansowane ustawienia partycji"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Folder instalacji", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Instalacja menedżera rozruchu", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Instaluj menedżer rozruchu na dysku twardym (MBR i VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Instaluj menedżer rozruchu na dysku twardym (tylko VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Pomiń instalację menedżera rozruchu", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Anuluj", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Instalacja menedżera rozruchu", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Anuluj", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -184,3 +186,12 @@ BEGIN
     IDS_PARTITION_SIZE "Rozmiar"
     IDS_PARTITION_STATUS "Stan"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "Pomiń instalację"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR i VBR (Default)"        // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "Tylko VBR"                  // ""
+END

base/setup/reactos/lang/pt-BR.rc

@@ -53,42 +53,44 @@ 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
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "&Criar", IDC_PARTCREATE, 7, 122, 50, 14
+    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, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Criar Partição"
+CAPTION "Criar e 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 "&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 (MBR disks only)", 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, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&OK", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Cancelar", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Configurações Avançadas de Particionamento"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Pasta de instalação", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Instalação do boot loader", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Instalar boot loader no disco rígido (MBR e VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Instalar boot loader no disco rígido (apenas VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Não instalar boot loader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Cancelar", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Instalação do bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Cancelar", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -146,9 +148,9 @@ BEGIN
     IDS_DEVICETITLE "Instalar dispositivos básicos"
     IDS_DEVICESUBTITLE "Definir as configurações de monitor e teclado."
     IDS_DRIVETITLE "Configurar a partição de instalação e pasta do sistema"
-    IDS_DRIVESUBTITLE "Preparando partição de instalação, pasta do sistema e boot loader."
+    IDS_DRIVESUBTITLE "Preparando partição de instalação, pasta do sistema e bootloader."
     IDS_PROCESSTITLE "Preparar partição, copiar arquivos e configurar sistema"
-    IDS_PROCESSSUBTITLE "Criar e formatar partição, copiar arquivos, instalar e configurar boot loader"
+    IDS_PROCESSSUBTITLE "Criar e formatar partição, copiar arquivos, instalar e configurar bootloader"
     IDS_RESTARTTITLE "Primeira etapa de instalação finalizada"
     IDS_RESTARTSUBTITLE "A primeira etapada da instalação foi completada, reinicie o computador para prosseguir com a segunda estapa"
     IDS_SUMMARYTITLE "Sumário de Instalação"
@@ -173,3 +175,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "Não instalar"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR e VBR (Default)"        // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "Apenas VBR"                 // ""
+END

base/setup/reactos/lang/pt-PT.rc

@@ -53,42 +53,44 @@ 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
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "&Criar", IDC_PARTCREATE, 7, 122, 50, 14
+    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, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Criar Partição"
+CAPTION "Criar e 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 "&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 (MBR disks only)", 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, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&OK", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Cancelar", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Configurações Avançadas de Particionamento"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Pasta de instalação", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Instalação do boot loader", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Instalar boot loader no disco rígido (MBR e VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Instalar boot loader no disco rígido (apenas VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Não instalar boot loader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Cancelar", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Instalação do bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Cancelar", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -146,9 +148,9 @@ BEGIN
     IDS_DEVICETITLE "Instalar dispositivos básicos"
     IDS_DEVICESUBTITLE "Definir as configurações de monitor e teclado."
     IDS_DRIVETITLE "Configurar a partição de instalação e pasta do sistema"
-    IDS_DRIVESUBTITLE "A preparar a partição de instalação, pasta do sistema e boot loader."
+    IDS_DRIVESUBTITLE "A preparar a partição de instalação, pasta do sistema e bootloader."
     IDS_PROCESSTITLE "Preparar partição, copiar arquivos e configurar sistema"
-    IDS_PROCESSSUBTITLE "Criar e formatar partição, copiar arquivos, instalar e configurar boot loader"
+    IDS_PROCESSSUBTITLE "Criar e formatar partição, copiar arquivos, instalar e configurar bootloader"
     IDS_RESTARTTITLE "Primeira etapa de instalação finalizada"
     IDS_RESTARTSUBTITLE "A primeira etapada da instalação foi completada, reinicie o computador para prosseguir com a segunda estapa"
     IDS_SUMMARYTITLE "Sumário de Instalação"
@@ -173,3 +175,12 @@ BEGIN
     IDS_PARTITION_SIZE "Tamanho"
     IDS_PARTITION_STATUS "Estado"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "Não instalar"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR e VBR (Default)"        // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "Apenas VBR"                 // ""
+END

base/setup/reactos/lang/ro-RO.rc

@@ -62,42 +62,44 @@ CAPTION "Expert de instalare 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 "&Crează", IDC_PARTCREATE, 7, 122, 50, 15
-    PUSHBUTTON "Șt&erge", IDC_PARTDELETE, 63, 122, 50, 15
-    PUSHBUTTON "&Driver", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
-    PUSHBUTTON "Opțiuni a&vansate…", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "&Crează", IDC_PARTCREATE, 7, 122, 50, 14
+    PUSHBUTTON "Șt&erge", IDC_PARTDELETE, 63, 122, 50, 14
+    PUSHBUTTON "&Driver", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "Opțiuni a&vansate…", IDC_PARTMOREOPTS, 230, 122, 80, 14
     // LTEXT "Apăsați pe Înainte pentru a verifica sumarul.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Creare partiție"
+CAPTION "Crearea și formatarea partiției"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
-    CONTROL "Crearea și formatarea partiției", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
-    LTEXT "Mărime:", 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 "Sistemul de fișiere:", 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 "&Revocare", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    LTEXT "&Mărime:", 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 "&Extended partition", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "&Sistemul de fișiere:", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&OK", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Revocare", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Opțiuni avansate partiție"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Folderul de instalare", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Instalare secvență de inițializare", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Instalează inițializatorul pe hard disc (MBR și VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Instalează inițializatorul pe hard disc (numai VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Omite instalarea inițializatorului", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Revocare", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Instalare secvență de inițializare", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Revocare", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -182,3 +184,12 @@ BEGIN
     IDS_PARTITION_SIZE "Dimensiune"
     IDS_PARTITION_STATUS "Stare"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR și VBR (Default)"       // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "Numai VBR"                  // ""
+END

base/setup/reactos/lang/ru-RU.rc

@@ -53,42 +53,44 @@ 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, 119, 122, 50, 15, WS_DISABLED
-    PUSHBUTTON "&Дополнительные параметры...", IDC_PARTMOREOPTS, 189, 122, 122, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "&Создать", IDC_PARTCREATE, 7, 122, 50, 14
+    PUSHBUTTON "&Удалить", IDC_PARTDELETE, 63, 122, 50, 14
+    PUSHBUTTON "Д&райвер", IDC_DEVICEDRIVER, 119, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "&Дополнительные параметры...", IDC_PARTMOREOPTS, 189, 122, 122, 14
     // LTEXT "Для начала установки нажмите ""Далее"".", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 167, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Создать раздел на диске"
+CAPTION "Создать и отформатировать раздел диска"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 127, 22, 9, 13
-    CONTROL "Создать и отформатировать раздел диска", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 153, 57
-    LTEXT "Размер:", IDC_STATIC, 13, 24, 27, 9
-    EDITTEXT IDC_PARTSIZE, 80, 22, 47, 13, WS_VISIBLE | WS_TABSTOP
-    LTEXT "Гб", IDC_UNIT, 143, 24, 14, 9
-    LTEXT "Файловая система:", IDC_STATIC, 13, 44, 65, 9
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 80, 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_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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "&Файловая система:", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&Есть", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Отмена", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Дополнительные параметры установки"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Основной каталог", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 12, 283, 14, WS_VISIBLE
-    CONTROL "Установка загрузчика", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Установить загрузчик на диск (MBR и VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 49, 278, 11
-    CONTROL "Установить загрузчик на диск (только VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 59, 278, 11
-    CONTROL "Не устанавливать загрузчик", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 69, 278, 11
-    PUSHBUTTON "&OK", IDOK, 184, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Отмена", IDCANCEL, 244, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Установка загрузчика", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&Есть", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Отмена", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -173,3 +175,12 @@ BEGIN
     IDS_PARTITION_SIZE "Размер"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "Не устанавливайте"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR и VBR (Default)"        // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "Только VBR"                 // ""
+END

base/setup/reactos/lang/sk-SK.rc

@@ -58,42 +58,44 @@ CAPTION "Inštalácia 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 "&Vytvoriť", IDC_PARTCREATE, 7, 122, 50, 15
-    PUSHBUTTON "O&dstrániť", IDC_PARTDELETE, 63, 122, 50, 15
-    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
-    PUSHBUTTON "Rozšírené &možnosti...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "&Vytvoriť", IDC_PARTCREATE, 7, 122, 50, 14
+    PUSHBUTTON "O&dstrániť", IDC_PARTDELETE, 63, 122, 50, 14
+    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "Rozšírené &možnosti...", IDC_PARTMOREOPTS, 230, 122, 80, 14
     // LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Vytvoriť partíciu"
+CAPTION "Vytvoriť a naformátovať partíciu"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
-    CONTROL "Vytvoriť a naformátovať partíciu", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
-    LTEXT "Veľkosť:", 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 "Systém súborov:", 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 "&Zrušiť", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    LTEXT "&Veľkosť:", 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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "&Systém súborov:", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&OK", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Zrušiť", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Rozšírené nastavenia partície"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Inštalačný priečinok", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Inštalácia zavádzača systému", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Nainštalovať zavádzač systému na pevný disk (MBR a VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Nainštalovať zavádzač systému na pevný disk (iba VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Nenainštalovať zavádzač systému", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Zrušiť", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Inštalácia zavádzača systému", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Zrušiť", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -151,9 +153,9 @@ BEGIN
     IDS_DEVICETITLE "Setup the basic devices"
     IDS_DEVICESUBTITLE "Set the settings of display and keyboard."
     IDS_DRIVETITLE "Setup the installation partition and system folder"
-    IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot loader."
+    IDS_DRIVESUBTITLE "Prepare installation partition, system folder and bootloader."
     IDS_PROCESSTITLE "Prepare partition, copy files and setup system"
-    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader"
+    IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup bootloader"
     IDS_RESTARTTITLE "First stage of setup finished"
     IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage"
     IDS_SUMMARYTITLE "Zhrnutie inštalácie"
@@ -178,3 +180,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR a VBR (Default)"        // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "Iba VBR"                    // ""
+END

base/setup/reactos/lang/sq-AL.rc

@@ -55,42 +55,44 @@ CAPTION "Instalimi i 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 "&Krijo", IDC_PARTCREATE, 7, 122, 50, 15
-    PUSHBUTTON "&Fshi", IDC_PARTDELETE, 63, 122, 50, 15
-    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
-    PUSHBUTTON "&Opsionet e avancuara...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "&Krijo", IDC_PARTCREATE, 7, 122, 50, 14
+    PUSHBUTTON "&Fshi", IDC_PARTDELETE, 63, 122, 50, 14
+    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "&Opsionet e avancuara...", IDC_PARTMOREOPTS, 230, 122, 80, 14
     // LTEXT "Kliko vazhdo për të kontrolluar përmbajtjen.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Krijo particion"
+CAPTION "Krijo dhe formato particionin"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
-    CONTROL "Krijo dhe formato particionin", 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 "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 "&Anulo", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "&Filesystem:", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&OK", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Anulo", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Krijimi i Avancuar i Particioneve"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Skeda e Instalimit", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Instalimi i Boot loaderit", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Instalo boot loaderin në hard disk (MBR dhe VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Instalo boot loaderin në hard disk (VBR veq)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Mos instalo bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&Dakord", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Anulo", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Instalimi i Bootloaderit", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Anulo", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -148,9 +150,9 @@ BEGIN
     IDS_DEVICETITLE "Instaloni pajisjet themelore"
     IDS_DEVICESUBTITLE "Vendos parametrat e ekranit dhe tastieres."
     IDS_DRIVETITLE "Konfiguro particionet për instalim dhe dosjet e sistemit"
-    IDS_DRIVESUBTITLE "Pergatit particionet për instalim, dosjet e sistemit dhe boot loaderin."
+    IDS_DRIVESUBTITLE "Pergatit particionet për instalim, dosjet e sistemit dhe bootloaderin."
     IDS_PROCESSTITLE "Konfiguro particionet, kopjo dokumentat dhe konfiguro sistemin"
-    IDS_PROCESSSUBTITLE "Krijo dhe formato particionet, kopjo dokumentat, insalo dhe konfiguro book loaderin"
+    IDS_PROCESSSUBTITLE "Krijo dhe formato particionet, kopjo dokumentat, insalo dhe konfiguro bootloaderin"
     IDS_RESTARTTITLE "Faza e pare e instalimit ka perfunduar"
     IDS_RESTARTSUBTITLE "Faza e pare e instalimit ka perfunduar, rinisni për të vazhduar me fazen e dytë"
     IDS_SUMMARYTITLE "Përmbajtja e instalimit"
@@ -175,3 +177,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "Mos instalo"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR dhe VBR (Default)"      // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "VBR veq"                    // ""
+END

base/setup/reactos/lang/tr-TR.rc

@@ -60,42 +60,44 @@ CAPTION "ReactOS Kur"
 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 "&Oluştur...", IDC_PARTCREATE, 7, 122, 50, 15
-    PUSHBUTTON "&Sil", IDC_PARTDELETE, 63, 122, 50, 15
-    PUSHBUTTON "S&ürücü", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
-    PUSHBUTTON "G&elişmiş Seçenekler...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "&Oluştur...", IDC_PARTCREATE, 7, 122, 50, 14
+    PUSHBUTTON "&Sil", IDC_PARTDELETE, 63, 122, 50, 14
+    PUSHBUTTON "S&ürücü", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "G&elişmiş Seçenekler...", IDC_PARTMOREOPTS, 230, 122, 80, 14
     // LTEXT "Kurulum özetini gözden geçirmek için İleri'ye tıklayınız.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Bölüm Oluştur"
+CAPTION "Bölüm Oluşturma ve Biçimlendirme"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
-    CONTROL "Bölüm Oluşturma ve Biçimlendirme", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
-    LTEXT "Boyut:", 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 "Dosya sistemi:", IDC_STATIC, 13, 46, 42, 9
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
-    PUSHBUTTON "Tamam", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "İptal", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    LTEXT "&Boyut:", 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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "&Dosya sistemi:", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&Tamam", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&İptal", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Gelişmiş Bölümlendirme Seçenekleri"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Kurulum Dizini", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Önyükleyici Kurulumu", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Önyükleyiciyi sabit diskin üzerine kur. (MBR ve VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Önyükleyiciyi sabit diskin üzerine kur. (Yalnızca VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Önyükleyici kurulumunu atla.", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "Tamam", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "İptal", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Önyükleyici Kurulumu", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&Tamam", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&İptal", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -180,3 +182,12 @@ BEGIN
     IDS_PARTITION_SIZE "Boyut"
     IDS_PARTITION_STATUS "Durum"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR ve VBR (Default)"       // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "Yalnızca VBR"               // ""
+END

base/setup/reactos/lang/uk-UA.rc

@@ -61,42 +61,44 @@ 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
+    PUSHBUTTON "&Initialize", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "&Створити", IDC_PARTCREATE, 7, 122, 50, 14
+    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, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 172, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Створення розділу"
+CAPTION "Створити та відформатувати розділ"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 131, 22, 9, 13
-    CONTROL "Створити та відформатувати розділ", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 156, 57
-    LTEXT "Розмір:", IDC_STATIC, 13, 24, 27, 9
-    EDITTEXT IDC_PARTSIZE, 79, 22, 53, 13, WS_VISIBLE | WS_TABSTOP
-    LTEXT "Гб", IDC_UNIT, 144, 24, 14, 9
-    LTEXT "Файлова система:", IDC_STATIC, 13, 46, 65, 9
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 79, 42, 79, 50
-    PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Скасувати", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "&Файлова система:", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&OK", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Скасувати", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Розширені параметри розділу"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Тека встановлення", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Встановлення завантажувача", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Встановити завантажувач на жосткий диск (MBR та VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Встановити завантажувач на жосткий диск (лише VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Не встановлювати завантажувач", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&OK", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Скасувати", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Встановлення завантажувача", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&OK", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Скасувати", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -181,3 +183,12 @@ BEGIN
     IDS_PARTITION_SIZE "Size"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "Не встановлювати"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR та VBR (Default)"       // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "Лише VBR"                   // ""
+END

base/setup/reactos/lang/vi-VN.rc

@@ -53,6 +53,7 @@ CAPTION "Cài đặt 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 the next button!
     PUSHBUTTON "&Tạo", IDC_PARTCREATE, 7, 122, 50, 14
     PUSHBUTTON "&Xóa", IDC_PARTDELETE, 63, 122, 50, 14
     PUSHBUTTON "P&hần mềm", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
@@ -60,35 +61,36 @@ BEGIN
     // LTEXT "Ấn Tiếp để  kiểm tra phần tóm lượct.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Phân chia ổ cứng"
+CAPTION "Tạo và định dạng phần ổ cứng"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
-    CONTROL "Tạo và định dạng phần ổ cứng", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
-    LTEXT "Kích cỡ:", 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 "Loại định dạng:", IDC_STATIC, 13, 46, 42, 9
-    CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50
-    PUSHBUTTON "&Đồng ý", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Hủy", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
+    LTEXT "&Kích cỡ:", 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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "&Loại định dạng:", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "&Đồng ý", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Hủy", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "Tùy chọn phân chia ổ đĩa nâng cao"
+CAPTION "Advanced Installation Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Thư mục cài đặt", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "Cài đặt Boot loader", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "Cài boot loader trên ổ cứng  (MBR-MasterBootRecord- và VBR-VolumeBootRecord)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "Cài boot loader  (chỉ VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "Không cài bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "&Đồng ý", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Hủy", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "Cài đặt Bootloader", IDC_STATIC, 7, 45, 291, 60
+    LTEXT "Select the location where the FreeLoader\nbootloader should be installed.\n\nBy default, it is installed on the system partition of the boot disk (and either in the Master or the Volume Boot Record for BIOS-based computers).", IDC_STATIC, 13, 57, 279, 44
+    COMBOBOX IDC_INSTFREELDR, 150, 58, 142, 45, WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
+    PUSHBUTTON "&Đồng ý", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Hủy", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -146,9 +148,9 @@ BEGIN
     IDS_DEVICETITLE "Thiết lập các thiết bị cơ bản"
     IDS_DEVICESUBTITLE "Chọn những cài đặt cho màn hình và bàn phím."
     IDS_DRIVETITLE "Thiết lập phần ổ cứng để cài đặt và thư mục hệ thống"
-    IDS_DRIVESUBTITLE "Chuẩn bị phần ổ cứng, thư mục hệ thống và boot loader."
+    IDS_DRIVESUBTITLE "Chuẩn bị phần ổ cứng, thư mục hệ thống và bootloader."
     IDS_PROCESSTITLE "Thiết lập phần ổ cứng, sao chép tập tin và thiết lập hệ thống"
-    IDS_PROCESSSUBTITLE "Tạo và định dạng phần ổ đĩa, sao chép thư  mục, cài đặt và thiết lập boot loader"
+    IDS_PROCESSSUBTITLE "Tạo và định dạng phần ổ đĩa, sao chép thư  mục, cài đặt và thiết lập bootloader"
     IDS_RESTARTTITLE "Giai đoạn đầu của việc thiết lập đã hoàn tất"
     IDS_RESTARTSUBTITLE "Giai đoạn đầu của việc thiết lập đã được hoàn thành, khởi động lại máy tính để tiếp tuc với giai đoạn hai"
     IDS_SUMMARYTITLE "Tóm lược quá trình cài đặt"
@@ -173,3 +175,12 @@ BEGIN
     IDS_PARTITION_SIZE "Kích cỡ"
     IDS_PARTITION_STATUS "Status"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR và VBR (Default)"       // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "Chỉ VBR"                    // ""
+END

base/setup/reactos/lang/zh-CN.rc

@@ -53,42 +53,44 @@ CAPTION "ReactOS 安装程序"
 FONT 9, "宋体"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "新建(&C)", IDC_PARTCREATE, 7, 122, 50, 15
-    PUSHBUTTON "删除(&D)", IDC_PARTDELETE, 63, 122, 50, 15
-    PUSHBUTTON "驱动器(&R)", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
-    PUSHBUTTON "高级选项(&A)...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "Initialize(&I)", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "新建(&C)", IDC_PARTCREATE, 7, 122, 50, 14
+    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, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "建立分区"
+CAPTION "创建并格式化分区"
 FONT 9, "宋体"
 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 "确定(&O)", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "取消(&C)", IDCANCEL, 87, 68, 47, 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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "文件系统(&F)：", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "确定(&O)", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "取消(&C)", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "高级分区设置"
+CAPTION "Advanced Installation Options"
 FONT 9, "宋体"
 BEGIN
-    CONTROL "安装文件夹", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "引导程序安装", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "安装引导程序到硬盘 (MBR 和 VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "安装引导程序到硬盘 (仅 VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "不安装引导程序", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "确定(&O)", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "取消(&C)", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "引导程序安装", 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 "确定(&O)", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "取消(&C)", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -173,3 +175,12 @@ BEGIN
     IDS_PARTITION_SIZE "大小"
     IDS_PARTITION_STATUS "状态"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR 和 VBR (Default)"       // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "仅 VBR"                     // ""
+END

base/setup/reactos/lang/zh-HK.rc

@@ -61,42 +61,44 @@ CAPTION "ReactOS 安裝程式"
 FONT 9, "新細明體"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "建立(&C)", IDC_PARTCREATE, 7, 122, 50, 15
-    PUSHBUTTON "刪除(&D)", IDC_PARTDELETE, 63, 122, 50, 15
-    PUSHBUTTON "驅動程式(&R)", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
-    PUSHBUTTON "進階選項(&A)...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "Initialize(&I)", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "建立(&C)", IDC_PARTCREATE, 7, 122, 50, 14
+    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, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "建立磁碟區"
+CAPTION "建立並格式化磁碟區"
 FONT 9, "新細明體"
 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 "確定(&O)", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "取消(&C)", IDCANCEL, 87, 68, 47, 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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "檔案系統(&F)：", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "確定(&O)", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "取消(&C)", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "進階磁碟區設定"
+CAPTION "Advanced Installation Options"
 FONT 9, "新細明體"
 BEGIN
-    CONTROL "安裝資料夾", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "安裝啟動程式", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "安裝啟動程式到硬碟（MBR 和 VBR）", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "安裝啟動程式到硬碟（僅 VBR）", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "不安裝啟動程式", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "確定(&O)", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "取消(&C)", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "安裝啟動程式", 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 "確定(&O)", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "取消(&C)", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -181,3 +183,12 @@ BEGIN
     IDS_PARTITION_SIZE "大小"
     IDS_PARTITION_STATUS "狀態"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR 和 VBR (Default)"       // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "僅 VBR"                     // ""
+END

base/setup/reactos/lang/zh-TW.rc

@@ -62,42 +62,44 @@ CAPTION "ReactOS 安裝程式"
 FONT 9, "新細明體"
 BEGIN
     CONTROL "", IDC_PARTITION, "SysTreeList32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
-    PUSHBUTTON "建立(&C)", IDC_PARTCREATE, 7, 122, 50, 15
-    PUSHBUTTON "刪除(&D)", IDC_PARTDELETE, 63, 122, 50, 15
-    PUSHBUTTON "驅動程式(&R)", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
-    PUSHBUTTON "進階選項(&A)...", IDC_PARTMOREOPTS, 230, 122, 80, 15
+    PUSHBUTTON "Initialize(&I)", IDC_INITDISK, 7, 122, 50, 14 // NOTE: At same position as the next button!
+    PUSHBUTTON "建立(&C)", IDC_PARTCREATE, 7, 122, 50, 14
+    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, 10, 180, 277, 20
 END
 
-IDD_PARTITION DIALOGEX 0, 0, 145, 90
+IDD_PARTITION DIALOGEX 0, 0, 200, 120
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "建立磁碟區"
+CAPTION "建立並格式化磁碟區"
 FONT 9, "新細明體"
 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 "確定(&O)", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "取消(&C)", IDCANCEL, 87, 68, 47, 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 (MBR disks only)", IDC_CHECK_MBREXTPART, 7, 22, 180, 14
+    LTEXT "檔案系統(&F)：", IDC_FS_STATIC, 7, 46, 70, 9
+    COMBOBOX IDC_FSTYPE, 82, 44, 100, 50, WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+    AUTOCHECKBOX "&Quick format", IDC_CHECK_QUICKFMT, 7, 59, 180, 14
+    PUSHBUTTON "確定(&O)", IDOK, 88, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "取消(&C)", IDCANCEL, 143, 98, 50, 14, WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116
+IDD_ADVINSTOPTS DIALOGEX 0, 0, 305, 135
 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
-CAPTION "進階磁碟區設定"
+CAPTION "Advanced Installation Options"
 FONT 9, "新細明體"
 BEGIN
-    CONTROL "安裝資料夾", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
-    EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
-    CONTROL "安裝啟動程式", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
-    CONTROL "安裝啟動程式到硬碟（MBR 和 VBR）", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
-    CONTROL "安裝啟動程式到硬碟（僅 VBR）", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11
-    CONTROL "不安裝啟動程式", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11
-    PUSHBUTTON "確定(&O)", IDOK, 180, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "取消(&C)", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
+    LTEXT "Choose the &directory where you want to install ReactOS:", IDC_STATIC, 7, 9, 291, 10
+    EDITTEXT IDC_PATH, 7, 23, 291, 13, WS_VISIBLE
+    GROUPBOX "安裝啟動程式", 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 "確定(&O)", IDOK, 193, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "取消(&C)", IDCANCEL, 248, 113, 50, 14, WS_TABSTOP | WS_VISIBLE
 END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
@@ -182,3 +184,12 @@ BEGIN
     IDS_PARTITION_SIZE "大小"
     IDS_PARTITION_STATUS "狀態"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_BOOTLOADER_NOINST    "No installation"
+    IDS_BOOTLOADER_REMOVABLE "Removable media"
+    IDS_BOOTLOADER_SYSTEM    "System partition (Default)" // For non-MBR disks
+    IDS_BOOTLOADER_MBRVBR    "MBR 和 VBR (Default)"       // For MBR disks only
+    IDS_BOOTLOADER_VBRONLY   "僅 VBR"                     // ""
+END

base/setup/reactos/reactos.c

@@ -41,6 +41,19 @@ HANDLE ProcessHeap;
 BOOLEAN IsUnattendedSetup = FALSE;
 SETUPDATA SetupData;
 
+/* The partition where to perform the installation */
+PPARTENTRY InstallPartition = NULL;
+// static PVOLENTRY InstallVolume = NULL;
+#define InstallVolume (InstallPartition->Volume)
+
+/* The system partition we will actually use */
+PPARTENTRY SystemPartition = NULL;
+// static PVOLENTRY SystemVolume = NULL;
+#define SystemVolume (SystemPartition->Volume)
+
+/* UI elements */
+UI_CONTEXT UiContext;
+
 
 /* FUNCTIONS ****************************************************************/
 
@@ -92,10 +105,66 @@ CreateTitleFont(VOID)
     return hFont;
 }
 
-INT DisplayError(
-    IN HWND hParentWnd OPTIONAL,
-    IN UINT uIDTitle,
-    IN UINT uIDMessage)
+INT
+DisplayMessage(
+    _In_opt_ HWND hParentWnd,
+    _In_ UINT uType,
+    _In_opt_ LPCWSTR pszTitle,
+    _In_ LPCWSTR pszFormatMessage,
+    ...)
+{
+    INT iRes;
+    WCHAR  StaticBuffer[256];
+    LPWSTR Buffer = StaticBuffer; // Use the static buffer by default.
+    LPCWSTR Format = pszFormatMessage;
+    size_t MsgLen;
+    va_list args;
+
+    va_start(args, pszFormatMessage);
+
+    /*
+     * Retrieve the message length and if it is too long, allocate
+     * an auxiliary buffer; otherwise use the static buffer.
+     * The string is built to be NULL-terminated.
+     */
+    MsgLen = _vscwprintf(Format, args);
+    if (MsgLen >= ARRAYSIZE(StaticBuffer))
+    {
+        Buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (MsgLen + 1) * sizeof(WCHAR));
+        if (Buffer == NULL)
+        {
+            /* Allocation failed, use the static buffer and display a suitable error message */
+            // Buffer = StaticBuffer;
+            // Format = L"DisplayMessage()\nOriginal message is too long and allocating an auxiliary buffer failed.";
+            // MsgLen = wcslen(Format);
+            Buffer = (LPWSTR)pszFormatMessage;
+        }
+    }
+
+    if (Buffer != (LPWSTR)pszFormatMessage)
+    {
+        /* Do the printf as we use the caller's format string */
+        ZeroMemory(Buffer, (MsgLen + 1) * sizeof(WCHAR));
+        _vsnwprintf(Buffer, MsgLen, Format, args);
+    }
+
+    va_end(args);
+
+    /* Display the message */
+    iRes = MessageBoxW(hParentWnd, Buffer, pszTitle, uType);
+
+    /* Free the buffer if needed */
+    if (Buffer != StaticBuffer && Buffer != (LPWSTR)pszFormatMessage)
+        HeapFree(GetProcessHeap(), 0, Buffer);
+
+    return iRes;
+}
+
+INT
+DisplayError(
+    _In_opt_ HWND hParentWnd,
+    _In_ UINT uIDTitle,
+    _In_ UINT uIDMessage)
 {
     WCHAR message[512], caption[64];
 
@@ -468,14 +537,20 @@ AddNTOSInstallationItem(
     IN SIZE_T cchBufferSize)
 {
     PNTOS_INSTALLATION NtOsInstall = (PNTOS_INSTALLATION)GetListEntryData(Entry);
-    PPARTENTRY PartEntry = NtOsInstall->PartEntry;
 
-    if (PartEntry && PartEntry->DriveLetter)
+    /* Retrieve the corresponding partition */
+    PPARTENTRY PartEntry; // NtOsInstall->PartEntry;
+    PartEntry = SelectPartition(SetupData.PartitionList,
+                                NtOsInstall->DiskNumber,
+                                NtOsInstall->PartitionNumber);
+    ASSERT(PartEntry);
+
+    if (PartEntry && PartEntry->Volume->Info.DriveLetter)
     {
         /* We have retrieved a partition that is mounted */
         StringCchPrintfW(Buffer, cchBufferSize,
                          L"%c:%s",
-                         PartEntry->DriveLetter,
+                         PartEntry->Volume->Info.DriveLetter,
                          NtOsInstall->PathComponent);
     }
     else
@@ -859,6 +934,8 @@ SummaryDlgProc(
                 {
                     WCHAR CurrentItemText[256];
 
+                    ASSERT(InstallPartition);
+
                     /* Show the current selected settings */
 
                     // FIXME! Localize
@@ -894,24 +971,39 @@ SummaryDlgProc(
                                           ARRAYSIZE(CurrentItemText));
                     SetDlgItemTextW(hwndDlg, IDC_KEYBOARD, CurrentItemText);
 
-                    if (L'C') // FIXME!
+                    if (InstallVolume->Info.DriveLetter)
                     {
+#if 0
                         StringCchPrintfW(CurrentItemText, ARRAYSIZE(CurrentItemText),
                                          L"%c: \x2014 %wZ",
-                                         L'C', // FIXME!
+                                         InstallVolume->Info.DriveLetter,
                                          &pSetupData->USetupData.DestinationRootPath);
+#else
+                        StringCchPrintfW(CurrentItemText, ARRAYSIZE(CurrentItemText),
+                                         L"%c: \x2014 Harddisk %lu, Partition %lu",
+                                         InstallVolume->Info.DriveLetter,
+                                         InstallPartition->DiskEntry->DiskNumber,
+                                         InstallPartition->OnDiskPartitionNumber);
+#endif
                     }
                     else
                     {
+#if 0
                         StringCchPrintfW(CurrentItemText, ARRAYSIZE(CurrentItemText),
                                          L"%wZ",
                                          &pSetupData->USetupData.DestinationRootPath);
+#else
+                        StringCchPrintfW(CurrentItemText, ARRAYSIZE(CurrentItemText),
+                                         L"Harddisk %lu, Partition %lu",
+                                         InstallPartition->DiskEntry->DiskNumber,
+                                         InstallPartition->OnDiskPartitionNumber);
+#endif
                     }
                     SetDlgItemTextW(hwndDlg, IDC_DESTDRIVE, CurrentItemText);
 
                     SetDlgItemTextW(hwndDlg, IDC_PATH,
-                                    /*pSetupData->USetupData.InstallationDirectory*/
-                                    pSetupData->USetupData.InstallPath.Buffer);
+                                    pSetupData->USetupData.InstallationDirectory
+                                    /*pSetupData->USetupData.InstallPath.Buffer*/);
 
 
                     /* Change the "Next" button text to "Install" */
@@ -973,11 +1065,429 @@ SummaryDlgProc(
 }
 
 
+typedef struct _FSVOL_CONTEXT
+{
+    PSETUPDATA pSetupData;
+    // PAGE_NUMBER NextPageOnAbort;
+} FSVOL_CONTEXT, *PFSVOL_CONTEXT;
+
+static
+BOOLEAN
+NTAPI
+FormatCallback(
+    _In_ CALLBACKCOMMAND Command,
+    _In_ ULONG Modifier,
+    _In_ PVOID Argument)
+{
+    switch (Command)
+    {
+        case PROGRESS:
+        {
+            PULONG Percent = (PULONG)Argument;
+            DPRINT("%lu percent completed\n", *Percent);
+            SendMessageW(UiContext.hWndProgress, PBM_SETPOS, *Percent, 0);
+            break;
+        }
+
+#if 0
+        case OUTPUT:
+        {
+            PTEXTOUTPUT output = (PTEXTOUTPUT)Argument;
+            DPRINT("%s\n", output->Output);
+            break;
+        }
+#endif
+
+        case DONE:
+        {
+#if 0
+            PBOOLEAN Success = (PBOOLEAN)Argument;
+            if (*Success == FALSE)
+            {
+                DPRINT("FormatEx was unable to complete successfully.\n\n");
+            }
+#endif
+            DPRINT("Done\n");
+            break;
+        }
+
+        default:
+            DPRINT("Unknown callback %lu\n", (ULONG)Command);
+            break;
+    }
+
+    return TRUE;
+}
+
+static
+BOOLEAN
+NTAPI
+ChkdskCallback(
+    _In_ CALLBACKCOMMAND Command,
+    _In_ ULONG Modifier,
+    _In_ PVOID Argument)
+{
+    switch (Command)
+    {
+        default:
+            DPRINT("Unknown callback %lu\n", (ULONG)Command);
+            break;
+    }
+
+    return TRUE;
+}
+
+// PFSVOL_CALLBACK
+static FSVOL_OP
+CALLBACK
+FsVolCallback(
+    _In_opt_ PVOID Context,
+    _In_ FSVOLNOTIFY FormatStatus,
+    _In_ ULONG_PTR Param1,
+    _In_ ULONG_PTR Param2)
+{
+    PFSVOL_CONTEXT FsVolContext = (PFSVOL_CONTEXT)Context;
+    WCHAR Buffer[MAX_PATH];
+
+    switch (FormatStatus)
+    {
+    // FIXME: Deprecate!
+    case ChangeSystemPartition:
+    {
+        // PPARTENTRY SystemPartition = (PPARTENTRY)Param1;
+
+        // FsVolContext->NextPageOnAbort = SELECT_PARTITION_PAGE;
+        // if (ChangeSystemPartitionPage(Ir, SystemPartition))
+        //     return FSVOL_DOIT;
+        return FSVOL_ABORT;
+    }
+
+    case FSVOLNOTIFY_PARTITIONERROR:
+    {
+        switch (Param1)
+        {
+        case STATUS_PARTITION_FAILURE:
+        {
+            // ERROR_WRITE_PTABLE
+            DisplayMessage(NULL, MB_ICONERROR | MB_OK,
+                           L"Error",
+                           L"Setup failed to write partition tables.");
+            // FsVolContext->NextPageOnAbort = QUIT_PAGE;
+            // TODO: Go back to the partitioning page?
+            break;
+        }
+
+        case ERROR_SYSTEM_PARTITION_NOT_FOUND:
+        {
+            /* FIXME: improve the error dialog */
+            //
+            // Error dialog should say that we cannot find a suitable
+            // system partition and create one on the system. At this point,
+            // it may be nice to ask the user whether he wants to continue,
+            // or use an external drive as the system drive/partition
+            // (e.g. floppy, USB drive, etc...)
+            //
+            DisplayMessage(NULL, MB_ICONERROR | MB_OK,
+                           L"Error",
+                           L"The ReactOS Setup could not find a supported system partition\n"
+                           L"on your system or could not create a new one. Without such partition\n"
+                           L"the Setup program cannot install ReactOS.\n"
+                           L"Press OK to return to the partition selection list.");
+
+            // FsVolContext->NextPageOnAbort = SELECT_PARTITION_PAGE;
+            // TODO: Go back to the partitioning page
+            break;
+        }
+
+        default:
+            break;
+        }
+        return FSVOL_ABORT;
+    }
+
+    case FSVOLNOTIFY_STARTQUEUE:
+    case FSVOLNOTIFY_ENDQUEUE:
+        // NOTE: If needed, clear progress gauges.
+        return FSVOL_DOIT;
+
+    case FSVOLNOTIFY_STARTSUBQUEUE:
+    {
+        if ((FSVOL_OP)Param1 == FSVOL_FORMAT)
+        {
+            /*
+             * In case we just repair an existing installation, or make
+             * an unattended setup without formatting, just go to the
+             * filesystem check step.
+             */
+            if (FsVolContext->pSetupData->RepairUpdateFlag)
+                return FSVOL_SKIP; /** HACK!! **/
+
+            if (IsUnattendedSetup && !FsVolContext->pSetupData->USetupData.FormatPartition)
+                return FSVOL_SKIP; /** HACK!! **/
+
+            /* Set status text */
+            SetDlgItemTextW(UiContext.hwndDlg, IDC_ITEM, L"");
+        }
+        else
+        if ((FSVOL_OP)Param1 == FSVOL_CHECK)
+        {
+            /* Set status text */
+            SetDlgItemTextW(UiContext.hwndDlg, IDC_ITEM, L"");
+
+            /* Filechecking step: set progress marquee style and start it up */
+            UiContext.dwPbStyle = GetWindowLongPtrW(UiContext.hWndProgress, GWL_STYLE);
+            SetWindowLongPtrW(UiContext.hWndProgress, GWL_STYLE, UiContext.dwPbStyle | PBS_MARQUEE);
+            SendMessageW(UiContext.hWndProgress, PBM_SETMARQUEE, TRUE, 0);
+        }
+
+        return FSVOL_DOIT;
+    }
+
+    case FSVOLNOTIFY_ENDSUBQUEUE:
+    {
+        if ((FSVOL_OP)Param1 == FSVOL_CHECK)
+        {
+            /* File-checking finished: stop the progress bar and restore its style */
+            SendMessageW(UiContext.hWndProgress, PBM_SETMARQUEE, FALSE, 0);
+            SetWindowLongPtrW(UiContext.hWndProgress, GWL_STYLE, UiContext.dwPbStyle);
+        }
+        return 0;
+    }
+
+    case FSVOLNOTIFY_FORMATERROR:
+    {
+        PFORMAT_VOLUME_INFO FmtInfo = (PFORMAT_VOLUME_INFO)Param1;
+
+        // FIXME: See also FSVOLNOTIFY_PARTITIONERROR
+        if (FmtInfo->ErrorStatus == STATUS_PARTITION_FAILURE)
+        {
+            // ERROR_WRITE_PTABLE
+            DisplayMessage(NULL, MB_ICONERROR | MB_OK,
+                           L"Error",
+                           L"Setup failed to write partition tables.");
+            // FsVolContext->NextPageOnAbort = QUIT_PAGE;
+            // TODO: Go back to the partitioning page?
+            return FSVOL_ABORT;
+        }
+        else
+        if (FmtInfo->ErrorStatus == STATUS_UNRECOGNIZED_VOLUME)
+        {
+            /* FIXME: show an error dialog */
+            // MUIDisplayError(ERROR_FORMATTING_PARTITION, Ir, POPUP_WAIT_ANY_KEY, PathBuffer);
+            DisplayMessage(NULL, MB_ICONERROR | MB_OK,
+                           L"Error",
+                           L"Unrecognized volume while attempting to format the partition.");
+            // FsVolContext->NextPageOnAbort = QUIT_PAGE;
+            return FSVOL_ABORT;
+        }
+        else
+        if (FmtInfo->ErrorStatus == STATUS_NOT_SUPPORTED)
+        {
+            INT nRet;
+
+            nRet = DisplayMessage(NULL, MB_ICONERROR | MB_OKCANCEL,
+                                  L"Error",
+                                  L"Setup is currently unable to format a partition in %s.\n"
+                                  L"\n"
+                                  L"  \x07  Press OK to continue Setup.\n"
+                                  L"  \x07  Press Cancel to quit Setup.",
+                                  FmtInfo->FileSystemName);
+            if (nRet == IDCANCEL)
+            {
+                // FsVolContext->NextPageOnAbort = QUIT_PAGE;
+                return FSVOL_ABORT;
+            }
+            else if (nRet == IDOK)
+            {
+                return FSVOL_RETRY;
+            }
+        }
+        else if (!NT_SUCCESS(FmtInfo->ErrorStatus))
+        {
+            ASSERT(*FmtInfo->Volume->Info.DeviceName);
+
+            DPRINT1("FormatPartition() failed with status 0x%08lx\n", FmtInfo->ErrorStatus);
+
+            // ERROR_FORMATTING_PARTITION
+            DisplayMessage(NULL, MB_ICONERROR | MB_OK,
+                           L"Error",
+                           L"Setup is unable to format the partition:\n %s\n",
+                           FmtInfo->Volume->Info.DeviceName);
+            // FsVolContext->NextPageOnAbort = QUIT_PAGE;
+            return FSVOL_ABORT;
+        }
+
+        return FSVOL_RETRY;
+    }
+
+    case FSVOLNOTIFY_CHECKERROR:
+    {
+        PCHECK_VOLUME_INFO ChkInfo = (PCHECK_VOLUME_INFO)Param1;
+
+        if (ChkInfo->ErrorStatus == STATUS_NOT_SUPPORTED)
+        {
+            INT nRet;
+
+            nRet = DisplayMessage(NULL, MB_ICONERROR | MB_OKCANCEL,
+                                  L"Error",
+                                  L"Setup is currently unable to check a partition formatted in %s.\n"
+                                  L"\n"
+                                  L"  \x07  Press ENTER to continue Setup.\n"
+                                  L"  \x07  Press F3 to quit Setup.",
+                                  ChkInfo->Volume->Info.FileSystem);
+            if (nRet == IDCANCEL)
+            {
+                // FsVolContext->NextPageOnAbort = QUIT_PAGE;
+                return FSVOL_ABORT;
+            }
+            else if (nRet == IDOK)
+            {
+                return FSVOL_SKIP;
+            }
+        }
+        else if (!NT_SUCCESS(ChkInfo->ErrorStatus))
+        {
+            DPRINT1("ChkdskPartition() failed with status 0x%08lx\n", ChkInfo->ErrorStatus);
+
+            DisplayMessage(NULL, MB_ICONERROR | MB_OK,
+                           L"Error",
+                           L"ChkDsk detected some disk errors.\n(Status 0x%08lx).\n",
+                           ChkInfo->ErrorStatus);
+            return FSVOL_SKIP;
+        }
+
+        return FSVOL_SKIP;
+    }
+
+    case FSVOLNOTIFY_STARTFORMAT:
+    {
+        PFORMAT_VOLUME_INFO FmtInfo = (PFORMAT_VOLUME_INFO)Param1;
+        PVOL_CREATE_INFO VolCreate;
+
+        ASSERT((FSVOL_OP)Param2 == FSVOL_FORMAT);
+
+        /* Find the volume info in the partition TreeList UI.
+         * If none, don't format it. */
+        VolCreate = FindVolCreateInTreeByVolume(UiContext.hPartList,
+                                                FmtInfo->Volume);
+        if (!VolCreate)
+            return FSVOL_SKIP;
+        ASSERT(VolCreate->Volume == FmtInfo->Volume);
+
+        /* If there is no formatting information, skip it */
+        if (!*VolCreate->FileSystemName)
+            return FSVOL_SKIP;
+
+        ASSERT(*FmtInfo->Volume->Info.DeviceName);
+
+        /* Set status text */
+        if (FmtInfo->Volume->Info.DriveLetter)
+        {
+            StringCchPrintfW(Buffer, ARRAYSIZE(Buffer),
+                             L"Formatting volume %c: (%s) in %s...",
+                             FmtInfo->Volume->Info.DriveLetter,
+                             FmtInfo->Volume->Info.DeviceName,
+                             VolCreate->FileSystemName);
+        }
+        else
+        {
+            StringCchPrintfW(Buffer, ARRAYSIZE(Buffer),
+                             L"Formatting volume %s in %s...",
+                             FmtInfo->Volume->Info.DeviceName,
+                             VolCreate->FileSystemName);
+        }
+        SetDlgItemTextW(UiContext.hwndDlg, IDC_ITEM, Buffer);
+
+        // StartFormat(FmtInfo, FileSystemList->Selected);
+        FmtInfo->FileSystemName = VolCreate->FileSystemName;
+        FmtInfo->MediaFlag = VolCreate->MediaFlag;
+        FmtInfo->Label = VolCreate->Label;
+        FmtInfo->QuickFormat = VolCreate->QuickFormat;
+        FmtInfo->ClusterSize = VolCreate->ClusterSize;
+        FmtInfo->Callback = FormatCallback;
+
+        /* Set up the progress bar */
+        SendMessageW(UiContext.hWndProgress,
+                     PBM_SETRANGE, 0, MAKELPARAM(0, 100));
+        SendMessageW(UiContext.hWndProgress,
+                     PBM_SETPOS, 0, 0);
+
+        return FSVOL_DOIT;
+    }
+
+    case FSVOLNOTIFY_ENDFORMAT:
+    {
+        PFORMAT_VOLUME_INFO FmtInfo = (PFORMAT_VOLUME_INFO)Param1;
+
+        // EndFormat(FmtInfo->ErrorStatus);
+        if (FmtInfo->FileSystemName)
+            *(PWSTR)FmtInfo->FileSystemName = UNICODE_NULL; // FIXME: HACK!
+
+        // /* Reset the file system list */
+        // ResetFileSystemList();
+        return 0;
+    }
+
+    case FSVOLNOTIFY_STARTCHECK:
+    {
+        PCHECK_VOLUME_INFO ChkInfo = (PCHECK_VOLUME_INFO)Param1;
+        PVOL_CREATE_INFO VolCreate;
+
+        ASSERT((FSVOL_OP)Param2 == FSVOL_CHECK);
+
+        /* Find the volume info in the partition TreeList UI.
+         * If none, don't check it. */
+        VolCreate = FindVolCreateInTreeByVolume(UiContext.hPartList,
+                                                ChkInfo->Volume);
+        if (!VolCreate)
+            return FSVOL_SKIP;
+        ASSERT(VolCreate->Volume == ChkInfo->Volume);
+
+        ASSERT(*ChkInfo->Volume->Info.DeviceName);
+
+        /* Set status text */
+        if (ChkInfo->Volume->Info.DriveLetter)
+        {
+            StringCchPrintfW(Buffer, ARRAYSIZE(Buffer),
+                             L"Checking volume %c: (%s)...",
+                             ChkInfo->Volume->Info.DriveLetter,
+                             ChkInfo->Volume->Info.DeviceName);
+        }
+        else
+        {
+            StringCchPrintfW(Buffer, ARRAYSIZE(Buffer),
+                             L"Checking volume %s...",
+                             ChkInfo->Volume->Info.DeviceName);
+        }
+        SetDlgItemTextW(UiContext.hwndDlg, IDC_ITEM, Buffer);
+
+        // StartCheck(ChkInfo);
+        // TODO: Think about which values could be defaulted...
+        ChkInfo->FixErrors = TRUE;
+        ChkInfo->Verbose = FALSE;
+        ChkInfo->CheckOnlyIfDirty = TRUE;
+        ChkInfo->ScanDrive = FALSE;
+        ChkInfo->Callback = ChkdskCallback;
+
+        return FSVOL_DOIT;
+    }
+
+    case FSVOLNOTIFY_ENDCHECK:
+    {
+        // PCHECK_VOLUME_INFO ChkInfo = (PCHECK_VOLUME_INFO)Param1;
+        // EndCheck(ChkInfo->ErrorStatus);
+        return 0;
+    }
+    }
+
+    return 0;
+}
+
+
+
 typedef struct _COPYCONTEXT
 {
     PSETUPDATA pSetupData;
-    HWND hWndItem;
-    HWND hWndProgress;
     ULONG TotalOperations;
     ULONG CompletedOperations;
 } COPYCONTEXT, *PCOPYCONTEXT;
@@ -1005,11 +1515,14 @@ FileCopyCallback(PVOID Context,
             CopyContext->TotalOperations = (ULONG)Param2;
             CopyContext->CompletedOperations = 0;
 
-            SendMessageW(CopyContext->hWndProgress,
+            /* Set up the progress bar */
+            SendMessageW(UiContext.hWndProgress,
                          PBM_SETRANGE, 0,
                          MAKELPARAM(0, CopyContext->TotalOperations));
-            SendMessageW(CopyContext->hWndProgress,
+            SendMessageW(UiContext.hWndProgress,
                          PBM_SETSTEP, 1, 0);
+            SendMessageW(UiContext.hWndProgress,
+                         PBM_SETPOS, 0, 0);
             break;
         }
 
@@ -1030,7 +1543,7 @@ FileCopyCallback(PVOID Context,
 
                 // STRING_DELETING
                 StringCchPrintfW(Status, ARRAYSIZE(Status), L"Deleting %s", DstFileName);
-                SetWindowTextW(CopyContext->hWndItem, Status);
+                SetWindowTextW(UiContext.hWndItem, Status);
             }
             else if (Notification == SPFILENOTIFY_STARTRENAME)
             {
@@ -1051,7 +1564,7 @@ FileCopyCallback(PVOID Context,
                 else
                     StringCchPrintfW(Status, ARRAYSIZE(Status), L"Renaming %s to %s", SrcFileName, DstFileName);
 
-                SetWindowTextW(CopyContext->hWndItem, Status);
+                SetWindowTextW(UiContext.hWndItem, Status);
             }
             else if (Notification == SPFILENOTIFY_STARTCOPY)
             {
@@ -1064,11 +1577,20 @@ FileCopyCallback(PVOID Context,
 
                 // STRING_COPYING
                 StringCchPrintfW(Status, ARRAYSIZE(Status), L"Copying %s", DstFileName);
-                SetWindowTextW(CopyContext->hWndItem, Status);
+                SetWindowTextW(UiContext.hWndItem, Status);
             }
             break;
         }
 
+        case SPFILENOTIFY_COPYERROR:
+        {
+            FilePathInfo = (PFILEPATHS_W)Param1;
+
+            DPRINT1("An error happened while trying to copy file '%S' (error 0x%08lx), skipping it...\n",
+                    FilePathInfo->Target, FilePathInfo->Win32Error);
+            return FILEOP_SKIP;
+        }
+
         case SPFILENOTIFY_ENDDELETE:
         case SPFILENOTIFY_ENDRENAME:
         case SPFILENOTIFY_ENDCOPY:
@@ -1079,7 +1601,7 @@ FileCopyCallback(PVOID Context,
             if (CopyContext->TotalOperations >> 1 == CopyContext->CompletedOperations)
                 DPRINT1("CHECKPOINT:HALF_COPIED\n");
 
-            SendMessageW(CopyContext->hWndProgress, PBM_STEPIT, 0, 0);
+            SendMessageW(UiContext.hWndProgress, PBM_STEPIT, 0, 0);
             break;
         }
     }
@@ -1087,6 +1609,23 @@ FileCopyCallback(PVOID Context,
     return FILEOP_DOIT;
 }
 
+/**
+ * @brief
+ * Enables or disables the Cancel and the Close title-bar
+ * property-sheet window buttons.
+ **/
+VOID
+PropSheet_SetCloseCancel(
+    _In_ HWND hWndWiz,
+    _In_ BOOL Enable)
+{
+    EnableDlgItem(hWndWiz, IDCANCEL, Enable);
+    // ShowWindow(GetDlgItem(hWndWiz, IDCANCEL), Enable ? SW_SHOW : SW_HIDE);
+    EnableMenuItem(GetSystemMenu(hWndWiz, FALSE),
+                   SC_CLOSE,
+                   MF_BYCOMMAND | (Enable ? MF_ENABLED : MF_GRAYED));
+}
+
 static DWORD
 WINAPI
 PrepareAndDoCopyThread(
@@ -1098,7 +1637,10 @@ PrepareAndDoCopyThread(
     LONG_PTR dwStyle;
     // ERROR_NUMBER ErrorNumber;
     BOOLEAN Success;
+    NTSTATUS Status;
+    FSVOL_CONTEXT FsVolContext;
     COPYCONTEXT CopyContext;
+    // WCHAR PathBuffer[MAX_PATH];
 
     /* Retrieve pointer to the global setup data */
     pSetupData = (PSETUPDATA)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA);
@@ -1106,6 +1648,109 @@ PrepareAndDoCopyThread(
     /* Get the progress handle */
     hWndProgress = GetDlgItem(hwndDlg, IDC_PROCESSPROGRESS);
 
+    /* Setup global UI context */
+    UiContext.hwndDlg = hwndDlg;
+    UiContext.hWndItem = GetDlgItem(hwndDlg, IDC_ITEM);
+    UiContext.hWndProgress = hWndProgress;
+    UiContext.dwPbStyle = 0;
+
+
+    /* Disable the Close/Cancel buttons during all partition operations */
+    // TODO: Consider, alternatively, to just show an info-box saying
+    // that the installation process cannot be canceled at this stage?
+    // PropSheet_SetWizButtons(GetParent(hwndDlg), 0);
+    PropSheet_SetCloseCancel(GetParent(hwndDlg), FALSE);
+
+
+    /*
+     * Find/Set the system partition, and apply all pending partition operations.
+     */
+
+    /* Create context for the volume/partition operations */
+    FsVolContext.pSetupData = pSetupData;
+
+    /* Set status text */
+    SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L"Setting the system partition...");
+    SetDlgItemTextW(hwndDlg, IDC_ITEM, L"");
+
+    /* Find or set the active system partition before starting formatting */
+    Success = InitSystemPartition(pSetupData->PartitionList,
+                                  InstallPartition,
+                                  &SystemPartition,
+                                  FsVolCallback,
+                                  &FsVolContext);
+    // if (!Success)
+    //     return FsVolContext.NextPageOnAbort;
+    //
+    // FIXME?? If cannot use any system partition, install FreeLdr on floppy / removable media??
+    //
+    if (!Success)
+    {
+        /* Display an error if an unexpected failure happened */
+        MessageBoxW(GetParent(hwndDlg), L"Failed to find or set the system partition!", L"Error", MB_ICONERROR);
+
+        /* Re-enable the Close/Cancel buttons */
+        PropSheet_SetCloseCancel(GetParent(hwndDlg), TRUE);
+
+        /*
+         * We failed due to an unexpected error, keep on the copy page to view the current state,
+         * but enable the "Next" button to allow the user to continue to the terminate page.
+         */
+        PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT);
+        return 1;
+    }
+
+
+    /* Set status text */
+    SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L"Preparing partitions...");
+    SetDlgItemTextW(hwndDlg, IDC_ITEM, L"");
+
+    /* Apply all pending operations on partitions: formatting and checking */
+    Success = FsVolCommitOpsQueue(pSetupData->PartitionList,
+                                  SystemVolume,
+                                  InstallVolume,
+                                  FsVolCallback,
+                                  &FsVolContext);
+    if (!Success)
+    {
+        /* Display an error if an unexpected failure happened */
+        MessageBoxW(GetParent(hwndDlg), L"Failed to prepare the partitions!", L"Error", MB_ICONERROR);
+
+        /* Re-enable the Close/Cancel buttons */
+        PropSheet_SetCloseCancel(GetParent(hwndDlg), TRUE);
+
+        /*
+         * We failed due to an unexpected error, keep on the copy page to view the current state,
+         * but enable the "Next" button to allow the user to continue to the terminate page.
+         */
+        PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT);
+        return 1;
+    }
+
+
+    /* Re-enable the Close/Cancel buttons */
+    PropSheet_SetCloseCancel(GetParent(hwndDlg), TRUE);
+
+
+
+    /* Re-calculate the final destination paths */
+    ASSERT(InstallPartition);
+    Status = InitDestinationPaths(&pSetupData->USetupData,
+                                  NULL, // pSetupData->USetupData.InstallationDirectory,
+                                  InstallVolume);
+    if (!NT_SUCCESS(Status))
+    {
+        DisplayMessage(GetParent(hwndDlg), MB_ICONERROR, L"Error", L"InitDestinationPaths() failed with status 0x%08lx\n", Status);
+
+        /*
+         * We failed due to an unexpected error, keep on the copy page to view the current state,
+         * but enable the "Next" button to allow the user to continue to the terminate page.
+         */
+        PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT);
+        return 1;
+    }
+
+
 
     /*
      * Preparation of the list of files to be copied
@@ -1115,27 +1760,24 @@ PrepareAndDoCopyThread(
     SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L"Preparing the list of files to be copied, please wait...");
     SetDlgItemTextW(hwndDlg, IDC_ITEM, L"");
 
-    /* Set progress marquee style */
+    /* Set progress marquee style and start it up */
     dwStyle = GetWindowLongPtrW(hWndProgress, GWL_STYLE);
     SetWindowLongPtrW(hWndProgress, GWL_STYLE, dwStyle | PBS_MARQUEE);
-
-    /* Start it up */
     SendMessageW(hWndProgress, PBM_SETMARQUEE, TRUE, 0);
 
     /* Prepare the list of files */
     /* ErrorNumber = */ Success = PrepareFileCopy(&pSetupData->USetupData, NULL);
+
+    /* Stop progress and restore its style */
+    SendMessageW(hWndProgress, PBM_SETMARQUEE, FALSE, 0);
+    SetWindowLongPtrW(hWndProgress, GWL_STYLE, dwStyle);
+
     if (/*ErrorNumber != ERROR_SUCCESS*/ !Success)
     {
         /* Display an error only if an unexpected failure happened, and not because the user cancelled the installation */
         if (!pSetupData->bStopInstall)
             MessageBoxW(GetParent(hwndDlg), L"Failed to prepare the list of files!", L"Error", MB_ICONERROR);
 
-        /* Stop it */
-        SendMessageW(hWndProgress, PBM_SETMARQUEE, FALSE, 0);
-
-        /* Restore progress style */
-        SetWindowLongPtrW(hWndProgress, GWL_STYLE, dwStyle);
-
         /*
          * If we failed due to an unexpected error, keep on the copy page to view the current state,
          * but enable the "Next" button to allow the user to continue to the terminate page.
@@ -1146,12 +1788,6 @@ PrepareAndDoCopyThread(
         return 1;
     }
 
-    /* Stop it */
-    SendMessageW(hWndProgress, PBM_SETMARQUEE, FALSE, 0);
-
-    /* Restore progress style */
-    SetWindowLongPtrW(hWndProgress, GWL_STYLE, dwStyle);
-
 
     /*
      * Perform the file copy
@@ -1163,8 +1799,6 @@ PrepareAndDoCopyThread(
 
     /* Create context for the copy process */
     CopyContext.pSetupData = pSetupData;
-    CopyContext.hWndItem = GetDlgItem(hwndDlg, IDC_ITEM);
-    CopyContext.hWndProgress = hWndProgress;
     CopyContext.TotalOperations = 0;
     CopyContext.CompletedOperations = 0;
 
@@ -1185,9 +1819,9 @@ PrepareAndDoCopyThread(
         return 1;
     }
 
-    /* Set status text */
-    SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L"Finalizing the installation...");
-    SetDlgItemTextW(hwndDlg, IDC_ITEM, L"");
+    // /* Set status text */
+    // SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L"Finalizing the installation...");
+    // SetDlgItemTextW(hwndDlg, IDC_ITEM, L"");
 
     /* Create the $winnt$.inf file */
     InstallSetupInfFile(&pSetupData->USetupData);

base/setup/reactos/reactos.h

@@ -45,6 +45,9 @@
 #include <commctrl.h>
 #include <windowsx.h>
 
+#define EnableDlgItem(hDlg, nID, bEnable)   \
+    EnableWindow(GetDlgItem((hDlg), (nID)), (bEnable))
+
 /* These are public names and values determined from MFC, and compatible with Windows */
 // Property Sheet control id's (determined with Spy++)
 #define IDC_TAB_CONTROL                 0x3020
@@ -69,14 +72,18 @@
 // #include <reactos/rosioctl.h>
 #include <../lib/setuplib.h>
 
-#if 0
-typedef struct _KBLAYOUT
+
+/* UI elements */
+typedef struct _UI_CONTEXT
 {
-    TCHAR LayoutId[9];
-    TCHAR LayoutName[128];
-    TCHAR DllName[128];
-} KBLAYOUT, *PKBLAYOUT;
-#endif
+    HWND hPartList; // Disks & partitions list
+    HWND hwndDlg;   // Install progress page
+    HWND hWndItem;  // Progress action
+    HWND hWndProgress;  // Progress gauge
+    LONG_PTR dwPbStyle; // Progress gauge style
+} UI_CONTEXT, *PUI_CONTEXT;
+
+extern UI_CONTEXT UiContext;
 
 
 /*
@@ -108,6 +115,15 @@ typedef struct _NT_WIN32_PATH_MAPPING_LIST
 } NT_WIN32_PATH_MAPPING_LIST, *PNT_WIN32_PATH_MAPPING_LIST;
 
 
+#if 0
+typedef struct _KBLAYOUT
+{
+    TCHAR LayoutId[9];
+    TCHAR LayoutName[128];
+    TCHAR DllName[128];
+} KBLAYOUT, *PKBLAYOUT;
+#endif
+
 typedef struct _SETUPDATA
 {
     /* General */
@@ -151,6 +167,34 @@ extern BOOLEAN IsUnattendedSetup;
 
 extern SETUPDATA SetupData;
 
+extern PPARTENTRY InstallPartition;
+extern PPARTENTRY SystemPartition;
+
+/**
+ * @brief   Data structure stored when a partition/volume needs to be formatted.
+ **/
+typedef struct _VOL_CREATE_INFO
+{
+    PVOLENTRY Volume;
+
+    /* Volume-related parameters:
+     * Cached input information that will be set to
+     * the FORMAT_VOLUME_INFO structure given to the
+     * 'FSVOLNOTIFY_STARTFORMAT' step */
+    // PCWSTR FileSystemName;
+    WCHAR FileSystemName[MAX_PATH+1];
+    FMIFS_MEDIA_FLAG MediaFlag;
+    PCWSTR Label;
+    BOOLEAN QuickFormat;
+    ULONG ClusterSize;
+} VOL_CREATE_INFO, *PVOL_CREATE_INFO;
+
+/* See drivepage.c */
+PVOL_CREATE_INFO
+FindVolCreateInTreeByVolume(
+    _In_ HWND hTreeList,
+    _In_ PVOLENTRY Volume);
+
 
 /*
  * Attempts to convert a pure NT file path into a corresponding Win32 path.
@@ -166,6 +210,17 @@ ConvertNtPathToWin32Path(
 
 /* drivepage.c */
 
+INT_PTR
+CALLBACK
+DriveDlgProc(
+    _In_ HWND hwndDlg,
+    _In_ UINT uMsg,
+    _In_ WPARAM wParam,
+    _In_ LPARAM lParam);
+
+
+/* reactos.c */
+
 BOOL
 CreateListViewColumns(
     IN HINSTANCE hInstance,
@@ -175,14 +230,21 @@ CreateListViewColumns(
     IN const INT* pColsAlign,
     IN UINT nNumOfColumns);
 
-INT_PTR
-CALLBACK
-DriveDlgProc(
-    HWND hwndDlg,
-    UINT uMsg,
-    WPARAM wParam,
-    LPARAM lParam);
+INT
+DisplayMessage(
+    _In_opt_ HWND hParentWnd,
+    _In_ UINT uType,
+    _In_opt_ LPCWSTR pszTitle,
+    _In_ LPCWSTR pszFormatMessage,
+    ...);
+
+INT
+DisplayError(
+    _In_opt_ HWND hParentWnd,
+    _In_ UINT uIDTitle,
+    _In_ UINT uIDMessage);
+
 
 #endif /* _REACTOS_PCH_ */
 
-/* EOP */
+/* EOF */

base/setup/reactos/resource.h

@@ -34,11 +34,13 @@
 #define IDC_KEYBOARD         2033
 #define IDC_KEYLAYOUT        2034
 
-#define IDD_DRIVEPAGE        2040
-#define IDC_PARTITION        2041
-#define IDC_PARTCREATE       2042
-#define IDC_PARTDELETE       2043
-#define IDC_DEVICEDRIVER     2044
+#define IDD_DRIVEPAGE           2040
+#define IDC_PARTITION           2041
+#define IDC_INITDISK            2042
+#define IDC_PARTCREATE          2043
+#define IDC_PARTDELETE          2044
+#define IDC_DEVICEDRIVER        2045
+#define IDC_PARTMOREOPTS        2046
 
 #define IDD_SUMMARYPAGE      2050
 #define IDC_INSTALLTYPE      2051
@@ -59,19 +61,19 @@
 #define IDD_RESTARTPAGE      2070
 #define IDC_FINISHTITLE      2071
 #define IDC_RESTART_PROGRESS 2072
-#define IDC_PARTMOREOPTS     2073
 
-#define IDD_BOOTOPTIONS      2080
+#define IDD_ADVINSTOPTS      2080
 #define IDC_PATH             2081
 #define IDC_INSTFREELDR      2082
-#define IDC_INSTVBRONLY      2083
-#define IDC_NOINSTFREELDR    2084
 
-#define IDD_PARTITION        2090
-#define IDC_UPDOWN1          2091
-#define IDC_PARTSIZE         2092
-#define IDC_UNIT             2093
-#define IDC_FSTYPE           2094
+#define IDD_PARTITION           2090
+#define IDC_EDIT_PARTSIZE       2091
+#define IDC_UPDOWN_PARTSIZE     2092
+#define IDC_UNIT                2093
+#define IDC_CHECK_MBREXTPART    2094
+#define IDC_FS_STATIC           2095
+#define IDC_FSTYPE              2096
+#define IDC_CHECK_QUICKFMT      2097
 
 
 /* Strings */
@@ -100,3 +102,10 @@
 #define IDS_PARTITION_TYPE   5201
 #define IDS_PARTITION_SIZE   5202
 #define IDS_PARTITION_STATUS 5203
+
+// WARNING: These IDs *MUST* stay in increasing order!
+#define IDS_BOOTLOADER_NOINST       5300
+#define IDS_BOOTLOADER_REMOVABLE    5301
+#define IDS_BOOTLOADER_SYSTEM       5302
+#define IDS_BOOTLOADER_MBRVBR       5303
+#define IDS_BOOTLOADER_VBRONLY      5304

base/setup/reactos/treelist.h

@@ -457,10 +457,21 @@ extern BOOL	TreeListUnregister(HINSTANCE hInstance);
 
 /* Compat with my old code... */
 #define TLCOLUMN TVCOLUMN
-#define HTLITEM HTREEITEM
+#define HTLITEM  HTREEITEM
+
 #define TL_INSERTSTRUCTA TV_INSERTSTRUCTA
+#define TLINSERTSTRUCTA  TVINSERTSTRUCTA
 #define TL_INSERTSTRUCTW TV_INSERTSTRUCTW
-#define TL_INSERTSTRUCT TV_INSERTSTRUCT
+#define TLINSERTSTRUCTW  TVINSERTSTRUCTW
+#define TL_INSERTSTRUCT  TV_INSERTSTRUCT
+#define TLINSERTSTRUCT   TVINSERTSTRUCT
+
+#define TL_ITEMA TV_ITEMA
+#define TLITEMA  TVITEMA
+#define TL_ITEMW TV_ITEMW
+#define TLITEMW  TVITEMW
+#define TL_ITEM  TV_ITEM
+#define TLITEM   TVITEM
 
 /* New stuff */
 #ifndef __REACTOS__

base/setup/usetup/partlist.c

@@ -559,7 +559,7 @@ PrintDiskData(
                            DiskEntry,
                            PrimaryPartEntry);
 
-        if (IsContainerPartition(PrimaryPartEntry->PartitionType))
+        if (PrimaryPartEntry == DiskEntry->ExtendedPartition)
         {
             for (LogicalEntry = DiskEntry->LogicalPartListHead.Flink;
                  LogicalEntry != &DiskEntry->LogicalPartListHead;
@@ -843,8 +843,9 @@ ScrollUpDownPartitionList(
     _In_ BOOLEAN Direction)
 {
     PPARTENTRY PartEntry =
-        (Direction ? GetNextPartition
-                   : GetPrevPartition)(ListUi->List, ListUi->CurrentPartition);
+        GetAdjPartition(ListUi->List, ListUi->CurrentPartition,
+                        (Direction ? ENUM_REGION_NEXT : ENUM_REGION_PREV)
+                            | ENUM_REGION_MBR_BY_ORDER);
     if (PartEntry)
     {
         ListUi->CurrentPartition = PartEntry;

base/setup/usetup/usetup.c

@@ -508,14 +508,20 @@ GetNTOSInstallationName(
     IN SIZE_T cchBufferSize)
 {
     PNTOS_INSTALLATION NtOsInstall = (PNTOS_INSTALLATION)GetListEntryData(Entry);
-    PPARTENTRY PartEntry = NtOsInstall->PartEntry;
 
-    if (PartEntry && PartEntry->DriveLetter)
+    /* Retrieve the corresponding disk and partition */
+    PDISKENTRY DiskEntry = NULL;
+    PPARTENTRY PartEntry = NULL; // NtOsInstall->PartEntry;
+    GetDiskOrPartition(PartitionList,
+                       NtOsInstall->DiskNumber, NtOsInstall->PartitionNumber,
+                       &DiskEntry, &PartEntry);
+
+    if (PartEntry && PartEntry->Volume.DriveLetter)
     {
         /* We have retrieved a partition that is mounted */
         return RtlStringCchPrintfA(Buffer, cchBufferSize,
                                    "%C:%S  \"%S\"",
-                                   PartEntry->DriveLetter,
+                                   PartEntry->Volume.DriveLetter,
                                    NtOsInstall->PathComponent,
                                    NtOsInstall->InstallationName);
     }
@@ -3507,15 +3513,15 @@ BootLoaderSelectPage(PINPUT_RECORD Ir)
      */
     if (RepairUpdateFlag)
     {
-        USetupData.MBRInstallType = 0;
+        USetupData.BootLoaderLocation = 0;
         goto Quit;
     }
 
     /* For unattended setup, skip MBR installation or install on removable disk if needed */
     if (IsUnattendedSetup)
     {
-        if ((USetupData.MBRInstallType == 0) ||
-            (USetupData.MBRInstallType == 1))
+        if ((USetupData.BootLoaderLocation == 0) ||
+            (USetupData.BootLoaderLocation == 1))
         {
             goto Quit;
         }
@@ -3530,7 +3536,7 @@ BootLoaderSelectPage(PINPUT_RECORD Ir)
     if ((SystemPartition->DiskEntry->DiskStyle != PARTITION_STYLE_MBR) ||
         !IsRecognizedPartition(SystemPartition->PartitionType))
     {
-        USetupData.MBRInstallType = 1;
+        USetupData.BootLoaderLocation = 1;
         goto Quit;
     }
 #endif
@@ -3538,8 +3544,8 @@ BootLoaderSelectPage(PINPUT_RECORD Ir)
     /* Is it an unattended install on hdd? */
     if (IsUnattendedSetup)
     {
-        if ((USetupData.MBRInstallType == 2) ||
-            (USetupData.MBRInstallType == 3))
+        if ((USetupData.BootLoaderLocation == 2) ||
+            (USetupData.BootLoaderLocation == 3))
         {
             goto Quit;
         }
@@ -3611,25 +3617,25 @@ BootLoaderSelectPage(PINPUT_RECORD Ir)
             if (Line == 12)
             {
                 /* Install on both MBR and VBR */
-                USetupData.MBRInstallType = 2;
+                USetupData.BootLoaderLocation = 2;
                 break;
             }
             else if (Line == 13)
             {
                 /* Install on VBR only */
-                USetupData.MBRInstallType = 3;
+                USetupData.BootLoaderLocation = 3;
                 break;
             }
             else if (Line == 14)
             {
                 /* Install on removable disk */
-                USetupData.MBRInstallType = 1;
+                USetupData.BootLoaderLocation = 1;
                 break;
             }
             else if (Line == 15)
             {
                 /* Skip installation */
-                USetupData.MBRInstallType = 0;
+                USetupData.BootLoaderLocation = 0;
                 break;
             }
 
@@ -3698,7 +3704,7 @@ BootLoaderHardDiskPage(PINPUT_RECORD Ir)
     NTSTATUS Status;
     WCHAR DestinationDevicePathBuffer[MAX_PATH];
 
-    if (USetupData.MBRInstallType == 2)
+    if (USetupData.BootLoaderLocation == 2)
     {
         /* Step 1: Write the VBR */
         Status = InstallVBRToPartition(&USetupData.SystemRootPath,
@@ -3774,10 +3780,10 @@ BootLoaderInstallPage(PINPUT_RECORD Ir)
     RtlCreateUnicodeString(&USetupData.SystemRootPath, PathBuffer);
     DPRINT1("SystemRootPath: %wZ\n", &USetupData.SystemRootPath);
 
-    if (USetupData.MBRInstallType != 0)
+    if (USetupData.BootLoaderLocation != 0)
         MUIDisplayPage(BOOTLOADER_INSTALL_PAGE);
 
-    switch (USetupData.MBRInstallType)
+    switch (USetupData.BootLoaderLocation)
     {
         /* Skip installation */
         case 0:

boot/bootdata/bootcd/unattend.inf

@@ -11,10 +11,11 @@ DestinationDiskNumber = 0
 DestinationPartitionNumber = 1
 InstallationDirectory=ReactOS
 
-; MBRInstallType=0  skips MBR installation
-; MBRInstallType=1  install MBR on floppy
-; MBRInstallType=2  install MBR on hdd
-MBRInstallType=2
+; BootLoaderLocation=0  Skips installation
+; BootLoaderLocation=1  Install on removable media (floppy)
+; BootLoaderLocation=2  Install on system partition (MBR and VBR for MBR disks)
+; BootLoaderLocation=3  Install on VBR only (for MBR disks)
+BootLoaderLocation=2
 
 FullName="MyName"
 ;OrgName="MyOrg"

boot/bootdata/bootcdregtest/unattend.inf

@@ -11,10 +11,11 @@ DestinationDiskNumber = 0
 DestinationPartitionNumber = 1
 InstallationDirectory=ReactOS
 
-; MBRInstallType=0  skips MBR installation
-; MBRInstallType=1  install MBR on floppy 
-; MBRInstallType=2  install MBR on hdd
-MBRInstallType=2
+; BootLoaderLocation=0  Skips installation
+; BootLoaderLocation=1  Install on removable media (floppy)
+; BootLoaderLocation=2  Install on system partition (MBR and VBR for MBR disks)
+; BootLoaderLocation=3  Install on VBR only (for MBR disks)
+BootLoaderLocation=2
 
 FullName="MyName"
 ;OrgName="MyOrg"