Author: ekohl
Date: Sat Jun 13 10:08:36 2015
New Revision: 68115
URL:
http://svn.reactos.org/svn/reactos?rev=68115&view=rev
Log:
[USETUP]
Get rid of CheckForLinuxFdiskPartitions.
Modified:
trunk/reactos/base/setup/usetup/interface/usetup.c
trunk/reactos/base/setup/usetup/partlist.c
trunk/reactos/base/setup/usetup/partlist.h
Modified: trunk/reactos/base/setup/usetup/interface/usetup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac…
==============================================================================
--- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sat Jun 13 10:08:36
2015
@@ -80,8 +80,6 @@
static HSPFILEQ SetupFileQueue = NULL;
-static BOOLEAN WarnLinuxPartitions = TRUE;
-
static PGENERIC_LIST ComputerList = NULL;
static PGENERIC_LIST DisplayList = NULL;
static PGENERIC_LIST KeyboardList = NULL;
@@ -1472,29 +1470,6 @@
}
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)
{
Modified: trunk/reactos/base/setup/usetup/partlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist…
==============================================================================
--- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sat Jun 13 10:08:36 2015
@@ -2824,65 +2824,9 @@
}
-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 @@
if (DiskEntry->Dirty == TRUE)
{
- WritePartitons(List, DiskEntry);
+ WritePartitions(List, DiskEntry);
DiskEntry->Dirty = FALSE;
}
Modified: trunk/reactos/base/setup/usetup/partlist.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist…
==============================================================================
--- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Sat Jun 13 10:08:36 2015
@@ -264,10 +264,6 @@
PPARTLIST List);
BOOLEAN
-CheckForLinuxFdiskPartitions(
- PPARTLIST List);
-
-BOOLEAN
WritePartitionsToDisk(
PPARTLIST List);