Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 22287: - Add Object Header Quota structure/define - Give Files/Devices a parse routine and currently stubplement it for debugging purposes and trying to figure out a way to kill the IopCreateFile hack. - Implement ObpChargeQuotaForObject. Using a memory breakpoint in WinDBG I've finally found where the OB_FLAG_CREATE_INFO flag gets masked out. Also attempted a very naive quota charging implementation, but it's a guess and probably wrong (but at least it does...something.)
by ion＠svn.reactos.org 08 Jun '06

08 Jun '06

Author: ion Date: Fri Jun 9 00:58:21 2006 New Revision: 22287 URL: http://svn.reactos.ru/svn/reactos?rev=22287&view=rev Log: - Add Object Header Quota structure/define - Give Files/Devices a parse routine and currently stubplement it for debugging purposes and trying to figure out a way to kill the IopCreateFile hack. - Implement ObpChargeQuotaForObject. Using a memory breakpoint in WinDBG I've finally found where the OB_FLAG_CREATE_INFO flag gets masked out. Also attempted a very naive quota charging implementation, but it's a guess and probably wrong (but at least it does...something.) Modified: trunk/reactos/include/ndk/obtypes.h trunk/reactos/ntoskrnl/io/file.c trunk/reactos/ntoskrnl/io/iomgr.c trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/include/ndk/obtypes.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ndk/obtypes.h?rev=2… ============================================================================== --- trunk/reactos/include/ndk/obtypes.h (original) +++ trunk/reactos/include/ndk/obtypes.h Fri Jun 9 00:58:21 2006 @@ -97,6 +97,10 @@ #define OBJECT_HEADER_TO_HANDLE_INFO(h) \ ((POBJECT_HEADER_HANDLE_INFO)(!(h)->HandleInfoOffset ? \ NULL: ((PCHAR)(h) - (h)->HandleInfoOffset))) + +#define OBJECT_HEADER_TO_QUOTA_INFO(h) \ + ((POBJECT_HEADER_QUOTA_INFO)(!(h)->QuotaInfoOffset ? \ + NULL: ((PCHAR)(h) - (h)->QuotaInfoOffset))) #define OBJECT_HEADER_TO_CREATOR_INFO(h) \ ((POBJECT_HEADER_CREATOR_INFO)(!((h)->Flags & \ @@ -409,6 +413,14 @@ USHORT Reserved; } OBJECT_HEADER_CREATOR_INFO, *POBJECT_HEADER_CREATOR_INFO; +typedef struct _OBJECT_HEADER_QUOTA_INFO +{ + ULONG PagedPoolCharge; + ULONG NonPagedPoolCharge; + ULONG SecurityDescriptorCharge; + PEPROCESS ExclusiveProcess; +} OBJECT_HEADER_QUOTA_INFO, *POBJECT_HEADER_QUOTA_INFO; + // // Object Header // Modified: trunk/reactos/ntoskrnl/io/file.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/file.c?rev=2228… ============================================================================== --- trunk/reactos/ntoskrnl/io/file.c (original) +++ trunk/reactos/ntoskrnl/io/file.c Fri Jun 9 00:58:21 2006 @@ -25,6 +25,86 @@ PULONG BufferLength); /* INTERNAL FUNCTIONS ********************************************************/ + +NTSTATUS +NTAPI +IopParseDevice(IN PVOID ParseObject, + IN POBJECT_TYPE ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING CompleteName, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *Object) +{ + DPRINT("IopParseDevice:\n" + "DeviceObject : %p, Type : %p, TypeName : %wZ\n" + "FileObject : %p, Type : %p, TypeName : %wZ\n" + "CompleteName : %wZ, RemainingName : %wZ\n", + ParseObject, + ObjectType, + &ObjectType->Name, + Context, + Context ? OBJECT_TO_OBJECT_HEADER(Context)->Type : NULL, + Context ? &OBJECT_TO_OBJECT_HEADER(Context)->Type->Name: NULL, + CompleteName, + RemainingName); + + /* + * Just clear the object and return success, and ObFindObject will behave + * just as if we had no parse procedure, so we can debug in peace. + */ + *Object = NULL; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +IopParseFile(IN PVOID ParseObject, + IN POBJECT_TYPE ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING CompleteName, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *Object) +{ + PVOID DeviceObject; + + /* Get the device object */ + DeviceObject = IoGetRelatedDeviceObject(ParseObject); + Context = ParseObject; + + DPRINT("IopParseFile:\n" + "DeviceObject : %p, Type : %p, TypeName : %wZ\n" + "FileObject : %p, Type : %p, TypeName : %wZ\n" + "CompleteName : %wZ, RemainingName : %wZ\n", + DeviceObject, + OBJECT_TO_OBJECT_HEADER(DeviceObject)->Type, + &OBJECT_TO_OBJECT_HEADER(DeviceObject)->Type->Name, + ParseObject, + ObjectType, + &ObjectType->Name, + CompleteName, + RemainingName); + + /* Call the main routine */ + return IopParseDevice(DeviceObject, + ObjectType, + AccessState, + AccessMode, + Attributes, + CompleteName, + RemainingName, + Context, + SecurityQos, + Object); + +} /* * NAME INTERNAL Modified: trunk/reactos/ntoskrnl/io/iomgr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr.c?rev=222… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr.c Fri Jun 9 00:58:21 2006 @@ -51,7 +51,31 @@ #pragma alloc_text(INIT, IoInit3) #endif - +NTSTATUS +NTAPI +IopParseFile(IN PVOID ParseObject, + IN PVOID ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING CompleteName, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *Object); + +NTSTATUS +NTAPI +IopParseDevice(IN PVOID ParseObject, + IN PVOID ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING CompleteName, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *Object); /* INIT FUNCTIONS ************************************************************/ VOID @@ -210,6 +234,7 @@ ObjectTypeInitializer.ValidAccessMask = FILE_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.GenericMapping = IopFileMapping; + ObjectTypeInitializer.ParseProcedure = IopParseDevice; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &IoDeviceObjectType); /* Do the Adapter Type */ @@ -229,6 +254,7 @@ ObjectTypeInitializer.DeleteProcedure = IopDeleteFile; ObjectTypeInitializer.SecurityProcedure = IopSecurityFile; ObjectTypeInitializer.QueryNameProcedure = IopQueryNameFile; + ObjectTypeInitializer.ParseProcedure = IopParseFile; ObjectTypeInitializer.UseDefaultObject = FALSE; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &IoFileObjectType); Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Fri Jun 9 00:58:21 2006 @@ -27,6 +27,50 @@ /* PRIVATE FUNCTIONS *********************************************************/ +NTSTATUS +NTAPI +ObpChargeQuotaForObject(IN POBJECT_HEADER ObjectHeader, + IN POBJECT_TYPE ObjectType) +{ + POBJECT_HEADER_QUOTA_INFO ObjectQuota; + ULONG PagedPoolCharge, NonPagedPoolCharge; + PEPROCESS Process; + + /* Get quota information */ + ObjectQuota = OBJECT_HEADER_TO_QUOTA_INFO(ObjectHeader); + + /* Check if this is a new object */ + if (ObjectHeader->Flags & OB_FLAG_CREATE_INFO) + { + /* Remove the flag */ + ObjectHeader->Flags &= ~ OB_FLAG_CREATE_INFO; + if (ObjectQuota) + { + /* We have a quota, get the charges */ + PagedPoolCharge = ObjectQuota->PagedPoolCharge; + NonPagedPoolCharge = ObjectQuota->NonPagedPoolCharge; + } + else + { + /* Get it from the object type */ + PagedPoolCharge = ObjectType->TypeInfo.DefaultPagedPoolCharge; + NonPagedPoolCharge = ObjectType->TypeInfo.DefaultNonPagedPoolCharge; + } + + /* + * Charge the quota + * FIXME: This is a *COMPLETE* guess and probably defintely not the way to do this. + */ + Process = PsGetCurrentProcess(); + Process->QuotaBlock->QuotaEntry[PagedPool].Usage += PagedPoolCharge; + Process->QuotaBlock->QuotaEntry[NonPagedPool].Usage += NonPagedPoolCharge; + ObjectHeader->QuotaBlockCharged = Process->QuotaBlock; + } + + /* Return success */ + return STATUS_SUCCESS; +} + /*++ * @name ObpDecrementHandleCount * @@ -247,6 +291,7 @@ POBJECT_HEADER ObjectHeader; POBJECT_TYPE ObjectType; ULONG ProcessHandleCount; + NTSTATUS Status; /* Get the object header and type */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); @@ -257,6 +302,10 @@ OpenReason, ObjectHeader->HandleCount, ObjectHeader->PointerCount); + + /* Charge quota and remove the creator info flag */ + Status = ObpChargeQuotaForObject(ObjectHeader, ObjectType); + if (!NT_SUCCESS(Status)) return Status; /* Check if we're opening an existing handle */ if (OpenReason == ObOpenHandle) @@ -1151,6 +1200,14 @@ { /* Then we are creating a new handle */ OpenReason = ObCreateHandle; + + /* Check if we still have create info */ + if (ObjectHeader->ObjectCreateInfo) + { + /* Free it */ + //ObpFreeAndReleaseCapturedAttributes(&ObjectCreateInfo); + //ObjectHeader->ObjectCreateInfo = NULL; + } } else {

1 0

[ion] 22286: - Kill a bunch of deprecated hacks, because removing hacks is always cool!
by ion＠svn.reactos.org 08 Jun '06

08 Jun '06

