From ce068ea8907d5696a86336f1a7fcb2fba97e3dc1 Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Mon, 20 Jun 2005 22:49:45 +0000 Subject: [PATCH] Build usetup with NDK svn path=/trunk/; revision=16195 --- reactos/subsys/system/usetup/bootsup.c | 7 ---- reactos/subsys/system/usetup/cabinet.c | 6 +-- reactos/subsys/system/usetup/console.c | 6 --- reactos/subsys/system/usetup/console.h | 2 - reactos/subsys/system/usetup/drivesup.c | 6 +-- reactos/subsys/system/usetup/filequeue.c | 5 --- reactos/subsys/system/usetup/filesup.c | 5 --- reactos/subsys/system/usetup/format.c | 7 ---- reactos/subsys/system/usetup/fslist.c | 8 +--- reactos/subsys/system/usetup/genlist.c | 7 ---- reactos/subsys/system/usetup/infcache.c | 2 - reactos/subsys/system/usetup/inicache.c | 2 - reactos/subsys/system/usetup/keytrans.c | 7 +--- reactos/subsys/system/usetup/keytrans.h | 2 + reactos/subsys/system/usetup/partlist.c | 12 ------ reactos/subsys/system/usetup/precomp.h | 1 - reactos/subsys/system/usetup/progress.c | 8 ++-- reactos/subsys/system/usetup/registry.c | 7 ---- reactos/subsys/system/usetup/settings.c | 9 ----- reactos/subsys/system/usetup/usetup.c | 31 ++-------------- reactos/subsys/system/usetup/usetup.h | 47 +++++++++++++++++++++--- reactos/subsys/system/usetup/usetup.xml | 2 +- 22 files changed, 57 insertions(+), 132 deletions(-) delete mode 100644 reactos/subsys/system/usetup/precomp.h diff --git a/reactos/subsys/system/usetup/bootsup.c b/reactos/subsys/system/usetup/bootsup.c index 93de053060f..1623bcb9a00 100644 --- a/reactos/subsys/system/usetup/bootsup.c +++ b/reactos/subsys/system/usetup/bootsup.c @@ -24,14 +24,7 @@ * PROGRAMMER: Eric Kohl */ -#include "precomp.h" -#include -#include /* FIXME: NDK */ - #include "usetup.h" -#include "inicache.h" -#include "filesup.h" -#include "bootsup.h" #define NDEBUG #include diff --git a/reactos/subsys/system/usetup/cabinet.c b/reactos/subsys/system/usetup/cabinet.c index 094fc7699b0..a4b6f9d264f 100755 --- a/reactos/subsys/system/usetup/cabinet.c +++ b/reactos/subsys/system/usetup/cabinet.c @@ -8,12 +8,8 @@ * CSH 15/08-2003 Created */ -#include -#include -#include -#include -#include "cabinet.h" #include "usetup.h" +#include #define NDEBUG #include diff --git a/reactos/subsys/system/usetup/console.c b/reactos/subsys/system/usetup/console.c index 6a98c87953c..5c0546c24ba 100644 --- a/reactos/subsys/system/usetup/console.c +++ b/reactos/subsys/system/usetup/console.c @@ -26,13 +26,7 @@ /* INCLUDES ******************************************************************/ -#include "precomp.h" -#include -#include - #include "usetup.h" -#include "console.h" -#include "keytrans.h" #define NDEBUG #include diff --git a/reactos/subsys/system/usetup/console.h b/reactos/subsys/system/usetup/console.h index 5318d673f9f..d98e08fd4cb 100644 --- a/reactos/subsys/system/usetup/console.h +++ b/reactos/subsys/system/usetup/console.h @@ -27,8 +27,6 @@ #ifndef __CONSOLE_H__ #define __CONSOLE_H__ -#include - #define AllocConsole ConAllocConsole #define FreeConsole ConFreeConsole #define ReadConsoleOutputCharacters ConReadConsoleOutputCharacters diff --git a/reactos/subsys/system/usetup/drivesup.c b/reactos/subsys/system/usetup/drivesup.c index 55e4d569beb..53fefc23735 100644 --- a/reactos/subsys/system/usetup/drivesup.c +++ b/reactos/subsys/system/usetup/drivesup.c @@ -26,12 +26,10 @@ /* INCLUDES *****************************************************************/ -#include "precomp.h" -#include - #include "usetup.h" -#include "drivesup.h" +#define NDEBUG +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/subsys/system/usetup/filequeue.c b/reactos/subsys/system/usetup/filequeue.c index 5e514f1458f..be5452d9acc 100644 --- a/reactos/subsys/system/usetup/filequeue.c +++ b/reactos/subsys/system/usetup/filequeue.c @@ -27,12 +27,7 @@ /* INCLUDES *****************************************************************/ -#include "precomp.h" -#include - #include "usetup.h" -#include "filesup.h" -#include "filequeue.h" #define NDEBUG #include diff --git a/reactos/subsys/system/usetup/filesup.c b/reactos/subsys/system/usetup/filesup.c index e499f8b6daa..88e144fae75 100644 --- a/reactos/subsys/system/usetup/filesup.c +++ b/reactos/subsys/system/usetup/filesup.c @@ -27,12 +27,7 @@ /* INCLUDES *****************************************************************/ -#include "precomp.h" -#include - #include "usetup.h" -#include "filesup.h" -#include "cabinet.h" #define NDEBUG #include diff --git a/reactos/subsys/system/usetup/format.c b/reactos/subsys/system/usetup/format.c index 08e4b1b5303..a47942e81d7 100755 --- a/reactos/subsys/system/usetup/format.c +++ b/reactos/subsys/system/usetup/format.c @@ -26,18 +26,11 @@ /* INCLUDES *****************************************************************/ -#include "precomp.h" -#include -#include - #include "usetup.h" -#include "console.h" -#include "progress.h" #define NDEBUG #include - PPROGRESSBAR ProgressBar = NULL; /* FUNCTIONS ****************************************************************/ diff --git a/reactos/subsys/system/usetup/fslist.c b/reactos/subsys/system/usetup/fslist.c index 2d418880f9f..7a6aa84f48e 100644 --- a/reactos/subsys/system/usetup/fslist.c +++ b/reactos/subsys/system/usetup/fslist.c @@ -25,14 +25,10 @@ * Casper S. Hornstrup (chorns@users.sourceforge.net) */ -#include "precomp.h" -#include -#include - #include "usetup.h" -#include "console.h" -#include "fslist.h" +#define NDEBUG +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/subsys/system/usetup/genlist.c b/reactos/subsys/system/usetup/genlist.c index dcdc24006ca..faefd689d2a 100644 --- a/reactos/subsys/system/usetup/genlist.c +++ b/reactos/subsys/system/usetup/genlist.c @@ -26,18 +26,11 @@ /* INCLUDES *****************************************************************/ -#include "precomp.h" -#include -#include - #include "usetup.h" -#include "console.h" -#include "genlist.h" #define NDEBUG #include - /* FUNCTIONS ****************************************************************/ PGENERIC_LIST diff --git a/reactos/subsys/system/usetup/infcache.c b/reactos/subsys/system/usetup/infcache.c index 43e1280b0de..9afa3fa5d41 100644 --- a/reactos/subsys/system/usetup/infcache.c +++ b/reactos/subsys/system/usetup/infcache.c @@ -27,9 +27,7 @@ /* INCLUDES *****************************************************************/ -#include "precomp.h" #include "usetup.h" -#include "infcache.h" #define NDEBUG #include diff --git a/reactos/subsys/system/usetup/inicache.c b/reactos/subsys/system/usetup/inicache.c index eb4d875ef42..2eb6bc1b462 100644 --- a/reactos/subsys/system/usetup/inicache.c +++ b/reactos/subsys/system/usetup/inicache.c @@ -27,9 +27,7 @@ /* INCLUDES *****************************************************************/ -#include "precomp.h" #include "usetup.h" -#include "inicache.h" #define NDEBUG #include diff --git a/reactos/subsys/system/usetup/keytrans.c b/reactos/subsys/system/usetup/keytrans.c index 3ea75d17aa9..06f350ab7df 100644 --- a/reactos/subsys/system/usetup/keytrans.c +++ b/reactos/subsys/system/usetup/keytrans.c @@ -25,14 +25,11 @@ * * NB: Hardcoded to US keyboard */ +#include "usetup.h" + #define NDEBUG #include -#include "precomp.h" -#include -#include -#include - static WORD KeyTable[] = { /* 0x00 */ 0x00, VK_ESCAPE, 0x31, 0x32, diff --git a/reactos/subsys/system/usetup/keytrans.h b/reactos/subsys/system/usetup/keytrans.h index 61a757eaffb..261233e9742 100644 --- a/reactos/subsys/system/usetup/keytrans.h +++ b/reactos/subsys/system/usetup/keytrans.h @@ -27,6 +27,8 @@ #ifndef __KEYTRANS_H__ #define __KEYTRANS_H__ +#include + NTSTATUS IntTranslateKey(PKEYBOARD_INPUT_DATA InputData, KEY_EVENT_RECORD *Event); diff --git a/reactos/subsys/system/usetup/partlist.c b/reactos/subsys/system/usetup/partlist.c index dc56b76d24b..596d52786cd 100644 --- a/reactos/subsys/system/usetup/partlist.c +++ b/reactos/subsys/system/usetup/partlist.c @@ -25,19 +25,7 @@ * Casper S. Hornstrup (chorns@users.sourceforge.net) */ -#include "precomp.h" -#include /* FIXME: NDK */ -#include /* FIXME: NDK */ - -#include - -#include - #include "usetup.h" -#include "console.h" -#include "partlist.h" -#include "drivesup.h" -#include "bootsup.h" #define NDEBUG #include diff --git a/reactos/subsys/system/usetup/precomp.h b/reactos/subsys/system/usetup/precomp.h deleted file mode 100644 index 989e9c340aa..00000000000 --- a/reactos/subsys/system/usetup/precomp.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/reactos/subsys/system/usetup/progress.c b/reactos/subsys/system/usetup/progress.c index fe89af8d751..8484b8617bd 100644 --- a/reactos/subsys/system/usetup/progress.c +++ b/reactos/subsys/system/usetup/progress.c @@ -1,12 +1,10 @@ /* INCLUDES *****************************************************************/ -#include "precomp.h" -#include - #include "usetup.h" -#include "progress.h" -#include "console.h" + +#define NDEBUG +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/subsys/system/usetup/registry.c b/reactos/subsys/system/usetup/registry.c index b457b894111..cb96ebb60aa 100644 --- a/reactos/subsys/system/usetup/registry.c +++ b/reactos/subsys/system/usetup/registry.c @@ -26,18 +26,11 @@ /* INCLUDES *****************************************************************/ -#include "precomp.h" -#include -#include - #include "usetup.h" -#include "registry.h" -#include "infcache.h" #define NDEBUG #include - #define FLG_ADDREG_BINVALUETYPE 0x00000001 #define FLG_ADDREG_NOCLOBBER 0x00000002 #define FLG_ADDREG_DELVAL 0x00000004 diff --git a/reactos/subsys/system/usetup/settings.c b/reactos/subsys/system/usetup/settings.c index 81dc3ac7079..afb652574db 100644 --- a/reactos/subsys/system/usetup/settings.c +++ b/reactos/subsys/system/usetup/settings.c @@ -26,20 +26,11 @@ /* INCLUDES *****************************************************************/ -#include "precomp.h" -#include -#include -#include - #include "usetup.h" -#include "infcache.h" -#include "genlist.h" -#include "settings.h" #define NDEBUG #include - /* FUNCTIONS ****************************************************************/ PGENERIC_LIST diff --git a/reactos/subsys/system/usetup/usetup.c b/reactos/subsys/system/usetup/usetup.c index a9c7f6ead14..2b168a121d4 100644 --- a/reactos/subsys/system/usetup/usetup.c +++ b/reactos/subsys/system/usetup/usetup.c @@ -25,36 +25,11 @@ * Casper S. Hornstrup (chorns@users.sourceforge.net) */ - -#include "precomp.h" -#include -#include /* FIXME: NDK */ - -#include -#include -#include - #include "usetup.h" -#include "console.h" -#include "partlist.h" -#include "inicache.h" -#include "infcache.h" -#include "filequeue.h" -#include "progress.h" -#include "bootsup.h" -#include "registry.h" -#include "format.h" -#include "fslist.h" -#include "cabinet.h" -#include "filesup.h" -#include "drivesup.h" -#include "genlist.h" -#include "settings.h" #define NDEBUG #include - typedef enum _PAGE_NUMBER { START_PAGE, @@ -1549,7 +1524,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) return SELECT_FILE_SYSTEM_PAGE; } - else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_C) /* C */ + else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'c') /* C */ { if (PartitionList->CurrentPartition->Unpartitioned == FALSE) { @@ -1565,7 +1540,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) return CREATE_PARTITION_PAGE; } - else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_D) /* D */ + else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'd') /* D */ { if (PartitionList->CurrentPartition->Unpartitioned == TRUE) { @@ -2075,7 +2050,7 @@ DeletePartitionPage (PINPUT_RECORD Ir) { return SELECT_PARTITION_PAGE; } - else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_D) /* D */ + else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'd') /* D */ { DeleteCurrentPartition (PartitionList); diff --git a/reactos/subsys/system/usetup/usetup.h b/reactos/subsys/system/usetup/usetup.h index c630cd2086d..d18dbaf9b4b 100644 --- a/reactos/subsys/system/usetup/usetup.h +++ b/reactos/subsys/system/usetup/usetup.h @@ -27,16 +27,51 @@ #ifndef __USETUP_H__ #define __USETUP_H__ -#ifdef assert -#undef assert -#endif -#define assert(x) +/* PSDK/NDK */ +#include +#include +#define NTOS_MODE_USER +#include + +/* VFAT */ +#include + +/* DDK Disk Headers */ +#include + +/* FIXME: Put outside of DDK */ +#include + +/* FIXME: KILL ROSRTL */ +#include + +/* Helper Header */ +#include + +/* ReactOS Version */ +#include + +/* Internal Headers */ +#include "console.h" +#include "partlist.h" +#include "inicache.h" +#include "infcache.h" +#include "filequeue.h" +#include "progress.h" +#include "bootsup.h" +#include "keytrans.h" +#include "registry.h" +#include "format.h" +#include "fslist.h" +#include "cabinet.h" +#include "filesup.h" +#include "drivesup.h" +#include "genlist.h" +#include "settings.h" extern HANDLE ProcessHeap; - extern UNICODE_STRING SourceRootPath; - #endif /* __USETUP_H__*/ /* EOF */ diff --git a/reactos/subsys/system/usetup/usetup.xml b/reactos/subsys/system/usetup/usetup.xml index 4ffe38dce34..a26a43135de 100644 --- a/reactos/subsys/system/usetup/usetup.xml +++ b/reactos/subsys/system/usetup/usetup.xml @@ -9,7 +9,7 @@ zlib vfatlib ntdll - precomp.h + usetup.h bootsup.c cabinet.c console.c