Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 52055: [FDC] - Implement fdc.sys (still needs work but fairly complete) [TXTSETUP.SIF] - Load fdc.sys for floppy controllers [FDC.INF] - Install fdc.sys for floppy controllers
by cgutman＠svn.reactos.org 02 Jun '11

02 Jun '11

Author: cgutman Date: Thu Jun 2 06:24:25 2011 New Revision: 52055 URL: http://svn.reactos.org/svn/reactos?rev=52055&view=rev Log: [FDC] - Implement fdc.sys (still needs work but fairly complete) [TXTSETUP.SIF] - Load fdc.sys for floppy controllers [FDC.INF] - Install fdc.sys for floppy controllers Added: trunk/reactos/drivers/storage/fdc/CMakeLists.txt (with props) trunk/reactos/drivers/storage/fdc/directory.rbuild (with props) trunk/reactos/drivers/storage/fdc/fdc/CMakeLists.txt (with props) trunk/reactos/drivers/storage/fdc/fdc/SOURCES (with props) trunk/reactos/drivers/storage/fdc/fdc/fdc.c (with props) trunk/reactos/drivers/storage/fdc/fdc/fdc.h (with props) trunk/reactos/drivers/storage/fdc/fdc/fdc.rbuild (with props) trunk/reactos/drivers/storage/fdc/fdc/fdc.rc (with props) trunk/reactos/drivers/storage/fdc/fdc/fdo.c (with props) trunk/reactos/drivers/storage/fdc/fdc/pdo.c (with props) Modified: trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/drivers/storage/CMakeLists.txt trunk/reactos/drivers/storage/directory.rbuild trunk/reactos/media/inf/fdc.inf Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Thu Jun 2 06:24:25 2011 @@ -30,6 +30,7 @@ isapnp.sys=,,,,,,,,,,,,4 kdcom.dll=,,,,,,,,,,,,2 disk.sys=,,,,,,x,,,,,,4 +fdc.sys=,,,,,,,,,,,,4 floppy.sys=,,,,,,x,,,,,,4 i8042prt.sys=,,,,,,x,,,,,,4 kbdclass.sys=,,,,,,x,,,,,,4 @@ -60,6 +61,7 @@ PCI\CC_0105 = uniata PCI\CC_0106 = uniata *PNP0600 = uniata +*PNP0700 = fdc [BootBusExtenders.Load] acpi = acpi.sys @@ -68,6 +70,7 @@ [BusExtenders.Load] pciide = pciide.sys +fdc = fdc.sys [SCSI.Load] uniata = uniata.sys Modified: trunk/reactos/drivers/storage/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/CMakeLists… ============================================================================== --- trunk/reactos/drivers/storage/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/CMakeLists.txt [iso-8859-1] Thu Jun 2 06:24:25 2011 @@ -1,6 +1,7 @@ add_subdirectory(class) add_subdirectory(classpnp) +add_subdirectory(fdc) add_subdirectory(floppy) add_subdirectory(ide) add_subdirectory(port) Modified: trunk/reactos/drivers/storage/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/directory.… ============================================================================== --- trunk/reactos/drivers/storage/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/directory.rbuild [iso-8859-1] Thu Jun 2 06:24:25 2011 @@ -3,6 +3,9 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <directory name="class"> <xi:include href="class/directory.rbuild" /> +</directory> +<directory name="fdc"> + <xi:include href="fdc/directory.rbuild" /> </directory> <directory name="floppy"> <xi:include href="floppy/floppy.rbuild" /> Added: trunk/reactos/drivers/storage/fdc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/CMakeL… ============================================================================== --- trunk/reactos/drivers/storage/fdc/CMakeLists.txt (added) +++ trunk/reactos/drivers/storage/fdc/CMakeLists.txt [iso-8859-1] Thu Jun 2 06:24:25 2011 @@ -1,0 +1,2 @@ + +add_subdirectory(fdc) Propchange: trunk/reactos/drivers/storage/fdc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/storage/fdc/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/direct… ============================================================================== --- trunk/reactos/drivers/storage/fdc/directory.rbuild (added) +++ trunk/reactos/drivers/storage/fdc/directory.rbuild [iso-8859-1] Thu Jun 2 06:24:25 2011 @@ -1,0 +1,7 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> +<directory name="fdc"> + <xi:include href="fdc/fdc.rbuild" /> +</directory> +</group> Propchange: trunk/reactos/drivers/storage/fdc/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/storage/fdc/fdc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/CM… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/CMakeLists.txt (added) +++ trunk/reactos/drivers/storage/fdc/fdc/CMakeLists.txt [iso-8859-1] Thu Jun 2 06:24:25 2011 @@ -1,0 +1,13 @@ + +add_library(fdc SHARED + fdc.c + fdo.c + pdo.c + fdc.rc) + +target_link_libraries(fdc) + +set_module_type(fdc kernelmodedriver) +add_importlibs(fdc hal ntoskrnl) + +add_cd_file(TARGET fdc DESTINATION reactos/system32/drivers NO_CAB FOR all) Propchange: trunk/reactos/drivers/storage/fdc/fdc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/storage/fdc/fdc/SOURCES URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/SO… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/SOURCES (added) +++ trunk/reactos/drivers/storage/fdc/fdc/SOURCES [iso-8859-1] Thu Jun 2 06:24:25 2011 @@ -1,0 +1,5 @@ +TARGETNAME=fdc +TARGETTYPE=DRIVER +TARGETPATH=obj +SOURCES= fdc.c fdo.c pdo.c +MSC_WARNING_LEVEL=/W3 /WX Propchange: trunk/reactos/drivers/storage/fdc/fdc/SOURCES ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/storage/fdc/fdc/fdc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/fd… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/fdc.c (added) +++ trunk/reactos/drivers/storage/fdc/fdc/fdc.c [iso-8859-1] Thu Jun 2 06:24:25 2011 @@ -1,0 +1,153 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Serial enumerator driver + * FILE: drivers/storage/fdc/fdc/fdc.c + * PURPOSE: Floppy class driver entry point + * + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include <ntddk.h> + +#include "fdc.h" + +#define NDEBUG +#include <debug.h> + +static NTSTATUS +NTAPI +FdcAddDevice(IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) +{ + NTSTATUS Status; + PDEVICE_OBJECT DeviceObject; + PFDC_FDO_EXTENSION DeviceExtension; + + Status = IoCreateDevice(DriverObject, + sizeof(FDC_FDO_EXTENSION), + NULL, + FILE_DEVICE_CONTROLLER, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &DeviceObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create device object (Status: 0x%x)\n", Status); + return Status; + } + + DeviceExtension = DeviceObject->DeviceExtension; + + DeviceExtension->Common.IsFDO = TRUE; + DeviceExtension->Common.DeviceObject = DeviceObject; + DeviceExtension->Common.DriverObject = DriverObject; + + InitializeListHead(&DeviceExtension->FloppyDriveList); + DeviceExtension->FloppyDriveListCount = 0; + KeInitializeSpinLock(&DeviceExtension->FloppyDriveListLock); + + DeviceObject->Flags |= DO_POWER_PAGABLE; + + DeviceExtension->Ldo = IoAttachDeviceToDeviceStack(DeviceObject, + PhysicalDeviceObject); + if (!DeviceExtension->Ldo) + { + DPRINT1("Failed to attach to device stack\n"); + IoDeleteDevice(DeviceObject); + return STATUS_UNSUCCESSFUL; + } + + DPRINT("FdcAddDevice completed successfully\n"); + + return STATUS_SUCCESS; +} + +static NTSTATUS +NTAPI +FdcPnpDispatch(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PFDC_COMMON_EXTENSION DevExt = DeviceObject->DeviceExtension; + + if (DevExt->IsFDO) + return FdcFdoPnpDispatch(DeviceObject, Irp); + else + return FdcPdoPnpDispatch(DeviceObject, Irp); +} + +static NTSTATUS +NTAPI +FdcPowerDispatch(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PFDC_COMMON_EXTENSION DevExt = DeviceObject->DeviceExtension; + + if (DevExt->IsFDO) + return FdcFdoPowerDispatch(DeviceObject, Irp); + else + return FdcPdoPowerDispatch(DeviceObject, Irp); +} + +static NTSTATUS +NTAPI +FdcDeviceControlDispatch(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PFDC_COMMON_EXTENSION DevExt = DeviceObject->DeviceExtension; + + if (DevExt->IsFDO) + return FdcFdoDeviceControlDispatch(DeviceObject, Irp); + else + return FdcPdoDeviceControlDispatch(DeviceObject, Irp); +} + +static NTSTATUS +NTAPI +FdcInternalDeviceControlDispatch(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PFDC_COMMON_EXTENSION DevExt = DeviceObject->DeviceExtension; + + if (DevExt->IsFDO) + return FdcFdoInternalDeviceControlDispatch(DeviceObject, Irp); + else + return FdcPdoInternalDeviceControlDispatch(DeviceObject, Irp); +} + +static NTSTATUS +NTAPI +FdcCreateClose(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNREFERENCED_PARAMETER(DeviceObject); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = FILE_OPENED; + + return STATUS_SUCCESS; +} + +static VOID +NTAPI +FdcUnload(IN PDRIVER_OBJECT DriverObject) +{ + DPRINT1("FDC Unloaded\n"); +} + +NTSTATUS +NTAPI +DriverEntry(IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegPath) +{ + DriverObject->DriverUnload = FdcUnload; + DriverObject->DriverExtension->AddDevice = FdcAddDevice; + + DriverObject->MajorFunction[IRP_MJ_CREATE] = FdcCreateClose; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = FdcCreateClose; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = FdcDeviceControlDispatch; + DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = FdcInternalDeviceControlDispatch; + DriverObject->MajorFunction[IRP_MJ_PNP] = FdcPnpDispatch; + DriverObject->MajorFunction[IRP_MJ_POWER] = FdcPowerDispatch; + + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/storage/fdc/fdc/fdc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/storage/fdc/fdc/fdc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/fd… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/fdc.h (added) +++ trunk/reactos/drivers/storage/fdc/fdc/fdc.h [iso-8859-1] Thu Jun 2 06:24:25 2011 @@ -1,0 +1,77 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Serial enumerator driver + * FILE: drivers/storage/fdc/fdc/fdc.h + * PURPOSE: Floppy class driver header + * + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include <wdm.h> + +int _cdecl swprintf(const WCHAR *, ...); + +typedef struct _FDC_COMMON_EXTENSION +{ + BOOLEAN IsFDO; + PDEVICE_OBJECT DeviceObject; + PDRIVER_OBJECT DriverObject; +} FDC_COMMON_EXTENSION, *PFDC_COMMON_EXTENSION; + +typedef struct _FDC_FDO_EXTENSION +{ + FDC_COMMON_EXTENSION Common; + + LIST_ENTRY FloppyDriveList; + ULONG FloppyDriveListCount; + KSPIN_LOCK FloppyDriveListLock; + + PDEVICE_OBJECT Ldo; + + CM_FLOPPY_DEVICE_DATA FloppyDeviceData; +} FDC_FDO_EXTENSION, *PFDC_FDO_EXTENSION; + +typedef struct _FDC_PDO_EXTENSION +{ + FDC_COMMON_EXTENSION Common; + + ULONG FloppyNumber; + + PFDC_FDO_EXTENSION FdoDevExt; + + LIST_ENTRY ListEntry; +} FDC_PDO_EXTENSION, *PFDC_PDO_EXTENSION; + +/* fdo.c */ +NTSTATUS +FdcFdoPnpDispatch(PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +NTSTATUS +FdcFdoPowerDispatch(PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +NTSTATUS +FdcFdoDeviceControlDispatch(PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +NTSTATUS +FdcFdoInternalDeviceControlDispatch(PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +/* pdo.c */ +NTSTATUS +FdcPdoPnpDispatch(PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +NTSTATUS +FdcPdoPowerDispatch(PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +NTSTATUS +FdcPdoDeviceControlDispatch(PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +NTSTATUS +FdcPdoInternalDeviceControlDispatch(PDEVICE_OBJECT DeviceObject, + PIRP Irp); Propchange: trunk/reactos/drivers/storage/fdc/fdc/fdc.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/storage/fdc/fdc/fdc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/fd… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/fdc.rbuild (added) +++ trunk/reactos/drivers/storage/fdc/fdc/fdc.rbuild [iso-8859-1] Thu Jun 2 06:24:25 2011 @@ -1,0 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="fdc" type="kernelmodedriver" installbase="system32/drivers" installname="fdc.sys"> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> + <include base="fdc">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>fdc.c</file> + <file>fdo.c</file> + <file>pdo.c</file> + <file>fdc.rc</file> +</module> Propchange: trunk/reactos/drivers/storage/fdc/fdc/fdc.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/storage/fdc/fdc/fdc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/fd… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/fdc.rc (added) +++ trunk/reactos/drivers/storage/fdc/fdc/fdc.rc [iso-8859-1] Thu Jun 2 06:24:25 2011 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Floppy Disk Controller Driver\0" +#define REACTOS_STR_INTERNAL_NAME "fdc\0" +#define REACTOS_STR_ORIGINAL_FILENAME "fdc.sys\0" +#include <reactos/version.rc> Propchange: trunk/reactos/drivers/storage/fdc/fdc/fdc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/storage/fdc/fdc/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/fd… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/fdo.c (added) +++ trunk/reactos/drivers/storage/fdc/fdc/fdo.c [iso-8859-1] Thu Jun 2 06:24:25 2011 @@ -1,0 +1,292 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Serial enumerator driver + * FILE: drivers/storage/fdc/fdc/fdo.c + * PURPOSE: Floppy class driver FDO functions + * + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include <wdm.h> + +#include "fdc.h" + +#define NDEBUG +#include <debug.h> + +static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; + +static NTSTATUS NTAPI +ForwardIrpAndWaitCompletion(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + UNREFERENCED_PARAMETER(DeviceObject); + if (Irp->PendingReturned) + KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS NTAPI +ForwardIrpAndWait(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + KEVENT Event; + NTSTATUS Status; + PDEVICE_OBJECT LowerDevice = ((PFDC_FDO_EXTENSION)DeviceObject->DeviceExtension)->Ldo; + ASSERT(LowerDevice); + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + IoCopyCurrentIrpStackLocationToNext(Irp); + + IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); + + Status = IoCallDriver(LowerDevice, Irp); + if (Status == STATUS_PENDING) + { + Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + if (NT_SUCCESS(Status)) + Status = Irp->IoStatus.Status; + } + + return Status; +} + +static NTSTATUS +AddFloppyDiskDevice(PFDC_FDO_EXTENSION DevExt) +{ + NTSTATUS Status; + PFDC_PDO_EXTENSION PdoDevExt; + PDEVICE_OBJECT DeviceObject; + + Status = IoCreateDevice(DevExt->Common.DriverObject, + sizeof(FDC_PDO_EXTENSION), + NULL, + FILE_DEVICE_CONTROLLER, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &DeviceObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create PDO device (Status: 0x%x)\n", Status); + return Status; + } + + PdoDevExt = DeviceObject->DeviceExtension; + + PdoDevExt->Common.IsFDO = FALSE; + PdoDevExt->Common.DeviceObject = DeviceObject; + PdoDevExt->Common.DriverObject = DevExt->Common.DriverObject; + PdoDevExt->FdoDevExt = DevExt; + PdoDevExt->FloppyNumber = DevExt->FloppyDriveListCount++; + + ExInterlockedInsertTailList(&DevExt->FloppyDriveList, + &PdoDevExt->ListEntry, + &DevExt->FloppyDriveListLock); + + DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + return STATUS_SUCCESS; +} + +static NTSTATUS +EnumerateDevices(PFDC_FDO_EXTENSION DevExt) +{ + /* FIXME: Hardcoded */ + if (DevExt->FloppyDriveListCount == 0) + return AddFloppyDiskDevice(DevExt); + + return STATUS_SUCCESS; +} + +static NTSTATUS +FdcFdoQueryBusRelations(PFDC_FDO_EXTENSION DevExt, + PIRP Irp) +{ + PDEVICE_RELATIONS DeviceRelations; + KIRQL OldIrql; + ULONG i; + PFDC_PDO_EXTENSION PdoDevExt; + PLIST_ENTRY ListEntry; + NTSTATUS Status; + + Status = EnumerateDevices(DevExt); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Device enumeration failed (Status: 0x%x)\n", Status); + return Status; + } + + KeAcquireSpinLock(&DevExt->FloppyDriveListLock, &OldIrql); + + DeviceRelations = ExAllocatePool(NonPagedPool, + sizeof(DEVICE_RELATIONS) + sizeof(DeviceRelations->Objects) * + (DevExt->FloppyDriveListCount - 1)); + if (!DeviceRelations) + { + DPRINT1("Failed to allocate memory for device relations\n"); + KeReleaseSpinLock(&DevExt->FloppyDriveListLock, OldIrql); + return STATUS_INSUFFICIENT_RESOURCES; + } + + DeviceRelations->Count = DevExt->FloppyDriveListCount; + + ListEntry = DevExt->FloppyDriveList.Flink; + i = 0; + while (ListEntry != &DevExt->FloppyDriveList) + { + PdoDevExt = CONTAINING_RECORD(ListEntry, FDC_PDO_EXTENSION, ListEntry); + + ObReferenceObject(PdoDevExt->Common.DeviceObject); + + DeviceRelations->Objects[i++] = PdoDevExt->Common.DeviceObject; + + ListEntry = ListEntry->Flink; + } + + KeReleaseSpinLock(&DevExt->FloppyDriveListLock, OldIrql); + + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; + + return STATUS_SUCCESS; +} + +static NTSTATUS +FdcFdoStartDevice(PFDC_FDO_EXTENSION DevExt, + PIRP Irp, + PIO_STACK_LOCATION IrpSp) +{ + PCM_PARTIAL_RESOURCE_LIST ResourceList; + ULONG i; + + ResourceList = &IrpSp->Parameters.StartDevice.AllocatedResources->List[0].PartialResourceList; + + DPRINT1("Descriptor count: %d\n", ResourceList->Count); + + for (i = 0; i < ResourceList->Count; i++) + { + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor = &ResourceList->PartialDescriptors[i]; + + if (PartialDescriptor->Type == CmResourceTypeDeviceSpecific) + { + RtlCopyMemory(&DevExt->FloppyDeviceData, + (PartialDescriptor + 1), + sizeof(CM_FLOPPY_DEVICE_DATA)); + } + } + + return STATUS_SUCCESS; +} + +NTSTATUS +FdcFdoPnpDispatch(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PFDC_FDO_EXTENSION DevExt = DeviceObject->DeviceExtension; + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + NTSTATUS Status = Irp->IoStatus.Status; + + switch (IrpSp->MinorFunction) + { + case IRP_MN_CANCEL_STOP_DEVICE: + case IRP_MN_CANCEL_REMOVE_DEVICE: + Status = STATUS_SUCCESS; + break; + + case IRP_MN_START_DEVICE: + DPRINT("Starting FDC FDO\n"); + + Status = ForwardIrpAndWait(DeviceObject, Irp); + if (NT_SUCCESS(Status)) + { + Status = FdcFdoStartDevice(DevExt, Irp, IrpSp); + } + + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; + case IRP_MN_STOP_DEVICE: + DPRINT("Stopping FDC FDO\n"); + /* We don't need to do anything here */ + Status = STATUS_SUCCESS; + break; + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_QUERY_STOP_DEVICE: + /* We don't care */ + Status = STATUS_SUCCESS; + break; + case IRP_MN_REMOVE_DEVICE: + DPRINT("Removing FDC FDO\n"); + + /* Undo what we did in FdcAddDevice */ + IoDetachDevice(DevExt->Ldo); + + IoDeleteDevice(DeviceObject); + + Status = STATUS_SUCCESS; + break; + case IRP_MN_SURPRISE_REMOVAL: + /* Nothing special to do here to deal with surprise removal */ + Status = STATUS_SUCCESS; + break; + case IRP_MN_QUERY_DEVICE_RELATIONS: + if (IrpSp->Parameters.QueryDeviceRelations.Type == BusRelations) + { + Status = FdcFdoQueryBusRelations(DevExt, Irp); + + Irp->IoStatus.Status = Status; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; + } + break; + } + + Irp->IoStatus.Status = Status; + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DevExt->Ldo, Irp); +} + +NTSTATUS +FdcFdoPowerDispatch(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PFDC_FDO_EXTENSION DevExt = DeviceObject->DeviceExtension; + + DPRINT1("Power request not handled\n"); + + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DevExt->Ldo, Irp); +} + +NTSTATUS +FdcFdoDeviceControlDispatch(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + /* FIXME: We don't handle any of these yet */ + + DPRINT1("Device control request not handled\n"); + + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Irp->IoStatus.Status; +} + +NTSTATUS +FdcFdoInternalDeviceControlDispatch(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + /* FIXME: We don't handle any of these yet */ + + DPRINT1("Internal device control request not handled\n"); + + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Irp->IoStatus.Status; +} Propchange: trunk/reactos/drivers/storage/fdc/fdc/fdo.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/storage/fdc/fdc/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/pd… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/pdo.c (added) +++ trunk/reactos/drivers/storage/fdc/fdc/pdo.c [iso-8859-1] Thu Jun 2 06:24:25 2011 @@ -1,0 +1,260 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Serial enumerator driver + * FILE: drivers/storage/fdc/fdc/pdo.c + * PURPOSE: Floppy class driver PDO functions + * + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include <wdm.h> + +#define INITGUID +#include <wdmguid.h> + +#include "fdc.h" + +#define NDEBUG +#include <debug.h> + +static NTSTATUS +FdcPdoQueryId(PFDC_PDO_EXTENSION DevExt, + PIRP Irp, + PIO_STACK_LOCATION IrpSp) +{ + WCHAR Buffer[100]; + PWCHAR BufferP; + + switch (IrpSp->Parameters.QueryId.IdType) + { + case BusQueryDeviceID: + BufferP = L"FDC\\GENERIC_FLOPPY_DRIVE"; + break; + case BusQueryHardwareIDs: + BufferP = L"FDC\\GENERIC_FLOPPY_DRIVE\0"; + break; + case BusQueryCompatibleIDs: + BufferP = L"GenFloppyDisk\0"; + break; + case BusQueryInstanceID: + swprintf(Buffer, L"%d", DevExt->FloppyNumber); + BufferP = Buffer; + break; + default: + return STATUS_UNSUCCESSFUL; + } + + Irp->IoStatus.Information = (ULONG_PTR)BufferP; + + return STATUS_SUCCESS; +} + +#if 0 +static NTSTATUS +FdcPdoQueryBusInformation(PIRP Irp) +{ + PPNP_BUS_INFORMATION BusInformation; + + BusInformation = ExAllocatePool(PagedPool, sizeof(PNP_BUS_INFORMATION)); + if (!BusInformation) + { + DPRINT1("Failed to allocate PnP bus info struct\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + BusInformation->BusTypeGuid = GUID_BUS_TYPE_INTERNAL; + BusInformation->LegacyBusType = Internal; + BusInformation->BusNumber = 0; + + Irp->IoStatus.Information = (ULONG_PTR)BusInformation; + + return STATUS_SUCCESS; +} +#endif + +static NTSTATUS +FdcPdoQueryCapabilities(PFDC_PDO_EXTENSION DevExt, + PIO_STACK_LOCATION IrpSp) +{ + PDEVICE_CAPABILITIES DevCaps = IrpSp->Parameters.DeviceCapabilities.Capabilities; + + DevCaps->DeviceD1 = 0; + DevCaps->DeviceD2 = 0; + DevCaps->LockSupported = 0; + DevCaps->EjectSupported = 0; + DevCaps->Removable = 0; + DevCaps->DockDevice = 0; + DevCaps->UniqueID = 0; + DevCaps->SilentInstall = 0; + DevCaps->RawDeviceOK = 0; + DevCaps->SurpriseRemovalOK = 0; + DevCaps->WakeFromD0 = 0; + DevCaps->WakeFromD1 = 0; + DevCaps->WakeFromD2 = 0; + DevCaps->WakeFromD3 = 0; + DevCaps->HardwareDisabled = 0; + DevCaps->NoDisplayInUI = 0; + DevCaps->Address = DevExt->FloppyNumber; + DevCaps->SystemWake = PowerSystemUnspecified; + DevCaps->DeviceWake = PowerDeviceUnspecified; + DevCaps->D1Latency = 0; + DevCaps->D2Latency = 0; + DevCaps->D3Latency = 0; + + return STATUS_SUCCESS; +} + +static NTSTATUS +FdcPdoQueryTargetDeviceRelations(PFDC_PDO_EXTENSION DevExt, + PIRP Irp) +{ + PDEVICE_RELATIONS DeviceRelations; + + DeviceRelations = ExAllocatePool(NonPagedPool, + sizeof(DEVICE_RELATIONS)); + if (!DeviceRelations) + { + DPRINT1("Failed to allocate memory for device relations\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + DeviceRelations->Count = 1; + DeviceRelations->Objects[0] = DevExt->Common.DeviceObject; + + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; + + return STATUS_SUCCESS; +} + +static VOID +FdcPdoRemoveDevice(PFDC_PDO_EXTENSION DevExt) +{ + KIRQL OldIrql; + + KeAcquireSpinLock(&DevExt->FdoDevExt->FloppyDriveListLock, &OldIrql); + RemoveEntryList(&DevExt->ListEntry); + KeReleaseSpinLock(&DevExt->FdoDevExt->FloppyDriveListLock, OldIrql); + + IoDeleteDevice(DevExt->Common.DeviceObject); +} + +NTSTATUS +FdcPdoPnpDispatch(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PFDC_PDO_EXTENSION DevExt = DeviceObject->DeviceExtension; + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + NTSTATUS Status = Irp->IoStatus.Status; + PWCHAR Buffer; + + switch (IrpSp->MinorFunction) + { + case IRP_MN_CANCEL_STOP_DEVICE: + case IRP_MN_CANCEL_REMOVE_DEVICE: + Status = STATUS_SUCCESS; + break; + case IRP_MN_START_DEVICE: + DPRINT("Starting FDC PDO\n"); + Status = STATUS_SUCCESS; + break; + case IRP_MN_STOP_DEVICE: + DPRINT("Stopping FDC PDO\n"); + /* We don't need to do anything here */ + Status = STATUS_SUCCESS; + break; + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_QUERY_STOP_DEVICE: + /* We don't care */ + Status = STATUS_SUCCESS; + break; + case IRP_MN_REMOVE_DEVICE: + DPRINT("Removing FDC PDO\n"); + + FdcPdoRemoveDevice(DevExt); + + Status = STATUS_SUCCESS; + break; + case IRP_MN_SURPRISE_REMOVAL: + /* Nothing special to do here to deal with surprise removal */ + Status = STATUS_SUCCESS; + break; + case IRP_MN_QUERY_DEVICE_TEXT: + Buffer = L"Floppy disk drive"; + Irp->IoStatus.Information = (ULONG_PTR)Buffer; + Status = STATUS_SUCCESS; + break; + case IRP_MN_QUERY_ID: + Status = FdcPdoQueryId(DevExt, Irp, IrpSp); + break; + case IRP_MN_QUERY_CAPABILITIES: + Status = FdcPdoQueryCapabilities(DevExt, IrpSp); + break; + case IRP_MN_QUERY_DEVICE_RELATIONS: + if (IrpSp->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation) + { + Status = FdcPdoQueryTargetDeviceRelations(DevExt, Irp); + } + break; +#if 0 + case IRP_MN_QUERY_BUS_INFORMATION: + Status = FdcPdoQueryBusInformation(Irp); + break; +#endif + case IRP_MN_QUERY_RESOURCES: + case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: + /* All resources are owned by the controller's FDO */ + break; + default: + break; + } + + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +NTSTATUS +FdcPdoPowerDispatch(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("Power request not handled\n"); + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Irp->IoStatus.Status; +} + +NTSTATUS +FdcPdoDeviceControlDispatch(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNREFERENCED_PARAMETER(DeviceObject); + + /* FIXME: We don't handle any of these yet */ + + DPRINT1("Device control request not handled\n"); + + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Irp->IoStatus.Status; +} + +NTSTATUS +FdcPdoInternalDeviceControlDispatch(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNREFERENCED_PARAMETER(DeviceObject); + + /* FIXME: We don't handle any of these yet */ + + DPRINT1("Internal device control request not handled\n"); + + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Irp->IoStatus.Status; +} Propchange: trunk/reactos/drivers/storage/fdc/fdc/pdo.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/fdc.inf?rev=5205… ============================================================================== Binary files - no diff available.

1 0

[cgutman] 52054: [NTOSKRNL] - Comment out sending remove to devices before driver installation because there are still some bugs causing crashes
by cgutman＠svn.reactos.org 02 Jun '11

02 Jun '11

Author: cgutman Date: Thu Jun 2 06:07:08 2011 New Revision: 52054 URL: http://svn.reactos.org/svn/reactos?rev=52054&view=rev Log: [NTOSKRNL] - Comment out sending remove to devices before driver installation because there are still some bugs causing crashes Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Thu Jun 2 06:07:08 2011 @@ -551,6 +551,7 @@ DeviceNode = IopGetDeviceNode(DeviceObject); +#if 0 /* Remove the device */ if (DeviceNode->Flags & DNF_ENUMERATED) { @@ -560,6 +561,7 @@ DPRINT1("WARNING: Ignoring failed IopRemoveDevice() for %wZ (likely a driver bug)\n", &DeviceNode->InstancePath); } } +#endif /* Reenumerate the device and its children */ DeviceNode->Flags &= ~DNF_DISABLED;

1 0

[akhaldi] 52053: [CMAKE] Merge r52051 and r52052 from cmake branch: * Improve static libs creation in *nix. Dedicated to arty. * Add a missing dependency.
by akhaldi＠svn.reactos.org 01 Jun '11

01 Jun '11

Author: akhaldi Date: Wed Jun 1 22:18:48 2011 New Revision: 52053 URL: http://svn.reactos.org/svn/reactos?rev=52053&view=rev Log: [CMAKE] Merge r52051 and r52052 from cmake branch: * Improve static libs creation in *nix. Dedicated to arty. * Add a missing dependency. Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/gcc.cmake trunk/reactos/toolchain-mingw32.cmake Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Wed Jun 1 22:18:48 2011 @@ -154,6 +154,7 @@ set_source_files_properties(${FREELDR_ARCH_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_;_BLDR_;_NTSYSTEM_") add_library(freeldr_arch ${FREELDR_ARCH_SOURCE}) +add_dependencies(freeldr_arch bugcodes) list(APPEND FREELDR_SOURCE bootmgr.c Modified: trunk/reactos/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/gcc.cmake?rev=52053&r1=520… ============================================================================== --- trunk/reactos/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/gcc.cmake [iso-8859-1] Wed Jun 1 22:18:48 2011 @@ -18,10 +18,6 @@ "<CMAKE_C_COMPILER> -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -xc -E <SOURCE> -o <OBJECT>" "${WRC} -i <OBJECT> -o <OBJECT>" "<CMAKE_RC_COMPILER> -i <OBJECT> -J res -O coff -o <OBJECT>") - -if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES Windows) - set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> crs <TARGET> <LINK_FLAGS> <OBJECTS>") -endif() # Compiler Core add_definitions(-pipe -fms-extensions) Modified: trunk/reactos/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-mingw32.cmake?re… ============================================================================== --- trunk/reactos/toolchain-mingw32.cmake [iso-8859-1] (original) +++ trunk/reactos/toolchain-mingw32.cmake [iso-8859-1] Wed Jun 1 22:18:48 2011 @@ -35,6 +35,13 @@ set(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc) set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") +set(CMAKE_AR ${MINGW_PREFIX}ar) +if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES Windows) + set(CMAKE_C_CREATE_STATIC_LIBRARY "${CMAKE_AR} crs <TARGET> <LINK_FLAGS> <OBJECTS>") + set(CMAKE_CXX_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) + set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) +endif() + # Use stdcall fixups, and don't link with anything by default unless we say so set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries")

1 0

[akhaldi] 52052: [CMAKE] * Add a missing dependency.
by akhaldi＠svn.reactos.org 01 Jun '11

01 Jun '11

Author: akhaldi Date: Wed Jun 1 22:08:27 2011 New Revision: 52052 URL: http://svn.reactos.org/svn/reactos?rev=52052&view=rev Log: [CMAKE] * Add a missing dependency. Modified: branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt Modified: branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Wed Jun 1 22:08:27 2011 @@ -154,6 +154,7 @@ set_source_files_properties(${FREELDR_ARCH_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_;_BLDR_;_NTSYSTEM_") add_library(freeldr_arch ${FREELDR_ARCH_SOURCE}) +add_dependencies(freeldr_arch bugcodes) list(APPEND FREELDR_SOURCE bootmgr.c

1 0

[akhaldi] 52051: [CMAKE] * Improve static libs creation in *nix. Dedicated to arty.
by akhaldi＠svn.reactos.org 01 Jun '11

01 Jun '11

Author: akhaldi Date: Wed Jun 1 22:05:24 2011 New Revision: 52051 URL: http://svn.reactos.org/svn/reactos?rev=52051&view=rev Log: [CMAKE] * Improve static libs creation in *nix. Dedicated to arty. Modified: branches/cmake-bringup/gcc.cmake branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=520… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Wed Jun 1 22:05:24 2011 @@ -18,10 +18,6 @@ "<CMAKE_C_COMPILER> -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -xc -E <SOURCE> -o <OBJECT>" "${WRC} -i <OBJECT> -o <OBJECT>" "<CMAKE_RC_COMPILER> -i <OBJECT> -J res -O coff -o <OBJECT>") - -if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES Windows) - set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> crs <TARGET> <LINK_FLAGS> <OBJECTS>") -endif() # Compiler Core add_definitions(-pipe -fms-extensions) Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Wed Jun 1 22:05:24 2011 @@ -35,6 +35,13 @@ set(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc) set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") +set(CMAKE_AR ${MINGW_PREFIX}ar) +if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES Windows) + set(CMAKE_C_CREATE_STATIC_LIBRARY "${CMAKE_AR} crs <TARGET> <LINK_FLAGS> <OBJECTS>") + set(CMAKE_CXX_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) + set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) +endif() + # Use stdcall fixups, and don't link with anything by default unless we say so set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries")

1 0

[tkreuzer] 52050: [NTOSKRNL] Merge r52027 from cmake branch: * Several improvements to debug symbols handling. * A new (killer/awesome/...etc) feature has been introduced to kdbg: argument values s...
by tkreuzer＠svn.reactos.org 01 Jun '11

01 Jun '11

Author: tkreuzer Date: Wed Jun 1 20:36:40 2011 New Revision: 52050 URL: http://svn.reactos.org/svn/reactos?rev=52050&view=rev Log: [NTOSKRNL] Merge r52027 from cmake branch: * Several improvements to debug symbols handling. * A new (killer/awesome/...etc) feature has been introduced to kdbg: argument values support. Now backtraces contain not only usermode and kernelmode addresses translated, but also the argument values passed to the functions along the trace. * Brought to you by the Arty. * works only with cmake builds Modified: trunk/reactos/ (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/ (props changed) trunk/reactos/include/reactos/rossym.h trunk/reactos/lib/rossym_new/CMakeLists.txt trunk/reactos/lib/rossym_new/compat.h trunk/reactos/lib/rossym_new/dwarf.h trunk/reactos/lib/rossym_new/dwarfabbrev.c trunk/reactos/lib/rossym_new/dwarfaranges.c trunk/reactos/lib/rossym_new/dwarfcfa.c trunk/reactos/lib/rossym_new/dwarfget.c trunk/reactos/lib/rossym_new/dwarfinfo.c trunk/reactos/lib/rossym_new/dwarfopen.c trunk/reactos/lib/rossym_new/dwarfpc.c trunk/reactos/lib/rossym_new/find.c trunk/reactos/lib/rossym_new/fromfile.c trunk/reactos/lib/rossym_new/initum.c trunk/reactos/lib/rossym_new/pe.c trunk/reactos/lib/rossym_new/pe.h trunk/reactos/lib/rossym_new/rossympriv.h trunk/reactos/ntoskrnl/include/internal/kd.h trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.c trunk/reactos/ntoskrnl/kdbg/kdb_cli.c trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c trunk/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c trunk/reactos/ntoskrnl/ke/bug.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/reactos/rossym.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/rossym.h?r… Modified: trunk/reactos/lib/rossym_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/CMakeLists.… Modified: trunk/reactos/lib/rossym_new/compat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/compat.h?re… Modified: trunk/reactos/lib/rossym_new/dwarf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/dwarf.h?rev… Modified: trunk/reactos/lib/rossym_new/dwarfabbrev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/dwarfabbrev… Modified: trunk/reactos/lib/rossym_new/dwarfaranges.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/dwarfarange… Modified: trunk/reactos/lib/rossym_new/dwarfcfa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/dwarfcfa.c?… Modified: trunk/reactos/lib/rossym_new/dwarfget.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/dwarfget.c?… Modified: trunk/reactos/lib/rossym_new/dwarfinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/dwarfinfo.c… Modified: trunk/reactos/lib/rossym_new/dwarfopen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/dwarfopen.c… Modified: trunk/reactos/lib/rossym_new/dwarfpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/dwarfpc.c?r… Modified: trunk/reactos/lib/rossym_new/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/find.c?rev=… Modified: trunk/reactos/lib/rossym_new/fromfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/fromfile.c?… Modified: trunk/reactos/lib/rossym_new/initum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/initum.c?re… Modified: trunk/reactos/lib/rossym_new/pe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/pe.c?rev=52… Modified: trunk/reactos/lib/rossym_new/pe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/pe.h?rev=52… Modified: trunk/reactos/lib/rossym_new/rossympriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/rossympriv.… Modified: trunk/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/i386/i386-di… Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=5205…

1 0

[jgardou] 52049: [CMAKE] - clean up wine directx build file. Wine removed COM from wind3d
by jgardou＠svn.reactos.org 01 Jun '11

01 Jun '11

Author: jgardou Date: Wed Jun 1 19:45:03 2011 New Revision: 52049 URL: http://svn.reactos.org/svn/reactos?rev=52049&view=rev Log: [CMAKE] - clean up wine directx build file. Wine removed COM from wind3d Modified: trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt Modified: trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/CMak… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] Wed Jun 1 19:45:03 2011 @@ -29,7 +29,6 @@ volume.c volumetexture.c version.rc - #${REACTOS_BINARY_DIR}/include/reactos/wine/wined3d_i.c ${CMAKE_CURRENT_BINARY_DIR}/d3d8.def) add_library(d3d8 SHARED ${SOURCE}) Modified: trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/CMak… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] Wed Jun 1 19:45:03 2011 @@ -31,7 +31,6 @@ volume.c volumetexture.c version.rc - #${REACTOS_BINARY_DIR}/include/reactos/wine/wined3d_i.c ${CMAKE_CURRENT_BINARY_DIR}/d3d9_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/d3d9.def) Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/C… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Wed Jun 1 19:45:03 2011 @@ -55,7 +55,7 @@ add_library(wined3d SHARED ${SOURCE}) set_module_type(wined3d win32dll) -target_link_libraries(wined3d wine uuid) +target_link_libraries(wined3d wine) add_importlibs(wined3d user32

1 0

[cgutman] 52048: [UMPNPMGR] - Handle more GUIDs
by cgutman＠svn.reactos.org 01 Jun '11

01 Jun '11

Author: cgutman Date: Wed Jun 1 19:44:03 2011 New Revision: 52048 URL: http://svn.reactos.org/svn/reactos?rev=52048&view=rev Log: [UMPNPMGR] - Handle more GUIDs Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Wed Jun 1 19:44:03 2011 @@ -2965,6 +2965,30 @@ DPRINT1("Device arrival: %S\n", PnpEvent->TargetDevice.DeviceIds); /* FIXME: ? */ } + else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_EJECT_VETOED, &RpcStatus)) + { + DPRINT1("Eject vetoed: %S\n", PnpEvent->TargetDevice.DeviceIds); + } + else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_KERNEL_INITIATED_EJECT, &RpcStatus)) + { + DPRINT1("Kernel initiated eject: %S\n", PnpEvent->TargetDevice.DeviceIds); + } + else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_SAFE_REMOVAL, &RpcStatus)) + { + DPRINT1("Safe removal: %S\n", PnpEvent->TargetDevice.DeviceIds); + } + else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_SURPRISE_REMOVAL, &RpcStatus)) + { + DPRINT1("Surprise removal: %S\n", PnpEvent->TargetDevice.DeviceIds); + } + else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_REMOVAL_VETOED, &RpcStatus)) + { + DPRINT1("Removal vetoed: %S\n", PnpEvent->TargetDevice.DeviceIds); + } + else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_REMOVE_PENDING, &RpcStatus)) + { + DPRINT1("Removal pending: %S\n", PnpEvent->TargetDevice.DeviceIds); + } else { DPRINT1("Unknown event, GUID {%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}\n",

1 0

[tkreuzer] 52047: [CMD] replace FILE IO with Memory IO functions for batch files Patch by HansH (hans at atbas dot org) See issue #5807 for more details.
by tkreuzer＠svn.reactos.org 01 Jun '11

01 Jun '11

Author: tkreuzer Date: Wed Jun 1 19:33:20 2011 New Revision: 52047 URL: http://svn.reactos.org/svn/reactos?rev=52047&view=rev Log: [CMD] replace FILE IO with Memory IO functions for batch files Patch by HansH (hans at atbas dot org) See issue #5807 for more details. Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/batch.h trunk/reactos/base/shell/cmd/goto.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] Wed Jun 1 19:33:20 2011 @@ -156,6 +156,22 @@ return dp; } +/* + * free the allocated memory of a batch file + */ +VOID ClearBatch() +{ + TRACE ("ClearBatch mem = %08x free = %d\n", bc->mem, bc->memfree); + + if (bc->mem && bc->memfree) + cmd_free(bc->mem); + + if (bc->raw_params) + cmd_free(bc->raw_params); + + if (bc->params) + cmd_free(bc->params); +} /* * If a batch file is current, exits it, freeing the context block and @@ -169,19 +185,9 @@ VOID ExitBatch() { + ClearBatch(); + TRACE ("ExitBatch\n"); - - if (bc->hBatchFile) - { - CloseHandle (bc->hBatchFile); - bc->hBatchFile = INVALID_HANDLE_VALUE; - } - - if (bc->raw_params) - cmd_free(bc->raw_params); - - if (bc->params) - cmd_free(bc->params); UndoRedirection(bc->RedirList, NULL); FreeRedirection(bc->RedirList); @@ -195,6 +201,33 @@ bc = bc->prev; } +/* + * Load batch file into memory + * + */ +void BatchFile2Mem(HANDLE hBatchFile) +{ + TRACE ("BatchFile2Mem ()\n"); + + bc->memsize = GetFileSize(hBatchFile, NULL); + bc->mem = (char *)cmd_alloc(bc->memsize+1); /* 1 extra for '\0' */ + + /* if memory is available, read it in and close the file */ + if (bc->mem != NULL) + { + TRACE ("BatchFile2Mem memory %08x - %08x\n",bc->mem,bc->memsize); + SetFilePointer (hBatchFile, 0, NULL, FILE_BEGIN); + ReadFile(hBatchFile, (LPVOID)bc->mem, bc->memsize, &bc->memsize, NULL); + bc->mem[bc->memsize]='\0'; /* end this, so you can dump it as a string */ + bc->memfree=TRUE; /* this one needs to be freed */ + } + else + { + bc->memsize=0; /* this will prevent mem being accessed */ + bc->memfree=FALSE; + } + bc->mempos = 0; /* set position to the start */ +} /* * Start batch file execution @@ -209,31 +242,37 @@ LPFOR_CONTEXT saved_fc; INT i; INT ret = 0; - - HANDLE hFile; + BOOL same_fn = FALSE; + + HANDLE hFile = 0; SetLastError(0); - hFile = CreateFile (fullname, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | - FILE_FLAG_SEQUENTIAL_SCAN, NULL); - - TRACE ("Batch: (\'%s\', \'%s\', \'%s\') hFile = %x\n", - debugstr_aw(fullname), debugstr_aw(firstword), debugstr_aw(param), hFile); - - if (hFile == INVALID_HANDLE_VALUE) - { - ConErrResPuts(STRING_BATCH_ERROR); - return 1; - } - + if (bc && bc->mem) + { + TCHAR fpname[MAX_PATH]; + GetFullPathName(fullname, sizeof(fpname) / sizeof(TCHAR), fpname, NULL); + if (_tcsicmp(bc->BatchFilePath,fpname)==0) + same_fn=TRUE; + } + TRACE ("Batch: (\'%s\', \'%s\', \'%s\') same_fn = %d\n", + debugstr_aw(fullname), debugstr_aw(firstword), debugstr_aw(param), same_fn); + + if (!same_fn) + { + hFile = CreateFile (fullname, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | + FILE_FLAG_SEQUENTIAL_SCAN, NULL); + + if (hFile == INVALID_HANDLE_VALUE) + { + ConErrResPuts(STRING_BATCH_ERROR); + return 1; + } + } + if (bc != NULL && Cmd == bc->current) { /* Then we are transferring to another batch */ - CloseHandle (bc->hBatchFile); - bc->hBatchFile = INVALID_HANDLE_VALUE; - if (bc->params) - cmd_free (bc->params); - if (bc->raw_params) - cmd_free (bc->raw_params); + ClearBatch(); AddBatchRedirection(&Cmd->Redirections); } else @@ -261,15 +300,27 @@ /* Create a new context. This function will not * return until this context has been exited */ new.prev = bc; + /* copy some fields in the new structure if it is the same file */ + if (same_fn) { + new.mem = bc->mem; + new.memsize = bc->memsize; + new.mempos = 0; + new.memfree = FALSE; /* don't free this, being used before this */ + } bc = &new; bc->RedirList = NULL; bc->setlocal = setlocal; } GetFullPathName(fullname, sizeof(bc->BatchFilePath) / sizeof(TCHAR), bc->BatchFilePath, NULL); - - bc->hBatchFile = hFile; - SetFilePointer (bc->hBatchFile, 0, NULL, FILE_BEGIN); + /* if a new batch file, load it into memory and close the file */ + if (!same_fn) + { + BatchFile2Mem(hFile); + CloseHandle(hFile); + } + + bc->mempos = 0; /* goto begin of batch file */ bc->bEcho = bEcho; /* Preserve echo across batch calls */ for (i = 0; i < 10; i++) bc->shiftlevel[i] = i; @@ -340,6 +391,49 @@ } /* + * Read a single line from the batch file from the current batch/memory position. + * Almost a copy of FileGetString with same UNICODE handling + */ +BOOL BatchGetString (LPTSTR lpBuffer, INT nBufferLength) +{ + LPSTR lpString; + INT len = 0; +#ifdef _UNICODE + lpString = cmd_alloc(nBufferLength); +#else + lpString = lpBuffer; +#endif + /* read all chars from memory until a '\n' is encountered */ + if (bc->mem) + { + for (; (bc->mempos < bc->memsize && len < (nBufferLength-1)); len++) + { + lpString[len] = bc->mem[bc->mempos++]; + if (lpString[len] == '\n' ) + { + len++; + break; + } + } + } + + if (!len) + { +#ifdef _UNICODE + cmd_free(lpString); +#endif + return FALSE; + } + + lpString[len++] = '\0'; +#ifdef _UNICODE + MultiByteToWideChar(OutputCodePage, 0, lpString, -1, lpBuffer, len); + cmd_free(lpString); +#endif + return TRUE; +} + +/* * Read and return the next executable line form the current batch file * * If no batch file is current or no further executable lines are found @@ -347,7 +441,6 @@ * * Set eflag to 0 if line is not to be echoed else 1 */ - LPTSTR ReadBatchLine () { TRACE ("ReadBatchLine ()\n"); @@ -360,7 +453,7 @@ return NULL; } - if (!FileGetString (bc->hBatchFile, textline, sizeof (textline) / sizeof (textline[0]) - 1)) + if (!BatchGetString (textline, sizeof (textline) / sizeof (textline[0]) - 1)) { TRACE ("ReadBatchLine(): Reached EOF!\n"); /* End of file.... */ Modified: trunk/reactos/base/shell/cmd/batch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.h?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] Wed Jun 1 19:33:20 2011 @@ -9,7 +9,10 @@ typedef struct tagBATCHCONTEXT { struct tagBATCHCONTEXT *prev; - HANDLE hBatchFile; + char *mem; /* batchfile content in memory */ + DWORD memsize; /* size of batchfile */ + DWORD mempos; /* current position to read from */ + BOOL memfree; /* true if it need to be freed when exitbatch is called */ TCHAR BatchFilePath[MAX_PATH]; LPTSTR params; LPTSTR raw_params; /* Holds the raw params given by the input */ @@ -47,5 +50,6 @@ LPTSTR BatchParams (LPTSTR, LPTSTR); VOID ExitBatch (VOID); INT Batch (LPTSTR, LPTSTR, LPTSTR, PARSED_COMMAND *); +BOOL BatchGetString (LPTSTR lpBuffer, INT nBufferLength); LPTSTR ReadBatchLine(VOID); -VOID AddBatchRedirection(REDIRECTION **); +VOID AddBatchRedirection(REDIRECTION **); Modified: trunk/reactos/base/shell/cmd/goto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/goto.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/goto.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/goto.c [iso-8859-1] Wed Jun 1 19:33:20 2011 @@ -74,14 +74,14 @@ /* jump to end of the file */ if ( _tcsicmp( param, _T(":eof"))==0) { - SetFilePointer (bc->hBatchFile, 0, &lNewPosHigh, FILE_END); + bc->mempos=bc->memsize; /* position at the end of the batchfile */ return 0; } /* jump to begin of the file */ - SetFilePointer (bc->hBatchFile, 0, &lNewPosHigh, FILE_BEGIN); + bc->mempos=0; - while (FileGetString (bc->hBatchFile, textline, sizeof(textline) / sizeof(textline[0]))) + while (BatchGetString (textline, sizeof(textline) / sizeof(textline[0]))) { int pos; int size;

1 0

[cgutman] 52046: [NTOSKRNL] - Massive rework of device removal - IRP_MN_QUERY_REMOVE_DEVICE is sent to all devices that will be removed in response to a removal/ejection - If any of the IRP_MN_QUER...
by cgutman＠svn.reactos.org 01 Jun '11

01 Jun '11

Author: cgutman Date: Wed Jun 1 19:32:12 2011 New Revision: 52046 URL: http://svn.reactos.org/svn/reactos?rev=52046&view=rev Log: [NTOSKRNL] - Massive rework of device removal - IRP_MN_QUERY_REMOVE_DEVICE is sent to all devices that will be removed in response to a removal/ejection - If any of the IRP_MN_QUERY_REMOVE_DEVICE requests fail, all devices which received a IRP_MN_QUERY_REMOVE_DEVICE will receive IRP_MN_CANCEL_REMOVE_DEVICE - If everything approves the remove request, IRP_MN_REMOVE_DEVICE will be sent to children, ejection and/or removal relations, and finally the device itself - Handle removal relations for all devices not just 1st level devices - Remove child devices before removing the parent - Move GUID_DEVICE_REMOVE_PENDING and GUID_DEVICE_REMOVAL_VETOED notifications to IopQueryRemoveDevice - Implement IopCancelRemoveDevice which sends IRP_MN_CANCEL_REMOVE_DEVICE to the driver stack and sends GUID_TARGET_DEVICE_REMOVE_CANCELLED to any drivers waiting on target device change - Use the IopRemoveDevice function to remove devices instead of calling IopQueryRemoveDevice and IopSendRemoveDevice manually so removal and/or ejection relations and children are processed - IRPs and PnP notifications sent upon device removal (surprise and safe) should now be compatible with XP/Vista/7 Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Wed Jun 1 19:32:12 2011 @@ -45,6 +45,12 @@ IN ULONG CreateOptions, OUT PHANDLE Handle); +VOID +IopCancelPrepareDeviceForRemoval(PDEVICE_OBJECT DeviceObject); + +NTSTATUS +IopPrepareDeviceForRemoval(PDEVICE_OBJECT DeviceObject); + PDEVICE_NODE FASTCALL IopGetDeviceNode(PDEVICE_OBJECT DeviceObject) @@ -125,6 +131,7 @@ return STATUS_SUCCESS; } +static NTSTATUS NTAPI IopSendEject(IN PDEVICE_OBJECT DeviceObject) @@ -139,6 +146,7 @@ return IopSynchronousCall(DeviceObject, &Stack, &Dummy); } +static VOID NTAPI IopSendSurpriseRemoval(IN PDEVICE_OBJECT DeviceObject) @@ -154,13 +162,20 @@ IopSynchronousCall(DeviceObject, &Stack, &Dummy); } +static NTSTATUS NTAPI IopQueryRemoveDevice(IN PDEVICE_OBJECT DeviceObject) { + PDEVICE_NODE DeviceNode = IopGetDeviceNode(DeviceObject); IO_STACK_LOCATION Stack; PVOID Dummy; NTSTATUS Status; + + ASSERT(DeviceNode); + + IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVE_PENDING, + &DeviceNode->InstancePath); RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); Stack.MajorFunction = IRP_MJ_PNP; @@ -173,10 +188,18 @@ &GUID_TARGET_DEVICE_QUERY_REMOVE, NULL, NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Removal vetoed by %wZ\n", &DeviceNode->InstancePath); + IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVAL_VETOED, + &DeviceNode->InstancePath); + } return Status; } +static NTSTATUS NTAPI IopQueryStopDevice(IN PDEVICE_OBJECT DeviceObject) @@ -191,6 +214,7 @@ return IopSynchronousCall(DeviceObject, &Stack, &Dummy); } +static VOID NTAPI IopSendRemoveDevice(IN PDEVICE_OBJECT DeviceObject) @@ -212,6 +236,29 @@ NULL); } +static +VOID +NTAPI +IopCancelRemoveDevice(IN PDEVICE_OBJECT DeviceObject) +{ + IO_STACK_LOCATION Stack; + PVOID Dummy; + + RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); + Stack.MajorFunction = IRP_MJ_PNP; + Stack.MinorFunction = IRP_MN_CANCEL_REMOVE_DEVICE; + + /* Drivers should never fail a IRP_MN_CANCEL_REMOVE_DEVICE request */ + IopSynchronousCall(DeviceObject, &Stack, &Dummy); + + IopNotifyPlugPlayNotification(DeviceObject, + EventCategoryTargetDeviceChange, + &GUID_TARGET_DEVICE_REMOVE_CANCELLED, + NULL, + NULL); +} + +static VOID NTAPI IopSendStopDevice(IN PDEVICE_OBJECT DeviceObject) @@ -257,7 +304,7 @@ if (!NT_SUCCESS(Status)) { /* Send an IRP_MN_REMOVE_DEVICE request */ - IopSendRemoveDevice(DeviceObject); + IopRemoveDevice(DeviceNode); /* Set the appropriate flag */ DeviceNode->Flags |= DNF_START_FAILED; @@ -3721,7 +3768,7 @@ DeviceNode->Flags &= ~(DNF_STARTED | DNF_START_REQUEST_PENDING); DeviceNode->Flags |= DNF_START_FAILED; - IopSendRemoveDevice(PhysicalDeviceObject); + IopRemoveDevice(DeviceNode); } } } @@ -3881,8 +3928,213 @@ return Status; } +static NTSTATUS -NTAPI +IopQueryRemoveChildDevices(PDEVICE_NODE ParentDeviceNode) +{ + PDEVICE_NODE ChildDeviceNode, NextDeviceNode, FailedRemoveDevice; + NTSTATUS Status; + KIRQL OldIrql; + + KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql); + ChildDeviceNode = ParentDeviceNode->Child; + while (ChildDeviceNode != NULL) + { + NextDeviceNode = ChildDeviceNode->Sibling; + KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); + + Status = IopPrepareDeviceForRemoval(ChildDeviceNode->PhysicalDeviceObject); + if (!NT_SUCCESS(Status)) + { + FailedRemoveDevice = ChildDeviceNode; + goto cleanup; + } + + KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql); + ChildDeviceNode = NextDeviceNode; + } + KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); + + return STATUS_SUCCESS; + +cleanup: + KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql); + ChildDeviceNode = ParentDeviceNode->Child; + while (ChildDeviceNode != NULL) + { + NextDeviceNode = ChildDeviceNode->Sibling; + KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); + + IopCancelPrepareDeviceForRemoval(ChildDeviceNode->PhysicalDeviceObject); + + /* IRP_MN_CANCEL_REMOVE_DEVICE is also sent to the device + * that failed the IRP_MN_QUERY_REMOVE_DEVICE request */ + if (ChildDeviceNode == FailedRemoveDevice) + return Status; + + ChildDeviceNode = NextDeviceNode; + + KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql); + } + KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); + + return Status; +} + +static +VOID +IopSendRemoveChildDevices(PDEVICE_NODE ParentDeviceNode) +{ + PDEVICE_NODE ChildDeviceNode, NextDeviceNode; + KIRQL OldIrql; + + KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql); + ChildDeviceNode = ParentDeviceNode->Child; + while (ChildDeviceNode != NULL) + { + NextDeviceNode = ChildDeviceNode->Sibling; + KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); + + IopSendRemoveDevice(ChildDeviceNode->PhysicalDeviceObject); + + ChildDeviceNode = NextDeviceNode; + + KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql); + } + KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); +} + +static +VOID +IopCancelRemoveChildDevices(PDEVICE_NODE ParentDeviceNode) +{ + PDEVICE_NODE ChildDeviceNode, NextDeviceNode; + KIRQL OldIrql; + + KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql); + ChildDeviceNode = ParentDeviceNode->Child; + while (ChildDeviceNode != NULL) + { + NextDeviceNode = ChildDeviceNode->Sibling; + KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); + + IopCancelPrepareDeviceForRemoval(ChildDeviceNode->PhysicalDeviceObject); + + ChildDeviceNode = NextDeviceNode; + + KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql); + } + KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); +} + +static +NTSTATUS +IopQueryRemoveDeviceRelations(PDEVICE_RELATIONS DeviceRelations) +{ + /* This function DOES NOT dereference the device objects on SUCCESS + * but it DOES dereference device objects on FAILURE */ + + ULONG i, j; + NTSTATUS Status; + + for (i = 0; i < DeviceRelations->Count; i++) + { + Status = IopPrepareDeviceForRemoval(DeviceRelations->Objects[i]); + if (!NT_SUCCESS(Status)) + { + j = i; + goto cleanup; + } + } + + return STATUS_SUCCESS; + +cleanup: + /* IRP_MN_CANCEL_REMOVE_DEVICE is also sent to the device + * that failed the IRP_MN_QUERY_REMOVE_DEVICE request */ + for (i = 0; i <= j; i++) + { + IopCancelPrepareDeviceForRemoval(DeviceRelations->Objects[i]); + ObDereferenceObject(DeviceRelations->Objects[i]); + DeviceRelations->Objects[i] = NULL; + } + for (; i < DeviceRelations->Count; i++) + { + ObDereferenceObject(DeviceRelations->Objects[i]); + DeviceRelations->Objects[i] = NULL; + } + ExFreePool(DeviceRelations); + + return Status; +} + +static +VOID +IopSendRemoveDeviceRelations(PDEVICE_RELATIONS DeviceRelations) +{ + /* This function DOES dereference the device objects in all cases */ + + ULONG i; + + for (i = 0; i < DeviceRelations->Count; i++) + { + IopSendRemoveDevice(DeviceRelations->Objects[i]); + ObDereferenceObject(DeviceRelations->Objects[i]); + DeviceRelations->Objects[i] = NULL; + } + + ExFreePool(DeviceRelations); +} + +static +VOID +IopCancelRemoveDeviceRelations(PDEVICE_RELATIONS DeviceRelations) +{ + /* This function DOES dereference the device objects in all cases */ + + ULONG i; + + for (i = 0; i < DeviceRelations->Count; i++) + { + IopCancelPrepareDeviceForRemoval(DeviceRelations->Objects[i]); + ObDereferenceObject(DeviceRelations->Objects[i]); + DeviceRelations->Objects[i] = NULL; + } + + ExFreePool(DeviceRelations); +} + +VOID +IopCancelPrepareDeviceForRemoval(PDEVICE_OBJECT DeviceObject) +{ + IO_STACK_LOCATION Stack; + IO_STATUS_BLOCK IoStatusBlock; + PDEVICE_RELATIONS DeviceRelations; + NTSTATUS Status; + + IopCancelRemoveDevice(DeviceObject); + + Stack.Parameters.QueryDeviceRelations.Type = RemovalRelations; + + Status = IopInitiatePnpIrp(DeviceObject, + &IoStatusBlock, + IRP_MN_QUERY_DEVICE_RELATIONS, + &Stack); + if (!NT_SUCCESS(Status)) + { + DPRINT("IopInitiatePnpIrp() failed with status 0x%08lx\n", Status); + DeviceRelations = NULL; + } + else + { + DeviceRelations = (PDEVICE_RELATIONS)IoStatusBlock.Information; + } + + if (DeviceRelations) + IopCancelRemoveDeviceRelations(DeviceRelations); +} + +NTSTATUS IopPrepareDeviceForRemoval(IN PDEVICE_OBJECT DeviceObject) { PDEVICE_NODE DeviceNode = IopGetDeviceNode(DeviceObject); @@ -3890,7 +4142,6 @@ IO_STATUS_BLOCK IoStatusBlock; PDEVICE_RELATIONS DeviceRelations; NTSTATUS Status; - ULONG i; if (DeviceNode->UserFlags & DNUF_NOT_DISABLEABLE) { @@ -3898,15 +4149,9 @@ return STATUS_UNSUCCESSFUL; } - IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVE_PENDING, - &DeviceNode->InstancePath); - if (IopQueryRemoveDevice(DeviceObject) != STATUS_SUCCESS) { DPRINT1("Removal vetoed by failing the query remove request\n"); - - IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVAL_VETOED, - &DeviceNode->InstancePath); return STATUS_UNSUCCESSFUL; } @@ -3929,51 +4174,24 @@ if (DeviceRelations) { - for (i = 0; i < DeviceRelations->Count; i++) - { - PDEVICE_NODE RelationsDeviceNode = IopGetDeviceNode(DeviceRelations->Objects[i]); - - IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVE_PENDING, - &RelationsDeviceNode->InstancePath); - - if (IopRemoveDevice(RelationsDeviceNode) != STATUS_SUCCESS) - { - DPRINT1("Device removal vetoed by failing a dependent query remove request\n"); - - Status = STATUS_UNSUCCESSFUL; - - goto cleanup; - } - else - { - ObDereferenceObject(DeviceRelations->Objects[i]); - - DeviceRelations->Objects[i] = NULL; - } - } - - ExFreePool(DeviceRelations); - - DeviceRelations = NULL; - } - - Status = STATUS_SUCCESS; - -cleanup: + Status = IopQueryRemoveDeviceRelations(DeviceRelations); + if (!NT_SUCCESS(Status)) + return Status; + } + + Status = IopQueryRemoveChildDevices(DeviceNode); + if (!NT_SUCCESS(Status)) + { + if (DeviceRelations) + IopCancelRemoveDeviceRelations(DeviceRelations); + return Status; + } + if (DeviceRelations) - { - for (i = 0; i < DeviceRelations->Count; i++) - { - if (DeviceRelations->Objects[i]) - { - ObDereferenceObject(DeviceRelations->Objects[i]); - } - } - - ExFreePool(DeviceRelations); - } - - return Status; + IopSendRemoveDeviceRelations(DeviceRelations); + IopSendRemoveChildDevices(DeviceNode); + + return STATUS_SUCCESS; } NTSTATUS @@ -3992,9 +4210,6 @@ DeviceNode->Flags |= DNF_WILL_BE_REMOVED; return STATUS_SUCCESS; } - - IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVAL_VETOED, - &DeviceNode->InstancePath); return Status; } @@ -4012,16 +4227,13 @@ IO_STACK_LOCATION Stack; DEVICE_CAPABILITIES Capabilities; NTSTATUS Status; - ULONG i; IopQueueTargetDeviceEvent(&GUID_DEVICE_KERNEL_INITIATED_EJECT, &DeviceNode->InstancePath); if (IopQueryDeviceCapabilities(DeviceNode, &Capabilities) != STATUS_SUCCESS) { - IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT_VETOED, - &DeviceNode->InstancePath); - return; + goto cleanup; } Stack.Parameters.QueryDeviceRelations.Type = EjectionRelations; @@ -4042,47 +4254,36 @@ if (DeviceRelations) { - for (i = 0; i < DeviceRelations->Count; i++) - { - PDEVICE_NODE RelationsDeviceNode = IopGetDeviceNode(DeviceRelations->Objects[i]); - - IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVE_PENDING, - &RelationsDeviceNode->InstancePath); - - if (IopRemoveDevice(RelationsDeviceNode) != STATUS_SUCCESS) - { - DPRINT1("Device removal vetoed by failing a query remove request (ejection relations)\n"); - - goto cleanup; - } - else - { - ObDereferenceObject(DeviceRelations->Objects[i]); - - DeviceRelations->Objects[i] = NULL; - } - } - - ExFreePool(DeviceRelations); - - DeviceRelations = NULL; + Status = IopQueryRemoveDeviceRelations(DeviceRelations); + if (!NT_SUCCESS(Status)) + goto cleanup; + } + + Status = IopQueryRemoveChildDevices(DeviceNode); + if (!NT_SUCCESS(Status)) + { + if (DeviceRelations) + IopCancelRemoveDeviceRelations(DeviceRelations); + goto cleanup; } if (IopPrepareDeviceForRemoval(PhysicalDeviceObject) != STATUS_SUCCESS) { - IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT_VETOED, - &DeviceNode->InstancePath); - return; - } + if (DeviceRelations) + IopCancelRemoveDeviceRelations(DeviceRelations); + IopCancelRemoveChildDevices(DeviceNode); + goto cleanup; + } + + if (DeviceRelations) + IopSendRemoveDeviceRelations(DeviceRelations); + IopSendRemoveChildDevices(DeviceNode); if (Capabilities.EjectSupported) { if (IopSendEject(PhysicalDeviceObject) != STATUS_SUCCESS) { - IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT_VETOED, - &DeviceNode->InstancePath); - - return; + goto cleanup; } } else @@ -4090,27 +4291,14 @@ DeviceNode->Flags |= DNF_DISABLED; } + IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT, + &DeviceNode->InstancePath); + + return; + cleanup: - if (DeviceRelations) - { - for (i = 0; i < DeviceRelations->Count; i++) - { - if (DeviceRelations->Objects[i]) - { - ObDereferenceObject(DeviceRelations->Objects[i]); - } - } - - ExFreePool(DeviceRelations); - - IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT_VETOED, - &DeviceNode->InstancePath); - } - else - { - IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT, - &DeviceNode->InstancePath); - } + IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT_VETOED, + &DeviceNode->InstancePath); } /*

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