Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 24566: Fix gcc4 warning (thx to Herve)
by weiden＠svn.reactos.org 18 Oct '06

18 Oct '06

Author: weiden Date: Thu Oct 19 01:35:18 2006 New Revision: 24566 URL: http://svn.reactos.org/svn/reactos?rev=24566&view=rev Log: Fix gcc4 warning (thx to Herve) Modified: trunk/reactos/lib/crt/wine/cpp.c Modified: trunk/reactos/lib/crt/wine/cpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/crt/wine/cpp.c?rev=245… ============================================================================== --- trunk/reactos/lib/crt/wine/cpp.c (original) +++ trunk/reactos/lib/crt/wine/cpp.c Thu Oct 19 01:35:18 2006 @@ -1181,7 +1181,7 @@ { int count = 0; const rtti_object_hierachy *obj_bases = obj_locator->type_hierachy; - const rtti_base_descriptor **base_desc = obj_bases->base_classes->bases; + const rtti_base_descriptor* const *base_desc = obj_bases->base_classes->bases; int src_offset = obj_locator->base_class_offset, dst_offset = -1; while (count < obj_bases->array_len)

1 0

[weiden] 24565: fix gcc4 warning
by weiden＠svn.reactos.org 18 Oct '06

18 Oct '06

Author: weiden Date: Thu Oct 19 01:18:02 2006 New Revision: 24565 URL: http://svn.reactos.org/svn/reactos?rev=24565&view=rev Log: fix gcc4 warning Modified: trunk/reactos/base/applications/devmgmt/mainwnd.c Modified: trunk/reactos/base/applications/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/mainwnd.c (original) +++ trunk/reactos/base/applications/devmgmt/mainwnd.c Thu Oct 19 01:18:02 2006 @@ -358,7 +358,7 @@ ScreenToClient(Info->hTreeView, &HitTest.pt)) { if (TreeView_HitTest(Info->hTreeView, &HitTest)) - TreeView_SelectItem(Info->hTreeView, HitTest.hItem); + (void)TreeView_SelectItem(Info->hTreeView, HitTest.hItem); } } break;

1 0

[ion] 24564: - A much simpler and featured RawFs driver that I had been working on while learning how to write simple FS drivers. Still missing some advanced functionality (Lite Stream File Objects and FS Notifications) because the Kernel doesn't fully support them yet. This one actually creates the \\Device names so that user-mode can even talk to it.
by ion＠svn.reactos.org 18 Oct '06

18 Oct '06

Author: ion Date: Wed Oct 18 22:00:42 2006 New Revision: 24564 URL: http://svn.reactos.org/svn/reactos?rev=24564&view=rev Log: - A much simpler and featured RawFs driver that I had been working on while learning how to write simple FS drivers. Still missing some advanced functionality (Lite Stream File Objects and FS Notifications) because the Kernel doesn't fully support them yet. This one actually creates the \\Device names so that user-mode can even talk to it. Modified: trunk/reactos/ntoskrnl/io/iomgr/rawfs.c Modified: trunk/reactos/ntoskrnl/io/iomgr/rawfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/rawfs.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/rawfs.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/rawfs.c Wed Oct 18 22:00:42 2006 @@ -1,962 +1,1105 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/io/rawfs.c - * PURPOSE: Raw filesystem driver - * - * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - */ +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/io/iomgr/rawfs.c +* PURPOSE: Raw File System Driver +* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +*/ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* TYPES *******************************************************************/ -typedef struct _RAWFS_GLOBAL_DATA -{ - PDRIVER_OBJECT DriverObject; - PDEVICE_OBJECT DeviceObject; - ULONG Flags; - ERESOURCE VolumeListLock; - LIST_ENTRY VolumeListHead; - NPAGED_LOOKASIDE_LIST FcbLookasideList; - NPAGED_LOOKASIDE_LIST CcbLookasideList; -} RAWFS_GLOBAL_DATA, *PRAWFS_GLOBAL_DATA, VCB, *PVCB; - -typedef struct _RAWFS_DEVICE_EXTENSION -{ - KSPIN_LOCK FcbListLock; - LIST_ENTRY FcbListHead; - PDEVICE_OBJECT StorageDevice; - ULONG Flags; - struct _RAWFS_FCB *VolumeFcb; - LIST_ENTRY VolumeListEntry; -} RAWFS_DEVICE_EXTENSION, *PRAWFS_DEVICE_EXTENSION; - -typedef struct _RAWFS_IRP_CONTEXT -{ - PIRP Irp; - PDEVICE_OBJECT DeviceObject; - PRAWFS_DEVICE_EXTENSION DeviceExt; - ULONG Flags; - WORK_QUEUE_ITEM WorkQueueItem; - PIO_STACK_LOCATION Stack; - UCHAR MajorFunction; - UCHAR MinorFunction; - PFILE_OBJECT FileObject; -} RAWFS_IRP_CONTEXT, *PRAWFS_IRP_CONTEXT; - -#define IRPCONTEXT_CANWAIT 0x0001 - -#define FCB_CACHE_INITIALIZED 0x0001 -#define FCB_DELETE_PENDING 0x0002 -#define FCB_IS_FAT 0x0004 -#define FCB_IS_PAGE_FILE 0x0008 -#define FCB_IS_VOLUME 0x0010 - -typedef struct _RAWFS_FCB -{ - /* Start FCB header required by ReactOS/Windows NT */ - FSRTL_COMMON_FCB_HEADER RFCB; - SECTION_OBJECT_POINTERS SectionObjectPointers; - ERESOURCE MainResource; - ERESOURCE PagingIoResource; - /* End FCB header required by ReactOS/Windows NT */ - - /* Reference count */ - LONG RefCount; - - /* List of FCB's for this volume */ - LIST_ENTRY FcbListEntry; - - /* Pointer to the parent fcb */ - struct _RAWFS_FCB* ParentFcb; - - /* Flags for the FCB */ - ULONG Flags; - - /* Pointer to the file object which has initialized the fcb */ - PFILE_OBJECT FileObject; -} RAWFS_FCB, *PRAWFS_FCB; - -typedef struct _RAWFS_CCB -{ - LARGE_INTEGER CurrentByteOffset; -} RAWFS_CCB, *PRAWFS_CCB; - -/* GLOBALS ******************************************************************/ - -static PDRIVER_OBJECT RawFsDriverObject; -static PDEVICE_OBJECT DiskDeviceObject; -static PDEVICE_OBJECT CdromDeviceObject; -static PDEVICE_OBJECT TapeDeviceObject; -static NPAGED_LOOKASIDE_LIST IrpContextLookasideList; -static LONG RawFsQueueCount = 0; +typedef struct _VCB +{ + USHORT NodeTypeCode; + USHORT NodeByteSize; + PDEVICE_OBJECT TargetDeviceObject; + PVPB Vpb; + ULONG VcbState; + KMUTEX Mutex; + CLONG OpenCount; + SHARE_ACCESS ShareAccess; + ULONG BytesPerSector; + LARGE_INTEGER SectorsOnDisk; +} VCB, *PVCB; + +typedef struct _VOLUME_DEVICE_OBJECT +{ + DEVICE_OBJECT DeviceObject; + VCB Vcb; +} VOLUME_DEVICE_OBJECT, *PVOLUME_DEVICE_OBJECT; + +/* GLOBALS *******************************************************************/ + +PDEVICE_OBJECT RawDiskDeviceObject, RawCdromDeviceObject, RawTapeDeviceObject; /* FUNCTIONS *****************************************************************/ +VOID +NTAPI +RawInitializeVcb(IN OUT PVCB Vcb, + IN PDEVICE_OBJECT TargetDeviceObject, + IN PVPB Vpb) +{ + PAGED_CODE(); + + /* Clear it */ + RtlZeroMemory(Vcb, sizeof(VCB)); + + /* Associate to system objects */ + Vcb->TargetDeviceObject = TargetDeviceObject; + Vcb->Vpb = Vpb; + + /* Initialize the lock */ + KeInitializeMutex(&Vcb->Mutex, 0); +} + BOOLEAN -RawFsIsRawFileSystemDeviceObject(IN PDEVICE_OBJECT DeviceObject) -{ - DPRINT("RawFsIsRawFileSystemDeviceObject(DeviceObject 0x%p)\n", DeviceObject); - - if (DeviceObject == DiskDeviceObject) - return TRUE; - if (DeviceObject == CdromDeviceObject) - return TRUE; - if (DeviceObject == TapeDeviceObject) - return TRUE; - return FALSE; -} - -static NTSTATUS -RawFsDispatchRequest(IN PRAWFS_IRP_CONTEXT IrpContext); - -/*static */NTSTATUS -RawFsReadDisk(IN PDEVICE_OBJECT pDeviceObject, - IN PLARGE_INTEGER ReadOffset, - IN ULONG ReadLength, - IN OUT PUCHAR Buffer) -{ - IO_STATUS_BLOCK IoStatus; - NTSTATUS Status; - KEVENT Event; - PIRP Irp; - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - DPRINT("RawFsReadDisk(pDeviceObject 0x%p, Offset %I64x, Length %d, Buffer 0x%p)\n", - pDeviceObject, ReadOffset->QuadPart, ReadLength, Buffer); - - DPRINT ("Building synchronous FSD Request...\n"); - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, - pDeviceObject, - Buffer, - ReadLength, - ReadOffset, - &Event, - &IoStatus); - if (Irp == NULL) - { - DPRINT("IoBuildSynchronousFsdRequest() failed\n"); - return STATUS_UNSUCCESSFUL; - } - - DPRINT("Calling IO Driver... with irp 0x%p\n", Irp); - Status = IoCallDriver(pDeviceObject, Irp); - - DPRINT("Waiting for IO Operation for 0x%p\n", Irp); - if (Status == STATUS_PENDING) - { - DPRINT("Operation pending\n"); - KeWaitForSingleObject (&Event, Suspended, KernelMode, FALSE, NULL); - DPRINT("Getting IO Status... for 0x%p\n", Irp); - Status = IoStatus.Status; - } - - if (!NT_SUCCESS(Status)) - { - DPRINT("RawFsReadDisk() failed. Status %x\n", Status); - DPRINT("(pDeviceObject 0x%p, Offset %I64x, Size %d, Buffer 0x%p\n", - pDeviceObject, ReadOffset->QuadPart, ReadLength, Buffer); - return Status; - } - DPRINT("Block request succeeded for 0x%p\n", Irp); - return STATUS_SUCCESS; -} - -/*static */NTSTATUS -RawFsWriteDisk(IN PDEVICE_OBJECT pDeviceObject, - IN PLARGE_INTEGER WriteOffset, - IN ULONG WriteLength, - IN PUCHAR Buffer) -{ - IO_STATUS_BLOCK IoStatus; - NTSTATUS Status; - KEVENT Event; - PIRP Irp; - - DPRINT("RawFsWriteDisk(pDeviceObject 0x%p, Offset %I64x, Size %d, Buffer 0x%p)\n", - pDeviceObject, WriteOffset->QuadPart, WriteLength, Buffer); - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - DPRINT("Building synchronous FSD Request...\n"); - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_WRITE, - pDeviceObject, - Buffer, - WriteLength, - WriteOffset, - &Event, - &IoStatus); - if (!Irp) - { - DPRINT("IoBuildSynchronousFsdRequest()\n"); - return(STATUS_UNSUCCESSFUL); - } - - DPRINT("Calling IO Driver...\n"); - Status = IoCallDriver(pDeviceObject, Irp); - - DPRINT("Waiting for IO Operation...\n"); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - DPRINT("Getting IO Status...\n"); - Status = IoStatus.Status; - } - if (!NT_SUCCESS(Status)) - { - DPRINT("RawFsWriteDisk() failed. Status %x\n", Status); - DPRINT("(pDeviceObject 0x%p, Offset %I64x, Size %d, Buffer 0x%p\n", - pDeviceObject, WriteOffset->QuadPart, WriteLength, Buffer); - return Status; - } - - return STATUS_SUCCESS; -} - -static NTSTATUS -RawFsBlockDeviceIoControl(IN PDEVICE_OBJECT DeviceObject, - IN ULONG CtlCode, - IN PVOID InputBuffer, - IN ULONG InputBufferSize, - IN OUT PVOID OutputBuffer, - IN OUT PULONG pOutputBufferSize) -{ - ULONG OutputBufferSize = 0; - KEVENT Event; - PIRP Irp; - IO_STATUS_BLOCK IoStatus; - NTSTATUS Status; - - DPRINT("RawFsBlockDeviceIoControl(DeviceObject 0x%p, CtlCode %x, " - "InputBuffer 0x%p, InputBufferSize %x, OutputBuffer 0x%p, " - "POutputBufferSize 0x%p (%x)\n", DeviceObject, CtlCode, - InputBuffer, InputBufferSize, OutputBuffer, pOutputBufferSize, - pOutputBufferSize ? *pOutputBufferSize : 0); - - if (pOutputBufferSize) - { - OutputBufferSize = *pOutputBufferSize; - } - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - DPRINT("Building device I/O control request ...\n"); - Irp = IoBuildDeviceIoControlRequest(CtlCode, - DeviceObject, - InputBuffer, - InputBufferSize, - OutputBuffer, - OutputBufferSize, - FALSE, - &Event, - &IoStatus); - if (Irp == NULL) - { - DPRINT("IoBuildDeviceIoControlRequest failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - DPRINT("Calling IO Driver... with irp 0x%p\n", Irp); - Status = IoCallDriver(DeviceObject, Irp); - - DPRINT("Waiting for IO Operation for 0x%p\n", Irp); - if (Status == STATUS_PENDING) - { - DPRINT("Operation pending\n"); - KeWaitForSingleObject (&Event, Suspended, KernelMode, FALSE, NULL); - DPRINT("Getting IO Status... for 0x%p\n", Irp); - Status = IoStatus.Status; - } - if (OutputBufferSize) - { - *pOutputBufferSize = OutputBufferSize; - } - DPRINT("Returning Status %x\n", Status); - return Status; -} - -static PRAWFS_FCB -RawFsNewFCB(IN PRAWFS_GLOBAL_DATA pGlobalData) -{ - PRAWFS_FCB Fcb; - - Fcb = ExAllocateFromNPagedLookasideList(&pGlobalData->FcbLookasideList); - memset(Fcb, 0, sizeof(RAWFS_FCB)); - ExInitializeResourceLite(&Fcb->PagingIoResource); - ExInitializeResourceLite(&Fcb->MainResource); -// FsRtlInitializeFileLock(&Fcb->FileLock, NULL, NULL); - return Fcb; -} - -static VOID -RawFsDestroyFCB(IN PRAWFS_GLOBAL_DATA pGlobalData, IN PRAWFS_FCB pFcb) -{ - //FsRtlUninitializeFileLock(&pFcb->FileLock); - ExDeleteResourceLite(&pFcb->PagingIoResource); - ExDeleteResourceLite(&pFcb->MainResource); - ExFreeToNPagedLookasideList(&pGlobalData->FcbLookasideList, pFcb); -} - -static PRAWFS_CCB -RawFsNewCCB(PRAWFS_GLOBAL_DATA pGlobalData) -{ - PRAWFS_CCB Ccb; - - Ccb = ExAllocateFromNPagedLookasideList(&pGlobalData->CcbLookasideList); - memset(Ccb, 0, sizeof(RAWFS_CCB)); - return Ccb; -} - -/*static */VOID -RawFsDestroyCCB(PRAWFS_GLOBAL_DATA pGlobalData, PRAWFS_CCB pCcb) -{ - ExFreeToNPagedLookasideList(&pGlobalData->CcbLookasideList, pCcb); -} - -static PRAWFS_IRP_CONTEXT -RawFsAllocateIrpContext(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) -{ - PRAWFS_GLOBAL_DATA GlobalData; - PRAWFS_IRP_CONTEXT IrpContext; - UCHAR MajorFunction; - - DPRINT("RawFsAllocateIrpContext(DeviceObject 0x%p, Irp 0x%p)\n", DeviceObject, Irp); - - ASSERT(DeviceObject); - ASSERT(Irp); - - GlobalData = (PRAWFS_GLOBAL_DATA) DeviceObject->DeviceExtension; - IrpContext = ExAllocateFromNPagedLookasideList(&IrpContextLookasideList); - if (IrpContext) - { - RtlZeroMemory(IrpContext, sizeof(IrpContext)); - IrpContext->Irp = Irp; - IrpContext->DeviceObject = DeviceObject; - IrpContext->DeviceExt = DeviceObject->DeviceExtension; - IrpContext->Stack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(IrpContext->Stack); - MajorFunction = IrpContext->MajorFunction = IrpContext->Stack->MajorFunction; - IrpContext->MinorFunction = IrpContext->Stack->MinorFunction; - IrpContext->FileObject = IrpContext->Stack->FileObject; - if (MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL || - MajorFunction == IRP_MJ_DEVICE_CONTROL || - MajorFunction == IRP_MJ_SHUTDOWN) +NTAPI +RawCheckForDismount(IN PVCB Vcb, + IN BOOLEAN CreateOperation) +{ + KIRQL OldIrql; + PVPB Vpb; + BOOLEAN Delete; + + /* Lock VPB */ + IoAcquireVpbSpinLock(&OldIrql); + + /* Reference it and check if a create is being done */ + Vpb = Vcb->Vpb; + if (Vcb->Vpb->ReferenceCount != CreateOperation) + { + /* Don't do anything */ + Delete = FALSE; + } + else + { + /* Otherwise, delete the volume */ + Delete = TRUE; + + /* Check if it has a VPB and unmount it */ + if (Vpb->RealDevice->Vpb == Vpb) { - IrpContext->Flags |= IRPCONTEXT_CANWAIT; + Vpb->DeviceObject = NULL; + Vpb->Flags &= ~VPB_MOUNTED; } - else if (MajorFunction != IRP_MJ_CLEANUP && - MajorFunction != IRP_MJ_CLOSE && - IoIsOperationSynchronous(Irp)) + } + + /* Release lock and return status */ + IoReleaseVpbSpinLock(OldIrql); + return Delete; +} + +NTSTATUS +NTAPI +RawCompletionRoutine(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + PIO_STACK_LOCATION IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + + /* Check if this was a valid sync R/W request */ + if (((IoStackLocation->MajorFunction == IRP_MJ_READ) || + (IoStackLocation->MajorFunction == IRP_MJ_WRITE)) && + ((IoStackLocation->FileObject)) && + (FlagOn(IoStackLocation->FileObject->Flags, FO_SYNCHRONOUS_IO)) && + (NT_SUCCESS(Irp->IoStatus.Status))) + { + /* Update byte offset */ + IoStackLocation->FileObject->CurrentByteOffset.QuadPart += + Irp->IoStatus.Information; + } + + /* Mark the IRP Pending if it was */ + if (Irp->PendingReturned) IoMarkIrpPending(Irp); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RawClose(IN PVCB Vcb, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status; + BOOLEAN Deleted = FALSE; + PAGED_CODE(); + + /* Make sure we can clean up */ + Status = KeWaitForSingleObject(&Vcb->Mutex, + Executive, + KernelMode, + FALSE, + NULL); + ASSERT(NT_SUCCESS(Status)); + + /* Decrease the open count and check if this is a dismount */ + Vcb->OpenCount--; + if (!Vcb->OpenCount) Deleted = RawCheckForDismount(Vcb, FALSE); + + /* Check if we should delete the device */ + KeReleaseMutex(&Vcb->Mutex, FALSE); + if (Deleted) + { + /* Delete it */ + IoDeleteDevice((PDEVICE_OBJECT)CONTAINING_RECORD(Vcb, + VOLUME_DEVICE_OBJECT, + Vcb)); + } + + /* Complete the request */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RawCreate(IN PVCB Vcb, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status; + BOOLEAN Deleted = FALSE; + USHORT ShareAccess; + ACCESS_MASK DesiredAccess; + PAGED_CODE(); + + /* Make sure we can clean up */ + Status = KeWaitForSingleObject(&Vcb->Mutex, + Executive, + KernelMode, + FALSE, + NULL); + ASSERT(NT_SUCCESS(Status)); + + /* Check if this is a valid non-directory file open */ + if ((!(IoStackLocation->FileObject) || + !(IoStackLocation->FileObject->FileName.Length)) && + ((IoStackLocation->Parameters.Create.Options >> 24) == FILE_OPEN) && + (!(IoStackLocation->Parameters.Create.Options & FILE_DIRECTORY_FILE))) + { + /* Make sure the VCB isn't locked */ + if (Vcb->VcbState & 1) { - IrpContext->Flags |= IRPCONTEXT_CANWAIT; + /* Refuse the operation */ + Status = STATUS_ACCESS_DENIED; + Irp->IoStatus.Information = 0; } - } - return IrpContext; -} - -static VOID -RawFsFreeIrpContext(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsFreeIrpContext(IrpContext 0x%p)\n", IrpContext); - - ASSERT(IrpContext); - - ExFreeToNPagedLookasideList(&IrpContextLookasideList, IrpContext); -} - -static VOID -STDCALL RawFsDoRequest(PVOID IrpContext) -{ - ULONG Count; - - Count = InterlockedDecrement(&RawFsQueueCount); - - DPRINT("RawFsDoRequest(IrpContext 0x%p), MajorFunction %x, %d\n", - IrpContext, ((PRAWFS_IRP_CONTEXT) IrpContext)->MajorFunction, Count); - - RawFsDispatchRequest((PRAWFS_IRP_CONTEXT) IrpContext); -} - -static NTSTATUS -RawFsQueueRequest(PRAWFS_IRP_CONTEXT IrpContext) -{ - ULONG Count; - - ASSERT(IrpContext != NULL); - ASSERT(IrpContext->Irp != NULL); - - Count = InterlockedIncrement(&RawFsQueueCount); - - DPRINT("RawFsQueueRequest (IrpContext 0x%p), %d\n", IrpContext, Count); - - IrpContext->Flags |= IRPCONTEXT_CANWAIT; - IoMarkIrpPending (IrpContext->Irp); - ExInitializeWorkItem (&IrpContext->WorkQueueItem, RawFsDoRequest, IrpContext); - ExQueueWorkItem(&IrpContext->WorkQueueItem, CriticalWorkQueue); - return STATUS_PENDING; -} - -static NTSTATUS -RawFsClose(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsClose(IrpContext 0x%p)\n", IrpContext); - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS -RawFsCreateFile(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - PRAWFS_DEVICE_EXTENSION DeviceExt; - PRAWFS_GLOBAL_DATA GlobalData; - PIO_STACK_LOCATION IoSp; - PFILE_OBJECT FileObject; - ULONG RequestedDisposition; - ULONG RequestedOptions; - PRAWFS_FCB pFcb; - PRAWFS_CCB pCcb; - - GlobalData = (PRAWFS_GLOBAL_DATA) IrpContext->DeviceObject->DeviceExtension; - IoSp = IoGetCurrentIrpStackLocation(IrpContext->Irp); - RequestedDisposition = ((IoSp->Parameters.Create.Options >> 24) & 0xff); - RequestedOptions = IoSp->Parameters.Create.Options & FILE_VALID_OPTION_FLAGS; - FileObject = IoSp->FileObject; - DeviceExt = IrpContext->DeviceObject->DeviceExtension; - - if (FileObject->FileName.Length == 0 && - FileObject->RelatedFileObject == NULL) - { - /* This a open operation for the volume itself */ - if (RequestedDisposition == FILE_CREATE - || RequestedDisposition == FILE_OVERWRITE_IF - || RequestedDisposition == FILE_SUPERSEDE) - { - return STATUS_ACCESS_DENIED; - } - if (RequestedOptions & FILE_DIRECTORY_FILE) - { - return STATUS_NOT_A_DIRECTORY; - } - pFcb = DeviceExt->VolumeFcb; - pCcb = RawFsNewCCB(GlobalData); - if (pCcb == NULL) - { - return (STATUS_INSUFFICIENT_RESOURCES); - } - - FileObject->SectionObjectPointer = &pFcb->SectionObjectPointers; - FileObject->FsContext = pFcb; - FileObject->FsContext2 = pCcb; - pFcb->RefCount++; - - IrpContext->Irp->IoStatus.Information = FILE_OPENED; - return(STATUS_SUCCESS); - } - - /* This filesystem driver only supports volume access */ - return(STATUS_INVALID_PARAMETER); -} - -static NTSTATUS -RawFsCreate(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - NTSTATUS Status; - - DPRINT("RawFsCreate(IrpContext 0x%p)\n", IrpContext); - - ASSERT(IrpContext); - - if (RawFsIsRawFileSystemDeviceObject(IrpContext->DeviceObject)) - { - /* DeviceObject represents FileSystem instead of logical volume */ - DPRINT("RawFsCreate() called with file system\n"); - IrpContext->Irp->IoStatus.Information = FILE_OPENED; - IrpContext->Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(IrpContext->Irp, IO_DISK_INCREMENT); - RawFsFreeIrpContext(IrpContext); - return STATUS_SUCCESS; - } - - if (!(IrpContext->Flags & IRPCONTEXT_CANWAIT)) - { - return RawFsQueueRequest(IrpContext); - } - - IrpContext->Irp->IoStatus.Information = 0; - - Status = RawFsCreateFile(IrpContext); - - IrpContext->Irp->IoStatus.Status = Status; - IoCompleteRequest(IrpContext->Irp, - (CCHAR)(NT_SUCCESS(Status) ? IO_DISK_INCREMENT : IO_NO_INCREMENT)); - RawFsFreeIrpContext(IrpContext); - - return Status; -} - -static NTSTATUS -RawFsRead(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsRead(IrpContext 0x%p)\n", IrpContext); - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS -RawFsWrite(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsWrite(IrpContext 0x%p)\n", IrpContext); - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS -RawFsMount(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - PRAWFS_GLOBAL_DATA GlobalData = NULL; - PDEVICE_OBJECT DeviceObject = NULL; - PRAWFS_DEVICE_EXTENSION DeviceExt = NULL; - PRAWFS_FCB VolumeFcb = NULL; - PRAWFS_FCB Fcb = NULL; - PARTITION_INFORMATION PartitionInfo; - DISK_GEOMETRY DiskGeometry; - LARGE_INTEGER VolumeSize; - NTSTATUS Status; - ULONG Size; - - DPRINT("RawFsMount(IrpContext 0x%p)\n", IrpContext); - - ASSERT(IrpContext); - - if (!RawFsIsRawFileSystemDeviceObject(IrpContext->DeviceObject)) - { - Status = STATUS_INVALID_DEVICE_REQUEST; - DPRINT("Not for me\n"); - goto ByeBye; - } - - GlobalData = (PRAWFS_GLOBAL_DATA) IrpContext->DeviceObject->DeviceExtension; - - Status = IoCreateDevice(GlobalData->DriverObject, - sizeof(RAWFS_DEVICE_EXTENSION), - NULL, - FILE_DEVICE_FILE_SYSTEM, - 0, - FALSE, - &DeviceObject); - if (!NT_SUCCESS(Status)) - { - goto ByeBye; - } - - DeviceObject->Flags |= DO_DIRECT_IO; - DeviceExt = (PVOID) DeviceObject->DeviceExtension; - RtlZeroMemory(DeviceExt, sizeof(RAWFS_DEVICE_EXTENSION)); - - /* Use same vpb as device disk */ - DeviceObject->Vpb = IrpContext->Stack->Parameters.MountVolume.DeviceObject->Vpb; - DeviceExt->StorageDevice = IrpContext->Stack->Parameters.MountVolume.DeviceObject; - DeviceExt->StorageDevice->Vpb->DeviceObject = DeviceObject; - DeviceExt->StorageDevice->Vpb->RealDevice = DeviceExt->StorageDevice; - DeviceExt->StorageDevice->Vpb->Flags |= VPB_MOUNTED; - DeviceObject->StackSize = DeviceExt->StorageDevice->StackSize + 1; - DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - - KeInitializeSpinLock(&DeviceExt->FcbListLock); - InitializeListHead(&DeviceExt->FcbListHead); - - /* First try getting harddisk geometry then try getting CD-ROM geometry */ - Size = sizeof(DISK_GEOMETRY); - Status = RawFsBlockDeviceIoControl( - IrpContext->Stack->Parameters.MountVolume.DeviceObject, - IOCTL_DISK_GET_DRIVE_GEOMETRY, - NULL, - 0, - &DiskGeometry, - &Size); - if (!NT_SUCCESS(Status)) - { - DPRINT("RawFsBlockDeviceIoControl failed with status 0x%.08x\n", Status); - goto ByeBye; - } - if (DiskGeometry.MediaType == FixedMedia) - { - // We have found a hard disk - Size = sizeof(PARTITION_INFORMATION); - Status = RawFsBlockDeviceIoControl( - IrpContext->Stack->Parameters.MountVolume.DeviceObject, - IOCTL_DISK_GET_PARTITION_INFO, - NULL, - 0, - &PartitionInfo, - &Size); - if (!NT_SUCCESS(Status)) + else { - DPRINT("RawFsBlockDeviceIoControl() failed (%x)\n", Status); - goto ByeBye; + /* Setup share access */ + ShareAccess = IoStackLocation->Parameters.Create.ShareAccess; + DesiredAccess = IoStackLocation->Parameters.Create. + SecurityContext->DesiredAccess; + + /* Check if this VCB was already opened */ + if (Vcb->OpenCount > 0) + { + /* Try to see if we have access to it */ + Status = IoCheckShareAccess(DesiredAccess, + ShareAccess, + IoStackLocation->FileObject, + &Vcb->ShareAccess, + TRUE); + if (!NT_SUCCESS(Status)) Irp->IoStatus.Information = 0; + } + + /* Make sure we have access */ + if (NT_SUCCESS(Status)) + { + /* Check if this is the first open */ + if (!Vcb->OpenCount) + { + /* Set the share access */ + IoSetShareAccess(DesiredAccess, + ShareAccess, + IoStackLocation->FileObject, + &Vcb->ShareAccess); + } + + /* Increase the open count and set the VPB */ + Vcb->OpenCount += 1; + IoStackLocation->FileObject->Vpb = Vcb->Vpb; + + /* Set IRP status and disable intermediate buffering */ + Status = STATUS_SUCCESS; + Irp->IoStatus.Information = FILE_OPENED; + IoStackLocation->FileObject->Flags |= + FO_NO_INTERMEDIATE_BUFFERING; + } } -#ifndef NDEBUG - DbgPrint("Partition Information:\n"); - DbgPrint("StartingOffset %u\n", PartitionInfo.StartingOffset.QuadPart); - DbgPrint("PartitionLength %u\n", PartitionInfo.PartitionLength.QuadPart); - DbgPrint("HiddenSectors %u\n", PartitionInfo.HiddenSectors); - DbgPrint("PartitionNumber %u\n", PartitionInfo.PartitionNumber); - DbgPrint("PartitionType %u\n", PartitionInfo.PartitionType); - DbgPrint("BootIndicator %u\n", PartitionInfo.BootIndicator); - DbgPrint("RecognizedPartition %u\n", PartitionInfo.RecognizedPartition); - DbgPrint("RewritePartition %u\n", PartitionInfo.RewritePartition); + } + else + { + /* Invalid create request */ + Status = STATUS_INVALID_PARAMETER; + Irp->IoStatus.Information = 0; + } + + /* Check if the request failed */ + if (!(NT_SUCCESS(Status)) && !(Vcb->OpenCount)) + { + /* Check if we can dismount the device */ + Deleted = RawCheckForDismount(Vcb, FALSE); + } + + /* Check if we should delete the device */ + KeReleaseMutex(&Vcb->Mutex, FALSE); + if (Deleted) + { + /* Delete it */ + IoDeleteDevice((PDEVICE_OBJECT)CONTAINING_RECORD(Vcb, + VOLUME_DEVICE_OBJECT, + Vcb)); + } + + /* Complete the request */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RawReadWriteDeviceControl(IN PVCB Vcb, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status; + PAGED_CODE(); + + /* Don't do anything if the request was 0 bytes */ + if (((IoStackLocation->MajorFunction == IRP_MJ_READ) || + (IoStackLocation->MajorFunction == IRP_MJ_WRITE)) && + !(IoStackLocation->Parameters.Read.Length)) + { + /* Complete it */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return STATUS_SUCCESS; + } + + /* Copy the IRP stack location */ + IoCopyCurrentIrpStackLocationToNext(Irp); + + /* Disable verifies */ + IoGetNextIrpStackLocation(Irp)->Flags |= SL_OVERRIDE_VERIFY_VOLUME; + + /* Setup a completion routine */ + IoSetCompletionRoutine(Irp, + RawCompletionRoutine, + NULL, + TRUE, + TRUE, + TRUE); + + /* Call the next driver and exit */ + Status = IoCallDriver(Vcb->TargetDeviceObject, Irp); + return Status; +} + +NTSTATUS +NTAPI +RawMountVolume(IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status; + PDEVICE_OBJECT DeviceObject; + PVOLUME_DEVICE_OBJECT Volume; + PAGED_CODE(); + + /* Remember our owner */ + DeviceObject = IoStackLocation->Parameters.MountVolume.DeviceObject; + + /* Create the volume */ + Status = IoCreateDevice(RawDiskDeviceObject->DriverObject, + sizeof(VOLUME_DEVICE_OBJECT) - + sizeof(DEVICE_OBJECT), + NULL, + FILE_DEVICE_DISK_FILE_SYSTEM, + 0, + FALSE, + (PDEVICE_OBJECT*)&Volume); + if (!NT_SUCCESS(Status)) return Status; + + /* Use highest alignment requirement */ + Volume->DeviceObject.AlignmentRequirement = max(DeviceObject-> + AlignmentRequirement, + Volume->DeviceObject. + AlignmentRequirement); + + /* Setup the VCB */ + RawInitializeVcb(&Volume->Vcb, + IoStackLocation->Parameters.MountVolume.DeviceObject, + IoStackLocation->Parameters.MountVolume.Vpb); + + /* Set dummy label and serial number */ + Volume->Vcb.Vpb->SerialNumber = 0xFFFFFFFF; + Volume->Vcb.Vpb->VolumeLabelLength = 0; + + /* Setup the DO */ + Volume->Vcb.Vpb->DeviceObject = &Volume->DeviceObject; + Volume->DeviceObject.StackSize = DeviceObject->StackSize + 1; + Volume->DeviceObject.SectorSize = DeviceObject->SectorSize; + Volume->DeviceObject.Flags |= DO_DIRECT_IO; + Volume->DeviceObject.Flags &= ~DO_DEVICE_INITIALIZING; + return Status; +} + +NTSTATUS +NTAPI +RawUserFsCtrl(IN PIO_STACK_LOCATION IoStackLocation, + IN PVCB Vcb) +{ + NTSTATUS Status; + PAGED_CODE(); + + /* Lock the device */ + Status = KeWaitForSingleObject(&Vcb->Mutex, + Executive, + KernelMode, + FALSE, + NULL); + ASSERT(NT_SUCCESS(Status)); + + /* Check what kind of request this is */ + switch (IoStackLocation->Parameters.FileSystemControl.FsControlCode) + { + /* Oplock requests */ + case FSCTL_REQUEST_OPLOCK_LEVEL_1: + case FSCTL_REQUEST_OPLOCK_LEVEL_2: + case FSCTL_OPLOCK_BREAK_ACKNOWLEDGE: + case FSCTL_OPLOCK_BREAK_NOTIFY: + + /* We don't handle them */ + Status = STATUS_NOT_IMPLEMENTED; + break; + + /* Lock request */ + case FSCTL_LOCK_VOLUME: + + /* Make sure we're not locked, and that we're alone */ + if (!(Vcb->VcbState & 1) && (Vcb->OpenCount == 1)) + { + /* Lock the VCB */ + Vcb->VcbState |= 1; + Status = STATUS_SUCCESS; + } + else + { + /* Otherwise, we can't do this */ + Status = STATUS_ACCESS_DENIED; + } + break; + + /* Unlock request */ + case FSCTL_UNLOCK_VOLUME: + + /* Make sure we're locked */ + if (!(Vcb->VcbState & 1)) + { + /* Let caller know we're not */ + Status = STATUS_NOT_LOCKED; + } + else + { + /* Unlock the VCB */ + Vcb->VcbState &= ~1; + Status = STATUS_SUCCESS; + } + break; + + /* Dismount request */ + case FSCTL_DISMOUNT_VOLUME: + + /* Make sure we're locked */ + if (Vcb->VcbState & 1) + { + /* Do nothing, just return success */ + Status = STATUS_SUCCESS; + } + else + { + /* We can't dismount, device not locked */ + Status = STATUS_ACCESS_DENIED; + } + break; + + /* Unknown request */ + default: + + /* Fail */ + Status = STATUS_INVALID_PARAMETER; + break; + } + + /* Unlock device and return */ + KeReleaseMutex(&Vcb->Mutex, FALSE); + return Status; +} + +NTSTATUS +NTAPI +RawFileSystemControl(IN PVCB Vcb, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status; + PAGED_CODE(); + + /* Check the kinds of FSCTLs that we support */ + switch (IoStackLocation->MinorFunction) + { + /* User-mode request */ + case IRP_MN_USER_FS_REQUEST: + + /* Handle it */ + Status = RawUserFsCtrl(IoStackLocation, Vcb); + break; + + /* Mount request */ + case IRP_MN_MOUNT_VOLUME: + + /* Mount the volume */ + Status = RawMountVolume(IoStackLocation); + break; + + case IRP_MN_VERIFY_VOLUME: + + /* We don't do verifies */ + Status = STATUS_WRONG_VOLUME; + Vcb->Vpb->RealDevice->Flags &= ~DO_VERIFY_VOLUME; + + /* Check if we should delete the device */ + if (RawCheckForDismount(Vcb, FALSE)) + { + /* Do it */ + IoDeleteDevice((PDEVICE_OBJECT) + CONTAINING_RECORD(Vcb, + VOLUME_DEVICE_OBJECT, + Vcb)); + } + + /* We're done */ + break; + + /* Invalid request */ + default: + + /* Fail it */ + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + /* Complete the request */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return Status; +} + +NTSTATUS +NTAPI +RawQueryInformation(IN PVCB Vcb, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status = STATUS_INVALID_DEVICE_REQUEST; + PULONG Length; + PFILE_POSITION_INFORMATION Buffer; + PAGED_CODE(); + + /* Get information from the IRP */ + Length = &IoStackLocation->Parameters.QueryFile.Length; + Buffer = Irp->AssociatedIrp.SystemBuffer; + + /* We only handle this request */ + if (IoStackLocation->Parameters.QueryFile.FileInformationClass == + FilePositionInformation) + { + /* Validate buffer size */ + if (*Length < sizeof(FILE_POSITION_INFORMATION)) + { + /* Invalid, fail */ + Irp->IoStatus.Information = 0; + Status = STATUS_BUFFER_OVERFLOW; + } + else + { + /* Get offset and update length */ + Buffer->CurrentByteOffset = IoStackLocation->FileObject-> + CurrentByteOffset; + *Length -= sizeof(FILE_POSITION_INFORMATION); + + /* Set IRP Status information */ + Irp->IoStatus.Information = sizeof(FILE_POSITION_INFORMATION); + Status = STATUS_SUCCESS; + } + } + + /* Complete it */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return Status; +} + +NTSTATUS +NTAPI +RawSetInformation(IN PVCB Vcb, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status = STATUS_INVALID_DEVICE_REQUEST; + PULONG Length; + PFILE_POSITION_INFORMATION Buffer; + PDEVICE_OBJECT DeviceObject; + PAGED_CODE(); + + /* Get information from the IRP */ + Length = &IoStackLocation->Parameters.QueryFile.Length; + Buffer = Irp->AssociatedIrp.SystemBuffer; + + /* We only handle this request */ + if (IoStackLocation->Parameters.QueryFile.FileInformationClass == + FilePositionInformation) + { + /* Get the DO */ + DeviceObject = IoGetRelatedDeviceObject(IoStackLocation->FileObject); + + /* Make sure the offset is aligned */ + if ((Buffer->CurrentByteOffset.LowPart & + DeviceObject->AlignmentRequirement)) + { + /* It's not, fail */ + Status = STATUS_INVALID_PARAMETER; + } + else + { + /* Otherwise, set offset */ + IoStackLocation->FileObject->CurrentByteOffset = Buffer-> + CurrentByteOffset; + + /* Set IRP Status information */ + Status = STATUS_SUCCESS; + } + } + + /* Complete it */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return Status; +} + +NTSTATUS +NTAPI +RawQueryFsVolumeInfo(IN PVCB Vcb, + IN PFILE_FS_VOLUME_INFORMATION Buffer, + IN OUT PULONG Length) +{ + PAGED_CODE(); + + /* Clear the buffer and stub it out */ + RtlZeroMemory( Buffer, sizeof(FILE_FS_VOLUME_INFORMATION)); + Buffer->VolumeSerialNumber = Vcb->Vpb->SerialNumber; + Buffer->SupportsObjects = FALSE; + Buffer->VolumeLabelLength = 0; + + /* Return length and success */ + *Length -= FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel[0]); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RawQueryFsSizeInfo(IN PVCB Vcb, + IN PFILE_FS_SIZE_INFORMATION Buffer, + IN OUT PULONG Length) +{ + PIRP Irp; + KEVENT Event; + NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + PDEVICE_OBJECT RealDevice; + DISK_GEOMETRY DiskGeometry; + PARTITION_INFORMATION PartitionInformation; + BOOLEAN DiskHasPartitions; + PAGED_CODE(); + + /* Validate the buffer */ + if (*Length < sizeof(FILE_FS_SIZE_INFORMATION)) + { + /* Fail */ + return STATUS_BUFFER_OVERFLOW; + } + + /* Clear the buffer, initialize the event and set the DO */ + RtlZeroMemory(Buffer, sizeof(FILE_FS_SIZE_INFORMATION)); + KeInitializeEvent(&Event, NotificationEvent, FALSE); + RealDevice = Vcb->Vpb->RealDevice; + + /* Build query IRP */ + Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_DRIVE_GEOMETRY, + RealDevice, + NULL, + 0, + &DiskGeometry, + sizeof(DISK_GEOMETRY), + FALSE, + &Event, + &IoStatusBlock); + + /* Call driver and check if we're pending */ + Status = IoCallDriver(RealDevice, Irp); + if (Status == STATUS_PENDING) + { + /* Wait on driver to finish */ + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } + + /* Fail if we couldn't get CHS data */ + if (!NT_SUCCESS(Status)) + { + *Length = 0; + return Status; + } + + /* Check if this is a floppy */ + if (FlagOn(RealDevice->Characteristics, FILE_FLOPPY_DISKETTE)) + { + /* Floppies don't have partitions */ + DiskHasPartitions = FALSE; + } + else + { + /* Setup query IRP */ + KeResetEvent(&Event); + Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_PARTITION_INFO, + RealDevice, + NULL, + 0, + &PartitionInformation, + sizeof(PARTITION_INFORMATION), + FALSE, + &Event, + &IoStatusBlock); + + /* Call driver and check if we're pending */ + Status = IoCallDriver(RealDevice, Irp); + if (Status == STATUS_PENDING) + { + /* Wait on driver to finish */ + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } + + /* If this was an invalid request, then the disk is not partitioned */ + if (Status == STATUS_INVALID_DEVICE_REQUEST) + { + DiskHasPartitions = FALSE; + } + else + { + /* Otherwise, it must be */ + ASSERT(NT_SUCCESS(Status)); + DiskHasPartitions = TRUE; + } + } + + /* Set sector data */ + Buffer->BytesPerSector = DiskGeometry.BytesPerSector; + Buffer->SectorsPerAllocationUnit = 1; + + /* Calculate allocation units */ + if (DiskHasPartitions) + { + /* Use partition data */ + Buffer->TotalAllocationUnits = + RtlExtendedLargeIntegerDivide(PartitionInformation.PartitionLength, + DiskGeometry.BytesPerSector, + NULL); + } + else + { + /* Use CHS */ + Buffer->TotalAllocationUnits = + RtlExtendedIntegerMultiply(DiskGeometry.Cylinders, + DiskGeometry.TracksPerCylinder * + DiskGeometry.SectorsPerTrack); + } + + /* Set available units */ + Buffer->AvailableAllocationUnits = Buffer->TotalAllocationUnits; + + /* Return length and success */ + *Length -= sizeof(FILE_FS_SIZE_INFORMATION); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RawQueryFsDeviceInfo(IN PVCB Vcb, + IN PFILE_FS_DEVICE_INFORMATION Buffer, + IN OUT PULONG Length) +{ + PAGED_CODE(); + + /* Validate buffer */ + if (*Length < sizeof(FILE_FS_DEVICE_INFORMATION)) + { + /* Fail */ + return STATUS_BUFFER_OVERFLOW; + } + + /* Clear buffer and write information */ + RtlZeroMemory(Buffer, sizeof(FILE_FS_DEVICE_INFORMATION)); + Buffer->DeviceType = FILE_DEVICE_DISK; + Buffer->Characteristics = Vcb->TargetDeviceObject->Characteristics; + + /* Return length and success */ + *Length -= sizeof(FILE_FS_DEVICE_INFORMATION); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RawQueryFsAttributeInfo(IN PVCB Vcb, + IN PFILE_FS_ATTRIBUTE_INFORMATION Buffer, + IN OUT PULONG Length) +{ + ULONG ReturnLength; + PAGED_CODE(); + + /* Check if the buffer is large enough for our name ("RAW") */ + ReturnLength = FIELD_OFFSET(FILE_FS_ATTRIBUTE_INFORMATION, + FileSystemName[0]); + ReturnLength += sizeof(L"RAW"); + if (*Length < ReturnLength) return STATUS_BUFFER_OVERFLOW; + + /* Output the data */ + Buffer->FileSystemAttributes = 0; + Buffer->MaximumComponentNameLength = 0; + Buffer->FileSystemNameLength = 6; + RtlMoveMemory(&Buffer->FileSystemName[0], L"RAW", 6); + + /* Return length and success */ + *Length -= ReturnLength; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RawQueryVolumeInformation(IN PVCB Vcb, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status; + ULONG Length; + PVOID Buffer; + PAGED_CODE(); + + /* Get IRP Data */ + Length = IoStackLocation->Parameters.QueryVolume.Length; + Buffer = Irp->AssociatedIrp.SystemBuffer; + + /* Check the kind of request */ + switch (IoStackLocation->Parameters.QueryVolume.FsInformationClass) + { + /* Volume information request */ + case FileFsVolumeInformation: + + Status = RawQueryFsVolumeInfo(Vcb, Buffer, &Length); + break; + + /* File system size invormation */ + case FileFsSizeInformation: + + Status = RawQueryFsSizeInfo(Vcb, Buffer, &Length); + break; + + /* Device information */ + case FileFsDeviceInformation: + + Status = RawQueryFsDeviceInfo(Vcb, Buffer, &Length); + break; + + /* Attribute information */ + case FileFsAttributeInformation: + + Status = RawQueryFsAttributeInfo(Vcb, Buffer, &Length); + break; + + /* Invalid request */ + default: + + /* Fail it */ + Status = STATUS_INVALID_PARAMETER; + break; + } + + /* Set status and complete the request */ + Irp->IoStatus.Information = IoStackLocation-> + Parameters.QueryVolume.Length - Length; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return Status; +} + +NTSTATUS +NTAPI +RawCleanup(IN PVCB Vcb, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status; + PAGED_CODE(); + + /* Make sure we can clean up */ + Status = KeWaitForSingleObject(&Vcb->Mutex, + Executive, + KernelMode, + FALSE, + NULL); + ASSERT(NT_SUCCESS(Status)); + + /* Remove shared access and complete the request */ + IoRemoveShareAccess(IoStackLocation->FileObject, &Vcb->ShareAccess); + KeReleaseMutex(&Vcb->Mutex, FALSE); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RawDispatch(IN PVOLUME_DEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status = STATUS_INVALID_DEVICE_REQUEST; + PIO_STACK_LOCATION IoStackLocation; + PVCB Vcb; + PAGED_CODE(); + + /* Get the stack location */ + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + + /* Differentiate between Volume DO and FS DO */ + if ((((PDEVICE_OBJECT)DeviceObject)->Size == sizeof(DEVICE_OBJECT)) && + !((IoStackLocation->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL) && + (IoStackLocation->MinorFunction == IRP_MN_MOUNT_VOLUME))) + { + /* This is an FS DO. Stub out the common calls */ + if ((IoStackLocation->MajorFunction == IRP_MJ_CREATE) || + (IoStackLocation->MajorFunction == IRP_MJ_CLEANUP) || + (IoStackLocation->MajorFunction == IRP_MJ_CLOSE)) + { + /* Return success for them */ + Status = STATUS_SUCCESS; + } + else + { + /* Anything else, we don't support */ + Status = STATUS_INVALID_DEVICE_REQUEST; + } + + /* Complete the request */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return Status; + } + + /* Otherwise, get our VCB and start handling the IRP */ + FsRtlEnterFileSystem(); + Vcb = &DeviceObject->Vcb; + + /* Check what kind of IRP this is */ + switch (IoStackLocation->MajorFunction) + { + /* Cleanup request */ + case IRP_MJ_CLEANUP: + + Status = RawCleanup(Vcb, Irp, IoStackLocation); + break; + + /* Close request */ + case IRP_MJ_CLOSE: + + Status = RawClose(Vcb, Irp, IoStackLocation); + break; + + /* Create request */ + case IRP_MJ_CREATE: + + Status = RawCreate(Vcb, Irp, IoStackLocation); + break; + + /* FSCTL request */ + case IRP_MJ_FILE_SYSTEM_CONTROL: + + Status = RawFileSystemControl(Vcb, Irp, IoStackLocation); + break; + + /* R/W or IOCTL request */ + case IRP_MJ_READ: + case IRP_MJ_WRITE: + case IRP_MJ_DEVICE_CONTROL: + + Status = RawReadWriteDeviceControl(Vcb, Irp, IoStackLocation); + break; + + /* Information query request */ + case IRP_MJ_QUERY_INFORMATION: + + Status = RawQueryInformation(Vcb, Irp, IoStackLocation); + break; + + /* Information set request */ + case IRP_MJ_SET_INFORMATION: + + Status = RawSetInformation(Vcb, Irp, IoStackLocation); + break; + + /* Volume information request */ + case IRP_MJ_QUERY_VOLUME_INFORMATION: + + Status = RawQueryVolumeInformation(Vcb, Irp, IoStackLocation); + break; + + /* Unexpected request */ + default: + + /* Anything else is pretty bad */ + KeBugCheck(FILE_SYSTEM); + } + + /* Return the status */ + FsRtlExitFileSystem(); + return Status; +} + +NTSTATUS +NTAPI +RawShutdown(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + /* Unregister file systems */ +#if 0 // FIXME: This freezes ROS at shutdown. PnP Problem? + IoUnregisterFileSystem(RawDiskDeviceObject); + IoUnregisterFileSystem(RawCdromDeviceObject); + IoUnregisterFileSystem(RawTapeDeviceObject); + + /* Delete the devices */ + IoDeleteDevice(RawDiskDeviceObject); + IoDeleteDevice(RawCdromDeviceObject); + IoDeleteDevice(RawTapeDeviceObject); #endif - VolumeSize.QuadPart = PartitionInfo.PartitionLength.QuadPart; - } - else if (DiskGeometry.MediaType > Unknown && DiskGeometry.MediaType <= RemovableMedia) - { - Status = STATUS_UNRECOGNIZED_VOLUME; - goto ByeBye; - } - - VolumeFcb = RawFsNewFCB(GlobalData); - if (VolumeFcb == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto ByeBye; - } - - VolumeFcb->Flags = FCB_IS_VOLUME; - VolumeFcb->RFCB.FileSize.QuadPart = VolumeSize.QuadPart; - VolumeFcb->RFCB.ValidDataLength.QuadPart = VolumeFcb->RFCB.FileSize.QuadPart; - VolumeFcb->RFCB.AllocationSize.QuadPart = VolumeFcb->RFCB.FileSize.QuadPart; - DeviceExt->VolumeFcb = VolumeFcb; - - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&GlobalData->VolumeListLock, TRUE); - InsertHeadList(&GlobalData->VolumeListHead, &DeviceExt->VolumeListEntry); - ExReleaseResourceLite(&GlobalData->VolumeListLock); - KeLeaveCriticalRegion(); - - /* No serial number */ - DeviceObject->Vpb->SerialNumber = 0; - - /* Set volume label (no label) */ - *(DeviceObject->Vpb->VolumeLabel) = 0; - DeviceObject->Vpb->VolumeLabelLength = 0; - - Status = STATUS_SUCCESS; - -ByeBye: - if (!NT_SUCCESS(Status)) - { - DPRINT("RAWFS: RawFsMount() Status 0x%.08x\n", Status); - - if (Fcb) - RawFsDestroyFCB(GlobalData, Fcb); - if (DeviceObject) - IoDeleteDevice(DeviceObject); - if (VolumeFcb) - RawFsDestroyFCB(GlobalData, VolumeFcb); - } - return Status; -} - -static NTSTATUS -RawFsFileSystemControl(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - NTSTATUS Status; - - DPRINT("RawFsFileSystemControl(IrpContext 0x%p)\n", IrpContext); - - ASSERT(IrpContext); - - switch (IrpContext->MinorFunction) - { - case IRP_MN_USER_FS_REQUEST: - DPRINT("RawFs FSC: IRP_MN_USER_FS_REQUEST\n"); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - - case IRP_MN_MOUNT_VOLUME: - DPRINT("RawFs FSC: IRP_MN_MOUNT_VOLUME\n"); - Status = RawFsMount(IrpContext); - break; - - case IRP_MN_VERIFY_VOLUME: - DPRINT("RawFs FSC: IRP_MN_VERIFY_VOLUME\n"); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - - default: - DPRINT("RawFs FSC: MinorFunction %d\n", IrpContext->MinorFunction); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - } - - IrpContext->Irp->IoStatus.Status = Status; - IrpContext->Irp->IoStatus.Information = 0; - - IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT); - RawFsFreeIrpContext(IrpContext); - return Status; -} - -static NTSTATUS -RawFsQueryInformation(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsQueryInformation(IrpContext 0x%p)\n", IrpContext); - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS -RawFsSetInformation(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsSetInformation(IrpContext 0x%p)\n", IrpContext); - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS -RawFsDirectoryControl(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsDirectoryControl(IrpContext 0x%p)\n", IrpContext); - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS -RawFsQueryVolumeInformation(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsQueryVolumeInformation(IrpContext 0x%p)\n", IrpContext); - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS -RawFsSetVolumeInformation(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsSetVolumeInformation(IrpContext 0x%p)\n", IrpContext); - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS -RawFsLockControl(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsLockControl(IrpContext 0x%p)\n", IrpContext); - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS -RawFsCleanup(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsCleanup(IrpContext 0x%p)\n", IrpContext); - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS -RawFsFlush(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsFlush(IrpContext 0x%p)\n", IrpContext); - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS STDCALL -RawFsShutdown(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) -{ - DPRINT("RawFsShutdown(DeviceObject 0x%p, Irp 0x%p)\n", DeviceObject, Irp); - - /* - * Note: Do NOT call UNIMPLEMENTED here! - * This function must finish in order to shutdown ReactOS properly! - */ - - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS -RawFsDispatchRequest(IN PRAWFS_IRP_CONTEXT IrpContext) -{ - DPRINT("RawFsDispatchRequest(IrpContext 0x%p), MajorFunction %x\n", - IrpContext, IrpContext->MajorFunction); - - ASSERT(IrpContext); - - switch (IrpContext->MajorFunction) - { - case IRP_MJ_CLOSE: - return RawFsClose(IrpContext); - case IRP_MJ_CREATE: - return RawFsCreate (IrpContext); - case IRP_MJ_READ: - return RawFsRead (IrpContext); - case IRP_MJ_WRITE: - return RawFsWrite (IrpContext); - case IRP_MJ_FILE_SYSTEM_CONTROL: - return RawFsFileSystemControl(IrpContext); - case IRP_MJ_QUERY_INFORMATION: - return RawFsQueryInformation (IrpContext); - case IRP_MJ_SET_INFORMATION: - return RawFsSetInformation (IrpContext); - case IRP_MJ_DIRECTORY_CONTROL: - return RawFsDirectoryControl(IrpContext); - case IRP_MJ_QUERY_VOLUME_INFORMATION: - return RawFsQueryVolumeInformation(IrpContext); - case IRP_MJ_SET_VOLUME_INFORMATION: - return RawFsSetVolumeInformation(IrpContext); - case IRP_MJ_LOCK_CONTROL: - return RawFsLockControl(IrpContext); - case IRP_MJ_CLEANUP: - return RawFsCleanup(IrpContext); - case IRP_MJ_FLUSH_BUFFERS: - return RawFsFlush(IrpContext); - default: - DPRINT1("Unexpected major function %x\n", IrpContext->MajorFunction); - IrpContext->Irp->IoStatus.Status = STATUS_DRIVER_INTERNAL_ERROR; - IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT); - RawFsFreeIrpContext(IrpContext); - return STATUS_DRIVER_INTERNAL_ERROR; - } -} - -static NTSTATUS STDCALL -RawFsBuildRequest(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PRAWFS_IRP_CONTEXT IrpContext; - NTSTATUS Status; - - DPRINT("RawFsBuildRequest(DeviceObject 0x%p, Irp 0x%p)\n", DeviceObject, Irp); - - ASSERT(DeviceObject); - ASSERT(Irp); - - IrpContext = RawFsAllocateIrpContext(DeviceObject, Irp); - if (IrpContext == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } - else - { - if (KeGetCurrentIrql() <= PASSIVE_LEVEL) - { - FsRtlEnterFileSystem(); - } - else - { - DPRINT1("RawFs is entered at irql = %d\n", KeGetCurrentIrql()); - } - Status = RawFsDispatchRequest(IrpContext); - if (KeGetCurrentIrql() <= PASSIVE_LEVEL) - { - FsRtlExitFileSystem(); - } - } - return Status; -} - -NTSTATUS STDCALL + + /* Complete the request */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return STATUS_SUCCESS; +} + +VOID +NTAPI +RawUnload(IN PDRIVER_OBJECT DriverObject) +{ +#if 0 // FIXME: DriverUnload is never called + /* Dereference device objects */ + ObDereferenceObject(RawDiskDeviceObject); + ObDereferenceObject(RawCdromDeviceObject); + ObDereferenceObject(RawTapeDeviceObject); +#endif +} + +NTSTATUS +NTAPI RawFsDriverEntry(IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath) -{ - PRAWFS_GLOBAL_DATA DeviceData; - NTSTATUS Status; - - RawFsDriverObject = DriverObject; - - Status = IoCreateDevice(DriverObject, - sizeof(RAWFS_GLOBAL_DATA), - NULL, - FILE_DEVICE_DISK_FILE_SYSTEM, - 0, - FALSE, - &DiskDeviceObject); - if (!NT_SUCCESS(Status)) - { - CPRINT("IoCreateDevice() failed with status 0x%.08x\n", Status); - KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - return(Status); - } - DeviceData = DiskDeviceObject->DeviceExtension; - RtlZeroMemory(DeviceData, sizeof(RAWFS_GLOBAL_DATA)); - DeviceData->DriverObject = DriverObject; - DeviceData->DeviceObject = DiskDeviceObject; - DiskDeviceObject->Flags |= DO_DIRECT_IO; - - - Status = IoCreateDevice(DriverObject, - sizeof(RAWFS_GLOBAL_DATA), - NULL, - FILE_DEVICE_CD_ROM_FILE_SYSTEM, - 0, - FALSE, - &CdromDeviceObject); - if (!NT_SUCCESS(Status)) - { - CPRINT("IoCreateDevice() failed with status 0x%.08x\n", Status); - KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - return(Status); - } - DeviceData = CdromDeviceObject->DeviceExtension; - RtlZeroMemory (DeviceData, sizeof(RAWFS_GLOBAL_DATA)); - DeviceData->DriverObject = DriverObject; - DeviceData->DeviceObject = CdromDeviceObject; - CdromDeviceObject->Flags |= DO_DIRECT_IO; - - - Status = IoCreateDevice(DriverObject, - sizeof(RAWFS_GLOBAL_DATA), - NULL, - FILE_DEVICE_TAPE_FILE_SYSTEM, - 0, - FALSE, - &TapeDeviceObject); - if (!NT_SUCCESS(Status)) - { - KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - return(Status); - } - DeviceData = TapeDeviceObject->DeviceExtension; - RtlZeroMemory (DeviceData, sizeof(RAWFS_GLOBAL_DATA)); - DeviceData->DriverObject = DriverObject; - DeviceData->DeviceObject = TapeDeviceObject; - TapeDeviceObject->Flags |= DO_DIRECT_IO; - - - DriverObject->MajorFunction[IRP_MJ_CLOSE] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_CREATE] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_READ] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_WRITE] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = (PDRIVER_DISPATCH) RawFsShutdown; - DriverObject->MajorFunction[IRP_MJ_LOCK_CONTROL] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = (PDRIVER_DISPATCH) RawFsBuildRequest; - DriverObject->DriverUnload = NULL; - - ExInitializeNPagedLookasideList(&IrpContextLookasideList, - NULL, NULL, 0, sizeof(RAWFS_IRP_CONTEXT), TAG_IRP, 0); - - - IoRegisterFileSystem(DiskDeviceObject); - IoRegisterFileSystem(CdromDeviceObject); - IoRegisterFileSystem(TapeDeviceObject); - - return STATUS_SUCCESS; + IN PUNICODE_STRING RegistryPath) +{ + UNICODE_STRING DeviceName; + NTSTATUS Status; + + /* Create the raw disk device */ + RtlInitUnicodeString(&DeviceName, L"\\Device\\RawDisk"); + Status = IoCreateDevice(DriverObject, + 0, + NULL, + FILE_DEVICE_DISK_FILE_SYSTEM, + 0, + FALSE, + &RawDiskDeviceObject); + if (!NT_SUCCESS(Status)) return Status; + + /* Create the raw CDROM device */ + RtlInitUnicodeString(&DeviceName, L"\\Device\\RawCdRom"); + Status = IoCreateDevice(DriverObject, + 0, + NULL, + FILE_DEVICE_CD_ROM_FILE_SYSTEM, + 0, + FALSE, + &RawCdromDeviceObject); + if (!NT_SUCCESS(Status)) return Status; + + /* Create the raw tape device */ + RtlInitUnicodeString(&DeviceName, L"\\Device\\RawTape"); + Status = IoCreateDevice(DriverObject, + 0, + NULL, + FILE_DEVICE_TAPE_FILE_SYSTEM, + 0, + FALSE, + &RawTapeDeviceObject); + if (!NT_SUCCESS(Status)) return Status; + + /* Set Direct I/O for all devices */ + RawDiskDeviceObject->Flags |= DO_DIRECT_IO; + RawCdromDeviceObject->Flags |= DO_DIRECT_IO; + RawTapeDeviceObject->Flags |= DO_DIRECT_IO; + + /* Set generic stubs */ + DriverObject->MajorFunction[IRP_MJ_CREATE] = + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = + DriverObject->MajorFunction[IRP_MJ_CLOSE] = + DriverObject->MajorFunction[IRP_MJ_READ] = + DriverObject->MajorFunction[IRP_MJ_WRITE] = + DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = + DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = + DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = + DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = (PDRIVER_DISPATCH)RawDispatch; + + /* Shutdown and unload */ + DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = RawShutdown; + DriverObject->DriverUnload = RawUnload; + + /* Register the file systems */ + IoRegisterFileSystem(RawDiskDeviceObject); + IoRegisterFileSystem(RawCdromDeviceObject); + IoRegisterFileSystem(RawTapeDeviceObject); + +#if 0 // FIXME: DriverUnload is never called + /* Reference device objects */ + ObReferenceObject(RawDiskDeviceObject); + ObReferenceObject(RawCdromDeviceObject); + ObReferenceObject(RawTapeDeviceObject); +#endif + return STATUS_SUCCESS; } /* EOF */

