Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-11 15:15:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USBHUB_NEW]

Browse source 
- Only get the string descriptors if they are available. Fixes crash when using usb mouse and keyboards in windows.

svn path=/branches/usb-bringup/; revision=51688
This commit is contained in:
Michael Martin 2011-05-12 23:31:32 +00:00
parent 76310d7679
commit 9d7751a2f6
1 changed files with 30 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
drivers/usb/usbhub_new/fdo.c
View file

@ -914,38 +914,44 @@ CreateDeviceIds(
//
//
// Get the product string
// Get the product string if obe provided
//
Status = GetUsbStringDescriptor(UsbChildDeviceObject,
UsbChildExtension->DeviceDesc.iProduct,
0,
(PVOID*)&UsbChildExtension->usTextDescription.Buffer,
&UsbChildExtension->usTextDescription.Length);
if (!NT_SUCCESS(Status))
if (UsbChildExtension->DeviceDesc.iProduct)
{
DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status);
goto Cleanup;
Status = GetUsbStringDescriptor(UsbChildDeviceObject,
UsbChildExtension->DeviceDesc.iProduct,
0,
(PVOID*)&UsbChildExtension->usTextDescription.Buffer,
&UsbChildExtension->usTextDescription.Length);
if (!NT_SUCCESS(Status))
{
DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status);
goto Cleanup;
}
UsbChildExtension->usTextDescription.MaximumLength = UsbChildExtension->usTextDescription.Length;
DPRINT1("Usb TextDescription %wZ\n", &UsbChildExtension->usTextDescription);
}
UsbChildExtension->usTextDescription.MaximumLength = UsbChildExtension->usTextDescription.Length;
DPRINT1("Usb TextDescription %wZ\n", &UsbChildExtension->usTextDescription);
//
// Get the Serial Number string
// Get the Serial Number string if obe provided
//
Status = GetUsbStringDescriptor(UsbChildDeviceObject,
UsbChildExtension->DeviceDesc.iSerialNumber,
0,
(PVOID*)&UsbChildExtension->usInstanceId.Buffer,
&UsbChildExtension->usInstanceId.Length);
if (!NT_SUCCESS(Status))
if (UsbChildExtension->DeviceDesc.iSerialNumber)
{
DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status);
goto Cleanup;
}
Status = GetUsbStringDescriptor(UsbChildDeviceObject,
UsbChildExtension->DeviceDesc.iSerialNumber,
0,
(PVOID*)&UsbChildExtension->usInstanceId.Buffer,
&UsbChildExtension->usInstanceId.Length);
if (!NT_SUCCESS(Status))
{
DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status);
goto Cleanup;
}
UsbChildExtension->usInstanceId.MaximumLength = UsbChildExtension->usInstanceId.Length;
DPRINT1("Usb InstanceId %wZ\n", &UsbChildExtension->usInstanceId);
UsbChildExtension->usInstanceId.MaximumLength = UsbChildExtension->usInstanceId.Length;
DPRINT1("Usb InstanceId %wZ\n", &UsbChildExtension->usInstanceId);
}
return Status;