Author: ion Date: Thu Jun 8 23:00:22 2006 New Revision: 22286 URL: http://svn.reactos.ru/svn/reactos?rev=22286&view=rev Log: - Kill a bunch of deprecated hacks, because removing hacks is always cool! Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/ex/win32k.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ps/win32.c trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Thu Jun 8 23:00:22 2006 @@ -839,11 +839,6 @@ } -VOID -ObpGetNextHandleByProcessCount(PSYSTEM_HANDLE_TABLE_ENTRY_INFO pshi, - PEPROCESS Process, - int Count); - /* Class 16 - Handle Information */ QSI_DEF(SystemHandleInformation) { @@ -910,7 +905,7 @@ for (Count = 0; HandleCount > 0 ; HandleCount--) { - ObpGetNextHandleByProcessCount( &Shi->Handles[i], pr, Count); + Shi->Handles[i].UniqueProcessId = (ULONG)pr->UniqueProcessId; Count++; i++; } Modified: trunk/reactos/ntoskrnl/ex/win32k.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/win32k.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ex/win32k.c (original) +++ trunk/reactos/ntoskrnl/ex/win32k.c Thu Jun 8 23:00:22 2006 @@ -35,33 +35,11 @@ STANDARD_RIGHTS_REQUIRED }; -PKWIN32_OPENMETHOD_CALLOUT ExpWindowStationObjectOpen = NULL; PKWIN32_PARSEMETHOD_CALLOUT ExpWindowStationObjectParse = NULL; PKWIN32_DELETEMETHOD_CALLOUT ExpWindowStationObjectDelete = NULL; PKWIN32_DELETEMETHOD_CALLOUT ExpDesktopObjectDelete = NULL; /* FUNCTIONS ****************************************************************/ - -NTSTATUS -STDCALL -ExpWinStaObjectOpen(OB_OPEN_REASON Reason, - PEPROCESS Process, - PVOID ObjectBody, - ACCESS_MASK GrantedAccess, - ULONG HandleCount) -{ - WIN32_OPENMETHOD_PARAMETERS Parameters; - - /* Fill out the callback structure */ - Parameters.OpenReason = Reason; - Parameters.Process = Process; - Parameters.Object = ObjectBody; - Parameters.GrantedAccess = GrantedAccess; - Parameters.HandleCount = HandleCount; - - /* Call the Registered Callback */ - return ExpWindowStationObjectOpen(&Parameters); -} VOID STDCALL @@ -134,7 +112,6 @@ ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); ObjectTypeInitializer.GenericMapping = ExpWindowStationMapping; ObjectTypeInitializer.PoolType = NonPagedPool; - ObjectTypeInitializer.OpenProcedure = ExpWinStaObjectOpen; ObjectTypeInitializer.DeleteProcedure = ExpWinStaObjectDelete; ObjectTypeInitializer.ParseProcedure = ExpWinStaObjectParse; ObCreateObjectType(&Name, @@ -145,7 +122,6 @@ /* Create desktop object type */ RtlInitUnicodeString(&Name, L"Desktop"); ObjectTypeInitializer.GenericMapping = ExpDesktopMapping; - ObjectTypeInitializer.OpenProcedure = NULL; ObjectTypeInitializer.DeleteProcedure = ExpDesktopDelete; ObjectTypeInitializer.ParseProcedure = NULL; ObCreateObjectType(&Name, Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Jun 8 23:00:22 2006 @@ -316,14 +316,12 @@ /* Check if we have an open procedure */ if (ObjectType->TypeInfo.OpenProcedure) { -#if 0 /* Call it */ ObjectType->TypeInfo.OpenProcedure(OpenReason, Process, Object, AccessState->PreviouslyGrantedAccess, ProcessHandleCount); -#endif } /* Increase total number of handles */ @@ -1459,31 +1457,6 @@ return Status; } } - else - { - /* - * OK, if we got here then that means we don't have a name, - * so RemainingPath.Buffer/RemainingPath would've been NULL - * under the old implemetantation, so just use NULL. - * If remaining path wouldn't have been NULL, then we would've - * called ObFindObject which already has this code. - * We basically kill 3-4 hacks and add 2 new ones. - */ - if (Header->Type == IoFileObjectType) - { - DPRINT("About to call Open Routine\n"); - if (Header->Type == IoFileObjectType) - { - /* TEMPORARY HACK. DO NOT TOUCH -- Alex */ - DPRINT("Calling IopCreateFile: %x\n", FoundObject); - Status = IopCreateFile(&Header->Body, - FoundObject, - NULL, - NULL); - DPRINT("Called IopCreateFile: %x\n", Status); - } - } - } /* Now check if this object is being created */ if (FoundObject == Object) Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Thu Jun 8 23:00:22 2006 @@ -350,48 +350,33 @@ ObjectAttached = TRUE; } - if ((Header->Type == IoFileObjectType) || - (Header->Type->TypeInfo.OpenProcedure != NULL)) - { - DPRINT("About to call Open Routine\n"); - if (Header->Type == IoFileObjectType) - { - /* TEMPORARY HACK. DO NOT TOUCH -- Alex */ - DPRINT("Calling IopCreateFile: %x\n", FoundObject); - Status = IopCreateFile(&Header->Body, - FoundObject, - RemainingPath->Buffer, - NULL); - DPRINT("Called IopCreateFile: %x\n", Status); - - } - else if (Header->Type->TypeInfo.OpenProcedure != NULL) - { - DPRINT("Calling %x\n", Header->Type->TypeInfo.OpenProcedure); - Status = Header->Type->TypeInfo.OpenProcedure(ObCreateHandle, - NULL, - &Header->Body, - 0, - 0); - } - - if (!NT_SUCCESS(Status)) - { - DPRINT("Create Failed\n"); - if (ObjectAttached == TRUE) - { - ObpDeleteEntryDirectory(Context); - } - if (FoundObject) - { - ObDereferenceObject(FoundObject); - } - RtlFreeUnicodeString(RemainingPath); - return Status; - } + if (Header->Type == IoFileObjectType) + { + /* TEMPORARY HACK. DO NOT TOUCH -- Alex */ + DPRINT("Calling IopCreateFile: %p %p %wZ\n", &Header->Body, FoundObject, RemainingPath); + Status = IopCreateFile(&Header->Body, + FoundObject, + RemainingPath->Buffer, + NULL); + DPRINT("Called IopCreateFile: %x\n", Status); + } + + if (!NT_SUCCESS(Status)) + { + DPRINT("Create Failed\n"); + if (ObjectAttached == TRUE) + { + ObpDeleteEntryDirectory(Context); + } + if (FoundObject) + { + ObDereferenceObject(FoundObject); + } + RtlFreeUnicodeString(RemainingPath); + return Status; } RtlFreeUnicodeString(RemainingPath); - *ReturnedObject = Insert; + *ReturnedObject = Insert; } else { Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=222… ============================================================================== --- trunk/reactos/ntoskrnl/ps/win32.c (original) +++ trunk/reactos/ntoskrnl/ps/win32.c Thu Jun 8 23:00:22 2006 @@ -18,7 +18,6 @@ static PKWIN32_PROCESS_CALLOUT PspWin32ProcessCallback = NULL; static PKWIN32_THREAD_CALLOUT PspWin32ThreadCallback = NULL; -extern PKWIN32_OPENMETHOD_CALLOUT ExpWindowStationObjectOpen; extern PKWIN32_PARSEMETHOD_CALLOUT ExpWindowStationObjectParse; extern PKWIN32_DELETEMETHOD_CALLOUT ExpWindowStationObjectDelete; extern PKWIN32_DELETEMETHOD_CALLOUT ExpDesktopObjectDelete; @@ -56,7 +55,6 @@ { PspWin32ProcessCallback = CalloutData->ProcessCallout; PspWin32ThreadCallback = CalloutData->ThreadCallout; - ExpWindowStationObjectOpen = CalloutData->WindowStationOpenProcedure; ExpWindowStationObjectParse = CalloutData->WindowStationParseProcedure; ExpWindowStationObjectDelete = CalloutData->WindowStationDeleteProcedure; ExpDesktopObjectDelete = CalloutData->DesktopDeleteProcedure; Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/mai… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c Thu Jun 8 23:00:22 2006 @@ -359,7 +359,7 @@ { NTSTATUS Status; BOOLEAN Result; - WIN32_CALLOUTS_FPNS CalloutData; + WIN32_CALLOUTS_FPNS CalloutData = {0}; PVOID GlobalUserHeapBase = NULL; /* @@ -380,7 +380,6 @@ /* * Register Object Manager Callbacks */ - CalloutData.WindowStationOpenProcedure = IntWinStaObjectOpen; CalloutData.WindowStationParseProcedure = IntWinStaObjectParse; CalloutData.WindowStationDeleteProcedure = IntWinStaObjectDelete; CalloutData.DesktopDeleteProcedure = IntDesktopObjectDelete; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Thu Jun 8 23:00:22 2006 @@ -93,32 +93,6 @@ } /* OBJECT CALLBACKS **********************************************************/ - -NTSTATUS -STDCALL -IntWinStaObjectOpen(PWIN32_OPENMETHOD_PARAMETERS Parameters) -{ - PWINSTATION_OBJECT WinSta = (PWINSTATION_OBJECT)Parameters->Object; - OB_OPEN_REASON Reason = Parameters->OpenReason; - NTSTATUS Status; - - if (Reason == ObCreateHandle) - { - DPRINT("Creating window station (0x%X)\n", WinSta); - - KeInitializeSpinLock(&WinSta->Lock); - - InitializeListHead(&WinSta->DesktopListHead); - - WinSta->AtomTable = NULL; - Status = RtlCreateAtomTable(37, &WinSta->AtomTable); - WinSta->SystemMenuTemplate = (HANDLE)0; - - DPRINT("Window station successfully created.\n"); - } - - return STATUS_SUCCESS; -} VOID STDCALL IntWinStaObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters) @@ -484,6 +458,14 @@ SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); return 0; } + + KeInitializeSpinLock(&WindowStationObject->Lock); + + InitializeListHead(&WindowStationObject->DesktopListHead); + + WindowStationObject->AtomTable = NULL; + Status = RtlCreateAtomTable(37, &WindowStationObject->AtomTable); + WindowStationObject->SystemMenuTemplate = (HANDLE)0; WindowStationObject->Name = WindowStationName;

1 0

[ion] 22285: - [FORMATTING]: - Get rid of ObpGetHandleCountByHandleTable and ObpGetNextHandleByProcessCount. - Add some function comment headers. - Move ObMakeTemporaryObject, NtMakeTemporaryObject, NtMakePermanentObject to oblife.c - Move ObpDeleteNameCheck to obname.c
by ion＠svn.reactos.org 08 Jun '06

08 Jun '06

