X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=base%2Fsetup%2Fusetup%2Fusetup.h;h=e65bc33a7f0bd55c28a4120d06d683950d404d90;hp=d0ce275f75a79cd0cd199ca558277f74b497b01a;hb=d23fa54488d5ec8b214c4c7611b97d8ef570bae8;hpb=29ace9c0dcc4ca2a812ba0e07bcccab99f80b2b0;ds=sidebyside

diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h
index d0ce275f75a..e65bc33a7f0 100644
--- a/base/setup/usetup/usetup.h
+++ b/base/setup/usetup/usetup.h
@@ -52,58 +52,30 @@
 
 #include <ntstrsafe.h>
 
+
 /* Setup library headers */
 #include <reactos/rosioctl.h>
 #include <../lib/setuplib.h>
-// #include "errorcode.h"
 
 /* Internal Headers */
 #include "consup.h"
-#include "inffile.h"
 #include "progress.h"
-#include "infros.h"
-#include "filequeue.h"
-#include "registry.h"
 #include "fslist.h"
 #include "partlist.h"
-#include "cabinet.h"
-#include "filesup.h"
 #include "genlist.h"
 #include "mui.h"
 
+#include "spapisup/inffile.h"
+#include "spapisup/cabinet.h"
+
+
 extern HANDLE ProcessHeap;
-extern UNICODE_STRING SourcePath;
 extern BOOLEAN IsUnattendedSetup;
-extern PWCHAR SelectedLanguageId;
-
-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
+extern PCWSTR SelectedLanguageId;
 
 typedef enum _PAGE_NUMBER
 {
+    SETUP_INIT_PAGE,
     LANGUAGE_PAGE,
     WELCOME_PAGE,
     LICENSE_PAGE,
@@ -152,4 +124,10 @@ typedef enum _PAGE_NUMBER
 #define POPUP_WAIT_ANY_KEY 1
 #define POPUP_WAIT_ENTER   2
 
+VOID
+PopupError(IN PCCH Text,
+           IN PCCH Status,
+           IN PINPUT_RECORD Ir,
+           IN ULONG WaitEvent);
+
 #endif /* _USETUP_PCH_ */