Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 10:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

[HID]

Browse source 
- Implement quering compatible ids
- Fix result status for quering instance id
- Fix bug in msmouse.inf

svn path=/branches/usb-bringup/; revision=54843
This commit is contained in:
Johannes Anderwald 2012-01-05 18:22:48 +00:00
parent ee21e811d0
commit f53c2c4f14
3 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
drivers/hid/hidclass/pdo.c
View file

@ -131,6 +131,8 @@ HidClassPDO_HandleQueryDeviceId(
//
// store result
//
DPRINT1("NewBuffer %S\n", NewBuffer);
ASSERT(FALSE);
Irp->IoStatus.Information = (ULONG_PTR)NewBuffer;
return STATUS_SUCCESS;
}
@ -183,8 +185,8 @@ HidClassPDO_HandleQueryHardwareId(
//
// single tlc device
//
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;
Offset = swprintf(&Buffer[Offset], L"HID\\Vix_%04x&Pid_%04x&Rev_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID, PDODeviceExtension->Common.Attributes.VersionNumber) + 1;
Offset += swprintf(&Buffer[Offset], L"HID\\Vix_%04x&Pid_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID) + 1;
}
//
@ -270,6 +272,7 @@ HidClassPDO_HandleQueryHardwareId(
//
// store result
//
ASSERT(FALSE);
Irp->IoStatus.Information = (ULONG_PTR)Ptr;
return STATUS_SUCCESS;
}
@ -298,11 +301,7 @@ HidClassPDO_HandleQueryInstanceId(
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;
return Status;
}
NTSTATUS
@ -310,29 +309,28 @@ HidClassPDO_HandleQueryCompatibleId(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp)
{
NTSTATUS Status;
LPWSTR Buffer;
//
// copy current stack location
//
IoCopyCurrentIrpStackLocationToNext(Irp);
//
// call mini-driver
//
Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp);
if (!NT_SUCCESS(Status))
Buffer = (LPWSTR)ExAllocatePool(NonPagedPool, 2 * sizeof(WCHAR));
if (!Buffer)
{
//
// failed
// no memory
//
return Status;
return STATUS_INSUFFICIENT_RESOURCES;
}
//
// FIXME: implement me
// zero buffer
//
return STATUS_NOT_IMPLEMENTED;
Buffer[0] = 0;
Buffer[1] = 0;
//
// store result
//
Irp->IoStatus.Information = (ULONG_PTR)Buffer;
return STATUS_SUCCESS;
}

2
media/inf/input.inf
View file

@ -59,7 +59,7 @@ ServiceType = 1
StartType = 3
ErrorControl = 1
ServiceBinary = %12%\hidusb.sys
LoadOrderGroup = Pointer Port
LoadOrderGroup = extended base
[strings]
MSFT = "ReactOS"

BIN
media/inf/msmouse.inf
View file

Binary file not shown.