Author: ion Date: Thu Jun 8 22:24:37 2006 New Revision: 22285 URL: http://svn.reactos.ru/svn/reactos?rev=22285&view=rev Log: - [FORMATTING]: - Get rid of ObpGetHandleCountByHandleTable and ObpGetNextHandleByProcessCount. - Add some function comment headers. - Move ObMakeTemporaryObject, NtMakeTemporaryObject, NtMakePermanentObject to oblife.c - Move ObpDeleteNameCheck to obname.c Modified: trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/o… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Thu Jun 8 22:24:37 2006 @@ -34,6 +34,8 @@ (HANDLE)((ULONG_PTR)(Handle) & ~KERNEL_HANDLE_FLAG) #define ObMarkHandleAsKernelHandle(Handle) \ (HANDLE)((ULONG_PTR)(Handle) | KERNEL_HANDLE_FLAG) +#define ObpGetHandleCountByHandleTable(HandleTable) \ + ((PHANDLE_TABLE)HandleTable)->HandleCount extern KEVENT ObpDefaultObject; extern POBJECT_TYPE ObpTypeObjectType; @@ -131,10 +133,6 @@ ULONG Options ); -ULONG -NTAPI -ObpGetHandleCountByHandleTable(PHANDLE_TABLE HandleTable); - VOID NTAPI ObQueryDeviceMapInformation( Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Jun 8 22:24:37 2006 @@ -25,169 +25,7 @@ #define OBTRACE DPRINT #endif -/* UGLY FUNCTIONS ************************************************************/ - -ULONG -NTAPI -ObpGetHandleCountByHandleTable(PHANDLE_TABLE HandleTable) -{ - return HandleTable->HandleCount; -} - -VOID -ObpGetNextHandleByProcessCount(PSYSTEM_HANDLE_TABLE_ENTRY_INFO pshi, - PEPROCESS Process, - int Count) -{ - ULONG P; - // KIRQL oldIrql; - - // pshi->HandleValue; - - /* - This will never work with ROS! M$, I guess uses 0 -> 65535. - Ros uses 0 -> 4294967295! - */ - - P = (ULONG) Process->UniqueProcessId; - pshi->UniqueProcessId = (USHORT) P; - - // KeAcquireSpinLock( &Process->HandleTable.ListLock, &oldIrql ); - - // pshi->GrantedAccess; - // pshi->Object; - // pshi->TypeIndex; - // pshi->HandleAttributes; - - // KeReleaseSpinLock( &Process->HandleTable.ListLock, oldIrql ); - - return; -} - /* PRIVATE FUNCTIONS *********************************************************/ - -/*++ -* @name ObpDeleteNameCheck -* -* The ObpDeleteNameCheck routine checks if a named object should be -* removed from the object directory namespace. -* -* @param Object -* Pointer to the object to check for possible removal. -* -* @return None. -* -* @remarks An object is removed if the following 4 criteria are met: -* 1) The object has 0 handles open -* 2) The object is in the directory namespace and has a name -* 3) The object is not permanent -* -*--*/ -VOID -NTAPI -ObpDeleteNameCheck(IN PVOID Object) -{ - POBJECT_HEADER ObjectHeader; - OBP_LOOKUP_CONTEXT Context; - POBJECT_HEADER_NAME_INFO ObjectNameInfo; - POBJECT_TYPE ObjectType; - - /* Get object structures */ - ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); - ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); - ObjectType = ObjectHeader->Type; - - /* - * Check if the handle count is 0, if the object is named, - * and if the object isn't a permanent object. - */ - if (!(ObjectHeader->HandleCount) && - (ObjectNameInfo) && - (ObjectNameInfo->Name.Length) && - !(ObjectHeader->Flags & OB_FLAG_PERMANENT)) - { - /* Make sure it's still inserted */ - Context.Directory = ObjectNameInfo->Directory; - Context.DirectoryLocked = TRUE; - Object = ObpLookupEntryDirectory(ObjectNameInfo->Directory, - &ObjectNameInfo->Name, - 0, - FALSE, - &Context); - if (Object) - { - /* First delete it from the directory */ - ObpDeleteEntryDirectory(&Context); - - /* Now check if we have a security callback */ - if (ObjectType->TypeInfo.SecurityRequired) - { - /* Call it */ - ObjectType->TypeInfo.SecurityProcedure(Object, - DeleteSecurityDescriptor, - 0, - NULL, - NULL, - &ObjectHeader-> - SecurityDescriptor, - ObjectType-> - TypeInfo.PoolType, - NULL); - } - - /* Free the name */ - ExFreePool(ObjectNameInfo->Name.Buffer); - RtlInitEmptyUnicodeString(&ObjectNameInfo->Name, NULL, 0); - - /* Clear the current directory and de-reference it */ - ObDereferenceObject(ObjectNameInfo->Directory); - ObDereferenceObject(Object); - ObjectNameInfo->Directory = NULL; - } - } -} - -/*++ -* @name ObpSetPermanentObject -* -* The ObpSetPermanentObject routine makes an sets or clears the permanent -* flag of an object, thus making it either permanent or temporary. -* -* @param ObjectBody -* Pointer to the object to make permanent or temporary. -* -* @param Permanent -* Flag specifying which operation to perform. -* -* @return None. -* -* @remarks If the object is being made temporary, then it will be checked -* as a candidate for immediate removal from the namespace. -* -*--*/ -VOID -FASTCALL -ObpSetPermanentObject(IN PVOID ObjectBody, - IN BOOLEAN Permanent) -{ - POBJECT_HEADER ObjectHeader; - - /* Get the header */ - ObjectHeader = OBJECT_TO_OBJECT_HEADER(ObjectBody); - if (Permanent) - { - /* Set it to permanent */ - ObjectHeader->Flags |= OB_FLAG_PERMANENT; - } - else - { - /* Remove the flag */ - ObjectHeader->Flags &= ~OB_FLAG_PERMANENT; - - /* Check if we should delete the object now */ - ObpDeleteNameCheck(ObjectBody); - } -} /*++ * @name ObpDecrementHandleCount @@ -680,6 +518,22 @@ return STATUS_INSUFFICIENT_RESOURCES; } +/*++ +* @name ObpCloseHandle +* +* The ObpCloseHandle routine <FILLMEIN> +* +* @param Handle +* <FILLMEIN>. +* +* @param AccessMode +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ NTSTATUS NTAPI ObpCloseHandle(IN HANDLE Handle, @@ -1446,27 +1300,6 @@ { DPRINT("ObFindHandleForObject is unimplemented!\n"); return STATUS_UNSUCCESSFUL; -} - -/*++ -* @name ObMakeTemporaryObject -* @implemented NT4 -* -* The ObMakeTemporaryObject routine <FILLMEIN> -* -* @param ObjectBody -* <FILLMEIN> -* -* @return None. -* -* @remarks None. -* -*--*/ -VOID -NTAPI -ObMakeTemporaryObject(IN PVOID ObjectBody) -{ - ObpSetPermanentObject (ObjectBody, FALSE); } /*++ @@ -1753,6 +1586,23 @@ return Status; } +/*++ +* @name ObCloseHandle +* @implemented NT5.1 +* +* The ObCloseHandle routine <FILLMEIN> +* +* @param Handle +* <FILLMEIN>. +* +* @param AccessMode +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ NTSTATUS NTAPI ObCloseHandle(IN HANDLE Handle, @@ -1764,6 +1614,20 @@ return ObpCloseHandle(Handle, AccessMode); } +/*++ +* @name NtClose +* @implemented NT4 +* +* The NtClose routine <FILLMEIN> +* +* @param Handle +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ NTSTATUS NTAPI NtClose(IN HANDLE Handle) @@ -1954,83 +1818,4 @@ return Status; } -/*++ -* @name NtMakeTemporaryObject -* @implemented NT4 -* -* The NtMakeTemporaryObject routine <FILLMEIN> -* -* @param ObjectHandle -* <FILLMEIN> -* -* @return STATUS_SUCCESS or appropriate error value. -* -* @remarks None. -* -*--*/ -NTSTATUS -NTAPI -NtMakeTemporaryObject(IN HANDLE ObjectHandle) -{ - PVOID ObjectBody; - NTSTATUS Status; - PAGED_CODE(); - - /* Reference the object for DELETE access */ - Status = ObReferenceObjectByHandle(ObjectHandle, - DELETE, - NULL, - KeGetPreviousMode(), - &ObjectBody, - NULL); - if (Status != STATUS_SUCCESS) return Status; - - /* Set it as temporary and dereference it */ - ObpSetPermanentObject(ObjectBody, FALSE); - ObDereferenceObject(ObjectBody); - return STATUS_SUCCESS; -} - -/*++ -* @name NtMakePermanentObject -* @implemented NT4 -* -* The NtMakePermanentObject routine <FILLMEIN> -* -* @param ObjectHandle -* <FILLMEIN> -* -* @return STATUS_SUCCESS or appropriate error value. -* -* @remarks None. -* -*--*/ -NTSTATUS -NTAPI -NtMakePermanentObject(IN HANDLE ObjectHandle) -{ - PVOID ObjectBody; - NTSTATUS Status; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PAGED_CODE(); - - /* Make sure that the caller has SeCreatePermanentPrivilege */ - Status = SeSinglePrivilegeCheck(SeCreatePermanentPrivilege, - PreviousMode); - if (!NT_SUCCESS(Status)) return STATUS_PRIVILEGE_NOT_HELD; - - /* Reference the object */ - Status = ObReferenceObjectByHandle(ObjectHandle, - 0, - NULL, - PreviousMode, - &ObjectBody, - NULL); - if (Status != STATUS_SUCCESS) return Status; - - /* Set it as permanent and dereference it */ - ObpSetPermanentObject(ObjectBody, TRUE); - ObDereferenceObject(ObjectBody); - return STATUS_SUCCESS; -} /* EOF */ Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Thu Jun 8 22:24:37 2006 @@ -177,6 +177,48 @@ /* Move to the next one */ ReapObject = NextObject; } while(NextObject != NULL); + } +} + +/*++ +* @name ObpSetPermanentObject +* +* The ObpSetPermanentObject routine makes an sets or clears the permanent +* flag of an object, thus making it either permanent or temporary. +* +* @param ObjectBody +* Pointer to the object to make permanent or temporary. +* +* @param Permanent +* Flag specifying which operation to perform. +* +* @return None. +* +* @remarks If the object is being made temporary, then it will be checked +* as a candidate for immediate removal from the namespace. +* +*--*/ +VOID +FASTCALL +ObpSetPermanentObject(IN PVOID ObjectBody, + IN BOOLEAN Permanent) +{ + POBJECT_HEADER ObjectHeader; + + /* Get the header */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(ObjectBody); + if (Permanent) + { + /* Set it to permanent */ + ObjectHeader->Flags |= OB_FLAG_PERMANENT; + } + else + { + /* Remove the flag */ + ObjectHeader->Flags &= ~OB_FLAG_PERMANENT; + + /* Check if we should delete the object now */ + ObpDeleteNameCheck(ObjectBody); } } @@ -763,6 +805,108 @@ } /*++ +* @name ObMakeTemporaryObject +* @implemented NT4 +* +* The ObMakeTemporaryObject routine <FILLMEIN> +* +* @param ObjectBody +* <FILLMEIN> +* +* @return None. +* +* @remarks None. +* +*--*/ +VOID +NTAPI +ObMakeTemporaryObject(IN PVOID ObjectBody) +{ + /* Call the internal API */ + ObpSetPermanentObject (ObjectBody, FALSE); +} + +/*++ +* @name NtMakeTemporaryObject +* @implemented NT4 +* +* The NtMakeTemporaryObject routine <FILLMEIN> +* +* @param ObjectHandle +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI +NtMakeTemporaryObject(IN HANDLE ObjectHandle) +{ + PVOID ObjectBody; + NTSTATUS Status; + PAGED_CODE(); + + /* Reference the object for DELETE access */ + Status = ObReferenceObjectByHandle(ObjectHandle, + DELETE, + NULL, + KeGetPreviousMode(), + &ObjectBody, + NULL); + if (Status != STATUS_SUCCESS) return Status; + + /* Set it as temporary and dereference it */ + ObpSetPermanentObject(ObjectBody, FALSE); + ObDereferenceObject(ObjectBody); + return STATUS_SUCCESS; +} + +/*++ +* @name NtMakePermanentObject +* @implemented NT4 +* +* The NtMakePermanentObject routine <FILLMEIN> +* +* @param ObjectHandle +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI +NtMakePermanentObject(IN HANDLE ObjectHandle) +{ + PVOID ObjectBody; + NTSTATUS Status; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PAGED_CODE(); + + /* Make sure that the caller has SeCreatePermanentPrivilege */ + Status = SeSinglePrivilegeCheck(SeCreatePermanentPrivilege, + PreviousMode); + if (!NT_SUCCESS(Status)) return STATUS_PRIVILEGE_NOT_HELD; + + /* Reference the object */ + Status = ObReferenceObjectByHandle(ObjectHandle, + 0, + NULL, + PreviousMode, + &ObjectBody, + NULL); + if (Status != STATUS_SUCCESS) return Status; + + /* Set it as permanent and dereference it */ + ObpSetPermanentObject(ObjectBody, TRUE); + ObDereferenceObject(ObjectBody); + return STATUS_SUCCESS; +} + +/*++ * @name NtQueryObject * @implemented NT4 * Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Thu Jun 8 22:24:37 2006 @@ -19,6 +19,87 @@ POBJECT_DIRECTORY ObpTypeDirectoryObject = NULL; /* PRIVATE FUNCTIONS *********************************************************/ + +/*++ +* @name ObpDeleteNameCheck +* +* The ObpDeleteNameCheck routine checks if a named object should be +* removed from the object directory namespace. +* +* @param Object +* Pointer to the object to check for possible removal. +* +* @return None. +* +* @remarks An object is removed if the following 4 criteria are met: +* 1) The object has 0 handles open +* 2) The object is in the directory namespace and has a name +* 3) The object is not permanent +* +*--*/ +VOID +NTAPI +ObpDeleteNameCheck(IN PVOID Object) +{ + POBJECT_HEADER ObjectHeader; + OBP_LOOKUP_CONTEXT Context; + POBJECT_HEADER_NAME_INFO ObjectNameInfo; + POBJECT_TYPE ObjectType; + + /* Get object structures */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); + ObjectType = ObjectHeader->Type; + + /* + * Check if the handle count is 0, if the object is named, + * and if the object isn't a permanent object. + */ + if (!(ObjectHeader->HandleCount) && + (ObjectNameInfo) && + (ObjectNameInfo->Name.Length) && + !(ObjectHeader->Flags & OB_FLAG_PERMANENT)) + { + /* Make sure it's still inserted */ + Context.Directory = ObjectNameInfo->Directory; + Context.DirectoryLocked = TRUE; + Object = ObpLookupEntryDirectory(ObjectNameInfo->Directory, + &ObjectNameInfo->Name, + 0, + FALSE, + &Context); + if (Object) + { + /* First delete it from the directory */ + ObpDeleteEntryDirectory(&Context); + + /* Now check if we have a security callback */ + if (ObjectType->TypeInfo.SecurityRequired) + { + /* Call it */ + ObjectType->TypeInfo.SecurityProcedure(Object, + DeleteSecurityDescriptor, + 0, + NULL, + NULL, + &ObjectHeader-> + SecurityDescriptor, + ObjectType-> + TypeInfo.PoolType, + NULL); + } + + /* Free the name */ + ExFreePool(ObjectNameInfo->Name.Buffer); + RtlInitEmptyUnicodeString(&ObjectNameInfo->Name, NULL, 0); + + /* Clear the current directory and de-reference it */ + ObDereferenceObject(ObjectNameInfo->Directory); + ObDereferenceObject(Object); + ObjectNameInfo->Directory = NULL; + } + } +} NTSTATUS NTAPI

