X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=reactos%2Fdrivers%2Fusb%2Fusbhub%2Fpdo.c;h=1339412225fdbe91316eeb3d4d9d403845ffda1c;hp=fec7c3743b1488504590f77d829e13d076f9e2ad;hb=aefb7a13547044b8fa59d06cc3e295eab17d7b19;hpb=0558c3abc528cb74c5b5bac296cb8b39b78e753b

diff --git a/reactos/drivers/usb/usbhub/pdo.c b/reactos/drivers/usb/usbhub/pdo.c
index fec7c3743b1..1339412225f 100644
--- a/reactos/drivers/usb/usbhub/pdo.c
+++ b/reactos/drivers/usb/usbhub/pdo.c
@@ -149,37 +149,54 @@ UsbhubPdoQueryDeviceText(
 
 	switch (DeviceTextType)
 	{
-		/*case DeviceTextDescription:
-		{
-			DPRINT1("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n");
-			return STATUS_NOT_IMPLEMENTED;
-		}*/
+		case DeviceTextDescription:
 		case DeviceTextLocationInformation:
 		{
-			int size;
-			char *buf;
+			unsigned short size;
+			int ret;
+			PWCHAR buf;
+			PWCHAR bufret;
 
-			DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextLocationInformation\n");
+			if (DeviceTextType == DeviceTextDescription)
+				DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n");
+			else
+				DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextLocationInformation\n");
+			
 			if (!DeviceExtension->dev->descriptor.iProduct)
 				return STATUS_NOT_SUPPORTED;
 
-			size = usb_get_string(DeviceExtension->dev, LocaleId, DeviceExtension->dev->descriptor.iProduct, NULL, 0);
-			if (size < 2)
+			ret = usb_get_string(DeviceExtension->dev, LocaleId, DeviceExtension->dev->descriptor.iProduct, &size, sizeof(size));
+			if (ret < 2)
 			{
-				DPRINT("Usbhub: usb_get_string() failed\n");
+				DPRINT("Usbhub: usb_get_string() failed with error %d\n", ret);
 				return STATUS_IO_DEVICE_ERROR;
 			}
+			size &= 0xff;
 			buf = ExAllocatePool(PagedPool, size);
 			if (buf == NULL)
+			{
+				DPRINT("Usbhub: ExAllocatePool() failed\n");
 				return STATUS_INSUFFICIENT_RESOURCES;
-			size = usb_get_string(DeviceExtension->dev, LocaleId, DeviceExtension->dev->descriptor.iProduct, buf, size);
-			if (size < 0)
+			}
+			ret = usb_get_string(DeviceExtension->dev, LocaleId, DeviceExtension->dev->descriptor.iProduct, buf, size);
+			if (ret < 0)
 			{
-				DPRINT("Usbhub: usb_get_string() failed\n");
+				DPRINT("Usbhub: usb_get_string() failed with error %d\n", ret);
 				ExFreePool(buf);
 				return STATUS_IO_DEVICE_ERROR;
 			}
-			*Information = (ULONG_PTR)buf;
+			bufret = ExAllocatePool(PagedPool, size - 2 /* size of length identifier */ + 2 /* final NULL */);
+			if (bufret == NULL)
+			{
+				DPRINT("Usbhub: ExAllocatePool() failed\n");
+				ExFreePool(buf);
+				return STATUS_INSUFFICIENT_RESOURCES;
+			}
+
+			RtlCopyMemory(bufret, &buf[1], size - 2);
+			bufret[(size - 1) / sizeof(WCHAR)] = 0;
+			*Information = (ULONG_PTR)bufret;
+			ExFreePool(buf);
 			return STATUS_SUCCESS;
 		}
 		default: