Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[hpoussin] 22292: Add documentation to SetupDiBuildClassInfoList/SetupDiBuildClassInfoListExA/W Patch by Christian Gmeiner on wine-patches ML

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Jun 9 18:16:39 2006 New Revision: 22292 URL: http://svn.reactos.ru/svn/reactos?rev=22292&view=rev Log: Add documentation to SetupDiBuildClassInfoList/SetupDiBuildClassInfoListExA/W Patch by Christian Gmeiner on wine-patches ML Modified: trunk/reactos/dll/win32/setupapi/devclass.c Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/devclass… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c Fri Jun 9 18:16:39 2006 @@ -99,6 +99,19 @@ /*********************************************************************** * SetupDiBuildClassInfoList (SETUPAPI.@) + * + * Returns a list of setup class GUIDs that identify the classes + * that are installed on a local machine. + * + * PARAMS + * Flags [I] control exclusion of classes from the list. + * ClassGuidList [O] pointer to a GUID-typed array that receives a list of setup class GUIDs. + * ClassGuidListSize [I] The number of GUIDs in the array (ClassGuidList). + * RequiredSize [O] pointer, which receives the number of GUIDs that are returned. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. */ BOOL WINAPI SetupDiBuildClassInfoList( @@ -115,6 +128,18 @@ /*********************************************************************** * SetupDiBuildClassInfoListExA (SETUPAPI.@) + * + * PARAMS + * Flags [I] control exclusion of classes from the list. + * ClassGuidList [O] pointer to a GUID-typed array that receives a list of setup class GUIDs. + * ClassGuidListSize [I] The number of GUIDs in the array (ClassGuidList). + * RequiredSize [O] pointer, which receives the number of GUIDs that are returned. + * MachineName [I] name of a remote machine. + * Reserved [I] must be NULL. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. */ BOOL WINAPI SetupDiBuildClassInfoListExA( @@ -147,7 +172,22 @@ } /*********************************************************************** - * SetupDiBuildClassInfoListExW (SETUPAPI.@) + * SetupDiBuildClassInfoListExW (SETUPAPI.@) + * + * Returns a list of setup class GUIDs that identify the classes + * that are installed on a local or remote macine. + * + * PARAMS + * Flags [I] control exclusion of classes from the list. + * ClassGuidList [O] pointer to a GUID-typed array that receives a list of setup class GUIDs. + * ClassGuidListSize [I] The number of GUIDs in the array (ClassGuidList). + * RequiredSize [O] pointer, which receives the number of GUIDs that are returned. + * MachineName [I] name of a remote machine. + * Reserved [I] must be NULL. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. */ BOOL WINAPI SetupDiBuildClassInfoListExW(

18 years, 5 months

[ion] 22291: - Fix the CmpObjectDelete bugcheck by hacking away some code reponsible for it. The bugcheck is probably the result of the current ref-count bug. - Remove some more code in IoCreateFile/IopCreateFile to help with deprecating it later.

by ion＠svn.reactos.org

