[ion] 16358: Move some internal headers to /reactos, set it as a default include path, move pseh and elf headers to their respective directories
Move some internal headers to /reactos, set it as a default include path, move pseh and elf headers to their respective directories Modified: trunk/reactos/ReactOS.xml Modified: trunk/reactos/drivers/dd/mpu401/settings.c Modified: trunk/reactos/drivers/dd/null/null.c Modified: trunk/reactos/drivers/net/afd/afd/info.c Modified: trunk/reactos/drivers/net/afd/afd/lock.c Modified: trunk/reactos/drivers/net/afd/afd/tdi.c Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c Deleted: trunk/reactos/include/debug.h Added: trunk/reactos/include/elf/elf.h Deleted: trunk/reactos/include/elf.h Added: trunk/reactos/include/pseh/pseh.h Deleted: trunk/reactos/include/pseh.h Added: trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/lib/dbghelp/msc.c Modified: trunk/reactos/lib/kernel32/k32.h Modified: trunk/reactos/lib/psapi/precomp.h Modified: trunk/reactos/lib/pseh/framebased.c Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/mm/elf.inc.h Modified: trunk/reactos/regtests/shared/regtests.c Modified: trunk/reactos/subsys/win32k/w32k.h _____
Modified: trunk/reactos/ReactOS.xml --- trunk/reactos/ReactOS.xml 2005-06-30 21:38:39 UTC (rev 16357) +++ trunk/reactos/ReactOS.xml 2005-06-30 22:40:36 UTC (rev 16358) @@ -30,8 +30,9 @@
</if>
<include>include</include> + <include>include/reactos</include> <include>w32api/include</include> - <include>w32api/include/ddk</include> + <include>w32api/include/ddk</include>
<directory name="apps"> <xi:include href="apps/directory.xml" /> _____
Modified: trunk/reactos/drivers/dd/mpu401/settings.c --- trunk/reactos/drivers/dd/mpu401/settings.c 2005-06-30 21:38:39 UTC (rev 16357) +++ trunk/reactos/drivers/dd/mpu401/settings.c 2005-06-30 22:40:36 UTC (rev 16358) @@ -9,7 +9,7 @@
* Sept 27, 2003: Created */
-#include <ntddk.h> +#include <ddk/ntddk.h>
#include "mpu401.h"
_____
Modified: trunk/reactos/drivers/dd/null/null.c --- trunk/reactos/drivers/dd/null/null.c 2005-06-30 21:38:39 UTC (rev 16357) +++ trunk/reactos/drivers/dd/null/null.c 2005-06-30 22:40:36 UTC (rev 16358) @@ -14,7 +14,7 @@
/* INCLUDES */ #include <ntddk.h>
-#include <pseh.h> +#include <pseh/pseh.h>
#include "null.h"
_____
Modified: trunk/reactos/drivers/net/afd/afd/info.c --- trunk/reactos/drivers/net/afd/afd/info.c 2005-06-30 21:38:39 UTC (rev 16357) +++ trunk/reactos/drivers/net/afd/afd/info.c 2005-06-30 22:40:36 UTC (rev 16358) @@ -11,7 +11,7 @@
#include "tdi_proto.h" #include "tdiconn.h" #include "debug.h" -#include "pseh.h" +#include "pseh/pseh.h"
NTSTATUS STDCALL AfdGetInfo( PDEVICE_OBJECT DeviceObject, PIRP Irp, _____
Modified: trunk/reactos/drivers/net/afd/afd/lock.c --- trunk/reactos/drivers/net/afd/afd/lock.c 2005-06-30 21:38:39 UTC (rev 16357) +++ trunk/reactos/drivers/net/afd/afd/lock.c 2005-06-30 22:40:36 UTC (rev 16358) @@ -11,7 +11,7 @@
#include "tdi_proto.h" #include "tdiconn.h" #include "debug.h" -#include "pseh.h" +#include "pseh/pseh.h"
/* Lock a method_neither request so it'll be available from DISPATCH_LEVEL */ PVOID LockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp ) { _____
Modified: trunk/reactos/drivers/net/afd/afd/tdi.c --- trunk/reactos/drivers/net/afd/afd/tdi.c 2005-06-30 21:38:39 UTC (rev 16357) +++ trunk/reactos/drivers/net/afd/afd/tdi.c 2005-06-30 22:40:36 UTC (rev 16358) @@ -9,7 +9,7 @@
*/ #include <afd.h> #ifndef _MSC_VER -#include <pseh.h> +#include <pseh/pseh.h> #endif #include "debug.h" #include "tdiconn.h" _____
Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c --- trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2005-06-30 21:38:39 UTC (rev 16357) +++ trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2005-06-30 22:40:36 UTC (rev 16358) @@ -10,7 +10,7 @@
*/
#include "precomp.h" -#include <pseh.h> +#include <pseh/pseh.h>
NTSTATUS DispPrepareIrpForCancel( PTRANSPORT_CONTEXT Context, _____
Deleted: trunk/reactos/include/debug.h --- trunk/reactos/include/debug.h 2005-06-30 21:38:39 UTC (rev 16357) +++ trunk/reactos/include/debug.h 2005-06-30 22:40:36 UTC (rev 16358) @@ -1,101 +0,0 @@
-/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: include/internal/debug.h - * PURPOSE: Useful debugging macros - * PROGRAMMER: David Welch (welch@mcmail.com) - * UPDATE HISTORY: - * 28/05/98: Created - */ - -/* - * NOTE: Define NDEBUG before including this header to disable debugging - * macros - */ - -#ifndef __INTERNAL_DEBUG -#define __INTERNAL_DEBUG - -//#define UNIMPLEMENTED do {DbgPrint("%s at %s:%d is unimplemented, have a nice day\n",__FUNCTION__,__FILE__,__LINE__); for(;;); } while(0); -#define UNIMPLEMENTED DbgPrint("WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); - -/* FIXME: should probably remove this later */ -#if !defined(CHECKED) && !defined(NDEBUG) -#define CHECKED -#endif - -#ifndef assert -#ifndef NASSERT -#define assert(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } -#else -#define assert(x) -#endif -#endif - -#ifndef ASSERT -#ifndef NASSERT -#define ASSERT(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } -#else -#define ASSERT(x) -#endif -#endif - -#ifndef ASSERTMSG -#ifndef NASSERT -#define ASSERTMSG(x,m) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, m); } -#else -#define ASSERTMSG(x) -#endif -#endif - -/* TODO: Make the output of file/line and the debug message atomic */ -#ifdef DBG -#define DPRINT1 DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint -#define CHECKPOINT1 do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0); -#else -#ifdef __GNUC__ -#define DPRINT1(args...) -#define CHECKPOINT1 -#else -#define DPRINT1 -#define CHECKPOINT1 -#endif /* __GNUC__ */ -#endif - -#ifndef NDEBUG -#define DPRINT(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0); -#define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0); -#else -#ifdef __GNUC__ -#define DPRINT(args...) -#else -#define DPRINT -#endif /* __GNUC__ */ -#define CHECKPOINT -#endif /* NDEBUG */ - -/* - * FUNCTION: Assert a maximum value for the current irql - * ARGUMENTS: - * x = Maximum irql - */ -#define ASSERT_IRQL(x) assert(KeGetCurrentIrql()<=(x)) -#define assert_irql(x) assert(KeGetCurrentIrql()<=(x)) - -/* Macros expanding to the appropriate inline assembly to raise a breakpoint */ -#if defined(_M_IX86) -#define ASM_BREAKPOINT "\nint $3\n" -#elif defined(_M_ALPHA) -#define ASM_BREAKPOINT "\ncall_pal bpt\n" -#elif defined(_M_MIPS) -#define ASM_BREAKPOINT "\nbreak\n" -#else -#error Unsupported architecture. -#endif - -#ifndef KEBUGCHECK -#define KEBUGCHECK(a) DbgPrint("KeBugCheck (0x%X) at %s:%i\n", a, __FILE__,__LINE__), KeBugCheck(a) -#define KEBUGCHECKEX(a,b,c,d,e) DbgPrint("KeBugCheckEx (0x%X, 0x%X, 0x%X, 0x%X, 0x%X) at %s:%i\n", a, b, c, d, e, __FILE__,__LINE__), KeBugCheckEx(a,b,c,d,e) -#endif - -#endif /* __INTERNAL_DEBUG */ _____
Copied: trunk/reactos/include/elf/elf.h (from rev 16335, trunk/reactos/include/elf.h) _____
Deleted: trunk/reactos/include/elf.h --- trunk/reactos/include/elf.h 2005-06-30 21:38:39 UTC (rev 16357) +++ trunk/reactos/include/elf.h 2005-06-30 22:40:36 UTC (rev 16358) @@ -1,20 +0,0 @@
-#ifndef _REACTOS_ELF_H_ -#define _REACTOS_ELF_H_ 1 - -/* Machine-independent and word-size-independent definitions */ -#include <elf/common.h> - -/* - * Word-size-dependent definitions. All ReactOS builds support all of them, - * even if (obviously) code for the wrong architecture cannot be executed - the - * files can still be used in machine-independent ways, e.g. as resource DLLs - */ -#include <elf/elf32.h> -#include <elf/elf64.h> - -/* Machine-dependent definitions */ -#include <elf/machine.h> - -#endif - -/* EOF */ _____
Copied: trunk/reactos/include/pseh/pseh.h (from rev 16356, trunk/reactos/include/pseh.h) _____
Deleted: trunk/reactos/include/pseh.h --- trunk/reactos/include/pseh.h 2005-06-30 21:38:39 UTC (rev 16357) +++ trunk/reactos/include/pseh.h 2005-06-30 22:40:36 UTC (rev 16358) @@ -1,84 +0,0 @@
-/* - Copyright (c) 2004/2005 KJK::Hyperion - - Permission is hereby granted, free of charge, to any person obtaining a copy of - this software and associated documentation files (the "Software"), to deal in - the Software without restriction, including without limitation the rights to - use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - of the Software, and to permit persons to whom the Software is furnished to do - so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*/ - -#ifndef KJK_PSEH_H_ -#define KJK_PSEH_H_ - -/* Some useful macros */ -#if defined(__cplusplus) -# define _SEH_PVOID_CAST(TYPE_, P_) ((TYPE_)(P_)) -#else -# define _SEH_PVOID_CAST(TYPE_, P_) (P_) -#endif - -#if defined(FIELD_OFFSET) -# define _SEH_FIELD_OFFSET FIELD_OFFSET -#else -# include <stddef.h> -# define _SEH_FIELD_OFFSET offsetof -#endif - -#if defined(CONTAINING_RECORD) -# define _SEH_CONTAINING_RECORD CONTAINING_RECORD -#else -# define _SEH_CONTAINING_RECORD(ADDR_, TYPE_, FIELD_) \ - ((TYPE_ *)(((char *)(ADDR_)) - _SEH_FIELD_OFFSET(TYPE_, FIELD_))) -#endif - -#if defined(__CONCAT) -# define _SEH_CONCAT __CONCAT -#else -# define _SEH_CONCAT1(X_, Y_) X_ ## Y_ -# define _SEH_CONCAT(X_, Y_) _SEH_CONCAT1(X_, Y_) -#endif - -/* - Note: just define __inline to an empty symbol if your C compiler doesn't - support it -*/ -#ifdef __cplusplus -# ifndef __inline -# define __inline inline -# endif -#endif - -/* Locals sharing support */ -#define _SEH_LOCALS_TYPENAME(BASENAME_) \ - struct _SEH_CONCAT(_SEHLocalsTag, BASENAME_) - -#define _SEH_DEFINE_LOCALS(BASENAME_) \ - _SEH_LOCALS_TYPENAME(BASENAME_) - -#define _SEH_DECLARE_LOCALS(BASENAME_) \ - _SEH_LOCALS_TYPENAME(BASENAME_) _SEHLocals; \ - _SEH_LOCALS_TYPENAME(BASENAME_) * _SEHPLocals; \ - _SEHPLocals = &_SEHLocals; - -/* Dummy locals */ -static int _SEHLocals; -static void * const _SEHDummyLocals = &_SEHLocals; - -#include <pseh/framebased.h> - -#endif - -/* EOF */ _____
Copied: trunk/reactos/include/reactos/debug.h (from rev 16335, trunk/reactos/include/debug.h) _____
Modified: trunk/reactos/lib/dbghelp/msc.c --- trunk/reactos/lib/dbghelp/msc.c 2005-06-30 21:38:39 UTC (rev 16357) +++ trunk/reactos/lib/dbghelp/msc.c 2005-06-30 22:40:36 UTC (rev 16358) @@ -52,7 +52,7 @@
#include "winreg.h" #include "winternl.h"
-#include <pseh.h> +#include <pseh/pseh.h>
#include "wine/debug.h" #include "dbghelp_private.h" _____
Modified: trunk/reactos/lib/kernel32/k32.h --- trunk/reactos/lib/kernel32/k32.h 2005-06-30 21:38:39 UTC (rev 16357) +++ trunk/reactos/lib/kernel32/k32.h 2005-06-30 22:40:36 UTC (rev 16358) @@ -28,7 +28,7 @@
#include "include/kernel32.h"
/* PSEH for SEH Support */ -#include <pseh.h> +#include <pseh/pseh.h>
/* Helper Header */ #include <reactos/helper.h> _____
Modified: trunk/reactos/lib/psapi/precomp.h --- trunk/reactos/lib/psapi/precomp.h 2005-06-30 21:38:39 UTC (rev 16357) +++ trunk/reactos/lib/psapi/precomp.h 2005-06-30 22:40:36 UTC (rev 16358) @@ -8,4 +8,4 @@
#include "internal.h"
-#include <pseh.h> +#include <pseh/pseh.h> _____
Modified: trunk/reactos/lib/pseh/framebased.c --- trunk/reactos/lib/pseh/framebased.c 2005-06-30 21:38:39 UTC (rev 16357) +++ trunk/reactos/lib/pseh/framebased.c 2005-06-30 22:40:36 UTC (rev 16358) @@ -24,7 +24,7 @@
#define WIN32_LEAN_AND_MEAN #include <windows.h>
-#include <pseh.h> +#include <pseh/pseh.h> #include <pseh/framebased/internal.h> #include <pseh/excpt.h> #include <pseh/framebased.h> _____
Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-06-30 21:38:39 UTC (rev 16357) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-06-30 22:40:36 UTC (rev 16358) @@ -34,7 +34,7 @@
#include <wchar.h>
/* SEH support with PSEH */ -#include <pseh.h> +#include <pseh/pseh.h>
/* Helper Header */ #include <reactos/helper.h> _____
Modified: trunk/reactos/ntoskrnl/mm/elf.inc.h --- trunk/reactos/ntoskrnl/mm/elf.inc.h 2005-06-30 21:38:39 UTC (rev 16357) +++ trunk/reactos/ntoskrnl/mm/elf.inc.h 2005-06-30 22:40:36 UTC (rev 16358) @@ -15,7 +15,7 @@
#define MAXULONG ((ULONG)(~1)) #endif
-#include <elf.h> +#include <elf/elf.h>
/* TODO: Intsafe should be made into a library, as it's generally useful */ static __inline BOOLEAN Intsafe_CanAddULongPtr _____
Modified: trunk/reactos/regtests/shared/regtests.c --- trunk/reactos/regtests/shared/regtests.c 2005-06-30 21:38:39 UTC (rev 16357) +++ trunk/reactos/regtests/shared/regtests.c 2005-06-30 22:40:36 UTC (rev 16358) @@ -9,7 +9,7 @@
#include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> -#include <pseh.h> +#include <pseh/pseh.h> #include "regtests.h"
#define NDEBUG _____
Modified: trunk/reactos/subsys/win32k/w32k.h --- trunk/reactos/subsys/win32k/w32k.h 2005-06-30 21:38:39 UTC (rev 16357) +++ trunk/reactos/subsys/win32k/w32k.h 2005-06-30 22:40:36 UTC (rev 16358) @@ -28,7 +28,7 @@
MmCopyToCaller(PVOID Dest, const VOID *Src, ULONG NumberOfBytes);
/* SEH Support with PSEH */ -#include <pseh.h> +#include <pseh/pseh.h>
/* CSRSS Header */ #include <csrss/csrss.h>
-
ion＠svn.reactos.com