Ros-diffs December 2011

ros-diffs@reactos.org

16 participants
242 discussions

[janderwald] 54798: [USB-BRINGUP] - Move attributes / device description to common struct - Partly implement IRP_MJ_CREATE, IRP_MJ_CLOSE, IRP_MJ_READ
by janderwald＠svn.reactos.org 31 Dec '11

31 Dec '11

Author: janderwald Date: Sat Dec 31 19:09:26 2011 New Revision: 54798 URL: http://svn.reactos.org/svn/reactos?rev=54798&view=rev Log: [USB-BRINGUP] - Move attributes / device description to common struct - Partly implement IRP_MJ_CREATE, IRP_MJ_CLOSE, IRP_MJ_READ Modified: branches/usb-bringup/drivers/hid/hidclass/fdo.c branches/usb-bringup/drivers/hid/hidclass/hidclass.c branches/usb-bringup/drivers/hid/hidclass/pdo.c branches/usb-bringup/drivers/hid/hidclass/precomp.h Modified: 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 [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/fdo.c [iso-8859-1] Sat Dec 31 19:09:26 2011 @@ -268,7 +268,7 @@ // IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_HID_GET_DEVICE_ATTRIBUTES; IoStack->Parameters.DeviceIoControl.OutputBufferLength = sizeof(HID_DEVICE_ATTRIBUTES); - Irp->UserBuffer = &FDODeviceExtension->Attributes; + Irp->UserBuffer = &FDODeviceExtension->Common.Attributes; // // send request @@ -357,7 +357,7 @@ // // lets start the lower device too // - IoCopyCurrentIrpStackLocationToNext(Irp); + IoSkipCurrentIrpStackLocation(Irp); Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); ASSERT(Status == STATUS_SUCCESS); @@ -370,7 +370,7 @@ // // now get the the collection description // - Status = HidP_GetCollectionDescription(FDODeviceExtension->ReportDescriptor, FDODeviceExtension->HidDescriptor.DescriptorList[0].wReportLength, NonPagedPool, &FDODeviceExtension->DeviceDescription); + Status = HidP_GetCollectionDescription(FDODeviceExtension->ReportDescriptor, FDODeviceExtension->HidDescriptor.DescriptorList[0].wReportLength, NonPagedPool, &FDODeviceExtension->Common.DeviceDescription); ASSERT(Status == STATUS_SUCCESS); // 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] Sat Dec 31 19:09:26 2011 @@ -126,6 +126,417 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PIO_STACK_LOCATION IoStack; + PHIDCLASS_COMMON_DEVICE_EXTENSION CommonDeviceExtension; + PHIDCLASS_PDO_DEVICE_EXTENSION PDODeviceExtension; + PHIDCLASS_FILEOP_CONTEXT Context; + + // + // get device extension + // + CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + if (CommonDeviceExtension->IsFDO) + { + // + // only supported for PDO + // + DPRINT1("[HIDCLASS] IRP_MJ_CREATE for FDO\n"); + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; + } + + // + // must be a PDO + // + ASSERT(CommonDeviceExtension->IsFDO == FALSE); + + // + // get device extension + // + PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)CommonDeviceExtension; + + // + // get stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + DPRINT1("ShareAccess %x\n", IoStack->Parameters.Create.ShareAccess); + DPRINT1("Options %x\n", IoStack->Parameters.Create.Options); + DPRINT1("DesiredAccess %x\n", IoStack->Parameters.Create.SecurityContext->DesiredAccess); + + // + // allocate context + // + Context = (PHIDCLASS_FILEOP_CONTEXT)ExAllocatePool(NonPagedPool, sizeof(HIDCLASS_FILEOP_CONTEXT)); + if (!Context) + { + // + // no memory + // + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // init context + // + RtlZeroMemory(Context, sizeof(HIDCLASS_FILEOP_CONTEXT)); + Context->DeviceExtension = PDODeviceExtension; + KeInitializeSpinLock(&Context->Lock); + InitializeListHead(&Context->ReadPendingIrpListHead); + InitializeListHead(&Context->IrpCompletedListHead); + + // + // store context + // + ASSERT(IoStack->FileObject); + IoStack->FileObject->FsContext = (PVOID)Context; + + // + // done + // + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +HidClass_Close( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PHIDCLASS_COMMON_DEVICE_EXTENSION CommonDeviceExtension; + PHIDCLASS_IRP_CONTEXT IrpContext; + + // + // get device extension + // + CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // is it a FDO request + // + if (CommonDeviceExtension->IsFDO) + { + // + // how did the request get there + // + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER_1; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_PARAMETER_1; + } + + // + // get stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // sanity checks + // + ASSERT(IoStack->FileObject); + ASSERT(IoStack->FileObject->FsContext); + + // + // get irp context + // + IrpContext = (PHIDCLASS_IRP_CONTEXT)IoStack->FileObject->FsContext; + + // + // cancel pending irps + // + UNIMPLEMENTED + + // + // remove context + // + IoStack->FileObject->FsContext = NULL; + + // + // free context + // + ExFreePool(IrpContext); + + // + // complete request + // + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +HidClass_ReadCompleteIrp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Ctx) +{ + PHIDCLASS_IRP_CONTEXT IrpContext; + KIRQL OldLevel; + + // + // get irp context + // + IrpContext = (PHIDCLASS_IRP_CONTEXT)Ctx; + + DPRINT1("HidClass_ReadCompleteIrp Irql %lu\n", KeGetCurrentIrql()); + DPRINT1("HidClass_ReadCompleteIrp Status %lx\n", Irp->IoStatus.Status); + DPRINT1("HidClass_ReadCompleteIrp Length %lu\n", Irp->IoStatus.Information); + DPRINT1("HidClass_ReadCompleteIrp Irp %p\n", Irp); + DPRINT1("HidClass_ReadCompleteIrp InputReportBuffer %p\n", IrpContext->InputReportBuffer); + DPRINT1("HidClass_ReadCompleteIrp InputReportBufferLength %li\n", IrpContext->InputReportBufferLength); + DPRINT1("HidClass_ReadCompleteIrp OriginalIrp %p\n", IrpContext->OriginalIrp); + + // + // copy result + // + if (Irp->IoStatus.Information) + { + // + // copy result + // + RtlCopyMemory(IrpContext->OriginalIrp->UserBuffer, IrpContext->InputReportBuffer, IrpContext->InputReportBufferLength); + } + + // + // copy result status + // + IrpContext->OriginalIrp->IoStatus.Status = Irp->IoStatus.Status; + Irp->IoStatus.Information = Irp->IoStatus.Information; + + // + // free input report buffer + // + ExFreePool(IrpContext->InputReportBuffer); + + // + // complete original request + // + IoCompleteRequest(IrpContext->OriginalIrp, IO_NO_INCREMENT); + + // + // remove us from pending list + // + KeAcquireSpinLock(&IrpContext->FileOp->Lock, &OldLevel); + + // + // remove from pending list + // + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + + // + // release lock + // + KeReleaseSpinLock(&IrpContext->FileOp->Lock, OldLevel); + + // + // free irp context + // + ExFreePool(IrpContext); + + // + // done + // + return STATUS_SUCCESS; +} + +NTSTATUS +HidClass_BuildIrp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP RequestIrp, + IN PHIDCLASS_FILEOP_CONTEXT Context, + IN ULONG DeviceIoControlCode, + IN ULONG BufferLength, + OUT PIRP *OutIrp, + OUT PHIDCLASS_IRP_CONTEXT *OutIrpContext) +{ + PIRP Irp; + PIO_STACK_LOCATION IoStack; + PHIDCLASS_IRP_CONTEXT IrpContext; + + // + // build new irp + // + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // allocate completion context + // + IrpContext = (PHIDCLASS_IRP_CONTEXT)ExAllocatePool(NonPagedPool, sizeof(HIDCLASS_IRP_CONTEXT)); + if (!IrpContext) + { + // + // no memory + // + IoFreeIrp(Irp); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // init irp context + // + RtlZeroMemory(IrpContext, sizeof(HIDCLASS_IRP_CONTEXT)); + IrpContext->InputReportBufferLength = BufferLength; + IrpContext->OriginalIrp = RequestIrp; + IrpContext->FileOp = Context; + + // + // allocate buffer + // + IrpContext->InputReportBuffer = ExAllocatePool(NonPagedPool, BufferLength); + if (!IrpContext->InputReportBuffer) + { + // + // no memory + // + IoFreeIrp(Irp); + ExFreePool(IrpContext); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // get stack location + // + IoStack = IoGetNextIrpStackLocation(Irp); + + // + // init stack location + // + IoStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; + IoStack->Parameters.DeviceIoControl.IoControlCode = DeviceIoControlCode; + IoStack->Parameters.DeviceIoControl.OutputBufferLength = IrpContext->InputReportBufferLength; + IoStack->Parameters.DeviceIoControl.InputBufferLength = 0; + IoStack->Parameters.DeviceIoControl.Type3InputBuffer = NULL; + Irp->UserBuffer = IrpContext->InputReportBuffer; + IoStack->DeviceObject = DeviceObject; + + // + // store result + // + *OutIrp = Irp; + *OutIrpContext = IrpContext; + + DPRINT1("IRP %p Buffer %p\n", Irp, Irp->UserBuffer); + + // + // done + // + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +HidClass_Read( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PHIDCLASS_FILEOP_CONTEXT Context; + KIRQL OldLevel; + NTSTATUS Status; + PIRP NewIrp; + PHIDCLASS_IRP_CONTEXT NewIrpContext; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // sanity check + // + ASSERT(IoStack->FileObject); + ASSERT(IoStack->FileObject->FsContext); + + // + // get context + // + Context = (PHIDCLASS_FILEOP_CONTEXT)IoStack->FileObject->FsContext; + ASSERT(Context); + + // + // FIXME support polled devices + // + ASSERT(Context->DeviceExtension->Common.DriverExtension->DevicesArePolled == FALSE); + + DPRINT1("[HIDCLASS] IRP_MJ_READ\n"); + + // + // build irp request + // + Status = HidClass_BuildIrp(DeviceObject, Irp, Context, IOCTL_HID_READ_REPORT, IoStack->Parameters.DeviceIoControl.OutputBufferLength, &NewIrp, &NewIrpContext); + if (!NT_SUCCESS(Status)) + { + // + // failed + // + DPRINT1("HidClass_BuildIrp failed with %x\n", Status); + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + // + // acquire lock + // + KeAcquireSpinLock(&Context->Lock, &OldLevel); + + // + // insert irp into pending list + // + InsertTailList(&Context->ReadPendingIrpListHead, &NewIrp->Tail.Overlay.ListEntry); + + // + // set completion routine + // + IoSetCompletionRoutine(NewIrp, HidClass_ReadCompleteIrp, NewIrpContext, TRUE, TRUE, TRUE); + + // + // make next location current + // + IoSetNextIrpStackLocation(NewIrp); + + // + // release spin lock + // + KeReleaseSpinLock(&Context->Lock, OldLevel); + + // + // mark irp pending + // + IoMarkIrpPending(Irp); + + // + // lets dispatch the request + // + ASSERT(Context->DeviceExtension); + Status = Context->DeviceExtension->Common.DriverExtension->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL](DeviceObject, NewIrp); + + // + // complete + // + return Status; +} + +NTSTATUS +NTAPI +HidClass_Write( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ UNIMPLEMENTED ASSERT(FALSE); Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; @@ -135,45 +546,6 @@ NTSTATUS NTAPI -HidClass_Close( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - UNIMPLEMENTED - ASSERT(FALSE); - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -HidClass_Read( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - UNIMPLEMENTED - ASSERT(FALSE); - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -HidClass_Write( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - UNIMPLEMENTED - ASSERT(FALSE); - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI HidClass_DeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -181,14 +553,11 @@ PIO_STACK_LOCATION IoStack; PHIDCLASS_COMMON_DEVICE_EXTENSION CommonDeviceExtension; PHID_COLLECTION_INFORMATION CollectionInformation; - PHIDCLASS_PDO_DEVICE_EXTENSION PDODeviceExtension; // // get device extension // CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ASSERT(CommonDeviceExtension->IsFDO == FALSE); - PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)CommonDeviceExtension; // // get stack location @@ -221,11 +590,11 @@ // // init result buffer // - CollectionInformation->DescriptorSize = PDODeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength; //FIXME which collection is to be retrieved for composite devices / multi collection devices? + CollectionInformation->DescriptorSize = CommonDeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength; //FIXME which collection is to be retrieved for composite devices / multi collection devices? CollectionInformation->Polled = CommonDeviceExtension->DriverExtension->DevicesArePolled; - CollectionInformation->VendorID = PDODeviceExtension->Attributes.VendorID; - CollectionInformation->ProductID = PDODeviceExtension->Attributes.ProductID; - CollectionInformation->VersionNumber = PDODeviceExtension->Attributes.VersionNumber; + CollectionInformation->VendorID = CommonDeviceExtension->Attributes.VendorID; + CollectionInformation->ProductID = CommonDeviceExtension->Attributes.ProductID; + CollectionInformation->VersionNumber = CommonDeviceExtension->Attributes.VersionNumber; // // complete request @@ -244,7 +613,7 @@ // // check if output buffer is big enough // - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < PDODeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength) + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < CommonDeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength) { // // invalid buffer size @@ -258,12 +627,12 @@ // copy result // ASSERT(Irp->UserBuffer); - RtlCopyMemory(Irp->UserBuffer, PDODeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedData, PDODeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength); + RtlCopyMemory(Irp->UserBuffer, CommonDeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedData, CommonDeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength); // // complete request // - Irp->IoStatus.Information = PDODeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength; + Irp->IoStatus.Information = CommonDeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength; Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; @@ -271,7 +640,6 @@ default: { DPRINT1("[HIDCLASS] DeviceControl IoControlCode 0x%x not implemented\n", IoStack->Parameters.DeviceIoControl.IoControlCode); - ASSERT(FALSE); Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; Modified: branches/usb-bringup/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/pdo.c [iso-8859-1] Sat Dec 31 19:09:26 2011 @@ -120,12 +120,12 @@ // // store hardware ids // - Offset = swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x&Rev_%04x", PDODeviceExtension->Attributes.VendorID, PDODeviceExtension->Attributes.ProductID, PDODeviceExtension->Attributes.VersionNumber) + 1; - Offset += swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x", PDODeviceExtension->Attributes.VendorID, PDODeviceExtension->Attributes.ProductID) + 1; - - if (PDODeviceExtension->DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].UsagePage == HID_USAGE_PAGE_GENERIC) - { - switch(PDODeviceExtension->DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].Usage) + Offset = swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x&Rev_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID, PDODeviceExtension->Common.Attributes.VersionNumber) + 1; + Offset += swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID) + 1; + + if (PDODeviceExtension->Common.DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].UsagePage == HID_USAGE_PAGE_GENERIC) + { + switch(PDODeviceExtension->Common.DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].Usage) { case HID_USAGE_GENERIC_POINTER: case HID_USAGE_GENERIC_MOUSE: @@ -156,7 +156,7 @@ break; } } - else if (PDODeviceExtension->DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].UsagePage == HID_USAGE_PAGE_CONSUMER && PDODeviceExtension->DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].Usage == HID_USAGE_CONSUMERCTRL) + else if (PDODeviceExtension->Common.DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].UsagePage == HID_USAGE_PAGE_CONSUMER && PDODeviceExtension->Common.DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].Usage == HID_USAGE_CONSUMERCTRL) { // // Consumer Audio Control @@ -545,15 +545,15 @@ PDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject = FDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject; PDODeviceExtension->Common.IsFDO = FALSE; PDODeviceExtension->Common.DriverExtension = FDODeviceExtension->Common.DriverExtension; - RtlCopyMemory(&PDODeviceExtension->Attributes, &FDODeviceExtension->Attributes, sizeof(HID_DEVICE_ATTRIBUTES)); - RtlCopyMemory(&PDODeviceExtension->DeviceDescription, &FDODeviceExtension->DeviceDescription, sizeof(HIDP_DEVICE_DESC)); + RtlCopyMemory(&PDODeviceExtension->Common.Attributes, &FDODeviceExtension->Common.Attributes, sizeof(HID_DEVICE_ATTRIBUTES)); + RtlCopyMemory(&PDODeviceExtension->Common.DeviceDescription, &FDODeviceExtension->Common.DeviceDescription, sizeof(HIDP_DEVICE_DESC)); RtlCopyMemory(&PDODeviceExtension->Capabilities, &FDODeviceExtension->Capabilities, sizeof(DEVICE_CAPABILITIES)); // // FIXME: support composite devices // PDODeviceExtension->CollectionIndex = 0; - ASSERT(PDODeviceExtension->DeviceDescription.CollectionDescLength == 1); + ASSERT(PDODeviceExtension->Common.DeviceDescription.CollectionDescLength == 1); // // store in device relations struct 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] Sat Dec 31 19:09:26 2011 @@ -8,8 +8,6 @@ #include <stdio.h> #include <wdmguid.h> #include <debug.h> - - typedef struct { @@ -40,6 +38,17 @@ // PHIDCLASS_DRIVER_EXTENSION DriverExtension; + // + // device description + // + HIDP_DEVICE_DESC DeviceDescription; + + // + // hid attributes + // + HID_DEVICE_ATTRIBUTES Attributes; + + }HIDCLASS_COMMON_DEVICE_EXTENSION, *PHIDCLASS_COMMON_DEVICE_EXTENSION; typedef struct @@ -60,19 +69,9 @@ HID_DESCRIPTOR HidDescriptor; // - // hid attributes - // - HID_DEVICE_ATTRIBUTES Attributes; - - // // report descriptor // PUCHAR ReportDescriptor; - - // - // device description - // - HIDP_DEVICE_DESC DeviceDescription; // // device relations @@ -89,19 +88,9 @@ HIDCLASS_COMMON_DEVICE_EXTENSION Common; // - // device descriptor - // - HID_DEVICE_ATTRIBUTES Attributes; - - // // device capabilities // DEVICE_CAPABILITIES Capabilities; - - // - // device description - // - HIDP_DEVICE_DESC DeviceDescription; // // collection index @@ -114,6 +103,58 @@ UNICODE_STRING DeviceInterface; }HIDCLASS_PDO_DEVICE_EXTENSION, *PHIDCLASS_PDO_DEVICE_EXTENSION; +typedef struct __HIDCLASS_FILEOP_CONTEXT__ +{ + // + // device extension + // + PHIDCLASS_PDO_DEVICE_EXTENSION DeviceExtension; + + // + // spin lock + // + KSPIN_LOCK Lock; + + // + // read irp pending list + // + LIST_ENTRY ReadPendingIrpListHead; + + // + // completed irp list + // + LIST_ENTRY IrpCompletedListHead; + +}HIDCLASS_FILEOP_CONTEXT, *PHIDCLASS_FILEOP_CONTEXT; + +typedef struct +{ + // + // original request + // + PIRP OriginalIrp; + + // + // file op + // + PHIDCLASS_FILEOP_CONTEXT FileOp; + + // + // buffer for reading report + // + PVOID InputReportBuffer; + + // + // buffer length + // + ULONG InputReportBufferLength; + + // + // work item + // + PIO_WORKITEM CompletionWorkItem; + +}HIDCLASS_IRP_CONTEXT, *PHIDCLASS_IRP_CONTEXT; /* fdo.c */ NTSTATUS

1 0

[janderwald] 54797: [USB-BRINGUP] - Fix bug in HidUsb_AbortPipe, which passed the wrong handle - Implement reset port routine - Implement reset worker routine when reading report fails
by janderwald＠svn.reactos.org 31 Dec '11

31 Dec '11

Author: janderwald Date: Sat Dec 31 18:22:18 2011 New Revision: 54797 URL: http://svn.reactos.org/svn/reactos?rev=54797&view=rev Log: [USB-BRINGUP] - Fix bug in HidUsb_AbortPipe, which passed the wrong handle - Implement reset port routine - Implement reset worker routine when reading report fails Modified: branches/usb-bringup/drivers/hid/hidusb/CMakeLists.txt branches/usb-bringup/drivers/hid/hidusb/hidusb.c branches/usb-bringup/drivers/hid/hidusb/hidusb.h Modified: branches/usb-bringup/drivers/hid/hidusb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidusb/… ============================================================================== --- branches/usb-bringup/drivers/hid/hidusb/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidusb/CMakeLists.txt [iso-8859-1] Sat Dec 31 18:22:18 2011 @@ -6,6 +6,6 @@ add_library(hidusb SHARED ${SOURCE}) set_module_type(hidusb kernelmodedriver) -add_importlibs(hidusb hidclass ntoskrnl usbd) +add_importlibs(hidusb hidclass ntoskrnl usbd hal) add_cab_target(hidusb 2) 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] Sat Dec 31 18:22:18 2011 @@ -175,6 +175,7 @@ PHID_DEVICE_EXTENSION DeviceExtension; PURB Urb; NTSTATUS Status; + PUSBD_PIPE_INFORMATION PipeInformation; // // get device extension @@ -193,6 +194,13 @@ // return STATUS_INSUFFICIENT_RESOURCES; } + + // + // get pipe information + // + PipeInformation = HidUsb_GetInputInterruptInterfaceHandle(HidDeviceExtension->InterfaceInfo); + ASSERT(PipeInformation); + ASSERT(PipeInformation->PipeHandle); // // init urb @@ -200,7 +208,7 @@ 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; + Urb->UrbPipeRequest.PipeHandle = PipeInformation->PipeHandle; // // dispatch request @@ -218,7 +226,56 @@ return Status; } - +NTSTATUS +HidUsb_ResetPort( + IN PDEVICE_OBJECT DeviceObject) +{ + KEVENT Event; + PIRP Irp; + PHID_DEVICE_EXTENSION DeviceExtension; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + // + // get device extension + // + DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // init event + // + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + // + // build irp + // + Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_USB_RESET_PORT, DeviceExtension->NextDeviceObject, NULL, 0, NULL, 0, TRUE, &Event, &IoStatusBlock); + if (!Irp) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // send the irp + // + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + // + // wait for request completion + // + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatusBlock.Status; + } + + // + // done + // + return IoStatusBlock.Status; +} NTSTATUS NTAPI @@ -255,6 +312,92 @@ // return STATUS_SUCCESS; } + +VOID +NTAPI +HidUsb_ResetWorkerRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Ctx) +{ + NTSTATUS Status; + ULONG PortStatus; + PHID_USB_RESET_CONTEXT ResetContext; + PHID_DEVICE_EXTENSION DeviceExtension; + + DPRINT1("[HIDUSB] ResetWorkerRoutine\n"); + + // + // get context + // + ResetContext = (PHID_USB_RESET_CONTEXT)Ctx; + + // + // get device extension + // + DeviceExtension = (PHID_DEVICE_EXTENSION)ResetContext->DeviceObject->DeviceExtension; + + // + // get port status + // + Status = HidUsb_GetPortStatus(ResetContext->DeviceObject, &PortStatus); + DPRINT1("[HIDUSB] ResetWorkerRoutine GetPortStatus %x\n", Status); + if (NT_SUCCESS(Status)) + { + if (!(PortStatus & USB_PORT_STATUS_ENABLE)) + { + // + // port is disabled + // + Status = HidUsb_ResetInterruptPipe(ResetContext->DeviceObject); + DPRINT1("[HIDUSB] ResetWorkerRoutine ResetPipe %x\n", Status); + } + else + { + // + // abort pipe + // + Status = HidUsb_AbortPipe(ResetContext->DeviceObject); + DPRINT1("[HIDUSB] ResetWorkerRoutine AbortPipe %x\n", Status); + if (NT_SUCCESS(Status)) + { + // + // reset port + // + Status = HidUsb_ResetPort(ResetContext->DeviceObject); + DPRINT1("[HIDUSB] ResetPort %x\n", Status); + if (Status == STATUS_DEVICE_DATA_ERROR) + { + // + // invalidate device state + // + IoInvalidateDeviceState(DeviceExtension->PhysicalDeviceObject); + } + + // + // reset interrupt pipe + // + if (NT_SUCCESS(Status)) + { + // + // reset pipe + // + Status = HidUsb_ResetInterruptPipe(ResetContext->DeviceObject); + DPRINT1("[HIDUSB] ResetWorkerRoutine ResetPipe %x\n", Status); + } + } + } + } + + // + // cleanup + // + ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + IoFreeWorkItem(ResetContext->WorkItem); + ResetContext->Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(ResetContext->Irp, IO_NO_INCREMENT); + ExFreePool(ResetContext); +} + NTSTATUS NTAPI @@ -267,6 +410,44 @@ PHID_DEVICE_EXTENSION DeviceExtension; PURB Urb; PUCHAR Buffer; + PHID_USB_RESET_CONTEXT ResetContext; + + // + // get urb + // + Urb = (PURB)Context; + ASSERT(Urb); + + // + // did the reading report succeed / cancelled + // + if (NT_SUCCESS(Irp->IoStatus.Status) || Irp->IoStatus.Status == STATUS_CANCELLED || Irp->IoStatus.Status == STATUS_DEVICE_NOT_CONNECTED) + { + // + // store result length + // + Irp->IoStatus.Information = Urb->UrbBulkOrInterruptTransfer.TransferBufferLength; + + // + // FIXME handle error + // + ASSERT(Urb->UrbHeader.Status == USBD_STATUS_SUCCESS); + + + Buffer = (PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer; + ASSERT(Urb->UrbBulkOrInterruptTransfer.TransferBufferLength == 4); + DPRINT("[HIDUSB] ReadCompletion Information %lu Buffer %x %x %x %x\n", Buffer[0] & 0xFF, Buffer[1] & 0xFF, Buffer[2] & 0xFF, Buffer[3] & 0xFF); + + // + // free the urb + // + ExFreePool(Context); + + // + // finish completion + // + return STATUS_SUCCESS; + } // // get device extension @@ -275,30 +456,48 @@ 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); + // allocate reset context + // + ResetContext = (PHID_USB_RESET_CONTEXT)ExAllocatePool(NonPagedPool, sizeof(HID_USB_RESET_CONTEXT)); + if (ResetContext) + { + // + // allocate work item + // + ResetContext->WorkItem = IoAllocateWorkItem(DeviceObject); + if (ResetContext->WorkItem) + { + // + // init reset context + // + ResetContext->Irp = Irp; + ResetContext->DeviceObject = DeviceObject; + + // + // queue the work item + // + IoQueueWorkItem(ResetContext->WorkItem, HidUsb_ResetWorkerRoutine, DelayedWorkQueue, ResetContext); + + // + // free urb + // + ExFreePool(Urb); + + // + // defer completion + // + return STATUS_MORE_PROCESSING_REQUIRED; + } + // + // free context + // + ExFreePool(ResetContext); + } + + // + // free urb + // + ExFreePool(Urb); // // complete request @@ -563,7 +762,7 @@ } case IOCTL_HID_READ_REPORT: { - //DPRINT1("[HIDUSB] IOCTL_HID_READ_REPORT\n"); + DPRINT1("[HIDUSB] IOCTL_HID_READ_REPORT\n"); Status = HidUsb_ReadReport(DeviceObject, Irp); return Status; } @@ -702,6 +901,7 @@ // return STATUS_MORE_PROCESSING_REQUIRED; } + NTSTATUS Hid_DispatchUrb( @@ -749,11 +949,6 @@ // store urb // IoStack->Parameters.Others.Argument1 = (PVOID)Urb; - - // - // set completion routine - // - IoSetCompletionRoutine(Irp, Hid_PnpCompletion, (PVOID)&Event, TRUE, TRUE, TRUE); // // call driver @@ -1333,6 +1528,7 @@ // complete request // Irp->IoStatus.Status = Status; + DPRINT1("[HIDUSB] IRP_MN_START_DEVICE Status %x\n", Status); IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } 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] Sat Dec 31 18:22:18 2011 @@ -44,6 +44,26 @@ PHID_DESCRIPTOR HidDescriptor; }HID_USB_DEVICE_EXTENSION, *PHID_USB_DEVICE_EXTENSION; +typedef struct +{ + // + // request irp + // + PIRP Irp; + + // + // work item + // + PIO_WORKITEM WorkItem; + + // + // device object + // + PDEVICE_OBJECT DeviceObject; + +}HID_USB_RESET_CONTEXT, *PHID_USB_RESET_CONTEXT; + + NTSTATUS Hid_GetDescriptor( IN PDEVICE_OBJECT DeviceObject,

1 0

[jgardou] 54796: [CRT] - define CRTDLL for crt and libcntpr for right usage of _CRTIMP macro
by jgardou＠svn.reactos.org 31 Dec '11

31 Dec '11

Author: jgardou Date: Sat Dec 31 17:44:51 2011 New Revision: 54796 URL: http://svn.reactos.org/svn/reactos?rev=54796&view=rev Log: [CRT] - define CRTDLL for crt and libcntpr for right usage of _CRTIMP macro Modified: trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/libcntpr.cmake Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Sat Dec 31 17:44:51 2011 @@ -449,6 +449,12 @@ add_library(crt ${CRT_SOURCE}) target_link_libraries(crt chkstk) -add_target_compile_definitions(crt __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT) +add_target_compile_definitions(crt + __MINGW_IMPORT=extern + USE_MSVCRT_PREFIX + _MSVCRT_LIB_ + _MSVCRT_ + _MT + CRTDLL) #add_pch(crt precomp.h) add_dependencies(crt psdk asm) Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Sat Dec 31 17:44:51 2011 @@ -175,5 +175,11 @@ endif() add_library(libcntpr ${LIBCNTPR_SOURCE}) -add_target_compile_definitions(libcntpr NO_RTL_INLINES _NTSYSTEM_ _NTDLLBUILD_ _LIBCNT_ __CRT__NO_INLINE) +add_target_compile_definitions(libcntpr + NO_RTL_INLINES + _NTSYSTEM_ + _NTDLLBUILD_ + _LIBCNT_ + __CRT__NO_INLINE + CRTDLL) add_dependencies(libcntpr psdk asm)

