X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=base%2Fsetup%2Fusetup%2Fusetup.h;h=e65bc33a7f0bd55c28a4120d06d683950d404d90;hp=48914d16bad519542ff03ba4a46c6c1055bee1d0;hb=d23fa54488d5ec8b214c4c7611b97d8ef570bae8;hpb=e5b5525a8a3eb4550044dc06e51e6f184f10d530

diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h
index 48914d16bad..e65bc33a7f0 100644
--- 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_
@@ -48,78 +48,44 @@
 #include <ndk/obfuncs.h>
 #include <ndk/psfuncs.h>
 #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>
 
 /* Internal Headers */
-#include "interface/consup.h"
-#include "partlist.h"
-#include "inffile.h"
-#include "inicache.h"
+#include "consup.h"
 #include "progress.h"
-#ifdef __REACTOS__
-#include "infros.h"
-#include "filequeue.h"
-#endif
-#include "registry.h"
 #include "fslist.h"
-#include "cabinet.h"
-#include "filesup.h"
+#include "partlist.h"
 #include "genlist.h"
-#include "host.h"
 #include "mui.h"
-#include "errorcode.h"
+
+#include "spapisup/inffile.h"
+#include "spapisup/cabinet.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,
-                               PINFCONTEXT ContextOut);
-extern BOOLEAN InfGetBinaryField(PINFCONTEXT Context,
-                                 ULONG FieldIndex,
-                                 PUCHAR ReturnBuffer,
-                                 ULONG ReturnBufferSize,
-                                 PULONG RequiredSize);
-extern BOOLEAN InfGetMultiSzField(PINFCONTEXT Context,
-                                  ULONG FieldIndex,
-                                  PWSTR ReturnBuffer,
-                                  ULONG ReturnBufferSize,
-                                  PULONG RequiredSize);
-extern BOOLEAN InfGetStringField(PINFCONTEXT Context,
-                                 ULONG FieldIndex,
-                                 PWSTR ReturnBuffer,
-                                 ULONG ReturnBufferSize,
-                                 PULONG RequiredSize);
-
-#define SetupCloseInfFile InfCloseFile
-#define SetupFindNextLine InfFindNextLine
-#define SetupGetBinaryField InfGetBinaryField
-#define SetupGetMultiSzFieldW InfGetMultiSzField
-#define SetupGetStringFieldW InfGetStringField
-
-#endif /* __REACTOS__ */
-
-#ifndef _PAGE_NUMBER_DEFINED
-#define _PAGE_NUMBER_DEFINED
+extern PCWSTR SelectedLanguageId;
+
 typedef enum _PAGE_NUMBER
 {
-    START_PAGE,
+    SETUP_INIT_PAGE,
     LANGUAGE_PAGE,
-    INTRO_PAGE,
+    WELCOME_PAGE,
     LICENSE_PAGE,
     INSTALL_INTRO_PAGE,
 
 //    SCSI_CONTROLLER_PAGE,
+//    OEM_DRIVER_PAGE,
+
+    REPAIR_INTRO_PAGE,
+    UPGRADE_REPAIR_PAGE,
 
     DEVICE_SETTINGS_PAGE,
     COMPUTER_SETTINGS_PAGE,
@@ -131,6 +97,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,
@@ -146,35 +113,21 @@ 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 */
+    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));\
-}
+VOID
+PopupError(IN PCCH Text,
+           IN PCCH Status,
+           IN PINPUT_RECORD Ir,
+           IN ULONG WaitEvent);
 
 #endif /* _USETUP_PCH_ */