Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- dlls/ntdll/unix/cdrom.c | 4 ++-- dlls/ntdll/unix/serial.c | 28 ++++++++++++++-------------- dlls/ntdll/unix/socket.c | 2 +- dlls/ntdll/unix/tape.c | 4 ++-- dlls/ntdll/unix/unix_private.h | 14 +++++++------- 5 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c index a9385daf099..c6b0e56476b 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/serial.c b/dlls/ntdll/unix/serial.c index 16c5964b77b..664d3a92aa3 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(unsigned int ioc) { switch (ioc) { @@ -295,7 +295,7 @@ static NTSTATUS get_line_control(int fd, SERIAL_LINE_CONTROL* slc) return STATUS_SUCCESS; }
-static NTSTATUS get_modem_status(int fd, DWORD* lpModemStat) +static NTSTATUS get_modem_status(int fd, unsigned int* lpModemStat) { NTSTATUS status = STATUS_NOT_SUPPORTED; int mstat; @@ -413,12 +413,12 @@ static void stop_waiting( HANDLE handle ) req->handle = wine_server_obj_handle( handle ); req->flags = SERIALINFO_PENDING_WAIT; if ((status = wine_server_call( req ))) - ERR("failed to clear waiting state: %#x\n", status); + ERR("failed to clear waiting state: %#x\n", (unsigned int)status); } SERVER_END_REQ; }
-static NTSTATUS get_wait_mask(HANDLE hDevice, DWORD *mask, DWORD *cookie, DWORD *pending_write, BOOL start_wait) +static NTSTATUS get_wait_mask(HANDLE hDevice, unsigned int *mask, unsigned int *cookie, unsigned int *pending_write, BOOL start_wait) { NTSTATUS status;
@@ -831,10 +831,10 @@ typedef struct async_commio DWORD* events; client_ptr_t iosb; HANDLE hEvent; - DWORD evtmask; - DWORD cookie; - DWORD mstat; - DWORD pending_write; + unsigned int evtmask; + unsigned int cookie; + unsigned int mstat; + unsigned int pending_write; serial_irq_info irq_info; } async_commio;
@@ -890,7 +890,7 @@ static NTSTATUS get_irq_info(int fd, serial_irq_info *irq_info) }
-static DWORD check_events(int fd, DWORD mask, +static DWORD check_events(int fd, unsigned int mask, const serial_irq_info *new, const serial_irq_info *old, DWORD new_mstat, DWORD old_mstat, DWORD pending_write) @@ -946,7 +946,7 @@ static void CALLBACK wait_for_event(LPVOID arg) if (!server_get_unix_fd( commio->hDevice, FILE_READ_DATA | FILE_WRITE_DATA, &fd, &needs_close, NULL, NULL )) { serial_irq_info new_irq_info; - DWORD new_mstat, dummy, cookie; + unsigned int new_mstat, dummy, cookie; LARGE_INTEGER time;
TRACE("device=%p fd=0x%08x mask=0x%08x buffer=%p event=%p irq_info=%p\n", @@ -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 23059e3cff8..aefb9422db3 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1183,7 +1183,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..73ff6f936b8 100644 --- a/dlls/ntdll/unix/tape.c +++ b/dlls/ntdll/unix/tape.c @@ -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 75f03706401..d3a6e6441bd 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -248,17 +248,17 @@ 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 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;