Added mapping of access rights

Improved 'open' function

svn path=/trunk/; revision=1578

reactos/include/ntos/synch.h

@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:    See COPYING in the top level directory
  * PROJECT:      ReactOS kernel
- * FILE:         include/synch.h
+ * FILE:         include/ntos/synch.h
  * PURPOSE:      Synchronization declarations used by all the parts of the 
  *               system
  * PROGRAMMER:   David Welch <welch@cwcom.net>
@@ -18,7 +18,9 @@
 #define EVENT_MODIFY_STATE	(2)
 #define EVENT_PAIR_ALL_ACCESS	(0x1f0000L)
 #define MUTEX_ALL_ACCESS	(0x1f0001L)
-#define MUTEX_MODIFY_STATE	(1)
+#define MUTEX_QUERY_STATE	(1)
+#define MUTANT_ALL_ACCESS	(0x1f0001L)
+#define MUTANT_QUERY_STATE	(1)
 #define SEMAPHORE_ALL_ACCESS	(0x1f0003L)
 #define SEMAPHORE_QUERY_STATE	(1)
 #define SEMAPHORE_MODIFY_STATE	(2)
@@ -27,4 +29,4 @@
 #define TIMER_MODIFY_STATE	(2)
 
 
-#endif /* __INCLUDE_PS_H */
+#endif /* __INCLUDE_SYNCH_H */

reactos/ntoskrnl/mm/section.c

@@ -1,4 +1,4 @@
-/* $Id: section.c,v 1.42 2001/01/13 18:38:09 dwelch Exp $
+/* $Id: section.c,v 1.43 2001/01/28 15:17:52 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -25,6 +25,12 @@
 
 POBJECT_TYPE EXPORTED MmSectionObjectType = NULL;
 
+static GENERIC_MAPPING MmpSectionMapping = {
+	STANDARD_RIGHTS_READ | SECTION_MAP_READ | SECTION_QUERY,
+	STANDARD_RIGHTS_WRITE | SECTION_MAP_WRITE,
+	STANDARD_RIGHTS_EXECUTE | SECTION_MAP_EXECUTE,
+	SECTION_ALL_ACCESS};
+
 /* FUNCTIONS *****************************************************************/
 
 NTSTATUS 
@@ -644,6 +650,7 @@ MmInitSectionImplementation(VOID)
    MmSectionObjectType->MaxHandles = ULONG_MAX;
    MmSectionObjectType->PagedPoolCharge = 0;
    MmSectionObjectType->NonpagedPoolCharge = sizeof(SECTION_OBJECT);
+   MmSectionObjectType->Mapping = &MmpSectionMapping;
    MmSectionObjectType->Dump = NULL;
    MmSectionObjectType->Open = NULL;
    MmSectionObjectType->Close = MmpCloseSection;
