Module: wine Branch: master Commit: 7afd11232eeb9fd019f7ea3cc5a65d7811a028fb URL: https://gitlab.winehq.org/wine/wine/-/commit/7afd11232eeb9fd019f7ea3cc5a65d7...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Nov 21 16:19:31 2022 +0100
ntdll: Use UINT instead of ULONG in ioctl helpers.
To avoid typecasts in debug traces.
---
dlls/ntdll/unix/cdrom.c | 4 ++-- dlls/ntdll/unix/file.c | 6 +++--- dlls/ntdll/unix/serial.c | 10 +++++----- dlls/ntdll/unix/socket.c | 2 +- dlls/ntdll/unix/tape.c | 6 +++--- dlls/ntdll/unix/unix_private.h | 14 +++++++------- 6 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c index a4a9400a518..a9acdf7a645 100644 --- a/dlls/ntdll/unix/cdrom.c +++ b/dlls/ntdll/unix/cdrom.c @@ -2814,8 +2814,8 @@ static NTSTATUS GetInquiryData(int fd, PSCSI_ADAPTER_BUS_INFO BufferOut, DWORD O * cdrom_DeviceIoControl */ NTSTATUS cdrom_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) { DWORD sz = 0; NTSTATUS status = STATUS_SUCCESS; diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index e80eb368e8a..95ca5fa9b51 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5095,9 +5095,9 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE /* do an ioctl call through the server */ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, PVOID apc_context, - IO_STATUS_BLOCK *io, ULONG code, - const void *in_buffer, ULONG in_size, - PVOID out_buffer, ULONG out_size ) + IO_STATUS_BLOCK *io, UINT code, + const void *in_buffer, UINT in_size, + PVOID out_buffer, UINT out_size ) { struct async_irp *async; NTSTATUS status; diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index 16c5964b77b..fce09500c91 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -71,7 +71,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(comm);
-static const char* iocode2str(DWORD ioc) +static const char* iocode2str(UINT ioc) { switch (ioc) { @@ -1096,8 +1096,8 @@ static NTSTATUS xmit_immediate(HANDLE hDevice, int fd, const char* ptr) }
static NTSTATUS io_control( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) { DWORD sz = 0, access = FILE_READ_DATA; NTSTATUS status = STATUS_SUCCESS; @@ -1320,8 +1320,8 @@ static NTSTATUS io_control( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, vo * serial_DeviceIoControl */ NTSTATUS serial_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) { NTSTATUS status;
diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index beb8382687a..779cc46fe32 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1487,7 +1487,7 @@ static int get_sock_type( HANDLE handle )
NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, - ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) + UINT code, void *in_buffer, UINT in_size, void *out_buffer, UINT out_size ) { int fd, needs_close = FALSE; NTSTATUS status; diff --git a/dlls/ntdll/unix/tape.c b/dlls/ntdll/unix/tape.c index 40ac307a632..a7ca04badb0 100644 --- a/dlls/ntdll/unix/tape.c +++ b/dlls/ntdll/unix/tape.c @@ -66,7 +66,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(tape);
-static const char *io2str( DWORD io ) +static const char *io2str( unsigned int io ) { switch (io) { @@ -519,8 +519,8 @@ static NTSTATUS TAPE_WriteMarks( int fd, const TAPE_WRITE_MARKS *data ) * tape_DeviceIoControl */ NTSTATUS tape_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, - void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) + IO_STATUS_BLOCK *io, UINT code, + void *in_buffer, UINT in_size, void *out_buffer, UINT out_size ) { DWORD sz = 0; NTSTATUS status = STATUS_INVALID_PARAMETER; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 9cf8989fb0d..afdb8397415 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -252,21 +252,21 @@ extern void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) DECLSPEC_HIDD extern NTSTATUS open_hkcu_key( const char *path, HANDLE *key ) DECLSPEC_HIDDEN;
extern NTSTATUS cdrom_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) DECLSPEC_HIDDEN; + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) DECLSPEC_HIDDEN; extern NTSTATUS serial_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) DECLSPEC_HIDDEN; + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) DECLSPEC_HIDDEN; extern NTSTATUS serial_FlushBuffersFile( int fd ) DECLSPEC_HIDDEN; extern NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, - ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) DECLSPEC_HIDDEN; + UINT code, void *in_buffer, UINT in_size, void *out_buffer, UINT out_size ) DECLSPEC_HIDDEN; extern NTSTATUS sock_read( HANDLE handle, int fd, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, void *buffer, ULONG length ) DECLSPEC_HIDDEN; extern NTSTATUS sock_write( HANDLE handle, int fd, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, const void *buffer, ULONG length ) DECLSPEC_HIDDEN; extern NTSTATUS tape_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) DECLSPEC_HIDDEN; + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) DECLSPEC_HIDDEN;
extern struct async_fileio *alloc_fileio( DWORD size, async_callback_t callback, HANDLE handle ) DECLSPEC_HIDDEN; extern void release_fileio( struct async_fileio *io ) DECLSPEC_HIDDEN;
-
Alexandre Julliard