[USETUP]

* Include NDK headers on-demand.
* Set usetup.h as a PCH.

svn path=/trunk/; revision=53282

diff --git a/reactos/base/setup/usetup/CMakeLists.txt b/reactos/base/setup/usetup/CMakeLists.txt
index bdc9651..d6f8534 100644 (file)
--- a/reactos/base/setup/usetup/CMakeLists.txt
+++ b/reactos/base/setup/usetup/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
     ${REACTOS_SOURCE_DIR}/lib/newinflib
     ${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib
     ${REACTOS_SOURCE_DIR}/include/reactos/drivers)
@@ -38,4 +39,5 @@ target_link_libraries(usetup
 
 set_module_type(usetup nativecui)
 add_importlibs(usetup ntdll)
+add_pch(usetup usetup.h)
 add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NAME_ON_CD smss.exe FOR bootcd regtest)

diff --git a/reactos/base/setup/usetup/cabinet.c b/reactos/base/setup/usetup/cabinet.c
index 25357a4..0e8200a 100644 (file)
--- a/reactos/base/setup/usetup/cabinet.c
+++ b/reactos/base/setup/usetup/cabinet.c
@@ -9,7 +9,6 @@
  */
 
 #include "usetup.h"
-#include <zlib.h>
 
 #define NDEBUG
 #include <debug.h>

diff --git a/reactos/base/setup/usetup/inffile.c b/reactos/base/setup/usetup/inffile.c
index 77acebc..e2ea1b4 100644 (file)
--- a/reactos/base/setup/usetup/inffile.c
+++ b/reactos/base/setup/usetup/inffile.c
@@ -28,10 +28,6 @@
 
 #include "usetup.h"
 
-#ifdef __REACTOS__
-#include <infros.h>
-#endif
-
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/base/setup/usetup/interface/devinst.c b/reactos/base/setup/usetup/interface/devinst.c
index 703a4cb..0f3f1ed 100644 (file)
--- a/reactos/base/setup/usetup/interface/devinst.c
+++ b/reactos/base/setup/usetup/interface/devinst.c
@@ -11,10 +11,6 @@
 #define NDEBUG
 #include <debug.h>
 
-#define INITGUID
-#include <guiddef.h>
-#include <libs/umpnpmgr/sysguid.h>
-
 BOOLEAN
 ResetDevice(
     IN LPCWSTR DeviceId)

diff --git a/reactos/base/setup/usetup/mui.c b/reactos/base/setup/usetup/mui.c
index 114ee8e..1972b93 100644 (file)
--- a/reactos/base/setup/usetup/mui.c
+++ b/reactos/base/setup/usetup/mui.c
@@ -25,9 +25,6 @@
  */
 
 #include "usetup.h"
-#include "interface/consup.h"
-#include "errorcode.h"
-#include "mui.h"
 #include "muifonts.h"
 #include "muilanguages.h"
 

diff --git a/reactos/base/setup/usetup/native/fslist.c b/reactos/base/setup/usetup/native/fslist.c
index b3ce5d4..e29a956 100644 (file)
--- a/reactos/base/setup/usetup/native/fslist.c
+++ b/reactos/base/setup/usetup/native/fslist.c
@@ -1,10 +1,5 @@
 #include "usetup.h"
 
-/* Filesystem headers */
-#include <fslib/ext2lib.h>
-#include <fslib/vfatlib.h>
-#include <fslib/vfatxlib.h>
-
 BOOLEAN
 NATIVE_CreateFileSystemList(
        IN PFILE_SYSTEM_LIST List)

diff --git a/reactos/base/setup/usetup/native/host_native.h b/reactos/base/setup/usetup/native/host_native.h
index 207927c..a44234b 100644 (file)
--- a/reactos/base/setup/usetup/native/host_native.h
+++ b/reactos/base/setup/usetup/native/host_native.h
@@ -2,12 +2,6 @@
 
 #include "usetup.h"
 
-typedef struct
-{
-       PWCHAR Source;
-       PWCHAR Target;
-} *PFILEPATHS_W;
-
 #define SetupInitDefaultQueueCallback(a) NULL
 #define SetupDefaultQueueCallbackW(a, b, c, d) TRUE
 #define SetupTermDefaultQueueCallback(a)

diff --git a/reactos/base/setup/usetup/usetup.h b/reactos/base/setup/usetup/usetup.h
index b6f887a..9193ec3 100644 (file)
--- a/reactos/base/setup/usetup/usetup.h
+++ b/reactos/base/setup/usetup/usetup.h
@@ -24,8 +24,6 @@
  * PROGRAMMER:      Eric Kohl
  */
 
-#pragma once
-
 /* C Headers */
 #include <ctype.h>
 #include <stdio.h>
@@ -35,11 +33,21 @@
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/cmfuncs.h>
+#include <ndk/exfuncs.h>
+#include <ndk/iofuncs.h>
+#include <ndk/kefuncs.h>
+#include <ndk/mmtypes.h>
+#include <ndk/mmfuncs.h>
+#include <ndk/obfuncs.h>
+#include <ndk/psfuncs.h>
+#include <ndk/rtlfuncs.h>
 #include <fmifs/fmifs.h>
 
-/* VFAT */
+/* Filesystem headers */
+#include <fslib/ext2lib.h>
 #include <fslib/vfatlib.h>
+#include <fslib/vfatxlib.h>
 
 /* DDK Disk Headers */
 #include <ntddscsi.h>
@@ -50,11 +58,11 @@
 /* Internal Headers */
 #include "interface/consup.h"
 #include "partlist.h"
-#include "infros.h"
 #include "inffile.h"
 #include "inicache.h"
 #include "progress.h"
 #ifdef __REACTOS__
+#include "infros.h"
 #include "filequeue.h"
 #endif
 #include "bootsup.h"
@@ -71,6 +79,12 @@
 #include "mui.h"
 #include "errorcode.h"
 
+#define INITGUID
+#include <guiddef.h>
+#include <libs/umpnpmgr/sysguid.h>
+
+#include <zlib.h>
+
 extern HANDLE ProcessHeap;
 extern UNICODE_STRING SourceRootPath;
 extern UNICODE_STRING SourceRootDir;
@@ -108,6 +122,8 @@ extern BOOLEAN InfGetStringField(PINFCONTEXT Context,
 
 #endif /* __REACTOS__ */
 
+#ifndef _PAGE_NUMBER_DEFINED
+#define _PAGE_NUMBER_DEFINED
 typedef enum _PAGE_NUMBER
 {
   START_PAGE,
@@ -148,6 +164,7 @@ typedef enum _PAGE_NUMBER
   FLUSH_PAGE,
   REBOOT_PAGE,                 /* virtual page */
 } PAGE_NUMBER, *PPAGE_NUMBER;
+#endif
 
 #define POPUP_WAIT_NONE    0
 #define POPUP_WAIT_ANY_KEY 1