From 37d076fdc05ed11a2d347c5ee40e49af48e37105 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Wed, 20 Apr 2005 20:58:16 +0000 Subject: [PATCH] Move RtlAreAllAccessesGranted, RtlAreAnyAccessesGranted and RtlMapGenericMask to the shared runtime library. svn path=/trunk/; revision=14723 --- reactos/lib/ntdll/makefile | 1 - reactos/lib/ntdll/rtl/access.c | 70 ---------------------------------- reactos/lib/rtl/access.c | 68 +++++++++++++++++++++++++++++++++ reactos/lib/rtl/makefile | 1 + reactos/ntoskrnl/se/access.c | 68 ++------------------------------- 5 files changed, 73 insertions(+), 135 deletions(-) delete mode 100644 reactos/lib/ntdll/rtl/access.c create mode 100644 reactos/lib/rtl/access.c diff --git a/reactos/lib/ntdll/makefile b/reactos/lib/ntdll/makefile index 559c5224afd..94b723efc2d 100644 --- a/reactos/lib/ntdll/makefile +++ b/reactos/lib/ntdll/makefile @@ -63,7 +63,6 @@ RTL_I386_OBJECTS = \ rtl/i386/ftol.o RTL_OBJECTS = \ - rtl/access.o \ rtl/apc.o \ rtl/atom.o \ rtl/callback.o \ diff --git a/reactos/lib/ntdll/rtl/access.c b/reactos/lib/ntdll/rtl/access.c deleted file mode 100644 index 684ae52e2ee..00000000000 --- a/reactos/lib/ntdll/rtl/access.c +++ /dev/null @@ -1,70 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Access rights handling functions - * FILE: lib/ntdll/rtl/access.c - * PROGRAMER: Eric Kohl - * REVISION HISTORY: - * 06/04/2000: Created - */ - -/* INCLUDES *****************************************************************/ - -#include - -#include - -/* FUNCTIONS ***************************************************************/ - -BOOLEAN -STDCALL -RtlAreAllAccessesGranted ( - ACCESS_MASK GrantedAccess, - ACCESS_MASK DesiredAccess - ) -{ - return ((GrantedAccess & DesiredAccess) == DesiredAccess); -} - - -/* - * @implemented - */ -BOOLEAN -STDCALL -RtlAreAnyAccessesGranted ( - ACCESS_MASK GrantedAccess, - ACCESS_MASK DesiredAccess - ) -{ - return ((GrantedAccess & DesiredAccess) != 0); -} - - -/* - * @implemented - */ -VOID -STDCALL -RtlMapGenericMask ( - PACCESS_MASK AccessMask, - PGENERIC_MAPPING GenericMapping - ) -{ - if (*AccessMask & GENERIC_READ) - *AccessMask |= GenericMapping->GenericRead; - - if (*AccessMask & GENERIC_WRITE) - *AccessMask |= GenericMapping->GenericWrite; - - if (*AccessMask & GENERIC_EXECUTE) - *AccessMask |= GenericMapping->GenericExecute; - - if (*AccessMask & GENERIC_ALL) - *AccessMask |= GenericMapping->GenericAll; - - *AccessMask &= 0x0FFFFFFF; -} - -/* EOF */ diff --git a/reactos/lib/rtl/access.c b/reactos/lib/rtl/access.c new file mode 100644 index 00000000000..f12870468bf --- /dev/null +++ b/reactos/lib/rtl/access.c @@ -0,0 +1,68 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: lib/rtl/access.c + * PURPOSE: Access rights handling functions + * + * PROGRAMMERS: Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include +#include + +#define NDEBUG +#include + +/* FUNCTIONS ***************************************************************/ + +/* + * @implemented + */ +BOOLEAN STDCALL +RtlAreAllAccessesGranted(ACCESS_MASK GrantedAccess, + ACCESS_MASK DesiredAccess) +{ + PAGED_CODE_RTL(); + return ((GrantedAccess & DesiredAccess) == DesiredAccess); +} + + +/* + * @implemented + */ +BOOLEAN STDCALL +RtlAreAnyAccessesGranted(ACCESS_MASK GrantedAccess, + ACCESS_MASK DesiredAccess) +{ + PAGED_CODE_RTL(); + return ((GrantedAccess & DesiredAccess) != 0); +} + + +/* + * @implemented + */ +VOID STDCALL +RtlMapGenericMask(PACCESS_MASK AccessMask, + PGENERIC_MAPPING GenericMapping) +{ + PAGED_CODE_RTL(); + + if (*AccessMask & GENERIC_READ) + *AccessMask |= GenericMapping->GenericRead; + + if (*AccessMask & GENERIC_WRITE) + *AccessMask |= GenericMapping->GenericWrite; + + if (*AccessMask & GENERIC_EXECUTE) + *AccessMask |= GenericMapping->GenericExecute; + + if (*AccessMask & GENERIC_ALL) + *AccessMask |= GenericMapping->GenericAll; + + *AccessMask &= ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + +/* EOF */ diff --git a/reactos/lib/rtl/makefile b/reactos/lib/rtl/makefile index 6987763c93e..d689b8000d2 100644 --- a/reactos/lib/rtl/makefile +++ b/reactos/lib/rtl/makefile @@ -17,6 +17,7 @@ TARGET_CFLAGS += -DDBG endif TARGET_OBJECTS = \ + access.o \ acl.o \ ppb.o \ bit.o \ diff --git a/reactos/ntoskrnl/se/access.c b/reactos/ntoskrnl/se/access.c index 62687dec6f3..0e1f2008f9a 100644 --- a/reactos/ntoskrnl/se/access.c +++ b/reactos/ntoskrnl/se/access.c @@ -1,11 +1,10 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/se/access.c - * PURPOSE: Access rights handling functions - * - * PROGRAMMERS: Eric Kohl + * PURPOSE: Access state functions + * + * PROGRAMMERS: Eric Kohl */ /* INCLUDES *****************************************************************/ @@ -16,65 +15,6 @@ /* FUNCTIONS ***************************************************************/ -/* - * @implemented - */ -BOOLEAN -STDCALL -RtlAreAllAccessesGranted ( - ACCESS_MASK GrantedAccess, - ACCESS_MASK DesiredAccess - ) -{ - PAGED_CODE_RTL(); - - return ((GrantedAccess & DesiredAccess) == DesiredAccess); -} - - -/* - * @implemented - */ -BOOLEAN -STDCALL -RtlAreAnyAccessesGranted ( - ACCESS_MASK GrantedAccess, - ACCESS_MASK DesiredAccess - ) -{ - PAGED_CODE_RTL(); - - return ((GrantedAccess & DesiredAccess) != 0); -} - - -/* - * @implemented - */ -VOID -STDCALL -RtlMapGenericMask ( - PACCESS_MASK AccessMask, - PGENERIC_MAPPING GenericMapping - ) -{ - PAGED_CODE_RTL(); - - if (*AccessMask & GENERIC_READ) - *AccessMask |= GenericMapping->GenericRead; - - if (*AccessMask & GENERIC_WRITE) - *AccessMask |= GenericMapping->GenericWrite; - - if (*AccessMask & GENERIC_EXECUTE) - *AccessMask |= GenericMapping->GenericExecute; - - if (*AccessMask & GENERIC_ALL) - *AccessMask |= GenericMapping->GenericAll; - - *AccessMask &= ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); -} - /* * @unimplemented */