[USBHUB_NEW] Fix x64 warnings.

diff --git a/drivers/usb/usbhub_new/debug.c b/drivers/usb/usbhub_new/debug.c
index 5113a37..55803b9 100644 (file)
--- a/drivers/usb/usbhub_new/debug.c
+++ b/drivers/usb/usbhub_new/debug.c
@@ -112,8 +112,8 @@ NTAPI
 USBHUB_DumpingIDs(IN PVOID Id)
 {
     PWSTR Ptr;
-    ULONG Length;
-    ULONG TotalLength = 0;
+    size_t Length;
+    size_t TotalLength = 0;
 
     Ptr = Id;
     DPRINT("USBHUB_DumpingIDs:\n");
@@ -127,6 +127,6 @@ USBHUB_DumpingIDs(IN PVOID Id)
         TotalLength += Length;
     }
 
-    DPRINT("TotalLength: %hu\n", TotalLength);
+    DPRINT("TotalLength: %Iu\n", TotalLength);
     DPRINT("\n");
 }

diff --git a/drivers/usb/usbhub_new/ioctl.c b/drivers/usb/usbhub_new/ioctl.c
index e7736b8..4f48c98 100644 (file)
--- a/drivers/usb/usbhub_new/ioctl.c
+++ b/drivers/usb/usbhub_new/ioctl.c
@@ -560,12 +560,12 @@ USBH_IoctlGetNodeName(IN PUSBHUB_FDO_EXTENSION HubExtension,
     PUSB_NODE_CONNECTION_NAME ConnectionName;
     PDEVICE_OBJECT PortDevice;
     PUSBHUB_PORT_PDO_EXTENSION PortExtension;
-    ULONG LengthSkip;
+    size_t LengthSkip;
     PWCHAR Buffer;
     ULONG BufferLength;
     PWCHAR BufferEnd;
-    ULONG LengthReturned;
-    ULONG LengthName;
+    ULONG_PTR LengthReturned;
+    size_t LengthName;
     ULONG Length;
     NTSTATUS Status;
     PIO_STACK_LOCATION IoStack;

diff --git a/drivers/usb/usbhub_new/pnp.c b/drivers/usb/usbhub_new/pnp.c
index f437752..16cd2b1 100644 (file)
--- a/drivers/usb/usbhub_new/pnp.c
+++ b/drivers/usb/usbhub_new/pnp.c
@@ -1558,7 +1558,7 @@ USBH_PdoQueryId(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension,
     WCHAR Buffer[200];
     PWCHAR EndBuffer;
     size_t Remaining = sizeof(Buffer);
-    ULONG Length;
+    size_t Length;
     PWCHAR Id = NULL;
     NTSTATUS Status = STATUS_SUCCESS;
     PUSB_DEVICE_DESCRIPTOR DeviceDescriptor;
@@ -1855,8 +1855,8 @@ USBH_PdoQueryDeviceText(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension,
     PWCHAR DeviceText;
     UCHAR iProduct = 0;
     NTSTATUS Status;
-    ULONG NumSymbols;
-    ULONG Length;
+    size_t NumSymbols;
+    size_t Length;
 
     DPRINT("USBH_PdoQueryDeviceText ... \n");