Ros-diffs December 2011

ros-diffs@reactos.org

16 participants
242 discussions

[pschweitzer] 54788: [FASTFAT] Return appropriate status when requesting extended attributes on FAT32
by pschweitzer＠svn.reactos.org 31 Dec '11

31 Dec '11

Author: pschweitzer Date: Sat Dec 31 00:09:57 2011 New Revision: 54788 URL: http://svn.reactos.org/svn/reactos?rev=54788&view=rev Log: [FASTFAT] Return appropriate status when requesting extended attributes on FAT32 Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Sat Dec 31 00:09:57 2011 @@ -517,8 +517,9 @@ { /* FIXME */ DPRINT1("VFAT: FileEaInformation not implemented!\n"); - } - return STATUS_SUCCESS; + return STATUS_SUCCESS; + } + return STATUS_EAS_NOT_SUPPORTED; }

1 0

[janderwald] 54787: [USB-BRINGUP] - Rename device extension - Implement FDO Initialization (IRP_MN_START_DEVICE)
by janderwald＠svn.reactos.org 30 Dec '11

30 Dec '11

Author: janderwald Date: Fri Dec 30 14:34:07 2011 New Revision: 54787 URL: http://svn.reactos.org/svn/reactos?rev=54787&view=rev Log: [USB-BRINGUP] - Rename device extension - Implement FDO Initialization (IRP_MN_START_DEVICE) Added: branches/usb-bringup/drivers/hid/hidclass/fdo.c (with props) Modified: branches/usb-bringup/drivers/hid/hidclass/CMakeLists.txt branches/usb-bringup/drivers/hid/hidclass/hidclass.c branches/usb-bringup/drivers/hid/hidclass/precomp.h Modified: branches/usb-bringup/drivers/hid/hidclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] Fri Dec 30 14:34:07 2011 @@ -2,6 +2,7 @@ spec2def(hidclass.sys hidclass.spec) list(APPEND SOURCE + fdo.c hidclass.c hidclass.rc ${CMAKE_CURRENT_BINARY_DIR}/hidclass.def) Added: branches/usb-bringup/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/fdo.c (added) +++ branches/usb-bringup/drivers/hid/hidclass/fdo.c [iso-8859-1] Fri Dec 30 14:34:07 2011 @@ -1,0 +1,472 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Human Interface Device Driver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/hid/hidclass/fdo.c + * PURPOSE: HID Class Driver + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ +#include "precomp.h" + +NTSTATUS +NTAPI +HidClassFDO_QueryCapabilitiesCompletionRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + // + // set event + // + KeSetEvent((PRKEVENT)Context, 0, FALSE); + + // + // completion is done in the HidClassFDO_QueryCapabilities routine + // + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +HidClassFDO_QueryCapabilities( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PDEVICE_CAPABILITIES Capabilities) +{ + PIRP Irp; + KEVENT Event; + NTSTATUS Status; + PIO_STACK_LOCATION IoStack; + PHIDCLASS_FDO_EXTENSION FDODeviceExtension; + + // + // get device extension + // + FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // init event + // + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + // + // now allocte the irp + // + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // get next stack location + // + IoStack = IoGetNextIrpStackLocation(Irp); + + // + // init stack location + // + IoStack->MajorFunction = IRP_MJ_PNP; + IoStack->MinorFunction = IRP_MN_QUERY_CAPABILITIES; + IoStack->Parameters.DeviceCapabilities.Capabilities = Capabilities; + + // + // set completion routine + // + IoSetCompletionRoutine(Irp, HidClassFDO_QueryCapabilitiesCompletionRoutine, (PVOID)&Event, TRUE, TRUE, TRUE); + + // + // init capabilities + // + RtlZeroMemory(Capabilities, sizeof(DEVICE_CAPABILITIES)); + Capabilities->Size = sizeof(DEVICE_CAPABILITIES); + Capabilities->Version = 1; // FIXME hardcoded constant + Capabilities->Address = MAXULONG; + Capabilities->UINumber = MAXULONG; + + // + // pnp irps have default completion code + // + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + + // + // call lower device + // + Status = IoCallDriver(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + // + // wait for completion + // + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + } + + // + // get status + // + Status = Irp->IoStatus.Status; + + // + // complete request + // + IoFreeIrp(Irp); + + // + // done + // + return Status; +} + +NTSTATUS +NTAPI +HidClassFDO_DispatchRequestSynchronousCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + // + // signal event + // + KeSetEvent((PRKEVENT)Context, 0, FALSE); + + // + // done + // + return STATUS_MORE_PROCESSING_REQUIRED; +} + + +NTSTATUS +HidClassFDO_DispatchRequestSynchronous( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + KEVENT Event; + PHIDCLASS_FDO_EXTENSION FDODeviceExtension; + NTSTATUS Status; + PIO_STACK_LOCATION IoStack; + + // + // init event + // + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + // + // get device extension + // + FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // set completion routine + // + IoSetCompletionRoutine(Irp, HidClassFDO_DispatchRequestSynchronousCompletion, &Event, TRUE, TRUE, TRUE); + + ASSERT(Irp->CurrentLocation > 0); + // + // create stack location + // + IoSetNextIrpStackLocation(Irp); + + // + // get next stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // store device object + // + IoStack->DeviceObject = DeviceObject; + + + + // + // call driver + // + DPRINT1("IoStack MajorFunction %x MinorFunction %x\n", IoStack->MajorFunction, IoStack->MinorFunction); + Status = FDODeviceExtension->DriverExtension->MajorFunction[IoStack->MajorFunction](DeviceObject, Irp); + + // + // wait for the request to finish + // + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + + // + // update status + // + Status = Irp->IoStatus.Status; + } + + // + // done + // + return Status; +} + +NTSTATUS +HidClassFDO_GetDescriptors( + IN PDEVICE_OBJECT DeviceObject) +{ + PHIDCLASS_FDO_EXTENSION FDODeviceExtension; + PIRP Irp; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + + // + // get device extension + // + FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // lets allocate irp + // + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // get stack location + // + IoStack = IoGetNextIrpStackLocation(Irp); + + // + // init stack location + // + IoStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; + IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_HID_GET_DEVICE_DESCRIPTOR; + IoStack->Parameters.DeviceIoControl.OutputBufferLength = sizeof(HID_DESCRIPTOR); + IoStack->Parameters.DeviceIoControl.InputBufferLength = 0; + IoStack->Parameters.DeviceIoControl.Type3InputBuffer = NULL; + Irp->UserBuffer = &FDODeviceExtension->HidDescriptor; + + // + // send request + // + Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); + if (!NT_SUCCESS(Status)) + { + // + // failed to get device descriptor + // + DPRINT1("[HIDCLASS] IOCTL_HID_GET_DEVICE_DESCRIPTOR failed with %x\n", Status); + IoFreeIrp(Irp); + return Status; + } + + // + // lets get device attributes + // + IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_HID_GET_DEVICE_ATTRIBUTES; + IoStack->Parameters.DeviceIoControl.OutputBufferLength = sizeof(HID_DEVICE_ATTRIBUTES); + Irp->UserBuffer = &FDODeviceExtension->Attributes; + + // + // send request + // + Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); + if (!NT_SUCCESS(Status)) + { + // + // failed to get device descriptor + // + DPRINT1("[HIDCLASS] IOCTL_HID_GET_DEVICE_ATTRIBUTES failed with %x\n", Status); + IoFreeIrp(Irp); + return Status; + } + + // + // sanity checks + // + ASSERT(FDODeviceExtension->HidDescriptor.bLength == sizeof(HID_DESCRIPTOR)); + ASSERT(FDODeviceExtension->HidDescriptor.bNumDescriptors > 0); + ASSERT(FDODeviceExtension->HidDescriptor.DescriptorList[0].wReportLength > 0); + ASSERT(FDODeviceExtension->HidDescriptor.DescriptorList[0].bReportType == HID_REPORT_DESCRIPTOR_TYPE); + + + // + // now allocate space for the report descriptor + // + FDODeviceExtension->ReportDescriptor = (PUCHAR)ExAllocatePool(NonPagedPool, FDODeviceExtension->HidDescriptor.DescriptorList[0].wReportLength); + if (!FDODeviceExtension->ReportDescriptor) + { + // + // not enough memory + // + IoFreeIrp(Irp); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // init stack location + // + IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_HID_GET_REPORT_DESCRIPTOR; + IoStack->Parameters.DeviceIoControl.OutputBufferLength = FDODeviceExtension->HidDescriptor.DescriptorList[0].wReportLength; + Irp->UserBuffer = FDODeviceExtension->ReportDescriptor; + + // + // send request + // + Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); + if (!NT_SUCCESS(Status)) + { + // + // failed to get device descriptor + // + DPRINT1("[HIDCLASS] IOCTL_HID_GET_REPORT_DESCRIPTOR failed with %x\n", Status); + IoFreeIrp(Irp); + return Status; + } + + // + // completed successfully + // + return STATUS_SUCCESS; +} + + +NTSTATUS +HidClassFDO_StartDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + PHIDCLASS_FDO_EXTENSION FDODeviceExtension; + + // + // get device extension + // + FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // query capabilities + // + Status = HidClassFDO_QueryCapabilities(DeviceObject, &FDODeviceExtension->Capabilities); + ASSERT(Status == STATUS_SUCCESS); + + // + // lets start the lower device too + // + IoCopyCurrentIrpStackLocationToNext(Irp); + Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); + ASSERT(Status == STATUS_SUCCESS); + + // + // lets get the descriptors + // + Status = HidClassFDO_GetDescriptors(DeviceObject); + ASSERT(Status == STATUS_SUCCESS); + + // + // now get the the collection description + // + Status = HidP_GetCollectionDescription(FDODeviceExtension->ReportDescriptor, FDODeviceExtension->HidDescriptor.DescriptorList[0].wReportLength, NonPagedPool, &FDODeviceExtension->DeviceDescription); + ASSERT(Status == STATUS_SUCCESS); + + // + // complete request + // + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + +NTSTATUS +HidClassFDO_RemoveDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +HidClassFDO_DeviceRelations( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +HidClassFDO_PnP( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PHIDCLASS_FDO_EXTENSION FDODeviceExtension; + + // + // get device extension + // + FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // get current irp stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + switch(IoStack->MinorFunction) + { + case IRP_MN_START_DEVICE: + { + return HidClassFDO_StartDevice(DeviceObject, Irp); + } + case IRP_MN_REMOVE_DEVICE: + { + return HidClassFDO_RemoveDevice(DeviceObject, Irp); + } + case IRP_MN_QUERY_STOP_DEVICE: + { + // + // set status to succes + // + Irp->IoStatus.Status = STATUS_SUCCESS; + + // + // forward to lower device + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject, Irp); + } + case IRP_MN_CANCEL_STOP_DEVICE: + { + // + // set status to succes + // + Irp->IoStatus.Status = STATUS_SUCCESS; + + // + // forward to lower device + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject, Irp); + } + case IRP_MN_QUERY_DEVICE_RELATIONS: + { + return HidClassFDO_DeviceRelations(DeviceObject, Irp); + } + default: + { + // + // dispatch to lower device + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject, Irp); + } + } +} Propchange: branches/usb-bringup/drivers/hid/hidclass/fdo.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/usb-bringup/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/hidclass.c [iso-8859-1] Fri Dec 30 14:34:07 2011 @@ -37,7 +37,7 @@ NTSTATUS Status; UNICODE_STRING DeviceName; PDEVICE_OBJECT NewDeviceObject; - PHIDCLASS_DEVICE_EXTENSION DeviceExtension; + PHIDCLASS_FDO_EXTENSION FDODeviceExtension; ULONG DeviceExtensionSize; PHIDCLASS_DRIVER_EXTENSION DriverExtension; @@ -61,7 +61,7 @@ } /* calculate device extension size */ - DeviceExtensionSize = sizeof(HIDCLASS_DEVICE_EXTENSION) + DriverExtension->DeviceExtensionSize; + DeviceExtensionSize = sizeof(HIDCLASS_FDO_EXTENSION) + DriverExtension->DeviceExtensionSize; /* now create the device */ Status = IoCreateDevice(DriverObject, DeviceExtensionSize, &DeviceName, FILE_DEVICE_UNKNOWN, 0, FALSE, &NewDeviceObject); @@ -73,20 +73,20 @@ } /* get device extension */ - DeviceExtension = (PHIDCLASS_DEVICE_EXTENSION)NewDeviceObject->DeviceExtension; + FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)NewDeviceObject->DeviceExtension; /* zero device extension */ - RtlZeroMemory(DeviceExtension, sizeof(HIDCLASS_DEVICE_EXTENSION)); + RtlZeroMemory(FDODeviceExtension, sizeof(HIDCLASS_FDO_EXTENSION)); /* initialize device extension */ - DeviceExtension->HidDeviceExtension.PhysicalDeviceObject = PhysicalDeviceObject; - DeviceExtension->HidDeviceExtension.MiniDeviceExtension = (PVOID)((ULONG_PTR)DeviceExtension + sizeof(HIDCLASS_DEVICE_EXTENSION)); - DeviceExtension->HidDeviceExtension.NextDeviceObject = IoAttachDeviceToDeviceStack(NewDeviceObject, PhysicalDeviceObject); - DeviceExtension->IsFDO = TRUE; - DeviceExtension->DriverExtension = DriverExtension; + FDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject = PhysicalDeviceObject; + FDODeviceExtension->Common.HidDeviceExtension.MiniDeviceExtension = (PVOID)((ULONG_PTR)FDODeviceExtension + sizeof(HIDCLASS_FDO_EXTENSION)); + FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject = IoAttachDeviceToDeviceStack(NewDeviceObject, PhysicalDeviceObject); + FDODeviceExtension->Common.IsFDO = TRUE; + FDODeviceExtension->DriverExtension = DriverExtension; /* sanity check */ - ASSERT(DeviceExtension->HidDeviceExtension.NextDeviceObject); + ASSERT(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject); /* increment stack size */ NewDeviceObject->StackSize++; @@ -102,7 +102,7 @@ { /* failed */ DPRINT1("HIDCLASS: AddDevice failed with %x\n", Status); - IoDetachDevice(DeviceExtension->HidDeviceExtension.NextDeviceObject); + IoDetachDevice(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject); IoDeleteDevice(NewDeviceObject); return Status; } @@ -122,13 +122,174 @@ NTSTATUS NTAPI +HidClass_Create( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HidClass_Close( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HidClass_Read( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HidClass_Write( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HidClass_DeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HidClass_InternalDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +NTAPI +HidClass_Power( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HidClass_PnP( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PHIDCLASS_COMMON_DEVICE_EXTENSION CommonDeviceExtension; + + // + // get common device extension + // + CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // FIXME: support PDO + // + ASSERT(CommonDeviceExtension->IsFDO == TRUE); + + // + // handle request + // + return HidClassFDO_PnP(DeviceObject, Irp); +} + +NTSTATUS +NTAPI +HidClass_DispatchDefault( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PHIDCLASS_COMMON_DEVICE_EXTENSION CommonDeviceExtension; + + // + // get common device extension + // + CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // FIXME: support PDO + // + ASSERT(CommonDeviceExtension->IsFDO == TRUE); + + // + // skip current irp stack location + // + IoSkipCurrentIrpStackLocation(Irp); + + // + // dispatch to lower device object + // + return IoCallDriver(CommonDeviceExtension->HidDeviceExtension.NextDeviceObject, Irp); +} + + +NTSTATUS +NTAPI HidClassDispatch( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION IoStack; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + DPRINT1("[HIDCLASS] Dispatch Major %x Minor %x\n", IoStack->MajorFunction, IoStack->MinorFunction); + + // + // dispatch request based on major function + // + switch(IoStack->MajorFunction) + { + case IRP_MJ_CREATE: + return HidClass_Create(DeviceObject, Irp); + case IRP_MJ_CLOSE: + return HidClass_Close(DeviceObject, Irp); + case IRP_MJ_READ: + return HidClass_Read(DeviceObject, Irp); + case IRP_MJ_WRITE: + return HidClass_Write(DeviceObject, Irp); + case IRP_MJ_DEVICE_CONTROL: + return HidClass_DeviceControl(DeviceObject, Irp); + case IRP_MJ_INTERNAL_DEVICE_CONTROL: + return HidClass_InternalDeviceControl(DeviceObject, Irp); + case IRP_MJ_POWER: + return HidClass_Power(DeviceObject, Irp); + case IRP_MJ_PNP: + return HidClass_PnP(DeviceObject, Irp); + default: + return HidClass_DispatchDefault(DeviceObject, Irp); + } } NTSTATUS @@ -167,7 +328,7 @@ DriverExtension->DriverUnload = MinidriverRegistration->DriverObject->DriverUnload; /* copy driver dispatch routines */ - RtlCopyMemory(DriverExtension->MajorFunction, MinidriverRegistration->DriverObject->MajorFunction, sizeof(PDRIVER_DISPATCH) * IRP_MJ_MAXIMUM_FUNCTION); + RtlCopyMemory(DriverExtension->MajorFunction, MinidriverRegistration->DriverObject->MajorFunction, sizeof(PDRIVER_DISPATCH) * (IRP_MJ_MAXIMUM_FUNCTION+1)); /* initialize lock */ KeInitializeSpinLock(&DriverExtension->Lock); Modified: branches/usb-bringup/drivers/hid/hidclass/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/precomp.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/precomp.h [iso-8859-1] Fri Dec 30 14:34:07 2011 @@ -3,6 +3,7 @@ #define _HIDPI_NO_FUNCTION_MACROS_ #include <ntddk.h> #include <hidport.h> +#include <hidpddi.h> #include <debug.h> @@ -11,7 +12,7 @@ PDRIVER_OBJECT DriverObject; ULONG DeviceExtensionSize; BOOLEAN DevicesArePolled; - PDRIVER_DISPATCH MajorFunction[IRP_MJ_MAXIMUM_FUNCTION]; + PDRIVER_DISPATCH MajorFunction[IRP_MJ_MAXIMUM_FUNCTION + 1]; PDRIVER_ADD_DEVICE AddDevice; PDRIVER_UNLOAD DriverUnload; KSPIN_LOCK Lock; @@ -22,6 +23,53 @@ { HID_DEVICE_EXTENSION HidDeviceExtension; BOOLEAN IsFDO; +}HIDCLASS_COMMON_DEVICE_EXTENSION, *PHIDCLASS_COMMON_DEVICE_EXTENSION; + + + +typedef struct +{ + // + // parts shared by fdo and pdo + // + HIDCLASS_COMMON_DEVICE_EXTENSION Common; + + // + // driver extension + // PHIDCLASS_DRIVER_EXTENSION DriverExtension; -}HIDCLASS_DEVICE_EXTENSION, *PHIDCLASS_DEVICE_EXTENSION; + // + // device capabilities + // + DEVICE_CAPABILITIES Capabilities; + + // + // hid descriptor + // + HID_DESCRIPTOR HidDescriptor; + + // + // hid attributes + // + HID_DEVICE_ATTRIBUTES Attributes; + + // + // report descriptor + // + PUCHAR ReportDescriptor; + + // + // device description + // + HIDP_DEVICE_DESC DeviceDescription; + +}HIDCLASS_FDO_EXTENSION, *PHIDCLASS_FDO_EXTENSION; + + +/* fdo.c */ +NTSTATUS +HidClassFDO_PnP( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); +