1 0

[ion] 22284: - Rename ObpDeleteHandle to ObpCloseHandleTableEntry and change semantics so that it deals directly with the entry and table. This re-factoring optimizes the case where we already have the entry and don't want to use the handle to get the kernel table and then attach/detach/enter/exit critcal regions (such as when sweeping). - Implement ObCloseHandle, a new XP Export - Take old NtClose code and write it in ObpCloseHandle, which is the master function that Ntclose/ObCloseHandle share
by ion＠svn.reactos.org 08 Jun '06

08 Jun '06

Author: ion Date: Thu Jun 8 22:09:01 2006 New Revision: 22284 URL: http://svn.reactos.ru/svn/reactos?rev=22284&view=rev Log: - Rename ObpDeleteHandle to ObpCloseHandleTableEntry and change semantics so that it deals directly with the entry and table. This re-factoring optimizes the case where we already have the entry and don't want to use the handle to get the kernel table and then attach/detach/enter/exit critcal regions (such as when sweeping). - Implement ObCloseHandle, a new XP Export - Take old NtClose code and write it in ObpCloseHandle, which is the master function that Ntclose/ObCloseHandle share. - Complete patch requires ExSweepHandleTable to be modified to return the Handle instead of the entry, so that sweeping can be fixed to properly destroy handles and call their OkayToClose, instead of just decrementing a count. Modified: trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/o… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Thu Jun 8 22:09:01 2006 @@ -14,6 +14,12 @@ KPROCESSOR_MODE PreviousMode; OBJECT_HANDLE_ATTRIBUTE_INFORMATION Information; } OBP_SET_HANDLE_ATTRIBUTES_CONTEXT, *POBP_SET_HANDLE_ATTRIBUTES_CONTEXT; + +typedef struct _OBP_CLOSE_HANDLE_CONTEXT +{ + PHANDLE_TABLE HandleTable; + KPROCESSOR_MODE AccessMode; +} OBP_CLOSE_HANDLE_CONTEXT, *POBP_CLOSE_HANDLE_CONTEXT; #define GENERIC_ACCESS (GENERIC_READ | \ GENERIC_WRITE | \ Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Jun 8 22:09:01 2006 @@ -258,11 +258,23 @@ } /*++ -* @name ObpDeleteHandle -* -* The ObpDeleteHandle routine <FILLMEIN> +* @name ObpCloseHandleTableEntry +* +* The ObpCloseHandleTableEntry routine <FILLMEIN> +* +* @param HandleTable +* <FILLMEIN>. +* +* @param HandleEntry +* <FILLMEIN>. * * @param Handle +* <FILLMEIN>. +* +* @param AccessMode +* <FILLMEIN>. +* +* @param IgnoreHandleProtection * <FILLMEIN>. * * @return <FILLMEIN>. @@ -272,83 +284,89 @@ *--*/ NTSTATUS NTAPI -ObpDeleteHandle(HANDLE Handle) -{ - PHANDLE_TABLE_ENTRY HandleEntry; +ObpCloseHandleTableEntry(IN PHANDLE_TABLE HandleTable, + IN PHANDLE_TABLE_ENTRY HandleEntry, + IN HANDLE Handle, + IN KPROCESSOR_MODE AccessMode, + IN BOOLEAN IgnoreHandleProtection) +{ PVOID Body; POBJECT_TYPE ObjectType; POBJECT_HEADER ObjectHeader; - PHANDLE_TABLE ObjectTable; ACCESS_MASK GrantedAccess; - NTSTATUS Status = STATUS_INVALID_HANDLE; PAGED_CODE(); - /* - * Get the object table of the current process/ - * NOTE: We might actually be attached to the system process - */ - ObjectTable = PsGetCurrentProcess()->ObjectTable; - - /* Enter a critical region while touching the handle locks */ - KeEnterCriticalRegion(); - - /* Get the entry for this handle */ - HandleEntry = ExMapHandleToPointer(ObjectTable, Handle); - if(HandleEntry) - { - /* Get the object data */ - ObjectHeader = EX_HTE_TO_HDR(HandleEntry); - ObjectType = ObjectHeader->Type; - Body = &ObjectHeader->Body; - GrantedAccess = HandleEntry->GrantedAccess; - OBTRACE("OBTRACE - %s - Deleting handle: %lx for %p. HC LC %lx %lx\n", - __FUNCTION__, - Handle, - Body, - ObjectHeader->HandleCount, - ObjectHeader->PointerCount); - - /* Check if the object has an Okay To Close procedure */ - if (ObjectType->TypeInfo.OkayToCloseProcedure) - { - /* Call it and check if it's not letting us close it */ - if (!ObjectType->TypeInfo.OkayToCloseProcedure(PsGetCurrentProcess(), - Body, - Handle)) + /* Get the object data */ + ObjectHeader = EX_HTE_TO_HDR(HandleEntry); + ObjectType = ObjectHeader->Type; + Body = &ObjectHeader->Body; + GrantedAccess = HandleEntry->GrantedAccess; + OBTRACE("OBTRACE - %s - Closing handle: %lx for %p. HC LC %lx %lx\n", + __FUNCTION__, + Handle, + Body, + ObjectHeader->HandleCount, + ObjectHeader->PointerCount); + + /* Check if the object has an Okay To Close procedure */ + if (ObjectType->TypeInfo.OkayToCloseProcedure) + { + /* Call it and check if it's not letting us close it */ + if (!ObjectType->TypeInfo.OkayToCloseProcedure(PsGetCurrentProcess(), + Body, + Handle)) + { + /* Fail */ + ExUnlockHandleTableEntry(HandleTable, HandleEntry); + return STATUS_HANDLE_NOT_CLOSABLE; + } + } + + /* The callback allowed us to close it, but does the handle itself? */ + if ((HandleEntry->ObAttributes & EX_HANDLE_ENTRY_PROTECTFROMCLOSE) && + !(IgnoreHandleProtection)) + { + /* It doesn't, are we from user mode? */ + if (AccessMode != KernelMode) + { + /* We are! Unlock the entry */ + ExUnlockHandleTableEntry(HandleTable, HandleEntry); + + /* Make sure we have an exception port */ + if (PsGetCurrentProcess()->ExceptionPort) { - /* Fail */ - ExUnlockHandleTableEntry(ObjectTable, HandleEntry); - KeLeaveCriticalRegion(); + /* Raise an exception */ + return KeRaiseUserException(STATUS_HANDLE_NOT_CLOSABLE); + } + else + { + /* Return the error isntead */ return STATUS_HANDLE_NOT_CLOSABLE; } } - /* The callback allowed us to close it, but does the handle itself? */ - if(HandleEntry->ObAttributes & EX_HANDLE_ENTRY_PROTECTFROMCLOSE) - { - /* Fail */ - ExUnlockHandleTableEntry(ObjectTable, HandleEntry); - KeLeaveCriticalRegion(); - return STATUS_HANDLE_NOT_CLOSABLE; - } - - /* Destroy and unlock the handle entry */ - ExDestroyHandleByEntry(ObjectTable, HandleEntry, Handle); - - /* Now decrement the handle count */ - ObpDecrementHandleCount(Body, PsGetCurrentProcess(), GrantedAccess); - Status = STATUS_SUCCESS; - OBTRACE("OBTRACE - %s - Deleted handle: %lx for %p. HC LC %lx %lx\n", - __FUNCTION__, - Handle, - Body, - ObjectHeader->HandleCount, - ObjectHeader->PointerCount); - } - - /* Leave the critical region and return the status */ - KeLeaveCriticalRegion(); - return Status; + /* Otherwise, we are kernel mode, so unlock the entry and return */ + ExUnlockHandleTableEntry(HandleTable, HandleEntry); + return STATUS_HANDLE_NOT_CLOSABLE; + } + + /* Destroy and unlock the handle entry */ + ExDestroyHandleByEntry(HandleTable, HandleEntry, Handle); + + /* Now decrement the handle count */ + ObpDecrementHandleCount(Body, PsGetCurrentProcess(), GrantedAccess); + + /* Dereference the object as well */ + //ObDereferenceObject(Body); // FIXME: Needs sync changes in other code + + /* Return to caller */ + OBTRACE("OBTRACE - %s - Closed handle: %lx for %p. HC LC %lx %lx\n", + __FUNCTION__, + Handle, + Body, + ObjectHeader->HandleCount, + ObjectHeader->PointerCount); + return STATUS_SUCCESS; } /*++ @@ -662,6 +680,89 @@ return STATUS_INSUFFICIENT_RESOURCES; } +NTSTATUS +NTAPI +ObpCloseHandle(IN HANDLE Handle, + IN KPROCESSOR_MODE AccessMode) +{ + PVOID HandleTable; + BOOLEAN AttachedToProcess = FALSE; + KAPC_STATE ApcState; + PHANDLE_TABLE_ENTRY HandleTableEntry; + NTSTATUS Status; + PAGED_CODE(); + OBTRACE("OBTRACE - %s - Closing handle: %lx\n", __FUNCTION__, Handle); + + /* Check if we're dealing with a kernel handle */ + if (ObIsKernelHandle(Handle, AccessMode)) + { + /* Use the kernel table and convert the handle */ + HandleTable = ObpKernelHandleTable; + Handle = ObKernelHandleToHandle(Handle); + + /* Check if we're not in the system process */ + if (PsGetCurrentProcess() != PsInitialSystemProcess) + { + /* Attach to the system process */ + KeStackAttachProcess(&PsInitialSystemProcess->Pcb, &ApcState); + AttachedToProcess = TRUE; + } + } + else + { + /* Use the process's handle table */ + HandleTable = PsGetCurrentProcess()->ObjectTable; + } + + /* Enter a critical region to protect handle access */ + KeEnterCriticalRegion(); + + /* Get the handle entry */ + HandleTableEntry = ExMapHandleToPointer(HandleTable, Handle); + if (HandleTableEntry) + { + /* Now close the entry */ + Status = ObpCloseHandleTableEntry(HandleTable, + HandleTableEntry, + Handle, + AccessMode, + FALSE); + + /* We can quit the critical region now */ + KeLeaveCriticalRegion(); + + /* Detach and return success */ + if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); + return STATUS_SUCCESS; + } + else + { + /* We failed, quit the critical region */ + KeLeaveCriticalRegion(); + + /* Detach */ + if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); + + /* Check if this was a user-mode caller with a valid exception port */ + if ((AccessMode != KernelMode) && + (PsGetCurrentProcess()->ExceptionPort)) + { + /* Raise an exception */ + Status = KeRaiseUserException(STATUS_INVALID_HANDLE); + } + else + { + /* Just return the status */ + Status = STATUS_INVALID_HANDLE; + } + } + + /* Return status */ + OBTRACE("OBTRACE - %s - Closed handle: %lx S: %lx\n", + __FUNCTION__, Handle, Status); + return Status; +} + /*++ * @name ObpSetHandleAttributes * @@ -750,6 +851,25 @@ * @remarks None. * *--*/ +#if 0 // waiting on thomas +BOOLEAN +NTAPI +ObpCloseHandleCallback(IN PHANDLE_TABLE_ENTRY HandleTableEntry, + IN HANDLE Handle, + IN PVOID Context) +{ + POBP_CLOSE_HANDLE_CONTEXT CloseContext = (POBP_CLOSE_HANDLE_CONTEXT)Context; + + /* Simply decrement the handle count */ + ObpCloseHandleTableEntry(Context->HandleTable, + HandleTableEntry, + Handle, + Context->AccessMode, + TRUE); + + /* Return success */ + return TRUE; +#else VOID NTAPI ObpCloseHandleCallback(IN PHANDLE_TABLE HandleTable, @@ -757,12 +877,10 @@ IN ULONG GrantedAccess, IN PVOID Context) { - PAGED_CODE(); - - /* Simply decrement the handle count */ ObpDecrementHandleCount(&EX_OBJ_TO_HDR(Object)->Body, PsGetCurrentProcess(), GrantedAccess); +#endif } /*++ @@ -893,18 +1011,24 @@ NTAPI ObKillProcess(IN PEPROCESS Process) { + PHANDLE_TABLE HandleTable = Process->ObjectTable; + OBP_CLOSE_HANDLE_CONTEXT Context; PAGED_CODE(); /* Enter a critical region */ KeEnterCriticalRegion(); + /* Fill out the context */ + Context.AccessMode = KernelMode; + Context.HandleTable = HandleTable; + /* Sweep the handle table to close all handles */ - ExSweepHandleTable(Process->ObjectTable, + ExSweepHandleTable(HandleTable, ObpCloseHandleCallback, Process); /* Destroy the table and leave the critical region */ - ExDestroyHandleTable(Process->ObjectTable); + ExDestroyHandleTable(HandleTable); KeLeaveCriticalRegion(); /* Clear the object table */ @@ -1038,7 +1162,7 @@ } /* delete the source handle */ - ObpDeleteHandle(SourceHandle); + NtClose(SourceHandle); if (AttachedToProcess) { @@ -1629,6 +1753,27 @@ return Status; } +NTSTATUS +NTAPI +ObCloseHandle(IN HANDLE Handle, + IN KPROCESSOR_MODE AccessMode) +{ + // + // Call the internal API + // + return ObpCloseHandle(Handle, AccessMode); +} + +NTSTATUS +NTAPI +NtClose(IN HANDLE Handle) +{ + // + // Call the internal API + // + return ObpCloseHandle(Handle, ExGetPreviousMode()); +} + /* * @implemented */ @@ -1770,7 +1915,7 @@ AttachedToProcess = TRUE; } - ObpDeleteHandle(SourceHandle); + NtClose(SourceHandle); if (AttachedToProcess) { @@ -1807,55 +1952,6 @@ } return Status; -} - -NTSTATUS STDCALL -NtClose(IN HANDLE Handle) -{ - PEPROCESS Process, CurrentProcess; - BOOLEAN AttachedToProcess = FALSE; - KAPC_STATE ApcState; - NTSTATUS Status; - KPROCESSOR_MODE PreviousMode; - - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - CurrentProcess = PsGetCurrentProcess(); - - if(ObIsKernelHandle(Handle, PreviousMode)) - { - Process = PsInitialSystemProcess; - Handle = ObKernelHandleToHandle(Handle); - - if (Process != CurrentProcess) - { - KeStackAttachProcess(&Process->Pcb, - &ApcState); - AttachedToProcess = TRUE; - } - } - else - Process = CurrentProcess; - - Status = ObpDeleteHandle(Handle); - - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - - if (!NT_SUCCESS(Status)) - { - if((PreviousMode != KernelMode) && - (CurrentProcess->ExceptionPort)) - { - KeRaiseUserException(Status); - } - return Status; - } - - return(STATUS_SUCCESS); } /*++