Author: ion Date: Fri Jun 9 12:49:03 2006 New Revision: 22291 URL: http://svn.reactos.ru/svn/reactos?rev=22291&view=rev Log: - Fix the CmpObjectDelete bugcheck by hacking away some code reponsible for it. The bugcheck is probably the result of the current ref-count bug. - Remove some more code in IoCreateFile/IopCreateFile to help with deprecating it later. Modified: trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Fri Jun 9 12:49:03 2006 @@ -491,9 +491,9 @@ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); - if (!NT_SUCCESS(CmiRemoveKeyFromList(KeyObject))) - { - DPRINT1("Key not found in parent list ???\n"); + //if (!NT_SUCCESS(CmiRemoveKeyFromList(KeyObject))) + { + // DPRINT1("Key not found in parent list ???\n"); } RemoveEntryList(&KeyObject->ListEntry); @@ -525,7 +525,7 @@ if (KeyObject->NumberOfSubKeys) { - KEBUGCHECK(REGISTRY_ERROR); + //KEBUGCHECK(REGISTRY_ERROR); } if (KeyObject->SizeOfSubKeys) Modified: trunk/reactos/ntoskrnl/io/file.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/file.c?rev=2229… ============================================================================== --- trunk/reactos/ntoskrnl/io/file.c (original) +++ trunk/reactos/ntoskrnl/io/file.c Fri Jun 9 12:49:03 2006 @@ -130,19 +130,11 @@ POBJECT_TYPE ParentObjectType; NTSTATUS Status; - DPRINT("IopCreateFile(ObjectBody 0x%p, Parent 0x%p, RemainingPath %S)\n", - ObjectBody, - Parent, - RemainingPath); - ParentObjectType = OBJECT_TO_OBJECT_HEADER(Parent)->Type; - if (ParentObjectType == IoDeviceObjectType) { - /* Parent is a devce object */ + /* Parent is a device object */ DeviceObject = IoGetAttachedDevice((PDEVICE_OBJECT)Parent); - DPRINT1("DeviceObject 0x%p\n", DeviceObject); - if (DeviceObject->Vpb) { if (!(DeviceObject->Vpb->Flags & VPB_MOUNTED)) @@ -153,23 +145,30 @@ } DeviceObject = DeviceObject->Vpb->DeviceObject; } - - DPRINT("FsDeviceObject %lx\n", DeviceObject); - RtlCreateUnicodeString(&FileObject->FileName, RemainingPath); } else { DeviceObject = ((PFILE_OBJECT)Parent)->DeviceObject; - DPRINT("DeviceObject 0x%p\n", DeviceObject); - FileObject->RelatedFileObject = (PFILE_OBJECT)Parent; - - RtlCreateUnicodeString(&FileObject->FileName, RemainingPath); - } - + } + +#if 0 + DbgPrint("--------------------- Creating File ---------------------\n"); + DbgPrint("Parent ObjectType: %wZ\n" + "Device Object: %p\n" + "File Object: %p\n" + "Device Name: %wZ\n" + "Remaining Path: %S\n", + &ParentObjectType->Name, + DeviceObject, + FileObject, + &DeviceObject->DriverObject->DriverName, + RemainingPath); + DbgPrint("--------------------- Created File ----------------------\n"); +#endif + + RtlCreateUnicodeString(&FileObject->FileName, RemainingPath); FileObject->DeviceObject = DeviceObject; - FileObject->Vpb = DeviceObject->Vpb; - FileObject->Type = IO_TYPE_FILE; return STATUS_SUCCESS; } @@ -949,107 +948,72 @@ NULL, &LocalHandle); - if (NT_SUCCESS(Status)) - { - OBJECT_CREATE_INFORMATION ObjectCreateInfo; - OBJECT_ATTRIBUTES tmpObjectAttributes; - UNICODE_STRING ObjectName; - - DPRINT1("FileExisted: %wZ %lx\n", ObjectAttributes->ObjectName, LocalHandle); - Status = ObReferenceObjectByHandle(LocalHandle, - DesiredAccess, - NULL, - KernelMode, - (PVOID*)&DeviceObject, - NULL); - ZwClose(LocalHandle); - if (!NT_SUCCESS(Status)) - { - return Status; - } - if (OBJECT_TO_OBJECT_HEADER(DeviceObject)->Type != IoDeviceObjectType) - { - ObDereferenceObject (DeviceObject); - return STATUS_OBJECT_NAME_COLLISION; - } - - Status = ObpCaptureObjectAttributes(ObjectAttributes, - AccessMode, - FALSE, - &ObjectCreateInfo, - &ObjectName); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject (DeviceObject); - return Status; - } - - InitializeObjectAttributes(&tmpObjectAttributes, - NULL, - ObjectCreateInfo.Attributes & OBJ_INHERIT, - 0, - NULL); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName); - - - /* FIXME: wt... */ - Status = ObCreateObject(KernelMode, - IoFileObjectType, - &tmpObjectAttributes, - KernelMode, - NULL, - sizeof(FILE_OBJECT), - 0, - 0, - (PVOID*)&FileObject); - - - /* Set File Object Data */ - FileObject->DeviceObject = IoGetAttachedDevice(DeviceObject); - FileObject->Vpb = FileObject->DeviceObject->Vpb; - - /* HACK */ - FileObject->Flags |= FO_DIRECT_DEVICE_OPEN; - DPRINT("%wZ\n", ObjectAttributes->ObjectName); - - ObDereferenceObject (DeviceObject); - } - - - if (FileObject == NULL) - { - Status = ObCreateObject(AccessMode, - IoFileObjectType, - ObjectAttributes, - AccessMode, - NULL, - sizeof(FILE_OBJECT), - 0, - 0, - (PVOID*)&FileObject); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObCreateObject() failed! (Status %lx)\n", Status); - return Status; - } - } - RtlMapGenericMask(&DesiredAccess, - &OBJECT_TO_OBJECT_HEADER(FileObject)->Type->TypeInfo.GenericMapping); - - Status = ObInsertObject ((PVOID)FileObject, - NULL, - DesiredAccess, - 0, - NULL, - &LocalHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObInsertObject() failed! (Status %lx)\n", Status); - ObMakeTemporaryObject(FileObject); - ObDereferenceObject (FileObject); - return Status; - } + // + // start stuff that should be in IopParseDevice + // + if (NT_SUCCESS(Status)) + { + Status = ObReferenceObjectByHandle(LocalHandle, + DesiredAccess, + NULL, + KernelMode, + (PVOID*)&DeviceObject, + NULL); + DPRINT("FileExisted: %wZ %lx %p\n", ObjectAttributes->ObjectName, LocalHandle, DeviceObject); + ZwClose(LocalHandle); + + /* FIXME: wt... */ + Status = ObCreateObject(KernelMode, + IoFileObjectType, + NULL, + KernelMode, + NULL, + sizeof(FILE_OBJECT), + 0, + 0, + (PVOID*)&FileObject); + + /* Set File Object Data */ + FileObject->DeviceObject = IoGetAttachedDevice(DeviceObject); + + /* HACK */ + FileObject->Flags |= FO_DIRECT_DEVICE_OPEN; + DPRINT("%p\n", FileObject->DeviceObject); + ObDereferenceObject (DeviceObject); + } + + if (FileObject == NULL) + { + Status = ObCreateObject(AccessMode, + IoFileObjectType, + ObjectAttributes, + AccessMode, + NULL, + sizeof(FILE_OBJECT), + 0, + 0, + (PVOID*)&FileObject); + } + + RtlMapGenericMask(&DesiredAccess, + &OBJECT_TO_OBJECT_HEADER(FileObject)->Type->TypeInfo.GenericMapping); + + Status = ObInsertObject ((PVOID)FileObject, + NULL, + DesiredAccess, + 0, + NULL, + &LocalHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObInsertObject() failed! (Status %lx)\n", Status); + ObMakeTemporaryObject(FileObject); + ObDereferenceObject (FileObject); + return Status; + } + // + // stop stuff that should be in IopParseDevice + // if (CreateOptions & FILE_SYNCHRONOUS_IO_ALERT) {

