Ros-diffs June 2011

ros-diffs@reactos.org

25 participants
460 discussions

[cgutman] 52072: [USBSTOR] - Fix a typo so SRB_FUNCTION_RELEASE_DEVICE actually does what was intended

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Jun 3 05:43:41 2011 New Revision: 52072 URL: http://svn.reactos.org/svn/reactos?rev=52072&view=rev Log: [USBSTOR] - Fix a typo so SRB_FUNCTION_RELEASE_DEVICE actually does what was intended Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] Fri Jun 3 05:43:41 2011 @@ -115,7 +115,7 @@ // // release claim // - PDODeviceExtension->Claimed = TRUE; + PDODeviceExtension->Claimed = FALSE; Status = STATUS_SUCCESS; break; }

13 years, 6 months

[cgutman] 52071: [USBSTOR] - Don't leave DISPATCH_LEVEL while holding a spin lock acquired at DISPATCH_LEVEL - Synchronize cancellation checking by acquiring the cancel spin lock

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Jun 3 05:38:27 2011 New Revision: 52071 URL: http://svn.reactos.org/svn/reactos?rev=52071&view=rev Log: [USBSTOR] - Don't leave DISPATCH_LEVEL while holding a spin lock acquired at DISPATCH_LEVEL - Synchronize cancellation checking by acquiring the cancel spin lock Modified: branches/usb-bringup/drivers/usb/usbstor/queue.c Modified: branches/usb-bringup/drivers/usb/usbstor/queue.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/queue.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/queue.c [iso-8859-1] Fri Jun 3 05:38:27 2011 @@ -56,19 +56,19 @@ KeAcquireSpinLockAtDpcLevel(&FDODeviceExtension->IrpListLock); // + // remove the irp from the list + // + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + + // + // release irp list lock + // + KeReleaseSpinLockFromDpcLevel(&FDODeviceExtension->IrpListLock); + + // // now release the cancel lock // IoReleaseCancelSpinLock(Irp->CancelIrql); - - // - // remove the irp from the list - // - RemoveEntryList(&Irp->Tail.Overlay.ListEntry); - - // - // release irp list lock - // - KeReleaseSpinLockFromDpcLevel(&FDODeviceExtension->IrpListLock); // // set cancel status @@ -132,6 +132,21 @@ FDODeviceExtension->IrpPendingCount++; // + // check if queue is freezed + // + IrpListFreeze = FDODeviceExtension->IrpListFreeze; + + // + // release list lock + // + KeReleaseSpinLock(&FDODeviceExtension->IrpListLock, OldLevel); + + // + // synchronize with cancellations by holding the cancel lock + // + IoAcquireCancelSpinLock(&Irp->CancelIrql); + + // // now set the driver cancel routine // OldDriverCancel = IoSetCancelRoutine(Irp, USBSTOR_CancelIo); @@ -142,16 +157,6 @@ if (Irp->Cancel && OldDriverCancel == NULL) { // - // the irp has already been cancelled - // - KeReleaseSpinLock(&FDODeviceExtension->IrpListLock, OldLevel); - - // - // cancel routine requires that cancel spinlock is held - // - IoAcquireCancelSpinLock(&Irp->CancelIrql); - - // // cancel irp // USBSTOR_CancelIo(DeviceObject, Irp); @@ -163,14 +168,9 @@ } // - // check if queue is freezed - // - IrpListFreeze = FDODeviceExtension->IrpListFreeze; - - // - // release list lock - // - KeReleaseSpinLock(&FDODeviceExtension->IrpListLock, OldLevel); + // release the cancel lock + // + IoReleaseCancelSpinLock(Irp->CancelIrql); // // if list is freezed, dont start this packet

13 years, 6 months

[cgutman] 52070: - Fix build

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Jun 3 00:31:14 2011 New Revision: 52070 URL: http://svn.reactos.org/svn/reactos?rev=52070&view=rev Log: - Fix build Modified: trunk/reactos/drivers/storage/CMakeLists.txt trunk/reactos/drivers/storage/directory.rbuild 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] Fri Jun 3 00:31:14 2011 @@ -1,7 +1,6 @@ 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] Fri Jun 3 00:31:14 2011 @@ -3,9 +3,6 @@ <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" />

13 years, 6 months

[jgardou] 52069: [WSOCK32] remove useless def file rbuild : use spec file cmake : do not use two def files, it's... pointless.

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Jun 3 00:29:36 2011 New Revision: 52069 URL: http://svn.reactos.org/svn/reactos?rev=52069&view=rev Log: [WSOCK32] remove useless def file rbuild : use spec file cmake : do not use two def files, it's... pointless. Removed: trunk/reactos/dll/win32/wsock32/wsock32.def Modified: trunk/reactos/dll/win32/wsock32/CMakeLists.txt trunk/reactos/dll/win32/wsock32/wsock32.rbuild Modified: trunk/reactos/dll/win32/wsock32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wsock32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/wsock32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wsock32/CMakeLists.txt [iso-8859-1] Fri Jun 3 00:29:36 2011 @@ -2,7 +2,7 @@ set_unicode() spec2def(wsock32.dll wsock32.spec) -add_library(wsock32 SHARED stubs.c wsock32.rc wsock32.def ${CMAKE_CURRENT_BINARY_DIR}/wsock32.def) +add_library(wsock32 SHARED stubs.c wsock32.rc ${CMAKE_CURRENT_BINARY_DIR}/wsock32.def) set_module_type(wsock32 win32dll) Removed: trunk/reactos/dll/win32/wsock32/wsock32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wsock32/wsock32.… ============================================================================== --- trunk/reactos/dll/win32/wsock32/wsock32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wsock32/wsock32.def (removed) @@ -1,78 +1,0 @@ -LIBRARY wsock32.dll - -EXPORTS -accept=ws2_32.accept @1 -bind=ws2_32.bind @2 -closesocket=ws2_32.closesocket @3 -connect=ws2_32.connect @4 -getpeername=ws2_32.getpeername @5 -getsockname=ws2_32.getsockname @6 -getsockopt(a)20=ws2_32.getsockopt @7 -htonl=ws2_32.htonl @8 -htons=ws2_32.htons @9 -inet_addr=ws2_32.inet_addr @10 -inet_ntoa=ws2_32.inet_ntoa @11 -ioctlsocket=ws2_32.ioctlsocket @12 -listen=ws2_32.listen @13 -ntohl=ws2_32.ntohl @14 -ntohs=ws2_32.ntohs @15 -recv(a)16=ws2_32.recv @16 -recvfrom(a)24=ws2_32.recvfrom @17 -select=ws2_32.select @18 -send=ws2_32.send @19 -sendto=ws2_32.sendto @20 -setsockopt(a)20=ws2_32.setsockopt @21 -shutdown=ws2_32.shutdown @22 -socket=ws2_32.socket @23 -MigrateWinsockConfiguration=MSWSOCK.MigrateWinsockConfiguration @24 -gethostbyaddr=ws2_32.gethostbyaddr @51 -gethostbyname=ws2_32.gethostbyname @52 -getprotobyname=ws2_32.getprotobyname @53 -getprotobynumber=ws2_32.getprotobynumber @54 -getservbyname=ws2_32.getservbyname @55 -getservbyport=ws2_32.getservbyport @56 -gethostname=ws2_32.gethostname @57 -WSAAsyncSelect=ws2_32.WSAAsyncSelect @101 -WSAAsyncGetHostByAddr=ws2_32.WSAAsyncGetHostByAddr @102 -WSAAsyncGetHostByName=ws2_32.WSAAsyncGetHostByName @103 -WSAAsyncGetProtoByNumber=ws2_32.WSAAsyncGetProtoByNumber @104 -WSAAsyncGetProtoByName=ws2_32.WSAAsyncGetProtoByName @105 -WSAAsyncGetServByPort=ws2_32.WSAAsyncGetServByPort @106 -WSAAsyncGetServByName=ws2_32.WSAAsyncGetServByName @107 -WSACancelAsyncRequest=ws2_32.WSACancelAsyncRequest @108 -WSASetBlockingHook=ws2_32.WSASetBlockingHook @109 -WSAUnhookBlockingHook=ws2_32.WSAUnhookBlockingHook @110 -WSAGetLastError=ws2_32.WSAGetLastError @111 -WSASetLastError=ws2_32.WSASetLastError @112 -WSACancelBlockingCall=ws2_32.WSACancelBlockingCall @113 -WSAIsBlocking=ws2_32.WSAIsBlocking @114 -WSAStartup=ws2_32.WSAStartup @115 -WSACleanup=ws2_32.WSACleanup @116 -__WSAFDIsSet=ws2_32.__WSAFDIsSet @151 -WEP=ws2_32.WEP @500 -WSApSetPostRoutine=ws2_32.WSApSetPostRoutine @1000 -inet_network=MSWSOCK.inet_network @1100 -getnetbyname=MSWSOCK.getnetbyname @1101 -rcmd=MSWSOCK.rcmd @1102 -rexec=MSWSOCK.rexec @1103 -rresvport=MSWSOCK.rresvport @1104 -sethostname=MSWSOCK.sethostname @1105 -dn_expand=MSWSOCK.dn_expand @1106 -WSARecvEx=MSWSOCK.WSARecvEx @1107 -s_perror=MSWSOCK.s_perror @1108 -GetAddressByNameA=MSWSOCK.GetAddressByNameA @1109 -GetAddressByNameW=MSWSOCK.GetAddressByNameW @1110 -EnumProtocolsA=MSWSOCK.EnumProtocolsA @1111 -EnumProtocolsW=MSWSOCK.EnumProtocolsW @1112 -GetTypeByNameA=MSWSOCK.GetTypeByNameA @1113 -GetTypeByNameW=MSWSOCK.GetTypeByNameW @1114 -GetNameByTypeA=MSWSOCK.GetNameByTypeA @1115 -GetNameByTypeW=MSWSOCK.GetNameByTypeW @1116 -SetServiceA=MSWSOCK.SetServiceA @1117 -SetServiceW=MSWSOCK.SetServiceW @1118 -GetServiceA=MSWSOCK.GetServiceA @1119 -GetServiceW=MSWSOCK.GetServiceW @1120 -NPLoadNameSpaces=MSWSOCK.NPLoadNameSpaces @1130 -TransmitFile=MSWSOCK.TransmitFile @1140 -AcceptEx=MSWSOCK.AcceptEx @1141 -GetAcceptExSockaddrs=MSWSOCK.GetAcceptExSockaddrs @1142 Modified: trunk/reactos/dll/win32/wsock32/wsock32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wsock32/wsock32.… ============================================================================== --- trunk/reactos/dll/win32/wsock32/wsock32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wsock32/wsock32.rbuild [iso-8859-1] Fri Jun 3 00:29:36 2011 @@ -1,5 +1,5 @@ <module name="wsock32" type="win32dll" baseaddress="${BASEADDRESS_WSOCK32}" installbase="system32" installname="wsock32.dll" unicode="yes"> - <importlibrary definition="wsock32.def" /> + <importlibrary definition="wsock32.spec" /> <include base="wsock32">.</include> <library>ntdll</library> <library>ws2_32</library>