1 0

[pschweitzer] 54786: [EVENTVWR] Fix handle leak
by pschweitzer＠svn.reactos.org 30 Dec '11

30 Dec '11

Author: pschweitzer Date: Fri Dec 30 13:31:44 2011 New Revision: 54786 URL: http://svn.reactos.org/svn/reactos?rev=54786&view=rev Log: [EVENTVWR] Fix handle leak Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Fri Dec 30 13:31:44 2011 @@ -555,12 +555,12 @@ /* If we have at least 1000 records show the waiting dialog */ if (dwTotalRecords > 1000) { - CreateThread(NULL, - 0, - ShowStatusMessageThread, - (LPVOID)&hwndDlg, - 0, - NULL); + CloseHandle(CreateThread(NULL, + 0, + ShowStatusMessageThread, + (LPVOID)&hwndDlg, + 0, + NULL)); } while (dwCurrentRecord < dwTotalRecords)

1 0

[jimtabor] 54785: - Fix absolutes.
by jimtabor＠svn.reactos.org 30 Dec '11

30 Dec '11

Author: jimtabor Date: Fri Dec 30 02:52:43 2011 New Revision: 54785 URL: http://svn.reactos.org/svn/reactos?rev=54785&view=rev Log: - Fix absolutes. Modified: trunk/reactos/subsystems/win32/win32k/objects/dcstate.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dcstate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcstate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcstate.c [iso-8859-1] Fri Dec 30 02:52:43 2011 @@ -24,7 +24,7 @@ /* The VisRectRegion field needs to be set to a valid state */ /* Mark some fields as dirty */ - pdcDst->pdcattr->ulDirty_ |= 0x0012001f; // Note: Use if, To is FALSE.... + pdcDst->pdcattr->ulDirty_ |= (DIRTY_FILL|DIRTY_LINE|DIRTY_TEXT|DIRTY_BACKGROUND|DIRTY_CHARSET|DC_ICM_NOT_CALIBRATED|DC_ICM_NOT_SET); // Note: Use if, To is FALSE.... /* Copy DC level */ pdcDst->dclevel.pColorSpace = pdcSrc->dclevel.pColorSpace;

1 0

[jimtabor] 54784: - Add ICM DC Attribute flags.
by jimtabor＠svn.reactos.org 30 Dec '11

30 Dec '11

Author: jimtabor Date: Fri Dec 30 01:28:02 2011 New Revision: 54784 URL: http://svn.reactos.org/svn/reactos?rev=54784&view=rev Log: - Add ICM DC Attribute flags. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Fri Dec 30 01:28:02 2011 @@ -169,6 +169,10 @@ #define DC_DIBSECTION 0x00004000 #define DC_LAST_CLIPRGN_VALID 0x00008000 #define DC_PRIMARY_DISPLAY 0x00010000 +#define DC_ICM_NOT_CALIBRATED 0x00020000 +#define DC_ICM_BRUSH_DIRTY 0x00040000 +#define DC_ICM_PEN_DIRTY 0x00080000 +#define DC_ICM_NOT_SET 0x00100000 #define DC_MODE_DIRTY 0x00200000 #define DC_FONTTEXT_DIRTY 0x00400000

1 0

[cgutman] 54783: [NTOSKRNL] - Fix the fix
by cgutman＠svn.reactos.org 30 Dec '11

30 Dec '11

Author: cgutman Date: Fri Dec 30 00:10:39 2011 New Revision: 54783 URL: http://svn.reactos.org/svn/reactos?rev=54783&view=rev Log: [NTOSKRNL] - Fix the fix Modified: trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Fri Dec 30 00:10:39 2011 @@ -529,7 +529,7 @@ * are invalid translations, so the processor won't cache them */ MmUnmapPageTable(Pt); - if (Pte & PA_PRESENT) + if ((Pte & PA_PRESENT) || !(Pte & 0x800)) { KeBugCheck(MEMORY_MANAGEMENT); } @@ -681,7 +681,7 @@ { ULONG Entry; Entry = MmGetPageEntryForProcess(Process, Address); - return !(Entry & PA_PRESENT) && Entry != 0; + return !(Entry & PA_PRESENT) && (Entry & 0x800); } NTSTATUS

