[ros-diffs] [ion] 16195: Build usetup with NDK

Build usetup with NDK
Modified: trunk/reactos/subsys/system/usetup/bootsup.c
Modified: trunk/reactos/subsys/system/usetup/cabinet.c
Modified: trunk/reactos/subsys/system/usetup/console.c
Modified: trunk/reactos/subsys/system/usetup/console.h
Modified: trunk/reactos/subsys/system/usetup/drivesup.c
Modified: trunk/reactos/subsys/system/usetup/filequeue.c
Modified: trunk/reactos/subsys/system/usetup/filesup.c
Modified: trunk/reactos/subsys/system/usetup/format.c
Modified: trunk/reactos/subsys/system/usetup/fslist.c
Modified: trunk/reactos/subsys/system/usetup/genlist.c
Modified: trunk/reactos/subsys/system/usetup/infcache.c
Modified: trunk/reactos/subsys/system/usetup/inicache.c
Modified: trunk/reactos/subsys/system/usetup/keytrans.c
Modified: trunk/reactos/subsys/system/usetup/keytrans.h
Modified: trunk/reactos/subsys/system/usetup/partlist.c
Deleted: trunk/reactos/subsys/system/usetup/precomp.h
Modified: trunk/reactos/subsys/system/usetup/progress.c
Modified: trunk/reactos/subsys/system/usetup/registry.c
Modified: trunk/reactos/subsys/system/usetup/settings.c
Modified: trunk/reactos/subsys/system/usetup/usetup.c
Modified: trunk/reactos/subsys/system/usetup/usetup.h
Modified: trunk/reactos/subsys/system/usetup/usetup.xml
  _____  

Modified: trunk/reactos/subsys/system/usetup/bootsup.c
--- trunk/reactos/subsys/system/usetup/bootsup.c	2005-06-20
22:48:50 UTC (rev 16194)
+++ trunk/reactos/subsys/system/usetup/bootsup.c	2005-06-20
22:49:45 UTC (rev 16195)
@@ -24,14 +24,7 @@

  * PROGRAMMER:      Eric Kohl
  */
 
-#include "precomp.h"
-#include <ntdll/rtl.h>
-#include <ddk/ntdddisk.h> /* FIXME: NDK */
-
 #include "usetup.h"
-#include "inicache.h"
-#include "filesup.h"
-#include "bootsup.h"
 
 #define NDEBUG
 #include <debug.h>
  _____  

Modified: trunk/reactos/subsys/system/usetup/cabinet.c
--- trunk/reactos/subsys/system/usetup/cabinet.c	2005-06-20
22:48:50 UTC (rev 16194)
+++ trunk/reactos/subsys/system/usetup/cabinet.c	2005-06-20
22:49:45 UTC (rev 16195)
@@ -8,12 +8,8 @@

  *   CSH 15/08-2003 Created
  */
 
-#include <ntos.h>
-#include <stdio.h>
-#include <string.h>
-#include <zlib.h>
-#include "cabinet.h"
 #include "usetup.h"
+#include <zlib.h>
 
 #define NDEBUG
 #include <debug.h>
  _____  

Modified: trunk/reactos/subsys/system/usetup/console.c
--- trunk/reactos/subsys/system/usetup/console.c	2005-06-20
22:48:50 UTC (rev 16194)
+++ trunk/reactos/subsys/system/usetup/console.c	2005-06-20
22:49:45 UTC (rev 16195)
@@ -26,13 +26,7 @@

 
 /* INCLUDES
******************************************************************/
 
-#include "precomp.h"
-#include <ddk/ntddblue.h>
-#include <ddk/ntddkbd.h>
-
 #include "usetup.h"
-#include "console.h"
-#include "keytrans.h"
 
 #define NDEBUG
 #include <debug.h>
  _____  

Modified: trunk/reactos/subsys/system/usetup/console.h
--- trunk/reactos/subsys/system/usetup/console.h	2005-06-20
22:48:50 UTC (rev 16194)
+++ trunk/reactos/subsys/system/usetup/console.h	2005-06-20
22:49:45 UTC (rev 16195)
@@ -27,8 +27,6 @@

 #ifndef __CONSOLE_H__
 #define __CONSOLE_H__
 
-#include <ntos/keyboard.h>
-
 #define AllocConsole ConAllocConsole
 #define FreeConsole ConFreeConsole
 #define ReadConsoleOutputCharacters ConReadConsoleOutputCharacters
  _____  

Modified: trunk/reactos/subsys/system/usetup/drivesup.c
--- trunk/reactos/subsys/system/usetup/drivesup.c	2005-06-20
22:48:50 UTC (rev 16194)
+++ trunk/reactos/subsys/system/usetup/drivesup.c	2005-06-20
22:49:45 UTC (rev 16195)
@@ -26,12 +26,10 @@

 
 /* INCLUDES
*****************************************************************/
 
-#include "precomp.h"
-#include <ntdll/rtl.h>
-
 #include "usetup.h"
-#include "drivesup.h"
 
+#define NDEBUG
+#include <debug.h>
 
 /* FUNCTIONS
****************************************************************/
 
  _____  

Modified: trunk/reactos/subsys/system/usetup/filequeue.c
--- trunk/reactos/subsys/system/usetup/filequeue.c	2005-06-20
22:48:50 UTC (rev 16194)
+++ trunk/reactos/subsys/system/usetup/filequeue.c	2005-06-20
22:49:45 UTC (rev 16195)
@@ -27,12 +27,7 @@

 
 /* INCLUDES
*****************************************************************/
 
-#include "precomp.h"
-#include <ntdll/rtl.h>
-
 #include "usetup.h"
-#include "filesup.h"
-#include "filequeue.h"
 
 #define NDEBUG
 #include <debug.h>
  _____  

Modified: trunk/reactos/subsys/system/usetup/filesup.c
--- trunk/reactos/subsys/system/usetup/filesup.c	2005-06-20
22:48:50 UTC (rev 16194)
+++ trunk/reactos/subsys/system/usetup/filesup.c	2005-06-20
22:49:45 UTC (rev 16195)
@@ -27,12 +27,7 @@

 
 /* INCLUDES
*****************************************************************/
 
-#include "precomp.h"
-#include <ntdll/rtl.h>
-
 #include "usetup.h"
-#include "filesup.h"
-#include "cabinet.h"
 
 #define NDEBUG
 #include <debug.h>
  _____  

Modified: trunk/reactos/subsys/system/usetup/format.c
--- trunk/reactos/subsys/system/usetup/format.c	2005-06-20 22:48:50 UTC
(rev 16194)
+++ trunk/reactos/subsys/system/usetup/format.c	2005-06-20 22:49:45 UTC
(rev 16195)
@@ -26,18 +26,11 @@

 
 /* INCLUDES
*****************************************************************/
 
-#include "precomp.h"
-#include <ntdll/rtl.h>
-#include <fslib/vfatlib.h>
-
 #include "usetup.h"
-#include "console.h"
-#include "progress.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
 PPROGRESSBAR ProgressBar = NULL;
 
 /* FUNCTIONS
****************************************************************/
  _____  

Modified: trunk/reactos/subsys/system/usetup/fslist.c
--- trunk/reactos/subsys/system/usetup/fslist.c	2005-06-20 22:48:50 UTC
(rev 16194)
+++ trunk/reactos/subsys/system/usetup/fslist.c	2005-06-20 22:49:45 UTC
(rev 16195)
@@ -25,14 +25,10 @@

  *                  Casper S. Hornstrup (chorns(a)users.sourceforge.net)
  */
 
-#include "precomp.h"
-#include <ddk/ntddscsi.h>
-#include <ntdll/rtl.h>
-
 #include "usetup.h"
-#include "console.h"
-#include "fslist.h"
 
+#define NDEBUG
+#include <debug.h>
 
 /* FUNCTIONS
****************************************************************/
 
  _____  

Modified: trunk/reactos/subsys/system/usetup/genlist.c
--- trunk/reactos/subsys/system/usetup/genlist.c	2005-06-20
22:48:50 UTC (rev 16194)
+++ trunk/reactos/subsys/system/usetup/genlist.c	2005-06-20
22:49:45 UTC (rev 16195)
@@ -26,18 +26,11 @@

 
 /* INCLUDES
*****************************************************************/
 
-#include "precomp.h"
-#include <ntdll/rtl.h>
-#include <ntos/minmax.h>
-
 #include "usetup.h"
-#include "console.h"
-#include "genlist.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* FUNCTIONS
****************************************************************/
 
 PGENERIC_LIST
  _____  

Modified: trunk/reactos/subsys/system/usetup/infcache.c
--- trunk/reactos/subsys/system/usetup/infcache.c	2005-06-20
22:48:50 UTC (rev 16194)
+++ trunk/reactos/subsys/system/usetup/infcache.c	2005-06-20
22:49:45 UTC (rev 16195)
@@ -27,9 +27,7 @@

 
 /* INCLUDES
*****************************************************************/
 
-#include "precomp.h"
 #include "usetup.h"
-#include "infcache.h"
 
 #define NDEBUG
 #include <debug.h>
  _____  

Modified: trunk/reactos/subsys/system/usetup/inicache.c
--- trunk/reactos/subsys/system/usetup/inicache.c	2005-06-20
22:48:50 UTC (rev 16194)
+++ trunk/reactos/subsys/system/usetup/inicache.c	2005-06-20
22:49:45 UTC (rev 16195)
@@ -27,9 +27,7 @@

 
 /* INCLUDES
*****************************************************************/
 
-#include "precomp.h"
 #include "usetup.h"
-#include "inicache.h"
 
 #define NDEBUG
 #include <debug.h>
  _____  

Modified: trunk/reactos/subsys/system/usetup/keytrans.c
--- trunk/reactos/subsys/system/usetup/keytrans.c	2005-06-20
22:48:50 UTC (rev 16194)
+++ trunk/reactos/subsys/system/usetup/keytrans.c	2005-06-20
22:49:45 UTC (rev 16195)
@@ -25,14 +25,11 @@

  *
  * NB: Hardcoded to US keyboard
  */
+#include "usetup.h"
+
 #define NDEBUG
 #include <debug.h>
 
-#include "precomp.h"
-#include <ddk/ntddblue.h>
-#include <ddk/ntddkbd.h>
-#include <windows.h>
-
 static WORD KeyTable[] = {
 /* 0x00 */
 	0x00,		VK_ESCAPE,	0x31,		0x32,
  _____  

Modified: trunk/reactos/subsys/system/usetup/keytrans.h
--- trunk/reactos/subsys/system/usetup/keytrans.h	2005-06-20
22:48:50 UTC (rev 16194)
+++ trunk/reactos/subsys/system/usetup/keytrans.h	2005-06-20
22:49:45 UTC (rev 16195)
@@ -27,6 +27,8 @@

 #ifndef __KEYTRANS_H__
 #define __KEYTRANS_H__
 
+#include <ddk/ntddkbd.h>
+
 NTSTATUS
 IntTranslateKey(PKEYBOARD_INPUT_DATA InputData, KEY_EVENT_RECORD
*Event);
 
  _____  

Modified: trunk/reactos/subsys/system/usetup/partlist.c
--- trunk/reactos/subsys/system/usetup/partlist.c	2005-06-20
22:48:50 UTC (rev 16194)
+++ trunk/reactos/subsys/system/usetup/partlist.c	2005-06-20
22:49:45 UTC (rev 16195)
@@ -25,19 +25,7 @@

  *                  Casper S. Hornstrup (chorns(a)users.sourceforge.net)
  */
 
-#include "precomp.h"
-#include <ddk/ntddscsi.h>  /* FIXME: NDK */
-#include <ddk/ntdddisk.h> /* FIXME: NDK */
-
-#include <ntdll/rtl.h>
-
-#include <ntos/minmax.h>
-
 #include "usetup.h"
-#include "console.h"
-#include "partlist.h"
-#include "drivesup.h"
-#include "bootsup.h"
 
 #define NDEBUG
 #include <debug.h>
  _____  

Deleted: trunk/reactos/subsys/system/usetup/precomp.h
--- trunk/reactos/subsys/system/usetup/precomp.h	2005-06-20
22:48:50 UTC (rev 16194)
+++ trunk/reactos/subsys/system/usetup/precomp.h	2005-06-20
22:49:45 UTC (rev 16195)
@@ -1 +0,0 @@

-#include <ntos.h>
  _____  

Modified: trunk/reactos/subsys/system/usetup/progress.c
--- trunk/reactos/subsys/system/usetup/progress.c	2005-06-20
22:48:50 UTC (rev 16194)
+++ trunk/reactos/subsys/system/usetup/progress.c	2005-06-20
22:49:45 UTC (rev 16195)
@@ -1,13 +1,11 @@

 
 /* INCLUDES
*****************************************************************/
 
-#include "precomp.h"
-#include <ntdll/rtl.h>
-
 #include "usetup.h"
-#include "progress.h"
-#include "console.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* FUNCTIONS
****************************************************************/
 
 
  _____  

Modified: trunk/reactos/subsys/system/usetup/registry.c
--- trunk/reactos/subsys/system/usetup/registry.c	2005-06-20
22:48:50 UTC (rev 16194)
+++ trunk/reactos/subsys/system/usetup/registry.c	2005-06-20
22:49:45 UTC (rev 16195)
@@ -26,18 +26,11 @@

 
 /* INCLUDES
*****************************************************************/
 
-#include "precomp.h"
-#include <ntdll/rtl.h>
-#include <rosrtl/string.h>
-
 #include "usetup.h"
-#include "registry.h"
-#include "infcache.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
 #define FLG_ADDREG_BINVALUETYPE           0x00000001
 #define FLG_ADDREG_NOCLOBBER              0x00000002
 #define FLG_ADDREG_DELVAL                 0x00000004
  _____  

Modified: trunk/reactos/subsys/system/usetup/settings.c
--- trunk/reactos/subsys/system/usetup/settings.c	2005-06-20
22:48:50 UTC (rev 16194)
+++ trunk/reactos/subsys/system/usetup/settings.c	2005-06-20
22:49:45 UTC (rev 16195)
@@ -26,20 +26,11 @@

 
 /* INCLUDES
*****************************************************************/
 
-#include "precomp.h"
-#include <ntdll/rtl.h>
-#include <ntos/minmax.h>
-#include <rosrtl/string.h>
-
 #include "usetup.h"
-#include "infcache.h"
-#include "genlist.h"
-#include "settings.h"
 
 #define NDEBUG
 #include <debug.h>
 
-
 /* FUNCTIONS
****************************************************************/
 
 PGENERIC_LIST
  _____  

Modified: trunk/reactos/subsys/system/usetup/usetup.c
--- trunk/reactos/subsys/system/usetup/usetup.c	2005-06-20 22:48:50 UTC
(rev 16194)
+++ trunk/reactos/subsys/system/usetup/usetup.c	2005-06-20 22:49:45 UTC
(rev 16195)
@@ -25,36 +25,11 @@

  *                  Casper S. Hornstrup (chorns(a)users.sourceforge.net)
  */
 
-
-#include "precomp.h"
-#include <ntdll/rtl.h>
-#include <ddk/ntdddisk.h> /* FIXME: NDK */
-
-#include <ntos/minmax.h>
-#include <reactos/resource.h>
-#include <rosrtl/string.h>
-
 #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 <debug.h>
 
-
 typedef enum _PAGE_NUMBER
 {
   START_PAGE,
@@ -1549,7 +1524,7 @@
 
 	  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 @@
 
 	  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 @@
 	{
 	  return SELECT_PARTITION_PAGE;
 	}
-      else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_D) /* D */
+      else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'd') /* D */
 	{
 	  DeleteCurrentPartition (PartitionList);
 
  _____  

Modified: trunk/reactos/subsys/system/usetup/usetup.h
--- trunk/reactos/subsys/system/usetup/usetup.h	2005-06-20 22:48:50 UTC
(rev 16194)
+++ trunk/reactos/subsys/system/usetup/usetup.h	2005-06-20 22:49:45 UTC
(rev 16195)
@@ -27,16 +27,51 @@

 #ifndef __USETUP_H__
 #define __USETUP_H__
 
-#ifdef assert
-#undef assert
-#endif
-#define assert(x)
+/* PSDK/NDK */
+#include <windows.h>
+#include <fmifs.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 
+/* VFAT */
+#include <fslib/vfatlib.h>
+
+/* DDK Disk Headers */
+#include <ddk/ntddscsi.h>
+
+/* FIXME: Put outside of DDK */
+#include <ddk/ntddblue.h>
+
+/* FIXME: KILL ROSRTL */
+#include <rosrtl/string.h>
+
+/* Helper Header */
+#include <reactos/helper.h>
+
+/* ReactOS Version */
+#include <reactos/buildno.h>
+
+/* 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 */
  _____  

Modified: trunk/reactos/subsys/system/usetup/usetup.xml
--- trunk/reactos/subsys/system/usetup/usetup.xml	2005-06-20
22:48:50 UTC (rev 16194)
+++ trunk/reactos/subsys/system/usetup/usetup.xml	2005-06-20
22:49:45 UTC (rev 16195)
@@ -9,7 +9,7 @@

 	<library>zlib</library>
 	<library>vfatlib</library>
 	<library>ntdll</library>
-	<pch>precomp.h</pch>
+	<pch>usetup.h</pch>
 	<file>bootsup.c</file>
 	<file>cabinet.c</file>
 	<file>console.c</file>