13 years, 6 months

[cgutman] 52068: [FDC] - Remove old fdc code

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Jun 3 00:20:01 2011 New Revision: 52068 URL: http://svn.reactos.org/svn/reactos?rev=52068&view=rev Log: [FDC] - Remove old fdc code Removed: trunk/reactos/drivers/storage/fdc/fdc/fdc.c trunk/reactos/drivers/storage/fdc/fdc/fdc.h trunk/reactos/drivers/storage/fdc/fdc/fdc.rc trunk/reactos/drivers/storage/fdc/fdc/fdo.c trunk/reactos/drivers/storage/fdc/fdc/pdo.c Removed: 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 [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/fdc/fdc/fdc.c (removed) @@ -1,153 +1,0 @@ -/* - * 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; -} Removed: 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 [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/fdc/fdc/fdc.h (removed) @@ -1,77 +1,0 @@ -/* - * 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); Removed: 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 [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/fdc/fdc/fdc.rc (removed) @@ -1,5 +1,0 @@ -#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> Removed: 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 [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/fdc/fdc/fdo.c (removed) @@ -1,292 +1,0 @@ -/* - * 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; -} Removed: 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 [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/fdc/fdc/pdo.c (removed) @@ -1,260 +1,0 @@ -/* - * 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; -}

13 years, 6 months

