Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

[ion] 16358: Move some internal headers to /reactos, set it as a default include path, move pseh and elf headers to their respective directories

by ion＠svn.reactos.com

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(a)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>

19 years, 5 months

[weiden] 16357: - Get rid of GCC specific typecasts to PVOID for pointer arithmetics

by weiden＠svn.reactos.com

- Get rid of GCC specific typecasts to PVOID for pointer arithmetics - Decrement the AceCount in RtlDeleteAce instead of incrementing it Modified: trunk/reactos/lib/rtl/acl.c _____ Modified: trunk/reactos/lib/rtl/acl.c --- trunk/reactos/lib/rtl/acl.c 2005-06-30 17:00:19 UTC (rev 16356) +++ trunk/reactos/lib/rtl/acl.c 2005-06-30 21:38:39 UTC (rev 16357) @@ -23,23 +23,25 @@ PACE* Ace) { PACE Current; - PVOID AclEnd; + ULONG_PTR AclEnd; ULONG i; PAGED_CODE_RTL(); Current = (PACE)(Acl + 1); *Ace = NULL; - i = 0; + if (Acl->AceCount == 0) { *Ace = Current; return(TRUE); } - AclEnd = Acl->AclSize + (PVOID)Acl; + + i = 0; + AclEnd = (ULONG_PTR)Acl + Acl->AclSize; do { - if ((PVOID)Current >= AclEnd) + if ((ULONG_PTR)Current >= AclEnd) { return(FALSE); } @@ -48,12 +50,11 @@ { return(FALSE); } - Current = (PACE)((ULONG_PTR)Current + (ULONG_PTR)Current->Header.AceSize); - i++; + Current = (PACE)((ULONG_PTR)Current + Current->Header.AceSize); } - while (i < Acl->AceCount); + while (++i < Acl->AceCount); - if ((PVOID)Current < AclEnd) + if ((ULONG_PTR)Current < AclEnd) { *Ace = Current; } @@ -74,29 +75,25 @@ PAGED_CODE_RTL(); - *Ace = (PACE)(Acl + 1); - if (Acl->AclRevision < MIN_ACL_REVISION || - Acl->AclRevision > MAX_ACL_REVISION) + Acl->AclRevision > MAX_ACL_REVISION || + AceIndex >= Acl->AceCount) { return(STATUS_INVALID_PARAMETER); } + + *Ace = (PACE)(Acl + 1); - if (AceIndex >= Acl->AceCount) - { - return(STATUS_INVALID_PARAMETER); - } - for (i = 0; i < AceIndex; i++) { - if ((PVOID)*Ace >= (PVOID)Acl + Acl->AclSize) + if ((ULONG_PTR)*Ace >= (ULONG_PTR)Acl + Acl->AclSize) { return(STATUS_INVALID_PARAMETER); } - *Ace = (PACE)((PVOID)(*Ace) + (ULONG)(*Ace)->Header.AceSize); + *Ace = (PACE)((ULONG_PTR)(*Ace) + (*Ace)->Header.AceSize); } - if ((PVOID)*Ace >= (PVOID)Acl + Acl->AclSize) + if ((ULONG_PTR)*Ace >= (ULONG_PTR)Acl + Acl->AclSize) { return(STATUS_INVALID_PARAMETER); } @@ -244,16 +241,16 @@ { if (Offset > 0) { - memcpy((PVOID)Ace + AceListLength, - Ace, - Offset); + RtlCopyMemory((PVOID)((ULONG_PTR)Ace + AceListLength), + Ace, + Offset); } if (AceListLength != 0) { - memcpy(Ace, - AceList, - AceListLength); + RtlCopyMemory(Ace, + AceList, + AceListLength); } } @@ -276,48 +273,40 @@ PAGED_CODE_RTL(); if (Acl->AclRevision < MIN_ACL_REVISION || - Acl->AclRevision > MAX_ACL_REVISION) + Acl->AclRevision > MAX_ACL_REVISION || + !RtlFirstFreeAce(Acl, &Ace)) { return(STATUS_INVALID_PARAMETER); } - if (!RtlFirstFreeAce(Acl,&Ace)) - { - return(STATUS_INVALID_PARAMETER); - } - if (Acl->AclRevision <= AclRevision) { AclRevision = Acl->AclRevision; } - if (((PVOID)AceList + AceListLength) <= (PVOID)AceList) + if (((ULONG_PTR)AceList + AceListLength) <= (ULONG_PTR)AceList) { return(STATUS_INVALID_PARAMETER); } i = 0; Current = (PACE)(Acl + 1); - while ((PVOID)Current < ((PVOID)AceList + AceListLength)) + while ((ULONG_PTR)Current < ((ULONG_PTR)AceList + AceListLength)) { if (AceList->Header.AceType == ACCESS_ALLOWED_COMPOUND_ACE_TYPE && AclRevision < ACL_REVISION3) { return(STATUS_INVALID_PARAMETER); } - Current = (PACE)((PVOID)Current + Current->Header.AceSize); + Current = (PACE)((ULONG_PTR)Current + Current->Header.AceSize); } - if (Ace == NULL) + if (Ace == NULL || + ((ULONG_PTR)Ace + AceListLength) >= ((ULONG_PTR)Acl + Acl->AclSize)) { return(STATUS_BUFFER_TOO_SMALL); } - if (((PVOID)Ace + AceListLength) >= ((PVOID)Acl + Acl->AclSize)) - { - return(STATUS_BUFFER_TOO_SMALL); - } - if (StartingIndex != 0) { if (Acl->AceCount > 0) @@ -325,7 +314,7 @@ Current = (PACE)(Acl + 1); for (j = 0; j < StartingIndex; j++) { - Current = (PACE)((PVOID)Current + Current->Header.AceSize); + Current = (PACE)((ULONG_PTR)Current + Current->Header.AceSize); } } } @@ -333,7 +322,7 @@ RtlpAddData(AceList, AceListLength, Current, - (ULONG)Ace - (ULONG)Current); + (ULONG)((ULONG_PTR)Ace - (ULONG_PTR)Current)); Acl->AceCount = Acl->AceCount + i; Acl->AclRevision = AclRevision; @@ -388,16 +377,12 @@ return(STATUS_INVALID_ACL); } - if (Ace == NULL) + if (Ace == NULL || + ((ULONG_PTR)Ace + RtlLengthSid(Sid) + sizeof(ACE)) > ((ULONG_PTR)Acl + Acl->AclSize)) { return(STATUS_ALLOTTED_SPACE_EXCEEDED); } - if (((PVOID)Ace + RtlLengthSid(Sid) + sizeof(ACE)) >= ((PVOID)Acl + Acl->AclSize)) - { - return(STATUS_ALLOTTED_SPACE_EXCEEDED); - } - Ace->Header.AceFlags = Flags; Ace->Header.AceType = SYSTEM_AUDIT_ACE_TYPE; Ace->Header.AceSize = RtlLengthSid(Sid) + sizeof(ACE); @@ -459,16 +444,12 @@ return STATUS_INVALID_ACL; } - if (Ace == NULL) + if (Ace == NULL || + ((ULONG_PTR)Ace + RtlLengthSid(Sid) + sizeof(ACE)) >= ((ULONG_PTR)Acl + Acl->AclSize)) { return STATUS_ALLOTTED_SPACE_EXCEEDED; } - if (((PVOID)Ace + RtlLengthSid(Sid) + sizeof(ACE)) >= ((PVOID)Acl + Acl->AclSize)) - { - return STATUS_ALLOTTED_SPACE_EXCEEDED; - } - Ace->Header.AceFlags = Flags; Ace->Header.AceType = SYSTEM_AUDIT_ACE_TYPE; Ace->Header.AceSize = RtlLengthSid(Sid) + sizeof(ACE); @@ -490,16 +471,15 @@ { if (AceSize < Offset) { - memcpy(Ace, - (PUCHAR)Ace + AceSize, - Offset - AceSize); + RtlCopyMemory(Ace, + (PVOID)((ULONG_PTR)Ace + AceSize), + Offset - AceSize); } if (Offset - AceSize < Offset) { - memset((PUCHAR)Ace + Offset - AceSize, - 0, - AceSize); + RtlZeroMemory((PVOID)((ULONG_PTR)Ace + Offset - AceSize), + AceSize); } } @@ -517,32 +497,24 @@ PAGED_CODE_RTL(); if (Acl->AclRevision < MIN_ACL_REVISION || - Acl->AclRevision > MAX_ACL_REVISION) + Acl->AclRevision > MAX_ACL_REVISION || + Acl->AceCount <= AceIndex || + !RtlFirstFreeAce(Acl, &Ace)) { return(STATUS_INVALID_PARAMETER); } - if (Acl->AceCount <= AceIndex) - { - return(STATUS_INVALID_PARAMETER); - } - - if (!RtlFirstFreeAce(Acl, &Ace)) - { - return(STATUS_INVALID_PARAMETER); - } - Current = (PACE)(Acl + 1); while(AceIndex--) { - Current = (PACE)((PVOID)Current + Current->Header.AceSize); + Current = (PACE)((ULONG_PTR)Current + Current->Header.AceSize); } RtlpDeleteData(Current, Current->Header.AceSize, - Ace - Current); - Acl->AceCount++; + (ULONG)((ULONG_PTR)Ace - (ULONG_PTR)Current)); + Acl->AceCount--; return(STATUS_SUCCESS); } @@ -558,22 +530,18 @@ { PAGED_CODE_RTL(); - if (AclSize < 8) + if (AclSize < sizeof(ACL)) { return(STATUS_BUFFER_TOO_SMALL); } if (AclRevision < MIN_ACL_REVISION || - AclRevision > MAX_ACL_REVISION) + AclRevision > MAX_ACL_REVISION || + AclSize > 0xffff) { return(STATUS_INVALID_PARAMETER); } - if (AclSize > 0xffff) - { - return(STATUS_INVALID_PARAMETER); - } - AclSize = ROUND_UP(AclSize, 4); Acl->AclSize = AclSize; Acl->AclRevision = AclRevision; @@ -635,7 +603,7 @@ Info->AceCount = Acl->AceCount; if (Ace != NULL) { - Info->AclBytesInUse = (PVOID)Ace - (PVOID)Acl; + Info->AclBytesInUse = (DWORD)((ULONG_PTR)Ace - (ULONG_PTR)Acl); Info->AclBytesFree = Acl->AclSize - Info->AclBytesInUse; } else

