Eric Pouech : nsiproxy: Enable compilation with long types.
Alexandre Julliard
julliard at winehq.org
Mon Apr 25 16:30:31 CDT 2022
Module: wine
Branch: master
Commit: d0833a0edf8ad6db3c4224c8b91a93a225311fd3
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0833a0edf8ad6db3c4224c8b91a93a225311fd3
Author: Eric Pouech <eric.pouech at gmail.com>
Date: Mon Apr 25 09:35:27 2022 +0100
nsiproxy: Enable compilation with long types.
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/nsiproxy.sys/Makefile.in | 1 -
dlls/nsiproxy.sys/device.c | 10 +++++-----
dlls/nsiproxy.sys/tcp.c | 2 +-
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in
index 3b83a4ddaac..87f7e165ef4 100644
--- a/dlls/nsiproxy.sys/Makefile.in
+++ b/dlls/nsiproxy.sys/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = nsiproxy.sys
UNIXLIB = nsiproxy.so
IMPORTS = ntoskrnl
diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c
index cc9b00d3359..d3845829a85 100644
--- a/dlls/nsiproxy.sys/device.c
+++ b/dlls/nsiproxy.sys/device.c
@@ -266,7 +266,7 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp )
IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp );
NTSTATUS status;
- TRACE( "ioctl %x insize %u outsize %u\n",
+ TRACE( "ioctl %lx insize %lu outsize %lu\n",
irpsp->Parameters.DeviceIoControl.IoControlCode,
irpsp->Parameters.DeviceIoControl.InputBufferLength,
irpsp->Parameters.DeviceIoControl.OutputBufferLength );
@@ -290,7 +290,7 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp )
break;
default:
- FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode );
+ FIXME( "ioctl %lx not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode );
status = STATUS_NOT_SUPPORTED;
break;
}
@@ -316,7 +316,7 @@ static int add_device( DRIVER_OBJECT *driver )
status = IoCreateSymbolicLink( &link, &name );
if (status)
{
- FIXME( "failed to create device error %x\n", status );
+ FIXME( "failed to create device error %lx\n", status );
return 0;
}
@@ -341,7 +341,7 @@ static DWORD WINAPI listen_thread_proc( void *arg )
params.reply_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength;
status = nsiproxy_call( icmp_listen, ¶ms );
- TRACE( "icmp_listen rets %08x\n", status );
+ TRACE( "icmp_listen rets %08lx\n", status );
EnterCriticalSection( &nsiproxy_cs );
@@ -375,7 +375,7 @@ static void handle_queued_send_echo( IRP *irp )
params.dst = &in->dst;
status = nsiproxy_call( icmp_send_echo, ¶ms );
- TRACE( "icmp_send_echo rets %08x\n", status );
+ TRACE( "icmp_send_echo rets %08lx\n", status );
if (status != STATUS_PENDING)
{
diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c
index 0dbee8418b9..5734c4d9ee0 100644
--- a/dlls/nsiproxy.sys/tcp.c
+++ b/dlls/nsiproxy.sys/tcp.c
@@ -404,7 +404,7 @@ unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entries, UIN
unsigned int i, len_socket;
char socket[32];
- sprintf( socket, "socket:[%lu]", inode );
+ sprintf( socket, "socket:[%zu]", inode );
len_socket = strlen( socket );
for (i = 0; i < num_entries; i++)
{
More information about the wine-cvs
mailing list