1 0

[ion] 24563: - Combine PnpInit1/2 since they were called one after the other. - Load RAW driver while loading boot drivers. - Cleanup IoInitSystem a bit more.
by ion＠svn.reactos.org 18 Oct '06

18 Oct '06

Author: ion Date: Wed Oct 18 21:46:55 2006 New Revision: 24563 URL: http://svn.reactos.org/svn/reactos?rev=24563&view=rev Log: - Combine PnpInit1/2 since they were called one after the other. - Load RAW driver while loading boot drivers. - Cleanup IoInitSystem a bit more. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Wed Oct 18 21:46:55 2006 @@ -918,7 +918,6 @@ * Return Value * None */ - VOID FASTCALL IopInitializeBootDrivers(VOID) @@ -926,6 +925,50 @@ PLIST_ENTRY ListHead, NextEntry; PLDR_DATA_TABLE_ENTRY LdrEntry; UNICODE_STRING NtosSymName = RTL_CONSTANT_STRING(L"ntoskrnl.sym"); + PDEVICE_NODE DeviceNode; + PDRIVER_OBJECT DriverObject; + LDR_DATA_TABLE_ENTRY ModuleObject; + NTSTATUS Status; + + /* Use IopRootDeviceNode for now */ + Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &DeviceNode); + if (!NT_SUCCESS(Status)) return; + + /* Setup the module object for the RAW FS Driver */ + ModuleObject.DllBase = NULL; + ModuleObject.SizeOfImage = 0; + ModuleObject.EntryPoint = RawFsDriverEntry; + + /* Initialize it */ + Status = IopInitializeDriverModule(DeviceNode, + &ModuleObject, + &DeviceNode->ServiceName, + TRUE, + &DriverObject); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + IopFreeDeviceNode(DeviceNode); + return; + } + + /* Now initialize the associated device */ + Status = IopInitializeDevice(DeviceNode, DriverObject); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + IopFreeDeviceNode(DeviceNode); + return; + } + + /* Start it up */ + Status = IopStartDevice(DeviceNode); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + IopFreeDeviceNode(DeviceNode); + return; + } /* Hack for NTOSKRNL.SYM */ KDB_SYMBOLFILE_HOOK(&NtosSymName); Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Wed Oct 18 21:46:55 2006 @@ -442,9 +442,6 @@ IoInitSystem(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { LARGE_INTEGER ExpireTime; - PDEVICE_NODE DeviceNode; - PDRIVER_OBJECT DriverObject; - LDR_DATA_TABLE_ENTRY ModuleObject; NTSTATUS Status; CHAR Buffer[256]; ANSI_STRING NtBootPath, RootString; @@ -497,65 +494,16 @@ /* Create Object Directories */ if (!IopCreateRootDirectories()) return FALSE; - /* - * Initialize PnP manager - */ + /* Initialize PnP manager */ PnpInit(); - PnpInit2(); - - IoCreateDriverList(); - - KeInitializeSpinLock (&IoStatisticsLock); - - /* Initialize raw filesystem driver */ - - /* Use IopRootDeviceNode for now */ - Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &DeviceNode); - if (!NT_SUCCESS(Status)) - { - CPRINT("IopCreateDeviceNode() failed with status (%x)\n", Status); - return FALSE; - } - - ModuleObject.DllBase = NULL; - ModuleObject.SizeOfImage = 0; - ModuleObject.EntryPoint = RawFsDriverEntry; - - Status = IopInitializeDriverModule(DeviceNode, - &ModuleObject, - &DeviceNode->ServiceName, - TRUE, - &DriverObject); - if (!NT_SUCCESS(Status)) - { - IopFreeDeviceNode(DeviceNode); - CPRINT("IopInitializeDriver() failed with status (%x)\n", Status); - return FALSE; - } - - Status = IopInitializeDevice(DeviceNode, DriverObject); - if (!NT_SUCCESS(Status)) - { - IopFreeDeviceNode(DeviceNode); - CPRINT("IopInitializeDevice() failed with status (%x)\n", Status); - return FALSE; - } - - Status = IopStartDevice(DeviceNode); - if (!NT_SUCCESS(Status)) - { - IopFreeDeviceNode(DeviceNode); - CPRINT("IopInitializeDevice() failed with status (%x)\n", Status); - return FALSE; - } - - /* - * Initialize PnP root releations - */ + /* Initialize PnP root relations */ IoSynchronousInvalidateDeviceRelations(IopRootDeviceNode-> PhysicalDeviceObject, BusRelations); + + /* Create the group driver list */ + IoCreateDriverList(); /* Load boot start drivers */ IopInitializeBootDrivers(); Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Wed Oct 18 21:46:55 2006 @@ -2610,73 +2610,6 @@ ExFreePool(Data); } -VOID INIT_FUNCTION -PnpInit(VOID) -{ - PDEVICE_OBJECT Pdo; - NTSTATUS Status; - - DPRINT("PnpInit()\n"); - - KeInitializeSpinLock(&IopDeviceTreeLock); - - /* Initialize the Bus Type GUID List */ - IopBusTypeGuidList = ExAllocatePool(PagedPool, sizeof(IO_BUS_TYPE_GUID_LIST)); - RtlZeroMemory(IopBusTypeGuidList, sizeof(IO_BUS_TYPE_GUID_LIST)); - ExInitializeFastMutex(&IopBusTypeGuidList->Lock); - - /* Initialize PnP-Event notification support */ - Status = IopInitPlugPlayEvents(); - if (!NT_SUCCESS(Status)) - { - CPRINT("IopInitPlugPlayEvents() failed\n"); - KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - } - - /* - * Create root device node - */ - - Status = IopCreateDriverObject(&IopRootDriverObject, NULL, 0, FALSE, NULL, 0); - if (!NT_SUCCESS(Status)) - { - CPRINT("IoCreateDriverObject() failed\n"); - KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - } - - Status = IoCreateDevice(IopRootDriverObject, 0, NULL, FILE_DEVICE_CONTROLLER, - 0, FALSE, &Pdo); - if (!NT_SUCCESS(Status)) - { - CPRINT("IoCreateDevice() failed\n"); - KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - } - - Status = IopCreateDeviceNode(NULL, Pdo, &IopRootDeviceNode); - if (!NT_SUCCESS(Status)) - { - CPRINT("Insufficient resources\n"); - KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - } - - if (!RtlCreateUnicodeString(&IopRootDeviceNode->InstancePath, - L"HTREE\\ROOT\\0")) - { - CPRINT("Failed to create the instance path!\n"); - KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, STATUS_NO_MEMORY, 0, 0, 0); - } - - /* Report the device to the user-mode pnp manager */ - IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL, - &IopRootDeviceNode->InstancePath); - - IopRootDeviceNode->PhysicalDeviceObject->Flags |= DO_BUS_ENUMERATED_DEVICE; - PnpRootDriverEntry(IopRootDriverObject, NULL); - IopRootDriverObject->DriverExtension->AddDevice( - IopRootDriverObject, - IopRootDeviceNode->PhysicalDeviceObject); -} - static NTSTATUS INIT_FUNCTION IopEnumerateDetectedDevices( IN HANDLE hBaseKey, @@ -3297,17 +3230,79 @@ } VOID INIT_FUNCTION -PnpInit2(VOID) +PnpInit(VOID) { - NTSTATUS Status; - - /* Move information about devices detected by Freeloader to SYSTEM\CurrentControlSet\Root\ */ - Status = IopUpdateRootKey(); - if (!NT_SUCCESS(Status)) - { - CPRINT("IopUpdateRootKey() failed\n"); - KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - } + PDEVICE_OBJECT Pdo; + NTSTATUS Status; + + DPRINT("PnpInit()\n"); + + KeInitializeSpinLock(&IopDeviceTreeLock); + + /* Initialize the Bus Type GUID List */ + IopBusTypeGuidList = ExAllocatePool(PagedPool, sizeof(IO_BUS_TYPE_GUID_LIST)); + RtlZeroMemory(IopBusTypeGuidList, sizeof(IO_BUS_TYPE_GUID_LIST)); + ExInitializeFastMutex(&IopBusTypeGuidList->Lock); + + /* Initialize PnP-Event notification support */ + Status = IopInitPlugPlayEvents(); + if (!NT_SUCCESS(Status)) + { + CPRINT("IopInitPlugPlayEvents() failed\n"); + KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + + /* + * Create root device node + */ + + Status = IopCreateDriverObject(&IopRootDriverObject, NULL, 0, FALSE, NULL, 0); + if (!NT_SUCCESS(Status)) + { + CPRINT("IoCreateDriverObject() failed\n"); + KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + + Status = IoCreateDevice(IopRootDriverObject, 0, NULL, FILE_DEVICE_CONTROLLER, + 0, FALSE, &Pdo); + if (!NT_SUCCESS(Status)) + { + CPRINT("IoCreateDevice() failed\n"); + KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + + Status = IopCreateDeviceNode(NULL, Pdo, &IopRootDeviceNode); + if (!NT_SUCCESS(Status)) + { + CPRINT("Insufficient resources\n"); + KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + + if (!RtlCreateUnicodeString(&IopRootDeviceNode->InstancePath, + L"HTREE\\ROOT\\0")) + { + CPRINT("Failed to create the instance path!\n"); + KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, STATUS_NO_MEMORY, 0, 0, 0); + } + + /* Report the device to the user-mode pnp manager */ + IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL, + &IopRootDeviceNode->InstancePath); + + IopRootDeviceNode->PhysicalDeviceObject->Flags |= DO_BUS_ENUMERATED_DEVICE; + PnpRootDriverEntry(IopRootDriverObject, NULL); + IopRootDriverObject->DriverExtension->AddDevice( + IopRootDriverObject, + IopRootDeviceNode->PhysicalDeviceObject); + + /* Move information about devices detected by Freeloader to SYSTEM\CurrentControlSet\Root\ */ + Status = IopUpdateRootKey(); + if (!NT_SUCCESS(Status)) + { + CPRINT("IopUpdateRootKey() failed\n"); + KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); + } } + /* EOF */

1 0

[gedmurphy] 24562: To stop the app hanging when enumerating, use a separate thread for enumerating exclusively
by gedmurphy＠svn.reactos.org 18 Oct '06

18 Oct '06

Author: gedmurphy Date: Wed Oct 18 19:50:05 2006 New Revision: 24562 URL: http://svn.reactos.org/svn/reactos?rev=24562&view=rev Log: To stop the app hanging when enumerating, use a separate thread for enumerating exclusively Modified: trunk/reactos/base/applications/devmgmt/mainwnd.c trunk/reactos/base/applications/devmgmt/misc.c trunk/reactos/base/applications/devmgmt/precomp.h Modified: trunk/reactos/base/applications/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/mainwnd.c (original) +++ trunk/reactos/base/applications/devmgmt/mainwnd.c Wed Oct 18 19:50:05 2006 @@ -206,6 +206,9 @@ hTreeView = (HWND *)lpParameter; + if (*hTreeView) + FreeDeviceStrings(*hTreeView); + hRoot = InitTreeView(*hTreeView); if (hRoot) { @@ -411,13 +414,7 @@ case IDC_REFRESH: { - HTREEITEM hRoot; - - FreeDeviceStrings(Info->hTreeView); - - hRoot = InitTreeView(Info->hTreeView); - if (hRoot) - ListDevicesByType(Info->hTreeView, hRoot); + HANDLE DevEnumThread; SendMessage(Info->hTool, TB_SETSTATE, @@ -426,6 +423,21 @@ EnableMenuItem(GetMenu(Info->hMainWnd), IDC_PROP, MF_GRAYED); EnableMenuItem(Info->hShortcutMenu, IDC_PROP, MF_GRAYED); + + /* create seperate thread to emum devices */ + DevEnumThread = CreateThread(NULL, + 0, + DeviceEnumThread, + &Info->hTreeView, + 0, + NULL); + if (!DevEnumThread) + { + DisplayString(_T("Failed to enumerate devices")); + break; + } + + CloseHandle(DevEnumThread); } break; Modified: trunk/reactos/base/applications/devmgmt/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/misc.c (original) +++ trunk/reactos/base/applications/devmgmt/misc.c Wed Oct 18 19:50:05 2006 @@ -248,7 +248,7 @@ 0, NULL ); - MessageBox(NULL, (LPTSTR)lpMsgBuf, _T("Error!"), MB_OK | MB_ICONERROR); + MessageBox(NULL, lpMsgBuf, _T("Error!"), MB_OK | MB_ICONERROR); LocalFree(lpMsgBuf); } Modified: trunk/reactos/base/applications/devmgmt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/precomp.h (original) +++ trunk/reactos/base/applications/devmgmt/precomp.h Wed Oct 18 19:50:05 2006 @@ -111,10 +111,6 @@ UINT Height); VOID GetError(VOID); - -VOID DisplayString(PTCHAR); - -VOID TimerInfo(LPTSTR); - +VOID DisplayString(LPTSTR); #endif /* __DEVMGMT_PRECOMP_H */