19 years, 5 months

[ion] 16356: rollback change

by ion＠svn.reactos.com

rollback change Modified: trunk/reactos/subsys/system/directory.xml _____ Modified: trunk/reactos/subsys/system/directory.xml --- trunk/reactos/subsys/system/directory.xml 2005-06-30 16:59:07 UTC (rev 16355) +++ trunk/reactos/subsys/system/directory.xml 2005-06-30 17:00:19 UTC (rev 16356) @@ -13,6 +13,12 @@ <directory name="expand"> <xi:include href="expand/expand.xml" /> </directory> +<directory name="explorer"> + <xi:include href="explorer/explorer.xml" /> +</directory> +<directory name="ibrowser"> + <xi:include href="ibrowser/ibrowser.xml" /> +</directory> <directory name="format"> <xi:include href="format/format.xml" /> </directory>

19 years, 5 months

[ion] 16355: rollback change

by ion＠svn.reactos.com

rollback change Modified: trunk/reactos/subsys/system/taskmgr/font.c _____ Modified: trunk/reactos/subsys/system/taskmgr/font.c --- trunk/reactos/subsys/system/taskmgr/font.c 2005-06-30 16:57:06 UTC (rev 16354) +++ trunk/reactos/subsys/system/taskmgr/font.c 2005-06-30 16:59:07 UTC (rev 16355) @@ -37,11 +37,11 @@ if ((lpszText[i] >= '0') && (lpszText[i] <= '9')) { BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, (lpszText[i] - '0') * 8, 0, SRCCOPY); } - else if (lpszText[i] == '%') + else if (lpszText[i] == 'K') { BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 80, 0, SRCCOPY); } - else if (lpszText[i] == 'K') + else if (lpszText[i] == '%') { BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 88, 0, SRCCOPY); }