18 years, 5 months

[ion] 22290: - Add the OPEN_PACKET structure to internal headers. Used for the I/O Parse Routine. - Gut down IopCreateFile to the strict minimum so that only the critical parts remain. - NT Compatiblity fix in ObFindObject: stop parsing if remaining path is null, this means that the parse routine is done parsing and that -this- is the final object.

by ion＠svn.reactos.org

Author: ion Date: Fri Jun 9 11:28:26 2006 New Revision: 22290 URL: http://svn.reactos.ru/svn/reactos?rev=22290&view=rev Log: - Add the OPEN_PACKET structure to internal headers. Used for the I/O Parse Routine. - Gut down IopCreateFile to the strict minimum so that only the critical parts remain. - NT Compatiblity fix in ObFindObject: stop parsing if remaining path is null, this means that the parse routine is done parsing and that -this- is the final object. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/file.c trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/i… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Fri Jun 9 11:28:26 2006 @@ -65,6 +65,44 @@ IO_STATUS_BLOCK IoStatus; } IO_COMPLETION_PACKET, *PIO_COMPLETION_PACKET; +typedef struct _DUMMY_FILE_OBJECT +{ + OBJECT_HEADER ObjectHeader; + CHAR FileObjectBody[sizeof(FILE_OBJECT)]; +} DUMMY_FILE_OBJECT, *PDUMMY_FILE_OBJECT; + +typedef struct _OPEN_PACKET +{ + CSHORT Type; + CSHORT Size; + PFILE_OBJECT FileObject; + NTSTATUS FinalStatus; + ULONG_PTR Information; + ULONG ParseCheck; + PFILE_OBJECT RelatedFileObject; + OBJECT_ATTRIBUTES OriginalAttributes; + LARGE_INTEGER AllocationSize; + ULONG CreateOptions; + USHORT FileAttributes; + USHORT ShareAccess; + PVOID EaBuffer; + ULONG EaLength; + ULONG Options; + ULONG Disposition; + PFILE_BASIC_INFORMATION BasicInformation; + PFILE_NETWORK_OPEN_INFORMATION NetworkInformation; + CREATE_FILE_TYPE CreateFileType; + PVOID MailslotOrPipeParameters; + BOOLEAN Override; + BOOLEAN QueryOnly; + BOOLEAN DeleteOnly; + BOOLEAN FullAttributes; + PDUMMY_FILE_OBJECT DummyFileObject; + ULONG InternalFlags; + //PIO_DRIVER_CREATE_CONTEXT DriverCreateContext; Vista only, needs ROS DDK Update +} OPEN_PACKET, *POPEN_PACKET; + + /* List of Bus Type GUIDs */ typedef struct _IO_BUS_TYPE_GUID_LIST { Modified: trunk/reactos/ntoskrnl/io/file.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/file.c?rev=2229… ============================================================================== --- trunk/reactos/ntoskrnl/io/file.c (original) +++ trunk/reactos/ntoskrnl/io/file.c Fri Jun 9 11:28:26 2006 @@ -125,120 +125,52 @@ PWSTR RemainingPath, POBJECT_CREATE_INFORMATION ObjectCreateInfo) { - PDEVICE_OBJECT DeviceObject; - PFILE_OBJECT FileObject = (PFILE_OBJECT) ObjectBody; - POBJECT_TYPE ParentObjectType; - NTSTATUS Status; - - DPRINT("IopCreateFile(ObjectBody 0x%p, Parent 0x%p, RemainingPath %S)\n", - ObjectBody, - Parent, - RemainingPath); - - if (NULL == Parent) - { - /* This is probably an attempt to create a meta fileobject (eg. for FAT) - for the cache manager, so return STATUS_SUCCESS */ - DPRINT("Parent object was NULL\n"); - return(STATUS_SUCCESS); - } - - ParentObjectType = OBJECT_TO_OBJECT_HEADER(Parent)->Type; - - if (ParentObjectType != IoDeviceObjectType && - ParentObjectType != IoFileObjectType) - { - DPRINT("Parent [%wZ] is a %S which is neither a file type nor a device type ; remaining path = %S\n", - &OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(Parent))->Name, - OBJECT_TO_OBJECT_HEADER(Parent)->Type->Name.Buffer, - RemainingPath); - return(STATUS_UNSUCCESSFUL); - } - - Status = ObReferenceObjectByPointer(Parent, - STANDARD_RIGHTS_REQUIRED, - ParentObjectType, - UserMode); - if (!NT_SUCCESS(Status)) - { - CPRINT("Failed to reference parent object 0x%p\n", Parent); - return(Status); - } - - if (ParentObjectType == IoDeviceObjectType) - { - /* Parent is a devce object */ - DeviceObject = IoGetAttachedDevice((PDEVICE_OBJECT)Parent); - DPRINT("DeviceObject 0x%p\n", DeviceObject); - - if (RemainingPath == NULL) - { - FileObject->Flags = FileObject->Flags | FO_DIRECT_DEVICE_OPEN; - FileObject->FileName.Buffer = 0; - FileObject->FileName.Length = FileObject->FileName.MaximumLength = 0; - } - else - { - if ((DeviceObject->DeviceType != FILE_DEVICE_FILE_SYSTEM) - && (DeviceObject->DeviceType != FILE_DEVICE_DISK) - && (DeviceObject->DeviceType != FILE_DEVICE_CD_ROM) - && (DeviceObject->DeviceType != FILE_DEVICE_TAPE) - && (DeviceObject->DeviceType != FILE_DEVICE_NETWORK) - && (DeviceObject->DeviceType != FILE_DEVICE_NAMED_PIPE) - && (DeviceObject->DeviceType != FILE_DEVICE_MAILSLOT)) + PDEVICE_OBJECT DeviceObject; + PFILE_OBJECT FileObject = (PFILE_OBJECT) ObjectBody; + POBJECT_TYPE ParentObjectType; + NTSTATUS Status; + + DPRINT("IopCreateFile(ObjectBody 0x%p, Parent 0x%p, RemainingPath %S)\n", + ObjectBody, + Parent, + RemainingPath); + + ParentObjectType = OBJECT_TO_OBJECT_HEADER(Parent)->Type; + + if (ParentObjectType == IoDeviceObjectType) + { + /* Parent is a devce object */ + DeviceObject = IoGetAttachedDevice((PDEVICE_OBJECT)Parent); + DPRINT1("DeviceObject 0x%p\n", DeviceObject); + + if (DeviceObject->Vpb) + { + if (!(DeviceObject->Vpb->Flags & VPB_MOUNTED)) { - CPRINT("Device was wrong type\n"); - return(STATUS_UNSUCCESSFUL); + DPRINT1("Mount the logical volume\n"); + Status = IoMountVolume(DeviceObject, FALSE); + DPRINT1("Status %x\n", Status); } - - if (DeviceObject->DeviceType != FILE_DEVICE_NETWORK - && (DeviceObject->DeviceType != FILE_DEVICE_NAMED_PIPE) - && (DeviceObject->DeviceType != FILE_DEVICE_MAILSLOT)) - { - if (!(DeviceObject->Vpb->Flags & VPB_MOUNTED)) - { - DPRINT("Mount the logical volume\n"); - Status = IoMountVolume(DeviceObject, FALSE); - DPRINT("Status %x\n", Status); - if (!NT_SUCCESS(Status)) - { - CPRINT("Failed to mount logical volume (Status %x)\n", Status); - return(Status); - } - } - DeviceObject = DeviceObject->Vpb->DeviceObject; - DPRINT("FsDeviceObject %lx\n", DeviceObject); - } - RtlCreateUnicodeString(&FileObject->FileName, RemainingPath); - } - } - else - { - /* Parent is a file object */ - if (RemainingPath == NULL) - { - CPRINT("Device is unnamed\n"); - return STATUS_UNSUCCESSFUL; - } - - DeviceObject = ((PFILE_OBJECT)Parent)->DeviceObject; - DPRINT("DeviceObject 0x%p\n", DeviceObject); - - FileObject->RelatedFileObject = (PFILE_OBJECT)Parent; - - RtlCreateUnicodeString(&FileObject->FileName, RemainingPath); - } - - DPRINT("FileObject->FileName %wZ\n", - &FileObject->FileName); - FileObject->DeviceObject = DeviceObject; - DPRINT("FileObject 0x%p DeviceObject 0x%p\n", - FileObject, - DeviceObject); - FileObject->Vpb = DeviceObject->Vpb; - FileObject->Type = IO_TYPE_FILE; - - return(STATUS_SUCCESS); + DeviceObject = DeviceObject->Vpb->DeviceObject; + } + + DPRINT("FsDeviceObject %lx\n", DeviceObject); + RtlCreateUnicodeString(&FileObject->FileName, RemainingPath); + } + else + { + DeviceObject = ((PFILE_OBJECT)Parent)->DeviceObject; + DPRINT("DeviceObject 0x%p\n", DeviceObject); + + FileObject->RelatedFileObject = (PFILE_OBJECT)Parent; + + RtlCreateUnicodeString(&FileObject->FileName, RemainingPath); + } + + FileObject->DeviceObject = DeviceObject; + FileObject->Vpb = DeviceObject->Vpb; + FileObject->Type = IO_TYPE_FILE; + return STATUS_SUCCESS; } VOID @@ -1023,6 +955,7 @@ OBJECT_ATTRIBUTES tmpObjectAttributes; UNICODE_STRING ObjectName; + DPRINT1("FileExisted: %wZ %lx\n", ObjectAttributes->ObjectName, LocalHandle); Status = ObReferenceObjectByHandle(LocalHandle, DesiredAccess, NULL, 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 Fri Jun 9 11:28:26 2006 @@ -288,6 +288,7 @@ } ObDereferenceObject(CurrentObject); CurrentObject = NextObject; + if (!current) break; } if (current)