[janderwald] 52067: [HIDPARSE] - Start of HID parser driver - Contains currently only stubs

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Jun 2 19:13:51 2011 New Revision: 52067 URL: http://svn.reactos.org/svn/reactos?rev=52067&view=rev Log: [HIDPARSE] - Start of HID parser driver - Contains currently only stubs Added: branches/usb-bringup/drivers/usb/hidparse/ (with props) branches/usb-bringup/drivers/usb/hidparse/CMakeLists.txt (with props) branches/usb-bringup/drivers/usb/hidparse/hidparse.c (with props) branches/usb-bringup/drivers/usb/hidparse/hidparse.h (with props) branches/usb-bringup/drivers/usb/hidparse/hidparse.rc (with props) branches/usb-bringup/drivers/usb/hidparse/hidparse.spec (with props) branches/usb-bringup/include/ddk/hidpddi.h (with props) Modified: branches/usb-bringup/drivers/usb/CMakeLists.txt Modified: branches/usb-bringup/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/CMakeLi… ============================================================================== --- branches/usb-bringup/drivers/usb/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/CMakeLists.txt [iso-8859-1] Thu Jun 2 19:13:51 2011 @@ -1,6 +1,7 @@ - +add_subdirectory(hidparse) add_subdirectory(nt4compat) add_subdirectory(usbd) add_subdirectory(usbehci_new) add_subdirectory(usbhub_new) +add_subdirectory(usbohci) add_subdirectory(usbstor) Propchange: branches/usb-bringup/drivers/usb/hidparse/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Jun 2 19:13:51 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/usb-bringup/drivers/usb/hidparse/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/usb-bringup/drivers/usb/hidparse/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/usb-bringup/drivers/usb/hidparse/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/usb-bringup/drivers/usb/hidparse/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidpars… ============================================================================== --- branches/usb-bringup/drivers/usb/hidparse/CMakeLists.txt (added) +++ branches/usb-bringup/drivers/usb/hidparse/CMakeLists.txt [iso-8859-1] Thu Jun 2 19:13:51 2011 @@ -1,0 +1,14 @@ + +spec2def(hidparse.sys hidparse.spec) +add_definitions(-DDEBUG_MODE) + +include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) + +add_library(hidparse SHARED hidparse.c hidparse.rc ${CMAKE_CURRENT_BINARY_DIR}/hidparse.def) + +set_module_type(hidparse kernelmodedriver) +add_importlibs(hidparse ntoskrnl) +add_cab_target(hidparse 2) + +add_cab_target(hidparse 2) +add_importlib_target(hidparse.spec) Propchange: branches/usb-bringup/drivers/usb/hidparse/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/hidparse/hidparse.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidpars… ============================================================================== --- branches/usb-bringup/drivers/usb/hidparse/hidparse.c (added) +++ branches/usb-bringup/drivers/usb/hidparse/hidparse.c [iso-8859-1] Thu Jun 2 19:13:51 2011 @@ -1,0 +1,499 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/hidparse/hidparse.c + * PURPOSE: HID Parser + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + +#include "hidparse.h" + + +VOID +HidP_FreeCollectionDescription ( + IN PHIDP_DEVICE_DESC DeviceDescription) +{ + DPRINT1("HidP_FreeCollectionDescription DeviceDescription %p\n", DeviceDescription); + + // + // free collection + // + ExFreePool(DeviceDescription->CollectionDesc); + + // + // free report ids + // + ExFreePool(DeviceDescription->ReportIDs); + + // + // free description itself + // + ExFreePool(DeviceDescription); + +} + +HIDAPI +NTSTATUS +NTAPI +HidP_GetButtonCaps( + HIDP_REPORT_TYPE ReportType, + PHIDP_BUTTON_CAPS ButtonCaps, + PUSHORT ButtonCapsLength, + PHIDP_PREPARSED_DATA PreparsedData) +{ + return HidP_GetSpecificButtonCaps(ReportType, 0, 0, 0, ButtonCaps, (PULONG)ButtonCapsLength, PreparsedData); +} + +HIDAPI +NTSTATUS +NTAPI +HidP_GetSpecificButtonCaps( + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection, + IN USAGE Usage, + OUT PHIDP_BUTTON_CAPS ButtonCaps, + IN OUT PULONG ButtonCapsLength, + IN PHIDP_PREPARSED_DATA PreparsedData) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + + +HIDAPI +NTSTATUS +NTAPI +HidP_GetCaps( + IN PHIDP_PREPARSED_DATA PreparsedData, + OUT PHIDP_CAPS Capabilities) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +HidP_GetCollectionDescription( + IN PHIDP_REPORT_DESCRIPTOR ReportDesc, + IN ULONG DescLength, + IN POOL_TYPE PoolType, + OUT PHIDP_DEVICE_DESC DeviceDescription) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +HIDAPI +NTSTATUS +NTAPI +HidP_GetData( + IN HIDP_REPORT_TYPE ReportType, + OUT PHIDP_DATA DataList, + IN OUT PULONG DataLength, + IN PHIDP_PREPARSED_DATA PreparsedData, + IN PCHAR Report, + IN ULONG ReportLength) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +HIDAPI +NTSTATUS +NTAPI +HidP_GetExtendedAttributes( + IN HIDP_REPORT_TYPE ReportType, + IN USHORT DataIndex, + IN PHIDP_PREPARSED_DATA PreparsedData, + OUT PHIDP_EXTENDED_ATTRIBUTES Attributes, + IN OUT PULONG LengthAttributes) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +HIDAPI +NTSTATUS +NTAPI +HidP_GetLinkCollectionNodes( + OUT PHIDP_LINK_COLLECTION_NODE LinkCollectionNodes, + IN OUT PULONG LinkCollectionNodesLength, + IN PHIDP_PREPARSED_DATA PreparsedData) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +HIDAPI +NTSTATUS +NTAPI +HidP_GetScaledUsageValue( + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection OPTIONAL, + IN USAGE Usage, + OUT PLONG UsageValue, + IN PHIDP_PREPARSED_DATA PreparsedData, + IN PCHAR Report, + IN ULONG ReportLength) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +HIDAPI +NTSTATUS +NTAPI +HidP_GetUsageValue( + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection, + IN USAGE Usage, + OUT PULONG UsageValue, + IN PHIDP_PREPARSED_DATA PreparsedData, + IN PCHAR Report, + IN ULONG ReportLength) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + + + +HIDAPI +NTSTATUS +NTAPI +HidP_UsageListDifference( + IN PUSAGE PreviousUsageList, + IN PUSAGE CurrentUsageList, + OUT PUSAGE BreakUsageList, + OUT PUSAGE MakeUsageList, + IN ULONG UsageListLength) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +HIDAPI +NTSTATUS +NTAPI +HidP_GetSpecificValueCaps( + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection, + IN USAGE Usage, + OUT PHIDP_VALUE_CAPS ValueCaps, + IN OUT PULONG ValueCapsLength, + IN PHIDP_PREPARSED_DATA PreparsedData) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +HIDAPI +ULONG +NTAPI +HidP_MaxUsageListLength( + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage OPTIONAL, + IN PHIDP_PREPARSED_DATA PreparsedData) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +HIDAPI +NTSTATUS +NTAPI +HidP_GetUsages( + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection OPTIONAL, + OUT USAGE *UsageList, + IN OUT ULONG *UsageLength, + IN PHIDP_PREPARSED_DATA PreparsedData, + IN PCHAR Report, + IN ULONG ReportLength) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +HidP_SysPowerEvent ( + IN PCHAR HidPacket, + IN USHORT HidPacketLength, + IN PHIDP_PREPARSED_DATA Ppd, + OUT PULONG OutputBuffer) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +HidP_SysPowerCaps ( + IN PHIDP_PREPARSED_DATA Ppd, + OUT PULONG OutputBuffer) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +HIDAPI +NTSTATUS +NTAPI +HidP_GetUsageValueArray( + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection OPTIONAL, + IN USAGE Usage, + OUT PCHAR UsageValue, + IN USHORT UsageValueByteLength, + IN PHIDP_PREPARSED_DATA PreparsedData, + IN PCHAR Report, + IN ULONG ReportLength) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +HIDAPI +NTSTATUS +NTAPI +HidP_GetUsagesEx( + IN HIDP_REPORT_TYPE ReportType, + IN USHORT LinkCollection, + OUT PUSAGE_AND_PAGE ButtonList, + IN OUT ULONG *UsageLength, + IN PHIDP_PREPARSED_DATA PreparsedData, + IN PCHAR Report, + IN ULONG ReportLength) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + + +HIDAPI +NTSTATUS +NTAPI +HidP_UsageAndPageListDifference( + IN PUSAGE_AND_PAGE PreviousUsageList, + IN PUSAGE_AND_PAGE CurrentUsageList, + OUT PUSAGE_AND_PAGE BreakUsageList, + OUT PUSAGE_AND_PAGE MakeUsageList, + IN ULONG UsageListLength) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +HIDAPI +NTSTATUS +NTAPI +HidP_UnsetUsages( + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection, + IN PUSAGE UsageList, + IN OUT PULONG UsageLength, + IN PHIDP_PREPARSED_DATA PreparsedData, + IN OUT PCHAR Report, + IN ULONG ReportLength) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +HIDAPI +NTSTATUS +NTAPI +HidP_TranslateUsagesToI8042ScanCodes( + IN PUSAGE ChangedUsageList, + IN ULONG UsageListLength, + IN HIDP_KEYBOARD_DIRECTION KeyAction, + IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, + IN PHIDP_INSERT_SCANCODES InsertCodesProcedure, + IN PVOID InsertCodesContext) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +HIDAPI +NTSTATUS +NTAPI +HidP_TranslateUsageAndPagesToI8042ScanCodes( + IN PUSAGE_AND_PAGE ChangedUsageList, + IN ULONG UsageListLength, + IN HIDP_KEYBOARD_DIRECTION KeyAction, + IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, + IN PHIDP_INSERT_SCANCODES InsertCodesProcedure, + IN PVOID InsertCodesContext) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +HIDAPI +NTSTATUS +NTAPI +HidP_SetUsages( + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection, + IN PUSAGE UsageList, + IN OUT PULONG UsageLength, + IN PHIDP_PREPARSED_DATA PreparsedData, + IN OUT PCHAR Report, + IN ULONG ReportLength) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +HIDAPI +NTSTATUS +NTAPI +HidP_SetUsageValueArray( + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection OPTIONAL, + IN USAGE Usage, + IN PCHAR UsageValue, + IN USHORT UsageValueByteLength, + IN PHIDP_PREPARSED_DATA PreparsedData, + OUT PCHAR Report, + IN ULONG ReportLength) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +HIDAPI +NTSTATUS +NTAPI +HidP_SetUsageValue( + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection, + IN USAGE Usage, + IN ULONG UsageValue, + IN PHIDP_PREPARSED_DATA PreparsedData, + IN OUT PCHAR Report, + IN ULONG ReportLength) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +HIDAPI +NTSTATUS +NTAPI +HidP_SetScaledUsageValue( + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection OPTIONAL, + IN USAGE Usage, + IN LONG UsageValue, + IN PHIDP_PREPARSED_DATA PreparsedData, + IN OUT PCHAR Report, + IN ULONG ReportLength) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +HIDAPI +NTSTATUS +NTAPI +HidP_SetData( + IN HIDP_REPORT_TYPE ReportType, + IN PHIDP_DATA DataList, + IN OUT PULONG DataLength, + IN PHIDP_PREPARSED_DATA PreparsedData, + IN OUT PCHAR Report, + IN ULONG ReportLength) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +HIDAPI +ULONG +NTAPI +HidP_MaxDataListLength( + IN HIDP_REPORT_TYPE ReportType, + IN PHIDP_PREPARSED_DATA PreparsedData) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +HIDAPI +NTSTATUS +NTAPI +HidP_InitializeReportForID( + IN HIDP_REPORT_TYPE ReportType, + IN UCHAR ReportID, + IN PHIDP_PREPARSED_DATA PreparsedData, + IN OUT PCHAR Report, + IN ULONG ReportLength) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +HIDAPI +NTSTATUS +NTAPI +HidP_GetValueCaps( + HIDP_REPORT_TYPE ReportType, + PHIDP_VALUE_CAPS ValueCaps, + PULONG ValueCapsLength, + PHIDP_PREPARSED_DATA PreparsedData) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegPath) +{ + + DPRINT1("********* HID PARSE *********\n"); + return STATUS_SUCCESS; +} Propchange: branches/usb-bringup/drivers/usb/hidparse/hidparse.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/hidparse/hidparse.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidpars… ============================================================================== --- branches/usb-bringup/drivers/usb/hidparse/hidparse.h (added) +++ branches/usb-bringup/drivers/usb/hidparse/hidparse.h [iso-8859-1] Thu Jun 2 19:13:51 2011 @@ -1,0 +1,8 @@ +#pragma once + +#define _HIDPI_ +#define _HIDPI_NO_FUNCTION_MACROS_ +#include <ntddk.h> +#include <hidpddi.h> +#include <hidpi.h> +#include <debug.h> Propchange: branches/usb-bringup/drivers/usb/hidparse/hidparse.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/hidparse/hidparse.rc URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidpars… ============================================================================== --- branches/usb-bringup/drivers/usb/hidparse/hidparse.rc (added) +++ branches/usb-bringup/drivers/usb/hidparse/hidparse.rc [iso-8859-1] Thu Jun 2 19:13:51 2011 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "USB HID Parser\0" +#define REACTOS_STR_INTERNAL_NAME "hidparse\0" +#define REACTOS_STR_ORIGINAL_FILENAME "hidparse.sys\0" +#include <reactos/version.rc> Propchange: branches/usb-bringup/drivers/usb/hidparse/hidparse.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/hidparse/hidparse.spec URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidpars… ============================================================================== --- branches/usb-bringup/drivers/usb/hidparse/hidparse.spec (added) +++ branches/usb-bringup/drivers/usb/hidparse/hidparse.spec [iso-8859-1] Thu Jun 2 19:13:51 2011 @@ -1,0 +1,53 @@ +@ stdcall HidP_FreeCollectionDescription(ptr) +@ stdcall HidP_GetButtonCaps(long ptr ptr ptr) +@ stdcall HidP_GetCaps(ptr ptr) +@ stdcall HidP_GetCollectionDescription(ptr long long ptr) +@ stdcall HidP_GetData(long ptr ptr ptr ptr long) +@ stdcall HidP_GetExtendedAttributes(long long ptr ptr long) +@ stdcall HidP_GetLinkCollectionNodes(ptr ptr ptr) +@ stdcall HidP_GetScaledUsageValue(long long long long ptr ptr ptr long) +@ stdcall HidP_GetSpecificButtonCaps(long long long long ptr ptr ptr) +@ stdcall HidP_GetSpecificValueCaps(long long long long ptr ptr ptr) +@ stdcall HidP_GetUsageValue(long long long long ptr ptr ptr long) +@ stdcall HidP_GetUsageValueArray(long long long long ptr long ptr ptr long) +@ stdcall HidP_GetUsages(long long ptr ptr ptr ptr long) +@ stdcall HidP_GetUsagesEx(long long ptr ptr ptr ptr long) +@ stdcall HidP_GetValueCaps(long ptr ptr ptr) +@ stdcall HidP_InitializeReportForID(long long ptr ptr long) +@ stdcall HidP_MaxDataListLength(long ptr) +@ stdcall HidP_MaxUsageListLength(long long ptr) +@ stdcall HidP_SetData(long ptr ptr ptr ptr long) +@ stdcall HidP_SetScaledUsageValue(long long long long long ptr ptr long) +@ stdcall HidP_SetUsageValue(long long long long long ptr ptr long) +@ stdcall HidP_SetUsageValueArray(long long long long ptr long long ptr long) +@ stdcall HidP_SetUsages(long long long ptr ptr ptr ptr long) +@ stdcall HidP_SysPowerCaps(ptr ptr) +@ stdcall HidP_SysPowerEvent(ptr long ptr ptr) +@ stdcall HidP_TranslateUsageAndPagesToI8042ScanCodes(ptr long long ptr ptr ptr) +@ stdcall HidP_TranslateUsagesToI8042ScanCodes(ptr long long ptr ptr ptr) +@ stdcall HidP_UnsetUsages(long long long ptr ptr ptr ptr long) +@ stdcall HidP_UsageAndPageListDifference(ptr ptr ptr ptr long) +@ stdcall HidP_UsageListDifference(ptr ptr ptr ptr long) + + + + + + + + + + + + + + + + + + + + + + + Propchange: branches/usb-bringup/drivers/usb/hidparse/hidparse.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/include/ddk/hidpddi.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/include/ddk/hidpddi… ============================================================================== --- branches/usb-bringup/include/ddk/hidpddi.h (added) +++ branches/usb-bringup/include/ddk/hidpddi.h [iso-8859-1] Thu Jun 2 19:13:51 2011 @@ -1,0 +1,97 @@ +#ifndef _HIDPDDI_H +#define _HIDPDDI_H + +#include "hidusage.h" +#include "hidpi.h" + +typedef struct _HIDP_COLLECTION_DESC +{ + USAGE UsagePage; + USAGE Usage; + UCHAR CollectionNumber; + UCHAR Reserved [15]; + USHORT InputLength; + USHORT OutputLength; + USHORT FeatureLength; + USHORT PreparsedDataLength; + PHIDP_PREPARSED_DATA PreparsedData; +}HIDP_COLLECTION_DESC, *PHIDP_COLLECTION_DESC; + +typedef struct _HIDP_REPORT_IDS +{ + UCHAR ReportID; + UCHAR CollectionNumber; + USHORT InputLength; + USHORT OutputLength; + USHORT FeatureLength; +}HIDP_REPORT_IDS, *PHIDP_REPORT_IDS; + +typedef struct _HIDP_GETCOLDESC_DBG +{ + ULONG BreakOffset; + ULONG ErrorCode; + ULONG Args[6]; +}HIDP_GETCOLDESC_DBG, *PHIDP_GETCOLDESC_DBG; + +typedef struct _HIDP_DEVICE_DESC +{ + PHIDP_COLLECTION_DESC CollectionDesc; + ULONG CollectionDescLength; + PHIDP_REPORT_IDS ReportIDs; + ULONG ReportIDsLength; + HIDP_GETCOLDESC_DBG Dbg; +}HIDP_DEVICE_DESC, *PHIDP_DEVICE_DESC; + +NTSTATUS +HidP_GetCollectionDescription( + IN PHIDP_REPORT_DESCRIPTOR ReportDesc, + IN ULONG DescLength, + IN POOL_TYPE PoolType, + OUT PHIDP_DEVICE_DESC DeviceDescription +); + +VOID +HidP_FreeCollectionDescription ( + IN PHIDP_DEVICE_DESC DeviceDescription +); + +NTSTATUS +HidP_SysPowerEvent ( + IN PCHAR HidPacket, + IN USHORT HidPacketLength, + IN PHIDP_PREPARSED_DATA Ppd, + OUT PULONG OutputBuffer +); + +NTSTATUS +HidP_SysPowerCaps ( + IN PHIDP_PREPARSED_DATA Ppd, + OUT PULONG OutputBuffer +); + +#define HIDP_GETCOLDESC_SUCCESS 0x00 +#define HIDP_GETCOLDESC_RESOURCES 0x01 +#define HIDP_GETCOLDESC_BUFFER 0x02 +#define HIDP_GETCOLDESC_LINK_RESOURCES 0x03 +#define HIDP_GETCOLDESC_UNEXP_END_COL 0x04 +#define HIDP_GETCOLDESC_PREPARSE_RESOURCES 0x05 +#define HIDP_GETCOLDESC_ONE_BYTE 0x06 +#define HIDP_GETCOLDESC_TWO_BYTE 0x07 +#define HIDP_GETCOLDESC_FOUR_BYTE 0x08 +#define HIDP_GETCOLDESC_BYTE_ALLIGN 0x09 +#define HIDP_GETCOLDESC_MAIN_ITEM_NO_USAGE 0x0A +#define HIDP_GETCOLDESC_TOP_COLLECTION_USAGE 0x0B +#define HIDP_GETCOLDESC_PUSH_RESOURCES 0x10 +#define HIDP_GETCOLDESC_ITEM_UNKNOWN 0x12 +#define HIDP_GETCOLDESC_REPORT_ID 0x13 +#define HIDP_GETCOLDESC_BAD_REPORT_ID 0x14 +#define HIDP_GETCOLDESC_NO_REPORT_ID 0x15 +#define HIDP_GETCOLDESC_DEFAULT_ID_ERROR 0x16 +#define HIDP_GETCOLDESC_NO_DATA 0x1A +#define HIDP_GETCOLDESC_INVALID_MAIN_ITEM 0x1B +#define HIDP_GETCOLDESC_NO_CLOSE_DELIMITER 0x20 +#define HIDP_GETCOLDESC_NOT_VALID_DELIMITER 0x21 +#define HIDP_GETCOLDESC_MISMATCH_OC_DELIMITER 0x22 +#define HIDP_GETCOLDESC_UNSUPPORTED 0x40 + +#endif Propchange: branches/usb-bringup/include/ddk/hidpddi.h ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 6 months

[cgutman] 52066: [NTOSKRNL] - Fix a bug in device removal which resulted in an IRP_MN_CANCEL_REMOVE_DEVICE request not being sent if the initial IRP_MN_QUERY_REMOVE_DEVICE failed

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Jun 2 18:23:30 2011 New Revision: 52066 URL: http://svn.reactos.org/svn/reactos?rev=52066&view=rev Log: [NTOSKRNL] - Fix a bug in device removal which resulted in an IRP_MN_CANCEL_REMOVE_DEVICE request not being sent if the initial IRP_MN_QUERY_REMOVE_DEVICE failed 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] Thu Jun 2 18:23:30 2011 @@ -4153,6 +4153,8 @@ { DPRINT1("Removal vetoed by failing the query remove request\n"); + IopCancelRemoveDevice(DeviceObject); + return STATUS_UNSUCCESSFUL; }

13 years, 6 months

[pschweitzer] 52065: [NTOSKRNL] - renamed Io volumes global to match Windows names (in case of debug) - renamed IopDereferenceVpb() to IopDereferenceVpbAndFree(), IopReferenceVpbForVerify() to IopR...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Jun 2 17:43:44 2011 New Revision: 52065 URL: http://svn.reactos.org/svn/reactos?rev=52065&view=rev Log: [NTOSKRNL] - renamed Io volumes global to match Windows names (in case of debug) - renamed IopDereferenceVpb() to IopDereferenceVpbAndFree(), IopReferenceVpbForVerify() to IopReferenceVerifyVpb(), IopInitializeVpbForMount() to IopMountInitializeVpb(), IopLoadFileSystem() to IopLoadFileSystemDriver() - implemented IopDecrementDeviceObjectHandleCount(), IopInterlockedIncrementUlong(), IopInterlockedDecrementUlong(), IopNotifyAlreadyRegisteredFileSystems() and IoEnumerateRegisteredFiltersList() - halfplemented IopDecrementDeviceObjectRef() - implemented check for already registrered notification in IoRegisterFsRegistrationChange() - implemented sending notifications for already registered drivers to registrant in IoRegisterFsRegistrationChange() - implemented VPB freeing in IopDereferenceVpbAndFree() - acquire Io volumes lists once and forever for system shutdown, instead of keeping acquiring and releasing - reference device object in IopShutdownBaseFileSystems() before sending it the shutdown IRP. To ensure to keep it valid till the end - added a FS driver registration operations counter - use this counter to handle failed mounts - fixed: release locks before calling driver for mounting and reacquire them after - fixed check for boot partition failure (and associated bugcheck): check we are in boot phase 0 or 1 - simplified lock process by using only one lock (ie removed mutex). Also use only critical region where needed - fixed: ensure that locks are properly released when quitting a function - fixed wrong return in IopCreateVpb() - minor fixes around Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/io/iomgr/volume.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Thu Jun 2 17:43:44 2011 @@ -838,7 +838,7 @@ VOID NTAPI -IopDereferenceVpb( +IopDereferenceVpbAndFree( IN PVPB Vpb ); @@ -869,8 +869,15 @@ NTSTATUS NTAPI -IoGetRelatedTargetDevice(IN PFILE_OBJECT FileObject, - OUT PDEVICE_OBJECT *DeviceObject +IoGetRelatedTargetDevice( + IN PFILE_OBJECT FileObject, + OUT PDEVICE_OBJECT *DeviceObject +); + +VOID +NTAPI +IopUnloadDevice( + IN PDEVICE_OBJECT DeviceObject ); // Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Thu Jun 2 17:43:44 2011 @@ -19,9 +19,10 @@ ULONG IopDeviceObjectNumber = 0; LIST_ENTRY ShutdownListHead, LastChanceShutdownListHead; KSPIN_LOCK ShutdownListLock; -extern LIST_ENTRY IopDiskFsListHead; -extern LIST_ENTRY IopCdRomFsListHead; -extern LIST_ENTRY IopTapeFsListHead; +extern LIST_ENTRY IopDiskFileSystemQueueHead; +extern LIST_ENTRY IopCdRomFileSystemQueueHead; +extern LIST_ENTRY IopTapeFileSystemQueueHead; +extern ERESOURCE IopDatabaseResource; /* PRIVATE FUNCTIONS **********************************************************/ @@ -187,14 +188,17 @@ } else if (Phase == 1) { + /* Acquire resource forever */ + ExAcquireResourceExclusiveLite(&IopDatabaseResource, TRUE); + /* Shutdown disk file systems */ - IopShutdownBaseFileSystems(&IopDiskFsListHead); + IopShutdownBaseFileSystems(&IopDiskFileSystemQueueHead); /* Shutdown cdrom file systems */ - IopShutdownBaseFileSystems(&IopCdRomFsListHead); + IopShutdownBaseFileSystems(&IopCdRomFileSystemQueueHead); /* Shutdown tape filesystems */ - IopShutdownBaseFileSystems(&IopTapeFsListHead); + IopShutdownBaseFileSystems(&IopTapeFileSystemQueueHead); /* Loop last-chance shutdown notifications */ ListEntry = ExInterlockedRemoveHeadList(&LastChanceShutdownListHead, Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Thu Jun 2 17:43:44 2011 @@ -479,7 +479,7 @@ { /* Dereference the device and VPB, then fail */ IopDereferenceDeviceObject(OriginalDeviceObject, FALSE); - if (Vpb) IopDereferenceVpb(Vpb); + if (Vpb) IopDereferenceVpbAndFree(Vpb); return STATUS_INSUFFICIENT_RESOURCES; } @@ -577,7 +577,7 @@ /* Dereference the device and VPB */ IopDereferenceDeviceObject(OriginalDeviceObject, FALSE); - if (Vpb) IopDereferenceVpb(Vpb); + if (Vpb) IopDereferenceVpbAndFree(Vpb); /* We failed, return status */ OpenPacket->FinalStatus = Status; @@ -687,7 +687,7 @@ /* Dereference the device object and VPB */ IopDereferenceDeviceObject(OriginalDeviceObject, FALSE); - if (Vpb) IopDereferenceVpb(Vpb); + if (Vpb) IopDereferenceVpbAndFree(Vpb); /* Clear the FO and dereference it */ FileObject->DeviceObject = NULL; @@ -783,7 +783,7 @@ IopDereferenceDeviceObject(OriginalDeviceObject, FALSE); /* Unless the driver cancelled the open, dereference the VPB */ - if (!(OpenCancelled) && (Vpb)) IopDereferenceVpb(Vpb); + if (!(OpenCancelled) && (Vpb)) IopDereferenceVpbAndFree(Vpb); /* Set the status and return */ OpenPacket->FinalStatus = Status; @@ -806,7 +806,7 @@ if (OwnerDevice != DeviceObject) { /* We have to de-reference the VPB we had associated */ - if (Vpb) IopDereferenceVpb(Vpb); + if (Vpb) IopDereferenceVpbAndFree(Vpb); /* And re-associate with the actual one */ Vpb = FileObject->Vpb; 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Thu Jun 2 17:43:44 2011 @@ -52,19 +52,17 @@ extern LIST_ENTRY LastChanceShutdownListHead; extern KSPIN_LOCK ShutdownListLock; extern POBJECT_TYPE IoAdapterObjectType; -ERESOURCE IopDatabaseResource; -extern ERESOURCE FileSystemListLock; +extern ERESOURCE IopDatabaseResource; ERESOURCE IopSecurityResource; -extern KGUARDED_MUTEX FsChangeNotifyListLock; extern KGUARDED_MUTEX PnpNotifyListLock; -extern LIST_ENTRY IopDiskFsListHead; -extern LIST_ENTRY IopCdRomFsListHead; -extern LIST_ENTRY IopTapeFsListHead; -extern LIST_ENTRY IopNetworkFsListHead; +extern LIST_ENTRY IopDiskFileSystemQueueHead; +extern LIST_ENTRY IopCdRomFileSystemQueueHead; +extern LIST_ENTRY IopTapeFileSystemQueueHead; +extern LIST_ENTRY IopNetworkFileSystemQueueHead; extern LIST_ENTRY DriverBootReinitListHead; extern LIST_ENTRY DriverReinitListHead; extern LIST_ENTRY PnpNotifyListHead; -extern LIST_ENTRY FsChangeNotifyListHead; +extern LIST_ENTRY IopFsNotifyChangeQueueHead; extern LIST_ENTRY IopErrorLogListHead; extern LIST_ENTRY IopTimerQueueHead; extern KDPC IopTimerDpc; @@ -450,20 +448,18 @@ /* Initialize all locks and lists */ ExInitializeResource(&IopDatabaseResource); - ExInitializeResource(&FileSystemListLock); ExInitializeResource(&IopSecurityResource); - KeInitializeGuardedMutex(&FsChangeNotifyListLock); KeInitializeGuardedMutex(&PnpNotifyListLock); - InitializeListHead(&IopDiskFsListHead); - InitializeListHead(&IopCdRomFsListHead); - InitializeListHead(&IopTapeFsListHead); - InitializeListHead(&IopNetworkFsListHead); + InitializeListHead(&IopDiskFileSystemQueueHead); + InitializeListHead(&IopCdRomFileSystemQueueHead); + InitializeListHead(&IopTapeFileSystemQueueHead); + InitializeListHead(&IopNetworkFileSystemQueueHead); InitializeListHead(&DriverBootReinitListHead); InitializeListHead(&DriverReinitListHead); InitializeListHead(&PnpNotifyListHead); InitializeListHead(&ShutdownListHead); InitializeListHead(&LastChanceShutdownListHead); - InitializeListHead(&FsChangeNotifyListHead); + InitializeListHead(&IopFsNotifyChangeQueueHead); InitializeListHead(&IopErrorLogListHead); KeInitializeSpinLock(&IoStatisticsLock); KeInitializeSpinLock(&DriverReinitListLock); Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] Thu Jun 2 17:43:44 2011 @@ -6,6 +6,7 @@ * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Hervé Poussineau (hpoussin(a)reactos.org) * Eric Kohl + * Pierre Schweitzer (pierre.schweitzer(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -21,14 +22,60 @@ /* GLOBALS ******************************************************************/ -ERESOURCE FileSystemListLock; -LIST_ENTRY IopDiskFsListHead, IopNetworkFsListHead; -LIST_ENTRY IopCdRomFsListHead, IopTapeFsListHead; -KGUARDED_MUTEX FsChangeNotifyListLock; -LIST_ENTRY FsChangeNotifyListHead; +ERESOURCE IopDatabaseResource; +LIST_ENTRY IopDiskFileSystemQueueHead, IopNetworkFileSystemQueueHead; +LIST_ENTRY IopCdRomFileSystemQueueHead, IopTapeFileSystemQueueHead; +LIST_ENTRY IopFsNotifyChangeQueueHead; +ULONG IopFsRegistrationOps; /* PRIVATE FUNCTIONS *********************************************************/ +/* + * @halfplemented + */ +VOID +NTAPI +IopDecrementDeviceObjectRef(IN PDEVICE_OBJECT DeviceObject, + IN BOOLEAN UnloadIfUnused) +{ + KIRQL OldIrql; + + /* Acquire lock */ + OldIrql = KeAcquireQueuedSpinLock(LockQueueIoDatabaseLock); + ASSERT(DeviceObject->ReferenceCount > 0); + + if (--DeviceObject->ReferenceCount > 0) + { + KeReleaseQueuedSpinLock(LockQueueIoDatabaseLock, OldIrql); + return; + } + + /* Here, DO is not referenced any longer, check if we have to unload it */ + if (UnloadIfUnused || IoGetDevObjExtension(DeviceObject)->ExtensionFlags & + (DOE_UNLOAD_PENDING | DOE_DELETE_PENDING | DOE_REMOVE_PENDING)) + { + /* Unload the driver */ + IopUnloadDevice(DeviceObject); + } + + /* Release lock */ + KeReleaseQueuedSpinLock(LockQueueIoDatabaseLock, OldIrql); +} + +/* + * @implemented + */ +VOID +NTAPI +IopDecrementDeviceObjectHandleCount(IN PDEVICE_OBJECT DeviceObject) +{ + /* Just decrease reference count */ + IopDecrementDeviceObjectRef(DeviceObject, FALSE); +} + +/* + * @implemented + */ PVPB NTAPI IopCheckVpbMounted(IN POPEN_PACKET OpenPacket, @@ -100,6 +147,9 @@ return Vpb; } +/* + * @implemented + */ NTSTATUS NTAPI IopCreateVpb(IN PDEVICE_OBJECT DeviceObject) @@ -110,7 +160,7 @@ Vpb = ExAllocatePoolWithTag(NonPagedPool, sizeof(VPB), TAG_VPB); - if (!Vpb) return STATUS_UNSUCCESSFUL; + if (!Vpb) return STATUS_INSUFFICIENT_RESOURCES; /* Clear it so we don't waste time manually */ RtlZeroMemory(Vpb, sizeof(VPB)); @@ -125,9 +175,12 @@ return STATUS_SUCCESS; } +/* + * @implemented + */ VOID NTAPI -IopDereferenceVpb(IN PVPB Vpb) +IopDereferenceVpbAndFree(IN PVPB Vpb) { KIRQL OldIrql; @@ -136,21 +189,30 @@ Vpb->ReferenceCount--; /* Check if we're out of references */ - if (!Vpb->ReferenceCount) - { - /* FIXME: IMPLEMENT CLEANUP! */ - ASSERT(FALSE); - } - - /* Release VPB lock */ - IoReleaseVpbSpinLock(OldIrql); -} - + if (!Vpb->ReferenceCount && Vpb->RealDevice->Vpb == Vpb && + !(Vpb->Flags & VPB_PERSISTENT)) + { + /* Release VPB lock */ + IoReleaseVpbSpinLock(OldIrql); + + /* And free VPB */ + ExFreePoolWithTag(Vpb, TAG_VPB); + } + else + { + /* Release VPB lock */ + IoReleaseVpbSpinLock(OldIrql); + } +} + +/* + * @implemented + */ BOOLEAN NTAPI -IopReferenceVpbForVerify(IN PDEVICE_OBJECT DeviceObject, - OUT PDEVICE_OBJECT *FileSystemObject, - OUT PVPB *Vpb) +IopReferenceVerifyVpb(IN PDEVICE_OBJECT DeviceObject, + OUT PDEVICE_OBJECT *FileSystemObject, + OUT PVPB *Vpb) { KIRQL OldIrql; PVPB LocalVpb; @@ -181,9 +243,9 @@ PVPB NTAPI -IopInitializeVpbForMount(IN PDEVICE_OBJECT DeviceObject, - IN PDEVICE_OBJECT AttachedDeviceObject, - IN BOOLEAN Raw) +IopMountInitializeVpb(IN PDEVICE_OBJECT DeviceObject, + IN PDEVICE_OBJECT AttachedDeviceObject, + IN BOOLEAN Raw) { KIRQL OldIrql; PVPB Vpb; @@ -212,20 +274,20 @@ return Vpb; } +/* + * @implemented + */ VOID -NTAPI +FORCEINLINE IopNotifyFileSystemChange(IN PDEVICE_OBJECT DeviceObject, IN BOOLEAN DriverActive) { PFS_CHANGE_NOTIFY_ENTRY ChangeEntry; PLIST_ENTRY ListEntry; - /* Acquire the notification lock */ - KeAcquireGuardedMutex(&FsChangeNotifyListLock); - /* Loop the list */ - ListEntry = FsChangeNotifyListHead.Flink; - while (ListEntry != &FsChangeNotifyListHead) + ListEntry = IopFsNotifyChangeQueueHead.Flink; + while (ListEntry != &IopFsNotifyChangeQueueHead) { /* Get the entry */ ChangeEntry = CONTAINING_RECORD(ListEntry, @@ -238,11 +300,47 @@ /* Go to the next entry */ ListEntry = ListEntry->Flink; } - - /* Release the lock */ - KeReleaseGuardedMutex(&FsChangeNotifyListLock); -} - +} + +/* + * @implemented + */ +ULONG +FASTCALL +IopInterlockedIncrementUlong(IN KSPIN_LOCK_QUEUE_NUMBER Queue, + IN PULONG Ulong) +{ + KIRQL Irql; + ULONG OldValue; + + Irql = KeAcquireQueuedSpinLock(Queue); + OldValue = (*Ulong)++; + KeReleaseQueuedSpinLock(Queue, Irql); + + return OldValue; +} + +/* + * @implemented + */ +ULONG +FASTCALL +IopInterlockedDecrementUlong(IN KSPIN_LOCK_QUEUE_NUMBER Queue, + IN PULONG Ulong) +{ + KIRQL Irql; + ULONG OldValue; + + Irql = KeAcquireQueuedSpinLock(Queue); + OldValue = (*Ulong)--; + KeReleaseQueuedSpinLock(Queue, Irql); + + return OldValue; +} + +/* + * @implemented + */ VOID NTAPI IopShutdownBaseFileSystems(IN PLIST_ENTRY ListHead) @@ -254,9 +352,6 @@ KEVENT Event; NTSTATUS Status; - /* Lock the FS List and initialize an event to wait on */ - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); KeInitializeEvent(&Event, NotificationEvent, FALSE); /* Get the first entry and start looping */ @@ -267,6 +362,9 @@ DeviceObject = CONTAINING_RECORD(ListEntry, DEVICE_OBJECT, Queue.ListEntry); + + ObReferenceObject(DeviceObject); + IopInterlockedIncrementUlong(LockQueueIoDatabaseLock, (PULONG)&DeviceObject->ReferenceCount); /* Check if we're attached */ if (DeviceObject->AttachedDevice) @@ -293,18 +391,20 @@ /* Reset the event */ KeClearEvent(&Event); + IopDecrementDeviceObjectRef(DeviceObject, FALSE); + ObDereferenceObject(DeviceObject); + /* Go to the next entry */ ListEntry = ListEntry->Flink; } - - /* Release the lock */ - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); -} - +} + +/* + * @implemented + */ VOID NTAPI -IopLoadFileSystem(IN PDEVICE_OBJECT DeviceObject) +IopLoadFileSystemDriver(IN PDEVICE_OBJECT DeviceObject) { IO_STATUS_BLOCK IoStatusBlock; PIO_STACK_LOCATION StackPtr; @@ -347,8 +447,14 @@ KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); } } -} - + + /* Dereference DO - FsRec? */ + IopDecrementDeviceObjectRef(AttachedDeviceObject, TRUE); +} + +/* + * @implemented + */ NTSTATUS NTAPI IopMountVolume(IN PDEVICE_OBJECT DeviceObject, @@ -366,7 +472,7 @@ LIST_ENTRY LocalList; PDEVICE_OBJECT AttachedDeviceObject = DeviceObject; PDEVICE_OBJECT FileSystemDeviceObject, ParentFsDeviceObject; - ULONG FsStackOverhead; + ULONG FsStackOverhead, RegistrationOps; PAGED_CODE(); /* Check if the device isn't already locked */ @@ -387,7 +493,7 @@ /* Acquire the FS Lock*/ KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&FileSystemListLock, TRUE); + ExAcquireResourceSharedLite(&IopDatabaseResource, TRUE); /* Make sure we weren't already mounted */ if (!(DeviceObject->Vpb->Flags & (VPB_MOUNTED | VPB_REMOVE_PENDING))) @@ -411,17 +517,17 @@ (DeviceObject->DeviceType == FILE_DEVICE_VIRTUAL_DISK)) { /* Use the disk list */ - FsList = &IopDiskFsListHead; + FsList = &IopDiskFileSystemQueueHead; } else if (DeviceObject->DeviceType == FILE_DEVICE_CD_ROM) { /* Use the CD-ROM list */ - FsList = &IopCdRomFsListHead; + FsList = &IopCdRomFileSystemQueueHead; } else { /* It's gotta be a tape... */ - FsList = &IopTapeFsListHead; + FsList = &IopTapeFileSystemQueueHead; } /* Now loop the fs list until one of the file systems accepts us */ @@ -502,6 +608,13 @@ StackPtr->Parameters.MountVolume.DeviceObject = AttachedDeviceObject; + /* Save registration operations */ + RegistrationOps = IopFsRegistrationOps; + + /* Release locks */ + IopInterlockedIncrementUlong(LockQueueIoDatabaseLock, (PULONG)&DeviceObject->ReferenceCount); + ExReleaseResourceLite(&IopDatabaseResource); + /* Call the driver */ Status = IoCallDriver(FileSystemDeviceObject, Irp); if (Status == STATUS_PENDING) @@ -515,14 +628,17 @@ Status = IoStatusBlock.Status; } + ExAcquireResourceSharedLite(&IopDatabaseResource, TRUE); + IopInterlockedDecrementUlong(LockQueueIoDatabaseLock, (PULONG)&DeviceObject->ReferenceCount); + /* Check if mounting was successful */ if (NT_SUCCESS(Status)) { /* Mount the VPB */ - *Vpb = IopInitializeVpbForMount(DeviceObject, - AttachedDeviceObject, - (DeviceObject->Vpb->Flags & - VPB_RAW_MOUNT)); + *Vpb = IopMountInitializeVpb(DeviceObject, + AttachedDeviceObject, + (DeviceObject->Vpb->Flags & + VPB_RAW_MOUNT)); } else { @@ -534,11 +650,22 @@ break; } + /* If there were registration operations in the meanwhile */ + if (RegistrationOps != IopFsRegistrationOps) + { + /* We need to setup a local list to pickup where we left */ + LocalList.Flink = FsList->Flink; + ListEntry = &LocalList; + + Status = STATUS_UNRECOGNIZED_VOLUME; + } + /* Otherwise, check if we need to load the FS driver */ if (Status == STATUS_FS_DRIVER_REQUIRED) { /* We need to release the lock */ - ExReleaseResourceLite(&FileSystemListLock); + IopInterlockedIncrementUlong(LockQueueIoDatabaseLock, (PULONG)&DeviceObject->ReferenceCount); + ExReleaseResourceLite(&IopDatabaseResource); /* Release the device lock if we're holding it */ if (!DeviceIsLocked) @@ -546,8 +673,11 @@ KeSetEvent(&DeviceObject->DeviceLock, 0, FALSE); } + /* Leave critical section */ + KeLeaveCriticalRegion(); + /* Load the FS */ - IopLoadFileSystem(ParentFsDeviceObject); + IopLoadFileSystemDriver(ParentFsDeviceObject); /* Check if the device isn't already locked */ if (!DeviceIsLocked) @@ -569,7 +699,8 @@ } /* Reacquire the lock */ - ExAcquireResourceSharedLite(&FileSystemListLock, TRUE); + KeEnterCriticalRegion(); + ExAcquireResourceSharedLite(&IopDatabaseResource, TRUE); /* When we released the lock, make sure nobody beat us */ if (DeviceObject->Vpb->Flags & VPB_MOUNTED) @@ -620,7 +751,7 @@ } /* Release the FS lock */ - ExReleaseResourceLite(&FileSystemListLock); + ExReleaseResourceLite(&IopDatabaseResource); KeLeaveCriticalRegion(); /* Release the device lock if we're holding it */ @@ -628,7 +759,8 @@ /* Check if we failed to mount the boot partition */ if ((!NT_SUCCESS(Status)) && - (DeviceObject->Flags & DO_SYSTEM_BOOT_PARTITION)) + (DeviceObject->Flags & DO_SYSTEM_BOOT_PARTITION) && + ExpInitializationPhase < 2) { /* Bugcheck the system */ KeBugCheckEx(INACCESSIBLE_BOOT_DEVICE, @@ -642,19 +774,102 @@ return Status; } +/* + * @implemented + */ +VOID +NTAPI +IopNotifyAlreadyRegisteredFileSystems(IN PLIST_ENTRY ListHead, + IN PDRIVER_FS_NOTIFICATION DriverNotificationRoutine, + BOOLEAN SkipLast) +{ + PLIST_ENTRY ListEntry; + PDEVICE_OBJECT DeviceObject; + + /* Browse the whole list */ + ListEntry = ListHead->Flink; + while (ListEntry != ListHead) + { + /* Check if we reached end and if we have to skip it */ + if (ListEntry->Flink == ListHead && SkipLast) + { + return; + } + + /* Otherwise, get DO and notify */ + DeviceObject = CONTAINING_RECORD(ListEntry, + DEVICE_OBJECT, + Queue.ListEntry); + + DriverNotificationRoutine(DeviceObject, TRUE); + + /* Go to the next entry */ + ListEntry = ListEntry->Flink; + } +} + /* PUBLIC FUNCTIONS **********************************************************/ /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI -IoEnumerateRegisteredFiltersList(IN PDRIVER_OBJECT *DriverObjectList, +IoEnumerateRegisteredFiltersList(OUT PDRIVER_OBJECT *DriverObjectList, IN ULONG DriverObjectListSize, OUT PULONG ActualNumberDriverObjects) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + USHORT Index = 0; + ULONG ListSize = 0; + PLIST_ENTRY ListEntry; + NTSTATUS Status = STATUS_SUCCESS; + PFS_CHANGE_NOTIFY_ENTRY ChangeEntry; + + /* Acquire the FS lock */ + ExAcquireResourceExclusiveLite(&IopDatabaseResource, TRUE); + + /* First of all, count number of driver objects */ + ListEntry = IopFsNotifyChangeQueueHead.Flink; + while (ListEntry != &IopFsNotifyChangeQueueHead) + { + ListSize++; + + /* Go to the next entry */ + ListEntry = ListEntry->Flink; + } + + /* Return this size */ + *ActualNumberDriverObjects = ListSize; + + /* Then, check if given buffer is big enough to contain list */ + if (ListSize > DriverObjectListSize / sizeof(PDRIVER_OBJECT)) + { + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + /* Rebrowse the whole list */ + ListEntry = IopFsNotifyChangeQueueHead.Flink; + while (ListEntry != &IopFsNotifyChangeQueueHead) + { + ChangeEntry = CONTAINING_RECORD(ListEntry, + FS_CHANGE_NOTIFY_ENTRY, + FsChangeNotifyList); + + /* Reference the driver object */ + ObReferenceObject(ChangeEntry->DriverObject); + /* And pass it to the caller */ + DriverObjectList[Index++] = ChangeEntry->DriverObject; + + /* Go to the next entry */ + ListEntry = ListEntry->Flink; + } + } + + /* Release the FS lock */ + ExReleaseResourceLite(&IopDatabaseResource); + + return Status; } /* @@ -669,20 +884,21 @@ PIO_STACK_LOCATION StackPtr; KEVENT Event; PIRP Irp; - NTSTATUS Status = STATUS_SUCCESS, VpbStatus; + NTSTATUS Status, VpbStatus; PDEVICE_OBJECT FileSystemDeviceObject; PVPB Vpb, NewVpb; BOOLEAN WasNotMounted = TRUE; /* Wait on the device lock */ - KeWaitForSingleObject(&DeviceObject->DeviceLock, - Executive, - KernelMode, - FALSE, - NULL); + Status = KeWaitForSingleObject(&DeviceObject->DeviceLock, + Executive, + KernelMode, + FALSE, + NULL); + ASSERT(Status == STATUS_SUCCESS); /* Reference the VPB */ - if (IopReferenceVpbForVerify(DeviceObject, &FileSystemDeviceObject, &Vpb)) + if (IopReferenceVerifyVpb(DeviceObject, &FileSystemDeviceObject, &Vpb)) { /* Initialize the event */ KeInitializeEvent(&Event, NotificationEvent, FALSE); @@ -698,7 +914,11 @@ /* Allocate the IRP */ Irp = IoAllocateIrp(FileSystemDeviceObject->StackSize, FALSE); - if (!Irp) return STATUS_INSUFFICIENT_RESOURCES; + if (!Irp) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Release; + } /* Set it up */ Irp->UserIosb = &IoStatusBlock; @@ -726,28 +946,37 @@ } /* Dereference the VPB */ - IopDereferenceVpb(Vpb); + IopDereferenceVpbAndFree(Vpb); } /* Check if we had the wrong volume or didn't mount at all */ - if ((Status == STATUS_WRONG_VOLUME) || (WasNotMounted)) + if (Status == STATUS_WRONG_VOLUME) { /* Create a VPB */ VpbStatus = IopCreateVpb(DeviceObject); if (NT_SUCCESS(VpbStatus)) { + PoVolumeDevice(DeviceObject); + /* Mount it */ VpbStatus = IopMountVolume(DeviceObject, AllowRawMount, TRUE, FALSE, &NewVpb); + + /* If we got a new VPB, dereference it */ + if (NewVpb) + { + IopInterlockedDecrementUlong(LockQueueIoVpbLock, &NewVpb->ReferenceCount); + } } /* If we failed, remove the verify flag */ if (!NT_SUCCESS(VpbStatus)) DeviceObject->Flags &= ~DO_VERIFY_VOLUME; } +Release: /* Signal the device lock and return */ KeSetEvent(&DeviceObject->DeviceLock, IO_NO_INCREMENT, FALSE); return Status; @@ -764,29 +993,28 @@ PAGED_CODE(); /* Acquire the FS lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&FileSystemListLock, TRUE); + ExAcquireResourceExclusiveLite(&IopDatabaseResource, TRUE); /* Check what kind of FS this is */ if (DeviceObject->DeviceType == FILE_DEVICE_DISK_FILE_SYSTEM) { /* Use the disk list */ - FsList = &IopDiskFsListHead; + FsList = &IopDiskFileSystemQueueHead; } else if (DeviceObject->DeviceType == FILE_DEVICE_NETWORK_FILE_SYSTEM) { /* Use the network device list */ - FsList = &IopNetworkFsListHead; + FsList = &IopNetworkFileSystemQueueHead; } else if (DeviceObject->DeviceType == FILE_DEVICE_CD_ROM_FILE_SYSTEM) { /* Use the CD-ROM list */ - FsList = &IopCdRomFsListHead; + FsList = &IopCdRomFileSystemQueueHead; } else if (DeviceObject->DeviceType == FILE_DEVICE_TAPE_FILE_SYSTEM) { /* Use the tape list */ - FsList = &IopTapeFsListHead; + FsList = &IopTapeFileSystemQueueHead; } /* Make sure that we have a valid list */ @@ -805,15 +1033,20 @@ } } + /* Update operations counter */ + IopFsRegistrationOps++; + /* Clear the initializing flag */ DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - /* Release the FS Lock */ - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); - /* Notify file systems of the addition */ IopNotifyFileSystemChange(DeviceObject, TRUE); + + /* Release the FS Lock */ + ExReleaseResourceLite(&IopDatabaseResource); + + /* Ensure driver won't be unloaded */ + IopInterlockedIncrementUlong(LockQueueIoDatabaseLock, (PULONG)&DeviceObject->ReferenceCount); } /* @@ -826,18 +1059,25 @@ PAGED_CODE(); /* Acquire the FS lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&FileSystemListLock, TRUE); - - /* Simply remove the entry */ - RemoveEntryList(&DeviceObject->Queue.ListEntry); + ExAcquireResourceExclusiveLite(&IopDatabaseResource, TRUE); + + /* Simply remove the entry - if queued */ + if (DeviceObject->Queue.ListEntry.Flink) + { + RemoveEntryList(&DeviceObject->Queue.ListEntry); + } /* And notify all registered file systems */ IopNotifyFileSystemChange(DeviceObject, FALSE); + /* Update operations counter */ + IopFsRegistrationOps++; + /* Then release the lock */ - ExReleaseResourceLite(&FileSystemListLock); - KeLeaveCriticalRegion(); + ExReleaseResourceLite(&IopDatabaseResource); + + /* Decrease reference count to allow unload */ + IopInterlockedDecrementUlong(LockQueueIoDatabaseLock, (PULONG)&DeviceObject->ReferenceCount); } /* @@ -846,25 +1086,60 @@ NTSTATUS NTAPI IoRegisterFsRegistrationChange(IN PDRIVER_OBJECT DriverObject, - IN PDRIVER_FS_NOTIFICATION FSDNotificationProc) + IN PDRIVER_FS_NOTIFICATION DriverNotificationRoutine) { PFS_CHANGE_NOTIFY_ENTRY Entry; PAGED_CODE(); + + /* Acquire the list lock */ + ExAcquireResourceExclusiveLite(&IopDatabaseResource, TRUE); + + /* Check if that driver is already registered (successive calls) + * See MSDN note: http://msdn.microsoft.com/en-us/library/ff548499%28v=vs.85%29.aspx + */ + if (!IsListEmpty(&IopFsNotifyChangeQueueHead)) + { + Entry = CONTAINING_RECORD(IopFsNotifyChangeQueueHead.Blink, + FS_CHANGE_NOTIFY_ENTRY, + FsChangeNotifyList); + + if (Entry->DriverObject == DriverObject && + Entry->FSDNotificationProc == DriverNotificationRoutine) + { + /* Release the lock */ + ExReleaseResourceLite(&IopDatabaseResource); + + return STATUS_DEVICE_ALREADY_ATTACHED; + } + } /* Allocate a notification entry */ Entry = ExAllocatePoolWithTag(PagedPool, sizeof(FS_CHANGE_NOTIFY_ENTRY), TAG_FS_CHANGE_NOTIFY); - if (!Entry) return(STATUS_INSUFFICIENT_RESOURCES); + if (!Entry) + { + /* Release the lock */ + ExReleaseResourceLite(&IopDatabaseResource); + + return STATUS_INSUFFICIENT_RESOURCES; + } /* Save the driver object and notification routine */ Entry->DriverObject = DriverObject; - Entry->FSDNotificationProc = FSDNotificationProc; + Entry->FSDNotificationProc = DriverNotificationRoutine; /* Insert it into the notification list */ - KeAcquireGuardedMutex(&FsChangeNotifyListLock); - InsertTailList(&FsChangeNotifyListHead, &Entry->FsChangeNotifyList); - KeReleaseGuardedMutex(&FsChangeNotifyListLock); + InsertTailList(&IopFsNotifyChangeQueueHead, &Entry->FsChangeNotifyList); + + /* Start notifying all already present FS */ + IopNotifyAlreadyRegisteredFileSystems(&IopNetworkFileSystemQueueHead, DriverNotificationRoutine, FALSE); + IopNotifyAlreadyRegisteredFileSystems(&IopCdRomFileSystemQueueHead, DriverNotificationRoutine, TRUE); + IopNotifyAlreadyRegisteredFileSystems(&IopDiskFileSystemQueueHead, DriverNotificationRoutine, TRUE); + IopNotifyAlreadyRegisteredFileSystems(&IopTapeFileSystemQueueHead, DriverNotificationRoutine, TRUE); + + /* Release the lock */ + ExReleaseResourceLite(&IopDatabaseResource); /* Reference the driver */ ObReferenceObject(DriverObject); @@ -884,11 +1159,11 @@ PAGED_CODE(); /* Acquire the list lock */ - KeAcquireGuardedMutex(&FsChangeNotifyListLock); + ExAcquireResourceExclusiveLite(&IopDatabaseResource, TRUE); /* Loop the list */ - NextEntry = FsChangeNotifyListHead.Flink; - while (NextEntry != &FsChangeNotifyListHead) + NextEntry = IopFsNotifyChangeQueueHead.Flink; + while (NextEntry != &IopFsNotifyChangeQueueHead) { /* Get the entry */ ChangeEntry = CONTAINING_RECORD(NextEntry, @@ -910,7 +1185,7 @@ } /* Release the lock and dereference the driver */ - KeReleaseGuardedMutex(&FsChangeNotifyListLock); + ExReleaseResourceLite(&IopDatabaseResource); ObDereferenceObject(DriverObject); }