19 years, 5 months

[ion] 16354: kill rosrtl from system modules

by ion＠svn.reactos.com

kill rosrtl from system modules Modified: trunk/reactos/subsys/system/directory.xml Modified: trunk/reactos/subsys/system/services/database.c Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.h Modified: trunk/reactos/subsys/system/taskmgr/font.c _____ Modified: trunk/reactos/subsys/system/directory.xml --- trunk/reactos/subsys/system/directory.xml 2005-06-30 16:52:26 UTC (rev 16353) +++ trunk/reactos/subsys/system/directory.xml 2005-06-30 16:57:06 UTC (rev 16354) @@ -13,12 +13,6 @@ <directory name="expand"> <xi:include href="expand/expand.xml" /> </directory> -<directory name="explorer"> - <xi:include href="explorer/explorer.xml" /> -</directory> -<directory name="ibrowser"> - <xi:include href="ibrowser/ibrowser.xml" /> -</directory> <directory name="format"> <xi:include href="format/format.xml" /> </directory> _____ Modified: trunk/reactos/subsys/system/services/database.c --- trunk/reactos/subsys/system/services/database.c 2005-06-30 16:52:26 UTC (rev 16353) +++ trunk/reactos/subsys/system/services/database.c 2005-06-30 16:57:06 UTC (rev 16354) @@ -28,8 +28,6 @@ #include "services.h" #include <services/services.h> -#include <rosrtl/string.h> - #define NDEBUG #include <debug.h> @@ -298,7 +296,8 @@ { RTL_QUERY_REGISTRY_TABLE QueryTable[2]; OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING ServicesKeyName; + UNICODE_STRING ServicesKeyName = + RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Se rvices"); UNICODE_STRING SubKeyName; HKEY ServicesKey; ULONG Index; @@ -329,9 +328,6 @@ if (!NT_SUCCESS(Status)) return Status; - RtlRosInitUnicodeStringFromLiteral(&ServicesKeyName, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services"); - InitializeObjectAttributes(&ObjectAttributes, &ServicesKeyName, OBJ_CASE_INSENSITIVE, @@ -417,12 +413,12 @@ if (Service->Type == SERVICE_KERNEL_DRIVER) { - RtlRosInitUnicodeStringFromLiteral(&DirName, + RtlInitUnicodeString(&DirName, L"\\Driver"); } else { - RtlRosInitUnicodeStringFromLiteral(&DirName, + RtlInitUnicodeString(&DirName, L"\\FileSystem"); } _____ Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.h --- trunk/reactos/subsys/system/sndvol32/sndvol32.h 2005-06-30 16:52:26 UTC (rev 16353) +++ trunk/reactos/subsys/system/sndvol32/sndvol32.h 2005-06-30 16:57:06 UTC (rev 16354) @@ -7,7 +7,6 @@ #include <stdio.h> #include <tchar.h> #include <string.h> -#include <rosrtl/resstr.h> #include "resources.h" typedef struct _MIXER_WINDOW _____ Modified: trunk/reactos/subsys/system/taskmgr/font.c --- trunk/reactos/subsys/system/taskmgr/font.c 2005-06-30 16:52:26 UTC (rev 16353) +++ trunk/reactos/subsys/system/taskmgr/font.c 2005-06-30 16:57:06 UTC (rev 16354) @@ -37,11 +37,11 @@ if ((lpszText[i] >= '0') && (lpszText[i] <= '9')) { BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, (lpszText[i] - '0') * 8, 0, SRCCOPY); } - else if (lpszText[i] == 'K') + else if (lpszText[i] == '%') { BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 80, 0, SRCCOPY); } - else if (lpszText[i] == '%') + else if (lpszText[i] == 'K') { BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 88, 0, SRCCOPY); }

19 years, 5 months

[ion] 16353: remove roscfg.h

by ion＠svn.reactos.com

remove roscfg.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-06-30 16:48:14 UTC (rev 16352) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-06-30 16:52:26 UTC (rev 16353) @@ -13,7 +13,6 @@ /* include the ntoskrnl config.h file */ #include "config.h" -#include <roscfg.h> /* DDK/IFS/NDK Headers */ #include <ddk/ntddk.h>

19 years, 5 months

[ion] 16352: Add windows.h back, is it futile to remove it

by ion＠svn.reactos.com

Add windows.h back, is it futile to remove it Modified: trunk/reactos/subsys/win32k/w32k.h _____ Modified: trunk/reactos/subsys/win32k/w32k.h --- trunk/reactos/subsys/win32k/w32k.h 2005-06-30 16:39:17 UTC (rev 16351) +++ trunk/reactos/subsys/win32k/w32k.h 2005-06-30 16:48:14 UTC (rev 16352) @@ -11,14 +11,12 @@ /* We are Win32K */ #define __WIN32K__ -/* ReactOS Config */ -#include <roscfg.h> - /* DDK/NDK/SDK Headers */ #include <ddk/ntddk.h> #include <ddk/ntifs.h> #include <ddk/winddi.h> #include <ddk/ntddmou.h> +#include <windows.h> #include <ndk/ntndk.h> /* FIXME: ReactOS will be R-Rated if I really write what I'm about to */ @@ -44,4 +42,3 @@ /* Internal Win32K Header */ #include "include/win32k.h" -

19 years, 5 months

[ion] 16351: Remove windows.h from external win32k headers

by ion＠svn.reactos.com

Remove windows.h from external win32k headers Modified: trunk/reactos/include/win32k/font.h Modified: trunk/reactos/include/win32k/ntddraw.h _____ Modified: trunk/reactos/include/win32k/font.h --- trunk/reactos/include/win32k/font.h 2005-06-30 16:31:15 UTC (rev 16350) +++ trunk/reactos/include/win32k/font.h 2005-06-30 16:39:17 UTC (rev 16351) @@ -11,8 +11,6 @@ #ifndef WIN32K_FONT_H_INCLUDED #define WIN32K_FONT_H_INCLUDED -#include <windows.h> - typedef struct tagFONTFAMILYINFO { ENUMLOGFONTEXW EnumLogFontEx; _____ Modified: trunk/reactos/include/win32k/ntddraw.h --- trunk/reactos/include/win32k/ntddraw.h 2005-06-30 16:31:15 UTC (rev 16350) +++ trunk/reactos/include/win32k/ntddraw.h 2005-06-30 16:39:17 UTC (rev 16351) @@ -2,10 +2,6 @@ #ifndef __WIN32K_NTDDRAW_H #define __WIN32K_NTDDRAW_H -#include <windows.h> -#include <ddk/ddrawint.h> -#include <ddk/d3dnthal.h> - #ifdef __cplusplus extern "C" { #endif

19 years, 5 months

[ion] 16350: Math.c wasn't using the pch header, thanks for the catch, Steven

by ion＠svn.reactos.com

Math.c wasn't using the pch header, thanks for the catch, Steven Modified: trunk/reactos/subsys/win32k/misc/math.c _____ Modified: trunk/reactos/subsys/win32k/misc/math.c --- trunk/reactos/subsys/win32k/misc/math.c 2005-06-30 16:20:40 UTC (rev 16349) +++ trunk/reactos/subsys/win32k/misc/math.c 2005-06-30 16:31:15 UTC (rev 16350) @@ -18,8 +18,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <windows.h> -#include <stdlib.h> +#include <w32k.h> double atan (double __x); double atan2 (double __y, double __x);

19 years, 5 months

[ion] 16349: remove windows.h dependency. Filip said it couldn't be done, so please watch out for flying pigs and hell freezing over

by ion＠svn.reactos.com

remove windows.h dependency. Filip said it couldn't be done, so please watch out for flying pigs and hell freezing over Modified: trunk/reactos/subsys/win32k/w32k.h _____ Modified: trunk/reactos/subsys/win32k/w32k.h --- trunk/reactos/subsys/win32k/w32k.h 2005-06-30 16:17:45 UTC (rev 16348) +++ trunk/reactos/subsys/win32k/w32k.h 2005-06-30 16:20:40 UTC (rev 16349) @@ -19,8 +19,6 @@ #include <ddk/ntifs.h> #include <ddk/winddi.h> #include <ddk/ntddmou.h> -#include <windows.h> /* FIXME ? */ -//#include <windowsx.h> /* FIXME ? */ #include <ndk/ntndk.h> /* FIXME: ReactOS will be R-Rated if I really write what I'm about to */

19 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2005