18 years, 5 months

[fireball] 22289: - Added DPRINT logic in all files (to be used as "TRACE" to aid in debugging of tests) - Added initial part of Ob tests which uses ObCreateObjectType, NtCreateDirectoryObject, ObCreateObject exported APIs.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jun 9 01:39:51 2006 New Revision: 22289 URL: http://svn.reactos.ru/svn/reactos?rev=22289&view=rev Log: - Added DPRINT logic in all files (to be used as "TRACE" to aid in debugging of tests) - Added initial part of Ob tests which uses ObCreateObjectType, NtCreateDirectoryObject, ObCreateObject exported APIs. Added: trunk/reactos/drivers/test/kmtest/ntos_ob.c Modified: trunk/reactos/drivers/test/kmtest/deviface.c trunk/reactos/drivers/test/kmtest/deviface_test.c trunk/reactos/drivers/test/kmtest/kmtest.c trunk/reactos/drivers/test/kmtest/kmtest.h trunk/reactos/drivers/test/kmtest/kmtest.rbuild trunk/reactos/drivers/test/kmtest/ntos_io.c Modified: trunk/reactos/drivers/test/kmtest/deviface.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/test/kmtest/devifac… ============================================================================== --- trunk/reactos/drivers/test/kmtest/deviface.c (original) +++ trunk/reactos/drivers/test/kmtest/deviface.c Fri Jun 9 01:39:51 2006 @@ -25,6 +25,9 @@ #include <ddk/ntddk.h> #include "kmtest.h" + +//#define NDEBUG +#include "debug.h" /* PUBLIC FUNCTIONS ***********************************************************/ Modified: trunk/reactos/drivers/test/kmtest/deviface_test.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/test/kmtest/devifac… ============================================================================== --- trunk/reactos/drivers/test/kmtest/deviface_test.c (original) +++ trunk/reactos/drivers/test/kmtest/deviface_test.c Fri Jun 9 01:39:51 2006 @@ -24,6 +24,9 @@ #include <ddk/ntddk.h> #include "kmtest.h" + +//#define NDEBUG +#include "debug.h" /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/drivers/test/kmtest/kmtest.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/test/kmtest/kmtest.… ============================================================================== --- trunk/reactos/drivers/test/kmtest/kmtest.c (original) +++ trunk/reactos/drivers/test/kmtest/kmtest.c Fri Jun 9 01:39:51 2006 @@ -105,6 +105,7 @@ */ VOID FASTCALL DeviceInterfaceTest(); VOID FASTCALL NtoskrnlIoMdlTest(); +VOID FASTCALL NtoskrnlObTest(); /* * DriverEntry @@ -114,9 +115,10 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) { - DbgPrint("Kernel Mode Regression Test driver starting...\n"); + DbgPrint("\n===============================================\nKernel Mode Regression Test driver starting...\n"); //DeviceInterfaceTest(); NtoskrnlIoMdlTest(); + NtoskrnlObTest(); return STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/drivers/test/kmtest/kmtest.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/test/kmtest/kmtest.… ============================================================================== --- trunk/reactos/drivers/test/kmtest/kmtest.h (original) +++ trunk/reactos/drivers/test/kmtest/kmtest.h Fri Jun 9 01:39:51 2006 @@ -9,12 +9,6 @@ Wine regression tests Copyright (C) 2002 Alexandre Julliard. Everything else is done by Aleksey Bragin based on PnPTest by Filip Navara */ - -#if 0 -#define DPRINT DbgPrint("%s:%d ", __FILE__, __LINE__), DbgPrint -#else -#define DPRINT DbgPrint -#endif extern ULONG successes; /* number of successful tests */ extern ULONG failures; /* number of failures */ Modified: trunk/reactos/drivers/test/kmtest/kmtest.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/test/kmtest/kmtest.… ============================================================================== --- trunk/reactos/drivers/test/kmtest/kmtest.rbuild (original) +++ trunk/reactos/drivers/test/kmtest/kmtest.rbuild Fri Jun 9 01:39:51 2006 @@ -8,5 +8,6 @@ <file>deviface.c</file> <file>deviface_test.c</file> <file>ntos_io.c</file> + <file>ntos_ob.c</file> <file>kmtest.rc</file> </module> Modified: trunk/reactos/drivers/test/kmtest/ntos_io.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/test/kmtest/ntos_io… ============================================================================== --- trunk/reactos/drivers/test/kmtest/ntos_io.c (original) +++ trunk/reactos/drivers/test/kmtest/ntos_io.c Fri Jun 9 01:39:51 2006 @@ -24,6 +24,9 @@ #include <ddk/ntddk.h> #include "kmtest.h" + +#define NDEBUG +#include "debug.h" /* PUBLIC FUNCTIONS ***********************************************************/ Added: trunk/reactos/drivers/test/kmtest/ntos_ob.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/test/kmtest/ntos_ob… ============================================================================== --- trunk/reactos/drivers/test/kmtest/ntos_ob.c (added) +++ trunk/reactos/drivers/test/kmtest/ntos_ob.c Fri Jun 9 01:39:51 2006 @@ -1,0 +1,231 @@ +/* + * NTOSKRNL Ob Regressions KM-Test + * ReactOS Kernel Mode Regression Testing framework + * + * Copyright 2006 Aleksey Bragin <aleksey(a)reactos.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; see the file COPYING.LIB. + * If not, write to the Free Software Foundation, + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +/* INCLUDES *******************************************************************/ + +#include <ddk/ntddk.h> +#include "kmtest.h" + +//#define NDEBUG +#include "debug.h" + +#include "ndk/obtypes.h" +#include "ndk/obfuncs.h" + +#include "ndk/ifssupp.h" +#include "ndk/setypes.h" +#include "ndk/sefuncs.h" + +// I ment to make this test scalable, but for now +// we work with two object types only +#define NUM_OBTYPES 2 + +typedef struct _MY_OBJECT1 +{ + ULONG Something1; +} MY_OBJECT1, *PMY_OBJECT1; + +typedef struct _MY_OBJECT2 +{ + ULONG Something1; + ULONG SomeLong[10]; +} MY_OBJECT2, *PMY_OBJECT2; + +POBJECT_TYPE ObTypes[NUM_OBTYPES]; +UNICODE_STRING ObTypeName[NUM_OBTYPES]; +UNICODE_STRING ObName[NUM_OBTYPES]; +OBJECT_TYPE_INITIALIZER ObTypeInitializer[NUM_OBTYPES]; +UNICODE_STRING ObDirectoryName; +OBJECT_ATTRIBUTES ObDirectoryAttributes; +OBJECT_ATTRIBUTES ObAttributes[NUM_OBTYPES]; +PVOID ObBody[NUM_OBTYPES]; +PMY_OBJECT1 ObObject1; +PMY_OBJECT2 ObObject2; + +/* PRIVATE FUNCTIONS **********************************************************/ + +VOID +DumpProc(IN PVOID Object, + IN POB_DUMP_CONTROL DumpControl) +{ + DbgPrint("DumpProc() called\n"); +} + +VOID +OpenProc(IN OB_OPEN_REASON OpenReason, + IN PEPROCESS Process, + IN PVOID Object, + IN ACCESS_MASK GrantedAccess, + IN ULONG HandleCount) +{ + DbgPrint("OpenProc() called\n"); +} + +VOID +CloseProc(IN PEPROCESS Process, + IN PVOID Object, + IN ACCESS_MASK GrantedAccess, + IN ULONG ProcessHandleCount, + IN ULONG SystemHandleCount) +{ + DbgPrint("CloseProc() called\n"); +} + +VOID +DeleteProc(IN PVOID Object) +{ + DbgPrint("DeleteProc()called\n"); +} + +NTSTATUS +ParseProc(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) +{ + DbgPrint("ParseProc() called\n"); + return STATUS_SUCCESS; +} + +VOID +ObtCreateObjectTypes() +{ + UCHAR i; + NTSTATUS Status; + + for (i=0; i<NUM_OBTYPES; i++) + { + // Prepare object type name + // TODO: Generate type names and don't use this unprofessional, + // ugly looking, and otherwise bad if-condition + if (i == 0) + RtlInitUnicodeString(&ObTypeName[i], L"MyObjectType1"); + else + RtlInitUnicodeString(&ObTypeName[i], L"MyObjectType2"); + + // Prepare initializer + RtlZeroMemory(&ObTypeInitializer[i], sizeof(ObTypeInitializer[i])); + ObTypeInitializer[i].Length = sizeof(ObTypeInitializer[i]); + ObTypeInitializer[i].PoolType = NonPagedPool; + ObTypeInitializer[i].MaintainHandleCount = TRUE; + ObTypeInitializer[i].ValidAccessMask = OBJECT_TYPE_ALL_ACCESS; + + // Object procedures + ObTypeInitializer[i].CloseProcedure = (OB_CLOSE_METHOD)CloseProc; + ObTypeInitializer[i].DeleteProcedure = (OB_DELETE_METHOD)DeleteProc; + ObTypeInitializer[i].DumpProcedure = (OB_DUMP_METHOD)DumpProc; + ObTypeInitializer[i].OpenProcedure = (OB_OPEN_METHOD)OpenProc; + ObTypeInitializer[i].ParseProcedure = (OB_PARSE_METHOD)ParseProc; + + Status = ObCreateObjectType(&ObTypeName[i], &ObTypeInitializer[i], + (PSECURITY_DESCRIPTOR)NULL, &ObTypes[i]); + ok(Status == STATUS_SUCCESS, + "Failed to create object type with status=0x%lX", Status); + } +} + +VOID +ObtCreateDirectory() +{ + NTSTATUS Status; + HANDLE DirectoryHandle; + + // Directory will have permanent and case insensitive flags + RtlInitUnicodeString(&ObDirectoryName, L"\\ObtDirectory"); + InitializeObjectAttributes(&ObDirectoryAttributes, &ObDirectoryName, + OBJ_PERMANENT | OBJ_CASE_INSENSITIVE, NULL, NULL); + + Status = ZwCreateDirectoryObject(&DirectoryHandle, 0, &ObDirectoryAttributes); + ok(Status == STATUS_SUCCESS, + "Failed to create directory object with status=0x%lX", Status); + + Status = ZwClose(DirectoryHandle); + ok(Status == STATUS_SUCCESS, + "Failed to close handle with status=0x%lX", Status); +} + +VOID +ObtCreateObjects() +{ + NTSTATUS Status; + + RtlInitUnicodeString(&ObName[0], L"\\ObtDirectory\\MyObject1"); + InitializeObjectAttributes(&ObAttributes[0], &ObName[0], + OBJ_CASE_INSENSITIVE, NULL, NULL); + + RtlInitUnicodeString(&ObName[1], L"\\ObtDirectory\\MyObject2"); + InitializeObjectAttributes(&ObAttributes[1], &ObName[1], + OBJ_CASE_INSENSITIVE, NULL, NULL); + + Status = ObCreateObject(KernelMode, ObTypes[0], &ObAttributes[0], + KernelMode, NULL, (ULONG)sizeof(MY_OBJECT1), 0L, 0L, + (PVOID *)&ObBody[0]); + ok(Status == STATUS_SUCCESS, + "Failed to create object with status=0x%lX", Status); + DPRINT("Created Object 0\n"); + + Status = ObCreateObject(KernelMode, ObTypes[1], &ObAttributes[1], + KernelMode, NULL, (ULONG)sizeof(MY_OBJECT2), 0L, 0L, + (PVOID *)&ObBody[1]); + ok(Status == STATUS_SUCCESS, + "Failed to create object with status=0x%lX", Status); + DPRINT("Created Object 1\n"); +} + +VOID +ObtClose() +{ + // TODO: Close what we have opened and free what we allocated +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID +FASTCALL +NtoskrnlObTest() +{ + StartTest(); + + // Create object-types to use in tests + ObtCreateObjectTypes(); + DPRINT("ObtCreateObjectTypes() done\n"); + + // Create Directory + ObtCreateDirectory(); + DPRINT("ObtCreateDirectory() done\n"); + + // Create and insert objects + ObtCreateObjects(); + DPRINT("ObtCreateObjects() done\n"); + + // Clean up + ObtClose(); + DPRINT("Cleanup done\n"); + + FinishTest("NTOSKRNL Ob Manager"); +}

