mirror of
https://github.com/reactos/reactos.git
synced 2024-09-30 22:47:28 +00:00
[USETUP]
Get rid of CheckForLinuxFdiskPartitions. svn path=/trunk/; revision=68115
This commit is contained in:
parent
e93ccca737
commit
be9ea7e123
|
@ -80,8 +80,6 @@ static HINF SetupInf;
|
|||
|
||||
static HSPFILEQ SetupFileQueue = NULL;
|
||||
|
||||
static BOOLEAN WarnLinuxPartitions = TRUE;
|
||||
|
||||
static PGENERIC_LIST ComputerList = NULL;
|
||||
static PGENERIC_LIST DisplayList = NULL;
|
||||
static PGENERIC_LIST KeyboardList = NULL;
|
||||
|
@ -1473,29 +1471,6 @@ SelectPartitionPage(PINPUT_RECORD Ir)
|
|||
|
||||
DrawPartitionList(PartitionList);
|
||||
|
||||
/* Warn about partitions created by Linux Fdisk */
|
||||
if (WarnLinuxPartitions == TRUE &&
|
||||
CheckForLinuxFdiskPartitions(PartitionList) == TRUE)
|
||||
{
|
||||
MUIDisplayError(ERROR_WARN_PARTITION, NULL, POPUP_WAIT_NONE);
|
||||
|
||||
while (TRUE)
|
||||
{
|
||||
CONSOLE_ConInKey(Ir);
|
||||
|
||||
if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
|
||||
(Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */
|
||||
{
|
||||
return QUIT_PAGE;
|
||||
}
|
||||
else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */
|
||||
{
|
||||
WarnLinuxPartitions = FALSE;
|
||||
return SELECT_PARTITION_PAGE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (IsUnattendedSetup)
|
||||
{
|
||||
if (!SelectPartition(PartitionList, UnattendDestinationDiskNumber, UnattendDestinationPartitionNumber))
|
||||
|
|
|
@ -2824,65 +2824,9 @@ CheckActiveBootPartition(
|
|||
}
|
||||
|
||||
|
||||
BOOLEAN
|
||||
CheckForLinuxFdiskPartitions(
|
||||
PPARTLIST List)
|
||||
{
|
||||
#if 0
|
||||
PDISKENTRY DiskEntry;
|
||||
PPARTENTRY PartEntry;
|
||||
PLIST_ENTRY Entry1;
|
||||
PLIST_ENTRY Entry2;
|
||||
ULONG PartitionCount;
|
||||
ULONG i;
|
||||
|
||||
Entry1 = List->DiskListHead.Flink;
|
||||
while (Entry1 != &List->DiskListHead)
|
||||
{
|
||||
DiskEntry = CONTAINING_RECORD(Entry1,
|
||||
DISKENTRY,
|
||||
ListEntry);
|
||||
|
||||
Entry2 = DiskEntry->PartListHead.Flink;
|
||||
while (Entry2 != &DiskEntry->PartListHead)
|
||||
{
|
||||
PartEntry = CONTAINING_RECORD(Entry2,
|
||||
PARTENTRY,
|
||||
ListEntry);
|
||||
|
||||
if (PartEntry->Unpartitioned == FALSE)
|
||||
{
|
||||
PartitionCount = 0;
|
||||
|
||||
for (i = 0; i < 4; i++)
|
||||
{
|
||||
if (!IsContainerPartition(PartEntry->PartInfo[i].PartitionType) &&
|
||||
PartEntry->PartInfo[i].PartitionLength.QuadPart != 0ULL)
|
||||
{
|
||||
PartitionCount++;
|
||||
}
|
||||
}
|
||||
|
||||
if (PartitionCount > 1)
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
Entry2 = Entry2->Flink;
|
||||
}
|
||||
|
||||
Entry1 = Entry1->Flink;
|
||||
}
|
||||
#endif
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
static
|
||||
NTSTATUS
|
||||
WritePartitons(
|
||||
WritePartitions(
|
||||
IN PPARTLIST List,
|
||||
IN PDISKENTRY DiskEntry)
|
||||
{
|
||||
|
@ -2964,7 +2908,7 @@ WritePartitionsToDisk(
|
|||
|
||||
if (DiskEntry->Dirty == TRUE)
|
||||
{
|
||||
WritePartitons(List, DiskEntry);
|
||||
WritePartitions(List, DiskEntry);
|
||||
DiskEntry->Dirty = FALSE;
|
||||
}
|
||||
|
||||
|
|
|
@ -263,10 +263,6 @@ VOID
|
|||
CheckActiveBootPartition(
|
||||
PPARTLIST List);
|
||||
|
||||
BOOLEAN
|
||||
CheckForLinuxFdiskPartitions(
|
||||
PPARTLIST List);
|
||||
|
||||
BOOLEAN
|
||||
WritePartitionsToDisk(
|
||||
PPARTLIST List);
|
||||
|
|
Loading…
Reference in a new issue