1 0

[ion] 24561: - Some stuff I promised James. This is DC_ATTR from Win2K, IIRC (you called it GDI_USER_DATA). It changed a bit in XP, but now you have a working model. Also added some more flags/enums that I knew about and some font structures.
by ion＠svn.reactos.org 18 Oct '06

18 Oct '06

Author: ion Date: Wed Oct 18 10:00:31 2006 New Revision: 24561 URL: http://svn.reactos.org/svn/reactos?rev=24561&view=rev Log: - Some stuff I promised James. This is DC_ATTR from Win2K, IIRC (you called it GDI_USER_DATA). It changed a bit in XP, but now you have a working model. Also added some more flags/enums that I knew about and some font structures. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Wed Oct 18 10:00:31 2006 @@ -74,6 +74,25 @@ #define GDI_HANDLE_SET_STOCKOBJ(h) \ ((h) = (HANDLE)(((ULONG_PTR)(h)) | GDI_HANDLE_STOCK_MASK)) +/* DC_ATTR Dirty Flags */ +#define DIRTY_FILL 0x00000001 +#define DIRTY_LINE 0x00000002 +#define DIRTY_TEXT 0x00000004 +#define DIRTY_BACKGROUND 0x00000008 +#define DIRTY_CHARSET 0x00000010 +#define SLOW_WIDTHS 0x00000020 +#define DC_CACHED_TM_VALID 0x00000040 +#define DISPLAY_DC 0x00000080 +#define DIRTY_PTLCURRENT 0x00000100 +#define DIRTY_PTFXCURRENT 0x00000200 +#define DIRTY_STYLESTATE 0x00000400 +#define DC_PLAYMETAFILE 0x00000800 +#define DC_BRUSH_DIRTY 0x00001000 +#define DC_PEN_DIRTY 0x00002000 +#define DC_DIBSECTION 0x00004000 +#define DC_LAST_CLIPRGN_VALID 0x00008000 +#define DC_PRIMARY_DISPLAY 0x00010000 + /* TYPES *********************************************************************/ typedef struct _GDI_TABLE_ENTRY @@ -84,28 +103,62 @@ PVOID UserData; /* Points to the user mode structure, usually NULL though */ } GDI_TABLE_ENTRY, *PGDI_TABLE_ENTRY; +typedef struct _RGNATTR +{ + ULONG AttrFlags; + ULONG Flags; + RECTL Rect; +} RGNATTR,*PRGNATTR; -typedef struct _GDI_USER_DATA +typedef struct _DC_ATTR { - COLORREF PenColor; - COLORREF BrushColor; - INT ROPmode; - INT PolyFillMode; - INT StretchBltMode; - INT BackgroundMode; - COLORREF BackgroundColor; - COLORREF TextColor; - DWORD CodePage; - HCOLORSPACE ColorSpace; - INT TextAlign; /* Text alignment from SetTextAlign() */ - INT CharExtra; /* Spacing from SetTextCharacterExtra() */ - INT BreakExtral; /* SetTextJustification */ - INT BreakCount; /* " */ - INT GraphicsMode; /* Graphics mode */ - INT MapMode; - HFONT hFont; - DWORD Layout; -} GDI_USER_DATA, *PGDI_USER_DATA; - + PVOID pvLDC; + ULONG ulDirty_; + HANDLE hbrush; + HANDLE hpen; + COLORREF crBackgroundClr; + ULONG ulBackgroundClr; + COLORREF crForegroundClr; + ULONG ulForegroundClr; + DWORD iCS_CP; + INT iGraphicsMode; + BYTE jROP2; + BYTE jBkMode; + BYTE jFillMode; + BYTE jStretchBltMode; + POINTL ptlCurrent; + POINTL ptfxCurrent; + LONG lBkMode; + LONG lFillMode; + LONG lStretchBltMode; + FLONG flFontMapper; + LONG lIcmMode; + HANDLE hcmXform; + HCOLORSPACE hColorSpace; + INT IcmBrushColor; + INT IcmPenColor; + FLONG flTextAlign; + LONG lTextAlign; + LONG lTextExtra; + LONG lRelAbs; + LONG lBreakExtra; + LONG cBreak; + HANDLE hlfntNew; + MATRIX_S mxWorldToDevice; + MATRIX_S mxDevicetoWorld; + MATRIX_S mxWorldToPage; + INT iMapMode; + DWORD dwLayout; + LONG lWindowOrgx; + POINTL ptlWindowOrg; + SIZEL szlWindowExt; + POINTL ptlViewportOrg; + SIZEL szlViewportExt; + FLONG flXform; + SIZEL szlVirtualDevicePixel; + SIZEL szlVirtualDeviceMm; + POINTL ptlBrushOrigin; + RGNATTR VisRectRegion; +} DC_ATTR, *PDC_ATTR; #endif Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Wed Oct 18 10:00:31 2006 @@ -43,27 +43,38 @@ typedef enum _GETDCDWORD { - GdiGetRelAbs = 1, + GdiGetJournal, + GdiGetRelAbs, GdiGetBreakExtra, GdiGerCharBreak, GdiGetArcDirection, GdiGetEMFRestorDc, GdiGetFontLanguageInfo, GdiGetIsMemDc, + GdiGetMapMode, + GdiGetTextCharExtra, } GETDCDWORD, *PGETDCDWORD; typedef enum _GETSETDCDWORD { - GdiGetSetRelAbs = 4, - GdiGetSetMapperFlagsInternal = 7, - GdiGetSetMapMode = 8, - GdiGetSetArcDirection = 9, + GdtGetSetCopyCount = 2, + GdiGetSetTextAlign, + GdiGetSetRelAbs, + GdiGetSetTextCharExtra, + GdiGetSetSelectFont, + GdiGetSetMapperFlagsInternal, + GdiGetSetMapMode, + GdiGetSetArcDirection, } GETSETDCDWORD, *PGETSETDCDWORD; typedef enum _GETDCPOINT { GdiGetViewPortExt = 1, - GdiGetDCOrg = 7, + GdiGetWindowExt, + GdiGetViewPortOrg, + GdiGetWindowOrg, + GdiGetAspectRatioFilter, + GdiGetDCOrg = 6, } GETDCPOINT, *PGETDCPOINT; typedef enum _TRANSFORMTYPE @@ -86,13 +97,50 @@ typedef DWORD CHWIDTHINFO; typedef CHWIDTHINFO *PCHWIDTHINFO; typedef D3DNTHAL_CONTEXTCREATEDATA D3DNTHAL_CONTEXTCREATEI; +typedef LONG FIX; /* FIXME: Unknown; easy to guess, usually based on public types and converted */ typedef struct _WIDTHDATA WIDTHDATA, *PWIDTHDATA; -typedef struct _TMDIFF TMDIFF, *PTMDIFF; -typedef struct _TMW_INTERNAL TMW_INTERNAL, *PTMW_INTERNAL; -typedef struct _ENUMFONTDATAW ENUMFONTDATAW, *PENUMFONTDATAW; typedef struct _DEVCAPS DEVCAPS, *PDEVCAPS; typedef struct _REALIZATION_INFO REALIZATION_INFO, *PREALIZATION_INFO; +/* Font Structures */ +typedef struct _TMDIFF +{ + ULONG cjotma; + CHAR chFirst; + CHAR chLast; + CHAR ChDefault; + CHAR ChBreak; +} TMDIFF, *PTMDIFF; + +typedef struct _TMW_INTERNAL +{ + TEXTMETRICW TextMetric; + TMDIFF Diff; +} TMW_INTERNAL, *PTMW_INTERNAL; + +typedef struct _ENUMFONTDATAW ENUMFONTDATAW, *PENUMFONTDATAW; + +/* Number Representation */ +typedef struct _EFLOAT_S +{ + LONG lMant; + LONG lExp; +} EFLOAT_S; + +/* XFORM Structures */ +typedef struct _MATRIX_S +{ + EFLOAT_S efM11; + EFLOAT_S efM12; + EFLOAT_S efM21; + EFLOAT_S efM22; + EFLOAT_S efDx; + EFLOAT_S efDy; + FIX fxDx; + FIX fxDy; + FLONG flAccel; +} MATRIX_S; + #endif

1 0

[jimtabor] 24560: Set GDI_BatchLimit from TEB.
by jimtabor＠svn.reactos.org 18 Oct '06

18 Oct '06

Author: jimtabor Date: Wed Oct 18 07:55:28 2006 New Revision: 24560 URL: http://svn.reactos.org/svn/reactos?rev=24560&view=rev Log: Set GDI_BatchLimit from TEB. Modified: trunk/reactos/dll/win32/gdi32/main/dllmain.c Modified: trunk/reactos/dll/win32/gdi32/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/main/dllma… ============================================================================== --- trunk/reactos/dll/win32/gdi32/main/dllmain.c (original) +++ trunk/reactos/dll/win32/gdi32/main/dllmain.c Wed Oct 18 07:55:28 2006 @@ -34,6 +34,7 @@ /* map the gdi handle table to user space */ GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; CurrentProcessId = NtCurrentTeb()->Cid.UniqueProcess; + GDI_BatchLimit = NtCurrentTeb()->GdiBatchCount; }

1 0

[jimtabor] 24559: Add more DCDWord constants and two more members in GdiUserData structure.
by jimtabor＠svn.reactos.org 18 Oct '06

18 Oct '06

Author: jimtabor Date: Wed Oct 18 07:54:35 2006 New Revision: 24559 URL: http://svn.reactos.org/svn/reactos?rev=24559&view=rev Log: Add more DCDWord constants and two more members in GdiUserData structure. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Wed Oct 18 07:54:35 2006 @@ -99,6 +99,8 @@ HCOLORSPACE ColorSpace; INT TextAlign; /* Text alignment from SetTextAlign() */ INT CharExtra; /* Spacing from SetTextCharacterExtra() */ + INT BreakExtral; /* SetTextJustification */ + INT BreakCount; /* " */ INT GraphicsMode; /* Graphics mode */ INT MapMode; HFONT hFont; Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Wed Oct 18 07:54:35 2006 @@ -44,13 +44,19 @@ typedef enum _GETDCDWORD { GdiGetRelAbs = 1, - GdiGetArcDirection = 4, - GdiGetFontLanguageInfo = 6, - GdiGetIsMemDc = 7, + GdiGetBreakExtra, + GdiGerCharBreak, + GdiGetArcDirection, + GdiGetEMFRestorDc, + GdiGetFontLanguageInfo, + GdiGetIsMemDc, } GETDCDWORD, *PGETDCDWORD; typedef enum _GETSETDCDWORD { + GdiGetSetRelAbs = 4, + GdiGetSetMapperFlagsInternal = 7, + GdiGetSetMapMode = 8, GdiGetSetArcDirection = 9, } GETSETDCDWORD, *PGETSETDCDWORD;

