Alexandre Julliard : wineusb.sys: Build without -DWINE_NO_LONG_TYPES.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 46341ec62b2baff1c67812a26c63c74f15bb3c04
URL:    https://gitlab.winehq.org/wine/wine/-/commit/46341ec62b2baff1c67812a26c63c74...

Author: Alexandre Julliard 
Date:   Thu Nov 17 11:17:42 2022 +0100

wineusb.sys: Build without -DWINE_NO_LONG_TYPES.

---

dlls/wineusb.sys/Makefile.in |  1 -
 dlls/wineusb.sys/unixlib.c   |  2 +-
 dlls/wineusb.sys/wineusb.c   | 10 +++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/wineusb.sys/Makefile.in b/dlls/wineusb.sys/Makefile.in
index 66a9f56b213..a7c93f24c8e 100644
--- a/dlls/wineusb.sys/Makefile.in
+++ b/dlls/wineusb.sys/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = wineusb.sys
 UNIXLIB   = wineusb.so
 IMPORTS   = ntoskrnl
diff --git a/dlls/wineusb.sys/unixlib.c b/dlls/wineusb.sys/unixlib.c
index f2356fcb06a..f269d3e96fd 100644
--- a/dlls/wineusb.sys/unixlib.c
+++ b/dlls/wineusb.sys/unixlib.c
@@ -502,7 +502,7 @@ static NTSTATUS usb_submit_urb(void *args)
             if (req->TransferFlags & USBD_TRANSFER_DIRECTION_IN)
                 req_type |= LIBUSB_ENDPOINT_IN;
             if (req->TransferFlags & ~USBD_TRANSFER_DIRECTION_IN)
-                FIXME("Unhandled flags %#x.\n", req->TransferFlags);
+                FIXME("Unhandled flags %#x.\n", (int)req->TransferFlags);

if (req->TransferBufferMDL)
                 FIXME("Unhandled MDL output buffer.\n");
diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c
index 2f918cdeeb7..63b723503c9 100644
--- a/dlls/wineusb.sys/wineusb.c
+++ b/dlls/wineusb.sys/wineusb.c
@@ -119,7 +119,7 @@ static void add_unix_device(const struct usb_add_device_event *event)
     if ((status = IoCreateDevice(driver_obj, sizeof(*device), &string,
             FILE_DEVICE_USB, 0, FALSE, &device_obj)))
     {
-        ERR("Failed to create device, status %#x.\n", status);
+        ERR("Failed to create device, status %#lx.\n", status);
         return;
     }

@@ -586,7 +586,7 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device_obj, IRP *irp
     NTSTATUS status = STATUS_NOT_IMPLEMENTED;
     BOOL removed;

-    TRACE("device_obj %p, irp %p, code %#x.\n", device_obj, irp, code);
+    TRACE("device_obj %p, irp %p, code %#lx.\n", device_obj, irp, code);

EnterCriticalSection(&wineusb_cs);
     removed = device->removed;
@@ -606,7 +606,7 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device_obj, IRP *irp
             break;

default:
-            FIXME("Unhandled ioctl %#x (device %#x, access %#x, function %#x, method %#x).\n",
+            FIXME("Unhandled ioctl %#lx (device %#lx, access %#lx, function %#lx, method %#lx).\n",
                     code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3);
     }

@@ -626,7 +626,7 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *p

if ((ret = IoCreateDevice(driver, 0, NULL, FILE_DEVICE_BUS_EXTENDER, 0, FALSE, &bus_fdo)))
     {
-        ERR("Failed to create FDO, status %#x.\n", ret);
+        ERR("Failed to create FDO, status %#lx.\n", ret);
         return ret;
     }

@@ -652,7 +652,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path)
     if ((status = NtQueryVirtualMemory(GetCurrentProcess(), instance,
             MemoryWineUnixFuncs, &unix_handle, sizeof(unix_handle), NULL)))
     {
-        ERR("Failed to initialize Unix library, status %#x.\n", status);
+        ERR("Failed to initialize Unix library, status %#lx.\n", status);
         return status;
     }