Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 22748: - Add some more functions that just build IRPs to send to devices into iofunc.c from vpb.c - Add IoCheckQuerySetvolumeInformation to util.c from vpb.c with other similar functions - Add the actual VPB functions in vpc.c to fs.c, and rename fs.c to volume.c, because it already contained Volume APIs, and now with VPB, even more so. It also still contains the FileSystem stuff, which is of course also generically part of "volumes". - Delete vpb.c, rename fs.c to volume.c.
by ion＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: ion Date: Sun Jul 2 01:58:29 2006 New Revision: 22748 URL: http://svn.reactos.org/svn/reactos?rev=22748&view=rev Log: - Add some more functions that just build IRPs to send to devices into iofunc.c from vpb.c - Add IoCheckQuerySetvolumeInformation to util.c from vpb.c with other similar functions - Add the actual VPB functions in vpc.c to fs.c, and rename fs.c to volume.c, because it already contained Volume APIs, and now with VPB, even more so. It also still contains the FileSystem stuff, which is of course also generically part of "volumes". - Delete vpb.c, rename fs.c to volume.c. Added: trunk/reactos/ntoskrnl/io/iomgr/volume.c - copied, changed from r22747, trunk/reactos/ntoskrnl/io/iomgr/fs.c Removed: trunk/reactos/ntoskrnl/io/iomgr/fs.c trunk/reactos/ntoskrnl/io/iomgr/vpb.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/io/iomgr/util.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Removed: trunk/reactos/ntoskrnl/io/iomgr/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/fs.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/fs.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/fs.c (removed) @@ -1,606 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/io/fs.c - * PURPOSE: Filesystem functions - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, IoInitFileSystemImplementation) -#endif - -/* TYPES *******************************************************************/ - -typedef struct _FILE_SYSTEM_OBJECT -{ - PDEVICE_OBJECT DeviceObject; - LIST_ENTRY Entry; -} FILE_SYSTEM_OBJECT, *PFILE_SYSTEM_OBJECT; - -typedef struct _FS_CHANGE_NOTIFY_ENTRY -{ - LIST_ENTRY FsChangeNotifyList; - PDRIVER_OBJECT DriverObject; - PDRIVER_FS_NOTIFICATION FSDNotificationProc; -} FS_CHANGE_NOTIFY_ENTRY, *PFS_CHANGE_NOTIFY_ENTRY; - -/* GLOBALS ******************************************************************/ - -static ERESOURCE FileSystemListLock; -static LIST_ENTRY FileSystemListHead; - -static KGUARDED_MUTEX FsChangeNotifyListLock; -static LIST_ENTRY FsChangeNotifyListHead; - -static VOID -IopNotifyFileSystemChange(PDEVICE_OBJECT DeviceObject, - BOOLEAN DriverActive); - - -/* FUNCTIONS *****************************************************************/ - -VOID INIT_FUNCTION -IoInitFileSystemImplementation(VOID) -{ - InitializeListHead(&FileSystemListHead); - ExInitializeResourceLite(&FileSystemListLock); - - InitializeListHead(&FsChangeNotifyListHead); - KeInitializeGuardedMutex(&FsChangeNotifyListLock); -} - - -VOID -IoShutdownRegisteredFileSystems(VOID) -{ - FILE_SYSTEM_OBJECT* current; - PIRP Irp; - KEVENT Event; - IO_STATUS_BLOCK IoStatusBlock; - NTSTATUS Status; - - DPRINT("IoShutdownRegisteredFileSystems()\n"); - - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); - KeInitializeEvent(&Event, - NotificationEvent, - FALSE); - - LIST_FOR_EACH(current, &FileSystemListHead, FILE_SYSTEM_OBJECT,Entry) - { - /* send IRP_MJ_SHUTDOWN */ - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_SHUTDOWN, - current->DeviceObject, - NULL, - 0, - 0, - &Event, - &IoStatusBlock); - - Status = IoCallDriver(current->DeviceObject,Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, - Executive, - KernelMode, - FALSE, - NULL); - } - } - - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); -} - - -static NTSTATUS -IopMountFileSystem(PDEVICE_OBJECT DeviceObject, - PDEVICE_OBJECT DeviceToMount) -{ - IO_STATUS_BLOCK IoStatusBlock; - PIO_STACK_LOCATION StackPtr; - KEVENT Event; - PIRP Irp; - NTSTATUS Status; - - DPRINT("IopMountFileSystem(DeviceObject 0x%p, DeviceToMount 0x%p)\n", - DeviceObject,DeviceToMount); - - ASSERT_IRQL(PASSIVE_LEVEL); - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - if (Irp==NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - - Irp->UserIosb = &IoStatusBlock; - DPRINT("Irp->UserIosb 0x%p\n", Irp->UserIosb); - Irp->UserEvent = &Event; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_FILE_SYSTEM_CONTROL; - StackPtr->MinorFunction = IRP_MN_MOUNT_VOLUME; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = NULL; - StackPtr->CompletionRoutine = NULL; - - StackPtr->Parameters.MountVolume.Vpb = DeviceToMount->Vpb; - StackPtr->Parameters.MountVolume.DeviceObject = DeviceToMount; - - Status = IoCallDriver(DeviceObject,Irp); - if (Status==STATUS_PENDING) - { - KeWaitForSingleObject(&Event,Executive,KernelMode,FALSE,NULL); - Status = IoStatusBlock.Status; - } - - return(Status); -} - - -static NTSTATUS -IopLoadFileSystem(IN PDEVICE_OBJECT DeviceObject) -{ - IO_STATUS_BLOCK IoStatusBlock; - PIO_STACK_LOCATION StackPtr; - KEVENT Event; - PIRP Irp; - NTSTATUS Status; - - DPRINT("IopLoadFileSystem(DeviceObject 0x%p)\n", DeviceObject); - - ASSERT_IRQL(PASSIVE_LEVEL); - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - if (Irp==NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - - Irp->UserIosb = &IoStatusBlock; - DPRINT("Irp->UserIosb 0x%p\n", Irp->UserIosb); - Irp->UserEvent = &Event; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_FILE_SYSTEM_CONTROL; - StackPtr->MinorFunction = IRP_MN_LOAD_FILE_SYSTEM; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = NULL; - StackPtr->CompletionRoutine = NULL; - - Status = IoCallDriver(DeviceObject,Irp); - if (Status==STATUS_PENDING) - { - KeWaitForSingleObject(&Event,Executive,KernelMode,FALSE,NULL); - Status = IoStatusBlock.Status; - } - - return(Status); -} - - -NTSTATUS -IoMountVolume(IN PDEVICE_OBJECT DeviceObject, - IN BOOLEAN AllowRawMount) -/* - * FUNCTION: Mounts a logical volume - * ARGUMENTS: - * DeviceObject = Device to mount - * RETURNS: Status - */ -{ - PFILE_SYSTEM_OBJECT current; - NTSTATUS Status; - DEVICE_TYPE MatchingDeviceType; - PDEVICE_OBJECT DevObject; - - ASSERT_IRQL(PASSIVE_LEVEL); - - DPRINT("IoMountVolume(DeviceObject 0x%p AllowRawMount %x)\n", - DeviceObject, AllowRawMount); - - switch (DeviceObject->DeviceType) - { - case FILE_DEVICE_DISK: - case FILE_DEVICE_VIRTUAL_DISK: /* ?? */ - MatchingDeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; - break; - - case FILE_DEVICE_CD_ROM: - MatchingDeviceType = FILE_DEVICE_CD_ROM_FILE_SYSTEM; - break; - - case FILE_DEVICE_NETWORK: - MatchingDeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM; - break; - - case FILE_DEVICE_TAPE: - MatchingDeviceType = FILE_DEVICE_TAPE_FILE_SYSTEM; - break; - - default: - CPRINT("No matching file system type found for device type: %x\n", - DeviceObject->DeviceType); - return(STATUS_UNRECOGNIZED_VOLUME); - } - - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); - -restart: - LIST_FOR_EACH(current,&FileSystemListHead, FILE_SYSTEM_OBJECT, Entry) - { - if (current->DeviceObject->DeviceType != MatchingDeviceType) - { - continue; - } - /* If we are not allowed to mount this volume as a raw filesystem volume - then don't try this */ - if (!AllowRawMount && RawFsIsRawFileSystemDeviceObject(current->DeviceObject)) - { - Status = STATUS_UNRECOGNIZED_VOLUME; - } - else - { - Status = IopMountFileSystem(current->DeviceObject, - DeviceObject); - } - switch (Status) - { - case STATUS_FS_DRIVER_REQUIRED: - DevObject = current->DeviceObject; - ExReleaseResourceLite(&FileSystemListLock); - Status = IopLoadFileSystem(DevObject); - if (!NT_SUCCESS(Status)) - { - KeLeaveCriticalRegion(); - return(Status); - } - ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); - goto restart; - - case STATUS_SUCCESS: - DeviceObject->Vpb->Flags = DeviceObject->Vpb->Flags | - VPB_MOUNTED; - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); - return(STATUS_SUCCESS); - - case STATUS_UNRECOGNIZED_VOLUME: - default: - /* do nothing */ - break; - } - } - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); - - return(STATUS_UNRECOGNIZED_VOLUME); -} - - -/********************************************************************** - * NAME EXPORTED - * IoVerifyVolume - * - * DESCRIPTION - * Verify the file system type and volume information or mount - * a file system. - * - * ARGUMENTS - * DeviceObject - * Device to verify or mount - * - * AllowRawMount - * ... - * - * RETURN VALUE - * Status - * - * @implemented - */ -NTSTATUS STDCALL -IoVerifyVolume(IN PDEVICE_OBJECT DeviceObject, - IN BOOLEAN AllowRawMount) -{ - IO_STATUS_BLOCK IoStatusBlock; - PIO_STACK_LOCATION StackPtr; - KEVENT Event; - PIRP Irp; - NTSTATUS Status; - PDEVICE_OBJECT DevObject; - - DPRINT("IoVerifyVolume(DeviceObject 0x%p AllowRawMount %x)\n", - DeviceObject, AllowRawMount); - - Status = STATUS_SUCCESS; - - KeWaitForSingleObject(&DeviceObject->DeviceLock, - Executive, - KernelMode, - FALSE, - NULL); - - if (DeviceObject->Vpb->Flags & VPB_MOUNTED) - { - /* Issue verify request to the FSD */ - DevObject = DeviceObject->Vpb->DeviceObject; - - KeInitializeEvent(&Event, - NotificationEvent, - FALSE); - - Irp = IoAllocateIrp(DevObject->StackSize, TRUE); - if (Irp==NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - - Irp->UserIosb = &IoStatusBlock; - Irp->UserEvent = &Event; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_FILE_SYSTEM_CONTROL; - StackPtr->MinorFunction = IRP_MN_VERIFY_VOLUME; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DevObject; - StackPtr->FileObject = NULL; - StackPtr->CompletionRoutine = NULL; - - StackPtr->Parameters.VerifyVolume.Vpb = DeviceObject->Vpb; - StackPtr->Parameters.VerifyVolume.DeviceObject = DeviceObject; - - Status = IoCallDriver(DevObject, - Irp); - if (Status==STATUS_PENDING) - { - KeWaitForSingleObject(&Event,Executive,KernelMode,FALSE,NULL); - Status = IoStatusBlock.Status; - } - - if (NT_SUCCESS(Status)) - { - KeSetEvent(&DeviceObject->DeviceLock, - IO_NO_INCREMENT, - FALSE); - return(STATUS_SUCCESS); - } - } - - if (Status == STATUS_WRONG_VOLUME) - { - /* Clean existing VPB. This unmounts the filesystem. */ - DPRINT("Wrong volume!\n"); - - DeviceObject->Vpb->DeviceObject = NULL; - DeviceObject->Vpb->Flags &= ~VPB_MOUNTED; - } - - /* Start mount sequence */ - Status = IoMountVolume(DeviceObject, - AllowRawMount); - - KeSetEvent(&DeviceObject->DeviceLock, - IO_NO_INCREMENT, - FALSE); - - return(Status); -} - - - - -/* - * @implemented - */ -VOID STDCALL -IoRegisterFileSystem(IN PDEVICE_OBJECT DeviceObject) -{ - PFILE_SYSTEM_OBJECT Fs; - - DPRINT("IoRegisterFileSystem(DeviceObject 0x%p)\n", DeviceObject); - - Fs = ExAllocatePoolWithTag(NonPagedPool, - sizeof(FILE_SYSTEM_OBJECT), - TAG_FILE_SYSTEM); - ASSERT(Fs!=NULL); - - Fs->DeviceObject = DeviceObject; - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&FileSystemListLock, TRUE); - - /* The RAW filesystem device objects must be last in the list so the - raw filesystem driver is the last filesystem driver asked to mount - a volume. It is always the first filesystem driver registered so - we use InsertHeadList() here as opposed to the other alternative - InsertTailList(). */ - InsertHeadList(&FileSystemListHead, - &Fs->Entry); - - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); - - IopNotifyFileSystemChange(DeviceObject, - TRUE); -} - - -/* - * @implemented - */ -VOID STDCALL -IoUnregisterFileSystem(IN PDEVICE_OBJECT DeviceObject) -{ - PFILE_SYSTEM_OBJECT current; - - DPRINT("IoUnregisterFileSystem(DeviceObject 0x%p)\n", DeviceObject); - - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&FileSystemListLock, TRUE); - - LIST_FOR_EACH(current,&FileSystemListHead, FILE_SYSTEM_OBJECT,Entry) - { - if (current->DeviceObject == DeviceObject) - { - RemoveEntryList(&current->Entry); - ExFreePoolWithTag(current, TAG_FILE_SYSTEM); - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); - IopNotifyFileSystemChange(DeviceObject, FALSE); - return; - } - } - - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); -} - - -/********************************************************************** - * NAME EXPORTED - * IoGetBaseFileSystemDeviceObject@4 - * - * DESCRIPTION - * Get the DEVICE_OBJECT associated to - * a FILE_OBJECT. - * - * ARGUMENTS - * FileObject - * - * RETURN VALUE - * - * NOTE - * From Bo Branten's ntifs.h v13. - * - * @implemented - */ -PDEVICE_OBJECT STDCALL -IoGetBaseFileSystemDeviceObject(IN PFILE_OBJECT FileObject) -{ - PDEVICE_OBJECT DeviceObject = NULL; - PVPB Vpb = NULL; - - /* - * If the FILE_OBJECT's VPB is defined, - * get the device from it. - */ - if (NULL != (Vpb = FileObject->Vpb)) - { - if (NULL != (DeviceObject = Vpb->DeviceObject)) - { - /* Vpb->DeviceObject DEFINED! */ - return DeviceObject; - } - } - /* - * If that failed, try the VPB - * in the FILE_OBJECT's DeviceObject. - */ - DeviceObject = FileObject->DeviceObject; - if (NULL == (Vpb = DeviceObject->Vpb)) - { - /* DeviceObject->Vpb UNDEFINED! */ - return DeviceObject; - } - /* - * If that pointer to the VPB is again - * undefined, return directly the - * device object from the FILE_OBJECT. - */ - return ( - (NULL == Vpb->DeviceObject) - ? DeviceObject - : Vpb->DeviceObject - ); -} - - -static VOID -IopNotifyFileSystemChange(PDEVICE_OBJECT DeviceObject, - BOOLEAN DriverActive) -{ - PFS_CHANGE_NOTIFY_ENTRY ChangeEntry; - - KeAcquireGuardedMutex(&FsChangeNotifyListLock); - LIST_FOR_EACH(ChangeEntry, &FsChangeNotifyListHead,FS_CHANGE_NOTIFY_ENTRY, FsChangeNotifyList) - { - (ChangeEntry->FSDNotificationProc)(DeviceObject, DriverActive); - } - KeReleaseGuardedMutex(&FsChangeNotifyListLock); -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -IoRegisterFsRegistrationChange(IN PDRIVER_OBJECT DriverObject, - IN PDRIVER_FS_NOTIFICATION FSDNotificationProc) -{ - PFS_CHANGE_NOTIFY_ENTRY Entry; - - Entry = ExAllocatePoolWithTag(NonPagedPool, - sizeof(FS_CHANGE_NOTIFY_ENTRY), - TAG_FS_CHANGE_NOTIFY); - if (Entry == NULL) - return(STATUS_INSUFFICIENT_RESOURCES); - - Entry->DriverObject = DriverObject; - Entry->FSDNotificationProc = FSDNotificationProc; - - KeAcquireGuardedMutex(&FsChangeNotifyListLock); - InsertHeadList(&FsChangeNotifyListHead, - &Entry->FsChangeNotifyList); - KeReleaseGuardedMutex(&FsChangeNotifyListLock); - - return(STATUS_SUCCESS); -} - - -/* - * @implemented - */ -VOID STDCALL -IoUnregisterFsRegistrationChange(IN PDRIVER_OBJECT DriverObject, - IN PDRIVER_FS_NOTIFICATION FSDNotificationProc) -{ - PFS_CHANGE_NOTIFY_ENTRY ChangeEntry; - - LIST_FOR_EACH(ChangeEntry, &FsChangeNotifyListHead, FS_CHANGE_NOTIFY_ENTRY, FsChangeNotifyList) - { - if (ChangeEntry->DriverObject == DriverObject && - ChangeEntry->FSDNotificationProc == FSDNotificationProc) - { - KeAcquireGuardedMutex(&FsChangeNotifyListLock); - RemoveEntryList(&ChangeEntry->FsChangeNotifyList); - KeReleaseGuardedMutex(&FsChangeNotifyListLock); - - ExFreePoolWithTag(ChangeEntry, TAG_FS_CHANGE_NOTIFY); - return; - } - - } -} - -/* EOF */ Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Sun Jul 2 01:58:29 2006 @@ -400,6 +400,86 @@ /* Return the Length and Status. ReturnedLength is NOT optional */ *ReturnedLength = IoStatusBlock.Information; return Status; +} + +/* + * @implemented + */ +NTSTATUS STDCALL +IoQueryVolumeInformation(IN PFILE_OBJECT FileObject, + IN FS_INFORMATION_CLASS FsInformationClass, + IN ULONG Length, + OUT PVOID FsInformation, + OUT PULONG ReturnedLength) +{ + IO_STATUS_BLOCK IoStatusBlock; + PIO_STACK_LOCATION StackPtr; + PDEVICE_OBJECT DeviceObject; + PIRP Irp; + NTSTATUS Status; + + ASSERT(FsInformation != NULL); + + DPRINT("FsInformation %p\n", FsInformation); + + Status = ObReferenceObjectByPointer(FileObject, + FILE_READ_ATTRIBUTES, + IoFileObjectType, + KernelMode); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + DeviceObject = FileObject->DeviceObject; + + Irp = IoAllocateIrp(DeviceObject->StackSize, + TRUE); + if (Irp == NULL) + { + ObDereferenceObject(FileObject); + return(STATUS_INSUFFICIENT_RESOURCES); + } + + /* Trigger FileObject/Event dereferencing */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = KernelMode; + Irp->AssociatedIrp.SystemBuffer = FsInformation; + KeResetEvent( &FileObject->Event ); + Irp->UserEvent = &FileObject->Event; + Irp->UserIosb = &IoStatusBlock; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_QUERY_VOLUME_INFORMATION; + StackPtr->MinorFunction = 0; + StackPtr->Flags = 0; + StackPtr->Control = 0; + StackPtr->DeviceObject = DeviceObject; + StackPtr->FileObject = FileObject; + StackPtr->Parameters.QueryVolume.Length = Length; + StackPtr->Parameters.QueryVolume.FsInformationClass = + FsInformationClass; + + Status = IoCallDriver(DeviceObject, + Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&FileObject->Event, + UserRequest, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } + DPRINT("Status %x\n", Status); + + if (ReturnedLength != NULL) + { + *ReturnedLength = IoStatusBlock.Information; + } + + return(Status); } /* @@ -2421,3 +2501,328 @@ return(STATUS_NOT_IMPLEMENTED); } +/* + * FUNCTION: Queries the volume information + * ARGUMENTS: + * FileHandle = Handle to a file object on the target volume + * ReturnLength = DataWritten + * FsInformation = Caller should supply storage for the information + * structure. + * Length = Size of the information structure + * FsInformationClass = Index to a information structure + * + * FileFsVolumeInformation FILE_FS_VOLUME_INFORMATION + * FileFsLabelInformation FILE_FS_LABEL_INFORMATION + * FileFsSizeInformation FILE_FS_SIZE_INFORMATION + * FileFsDeviceInformation FILE_FS_DEVICE_INFORMATION + * FileFsAttributeInformation FILE_FS_ATTRIBUTE_INFORMATION + * FileFsControlInformation + * FileFsQuotaQueryInformation -- + * FileFsQuotaSetInformation -- + * FileFsMaximumInformation + * + * RETURNS: Status + * + * @implemented + */ + +NTSTATUS STDCALL +NtQueryVolumeInformationFile(IN HANDLE FileHandle, + OUT PIO_STATUS_BLOCK IoStatusBlock, + OUT PVOID FsInformation, + IN ULONG Length, + IN FS_INFORMATION_CLASS FsInformationClass) +{ + PFILE_OBJECT FileObject; + PDEVICE_OBJECT DeviceObject; + PIRP Irp; + NTSTATUS Status = STATUS_SUCCESS; + PIO_STACK_LOCATION StackPtr; + PVOID SystemBuffer; + KPROCESSOR_MODE PreviousMode; + + DPRINT("FsInformation %p\n", FsInformation); + + PreviousMode = ExGetPreviousMode(); + + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + if (IoStatusBlock != NULL) + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + } + + if (Length != 0) + { + ProbeForWrite(FsInformation, + Length, + 1); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + else + { + ASSERT(IoStatusBlock != NULL); + ASSERT(FsInformation != NULL); + } + + Status = ObReferenceObjectByHandle(FileHandle, + 0, /* FIXME - depends on the information class! */ + IoFileObjectType, + PreviousMode, + (PVOID*)&FileObject, + NULL); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + DeviceObject = FileObject->DeviceObject; + + Irp = IoAllocateIrp(DeviceObject->StackSize, + TRUE); + if (Irp == NULL) + { + ObDereferenceObject(FileObject); + return(STATUS_INSUFFICIENT_RESOURCES); + } + + SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, + Length, + TAG_SYSB); + if (SystemBuffer == NULL) + { + IoFreeIrp(Irp); + ObDereferenceObject(FileObject); + return(STATUS_INSUFFICIENT_RESOURCES); + } + + /* Trigger FileObject/Event dereferencing */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + + Irp->RequestorMode = PreviousMode; + Irp->AssociatedIrp.SystemBuffer = SystemBuffer; + KeResetEvent( &FileObject->Event ); + Irp->UserEvent = &FileObject->Event; + Irp->UserIosb = IoStatusBlock; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_QUERY_VOLUME_INFORMATION; + StackPtr->MinorFunction = 0; + StackPtr->Flags = 0; + StackPtr->Control = 0; + StackPtr->DeviceObject = DeviceObject; + StackPtr->FileObject = FileObject; + StackPtr->Parameters.QueryVolume.Length = Length; + StackPtr->Parameters.QueryVolume.FsInformationClass = + FsInformationClass; + + Status = IoCallDriver(DeviceObject, + Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&FileObject->Event, + UserRequest, + PreviousMode, + FALSE, + NULL); + Status = IoStatusBlock->Status; + } + DPRINT("Status %x\n", Status); + + if (NT_SUCCESS(Status)) + { + _SEH_TRY + { + DPRINT("Information %lu\n", IoStatusBlock->Information); + RtlCopyMemory(FsInformation, + SystemBuffer, + IoStatusBlock->Information); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + ExFreePool(SystemBuffer); + + return(Status); +} + +/* + * @implemented + */ +NTSTATUS STDCALL +NtSetVolumeInformationFile(IN HANDLE FileHandle, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN PVOID FsInformation, + IN ULONG Length, + IN FS_INFORMATION_CLASS FsInformationClass) +{ + PFILE_OBJECT FileObject; + PDEVICE_OBJECT DeviceObject; + PIRP Irp; + NTSTATUS Status; + PIO_STACK_LOCATION StackPtr; + PVOID SystemBuffer; + KPROCESSOR_MODE PreviousMode; + + PreviousMode = ExGetPreviousMode(); + + if (PreviousMode != KernelMode) + { + Status = STATUS_SUCCESS; + _SEH_TRY + { + if (IoStatusBlock != NULL) + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + } + + if (Length != 0) + { + ProbeForRead(FsInformation, + Length, + 1); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + else + { + ASSERT(IoStatusBlock != NULL); + ASSERT(FsInformation != NULL); + } + + Status = ObReferenceObjectByHandle(FileHandle, + FILE_WRITE_ATTRIBUTES, + NULL, + PreviousMode, + (PVOID*)&FileObject, + NULL); + if (Status != STATUS_SUCCESS) + { + return(Status); + } + + DeviceObject = FileObject->DeviceObject; + + Irp = IoAllocateIrp(DeviceObject->StackSize,TRUE); + if (Irp == NULL) + { + ObDereferenceObject(FileObject); + return(STATUS_INSUFFICIENT_RESOURCES); + } + + SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, + Length, + TAG_SYSB); + if (SystemBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto failfreeirp; + } + + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + /* no need to probe again */ + RtlCopyMemory(SystemBuffer, + FsInformation, + Length); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(SystemBuffer, + TAG_SYSB); +failfreeirp: + IoFreeIrp(Irp); + ObDereferenceObject(FileObject); + return Status; + } + } + else + { + RtlCopyMemory(SystemBuffer, + FsInformation, + Length); + } + + /* Trigger FileObject/Event dereferencing */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = PreviousMode; + Irp->AssociatedIrp.SystemBuffer = SystemBuffer; + KeResetEvent( &FileObject->Event ); + Irp->UserEvent = &FileObject->Event; + Irp->UserIosb = IoStatusBlock; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_SET_VOLUME_INFORMATION; + StackPtr->MinorFunction = 0; + StackPtr->Flags = 0; + StackPtr->Control = 0; + StackPtr->DeviceObject = DeviceObject; + StackPtr->FileObject = FileObject; + StackPtr->Parameters.SetVolume.Length = Length; + StackPtr->Parameters.SetVolume.FsInformationClass = + FsInformationClass; + + Status = IoCallDriver(DeviceObject,Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&FileObject->Event, + UserRequest, + PreviousMode, + FALSE, + NULL); + _SEH_TRY + { + Status = IoStatusBlock->Status; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + ExFreePool(SystemBuffer); + + return(Status); +} Modified: trunk/reactos/ntoskrnl/io/iomgr/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/util.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/util.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/util.c Sun Jul 2 01:58:29 2006 @@ -195,4 +195,16 @@ return Thread->DeviceToVerify; } +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IoCheckQuerySetVolumeInformation(IN FS_INFORMATION_CLASS FsInformationClass, + IN ULONG Length, + IN BOOLEAN SetOperation) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} /* EOF */ Copied: trunk/reactos/ntoskrnl/io/iomgr/volume.c (from r22747, trunk/reactos/ntoskrnl/io/iomgr/fs.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/fs.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c Sun Jul 2 01:58:29 2006 @@ -33,6 +33,10 @@ PDRIVER_FS_NOTIFICATION FSDNotificationProc; } FS_CHANGE_NOTIFY_ENTRY, *PFS_CHANGE_NOTIFY_ENTRY; +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, IoInitVpbImplementation) +#endif + /* GLOBALS ******************************************************************/ static ERESOURCE FileSystemListLock; @@ -45,8 +49,39 @@ IopNotifyFileSystemChange(PDEVICE_OBJECT DeviceObject, BOOLEAN DriverActive); - +static KSPIN_LOCK IoVpbLock; /* FUNCTIONS *****************************************************************/ + +VOID INIT_FUNCTION +IoInitVpbImplementation(VOID) +{ + KeInitializeSpinLock(&IoVpbLock); +} + +NTSTATUS +STDCALL +IopAttachVpb(PDEVICE_OBJECT DeviceObject) +{ + PVPB Vpb; + + /* Allocate the Vpb */ + Vpb = ExAllocatePoolWithTag(NonPagedPool, + sizeof(VPB), + TAG_VPB); + if (Vpb == NULL) return(STATUS_UNSUCCESSFUL); + + /* Clear it so we don't waste time manually */ + RtlZeroMemory(Vpb, sizeof(VPB)); + + /* Set the Header and Device Field */ + Vpb->Type = IO_TYPE_VPB; + Vpb->Size = sizeof(VPB); + Vpb->RealDevice = DeviceObject; + + /* link it to the Device Object */ + DeviceObject->Vpb = Vpb; + return(STATUS_SUCCESS); +} VOID INIT_FUNCTION IoInitFileSystemImplementation(VOID) @@ -603,4 +638,25 @@ } } +/* + * @implemented + */ +VOID STDCALL +IoAcquireVpbSpinLock(OUT PKIRQL Irql) +{ + KeAcquireSpinLock(&IoVpbLock, + Irql); +} + + +/* + * @implemented + */ +VOID STDCALL +IoReleaseVpbSpinLock(IN KIRQL Irql) +{ + KeReleaseSpinLock(&IoVpbLock, + Irql); +} + /* EOF */ Removed: trunk/reactos/ntoskrnl/io/iomgr/vpb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/vpb.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/vpb.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/vpb.c (removed) @@ -1,502 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/io/vpb.c - * PURPOSE: Volume Parameter Block managment - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, IoInitVpbImplementation) -#endif - - -/* GLOBALS *******************************************************************/ - -static KSPIN_LOCK IoVpbLock; - -/* FUNCTIONS *****************************************************************/ - -VOID INIT_FUNCTION -IoInitVpbImplementation(VOID) -{ - KeInitializeSpinLock(&IoVpbLock); -} - -NTSTATUS -STDCALL -IopAttachVpb(PDEVICE_OBJECT DeviceObject) -{ - PVPB Vpb; - - /* Allocate the Vpb */ - Vpb = ExAllocatePoolWithTag(NonPagedPool, - sizeof(VPB), - TAG_VPB); - if (Vpb == NULL) return(STATUS_UNSUCCESSFUL); - - /* Clear it so we don't waste time manually */ - RtlZeroMemory(Vpb, sizeof(VPB)); - - /* Set the Header and Device Field */ - Vpb->Type = IO_TYPE_VPB; - Vpb->Size = sizeof(VPB); - Vpb->RealDevice = DeviceObject; - - /* link it to the Device Object */ - DeviceObject->Vpb = Vpb; - return(STATUS_SUCCESS); -} - -/* - * FUNCTION: Queries the volume information - * ARGUMENTS: - * FileHandle = Handle to a file object on the target volume - * ReturnLength = DataWritten - * FsInformation = Caller should supply storage for the information - * structure. - * Length = Size of the information structure - * FsInformationClass = Index to a information structure - * - * FileFsVolumeInformation FILE_FS_VOLUME_INFORMATION - * FileFsLabelInformation FILE_FS_LABEL_INFORMATION - * FileFsSizeInformation FILE_FS_SIZE_INFORMATION - * FileFsDeviceInformation FILE_FS_DEVICE_INFORMATION - * FileFsAttributeInformation FILE_FS_ATTRIBUTE_INFORMATION - * FileFsControlInformation - * FileFsQuotaQueryInformation -- - * FileFsQuotaSetInformation -- - * FileFsMaximumInformation - * - * RETURNS: Status - * - * @implemented - */ - -NTSTATUS STDCALL -NtQueryVolumeInformationFile(IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock, - OUT PVOID FsInformation, - IN ULONG Length, - IN FS_INFORMATION_CLASS FsInformationClass) -{ - PFILE_OBJECT FileObject; - PDEVICE_OBJECT DeviceObject; - PIRP Irp; - NTSTATUS Status = STATUS_SUCCESS; - PIO_STACK_LOCATION StackPtr; - PVOID SystemBuffer; - KPROCESSOR_MODE PreviousMode; - - DPRINT("FsInformation %p\n", FsInformation); - - PreviousMode = ExGetPreviousMode(); - - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - if (IoStatusBlock != NULL) - { - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); - } - - if (Length != 0) - { - ProbeForWrite(FsInformation, - Length, - 1); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - return Status; - } - } - else - { - ASSERT(IoStatusBlock != NULL); - ASSERT(FsInformation != NULL); - } - - Status = ObReferenceObjectByHandle(FileHandle, - 0, /* FIXME - depends on the information class! */ - IoFileObjectType, - PreviousMode, - (PVOID*)&FileObject, - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - DeviceObject = FileObject->DeviceObject; - - Irp = IoAllocateIrp(DeviceObject->StackSize, - TRUE); - if (Irp == NULL) - { - ObDereferenceObject(FileObject); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, - Length, - TAG_SYSB); - if (SystemBuffer == NULL) - { - IoFreeIrp(Irp); - ObDereferenceObject(FileObject); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - - Irp->RequestorMode = PreviousMode; - Irp->AssociatedIrp.SystemBuffer = SystemBuffer; - KeResetEvent( &FileObject->Event ); - Irp->UserEvent = &FileObject->Event; - Irp->UserIosb = IoStatusBlock; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_QUERY_VOLUME_INFORMATION; - StackPtr->MinorFunction = 0; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = FileObject; - StackPtr->Parameters.QueryVolume.Length = Length; - StackPtr->Parameters.QueryVolume.FsInformationClass = - FsInformationClass; - - Status = IoCallDriver(DeviceObject, - Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, - UserRequest, - PreviousMode, - FALSE, - NULL); - Status = IoStatusBlock->Status; - } - DPRINT("Status %x\n", Status); - - if (NT_SUCCESS(Status)) - { - _SEH_TRY - { - DPRINT("Information %lu\n", IoStatusBlock->Information); - RtlCopyMemory(FsInformation, - SystemBuffer, - IoStatusBlock->Information); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - - ExFreePool(SystemBuffer); - - return(Status); -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -IoQueryVolumeInformation(IN PFILE_OBJECT FileObject, - IN FS_INFORMATION_CLASS FsInformationClass, - IN ULONG Length, - OUT PVOID FsInformation, - OUT PULONG ReturnedLength) -{ - IO_STATUS_BLOCK IoStatusBlock; - PIO_STACK_LOCATION StackPtr; - PDEVICE_OBJECT DeviceObject; - PIRP Irp; - NTSTATUS Status; - - ASSERT(FsInformation != NULL); - - DPRINT("FsInformation %p\n", FsInformation); - - Status = ObReferenceObjectByPointer(FileObject, - FILE_READ_ATTRIBUTES, - IoFileObjectType, - KernelMode); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - DeviceObject = FileObject->DeviceObject; - - Irp = IoAllocateIrp(DeviceObject->StackSize, - TRUE); - if (Irp == NULL) - { - ObDereferenceObject(FileObject); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = KernelMode; - Irp->AssociatedIrp.SystemBuffer = FsInformation; - KeResetEvent( &FileObject->Event ); - Irp->UserEvent = &FileObject->Event; - Irp->UserIosb = &IoStatusBlock; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_QUERY_VOLUME_INFORMATION; - StackPtr->MinorFunction = 0; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = FileObject; - StackPtr->Parameters.QueryVolume.Length = Length; - StackPtr->Parameters.QueryVolume.FsInformationClass = - FsInformationClass; - - Status = IoCallDriver(DeviceObject, - Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, - UserRequest, - KernelMode, - FALSE, - NULL); - Status = IoStatusBlock.Status; - } - DPRINT("Status %x\n", Status); - - if (ReturnedLength != NULL) - { - *ReturnedLength = IoStatusBlock.Information; - } - - return(Status); -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -NtSetVolumeInformationFile(IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PVOID FsInformation, - IN ULONG Length, - IN FS_INFORMATION_CLASS FsInformationClass) -{ - PFILE_OBJECT FileObject; - PDEVICE_OBJECT DeviceObject; - PIRP Irp; - NTSTATUS Status; - PIO_STACK_LOCATION StackPtr; - PVOID SystemBuffer; - KPROCESSOR_MODE PreviousMode; - - PreviousMode = ExGetPreviousMode(); - - if (PreviousMode != KernelMode) - { - Status = STATUS_SUCCESS; - _SEH_TRY - { - if (IoStatusBlock != NULL) - { - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); - } - - if (Length != 0) - { - ProbeForRead(FsInformation, - Length, - 1); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - return Status; - } - } - else - { - ASSERT(IoStatusBlock != NULL); - ASSERT(FsInformation != NULL); - } - - Status = ObReferenceObjectByHandle(FileHandle, - FILE_WRITE_ATTRIBUTES, - NULL, - PreviousMode, - (PVOID*)&FileObject, - NULL); - if (Status != STATUS_SUCCESS) - { - return(Status); - } - - DeviceObject = FileObject->DeviceObject; - - Irp = IoAllocateIrp(DeviceObject->StackSize,TRUE); - if (Irp == NULL) - { - ObDereferenceObject(FileObject); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, - Length, - TAG_SYSB); - if (SystemBuffer == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto failfreeirp; - } - - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - /* no need to probe again */ - RtlCopyMemory(SystemBuffer, - FsInformation, - Length); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - ExFreePoolWithTag(SystemBuffer, - TAG_SYSB); -failfreeirp: - IoFreeIrp(Irp); - ObDereferenceObject(FileObject); - return Status; - } - } - else - { - RtlCopyMemory(SystemBuffer, - FsInformation, - Length); - } - - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = PreviousMode; - Irp->AssociatedIrp.SystemBuffer = SystemBuffer; - KeResetEvent( &FileObject->Event ); - Irp->UserEvent = &FileObject->Event; - Irp->UserIosb = IoStatusBlock; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_SET_VOLUME_INFORMATION; - StackPtr->MinorFunction = 0; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = FileObject; - StackPtr->Parameters.SetVolume.Length = Length; - StackPtr->Parameters.SetVolume.FsInformationClass = - FsInformationClass; - - Status = IoCallDriver(DeviceObject,Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, - UserRequest, - PreviousMode, - FALSE, - NULL); - _SEH_TRY - { - Status = IoStatusBlock->Status; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - - ExFreePool(SystemBuffer); - - return(Status); -} - - -/* - * @implemented - */ -VOID STDCALL -IoAcquireVpbSpinLock(OUT PKIRQL Irql) -{ - KeAcquireSpinLock(&IoVpbLock, - Irql); -} - - -/* - * @implemented - */ -VOID STDCALL -IoReleaseVpbSpinLock(IN KIRQL Irql) -{ - KeReleaseSpinLock(&IoVpbLock, - Irql); -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -IoCheckQuerySetVolumeInformation(IN FS_INFORMATION_CLASS FsInformationClass, - IN ULONG Length, - IN BOOLEAN SetOperation) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* EOF */ Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Sun Jul 2 01:58:29 2006 @@ -175,7 +175,6 @@ <file>error.c</file> <file>event.c</file> <file>file.c</file> - <file>fs.c</file> <file>iocomp.c</file> <file>iofunc.c</file> <file>iomgr.c</file> @@ -189,7 +188,7 @@ <file>util.c</file> <file>symlink.c</file> <file>timer.c</file> - <file>vpb.c</file> + <file>volume.c</file> </directory> <directory name="pnpmgr"> <file>plugplay.c</file>