1 0

[cgutman] 54782: [NTOSKRNL] - Remove an unneeded (and prone to race) RtlZeroMemory (found by Thomas Faber) - Fix misuse of PAGE_MASK macro and broken PTE flag comparisons
by cgutman＠svn.reactos.org 29 Dec '11

29 Dec '11

Author: cgutman Date: Thu Dec 29 23:48:49 2011 New Revision: 54782 URL: http://svn.reactos.org/svn/reactos?rev=54782&view=rev Log: [NTOSKRNL] - Remove an unneeded (and prone to race) RtlZeroMemory (found by Thomas Faber) - Fix misuse of PAGE_MASK macro and broken PTE flag comparisons Modified: trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Thu Dec 29 23:48:49 2011 @@ -305,7 +305,6 @@ MmReleasePageMemoryConsumer(MC_SYSTEM, Pfn); } InterlockedExchangePte(PageDir, MmGlobalKernelPageDirectory[PdeOffset]); - RtlZeroMemory(MiPteToAddress(PageDir), PAGE_SIZE); return (PULONG)MiAddressToPte(Address); } InterlockedExchangePte(PageDir, MmGlobalKernelPageDirectory[PdeOffset]); @@ -372,6 +371,7 @@ { KeBugCheck(MEMORY_MANAGEMENT); } + /* * Atomically disable the present bit and get the old value. */ @@ -380,12 +380,9 @@ Pte = *Pt; } while (Pte != InterlockedCompareExchangePte(Pt, Pte & ~PA_PRESENT, Pte)); - if(Pte & PA_PRESENT) - MiFlushTlb(Pt, Address); - else - MmUnmapPageTable(Pt); - - WasValid = (PAGE_MASK(Pte) != 0); + MiFlushTlb(Pt, Address); + + WasValid = (Pte & PA_PRESENT); if (!WasValid) { KeBugCheck(MEMORY_MANAGEMENT); @@ -457,7 +454,7 @@ */ Pte = InterlockedExchangePte(Pt, 0); - WasValid = (PAGE_MASK(Pte) != 0); + WasValid = (Pte & PA_PRESENT); if (WasValid) { /* Flush the TLB since we transitioned this PTE @@ -532,7 +529,7 @@ * are invalid translations, so the processor won't cache them */ MmUnmapPageTable(Pt); - if(!(Pte & 0x800)) + if (Pte & PA_PRESENT) { KeBugCheck(MEMORY_MANAGEMENT); } @@ -580,7 +577,6 @@ } Pt = MmGetPageTableForProcess(Process, Address, FALSE); - if (Pt == NULL) { KeBugCheck(MEMORY_MANAGEMENT); @@ -591,7 +587,11 @@ Pte = *Pt; } while (Pte != InterlockedCompareExchangePte(Pt, Pte & ~PA_DIRTY, Pte)); - if (Pte & PA_DIRTY) + if (!(Pte & PA_PRESENT)) + { + KeBugCheck(MEMORY_MANAGEMENT); + } + else if (Pte & PA_DIRTY) { MiFlushTlb(Pt, Address); } @@ -624,7 +624,12 @@ { Pte = *Pt; } while (Pte != InterlockedCompareExchangePte(Pt, Pte | PA_DIRTY, Pte)); - if (!(Pte & PA_DIRTY)) + + if (!(Pte & PA_PRESENT)) + { + KeBugCheck(MEMORY_MANAGEMENT); + } + else if (!(Pte & PA_DIRTY)) { MiFlushTlb(Pt, Address); } @@ -676,7 +681,7 @@ { ULONG Entry; Entry = MmGetPageEntryForProcess(Process, Address); - return !(Entry & PA_PRESENT) && (Entry & 0x800) && Entry != 0; + return !(Entry & PA_PRESENT) && Entry != 0; } NTSTATUS @@ -710,7 +715,7 @@ KeBugCheck(MEMORY_MANAGEMENT); } Pte = InterlockedExchangePte(Pt, SwapEntry << 1); - if(PAGE_MASK(Pte)) + if (Pte != 0) { KeBugCheck(MEMORY_MANAGEMENT); } @@ -814,8 +819,9 @@ oldPdeOffset = PdeOffset; Pte = InterlockedExchangePte(Pt, PFN_TO_PTE(Pages[i]) | Attributes); + /* There should not be anything valid here */ - if (PAGE_MASK(Pte) != 0) + if (Pte != 0) { DPRINT1("Bad PTE %lx\n", Pte); KeBugCheck(MEMORY_MANAGEMENT); @@ -928,7 +934,7 @@ } Pte = InterlockedExchangePte(Pt, PAGE_MASK(*Pt) | Attributes | (*Pt & (PA_ACCESSED|PA_DIRTY))); - if(!PAGE_MASK(Pte)) + if (!(Pte & PA_PRESENT)) { DPRINT1("Invalid Pte %lx\n", Pte); KeBugCheck(MEMORY_MANAGEMENT);

