Merged 16330:16362 from trunk. Modified: branches/cache_manager_rewrite/reactos/ReactOS.xml Modified: branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/settings.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/null/null.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/np/rw.c Modified: branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/info.c Modified: branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/lock.c Modified: branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/tdi.c Modified: branches/cache_manager_rewrite/reactos/drivers/net/tcpip/tcpip/dispatch. c Deleted: branches/cache_manager_rewrite/reactos/include/GL/ Deleted: branches/cache_manager_rewrite/reactos/include/ddentry.h Deleted: branches/cache_manager_rewrite/reactos/include/debug.h Added: branches/cache_manager_rewrite/reactos/include/elf/elf.h Deleted: branches/cache_manager_rewrite/reactos/include/elf.h Deleted: branches/cache_manager_rewrite/reactos/include/expat/ Added: branches/cache_manager_rewrite/reactos/include/pseh/pseh.h Deleted: branches/cache_manager_rewrite/reactos/include/pseh.h Added: branches/cache_manager_rewrite/reactos/include/reactos/debug.h Deleted: branches/cache_manager_rewrite/reactos/include/rosky/ Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/devmode.h Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/gdimacro.h Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/logfont.h Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/minmax.h Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/path.h Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/priv.h Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/registry.h Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/resstr.h Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/sparse.h Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/string.h Deleted: branches/cache_manager_rewrite/reactos/include/tcpmisc.h Deleted: branches/cache_manager_rewrite/reactos/include/tgetopt.h Modified: branches/cache_manager_rewrite/reactos/include/win32k/font.h Modified: branches/cache_manager_rewrite/reactos/include/win32k/gdiobj.h Modified: branches/cache_manager_rewrite/reactos/include/win32k/ntddraw.h Deleted: branches/cache_manager_rewrite/reactos/include/wine/wininet.h Modified: branches/cache_manager_rewrite/reactos/lib/aclui/aclui.c Modified: branches/cache_manager_rewrite/reactos/lib/dbghelp/msc.c Modified: branches/cache_manager_rewrite/reactos/lib/dbghelp/stack.c Modified: branches/cache_manager_rewrite/reactos/lib/dbghelp/stackframe.h Modified: branches/cache_manager_rewrite/reactos/lib/gdi32/include/precomp.h Modified: branches/cache_manager_rewrite/reactos/lib/gdi32/misc/stubs.c Modified: branches/cache_manager_rewrite/reactos/lib/gdi32/objects/dc.c Modified: branches/cache_manager_rewrite/reactos/lib/gdi32/objects/font.c Modified: branches/cache_manager_rewrite/reactos/lib/gdi32/objects/utils.c Modified: branches/cache_manager_rewrite/reactos/lib/glu32/include/gluos.h Modified: branches/cache_manager_rewrite/reactos/lib/iphlpapi/iphlpapi_private.h Modified: branches/cache_manager_rewrite/reactos/lib/kernel32/file/dir.c Modified: branches/cache_manager_rewrite/reactos/lib/kernel32/k32.h Modified: branches/cache_manager_rewrite/reactos/lib/kernel32/misc/computername.c Modified: branches/cache_manager_rewrite/reactos/lib/psapi/precomp.h Modified: branches/cache_manager_rewrite/reactos/lib/pseh/framebased.c Deleted: branches/cache_manager_rewrite/reactos/lib/rosky/ Modified: branches/cache_manager_rewrite/reactos/lib/rosrtl/file/sparse.c Modified: branches/cache_manager_rewrite/reactos/lib/rosrtl/misc/devmode.c Modified: branches/cache_manager_rewrite/reactos/lib/rosrtl/misc/logfont.c Modified: branches/cache_manager_rewrite/reactos/lib/rosrtl/registry/registry.c Modified: branches/cache_manager_rewrite/reactos/lib/rosrtl/thread/priv.c Modified: branches/cache_manager_rewrite/reactos/lib/rtl/acl.c Modified: branches/cache_manager_rewrite/reactos/lib/rtl/rtl.h Modified: branches/cache_manager_rewrite/reactos/lib/rtl/unicode.c Modified: branches/cache_manager_rewrite/reactos/lib/smdll/dllmain.c Added: branches/cache_manager_rewrite/reactos/lib/tgetopt/tgetopt.h Modified: branches/cache_manager_rewrite/reactos/lib/user32/include/user32p.h Modified: branches/cache_manager_rewrite/reactos/lib/user32/misc/desktop.c Modified: branches/cache_manager_rewrite/reactos/lib/user32/misc/display.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/include/ntoskrnl.h Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/elf.inc.h Modified: branches/cache_manager_rewrite/reactos/regtests/shared/regtests.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/api/handle.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/api/process.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/api/user.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/api/wapi.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/csrss.c Added: branches/cache_manager_rewrite/reactos/subsys/csrss/csrss.h Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/csrss.xml Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/init.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/print.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/video.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/conio.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/desktopbg.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/dllmain.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/exitros.c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/guiconsole. c Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/tuiconsole. c Added: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/w32csr.h Modified: branches/cache_manager_rewrite/reactos/subsys/csrss/win32csr/win32csr.xm l Modified: branches/cache_manager_rewrite/reactos/subsys/smss/smapi.c Modified: branches/cache_manager_rewrite/reactos/subsys/smss/smss.h Modified: branches/cache_manager_rewrite/reactos/subsys/smss/smss.xml Modified: branches/cache_manager_rewrite/reactos/subsys/system/services/database.c Modified: branches/cache_manager_rewrite/reactos/subsys/system/sndvol32/sndvol32.h Modified: branches/cache_manager_rewrite/reactos/subsys/win32k/misc/math.c Modified: branches/cache_manager_rewrite/reactos/subsys/win32k/ntuser/caret.c Modified: branches/cache_manager_rewrite/reactos/subsys/win32k/ntuser/input.c Modified: branches/cache_manager_rewrite/reactos/subsys/win32k/ntuser/msgqueue.c Modified: branches/cache_manager_rewrite/reactos/subsys/win32k/objects/gdiobj.c Modified: branches/cache_manager_rewrite/reactos/subsys/win32k/w32k.h Modified: branches/cache_manager_rewrite/reactos/tools/rbuild/backend/mingw/mingw. cpp Modified: branches/cache_manager_rewrite/reactos/w32api/include/ddk/winddi.h Added: branches/cache_manager_rewrite/reactos/w32api/include/ddrawgdi.h Modified: branches/cache_manager_rewrite/reactos/w32api/include/gdiplus.h [truncated at 100 lines; 1 more skipped] _____
Modified: branches/cache_manager_rewrite/reactos/ReactOS.xml --- branches/cache_manager_rewrite/reactos/ReactOS.xml 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/ReactOS.xml 2005-08-14 13:42:08 UTC (rev 17383) @@ -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: branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/settings.c --- branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/settings.c 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/settings.c 2005-08-14 13:42:08 UTC (rev 17383) @@ -9,7 +9,7 @@
* Sept 27, 2003: Created */
-#include <ntddk.h> +#include <ddk/ntddk.h>
#include "mpu401.h"
_____
Modified: branches/cache_manager_rewrite/reactos/drivers/dd/null/null.c --- branches/cache_manager_rewrite/reactos/drivers/dd/null/null.c 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/drivers/dd/null/null.c 2005-08-14 13:42:08 UTC (rev 17383) @@ -14,7 +14,7 @@
/* INCLUDES */ #include <ntddk.h>
-#include <pseh.h> +#include <pseh/pseh.h>
#include "null.h"
_____
Modified: branches/cache_manager_rewrite/reactos/drivers/fs/np/rw.c --- branches/cache_manager_rewrite/reactos/drivers/fs/np/rw.c 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/drivers/fs/np/rw.c 2005-08-14 13:42:08 UTC (rev 17383) @@ -10,7 +10,6 @@
/* INCLUDES ******************************************************************/
#include <ntifs.h> -#include <rosrtl/minmax.h> #include "npfs.h"
#define NDEBUG @@ -450,7 +449,7 @@ /* Byte stream mode */ while (Length > 0 && Fcb->ReadDataAvailable > 0) { - CopyLength = RtlRosMin(Fcb->ReadDataAvailable, Length); + CopyLength = min(Fcb->ReadDataAvailable, Length); if (Fcb->ReadPtr + CopyLength <= Fcb->Data + Fcb->MaxDataLength) { memcpy(Buffer, Fcb->ReadPtr, CopyLength); @@ -494,7 +493,7 @@ if (Fcb->ReadDataAvailable) { /* Truncate the message if the receive buffer is too small */ - CopyLength = RtlRosMin(Fcb->ReadDataAvailable, Length); + CopyLength = min(Fcb->ReadDataAvailable, Length); memcpy(Buffer, Fcb->Data, CopyLength);
#ifndef NDEBUG @@ -694,7 +693,7 @@ DPRINT("Byte stream mode\n"); while (Length > 0 && ReaderFcb->WriteQuotaAvailable > 0) { - CopyLength = RtlRosMin(Length, ReaderFcb->WriteQuotaAvailable); + CopyLength = min(Length, ReaderFcb->WriteQuotaAvailable); if (ReaderFcb->WritePtr + CopyLength <= ReaderFcb->Data + ReaderFcb->MaxDataLength) { memcpy(ReaderFcb->WritePtr, Buffer, CopyLength); @@ -732,7 +731,7 @@ DPRINT("Message mode\n"); if (Length > 0) { - CopyLength = RtlRosMin(Length, ReaderFcb->WriteQuotaAvailable); + CopyLength = min(Length, ReaderFcb->WriteQuotaAvailable); memcpy(ReaderFcb->Data, Buffer, CopyLength);
Information = CopyLength; _____
Modified: branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/info.c --- branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/info.c 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/info.c 2005-08-14 13:42:08 UTC (rev 17383) @@ -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: branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/lock.c --- branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/lock.c 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/lock.c 2005-08-14 13:42:08 UTC (rev 17383) @@ -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: branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/tdi.c --- branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/tdi.c 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/tdi.c 2005-08-14 13:42:08 UTC (rev 17383) @@ -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: branches/cache_manager_rewrite/reactos/drivers/net/tcpip/tcpip/dispatch. c --- branches/cache_manager_rewrite/reactos/drivers/net/tcpip/tcpip/dispatch. c 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/drivers/net/tcpip/tcpip/dispatch. c 2005-08-14 13:42:08 UTC (rev 17383) @@ -10,7 +10,7 @@
*/
#include "precomp.h" -#include <pseh.h> +#include <pseh/pseh.h>
NTSTATUS DispPrepareIrpForCancel( PTRANSPORT_CONTEXT Context, _____
Deleted: branches/cache_manager_rewrite/reactos/include/ddentry.h --- branches/cache_manager_rewrite/reactos/include/ddentry.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/ddentry.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,95 +0,0 @@
-/* - * DirectDraw GDI32.dll interface definitions - * Copyright (C) 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -#include <ddk/ddrawi.h> -#include <ddk/d3dhal.h> -#include <ddk/winddi.h> -BOOL STDCALL DdCreateDirectDrawObject( -LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, -HDC hdc -); -BOOL STDCALL DdQueryDirectDrawObject( -LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, -LPDDHALINFO pHalInfo, -LPDDHAL_DDCALLBACKS pDDCallbacks, -LPDDHAL_DDSURFACECALLBACKS pDDSurfaceCallbacks, -LPDDHAL_DDPALETTECALLBACKS pDDPaletteCallbacks, -LPD3DHAL_CALLBACKS pD3dCallbacks, -LPD3DHAL_GLOBALDRIVERDATA pD3dDriverData, -LPDDHAL_DDEXEBUFCALLBACKS pD3dBufferCallbacks, -LPDDSURFACEDESC pD3dTextureFormats, -LPDWORD pdwFourCC, -LPVIDMEM pvmList -); -BOOL STDCALL DdDeleteDirectDrawObject( -LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal -); -BOOL STDCALL DdCreateSurfaceObject( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, -BOOL bPrimarySurface -); -BOOL STDCALL DdDeleteSurfaceObject( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal -); -BOOL STDCALL DdResetVisrgn( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, -HWND hWnd -); -BOOL STDCALL DdGetDC( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, -LPPALETTEENTRY pColorTable -); -BOOL STDCALL DdReleaseDC( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal -); -HBITMAP STDCALL DdCreateDIBSection( -HDC hdc, -CONST BITMAPINFO *pbmi, -UINT iUsage, -VOID **ppvBits, -HANDLE hSectionApp, -DWORD dwOffset -); -BOOL STDCALL DdReenableDirectDrawObject( -LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, -BOOL *pbNewMode -); -BOOL STDCALL DdAttachSurface( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceFrom, -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceTo -); -VOID STDCALL DdUnattachSurface( -LPDDRAWI_DDRAWSURFACE_LCL pSurface, -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceAttached -); -ULONG STDCALL DdQueryDisplaySettingsUniqueness(VOID); -HANDLE STDCALL DdGetDxHandle( -LPDDRAWI_DIRECTDRAW_LCL pDDraw, -LPDDRAWI_DDRAWSURFACE_LCL pSurface, -BOOL bRelease -); -BOOL STDCALL DdSetGammaRamp( -LPDDRAWI_DIRECTDRAW_LCL pDDraw, -HDC hdc, -LPVOID lpGammaRamp -); -DWORD STDCALL DdSwapTextureHandles( -LPDDRAWI_DIRECTDRAW_LCL pDDraw, -LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1, -LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2 -); _____
Deleted: branches/cache_manager_rewrite/reactos/include/debug.h --- branches/cache_manager_rewrite/reactos/include/debug.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/debug.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -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: branches/cache_manager_rewrite/reactos/include/elf/elf.h (from rev 16362, trunk/reactos/include/elf/elf.h) _____
Deleted: branches/cache_manager_rewrite/reactos/include/elf.h --- branches/cache_manager_rewrite/reactos/include/elf.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/elf.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -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: branches/cache_manager_rewrite/reactos/include/pseh/pseh.h (from rev 16362, trunk/reactos/include/pseh/pseh.h) _____
Deleted: branches/cache_manager_rewrite/reactos/include/pseh.h --- branches/cache_manager_rewrite/reactos/include/pseh.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/pseh.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -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: branches/cache_manager_rewrite/reactos/include/reactos/debug.h (from rev 16362, trunk/reactos/include/reactos/debug.h) _____
Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/devmode.h --- branches/cache_manager_rewrite/reactos/include/rosrtl/devmode.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/rosrtl/devmode.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,18 +0,0 @@
-/* devmode.h - */ - -#ifdef __cplusplus -extern "C" -{ -#endif - -void -RosRtlDevModeA2W ( LPDEVMODEW pW, const LPDEVMODEA pA ); -void -RosRtlDevModeW2A( LPDEVMODEA pA, const LPDEVMODEW pW ); - -#ifdef __cplusplus -} -#endif - -/* EOF */ _____
Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/gdimacro.h --- branches/cache_manager_rewrite/reactos/include/rosrtl/gdimacro.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/rosrtl/gdimacro.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,24 +0,0 @@
-/* - * gdimacro.h - */ - -#ifndef ROSRTL_GDIMACRO_H -#define ROSRTL_GDIMACRO_H - -#define IN_RECT(r,x,y) \ -( \ - (x) >= (r).left && \ - (y) >= (r).top && \ - (x) < (r).right && \ - (y) < (r).bottom \ -) - -#define RECT_OVERLAP(a,b) \ -( \ - (a).left < (b).right && \ - (b).left < (a).right && \ - (a).top < (b).bottom && \ - (b).top < (a).bottom \ -) - -#endif /* ROSRTL_GDIMACRO_H */ _____
Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/logfont.h --- branches/cache_manager_rewrite/reactos/include/rosrtl/logfont.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/rosrtl/logfont.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,19 +0,0 @@
-/* logfont.h - */ - -#ifdef __cplusplus -extern "C" -{ -#endif - -void -RosRtlLogFontA2W ( LPLOGFONTW pW, const LOGFONTA *pA ); - -void -RosRtlLogFontW2A ( LPLOGFONTA pA, const LOGFONTW *pW ); - -#ifdef __cplusplus -} -#endif - -/* EOF */ _____
Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/minmax.h --- branches/cache_manager_rewrite/reactos/include/rosrtl/minmax.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/rosrtl/minmax.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,23 +0,0 @@
-/* $Id$ - */ - -#ifndef ROSRTL_MINMAX_H__ -#define ROSRTL_MINMAX_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif - -#define RtlRosMin(X,Y) (((X) < (Y))? (X) : (Y)) -#define RtlRosMax(X,Y) (((X) > (Y))? (X) : (Y)) -#define RtlRosMin3(X,Y,Z) (((X) < (Y)) ? RtlRosMin(X,Z) : RtlRosMin(Y,Z)) -#define RtlRosMax3(X,Y,Z) (((X) > (Y)) ? RtlRosMax(X,Z) : RtlRosMax(Y,Z)) - -#ifdef __cplusplus -} -#endif - -#endif - -/* EOF */ _____
Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/path.h --- branches/cache_manager_rewrite/reactos/include/rosrtl/path.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/rosrtl/path.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,21 +0,0 @@
-/* - */ - -#ifndef ROSRTL_PATH_H__ -#define ROSRTL_PATH_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif - -BOOL STDCALL MakeSureDirectoryPathExistsExA(LPCSTR DirPath, BOOL FileAtEnd); -BOOL STDCALL MakeSureDirectoryPathExistsExW(LPCWSTR DirPath, BOOL FileAtEnd); - -#ifdef __cplusplus -} -#endif - -#endif - -/* EOF */ _____
Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/priv.h --- branches/cache_manager_rewrite/reactos/include/rosrtl/priv.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/rosrtl/priv.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,23 +0,0 @@
-/* $Id$ - */ - -#ifndef ROSRTL_SEC_H__ -#define ROSRTL_SEC_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif - -BOOL -RosEnableThreadPrivileges(HANDLE *hToken, LUID *Privileges, DWORD PrivilegeCount); -BOOL -RosResetThreadPrivileges(HANDLE hToken); - -#ifdef __cplusplus -} -#endif - -#endif - -/* EOF */ _____
Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/registry.h --- branches/cache_manager_rewrite/reactos/include/rosrtl/registry.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/rosrtl/registry.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,16 +0,0 @@
-#ifndef _ROSRTL_REGISTRY_H_ -#define _ROSRTL_REGISTRY_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -NTSTATUS NTAPI RosReadRegistryValue( IN PUNICODE_STRING Key, - IN PUNICODE_STRING Value, - OUT PUNICODE_STRING Result ); - -#ifdef __cplusplus -}; -#endif - -#endif/*_ROSRTL_REGISTRY_H_*/ _____
Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/resstr.h --- branches/cache_manager_rewrite/reactos/include/rosrtl/resstr.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/rosrtl/resstr.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,43 +0,0 @@
-/* $Id$ - */ - -#ifndef ROSRTL_RESSTR_H__ -#define ROSRTL_RESSTR_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif - -int -RosLenOfStrResource(HINSTANCE hInst, UINT uID); -int -RosAllocAndLoadStringA(LPSTR *lpTarget, HINSTANCE hInst, UINT uID); -int -RosAllocAndLoadStringW(LPWSTR *lpTarget, HINSTANCE hInst, UINT uID); -DWORD -RosFormatStrA(LPSTR *lpTarget, LPSTR lpFormat, ...); -DWORD -RosFormatStrW(LPWSTR *lpTarget, LPWSTR lpFormat, ...); -DWORD -RosLoadAndFormatStrA(HINSTANCE hInst, UINT uID, LPSTR *lpTarget, ...); -DWORD -RosLoadAndFormatStrW(HINSTANCE hInst, UINT uID, LPWSTR *lpTarget, ...); - -#ifdef UNICODE -# define RosFmtString RosFmtStringW -# define RosAllocAndLoadString RosAllocAndLoadStringW -# define RosLoadAndFormatStr RosLoadAndFormatStrW -#else -# define RosFmtString RosFmtStringA -# define RosAllocAndLoadString RosAllocAndLoadStringA -# define RosLoadAndFormatStr RosLoadAndFormatStrA -#endif - -#ifdef __cplusplus -} -#endif - -#endif - -/* EOF */ _____
Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/sparse.h --- branches/cache_manager_rewrite/reactos/include/rosrtl/sparse.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/rosrtl/sparse.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,36 +0,0 @@
-/* $Id$ - */ - -#ifndef ROSRTL_SPARSE_H__ -#define ROSRTL_SPARSE_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif - -BOOL -STDCALL -SetFileSparse(HANDLE hFile); - -BOOL -STDCALL -ZeroFileData(HANDLE hFile, - PLARGE_INTEGER pliFileOffset, - PLARGE_INTEGER pliBeyondFinalZero); - -DWORD -STDCALL -QueryAllocatedFileRanges(HANDLE hFile, - PLARGE_INTEGER pliFileOffset, - PLARGE_INTEGER pliLength, - PFILE_ALLOCATED_RANGE_BUFFER lpAllocatedRanges, - DWORD dwBufferSize); - -#ifdef __cplusplus -} -#endif - -#endif - -/* EOF */ _____
Deleted: branches/cache_manager_rewrite/reactos/include/rosrtl/string.h --- branches/cache_manager_rewrite/reactos/include/rosrtl/string.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/rosrtl/string.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,157 +0,0 @@
-/* $Id$ - */ - -#ifndef ROSRTL_STRING_H__ -#define ROSRTL_STRING_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif - -#define RosInitializeString( \ - __PDEST_STRING__, \ - __LENGTH__, \ - __MAXLENGTH__, \ - __BUFFER__ \ -) \ -{ \ - (__PDEST_STRING__)->Length = (__LENGTH__); \ - (__PDEST_STRING__)->MaximumLength = (__MAXLENGTH__); \ - (__PDEST_STRING__)->Buffer = (__BUFFER__); \ -} - -#define RtlRosInitStringFromLiteral( \ - __PDEST_STRING__, __SOURCE_STRING__) \ - RosInitializeString( \ - (__PDEST_STRING__), \ - sizeof(__SOURCE_STRING__) - sizeof((__SOURCE_STRING__)[0]), \ - sizeof(__SOURCE_STRING__), \ - (__SOURCE_STRING__) \ - ) - -#define RtlRosInitUnicodeStringFromLiteral \ - RtlRosInitStringFromLiteral - -#define ROS_STRING_INITIALIZER(__SOURCE_STRING__) \ -{ \ - sizeof(__SOURCE_STRING__) - sizeof((__SOURCE_STRING__)[0]), \ - sizeof(__SOURCE_STRING__), \ - (__SOURCE_STRING__) \ -} - -#define ROS_EMPTY_STRING {0, 0, NULL} - -NTSTATUS -FASTCALL -RtlpOemStringToCountedUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN POEM_STRING OemSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUpcaseUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PCUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUpcaseUnicodeStringToAnsiString( - IN OUT PANSI_STRING AnsiDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUpcaseUnicodeStringToCountedOemString( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUpcaseUnicodeStringToOemString ( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpDowncaseUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpAnsiStringToUnicodeString( - IN OUT PUNICODE_STRING DestinationString, - IN PANSI_STRING SourceString, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUnicodeStringToAnsiString( - IN OUT PANSI_STRING AnsiDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpOemStringToUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN POEM_STRING OemSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUnicodeStringToOemString( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -BOOLEAN -FASTCALL -RtlpCreateUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PCWSTR Source, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUnicodeStringToCountedOemString( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS STDCALL -RtlpDuplicateUnicodeString( - INT AddNull, - IN PUNICODE_STRING SourceString, - PUNICODE_STRING DestinationString, - POOL_TYPE PoolType); - -NTSTATUS NTAPI RosAppendUnicodeString( PUNICODE_STRING ResultFirst, - PUNICODE_STRING Second, - BOOL Deallocate ); - -#ifdef __cplusplus -} -#endif - -#endif - -/* EOF */ _____
Deleted: branches/cache_manager_rewrite/reactos/include/tcpmisc.h --- branches/cache_manager_rewrite/reactos/include/tcpmisc.h 2005-08-14 13:18:50 UTC (rev 17382) +++ branches/cache_manager_rewrite/reactos/include/tcpmisc.h 2005-08-14 13:42:08 UTC (rev 17383) @@ -1,98 +0,0 @@
-#ifndef TCPMISC_H -#define TCPMISC_H - -#define IF_MIB_STATS_ID 1 -#define MAX_PHYSADDR_SIZE 8 -#define MAX_IFDESCR_LEN 256 - -/* ID to use for requesting an IFEntry for an interface */ -#define IF_MIB_STATS_ID 1 - -/* ID to use for requesting an IPSNMPInfo for an interface */ -#define IP_MIB_STATS_ID 1 - -/* ID to use for requesting the route table */ -#define IP_MIB_ROUTETABLE_ENTRY_ID 0x101 -#define IP_MIB_ADDRTABLE_ENTRY_ID 0x102 - -typedef struct IFEntry { - ULONG if_index; - ULONG if_type; - ULONG if_mtu; - ULONG if_speed; - ULONG if_physaddrlen; - UCHAR if_physaddr[MAX_PHYSADDR_SIZE]; - ULONG if_adminstatus; - ULONG if_operstatus; - ULONG if_lastchange; - ULONG if_inoctets; - ULONG if_inucastpkts; - ULONG if_innucastpkts; - ULONG if_indiscards; - ULONG if_inerrors; - ULONG if_inunknownprotos; - ULONG if_outoctets; - ULONG if_outucastpkts; - ULONG if_outnucastpkts; - ULONG if_outdiscards; - ULONG if_outerrors; - ULONG if_outqlen; - ULONG if_descrlen; - UCHAR if_descr[1]; -} IFEntry; - -// As in the mib from RFC 1213 - -typedef struct _IPRouteEntry { - ULONG ire_dest; - ULONG ire_index; //matches if_index in IFEntry and iae_index in IPAddrEntry - ULONG ire_metric1; - ULONG ire_metric2; - ULONG ire_metric3; - ULONG ire_metric4; - ULONG ire_gw; - ULONG ire_type; - ULONG ire_proto; - ULONG ire_age; - ULONG ire_mask; - ULONG ire_metric5; - ULONG ire_info; -} IPRouteEntry; - -typedef struct _IPAddrEntry { - ULONG iae_addr; - ULONG iae_index; - ULONG iae_mask; - ULONG iae_bcastaddr; - ULONG iae_reasmsize; - ULONG iae_context; - ULONG iae_pad; -} IPAddrEntry; - -typedef struct _IPSNMPInfo { - ULONG ipsi_index; - ULONG ipsi_forwarding; - ULONG ipsi_defaultttl; - ULONG ipsi_inreceives; - ULONG ipsi_inhdrerrors; - ULONG ipsi_inaddrerrors; - ULONG ipsi_inunknownprotos; - ULONG ipsi_indiscards; - ULONG ipsi_indelivers; - ULONG ipsi_outrequests; - ULONG ipsi_routingdiscards; - ULONG ipsi_outdiscards; - ULONG ipsi_outnoroutes; - ULONG ipsi_reasmtimeout; - ULONG ipsi_reasmreqds; - ULONG ipsi_reasmoks; - ULONG ipsi_reasmfails; - ULONG ipsi_fragoks; - ULONG ipsi_fragfails; - ULONG ipsi_fragcreates; - ULONG ipsi_numif; - ULONG ipsi_numaddr; - ULONG ipsi_numroutes; -} IPSNMPInfo; - -#endif /* TCPMISC_H */ _____
Deleted: branches/cache_manager_rewrite/reactos/include/tgetopt.h --- branches/cache_manager_rewrite/reactos/include/tgetopt.h 2005-08-14 13:18:50 UTC (rev 17382)
[truncated at 1000 lines; 4571 more skipped]