1 0

[ion] 22747: - Move efi.c to \ex, because the functions are related to environmental variables, not I/O. - Create \wmi directory and put wmi.c, since it's the start of a large chunk of the XP+ kernel dedicated to WMI support. - Separate \io into \iomgr and \pnpmgr
by ion＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: ion Date: Sun Jul 2 01:51:06 2006 New Revision: 22747 URL: http://svn.reactos.org/svn/reactos?rev=22747&view=rev Log: - Move efi.c to \ex, because the functions are related to environmental variables, not I/O. - Create \wmi directory and put wmi.c, since it's the start of a large chunk of the XP+ kernel dedicated to WMI support. - Separate \io into \iomgr and \pnpmgr Added: trunk/reactos/ntoskrnl/ex/efi.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/efi.c trunk/reactos/ntoskrnl/io/iomgr/ trunk/reactos/ntoskrnl/io/iomgr/adapter.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/adapter.c trunk/reactos/ntoskrnl/io/iomgr/arcname.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/arcname.c trunk/reactos/ntoskrnl/io/iomgr/bootlog.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/bootlog.c trunk/reactos/ntoskrnl/io/iomgr/controller.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/controller.c trunk/reactos/ntoskrnl/io/iomgr/device.c - copied, changed from r22746, trunk/reactos/ntoskrnl/io/device.c trunk/reactos/ntoskrnl/io/iomgr/deviface.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/deviface.c trunk/reactos/ntoskrnl/io/iomgr/disk.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/disk.c trunk/reactos/ntoskrnl/io/iomgr/driver.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/driver.c trunk/reactos/ntoskrnl/io/iomgr/error.c - copied unchanged from r22734, trunk/reactos/ntoskrnl/io/error.c trunk/reactos/ntoskrnl/io/iomgr/event.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/event.c trunk/reactos/ntoskrnl/io/iomgr/file.c - copied unchanged from r22740, trunk/reactos/ntoskrnl/io/file.c trunk/reactos/ntoskrnl/io/iomgr/fs.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/fs.c trunk/reactos/ntoskrnl/io/iomgr/iocomp.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/iocomp.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/iofunc.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/iomgr.c trunk/reactos/ntoskrnl/io/iomgr/iowork.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/iowork.c trunk/reactos/ntoskrnl/io/iomgr/irp.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/irp.c trunk/reactos/ntoskrnl/io/iomgr/irq.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/irq.c trunk/reactos/ntoskrnl/io/iomgr/mdl.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/mdl.c trunk/reactos/ntoskrnl/io/iomgr/rawfs.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/rawfs.c trunk/reactos/ntoskrnl/io/iomgr/remlock.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/remlock.c trunk/reactos/ntoskrnl/io/iomgr/resource.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/resource.c trunk/reactos/ntoskrnl/io/iomgr/symlink.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/symlink.c trunk/reactos/ntoskrnl/io/iomgr/timer.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/timer.c trunk/reactos/ntoskrnl/io/iomgr/util.c - copied unchanged from r22735, trunk/reactos/ntoskrnl/io/util.c trunk/reactos/ntoskrnl/io/iomgr/vpb.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/vpb.c trunk/reactos/ntoskrnl/io/pnpmgr/ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/plugplay.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpdma.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/pnpdma.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c - copied unchanged from r22744, trunk/reactos/ntoskrnl/io/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/pnpnotify.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/pnpreport.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/pnproot.c trunk/reactos/ntoskrnl/wmi/ trunk/reactos/ntoskrnl/wmi/wmi.c - copied unchanged from r22733, trunk/reactos/ntoskrnl/io/wmi.c Removed: trunk/reactos/ntoskrnl/io/adapter.c trunk/reactos/ntoskrnl/io/arcname.c trunk/reactos/ntoskrnl/io/bootlog.c trunk/reactos/ntoskrnl/io/controller.c trunk/reactos/ntoskrnl/io/device.c trunk/reactos/ntoskrnl/io/deviface.c trunk/reactos/ntoskrnl/io/disk.c trunk/reactos/ntoskrnl/io/driver.c trunk/reactos/ntoskrnl/io/efi.c trunk/reactos/ntoskrnl/io/error.c trunk/reactos/ntoskrnl/io/event.c trunk/reactos/ntoskrnl/io/file.c trunk/reactos/ntoskrnl/io/fs.c trunk/reactos/ntoskrnl/io/iocomp.c trunk/reactos/ntoskrnl/io/iofunc.c trunk/reactos/ntoskrnl/io/iomgr.c trunk/reactos/ntoskrnl/io/iowork.c trunk/reactos/ntoskrnl/io/irp.c trunk/reactos/ntoskrnl/io/irq.c trunk/reactos/ntoskrnl/io/mdl.c trunk/reactos/ntoskrnl/io/plugplay.c trunk/reactos/ntoskrnl/io/pnpdma.c trunk/reactos/ntoskrnl/io/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpnotify.c trunk/reactos/ntoskrnl/io/pnpreport.c trunk/reactos/ntoskrnl/io/pnproot.c trunk/reactos/ntoskrnl/io/rawfs.c trunk/reactos/ntoskrnl/io/remlock.c trunk/reactos/ntoskrnl/io/resource.c trunk/reactos/ntoskrnl/io/symlink.c trunk/reactos/ntoskrnl/io/timer.c trunk/reactos/ntoskrnl/io/util.c trunk/reactos/ntoskrnl/io/vpb.c trunk/reactos/ntoskrnl/io/wmi.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/ntoskrnl.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Removed: trunk/reactos/ntoskrnl/io/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/adapter.c?rev=… Removed: trunk/reactos/ntoskrnl/io/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/arcname.c?rev=… Removed: trunk/reactos/ntoskrnl/io/bootlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/bootlog.c?rev=… Removed: trunk/reactos/ntoskrnl/io/controller.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/controller.c?r… Removed: trunk/reactos/ntoskrnl/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/device.c?rev=2… Removed: trunk/reactos/ntoskrnl/io/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/deviface.c?rev… Removed: trunk/reactos/ntoskrnl/io/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/disk.c?rev=227… Removed: trunk/reactos/ntoskrnl/io/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/driver.c?rev=2… Removed: trunk/reactos/ntoskrnl/io/efi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/efi.c?rev=2274… Removed: trunk/reactos/ntoskrnl/io/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/error.c?rev=22… Removed: trunk/reactos/ntoskrnl/io/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/event.c?rev=22… Removed: trunk/reactos/ntoskrnl/io/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/file.c?rev=227… Removed: trunk/reactos/ntoskrnl/io/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/fs.c?rev=22746… Removed: trunk/reactos/ntoskrnl/io/iocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iocomp.c?rev=2… Removed: trunk/reactos/ntoskrnl/io/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iofunc.c?rev=2… Removed: trunk/reactos/ntoskrnl/io/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr.c?rev=22… Copied: trunk/reactos/ntoskrnl/io/iomgr/device.c (from r22746, trunk/reactos/ntoskrnl/io/device.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… Removed: trunk/reactos/ntoskrnl/io/iowork.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iowork.c?rev=2… Removed: trunk/reactos/ntoskrnl/io/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/irp.c?rev=2274… Removed: trunk/reactos/ntoskrnl/io/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/irq.c?rev=2274… Removed: trunk/reactos/ntoskrnl/io/mdl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/mdl.c?rev=2274… Removed: trunk/reactos/ntoskrnl/io/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/plugplay.c?rev… Removed: trunk/reactos/ntoskrnl/io/pnpdma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpdma.c?rev=2… Removed: trunk/reactos/ntoskrnl/io/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr.c?rev=2… Removed: trunk/reactos/ntoskrnl/io/pnpnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpnotify.c?re… Removed: trunk/reactos/ntoskrnl/io/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpreport.c?re… Removed: trunk/reactos/ntoskrnl/io/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnproot.c?rev=… Removed: trunk/reactos/ntoskrnl/io/rawfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/rawfs.c?rev=22… Removed: trunk/reactos/ntoskrnl/io/remlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/remlock.c?rev=… Removed: trunk/reactos/ntoskrnl/io/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/resource.c?rev… Removed: trunk/reactos/ntoskrnl/io/symlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/symlink.c?rev=… Removed: trunk/reactos/ntoskrnl/io/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/timer.c?rev=22… Removed: trunk/reactos/ntoskrnl/io/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/util.c?rev=227… Removed: trunk/reactos/ntoskrnl/io/vpb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/vpb.c?rev=2274… Removed: trunk/reactos/ntoskrnl/io/wmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/wmi.c?rev=2274… Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r…