1 0

[janderwald] 54781: [USB-BRINGUP] - Implement AddDevice routine for hidusb - Fix bug in Hid_DispatchUrb, which returned not initialized status code - Implement IOCTL_HID_GET_REPORT_DESCRIPTOR, IOCT...
by janderwald＠svn.reactos.org 29 Dec '11

29 Dec '11

Author: janderwald Date: Thu Dec 29 19:03:40 2011 New Revision: 54781 URL: http://svn.reactos.org/svn/reactos?rev=54781&view=rev Log: [USB-BRINGUP] - Implement AddDevice routine for hidusb - Fix bug in Hid_DispatchUrb, which returned not initialized status code - Implement IOCTL_HID_GET_REPORT_DESCRIPTOR, IOCTL_HID_READ_REPORT - Add support routines for reseting / aborting pipe, not yet used - TBD: implement error handling - hidusb now works in combination with a usb mouse (other hid devices such as keyboards will require more ioctl implemented) - Tested in Vbox 4.1.4 + WinXP + ReactOS usbhid.sys + ReactOS usbmou.sys - Testing procedure -> inject usb mouse after startup (needs mouse integration disabled -> thanks to timo for pointing this out) Modified: branches/usb-bringup/drivers/hid/hidusb/hidusb.c branches/usb-bringup/drivers/hid/hidusb/hidusb.h Modified: branches/usb-bringup/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidusb/… ============================================================================== --- branches/usb-bringup/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidusb/hidusb.c [iso-8859-1] Thu Dec 29 19:03:40 2011 @@ -10,6 +10,216 @@ #include "hidusb.h" +PUSBD_PIPE_INFORMATION +HidUsb_GetInputInterruptInterfaceHandle( + PUSBD_INTERFACE_INFORMATION InterfaceInformation) +{ + ULONG Index; + + // + // sanity check + // + ASSERT(InterfaceInformation->NumberOfPipes); + + for(Index = 0; Index < InterfaceInformation->NumberOfPipes; Index++) + { + //DPRINT1("[HIDUSB] EndpointAddress %x PipeType %x PipeHandle %x\n", InterfaceInformation->Pipes[Index].EndpointAddress, InterfaceInformation->Pipes[Index].PipeType, InterfaceInformation->Pipes[Index].PipeHandle); + if (InterfaceInformation->Pipes[Index].PipeType == UsbdPipeTypeInterrupt && (InterfaceInformation->Pipes[Index].EndpointAddress & USB_ENDPOINT_DIRECTION_MASK)) + { + // + // found handle + // + return &InterfaceInformation->Pipes[Index]; + } + } + + // + // not found + // + return NULL; +} + +NTSTATUS +HidUsb_GetPortStatus( + IN PDEVICE_OBJECT DeviceObject, + IN PULONG PortStatus) +{ + PIRP Irp; + KEVENT Event; + IO_STATUS_BLOCK IoStatus; + PHID_DEVICE_EXTENSION DeviceExtension; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + + // + // get device extension + // + DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // init result + // + *PortStatus = 0; + + // + // init event + // + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + // + // build irp + // + Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_USB_GET_PORT_STATUS, DeviceExtension->NextDeviceObject, NULL, 0, NULL, 0, TRUE, &Event, &IoStatus); + if (!Irp) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // get stack location + // + IoStack = IoGetNextIrpStackLocation(Irp); + + // + // store result buffer + // + IoStack->Parameters.Others.Argument1 = (PVOID)PortStatus; + + // + // call driver + // + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + // + // wait for completion + // + KeWaitForSingleObject(&Event, Executive, KernelMode, 0, NULL); + return IoStatus.Status; + } + + // + // done + // + return Status; +} + +NTSTATUS +HidUsb_ResetInterruptPipe( + IN PDEVICE_OBJECT DeviceObject) +{ + PHID_USB_DEVICE_EXTENSION HidDeviceExtension; + PHID_DEVICE_EXTENSION DeviceExtension; + PUSBD_PIPE_INFORMATION PipeInformation; + PURB Urb; + NTSTATUS Status; + + // + // get device extension + // + DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + + // + // get interrupt pipe handle + // + ASSERT(HidDeviceExtension->InterfaceInfo); + PipeInformation = HidUsb_GetInputInterruptInterfaceHandle(HidDeviceExtension->InterfaceInfo); + ASSERT(PipeInformation); + ASSERT(PipeInformation->PipeHandle); + + // + // allocate urb + // + Urb = ExAllocatePool(NonPagedPool, sizeof(struct _URB_PIPE_REQUEST)); + if (!Urb) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // init urb + // + RtlZeroMemory(Urb, sizeof(struct _URB_PIPE_REQUEST)); + Urb->UrbHeader.Function = URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL; + Urb->UrbHeader.Length = sizeof(struct _URB_PIPE_REQUEST); + Urb->UrbPipeRequest.PipeHandle = PipeInformation->PipeHandle; + + // + // dispatch request + // + Status = Hid_DispatchUrb(DeviceObject, Urb); + + // + // free urb + // + ExFreePool(Urb); + + // + // done + // + return Status; +} + +NTSTATUS +HidUsb_AbortPipe( + IN PDEVICE_OBJECT DeviceObject) +{ + PHID_USB_DEVICE_EXTENSION HidDeviceExtension; + PHID_DEVICE_EXTENSION DeviceExtension; + PURB Urb; + NTSTATUS Status; + + // + // get device extension + // + DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + + // + // allocate urb + // + Urb = ExAllocatePool(NonPagedPool, sizeof(struct _URB_PIPE_REQUEST)); + if (!Urb) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // init urb + // + RtlZeroMemory(Urb, sizeof(struct _URB_PIPE_REQUEST)); + Urb->UrbHeader.Function = URB_FUNCTION_ABORT_PIPE; + Urb->UrbHeader.Length = sizeof(struct _URB_PIPE_REQUEST); + Urb->UrbPipeRequest.PipeHandle = HidDeviceExtension->ConfigurationHandle; + + // + // dispatch request + // + Status = Hid_DispatchUrb(DeviceObject, Urb); + + // + // free urb + // + ExFreePool(Urb); + + // + // done + // + return Status; +} + + + NTSTATUS NTAPI HidCreate( @@ -44,6 +254,218 @@ // done // return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +HidUsb_ReadReportCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + PHID_USB_DEVICE_EXTENSION HidDeviceExtension; + PHID_DEVICE_EXTENSION DeviceExtension; + PURB Urb; + PUCHAR Buffer; + + // + // get device extension + // + DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + + // + // get urb + // + Urb = (PURB)Context; + ASSERT(Urb); + + // + // FIXME handle error + // + ASSERT(Urb->UrbHeader.Status == USBD_STATUS_SUCCESS); + + // + // FIXME handle error + // + ASSERT(Irp->IoStatus.Status == STATUS_SUCCESS); + + Buffer = Urb->UrbBulkOrInterruptTransfer.TransferBuffer; + ASSERT(Urb->UrbBulkOrInterruptTransfer.TransferBufferLength == 4); + + // + // store result + // + Irp->IoStatus.Information = Urb->UrbBulkOrInterruptTransfer.TransferBufferLength; + + DPRINT("[HIDUSB] ReadCompletion Information %lu Buffer %x %x %x %x\n", Buffer[0] & 0xFF, Buffer[1] & 0xFF, Buffer[2] & 0xFF, Buffer[3] & 0xFF); + + // + // complete request + // + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +HidUsb_ReadReport( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PHID_USB_DEVICE_EXTENSION HidDeviceExtension; + PHID_DEVICE_EXTENSION DeviceExtension; + PIO_STACK_LOCATION IoStack; + PURB Urb; + PUSBD_PIPE_INFORMATION PipeInformation; + + // + // get device extension + // + DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // sanity checks + // + ASSERT(IoStack->Parameters.DeviceIoControl.OutputBufferLength); + ASSERT(Irp->UserBuffer); + ASSERT(HidDeviceExtension->InterfaceInfo); + + // + // get interrupt input pipe + // + PipeInformation = HidUsb_GetInputInterruptInterfaceHandle(HidDeviceExtension->InterfaceInfo); + ASSERT(PipeInformation); + + // + // lets allocate urb + // + Urb = (PURB)ExAllocatePool(NonPagedPool, sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER)); + if (!Urb) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // init urb + // + RtlZeroMemory(Urb, sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER)); + + // + // build the urb + // + UsbBuildInterruptOrBulkTransferRequest(Urb, + sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER), + PipeInformation->PipeHandle, + Irp->UserBuffer, + NULL, + IoStack->Parameters.DeviceIoControl.OutputBufferLength, + USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK, + NULL); + + // + // get next location to setup irp + // + IoStack = IoGetNextIrpStackLocation(Irp); + + // + // init irp for lower driver + // + IoStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; + IoStack->Parameters.Others.Argument1 = (PVOID)Urb; + IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; + + // + // set completion routine + // + IoSetCompletionRoutine(Irp, HidUsb_ReadReportCompletion, (PVOID)Urb, TRUE, TRUE, TRUE); + + // + // call driver + // + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); +} + + +NTSTATUS +NTAPI +HidUsb_GetReportDescriptor( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PHID_USB_DEVICE_EXTENSION HidDeviceExtension; + PHID_DEVICE_EXTENSION DeviceExtension; + PUCHAR Report = NULL; + ULONG BufferLength, Length; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + + // + // get device extension + // + DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + + // + // sanity checks + // + ASSERT(HidDeviceExtension); + ASSERT(HidDeviceExtension->HidDescriptor); + ASSERT(HidDeviceExtension->HidDescriptor->bNumDescriptors >= 1); + ASSERT(HidDeviceExtension->HidDescriptor->DescriptorList[0].bReportType == HID_REPORT_DESCRIPTOR_TYPE); + ASSERT(HidDeviceExtension->HidDescriptor->DescriptorList[0].wReportLength > 0); + + // + // FIXME: support old hid version + // + BufferLength = HidDeviceExtension->HidDescriptor->DescriptorList[0].wReportLength; + Status = Hid_GetDescriptor(DeviceObject, URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), &Report, &BufferLength, HidDeviceExtension->HidDescriptor->DescriptorList[0].bReportType, 0, 0); + if (!NT_SUCCESS(Status)) + { + // + // failed to get descriptor + // + DPRINT("[HIDUSB] failed to get report descriptor with %x\n", Status); + ASSERT(FALSE); + return Status; + } + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + DPRINT1("[HIDUSB] GetReportDescriptor: Status %x ReportLength %lu OutputBufferLength %lu TransferredLength %lu\n", Status, HidDeviceExtension->HidDescriptor->DescriptorList[0].wReportLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength, BufferLength); + + // + // get length to copy + // + Length = min(IoStack->Parameters.DeviceIoControl.OutputBufferLength, BufferLength); + ASSERT(Length); + + // + // copy result + // + RtlCopyMemory(Irp->UserBuffer, Report, Length); + + // + // store result length + // + Irp->IoStatus.Information = Length; + + // + // done + // + return Status; + } NTSTATUS @@ -80,12 +502,14 @@ // invalid request // Irp->IoStatus.Status = STATUS_INVALID_BUFFER_SIZE; + DPRINT1("[HIDUSB] IOCTL_HID_GET_DEVICE_ATTRIBUTES invalid buffer\n"); IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_INVALID_BUFFER_SIZE; } // // store result // + DPRINT1("[HIDUSB] IOCTL_HID_GET_DEVICE_ATTRIBUTES\n"); ASSERT(HidDeviceExtension->DeviceDescriptor); Irp->IoStatus.Information = sizeof(HID_DESCRIPTOR); Attributes = (PHID_DEVICE_ATTRIBUTES)Irp->UserBuffer; @@ -107,6 +531,7 @@ // sanity check // ASSERT(HidDeviceExtension->HidDescriptor); + DPRINT1("[HIDUSB] IOCTL_HID_GET_DEVICE_DESCRIPTOR DescriptorLength %lu OutputBufferLength %lu\n", HidDeviceExtension->HidDescriptor->bLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength); // // store length @@ -129,25 +554,99 @@ return STATUS_SUCCESS; } case IOCTL_HID_GET_REPORT_DESCRIPTOR: + { + Status = HidUsb_GetReportDescriptor(DeviceObject, Irp); + DPRINT1("[HIDUSB] IOCTL_HID_GET_REPORT_DESCRIPTOR Status %x\n", Status); + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } case IOCTL_HID_READ_REPORT: + { + //DPRINT1("[HIDUSB] IOCTL_HID_READ_REPORT\n"); + Status = HidUsb_ReadReport(DeviceObject, Irp); + return Status; + } case IOCTL_HID_WRITE_REPORT: + { + DPRINT1("[HIDUSB] IOCTL_HID_WRITE_REPORT not implemented \n"); + ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; + } case IOCTL_GET_PHYSICAL_DESCRIPTOR: + { + DPRINT1("[HIDUSB] IOCTL_GET_PHYSICAL_DESCRIPTOR not implemented \n"); + ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; + } case IOCTL_HID_SEND_IDLE_NOTIFICATION_REQUEST: + { + DPRINT1("[HIDUSB] IOCTL_HID_SEND_IDLE_NOTIFICATION_REQUEST not implemented \n"); + ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; + } case IOCTL_HID_GET_FEATURE: + { + DPRINT1("[HIDUSB] IOCTL_HID_GET_FEATURE not implemented \n"); + ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; + } case IOCTL_HID_SET_FEATURE: + { + DPRINT1("[HIDUSB] IOCTL_HID_SET_FEATURE not implemented \n"); + ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; + } case IOCTL_HID_SET_OUTPUT_REPORT: + { + DPRINT1("[HIDUSB] IOCTL_HID_SET_OUTPUT_REPORT not implemented \n"); + ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; + } case IOCTL_HID_GET_INPUT_REPORT: + { + DPRINT1("[HIDUSB] IOCTL_HID_GET_INPUT_REPORT not implemented \n"); + ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; + } case IOCTL_HID_GET_INDEXED_STRING: + { + DPRINT1("[HIDUSB] IOCTL_HID_GET_INDEXED_STRING not implemented \n"); + ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; + } case IOCTL_HID_GET_MS_GENRE_DESCRIPTOR: { - DPRINT1("UNIMPLEMENTED %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); - Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + DPRINT1("[HIDUSB] IOCTL_HID_GET_MS_GENRE_DESCRIPTOR not implemented \n"); ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; } default: + { + UNIMPLEMENTED + ASSERT(FALSE); Status = Irp->IoStatus.Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; + } } } @@ -267,13 +766,23 @@ if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + } + + // + // complete request + // + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + if (Status == STATUS_PENDING) + { + // + // get final status + // Status = IoStatus.Status; } - // - // complete request - // - IoCompleteRequest(Irp, IO_NO_INCREMENT); + DPRINT1("[HIDUSB] DispatchUrb %x\n", Status); + // // done @@ -284,6 +793,7 @@ NTSTATUS Hid_GetDescriptor( IN PDEVICE_OBJECT DeviceObject, + IN USHORT UrbFunction, IN USHORT UrbLength, IN OUT PVOID *UrbBuffer, IN OUT PULONG UrbBufferLength, @@ -341,6 +851,11 @@ // build descriptor request // UsbBuildGetDescriptorRequest(Urb, UrbLength, DescriptorType, Index, LanguageIndex, *UrbBuffer, NULL, *UrbBufferLength, NULL); + + // + // set urb function + // + Urb->UrbHeader.Function = UrbFunction; // // dispatch urb @@ -518,13 +1033,13 @@ // get device descriptor // DescriptorLength = sizeof(USB_DEVICE_DESCRIPTOR); - Status = Hid_GetDescriptor(DeviceObject, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), (PVOID*)&HidDeviceExtension->DeviceDescriptor, &DescriptorLength, USB_DEVICE_DESCRIPTOR_TYPE, 0, 0); + Status = Hid_GetDescriptor(DeviceObject, URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), (PVOID*)&HidDeviceExtension->DeviceDescriptor, &DescriptorLength, USB_DEVICE_DESCRIPTOR_TYPE, 0, 0); if (!NT_SUCCESS(Status)) { // // failed to obtain device descriptor // - DPRINT1("Hid_PnpStart failed to get device descriptor %x\n", Status); + DPRINT1("[HIDUSB] failed to get device descriptor %x\n", Status); return Status; } @@ -532,13 +1047,13 @@ // now get the configuration descriptor // DescriptorLength = sizeof(USB_CONFIGURATION_DESCRIPTOR); - Status = Hid_GetDescriptor(DeviceObject, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), (PVOID*)&HidDeviceExtension->ConfigurationDescriptor, &DescriptorLength, USB_CONFIGURATION_DESCRIPTOR_TYPE, 0, 0); + Status = Hid_GetDescriptor(DeviceObject, URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), (PVOID*)&HidDeviceExtension->ConfigurationDescriptor, &DescriptorLength, USB_CONFIGURATION_DESCRIPTOR_TYPE, 0, 0); if (!NT_SUCCESS(Status)) { // // failed to obtain device descriptor // - DPRINT1("Hid_PnpStart failed to get device descriptor %x\n", Status); + DPRINT1("[HIDUSB] failed to get device descriptor %x\n", Status); return Status; } @@ -563,13 +1078,13 @@ // // get full configuration descriptor // - Status = Hid_GetDescriptor(DeviceObject, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), (PVOID*)&HidDeviceExtension->ConfigurationDescriptor, &DescriptorLength, USB_CONFIGURATION_DESCRIPTOR_TYPE, 0, 0); + Status = Hid_GetDescriptor(DeviceObject, URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), (PVOID*)&HidDeviceExtension->ConfigurationDescriptor, &DescriptorLength, USB_CONFIGURATION_DESCRIPTOR_TYPE, 0, 0); if (!NT_SUCCESS(Status)) { // // failed to obtain device descriptor // - DPRINT1("Hid_PnpStart failed to get device descriptor %x\n", Status); + DPRINT1("[HIDUSB] failed to get device descriptor %x\n", Status); return Status; } @@ -588,7 +1103,7 @@ // // no interface class // - DPRINT1("NO HID Class found\n"); + DPRINT1("[HIDUSB] HID Class found\n"); return STATUS_UNSUCCESSFUL; } @@ -623,6 +1138,7 @@ // // done // + DPRINT1("[HIDUSB] SelectConfiguration %x\n", Status); return Status; } @@ -657,6 +1173,7 @@ // get current stack location // IoStack = IoGetCurrentIrpStackLocation(Irp); + DPRINT1("[HIDUSB] Pnp %x\n", IoStack->MinorFunction); // // handle requests based on request type @@ -832,6 +1349,32 @@ NTSTATUS NTAPI +HidAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT DeviceObject) +{ + PHID_USB_DEVICE_EXTENSION HidDeviceExtension; + PHID_DEVICE_EXTENSION DeviceExtension; + + // + // get device extension + // + DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + + // + // init event + // + KeInitializeEvent(&HidDeviceExtension->Event, NotificationEvent, FALSE); + + // + // done + // + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegPath) @@ -848,6 +1391,7 @@ DriverObject->MajorFunction[IRP_MJ_POWER] = HidPower; DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = HidSystemControl; DriverObject->MajorFunction[IRP_MJ_PNP] = HidPnp; + DriverObject->DriverExtension->AddDevice = HidAddDevice; // // prepare registration info Modified: branches/usb-bringup/drivers/hid/hidusb/hidusb.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidusb/… ============================================================================== --- branches/usb-bringup/drivers/hid/hidusb/hidusb.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidusb/hidusb.h [iso-8859-1] Thu Dec 29 19:03:40 2011 @@ -17,11 +17,6 @@ // event for completion // KEVENT Event; - - // - // list for pending requests - // - LIST_ENTRY PendingRequests; // // device descriptor @@ -49,3 +44,18 @@ PHID_DESCRIPTOR HidDescriptor; }HID_USB_DEVICE_EXTENSION, *PHID_USB_DEVICE_EXTENSION; +NTSTATUS +Hid_GetDescriptor( + IN PDEVICE_OBJECT DeviceObject, + IN USHORT UrbFunction, + IN USHORT UrbLength, + IN OUT PVOID *UrbBuffer, + IN OUT PULONG UrbBufferLength, + IN UCHAR DescriptorType, + IN UCHAR Index, + IN USHORT LanguageIndex); + +NTSTATUS +Hid_DispatchUrb( + IN PDEVICE_OBJECT DeviceObject, + IN PURB Urb);

1 0

[pschweitzer] 54780: [SYSDM] Fix the fix of the fix
by pschweitzer＠svn.reactos.org 29 Dec '11

29 Dec '11

Author: pschweitzer Date: Thu Dec 29 13:25:08 2011 New Revision: 54780 URL: http://svn.reactos.org/svn/reactos?rev=54780&view=rev Log: [SYSDM] Fix the fix of the fix Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hardprof.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] Thu Dec 29 13:25:08 2011 @@ -208,7 +208,7 @@ if (!GetProfileCount(&pProfileData->dwProfileCount)) { - HeapFree(pProfileData, 0, GetProcessHeap()); + HeapFree(GetProcessHeap(), 0, pProfileData); return FALSE; } @@ -216,7 +216,7 @@ pProfileData->dwProfileCount * sizeof(PROFILE)); if (pProfileData->pProfiles == NULL) { - HeapFree(pProfileData, 0, GetProcessHeap()); + HeapFree(GetProcessHeap(), 0, pProfileData); return FALSE; }

1 0

[pschweitzer] 54779: [SYSDM] Fix the fix...
by pschweitzer＠svn.reactos.org 29 Dec '11

29 Dec '11

Author: pschweitzer Date: Thu Dec 29 13:21:45 2011 New Revision: 54779 URL: http://svn.reactos.org/svn/reactos?rev=54779&view=rev Log: [SYSDM] Fix the fix... Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hardprof.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] Thu Dec 29 13:21:45 2011 @@ -216,7 +216,7 @@ pProfileData->dwProfileCount * sizeof(PROFILE)); if (pProfileData->pProfiles == NULL) { - HeapFree(GetProcessHeap(), 0, pProfileData); + HeapFree(pProfileData, 0, GetProcessHeap()); return FALSE; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2011