Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[pschweitzer] 54778: [SYSDM] Fix memory leak
by pschweitzer＠svn.reactos.org 29 Dec '11

29 Dec '11

Author: pschweitzer Date: Thu Dec 29 13:20:18 2011 New Revision: 54778 URL: http://svn.reactos.org/svn/reactos?rev=54778&view=rev Log: [SYSDM] Fix memory leak 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:20:18 2011 @@ -207,7 +207,10 @@ return FALSE; if (!GetProfileCount(&pProfileData->dwProfileCount)) - return FALSE; + { + HeapFree(pProfileData, 0, GetProcessHeap()); + return FALSE; + } pProfileData->pProfiles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pProfileData->dwProfileCount * sizeof(PROFILE));

1 0

[janderwald] 54777: [USBOHCI] - Silence a few traces - Add a hack for handling URB_FUNCTION_CLASS_INTERFACE. The hid bus driver performs this request with zero buffer length, which is not valid. Ne...
by janderwald＠svn.reactos.org 29 Dec '11

29 Dec '11

Author: janderwald Date: Thu Dec 29 10:13:36 2011 New Revision: 54777 URL: http://svn.reactos.org/svn/reactos?rev=54777&view=rev Log: [USBOHCI] - Silence a few traces - Add a hack for handling URB_FUNCTION_CLASS_INTERFACE. The hid bus driver performs this request with zero buffer length, which is not valid. Needs more investigation Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.cpp branches/usb-bringup/drivers/usb/usbohci/hub_controller.cpp branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Thu Dec 29 10:13:36 2011 @@ -1364,7 +1364,7 @@ // // defer processing // - DPRINT1("Status %x Acknowledge %x FrameNumber %x\n", Status, Acknowledge, This->m_HCCA->CurrentFrameNumber); + DPRINT("Status %x Acknowledge %x FrameNumber %x\n", Status, Acknowledge, This->m_HCCA->CurrentFrameNumber); KeInsertQueueDpc(&This->m_IntDpcObject, (PVOID)Status, (PVOID)(DoneHead & ~1)); // Modified: branches/usb-bringup/drivers/usb/usbohci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] Thu Dec 29 10:13:36 2011 @@ -1633,6 +1633,12 @@ DPRINT1("Request %x\n", Urb->UrbControlVendorClassRequest.Request); DPRINT1("Value %x\n", Urb->UrbControlVendorClassRequest.Value); DPRINT1("Index %x\n", Urb->UrbControlVendorClassRequest.Index); + + if (Urb->UrbControlVendorClassRequest.TransferBufferLength == 0) + { + DPRINT1("Invalid request length\n"); + return STATUS_SUCCESS; + } // // initialize setup packet Modified: branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] Thu Dec 29 10:13:36 2011 @@ -620,7 +620,7 @@ POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor, PreviousEndpointDescriptor; NTSTATUS Status; - DPRINT1("CUSBQueue::TransferDescriptorCompletionCallback transfer descriptor %x\n", TransferDescriptorLogicalAddress); + DPRINT("CUSBQueue::TransferDescriptorCompletionCallback transfer descriptor %x\n", TransferDescriptorLogicalAddress); // // find transfer descriptor in control list Modified: branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] Thu Dec 29 10:13:36 2011 @@ -941,7 +941,7 @@ Descriptor->Flags |= OHCI_ENDPOINT_SET_ENDPOINT_NUMBER(GetEndpointAddress()); Descriptor->Flags |= OHCI_ENDPOINT_SET_MAX_PACKET_SIZE(GetMaxPacketSize()); - DPRINT1("Flags %x DeviceAddress %x EndpointAddress %x PacketSize %x\n", Descriptor->Flags, GetDeviceAddress(), GetEndpointAddress(), GetMaxPacketSize()); + DPRINT("Flags %x DeviceAddress %x EndpointAddress %x PacketSize %x\n", Descriptor->Flags, GetDeviceAddress(), GetEndpointAddress(), GetMaxPacketSize()); // // is there an endpoint descriptor

1 0

[janderwald] 54776: [USB-BRINGUP] - Usage page of zero is not used, increment, the MouHid_ButtonUpFlags / MouHid_ButtonDownFlags array - Mouse clicks now work - Implement flushing of the hid report...
by janderwald＠svn.reactos.org 29 Dec '11

29 Dec '11

Author: janderwald Date: Thu Dec 29 10:07:00 2011 New Revision: 54776 URL: http://svn.reactos.org/svn/reactos?rev=54776&view=rev Log: [USB-BRINGUP] - Usage page of zero is not used, increment, the MouHid_ButtonUpFlags / MouHid_ButtonDownFlags array - Mouse clicks now work - Implement flushing of the hid report queue - Driver now works in VBox 4.1.4 + WinXP - Secondary mouse pointer does not move in VBox (either a Vbox bug / WinXP), tested with ms driver and the same results were reveiled Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.c Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/mouhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/mouhid/mouhid.c [iso-8859-1] Thu Dec 29 10:07:00 2011 @@ -12,6 +12,7 @@ static USHORT MouHid_ButtonUpFlags[] = { + 0xFF, /* unused */ MOUSE_LEFT_BUTTON_DOWN, MOUSE_RIGHT_BUTTON_DOWN, MOUSE_MIDDLE_BUTTON_DOWN, @@ -21,6 +22,7 @@ static USHORT MouHid_ButtonDownFlags[] = { + 0xFF, /* unused */ MOUSE_LEFT_BUTTON_UP, MOUSE_RIGHT_BUTTON_UP, MOUSE_MIDDLE_BUTTON_UP, @@ -400,7 +402,7 @@ NTSTATUS NTAPI -MouHid_DeviceControl( +MouHid_InternalDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -412,7 +414,7 @@ /* get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("[MOUHID] DeviceControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); + DPRINT1("[MOUHID] InternalDeviceControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); /* get device extension */ DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -424,6 +426,7 @@ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(MOUSE_ATTRIBUTES)) { /* invalid request */ + DPRINT1("[MOUHID] IOCTL_MOUSE_QUERY_ATTRIBUTES Buffer too small\n"); Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_BUFFER_TOO_SMALL; @@ -443,6 +446,11 @@ /* queue length */ Attributes->InputDataQueueLength = 2; + + DPRINT1("[MOUHID] MouseIdentifier %x\n", Attributes->MouseIdentifier); + DPRINT1("[MOUHID] NumberOfButtons %x\n", Attributes->NumberOfButtons); + DPRINT1("[MOUHID] SampleRate %x\n", Attributes->SampleRate); + DPRINT1("[MOUHID] InputDataQueueLength %x\n", Attributes->InputDataQueueLength); /* complete request */ Irp->IoStatus.Information = sizeof(MOUSE_ATTRIBUTES); @@ -504,6 +512,7 @@ return STATUS_INVALID_DEVICE_REQUEST; } + DPRINT1("[MOUHID] Unknown DeviceControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); /* unknown request not supported */ Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -512,7 +521,7 @@ NTSTATUS NTAPI -MouHid_InternalDeviceControl( +MouHid_DeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -535,7 +544,6 @@ IN PIRP Irp) { UNIMPLEMENTED - ASSERT(FALSE); return STATUS_NOT_IMPLEMENTED; } @@ -738,6 +746,32 @@ NTSTATUS NTAPI +MouHid_Flush( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PMOUHID_DEVICE_EXTENSION DeviceExtension; + + /* get device extension */ + DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* skip current stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* get next stack location */ + IoStack = IoGetNextIrpStackLocation(Irp); + + /* change request to hid flush queue request */ + IoStack->MajorFunction = IRP_MJ_DEVICE_CONTROL; + IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_HID_FLUSH_QUEUE; + + /* call device */ + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); +} + +NTSTATUS +NTAPI MouHid_Pnp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -915,6 +949,7 @@ DriverObject->DriverExtension->AddDevice = MouHid_AddDevice; DriverObject->MajorFunction[IRP_MJ_CREATE] = MouHid_Create; DriverObject->MajorFunction[IRP_MJ_CLOSE] = MouHid_Close; + DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = MouHid_Flush; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = MouHid_DeviceControl; DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = MouHid_InternalDeviceControl; DriverObject->MajorFunction[IRP_MJ_POWER] = MouHid_Power;

1 0

