[SETUPLIB][USETUP] Move some code to the SetupLib.

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

diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h
index 6696412..eeb1154 100644 (file)
--- a/base/setup/usetup/usetup.h
+++ b/base/setup/usetup/usetup.h
@@ -19,9 +19,9 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
- * FILE:            subsys/system/usetup/usetup.h
+ * FILE:            base/setup/usetup/usetup.h
  * PURPOSE:         Text-mode setup
- * PROGRAMMER:      Eric Kohl
+ * PROGRAMMER:
  */
 
 #ifndef _USETUP_PCH_
@@ -50,28 +50,26 @@
 #include <ndk/rtlfuncs.h>
 #include <ndk/setypes.h>
 
-/* Filesystem headers */
-#include <fslib/ext2lib.h>
-#include <fslib/vfatlib.h>
+#include <ntstrsafe.h>
+
+/* Setup library headers */
+#include <reactos/rosioctl.h>
+#include <../lib/setuplib.h>
+// #include "errorcode.h"
 
 /* Internal Headers */
-#include "interface/consup.h"
-#include "partlist.h"
+#include "consup.h"
 #include "inffile.h"
-#include "inicache.h"
 #include "progress.h"
-#ifdef __REACTOS__
 #include "infros.h"
 #include "filequeue.h"
-#endif
 #include "registry.h"
 #include "fslist.h"
+#include "partlist.h"
 #include "cabinet.h"
 #include "filesup.h"
 #include "genlist.h"
-#include "host.h"
 #include "mui.h"
-#include "errorcode.h"
 
 extern HANDLE ProcessHeap;
 extern UNICODE_STRING SourceRootPath;
@@ -80,8 +78,6 @@ extern UNICODE_STRING SourcePath;
 extern BOOLEAN IsUnattendedSetup;
 extern PWCHAR SelectedLanguageId;
 
-#ifdef __REACTOS__
-
 extern VOID InfSetHeap(PVOID Heap);
 extern VOID InfCloseFile(HINF InfHandle);
 extern BOOLEAN InfFindNextLine(PINFCONTEXT ContextIn,
@@ -108,8 +104,6 @@ extern BOOLEAN InfGetStringField(PINFCONTEXT Context,
 #define SetupGetMultiSzFieldW InfGetMultiSzField
 #define SetupGetStringFieldW InfGetStringField
 
-#endif /* __REACTOS__ */
-
 #ifndef _PAGE_NUMBER_DEFINED
 #define _PAGE_NUMBER_DEFINED
 typedef enum _PAGE_NUMBER
@@ -132,6 +126,7 @@ typedef enum _PAGE_NUMBER
     CREATE_PRIMARY_PARTITION_PAGE,
     CREATE_EXTENDED_PARTITION_PAGE,
     CREATE_LOGICAL_PARTITION_PAGE,
+    CONFIRM_DELETE_SYSTEM_PARTITION_PAGE,
     DELETE_PARTITION_PAGE,
 
     SELECT_FILE_SYSTEM_PAGE,
@@ -153,6 +148,7 @@ typedef enum _PAGE_NUMBER
     QUIT_PAGE,
     FLUSH_PAGE,
     REBOOT_PAGE,               /* virtual page */
+    RECOVERY_PAGE,             /* virtual page */
 } PAGE_NUMBER, *PPAGE_NUMBER;
 #endif
 
@@ -160,22 +156,4 @@ typedef enum _PAGE_NUMBER
 #define POPUP_WAIT_ANY_KEY 1
 #define POPUP_WAIT_ENTER   2
 
-#define InsertAscendingList(ListHead, NewEntry, Type, ListEntryField, SortField)\
-{\
-  PLIST_ENTRY current;\
-\
-  current = (ListHead)->Flink;\
-  while (current != (ListHead))\
-  {\
-    if (CONTAINING_RECORD(current, Type, ListEntryField)->SortField >=\
-        (NewEntry)->SortField)\
-    {\
-      break;\
-    }\
-    current = current->Flink;\
-  }\
-\
-  InsertTailList(current, &((NewEntry)->ListEntryField));\
-}
-
 #endif /* _USETUP_PCH_ */