@@ -773,30 +780,18 @@ NtOpenSection(PHANDLE			SectionHandle,
 	      ACCESS_MASK		DesiredAccess,
 	      POBJECT_ATTRIBUTES	ObjectAttributes)
 {
-   PVOID Object;
    NTSTATUS Status;
    
    *SectionHandle = 0;
 
-   Status = ObReferenceObjectByName(ObjectAttributes->ObjectName,
+   Status = ObOpenObjectByName(ObjectAttributes,
-				    ObjectAttributes->Attributes,
-				    NULL,
-				    DesiredAccess,
 			       MmSectionObjectType,
-				    UserMode,
 			       NULL,
-				    &Object);
+			       UserMode,
-   if (!NT_SUCCESS(Status))
-     {
-	return Status;
-     }
-   
-   Status = ObCreateHandle(PsGetCurrentProcess(),
-			   Object,
 			       DesiredAccess,
-			   FALSE,
+			       NULL,
 			       SectionHandle);
-   ObDereferenceObject(Object);
+
    return(Status);
 }
 

reactos/ntoskrnl/nt/evtpair.c

@@ -1,4 +1,4 @@
-/* $Id: evtpair.c,v 1.5 2000/10/22 11:30:00 ekohl Exp $
+/* $Id: evtpair.c,v 1.6 2001/01/28 15:14:19 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -24,6 +24,11 @@
 
 POBJECT_TYPE EXPORTED ExEventPairObjectType = NULL;
 
+static GENERIC_MAPPING ExEventPairMapping = {
+	STANDARD_RIGHTS_READ,
+	STANDARD_RIGHTS_WRITE,
+	STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE,
+	EVENT_PAIR_ALL_ACCESS};
 
 /* FUNCTIONS *****************************************************************/
 
@@ -59,6 +64,7 @@ VOID NtInitializeEventPairImplementation(VOID)
    ExEventPairObjectType->TotalHandles = 0;
    ExEventPairObjectType->PagedPoolCharge = 0;
    ExEventPairObjectType->NonpagedPoolCharge = sizeof(KEVENT_PAIR);
+   ExEventPairObjectType->Mapping = &ExEventPairMapping;
    ExEventPairObjectType->Dump = NULL;
    ExEventPairObjectType->Open = NULL;
    ExEventPairObjectType->Close = NULL;
@@ -99,31 +105,19 @@ NtOpenEventPair(OUT PHANDLE EventPairHandle,
 		IN ACCESS_MASK DesiredAccess,
 		IN POBJECT_ATTRIBUTES ObjectAttributes)
 {
-   PKEVENT_PAIR EventPair;
    NTSTATUS Status;
 
    DPRINT("NtOpenEventPair()\n");
-   Status = ObReferenceObjectByName(ObjectAttributes->ObjectName,
+
-				    ObjectAttributes->Attributes,
+   Status = ObOpenObjectByName(ObjectAttributes,
-				    NULL,
-				    DesiredAccess,
 			       ExEventPairObjectType,
-				    UserMode,
 			       NULL,
-				    (PVOID*)&EventPair);
+			       UserMode,
-   if (!NT_SUCCESS(Status))
-     {
-	return(Status);
-     }
-
-   Status = ObCreateHandle(PsGetCurrentProcess(),
-			   EventPair,
 			       DesiredAccess,
-			   FALSE,
+			       NULL,
 			       EventPairHandle);
-   ObDereferenceObject(EventPair);
 
-   return(STATUS_SUCCESS);
+   return Status;
 }
 
 

reactos/ntoskrnl/nt/ntevent.c

@@ -13,8 +13,8 @@
 #include <limits.h>
 #include <ddk/ntddk.h>
 #include <internal/ob.h>
-#include <ntos/synch.h>
 #include <internal/id.h>
+#include <ntos/synch.h>
 
 #define NDEBUG
 #include <internal/debug.h>
@@ -23,14 +23,21 @@
 
 POBJECT_TYPE EXPORTED ExEventObjectType = NULL;
 
+static GENERIC_MAPPING ExpEventMapping = {
+	STANDARD_RIGHTS_READ | SYNCHRONIZE | EVENT_QUERY_STATE,
+	STANDARD_RIGHTS_WRITE | SYNCHRONIZE | EVENT_MODIFY_STATE,
+	STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | EVENT_QUERY_STATE,
+	EVENT_ALL_ACCESS};
+
+
 /* FUNCTIONS *****************************************************************/
 
-NTSTATUS NtpCreateEvent(PVOID ObjectBody,
+NTSTATUS
+NtpCreateEvent(PVOID ObjectBody,
 	       PVOID Parent,
 	       PWSTR RemainingPath,
 	       POBJECT_ATTRIBUTES ObjectAttributes)
 {
-   
    DPRINT("NtpCreateEvent(ObjectBody %x, Parent %x, RemainingPath %S)\n",
 	  ObjectBody, Parent, RemainingPath);
    
@@ -46,7 +53,9 @@ NTSTATUS NtpCreateEvent(PVOID ObjectBody,
    return(STATUS_SUCCESS);
 }
 
-VOID NtInitializeEventImplementation(VOID)
+
+VOID
+NtInitializeEventImplementation(VOID)
 {
    ExEventObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE));
    
@@ -58,6 +67,7 @@ VOID NtInitializeEventImplementation(VOID)
    ExEventObjectType->TotalHandles = 0;
    ExEventObjectType->PagedPoolCharge = 0;
    ExEventObjectType->NonpagedPoolCharge = sizeof(KEVENT);
+   ExEventObjectType->Mapping = &ExpEventMapping;
    ExEventObjectType->Dump = NULL;
    ExEventObjectType->Open = NULL;
    ExEventObjectType->Close = NULL;
@@ -69,7 +79,9 @@ VOID NtInitializeEventImplementation(VOID)
    ExEventObjectType->Create = NtpCreateEvent;
 }
 
-NTSTATUS STDCALL NtClearEvent (IN HANDLE EventHandle)
+
+NTSTATUS STDCALL
+NtClearEvent(IN HANDLE EventHandle)
 {
    PKEVENT Event;
    NTSTATUS Status;
@@ -90,7 +102,8 @@ NTSTATUS STDCALL NtClearEvent (IN HANDLE EventHandle)
 }
 
 
-NTSTATUS STDCALL NtCreateEvent (OUT PHANDLE		EventHandle,
+NTSTATUS STDCALL
+NtCreateEvent(OUT PHANDLE EventHandle,
 	      IN ACCESS_MASK DesiredAccess,
 	      IN POBJECT_ATTRIBUTES ObjectAttributes,
 	      IN BOOLEAN ManualReset,
@@ -132,7 +145,8 @@ NtOpenEvent(OUT PHANDLE EventHandle,
 }
 
 
-NTSTATUS STDCALL NtPulseEvent(IN	HANDLE	EventHandle,
+NTSTATUS STDCALL
+NtPulseEvent(IN HANDLE EventHandle,
 	     IN PULONG PulseCount OPTIONAL)
 {
    PKEVENT Event;
@@ -157,7 +171,8 @@ NTSTATUS STDCALL NtPulseEvent(IN	HANDLE	EventHandle,
 }
 
 
-NTSTATUS STDCALL NtQueryEvent (IN	HANDLE	EventHandle,
+NTSTATUS STDCALL
+NtQueryEvent(IN HANDLE EventHandle,
 	     IN EVENT_INFORMATION_CLASS EventInformationClass,
 	     OUT PVOID EventInformation,
 	     IN ULONG EventInformationLength,
@@ -198,8 +213,9 @@ NTSTATUS STDCALL NtQueryEvent (IN	HANDLE	EventHandle,
 }
 
 
-NTSTATUS STDCALL NtResetEvent(HANDLE	EventHandle,
+NTSTATUS STDCALL
-			      PULONG	NumberOfWaitingThreads	OPTIONAL)
+NtResetEvent(IN HANDLE EventHandle,
+	     OUT PULONG NumberOfWaitingThreads OPTIONAL)
 {
    PKEVENT Event;
    NTSTATUS Status;
@@ -222,7 +238,8 @@ NTSTATUS STDCALL NtResetEvent(HANDLE	EventHandle,
 }
 
 
-NTSTATUS STDCALL NtSetEvent(IN	HANDLE	EventHandle,
+NTSTATUS STDCALL
+NtSetEvent(IN HANDLE EventHandle,
 	   OUT PULONG NumberOfThreadsReleased)
 {
    PKEVENT Event;
@@ -244,3 +261,5 @@ NTSTATUS STDCALL NtSetEvent(IN	HANDLE	EventHandle,
    ObDereferenceObject(Event);
    return(STATUS_SUCCESS);
 }
+
+/* EOF */

reactos/ntoskrnl/nt/ntsem.c

@@ -1,4 +1,5 @@
-/*
+/* $Id: ntsem.c,v 1.9 2001/01/28 15:15:07 ekohl Exp $
+ *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/nt/ntsem.c
@@ -22,6 +23,12 @@
 
 POBJECT_TYPE ExSemaphoreType;
 
+static GENERIC_MAPPING ExSemaphoreMapping = {
+	STANDARD_RIGHTS_READ | SEMAPHORE_QUERY_STATE,
+	STANDARD_RIGHTS_WRITE | SEMAPHORE_MODIFY_STATE,
+	STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | SEMAPHORE_QUERY_STATE,
+	SEMAPHORE_ALL_ACCESS};
+
 /* FUNCTIONS *****************************************************************/
 
 NTSTATUS NtpCreateSemaphore(PVOID ObjectBody,
@@ -57,6 +64,7 @@ VOID NtInitializeSemaphoreImplementation(VOID)
    ExSemaphoreType->TotalHandles = 0;
    ExSemaphoreType->PagedPoolCharge = 0;
    ExSemaphoreType->NonpagedPoolCharge = sizeof(KSEMAPHORE);
+   ExSemaphoreType->Mapping = &ExSemaphoreMapping;
    ExSemaphoreType->Dump = NULL;
    ExSemaphoreType->Open = NULL;
    ExSemaphoreType->Close = NULL;
@@ -68,7 +76,8 @@ VOID NtInitializeSemaphoreImplementation(VOID)
    ExSemaphoreType->Create = NtpCreateSemaphore;
 }
 
-NTSTATUS STDCALL NtCreateSemaphore(OUT PHANDLE SemaphoreHandle,
+NTSTATUS STDCALL
+NtCreateSemaphore(OUT PHANDLE SemaphoreHandle,
 		  IN ACCESS_MASK DesiredAccess,
 		  IN POBJECT_ATTRIBUTES ObjectAttributes,
 		  IN LONG InitialCount,
@@ -89,38 +98,27 @@ NTSTATUS STDCALL NtCreateSemaphore(OUT PHANDLE SemaphoreHandle,
 }
 
 
-NTSTATUS STDCALL NtOpenSemaphore(IN HANDLE SemaphoreHandle,
+NTSTATUS STDCALL
+NtOpenSemaphore(IN HANDLE SemaphoreHandle,
 		IN ACCESS_MASK	DesiredAccess,
 		IN POBJECT_ATTRIBUTES ObjectAttributes)
 {
    NTSTATUS Status;
-   PKSEMAPHORE Semaphore;
    
-   Status = ObReferenceObjectByName(ObjectAttributes->ObjectName,
+   Status = ObOpenObjectByName(ObjectAttributes,
-				    ObjectAttributes->Attributes,
-				    NULL,
-				    DesiredAccess,
 			       ExSemaphoreType,
-				    UserMode,
 			       NULL,
-				    (PVOID*)&Semaphore);
+			       UserMode,
-   if (Status != STATUS_SUCCESS)
-     {
-	return(Status);
-     }
-   
-   Status = ObCreateHandle(PsGetCurrentProcess(),
-			   Semaphore,
 			       DesiredAccess,
-			   FALSE,
+			       NULL,
 			       SemaphoreHandle);
-   ObDereferenceObject(Semaphore);
    
-   return(STATUS_SUCCESS);
+   return Status;
 }
 
 
-NTSTATUS STDCALL NtQuerySemaphore(IN	HANDLE	SemaphoreHandle,
+NTSTATUS STDCALL
+NtQuerySemaphore(IN HANDLE SemaphoreHandle,
 		 IN SEMAPHORE_INFORMATION_CLASS SemaphoreInformationClass,
 		 OUT PVOID SemaphoreInformation,
 		 IN ULONG SemaphoreInformationLength,
@@ -157,7 +155,8 @@ NTSTATUS STDCALL NtQuerySemaphore(IN	HANDLE	SemaphoreHandle,
    return STATUS_SUCCESS;
 }
 
-NTSTATUS STDCALL NtReleaseSemaphore(IN	HANDLE	SemaphoreHandle,
+NTSTATUS STDCALL
+NtReleaseSemaphore(IN HANDLE SemaphoreHandle,
 		   IN LONG ReleaseCount,
 		   OUT PLONG PreviousCount)
 {
@@ -181,3 +180,5 @@ NTSTATUS STDCALL NtReleaseSemaphore(IN	HANDLE	SemaphoreHandle,
    ObDereferenceObject(Semaphore);
    return(STATUS_SUCCESS);
 }
+
+/* EOF */

reactos/ntoskrnl/nt/nttimer.c

@@ -14,6 +14,18 @@
 
 #include <internal/debug.h>
 
+
+/* GLOBALS ******************************************************************/
+
+#if 0
+static GENERIC_MAPPING ExpTimerMapping = {
+	STANDARD_RIGHTS_READ | TIMER_QUERY_STATE,
+	STANDARD_RIGHTS_WRITE | TIMER_MODIFY_STATE,
+	STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE,
+	TIMER_ALL_ACCESS};
+#endif
+
+
 /* FUNCTIONS *****************************************************************/
 
 NTSTATUS