1 0

[turner] 22283: If treat a backspace more like a normal char.
by turner＠svn.reactos.org 08 Jun '06

08 Jun '06

Author: turner Date: Thu Jun 8 17:07:05 2006 New Revision: 22283 URL: http://svn.reactos.ru/svn/reactos?rev=22283&view=rev Log: If treat a backspace more like a normal char. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/csrss/win3… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Thu Jun 8 17:07:05 2006 @@ -613,13 +613,14 @@ i -= 2; /* if we already have something to return, just back it up by 2 */ } else - { /* otherwise, return STATUS_NOTIFY_CLEANUP to tell client to back up its buffer */ + { + /* otherwise, we will treat the backspace just like any other char and let the client decide what to do */ Console->WaitingChars--; ConioUnlockConsole(Console); HeapFree(Win32CsrApiHeap, 0, Input); - Request->Data.ReadConsoleRequest.NrCharactersRead = 0; - Request->Status = STATUS_NOTIFY_CLEANUP; - return STATUS_NOTIFY_CLEANUP; + Request->Data.ReadConsoleRequest.NrCharactersRead++; + Buffer[i] = Input->InputEvent.Event.KeyEvent.uChar.AsciiChar; + return Request->Status; } Request->Data.ReadConsoleRequest.nCharsCanBeDeleted--; Input->Echoed = TRUE; /* mark as echoed so we don't echo it below */

1 0

[turner] 22282: ReadConsole test to show how backspaces should be handled.
by turner＠svn.reactos.org 08 Jun '06

08 Jun '06

Author: turner Date: Thu Jun 8 16:59:32 2006 New Revision: 22282 URL: http://svn.reactos.ru/svn/reactos?rev=22282&view=rev Log: ReadConsole test to show how backspaces should be handled. Added: trunk/rosapps/tests/readconsole/ trunk/rosapps/tests/readconsole/main.c trunk/rosapps/tests/readconsole/readconsole.rbuild Modified: trunk/rosapps/tests/directory.xml Modified: trunk/rosapps/tests/directory.xml URL: http://svn.reactos.ru/svn/reactos/trunk/rosapps/tests/directory.xml?rev=222… ============================================================================== --- trunk/rosapps/tests/directory.xml (original) +++ trunk/rosapps/tests/directory.xml Thu Jun 8 16:59:32 2006 @@ -187,6 +187,10 @@ <xi:include href="p_dup_handle/p_dup_handle.xml" /> </directory> +<directory name="readconsole"> + <xi:include href="readconsole/readconsole.rbuild" /> +</directory> +  <directory name="regqueryvalue"> Added: trunk/rosapps/tests/readconsole/main.c URL: http://svn.reactos.ru/svn/reactos/trunk/rosapps/tests/readconsole/main.c?re… ============================================================================== --- trunk/rosapps/tests/readconsole/main.c (added) +++ trunk/rosapps/tests/readconsole/main.c Thu Jun 8 16:59:32 2006 @@ -1,0 +1,32 @@ +#include "stdio.h" +#include "Windows.h" + +int main() +{ + TCHAR Buffer = 0; + DWORD Count = 0; + + // + // We clear the mode, most importantly turn off ENABLE_ECHO_INPUT and ENABLE_LINE_INPUT + // This is the same mode as that is set up by getch() when trying to get a char + // + SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE),0); + + // + // We read one char from the input and then return + // + ReadConsole(GetStdHandle(STD_INPUT_HANDLE),&Buffer,1,&Count,NULL); + + // + // We print out this char as an int to show that infact a backspace does count as input + // + printf("You printed %c :: ", Buffer); + printf("With a value %d :: ", Buffer); + printf("Number of chars recieved %lu :: ", Count); + printf("Char equal to backspace %d \n", (Buffer == '\b')); + + // + // :) + // + return 0; +} Added: trunk/rosapps/tests/readconsole/readconsole.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/rosapps/tests/readconsole/readconso… ============================================================================== --- trunk/rosapps/tests/readconsole/readconsole.rbuild (added) +++ trunk/rosapps/tests/readconsole/readconsole.rbuild Thu Jun 8 16:59:32 2006 @@ -1,0 +1,5 @@ +<module name="readconsole" type="win32cui" installbase="bin" installname="readconsole.exe"> + <define name="__USE_W32API" /> + <library>kernel32</library> + <file>main.c</file> +</module>

1 0

[ion] 22281: - [FORMATTING] Add function comment headers.
by ion＠svn.reactos.org 08 Jun '06

08 Jun '06

Author: ion Date: Thu Jun 8 10:31:16 2006 New Revision: 22281 URL: http://svn.reactos.ru/svn/reactos?rev=22281&view=rev Log: - [FORMATTING] Add function comment headers. Modified: trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Jun 8 10:31:16 2006 @@ -351,6 +351,34 @@ return Status; } +/*++ +* @name ObpIncrementHandleCount +* +* The ObpIncrementHandleCount routine <FILLMEIN> +* +* @param Object +* <FILLMEIN>. +* +* @param AccessState +* <FILLMEIN>. +* +* @param AccessMode +* <FILLMEIN>. +* +* @param HandleAttributes +* <FILLMEIN>. +* +* @param Process +* <FILLMEIN>. +* +* @param OpenReason +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ NTSTATUS NTAPI ObpIncrementHandleCount(IN PVOID Object, @@ -453,14 +481,51 @@ return STATUS_SUCCESS; } +/*++ +* @name ObpCreateHandle +* +* The ObpCreateHandle routine <FILLMEIN> +* +* @param OpenReason +* <FILLMEIN>. +* +* @param Object +* <FILLMEIN>. +* +* @param Type +* <FILLMEIN>. +* +* @param AccessState +* <FILLMEIN>. +* +* @param AdditionalReferences +* <FILLMEIN>. +* +* @param HandleAttributes +* <FILLMEIN>. +* +* @param AccessMode +* <FILLMEIN>. +* +* @param ReturnedObject +* <FILLMEIN>. +* +* @param ReturnedHandle +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks Gloomy says OpenReason is "enables Security" if == 1. +* since this function *has* to call ObpIncrementHandleCount, +* which needs to somehow know the OpenReason, and since +* ObOpenHandle == 1, I'm guessing this is actually the +* OpenReason. Also makes sense since this function is shared +* by Duplication, Creation and Opening.. +* +*--*/ NTSTATUS NTAPI -ObpCreateHandle(IN OB_OPEN_REASON OpenReason, // Gloomy says this is "enables Security" if == 1. - // since this function *has* to call ObpIncrementHandleCount, - // which needs to somehow know the OpenReason, and since - // ObOpenHandle == 1, I'm guessing this is actually the - // OpenReason. Also makes sense since this function is shared - // by Duplication, Creation and Opening. +ObpCreateHandle(IN OB_OPEN_REASON OpenReason, IN PVOID Object, IN POBJECT_TYPE Type OPTIONAL, IN PACCESS_STATE AccessState, @@ -663,6 +728,28 @@ return TRUE; } +/*++ +* @name ObpCloseHandleCallback +* +* The ObpCloseHandleCallback routine <FILLMEIN> +* +* @param HandleTable +* <FILLMEIN>. +* +* @param Object +* <FILLMEIN>. +* +* @param GrantedAccess +* <FILLMEIN>. +* +* @param Context +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ VOID NTAPI ObpCloseHandleCallback(IN PHANDLE_TABLE HandleTable, @@ -678,6 +765,25 @@ GrantedAccess); } +/*++ +* @name ObpDuplicateHandleCallback +* +* The ObpDuplicateHandleCallback routine <FILLMEIN> +* +* @param HandleTable +* <FILLMEIN>. +* +* @param HandleTableEntry +* <FILLMEIN>. +* +* @param Context +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ BOOLEAN NTAPI ObpDuplicateHandleCallback(IN PHANDLE_TABLE HandleTable, @@ -723,6 +829,22 @@ return Ret; } +/*++ +* @name ObpCreateHandleTable +* +* The ObpCreateHandleTable routine <FILLMEIN> +* +* @param Parent +* <FILLMEIN>. +* +* @param Process +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ NTSTATUS NTAPI ObpCreateHandleTable(IN PEPROCESS Parent, @@ -754,6 +876,19 @@ return STATUS_SUCCESS; } +/*++ +* @name ObKillProcess +* +* The ObKillProcess routine <FILLMEIN> +* +* @param Process +* <FILLMEIN>. +* +* @return None. +* +* @remarks None. +* +*--*/ VOID NTAPI ObKillProcess(IN PEPROCESS Process) @@ -935,6 +1070,38 @@ /* PUBLIC FUNCTIONS *********************************************************/ +/*++ +* @name ObOpenObjectByName +* @implemented NT4 +* +* The ObOpenObjectByName routine <FILLMEIN> +* +* @param ObjectAttributes +* <FILLMEIN>. +* +* @param ObjectType +* <FILLMEIN>. +* +* @param AccessMode +* <FILLMEIN>. +* +* @param PassedAccessState +* <FILLMEIN>. +* +* @param DesiredAccess +* <FILLMEIN>. +* +* @param ParseContext +* <FILLMEIN>. +* +* @param Handle +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ NTSTATUS NTAPI ObOpenObjectByName(IN POBJECT_ATTRIBUTES ObjectAttributes, @@ -1047,9 +1214,38 @@ return Status; } -/* -* @implemented -*/ +/*++ +* @name ObOpenObjectByPointer +* @implemented NT4 +* +* The ObOpenObjectByPointer routine <FILLMEIN> +* +* @param Object +* <FILLMEIN>. +* +* @param HandleAttributes +* <FILLMEIN>. +* +* @param PassedAccessState +* <FILLMEIN>. +* +* @param DesiredAccess +* <FILLMEIN>. +* +* @param ObjectType +* <FILLMEIN>. +* +* @param AccessMode +* <FILLMEIN>. +* +* @param Handle +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ NTSTATUS NTAPI ObOpenObjectByPointer(IN PVOID Object, @@ -1149,16 +1345,42 @@ ObpSetPermanentObject (ObjectBody, FALSE); } -/* -* @implemented -*/ +/*++ +* @name ObInsertObject +* @implemented NT4 +* +* The ObInsertObject routine <FILLMEIN> +* +* @param Object +* <FILLMEIN>. +* +* @param PassedAccessState +* <FILLMEIN>. +* +* @param DesiredAccess +* <FILLMEIN>. +* +* @param AdditionalReferences +* <FILLMEIN>. +* +* @param ReferencedObject +* <FILLMEIN>. +* +* @param Handle +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ NTSTATUS NTAPI ObInsertObject(IN PVOID Object, IN PACCESS_STATE PassedAccessState OPTIONAL, IN ACCESS_MASK DesiredAccess, IN ULONG AdditionalReferences, - OUT PVOID* ReferencedObject OPTIONAL, + OUT PVOID *ReferencedObject OPTIONAL, OUT PHANDLE Handle) { POBJECT_CREATE_INFORMATION ObjectCreateInfo;

1 0

[ion] 22280: - ObFindObject should return the actual object being inserted, in the insert case (otherwise it always returns the root-directory instead...) - Add check for optimized case for objects with no name and no security, but not implemented (ObpIncrementUnnamedHandleCount in Gl00my docs), since I need a better translation then babelfish's. - Fix ObInsertObject to save the Security Descriptor in the Access State structure. Gl00my mentions this isn't absorbed by SeCreateAccessCheck and I ju
by ion＠svn.reactos.org 08 Jun '06

08 Jun '06