18 years, 5 months

[ion] 22288: - Remove the heart (but not the brain) of the IopCreateFile hack. A much 'nicer' hack now detects if a filename can't be found, and instead of inserting it into the object directory (wrong!), calling IopCreateFile (wrong!), then having it fail, only to then remove the newly inserted object entry (wrong wrong wrong!), IopCreateFile is now *only* called for real files, otherwise Ob detects the invalid name and fails nicely and quickly.

by ion＠svn.reactos.org

Author: ion Date: Fri Jun 9 01:36:44 2006 New Revision: 22288 URL: http://svn.reactos.ru/svn/reactos?rev=22288&view=rev Log: - Remove the heart (but not the brain) of the IopCreateFile hack. A much 'nicer' hack now detects if a filename can't be found, and instead of inserting it into the object directory (wrong!), calling IopCreateFile (wrong!), then having it fail, only to then remove the newly inserted object entry (wrong wrong wrong!), IopCreateFile is now *only* called for real files, otherwise Ob detects the invalid name and fails nicely and quickly. Modified: trunk/reactos/ntoskrnl/ob/obname.c 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 Fri Jun 9 01:36:44 2006 @@ -310,7 +310,6 @@ PVOID FoundObject = NULL; POBJECT_HEADER Header = OBJECT_TO_OBJECT_HEADER(Insert); POBJECT_HEADER FoundHeader = NULL; - BOOLEAN ObjectAttached = FALSE; FoundObject = *ReturnedObject; if (FoundObject) { @@ -322,6 +321,29 @@ DPRINT("Object exists\n"); ObDereferenceObject(FoundObject); return STATUS_OBJECT_NAME_COLLISION; + } + + /* + * MiniHack + * If we still have a remaining path on a directory object, but we are + * a file object, then fail, because this means the file doesn't exist + */ + if ((RemainingPath->Buffer) && + (FoundHeader && FoundHeader->Type == ObDirectoryType) && + (Header->Type == IoFileObjectType)) + { + /* Hack */ + RtlFreeUnicodeString(RemainingPath); + *ReturnedObject = NULL; + return STATUS_OBJECT_PATH_NOT_FOUND; + } + else if (Header->Type == IoFileObjectType) + { + /* Otherwise, call the hacked parse routine which will go away soon */ + Status = IopCreateFile(&Header->Body, + FoundObject, + RemainingPath->Buffer, + NULL); } if (FoundHeader && FoundHeader->Type == ObDirectoryType && @@ -347,34 +369,8 @@ ObjectNameInfo->Name.Length = RemainingPath->Length - Delta; ObjectNameInfo->Name.MaximumLength = RemainingPath->MaximumLength - Delta; ObpInsertEntryDirectory(FoundObject, Context, Header); - ObjectAttached = TRUE; - } - - 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; }

18 years, 5 months

[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

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 {

18 years, 5 months

[ion] 22286: - Kill a bunch of deprecated hacks, because removing hacks is always cool!

by ion＠svn.reactos.org

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;

18 years, 5 months

[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

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

18 years, 5 months

[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

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); } /*++

18 years, 5 months

[turner] 22283: If treat a backspace more like a normal char.

by turner＠svn.reactos.org

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 */

18 years, 5 months

← Newer
1
...
42
43
44
45
46
47
48
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2006