[janderwald] 54775: [USB-BRINGUP] - Fix up / down button detection - Fix move detection. Mouse changes are now detected - Mouse does not yet work in Vbox, as mouclass driver is for unknown reasons ...
by janderwald＠svn.reactos.org 28 Dec '11

28 Dec '11

Author: janderwald Date: Wed Dec 28 17:18:56 2011 New Revision: 54775 URL: http://svn.reactos.org/svn/reactos?rev=54775&view=rev Log: [USB-BRINGUP] - Fix up / down button detection - Fix move detection. Mouse changes are now detected - Mouse does not yet work in Vbox, as mouclass driver is for unknown reasons not connecting to the mouhid, needs to be investigated - Tested in VBox 4.1.4 + ReactOS mouhid.sys Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.c Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/mouhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/mouhid/mouhid.c [iso-8859-1] Wed Dec 28 17:18:56 2011 @@ -10,7 +10,7 @@ #include "mouhid.h" -static USHORT MouHid_ButtonDownFlags[] = +static USHORT MouHid_ButtonUpFlags[] = { MOUSE_LEFT_BUTTON_DOWN, MOUSE_RIGHT_BUTTON_DOWN, @@ -19,7 +19,7 @@ MOUSE_BUTTON_5_DOWN }; -static USHORT MouHid_ButtonUpFlags[] = +static USHORT MouHid_ButtonDownFlags[] = { MOUSE_LEFT_BUTTON_UP, MOUSE_RIGHT_BUTTON_UP, @@ -41,12 +41,12 @@ *LastY = 0; /* get scaled usage value x */ - Status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_X, (PLONG)&LastX, DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); + Status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_X, (PLONG)LastX, DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); /* FIXME handle error */ ASSERT(Status == HIDP_STATUS_SUCCESS); /* get scaled usage value y */ - Status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_Y, (PLONG)&LastY, DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); + Status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_Y, (PLONG)LastY, DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); /* FIXME handle error */ ASSERT(Status == HIDP_STATUS_SUCCESS); @@ -225,7 +225,7 @@ } } - DPRINT1("[MOUHID] LastX %lu LastY %lu Flags %x ButtonData %x\n", MouseInputData.LastX, MouseInputData.LastY, MouseInputData.ButtonFlags, MouseInputData.ButtonData); + DPRINT1("[MOUHID] LastX %ld LastY %ld Flags %x ButtonData %x\n", MouseInputData.LastX, MouseInputData.LastY, MouseInputData.ButtonFlags, MouseInputData.ButtonData); /* dispatch mouse action */ MouHid_DispatchInputData(DeviceExtension, &MouseInputData); @@ -411,6 +411,8 @@ /* get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); + + DPRINT1("[MOUHID] DeviceControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); /* get device extension */ DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -750,6 +752,7 @@ /* get current irp stack */ IoStack = IoGetCurrentIrpStackLocation(Irp); + DPRINT1("[MOUHID] IRP_MJ_PNP Request: %x\n", IoStack->MinorFunction); if (IoStack->MinorFunction == IRP_MN_STOP_DEVICE || IoStack->MinorFunction == IRP_MN_CANCEL_REMOVE_DEVICE || IoStack->MinorFunction == IRP_MN_QUERY_STOP_DEVICE || IoStack->MinorFunction == IRP_MN_CANCEL_STOP_DEVICE) { @@ -896,7 +899,6 @@ IN PDRIVER_OBJECT DriverObject) { UNIMPLEMENTED - ASSERT(FALSE); }

1 0

[janderwald] 54774: [USB-BRINGUP] - Fix a few bugs & race condition in the read report routine - mouhid initializes and is able to read input reports - button press / wheel state change is detected...
by janderwald＠svn.reactos.org 28 Dec '11

28 Dec '11

