[SETUPLIB][USETUP] Remove CurrentDisk/Partition from the partlist lib code, and move...

[reactos.git] / base / setup / usetup / partlist.h

diff --git a/base/setup/usetup/partlist.h b/base/setup/usetup/partlist.h
index b8caf45..ea92e75 100644 (file)
--- a/base/setup/usetup/partlist.h
+++ b/base/setup/usetup/partlist.h
@@ -16,16 +16,17 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* COPYRIGHT:       See COPYING in the top level directory
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            base/setup/usetup/partlist.h
  * PURPOSE:         Partition list functions
- * PROGRAMMER:      Eric Kohl
+ * PROGRAMMER:
  */
 
 #pragma once
 
-#include "../lib/partlist.h"
+// #include "../lib/utils/partlist.h"
 
 typedef enum _FORMATMACHINESTATE
 {
@@ -34,16 +35,26 @@ typedef enum _FORMATMACHINESTATE
     FormatInstallPartition,
     FormatOtherPartition,
     FormatDone,
-    CheckSystemPartition,
-    CheckInstallPartition,
-    CheckOtherPartition,
-    CheckDone
+    // CheckSystemPartition,
+    // CheckInstallPartition,
+    // CheckOtherPartition,
+    // CheckDone
 } FORMATMACHINESTATE, *PFORMATMACHINESTATE;
 
 typedef struct _PARTLIST_UI
 {
     PPARTLIST List;
 
+    /*
+     * Selected partition.
+     *
+     * NOTE that when CurrentPartition != NULL, then CurrentPartition->DiskEntry
+     * must be the same as CurrentDisk. We should however keep the two members
+     * separated as we can have a selected disk without any partition.
+     */
+    PDISKENTRY CurrentDisk;
+    PPARTENTRY CurrentPartition;
+
     // PLIST_ENTRY FirstShown;
     // PLIST_ENTRY LastShown;
 
@@ -69,6 +80,7 @@ VOID
 InitPartitionListUi(
     IN OUT PPARTLIST_UI ListUi,
     IN PPARTLIST List,
+    IN PPARTENTRY CurrentEntry OPTIONAL,
     IN SHORT Left,
     IN SHORT Top,
     IN SHORT Right,