1 0

[ion] 22746: - Add definitions for additional DOE flags to NDK. - I/O Packet APIs improvements Part 2: - Implement IoSetStartIoAttributes - Obey StartIo Flags set by IoSetStartIoAttributes and change Packet functions to Windows XP/2003 semantics by supporting non-cancelable packets and deferred Start I/O calling.
by ion＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: ion Date: Sun Jul 2 01:29:50 2006 New Revision: 22746 URL: http://svn.reactos.org/svn/reactos?rev=22746&view=rev Log: - Add definitions for additional DOE flags to NDK. - I/O Packet APIs improvements Part 2: - Implement IoSetStartIoAttributes - Obey StartIo Flags set by IoSetStartIoAttributes and change Packet functions to Windows XP/2003 semantics by supporting non-cancelable packets and deferred Start I/O calling. Modified: trunk/reactos/include/ndk/iotypes.h trunk/reactos/ntoskrnl/io/device.c Modified: trunk/reactos/include/ndk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/iotypes.h (original) +++ trunk/reactos/include/ndk/iotypes.h Sun Jul 2 01:29:50 2006 @@ -123,6 +123,15 @@ #define DOE_REMOVE_PENDING 0x4 #define DOE_REMOVE_PROCESSED 0x8 #define DOE_START_PENDING 0x10 + +// +// Device Object StartIo Flags +// +#define DOE_SIO_NO_KEY 0x20 +#define DOE_SIO_WITH_KEY 0x40 +#define DOE_SIO_CANCELABLE 0x80 +#define DOE_SIO_DEFERRED 0x100 +#define DOE_SIO_NO_CANCEL 0x200 // // Device Node Flags Modified: trunk/reactos/ntoskrnl/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/device.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/device.c (original) +++ trunk/reactos/ntoskrnl/io/device.c Sun Jul 2 01:29:50 2006 @@ -358,6 +358,171 @@ } } +VOID +NTAPI +IopStartNextPacketByKey(IN PDEVICE_OBJECT DeviceObject, + IN BOOLEAN Cancelable, + IN ULONG Key) +{ + PKDEVICE_QUEUE_ENTRY Entry; + PIRP Irp; + KIRQL OldIrql; + + /* Acquire the cancel lock if this is cancelable */ + if (Cancelable) IoAcquireCancelSpinLock(&OldIrql); + + /* Clear the current IRP */ + DeviceObject->CurrentIrp = NULL; + + /* Remove an entry from the queue */ + Entry = KeRemoveByKeyDeviceQueue(&DeviceObject->DeviceQueue, Key); + if (Entry) + { + /* Get the IRP and set it */ + Irp = CONTAINING_RECORD(Entry, IRP, Tail.Overlay.DeviceQueueEntry); + DeviceObject->CurrentIrp = Irp; + + /* Check if this is a cancelable packet */ + if (Cancelable) + { + /* Check if the caller requested no cancellation */ + if (IoGetDevObjExtension(DeviceObject)->StartIoFlags & + DOE_SIO_NO_CANCEL) + { + /* He did, so remove the cancel routine */ + Irp->CancelRoutine = NULL; + } + + /* Release the cancel lock */ + IoReleaseCancelSpinLock(OldIrql); + } + + /* Call the Start I/O Routine */ + DeviceObject->DriverObject->DriverStartIo(DeviceObject, Irp); + } + else + { + /* Otherwise, release the cancel lock if we had acquired it */ + if (Cancelable) IoReleaseCancelSpinLock(OldIrql); + } +} + +VOID +NTAPI +IopStartNextPacket(IN PDEVICE_OBJECT DeviceObject, + IN BOOLEAN Cancelable) +{ + PKDEVICE_QUEUE_ENTRY Entry; + PIRP Irp; + KIRQL OldIrql; + + /* Acquire the cancel lock if this is cancelable */ + if (Cancelable) IoAcquireCancelSpinLock(&OldIrql); + + /* Clear the current IRP */ + DeviceObject->CurrentIrp = NULL; + + /* Remove an entry from the queue */ + Entry = KeRemoveDeviceQueue(&DeviceObject->DeviceQueue); + if (Entry) + { + /* Get the IRP and set it */ + Irp = CONTAINING_RECORD(Entry, IRP, Tail.Overlay.DeviceQueueEntry); + DeviceObject->CurrentIrp = Irp; + + /* Check if this is a cancelable packet */ + if (Cancelable) + { + /* Check if the caller requested no cancellation */ + if (IoGetDevObjExtension(DeviceObject)->StartIoFlags & + DOE_SIO_NO_CANCEL) + { + /* He did, so remove the cancel routine */ + Irp->CancelRoutine = NULL; + } + + /* Release the cancel lock */ + IoReleaseCancelSpinLock(OldIrql); + } + + /* Call the Start I/O Routine */ + DeviceObject->DriverObject->DriverStartIo(DeviceObject, Irp); + } + else + { + /* Otherwise, release the cancel lock if we had acquired it */ + if (Cancelable) IoReleaseCancelSpinLock(OldIrql); + } +} + +VOID +NTAPI +IopStartNextPacketByKeyEx(IN PDEVICE_OBJECT DeviceObject, + IN ULONG Key, + IN ULONG Flags) +{ + PEXTENDED_DEVOBJ_EXTENSION DeviceExtension; + ULONG CurrentKey = Key; + ULONG CurrentFlags = Flags; + + /* Get the device extension and start the packet loop */ + DeviceExtension = IoGetDevObjExtension(DeviceObject); + while (TRUE) + { + /* Increase the count */ + if (InterlockedIncrement(&DeviceExtension->StartIoCount) > 1) + { + /* + * We've already called the routine once... + * All we have to do is save the key and add the new flags + */ + DeviceExtension->StartIoFlags |= CurrentFlags; + DeviceExtension->StartIoKey = CurrentKey; + } + else + { + /* Mask out the current packet flags and key */ + DeviceExtension->StartIoFlags &= ~(DOE_SIO_WITH_KEY | + DOE_SIO_NO_KEY | + DOE_SIO_CANCELABLE); + DeviceExtension->StartIoKey = 0; + + /* Check if this is a packet start with key */ + if (Flags & DOE_SIO_WITH_KEY) + { + /* Start the packet with a key */ + IopStartNextPacketByKey(DeviceObject, + (DOE_SIO_CANCELABLE) ? TRUE : FALSE, + CurrentKey); + } + else if (Flags & DOE_SIO_NO_KEY) + { + /* Start the packet */ + IopStartNextPacket(DeviceObject, + (DOE_SIO_CANCELABLE) ? TRUE : FALSE); + } + } + + /* Decrease the Start I/O count and check if it's 0 now */ + if (!InterlockedDecrement(&DeviceExtension->StartIoCount)) + { + /* Get the current active key and flags */ + CurrentKey = DeviceExtension->StartIoKey; + CurrentFlags = DeviceExtension->StartIoFlags & (DOE_SIO_WITH_KEY | + DOE_SIO_NO_KEY | + DOE_SIO_CANCELABLE); + + /* Check if we should still loop */ + if (!(CurrentFlags & (DOE_SIO_WITH_KEY | DOE_SIO_NO_KEY))) break; + } + else + { + /* There are still Start I/Os active, so quit this loop */ + break; + } + } +} + /* PUBLIC FUNCTIONS ***********************************************************/ /* @@ -1129,15 +1294,22 @@ } /* - * @unimplemented + * @implemented */ VOID -STDCALL +NTAPI IoSetStartIoAttributes(IN PDEVICE_OBJECT DeviceObject, IN BOOLEAN DeferredStartIo, IN BOOLEAN NonCancelable) { - UNIMPLEMENTED; + PEXTENDED_DEVOBJ_EXTENSION DeviceExtension; + + /* Get the Device Extension */ + DeviceExtension = IoGetDevObjExtension(DeviceObject); + + /* Set the flags the caller requested */ + DeviceExtension->StartIoFlags |= (DeferredStartIo) ? DOE_SIO_DEFERRED : 0; + DeviceExtension->StartIoFlags |= (NonCancelable) ? DOE_SIO_NO_CANCEL : 0; } /* @@ -1149,34 +1321,24 @@ IN BOOLEAN Cancelable, IN ULONG Key) { - PKDEVICE_QUEUE_ENTRY Entry; - PIRP Irp; - KIRQL OldIrql; - - /* Acquire the cancel lock if this is cancelable */ - if (Cancelable) IoAcquireCancelSpinLock(&OldIrql); - - /* Clear the current IRP */ - DeviceObject->CurrentIrp = NULL; - - /* Remove an entry from the queue */ - Entry = KeRemoveByKeyDeviceQueue(&DeviceObject->DeviceQueue, Key); - if (Entry) - { - /* Get the IRP and set it */ - Irp = CONTAINING_RECORD(Entry, IRP, Tail.Overlay.DeviceQueueEntry); - DeviceObject->CurrentIrp = Irp; - - /* Release the cancel lock if we had acquired it */ - if (Cancelable) IoReleaseCancelSpinLock(OldIrql); - - /* Call the Start I/O Routine */ - DeviceObject->DriverObject->DriverStartIo(DeviceObject, Irp); + PEXTENDED_DEVOBJ_EXTENSION DeviceExtension; + + /* Get the Device Extension */ + DeviceExtension = IoGetDevObjExtension(DeviceObject); + + /* Check if deferred start was requested */ + if (DeviceExtension->StartIoFlags & DOE_SIO_DEFERRED) + { + /* Call our internal function to handle the defered case */ + return IopStartNextPacketByKeyEx(DeviceObject, + Key, + DOE_SIO_WITH_KEY | + (Cancelable) ? DOE_SIO_CANCELABLE : 0); } else { - /* Otherwise, release the cancel lock if we had acquired it */ - if (Cancelable) IoReleaseCancelSpinLock(OldIrql); + /* Call the normal routine */ + return IopStartNextPacketByKey(DeviceObject, Cancelable, Key); } } @@ -1188,31 +1350,24 @@ IoStartNextPacket(IN PDEVICE_OBJECT DeviceObject, IN BOOLEAN Cancelable) { - PKDEVICE_QUEUE_ENTRY Entry; - PIRP Irp; - KIRQL OldIrql; - - /* Acquire the cancel lock if this is cancelable */ - if (Cancelable) IoAcquireCancelSpinLock(&OldIrql); - - /* Clear the current IRP */ - DeviceObject->CurrentIrp = NULL; - - /* Remove an entry from the queue */ - Entry = KeRemoveDeviceQueue(&DeviceObject->DeviceQueue); - if (Entry) - { - /* Get the IRP and set it */ - Irp = CONTAINING_RECORD(Entry, IRP, Tail.Overlay.DeviceQueueEntry); - DeviceObject->CurrentIrp = Irp; - - /* Call the Start I/O Routine */ - DeviceObject->DriverObject->DriverStartIo(DeviceObject, Irp); + PEXTENDED_DEVOBJ_EXTENSION DeviceExtension; + + /* Get the Device Extension */ + DeviceExtension = IoGetDevObjExtension(DeviceObject); + + /* Check if deferred start was requested */ + if (DeviceExtension->StartIoFlags & DOE_SIO_DEFERRED) + { + /* Call our internal function to handle the defered case */ + return IopStartNextPacketByKeyEx(DeviceObject, + 0, + DOE_SIO_NO_KEY | + (Cancelable) ? DOE_SIO_CANCELABLE : 0); } else { - /* Otherwise, release the cancel lock if we had acquired it */ - if (Cancelable) IoReleaseCancelSpinLock(OldIrql); + /* Call the normal routine */ + return IopStartNextPacket(DeviceObject, Cancelable); } } @@ -1261,8 +1416,20 @@ /* Set the IRP */ DeviceObject->CurrentIrp = Irp; - /* Release the cancel lock if we had a cancel function */ - if (CancelFunction) IoReleaseCancelSpinLock(CancelIrql); + /* Check if this is a cancelable packet */ + if (CancelFunction) + { + /* Check if the caller requested no cancellation */ + if (IoGetDevObjExtension(DeviceObject)->StartIoFlags & + DOE_SIO_NO_CANCEL) + { + /* He did, so remove the cancel routine */ + Irp->CancelRoutine = NULL; + } + + /* Release the cancel lock */ + IoReleaseCancelSpinLock(OldIrql); + } /* Call the Start I/O function */ DeviceObject->DriverObject->DriverStartIo(DeviceObject, Irp);

