[USETUP] Modify the integrated user-mode PnP manager along the lines of UMPNPMGR...

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

diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h
index 2bbb879..e65bc33 100644 (file)
--- a/base/setup/usetup/usetup.h
+++ b/base/setup/usetup/usetup.h
@@ -52,29 +52,30 @@
 
 #include <ntstrsafe.h>
 
 
 #include <ntstrsafe.h>
 

+

 /* Setup library headers */
 #include <reactos/rosioctl.h>
 #include <../lib/setuplib.h>
 /* Setup library headers */
 #include <reactos/rosioctl.h>
 #include <../lib/setuplib.h>

-// #include "errorcode.h"

 
 /* Internal Headers */
 #include "consup.h"
 
 /* Internal Headers */
 #include "consup.h"

-#include "inffile.h"

 #include "progress.h"
 #include "progress.h"

-#include "filequeue.h"

 #include "fslist.h"
 #include "partlist.h"
 #include "fslist.h"
 #include "partlist.h"

-#include "cabinet.h"
-#include "filesup.h"

 #include "genlist.h"
 #include "mui.h"
 
 #include "genlist.h"
 #include "mui.h"
 

+#include "spapisup/inffile.h"
+#include "spapisup/cabinet.h"
+
+

 extern HANDLE ProcessHeap;
 extern BOOLEAN IsUnattendedSetup;
 extern HANDLE ProcessHeap;
 extern BOOLEAN IsUnattendedSetup;

-extern PWCHAR SelectedLanguageId;
+extern PCWSTR SelectedLanguageId;

 
 typedef enum _PAGE_NUMBER
 {
 
 typedef enum _PAGE_NUMBER
 {

+    SETUP_INIT_PAGE,

     LANGUAGE_PAGE,
     WELCOME_PAGE,
     LICENSE_PAGE,
     LANGUAGE_PAGE,
     WELCOME_PAGE,
     LICENSE_PAGE,