Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 22:52:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Make it possible to assign drive letters to all partitions, not only to the first partition of a primary partition table.

Browse source 
- Make AssignDriveLetters in partlist.c to actually assign drive letters to all partitions found (the list corresponds to how Windows 2003 install CD assign driver letters, but more investigation would not hurt).
- Make CheckActiveBootPartition actually search for partition with a boot flag, instead of hardcoding it to partition 0 of disk 0.
- Fix SetMountedDeviceValues to take multiple partitions in a partition table into account.
- Fix Select Partition, Format Partition, Check File System, Delete Partition interface page to take partition number into account.
- IMPORTANT: Create/Delete partitions must not be used to repartition the harddrive! They can only be used to create/delete an initial primary partition on a clean harddisk.

svn path=/trunk/; revision=40430
This commit is contained in:
Aleksey Bragin 2009-04-09 18:59:28 +00:00
parent 32337f8c06
commit a78cdbe77a
3 changed files with 148 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

126
reactos/base/setup/usetup/interface/usetup.c
View file

@ -1812,6 +1812,7 @@ DeletePartitionPage (PINPUT_RECORD Ir)
ULONGLONG PartSize; ULONGLONG PartSize;
PCHAR Unit; PCHAR Unit;
PCHAR PartType; PCHAR PartType;
UCHAR PartNumber;
if (PartitionList == NULL || if (PartitionList == NULL ||
PartitionList->CurrentDisk == NULL || PartitionList->CurrentDisk == NULL ||
@ -1823,6 +1824,7 @@ DeletePartitionPage (PINPUT_RECORD Ir)
DiskEntry = PartitionList->CurrentDisk; DiskEntry = PartitionList->CurrentDisk;
PartEntry = PartitionList->CurrentPartition; PartEntry = PartitionList->CurrentPartition;
PartNumber = PartitionList->CurrentPartitionNumber;
MUIDisplayPage(DELETE_PARTITION_PAGE); MUIDisplayPage(DELETE_PARTITION_PAGE);
@ -1834,44 +1836,44 @@ DeletePartitionPage (PINPUT_RECORD Ir)
} }
else if (PartEntry->Unpartitioned == FALSE) else if (PartEntry->Unpartitioned == FALSE)
{ {
if ((PartEntry->PartInfo[0].PartitionType == PARTITION_FAT_12) || if ((PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_FAT_12) ||
(PartEntry->PartInfo[0].PartitionType == PARTITION_FAT_16) || (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_FAT_16) ||
(PartEntry->PartInfo[0].PartitionType == PARTITION_HUGE) || (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_HUGE) ||
(PartEntry->PartInfo[0].PartitionType == PARTITION_XINT13)) (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_XINT13))
{ {
PartType = "FAT"; PartType = "FAT";
} }
else if ((PartEntry->PartInfo[0].PartitionType == PARTITION_FAT32) || else if ((PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_FAT32) ||
(PartEntry->PartInfo[0].PartitionType == PARTITION_FAT32_XINT13)) (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_FAT32_XINT13))
{ {
PartType = "FAT32"; PartType = "FAT32";
} }
else if (PartEntry->PartInfo[0].PartitionType == PARTITION_EXT2) else if (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_EXT2)
{ {
PartType = "EXT2"; PartType = "EXT2";
} }
else if (PartEntry->PartInfo[0].PartitionType == PARTITION_IFS) else if (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_IFS)
{ {
PartType = "NTFS"; /* FIXME: Not quite correct! */ PartType = "NTFS"; /* FIXME: Not quite correct! */
} }
} }
#if 0 #if 0
if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0x280000000LL) /* 10 GB */ if (PartEntry->PartInfo[PartNumber].PartitionLength.QuadPart >= 0x280000000LL) /* 10 GB */
{ {
PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 29)) >> 30; PartSize = (PartEntry->PartInfo[PartNumber].PartitionLength.QuadPart + (1 << 29)) >> 30;
Unit = MUIGetString(STRING_GB); Unit = MUIGetString(STRING_GB);
} }
else else
#endif #endif
if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0xA00000LL) /* 10 MB */ if (PartEntry->PartInfo[PartNumber].PartitionLength.QuadPart >= 0xA00000LL) /* 10 MB */
{ {
PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 19)) >> 20; PartSize = (PartEntry->PartInfo[PartNumber].PartitionLength.QuadPart + (1 << 19)) >> 20;
Unit = MUIGetString(STRING_MB); Unit = MUIGetString(STRING_MB);
} }
else else
{ {
PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 9)) >> 10; PartSize = (PartEntry->PartInfo[PartNumber].PartitionLength.QuadPart + (1 << 9)) >> 10;
Unit = MUIGetString(STRING_KB); Unit = MUIGetString(STRING_KB);
} }
@ -1879,9 +1881,9 @@ DeletePartitionPage (PINPUT_RECORD Ir)
{ {
CONSOLE_PrintTextXY(6, 10, CONSOLE_PrintTextXY(6, 10,
MUIGetString(STRING_HDDINFOUNK2), MUIGetString(STRING_HDDINFOUNK2),
(PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : PartEntry->DriveLetter[PartNumber],
(PartEntry->DriveLetter == 0) ? '-' : ':', (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : ':',
PartEntry->PartInfo[0].PartitionType, PartEntry->PartInfo[PartNumber].PartitionType,
PartSize, PartSize,
Unit); Unit);
} }
@ -1889,8 +1891,8 @@ DeletePartitionPage (PINPUT_RECORD Ir)
{ {
CONSOLE_PrintTextXY(6, 10, CONSOLE_PrintTextXY(6, 10,
" %c%c %s %I64u %s", " %c%c %s %I64u %s",
(PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : PartEntry->DriveLetter[PartNumber],
(PartEntry->DriveLetter == 0) ? '-' : ':', (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : ':',
PartType, PartType,
PartSize, PartSize,
Unit); Unit);
@ -1972,6 +1974,7 @@ SelectFileSystemPage (PINPUT_RECORD Ir)
{ {
PDISKENTRY DiskEntry; PDISKENTRY DiskEntry;
PPARTENTRY PartEntry; PPARTENTRY PartEntry;
UCHAR PartNumber;
ULONGLONG DiskSize; ULONGLONG DiskSize;
ULONGLONG PartSize; ULONGLONG PartSize;
PCHAR DiskUnit; PCHAR DiskUnit;
@ -1988,6 +1991,7 @@ SelectFileSystemPage (PINPUT_RECORD Ir)
DiskEntry = PartitionList->CurrentDisk; DiskEntry = PartitionList->CurrentDisk;
PartEntry = PartitionList->CurrentPartition; PartEntry = PartitionList->CurrentPartition;
PartNumber = PartitionList->CurrentPartitionNumber;
/* adjust disk size */ /* adjust disk size */
if (DiskEntry->DiskSize >= 0x280000000ULL) /* 10 GB */ if (DiskEntry->DiskSize >= 0x280000000ULL) /* 10 GB */
@ -2002,39 +2006,39 @@ SelectFileSystemPage (PINPUT_RECORD Ir)
} }
/* adjust partition size */ /* adjust partition size */
if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0x280000000LL) /* 10 GB */ if (PartEntry->PartInfo[PartNumber].PartitionLength.QuadPart >= 0x280000000LL) /* 10 GB */
{ {
PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 29)) >> 30; PartSize = (PartEntry->PartInfo[PartNumber].PartitionLength.QuadPart + (1 << 29)) >> 30;
PartUnit = MUIGetString(STRING_GB); PartUnit = MUIGetString(STRING_GB);
} }
else else
{ {
PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 19)) >> 20; PartSize = (PartEntry->PartInfo[PartNumber].PartitionLength.QuadPart + (1 << 19)) >> 20;
PartUnit = MUIGetString(STRING_MB); PartUnit = MUIGetString(STRING_MB);
} }
/* adjust partition type */ /* adjust partition type */
if ((PartEntry->PartInfo[0].PartitionType == PARTITION_FAT_12) || if ((PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_FAT_12) ||
(PartEntry->PartInfo[0].PartitionType == PARTITION_FAT_16) || (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_FAT_16) ||
(PartEntry->PartInfo[0].PartitionType == PARTITION_HUGE) || (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_HUGE) ||
(PartEntry->PartInfo[0].PartitionType == PARTITION_XINT13)) (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_XINT13))
{ {
PartType = "FAT"; PartType = "FAT";
} }
else if ((PartEntry->PartInfo[0].PartitionType == PARTITION_FAT32) || else if ((PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_FAT32) ||
(PartEntry->PartInfo[0].PartitionType == PARTITION_FAT32_XINT13)) (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_FAT32_XINT13))
{ {
PartType = "FAT32"; PartType = "FAT32";
} }
else if (PartEntry->PartInfo[0].PartitionType == PARTITION_EXT2) else if (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_EXT2)
{ {
PartType = "EXT2"; PartType = "EXT2";
} }
else if (PartEntry->PartInfo[0].PartitionType == PARTITION_IFS) else if (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_IFS)
{ {
PartType = "NTFS"; /* FIXME: Not quite correct! */ PartType = "NTFS"; /* FIXME: Not quite correct! */
} }
else if (PartEntry->PartInfo[0].PartitionType == PARTITION_ENTRY_UNUSED) else if (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_ENTRY_UNUSED)
{ {
PartType = MUIGetString(STRING_FORMATUNUSED); PartType = MUIGetString(STRING_FORMATUNUSED);
} }
@ -2049,7 +2053,7 @@ SelectFileSystemPage (PINPUT_RECORD Ir)
#if 0 #if 0
CONSOLE_PrintTextXY(8, 10, "Partition %lu (%I64u %s) %s of", CONSOLE_PrintTextXY(8, 10, "Partition %lu (%I64u %s) %s of",
PartEntry->PartInfo[0].PartitionNumber, PartEntry->PartInfo[PartNumber].PartitionNumber,
PartSize, PartSize,
PartUnit, PartUnit,
PartType); PartType);
@ -2082,9 +2086,9 @@ SelectFileSystemPage (PINPUT_RECORD Ir)
{ {
CONSOLE_PrintTextXY(8, 10, CONSOLE_PrintTextXY(8, 10,
MUIGetString(STRING_HDDINFOUNK4), MUIGetString(STRING_HDDINFOUNK4),
(PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : PartEntry->DriveLetter[PartNumber],
(PartEntry->DriveLetter == 0) ? '-' : ':', (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : ':',
PartEntry->PartInfo[0].PartitionType, PartEntry->PartInfo[PartNumber].PartitionType,
PartSize, PartSize,
PartUnit); PartUnit);
} }
@ -2092,8 +2096,8 @@ SelectFileSystemPage (PINPUT_RECORD Ir)
{ {
CONSOLE_PrintTextXY(8, 10, CONSOLE_PrintTextXY(8, 10,
"%c%c %s %I64u %s", "%c%c %s %I64u %s",
(PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : PartEntry->DriveLetter[PartNumber],
(PartEntry->DriveLetter == 0) ? '-' : ':', (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : ':',
PartType, PartType,
PartSize, PartSize,
PartUnit); PartUnit);
@ -2192,6 +2196,7 @@ FormatPartitionPage (PINPUT_RECORD Ir)
WCHAR PathBuffer[MAX_PATH]; WCHAR PathBuffer[MAX_PATH];
PDISKENTRY DiskEntry; PDISKENTRY DiskEntry;
PPARTENTRY PartEntry; PPARTENTRY PartEntry;
UCHAR PartNum;
NTSTATUS Status; NTSTATUS Status;
#ifndef NDEBUG #ifndef NDEBUG
@ -2212,6 +2217,7 @@ FormatPartitionPage (PINPUT_RECORD Ir)
DiskEntry = PartitionList->CurrentDisk; DiskEntry = PartitionList->CurrentDisk;
PartEntry = PartitionList->CurrentPartition; PartEntry = PartitionList->CurrentPartition;
PartNum = PartitionList->CurrentPartitionNumber;
while(TRUE) while(TRUE)
{ {
@ -2234,53 +2240,53 @@ FormatPartitionPage (PINPUT_RECORD Ir)
{ {
CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT));
if (PartEntry->PartInfo[0].PartitionType == PARTITION_ENTRY_UNUSED) if (PartEntry->PartInfo[PartNum].PartitionType == PARTITION_ENTRY_UNUSED)
{ {
if (wcscmp(FileSystemList->Selected->FileSystem, L"FAT") == 0) if (wcscmp(FileSystemList->Selected->FileSystem, L"FAT") == 0)
{ {
if (PartEntry->PartInfo[0].PartitionLength.QuadPart < (4200LL * 1024LL)) if (PartEntry->PartInfo[PartNum].PartitionLength.QuadPart < (4200LL * 1024LL))
{ {
/* FAT12 CHS partition (disk is smaller than 4.1MB) */ /* FAT12 CHS partition (disk is smaller than 4.1MB) */
PartEntry->PartInfo[0].PartitionType = PARTITION_FAT_12; PartEntry->PartInfo[PartNum].PartitionType = PARTITION_FAT_12;
} }
else if (PartEntry->PartInfo[0].StartingOffset.QuadPart < (1024LL * 255LL * 63LL * 512LL)) else if (PartEntry->PartInfo[PartNum].StartingOffset.QuadPart < (1024LL * 255LL * 63LL * 512LL))
{ {
/* Partition starts below the 8.4GB boundary ==> CHS partition */ /* Partition starts below the 8.4GB boundary ==> CHS partition */
if (PartEntry->PartInfo[0].PartitionLength.QuadPart < (32LL * 1024LL * 1024LL)) if (PartEntry->PartInfo[PartNum].PartitionLength.QuadPart < (32LL * 1024LL * 1024LL))
{ {
/* FAT16 CHS partition (partiton size < 32MB) */ /* FAT16 CHS partition (partiton size < 32MB) */
PartEntry->PartInfo[0].PartitionType = PARTITION_FAT_16; PartEntry->PartInfo[PartNum].PartitionType = PARTITION_FAT_16;
} }
else if (PartEntry->PartInfo[0].PartitionLength.QuadPart < (512LL * 1024LL * 1024LL)) else if (PartEntry->PartInfo[PartNum].PartitionLength.QuadPart < (512LL * 1024LL * 1024LL))
{ {
/* FAT16 CHS partition (partition size < 512MB) */ /* FAT16 CHS partition (partition size < 512MB) */
PartEntry->PartInfo[0].PartitionType = PARTITION_HUGE; PartEntry->PartInfo[PartNum].PartitionType = PARTITION_HUGE;
} }
else else
{ {
/* FAT32 CHS partition (partition size >= 512MB) */ /* FAT32 CHS partition (partition size >= 512MB) */
PartEntry->PartInfo[0].PartitionType = PARTITION_FAT32; PartEntry->PartInfo[PartNum].PartitionType = PARTITION_FAT32;
} }
} }
else else
{ {
/* Partition starts above the 8.4GB boundary ==> LBA partition */ /* Partition starts above the 8.4GB boundary ==> LBA partition */
if (PartEntry->PartInfo[0].PartitionLength.QuadPart < (512LL * 1024LL * 1024LL)) if (PartEntry->PartInfo[PartNum].PartitionLength.QuadPart < (512LL * 1024LL * 1024LL))
{ {
/* FAT16 LBA partition (partition size < 512MB) */ /* FAT16 LBA partition (partition size < 512MB) */
PartEntry->PartInfo[0].PartitionType = PARTITION_XINT13; PartEntry->PartInfo[PartNum].PartitionType = PARTITION_XINT13;
} }
else else
{ {
/* FAT32 LBA partition (partition size >= 512MB) */ /* FAT32 LBA partition (partition size >= 512MB) */
PartEntry->PartInfo[0].PartitionType = PARTITION_FAT32_XINT13; PartEntry->PartInfo[PartNum].PartitionType = PARTITION_FAT32_XINT13;
} }
} }
} }
else if (wcscmp(FileSystemList->Selected->FileSystem, L"EXT2") == 0) else if (wcscmp(FileSystemList->Selected->FileSystem, L"EXT2") == 0)
PartEntry->PartInfo[0].PartitionType = PARTITION_EXT2; PartEntry->PartInfo[PartNum].PartitionType = PARTITION_EXT2;
else if (!FileSystemList->Selected->FormatFunc) else if (!FileSystemList->Selected->FormatFunc)
return QUIT_PAGE; return QUIT_PAGE;
} }
@ -2341,7 +2347,7 @@ FormatPartitionPage (PINPUT_RECORD Ir)
swprintf (PathBuffer, swprintf (PathBuffer,
L"\\Device\\Harddisk%lu\\Partition%lu", L"\\Device\\Harddisk%lu\\Partition%lu",
PartitionList->CurrentDisk->DiskNumber, PartitionList->CurrentDisk->DiskNumber,
PartitionList->CurrentPartition->PartInfo[0].PartitionNumber); PartitionList->CurrentPartition->PartInfo[PartNum].PartitionNumber);
RtlCreateUnicodeString (&DestinationRootPath, RtlCreateUnicodeString (&DestinationRootPath,
PathBuffer); PathBuffer);
DPRINT ("DestinationRootPath: %wZ\n", &DestinationRootPath); DPRINT ("DestinationRootPath: %wZ\n", &DestinationRootPath);
@ -2352,7 +2358,8 @@ FormatPartitionPage (PINPUT_RECORD Ir)
swprintf (PathBuffer, swprintf (PathBuffer,
L"\\Device\\Harddisk%lu\\Partition%lu", L"\\Device\\Harddisk%lu\\Partition%lu",
PartitionList->ActiveBootDisk->DiskNumber, PartitionList->ActiveBootDisk->DiskNumber,
PartitionList->ActiveBootPartition->PartInfo[0].PartitionNumber); PartitionList->ActiveBootPartition->
PartInfo[PartitionList->ActiveBootPartitionNumber].PartitionNumber);
RtlCreateUnicodeString (&SystemRootPath, RtlCreateUnicodeString (&SystemRootPath,
PathBuffer); PathBuffer);
DPRINT ("SystemRootPath: %wZ\n", &SystemRootPath); DPRINT ("SystemRootPath: %wZ\n", &SystemRootPath);
@ -2376,8 +2383,8 @@ FormatPartitionPage (PINPUT_RECORD Ir)
if (wcscmp(FileSystemList->Selected->FileSystem, L"FAT") == 0) if (wcscmp(FileSystemList->Selected->FileSystem, L"FAT") == 0)
{ {
/* FIXME: Install boot code. This is a hack! */ /* FIXME: Install boot code. This is a hack! */
if ((PartEntry->PartInfo[0].PartitionType == PARTITION_FAT32_XINT13) || if ((PartEntry->PartInfo[PartNum].PartitionType == PARTITION_FAT32_XINT13) ||
(PartEntry->PartInfo[0].PartitionType == PARTITION_FAT32)) (PartEntry->PartInfo[PartNum].PartitionType == PARTITION_FAT32))
{ {
wcscpy(PathBuffer, SourceRootPath.Buffer); wcscpy(PathBuffer, SourceRootPath.Buffer);
wcscat(PathBuffer, L"\\loader\\fat32.bin"); wcscat(PathBuffer, L"\\loader\\fat32.bin");
@ -2464,6 +2471,7 @@ CheckFileSystemPage(PINPUT_RECORD Ir)
WCHAR PathBuffer[MAX_PATH]; WCHAR PathBuffer[MAX_PATH];
CHAR Buffer[MAX_PATH]; CHAR Buffer[MAX_PATH];
NTSTATUS Status; NTSTATUS Status;
UCHAR PartNum = PartitionList->CurrentPartitionNumber;
/* FIXME: code duplicated in FormatPartitionPage */ /* FIXME: code duplicated in FormatPartitionPage */
/* Set DestinationRootPath */ /* Set DestinationRootPath */
@ -2471,7 +2479,7 @@ CheckFileSystemPage(PINPUT_RECORD Ir)
swprintf(PathBuffer, swprintf(PathBuffer,
L"\\Device\\Harddisk%lu\\Partition%lu", L"\\Device\\Harddisk%lu\\Partition%lu",
PartitionList->CurrentDisk->DiskNumber, PartitionList->CurrentDisk->DiskNumber,
PartitionList->CurrentPartition->PartInfo[0].PartitionNumber); PartitionList->CurrentPartition->PartInfo[PartNum].PartitionNumber);
RtlCreateUnicodeString(&DestinationRootPath, PathBuffer); RtlCreateUnicodeString(&DestinationRootPath, PathBuffer);
DPRINT("DestinationRootPath: %wZ\n", &DestinationRootPath); DPRINT("DestinationRootPath: %wZ\n", &DestinationRootPath);
@ -2480,7 +2488,7 @@ CheckFileSystemPage(PINPUT_RECORD Ir)
swprintf(PathBuffer, swprintf(PathBuffer,
L"\\Device\\Harddisk%lu\\Partition%lu", L"\\Device\\Harddisk%lu\\Partition%lu",
PartitionList->ActiveBootDisk->DiskNumber, PartitionList->ActiveBootDisk->DiskNumber,
PartitionList->ActiveBootPartition->PartInfo[0].PartitionNumber); PartitionList->ActiveBootPartition->PartInfo[PartNum].PartitionNumber);
RtlCreateUnicodeString(&SystemRootPath, PathBuffer); RtlCreateUnicodeString(&SystemRootPath, PathBuffer);
DPRINT("SystemRootPath: %wZ\n", &SystemRootPath); DPRINT("SystemRootPath: %wZ\n", &SystemRootPath);
@ -2544,7 +2552,7 @@ CheckFileSystemPage(PINPUT_RECORD Ir)
static PAGE_NUMBER static PAGE_NUMBER
InstallDirectoryPage1(PWCHAR InstallDir, PDISKENTRY DiskEntry, PPARTENTRY PartEntry) InstallDirectoryPage1(PWCHAR InstallDir, PDISKENTRY DiskEntry, PPARTENTRY PartEntry, UCHAR PartNum)
{ {
WCHAR PathBuffer[MAX_PATH]; WCHAR PathBuffer[MAX_PATH];
@ -2568,7 +2576,7 @@ InstallDirectoryPage1(PWCHAR InstallDir, PDISKENTRY DiskEntry, PPARTENTRY PartEn
swprintf(PathBuffer, swprintf(PathBuffer,
L"multi(0)disk(0)rdisk(%lu)partition(%lu)", L"multi(0)disk(0)rdisk(%lu)partition(%lu)",
DiskEntry->BiosDiskNumber, DiskEntry->BiosDiskNumber,
PartEntry->PartInfo[0].PartitionNumber); PartEntry->PartInfo[PartNum].PartitionNumber);
if (InstallDir[0] != L'\\') if (InstallDir[0] != L'\\')
wcscat(PathBuffer, L"\\"); wcscat(PathBuffer, L"\\");
@ -2624,7 +2632,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir)
if (IsUnattendedSetup) if (IsUnattendedSetup)
{ {
return(InstallDirectoryPage1 (InstallDir, DiskEntry, PartEntry)); return(InstallDirectoryPage1 (InstallDir, DiskEntry, PartEntry, PartitionList->CurrentPartitionNumber));
} }
while(TRUE) while(TRUE)
@ -2641,7 +2649,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir)
} }
else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */
{ {
return (InstallDirectoryPage1 (InstallDir, DiskEntry, PartEntry)); return (InstallDirectoryPage1 (InstallDir, DiskEntry, PartEntry, PartitionList->CurrentPartitionNumber));
} }
else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x08) /* BACKSPACE */ else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x08) /* BACKSPACE */
{ {

90
reactos/base/setup/usetup/partlist.c
View file

@ -70,8 +70,9 @@ AssignDriverLetters (PPARTLIST List)
PDISKENTRY DiskEntry; PDISKENTRY DiskEntry;
PPARTENTRY PartEntry; PPARTENTRY PartEntry;
PLIST_ENTRY Entry1; PLIST_ENTRY Entry1;
PLIST_ENTRY Entry2; //PLIST_ENTRY Entry2;
CHAR Letter; CHAR Letter;
UCHAR i;
Letter = 'C'; Letter = 'C';
@ -87,29 +88,35 @@ AssignDriverLetters (PPARTLIST List)
PARTENTRY, PARTENTRY,
ListEntry); ListEntry);
PartEntry->DriveLetter = 0; for (i=0; i<3; i++)
PartEntry->DriveLetter[i] = 0;
if (PartEntry->Unpartitioned == FALSE && if (PartEntry->Unpartitioned == FALSE)
!IsContainerPartition (PartEntry->PartInfo[0].PartitionType))
{ {
if (IsRecognizedPartition (PartEntry->PartInfo[0].PartitionType) || for (i=0; i<3; i++)
(PartEntry->PartInfo[0].PartitionType == PARTITION_ENTRY_UNUSED && {
PartEntry->PartInfo[0].PartitionLength.QuadPart != 0LL)) if (IsContainerPartition (PartEntry->PartInfo[i].PartitionType))
continue;
if (IsRecognizedPartition (PartEntry->PartInfo[i].PartitionType) ||
(PartEntry->PartInfo[i].PartitionType == PARTITION_ENTRY_UNUSED &&
PartEntry->PartInfo[i].PartitionLength.QuadPart != 0LL))
{ {
if (Letter <= 'Z') if (Letter <= 'Z')
{ {
PartEntry->DriveLetter = Letter; PartEntry->DriveLetter[i] = Letter;
Letter++; Letter++;
} }
} }
} }
} }
}
Entry1 = Entry1->Flink; Entry1 = Entry1->Flink;
} }
/* Assign drive letters to logical drives */ /* Assign drive letters to logical drives */
#if 0
Entry1 = List->DiskListHead.Flink; Entry1 = List->DiskListHead.Flink;
while (Entry1 != &List->DiskListHead) while (Entry1 != &List->DiskListHead)
{ {
@ -148,6 +155,7 @@ AssignDriverLetters (PPARTLIST List)
Entry1 = Entry1->Flink; Entry1 = Entry1->Flink;
} }
#endif
} }
@ -1197,8 +1205,8 @@ PrintPartitionData (PPARTLIST List,
{ {
sprintf (LineBuffer, sprintf (LineBuffer,
MUIGetString(STRING_HDDINFOUNK5), MUIGetString(STRING_HDDINFOUNK5),
(PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : PartEntry->DriveLetter[PartNumber],
(PartEntry->DriveLetter == 0) ? '-' : ':', (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : ':',
PartEntry->PartInfo[PartNumber].PartitionType, PartEntry->PartInfo[PartNumber].PartitionType,
PartSize.u.LowPart, PartSize.u.LowPart,
Unit); Unit);
@ -1207,8 +1215,8 @@ PrintPartitionData (PPARTLIST List,
{ {
sprintf (LineBuffer, sprintf (LineBuffer,
"%c%c %-24s %6lu %s", "%c%c %-24s %6lu %s",
(PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : PartEntry->DriveLetter[PartNumber],
(PartEntry->DriveLetter == 0) ? '-' : ':', (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : ':',
PartType, PartType,
PartSize.u.LowPart, PartSize.u.LowPart,
Unit); Unit);
@ -2294,12 +2302,15 @@ CheckActiveBootPartition (PPARTLIST List)
{ {
PDISKENTRY DiskEntry; PDISKENTRY DiskEntry;
PPARTENTRY PartEntry; PPARTENTRY PartEntry;
PLIST_ENTRY ListEntry;
UCHAR i;
/* Check for empty disk list */ /* Check for empty disk list */
if (IsListEmpty (&List->DiskListHead)) if (IsListEmpty (&List->DiskListHead))
{ {
List->ActiveBootDisk = NULL; List->ActiveBootDisk = NULL;
List->ActiveBootPartition = NULL; List->ActiveBootPartition = NULL;
List->ActiveBootPartitionNumber = 0;
return; return;
} }
@ -2321,6 +2332,7 @@ CheckActiveBootPartition (PPARTLIST List)
{ {
List->ActiveBootDisk = NULL; List->ActiveBootDisk = NULL;
List->ActiveBootPartition = NULL; List->ActiveBootPartition = NULL;
List->ActiveBootPartitionNumber = 0;
return; return;
} }
@ -2338,11 +2350,50 @@ CheckActiveBootPartition (PPARTLIST List)
PartEntry->PartInfo[0].BootIndicator = TRUE; PartEntry->PartInfo[0].BootIndicator = TRUE;
PartEntry->PartInfo[0].RewritePartition = TRUE; PartEntry->PartInfo[0].RewritePartition = TRUE;
DiskEntry->Modified = TRUE; DiskEntry->Modified = TRUE;
}
/* FIXME: Might be incorrect if partitions were created by Linux FDISK */ /* FIXME: Might be incorrect if partitions were created by Linux FDISK */
List->ActiveBootDisk = DiskEntry; List->ActiveBootDisk = DiskEntry;
List->ActiveBootPartition = PartEntry; List->ActiveBootPartition = PartEntry;
return;
}
/* Disk is not new, scan all partitions to find a bootable one */
List->ActiveBootDisk = NULL;
List->ActiveBootPartition = NULL;
List->ActiveBootPartitionNumber = 0;
ListEntry = DiskEntry->PartListHead.Flink;
while (ListEntry != &DiskEntry->PartListHead)
{
PartEntry = CONTAINING_RECORD(ListEntry,
PARTENTRY,
ListEntry);
/* Check if it's partitioned */
if (!PartEntry->Unpartitioned)
{
/* Go through all of its 4 partitions */
for (i=0; i<4; i++)
{
if (PartEntry->PartInfo[i].PartitionType != PARTITION_ENTRY_UNUSED &&
PartEntry->PartInfo[i].BootIndicator)
{
/* Yes, we found it */
List->ActiveBootDisk = DiskEntry;
List->ActiveBootPartition = PartEntry;
List->ActiveBootPartitionNumber = i;
DPRINT1("Found bootable partition disk %d, drive letter %c\n",
DiskEntry->BiosDiskNumber, PartEntry->DriveLetter[i]);
break;
}
}
}
/* Go to the next one */
ListEntry = ListEntry->Flink;
}
} }
@ -2635,6 +2686,7 @@ BOOL SetMountedDeviceValues(PPARTLIST List)
PLIST_ENTRY Entry1, Entry2; PLIST_ENTRY Entry1, Entry2;
PDISKENTRY DiskEntry; PDISKENTRY DiskEntry;
PPARTENTRY PartEntry; PPARTENTRY PartEntry;
UCHAR i;
if (List == NULL) if (List == NULL)
{ {
@ -2652,13 +2704,19 @@ BOOL SetMountedDeviceValues(PPARTLIST List)
while (Entry2 != &DiskEntry->PartListHead) while (Entry2 != &DiskEntry->PartListHead)
{ {
PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry);
if (!PartEntry->Unpartitioned && PartEntry->DriveLetter) if (!PartEntry->Unpartitioned)
{ {
if (!SetMountedDeviceValue(PartEntry->DriveLetter, DiskEntry->Signature, PartEntry->PartInfo[0].StartingOffset)) for (i=0; i<4; i++)
{
if (PartEntry->DriveLetter[i])
{
if (!SetMountedDeviceValue(PartEntry->DriveLetter[i], DiskEntry->Signature, PartEntry->PartInfo[i].StartingOffset))
{ {
return FALSE; return FALSE;
} }
} }
}
}
Entry2 = Entry2->Flink; Entry2 = Entry2->Flink;
} }
Entry1 = Entry1->Flink; Entry1 = Entry1->Flink;

3
reactos/base/setup/usetup/partlist.h
View file

@ -43,7 +43,7 @@ typedef struct _PARTENTRY
{ {
LIST_ENTRY ListEntry; LIST_ENTRY ListEntry;
CHAR DriveLetter; CHAR DriveLetter[4];
CHAR VolumeLabel[17]; CHAR VolumeLabel[17];
CHAR FileSystemName[9]; CHAR FileSystemName[9];
@ -136,6 +136,7 @@ typedef struct _PARTLIST
PDISKENTRY ActiveBootDisk; PDISKENTRY ActiveBootDisk;
PPARTENTRY ActiveBootPartition; PPARTENTRY ActiveBootPartition;
UCHAR ActiveBootPartitionNumber;
LIST_ENTRY DiskListHead; LIST_ENTRY DiskListHead;
LIST_ENTRY BiosDiskListHead; LIST_ENTRY BiosDiskListHead;