Author: janderwald Date: Wed Dec 28 16:35:41 2011 New Revision: 54774 URL: http://svn.reactos.org/svn/reactos?rev=54774&view=rev Log: [USB-BRINGUP] - Fix a few bugs & race condition in the read report routine - mouhid initializes and is able to read input reports - button press / wheel state change is detected - mouse move detection not yet working Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.c branches/usb-bringup/drivers/hid/mouhid/mouhid.h Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/mouhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/mouhid/mouhid.c [iso-8859-1] Wed Dec 28 16:35:41 2011 @@ -30,15 +30,11 @@ VOID MouHid_GetButtonMove( - IN PDEVICE_OBJECT DeviceObject, + IN PMOUHID_DEVICE_EXTENSION DeviceExtension, OUT PLONG LastX, OUT PLONG LastY) { - PMOUHID_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - - /* get device extension */ - DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; /* init result */ *LastX = 0; @@ -59,18 +55,14 @@ VOID MouHid_GetButtonFlags( - IN PDEVICE_OBJECT DeviceObject, + IN PMOUHID_DEVICE_EXTENSION DeviceExtension, OUT PUSHORT ButtonFlags) { - PMOUHID_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; USAGE Usage; ULONG Index; PUSAGE TempList; ULONG CurrentUsageListLength; - - /* get device extension */ - DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; /* init flags */ *ButtonFlags = 0; @@ -142,15 +134,14 @@ VOID MouHid_DispatchInputData( - IN PDEVICE_OBJECT DeviceObject, + IN PMOUHID_DEVICE_EXTENSION DeviceExtension, IN PMOUSE_INPUT_DATA InputData) { - PMOUHID_DEVICE_EXTENSION DeviceExtension; KIRQL OldIrql; ULONG InputDataConsumed; - /* get device extension */ - DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + if (!DeviceExtension->ClassService) + return; /* sanity check */ ASSERT(DeviceExtension->ClassService); @@ -181,13 +172,32 @@ MOUSE_INPUT_DATA MouseInputData; /* get device extension */ - DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = (PMOUHID_DEVICE_EXTENSION)Context; + + if (Irp->IoStatus.Status == STATUS_PRIVILEGE_NOT_HELD || + Irp->IoStatus.Status == STATUS_DEVICE_NOT_CONNECTED || + Irp->IoStatus.Status == STATUS_CANCELLED || + DeviceExtension->StopReadReport) + { + /* failed to read or should be stopped*/ + DPRINT1("[MOUHID] ReadCompletion terminating read Status %x\n", Irp->IoStatus.Status); + + /* report no longer active */ + DeviceExtension->ReadReportActive = FALSE; + + /* request stopping of the report cycle */ + DeviceExtension->StopReadReport = FALSE; + + /* signal completion event */ + KeSetEvent(&DeviceExtension->ReadCompletionEvent, 0, 0); + return STATUS_MORE_PROCESSING_REQUIRED; + } /* get mouse change flags */ - MouHid_GetButtonFlags(DeviceObject, &ButtonFlags); + MouHid_GetButtonFlags(DeviceExtension, &ButtonFlags); /* get mouse change */ - MouHid_GetButtonMove(DeviceObject, &LastX, &LastY); + MouHid_GetButtonMove(DeviceExtension, &LastX, &LastY); /* init input data */ RtlZeroMemory(&MouseInputData, sizeof(MOUSE_INPUT_DATA)); @@ -215,11 +225,13 @@ } } + DPRINT1("[MOUHID] LastX %lu LastY %lu Flags %x ButtonData %x\n", MouseInputData.LastX, MouseInputData.LastY, MouseInputData.ButtonFlags, MouseInputData.ButtonData); + /* dispatch mouse action */ - MouHid_DispatchInputData(DeviceObject, &MouseInputData); + MouHid_DispatchInputData(DeviceExtension, &MouseInputData); /* re-init read */ - MouHid_InitiateRead(DeviceObject); + MouHid_InitiateRead(DeviceExtension); /* stop completion */ return STATUS_MORE_PROCESSING_REQUIRED; @@ -227,14 +239,10 @@ NTSTATUS MouHid_InitiateRead( - IN PDEVICE_OBJECT DeviceObject) -{ - PMOUHID_DEVICE_EXTENSION DeviceExtension; + IN PMOUHID_DEVICE_EXTENSION DeviceExtension) +{ PIO_STACK_LOCATION IoStack; NTSTATUS Status; - - /* get device extension */ - DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; /* re-use irp */ IoReuseIrp(DeviceExtension->Irp, STATUS_SUCCESS); @@ -255,6 +263,9 @@ /* set completion routine */ IoSetCompletionRoutine(DeviceExtension->Irp, MouHid_ReadCompletion, DeviceExtension, TRUE, TRUE, TRUE); + /* read is active */ + DeviceExtension->ReadReportActive = TRUE; + /* start the read */ Status = IoCallDriver(DeviceExtension->NextDeviceObject, DeviceExtension->Irp); @@ -323,18 +334,23 @@ if (DeviceExtension->FileObject == NULL) { /* did the caller specify correct attributes */ - if (IoStack->Parameters.Create.FileAttributes & FILE_ATTRIBUTE_READONLY) + ASSERT(IoStack->Parameters.Create.SecurityContext); + if (IoStack->Parameters.Create.SecurityContext->DesiredAccess) { /* store file object */ DeviceExtension->FileObject = IoStack->FileObject; + /* reset event */ + KeResetEvent(&DeviceExtension->ReadCompletionEvent); + /* initiating read */ - Status = MouHid_InitiateRead(DeviceObject); - } - else - { - /* wrong mode */ - DPRINT1("MOUHID: wrong attributes: %x\n", IoStack->Parameters.Create.FileAttributes); + Status = MouHid_InitiateRead(DeviceExtension); + DPRINT1("[MOUHID] MouHid_InitiateRead: status %x\n", Status); + if (Status == STATUS_PENDING) + { + /* report irp is pending */ + Status = STATUS_SUCCESS; + } } } @@ -356,7 +372,21 @@ /* get device extension */ DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - /* FIXME: cancel irp */ + DPRINT("[MOUHID] IRP_MJ_CLOSE ReadReportActive %x\n", DeviceExtension->ReadReportActive); + + if (DeviceExtension->ReadReportActive) + { + /* request stopping of the report cycle */ + DeviceExtension->StopReadReport = TRUE; + + /* wait until the reports have been read */ + KeWaitForSingleObject(&DeviceExtension->ReadCompletionEvent, Executive, KernelMode, FALSE, NULL); + + /* cancel irp */ + IoCancelIrp(DeviceExtension->Irp); + } + + DPRINT("[MOUHID] IRP_MJ_CLOSE ReadReportActive %x\n", DeviceExtension->ReadReportActive); /* remove file object */ DeviceExtension->FileObject = NULL; @@ -572,22 +602,25 @@ if (!NT_SUCCESS(Status)) { /* failed to query collection information */ + DPRINT1("[MOUHID] failed to obtain collection information with %x\n", Status); return Status; } /* lets allocate space for preparsed data */ PreparsedData = ExAllocatePool(NonPagedPool, Information.DescriptorSize); - if (PreparsedData) + if (!PreparsedData) { /* no memory */ + DPRINT1("[MOUHID] no memory size %u\n", Information.DescriptorSize); return STATUS_INSUFFICIENT_RESOURCES; } /* now obtain the preparsed data */ - Status = MouHid_SubmitRequest(DeviceObject, IOCTL_HID_GET_DRIVER_CONFIG, 0, NULL, Information.DescriptorSize, PreparsedData); + Status = MouHid_SubmitRequest(DeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, 0, NULL, Information.DescriptorSize, PreparsedData); if (!NT_SUCCESS(Status)) { /* failed to get preparsed data */ + DPRINT1("[MOUHID] failed to obtain collection information with %x\n", Status); ExFreePool(PreparsedData); return Status; } @@ -597,9 +630,12 @@ if (!NT_SUCCESS(Status)) { /* failed to get capabilities */ + DPRINT1("[MOUHID] failed to obtain caps with %x\n", Status); ExFreePool(PreparsedData); return Status; } + + DPRINT1("[MOUHID] Usage %x UsagePage %x\n", Capabilities.Usage, Capabilities.UsagePage, Capabilities.InputReportByteLength); /* verify capabilities */ if (Capabilities.Usage != HID_USAGE_GENERIC_POINTER && Capabilities.Usage != HID_USAGE_GENERIC_MOUSE || Capabilities.UsagePage != HID_USAGE_PAGE_GENERIC) @@ -615,12 +651,17 @@ DeviceExtension->Report = (PUCHAR)ExAllocatePool(NonPagedPool, DeviceExtension->ReportLength); ASSERT(DeviceExtension->Report); RtlZeroMemory(DeviceExtension->Report, DeviceExtension->ReportLength); + + /* build mdl */ DeviceExtension->ReportMDL = IoAllocateMdl(DeviceExtension->Report, DeviceExtension->ReportLength, FALSE, FALSE, NULL); ASSERT(DeviceExtension->ReportMDL); + /* init mdl */ + MmBuildMdlForNonPagedPool(DeviceExtension->ReportMDL); /* get max number of buttons */ Buttons = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_BUTTON, PreparsedData); + DPRINT1("[MOUHID] Buttons %lu\n", Buttons); ASSERT(Buttons > 0); /* now allocate an array for those buttons */ @@ -662,6 +703,7 @@ /* mouse has wheel support */ DeviceExtension->MouseIdentifier = WHEELMOUSE_HID_HARDWARE; DeviceExtension->WheelUsagePage = ValueCaps.UsagePage; + DPRINT1("[MOUHID] mouse wheel support detected\n", Status); } else { @@ -673,6 +715,7 @@ /* wheel support */ DeviceExtension->MouseIdentifier = WHEELMOUSE_HID_HARDWARE; DeviceExtension->WheelUsagePage = ValueCaps.UsagePage; + DPRINT1("[MOUHID] mouse wheel support detected with z-axis\n", Status); } } @@ -827,7 +870,7 @@ DeviceExtension->MouseIdentifier = MOUSE_HID_HARDWARE; DeviceExtension->WheelUsagePage = 0; DeviceExtension->NextDeviceObject = NextDeviceObject; - KeInitializeEvent(&DeviceExtension->Event, NotificationEvent, FALSE); + KeInitializeEvent(&DeviceExtension->ReadCompletionEvent, NotificationEvent, FALSE); DeviceExtension->Irp = IoAllocateIrp(NextDeviceObject->StackSize, FALSE); /* FIXME handle allocation error */ Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/mouhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/mouhid/mouhid.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/mouhid/mouhid.h [iso-8859-1] Wed Dec 28 16:35:41 2011 @@ -8,6 +8,7 @@ #include <debug.h> #include <ntddmou.h> #include <kbdmou.h> +#include <debug.h> typedef struct @@ -25,7 +26,7 @@ // // event // - KEVENT Event; + KEVENT ReadCompletionEvent; // // device object for class callback @@ -97,9 +98,19 @@ // PFILE_OBJECT FileObject; + // + // report read is active + // + UCHAR ReadReportActive; + + // + // stop reading flag + // + UCHAR StopReadReport; + }MOUHID_DEVICE_EXTENSION, *PMOUHID_DEVICE_EXTENSION; NTSTATUS MouHid_InitiateRead( - IN PDEVICE_OBJECT DeviceObject); + IN PMOUHID_DEVICE_EXTENSION DeviceExtension);

1 0

[rharabien] 54773: [WIN32K] - Fix IntGdiSetBkColor setting wrong dirty flags. Fixes wrong background under text in Open With applications list.
by rharabien＠svn.reactos.org 28 Dec '11

28 Dec '11

Author: rharabien Date: Wed Dec 28 13:05:24 2011 New Revision: 54773 URL: http://svn.reactos.org/svn/reactos?rev=54773&view=rev Log: [WIN32K] - Fix IntGdiSetBkColor setting wrong dirty flags. Fixes wrong background under text in Open With applications list. Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c [iso-8859-1] Wed Dec 28 13:05:24 2011 @@ -20,7 +20,7 @@ oldColor = pdcattr->crBackgroundClr; pdcattr->crBackgroundClr = color; pdcattr->ulBackgroundClr = (ULONG)color; - pdcattr->ulDirty_ &= ~(DIRTY_BACKGROUND|DIRTY_LINE|DIRTY_FILL); // Clear Flag if set. + pdcattr->ulDirty_ |= DIRTY_BACKGROUND|DIRTY_LINE|DIRTY_FILL; // Clear Flag if set. hBrush = pdcattr->hbrush; DC_UnlockDc(dc); NtGdiSelectBrush(hDC, hBrush);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs