[ion] 57225: [NTOSKRNL]: Fix what should be at least 40 KmTest:ob failures, by correctly using the right attributes, security mappings, flags, names, etc... for the object types. This probably fixe...
Author: ion Date: Sun Sep 2 22:06:42 2012 New Revision: 57225
URL: http://svn.reactos.org/svn/reactos?rev=57225&view=rev Log: [NTOSKRNL]: Fix what should be at least 40 KmTest:ob failures, by correctly using the right attributes, security mappings, flags, names, etc... for the object types. This probably fixes countless subtle bugs in applications/drivers that were non-obvious before, especially now that Device names are case insensitive, or that asking for certain GENERIC rights translates correctly. Thank you thfabba (Thomas Fabber) for one of the most useful, yet ignored, tests in our suite. Hope this makes it up to you.
Modified: trunk/reactos/include/ndk/extypes.h trunk/reactos/include/ndk/lpctypes.h trunk/reactos/include/ndk/mmtypes.h trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/dbgk/dbgkobj.c trunk/reactos/ntoskrnl/ex/callback.c trunk/reactos/ntoskrnl/ex/event.c trunk/reactos/ntoskrnl/ex/evtpair.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/keyedevt.c trunk/reactos/ntoskrnl/ex/mutant.c trunk/reactos/ntoskrnl/ex/profile.c trunk/reactos/ntoskrnl/ex/sem.c trunk/reactos/ntoskrnl/ex/win32k.c trunk/reactos/ntoskrnl/io/iomgr/iocomp.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/lpc/port.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ps/job.c trunk/reactos/ntoskrnl/ps/psmgr.c
Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=5... ============================================================================== --- trunk/reactos/include/ndk/extypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/extypes.h [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -82,10 +82,10 @@ // // Callback Object Access Mask // -#define CALLBACK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x0001) -#define CALLBACK_EXECUTE (STANDARD_RIGHTS_EXECUTE|SYNCHRONIZE|0x0001) -#define CALLBACK_WRITE (STANDARD_RIGHTS_WRITE|SYNCHRONIZE|0x0001) -#define CALLBACK_READ (STANDARD_RIGHTS_READ|SYNCHRONIZE|0x0001) +#define CALLBACK_MODIFY_STATE 0x0001 +#define CALLBACK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | \ + SYNCHRONIZE | \ + CALLBACK_MODIFY_STATE)
// // Event Object Access Masks
Modified: trunk/reactos/include/ndk/lpctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/lpctypes.h?rev=... ============================================================================== --- trunk/reactos/include/ndk/lpctypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/lpctypes.h [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -44,7 +44,9 @@ // Port Object Access Masks // #define PORT_CONNECT 0x1 -#define PORT_ALL_ACCESS 0x1 +#define PORT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | \ + SYNCHRONIZE | \ + PORT_CONNECT)
// // Port Object Flags
Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=5... ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -415,6 +415,21 @@ PMMPTE PrototypePte; MMPTE ThePtes[1]; } SEGMENT, *PSEGMENT; + +typedef struct _MAPPED_FILE_SEGMENT +{ + struct _CONTROL_AREA *ControlArea; + ULONG TotalNumberOfPtes; + ULONG NonExtendedPtes; + ULONG Spare0; + UINT64 SizeOfSegment; + MMPTE SegmentPteTemplate; + SIZE_T NumberOfCommittedPages; + PMMEXTEND_INFO ExtendInfo; + SEGMENT_FLAGS SegmentFlags; + PVOID BasedAddress; + struct _MSUBSECTION *LastSubsectionHint; +} MAPPED_FILE_SEGMENT, *PMAPPED_FILE_SEGMENT;
// // Event Counter Structure
Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c?... ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -866,6 +866,7 @@ ObjectTypeInitializer.QueryNameProcedure = CmpQueryKeyName; ObjectTypeInitializer.CloseProcedure = CmpCloseKeyObject; ObjectTypeInitializer.SecurityRequired = TRUE; + ObjectTypeInitializer.InvalidAttributes = OBJ_EXCLUSIVE | OBJ_PERMANENT;
/* Create it */ return ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &CmpKeyObjectType);
Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?rev... ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -1495,7 +1495,7 @@ ObjectTypeInitializer.GenericMapping = DbgkDebugObjectMapping; ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = DEBUG_OBJECT_ALL_ACCESS; - ObjectTypeInitializer.UseDefaultObject = TRUE; + ObjectTypeInitializer.SecurityRequired = TRUE; ObjectTypeInitializer.CloseProcedure = DbgkpCloseObject; ObjectTypeInitializer.DeleteProcedure = DbgkpDeleteObject; ObCreateObjectType(&Name,
Modified: trunk/reactos/ntoskrnl/ex/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/callback.c?rev=... ============================================================================== --- trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -17,9 +17,9 @@ /* Mapping for Callback Object */ GENERIC_MAPPING ExpCallbackMapping = { - CALLBACK_READ, - CALLBACK_WRITE, - CALLBACK_EXECUTE, + STANDARD_RIGHTS_READ, + STANDARD_RIGHTS_WRITE | CALLBACK_MODIFY_STATE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, CALLBACK_ALL_ACCESS };
Modified: trunk/reactos/ntoskrnl/ex/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/event.c?rev=572... ============================================================================== --- trunk/reactos/ntoskrnl/ex/event.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/event.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -23,10 +23,11 @@
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}; + STANDARD_RIGHTS_READ | EVENT_QUERY_STATE, + STANDARD_RIGHTS_WRITE | EVENT_MODIFY_STATE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, + EVENT_ALL_ACCESS +};
static const INFORMATION_CLASS_INFO ExEventInfoClass[] = { @@ -53,6 +54,7 @@ ObjectTypeInitializer.GenericMapping = ExpEventMapping; ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = EVENT_ALL_ACCESS; + ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExEventObjectType); }
Modified: trunk/reactos/ntoskrnl/ex/evtpair.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/evtpair.c?rev=5... ============================================================================== --- trunk/reactos/ntoskrnl/ex/evtpair.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/evtpair.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -23,8 +23,8 @@
GENERIC_MAPPING ExEventPairMapping = { - STANDARD_RIGHTS_READ, - STANDARD_RIGHTS_WRITE, + STANDARD_RIGHTS_READ | SYNCHRONIZE, + STANDARD_RIGHTS_WRITE | SYNCHRONIZE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, EVENT_PAIR_ALL_ACCESS }; @@ -49,6 +49,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = EVENT_PAIR_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; + ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExEventPairObjectType); }
Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=5722... ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -664,14 +664,13 @@ /* Initialize events and event pairs */ ExpInitializeEventImplementation(); ExpInitializeEventPairImplementation(); - ExpInitializeKeyedEventImplementation(); - + + /* Initialize mutants */ + ExpInitializeMutantImplementation(); + /* Initialize callbacks */ ExpInitializeCallbacks();
- /* Initialize mutants */ - ExpInitializeMutantImplementation(); - /* Initialize semaphores */ ExpInitializeSemaphoreImplementation();
@@ -683,6 +682,9 @@
/* Initialize UUIDs */ ExpInitUuids(); + + /* Initialize keyed events */ + ExpInitializeKeyedEventImplementation();
/* Initialize Win32K */ ExpWin32kInit();
Modified: trunk/reactos/ntoskrnl/ex/keyedevt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/keyedevt.c?rev=... ============================================================================== --- trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -42,7 +42,7 @@ { STANDARD_RIGHTS_READ | EVENT_QUERY_STATE, STANDARD_RIGHTS_WRITE | EVENT_MODIFY_STATE, - STANDARD_RIGHTS_EXECUTE | EVENT_QUERY_STATE, + STANDARD_RIGHTS_EXECUTE, EVENT_ALL_ACCESS };
@@ -60,7 +60,8 @@ /* Set up the object type initializer */ ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); ObjectTypeInitializer.GenericMapping = ExpKeyedEventMapping; - ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.PoolType = PagedPool; + ObjectTypeInitializer.ValidAccessMask = EVENT_ALL_ACCESS; //ObjectTypeInitializer.DeleteProcedure = ???; //ObjectTypeInitializer.OkayToCloseProcedure = ???;
Modified: trunk/reactos/ntoskrnl/ex/mutant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/mutant.c?rev=57... ============================================================================== --- trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -23,9 +23,9 @@
GENERIC_MAPPING ExpMutantMapping = { - STANDARD_RIGHTS_READ | SYNCHRONIZE | MUTANT_QUERY_STATE, - STANDARD_RIGHTS_WRITE | SYNCHRONIZE, - STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | MUTANT_QUERY_STATE, + STANDARD_RIGHTS_READ | MUTANT_QUERY_STATE, + STANDARD_RIGHTS_WRITE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, MUTANT_ALL_ACCESS };
Modified: trunk/reactos/ntoskrnl/ex/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/profile.c?rev=5... ============================================================================== --- trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -82,6 +82,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.DeleteProcedure = ExpDeleteProfile; ObjectTypeInitializer.ValidAccessMask = PROFILE_ALL_ACCESS; + ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExProfileObjectType); }
Modified: trunk/reactos/ntoskrnl/ex/sem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sem.c?rev=57225... ============================================================================== --- trunk/reactos/ntoskrnl/ex/sem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sem.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -23,9 +23,9 @@
GENERIC_MAPPING ExSemaphoreMapping = { - STANDARD_RIGHTS_READ | SEMAPHORE_QUERY_STATE, - STANDARD_RIGHTS_WRITE | SEMAPHORE_MODIFY_STATE, - STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | SEMAPHORE_QUERY_STATE, + STANDARD_RIGHTS_READ | SEMAPHORE_QUERY_STATE, + STANDARD_RIGHTS_WRITE | SEMAPHORE_MODIFY_STATE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, SEMAPHORE_ALL_ACCESS };
Modified: trunk/reactos/ntoskrnl/ex/win32k.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/win32k.c?rev=57... ============================================================================== --- trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -151,6 +151,11 @@ ObjectTypeInitializer.DeleteProcedure = ExpWinStaObjectDelete; ObjectTypeInitializer.ParseProcedure = ExpWinStaObjectParse; ObjectTypeInitializer.OkayToCloseProcedure = ExpWindowStationOkToClose; + ObjectTypeInitializer.MaintainHandleCount = TRUE; + ObjectTypeInitializer.SecurityRequired = TRUE; + ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK | + OBJ_PERMANENT | + OBJ_EXCLUSIVE; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL,
Modified: trunk/reactos/ntoskrnl/io/iomgr/iocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iocomp.c?... ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iocomp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iocomp.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -19,9 +19,9 @@
GENERIC_MAPPING IopCompletionMapping = { - STANDARD_RIGHTS_READ | IO_COMPLETION_QUERY_STATE, - STANDARD_RIGHTS_WRITE | IO_COMPLETION_MODIFY_STATE, - STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | IO_COMPLETION_QUERY_STATE, + STANDARD_RIGHTS_READ | IO_COMPLETION_QUERY_STATE, + STANDARD_RIGHTS_WRITE | IO_COMPLETION_MODIFY_STATE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, IO_COMPLETION_ALL_ACCESS };
Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?r... ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -273,6 +273,7 @@ ObjectTypeInitializer.DeleteProcedure = IopDeleteDevice; ObjectTypeInitializer.ParseProcedure = IopParseDevice; ObjectTypeInitializer.SecurityProcedure = IopSecurityFile; + ObjectTypeInitializer.CaseInsensitive = TRUE; if (!NT_SUCCESS(ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL,
Modified: trunk/reactos/ntoskrnl/lpc/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/port.c?rev=572... ============================================================================== --- trunk/reactos/ntoskrnl/lpc/port.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/port.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -14,17 +14,17 @@
/* GLOBALS *******************************************************************/
-POBJECT_TYPE LpcPortObjectType; +POBJECT_TYPE LpcPortObjectType, LpcWaitablePortObjectType; ULONG LpcpMaxMessageSize; PAGED_LOOKASIDE_LIST LpcpMessagesLookaside; KGUARDED_MUTEX LpcpLock; ULONG LpcpTraceLevel = 0; ULONG LpcpNextMessageId = 1, LpcpNextCallbackId = 1;
-static GENERIC_MAPPING LpcpPortMapping = +static GENERIC_MAPPING LpcpPortMapping = { - STANDARD_RIGHTS_READ, - STANDARD_RIGHTS_WRITE, + READ_CONTROL | PORT_CONNECT, + DELETE | PORT_CONNECT, 0, PORT_ALL_ACCESS }; @@ -46,18 +46,29 @@ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Port"); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(LPCP_PORT_OBJECT); - ObjectTypeInitializer.DefaultPagedPoolCharge = sizeof(LPCP_NONPAGED_PORT_QUEUE); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(LPCP_NONPAGED_PORT_QUEUE); + ObjectTypeInitializer.DefaultPagedPoolCharge = FIELD_OFFSET(LPCP_PORT_OBJECT, WaitEvent); ObjectTypeInitializer.GenericMapping = LpcpPortMapping; ObjectTypeInitializer.PoolType = PagedPool; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.CloseProcedure = LpcpClosePort; ObjectTypeInitializer.DeleteProcedure = LpcpDeletePort; ObjectTypeInitializer.ValidAccessMask = PORT_ALL_ACCESS; + ObjectTypeInitializer.InvalidAttributes = OBJ_VALID_ATTRIBUTES & ~OBJ_CASE_INSENSITIVE; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &LpcPortObjectType); + + RtlInitUnicodeString(&Name, L"WaitablePort"); + ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.DefaultNonPagedPoolCharge += sizeof(LPCP_PORT_OBJECT); + ObjectTypeInitializer.DefaultPagedPoolCharge = 0; + ObjectTypeInitializer.UseDefaultObject = FALSE; + ObCreateObjectType(&Name, + &ObjectTypeInitializer, + NULL, + &LpcWaitablePortObjectType);
/* Allocate the LPC lookaside list */ LpcpMaxMessageSize = LPCP_MAX_MESSAGE_SIZE;
Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=5... ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -2766,6 +2766,7 @@ ObjectTypeInitializer.DeleteProcedure = MmpDeleteSection; ObjectTypeInitializer.CloseProcedure = MmpCloseSection; ObjectTypeInitializer.ValidAccessMask = SECTION_ALL_ACCESS; + ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &MmSectionObjectType);
MmCreatePhysicalMemorySection();
Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=57... ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -202,6 +202,7 @@
/* Create the Directory Type */ RtlInitUnicodeString(&Name, L"Directory"); + ObjectTypeInitializer.PoolType = PagedPool; ObjectTypeInitializer.ValidAccessMask = DIRECTORY_ALL_ACCESS; ObjectTypeInitializer.CaseInsensitive = TRUE; ObjectTypeInitializer.MaintainTypeList = FALSE; @@ -209,6 +210,7 @@ ObjectTypeInitializer.DeleteProcedure = NULL; ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_DIRECTORY); ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObDirectoryType); + ObDirectoryType->TypeInfo.ValidAccessMask &= ~SYNCHRONIZE;
/* Create 'symbolic link' object type */ RtlInitUnicodeString(&Name, L"SymbolicLink"); @@ -218,6 +220,7 @@ ObjectTypeInitializer.ParseProcedure = ObpParseSymbolicLink; ObjectTypeInitializer.DeleteProcedure = ObpDeleteSymbolicLink; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObSymbolicLinkType); + ObSymbolicLinkType->TypeInfo.ValidAccessMask &= ~SYNCHRONIZE;
/* Phase 0 initialization complete */ ObpInitializationPhase++;
Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=57... ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -1027,11 +1027,11 @@ POBJECT_TYPE LocalObjectType; ULONG HeaderSize; NTSTATUS Status; - CHAR Tag[4]; OBP_LOOKUP_CONTEXT Context; PWCHAR p; ULONG i; UNICODE_STRING ObjectName; + ANSI_STRING AnsiName; POBJECT_HEADER_CREATOR_INFO CreatorInfo;
/* Verify parameters */ @@ -1136,12 +1136,22 @@ } else { - /* Set Tag */ - Tag[0] = (CHAR)TypeName->Buffer[0]; - Tag[1] = (CHAR)TypeName->Buffer[1]; - Tag[2] = (CHAR)TypeName->Buffer[2]; - Tag[3] = (CHAR)TypeName->Buffer[3]; - LocalObjectType->Key = *(PULONG)Tag; + /* Convert the tag to ASCII */ + Status = RtlUnicodeStringToAnsiString(&AnsiName, TypeName, TRUE); + if (NT_SUCCESS(Status)) + { + /* For every missing character, use a space */ + for (i = 3; i >= AnsiName.Length; i--) AnsiName.Buffer[i] = ' '; + + /* Set the key and free the converted name */ + LocalObjectType->Key = *(PULONG)AnsiName.Buffer; + ExFreePool(AnsiName.Buffer); + } + else + { + /* Just copy the characters */ + LocalObjectType->Key = *(PULONG)TypeName->Buffer; + } }
/* Set up the type information */
Modified: trunk/reactos/ntoskrnl/ps/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/job.c?rev=57225... ============================================================================== --- trunk/reactos/ntoskrnl/ps/job.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/job.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -40,9 +40,13 @@ GENERIC_MAPPING PspJobMapping = { STANDARD_RIGHTS_READ | JOB_OBJECT_QUERY, - STANDARD_RIGHTS_WRITE | JOB_OBJECT_ASSIGN_PROCESS | JOB_OBJECT_SET_ATTRIBUTES | JOB_OBJECT_TERMINATE | JOB_OBJECT_SET_SECURITY_ATTRIBUTES, + + STANDARD_RIGHTS_WRITE | JOB_OBJECT_ASSIGN_PROCESS | + JOB_OBJECT_SET_ATTRIBUTES | JOB_OBJECT_TERMINATE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, - STANDARD_RIGHTS_ALL | JOB_OBJECT_ALL_ACCESS + + STANDARD_RIGHTS_ALL | THREAD_ALL_ACCESS // bug fixed only in vista };
/* FUNCTIONS *****************************************************************/
Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=572... ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -500,8 +500,7 @@ /* Initialize Object Initializer */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK | - OBJ_PERMANENT | + ObjectTypeInitializer.InvalidAttributes = OBJ_PERMANENT | OBJ_EXCLUSIVE | OBJ_OPENIF; ObjectTypeInitializer.PoolType = NonPagedPool; @@ -529,6 +528,7 @@ ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(EJOB); ObjectTypeInitializer.GenericMapping = PspJobMapping; + ObjectTypeInitializer.InvalidAttributes = 0; ObjectTypeInitializer.ValidAccessMask = JOB_OBJECT_ALL_ACCESS; ObjectTypeInitializer.DeleteProcedure = PspDeleteJob; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &PsJobType);
-
ion＠svn.reactos.org