1 0

[gedmurphy] 24558: fix a couple of warnings msvc highlighted
by gedmurphy＠svn.reactos.org 17 Oct '06

17 Oct '06

Author: gedmurphy Date: Wed Oct 18 03:11:02 2006 New Revision: 24558 URL: http://svn.reactos.org/svn/reactos?rev=24558&view=rev Log: fix a couple of warnings msvc highlighted Modified: trunk/reactos/base/applications/devmgmt/about.c trunk/reactos/base/applications/devmgmt/enumdevices.c trunk/reactos/base/applications/devmgmt/mainwnd.c trunk/reactos/base/applications/devmgmt/misc.c Modified: trunk/reactos/base/applications/devmgmt/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/about.c (original) +++ trunk/reactos/base/applications/devmgmt/about.c Wed Oct 18 03:11:02 2006 @@ -20,12 +20,12 @@ { case WM_INITDIALOG: - hIcon = LoadImage(hInstance, - MAKEINTRESOURCE(IDI_MAIN_ICON), - IMAGE_ICON, - 16, - 16, - 0); + hIcon = (HICON)LoadImage(hInstance, + MAKEINTRESOURCE(IDI_MAIN_ICON), + IMAGE_ICON, + 16, + 16, + 0); SendMessage(hDlg, WM_SETICON, Modified: trunk/reactos/base/applications/devmgmt/enumdevices.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/enumdevices.c (original) +++ trunk/reactos/base/applications/devmgmt/enumdevices.c Wed Oct 18 03:11:02 2006 @@ -235,7 +235,7 @@ { SP_DEVINFO_DATA DeviceInfoData; CONFIGRET cr; - LONG Status, ProblemNumber; + ULONG Status, ProblemNumber; DWORD DevIdSize; *DeviceName = _T('\0'); Modified: trunk/reactos/base/applications/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/mainwnd.c (original) +++ trunk/reactos/base/applications/devmgmt/mainwnd.c Wed Oct 18 03:11:02 2006 @@ -638,9 +638,9 @@ PMAIN_WND_INFO Info; HWND hMainWnd = NULL; - Info = HeapAlloc(ProcessHeap, - HEAP_ZERO_MEMORY, - sizeof(MAIN_WND_INFO)); + Info = (PMAIN_WND_INFO)HeapAlloc(ProcessHeap, + HEAP_ZERO_MEMORY, + sizeof(MAIN_WND_INFO)); if (Info != NULL) { Modified: trunk/reactos/base/applications/devmgmt/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/misc.c (original) +++ trunk/reactos/base/applications/devmgmt/misc.c Wed Oct 18 03:11:02 2006 @@ -28,7 +28,7 @@ /* Find the string table block */ if ((hrSrc = FindResourceW(hInst, lpName, (LPWSTR)RT_STRING)) && (hRes = LoadResource(hInst, hrSrc)) && - (lpStr = LockResource(hRes))) + (lpStr = (LPWSTR)LockResource(hRes))) { UINT x; @@ -212,12 +212,12 @@ /* Add all icons to the image list */ for (i = StartResource; i <= EndResource; i++) { - hBitmap = LoadImage(hInstance, - MAKEINTRESOURCE(i), - IMAGE_BITMAP, - Width, - Height, - LR_LOADTRANSPARENT); + hBitmap = (HBITMAP)LoadImage(hInstance, + MAKEINTRESOURCE(i), + IMAGE_BITMAP, + Width, + Height, + LR_LOADTRANSPARENT); if (hBitmap == NULL) return NULL; @@ -248,13 +248,13 @@ 0, NULL ); - MessageBox(NULL, lpMsgBuf, _T("Error!"), MB_OK | MB_ICONERROR); + MessageBox(NULL, (LPTSTR)lpMsgBuf, _T("Error!"), MB_OK | MB_ICONERROR); LocalFree(lpMsgBuf); } -VOID DisplayString(PTCHAR Msg) +VOID DisplayString(LPTSTR Msg) { MessageBox(NULL, Msg, _T("Note!"), MB_ICONEXCLAMATION|MB_OK); }

1 0

[gedmurphy] 24557: - enumerate devices in a separate thread so it doesn't stall opening of the main window - check for problems with devices, e.g. disabled devices (currently missing code to display overlay icons) - enable / disable the properties command dependant on what item is selected - fix a few potential bugs
by gedmurphy＠svn.reactos.org 17 Oct '06

17 Oct '06

