Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 09:50:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Started implementing type objects.

Browse source 
Some object manager cleanup.

svn path=/trunk/; revision=2659
This commit is contained in:
Eric Kohl 2002-03-01 00:47:40 +00:00
parent 3accb67df3
commit 82b7a361af
4 changed files with 279 additions and 152 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
reactos/ntoskrnl/include/internal/ob.h
View file

@ -22,7 +22,7 @@ typedef struct
typedef PVOID POBJECT; typedef PVOID POBJECT;
typedef struct _DIRECTORY_OBJECT typedef struct _DIRECTORY_OBJECT
{ {
CSHORT Type; CSHORT Type;
CSHORT Size; CSHORT Size;
@ -34,6 +34,16 @@ typedef struct _DIRECTORY_OBJECT
} DIRECTORY_OBJECT, *PDIRECTORY_OBJECT; } DIRECTORY_OBJECT, *PDIRECTORY_OBJECT;
typedef struct _TYPE_OBJECT
{
CSHORT Type;
CSHORT Size;
/* pointer to object type data */
POBJECT_TYPE ObjectType;
} TYPE_OBJECT, *PTYPE_OBJECT;
/* /*
* Enumeration of object types * Enumeration of object types
*/ */
@ -66,7 +76,6 @@ VOID ObpAddEntryDirectory(PDIRECTORY_OBJECT Parent,
PWSTR Name); PWSTR Name);
VOID ObpRemoveEntryDirectory(POBJECT_HEADER Header); VOID ObpRemoveEntryDirectory(POBJECT_HEADER Header);
NTSTATUS ObPerformRetentionChecks(POBJECT_HEADER Header);
NTSTATUS ObCreateHandle(struct _EPROCESS* Process, NTSTATUS ObCreateHandle(struct _EPROCESS* Process,
@ -81,11 +90,12 @@ NTSTATUS ObFindObject(POBJECT_ATTRIBUTES ObjectAttributes,
PVOID* ReturnedObject, PVOID* ReturnedObject,
PUNICODE_STRING RemainingPath, PUNICODE_STRING RemainingPath,
POBJECT_TYPE ObjectType); POBJECT_TYPE ObjectType);
ULONG ObGetReferenceCount(PVOID Object);
ULONG ObGetHandleCount(PVOID Object);
VOID ObCloseAllHandles(struct _EPROCESS* Process); VOID ObCloseAllHandles(struct _EPROCESS* Process);
VOID ObDeleteHandleTable(struct _EPROCESS* Process); VOID ObDeleteHandleTable(struct _EPROCESS* Process);
PVOID ObDeleteHandle(struct _EPROCESS* Process, PVOID ObDeleteHandle(struct _EPROCESS* Process,
HANDLE Handle); HANDLE Handle);
NTSTATUS
ObpCreateTypeObject(POBJECT_TYPE ObjectType);
#endif /* __INCLUDE_INTERNAL_OBJMGR_H */ #endif /* __INCLUDE_INTERNAL_OBJMGR_H */

7
reactos/ntoskrnl/lpc/close.c
View file

@ -1,4 +1,4 @@
/* $Id: close.c,v 1.7 2001/12/02 23:34:42 dwelch Exp $ /* $Id: close.c,v 1.8 2002/03/01 00:47:21 ekohl Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -12,7 +12,6 @@
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <internal/ob.h>
#include <internal/port.h> #include <internal/port.h>
#include <internal/dbg.h> #include <internal/dbg.h>
@ -44,7 +43,7 @@ NiClosePort (PVOID ObjectBody, ULONG HandleCount)
* happened and disconnect this port. * happened and disconnect this port.
*/ */
if (HandleCount == 0 && Port->State == EPORT_CONNECTED_CLIENT && if (HandleCount == 0 && Port->State == EPORT_CONNECTED_CLIENT &&
ObGetReferenceCount(Port) == 2) ObGetObjectPointerCount(Port) == 2)
{ {
Message.MessageSize = sizeof(LPC_MESSAGE); Message.MessageSize = sizeof(LPC_MESSAGE);
Message.DataSize = 0; Message.DataSize = 0;
@ -66,7 +65,7 @@ NiClosePort (PVOID ObjectBody, ULONG HandleCount)
* don't actually notify the client until it attempts an operation. * don't actually notify the client until it attempts an operation.
*/ */
if (HandleCount == 0 && Port->State == EPORT_CONNECTED_SERVER && if (HandleCount == 0 && Port->State == EPORT_CONNECTED_SERVER &&
ObGetReferenceCount(Port) == 2) ObGetObjectPointerCount(Port) == 2)
{ {
Port->OtherPort->OtherPort = NULL; Port->OtherPort->OtherPort = NULL;
Port->OtherPort->State = EPORT_DISCONNECTED; Port->OtherPort->State = EPORT_DISCONNECTED;

184
reactos/ntoskrnl/ob/namespc.c
View file

@ -1,4 +1,4 @@
/* $Id: namespc.c,v 1.28 2002/02/19 00:09:24 ekohl Exp $ /* $Id: namespc.c,v 1.29 2002/03/01 00:47:40 ekohl Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -23,6 +23,7 @@
/* GLOBALS ****************************************************************/ /* GLOBALS ****************************************************************/
POBJECT_TYPE ObDirectoryType = NULL; POBJECT_TYPE ObDirectoryType = NULL;
POBJECT_TYPE ObTypeObjectType = NULL;
PDIRECTORY_OBJECT NameSpaceRoot = NULL; PDIRECTORY_OBJECT NameSpaceRoot = NULL;
@ -32,6 +33,12 @@ static GENERIC_MAPPING ObpDirectoryMapping = {
STANDARD_RIGHTS_EXECUTE|DIRECTORY_QUERY|DIRECTORY_TRAVERSE, STANDARD_RIGHTS_EXECUTE|DIRECTORY_QUERY|DIRECTORY_TRAVERSE,
DIRECTORY_ALL_ACCESS}; DIRECTORY_ALL_ACCESS};
static GENERIC_MAPPING ObpTypeMapping = {
STANDARD_RIGHTS_READ,
STANDARD_RIGHTS_WRITE,
STANDARD_RIGHTS_EXECUTE,
0x000F0001};
/* FUNCTIONS **************************************************************/ /* FUNCTIONS **************************************************************/
NTSTATUS STDCALL NTSTATUS STDCALL
@ -106,13 +113,13 @@ DPRINT("Object %p\n", Object);
* Status. * Status.
*/ */
NTSTATUS STDCALL NTSTATUS STDCALL
ObOpenObjectByName(POBJECT_ATTRIBUTES ObjectAttributes, ObOpenObjectByName(IN POBJECT_ATTRIBUTES ObjectAttributes,
POBJECT_TYPE ObjectType, IN POBJECT_TYPE ObjectType,
PVOID ParseContext, IN OUT PVOID ParseContext,
KPROCESSOR_MODE AccessMode, IN KPROCESSOR_MODE AccessMode,
ACCESS_MASK DesiredAccess, IN ACCESS_MASK DesiredAccess,
PACCESS_STATE PassedAccessState, IN PACCESS_STATE PassedAccessState,
PHANDLE Handle) OUT PHANDLE Handle)
{ {
UNICODE_STRING RemainingPath; UNICODE_STRING RemainingPath;
PVOID Object = NULL; PVOID Object = NULL;
@ -316,40 +323,141 @@ ObpCreateDirectory(PVOID ObjectBody,
return(STATUS_SUCCESS); return(STATUS_SUCCESS);
} }
VOID ObInit(VOID)
VOID
ObInit(VOID)
/* /*
* FUNCTION: Initialize the object manager namespace * FUNCTION: Initialize the object manager namespace
*/ */
{ {
ObDirectoryType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); OBJECT_ATTRIBUTES ObjectAttributes;
UNICODE_STRING Name;
ObDirectoryType->Tag = TAG('D', 'I', 'R', 'T');
ObDirectoryType->TotalObjects = 0; /* create 'directory' object type */
ObDirectoryType->TotalHandles = 0; ObDirectoryType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE));
ObDirectoryType->MaxObjects = ULONG_MAX;
ObDirectoryType->MaxHandles = ULONG_MAX; ObDirectoryType->Tag = TAG('D', 'I', 'R', 'T');
ObDirectoryType->PagedPoolCharge = 0; ObDirectoryType->TotalObjects = 0;
ObDirectoryType->NonpagedPoolCharge = sizeof(DIRECTORY_OBJECT); ObDirectoryType->TotalHandles = 0;
ObDirectoryType->Mapping = &ObpDirectoryMapping; ObDirectoryType->MaxObjects = ULONG_MAX;
ObDirectoryType->Dump = NULL; ObDirectoryType->MaxHandles = ULONG_MAX;
ObDirectoryType->Open = NULL; ObDirectoryType->PagedPoolCharge = 0;
ObDirectoryType->Close = NULL; ObDirectoryType->NonpagedPoolCharge = sizeof(DIRECTORY_OBJECT);
ObDirectoryType->Delete = NULL; ObDirectoryType->Mapping = &ObpDirectoryMapping;
ObDirectoryType->Parse = ObpParseDirectory; ObDirectoryType->Dump = NULL;
ObDirectoryType->Security = NULL; ObDirectoryType->Open = NULL;
ObDirectoryType->QueryName = NULL; ObDirectoryType->Close = NULL;
ObDirectoryType->OkayToClose = NULL; ObDirectoryType->Delete = NULL;
ObDirectoryType->Create = ObpCreateDirectory; ObDirectoryType->Parse = ObpParseDirectory;
ObDirectoryType->DuplicationNotify = NULL; ObDirectoryType->Security = NULL;
ObDirectoryType->QueryName = NULL;
RtlInitUnicodeString(&ObDirectoryType->TypeName, ObDirectoryType->OkayToClose = NULL;
L"Directory"); ObDirectoryType->Create = ObpCreateDirectory;
ObDirectoryType->DuplicationNotify = NULL;
ObCreateObject(NULL,
STANDARD_RIGHTS_REQUIRED, RtlInitUnicodeString(&ObDirectoryType->TypeName,
NULL, L"Directory");
ObDirectoryType,
(PVOID*)&NameSpaceRoot); /* create 'type' object type*/
ObTypeObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE));
ObTypeObjectType->Tag = TAG('T', 'y', 'p', 'T');
ObTypeObjectType->TotalObjects = 0;
ObTypeObjectType->TotalHandles = 0;
ObTypeObjectType->MaxObjects = ULONG_MAX;
ObTypeObjectType->MaxHandles = ULONG_MAX;
ObTypeObjectType->PagedPoolCharge = 0;
ObTypeObjectType->NonpagedPoolCharge = sizeof(TYPE_OBJECT);
ObTypeObjectType->Mapping = &ObpTypeMapping;
ObTypeObjectType->Dump = NULL;
ObTypeObjectType->Open = NULL;
ObTypeObjectType->Close = NULL;
ObTypeObjectType->Delete = NULL;
ObTypeObjectType->Parse = NULL;
ObTypeObjectType->Security = NULL;
ObTypeObjectType->QueryName = NULL;
ObTypeObjectType->OkayToClose = NULL;
ObTypeObjectType->Create = NULL;
ObTypeObjectType->DuplicationNotify = NULL;
RtlInitUnicodeString(&ObTypeObjectType->TypeName,
L"ObjectType");
/* create root directory */
ObCreateObject(NULL,
STANDARD_RIGHTS_REQUIRED,
NULL,
ObDirectoryType,
(PVOID*)&NameSpaceRoot);
/* create '\ObjectTypes' directory */
RtlInitUnicodeString(&Name,
L"\\ObjectTypes");
InitializeObjectAttributes(&ObjectAttributes,
&Name,
OBJ_PERMANENT,
NULL,
NULL);
ObCreateObject(NULL,
STANDARD_RIGHTS_REQUIRED,
&ObjectAttributes,
ObDirectoryType,
NULL);
ObpCreateTypeObject(ObDirectoryType);
ObpCreateTypeObject(ObTypeObjectType);
} }
NTSTATUS
ObpCreateTypeObject(POBJECT_TYPE ObjectType)
{
OBJECT_ATTRIBUTES ObjectAttributes;
WCHAR NameString[80];
PTYPE_OBJECT TypeObject = NULL;
UNICODE_STRING Name;
HANDLE TypesDir;
NTSTATUS Status;
RtlInitUnicodeString(&Name,
L"\\ObjectTypes");
InitializeObjectAttributes(&ObjectAttributes,
&Name,
0,
NULL,
NULL);
Status = NtOpenDirectoryObject(&TypesDir,
STANDARD_RIGHTS_REQUIRED,
&ObjectAttributes);
if (!NT_SUCCESS(Status))
return(Status);
DPRINT("ObjectType: %wZ\n", &ObjectType->TypeName);
wcscpy(NameString, L"\\");
wcscat(NameString, ObjectType->TypeName.Buffer);
RtlInitUnicodeString(&Name,
NameString);
InitializeObjectAttributes(&ObjectAttributes,
&Name,
OBJ_PERMANENT,
TypesDir,
NULL);
Status = ObCreateObject(NULL,
STANDARD_RIGHTS_REQUIRED,
&ObjectAttributes,
ObTypeObjectType,
(PVOID*)&TypeObject);
if (NT_SUCCESS(Status))
{
TypeObject->ObjectType = ObjectType;
}
NtClose(TypesDir);
return(STATUS_SUCCESS);
}
/* EOF */ /* EOF */