Author: ion Date: Thu Jun 8 10:17:46 2006 New Revision: 22280 URL: http://svn.reactos.ru/svn/reactos?rev=22280&view=rev Log: - ObFindObject should return the actual object being inserted, in the insert case (otherwise it always returns the root-directory instead...) - Add check for optimized case for objects with no name and no security, but not implemented (ObpIncrementUnnamedHandleCount in Gl00my docs), since I need a better translation then babelfish's. - Fix ObInsertObject to save the Security Descriptor in the Access State structure. Gl00my mentions this isn't absorbed by SeCreateAccessCheck and I just noticed that too. - We only need to perform security checks for a new object, in ObInsertObject, not if the object already existed. - Added proper backout+failure code in ObInsertObject if lookup failed, and also look out for mismatch/exists/collision cases (implemented using simple logic). Modified: trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Jun 8 10:17:46 2006 @@ -1175,6 +1175,7 @@ AUX_DATA AuxData; BOOLEAN IsNamed = FALSE; OB_OPEN_REASON OpenReason = ObCreateHandle; + static int LostOptimizations = 0; PAGED_CODE(); /* Get the Header and Create Info */ @@ -1182,6 +1183,22 @@ ObjectCreateInfo = Header->ObjectCreateInfo; ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(Header); ObjectType = Header->Type; + + /* Check if this is an named object */ + if ((ObjectNameInfo) && (ObjectNameInfo->Name.Buffer)) IsNamed = TRUE; + + /* Check if the object is unnamed and also doesn't have security */ + if ((!ObjectType->TypeInfo.SecurityRequired) && !(IsNamed)) + { + /* + * FIXME: TODO (Optimized path through ObpIncrement*UnNamed*HandleCount). + * Described in chapter 6 of Gl00my, but babelfish translation isn't fully + * clear, so waiting on Aleksey's translation. Currently just profiling. + * (about ~500 calls per boot - not critical atm). + */ + ++LostOptimizations; + DPRINT("Optimized case could've be taken: %d times!\n", LostOptimizations); + } /* Check if we didn't get an access state */ if (!PassedAccessState) @@ -1200,8 +1217,9 @@ } } - /* Check if this is an named object */ - if ((ObjectNameInfo) && (ObjectNameInfo->Name.Buffer)) IsNamed = TRUE; + /* Save the security descriptor */ + PassedAccessState->SecurityDescriptor = + ObjectCreateInfo->SecurityDescriptor; /* Check if the object is named */ if (IsNamed) @@ -1218,12 +1236,48 @@ ObjectCreateInfo->SecurityQos, ObjectCreateInfo->ParseContext, Object); - if (!NT_SUCCESS(Status)) return Status; - - if (FoundObject) - { - DPRINT("Getting header: %x\n", FoundObject); + /* Check if we found an object that doesn't match the one requested */ + if ((NT_SUCCESS(Status)) && (FoundObject) && (Object != FoundObject)) + { + /* This means we're opening an object, not creating a new one */ FoundHeader = OBJECT_TO_OBJECT_HEADER(FoundObject); + OpenReason = ObOpenHandle; + + /* Make sure the caller said it's OK to do this */ + if (ObjectCreateInfo->Attributes & OBJ_OPENIF) + { + /* He did, but did he want this type? */ + if (ObjectType != FoundHeader->Type) + { + /* Wrong type, so fail */ + Status = STATUS_OBJECT_TYPE_MISMATCH; + } + else + { + /* Right type, so warn */ + Status = STATUS_OBJECT_NAME_EXISTS; + } + } + else + { + /* Caller wanted to create a new object, fail */ + Status = STATUS_OBJECT_NAME_COLLISION; + } + } + + /* Check if anything until now failed */ + if (!NT_SUCCESS(Status)) + { + /* We failed, dereference the object and delete the access state */ + ObDereferenceObject(Object); + if (PassedAccessState == &AccessState) + { + /* We used a local one; delete it */ + SeDeleteAccessState(PassedAccessState); + } + + /* Return failure code */ + return Status; } } else @@ -1252,57 +1306,60 @@ } } - /* Check if it's named or forces security */ - if ((IsNamed) || (ObjectType->TypeInfo.SecurityRequired)) - { - /* Make sure it's inserted into an object directory */ - if ((ObjectNameInfo) && (ObjectNameInfo->Directory)) - { - /* Get the current descriptor */ - ObGetObjectSecurity(ObjectNameInfo->Directory, - &DirectorySd, - &SdAllocated); - } - - /* Now assign it */ - Status = ObAssignSecurity(PassedAccessState, - DirectorySd, - Object, - ObjectType); - - /* Check if we captured one */ - if (DirectorySd) - { - /* We did, release it */ - DPRINT1("Here\n"); - ObReleaseObjectSecurity(DirectorySd, SdAllocated); - } - else if (NT_SUCCESS(Status)) - { - /* Other we didn't, but we were able to use the current SD */ - SeReleaseSecurityDescriptor(ObjectCreateInfo->SecurityDescriptor, - ObjectCreateInfo->ProbeMode, - TRUE); - - /* Clear the current one */ - PassedAccessState->SecurityDescriptor = - ObjectCreateInfo->SecurityDescriptor = NULL; - } - } - - /* Check if anything until now failed */ - if (!NT_SUCCESS(Status)) - { - /* We failed, dereference the object and delete the access state */ - ObDereferenceObject(Object); - if (PassedAccessState == &AccessState) - { - /* We used a local one; delete it */ - SeDeleteAccessState(PassedAccessState); - } - - /* Return failure code */ - return Status; + /* Now check if this object is being created */ + if (FoundObject == Object) + { + /* Check if it's named or forces security */ + if ((IsNamed) || (ObjectType->TypeInfo.SecurityRequired)) + { + /* Make sure it's inserted into an object directory */ + if ((ObjectNameInfo) && (ObjectNameInfo->Directory)) + { + /* Get the current descriptor */ + ObGetObjectSecurity(ObjectNameInfo->Directory, + &DirectorySd, + &SdAllocated); + } + + /* Now assign it */ + Status = ObAssignSecurity(PassedAccessState, + DirectorySd, + Object, + ObjectType); + + /* Check if we captured one */ + if (DirectorySd) + { + /* We did, release it */ + ObReleaseObjectSecurity(DirectorySd, SdAllocated); + } + else if (NT_SUCCESS(Status)) + { + /* Other we didn't, but we were able to use the current SD */ + SeReleaseSecurityDescriptor(ObjectCreateInfo->SecurityDescriptor, + ObjectCreateInfo->ProbeMode, + TRUE); + + /* Clear the current one */ + PassedAccessState->SecurityDescriptor = + ObjectCreateInfo->SecurityDescriptor = NULL; + } + } + + /* Check if anything until now failed */ + if (!NT_SUCCESS(Status)) + { + /* We failed, dereference the object and delete the access state */ + ObDereferenceObject(Object); + if (PassedAccessState == &AccessState) + { + /* We used a local one; delete it */ + SeDeleteAccessState(PassedAccessState); + } + + /* Return failure code */ + return Status; + } } /* HACKHACK: Because of ROS's incorrect startup, this can be called Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Thu Jun 8 10:17:46 2006 @@ -310,6 +310,7 @@ } } RtlFreeUnicodeString(RemainingPath); + *ReturnedObject = Insert; } else {

1 0

[ion] 22279: - Fix ObGetObjectSecurity to use the object type's pool type instead of assuming PagedPool. - Re-wrote the way ObInsertObject handles security as described in Chapters 6 and 9 of Gl00my (ie: made it use ObGetObjectSecurity and ObAssignObjectSecurity; ironically, these functions already existed/are exported and could've been used since the start instead of duplicating code). - Fix ObpReferenceCachedSecurityDescriptor only to touch the cached entry if it actually gets a non-NULL descr
by ion＠svn.reactos.org 08 Jun '06

08 Jun '06

Author: ion Date: Thu Jun 8 09:41:39 2006 New Revision: 22279 URL: http://svn.reactos.ru/svn/reactos?rev=22279&view=rev Log: - Fix ObGetObjectSecurity to use the object type's pool type instead of assuming PagedPool. - Re-wrote the way ObInsertObject handles security as described in Chapters 6 and 9 of Gl00my (ie: made it use ObGetObjectSecurity and ObAssignObjectSecurity; ironically, these functions already existed/are exported and could've been used since the start instead of duplicating code). - Fix ObpReferenceCachedSecurityDescriptor only to touch the cached entry if it actually gets a non-NULL descriptor. Also improved it to return the referenced SD, instead of requiring the caller to do it manually. Modified: trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/sdcache.c trunk/reactos/ntoskrnl/ob/security.c Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/o… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Thu Jun 8 09:41:39 2006 @@ -172,9 +172,11 @@ NTAPI ObpRemoveSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor); -VOID -NTAPI -ObpReferenceCachedSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor); +PSECURITY_DESCRIPTOR +NTAPI +ObpReferenceCachedSecurityDescriptor( + IN PSECURITY_DESCRIPTOR SecurityDescriptor +); VOID NTAPI Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Jun 8 09:41:39 2006 @@ -1167,8 +1167,8 @@ PVOID FoundObject = NULL; POBJECT_HEADER FoundHeader = NULL; NTSTATUS Status = STATUS_SUCCESS; - PSECURITY_DESCRIPTOR NewSecurityDescriptor = NULL; - SECURITY_SUBJECT_CONTEXT SubjectContext; + PSECURITY_DESCRIPTOR DirectorySd = NULL; + BOOLEAN SdAllocated; OBP_LOOKUP_CONTEXT Context; POBJECT_HEADER_NAME_INFO ObjectNameInfo; ACCESS_STATE AccessState; @@ -1252,48 +1252,58 @@ } } - DPRINT("Security Assignment in progress\n"); - SeCaptureSubjectContext(&SubjectContext); - - /* Build the new security descriptor */ - Status = SeAssignSecurity((FoundHeader != NULL) ? FoundHeader->SecurityDescriptor : NULL, - (ObjectCreateInfo != NULL) ? ObjectCreateInfo->SecurityDescriptor : NULL, - &NewSecurityDescriptor, - (Header->Type == ObDirectoryType), - &SubjectContext, - &Header->Type->TypeInfo.GenericMapping, - PagedPool); - - if (NT_SUCCESS(Status)) - { - DPRINT("NewSecurityDescriptor %p\n", NewSecurityDescriptor); - - if (Header->Type->TypeInfo.SecurityProcedure != NULL) - { - /* Call the security method */ - Status = Header->Type->TypeInfo.SecurityProcedure(&Header->Body, - AssignSecurityDescriptor, - 0, - NewSecurityDescriptor, - NULL, - NULL, - NonPagedPool, - NULL); - } - else - { - /* Assign the security descriptor to the object header */ - Status = ObpAddSecurityDescriptor(NewSecurityDescriptor, - &Header->SecurityDescriptor); - DPRINT("Object security descriptor %p\n", Header->SecurityDescriptor); - } - - /* Release the new security descriptor */ - SeDeassignSecurity(&NewSecurityDescriptor); - } - - DPRINT("Security Complete\n"); - SeReleaseSubjectContext(&SubjectContext); + /* Check if it's named or forces security */ + if ((IsNamed) || (ObjectType->TypeInfo.SecurityRequired)) + { + /* Make sure it's inserted into an object directory */ + if ((ObjectNameInfo) && (ObjectNameInfo->Directory)) + { + /* Get the current descriptor */ + ObGetObjectSecurity(ObjectNameInfo->Directory, + &DirectorySd, + &SdAllocated); + } + + /* Now assign it */ + Status = ObAssignSecurity(PassedAccessState, + DirectorySd, + Object, + ObjectType); + + /* Check if we captured one */ + if (DirectorySd) + { + /* We did, release it */ + DPRINT1("Here\n"); + ObReleaseObjectSecurity(DirectorySd, SdAllocated); + } + else if (NT_SUCCESS(Status)) + { + /* Other we didn't, but we were able to use the current SD */ + SeReleaseSecurityDescriptor(ObjectCreateInfo->SecurityDescriptor, + ObjectCreateInfo->ProbeMode, + TRUE); + + /* Clear the current one */ + PassedAccessState->SecurityDescriptor = + ObjectCreateInfo->SecurityDescriptor = NULL; + } + } + + /* Check if anything until now failed */ + if (!NT_SUCCESS(Status)) + { + /* We failed, dereference the object and delete the access state */ + ObDereferenceObject(Object); + if (PassedAccessState == &AccessState) + { + /* We used a local one; delete it */ + SeDeleteAccessState(PassedAccessState); + } + + /* Return failure code */ + return Status; + } /* HACKHACK: Because of ROS's incorrect startup, this can be called * without a valid Process until I finalize the startup patch, @@ -1301,8 +1311,7 @@ * a handle if Handle is NULL when the Registry Code calls it, because * the registry code totally bastardizes the Ob and needs to be fixed */ - DPRINT("Creating handle\n"); - if (Handle != NULL) + if (Handle) { /* Create the handle */ Status = ObpCreateHandle(OpenReason, @@ -1338,7 +1347,6 @@ } /* Return failure code */ - DPRINT("Status %x\n", Status); return Status; } Modified: trunk/reactos/ntoskrnl/ob/sdcache.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/sdcache.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/sdcache.c (original) +++ trunk/reactos/ntoskrnl/ob/sdcache.c Thu Jun 8 09:41:39 2006 @@ -306,30 +306,34 @@ return STATUS_SUCCESS; } +PSECURITY_DESCRIPTOR +NTAPI +ObpReferenceCachedSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor) +{ + PSD_CACHE_ENTRY CacheEntry; + + /* Lock the cache */ + ObpSdCacheLock(); + + /* Make sure we got a descriptor */ + if (SecurityDescriptor) + { + /* Get the entry */ + CacheEntry = (PSD_CACHE_ENTRY)((ULONG_PTR)SecurityDescriptor - + sizeof(SD_CACHE_ENTRY)); + + /* Reference it */ + CacheEntry->RefCount++; + DPRINT("RefCount %lu\n", CacheEntry->RefCount); + } + + /* Unlock the cache and return the descriptor */ + ObpSdCacheUnlock(); + return SecurityDescriptor; +} VOID NTAPI -ObpReferenceCachedSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor) -{ - PSD_CACHE_ENTRY CacheEntry; - - DPRINT("ObpReferenceCachedSecurityDescriptor() called\n"); - - ObpSdCacheLock(); - - CacheEntry = (PSD_CACHE_ENTRY)((ULONG_PTR)SecurityDescriptor - sizeof(SD_CACHE_ENTRY)); - - CacheEntry->RefCount++; - DPRINT("RefCount %lu\n", CacheEntry->RefCount); - - ObpSdCacheUnlock(); - - DPRINT("ObpReferenceCachedSecurityDescriptor() done\n"); -} - - -VOID -NTAPI ObpDereferenceCachedSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor) { DPRINT("ObpDereferenceCachedSecurityDescriptor() called\n"); Modified: trunk/reactos/ntoskrnl/ob/security.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/security.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/security.c (original) +++ trunk/reactos/ntoskrnl/ob/security.c Thu Jun 8 09:41:39 2006 @@ -117,9 +117,9 @@ /* Check if the object uses default security */ if (Type->TypeInfo.SecurityProcedure == SeDefaultObjectMethod) { - /* Reference the descriptor and return it */ - ObpReferenceCachedSecurityDescriptor(Header->SecurityDescriptor); - *SecurityDescriptor = Header->SecurityDescriptor; + /* Reference the descriptor */ + *SecurityDescriptor = + ObpReferenceCachedSecurityDescriptor(Header->SecurityDescriptor); /* Tell the caller that we didn't have to allocate anything */ *MemoryAllocated = FALSE; @@ -134,10 +134,10 @@ GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION, - NULL, + *SecurityDescriptor, &Length, &Header->SecurityDescriptor, - PagedPool, + Type->TypeInfo.PoolType, &Type->TypeInfo.GenericMapping); if (Status != STATUS_BUFFER_TOO_SMALL) return Status; @@ -158,7 +158,7 @@ *SecurityDescriptor, &Length, &Header->SecurityDescriptor, - PagedPool, + Type->TypeInfo.PoolType, &Type->TypeInfo.GenericMapping); if (!NT_SUCCESS(Status)) {

1 0

[ion] 22278: - I just noticed that ObInsertObject never got updated to deal with the improvements in ObFindObject and ACCESS_STATE usage, so made the following fixes: * Create the ACCESS_STATE structure much earlier. * Actually send the access state and parse context to ObFindObject, when called from ObInsertObject (this should fix some hidden regressions, since they finally get an access state with access masks now). * Remove some deprecated hacks. * If inserting the handle failed, cleanup the
by ion＠svn.reactos.org 08 Jun '06

08 Jun '06

Author: ion Date: Thu Jun 8 06:56:59 2006 New Revision: 22278 URL: http://svn.reactos.ru/svn/reactos?rev=22278&view=rev Log: - I just noticed that ObInsertObject never got updated to deal with the improvements in ObFindObject and ACCESS_STATE usage, so made the following fixes: * Create the ACCESS_STATE structure much earlier. * Actually send the access state and parse context to ObFindObject, when called from ObInsertObject (this should fix some hidden regressions, since they finally get an access state with access masks now). * Remove some deprecated hacks. * If inserting the handle failed, cleanup the name and remove it from the directory entry. * Fix a memory leak because we weren't deleting the access state. Modified: trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Jun 8 06:56:59 2006 @@ -1152,8 +1152,8 @@ /* * @implemented */ -NTSTATUS -STDCALL +NTSTATUS +NTAPI ObInsertObject(IN PVOID Object, IN PACCESS_STATE PassedAccessState OPTIONAL, IN ACCESS_MASK DesiredAccess, @@ -1163,6 +1163,7 @@ { POBJECT_CREATE_INFORMATION ObjectCreateInfo; POBJECT_HEADER Header; + POBJECT_TYPE ObjectType; PVOID FoundObject = NULL; POBJECT_HEADER FoundHeader = NULL; NTSTATUS Status = STATUS_SUCCESS; @@ -1172,27 +1173,51 @@ POBJECT_HEADER_NAME_INFO ObjectNameInfo; ACCESS_STATE AccessState; AUX_DATA AuxData; + BOOLEAN IsNamed = FALSE; + OB_OPEN_REASON OpenReason = ObCreateHandle; PAGED_CODE(); /* Get the Header and Create Info */ Header = OBJECT_TO_OBJECT_HEADER(Object); ObjectCreateInfo = Header->ObjectCreateInfo; ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(Header); - - /* First try to find the Object */ - if (ObjectNameInfo && ObjectNameInfo->Name.Buffer) - { + ObjectType = Header->Type; + + /* Check if we didn't get an access state */ + if (!PassedAccessState) + { + /* Use our built-in access state */ + PassedAccessState = &AccessState; + Status = SeCreateAccessState(&AccessState, + &AuxData, + DesiredAccess, + &ObjectType->TypeInfo.GenericMapping); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + ObDereferenceObject(Object); + return Status; + } + } + + /* Check if this is an named object */ + if ((ObjectNameInfo) && (ObjectNameInfo->Name.Buffer)) IsNamed = TRUE; + + /* Check if the object is named */ + if (IsNamed) + { + /* Look it up */ Status = ObFindObject(ObjectCreateInfo->RootDirectory, - &ObjectNameInfo->Name, - ObjectCreateInfo->Attributes, - KernelMode, - &FoundObject, - Header->Type, - &Context, - NULL, - ObjectCreateInfo->SecurityQos, - NULL, - Object); + &ObjectNameInfo->Name, + ObjectCreateInfo->Attributes, + KernelMode, + &FoundObject, + ObjectType, + &Context, + PassedAccessState, + ObjectCreateInfo->SecurityQos, + ObjectCreateInfo->ParseContext, + Object); if (!NT_SUCCESS(Status)) return Status; if (FoundObject) @@ -1211,8 +1236,7 @@ * called ObFindObject which already has this code. * We basically kill 3-4 hacks and add 2 new ones. */ - if ((Header->Type == IoFileObjectType) || - (Header->Type->TypeInfo.OpenProcedure != NULL)) + if (Header->Type == IoFileObjectType) { DPRINT("About to call Open Routine\n"); if (Header->Type == IoFileObjectType) @@ -1225,22 +1249,6 @@ NULL); DPRINT("Called IopCreateFile: %x\n", Status); } - else if (Header->Type->TypeInfo.OpenProcedure) - { - DPRINT("Calling %x\n", Header->Type->TypeInfo.OpenProcedure); - Status = Header->Type->TypeInfo.OpenProcedure(ObCreateHandle, - NULL, - &Header->Body, - 0, - 0); - } - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Create Failed\n"); - if (FoundObject) ObDereferenceObject(FoundObject); - return Status; - } } } @@ -1287,24 +1295,6 @@ DPRINT("Security Complete\n"); SeReleaseSubjectContext(&SubjectContext); - /* Check if we didn't get an access state */ - if (!PassedAccessState) - { - /* Use our built-in access state */ - PassedAccessState = &AccessState; - Status = SeCreateAccessState(&AccessState, - &AuxData, - DesiredAccess, - &Header->Type->TypeInfo.GenericMapping); - if (!NT_SUCCESS(Status)) - { - /* Fail */ - ObDereferenceObject(Object); - return Status; - } - } - - /* Create the Handle */ /* HACKHACK: Because of ROS's incorrect startup, this can be called * without a valid Process until I finalize the startup patch, * so don't create a handle if this is the case. We also don't create @@ -1314,7 +1304,8 @@ DPRINT("Creating handle\n"); if (Handle != NULL) { - Status = ObpCreateHandle(ObCreateHandle, + /* Create the handle */ + Status = ObpCreateHandle(OpenReason, &Header->Body, NULL, PassedAccessState, @@ -1329,6 +1320,24 @@ Header->ObjectCreateInfo = NULL; ObpFreeAndReleaseCapturedAttributes(ObjectCreateInfo); + /* Check if creating the handle failed */ + if (!NT_SUCCESS(Status)) + { + /* If the object had a name, backout everything */ + if (IsNamed) ObpDeleteNameCheck(Object); + } + + /* Remove the extra keep-alive reference */ + //ObDereferenceObject(Object); FIXME: Will require massive changes + + /* Check if we created our own access state */ + if (PassedAccessState == &AccessState) + { + /* We used a local one; delete it */ + SeDeleteAccessState(PassedAccessState); + } + + /* Return failure code */ DPRINT("Status %x\n", Status); return Status; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs