Eric Pouech : http.sys: Build without -DWINE_NO_LONG_TYPES.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3542152c236748733b7c71a9308cbcdc17b02c93
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3542152c236748733b7c71a93...

Author: Eric Pouech 
Date:   Tue Feb 15 00:23:34 2022 -0600

http.sys: Build without -DWINE_NO_LONG_TYPES.

Signed-off-by: Eric Pouech 
Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

dlls/http.sys/Makefile.in |  1 -
 dlls/http.sys/http.c      | 16 ++++++++--------
 dlls/http.sys/request.h   |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dlls/http.sys/Makefile.in b/dlls/http.sys/Makefile.in
index b8740120e84..b79f11cf930 100644
--- a/dlls/http.sys/Makefile.in
+++ b/dlls/http.sys/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = http.sys
 IMPORTS   = ntoskrnl ws2_32

diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c
index e655edfeea2..523c70ee12c 100644
--- a/dlls/http.sys/http.c
+++ b/dlls/http.sys/http.c
@@ -510,10 +510,10 @@ static void receive_data(struct connection *conn)
         ioctlsocket(conn->socket, FIONREAD, &available);
         if (available)
         {
-            TRACE("%u more bytes of data available, trying with larger buffer.\n", available);
+            TRACE("%lu more bytes of data available, trying with larger buffer.\n", available);
             if (!(conn->buffer = heap_realloc(conn->buffer, conn->len + available)))
             {
-                ERR("Failed to allocate %u bytes of memory.\n", conn->len + available);
+                ERR("Failed to allocate %lu bytes of memory.\n", conn->len + available);
                 close_connection(conn);
                 return;
             }
@@ -730,7 +730,7 @@ static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp)
     struct connection *conn;
     NTSTATUS ret;

-    TRACE("addr %s, id %s, flags %#x, bits %u.\n", wine_dbgstr_longlong(params->addr),
+    TRACE("addr %s, id %s, flags %#lx, bits %lu.\n", wine_dbgstr_longlong(params->addr),
             wine_dbgstr_longlong(params->id), params->flags, params->bits);

EnterCriticalSection(&http_cs);
@@ -821,13 +821,13 @@ static NTSTATUS http_receive_body(struct request_queue *queue, IRP *irp)
     struct connection *conn;
     NTSTATUS ret;

-    TRACE("id %s, bits %u.\n", wine_dbgstr_longlong(params->id), params->bits);
+    TRACE("id %s, bits %lu.\n", wine_dbgstr_longlong(params->id), params->bits);

EnterCriticalSection(&http_cs);

if ((conn = get_connection(params->id)))
     {
-        TRACE("%u bits remaining.\n", conn->content_len);
+        TRACE("%lu bits remaining.\n", conn->content_len);

if (conn->content_len)
         {
@@ -875,7 +875,7 @@ static NTSTATUS WINAPI dispatch_ioctl(DEVICE_OBJECT *device, IRP *irp)
         ret = http_receive_body(queue, irp);
         break;
     default:
-        FIXME("Unhandled ioctl %#x.\n", stack->Parameters.DeviceIoControl.IoControlCode);
+        FIXME("Unhandled ioctl %#lx.\n", stack->Parameters.DeviceIoControl.IoControlCode);
         ret = STATUS_NOT_IMPLEMENTED;
     }

@@ -987,12 +987,12 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path)
     RtlInitUnicodeString(&string, L"\Device\Http");
     attr.ObjectName = &string;
     if ((ret = NtCreateDirectoryObject(&directory_obj, 0, &attr)) && ret != STATUS_OBJECT_NAME_COLLISION)
-        ERR("Failed to create \Device\Http directory, status %#x.\n", ret);
+        ERR("Failed to create \Device\Http directory, status %#lx.\n", ret);

RtlInitUnicodeString(&string, L"\Device\Http\ReqQueue");
     if ((ret = IoCreateDevice(driver, 0, &string, FILE_DEVICE_UNKNOWN, 0, FALSE, &device_obj)))
     {
-        ERR("Failed to create request queue device, status %#x.\n", ret);
+        ERR("Failed to create request queue device, status %#lx.\n", ret);
         NtClose(directory_obj);
         return ret;
     }
diff --git a/dlls/http.sys/request.h b/dlls/http.sys/request.h
index a1b77b67dc5..f044db3bb2c 100644
--- a/dlls/http.sys/request.h
+++ b/dlls/http.sys/request.h
@@ -167,7 +167,7 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp)

irp_size += unk_headers_count * sizeof(struct http_unknown_header);

-    TRACE("Need %u bytes, have %u.\n", irp_size, output_len);
+    TRACE("Need %lu bytes, have %lu.\n", irp_size, output_len);
     irp->IoStatus.Information = irp_size;

memset(irp->AssociatedIrp.SystemBuffer, 0, output_len);