From 2df663e3fe66e309d87a2f0a54cfc9be5a4eeec8 Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Fri, 17 Jun 2005 17:22:27 +0000 Subject: [PATCH] Use NTDLL Common Header. svn path=/trunk/; revision=15999 --- reactos/lib/ntdll/csr/capture.c | 8 +------- reactos/lib/ntdll/csr/lpc.c | 9 +-------- reactos/lib/ntdll/csr/probe.c | 6 ++---- reactos/lib/ntdll/csr/thread.c | 9 +-------- reactos/lib/ntdll/dbg/brkpoint.c | 4 ++-- reactos/lib/ntdll/dbg/debug.c | 8 ++------ reactos/lib/ntdll/dbg/print.c | 7 ++----- reactos/lib/ntdll/ldr/elf.c | 3 +++ reactos/lib/ntdll/ldr/res.c | 11 +---------- reactos/lib/ntdll/ldr/startup.c | 14 ++------------ reactos/lib/ntdll/ldr/utils.c | 15 ++------------- reactos/lib/ntdll/main/dllmain.c | 7 ++----- reactos/lib/ntdll/rtl/apc.c | 5 ++--- reactos/lib/ntdll/rtl/atom.c | 7 +------ reactos/lib/ntdll/rtl/callback.c | 7 ++----- reactos/lib/ntdll/rtl/crc32.c | 5 ++--- reactos/lib/ntdll/rtl/critical.c | 5 +---- reactos/lib/ntdll/rtl/dbgbuffer.c | 11 +---------- reactos/lib/ntdll/rtl/exception.c | 8 +------- reactos/lib/ntdll/rtl/handle.c | 5 +---- reactos/lib/ntdll/rtl/libsupp.c | 7 +------ reactos/lib/ntdll/rtl/math.c | 3 ++- reactos/lib/ntdll/rtl/message.c | 8 ++------ reactos/lib/ntdll/rtl/misc.c | 6 +----- reactos/lib/ntdll/rtl/path.c | 9 +-------- reactos/lib/ntdll/rtl/process.c | 9 +-------- reactos/lib/ntdll/rtl/propvar.c | 4 ++-- reactos/lib/ntdll/rtl/rangelist.c | 7 +------ reactos/lib/ntdll/rtl/resource.c | 5 +---- reactos/lib/ntdll/rtl/teb.c | 4 ++-- reactos/lib/ntdll/rtl/timerqueue.c | 4 +--- reactos/lib/ntdll/rtl/trace.c | 6 +----- reactos/lib/ntdll/stdio/sprintf.c | 6 +----- reactos/lib/ntdll/stdio/sscanf.c | 8 ++------ reactos/lib/ntdll/stdio/swprintf.c | 10 ++-------- reactos/lib/ntdll/stdlib/mbstowcs.c | 4 ++-- reactos/lib/ntdll/stdlib/wcstombs.c | 3 ++- reactos/lib/ntdll/string/wstring.c | 1 - 38 files changed, 57 insertions(+), 201 deletions(-) diff --git a/reactos/lib/ntdll/csr/capture.c b/reactos/lib/ntdll/csr/capture.c index 42dadcc956f..f45723ae69b 100644 --- a/reactos/lib/ntdll/csr/capture.c +++ b/reactos/lib/ntdll/csr/capture.c @@ -8,14 +8,8 @@ /* INCLUDES *****************************************************************/ -#include -#include -#include - -#include - #define NDEBUG -#include +#include /* GLOBALS *******************************************************************/ diff --git a/reactos/lib/ntdll/csr/lpc.c b/reactos/lib/ntdll/csr/lpc.c index 5f49355d314..2689468f3ea 100644 --- a/reactos/lib/ntdll/csr/lpc.c +++ b/reactos/lib/ntdll/csr/lpc.c @@ -13,15 +13,8 @@ /* INCLUDES *****************************************************************/ -#include -#include -#include -#include - -#include - #define NDEBUG -#include +#include /* GLOBALS *******************************************************************/ diff --git a/reactos/lib/ntdll/csr/probe.c b/reactos/lib/ntdll/csr/probe.c index 33046fc66e7..348f89d5cc7 100644 --- a/reactos/lib/ntdll/csr/probe.c +++ b/reactos/lib/ntdll/csr/probe.c @@ -7,11 +7,9 @@ * AUTHOR: Eric Kohl * DATE: 2001-06-17 */ -#define NTOS_MODE_USER -#include - + #define NDEBUG -#include +#include /* * @implemented diff --git a/reactos/lib/ntdll/csr/thread.c b/reactos/lib/ntdll/csr/thread.c index b0bcad8ed32..dfe12a46248 100644 --- a/reactos/lib/ntdll/csr/thread.c +++ b/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 - -#include -#include - -#include #define NDEBUG -#include +#include /* * @implemented diff --git a/reactos/lib/ntdll/dbg/brkpoint.c b/reactos/lib/ntdll/dbg/brkpoint.c index 8badfa0314f..930205aecc7 100644 --- a/reactos/lib/ntdll/dbg/brkpoint.c +++ b/reactos/lib/ntdll/dbg/brkpoint.c @@ -11,8 +11,8 @@ /* INCLUDES *****************************************************************/ -#include -#include +#define NDEBUG +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/ntdll/dbg/debug.c b/reactos/lib/ntdll/dbg/debug.c index c10351aa10e..22034f80d1d 100644 --- a/reactos/lib/ntdll/dbg/debug.c +++ b/reactos/lib/ntdll/dbg/debug.c @@ -11,12 +11,8 @@ /* INCLUDES *****************************************************************/ -#include -#include -#include -#include -#include -#include +#define NDEBUG +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/ntdll/dbg/print.c b/reactos/lib/ntdll/dbg/print.c index 7e4e211aa36..ab82fd0f523 100644 --- a/reactos/lib/ntdll/dbg/print.c +++ b/reactos/lib/ntdll/dbg/print.c @@ -9,11 +9,8 @@ * Created 28/12/1999 */ -#include -#include -#include -#include - +#define NDEBUG +#include /* FUNCTIONS ***************************************************************/ diff --git a/reactos/lib/ntdll/ldr/elf.c b/reactos/lib/ntdll/ldr/elf.c index 917623045b6..98eb0f1474e 100644 --- a/reactos/lib/ntdll/ldr/elf.c +++ b/reactos/lib/ntdll/ldr/elf.c @@ -42,6 +42,9 @@ * John Polstra . */ +#define NDEBUG +#include + #if 0 #ifndef __GNUC__ diff --git a/reactos/lib/ntdll/ldr/res.c b/reactos/lib/ntdll/ldr/res.c index 49054223a5e..4dfd4ad6ac0 100644 --- a/reactos/lib/ntdll/ldr/res.c +++ b/reactos/lib/ntdll/ldr/res.c @@ -23,17 +23,8 @@ /* INCLUDES *****************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include - #define NDEBUG -#include +#include /* PROTOTYPES ****************************************************************/ diff --git a/reactos/lib/ntdll/ldr/startup.c b/reactos/lib/ntdll/ldr/startup.c index 91293c4823d..7f676db0486 100644 --- a/reactos/lib/ntdll/ldr/startup.c +++ b/reactos/lib/ntdll/ldr/startup.c @@ -10,19 +10,9 @@ /* INCLUDES *****************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include - #define NDEBUG -#include - +#include +#include VOID RtlInitializeHeapManager (VOID); VOID LdrpInitLoader(VOID); diff --git a/reactos/lib/ntdll/ldr/utils.c b/reactos/lib/ntdll/ldr/utils.c index 9ceef9d716e..4581d635383 100644 --- a/reactos/lib/ntdll/ldr/utils.c +++ b/reactos/lib/ntdll/ldr/utils.c @@ -19,22 +19,11 @@ /* INCLUDES *****************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include +#define NDEBUG +#include #define LDRP_PROCESS_CREATION_TIME 0x8000000 -#ifdef DBG_NTDLL_LDR_UTILS -#define NDEBUG -#endif -#include - /* GLOBALS *******************************************************************/ typedef struct _TLS_DATA diff --git a/reactos/lib/ntdll/main/dllmain.c b/reactos/lib/ntdll/main/dllmain.c index 334ca95c063..dc4b0c99ee6 100644 --- a/reactos/lib/ntdll/main/dllmain.c +++ b/reactos/lib/ntdll/main/dllmain.c @@ -7,11 +7,8 @@ * PROGRAMMER: */ -#include -#include -#include -#include -#include +#define NDEBUG +#include BOOL WINAPI DllMainCRTStartup(HINSTANCE hinstDll, DWORD fdwReason, diff --git a/reactos/lib/ntdll/rtl/apc.c b/reactos/lib/ntdll/rtl/apc.c index 313073d0d52..8962d32ecd1 100644 --- a/reactos/lib/ntdll/rtl/apc.c +++ b/reactos/lib/ntdll/rtl/apc.c @@ -26,9 +26,8 @@ /* INCLUDES *****************************************************************/ -#include -#include -#include +#define NDEBUG +#include /* FUNCTIONS ***************************************************************/ diff --git a/reactos/lib/ntdll/rtl/atom.c b/reactos/lib/ntdll/rtl/atom.c index 7a2952022d1..e20d4ff99ca 100644 --- a/reactos/lib/ntdll/rtl/atom.c +++ b/reactos/lib/ntdll/rtl/atom.c @@ -11,13 +11,8 @@ /* INCLUDES *****************************************************************/ -#include -#include -#include - #define NDEBUG -#include - +#include /* LOCAL TYPES ***************************************************************/ diff --git a/reactos/lib/ntdll/rtl/callback.c b/reactos/lib/ntdll/rtl/callback.c index f2e6ccfebeb..b1d80abb3c4 100644 --- a/reactos/lib/ntdll/rtl/callback.c +++ b/reactos/lib/ntdll/rtl/callback.c @@ -9,11 +9,8 @@ /* INCLUDES *****************************************************************/ -#include -#include -#include - - +#define NDEBUG +#include /* TYPES *********************************************************************/ typedef NTSTATUS (STDCALL *KERNEL_CALLBACK_FUNCTION)(PVOID Argument, diff --git a/reactos/lib/ntdll/rtl/crc32.c b/reactos/lib/ntdll/rtl/crc32.c index 5ccf4a071bb..a42699cf99f 100644 --- a/reactos/lib/ntdll/rtl/crc32.c +++ b/reactos/lib/ntdll/rtl/crc32.c @@ -17,9 +17,8 @@ /* INCLUDES *****************************************************************/ -#include -#include - +#define NDEBUG +#include /* FUNCTIONS ****************************************************************/ /* CRC polynomial 0xedb88320 */ diff --git a/reactos/lib/ntdll/rtl/critical.c b/reactos/lib/ntdll/rtl/critical.c index 895b38639e8..03b2fde097f 100644 --- a/reactos/lib/ntdll/rtl/critical.c +++ b/reactos/lib/ntdll/rtl/critical.c @@ -12,12 +12,9 @@ /* INCLUDES ******************************************************************/ -#include -#include #include - #define NDEBUG -#include +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/ntdll/rtl/dbgbuffer.c b/reactos/lib/ntdll/rtl/dbgbuffer.c index 4c0523698dc..8304703737a 100644 --- a/reactos/lib/ntdll/rtl/dbgbuffer.c +++ b/reactos/lib/ntdll/rtl/dbgbuffer.c @@ -31,17 +31,8 @@ /* INCLUDES *****************************************************************/ -#include -#include -#include -#include -#include -#include - -#include - #define NDEBUG -#include +#include /* FUNCTIONS ***************************************************************/ diff --git a/reactos/lib/ntdll/rtl/exception.c b/reactos/lib/ntdll/rtl/exception.c index 2cfc4e5725b..5db5083d1e3 100644 --- a/reactos/lib/ntdll/rtl/exception.c +++ b/reactos/lib/ntdll/rtl/exception.c @@ -14,14 +14,8 @@ /* INCLUDES *****************************************************************/ -#include -#include -#include -#include -#include - #define NDEBUG -#include +#include static RTL_CRITICAL_SECTION RtlpVectoredExceptionLock; static LIST_ENTRY RtlpVectoredExceptionHead; diff --git a/reactos/lib/ntdll/rtl/handle.c b/reactos/lib/ntdll/rtl/handle.c index e0ea09b3cc8..9ea8f2f28da 100644 --- a/reactos/lib/ntdll/rtl/handle.c +++ b/reactos/lib/ntdll/rtl/handle.c @@ -9,11 +9,8 @@ /* INCLUDES ******************************************************************/ -#include -#include - #define NDEBUG -#include +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/ntdll/rtl/libsupp.c b/reactos/lib/ntdll/rtl/libsupp.c index 4a50fc11109..71b0d8452fb 100644 --- a/reactos/lib/ntdll/rtl/libsupp.c +++ b/reactos/lib/ntdll/rtl/libsupp.c @@ -9,13 +9,8 @@ * */ -#include -#include -#include -#include - #define NDEBUG -#include +#include /* FUNCTIONS ***************************************************************/ diff --git a/reactos/lib/ntdll/rtl/math.c b/reactos/lib/ntdll/rtl/math.c index 0f8eb913dae..c09b69ca41d 100644 --- a/reactos/lib/ntdll/rtl/math.c +++ b/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 double atan (double __x); double ceil (double __x); diff --git a/reactos/lib/ntdll/rtl/message.c b/reactos/lib/ntdll/rtl/message.c index 9a0891f2260..5a392e76c74 100644 --- a/reactos/lib/ntdll/rtl/message.c +++ b/reactos/lib/ntdll/rtl/message.c @@ -11,13 +11,9 @@ /* INCLUDES *****************************************************************/ -#include -#include -#include - #define NDEBUG -#include - +#include +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/ntdll/rtl/misc.c b/reactos/lib/ntdll/rtl/misc.c index 12bbc8a9d4b..c29f0027597 100644 --- a/reactos/lib/ntdll/rtl/misc.c +++ b/reactos/lib/ntdll/rtl/misc.c @@ -11,12 +11,8 @@ /* INCLUDES *****************************************************************/ -#include -#include -#include - #define NDEBUG -#include +#include /********************************************************************** * NAME EXPORTED diff --git a/reactos/lib/ntdll/rtl/path.c b/reactos/lib/ntdll/rtl/path.c index 4544798b075..234244939da 100644 --- a/reactos/lib/ntdll/rtl/path.c +++ b/reactos/lib/ntdll/rtl/path.c @@ -10,15 +10,8 @@ /* INCLUDES ******************************************************************/ -#include -#include -#include -#include -#include -#include - #define NDEBUG -#include +#include /* DEFINITONS and MACROS ******************************************************/ diff --git a/reactos/lib/ntdll/rtl/process.c b/reactos/lib/ntdll/rtl/process.c index f26a42026ba..d3cf73f4a6d 100644 --- a/reactos/lib/ntdll/rtl/process.c +++ b/reactos/lib/ntdll/rtl/process.c @@ -11,15 +11,8 @@ /* INCLUDES ****************************************************************/ -#include -#include -#include -#include -#include -#include - #define NDEBUG -#include +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/lib/ntdll/rtl/propvar.c b/reactos/lib/ntdll/rtl/propvar.c index 01c28b4e199..e4d8ca2fe4e 100644 --- a/reactos/lib/ntdll/rtl/propvar.c +++ b/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 -#include +#define NDEBUG +#include /* * @unimplemented diff --git a/reactos/lib/ntdll/rtl/rangelist.c b/reactos/lib/ntdll/rtl/rangelist.c index 6aba4c84f36..33ea03f854a 100644 --- a/reactos/lib/ntdll/rtl/rangelist.c +++ b/reactos/lib/ntdll/rtl/rangelist.c @@ -26,13 +26,8 @@ /* INCLUDES ****************************************************************/ -#include -#include - #define NDEBUG -#include - -#define ROUND_DOWN(N, S) ((N) - ((N) % (S))) +#include typedef struct _RTL_RANGE_ENTRY { diff --git a/reactos/lib/ntdll/rtl/resource.c b/reactos/lib/ntdll/rtl/resource.c index 07933e9f56b..2c268d9ccfa 100644 --- a/reactos/lib/ntdll/rtl/resource.c +++ b/reactos/lib/ntdll/rtl/resource.c @@ -18,11 +18,8 @@ * The code is based on information published in WDJ January 1999 issue. */ -#include -#include - #define NDEBUG -#include +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/lib/ntdll/rtl/teb.c b/reactos/lib/ntdll/rtl/teb.c index 27ba01d8298..5147fc3ca88 100644 --- a/reactos/lib/ntdll/rtl/teb.c +++ b/reactos/lib/ntdll/rtl/teb.c @@ -6,8 +6,8 @@ * PURPOSE: */ -#include -#include +#define NDEBUG +#include PTEB STDCALL diff --git a/reactos/lib/ntdll/rtl/timerqueue.c b/reactos/lib/ntdll/rtl/timerqueue.c index 5b6667597f8..b25e76a2214 100644 --- a/reactos/lib/ntdll/rtl/timerqueue.c +++ b/reactos/lib/ntdll/rtl/timerqueue.c @@ -26,10 +26,8 @@ /* INCLUDES ****************************************************************/ -#include - #define NDEBUG -#include +#include typedef VOID (CALLBACK *WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN ); diff --git a/reactos/lib/ntdll/rtl/trace.c b/reactos/lib/ntdll/rtl/trace.c index 687a090148d..4aba0efcc35 100644 --- a/reactos/lib/ntdll/rtl/trace.c +++ b/reactos/lib/ntdll/rtl/trace.c @@ -26,11 +26,7 @@ /* INCLUDES *****************************************************************/ -#include -#include -#include -#include - +#define NDEBUG #include /* GLOBALS *******************************************************************/ diff --git a/reactos/lib/ntdll/stdio/sprintf.c b/reactos/lib/ntdll/stdio/sprintf.c index 73a1a4c077c..359bafd06e1 100644 --- a/reactos/lib/ntdll/stdio/sprintf.c +++ b/reactos/lib/ntdll/stdio/sprintf.c @@ -20,16 +20,12 @@ * Wirzenius wrote this portably, Torvalds fucked it up :-) */ -#include -#include -#include #define __NO_CTYPE_INLINES #include -#include #include #define NDEBUG -#include +#include #define ZEROPAD 1 /* pad with zero */ diff --git a/reactos/lib/ntdll/stdio/sscanf.c b/reactos/lib/ntdll/stdio/sscanf.c index 2dd6af361e4..424db0027cb 100644 --- a/reactos/lib/ntdll/stdio/sscanf.c +++ b/reactos/lib/ntdll/stdio/sscanf.c @@ -1,12 +1,8 @@ /**/ -#include -#include -#include - #define NDEBUG -#include - +#include +#include /* 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. diff --git a/reactos/lib/ntdll/stdio/swprintf.c b/reactos/lib/ntdll/stdio/swprintf.c index bb3a4eee0b8..576da802510 100644 --- a/reactos/lib/ntdll/stdio/swprintf.c +++ b/reactos/lib/ntdll/stdio/swprintf.c @@ -22,17 +22,11 @@ * Wirzenius wrote this portably, Torvalds fucked it up :-) */ -#include -#include -#include -#include +#define NDEBUG +#include #include #include -#define NDEBUG -#include - - #define ZEROPAD 1 /* pad with zero */ #define SIGN 2 /* unsigned/signed long */ #define PLUS 4 /* show plus */ diff --git a/reactos/lib/ntdll/stdlib/mbstowcs.c b/reactos/lib/ntdll/stdlib/mbstowcs.c index 17e1d9184f1..99d0398094b 100644 --- a/reactos/lib/ntdll/stdlib/mbstowcs.c +++ b/reactos/lib/ntdll/stdlib/mbstowcs.c @@ -6,10 +6,10 @@ * PURPOSE: converts a multi byte string to a unicode string */ -#include +#define NDEBUG +#include #include #include - /* * @implemented */ diff --git a/reactos/lib/ntdll/stdlib/wcstombs.c b/reactos/lib/ntdll/stdlib/wcstombs.c index f0b068799d3..db5708268a4 100644 --- a/reactos/lib/ntdll/stdlib/wcstombs.c +++ b/reactos/lib/ntdll/stdlib/wcstombs.c @@ -6,7 +6,8 @@ * PURPOSE: converts a unicode string to a multi byte string */ -#include +#define NDEBUG +#include #include #include diff --git a/reactos/lib/ntdll/string/wstring.c b/reactos/lib/ntdll/string/wstring.c index 9aa2ef163ed..1767e241e61 100644 --- a/reactos/lib/ntdll/string/wstring.c +++ b/reactos/lib/ntdll/string/wstring.c @@ -12,7 +12,6 @@ /* INCLUDES *****************************************************************/ -#include #include