1 0

[ekohl] 22745: Enable CM_Connect_MachineW to connect to the local machine.
by ekohl＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: ekohl Date: Sun Jul 2 01:01:59 2006 New Revision: 22745 URL: http://svn.reactos.org/svn/reactos?rev=22745&view=rev Log: Enable CM_Connect_MachineW to connect to the local machine. Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c Sun Jul 2 01:01:59 2006 @@ -42,6 +42,7 @@ WCHAR szMachineName[MAX_PATH]; RPC_BINDING_HANDLE BindingHandle; HSTRING_TABLE StringTable; + BOOL bLocal; } MACHINE_INFO, *PMACHINE_INFO; @@ -251,33 +252,48 @@ TRACE("%s %p\n", debugstr_w(UNCServerName), phMachine); - if (!UNCServerName) - { - FIXME("Connection to local machine not implemented\n"); - *phMachine = NULL; - return CR_SUCCESS; - } + if (phMachine == NULL) + return CR_INVALID_POINTER; + + *phMachine = NULL; pMachine = HeapAlloc(GetProcessHeap(), 0, sizeof(MACHINE_INFO)); if (pMachine == NULL) return CR_OUT_OF_MEMORY; - lstrcpyW(pMachine->szMachineName, UNCServerName); - - pMachine->StringTable = StringTableInitialize(); - if (pMachine->StringTable == NULL) - { - HeapFree(GetProcessHeap(), 0, pMachine); - return CR_FAILURE; - } - - StringTableAddString(pMachine->StringTable, L"PLT", 1); - - if (!PnpBindRpc(UNCServerName, &pMachine->BindingHandle)) - { - StringTableDestroy(pMachine->StringTable); - HeapFree(GetProcessHeap(), 0, pMachine); - return CR_INVALID_MACHINENAME; + if (UNCServerName == NULL || *UNCServerName == 0) + { + pMachine->bLocal = TRUE; + + /* FIXME: store the computers name in pMachine->szMachineName */ + + if (!PnpGetLocalHandles(&pMachine->BindingHandle, + &pMachine->StringTable)) + { + HeapFree(GetProcessHeap(), 0, pMachine); + return CR_FAILURE; + } + } + else + { + pMachine->bLocal = FALSE; + lstrcpyW(pMachine->szMachineName, UNCServerName); + + pMachine->StringTable = StringTableInitialize(); + if (pMachine->StringTable == NULL) + { + HeapFree(GetProcessHeap(), 0, pMachine); + return CR_FAILURE; + } + + StringTableAddString(pMachine->StringTable, L"PLT", 1); + + if (!PnpBindRpc(UNCServerName, &pMachine->BindingHandle)) + { + StringTableDestroy(pMachine->StringTable); + HeapFree(GetProcessHeap(), 0, pMachine); + return CR_INVALID_MACHINENAME; + } } phMachine = (PHMACHINE)pMachine; @@ -551,11 +567,14 @@ if (pMachine == NULL) return CR_SUCCESS; - if (pMachine->StringTable != NULL) - StringTableDestroy(pMachine->StringTable); - - if (!PnpUnbindRpc(pMachine->BindingHandle)) - return CR_ACCESS_DENIED; + if (pMachine->bLocal == FALSE) + { + if (pMachine->StringTable != NULL) + StringTableDestroy(pMachine->StringTable); + + if (!PnpUnbindRpc(pMachine->BindingHandle)) + return CR_ACCESS_DENIED; + } HeapFree(GetProcessHeap(), 0, pMachine);

