[USETUP] Massage the USETUP interface code.

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

diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h
index a640728..2f548b5 100644 (file)
--- a/base/setup/usetup/usetup.h
+++ b/base/setup/usetup/usetup.h
@@ -21,7 +21,7 @@
  * PROJECT:         ReactOS text-mode setup
  * FILE:            base/setup/usetup/usetup.h
  * PURPOSE:         Text-mode setup
- * PROGRAMMER:      Eric Kohl
+ * PROGRAMMER:
  */
 
 #ifndef _USETUP_PCH_
@@ -39,8 +39,6 @@
 #include <winuser.h>
 #include <wincon.h>
 
-#include <strsafe.h>
-
 #define NTOS_MODE_USER
 #include <ndk/cmfuncs.h>
 #include <ndk/exfuncs.h>
@@ -52,40 +50,32 @@
 #include <ndk/rtlfuncs.h>
 #include <ndk/setypes.h>
 
-/* Filesystem headers */
+#include <ntstrsafe.h>
+
+/* Setup library headers */
 #include <reactos/rosioctl.h>
-#include <fslib/vfatlib.h>
-#include <fslib/ext2lib.h>
-// #include <fslib/ntfslib.h>
+#include <../lib/setuplib.h>
+// #include "errorcode.h"
 
 /* Internal Headers */
-#include "interface/consup.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;
-extern UNICODE_STRING SourceRootDir;
 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,
@@ -112,19 +102,17 @@ 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
 {
-    START_PAGE,
     LANGUAGE_PAGE,
-    INTRO_PAGE,
+    WELCOME_PAGE,
     LICENSE_PAGE,
     INSTALL_INTRO_PAGE,
 
 //    SCSI_CONTROLLER_PAGE,
+//    OEM_DRIVER_PAGE,
+
+    REPAIR_INTRO_PAGE,
 
     DEVICE_SETTINGS_PAGE,
     COMPUTER_SETTINGS_PAGE,
@@ -152,36 +140,15 @@ typedef enum _PAGE_NUMBER
     BOOT_LOADER_HARDDISK_MBR_PAGE,
     BOOT_LOADER_HARDDISK_VBR_PAGE,
 
-    REPAIR_INTRO_PAGE,
-
     SUCCESS_PAGE,
     QUIT_PAGE,
     FLUSH_PAGE,
-    REBOOT_PAGE,               /* virtual page */
-    RECOVERY_PAGE,             /* virtual page */
+    REBOOT_PAGE,    /* Virtual page */
+    RECOVERY_PAGE,  /* Virtual page */
 } PAGE_NUMBER, *PPAGE_NUMBER;
-#endif
 
 #define POPUP_WAIT_NONE    0
 #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_ */