1 0

[jgardou] 54795: [NEWINFLIB] - better fix for non standard use of swprintf, by Thomas Faber
by jgardou＠svn.reactos.org 31 Dec '11

31 Dec '11

Author: jgardou Date: Sat Dec 31 17:29:42 2011 New Revision: 54795 URL: http://svn.reactos.org/svn/reactos?rev=54795&view=rev Log: [NEWINFLIB] - better fix for non standard use of swprintf, by Thomas Faber Modified: trunk/reactos/lib/newinflib/CMakeLists.txt trunk/reactos/lib/newinflib/infget.c Modified: trunk/reactos/lib/newinflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/CMakeLists.t… ============================================================================== --- trunk/reactos/lib/newinflib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/CMakeLists.txt [iso-8859-1] Sat Dec 31 17:29:42 2011 @@ -20,10 +20,10 @@ infhostput.c infhostrtl.c) - add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST) + add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST -D_CRT_NON_CONFORMING_SWPRINTFS) + add_library(inflibhost ${GLOBAL_FILES} ${SOURCE}) if(NOT MSVC) - add_compile_flags("-Wpointer-arith -Wwrite-strings") + add_target_compile_flags(inflibhost "-Wpointer-arith -Wwrite-strings") endif() - add_library(inflibhost ${GLOBAL_FILES} ${SOURCE}) target_link_libraries(inflibhost unicode) endif() Modified: trunk/reactos/lib/newinflib/infget.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infget.c?rev… ============================================================================== --- trunk/reactos/lib/newinflib/infget.c [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/infget.c [iso-8859-1] Sat Dec 31 17:29:42 2011 @@ -48,10 +48,9 @@ if (Inf->LanguageId != 0) { - _snwprintf(StringLangId, - 13, - L"Strings.%04hx", - Inf->LanguageId); + swprintf(StringLangId, + L"Strings.%04hx", + Inf->LanguageId); Status = InfpFindFirstLine(Inf, StringLangId, @@ -59,10 +58,9 @@ &Context); if (Status != INF_STATUS_SUCCESS) { - _snwprintf(StringLangId, - 13, - L"Strings.%04hx", - MAKELANGID(PRIMARYLANGID(Inf->LanguageId), SUBLANG_NEUTRAL)); + swprintf(StringLangId, + L"Strings.%04hx", + MAKELANGID(PRIMARYLANGID(Inf->LanguageId), SUBLANG_NEUTRAL)); Status = InfpFindFirstLine(Inf, StringLangId,

1 0

[ekohl] 54794: [EVENTLOG] Fix the record number hacks in ElfrNumberOfRecords and LogfWriteData by initializing the oldest record number to 1.
by ekohl＠svn.reactos.org 31 Dec '11

31 Dec '11

Author: ekohl Date: Sat Dec 31 15:23:59 2011 New Revision: 54794 URL: http://svn.reactos.org/svn/reactos?rev=54794&view=rev Log: [EVENTLOG] Fix the record number hacks in ElfrNumberOfRecords and LogfWriteData by initializing the oldest record number to 1. Modified: trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Sat Dec 31 15:23:59 2011 @@ -34,6 +34,7 @@ LogFile->Header.MajorVersion = MAJORVER; LogFile->Header.MinorVersion = MINORVER; LogFile->Header.CurrentRecordNumber = 1; + LogFile->Header.OldestRecordNumber = 1; /* FIXME: Read MaxSize from registry for this LogFile. But for now limit EventLog size to just under 5K. */ LogFile->Header.MaxSize = 5000; @@ -986,9 +987,6 @@ LogFile->Header.CurrentRecordNumber++; - if (LogFile->Header.OldestRecordNumber == 0) - LogFile->Header.OldestRecordNumber = 1; - if (WriteOffSet == LogFile->Header.EndOffset) { LogFile->Header.EndOffset += dwWritten; Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Sat Dec 31 15:23:59 2011 @@ -243,11 +243,8 @@ lpLogFile->Header.OldestRecordNumber, lpLogFile->Header.CurrentRecordNumber); - if (lpLogFile->Header.OldestRecordNumber == 0) - *NumberOfRecords = 0; - else - *NumberOfRecords = lpLogFile->Header.CurrentRecordNumber - - lpLogFile->Header.OldestRecordNumber; + *NumberOfRecords = lpLogFile->Header.CurrentRecordNumber - + lpLogFile->Header.OldestRecordNumber; return STATUS_SUCCESS; } @@ -271,8 +268,8 @@ return STATUS_INVALID_PARAMETER; } - *OldestRecordNumber = 0; *OldestRecordNumber = LogfGetOldestRecord(lpLogHandle->LogFile); + return STATUS_SUCCESS; }

1 0

[jgardou] 54793: [NEWINFLIB] - use _snwprintf instead of swprintf (MSVC is not compliant with standard here)
by jgardou＠svn.reactos.org 31 Dec '11

31 Dec '11

Author: jgardou Date: Sat Dec 31 14:33:35 2011 New Revision: 54793 URL: http://svn.reactos.org/svn/reactos?rev=54793&view=rev Log: [NEWINFLIB] - use _snwprintf instead of swprintf (MSVC is not compliant with standard here) Modified: trunk/reactos/lib/newinflib/infget.c Modified: trunk/reactos/lib/newinflib/infget.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infget.c?rev… ============================================================================== --- trunk/reactos/lib/newinflib/infget.c [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/infget.c [iso-8859-1] Sat Dec 31 14:33:35 2011 @@ -48,9 +48,10 @@ if (Inf->LanguageId != 0) { - swprintf(StringLangId, - L"Strings.%04hx", - Inf->LanguageId); + _snwprintf(StringLangId, + 13, + L"Strings.%04hx", + Inf->LanguageId); Status = InfpFindFirstLine(Inf, StringLangId, @@ -58,9 +59,10 @@ &Context); if (Status != INF_STATUS_SUCCESS) { - swprintf(StringLangId, - L"Strings.%04hx", - MAKELANGID(PRIMARYLANGID(Inf->LanguageId), SUBLANG_NEUTRAL)); + _snwprintf(StringLangId, + 13, + L"Strings.%04hx", + MAKELANGID(PRIMARYLANGID(Inf->LanguageId), SUBLANG_NEUTRAL)); Status = InfpFindFirstLine(Inf, StringLangId,

1 0

[janderwald] 54792: [USB-BRINGUP] - Partly implement IRP_MN_START_DEVICE for PDO - PDO now completely initializes - Remaining IOCTL to implement IRP_MJ_CREATE, IRP_MJ_CLOSE, IRP_MJ_FLUSH, IRP_MJ_RE...
by janderwald＠svn.reactos.org 31 Dec '11

31 Dec '11

Author: janderwald Date: Sat Dec 31 04:13:37 2011 New Revision: 54792 URL: http://svn.reactos.org/svn/reactos?rev=54792&view=rev Log: [USB-BRINGUP] - Partly implement IRP_MN_START_DEVICE for PDO - PDO now completely initializes - Remaining IOCTL to implement IRP_MJ_CREATE, IRP_MJ_CLOSE, IRP_MJ_FLUSH, IRP_MJ_READ for partial mouse support in hidclass Modified: branches/usb-bringup/drivers/hid/hidclass/hidclass.c branches/usb-bringup/drivers/hid/hidclass/pdo.c branches/usb-bringup/drivers/hid/hidclass/precomp.h 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] Sat Dec 31 04:13:37 2011 @@ -128,6 +128,8 @@ { UNIMPLEMENTED ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; } @@ -139,6 +141,8 @@ { UNIMPLEMENTED ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; } @@ -150,6 +154,8 @@ { UNIMPLEMENTED ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; } @@ -161,6 +167,8 @@ { UNIMPLEMENTED ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; } Modified: branches/usb-bringup/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/pdo.c [iso-8859-1] Sat Dec 31 04:13:37 2011 @@ -422,13 +422,27 @@ } case IRP_MN_START_DEVICE: { - DPRINT1("[HIDCLASS] PDO PnP not implemented %x\n", IoStack->MinorFunction); - ASSERT(FALSE); - - // - // do nothing - // - Status = Irp->IoStatus.Status; + // + // FIXME: support polled devices + // + ASSERT(PDODeviceExtension->Common.DriverExtension->DevicesArePolled == FALSE); + + // + // now register the device interface + // + Status = IoRegisterDeviceInterface(PDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject, &GUID_DEVINTERFACE_HID, NULL, &PDODeviceExtension->DeviceInterface); + if (NT_SUCCESS(Status)) + { + // + // enable device interface + // + Status = IoSetDeviceInterfaceState(&PDODeviceExtension->DeviceInterface, TRUE); + } + ASSERT(Status == STATUS_SUCCESS); + + // + // break + // break; } case IRP_MN_REMOVE_DEVICE: @@ -528,7 +542,7 @@ // PDODeviceExtension->Common.HidDeviceExtension.MiniDeviceExtension = FDODeviceExtension->Common.HidDeviceExtension.MiniDeviceExtension; PDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject = FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject; - PDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject = NULL; + PDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject = FDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject; PDODeviceExtension->Common.IsFDO = FALSE; PDODeviceExtension->Common.DriverExtension = FDODeviceExtension->Common.DriverExtension; RtlCopyMemory(&PDODeviceExtension->Attributes, &FDODeviceExtension->Attributes, sizeof(HID_DEVICE_ATTRIBUTES)); 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] Sat Dec 31 04:13:37 2011 @@ -2,10 +2,10 @@ #define _HIDPI_NO_FUNCTION_MACROS_ #include <ntddk.h> +#include <initguid.h> #include <hidport.h> #include <hidpddi.h> #include <stdio.h> -#include <initguid.h> #include <wdmguid.h> #include <debug.h> @@ -108,6 +108,10 @@ // ULONG CollectionIndex; + // + // device interface + // + UNICODE_STRING DeviceInterface; }HIDCLASS_PDO_DEVICE_EXTENSION, *PHIDCLASS_PDO_DEVICE_EXTENSION;

1 0

[janderwald] 54791: [USB-BRINGUP] - Implement HidClassFDO_DeviceRelations - Implement IOCTL_HID_GET_COLLECTION_INFORMATION, IOCTL_HID_GET_COLLECTION_DESCRIPTOR - Implement IRP_MN_QUERY_ID, IRP_MN_Q...
by janderwald＠svn.reactos.org 31 Dec '11

31 Dec '11

