[ros-diffs] [mjmartin] 51622: [USBHUB_NEW] - Some devices implement a default Language, LangId of 0. Some do not. Use LangId 0x0409 (English) until LangId is implemented. - Remove an unused variable.

Author: mjmartin
Date: Sat May  7 16:10:09 2011
New Revision: 51622

URL: http://svn.reactos.org/svn/reactos?rev=51622&view=rev
Log:
[USBHUB_NEW]
- Some devices implement a default Language, LangId of 0. Some do not. Use LangId 0x0409
(English) until LangId is implemented.
- Remove an unused variable.

Modified:
    branches/usb-bringup/drivers/usb/usbhub_new/fdo.c
    branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c

Modified: branches/usb-bringup/drivers/usb/usbhub_new/fdo.c
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_…
==============================================================================
--- branches/usb-bringup/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original)
+++ branches/usb-bringup/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Sat May  7 16:10:09
2011
@@ -688,21 +688,19 @@
 
     //
     // Get the index string descriptor length
+    // FIXME: Implement LangIds
     //
     Status = GetUsbDeviceDescriptor(ChildDeviceObject,
                                     USB_STRING_DESCRIPTOR_TYPE,
                                     Index,
-                                    0,
+                                    0x0409,
                                     StringDesc,
                                     sizeof(USB_STRING_DESCRIPTOR));
-
-    //
-    // If lenght is 4 only then either this is a bad index or the device is not
reporting
-    //
-    if (StringDesc->bLength == 4)
-    {
-        DPRINT1("USBHUB: Device Data Error\n");
-        return STATUS_UNSUCCESSFUL;
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("GetUsbDeviceDescriptor failed with status %x\n", Status);
+        ExFreePool(StringDesc);
+        return Status;
     }
 
     DPRINT1("StringDesc->bLength %d\n", StringDesc->bLength);
@@ -724,19 +722,21 @@
         DPRINT1("Failed to allocate buffer for string!\n");
         return STATUS_INSUFFICIENT_RESOURCES;
     }
+
     RtlZeroMemory(StringDesc, SizeNeeded);
+
     //
     // Get the string
     //
     Status = GetUsbDeviceDescriptor(ChildDeviceObject,
                                     USB_STRING_DESCRIPTOR_TYPE,
                                     Index,
-                                    0,
+                                    0x0409,
                                     StringDesc,
                                     SizeNeeded);
     if (!NT_SUCCESS(Status))
     {
-        DPRINT1("Failed to get string from device\n");
+        DPRINT1("GetUsbDeviceDescriptor failed with status %x\n", Status);
         ExFreePool(StringDesc);
         return Status;
     }

Modified: branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_…
==============================================================================
--- branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] (original)
+++ branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] Sat May  7 16:10:09
2011
@@ -190,8 +190,6 @@
     IN PDRIVER_OBJECT DriverObject,
     IN PUNICODE_STRING RegistryPath)
 {
-    ULONG i;
-
     DriverObject->DriverExtension->AddDevice = USBHUB_AddDevice;
     DPRINT1("USBHUB: DriverEntry\n");