From 708b29556c0869e177e6ec71c9ff9bd9e47eba38 Mon Sep 17 00:00:00 2001 From: Gunnar Dalsnes Date: Tue, 4 Jan 2005 04:45:00 +0000 Subject: [PATCH] -move structs OBJECT_TYPE/OBJECT_HEADER into private headers -correct OBJECT_TYPE_INFORMATION struct -rename meaningless members OBJECT_TYPE->MaxObjects/MaxHandles to PeakObjects/PeakHandles and init to zero. Both are still unused. svn path=/trunk/; revision=12779 --- reactos/include/ntos/obtypes.h | 200 +++---------------------- reactos/ntoskrnl/cm/registry.c | 6 +- reactos/ntoskrnl/ex/callback.c | 6 +- reactos/ntoskrnl/ex/win32k.c | 8 +- reactos/ntoskrnl/include/internal/ob.h | 156 +++++++++++++++++++ reactos/ntoskrnl/io/driver.c | 4 +- reactos/ntoskrnl/io/iocomp.c | 4 +- reactos/ntoskrnl/io/iomgr.c | 14 +- reactos/ntoskrnl/lpc/port.c | 4 +- reactos/ntoskrnl/mm/section.c | 4 +- reactos/ntoskrnl/nt/evtpair.c | 6 +- reactos/ntoskrnl/nt/mutant.c | 4 +- reactos/ntoskrnl/nt/ntevent.c | 4 +- reactos/ntoskrnl/nt/ntsem.c | 6 +- reactos/ntoskrnl/nt/nttimer.c | 6 +- reactos/ntoskrnl/nt/profile.c | 4 +- reactos/ntoskrnl/ob/namespc.c | 10 +- reactos/ntoskrnl/ob/symlink.c | 6 +- reactos/ntoskrnl/ps/job.c | 4 +- reactos/ntoskrnl/ps/process.c | 4 +- reactos/ntoskrnl/ps/thread.c | 4 +- reactos/ntoskrnl/se/token.c | 4 +- 22 files changed, 235 insertions(+), 233 deletions(-) diff --git a/reactos/include/ntos/obtypes.h b/reactos/include/ntos/obtypes.h index 08079c1c338..0e11636a8b9 100755 --- a/reactos/include/ntos/obtypes.h +++ b/reactos/include/ntos/obtypes.h @@ -1,6 +1,6 @@ #ifndef _INCLUDE_DDK_OBTYPES_H #define _INCLUDE_DDK_OBTYPES_H -/* $Id: obtypes.h,v 1.9 2004/11/21 06:51:17 ion Exp $ */ +/* $Id$ */ struct _DIRECTORY_OBJECT; struct _OBJECT_ATTRIBUTES; @@ -35,23 +35,28 @@ typedef struct _OBJECT_NAME_INFORMATION } OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION; -typedef struct _OBJECT_TYPE_INFORMATION -{ - UNICODE_STRING Name; - ULONG ObjectCount; - ULONG ReferenceCount; - ULONG Reserved1[4]; - ULONG PeakObjectCount; - ULONG PeakHandleCount; - ULONG Reserved2[4]; - ULONG InvalidAttributes; - GENERIC_MAPPING GenericMapping; - ULONG ValidAccess; - UCHAR Unknown; - BOOLEAN MainitainHandleDatabase; - POOL_TYPE PoolType; - ULONG PagedPoolUsage; - ULONG NonPagedPoolUsage; +typedef struct _OBJECT_TYPE_INFORMATION { + UNICODE_STRING TypeName; + ULONG TotalNumberOfObjects; + ULONG TotalNumberOfHandles; + ULONG TotalPagedPoolUsage; + ULONG TotalNonPagedPoolUsage; + ULONG TotalNamePoolUsage; + ULONG TotalHandleTableUsage; + ULONG PeakNumberOfObjects; + ULONG PeakNumberOfHandles; + ULONG PeakPagedPoolUsage; + ULONG PeakNonPagedPoolUsage; + ULONG PeakNamePoolUsage; + ULONG PeakHandleTableUsage; + ULONG InvalidAttributes; + GENERIC_MAPPING GenericMapping; + ULONG ValidAccessMask; + BOOLEAN SecurityRequired; + BOOLEAN MaintainHandleCount; + ULONG PoolType; + ULONG DefaultPagedPoolCharge; + ULONG DefaultNonPagedPoolCharge; } OBJECT_TYPE_INFORMATION, *POBJECT_TYPE_INFORMATION; @@ -68,168 +73,9 @@ typedef struct _OBJECT_HANDLE_ATTRIBUTE_INFORMATION BOOLEAN ProtectFromClose; } OBJECT_HANDLE_ATTRIBUTE_INFORMATION, *POBJECT_HANDLE_ATTRIBUTE_INFORMATION; -#endif /* __USE_W32API */ - -typedef struct _OBJECT_TYPE -{ - /* - * PURPOSE: Tag to be used when allocating objects of this type - */ - ULONG Tag; - - /* - * PURPOSE: Name of the type - */ - UNICODE_STRING TypeName; - - /* - * PURPOSE: Total number of objects of this type - */ - ULONG TotalObjects; - - /* - * PURPOSE: Total number of handles of this type - */ - ULONG TotalHandles; - - /* - * PURPOSE: Maximum objects of this type - */ - ULONG MaxObjects; - - /* - * PURPOSE: Maximum handles of this type - */ - ULONG MaxHandles; - - /* - * PURPOSE: Paged pool charge - */ - ULONG PagedPoolCharge; - - /* - * PURPOSE: Nonpaged pool charge - */ - ULONG NonpagedPoolCharge; - - /* - * PURPOSE: Mapping of generic access rights - */ - PGENERIC_MAPPING Mapping; - - /* - * PURPOSE: Dumps the object - * NOTE: To be defined - */ - VOID STDCALL_FUNC (*Dump)(VOID); - - /* - * PURPOSE: Opens the object - * NOTE: To be defined - */ - VOID STDCALL_FUNC (*Open)(VOID); - - /* - * PURPOSE: Called to close an object if OkayToClose returns true - */ - VOID STDCALL_FUNC (*Close)(PVOID ObjectBody, - ULONG HandleCount); - - /* - * PURPOSE: Called to delete an object when the last reference is removed - */ - VOID STDCALL_FUNC (*Delete)(PVOID ObjectBody); - - /* - * PURPOSE: Called when an open attempts to open a file apparently - * residing within the object - * RETURNS - * STATUS_SUCCESS NextObject was found - * STATUS_UNSUCCESSFUL NextObject not found - * STATUS_REPARSE Path changed, restart parsing the path - */ - NTSTATUS STDCALL_FUNC (*Parse)(PVOID ParsedObject, - PVOID *NextObject, - PUNICODE_STRING FullPath, - PWSTR *Path, - ULONG Attributes); - - /* - * PURPOSE: Called to set, query, delete or assign a security-descriptor - * to the object - * RETURNS - * STATUS_SUCCESS NextObject was found - */ - NTSTATUS STDCALL_FUNC (*Security)(PVOID ObjectBody, - SECURITY_OPERATION_CODE OperationCode, - SECURITY_INFORMATION SecurityInformation, - PSECURITY_DESCRIPTOR SecurityDescriptor, - PULONG BufferLength); - - /* - * PURPOSE: Called to query the name of the object - * RETURNS - * STATUS_SUCCESS NextObject was found - */ - NTSTATUS STDCALL_FUNC (*QueryName)(PVOID ObjectBody, - POBJECT_NAME_INFORMATION ObjectNameInfo, - ULONG Length, - PULONG ReturnLength); - - /* - * PURPOSE: Called when a process asks to close the object - */ - VOID STDCALL_FUNC (*OkayToClose)(VOID); - - NTSTATUS STDCALL_FUNC (*Create)(PVOID ObjectBody, - PVOID Parent, - PWSTR RemainingPath, - struct _OBJECT_ATTRIBUTES* ObjectAttributes); - - VOID STDCALL_FUNC (*DuplicationNotify)(PEPROCESS DuplicateTo, - PEPROCESS DuplicateFrom, - PVOID Object); -} OBJECT_TYPE; - -#ifndef __USE_W32API typedef struct _OBJECT_TYPE *POBJECT_TYPE; -#endif /* __USE_W32API */ - - -typedef struct _OBJECT_HEADER -/* - * PURPOSE: Header for every object managed by the object manager - */ -{ - UNICODE_STRING Name; - LIST_ENTRY Entry; - LONG RefCount; - LONG HandleCount; - BOOLEAN CloseInProcess; - BOOLEAN Permanent; - BOOLEAN Inherit; - struct _DIRECTORY_OBJECT* Parent; - POBJECT_TYPE ObjectType; - PSECURITY_DESCRIPTOR SecurityDescriptor; - - /* - * PURPOSE: Object type - * NOTE: This overlaps the first member of the object body - */ - CSHORT Type; - - /* - * PURPOSE: Object size - * NOTE: This overlaps the second member of the object body - */ - CSHORT Size; - - -} OBJECT_HEADER, *POBJECT_HEADER; - -#ifndef __USE_W32API typedef struct _OBJECT_ATTRIBUTES { diff --git a/reactos/ntoskrnl/cm/registry.c b/reactos/ntoskrnl/cm/registry.c index b9f9f7db617..75c8c642619 100644 --- a/reactos/ntoskrnl/cm/registry.c +++ b/reactos/ntoskrnl/cm/registry.c @@ -1,4 +1,4 @@ -/* $Id: registry.c,v 1.129 2004/12/12 22:36:10 ekohl Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -259,8 +259,8 @@ CmInitializeRegistry(VOID) CmiKeyType->Tag = TAG('R', 'e', 'g', 'K'); CmiKeyType->TotalObjects = 0; CmiKeyType->TotalHandles = 0; - CmiKeyType->MaxObjects = LONG_MAX; - CmiKeyType->MaxHandles = LONG_MAX; + CmiKeyType->PeakObjects = 0; + CmiKeyType->PeakHandles = 0; CmiKeyType->PagedPoolCharge = 0; CmiKeyType->NonpagedPoolCharge = sizeof(KEY_OBJECT); CmiKeyType->Mapping = &CmiKeyMapping; diff --git a/reactos/ntoskrnl/ex/callback.c b/reactos/ntoskrnl/ex/callback.c index b605ebeaacc..757cea4d43a 100644 --- a/reactos/ntoskrnl/ex/callback.c +++ b/reactos/ntoskrnl/ex/callback.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: callback.c,v 1.13 2004/10/30 14:02:04 navaraf Exp $ +/* $Id$ * * PROJECT: ReactOS kernel * FILE: ntoskrnl/ex/callback.c @@ -72,8 +72,8 @@ ExpInitializeCallbacks(VOID) ExCallbackObjectType->Tag = CALLBACK_TAG; ExCallbackObjectType->TotalObjects = 0; ExCallbackObjectType->TotalHandles = 0; - ExCallbackObjectType->MaxObjects = 0xFFFFFFFF; - ExCallbackObjectType->MaxHandles = 0xFFFFFFFF; + ExCallbackObjectType->PeakObjects = 0; + ExCallbackObjectType->PeakHandles = 0; ExCallbackObjectType->PagedPoolCharge = 0; ExCallbackObjectType->Dump = NULL; ExCallbackObjectType->Open = NULL; diff --git a/reactos/ntoskrnl/ex/win32k.c b/reactos/ntoskrnl/ex/win32k.c index 00e972017a4..a1d06d75836 100644 --- a/reactos/ntoskrnl/ex/win32k.c +++ b/reactos/ntoskrnl/ex/win32k.c @@ -297,8 +297,8 @@ ExpWin32kInit(VOID) ExWindowStationObjectType->Tag = TAG('W', 'I', 'N', 'S'); ExWindowStationObjectType->TotalObjects = 0; ExWindowStationObjectType->TotalHandles = 0; - ExWindowStationObjectType->MaxObjects = ULONG_MAX; - ExWindowStationObjectType->MaxHandles = ULONG_MAX; + ExWindowStationObjectType->PeakObjects = 0; + ExWindowStationObjectType->PeakHandles = 0; ExWindowStationObjectType->PagedPoolCharge = 0; ExWindowStationObjectType->NonpagedPoolCharge = sizeof(WINSTATION_OBJECT); ExWindowStationObjectType->Mapping = &ExpWindowStationMapping; @@ -327,8 +327,8 @@ ExpWin32kInit(VOID) ExDesktopObjectType->Tag = TAG('D', 'E', 'S', 'K'); ExDesktopObjectType->TotalObjects = 0; ExDesktopObjectType->TotalHandles = 0; - ExDesktopObjectType->MaxObjects = ULONG_MAX; - ExDesktopObjectType->MaxHandles = ULONG_MAX; + ExDesktopObjectType->PeakObjects = 0; + ExDesktopObjectType->PeakHandles = 0; ExDesktopObjectType->PagedPoolCharge = 0; ExDesktopObjectType->NonpagedPoolCharge = sizeof(DESKTOP_OBJECT); ExDesktopObjectType->Mapping = &ExpDesktopMapping; diff --git a/reactos/ntoskrnl/include/internal/ob.h b/reactos/ntoskrnl/include/internal/ob.h index 7c0548d0e0a..533741b3a86 100644 --- a/reactos/ntoskrnl/include/internal/ob.h +++ b/reactos/ntoskrnl/include/internal/ob.h @@ -24,6 +24,162 @@ typedef struct typedef PVOID POBJECT; + +typedef struct _OBJECT_TYPE +{ + /* + * PURPOSE: Tag to be used when allocating objects of this type + */ + ULONG Tag; + + /* + * PURPOSE: Name of the type + */ + UNICODE_STRING TypeName; + + /* + * PURPOSE: Total number of objects of this type + */ + ULONG TotalObjects; + + /* + * PURPOSE: Total number of handles of this type + */ + ULONG TotalHandles; + + /* + * PURPOSE: Peak objects of this type + */ + ULONG PeakObjects; + + /* + * PURPOSE: Peak handles of this type + */ + ULONG PeakHandles; + + /* + * PURPOSE: Paged pool charge + */ + ULONG PagedPoolCharge; + + /* + * PURPOSE: Nonpaged pool charge + */ + ULONG NonpagedPoolCharge; + + /* + * PURPOSE: Mapping of generic access rights + */ + PGENERIC_MAPPING Mapping; + + /* + * PURPOSE: Dumps the object + * NOTE: To be defined + */ + VOID STDCALL_FUNC (*Dump)(VOID); + + /* + * PURPOSE: Opens the object + * NOTE: To be defined + */ + VOID STDCALL_FUNC (*Open)(VOID); + + /* + * PURPOSE: Called to close an object if OkayToClose returns true + */ + VOID STDCALL_FUNC (*Close)(PVOID ObjectBody, + ULONG HandleCount); + + /* + * PURPOSE: Called to delete an object when the last reference is removed + */ + VOID STDCALL_FUNC (*Delete)(PVOID ObjectBody); + + /* + * PURPOSE: Called when an open attempts to open a file apparently + * residing within the object + * RETURNS + * STATUS_SUCCESS NextObject was found + * STATUS_UNSUCCESSFUL NextObject not found + * STATUS_REPARSE Path changed, restart parsing the path + */ + NTSTATUS STDCALL_FUNC (*Parse)(PVOID ParsedObject, + PVOID *NextObject, + PUNICODE_STRING FullPath, + PWSTR *Path, + ULONG Attributes); + + /* + * PURPOSE: Called to set, query, delete or assign a security-descriptor + * to the object + * RETURNS + * STATUS_SUCCESS NextObject was found + */ + NTSTATUS STDCALL_FUNC (*Security)(PVOID ObjectBody, + SECURITY_OPERATION_CODE OperationCode, + SECURITY_INFORMATION SecurityInformation, + PSECURITY_DESCRIPTOR SecurityDescriptor, + PULONG BufferLength); + + /* + * PURPOSE: Called to query the name of the object + * RETURNS + * STATUS_SUCCESS NextObject was found + */ + NTSTATUS STDCALL_FUNC (*QueryName)(PVOID ObjectBody, + POBJECT_NAME_INFORMATION ObjectNameInfo, + ULONG Length, + PULONG ReturnLength); + + /* + * PURPOSE: Called when a process asks to close the object + */ + VOID STDCALL_FUNC (*OkayToClose)(VOID); + + NTSTATUS STDCALL_FUNC (*Create)(PVOID ObjectBody, + PVOID Parent, + PWSTR RemainingPath, + struct _OBJECT_ATTRIBUTES* ObjectAttributes); + + VOID STDCALL_FUNC (*DuplicationNotify)(PEPROCESS DuplicateTo, + PEPROCESS DuplicateFrom, + PVOID Object); +} OBJECT_TYPE; + + + +typedef struct _OBJECT_HEADER +/* + * PURPOSE: Header for every object managed by the object manager + */ +{ + UNICODE_STRING Name; + LIST_ENTRY Entry; + LONG RefCount; + LONG HandleCount; + BOOLEAN CloseInProcess; + BOOLEAN Permanent; + BOOLEAN Inherit; + struct _DIRECTORY_OBJECT* Parent; + POBJECT_TYPE ObjectType; + PSECURITY_DESCRIPTOR SecurityDescriptor; + + /* + * PURPOSE: Object type + * NOTE: This overlaps the first member of the object body + */ + CSHORT Type; + + /* + * PURPOSE: Object size + * NOTE: This overlaps the second member of the object body + */ + CSHORT Size; + + +} OBJECT_HEADER, *POBJECT_HEADER; + + typedef struct _DIRECTORY_OBJECT { CSHORT Type; diff --git a/reactos/ntoskrnl/io/driver.c b/reactos/ntoskrnl/io/driver.c index a41da67ecdb..797a5b3a527 100644 --- a/reactos/ntoskrnl/io/driver.c +++ b/reactos/ntoskrnl/io/driver.c @@ -97,8 +97,8 @@ IopInitDriverImplementation(VOID) IoDriverObjectType->Tag = TAG('D', 'R', 'V', 'R'); IoDriverObjectType->TotalObjects = 0; IoDriverObjectType->TotalHandles = 0; - IoDriverObjectType->MaxObjects = ULONG_MAX; - IoDriverObjectType->MaxHandles = ULONG_MAX; + IoDriverObjectType->PeakObjects = 0; + IoDriverObjectType->PeakHandles = 0; IoDriverObjectType->PagedPoolCharge = 0; IoDriverObjectType->NonpagedPoolCharge = sizeof(DRIVER_OBJECT); IoDriverObjectType->Dump = NULL; diff --git a/reactos/ntoskrnl/io/iocomp.c b/reactos/ntoskrnl/io/iocomp.c index deb9b3453ff..17b5d604065 100644 --- a/reactos/ntoskrnl/io/iocomp.c +++ b/reactos/ntoskrnl/io/iocomp.c @@ -123,8 +123,8 @@ IopInitIoCompletionImplementation(VOID) RtlCreateUnicodeString(&ExIoCompletionType->TypeName, L"IoCompletion"); ExIoCompletionType->Tag = IOC_TAG; - ExIoCompletionType->MaxObjects = ULONG_MAX; - ExIoCompletionType->MaxHandles = ULONG_MAX; + ExIoCompletionType->PeakObjects = 0; + ExIoCompletionType->PeakHandles = 0; ExIoCompletionType->TotalObjects = 0; ExIoCompletionType->TotalHandles = 0; ExIoCompletionType->PagedPoolCharge = 0; diff --git a/reactos/ntoskrnl/io/iomgr.c b/reactos/ntoskrnl/io/iomgr.c index 0029abd1a4a..46cf6b633a5 100644 --- a/reactos/ntoskrnl/io/iomgr.c +++ b/reactos/ntoskrnl/io/iomgr.c @@ -1,4 +1,4 @@ -/* $Id: iomgr.c,v 1.55 2004/12/21 18:37:28 gvg Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -395,8 +395,8 @@ IoInit (VOID) IoDeviceObjectType->Tag = TAG_DEVICE_TYPE; IoDeviceObjectType->TotalObjects = 0; IoDeviceObjectType->TotalHandles = 0; - IoDeviceObjectType->MaxObjects = ULONG_MAX; - IoDeviceObjectType->MaxHandles = ULONG_MAX; + IoDeviceObjectType->PeakObjects = 0; + IoDeviceObjectType->PeakHandles = 0; IoDeviceObjectType->PagedPoolCharge = 0; IoDeviceObjectType->NonpagedPoolCharge = sizeof (DEVICE_OBJECT); IoDeviceObjectType->Mapping = &IopFileMapping; @@ -424,8 +424,8 @@ IoInit (VOID) IoFileObjectType->Tag = TAG_FILE_TYPE; IoFileObjectType->TotalObjects = 0; IoFileObjectType->TotalHandles = 0; - IoFileObjectType->MaxObjects = ULONG_MAX; - IoFileObjectType->MaxHandles = ULONG_MAX; + IoFileObjectType->PeakObjects = 0; + IoFileObjectType->PeakHandles = 0; IoFileObjectType->PagedPoolCharge = 0; IoFileObjectType->NonpagedPoolCharge = sizeof(FILE_OBJECT); IoFileObjectType->Mapping = &IopFileMapping; @@ -451,8 +451,8 @@ IoInit (VOID) sizeof (OBJECT_TYPE)); RtlZeroMemory(IoAdapterObjectType, sizeof(OBJECT_TYPE)); IoAdapterObjectType->Tag = TAG_ADAPTER_TYPE; - IoAdapterObjectType->MaxObjects = ULONG_MAX; - IoAdapterObjectType->MaxHandles = ULONG_MAX; + IoAdapterObjectType->PeakObjects = 0; + IoAdapterObjectType->PeakHandles = 0; IoDeviceObjectType->Mapping = &IopFileMapping; RtlRosInitUnicodeStringFromLiteral(&IoAdapterObjectType->TypeName, L"Adapter"); ObpCreateTypeObject(IoAdapterObjectType); diff --git a/reactos/ntoskrnl/lpc/port.c b/reactos/ntoskrnl/lpc/port.c index 7ad11d209ec..5649e8d0d32 100644 --- a/reactos/ntoskrnl/lpc/port.c +++ b/reactos/ntoskrnl/lpc/port.c @@ -44,8 +44,8 @@ NiInitPort (VOID) RtlRosInitUnicodeStringFromLiteral(&LpcPortObjectType->TypeName,L"Port"); LpcPortObjectType->Tag = TAG('L', 'P', 'R', 'T'); - LpcPortObjectType->MaxObjects = ULONG_MAX; - LpcPortObjectType->MaxHandles = ULONG_MAX; + LpcPortObjectType->PeakObjects = 0; + LpcPortObjectType->PeakHandles = 0; LpcPortObjectType->TotalObjects = 0; LpcPortObjectType->TotalHandles = 0; LpcPortObjectType->PagedPoolCharge = 0; diff --git a/reactos/ntoskrnl/mm/section.c b/reactos/ntoskrnl/mm/section.c index 9040d979dc3..82c2d381701 100644 --- a/reactos/ntoskrnl/mm/section.c +++ b/reactos/ntoskrnl/mm/section.c @@ -2148,8 +2148,8 @@ MmInitSectionImplementation(VOID) MmSectionObjectType->Tag = TAG('S', 'E', 'C', 'T'); MmSectionObjectType->TotalObjects = 0; MmSectionObjectType->TotalHandles = 0; - MmSectionObjectType->MaxObjects = ULONG_MAX; - MmSectionObjectType->MaxHandles = ULONG_MAX; + MmSectionObjectType->PeakObjects = 0; + MmSectionObjectType->PeakHandles = 0; MmSectionObjectType->PagedPoolCharge = 0; MmSectionObjectType->NonpagedPoolCharge = sizeof(SECTION_OBJECT); MmSectionObjectType->Mapping = &MmpSectionMapping; diff --git a/reactos/ntoskrnl/nt/evtpair.c b/reactos/ntoskrnl/nt/evtpair.c index 723de86ef27..c376c8f59c8 100644 --- a/reactos/ntoskrnl/nt/evtpair.c +++ b/reactos/ntoskrnl/nt/evtpair.c @@ -1,4 +1,4 @@ -/* $Id: evtpair.c,v 1.23 2004/09/28 15:02:29 weiden Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -66,8 +66,8 @@ NtInitializeEventPairImplementation(VOID) RtlCreateUnicodeString(&ExEventPairObjectType->TypeName, L"EventPair"); ExEventPairObjectType->Tag = TAG('E', 'v', 'P', 'a'); - ExEventPairObjectType->MaxObjects = ULONG_MAX; - ExEventPairObjectType->MaxHandles = ULONG_MAX; + ExEventPairObjectType->PeakObjects = 0; + ExEventPairObjectType->PeakHandles = 0; ExEventPairObjectType->TotalObjects = 0; ExEventPairObjectType->TotalHandles = 0; ExEventPairObjectType->PagedPoolCharge = 0; diff --git a/reactos/ntoskrnl/nt/mutant.c b/reactos/ntoskrnl/nt/mutant.c index bd932d19835..578ced42e20 100644 --- a/reactos/ntoskrnl/nt/mutant.c +++ b/reactos/ntoskrnl/nt/mutant.c @@ -81,8 +81,8 @@ NtInitializeMutantImplementation(VOID) RtlCreateUnicodeString(&ExMutantObjectType->TypeName, L"Mutant"); ExMutantObjectType->Tag = TAG('M', 'T', 'N', 'T'); - ExMutantObjectType->MaxObjects = ULONG_MAX; - ExMutantObjectType->MaxHandles = ULONG_MAX; + ExMutantObjectType->PeakObjects = 0; + ExMutantObjectType->PeakHandles = 0; ExMutantObjectType->TotalObjects = 0; ExMutantObjectType->TotalHandles = 0; ExMutantObjectType->PagedPoolCharge = 0; diff --git a/reactos/ntoskrnl/nt/ntevent.c b/reactos/ntoskrnl/nt/ntevent.c index 02e01d17a1a..335f088c4e0 100644 --- a/reactos/ntoskrnl/nt/ntevent.c +++ b/reactos/ntoskrnl/nt/ntevent.c @@ -70,8 +70,8 @@ NtInitializeEventImplementation(VOID) RtlCreateUnicodeString(&ExEventObjectType->TypeName, L"Event"); ExEventObjectType->Tag = TAG('E', 'V', 'T', 'T'); - ExEventObjectType->MaxObjects = ULONG_MAX; - ExEventObjectType->MaxHandles = ULONG_MAX; + ExEventObjectType->PeakObjects = 0; + ExEventObjectType->PeakHandles = 0; ExEventObjectType->TotalObjects = 0; ExEventObjectType->TotalHandles = 0; ExEventObjectType->PagedPoolCharge = 0; diff --git a/reactos/ntoskrnl/nt/ntsem.c b/reactos/ntoskrnl/nt/ntsem.c index 4db9dd6e997..129bbc497da 100644 --- a/reactos/ntoskrnl/nt/ntsem.c +++ b/reactos/ntoskrnl/nt/ntsem.c @@ -1,4 +1,4 @@ -/* $Id: ntsem.c,v 1.24 2004/12/26 17:48:19 navaraf Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -52,8 +52,8 @@ NtInitializeSemaphoreImplementation(VOID) RtlCreateUnicodeString(&ExSemaphoreObjectType->TypeName, L"Semaphore"); ExSemaphoreObjectType->Tag = TAG('S', 'E', 'M', 'T'); - ExSemaphoreObjectType->MaxObjects = ULONG_MAX; - ExSemaphoreObjectType->MaxHandles = ULONG_MAX; + ExSemaphoreObjectType->PeakObjects = 0; + ExSemaphoreObjectType->PeakHandles = 0; ExSemaphoreObjectType->TotalObjects = 0; ExSemaphoreObjectType->TotalHandles = 0; ExSemaphoreObjectType->PagedPoolCharge = 0; diff --git a/reactos/ntoskrnl/nt/nttimer.c b/reactos/ntoskrnl/nt/nttimer.c index fb27115fbbd..e86fb790213 100644 --- a/reactos/ntoskrnl/nt/nttimer.c +++ b/reactos/ntoskrnl/nt/nttimer.c @@ -1,4 +1,4 @@ -/* $Id: nttimer.c,v 1.26 2004/10/24 16:49:49 weiden Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -119,8 +119,8 @@ NtInitializeTimerImplementation(VOID) RtlCreateUnicodeString(&ExTimerType->TypeName, L"Timer"); ExTimerType->Tag = TAG('T', 'I', 'M', 'T'); - ExTimerType->MaxObjects = ULONG_MAX; - ExTimerType->MaxHandles = ULONG_MAX; + ExTimerType->PeakObjects = 0; + ExTimerType->PeakHandles = 0; ExTimerType->TotalObjects = 0; ExTimerType->TotalHandles = 0; ExTimerType->PagedPoolCharge = 0; diff --git a/reactos/ntoskrnl/nt/profile.c b/reactos/ntoskrnl/nt/profile.c index 7b358344948..6ebd6a9f1f8 100644 --- a/reactos/ntoskrnl/nt/profile.c +++ b/reactos/ntoskrnl/nt/profile.c @@ -371,8 +371,8 @@ NtInitializeProfileImplementation(VOID) RtlCreateUnicodeString(&ExProfileObjectType->TypeName, L"Profile"); ExProfileObjectType->Tag = TAG('P', 'R', 'O', 'F'); - ExProfileObjectType->MaxObjects = ULONG_MAX; - ExProfileObjectType->MaxHandles = ULONG_MAX; + ExProfileObjectType->PeakObjects = 0; + ExProfileObjectType->PeakHandles = 0; ExProfileObjectType->TotalObjects = 0; ExProfileObjectType->TotalHandles = 0; ExProfileObjectType->PagedPoolCharge = 0; diff --git a/reactos/ntoskrnl/ob/namespc.c b/reactos/ntoskrnl/ob/namespc.c index 0b273031430..60bee7fd7e8 100644 --- a/reactos/ntoskrnl/ob/namespc.c +++ b/reactos/ntoskrnl/ob/namespc.c @@ -1,4 +1,4 @@ -/* $Id: namespc.c,v 1.50 2004/11/21 10:59:10 weiden Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -376,8 +376,8 @@ ObInit(VOID) ObDirectoryType->Tag = TAG('D', 'I', 'R', 'T'); ObDirectoryType->TotalObjects = 0; ObDirectoryType->TotalHandles = 0; - ObDirectoryType->MaxObjects = ULONG_MAX; - ObDirectoryType->MaxHandles = ULONG_MAX; + ObDirectoryType->PeakObjects = 0; + ObDirectoryType->PeakHandles = 0; ObDirectoryType->PagedPoolCharge = 0; ObDirectoryType->NonpagedPoolCharge = sizeof(DIRECTORY_OBJECT); ObDirectoryType->Mapping = &ObpDirectoryMapping; @@ -401,8 +401,8 @@ ObInit(VOID) ObTypeObjectType->Tag = TAG('T', 'y', 'p', 'T'); ObTypeObjectType->TotalObjects = 0; ObTypeObjectType->TotalHandles = 0; - ObTypeObjectType->MaxObjects = ULONG_MAX; - ObTypeObjectType->MaxHandles = ULONG_MAX; + ObTypeObjectType->PeakObjects = 0; + ObTypeObjectType->PeakHandles = 0; ObTypeObjectType->PagedPoolCharge = 0; ObTypeObjectType->NonpagedPoolCharge = sizeof(TYPE_OBJECT); ObTypeObjectType->Mapping = &ObpTypeMapping; diff --git a/reactos/ntoskrnl/ob/symlink.c b/reactos/ntoskrnl/ob/symlink.c index 50780bec074..11fe7068e65 100644 --- a/reactos/ntoskrnl/ob/symlink.c +++ b/reactos/ntoskrnl/ob/symlink.c @@ -1,4 +1,4 @@ -/* $Id: symlink.c,v 1.12 2004/10/25 14:22:21 blight Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -165,8 +165,8 @@ ObInitSymbolicLinkImplementation (VOID) ObSymbolicLinkType->Tag = TAG('S', 'Y', 'M', 'T'); ObSymbolicLinkType->TotalObjects = 0; ObSymbolicLinkType->TotalHandles = 0; - ObSymbolicLinkType->MaxObjects = ULONG_MAX; - ObSymbolicLinkType->MaxHandles = ULONG_MAX; + ObSymbolicLinkType->PeakObjects = 0; + ObSymbolicLinkType->PeakHandles = 0; ObSymbolicLinkType->PagedPoolCharge = 0; ObSymbolicLinkType->NonpagedPoolCharge = sizeof(SYMLINK_OBJECT); ObSymbolicLinkType->Mapping = &ObpSymbolicLinkMapping; diff --git a/reactos/ntoskrnl/ps/job.c b/reactos/ntoskrnl/ps/job.c index 6401ce4e2f0..906af79c0cc 100644 --- a/reactos/ntoskrnl/ps/job.c +++ b/reactos/ntoskrnl/ps/job.c @@ -47,8 +47,8 @@ PsInitJobManagment(VOID) PsJobType->Tag = TAG('E', 'J', 'O', 'B'); PsJobType->TotalObjects = 0; PsJobType->TotalHandles = 0; - PsJobType->MaxObjects = ULONG_MAX; - PsJobType->MaxHandles = ULONG_MAX; + PsJobType->PeakObjects = 0; + PsJobType->PeakHandles = 0; PsJobType->PagedPoolCharge = 0; PsJobType->NonpagedPoolCharge = sizeof(EJOB); PsJobType->Mapping = &PiJobMapping; diff --git a/reactos/ntoskrnl/ps/process.c b/reactos/ntoskrnl/ps/process.c index 0b7c33d4122..ce1de2cd192 100644 --- a/reactos/ntoskrnl/ps/process.c +++ b/reactos/ntoskrnl/ps/process.c @@ -258,8 +258,8 @@ PsInitProcessManagment(VOID) PsProcessType->Tag = TAG('P', 'R', 'O', 'C'); PsProcessType->TotalObjects = 0; PsProcessType->TotalHandles = 0; - PsProcessType->MaxObjects = ULONG_MAX; - PsProcessType->MaxHandles = ULONG_MAX; + PsProcessType->PeakObjects = 0; + PsProcessType->PeakHandles = 0; PsProcessType->PagedPoolCharge = 0; PsProcessType->NonpagedPoolCharge = sizeof(EPROCESS); PsProcessType->Mapping = &PiProcessMapping; diff --git a/reactos/ntoskrnl/ps/thread.c b/reactos/ntoskrnl/ps/thread.c index e2c8d50ee2d..29a70f35189 100644 --- a/reactos/ntoskrnl/ps/thread.c +++ b/reactos/ntoskrnl/ps/thread.c @@ -684,8 +684,8 @@ PsInitThreadManagment(VOID) PsThreadType->Tag = TAG('T', 'H', 'R', 'T'); PsThreadType->TotalObjects = 0; PsThreadType->TotalHandles = 0; - PsThreadType->MaxObjects = 0; - PsThreadType->MaxHandles = 0; + PsThreadType->PeakObjects = 0; + PsThreadType->PeakHandles = 0; PsThreadType->PagedPoolCharge = 0; PsThreadType->NonpagedPoolCharge = sizeof(ETHREAD); PsThreadType->Mapping = &PiThreadMapping; diff --git a/reactos/ntoskrnl/se/token.c b/reactos/ntoskrnl/se/token.c index 71dc6da8138..91b80566bf3 100644 --- a/reactos/ntoskrnl/se/token.c +++ b/reactos/ntoskrnl/se/token.c @@ -538,8 +538,8 @@ SepInitializeTokenImplementation(VOID) SepTokenObjectType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); SepTokenObjectType->Tag = TAG('T', 'O', 'K', 'T'); - SepTokenObjectType->MaxObjects = ULONG_MAX; - SepTokenObjectType->MaxHandles = ULONG_MAX; + SepTokenObjectType->PeakObjects = 0; + SepTokenObjectType->PeakHandles = 0; SepTokenObjectType->TotalObjects = 0; SepTokenObjectType->TotalHandles = 0; SepTokenObjectType->PagedPoolCharge = 0;