Author: janderwald Date: Sat Dec 31 03:33:14 2011 New Revision: 54791 URL: http://svn.reactos.org/svn/reactos?rev=54791&view=rev Log: [USB-BRINGUP] - Implement HidClassFDO_DeviceRelations - Implement IOCTL_HID_GET_COLLECTION_INFORMATION, IOCTL_HID_GET_COLLECTION_DESCRIPTOR - Implement IRP_MN_QUERY_ID, IRP_MN_QUERY_CAPABILITIES, IRP_MN_QUERY_BUS_INFORMATION, IRP_MN_QUERY_PNP_STATE, IRP_MN_QUERY_DEVICE_RELATIONS, - HIDClass PDO is now created and starts initialization, needs IRP_MN_START_DEVICE request implementation - Tested in Vbox 4.1.4 + WinXP + ReactOS hidusb,hidmou,hidclass Added: branches/usb-bringup/drivers/hid/hidclass/pdo.c (with props) Modified: branches/usb-bringup/drivers/hid/hidclass/CMakeLists.txt branches/usb-bringup/drivers/hid/hidclass/fdo.c 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] Sat Dec 31 03:33:14 2011 @@ -5,6 +5,7 @@ fdo.c hidclass.c hidclass.rc + pdo.c ${CMAKE_CURRENT_BINARY_DIR}/hidclass.def) add_library(hidclass SHARED ${SOURCE}) Modified: 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 [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/fdo.c [iso-8859-1] Sat Dec 31 03:33:14 2011 @@ -145,7 +145,7 @@ IN PIRP Irp) { KEVENT Event; - PHIDCLASS_FDO_EXTENSION FDODeviceExtension; + PHIDCLASS_COMMON_DEVICE_EXTENSION CommonDeviceExtension; NTSTATUS Status; PIO_STACK_LOCATION IoStack; @@ -157,8 +157,7 @@ // // get device extension // - FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; - ASSERT(FDODeviceExtension->Common.IsFDO); + CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; // // set completion routine @@ -187,7 +186,7 @@ // call driver // DPRINT1("IoStack MajorFunction %x MinorFunction %x\n", IoStack->MajorFunction, IoStack->MinorFunction); - Status = FDODeviceExtension->DriverExtension->MajorFunction[IoStack->MajorFunction](DeviceObject, Irp); + Status = CommonDeviceExtension->DriverExtension->MajorFunction[IoStack->MajorFunction](DeviceObject, Irp); // // wait for the request to finish @@ -393,13 +392,132 @@ } NTSTATUS +HidClassFDO_CopyDeviceRelations( + IN PDEVICE_OBJECT DeviceObject, + OUT PDEVICE_RELATIONS *OutRelations) +{ + PDEVICE_RELATIONS DeviceRelations; + PHIDCLASS_FDO_EXTENSION FDODeviceExtension; + ULONG Index; + + // + // get device extension + // + FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // allocate result + // + DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePool(NonPagedPool, sizeof(DEVICE_RELATIONS) + (FDODeviceExtension->DeviceRelations.Count-1) * sizeof(PDEVICE_OBJECT)); + if (!DeviceRelations) + { + // + // no memory + // + *OutRelations = NULL; + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // copy device objects + // + for(Index = 0; Index < FDODeviceExtension->DeviceRelations.Count; Index++) + { + // + // reference pdo + // + ObReferenceObject(FDODeviceExtension->DeviceRelations.Objects[Index]); + + // + // store object + // + DeviceRelations->Objects[Index] = FDODeviceExtension->DeviceRelations.Objects[Index]; + } + + // + // set object count + // + DeviceRelations->Count = FDODeviceExtension->DeviceRelations.Count; + + + // + // store result + // + *OutRelations = DeviceRelations; + return STATUS_SUCCESS; +} + +NTSTATUS HidClassFDO_DeviceRelations( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + PHIDCLASS_FDO_EXTENSION FDODeviceExtension; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + PDEVICE_RELATIONS DeviceRelations; + + // + // get device extension + // + FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // get current irp stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // check relations type + // + if (IoStack->Parameters.QueryDeviceRelations.Type != BusRelations) + { + // + // only bus relations are handled + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject, Irp); + } + + if (FDODeviceExtension->DeviceRelations.Count == 0) + { + // + // time to create the pdos + // + Status = HidClassPDO_CreatePDO(DeviceObject); + if (!NT_SUCCESS(Status)) + { + // + // failed + // + DPRINT1("[HIDCLASS] HidClassPDO_CreatePDO failed with %x\n", Status); + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + // + // sanity check + // + ASSERT(FDODeviceExtension->DeviceRelations.Count > 0); + } + + // + // now copy device relations + // + Status = HidClassFDO_CopyDeviceRelations(DeviceObject, &DeviceRelations); + // + // store result + // + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; + + // + // complete request + // + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; } NTSTATUS 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] Sat Dec 31 03:33:14 2011 @@ -83,7 +83,7 @@ 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; + FDODeviceExtension->Common.DriverExtension = DriverExtension; /* sanity check */ ASSERT(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject); @@ -170,9 +170,105 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION IoStack; + PHIDCLASS_COMMON_DEVICE_EXTENSION CommonDeviceExtension; + PHID_COLLECTION_INFORMATION CollectionInformation; + PHIDCLASS_PDO_DEVICE_EXTENSION PDODeviceExtension; + + // + // get device extension + // + CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(CommonDeviceExtension->IsFDO == FALSE); + PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)CommonDeviceExtension; + + // + // get stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + switch(IoStack->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_HID_GET_COLLECTION_INFORMATION: + { + // + // check if output buffer is big enough + // + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(HID_COLLECTION_INFORMATION)) + { + // + // invalid buffer size + // + Irp->IoStatus.Status = STATUS_INVALID_BUFFER_SIZE; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_BUFFER_SIZE; + } + + // + // get output buffer + // + CollectionInformation = (PHID_COLLECTION_INFORMATION)Irp->AssociatedIrp.SystemBuffer; + ASSERT(CollectionInformation); + + // + // init result buffer + // + CollectionInformation->DescriptorSize = PDODeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength; //FIXME which collection is to be retrieved for composite devices / multi collection devices? + CollectionInformation->Polled = CommonDeviceExtension->DriverExtension->DevicesArePolled; + CollectionInformation->VendorID = PDODeviceExtension->Attributes.VendorID; + CollectionInformation->ProductID = PDODeviceExtension->Attributes.ProductID; + CollectionInformation->VersionNumber = PDODeviceExtension->Attributes.VersionNumber; + + // + // complete request + // + Irp->IoStatus.Information = sizeof(HID_COLLECTION_INFORMATION); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + case IOCTL_HID_GET_COLLECTION_DESCRIPTOR: + { + // + // FIXME: which collection to use for composite / multi collection devices... + // + + // + // check if output buffer is big enough + // + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < PDODeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength) + { + // + // invalid buffer size + // + Irp->IoStatus.Status = STATUS_INVALID_BUFFER_SIZE; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_BUFFER_SIZE; + } + + // + // copy result + // + ASSERT(Irp->UserBuffer); + RtlCopyMemory(Irp->UserBuffer, PDODeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedData, PDODeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength); + + // + // complete request + // + Irp->IoStatus.Information = PDODeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + default: + { + DPRINT1("[HIDCLASS] DeviceControl IoControlCode 0x%x not implemented\n", IoStack->Parameters.DeviceIoControl.IoControlCode); + ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; + } + } } NTSTATUS @@ -212,14 +308,22 @@ CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; // - // FIXME: support PDO - // - ASSERT(CommonDeviceExtension->IsFDO == TRUE); - - // - // handle request - // - return HidClassFDO_PnP(DeviceObject, Irp); + // check type of device object + // + if (CommonDeviceExtension->IsFDO) + { + // + // handle request + // + return HidClassFDO_PnP(DeviceObject, Irp); + } + else + { + // + // handle request + // + return HidClassPDO_PnP(DeviceObject, Irp); + } } NTSTATUS Added: branches/usb-bringup/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/pdo.c (added) +++ branches/usb-bringup/drivers/hid/hidclass/pdo.c [iso-8859-1] Sat Dec 31 03:33:14 2011 @@ -1,0 +1,566 @@ +/* + * 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 +HidClassPDO_HandleQueryDeviceId( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + LPWSTR Buffer; + LPWSTR NewBuffer, Ptr; + ULONG Length; + + // + // copy current stack location + // + IoCopyCurrentIrpStackLocationToNext(Irp); + + // + // call mini-driver + // + Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); + if (!NT_SUCCESS(Status)) + { + // + // failed + // + return Status; + } + + // + // get buffer + // + Buffer = (LPWSTR)Irp->IoStatus.Information; + Length = wcslen(Buffer); + + // + // allocate new buffer + // + NewBuffer = (LPWSTR)ExAllocatePool(NonPagedPool, (Length + 1) * sizeof(WCHAR)); + if (!NewBuffer) + { + // + // failed to allocate buffer + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // replace bus + // + wcscpy(NewBuffer, L"HID\\"); + + // + // get offset to first '\\' + // + Ptr = wcschr(Buffer, L'\\'); + if (Ptr) + { + // + // append result + // + wcscat(NewBuffer, Ptr + 1); + } + + // + // free old buffer + // + ExFreePool(Buffer); + + // + // store result + // + Irp->IoStatus.Information = (ULONG_PTR)NewBuffer; + return STATUS_SUCCESS; +} + +NTSTATUS +HidClassPDO_HandleQueryHardwareId( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + PHIDCLASS_PDO_DEVICE_EXTENSION PDODeviceExtension; + WCHAR Buffer[100]; + ULONG Offset = 0; + LPWSTR Ptr; + + // + // get device extension + // + PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + + // + // copy current stack location + // + IoCopyCurrentIrpStackLocationToNext(Irp); + + // + // call mini-driver + // + Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); + if (!NT_SUCCESS(Status)) + { + // + // failed + // + return Status; + } + + // + // store hardware ids + // + Offset = swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x&Rev_%04x", PDODeviceExtension->Attributes.VendorID, PDODeviceExtension->Attributes.ProductID, PDODeviceExtension->Attributes.VersionNumber) + 1; + Offset += swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x", PDODeviceExtension->Attributes.VendorID, PDODeviceExtension->Attributes.ProductID) + 1; + + if (PDODeviceExtension->DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].UsagePage == HID_USAGE_PAGE_GENERIC) + { + switch(PDODeviceExtension->DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].Usage) + { + case HID_USAGE_GENERIC_POINTER: + case HID_USAGE_GENERIC_MOUSE: + // + // Pointer / Mouse + // + Offset += swprintf(&Buffer[Offset], L"HID_DEVICE_SYSTEM_MOUSE") + 1; + break; + case HID_USAGE_GENERIC_GAMEPAD: + case HID_USAGE_GENERIC_JOYSTICK: + // + // Joystick / Gamepad + // + Offset += swprintf(&Buffer[Offset], L"HID_DEVICE_SYSTEM_GAME") + 1; + break; + case HID_USAGE_GENERIC_KEYBOARD: + case HID_USAGE_GENERIC_KEYPAD: + // + // Keyboard / Keypad + // + Offset += swprintf(&Buffer[Offset], L"HID_DEVICE_SYSTEM_KEYBOARD") + 1; + break; + case HID_USAGE_GENERIC_SYSTEM_CTL: + // + // System Control + // + Offset += swprintf(&Buffer[Offset], L"HID_DEVICE_SYSTEM_CONTROL") + 1; + break; + } + } + else if (PDODeviceExtension->DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].UsagePage == HID_USAGE_PAGE_CONSUMER && PDODeviceExtension->DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].Usage == HID_USAGE_CONSUMERCTRL) + { + // + // Consumer Audio Control + // + Offset += swprintf(&Buffer[Offset], L"HID_DEVICE_SYSTEM_CONSUMER") + 1; + } + + // + // FIXME: add 'HID_DEVICE_UP:0001_U:0002' + // + + // + // add HID + // + Offset +=swprintf(&Buffer[Offset], L"HID_DEVICE") + 1; + + // + // free old buffer + // + ExFreePool((PVOID)Irp->IoStatus.Information); + + // + // allocate buffer + // + Ptr = (LPWSTR)ExAllocatePool(NonPagedPool, (Offset +1)* sizeof(WCHAR)); + if (!Ptr) + { + // + // no memory + // + Irp->IoStatus.Information = 0; + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // copy buffer + // + RtlCopyMemory(Ptr, Buffer, Offset * sizeof(WCHAR)); + Ptr[Offset] = UNICODE_NULL; + + // + // store result + // + Irp->IoStatus.Information = (ULONG_PTR)Ptr; + return STATUS_SUCCESS; +} + +NTSTATUS +HidClassPDO_HandleQueryInstanceId( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + + // + // copy current stack location + // + IoCopyCurrentIrpStackLocationToNext(Irp); + + // + // call mini-driver + // + Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); + if (!NT_SUCCESS(Status)) + { + // + // failed + // + return Status; + } + DPRINT1("HidClassPDO_HandleQueryInstanceId Buffer %S\n", Irp->IoStatus.Information); + // + //TODO implement instance id + // example: + // HID\VID_045E&PID_0047\8&1A0700BC&0&0000 + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +HidClassPDO_HandleQueryCompatibleId( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + + // + // copy current stack location + // + IoCopyCurrentIrpStackLocationToNext(Irp); + + // + // call mini-driver + // + Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); + if (!NT_SUCCESS(Status)) + { + // + // failed + // + return Status; + } + + // + // FIXME: implement me + // + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +HidClassPDO_PnP( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PHIDCLASS_PDO_DEVICE_EXTENSION PDODeviceExtension; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + PPNP_BUS_INFORMATION BusInformation; + PDEVICE_RELATIONS DeviceRelation; + + // + // get device extension + // + PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + + // + // get current irp stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // handle request + // + switch(IoStack->MinorFunction) + { + case IRP_MN_QUERY_ID: + { + if (IoStack->Parameters.QueryId.IdType == BusQueryDeviceID) + { + // + // handle query device id + // + Status = HidClassPDO_HandleQueryDeviceId(DeviceObject, Irp); + break; + } + else if (IoStack->Parameters.QueryId.IdType == BusQueryHardwareIDs) + { + // + // handle instance id + // + Status = HidClassPDO_HandleQueryHardwareId(DeviceObject, Irp); + break; + } + else if (IoStack->Parameters.QueryId.IdType == BusQueryInstanceID) + { + // + // handle instance id + // + Status = HidClassPDO_HandleQueryInstanceId(DeviceObject, Irp); + break; + } + else if (IoStack->Parameters.QueryId.IdType == BusQueryCompatibleIDs) + { + // + // handle instance id + // + Status = HidClassPDO_HandleQueryCompatibleId(DeviceObject, Irp); + break; + } + + DPRINT1("[HIDCLASS]: IRP_MN_QUERY_ID IdType %x unimplemented\n", IoStack->Parameters.QueryId.IdType); + Status = STATUS_NOT_SUPPORTED; + Irp->IoStatus.Information = 0; + break; + } + case IRP_MN_QUERY_CAPABILITIES: + { + if (IoStack->Parameters.DeviceCapabilities.Capabilities == NULL) + { + // + // invalid request + // + Status = STATUS_DEVICE_CONFIGURATION_ERROR; + } + + // + // copy capabilities + // + RtlCopyMemory(IoStack->Parameters.DeviceCapabilities.Capabilities, &PDODeviceExtension->Capabilities, sizeof(DEVICE_CAPABILITIES)); + Status = STATUS_SUCCESS; + break; + } + case IRP_MN_QUERY_BUS_INFORMATION: + { + // + // + // + BusInformation = (PPNP_BUS_INFORMATION)ExAllocatePool(NonPagedPool, sizeof(PNP_BUS_INFORMATION)); + + // + // fill in result + // + RtlCopyMemory(&BusInformation->BusTypeGuid, &GUID_BUS_TYPE_HID, sizeof(GUID)); + BusInformation->LegacyBusType = PNPBus; + BusInformation->BusNumber = 0; //FIXME + + // + // store result + // + Irp->IoStatus.Information = (ULONG_PTR)BusInformation; + Status = STATUS_SUCCESS; + break; + } + case IRP_MN_QUERY_PNP_DEVICE_STATE: + { + // + // FIXME set flags when driver fails / disabled + // + Status = STATUS_SUCCESS; + break; + } + case IRP_MN_QUERY_DEVICE_RELATIONS: + { + // + // only target relations are supported + // + if (IoStack->Parameters.QueryDeviceRelations.Type != TargetDeviceRelation) + { + // + // not supported + // + Status = Irp->IoStatus.Status; + break; + } + + // + // allocate device relations + // + DeviceRelation = (PDEVICE_RELATIONS)ExAllocatePool(NonPagedPool, sizeof(DEVICE_RELATIONS)); + if (!DeviceRelation) + { + // + // no memory + // + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + // + // init device relation + // + DeviceRelation->Count = 1; + DeviceRelation->Objects[0] = DeviceObject; + ObReferenceObject(DeviceRelation->Objects[0]); + + // + // store result + // + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelation; + Status = STATUS_SUCCESS; + break; + } + case IRP_MN_START_DEVICE: + { + DPRINT1("[HIDCLASS] PDO PnP not implemented %x\n", IoStack->MinorFunction); + ASSERT(FALSE); + + // + // do nothing + // + Status = Irp->IoStatus.Status; + break; + } + case IRP_MN_REMOVE_DEVICE: + { + DPRINT1("[HIDCLASS] PDO IRP_MN_REMOVE_DEVICE not implemented\n"); + ASSERT(FALSE); + + // + // do nothing + // + Status = Irp->IoStatus.Status; + break; + } + case IRP_MN_QUERY_INTERFACE: + { + DPRINT1("[HIDCLASS] PDO IRP_MN_QUERY_INTERFACE not implemented\n"); + ASSERT(FALSE); + + // + // do nothing + // + Status = Irp->IoStatus.Status; + break; + } + default: + { + // + // do nothing + // + Status = Irp->IoStatus.Status; + break; + } + } + + // + // complete request + // + if (Status != STATUS_PENDING) + { + // + // store result + // + Irp->IoStatus.Status = Status; + + // + // complete request + // + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + // + // done processing + // + return Status; +} + +NTSTATUS +HidClassPDO_CreatePDO( + IN PDEVICE_OBJECT DeviceObject) +{ + PHIDCLASS_FDO_EXTENSION FDODeviceExtension; + NTSTATUS Status; + PDEVICE_OBJECT PDODeviceObject; + PHIDCLASS_PDO_DEVICE_EXTENSION PDODeviceExtension; + + // + // get device extension + // + FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // lets create the device object + // + Status = IoCreateDevice(FDODeviceExtension->Common.DriverExtension->DriverObject, sizeof(HIDCLASS_PDO_DEVICE_EXTENSION), NULL, FILE_DEVICE_UNKNOWN, FILE_AUTOGENERATED_DEVICE_NAME, FALSE, &PDODeviceObject); + if (!NT_SUCCESS(Status)) + { + // + // failed to create device + // + DPRINT1("[HIDCLASS] Failed to create device %x\n", Status); + return Status; + } + + // + // patch stack size + // + PDODeviceObject->StackSize = DeviceObject->StackSize + 1; + + // + // get device extension + // + PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)PDODeviceObject->DeviceExtension; + + // + // init device extension + // + PDODeviceExtension->Common.HidDeviceExtension.MiniDeviceExtension = FDODeviceExtension->Common.HidDeviceExtension.MiniDeviceExtension; + PDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject = FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject; + PDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject = NULL; + PDODeviceExtension->Common.IsFDO = FALSE; + PDODeviceExtension->Common.DriverExtension = FDODeviceExtension->Common.DriverExtension; + RtlCopyMemory(&PDODeviceExtension->Attributes, &FDODeviceExtension->Attributes, sizeof(HID_DEVICE_ATTRIBUTES)); + RtlCopyMemory(&PDODeviceExtension->DeviceDescription, &FDODeviceExtension->DeviceDescription, sizeof(HIDP_DEVICE_DESC)); + RtlCopyMemory(&PDODeviceExtension->Capabilities, &FDODeviceExtension->Capabilities, sizeof(DEVICE_CAPABILITIES)); + + // + // FIXME: support composite devices + // + PDODeviceExtension->CollectionIndex = 0; + ASSERT(PDODeviceExtension->DeviceDescription.CollectionDescLength == 1); + + // + // store in device relations struct + // + FDODeviceExtension->DeviceRelations.Count = 1; + FDODeviceExtension->DeviceRelations.Objects[0] = PDODeviceObject; + + // + // set device flags + // + PDODeviceObject->Flags |= DO_MAP_IO_BUFFER; + + // + // device is initialized + // + PDODeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + ObReferenceObject(PDODeviceObject); + + // + // done + // + return STATUS_SUCCESS; +} Propchange: branches/usb-bringup/drivers/hid/hidclass/pdo.c ------------------------------------------------------------------------------ svn:eol-style = native 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] Sat Dec 31 03:33:14 2011 @@ -4,7 +4,11 @@ #include <ntddk.h> #include <hidport.h> #include <hidpddi.h> +#include <stdio.h> +#include <initguid.h> +#include <wdmguid.h> #include <debug.h> + typedef struct @@ -21,11 +25,22 @@ typedef struct { + // + // hid device extension + // HID_DEVICE_EXTENSION HidDeviceExtension; + + // + // if it is a pdo + // BOOLEAN IsFDO; + + // + // driver extension + // + PHIDCLASS_DRIVER_EXTENSION DriverExtension; + }HIDCLASS_COMMON_DEVICE_EXTENSION, *PHIDCLASS_COMMON_DEVICE_EXTENSION; - - typedef struct { @@ -33,11 +48,6 @@ // parts shared by fdo and pdo // HIDCLASS_COMMON_DEVICE_EXTENSION Common; - - // - // driver extension - // - PHIDCLASS_DRIVER_EXTENSION DriverExtension; // // device capabilities @@ -64,7 +74,41 @@ // HIDP_DEVICE_DESC DeviceDescription; + // + // device relations + // + DEVICE_RELATIONS DeviceRelations; + }HIDCLASS_FDO_EXTENSION, *PHIDCLASS_FDO_EXTENSION; + +typedef struct +{ + // + // parts shared by fdo and pdo + // + HIDCLASS_COMMON_DEVICE_EXTENSION Common; + + // + // device descriptor + // + HID_DEVICE_ATTRIBUTES Attributes; + + // + // device capabilities + // + DEVICE_CAPABILITIES Capabilities; + + // + // device description + // + HIDP_DEVICE_DESC DeviceDescription; + + // + // collection index + // + ULONG CollectionIndex; + +}HIDCLASS_PDO_DEVICE_EXTENSION, *PHIDCLASS_PDO_DEVICE_EXTENSION; /* fdo.c */ @@ -73,3 +117,20 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS +HidClassFDO_DispatchRequestSynchronous( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +/* pdo.c */ +NTSTATUS +HidClassPDO_CreatePDO( + IN PDEVICE_OBJECT DeviceObject); + +NTSTATUS +HidClassPDO_PnP( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + + +/* eof */

1 0

[janderwald] 54790: [USB-BRINGUP] - add missing defines
by janderwald＠svn.reactos.org 31 Dec '11

31 Dec '11

Author: janderwald Date: Sat Dec 31 03:21:11 2011 New Revision: 54790 URL: http://svn.reactos.org/svn/reactos?rev=54790&view=rev Log: [USB-BRINGUP] - add missing defines Modified: branches/usb-bringup/include/psdk/hidusage.h Modified: branches/usb-bringup/include/psdk/hidusage.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/include/psdk/hidusa… ============================================================================== --- branches/usb-bringup/include/psdk/hidusage.h [iso-8859-1] (original) +++ branches/usb-bringup/include/psdk/hidusage.h [iso-8859-1] Sat Dec 31 03:21:11 2011 @@ -199,6 +199,14 @@ #define HID_USAGE_SIMULATION_RUDDER ((USAGE) 0xBA) #define HID_USAGE_SIMULATION_THROTTLE ((USAGE) 0xBB) + +#define HID_USAGE_CONSUMERCTRL ((USAGE)0x01) +#define HID_USAGE_DIGITIZER_PEN ((USAGE)0x02) +#define HID_USAGE_DIGITIZER_IN_RANGE ((USAGE)0x32) +#define HID_USAGE_DIGITIZER_TIP_SWITCH ((USAGE)0x42) +#define HID_USAGE_DIGITIZER_BARREL_SWITCH ((USAGE)0x44) + + #ifdef __cplusplus } #endif

1 0

[pschweitzer] 54789: [KERNEL32] CreateDirectory: handle the case when the FS doesn't support EAs. This should fix VBox and is mandatory if we want to support MS FSD with FAT32
by pschweitzer＠svn.reactos.org 31 Dec '11

31 Dec '11

Author: pschweitzer Date: Sat Dec 31 02:01:34 2011 New Revision: 54789 URL: http://svn.reactos.org/svn/reactos?rev=54789&view=rev Log: [KERNEL32] CreateDirectory: handle the case when the FS doesn't support EAs. This should fix VBox and is mandatory if we want to support MS FSD with FAT32 Modified: trunk/reactos/dll/win32/kernel32/client/file/dir.c Modified: trunk/reactos/dll/win32/kernel32/client/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/dir.c [iso-8859-1] Sat Dec 31 02:01:34 2011 @@ -342,6 +342,12 @@ } else { + if (Status == STATUS_EAS_NOT_SUPPORTED) + { + /* Extended attributes are not supported, so, this is OK */ + /* FIXME: Would deserve a deeper look, comparing with Windows */ + Status = STATUS_SUCCESS; + } /* failure or no extended attributes present, break the loop */ break; }

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