[USBHUB_NEW][USBPORT] Fix buffer size calculation for multi-sz values in IRP_MN_QUERY_ID.

Also fix some copypasta'd DPRINTs.

diff --git a/drivers/usb/usbhub_new/pnp.c b/drivers/usb/usbhub_new/pnp.c
index 16cd2b1..c186257 100644 (file)
--- a/drivers/usb/usbhub_new/pnp.c
+++ b/drivers/usb/usbhub_new/pnp.c
@@ -1649,7 +1649,7 @@ USBH_PdoQueryId(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension,
                                      DeviceDescriptor->idProduct);
             }
 
                                      DeviceDescriptor->idProduct);
             }
 

-            Length = sizeof(Buffer) - (Remaining - sizeof(UNICODE_NULL));
+            Length = sizeof(Buffer) - (Remaining - 2 * sizeof(UNICODE_NULL));

 
             Id = ExAllocatePoolWithTag(PagedPool, Length, USB_HUB_TAG);
 
 
             Id = ExAllocatePoolWithTag(PagedPool, Length, USB_HUB_TAG);
 


@@ -1662,7 +1662,7 @@ USBH_PdoQueryId(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension,
 
             if (PortExtension->PortPdoFlags & USBHUB_PDO_FLAG_INIT_PORT_FAILED)
             {
 
             if (PortExtension->PortPdoFlags & USBHUB_PDO_FLAG_INIT_PORT_FAILED)
             {

-                DPRINT("USBH_PdoQueryId: BusQueryInstanceID - %S\n", Id);
+                DPRINT("USBH_PdoQueryId: BusQueryHardwareID - %S\n", Id);

             }
             else
             {
             }
             else
             {


@@ -1766,7 +1766,7 @@ USBH_PdoQueryId(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension,
                                      InterfaceDescriptor->bInterfaceClass);
             }
 
                                      InterfaceDescriptor->bInterfaceClass);
             }
 

-            Length = sizeof(Buffer) - (Remaining - sizeof(UNICODE_NULL));
+            Length = sizeof(Buffer) - (Remaining - 2 * sizeof(UNICODE_NULL));

 
             Id = ExAllocatePoolWithTag(PagedPool, Length, USB_HUB_TAG);
 
 
             Id = ExAllocatePoolWithTag(PagedPool, Length, USB_HUB_TAG);
 


@@ -1779,7 +1779,7 @@ USBH_PdoQueryId(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension,
 
             if (PortExtension->PortPdoFlags & USBHUB_PDO_FLAG_INIT_PORT_FAILED)
             {
 
             if (PortExtension->PortPdoFlags & USBHUB_PDO_FLAG_INIT_PORT_FAILED)
             {

-                DPRINT("USBH_PdoQueryId: BusQueryInstanceID - %S\n", Id);
+                DPRINT("USBH_PdoQueryId: BusQueryCompatibleID - %S\n", Id);

             }
             else
             {
             }
             else
             {

diff --git a/drivers/usb/usbport/pnp.c b/drivers/usb/usbport/pnp.c
index 4e7a545..545b75e 100644 (file)
--- a/drivers/usb/usbport/pnp.c
+++ b/drivers/usb/usbport/pnp.c
@@ -1493,7 +1493,7 @@ USBPORT_GetDeviceHwIds(IN PDEVICE_OBJECT FdoDevice,
                              L"USB\\ROOT_HUB");
     }
 
                              L"USB\\ROOT_HUB");
     }
 

-    Length = (sizeof(Buffer) - Remaining + sizeof(UNICODE_NULL));
+    Length = (sizeof(Buffer) - Remaining + 2 * sizeof(UNICODE_NULL));

 
      /* for debug only */
     if (FALSE)
 
      /* for debug only */
     if (FALSE)