13 years, 6 months

[rharabien] 52064: [NTOSKRNL] - Reset KdbNumberOfRowsPrinted and KdbNumberOfColsPrinted before reading new command in kernel debugger so if previous command printed nearly full page, new command wo...

by rharabien＠svn.reactos.org

Author: rharabien Date: Thu Jun 2 15:59:57 2011 New Revision: 52064 URL: http://svn.reactos.org/svn/reactos?rev=52064&view=rev Log: [NTOSKRNL] - Reset KdbNumberOfRowsPrinted and KdbNumberOfColsPrinted before reading new command in kernel debugger so if previous command printed nearly full page, new command won't show "Press q to abort" message before processing Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Thu Jun 2 15:59:57 2011 @@ -2701,6 +2701,9 @@ /* Main loop */ do { + /* Reset the number of rows/cols printed */ + KdbNumberOfRowsPrinted = KdbNumberOfColsPrinted = 0; + /* Print the prompt */ KdbpPrint("kdb:> ");

13 years, 6 months

[janderwald] 52063: [USBSTOR] - Comment out getting usb device interface. It is currently unused and usbhub does not yet support it - Forward pnp capabilities request to lower device object - Fix c...

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Jun 2 15:35:04 2011 New Revision: 52063 URL: http://svn.reactos.org/svn/reactos?rev=52063&view=rev Log: [USBSTOR] - Comment out getting usb device interface. It is currently unused and usbhub does not yet support it - Forward pnp capabilities request to lower device object - Fix compilation by Usurp Modified: branches/usb-bringup/drivers/usb/usbstor/error.c branches/usb-bringup/drivers/usb/usbstor/fdo.c Modified: branches/usb-bringup/drivers/usb/usbstor/error.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/error.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/error.c [iso-8859-1] Thu Jun 2 15:35:04 2011 @@ -134,7 +134,7 @@ // Request = (PSCSI_REQUEST_BLOCK)Stack->Parameters.Others.Argument1; DPRINT1("Retrying\n"); - Status = USBSTOR_HandleExecuteSCSI(DeviceObject, Context->Irp, Request, Context->PDODeviceExtension); + Status = USBSTOR_HandleExecuteSCSI(DeviceObject, Context->Irp); } DPRINT1("USBSTOR_HandleTransferError returning with Status %x\n", Status); Modified: branches/usb-bringup/drivers/usb/usbstor/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/fdo.c [iso-8859-1] Thu Jun 2 15:35:04 2011 @@ -244,6 +244,7 @@ }while(Index < DeviceExtension->MaxLUN); +#if 0 // // finally get usb device interface // @@ -253,9 +254,10 @@ // // failed to device interface // - DPRINT1("USBSTOR_FdoHandleStartDevice failed to device interface %x\n", Status); - return Status; - } + DPRINT1("USBSTOR_FdoHandleStartDevice failed to get device interface %x\n", Status); + return Status; + } +#endif // // fdo is now initialized @@ -306,11 +308,10 @@ case IRP_MN_QUERY_CAPABILITIES: { // - // just forward irp to lower device + // FIXME: set custom capabilities // - //IoSkipCurrentIrpStackLocation(Irp); - Status = USBSTOR_SyncForwardIrp(DeviceExtension->LowerDeviceObject, Irp); - break; + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DeviceExtension->LowerDeviceObject, Irp); } case IRP_MN_START_DEVICE: {

13 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2011