[ros-diffs] [akhaldi] 53282: [USETUP] * Include NDK headers on-demand. * Set usetup.h as a PCH.
akhaldi at svn.reactos.org
akhaldi at svn.reactos.org
Wed Aug 17 13:59:48 UTC 2011
Author: akhaldi
Date: Wed Aug 17 13:59:47 2011
New Revision: 53282
URL: http://svn.reactos.org/svn/reactos?rev=53282&view=rev
Log:
[USETUP]
* Include NDK headers on-demand.
* Set usetup.h as a PCH.
Modified:
trunk/reactos/base/setup/usetup/CMakeLists.txt
trunk/reactos/base/setup/usetup/cabinet.c
trunk/reactos/base/setup/usetup/inffile.c
trunk/reactos/base/setup/usetup/interface/devinst.c
trunk/reactos/base/setup/usetup/mui.c
trunk/reactos/base/setup/usetup/native/fslist.c
trunk/reactos/base/setup/usetup/native/host_native.h
trunk/reactos/base/setup/usetup/usetup.h
Modified: trunk/reactos/base/setup/usetup/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/CMakeLists.txt?rev=53282&r1=53281&r2=53282&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] Wed Aug 17 13:59:47 2011
@@ -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 @@
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)
Modified: trunk/reactos/base/setup/usetup/cabinet.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/cabinet.c?rev=53282&r1=53281&r2=53282&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/cabinet.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/cabinet.c [iso-8859-1] Wed Aug 17 13:59:47 2011
@@ -9,7 +9,6 @@
*/
#include "usetup.h"
-#include <zlib.h>
#define NDEBUG
#include <debug.h>
Modified: trunk/reactos/base/setup/usetup/inffile.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inffile.c?rev=53282&r1=53281&r2=53282&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/inffile.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/inffile.c [iso-8859-1] Wed Aug 17 13:59:47 2011
@@ -28,10 +28,6 @@
#include "usetup.h"
-#ifdef __REACTOS__
-#include <infros.h>
-#endif
-
#define NDEBUG
#include <debug.h>
Modified: trunk/reactos/base/setup/usetup/interface/devinst.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interface/devinst.c?rev=53282&r1=53281&r2=53282&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/interface/devinst.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/interface/devinst.c [iso-8859-1] Wed Aug 17 13:59:47 2011
@@ -10,10 +10,6 @@
#define NDEBUG
#include <debug.h>
-
-#define INITGUID
-#include <guiddef.h>
-#include <libs/umpnpmgr/sysguid.h>
BOOLEAN
ResetDevice(
Modified: trunk/reactos/base/setup/usetup/mui.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?rev=53282&r1=53281&r2=53282&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] Wed Aug 17 13:59:47 2011
@@ -25,9 +25,6 @@
*/
#include "usetup.h"
-#include "interface/consup.h"
-#include "errorcode.h"
-#include "mui.h"
#include "muifonts.h"
#include "muilanguages.h"
Modified: trunk/reactos/base/setup/usetup/native/fslist.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/fslist.c?rev=53282&r1=53281&r2=53282&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/native/fslist.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/native/fslist.c [iso-8859-1] Wed Aug 17 13:59:47 2011
@@ -1,9 +1,4 @@
#include "usetup.h"
-
-/* Filesystem headers */
-#include <fslib/ext2lib.h>
-#include <fslib/vfatlib.h>
-#include <fslib/vfatxlib.h>
BOOLEAN
NATIVE_CreateFileSystemList(
Modified: trunk/reactos/base/setup/usetup/native/host_native.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/host_native.h?rev=53282&r1=53281&r2=53282&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/native/host_native.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/native/host_native.h [iso-8859-1] Wed Aug 17 13:59:47 2011
@@ -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)
Modified: trunk/reactos/base/setup/usetup/usetup.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h?rev=53282&r1=53281&r2=53282&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] Wed Aug 17 13:59:47 2011
@@ -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"
@@ -70,6 +78,12 @@
#include "host.h"
#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;
@@ -108,6 +122,8 @@
#endif /* __REACTOS__ */
+#ifndef _PAGE_NUMBER_DEFINED
+#define _PAGE_NUMBER_DEFINED
typedef enum _PAGE_NUMBER
{
START_PAGE,
@@ -148,6 +164,7 @@
FLUSH_PAGE,
REBOOT_PAGE, /* virtual page */
} PAGE_NUMBER, *PPAGE_NUMBER;
+#endif
#define POPUP_WAIT_NONE 0
#define POPUP_WAIT_ANY_KEY 1
More information about the Ros-diffs
mailing list