Use NTDLL Common Header.

svn path=/trunk/; revision=15999

reactos/lib/ntdll/csr/capture.c

@@ -8,14 +8,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntdll/csr.h>
-#include <string.h>
-
-#include <csrss/csrss.h>
-
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <ntdll.h>
 
 /* GLOBALS *******************************************************************/
 

reactos/lib/ntdll/csr/lpc.c

@@ -13,15 +13,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntdll/csr.h>
-#include <string.h>
-#include <rosrtl/string.h>
-
-#include <csrss/csrss.h>
-
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <ntdll.h>
 
 /* GLOBALS *******************************************************************/
 

reactos/lib/ntdll/csr/probe.c

@@ -7,11 +7,9 @@
  * AUTHOR:          Eric Kohl
  * DATE:            2001-06-17
  */
-#define NTOS_MODE_USER
+ 
-#include <ntos.h>
-
 #define NDEBUG
-#include <ntdll/rtl.h>
+#include <ntdll.h>
 
 /*
  * @implemented

reactos/lib/ntdll/csr/thread.c

@@ -5,16 +5,9 @@
  * FILE:            lib/ntdll/csr/propvar.c
  * PURPOSE:         CSRSS threads API
  */
-#define NTOS_MODE_USER
-#include <ntos.h>
-
-#include <ntdll/csr.h>
-#include <string.h>
-
-#include <csrss/csrss.h>
 
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <ntdll.h>
 
 /*
  * @implemented

reactos/lib/ntdll/dbg/brkpoint.c

@@ -11,8 +11,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#define NDEBUG
-#include <debug.h>
+#include <ntdll.h>
 
 /* FUNCTIONS *****************************************************************/
 

reactos/lib/ntdll/dbg/debug.c

@@ -11,12 +11,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#define NDEBUG
-#include <ntos.h>
+#include <ntdll.h>
-#include <ntdll/rtl.h>
-#include <rosrtl/string.h>
-#include <rosrtl/thread.h>
-#include <ntdll/dbg.h>
 
 /* FUNCTIONS *****************************************************************/
 

reactos/lib/ntdll/dbg/print.c

@@ -9,11 +9,8 @@
  *                  Created 28/12/1999
  */
 
-#include <ddk/ntddk.h>
+#define NDEBUG
-#include <stdarg.h>
+#include <ntdll.h>
-#include <stdio.h>
-#include <string.h>
-
 
 /* FUNCTIONS ***************************************************************/
 

reactos/lib/ntdll/ldr/elf.c

@@ -42,6 +42,9 @@
  * John Polstra <jdp@polstra.com>.
  */
 
+#define NDEBUG
+#include <ntdll.h>
+
 #if 0
 
 #ifndef __GNUC__

reactos/lib/ntdll/ldr/res.c

@@ -23,17 +23,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <reactos/config.h>
-#include <ddk/ntddk.h>
-#include <ntos.h>
-#include <ntos/ldrtypes.h>
-#include <windows.h>
-#include <string.h>
-#include <wchar.h>
-#include <ntdll/ldr.h>
-
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <ntdll.h>
 
 /* PROTOTYPES ****************************************************************/
 

reactos/lib/ntdll/ldr/startup.c

@@ -10,19 +10,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <reactos/config.h>
-#include <ddk/ntddk.h>
-#include <windows.h>
-#include <ntdll/ldr.h>
-#include <ntdll/rtl.h>
-#include <csrss/csrss.h>
-#include <ntdll/csr.h>
-#include <user32/callback.h>
-#include <rosrtl/string.h>
-
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <ntdll.h>
-
+#include <user32/callback.h>
 
 VOID RtlInitializeHeapManager (VOID);
 VOID LdrpInitLoader(VOID);

reactos/lib/ntdll/ldr/utils.c

@@ -19,22 +19,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <reactos/config.h>
+#define NDEBUG
-#include <ddk/ntddk.h>
+#include <ntdll.h>
-#include <ntos.h>
-#include <windows.h>
-#include <string.h>
-#include <wchar.h>
-#include <ntdll/ldr.h>
-#include <ntdll/rtl.h>
 
 #define LDRP_PROCESS_CREATION_TIME 0x8000000
 
-#ifdef DBG_NTDLL_LDR_UTILS
-#define NDEBUG
-#endif
-#include <ntdll/ntdll.h>
-
 /* GLOBALS *******************************************************************/
 
 typedef struct _TLS_DATA

reactos/lib/ntdll/main/dllmain.c

@@ -7,11 +7,8 @@
  * PROGRAMMER:
  */
 
-#include <ddk/ntddk.h>
+#define NDEBUG
-#include <stdarg.h>
+#include <ntdll.h>
-#include <stdio.h>
-#include <ntdll/ntdll.h>
-#include <windows.h>
 
 BOOL WINAPI DllMainCRTStartup(HINSTANCE hinstDll,
 			      DWORD fdwReason,

reactos/lib/ntdll/rtl/apc.c

@@ -26,9 +26,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ntos.h>
+#define NDEBUG
-#include <string.h>
+#include <ntdll.h>
-#include <debug.h>
 
 /* FUNCTIONS ***************************************************************/
 

reactos/lib/ntdll/rtl/atom.c

@@ -11,13 +11,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ntos.h>
-#include <ntdll/rtl.h>
-#include <ntos/heap.h>
-
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <ntdll.h>
-
 
 /* LOCAL TYPES ***************************************************************/
 

reactos/lib/ntdll/rtl/callback.c

@@ -9,11 +9,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ntos.h>
+#define NDEBUG
-#include <string.h>
+#include <ntdll.h>
-#include <napi/teb.h>
-
-
 /* TYPES *********************************************************************/
 
 typedef NTSTATUS (STDCALL *KERNEL_CALLBACK_FUNCTION)(PVOID Argument,

reactos/lib/ntdll/rtl/crc32.c

@@ -17,9 +17,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#define NDEBUG
-#include <ntdll/rtl.h>
+#include <ntdll.h>
-
 /* FUNCTIONS ****************************************************************/
 
 /* CRC polynomial 0xedb88320 */

reactos/lib/ntdll/rtl/critical.c

@@ -12,12 +12,9 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <windows.h>
-#include <ntos.h>
 #include <ntdll/rtl.h>
-
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <ntdll.h>
 
 /* FUNCTIONS *****************************************************************/
 

reactos/lib/ntdll/rtl/dbgbuffer.c

@@ -31,17 +31,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <windows.h>
-#include <ntos/types.h>
-#include <napi/teb.h>
-#include <ntdll/rtl.h>
-#include <ntdll/ldr.h>
-#include <ntos.h>
-
-#include <rosrtl/thread.h>
-
 #define NDEBUG
-#include <debug.h>
+#include <ntdll.h>
 
 /* FUNCTIONS ***************************************************************/
 

reactos/lib/ntdll/rtl/exception.c

@@ -14,14 +14,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ntos.h>
-#include <windows.h>
-#include <string.h>
-#include <ntdll/rtl.h>
-#include <napi/teb.h>
-
 #define NDEBUG
-#include <debug.h>
+#include <ntdll.h>
 
 static RTL_CRITICAL_SECTION RtlpVectoredExceptionLock;
 static LIST_ENTRY RtlpVectoredExceptionHead;

reactos/lib/ntdll/rtl/handle.c

@@ -9,11 +9,8 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <ntdll.h>
 
 /* FUNCTIONS *****************************************************************/
 

reactos/lib/ntdll/rtl/libsupp.c

@@ -9,13 +9,8 @@
  *
  */
 
-#include <ntos.h>
-#include <ntdll/rtl.h>
-#include <ctype.h>
-#include <ntos/minmax.h>
-
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <ntdll.h>
 
 /* FUNCTIONS ***************************************************************/
 

reactos/lib/ntdll/rtl/math.c

@@ -17,7 +17,8 @@
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
-
+#define NDEBUG
+#include <ntdll.h>
 
 double atan (double __x);
 double ceil (double __x);

reactos/lib/ntdll/rtl/message.c

@@ -11,13 +11,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ntos.h>
-#include <ntos/ldrtypes.h>
-#include <ddk/ldrfuncs.h>
-
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <ntdll.h>
-
+#include <ddk/ldrfuncs.h>
 
 /* FUNCTIONS *****************************************************************/
 

reactos/lib/ntdll/rtl/misc.c

@@ -11,12 +11,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <windows.h>
-#include <ntos.h>
-#include <ntdll/rtl.h>
-
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <ntdll.h>
 
 /**********************************************************************
  * NAME							EXPORTED

reactos/lib/ntdll/rtl/path.c

@@ -10,15 +10,8 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ntos.h>
-#include <ntdll/rtl.h>
-#include <ntos/minmax.h>
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
-
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <ntdll.h>
 
 /* DEFINITONS and MACROS ******************************************************/
 

reactos/lib/ntdll/rtl/process.c

@@ -11,15 +11,8 @@
 
 /* INCLUDES ****************************************************************/
 
-#include <ntos.h>
-#include <windows.h>
-#include <napi/i386/segment.h>
-#include <ntdll/ldr.h>
-#include <ntdll/base.h>
-#include <ntdll/rtl.h>
-
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <ntdll.h>
 
 /* FUNCTIONS ****************************************************************/
 

reactos/lib/ntdll/rtl/propvar.c

@@ -5,8 +5,8 @@
  * FILE:            lib/ntdll/csr/propvar.c
  * PURPOSE:         CSRSS properties and variants API
  */
-#define NTOS_MODE_USER
+#define NDEBUG
-#include <ntos.h>
+#include <ntdll.h>
 
 /*
  * @unimplemented

reactos/lib/ntdll/rtl/rangelist.c

@@ -26,13 +26,8 @@
 
 /* INCLUDES ****************************************************************/
 
-#include <ntos.h>
-#include <ntdll/rtl.h>
-
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <ntdll.h>
-
-#define ROUND_DOWN(N, S) ((N) - ((N) % (S)))
 
 typedef struct _RTL_RANGE_ENTRY
 {

reactos/lib/ntdll/rtl/resource.c

@@ -18,11 +18,8 @@
  * The code is based on information published in WDJ January 1999 issue.
  */
 
-#include <ntos.h>
-#include <ntdll/rtl.h>
-
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <ntdll.h>
 
 
 /* FUNCTIONS ****************************************************************/

reactos/lib/ntdll/rtl/teb.c

@@ -6,8 +6,8 @@
  * PURPOSE:
  */
 
-#include <ddk/ntddk.h>
+#define NDEBUG
-#include <napi/teb.h>
+#include <ntdll.h>
 
 
 PTEB STDCALL

reactos/lib/ntdll/rtl/timerqueue.c

@@ -26,10 +26,8 @@
 
 /* INCLUDES ****************************************************************/
 
-#include <ddk/ntddk.h>
-
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <ntdll.h>
 
 typedef VOID (CALLBACK *WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN );
 

reactos/lib/ntdll/rtl/trace.c

@@ -26,11 +26,7 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#define NDEBUG
-#include <ntdll/trace.h>
-#include <string.h>
-#include <stdarg.h>
-
 #include <ntdll.h>
 
 /* GLOBALS *******************************************************************/

reactos/lib/ntdll/stdio/sprintf.c

@@ -20,16 +20,12 @@
  * Wirzenius wrote this portably, Torvalds fucked it up :-)
  */
 
-#include <ddk/ntddk.h>
-#include <stdarg.h>
-#include <stdlib.h>
 #define __NO_CTYPE_INLINES
 #include <ctype.h>
-#include <string.h>
 #include <limits.h>
 
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <ntdll.h>
 
 
 #define ZEROPAD	1		/* pad with zero */

reactos/lib/ntdll/stdio/sscanf.c

@@ -1,12 +1,8 @@
 /**/
 
-#include <stdio.h>
-#include <ntos.h>
-#include <ntdll/rtl.h>
-
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <ntdll.h>
-
+#include <stdio.h>
 
 /* helper function for *scanf.  Returns the value of character c in the
  * given base, or -1 if the given character is not a digit of the base.

reactos/lib/ntdll/stdio/swprintf.c

@@ -22,17 +22,11 @@
  * Wirzenius wrote this portably, Torvalds fucked it up :-)
  */
 
-#include <ddk/ntddk.h>
+#define NDEBUG
-#include <stdarg.h>
+#include <ntdll.h>
-#include <stdlib.h>
-#include <ctype.h>
 #include <wchar.h>
 #include <limits.h>
 
-#define NDEBUG
-#include <ntdll/ntdll.h>
-
-
 #define ZEROPAD	1		/* pad with zero */
 #define SIGN	2		/* unsigned/signed long */
 #define PLUS	4		/* show plus */

reactos/lib/ntdll/stdlib/mbstowcs.c

@@ -6,10 +6,10 @@
  * PURPOSE:         converts a multi byte string to a unicode string
  */
 
-#include <ntos.h>
+#define NDEBUG
+#include <ntdll.h>
 #include <stdlib.h>
 #include <string.h>
-
 /*
  * @implemented
  */

reactos/lib/ntdll/stdlib/wcstombs.c

@@ -6,7 +6,8 @@
  * PURPOSE:         converts a unicode string to a multi byte string
  */
 
-#include <ntos.h>
+#define NDEBUG
+#include <ntdll.h>
 #include <stdlib.h>
 #include <string.h>
 

reactos/lib/ntdll/string/wstring.c

@@ -12,7 +12,6 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
 #include <wchar.h>