Author: gedmurphy Date: Tue Oct 17 19:56:41 2006 New Revision: 24557 URL: http://svn.reactos.org/svn/reactos?rev=24557&view=rev Log: - enumerate devices in a separate thread so it doesn't stall opening of the main window - check for problems with devices, e.g. disabled devices (currently missing code to display overlay icons) - enable / disable the properties command dependant on what item is selected - fix a few potential bugs Modified: trunk/reactos/base/applications/devmgmt/En.rc trunk/reactos/base/applications/devmgmt/devmgmt.c trunk/reactos/base/applications/devmgmt/enumdevices.c trunk/reactos/base/applications/devmgmt/mainwnd.c trunk/reactos/base/applications/devmgmt/misc.c trunk/reactos/base/applications/devmgmt/precomp.h Modified: trunk/reactos/base/applications/devmgmt/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/En.rc (original) +++ trunk/reactos/base/applications/devmgmt/En.rc Tue Oct 17 19:56:41 2006 @@ -8,7 +8,7 @@ BEGIN MENUITEM "Print", IDC_PRINT, GRAYED MENUITEM SEPARATOR - MENUITEM "Properties", IDC_PROP + MENUITEM "Properties", IDC_PROP, GRAYED MENUITEM SEPARATOR MENUITEM "Help", IDC_PROGHELP, GRAYED END @@ -30,7 +30,7 @@ BEGIN POPUP "popup" BEGIN - MENUITEM "Properties", IDC_PROP + MENUITEM "Properties", IDC_PROP, GRAYED MENUITEM SEPARATOR MENUITEM "Help", IDC_PROGHELP END Modified: trunk/reactos/base/applications/devmgmt/devmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/devmgmt.c (original) +++ trunk/reactos/base/applications/devmgmt/devmgmt.c Tue Oct 17 19:56:41 2006 @@ -38,9 +38,6 @@ return 1; } -// FreeConsole(); -// AllocConsole(); - if (InitMainWindowImpl()) { hMainWnd = CreateMainWindow(lpAppName, Modified: trunk/reactos/base/applications/devmgmt/enumdevices.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/enumdevices.c (original) +++ trunk/reactos/base/applications/devmgmt/enumdevices.c Tue Oct 17 19:56:41 2006 @@ -12,21 +12,22 @@ static SP_CLASSIMAGELIST_DATA ImageListData; static HDEVINFO hDevInfo; + VOID -FreeDeviceStrings(HWND hTV) +FreeDeviceStrings(HWND hTreeView) { HTREEITEM hItem; - hItem = TreeView_GetRoot(hTV); + hItem = TreeView_GetRoot(hTreeView); if (hItem) { - hItem = TreeView_GetChild(hTV, + hItem = TreeView_GetChild(hTreeView, hItem); /* loop the parent items */ while (hItem) { - hItem = TreeView_GetChild(hTV, + hItem = TreeView_GetChild(hTreeView, hItem); if (hItem == NULL) break; @@ -43,7 +44,7 @@ //tvItem.pszText = Buf; //tvItem.cchTextMax = 99; - (void)TreeView_GetItem(hTV, &tvItem); + (void)TreeView_GetItem(hTreeView, &tvItem); //MessageBox(NULL, Buf, NULL, 0); @@ -53,7 +54,7 @@ hOldItem = hItem; - hItem = TreeView_GetNextSibling(hTV, + hItem = TreeView_GetNextSibling(hTreeView, hItem); if (hItem == NULL) { @@ -62,9 +63,9 @@ } } - hItem = TreeView_GetParent(hTV, + hItem = TreeView_GetParent(hTreeView, hItem); - hItem = TreeView_GetNextSibling(hTV, + hItem = TreeView_GetNextSibling(hTreeView, hItem); } } @@ -72,7 +73,7 @@ VOID -OpenPropSheet(HWND hTV, +OpenPropSheet(HWND hTreeView, HTREEITEM hItem) { TV_ITEM tvItem; @@ -80,10 +81,10 @@ tvItem.hItem = hItem; tvItem.mask = TVIF_PARAM; - if (TreeView_GetItem(hTV, &tvItem) && + if (TreeView_GetItem(hTreeView, &tvItem) && (LPTSTR)tvItem.lParam != NULL) { - DevicePropertiesExW(hTV, + DevicePropertiesExW(hTreeView, NULL, (LPTSTR)tvItem.lParam, 0, @@ -94,11 +95,12 @@ static HTREEITEM -InsertIntoTreeView(HWND hTV, +InsertIntoTreeView(HWND hTreeView, HTREEITEM hRoot, LPTSTR lpLabel, LPTSTR DeviceID, - INT DevImage) + INT DevImage, + LONG DevProb) { TV_ITEM tvi; TV_INSERTSTRUCT tvins; @@ -113,10 +115,21 @@ tvi.iImage = DevImage; tvi.iSelectedImage = DevImage; + if (DevProb != 0) + { + tvi.stateMask = TVIS_OVERLAYMASK; + + if (DevProb == CM_PROB_DISABLED) + { + /* FIXME: set the overlay icon */ + } + + } + tvins.item = tvi; tvins.hParent = hRoot; - return TreeView_InsertItem(hTV, &tvins); + return TreeView_InsertItem(hTreeView, &tvins); } @@ -214,13 +227,15 @@ } -static INT +static LONG EnumDevices(INT index, LPTSTR DeviceClassName, LPTSTR DeviceName, LPTSTR *DeviceID) { SP_DEVINFO_DATA DeviceInfoData; + CONFIGRET cr; + LONG Status, ProblemNumber; DWORD DevIdSize; *DeviceName = _T('\0'); @@ -276,17 +291,23 @@ NULL)) { /* if the friendly name fails, try the description instead */ - if (!SetupDiGetDeviceRegistryProperty(hDevInfo, - &DeviceInfoData, - SPDRP_DEVICEDESC, - 0, - (BYTE*)DeviceName, - MAX_DEV_LEN, - NULL)) - { - /* if the description fails, just give up! */ - return -2; - } + SetupDiGetDeviceRegistryProperty(hDevInfo, + &DeviceInfoData, + SPDRP_DEVICEDESC, + 0, + (BYTE*)DeviceName, + MAX_DEV_LEN, + NULL); + } + + cr = CM_Get_DevNode_Status_Ex(&Status, + &ProblemNumber, + DeviceInfoData.DevInst, + 0, + NULL); + if (cr == CR_SUCCESS && (Status & DN_HAS_PROBLEM)) + { + return ProblemNumber; } return 0; @@ -294,7 +315,7 @@ VOID -ListDevicesByType(PMAIN_WND_INFO Info, +ListDevicesByType(HWND hTreeView, HTREEITEM hRoot) { HTREEITEM hDevItem; @@ -317,23 +338,26 @@ if ((ClassRet != -1) && (DevExist)) { TCHAR DeviceName[MAX_DEV_LEN]; - INT Ret, DevIndex = 0; + INT DevIndex = 0; + LONG Ret; if (DevDesc[0] != _T('\0')) { - hDevItem = InsertIntoTreeView(Info->hTreeView, + hDevItem = InsertIntoTreeView(hTreeView, hRoot, DevDesc, NULL, - DevImage); + DevImage, + 0); } else { - hDevItem = InsertIntoTreeView(Info->hTreeView, + hDevItem = InsertIntoTreeView(hTreeView, hRoot, DevName, NULL, - DevImage); + DevImage, + 0); } do @@ -342,13 +366,14 @@ DevName, DeviceName, &DeviceID); - if (Ret == 0) + if (Ret >= 0) { - InsertIntoTreeView(Info->hTreeView, + InsertIntoTreeView(hTreeView, hDevItem, DeviceName, DeviceID, - DevImage); + DevImage, + Ret); } DevIndex++; @@ -363,15 +388,15 @@ } /* don't insert classes with no devices */ - if (!TreeView_GetChild(Info->hTreeView, + if (!TreeView_GetChild(hTreeView, hDevItem)) { - (void)TreeView_DeleteItem(Info->hTreeView, + (void)TreeView_DeleteItem(hTreeView, hDevItem); } else { - (void)TreeView_SortChildren(Info->hTreeView, + (void)TreeView_SortChildren(hTreeView, hDevItem, 0); } @@ -381,18 +406,18 @@ } while (ClassRet != -1); - (void)TreeView_Expand(Info->hTreeView, + (void)TreeView_Expand(hTreeView, hRoot, TVE_EXPAND); - (void)TreeView_SortChildren(Info->hTreeView, + (void)TreeView_SortChildren(hTreeView, hRoot, 0); } HTREEITEM -InitTreeView(PMAIN_WND_INFO Info) +InitTreeView(HWND hTreeView) { HTREEITEM hRoot; HBITMAP hComp; @@ -400,7 +425,7 @@ DWORD dwSize = MAX_PATH; INT RootImage; - (void)TreeView_DeleteAllItems(Info->hTreeView); + (void)TreeView_DeleteAllItems(hTreeView); /* get the device image List */ ImageListData.cbSize = sizeof(ImageListData); @@ -415,7 +440,7 @@ DeleteObject(hComp); - (void)TreeView_SetImageList(Info->hTreeView, + (void)TreeView_SetImageList(hTreeView, ImageListData.ImageList, TVSIL_NORMAL); @@ -428,11 +453,12 @@ RootImage = ImageList_GetImageCount(ImageListData.ImageList) - 1; /* insert the root item into the tree */ - hRoot = InsertIntoTreeView(Info->hTreeView, + hRoot = InsertIntoTreeView(hTreeView, NULL, ComputerName, NULL, - RootImage); + RootImage, + 0); return hRoot; } Modified: trunk/reactos/base/applications/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/mainwnd.c (original) +++ trunk/reactos/base/applications/devmgmt/mainwnd.c Tue Oct 17 19:56:41 2006 @@ -15,7 +15,7 @@ /* Toolbar buttons */ TBBUTTON Buttons [] = { /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ - {TBICON_PROP, IDC_PROP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* properties */ + {TBICON_PROP, IDC_PROP, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0}, /* properties */ {TBICON_REFRESH, IDC_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* refresh */ /* Note: First item for a seperator is its width in pixels */ @@ -198,12 +198,30 @@ } - -static VOID +static DWORD WINAPI +DeviceEnumThread(LPVOID lpParameter) +{ + HTREEITEM hRoot; + HWND *hTreeView; + + hTreeView = (HWND *)lpParameter; + + hRoot = InitTreeView(*hTreeView); + if (hRoot) + { + ListDevicesByType(*hTreeView, hRoot); + return 0; + } + + return -1; +} + + +static BOOL InitMainWnd(PMAIN_WND_INFO Info) { + HANDLE DevEnumThread; HMENU hMenu; - HTREEITEM hRoot; if (!CreateToolbar(Info)) DisplayString(_T("error creating toolbar")); @@ -211,7 +229,7 @@ if (!CreateTreeView(Info)) { DisplayString(_T("error creating list view")); - return; + return FALSE; } if (!CreateStatusBar(Info)) @@ -229,10 +247,21 @@ 0); SetMenuDefaultItem(Info->hShortcutMenu, IDC_PROP, FALSE); - /* emum all devices */ - hRoot = InitTreeView(Info); - if (hRoot) - ListDevicesByType(Info, hRoot); + /* create seperate thread to emum devices */ + DevEnumThread = CreateThread(NULL, + 0, + DeviceEnumThread, + &Info->hTreeView, + 0, + NULL); + if (!DevEnumThread) + { + DisplayString(_T("Failed to enumerate devices")); + return FALSE; + } + + CloseHandle(DevEnumThread); + return TRUE; } @@ -273,11 +302,38 @@ OnNotify(PMAIN_WND_INFO Info, LPARAM lParam) { - LPNMHDR pnmhdr = (LPNMHDR)lParam; switch (pnmhdr->code) { + case TVN_SELCHANGED: + { + LPNM_TREEVIEW pnmtv = (LPNM_TREEVIEW)lParam; + + if (!TreeView_GetChild(Info->hTreeView, + pnmtv->itemNew.hItem)) + { + SendMessage(Info->hTool, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + + EnableMenuItem(GetMenu(Info->hMainWnd), IDC_PROP, MF_ENABLED); + EnableMenuItem(Info->hShortcutMenu, IDC_PROP, MF_ENABLED); + } + else + { + SendMessage(Info->hTool, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0)); + + EnableMenuItem(GetMenu(Info->hMainWnd), IDC_PROP, MF_GRAYED); + EnableMenuItem(Info->hShortcutMenu, IDC_PROP, MF_GRAYED); + } + } + break; + case NM_DBLCLK: { HTREEITEM hSelected = TreeView_GetSelection(Info->hTreeView); @@ -299,7 +355,7 @@ ScreenToClient(Info->hTreeView, &HitTest.pt)) { if (TreeView_HitTest(Info->hTreeView, &HitTest)) - (void)TreeView_SelectItem(Info->hTreeView, HitTest.hItem); + TreeView_SelectItem(Info->hTreeView, HitTest.hItem); } } break; @@ -329,7 +385,6 @@ case IDC_EXIT: lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_EXIT); break; - } } break; @@ -360,9 +415,17 @@ FreeDeviceStrings(Info->hTreeView); - hRoot = InitTreeView(Info); + hRoot = InitTreeView(Info->hTreeView); if (hRoot) - ListDevicesByType(Info, hRoot); + ListDevicesByType(Info->hTreeView, hRoot); + + SendMessage(Info->hTool, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0)); + + EnableMenuItem(GetMenu(Info->hMainWnd), IDC_PROP, MF_GRAYED); + EnableMenuItem(Info->hShortcutMenu, IDC_PROP, MF_GRAYED); } break; @@ -458,7 +521,8 @@ GWLP_USERDATA, (LONG_PTR)Info); - InitMainWnd(Info); + if (!InitMainWnd(Info)) + SendMessage(hwnd, WM_CLOSE, 0, 0); /* Show the window */ ShowWindow(hwnd, @@ -639,3 +703,4 @@ hInstance); } + Modified: trunk/reactos/base/applications/devmgmt/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/misc.c (original) +++ trunk/reactos/base/applications/devmgmt/misc.c Tue Oct 17 19:56:41 2006 @@ -258,21 +258,3 @@ { MessageBox(NULL, Msg, _T("Note!"), MB_ICONEXCLAMATION|MB_OK); } - - -VOID TimerInfo(LPTSTR text) -{ - static HANDLE hOut = NULL; - DWORD Count; - TCHAR buf[256]; - static DWORD start = 0; - - if (!start) start = GetTickCount(); - - if (!hOut) hOut = GetStdHandle(STD_ERROR_HANDLE); - - if (text) _sntprintf(buf, 256, _T("%s\ttime : %d\n"), text, GetTickCount() - start); - else _sntprintf(buf, 256, _T("time : %d\n"), GetTickCount() - start); - - WriteConsole(hOut, buf, lstrlen(buf)+1, &Count, NULL); -} Modified: trunk/reactos/base/applications/devmgmt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/precomp.h (original) +++ trunk/reactos/base/applications/devmgmt/precomp.h Tue Oct 17 19:56:41 2006 @@ -74,10 +74,10 @@ IN BOOL bShowDevMgr); #endif -VOID FreeDeviceStrings(HWND hTV); -VOID OpenPropSheet(HWND hTV, HTREEITEM hItem); -HTREEITEM InitTreeView(PMAIN_WND_INFO Info); -VOID ListDevicesByType(PMAIN_WND_INFO Info, HTREEITEM hRoot); +VOID FreeDeviceStrings(HWND hTreeView); +VOID OpenPropSheet(HWND hTreeView, HTREEITEM hItem); +HTREEITEM InitTreeView(HWND hTreeView); +VOID ListDevicesByType(HWND hTreeView, HTREEITEM hRoot); /* misc.c */

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