222
reactos/ntoskrnl/ob/object.c
View file

@ -1,4 +1,4 @@
/* $Id: object.c,v 1.44 2002/02/23 23:08:58 ekohl Exp $ /* $Id: object.c,v 1.45 2002/03/01 00:47:40 ekohl Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -227,11 +227,11 @@ NTSTATUS ObFindObject(POBJECT_ATTRIBUTES ObjectAttributes,
* RETURN VALUE * RETURN VALUE
*/ */
NTSTATUS STDCALL NTSTATUS STDCALL
ObCreateObject(PHANDLE Handle, ObCreateObject(OUT PHANDLE Handle,
ACCESS_MASK DesiredAccess, IN ACCESS_MASK DesiredAccess,
POBJECT_ATTRIBUTES ObjectAttributes, IN POBJECT_ATTRIBUTES ObjectAttributes,
POBJECT_TYPE Type, IN POBJECT_TYPE Type,
PVOID *Object) OUT PVOID *Object)
{ {
PVOID Parent = NULL; PVOID Parent = NULL;
UNICODE_STRING RemainingPath; UNICODE_STRING RemainingPath;
@ -329,10 +329,10 @@ ObCreateObject(PHANDLE Handle,
NTSTATUS STDCALL NTSTATUS STDCALL
ObReferenceObjectByPointer(PVOID ObjectBody, ObReferenceObjectByPointer(IN PVOID Object,
ACCESS_MASK DesiredAccess, IN ACCESS_MASK DesiredAccess,
POBJECT_TYPE ObjectType, IN POBJECT_TYPE ObjectType,
KPROCESSOR_MODE AccessMode) IN KPROCESSOR_MODE AccessMode)
/* /*
* FUNCTION: Increments the pointer reference count for a given object * FUNCTION: Increments the pointer reference count for a given object
* ARGUMENTS: * ARGUMENTS:
@ -343,37 +343,37 @@ ObReferenceObjectByPointer(PVOID ObjectBody,
* RETURNS: Status * RETURNS: Status
*/ */
{ {
POBJECT_HEADER ObjectHeader; POBJECT_HEADER Header;
// DPRINT("ObReferenceObjectByPointer(ObjectBody %x, ObjectType %x)\n", // DPRINT("ObReferenceObjectByPointer(Object %x, ObjectType %x)\n",
// ObjectBody,ObjectType); // Object,ObjectType);
ObjectHeader = BODY_TO_HEADER(ObjectBody); Header = BODY_TO_HEADER(Object);
if (ObjectType != NULL && ObjectHeader->ObjectType != ObjectType) if (ObjectType != NULL && Header->ObjectType != ObjectType)
{ {
DPRINT("Failed %x (type was %x %S) should be %x %S\n", DPRINT("Failed %x (type was %x %S) should be %x %S\n",
ObjectHeader, Header,
ObjectHeader->ObjectType, Header->ObjectType,
ObjectHeader->ObjectType->TypeName.Buffer, Header->ObjectType->TypeName.Buffer,
ObjectType, ObjectType,
ObjectType->TypeName.Buffer); ObjectType->TypeName.Buffer);
return(STATUS_UNSUCCESSFUL); return(STATUS_UNSUCCESSFUL);
} }
if (ObjectHeader->ObjectType == PsProcessType) if (Header->ObjectType == PsProcessType)
{ {
DPRINT("Ref p 0x%x refcount %d type %x ", DPRINT("Ref p 0x%x refcount %d type %x ",
ObjectBody, ObjectHeader->RefCount, PsProcessType); Object, Header->RefCount, PsProcessType);
DPRINT("eip %x\n", ((PULONG)&ObjectBody)[-1]); DPRINT("eip %x\n", ((PULONG)&Object)[-1]);
} }
if (ObjectHeader->ObjectType == PsThreadType) if (Header->ObjectType == PsThreadType)
{ {
DPRINT("Deref t 0x%x with refcount %d type %x ", DPRINT("Deref t 0x%x with refcount %d type %x ",
ObjectBody, ObjectHeader->RefCount, PsThreadType); Object, Header->RefCount, PsThreadType);
DPRINT("eip %x\n", ((PULONG)&ObjectBody)[-1]); DPRINT("eip %x\n", ((PULONG)&Object)[-1]);
} }
ObjectHeader->RefCount++; Header->RefCount++;
return(STATUS_SUCCESS); return(STATUS_SUCCESS);
} }
@ -413,56 +413,43 @@ ObOpenObjectByPointer(IN POBJECT Object,
} }
NTSTATUS ObPerformRetentionChecks(POBJECT_HEADER Header) static NTSTATUS
ObpPerformRetentionChecks(POBJECT_HEADER Header)
{ {
// DPRINT("ObPerformRetentionChecks(Header %x), RefCount %d, HandleCount %d\n", // DPRINT("ObPerformRetentionChecks(Header %x), RefCount %d, HandleCount %d\n",
// Header,Header->RefCount,Header->HandleCount); // Header,Header->RefCount,Header->HandleCount);
if (Header->RefCount < 0) if (Header->RefCount < 0)
{ {
CPRINT("Object %x/%x has invalid reference count (%d)\n", CPRINT("Object %x/%x has invalid reference count (%d)\n",
Header, HEADER_TO_BODY(Header), Header->RefCount); Header, HEADER_TO_BODY(Header), Header->RefCount);
KeBugCheck(0); KeBugCheck(0);
} }
if (Header->HandleCount < 0) if (Header->HandleCount < 0)
{ {
CPRINT("Object %x/%x has invalid handle count (%d)\n", CPRINT("Object %x/%x has invalid handle count (%d)\n",
Header, HEADER_TO_BODY(Header), Header->HandleCount); Header, HEADER_TO_BODY(Header), Header->HandleCount);
KeBugCheck(0); KeBugCheck(0);
} }
if (Header->RefCount == 0 && Header->HandleCount == 0 && if (Header->RefCount == 0 &&
!Header->Permanent) Header->HandleCount == 0 &&
{ Header->Permanent == FALSE)
if (Header->ObjectType != NULL && {
Header->ObjectType->Delete != NULL) if (Header->ObjectType != NULL &&
{ Header->ObjectType->Delete != NULL)
Header->ObjectType->Delete(HEADER_TO_BODY(Header)); {
} Header->ObjectType->Delete(HEADER_TO_BODY(Header));
if (Header->Name.Buffer != NULL) }
{ if (Header->Name.Buffer != NULL)
ObpRemoveEntryDirectory(Header); {
RtlFreeUnicodeString( &Header->Name ); ObpRemoveEntryDirectory(Header);
} RtlFreeUnicodeString(&Header->Name);
DPRINT("ObPerformRetentionChecks() = Freeing object\n"); }
ExFreePool(Header); DPRINT("ObPerformRetentionChecks() = Freeing object\n");
} ExFreePool(Header);
return(STATUS_SUCCESS); }
} return(STATUS_SUCCESS);
ULONG ObGetReferenceCount(PVOID ObjectBody)
{
POBJECT_HEADER Header = BODY_TO_HEADER(ObjectBody);
return(Header->RefCount);
}
ULONG ObGetHandleCount(PVOID ObjectBody)
{
POBJECT_HEADER Header = BODY_TO_HEADER(ObjectBody);
return(Header->HandleCount);
} }
@ -480,54 +467,77 @@ ULONG ObGetHandleCount(PVOID ObjectBody)
* RETURN VALUE * RETURN VALUE
* None. * None.
*/ */
VOID FASTCALL ObfReferenceObject(PVOID Object) VOID FASTCALL
ObfReferenceObject(IN PVOID Object)
{ {
POBJECT_HEADER Header; POBJECT_HEADER Header;
assert (Object); assert(Object);
Header = BODY_TO_HEADER(Object); Header = BODY_TO_HEADER(Object);
Header->RefCount++; Header->RefCount++;
ObPerformRetentionChecks (Header); ObpPerformRetentionChecks(Header);
} }
VOID FASTCALL ObfDereferenceObject (PVOID Object) /**********************************************************************
/* * NAME EXPORTED
* FUNCTION: Decrements a given object's reference count and performs * ObfDereferenceObject@4
* retention checks *
* ARGUMENTS: * DESCRIPTION
* Object = Body of the object * Decrements a given object's reference count and performs
* retention checks.
*
* ARGUMENTS
* ObjectBody = Body of the object.
*
* RETURN VALUE
* None.
*/ */
VOID FASTCALL
ObfDereferenceObject(IN PVOID Object)
{ {
POBJECT_HEADER Header; POBJECT_HEADER Header;
extern POBJECT_TYPE PsProcessType; extern POBJECT_TYPE PsProcessType;
assert (Object); assert(Object);
Header = BODY_TO_HEADER(Object); Header = BODY_TO_HEADER(Object);
if (Header->ObjectType == PsProcessType) if (Header->ObjectType == PsProcessType)
{ {
DPRINT("Deref p 0x%x with refcount %d type %x ", DPRINT("Deref p 0x%x with refcount %d type %x ",
Object, Header->RefCount, PsProcessType); Object, Header->RefCount, PsProcessType);
DPRINT("eip %x\n", ((PULONG)&Object)[-1]); DPRINT("eip %x\n", ((PULONG)&Object)[-1]);
} }
if (Header->ObjectType == PsThreadType) if (Header->ObjectType == PsThreadType)
{ {
DPRINT("Deref t 0x%x with refcount %d type %x ", DPRINT("Deref t 0x%x with refcount %d type %x ",
Object, Header->RefCount, PsThreadType); Object, Header->RefCount, PsThreadType);
DPRINT("eip %x\n", ((PULONG)&Object)[-1]); DPRINT("eip %x\n", ((PULONG)&Object)[-1]);
} }
Header->RefCount--; Header->RefCount--;
ObPerformRetentionChecks(Header); ObpPerformRetentionChecks(Header);
} }
/**********************************************************************
* NAME EXPORTED
* ObGetObjectPointerCount@4
*
* DESCRIPTION
* Retrieves the reference count of the given object.
*
* ARGUMENTS
* ObjectBody = Body of the object.
*
* RETURN VALUE
* Reference count.
*/
ULONG STDCALL ULONG STDCALL
ObGetObjectPointerCount(PVOID Object) ObGetObjectPointerCount(PVOID Object)
{ {