1 0

[ion] 22744: - Move IopInitialize/StartDevice to PnP Manager - I/O Packet APIs fixes Part 1: - Clear the current IRP before parsing the Device Queues - Respect Cancelable parameter in IoStartNextPacket(ByKey) instead of ignoring it (acquire the cancel lock when it's requested) - Raise IRQL to DISPATCH_LEVEL in IoStartPacket instead of expecting the caller to do it and crashing. Also only use Cancel Lock if a Cancel Function was specified. - Actually handle the case where the IRP Was cancelled ri
by ion＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: ion Date: Sat Jul 1 22:56:09 2006 New Revision: 22744 URL: http://svn.reactos.org/svn/reactos?rev=22744&view=rev Log: - Move IopInitialize/StartDevice to PnP Manager - I/O Packet APIs fixes Part 1: - Clear the current IRP before parsing the Device Queues - Respect Cancelable parameter in IoStartNextPacket(ByKey) instead of ignoring it (acquire the cancel lock when it's requested) - Raise IRQL to DISPATCH_LEVEL in IoStartPacket instead of expecting the caller to do it and crashing. Also only use Cancel Lock if a Cancel Function was specified. - Actually handle the case where the IRP Was cancelled right after insert and the Cancel Routine has to be called. Modified: trunk/reactos/ntoskrnl/io/device.c trunk/reactos/ntoskrnl/io/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/device.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/device.c (original) +++ trunk/reactos/ntoskrnl/io/device.c Sat Jul 1 22:56:09 2006 @@ -80,111 +80,6 @@ ListEntry = ExInterlockedRemoveHeadList(&ShutdownListHead, &ShutdownListLock); } -} - -NTSTATUS -FASTCALL -IopInitializeDevice(PDEVICE_NODE DeviceNode, - PDRIVER_OBJECT DriverObject) -{ - PDEVICE_OBJECT Fdo; - NTSTATUS Status; - BOOLEAN IsPnpDriver = FALSE; - - if (DriverObject->DriverExtension->AddDevice) - { - /* This is a Plug and Play driver */ - DPRINT("Plug and Play driver found\n"); - - ASSERT(DeviceNode->PhysicalDeviceObject); - - DPRINT("Calling driver AddDevice entrypoint at %08lx\n", - DriverObject->DriverExtension->AddDevice); - - IsPnpDriver = !IopDeviceNodeHasFlag(DeviceNode, DNF_LEGACY_DRIVER); - Status = DriverObject->DriverExtension->AddDevice( - DriverObject, IsPnpDriver ? DeviceNode->PhysicalDeviceObject : NULL); - - if (!NT_SUCCESS(Status)) - { - return Status; - } - - if (IsPnpDriver) - { - Fdo = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject); - - if (Fdo == DeviceNode->PhysicalDeviceObject) - { - /* FIXME: What do we do? Unload the driver or just disable the device? */ - DbgPrint("An FDO was not attached\n"); - IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); - return STATUS_UNSUCCESSFUL; - } - - if (Fdo->DeviceType == FILE_DEVICE_ACPI) - { - static BOOLEAN SystemPowerDeviceNodeCreated = FALSE; - - /* There can be only one system power device */ - if (!SystemPowerDeviceNodeCreated) - { - PopSystemPowerDeviceNode = DeviceNode; - SystemPowerDeviceNodeCreated = TRUE; - } - } - - ObDereferenceObject(Fdo); - } - - IopDeviceNodeSetFlag(DeviceNode, DNF_ADDED); - IopDeviceNodeSetFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY); - } - - return STATUS_SUCCESS; -} - -NTSTATUS -IopStartDevice( - PDEVICE_NODE DeviceNode) -{ - IO_STATUS_BLOCK IoStatusBlock; - IO_STACK_LOCATION Stack; - PDEVICE_OBJECT Fdo; - NTSTATUS Status; - - DPRINT("Sending IRP_MN_START_DEVICE to driver\n"); - - Fdo = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject); - Stack.Parameters.StartDevice.AllocatedResources = DeviceNode->ResourceList; - Stack.Parameters.StartDevice.AllocatedResourcesTranslated = DeviceNode->ResourceListTranslated; - - Status = IopInitiatePnpIrp( - Fdo, - &IoStatusBlock, - IRP_MN_START_DEVICE, - &Stack); - - if (!NT_SUCCESS(Status)) - { - DPRINT("IopInitiatePnpIrp() failed\n"); - } - else - { - if (IopDeviceNodeHasFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY)) - { - DPRINT("Device needs enumeration, invalidating bus relations\n"); - Status = IopInvalidateDeviceRelations(DeviceNode, BusRelations); - IopDeviceNodeClearFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY); - } - } - - ObDereferenceObject(Fdo); - - if (NT_SUCCESS(Status)) - DeviceNode->Flags |= DN_STARTED; - - return Status; } NTSTATUS @@ -1247,137 +1142,157 @@ /* * @implemented - * - * FUNCTION: Dequeues the next packet from the given device object's - * associated device queue according to a specified sort-key value and calls - * the drivers StartIo routine with that IRP - * ARGUMENTS: - * DeviceObject = Device object for which the irp is to dequeued - * Cancelable = True if IRPs in the key can be canceled - * Key = Sort key specifing which entry to remove from the queue */ VOID -STDCALL -IoStartNextPacketByKey(PDEVICE_OBJECT DeviceObject, - BOOLEAN Cancelable, - ULONG Key) -{ - PKDEVICE_QUEUE_ENTRY entry; - PIRP Irp; - - entry = KeRemoveByKeyDeviceQueue(&DeviceObject->DeviceQueue, - Key); - - if (entry != NULL) - { - Irp = CONTAINING_RECORD(entry, - IRP, - Tail.Overlay.DeviceQueueEntry); +NTAPI +IoStartNextPacketByKey(IN PDEVICE_OBJECT DeviceObject, + IN BOOLEAN Cancelable, + IN ULONG Key) +{ + PKDEVICE_QUEUE_ENTRY Entry; + PIRP Irp; + KIRQL OldIrql; + + /* Acquire the cancel lock if this is cancelable */ + if (Cancelable) IoAcquireCancelSpinLock(&OldIrql); + + /* Clear the current IRP */ + DeviceObject->CurrentIrp = NULL; + + /* Remove an entry from the queue */ + Entry = KeRemoveByKeyDeviceQueue(&DeviceObject->DeviceQueue, Key); + if (Entry) + { + /* Get the IRP and set it */ + Irp = CONTAINING_RECORD(Entry, IRP, Tail.Overlay.DeviceQueueEntry); DeviceObject->CurrentIrp = Irp; - DPRINT("Next irp is 0x%p\n", Irp); - DeviceObject->DriverObject->DriverStartIo(DeviceObject, Irp); - } - else - { - DPRINT("No next irp\n"); - DeviceObject->CurrentIrp = NULL; - } + + /* Release the cancel lock if we had acquired it */ + if (Cancelable) IoReleaseCancelSpinLock(OldIrql); + + /* Call the Start I/O Routine */ + DeviceObject->DriverObject->DriverStartIo(DeviceObject, Irp); + } + else + { + /* Otherwise, release the cancel lock if we had acquired it */ + if (Cancelable) IoReleaseCancelSpinLock(OldIrql); + } } /* * @implemented - * - * FUNCTION: Removes the next packet from the device's queue and calls - * the driver's StartIO - * ARGUMENTS: - * DeviceObject = Device - * Cancelable = True if irps in the queue can be canceled */ VOID -STDCALL -IoStartNextPacket(PDEVICE_OBJECT DeviceObject, - BOOLEAN Cancelable) -{ - PKDEVICE_QUEUE_ENTRY entry; - PIRP Irp; - - DPRINT("IoStartNextPacket(DeviceObject 0x%p, Cancelable %d)\n", - DeviceObject, Cancelable); - - entry = KeRemoveDeviceQueue(&DeviceObject->DeviceQueue); - - if (entry!=NULL) - { - Irp = CONTAINING_RECORD(entry,IRP,Tail.Overlay.DeviceQueueEntry); +NTAPI +IoStartNextPacket(IN PDEVICE_OBJECT DeviceObject, + IN BOOLEAN Cancelable) +{ + PKDEVICE_QUEUE_ENTRY Entry; + PIRP Irp; + KIRQL OldIrql; + + /* Acquire the cancel lock if this is cancelable */ + if (Cancelable) IoAcquireCancelSpinLock(&OldIrql); + + /* Clear the current IRP */ + DeviceObject->CurrentIrp = NULL; + + /* Remove an entry from the queue */ + Entry = KeRemoveDeviceQueue(&DeviceObject->DeviceQueue); + if (Entry) + { + /* Get the IRP and set it */ + Irp = CONTAINING_RECORD(Entry, IRP, Tail.Overlay.DeviceQueueEntry); DeviceObject->CurrentIrp = Irp; - DeviceObject->DriverObject->DriverStartIo(DeviceObject,Irp); - } - else - { - DeviceObject->CurrentIrp = NULL; - } + + /* Call the Start I/O Routine */ + DeviceObject->DriverObject->DriverStartIo(DeviceObject, Irp); + } + else + { + /* Otherwise, release the cancel lock if we had acquired it */ + if (Cancelable) IoReleaseCancelSpinLock(OldIrql); + } } /* * @implemented - * - * FUNCTION: Either call the device's StartIO routine with the packet or, - * if the device is busy, queue it. - * ARGUMENTS: - * DeviceObject = Device to start the packet on - * Irp = Irp to queue - * Key = Where to insert the irp - * If zero then insert in the tail of the queue - * CancelFunction = Optional function to cancel the irqp */ VOID -STDCALL -IoStartPacket(PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PULONG Key, - PDRIVER_CANCEL CancelFunction) -{ - BOOLEAN stat; - KIRQL oldirql; - - DPRINT("IoStartPacket(Irp 0x%p)\n", Irp); - - ASSERT_IRQL(DISPATCH_LEVEL); - - IoAcquireCancelSpinLock(&oldirql); - - if (CancelFunction != NULL) - { - Irp->CancelRoutine = CancelFunction; - } - - if (Key!=0) - { - stat = KeInsertByKeyDeviceQueue(&DeviceObject->DeviceQueue, - &Irp->Tail.Overlay.DeviceQueueEntry, - *Key); - } - else - { - stat = KeInsertDeviceQueue(&DeviceObject->DeviceQueue, - &Irp->Tail.Overlay.DeviceQueueEntry); - } - - - if (!stat) - { - IoReleaseCancelSpinLock(DISPATCH_LEVEL); +NTAPI +IoStartPacket(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PULONG Key, + IN PDRIVER_CANCEL CancelFunction) +{ + BOOLEAN Stat; + KIRQL OldIrql, CancelIrql; + + /* Raise to dispatch level */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + /* Check if we should acquire the cancel lock */ + if (CancelFunction) + { + /* Acquire and set it */ + IoAcquireCancelSpinLock(&CancelIrql); + Irp->CancelRoutine = CancelFunction; + } + + /* Check if we have a key */ + if (Key) + { + /* Insert by key */ + Stat = KeInsertByKeyDeviceQueue(&DeviceObject->DeviceQueue, + &Irp->Tail.Overlay.DeviceQueueEntry, + *Key); + } + else + { + /* Insert without a key */ + Stat = KeInsertDeviceQueue(&DeviceObject->DeviceQueue, + &Irp->Tail.Overlay.DeviceQueueEntry); + } + + /* Check if this was a first insert */ + if (!Stat) + { + /* Set the IRP */ DeviceObject->CurrentIrp = Irp; - DeviceObject->DriverObject->DriverStartIo(DeviceObject,Irp); - if (oldirql < DISPATCH_LEVEL) - { - KeLowerIrql(oldirql); + + /* Release the cancel lock if we had a cancel function */ + if (CancelFunction) IoReleaseCancelSpinLock(CancelIrql); + + /* Call the Start I/O function */ + DeviceObject->DriverObject->DriverStartIo(DeviceObject, Irp); + } + else + { + /* The packet was inserted... check if we have a cancel function */ + if (CancelFunction) + { + /* Check if the IRP got cancelled */ + if (Irp->Cancel) + { + /* + * Set the cancel IRQL, clear the currnet cancel routine and + * call ours + */ + Irp->CancelIrql = CancelIrql; + Irp->CancelRoutine = NULL; + CancelFunction(DeviceObject, Irp); + } + else + { + /* Otherwise, release the lock */ + IoReleaseCancelSpinLock(CancelIrql); + } } - } - else - { - IoReleaseCancelSpinLock(oldirql); - } + } + + /* Return back to previous IRQL */ + KeLowerIrql(OldIrql); } /* EOF */ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c Sat Jul 1 22:56:09 2006 @@ -42,6 +42,111 @@ IopGetDeviceNode(PDEVICE_OBJECT DeviceObject) { return ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->DeviceNode; +} + +NTSTATUS +FASTCALL +IopInitializeDevice(PDEVICE_NODE DeviceNode, + PDRIVER_OBJECT DriverObject) +{ + PDEVICE_OBJECT Fdo; + NTSTATUS Status; + BOOLEAN IsPnpDriver = FALSE; + + if (DriverObject->DriverExtension->AddDevice) + { + /* This is a Plug and Play driver */ + DPRINT("Plug and Play driver found\n"); + + ASSERT(DeviceNode->PhysicalDeviceObject); + + DPRINT("Calling driver AddDevice entrypoint at %08lx\n", + DriverObject->DriverExtension->AddDevice); + + IsPnpDriver = !IopDeviceNodeHasFlag(DeviceNode, DNF_LEGACY_DRIVER); + Status = DriverObject->DriverExtension->AddDevice( + DriverObject, IsPnpDriver ? DeviceNode->PhysicalDeviceObject : NULL); + + if (!NT_SUCCESS(Status)) + { + return Status; + } + + if (IsPnpDriver) + { + Fdo = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject); + + if (Fdo == DeviceNode->PhysicalDeviceObject) + { + /* FIXME: What do we do? Unload the driver or just disable the device? */ + DbgPrint("An FDO was not attached\n"); + IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); + return STATUS_UNSUCCESSFUL; + } + + if (Fdo->DeviceType == FILE_DEVICE_ACPI) + { + static BOOLEAN SystemPowerDeviceNodeCreated = FALSE; + + /* There can be only one system power device */ + if (!SystemPowerDeviceNodeCreated) + { + PopSystemPowerDeviceNode = DeviceNode; + SystemPowerDeviceNodeCreated = TRUE; + } + } + + ObDereferenceObject(Fdo); + } + + IopDeviceNodeSetFlag(DeviceNode, DNF_ADDED); + IopDeviceNodeSetFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY); + } + + return STATUS_SUCCESS; +} + +NTSTATUS +IopStartDevice( + PDEVICE_NODE DeviceNode) +{ + IO_STATUS_BLOCK IoStatusBlock; + IO_STACK_LOCATION Stack; + PDEVICE_OBJECT Fdo; + NTSTATUS Status; + + DPRINT("Sending IRP_MN_START_DEVICE to driver\n"); + + Fdo = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject); + Stack.Parameters.StartDevice.AllocatedResources = DeviceNode->ResourceList; + Stack.Parameters.StartDevice.AllocatedResourcesTranslated = DeviceNode->ResourceListTranslated; + + Status = IopInitiatePnpIrp( + Fdo, + &IoStatusBlock, + IRP_MN_START_DEVICE, + &Stack); + + if (!NT_SUCCESS(Status)) + { + DPRINT("IopInitiatePnpIrp() failed\n"); + } + else + { + if (IopDeviceNodeHasFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY)) + { + DPRINT("Device needs enumeration, invalidating bus relations\n"); + Status = IopInvalidateDeviceRelations(DeviceNode, BusRelations); + IopDeviceNodeClearFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY); + } + } + + ObDereferenceObject(Fdo); + + if (NT_SUCCESS(Status)) + DeviceNode->Flags |= DN_STARTED; + + return Status; } NTSTATUS

1 0

[ion] 22743: - Implement IoRegisterLastchanceShutdownNotification based on IoRegisterShutdownNotification - Modify IoUnregisterShudownNotification to loop both lists now. - Used the lock in IoShutdownREgisteredDevices when looping the list, and changed it to send IRP_MJ_SHUTDOWN to the attached DO. Also fixed a memory leak where the shutdown entry wasn't being freed, and optimized the function only to initialize the event once (And simply clear it each time). - Moved IoSynchronousInvalidateDevic
by ion＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: ion Date: Sat Jul 1 22:26:22 2006 New Revision: 22743 URL: http://svn.reactos.org/svn/reactos?rev=22743&view=rev Log: - Implement IoRegisterLastchanceShutdownNotification based on IoRegisterShutdownNotification - Modify IoUnregisterShudownNotification to loop both lists now. - Used the lock in IoShutdownREgisteredDevices when looping the list, and changed it to send IRP_MJ_SHUTDOWN to the attached DO. Also fixed a memory leak where the shutdown entry wasn't being freed, and optimized the function only to initialize the event once (And simply clear it each time). - Moved IoSynchronousInvalidateDeviceRelations to PnP Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/device.c trunk/reactos/ntoskrnl/io/pnpmgr.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Sat Jul 1 22:26:22 2006 @@ -594,6 +594,7 @@ ); VOID +NTAPI IoShutdownRegisteredDevices( VOID ); Modified: trunk/reactos/ntoskrnl/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/device.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/device.c (original) +++ trunk/reactos/ntoskrnl/io/device.c Sat Jul 1 22:26:22 2006 @@ -16,52 +16,69 @@ /* GLOBALS ********************************************************************/ -static ULONG IopDeviceObjectNumber = 0; +ULONG IopDeviceObjectNumber = 0; typedef struct _SHUTDOWN_ENTRY { - LIST_ENTRY ShutdownList; - PDEVICE_OBJECT DeviceObject; + LIST_ENTRY ShutdownList; + PDEVICE_OBJECT DeviceObject; } SHUTDOWN_ENTRY, *PSHUTDOWN_ENTRY; -LIST_ENTRY ShutdownListHead; +LIST_ENTRY ShutdownListHead, LastChanceShutdownListHead; KSPIN_LOCK ShutdownListLock; /* PRIVATE FUNCTIONS **********************************************************/ VOID +NTAPI IoShutdownRegisteredDevices(VOID) { - PSHUTDOWN_ENTRY ShutdownEntry; - IO_STATUS_BLOCK StatusBlock; - PIRP Irp; - KEVENT Event; - NTSTATUS Status; - - LIST_FOR_EACH(ShutdownEntry, &ShutdownListHead, SHUTDOWN_ENTRY, ShutdownList) - { - KeInitializeEvent (&Event, - NotificationEvent, - FALSE); - - Irp = IoBuildSynchronousFsdRequest (IRP_MJ_SHUTDOWN, - ShutdownEntry->DeviceObject, - NULL, - 0, - NULL, - &Event, - &StatusBlock); - - Status = IoCallDriver (ShutdownEntry->DeviceObject, - Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject (&Event, - Executive, - KernelMode, - FALSE, - NULL); - } + PLIST_ENTRY ListEntry; + PDEVICE_OBJECT DeviceObject; + PSHUTDOWN_ENTRY ShutdownEntry; + IO_STATUS_BLOCK StatusBlock; + PIRP Irp; + KEVENT Event; + NTSTATUS Status; + + /* Initialize an event to wait on */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* Get the first entry and start looping */ + ListEntry = ExInterlockedRemoveHeadList(&ShutdownListHead, + &ShutdownListLock); + while (ListEntry) + { + /* Get the shutdown entry */ + ShutdownEntry = CONTAINING_RECORD(ListEntry, + SHUTDOWN_ENTRY, + ShutdownList); + + /* Get the attached device */ + DeviceObject = IoGetAttachedDevice(ShutdownEntry->DeviceObject); + + /* Build the shutdown IRP and call the driver */ + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_SHUTDOWN, + DeviceObject, + NULL, + 0, + NULL, + &Event, + &StatusBlock); + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait on the driver */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + } + + /* Free the shutdown entry and reset the event */ + ExFreePool(ShutdownEntry); + KeClearEvent(&Event); + + /* Go to the next entry */ + ListEntry = ExInterlockedRemoveHeadList(&ShutdownListHead, + &ShutdownListLock); } } @@ -1097,39 +1114,123 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS -STDCALL +NTAPI IoRegisterLastChanceShutdownNotification(IN PDEVICE_OBJECT DeviceObject) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSHUTDOWN_ENTRY Entry; + + /* Allocate the shutdown entry */ + Entry = ExAllocatePoolWithTag(NonPagedPool, + sizeof(SHUTDOWN_ENTRY), + TAG_SHUTDOWN_ENTRY); + if (!Entry) return STATUS_INSUFFICIENT_RESOURCES; + + /* Set the DO */ + Entry->DeviceObject = DeviceObject; + + /* Insert it into the list */ + ExInterlockedInsertHeadList(&LastChanceShutdownListHead, + &Entry->ShutdownList, + &ShutdownListLock); + + /* Set the shutdown registered flag */ + DeviceObject->Flags |= DO_SHUTDOWN_REGISTERED; + return STATUS_SUCCESS; } /* * @implemented */ NTSTATUS -STDCALL +NTAPI IoRegisterShutdownNotification(PDEVICE_OBJECT DeviceObject) { - PSHUTDOWN_ENTRY Entry; - - Entry = ExAllocatePoolWithTag(NonPagedPool, sizeof(SHUTDOWN_ENTRY), - TAG_SHUTDOWN_ENTRY); - if (Entry == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - Entry->DeviceObject = DeviceObject; - - ExInterlockedInsertHeadList(&ShutdownListHead, - &Entry->ShutdownList, - &ShutdownListLock); - - DeviceObject->Flags |= DO_SHUTDOWN_REGISTERED; - - return STATUS_SUCCESS; + PSHUTDOWN_ENTRY Entry; + + /* Allocate the shutdown entry */ + Entry = ExAllocatePoolWithTag(NonPagedPool, + sizeof(SHUTDOWN_ENTRY), + TAG_SHUTDOWN_ENTRY); + if (!Entry) return STATUS_INSUFFICIENT_RESOURCES; + + /* Set the DO */ + Entry->DeviceObject = DeviceObject; + + /* Insert it into the list */ + ExInterlockedInsertHeadList(&ShutdownListHead, + &Entry->ShutdownList, + &ShutdownListLock); + + /* Set the shutdown registered flag */ + DeviceObject->Flags |= DO_SHUTDOWN_REGISTERED; + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +VOID +NTAPI +IoUnregisterShutdownNotification(PDEVICE_OBJECT DeviceObject) +{ + PSHUTDOWN_ENTRY ShutdownEntry; + PLIST_ENTRY NextEntry; + KIRQL OldIrql; + + /* Acquire the shutdown lock and loop the shutdown list */ + KeAcquireSpinLock(&ShutdownListLock, &OldIrql); + NextEntry = ShutdownListHead.Flink; + while (NextEntry != &ShutdownListHead) + { + /* Get the entry */ + ShutdownEntry = CONTAINING_RECORD(NextEntry, + SHUTDOWN_ENTRY, + ShutdownList); + + /* Get if the DO matches */ + if (ShutdownEntry->DeviceObject == DeviceObject) + { + /* Remove it from the list */ + RemoveEntryList(NextEntry); + NextEntry = NextEntry->Blink; + + /* Free the entry */ + ExFreePool(ShutdownEntry); + } + + /* Go to the next entry */ + NextEntry = NextEntry->Flink; + } + + /* Now loop the last chance list */ + NextEntry = LastChanceShutdownListHead.Flink; + while (NextEntry != &LastChanceShutdownListHead) + { + /* Get the entry */ + ShutdownEntry = CONTAINING_RECORD(NextEntry, + SHUTDOWN_ENTRY, + ShutdownList); + + /* Get if the DO matches */ + if (ShutdownEntry->DeviceObject == DeviceObject) + { + /* Remove it from the list */ + RemoveEntryList(NextEntry); + NextEntry = NextEntry->Blink; + + /* Free the entry */ + ExFreePool(ShutdownEntry); + } + + /* Go to the next entry */ + NextEntry = NextEntry->Flink; + } + + /* Now remove the flag */ + DeviceObject->Flags &= ~DO_SHUTDOWN_REGISTERED; } /* @@ -1277,46 +1378,6 @@ { IoReleaseCancelSpinLock(oldirql); } - -} - -/* - * @unimplemented - */ -VOID -STDCALL -IoSynchronousInvalidateDeviceRelations(IN PDEVICE_OBJECT DeviceObject, - IN DEVICE_RELATION_TYPE Type) -{ - UNIMPLEMENTED; -} - -/* - * @implemented - */ -VOID -STDCALL -IoUnregisterShutdownNotification(PDEVICE_OBJECT DeviceObject) -{ - PSHUTDOWN_ENTRY ShutdownEntry, tmp; - KIRQL oldlvl; - - LIST_FOR_EACH_SAFE(ShutdownEntry, tmp, &ShutdownListHead, SHUTDOWN_ENTRY, ShutdownList) - { - - if (ShutdownEntry->DeviceObject == DeviceObject) - { - DeviceObject->Flags &= ~DO_SHUTDOWN_REGISTERED; - - KeAcquireSpinLock(&ShutdownListLock,&oldlvl); - RemoveEntryList(&ShutdownEntry->ShutdownList); - KeReleaseSpinLock(&ShutdownListLock,oldlvl); - - ExFreePool(ShutdownEntry); - return; - } - - } } /* EOF */ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c Sat Jul 1 22:26:22 2006 @@ -79,6 +79,17 @@ IN DEVICE_RELATION_TYPE Type) { IopInvalidateDeviceRelations(IopGetDeviceNode(DeviceObject), Type); +} + +/* + * @unimplemented + */ +VOID +STDCALL +IoSynchronousInvalidateDeviceRelations(IN PDEVICE_OBJECT DeviceObject, + IN DEVICE_RELATION_TYPE Type) +{ + UNIMPLEMENTED; } /*

1 0

[janderwald] 22742: * DS_SHELLFONT is an style not an EXSTYLE.
by janderwald＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: janderwald Date: Sat Jul 1 22:04:00 2006 New Revision: 22742 URL: http://svn.reactos.org/svn/reactos?rev=22742&view=rev Log: * DS_SHELLFONT is an style not an EXSTYLE. Modified: trunk/reactos/base/applications/calc/Cz.rc trunk/reactos/base/applications/calc/De.rc trunk/reactos/base/applications/calc/En.rc trunk/reactos/base/applications/calc/Es.rc trunk/reactos/base/applications/calc/Fr.rc trunk/reactos/base/applications/calc/Hu.rc trunk/reactos/base/applications/calc/It.rc trunk/reactos/base/applications/calc/Ja.rc trunk/reactos/base/applications/calc/Nl.rc trunk/reactos/base/applications/calc/Pt.rc trunk/reactos/base/applications/calc/Ru.rc trunk/reactos/base/applications/calc/Sv.rc trunk/reactos/base/applications/calc/Uk.rc trunk/reactos/base/applications/control/control.c trunk/reactos/base/applications/games/solitaire/de.rc trunk/reactos/base/applications/games/solitaire/en.rc trunk/reactos/base/applications/games/winemine/De.rc trunk/reactos/base/applications/games/winemine/En.rc trunk/reactos/base/applications/games/winemine/Fr.rc trunk/reactos/base/applications/games/winemine/Nl.rc trunk/reactos/base/applications/games/winemine/Pl.rc trunk/reactos/base/applications/getfirefox/De.rc trunk/reactos/base/applications/getfirefox/En.rc trunk/reactos/base/applications/getfirefox/Fr.rc trunk/reactos/base/applications/getfirefox/Hu.rc trunk/reactos/base/applications/getfirefox/Nl.rc trunk/reactos/base/applications/getfirefox/Ru.rc trunk/reactos/base/applications/getfirefox/Sv.rc trunk/reactos/base/applications/getfirefox/Uk.rc trunk/reactos/base/applications/ibrowser/De.rc trunk/reactos/base/applications/ibrowser/En.rc trunk/reactos/base/applications/ibrowser/Nl.rc trunk/reactos/base/applications/imagesoft/En.rc trunk/reactos/base/applications/msconfig/De.rc trunk/reactos/base/applications/msconfig/En.rc trunk/reactos/base/applications/msconfig/Fr.rc trunk/reactos/base/applications/msconfig/Hu.rc trunk/reactos/base/applications/msconfig/Nl.rc trunk/reactos/base/applications/msconfig/No.rc trunk/reactos/base/applications/notepad/res/Cs.rc trunk/reactos/base/applications/notepad/res/Da.rc trunk/reactos/base/applications/notepad/res/De.rc trunk/reactos/base/applications/notepad/res/En.rc trunk/reactos/base/applications/notepad/res/Es.rc trunk/reactos/base/applications/notepad/res/Fi.rc trunk/reactos/base/applications/notepad/res/Fr.rc trunk/reactos/base/applications/notepad/res/Gr.rc trunk/reactos/base/applications/notepad/res/Hu.rc trunk/reactos/base/applications/notepad/res/It.rc trunk/reactos/base/applications/notepad/res/Ja.rc trunk/reactos/base/applications/notepad/res/Nl.rc trunk/reactos/base/applications/notepad/res/Pl.rc trunk/reactos/base/applications/notepad/res/Pt.rc trunk/reactos/base/applications/notepad/res/Ru.rc trunk/reactos/base/applications/notepad/res/Si.rc trunk/reactos/base/applications/notepad/res/Sk.rc trunk/reactos/base/applications/notepad/res/Sv.rc trunk/reactos/base/applications/notepad/res/Th.rc trunk/reactos/base/applications/notepad/res/Uk.rc trunk/reactos/base/applications/notepad/res/Wa.rc trunk/reactos/base/applications/notepad/res/Zh.rc trunk/reactos/base/applications/regedit/Cz.rc trunk/reactos/base/applications/regedit/De.rc trunk/reactos/base/applications/regedit/En.rc trunk/reactos/base/applications/regedit/Es.rc trunk/reactos/base/applications/regedit/Fr.rc trunk/reactos/base/applications/regedit/Hu.rc trunk/reactos/base/applications/regedit/It.rc trunk/reactos/base/applications/regedit/Ja.rc trunk/reactos/base/applications/regedit/Nl.rc trunk/reactos/base/applications/regedit/Pl.rc trunk/reactos/base/applications/regedit/Pt.rc trunk/reactos/base/applications/regedit/Ru.rc trunk/reactos/base/applications/regedit/Si.rc trunk/reactos/base/applications/regedit/Sv.rc trunk/reactos/base/applications/reporterror/Ja.rc trunk/reactos/base/applications/reporterror/Nl.rc trunk/reactos/base/applications/reporterror/de.rc trunk/reactos/base/applications/reporterror/dk.rc trunk/reactos/base/applications/reporterror/en.rc trunk/reactos/base/applications/reporterror/hu.rc trunk/reactos/base/applications/reporterror/ru.rc trunk/reactos/base/applications/reporterror/sv.rc trunk/reactos/base/applications/screensavers/matrix/matrix.rc trunk/reactos/base/applications/servman/De.rc trunk/reactos/base/applications/servman/En.rc trunk/reactos/base/applications/servman/Ru.rc trunk/reactos/base/applications/sndvol32/Cz.rc trunk/reactos/base/applications/sndvol32/De.rc trunk/reactos/base/applications/sndvol32/En.rc trunk/reactos/base/applications/sndvol32/Fr.rc trunk/reactos/base/applications/sndvol32/Hu.rc trunk/reactos/base/applications/sndvol32/Ja.rc trunk/reactos/base/applications/sndvol32/Nl.rc trunk/reactos/base/applications/sndvol32/Sv.rc trunk/reactos/base/applications/taskmgr/Cz.rc trunk/reactos/base/applications/taskmgr/De.rc trunk/reactos/base/applications/taskmgr/Dk.rc trunk/reactos/base/applications/taskmgr/En.rc trunk/reactos/base/applications/taskmgr/Es.rc trunk/reactos/base/applications/taskmgr/Fr.rc trunk/reactos/base/applications/taskmgr/Hu.rc trunk/reactos/base/applications/taskmgr/Ja.rc trunk/reactos/base/applications/taskmgr/Nl.rc trunk/reactos/base/applications/taskmgr/Sv.rc trunk/reactos/base/applications/taskmgr/Uk.rc trunk/reactos/base/applications/winefile/Sv.rc trunk/reactos/base/applications/winefile/cs.rc trunk/reactos/base/applications/winefile/de.rc trunk/reactos/base/applications/winefile/en.rc trunk/reactos/base/applications/winefile/es.rc trunk/reactos/base/applications/winefile/fr.rc trunk/reactos/base/applications/winefile/hu.rc trunk/reactos/base/applications/winefile/it.rc trunk/reactos/base/applications/winefile/nl.rc trunk/reactos/base/applications/winefile/pl.rc trunk/reactos/base/applications/winefile/pt.rc trunk/reactos/base/applications/winefile/ru.rc trunk/reactos/base/applications/winefile/si.rc trunk/reactos/base/applications/winefile/zh.rc trunk/reactos/base/applications/wordpad/En.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Cz.… Modified: trunk/reactos/base/applications/calc/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/De.… Modified: trunk/reactos/base/applications/calc/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/En.… Modified: trunk/reactos/base/applications/calc/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Es.… Modified: trunk/reactos/base/applications/calc/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Fr.… Modified: trunk/reactos/base/applications/calc/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Hu.… Modified: trunk/reactos/base/applications/calc/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/It.… Modified: trunk/reactos/base/applications/calc/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Ja.… Modified: trunk/reactos/base/applications/calc/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Nl.… Modified: trunk/reactos/base/applications/calc/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Pt.… Modified: trunk/reactos/base/applications/calc/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Ru.… Modified: trunk/reactos/base/applications/calc/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Sv.… Modified: trunk/reactos/base/applications/calc/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Uk.… Modified: trunk/reactos/base/applications/control/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… Modified: trunk/reactos/base/applications/games/solitaire/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/winemine/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/getfirefox/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/ibrowser/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/ibrowser… Modified: trunk/reactos/base/applications/ibrowser/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/ibrowser… Modified: trunk/reactos/base/applications/ibrowser/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/ibrowser… Modified: trunk/reactos/base/applications/imagesoft/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… Modified: trunk/reactos/base/applications/msconfig/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/notepad/res/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Wa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/regedit/Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/reporterror/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/dk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/screensavers/matrix/matrix.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/servman/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/servman/… Modified: trunk/reactos/base/applications/servman/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/servman/… Modified: trunk/reactos/base/applications/servman/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/servman/… Modified: trunk/reactos/base/applications/sndvol32/Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/taskmgr/Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Dk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/winefile/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/it.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…

1 0

[ion] 22741: - Use IoGetDevObjExtension and STDCALL->NTAPI. - Fix some bugs in IoGetRelatedDeviceObject: We should make sure that FO_DIRECT_DEVICE_OPEN isn't set when reading from the VPB's DO, otherwise we return the FO's DO directly. Also check for attachment before trying to get any attached device.
by ion＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: ion Date: Sat Jul 1 21:51:45 2006 New Revision: 22741 URL: http://svn.reactos.org/svn/reactos?rev=22741&view=rev Log: - Use IoGetDevObjExtension and STDCALL->NTAPI. - Fix some bugs in IoGetRelatedDeviceObject: We should make sure that FO_DIRECT_DEVICE_OPEN isn't set when reading from the VPB's DO, otherwise we return the FO's DO directly. Also check for attachment before trying to get any attached device. Modified: trunk/reactos/ntoskrnl/io/device.c Modified: trunk/reactos/ntoskrnl/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/device.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/device.c (original) +++ trunk/reactos/ntoskrnl/io/device.c Sat Jul 1 21:51:45 2006 @@ -954,11 +954,11 @@ * @implemented */ PDEVICE_OBJECT -STDCALL +NTAPI IoGetDeviceAttachmentBaseRef(IN PDEVICE_OBJECT DeviceObject) { /* Return the attached Device */ - return (((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->AttachedTo); + return IoGetDevObjExtension(DeviceObject)->AttachedTo; } /* @@ -968,7 +968,7 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI IoGetDeviceObjectPointer(IN PUNICODE_STRING ObjectName, IN ACCESS_MASK DesiredAccess, OUT PFILE_OBJECT *FileObject, @@ -986,8 +986,8 @@ * @implemented */ NTSTATUS -STDCALL -IoGetDiskDeviceObject(IN PDEVICE_OBJECT FileSystemDeviceObject, +NTAPI +IoGetDiskDeviceObject(IN PDEVICE_OBJECT FileSystemDeviceObject, OUT PDEVICE_OBJECT *DiskDeviceObject) { PEXTENDED_DEVOBJ_EXTENSION DeviceExtension; @@ -1001,14 +1001,18 @@ IoAcquireVpbSpinLock(&OldIrql); /* Get the Device Extension */ - DeviceExtension = (PEXTENDED_DEVOBJ_EXTENSION)FileSystemDeviceObject->DeviceObjectExtension; + DeviceExtension = IoGetDevObjExtension(FileSystemDeviceObject); /* Make sure this one has a VPB too */ Vpb = DeviceExtension->Vpb; if (!Vpb) return STATUS_INVALID_PARAMETER; - /* Make sure someone it's mounted */ - if ((!Vpb->ReferenceCount) || (Vpb->Flags & VPB_MOUNTED)) return STATUS_VOLUME_DISMOUNTED; + /* Make sure that it's mounted */ + if ((!Vpb->ReferenceCount) || (Vpb->Flags & VPB_MOUNTED)) + { + /* It's not, so return failure */ + return STATUS_VOLUME_DISMOUNTED; + } /* Return the Disk Device Object */ *DiskDeviceObject = Vpb->RealDevice; @@ -1022,13 +1026,14 @@ * @implemented */ PDEVICE_OBJECT -STDCALL +NTAPI IoGetLowerDeviceObject(IN PDEVICE_OBJECT DeviceObject) { - PEXTENDED_DEVOBJ_EXTENSION DeviceExtension = (PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension; + PEXTENDED_DEVOBJ_EXTENSION DeviceExtension; PDEVICE_OBJECT LowerDeviceObject = NULL; /* Make sure it's not getting deleted */ + DeviceExtension = IoGetDevObjExtension(DeviceObject); if (DeviceExtension->ExtensionFlags & (DOE_UNLOAD_PENDING | DOE_DELETE_PENDING | DOE_REMOVE_PENDING | @@ -1055,29 +1060,40 @@ * @implemented */ PDEVICE_OBJECT -STDCALL +NTAPI IoGetRelatedDeviceObject(IN PFILE_OBJECT FileObject) { PDEVICE_OBJECT DeviceObject = FileObject->DeviceObject; - /* Get logical volume mounted on a physical/virtual/logical device */ - if (FileObject->Vpb && FileObject->Vpb->DeviceObject) - { + /* Check if we have a VPB with a device object */ + if ((FileObject->Vpb) && (FileObject->Vpb->DeviceObject)) + { + /* Then use the DO from the VPB */ + ASSERT(!(FileObject->Flags & FO_DIRECT_DEVICE_OPEN)); DeviceObject = FileObject->Vpb->DeviceObject; } - - /* - * Check if file object has an associated device object mounted by some - * other file system. - */ - if (FileObject->DeviceObject->Vpb && - FileObject->DeviceObject->Vpb->DeviceObject) - { + else if (!(FileObject->Flags & FO_DIRECT_DEVICE_OPEN) && + (FileObject->DeviceObject->Vpb) && + (FileObject->DeviceObject->Vpb->DeviceObject)) + { + /* The disk device actually has a VPB, so get the DO from there */ DeviceObject = FileObject->DeviceObject->Vpb->DeviceObject; } - - /* Return the highest attached device */ - return IoGetAttachedDevice(DeviceObject); + else + { + /* Otherwise, this was a direct open */ + DeviceObject = FileObject->DeviceObject; + } + + /* Check if we were attached */ + if (DeviceObject->AttachedDevice) + { + /* Return the highest attached device */ + DeviceObject = IoGetAttachedDevice(DeviceObject); + } + + /* Return the DO we found */ + return DeviceObject; } /*

1 0

[ion] 22740: - Add IoGetDevObjExtension for getting the PEXTENDED_DEVOBJ_EXTENSION from a device object instead of always doing a huge typecast. - Implement device unloading through IopUnloadDevice and device referencing through IopReferenceDeviceObject and IopDereferenceDeviceObject, and make IoDeleteDevice and IoDetachDevice unload the device on 0 reference count. Doesn't fully work yet. - Simplify IoGetAttachedDEvice/IoGetAttachedDeviceReference not to use an extra stack variable.
by ion＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: ion Date: Sat Jul 1 21:40:03 2006 New Revision: 22740 URL: http://svn.reactos.org/svn/reactos?rev=22740&view=rev Log: - Add IoGetDevObjExtension for getting the PEXTENDED_DEVOBJ_EXTENSION from a device object instead of always doing a huge typecast. - Implement device unloading through IopUnloadDevice and device referencing through IopReferenceDeviceObject and IopDereferenceDeviceObject, and make IoDeleteDevice and IoDetachDevice unload the device on 0 reference count. Doesn't fully work yet. - Simplify IoGetAttachedDEvice/IoGetAttachedDeviceReference not to use an extra stack variable. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/device.c trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Sat Jul 1 21:40:03 2006 @@ -79,6 +79,13 @@ (!(FileObject) ? \ FALSE : \ FileObject->Flags & FO_SYNCHRONOUS_IO)) \ + +// +// Returns the internal Device Object Extension +// +#define IoGetDevObjExtension(DeviceObject) \ + ((PEXTENDED_DEVOBJ_EXTENSION) \ + (DeviceObject->DeviceObjectExtension)) \ /* * VOID @@ -176,6 +183,15 @@ (_DeviceNode); \ (_DeviceTreeTraverseContext)->Action = (_Action); \ (_DeviceTreeTraverseContext)->Context = (_Context); } + +// +// Device List Operations +// +typedef enum _IOP_DEVICE_LIST_OPERATION +{ + IopRemove, + IopAdd +} IOP_DEVICE_LIST_OPERATION, *PIOP_DEVICE_LIST_OPERATION; // // Special version of the IRP Overlay used to optimize I/O completion @@ -563,6 +579,12 @@ VOID ); +NTSTATUS +NTAPI +IopReferenceDeviceObject( + IN PDEVICE_OBJECT DeviceObject +); + // // Shutdown routines // Modified: trunk/reactos/ntoskrnl/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/device.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/device.c (original) +++ trunk/reactos/ntoskrnl/io/device.c Sat Jul 1 21:40:03 2006 @@ -171,7 +171,7 @@ } NTSTATUS -STDCALL +NTAPI IopGetDeviceObjectPointer(IN PUNICODE_STRING ObjectName, IN ACCESS_MASK DesiredAccess, OUT PFILE_OBJECT *FileObject, @@ -217,6 +217,235 @@ return Status; } +PDEVICE_OBJECT +NTAPI +IopGetLowestDevice(IN PDEVICE_OBJECT DeviceObject) +{ + PDEVICE_OBJECT LowestDevice; + PEXTENDED_DEVOBJ_EXTENSION DeviceExtension; + + /* Get the current device and its extension */ + LowestDevice = DeviceObject; + DeviceExtension = IoGetDevObjExtension(LowestDevice); + + /* Keep looping as long as we're attached */ + while (DeviceExtension->AttachedTo) + { + /* Get the lowest device and its extension */ + LowestDevice = DeviceExtension->AttachedTo; + DeviceExtension = IoGetDevObjExtension(LowestDevice); + } + + /* Return the lowest device */ + return LowestDevice; +} + +VOID +NTAPI +IopEditDeviceList(IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT DeviceObject, + IN IOP_DEVICE_LIST_OPERATION Type) +{ + PDEVICE_OBJECT Previous; + + /* Check the type of operation */ + if (Type == IopRemove) + { + /* Get the current device and check if it's the current one */ + Previous = DeviceObject->DriverObject->DeviceObject; + if (Previous == DeviceObject) + { + /* It is, simply unlink this one directly */ + DeviceObject->DriverObject->DeviceObject = + DeviceObject->NextDevice; + } + else + { + /* It's not, so loop until we find the device */ + while (Previous->NextDevice != DeviceObject) + { + /* Not this one, keep moving */ + Previous = Previous->NextDevice; + } + + /* We found it, now unlink us */ + Previous->NextDevice = DeviceObject->NextDevice; + } + } + else + { + /* Link the device object and the driver object */ + DeviceObject->NextDevice = DriverObject->DeviceObject; + DriverObject->DeviceObject = DeviceObject; + } +} + +VOID +NTAPI +IopUnloadDevice(IN PDEVICE_OBJECT DeviceObject) +{ + PDRIVER_OBJECT DriverObject = DeviceObject->DriverObject; + PDEVICE_OBJECT AttachedDeviceObject, LowestDeviceObject; + PEXTENDED_DEVOBJ_EXTENSION ThisExtension, DeviceExtension; + PDEVICE_NODE DeviceNode; + BOOLEAN SafeToUnload = TRUE; + + /* Check if removal is pending */ + ThisExtension = IoGetDevObjExtension(DeviceObject); + if (ThisExtension->ExtensionFlags & DOE_REMOVE_PENDING) + { + /* Get the PDO, extension, and node */ + LowestDeviceObject = IopGetLowestDevice(DeviceObject); + DeviceExtension = IoGetDevObjExtension(LowestDeviceObject); + DeviceNode = DeviceExtension->DeviceNode; + + /* The PDO needs a device node */ + ASSERT(DeviceNode != NULL); + + /* Loop all attached objects */ + AttachedDeviceObject = LowestDeviceObject; + while (AttachedDeviceObject) + { + /* Make sure they're dereferenced */ + if (AttachedDeviceObject->ReferenceCount) return; + AttachedDeviceObject = AttachedDeviceObject->AttachedDevice; + } + + /* Loop all attached objects */ + AttachedDeviceObject = LowestDeviceObject; + while (AttachedDeviceObject) + { + /* Get the device extension */ + DeviceExtension = IoGetDevObjExtension(AttachedDeviceObject); + + /* Remove the pending flag and set processed */ + DeviceExtension->ExtensionFlags &= ~DOE_REMOVE_PENDING; + DeviceExtension->ExtensionFlags |= DOE_REMOVE_PROCESSED; + AttachedDeviceObject = AttachedDeviceObject->AttachedDevice; + } + + /* + * FIXME: TODO HPOUSSIN + * We need to parse/lock the device node, and if we have any pending + * surprise removals, query all relationships and send IRP_MN_REMOVE_ + * _DEVICE to the devices related... + */ + return; + } + + /* Check if deletion is pending */ + if (ThisExtension->ExtensionFlags & DOE_DELETE_PENDING) + { + /* Make sure unload is pending */ + if (!(ThisExtension->ExtensionFlags & DOE_UNLOAD_PENDING) || + (DriverObject->Flags & DRVO_UNLOAD_INVOKED)) + { + /* We can't unload anymore */ + SafeToUnload = FALSE; + } + + /* + * Check if we have an attached device and fail if we're attached + * and still have a reference count. + */ + AttachedDeviceObject = DeviceObject->AttachedDevice; + if ((AttachedDeviceObject) && (DeviceObject->ReferenceCount)) return; + + /* Check if we have a Security Descriptor */ + if (DeviceObject->SecurityDescriptor) + { + /* Free it */ + ExFreePool(DeviceObject->SecurityDescriptor); + } + + /* Remove the device from the list */ + IopEditDeviceList(DeviceObject->DriverObject, DeviceObject, IopRemove); + + /* Dereference the keep-alive */ + ObDereferenceObject(DeviceObject); + + /* If we're not unloading, stop here */ + if (!SafeToUnload) return; + } + + /* Loop all the device objects */ + DeviceObject = DriverObject->DeviceObject; + while (DeviceObject) + { + /* + * Make sure we're not attached, having a reference count + * or already deleting + */ + if ((DeviceObject->ReferenceCount) || + (DeviceObject->AttachedDevice) || + (IoGetDevObjExtension(DeviceObject)->ExtensionFlags & + (DOE_DELETE_PENDING | DOE_REMOVE_PENDING))) + { + /* We're not safe to unload, quit */ + return; + } + + /* Check the next device */ + DeviceObject = DeviceObject->NextDevice; + } + + /* Set the unload invoked flag */ + DriverObject->Flags |= DRVO_UNLOAD_INVOKED; + + /* Unload it */ + if (DriverObject->DriverUnload) DriverObject->DriverUnload(DriverObject); +} + +VOID +NTAPI +IopDereferenceDeviceObject(IN PDEVICE_OBJECT DeviceObject, + IN BOOLEAN ForceUnload) +{ + /* Sanity check */ + ASSERT(DeviceObject->ReferenceCount); + + /* Dereference the device */ + DeviceObject->ReferenceCount--; + + /* + * Check if we can unload it and it's safe to unload (or if we're forcing + * an unload, which is OK too). + */ + if (!(DeviceObject->ReferenceCount) && + ((ForceUnload) || (IoGetDevObjExtension(DeviceObject)->ExtensionFlags & + (DOE_UNLOAD_PENDING | + DOE_DELETE_PENDING | + DOE_REMOVE_PENDING | + DOE_REMOVE_PROCESSED)))) + { + /* Unload it */ + IopUnloadDevice(DeviceObject); + } +} + +NTSTATUS +NTAPI +IopReferenceDeviceObject(IN PDEVICE_OBJECT DeviceObject) +{ + /* Make sure the object is valid */ + if ((IoGetDevObjExtension(DeviceObject)->ExtensionFlags & + (DOE_UNLOAD_PENDING | + DOE_DELETE_PENDING | + DOE_REMOVE_PENDING | + DOE_REMOVE_PROCESSED)) || + (DeviceObject->Flags & DO_DEVICE_INITIALIZING)) + { + /* It's unloading or initializing, so fail */ + return STATUS_NO_SUCH_DEVICE; + } + else + { + /* Increase reference count */ + DeviceObject->ReferenceCount++; + return STATUS_SUCCESS; + } +} + /* PUBLIC FUNCTIONS ***********************************************************/ /* @@ -238,7 +467,7 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI IoAttachDevice(PDEVICE_OBJECT SourceDevice, PUNICODE_STRING TargetDeviceName, PDEVICE_OBJECT *AttachedDevice) @@ -273,7 +502,7 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI IoAttachDeviceByPointer(IN PDEVICE_OBJECT SourceDevice, IN PDEVICE_OBJECT TargetDevice) { @@ -295,7 +524,7 @@ * @implemented */ PDEVICE_OBJECT -STDCALL +NTAPI IoAttachDeviceToDeviceStack(PDEVICE_OBJECT SourceDevice, PDEVICE_OBJECT TargetDevice) { @@ -315,7 +544,7 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI IoAttachDeviceToDeviceStackSafe(IN PDEVICE_OBJECT SourceDevice, IN PDEVICE_OBJECT TargetDevice, OUT PDEVICE_OBJECT *AttachedToDeviceObject) @@ -325,15 +554,14 @@ /* Get the Attached Device and source extension */ AttachedDevice = IoGetAttachedDevice(TargetDevice); - SourceDeviceExtension = (PEXTENDED_DEVOBJ_EXTENSION)SourceDevice-> - DeviceObjectExtension; + SourceDeviceExtension = IoGetDevObjExtension(SourceDevice); /* Make sure that it's in a correct state */ - if (!(((PEXTENDED_DEVOBJ_EXTENSION)AttachedDevice->DeviceObjectExtension)-> - ExtensionFlags & (DOE_UNLOAD_PENDING | - DOE_DELETE_PENDING | - DOE_REMOVE_PENDING | - DOE_REMOVE_PROCESSED))) + if (!IoGetDevObjExtension(AttachedDevice)->ExtensionFlags & + (DOE_UNLOAD_PENDING | + DOE_DELETE_PENDING | + DOE_REMOVE_PENDING | + DOE_REMOVE_PROCESSED)) { /* Update atached device fields */ AttachedDevice->AttachedDevice = SourceDevice; @@ -392,7 +620,7 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI IoCreateDevice(IN PDRIVER_OBJECT DriverObject, IN ULONG DeviceExtensionSize, IN PUNICODE_STRING DeviceName, @@ -559,8 +787,7 @@ /* Now do the final linking */ ObReferenceObject(DriverObject); CreatedDeviceObject->DriverObject = DriverObject; - CreatedDeviceObject->NextDevice = DriverObject->DeviceObject; - DriverObject->DeviceObject = CreatedDeviceObject; + IopEditDeviceList(DriverObject, CreatedDeviceObject, IopAdd); /* Close the temporary handle and return to caller */ NtClose(TempHandle); @@ -575,46 +802,39 @@ * @implemented */ VOID -STDCALL -IoDeleteDevice(PDEVICE_OBJECT DeviceObject) -{ - PDEVICE_OBJECT Previous; - - if (DeviceObject->Flags & DO_SHUTDOWN_REGISTERED) - IoUnregisterShutdownNotification(DeviceObject); - - /* Remove the timer if it exists */ - if (DeviceObject->Timer) - { - IopRemoveTimerFromTimerList(DeviceObject->Timer); - ExFreePoolWithTag(DeviceObject->Timer, TAG_IO_TIMER); - } - - /* Remove device from driver device list */ - Previous = DeviceObject->DriverObject->DeviceObject; - if (Previous == DeviceObject) - { - DeviceObject->DriverObject->DeviceObject = DeviceObject->NextDevice; - } - else - { - while (Previous->NextDevice != DeviceObject) - Previous = Previous->NextDevice; - Previous->NextDevice = DeviceObject->NextDevice; - } - - /* I guess this should be removed later... but it shouldn't cause problems */ - ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->ExtensionFlags |= DOE_DELETE_PENDING; - - /* Make the object temporary. This should automatically remove the device - from the namespace */ - ObMakeTemporaryObject(DeviceObject); - - /* Dereference the driver object */ - ObDereferenceObject(DeviceObject->DriverObject); - - /* Remove the keep-alive reference */ - ObDereferenceObject(DeviceObject); +NTAPI +IoDeleteDevice(IN PDEVICE_OBJECT DeviceObject) +{ + PIO_TIMER Timer; + + /* Check if the device is registered for shutdown notifications */ + if (DeviceObject->Flags & DO_SHUTDOWN_REGISTERED) + { + /* Call the shutdown notifications */ + IoUnregisterShutdownNotification(DeviceObject); + } + + /* Check if it has a timer */ + Timer = DeviceObject->Timer; + if (Timer) + { + /* Remove it and free it */ + IopRemoveTimerFromTimerList(Timer); + ExFreePoolWithTag(Timer, TAG_IO_TIMER); + } + + /* Check if the device has a name */ + if (DeviceObject->Flags & DO_DEVICE_HAS_NAME) + { + /* It does, make it temporary so we can remove it */ + ObMakeTemporaryObject(DeviceObject); + } + + /* Set the pending delete flag */ + IoGetDevObjExtension(DeviceObject)->ExtensionFlags |= DOE_DELETE_PENDING; + + /* Check if the device object can be unloaded */ + if (!DeviceObject->ReferenceCount) IopUnloadDevice(DeviceObject); } /* @@ -624,21 +844,28 @@ * @implemented */ VOID -STDCALL -IoDetachDevice(PDEVICE_OBJECT TargetDevice) -{ - DPRINT("IoDetachDevice(TargetDevice 0x%p)\n", TargetDevice); - +NTAPI +IoDetachDevice(IN PDEVICE_OBJECT TargetDevice) +{ /* Remove the attachment */ - ((PEXTENDED_DEVOBJ_EXTENSION)TargetDevice->AttachedDevice->DeviceObjectExtension)->AttachedTo = NULL; + IoGetDevObjExtension(TargetDevice->AttachedDevice)->AttachedTo = NULL; TargetDevice->AttachedDevice = NULL; + + /* Check if it's ok to delete this device */ + if ((IoGetDevObjExtension(TargetDevice)->ExtensionFlags & + (DOE_UNLOAD_PENDING | DOE_DELETE_PENDING | DOE_REMOVE_PENDING)) && + !(TargetDevice->ReferenceCount)) + { + /* It is, do it */ + IopUnloadDevice(TargetDevice); + } } /* * @implemented */ NTSTATUS -STDCALL +NTAPI IoEnumerateDeviceObjectList(IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT *DeviceObjectList, IN ULONG DeviceObjectListSize, @@ -647,13 +874,8 @@ ULONG ActualDevices = 1; PDEVICE_OBJECT CurrentDevice = DriverObject->DeviceObject; - DPRINT1("IoEnumerateDeviceObjectList\n"); - /* Find out how many devices we'll enumerate */ - while ((CurrentDevice = CurrentDevice->NextDevice)) - { - ActualDevices++; - } + while ((CurrentDevice = CurrentDevice->NextDevice)) ActualDevices++; /* Go back to the first */ CurrentDevice = DriverObject->DeviceObject; @@ -698,19 +920,18 @@ * @implemented */ PDEVICE_OBJECT -STDCALL +NTAPI IoGetAttachedDevice(PDEVICE_OBJECT DeviceObject) { - PDEVICE_OBJECT Current = DeviceObject; - /* Get the last attached device */ - while (Current->AttachedDevice) - { - Current = Current->AttachedDevice; + while (DeviceObject->AttachedDevice) + { + /* Move to the next one */ + DeviceObject = DeviceObject->AttachedDevice; } /* Return it */ - return Current; + return DeviceObject; } /* @@ -720,14 +941,13 @@ * @implemented */ PDEVICE_OBJECT -STDCALL +NTAPI IoGetAttachedDeviceReference(PDEVICE_OBJECT DeviceObject) { - PDEVICE_OBJECT Current = IoGetAttachedDevice(DeviceObject); - - /* Reference the ATtached Device */ - ObReferenceObject(Current); - return Current; + /* Reference the Attached Device */ + DeviceObject = IoGetAttachedDevice(DeviceObject); + ObReferenceObject(DeviceObject); + return DeviceObject; } /* Modified: trunk/reactos/ntoskrnl/io/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/file.c?rev=227… ============================================================================== --- trunk/reactos/ntoskrnl/io/file.c (original) +++ trunk/reactos/ntoskrnl/io/file.c Sat Jul 1 21:40:03 2006 @@ -55,6 +55,9 @@ if (!*RemainingName->Buffer) { DeviceObject = ParseObject; + Status = IopReferenceDeviceObject(DeviceObject); + // fixme: NT wouldn't allow this + //if (!NT_SUCCESS(Status)) return Status;// KEBUGCHECK(0); Status = ObCreateObject(AccessMode, IoFileObjectType, @@ -116,6 +119,9 @@ DeviceObject = OpenPacket->RelatedFileObject->DeviceObject; } + Status = IopReferenceDeviceObject(DeviceObject); + // fixme: NT wouldn't allow this + //if (!NT_SUCCESS(Status)) return Status;// KEBUGCHECK(0); RtlCreateUnicodeString(&FileObject->FileName, RemainingName->Buffer); FileObject->DeviceObject = DeviceObject; *Object = FileObject;

1 0

[greatlrd] 22739: No change in the source code. It if only to test if new slave build server works or not
by greatlrd＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: greatlrd Date: Sat Jul 1 16:08:35 2006 New Revision: 22739 URL: http://svn.reactos.org/svn/reactos?rev=22739&view=rev Log: No change in the source code. It if only to test if new slave build server works or not Modified: trunk/reactos/dll/directx/ddraw/videoport.c Modified: trunk/reactos/dll/directx/ddraw/videoport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/videopor… ============================================================================== --- trunk/reactos/dll/directx/ddraw/videoport.c (original) +++ trunk/reactos/dll/directx/ddraw/videoport.c Sat Jul 1 16:08:35 2006 @@ -17,6 +17,7 @@ Main_DirectDrawVideoPort_QueryInterface (LPDIRECTDRAWVIDEOPORT iface, REFIID riid, LPVOID* ppvObj) { DX_WINDBG_trace(); + DX_STUB; }

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