system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

ntdll: Build the Unix side without -DWINE_NO_LONG_TYPES.

Browse source
This commit is contained in:
Alexandre Julliard 2022-11-21 16:34:52 +01:00
parent 0adec25f92
commit 9f363a6905
17 changed files with 212 additions and 226 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dlls/ntdll/unix/cdrom.c
View file

@ -24,7 +24,6 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
@ -1457,8 +1456,8 @@ static NTSTATUS CDROM_RawRead(int fd, const RAW_READ_INFO* raw, void* buffer, DW
dk_cd_read_t cdrd;
#endif
TRACE("RAW_READ_INFO: DiskOffset=%i,%i SectorCount=%i TrackMode=%i\n buffer=%p len=%i sz=%p\n",
raw->DiskOffset.u.HighPart, raw->DiskOffset.u.LowPart, raw->SectorCount, raw->TrackMode, buffer, len, sz);
TRACE("RAW_READ_INFO: DiskOffset=%s SectorCount=%i TrackMode=%i\n buffer=%p len=%i sz=%p\n",
wine_dbgstr_longlong(raw->DiskOffset.QuadPart), (int)raw->SectorCount, (int)raw->TrackMode, buffer, (int)len, sz);
if (len < raw->SectorCount * 2352) return STATUS_BUFFER_TOO_SMALL;
@ -3057,11 +3056,11 @@ NTSTATUS cdrom_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc
else if (out_size < sz) status = STATUS_BUFFER_TOO_SMALL;
else
{
TRACE("before in 0x%08x out 0x%08x\n",(in_buffer)?*(PDVD_SESSION_ID)in_buffer:0,
*(PDVD_SESSION_ID)out_buffer);
TRACE("before in 0x%08x out 0x%08x\n",(int)(in_buffer ? *(DVD_SESSION_ID *)in_buffer : 0),
(int)*(DVD_SESSION_ID *)out_buffer);
status = DVD_StartSession(fd, in_buffer, out_buffer);
TRACE("before in 0x%08x out 0x%08x\n",(in_buffer)?*(PDVD_SESSION_ID)in_buffer:0,
*(PDVD_SESSION_ID)out_buffer);
TRACE("before in 0x%08x out 0x%08x\n",(int)(in_buffer ? *(DVD_SESSION_ID *)in_buffer : 0),
(int)*(DVD_SESSION_ID *)out_buffer);
}
break;
case IOCTL_DVD_END_SESSION:

11
dlls/ntdll/unix/debug.c
View file

@ -21,7 +21,6 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
@ -303,8 +302,8 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_
UINT ticks = NtGetTickCount();
pos += sprintf( pos, "%3u.%03u:", ticks / 1000, ticks % 1000 );
}
if (TRACE_ON(pid)) pos += sprintf( pos, "%04x:", GetCurrentProcessId() );
pos += sprintf( pos, "%04x:", GetCurrentThreadId() );
if (TRACE_ON(pid)) pos += sprintf( pos, "%04x:", (UINT)GetCurrentProcessId() );
pos += sprintf( pos, "%04x:", (UINT)GetCurrentThreadId() );
}
if (function && cls < ARRAY_SIZE( classes ))
pos += snprintf( pos, sizeof(info->output) - (pos - info->output), "%s:%s:%s ",
@ -340,8 +339,8 @@ void dbg_init(void)
NTSTATUS WINAPI NtTraceControl( ULONG code, void *inbuf, ULONG inbuf_len,
void *outbuf, ULONG outbuf_len, ULONG *size )
{
FIXME( "code %u, inbuf %p, inbuf_len %u, outbuf %p, outbuf_len %u, size %p\n", code, inbuf, inbuf_len,
outbuf, outbuf_len, size );
FIXME( "code %u, inbuf %p, inbuf_len %u, outbuf %p, outbuf_len %u, size %p\n",
(int)code, inbuf, (int)inbuf_len, outbuf, (int)outbuf_len, size );
return STATUS_SUCCESS;
}
@ -351,7 +350,7 @@ NTSTATUS WINAPI NtTraceControl( ULONG code, void *inbuf, ULONG inbuf_len,
*/
NTSTATUS WINAPI NtSetDebugFilterState( ULONG component_id, ULONG level, BOOLEAN state )
{
FIXME( "component_id %#x, level %u, state %#x stub.\n", component_id, level, state );
FIXME( "component_id %#x, level %u, state %#x stub.\n", (int)component_id, (int)level, state );
return STATUS_SUCCESS;
}

5
dlls/ntdll/unix/env.c
View file

@ -22,7 +22,6 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
@ -1561,7 +1560,7 @@ static WCHAR *build_command_line( WCHAR **wargv )
*p = 0;
if (p - ret >= 32767)
{
ERR( "command line too long (%u)\n", (DWORD)(p - ret) );
ERR( "command line too long (%zu)\n", p - ret );
NtTerminateProcess( GetCurrentProcess(), 1 );
}
return ret;
@ -1587,7 +1586,7 @@ static void run_wineboot( WCHAR *env, SIZE_T size )
UNICODE_STRING nameW;
OBJECT_ATTRIBUTES attr;
LARGE_INTEGER timeout;
NTSTATUS status;
unsigned int status;
int count = 1;
init_unicode_string( &nameW, eventW );

57
dlls/ntdll/unix/file.c
View file

@ -23,7 +23,6 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
@ -2177,7 +2176,7 @@ static NTSTATUS get_mountmgr_fs_info( HANDLE handle, int fd, struct mountmgr_uni
OBJECT_ATTRIBUTES attr;
UNICODE_STRING string;
char *unix_name;
IO_STATUS_BLOCK io = {0};
IO_STATUS_BLOCK io = {{0}};
HANDLE mountmgr;
unsigned int status;
int letter;
@ -2616,7 +2615,7 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, PIO_APC_ROUTI
TRACE("(%p %p %p %p %p %p 0x%08x 0x%08x 0x%08x %s 0x%08x\n",
handle, event, apc_routine, apc_context, io, buffer,
length, info_class, single_entry, debugstr_us(mask),
(int)length, info_class, single_entry, debugstr_us(mask),
restart_scan);
if (event || apc_routine)
@ -3972,9 +3971,9 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU
TRACE( "handle=%p access=%08x name=%s objattr=%08x root=%p sec=%p io=%p alloc_size=%p "
"attr=%08x sharing=%08x disp=%d options=%08x ea=%p.0x%08x\n",
handle, access, debugstr_us(attr->ObjectName), attr->Attributes,
handle, (int)access, debugstr_us(attr->ObjectName), (int)attr->Attributes,
attr->RootDirectory, attr->SecurityDescriptor, io, alloc_size,
attributes, sharing, disposition, options, ea_buffer, ea_length );
(int)attributes, (int)sharing, (int)disposition, (int)options, ea_buffer, (int)ea_length );
*handle = 0;
if (!attr || !attr->ObjectName) return STATUS_INVALID_PARAMETER;
@ -4083,7 +4082,7 @@ NTSTATUS WINAPI NtCreateMailslotFile( HANDLE *handle, ULONG access, OBJECT_ATTRI
struct object_attributes *objattr;
TRACE( "%p %08x %p %p %08x %08x %08x %p\n",
handle, access, attr, io, options, quota, msg_size, timeout );
handle, (int)access, attr, io, (int)options, (int)quota, (int)msg_size, timeout );
*handle = 0;
if (!attr) return STATUS_INVALID_PARAMETER;
@ -4121,9 +4120,9 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( HANDLE *handle, ULONG access, OBJECT_ATTR
if (!attr) return STATUS_INVALID_PARAMETER;
TRACE( "(%p %x %s %p %x %d %x %d %d %d %d %d %d %p)\n",
handle, access, debugstr_us(attr->ObjectName), io, sharing, dispo,
options, pipe_type, read_mode, completion_mode, max_inst, inbound_quota,
outbound_quota, timeout );
handle, (int)access, debugstr_us(attr->ObjectName), io, (int)sharing, (int)dispo,
(int)options, (int)pipe_type, (int)read_mode, (int)completion_mode, (int)max_inst,
(int)inbound_quota, (int)outbound_quota, timeout );
/* assume we only get relative timeout */
if (timeout->QuadPart > 0) FIXME( "Wrong time %s\n", wine_dbgstr_longlong(timeout->QuadPart) );
@ -4337,7 +4336,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
unsigned int options;
unsigned int status;
TRACE( "(%p,%p,%p,0x%08x,0x%08x)\n", handle, io, ptr, len, class);
TRACE( "(%p,%p,%p,0x%08x,0x%08x)\n", handle, io, ptr, (int)len, class);
io->Information = 0;
@ -4555,7 +4554,7 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
int fd, needs_close;
unsigned int status = STATUS_SUCCESS;
TRACE( "(%p,%p,%p,0x%08x,0x%08x)\n", handle, io, ptr, len, class );
TRACE( "(%p,%p,%p,0x%08x,0x%08x)\n", handle, io, ptr, (int)len, class );
switch (class)
{
@ -5160,7 +5159,7 @@ static unsigned int get_io_timeouts( HANDLE handle, enum server_fd_type type, UL
{
/* GetCommTimeouts */
SERIAL_TIMEOUTS st;
IO_STATUS_BLOCK io = {0};
IO_STATUS_BLOCK io = {{0}};
status = NtDeviceIoControlFile( handle, NULL, NULL, NULL, &io,
IOCTL_SERIAL_GET_TIMEOUTS, NULL, 0, &st, sizeof(st) );
@ -5247,7 +5246,7 @@ static NTSTATUS get_io_avail_mode( HANDLE handle, enum server_fd_type type, BOOL
{
/* GetCommTimeouts */
SERIAL_TIMEOUTS st;
IO_STATUS_BLOCK io = {0};
IO_STATUS_BLOCK io = {{0}};
status = NtDeviceIoControlFile( handle, NULL, NULL, NULL, &io,
IOCTL_SERIAL_GET_TIMEOUTS, NULL, 0, &st, sizeof(st) );
@ -5346,7 +5345,7 @@ NTSTATUS WINAPI NtReadFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, vo
BOOL send_completion = FALSE, async_read, timeout_init_done = FALSE;
TRACE( "(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p)\n",
handle, event, apc, apc_user, io, buffer, length, offset, key );
handle, event, apc, apc_user, io, buffer, (int)length, offset, key );
if (!io) return STATUS_ACCESS_VIOLATION;
@ -5547,7 +5546,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap
BOOL send_completion = FALSE;
TRACE( "(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n",
file, event, apc, apc_user, io, segments, length, offset, key );
file, event, apc, apc_user, io, segments, (int)length, offset, key );
if (!io) return STATUS_ACCESS_VIOLATION;
@ -5627,7 +5626,7 @@ NTSTATUS WINAPI NtWriteFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, v
LARGE_INTEGER offset_eof;
TRACE( "(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p)\n",
handle, event, apc, apc_user, io, buffer, length, offset, key );
handle, event, apc, apc_user, io, buffer, (int)length, offset, key );
if (!io) return STATUS_ACCESS_VIOLATION;
@ -5854,7 +5853,7 @@ NTSTATUS WINAPI NtWriteFileGather( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap
BOOL send_completion = FALSE;
TRACE( "(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n",
file, event, apc, apc_user, io, segments, length, offset, key );
file, event, apc, apc_user, io, segments, (int)length, offset, key );
if (length % page_size) return STATUS_INVALID_PARAMETER;
if (!io) return STATUS_ACCESS_VIOLATION;
@ -5936,7 +5935,8 @@ NTSTATUS WINAPI NtDeviceIoControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUT
NTSTATUS status = STATUS_NOT_SUPPORTED;
TRACE( "(%p,%p,%p,%p,%p,0x%08x,%p,0x%08x,%p,0x%08x)\n",
handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size );
handle, event, apc, apc_context, io, (int)code,
in_buffer, (int)in_size, out_buffer, (int)out_size );
/* some broken applications call this frequently with INVALID_HANDLE_VALUE,
* and run slowly if we make a server call every time */
@ -6011,7 +6011,8 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap
NTSTATUS status;
TRACE( "(%p,%p,%p,%p,%p,0x%08x,%p,0x%08x,%p,0x%08x)\n",
handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size );
handle, event, apc, apc_context, io, (int)code,
in_buffer, (int)in_size, out_buffer, (int)out_size );
if (!io) return STATUS_INVALID_PARAMETER;
@ -6034,7 +6035,7 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap
case FSCTL_LOCK_VOLUME:
case FSCTL_UNLOCK_VOLUME:
FIXME("stub! return success - Unsupported fsctl %x (device=%x access=%x func=%x method=%x)\n",
code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3);
(int)code, (int)code >> 16, ((int)code >> 14) & 3, ((int)code >> 2) & 0xfff, (int)code & 3);
status = STATUS_SUCCESS;
break;
@ -6305,8 +6306,8 @@ NTSTATUS WINAPI NtUnlockFile( HANDLE handle, IO_STATUS_BLOCK *io_status, LARGE_I
{
unsigned int status;
TRACE( "%p %x%08x %x%08x\n",
handle, offset->u.HighPart, offset->u.LowPart, count->u.HighPart, count->u.LowPart );
TRACE( "%p %s %s\n",
handle, wine_dbgstr_longlong(offset->QuadPart), wine_dbgstr_longlong(count->QuadPart) );
if (io_status || key)
{
@ -6420,7 +6421,7 @@ NTSTATUS WINAPI NtNotifyChangeDirectoryFile( HANDLE handle, HANDLE event, PIO_AP
ULONG size = max( 4096, buffer_size );
TRACE( "%p %p %p %p %p %p %u %u %d\n",
handle, event, apc, apc_context, iosb, buffer, buffer_size, filter, subtree );
handle, event, apc, apc_context, iosb, buffer, (int)buffer_size, (int)filter, subtree );
if (!iosb) return STATUS_ACCESS_VIOLATION;
if (filter == 0 || (filter & ~FILE_NOTIFY_ALL)) return STATUS_INVALID_PARAMETER;
@ -6895,7 +6896,7 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, IO_STATUS_BLOCK *io
NTSTATUS WINAPI NtSetVolumeInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, void *info,
ULONG length, FS_INFORMATION_CLASS class )
{
FIXME( "(%p,%p,%p,0x%08x,0x%08x) stub\n", handle, io, info, length, class );
FIXME( "(%p,%p,%p,0x%08x,0x%08x) stub\n", handle, io, info, (int)length, class );
return STATUS_SUCCESS;
}
@ -6911,7 +6912,7 @@ NTSTATUS WINAPI NtQueryEaFile( HANDLE handle, IO_STATUS_BLOCK *io, void *buffer,
NTSTATUS status;
FIXME( "(%p,%p,%p,%d,%d,%p,%d,%p,%d) semi-stub\n",
handle, io, buffer, length, single_entry, list, list_len, index, restart );
handle, io, buffer, (int)length, single_entry, list, (int)list_len, index, restart );
if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL )))
return status;
@ -6929,7 +6930,7 @@ NTSTATUS WINAPI NtQueryEaFile( HANDLE handle, IO_STATUS_BLOCK *io, void *buffer,
*/
NTSTATUS WINAPI NtSetEaFile( HANDLE handle, IO_STATUS_BLOCK *io, void *buffer, ULONG length )
{
FIXME( "(%p,%p,%p,%d) stub\n", handle, io, buffer, length );
FIXME( "(%p,%p,%p,%d) stub\n", handle, io, buffer, (int)length );
return STATUS_ACCESS_DENIED;
}
@ -6966,7 +6967,7 @@ NTSTATUS WINAPI NtQueryObject( HANDLE handle, OBJECT_INFORMATION_CLASS info_clas
{
unsigned int status;
TRACE("(%p,0x%08x,%p,0x%08x,%p)\n", handle, info_class, ptr, len, used_len);
TRACE("(%p,0x%08x,%p,0x%08x,%p)\n", handle, info_class, ptr, (int)len, used_len);
if (used_len) *used_len = 0;
@ -7165,7 +7166,7 @@ NTSTATUS WINAPI NtSetInformationObject( HANDLE handle, OBJECT_INFORMATION_CLASS
{
unsigned int status;
TRACE("(%p,0x%08x,%p,0x%08x)\n", handle, info_class, ptr, len);
TRACE("(%p,0x%08x,%p,0x%08x)\n", handle, info_class, ptr, (int)len);
switch (info_class)
{

3
dlls/ntdll/unix/loader.c
View file

@ -21,7 +21,6 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
@ -767,7 +766,7 @@ NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_i
sprintf( socket_env, "WINESERVERSOCKET=%u", socketfd );
sprintf( preloader_reserve, "WINEPRELOADRESERVE=%x%08x-%x%08x",
(ULONG)(res_start >> 32), (ULONG)res_start, (ULONG)(res_end >> 32), (ULONG)res_end );
(UINT)(res_start >> 32), (UINT)res_start, (UINT)(res_end >> 32), (UINT)res_end );
putenv( preloader_reserve );
putenv( socket_env );

17
dlls/ntdll/unix/process.c
View file

@ -22,7 +22,6 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
@ -413,7 +412,7 @@ static void set_stdio_fd( int stdin_fd, int stdout_fd )
*/
static BOOL is_unix_console_handle( HANDLE handle )
{
IO_STATUS_BLOCK io = {0};
IO_STATUS_BLOCK io = {{0}};
return !NtDeviceIoControlFile( handle, NULL, NULL, NULL, &io, IOCTL_CONDRV_IS_UNIX,
NULL, 0, NULL, 0 );
}
@ -702,13 +701,13 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_
if (thread_flags & THREAD_CREATE_FLAGS_HIDE_FROM_DEBUGGER)
{
WARN( "Invalid thread flags %#x.\n", thread_flags );
WARN( "Invalid thread flags %#x.\n", (int)thread_flags );
return STATUS_INVALID_PARAMETER;
}
if (thread_flags & ~THREAD_CREATE_FLAGS_CREATE_SUSPENDED)
FIXME( "Unsupported thread flags %#x.\n", thread_flags );
FIXME( "Unsupported thread flags %#x.\n", (int)thread_flags );
for (i = 0; i < attr_count; i++)
{
@ -889,7 +888,7 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_
}
TRACE( "%s pid %04x tid %04x handles %p/%p\n", debugstr_us(&path),
HandleToULong(id.UniqueProcess), HandleToULong(id.UniqueThread),
(int)HandleToULong(id.UniqueProcess), (int)HandleToULong(id.UniqueThread),
process_handle, thread_handle );
/* update output attributes */
@ -1070,7 +1069,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class
unsigned int ret = STATUS_SUCCESS;
ULONG len = 0;
TRACE( "(%p,0x%08x,%p,0x%08x,%p)\n", handle, class, info, size, ret_len );
TRACE( "(%p,0x%08x,%p,0x%08x,%p)\n", handle, class, info, (int)size, ret_len );
switch (class)
{
@ -1469,7 +1468,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class
break;
case ProcessCookie:
FIXME( "ProcessCookie (%p,%p,0x%08x,%p) stub\n", handle, info, size, ret_len );
FIXME( "ProcessCookie (%p,%p,0x%08x,%p) stub\n", handle, info, (int)size, ret_len );
if (handle == NtCurrentProcess())
{
len = sizeof(ULONG);
@ -1517,7 +1516,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class
default:
FIXME("(%p,info_class=%d,%p,0x%08x,%p) Unknown information class\n",
handle, class, info, size, ret_len );
handle, class, info, (int)size, ret_len );
ret = STATUS_INVALID_INFO_CLASS;
break;
}
@ -1645,7 +1644,7 @@ NTSTATUS WINAPI NtSetInformationProcess( HANDLE handle, PROCESSINFOCLASS class,
return ret;
default:
FIXME( "(%p,0x%08x,%p,0x%08x) stub\n", handle, class, info, size );
FIXME( "(%p,0x%08x,%p,0x%08x) stub\n", handle, class, info, (int)size );
ret = STATUS_NOT_IMPLEMENTED;
break;
}

37
dlls/ntdll/unix/registry.c
View file

@ -24,7 +24,6 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include <stdarg.h>
#include <string.h>
@ -57,10 +56,10 @@ NTSTATUS open_hkcu_key( const char *path, HANDLE *key )
sid = ((TOKEN_USER *)sid_data)->User.Sid;
len = sprintf( buffer, "\\Registry\\User\\S-%u-%u", sid->Revision,
MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], sid->IdentifierAuthority.Value[4] ),
MAKEWORD( sid->IdentifierAuthority.Value[3], sid->IdentifierAuthority.Value[2] )));
(int)MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], sid->IdentifierAuthority.Value[4] ),
MAKEWORD( sid->IdentifierAuthority.Value[3], sid->IdentifierAuthority.Value[2] )));
for (i = 0; i < sid->SubAuthorityCount; i++)
len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] );
len += sprintf( buffer + len, "-%u", (int)sid->SubAuthority[i] );
len += sprintf( buffer + len, "\\%s", path );
ascii_to_unicode( bufferW, buffer, len + 1 );
@ -87,7 +86,7 @@ NTSTATUS WINAPI NtCreateKey( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRI
objattr->attributes |= OBJ_OPENIF | OBJ_CASE_INSENSITIVE;
TRACE( "(%p,%s,%s,%x,%x,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName),
debugstr_us(class), options, access, key );
debugstr_us(class), (int)options, (int)access, key );
SERVER_START_REQ( create_key )
{
@ -124,7 +123,7 @@ NTSTATUS WINAPI NtCreateKeyTransacted( HANDLE *key, ACCESS_MASK access, const OB
HANDLE transacted, ULONG *dispos )
{
FIXME( "(%p,%s,%s,%x,%x,%p,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName),
debugstr_us(class), options, access, transacted, key );
debugstr_us(class), (int)options, (int)access, transacted, key );
return STATUS_NOT_IMPLEMENTED;
}
@ -141,9 +140,9 @@ NTSTATUS WINAPI NtOpenKeyEx( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRI
if (attr->Length != sizeof(*attr)) return STATUS_INVALID_PARAMETER;
if (attr->ObjectName->Length & 1) return STATUS_OBJECT_NAME_INVALID;
TRACE( "(%p,%s,%x,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName), access, key );
TRACE( "(%p,%s,%x,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName), (int)access, key );
if (options & ~REG_OPTION_OPEN_LINK) FIXME( "options %x not implemented\n", options );
if (options & ~REG_OPTION_OPEN_LINK) FIXME( "options %x not implemented\n", (int)options );
attributes = attr->Attributes | OBJ_CASE_INSENSITIVE;
@ -177,7 +176,7 @@ NTSTATUS WINAPI NtOpenKey( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRIBU
NTSTATUS WINAPI NtOpenKeyTransactedEx( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr,
ULONG options, HANDLE transaction )
{
FIXME( "(%p %x %p %x %p)\n", key, access, attr, options, transaction );
FIXME( "(%p %x %p %x %p)\n", key, (int)access, attr, (int)options, transaction );
return STATUS_NOT_IMPLEMENTED;
}
@ -380,7 +379,7 @@ NTSTATUS WINAPI NtQueryKey( HANDLE handle, KEY_INFORMATION_CLASS info_class,
*/
NTSTATUS WINAPI NtSetInformationKey( HANDLE key, int class, void *info, ULONG length )
{
FIXME( "(%p,0x%08x,%p,0x%08x) stub\n", key, class, info, length );
FIXME( "(%p,0x%08x,%p,0x%08x) stub\n", key, class, info, (int)length );
return STATUS_SUCCESS;
}
@ -442,7 +441,7 @@ NTSTATUS WINAPI NtEnumerateValueKey( HANDLE handle, ULONG index, KEY_VALUE_INFOR
void *ptr;
size_t fixed_size;
TRACE( "(%p,%u,%d,%p,%d)\n", handle, index, info_class, info, length );
TRACE( "(%p,%u,%d,%p,%d)\n", handle, (int)index, info_class, info, (int)length );
/* compute the length we want to retrieve */
switch (info_class)
@ -486,7 +485,7 @@ NTSTATUS WINAPI NtQueryValueKey( HANDLE handle, const UNICODE_STRING *name,
UCHAR *data_ptr;
unsigned int fixed_size, min_size;
TRACE( "(%p,%s,%d,%p,%d)\n", handle, debugstr_us(name), info_class, info, length );
TRACE( "(%p,%s,%d,%p,%d)\n", handle, debugstr_us(name), info_class, info, (int)length );
if (name->Length > MAX_VALUE_LENGTH) return STATUS_OBJECT_NAME_NOT_FOUND;
@ -550,7 +549,7 @@ NTSTATUS WINAPI NtQueryValueKey( HANDLE handle, const UNICODE_STRING *name,
NTSTATUS WINAPI NtQueryMultipleValueKey( HANDLE key, KEY_MULTIPLE_VALUE_INFORMATION *info,
ULONG count, void *buffer, ULONG length, ULONG *retlen )
{
FIXME( "(%p,%p,0x%08x,%p,0x%08x,%p) stub!\n", key, info, count, buffer, length, retlen );
FIXME( "(%p,%p,0x%08x,%p,0x%08x,%p) stub!\n", key, info, (int)count, buffer, (int)length, retlen );
return STATUS_SUCCESS;
}
@ -563,7 +562,7 @@ NTSTATUS WINAPI NtSetValueKey( HANDLE key, const UNICODE_STRING *name, ULONG ind
{
unsigned int ret;
TRACE( "(%p,%s,%d,%p,%d)\n", key, debugstr_us(name), type, data, count );
TRACE( "(%p,%s,%d,%p,%d)\n", key, debugstr_us(name), (int)type, data, (int)count );
if (name->Length > MAX_VALUE_LENGTH) return STATUS_INVALID_PARAMETER;
@ -614,7 +613,8 @@ NTSTATUS WINAPI NtNotifyChangeMultipleKeys( HANDLE key, ULONG count, OBJECT_ATTR
unsigned int ret;
TRACE( "(%p,%u,%p,%p,%p,%p,%p,0x%08x, 0x%08x,%p,0x%08x,0x%08x)\n",
key, count, attr, event, apc, apc_context, io, filter, async, buffer, length, subtree );
key, (int)count, attr, event, apc, apc_context, io,
(int)filter, async, buffer, (int)length, subtree );
if (count || attr || apc || apc_context || buffer || length)
FIXME( "Unimplemented optional parameter\n" );
@ -708,9 +708,10 @@ NTSTATUS WINAPI NtLoadKeyEx( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *f
UNICODE_STRING nt_name;
OBJECT_ATTRIBUTES new_attr = *file;
TRACE( "(%p,%p,0x%x,%p,%p,0x%x,%p,%p)\n", attr, file, flags, trustkey, event, access, roothandle, iostatus );
TRACE( "(%p,%p,0x%x,%p,%p,0x%x,%p,%p)\n",
attr, file, (int)flags, trustkey, event, (int)access, roothandle, iostatus );
if (flags) FIXME( "flags %x not handled\n", flags );
if (flags) FIXME( "flags %x not handled\n", (int)flags );
if (trustkey) FIXME("trustkey parameter not supported\n");
if (event) FIXME("event parameter not supported\n");
if (access) FIXME("access parameter not supported\n");
@ -795,7 +796,7 @@ NTSTATUS WINAPI NtSaveKey( HANDLE key, HANDLE file )
*/
NTSTATUS WINAPI NtRestoreKey( HANDLE key, HANDLE file, ULONG flags )
{
FIXME( "(%p,%p,0x%08x) stub\n", key, file, flags );
FIXME( "(%p,%p,0x%08x) stub\n", key, file, (int)flags );
return STATUS_SUCCESS;
}

30
dlls/ntdll/unix/security.c
View file

@ -22,7 +22,6 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include <stdarg.h>
#include <stdlib.h>
@ -54,7 +53,7 @@ NTSTATUS WINAPI NtOpenProcessTokenEx( HANDLE process, DWORD access, DWORD attrib
{
unsigned int ret;
TRACE( "(%p,0x%08x,0x%08x,%p)\n", process, access, attributes, handle );
TRACE( "(%p,0x%08x,0x%08x,%p)\n", process, (int)access, (int)attributes, handle );
*handle = 0;
@ -89,7 +88,7 @@ NTSTATUS WINAPI NtOpenThreadTokenEx( HANDLE thread, DWORD access, BOOLEAN self,
{
unsigned int ret;
TRACE( "(%p,0x%08x,%u,0x%08x,%p)\n", thread, access, self, attributes, handle );
TRACE( "(%p,0x%08x,%u,0x%08x,%p)\n", thread, (int)access, self, (int)attributes, handle );
*handle = 0;
@ -125,7 +124,7 @@ NTSTATUS WINAPI NtDuplicateToken( HANDLE token, ACCESS_MASK access, OBJECT_ATTRI
{
SECURITY_QUALITY_OF_SERVICE *qos = attr->SecurityQualityOfService;
TRACE( "ObjectAttributes->SecurityQualityOfService = {%d, %d, %d, %s}\n",
qos->Length, qos->ImpersonationLevel, qos->ContextTrackingMode,
(int)qos->Length, qos->ImpersonationLevel, qos->ContextTrackingMode,
qos->EffectiveOnly ? "TRUE" : "FALSE");
level = qos->ImpersonationLevel;
}
@ -201,7 +200,7 @@ NTSTATUS WINAPI NtQueryInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS c
ULONG len = 0;
unsigned int status = STATUS_SUCCESS;
TRACE( "(%p,%d,%p,%d,%p)\n", token, class, info, length, retlen );
TRACE( "(%p,%d,%p,%d,%p)\n", token, class, info, (int)length, retlen );
if (class < MaxTokenInfoClass) len = info_len[class];
if (retlen) *retlen = len;
@ -495,7 +494,7 @@ NTSTATUS WINAPI NtSetInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS cla
{
unsigned int ret = STATUS_NOT_IMPLEMENTED;
TRACE( "%p %d %p %u\n", token, class, info, length );
TRACE( "%p %d %p %u\n", token, class, info, (int)length );
switch (class)
{
@ -560,7 +559,8 @@ NTSTATUS WINAPI NtCreateLowBoxToken( HANDLE *token_handle, HANDLE token, ACCESS_
SID_AND_ATTRIBUTES *capabilities, ULONG handle_count, HANDLE *handle )
{
FIXME("(%p, %p, %x, %p, %p, %u, %p, %u, %p): stub\n",
token_handle, token, access, attr, sid, count, capabilities, handle_count, handle );
token_handle, token, (int)access, attr, sid,
(int)count, capabilities, (int)handle_count, handle );
/* we need to return a NULL handle since later it will be passed to NtClose and that must not fail */
*token_handle = NULL;
@ -574,7 +574,7 @@ NTSTATUS WINAPI NtCreateLowBoxToken( HANDLE *token_handle, HANDLE token, ACCESS_
NTSTATUS WINAPI NtAdjustGroupsToken( HANDLE token, BOOLEAN reset, TOKEN_GROUPS *groups,
ULONG length, TOKEN_GROUPS *prev, ULONG *retlen )
{
FIXME( "%p %d %p %u %p %p\n", token, reset, groups, length, prev, retlen );
FIXME( "%p %d %p %u %p %p\n", token, reset, groups, (int)length, prev, retlen );
return STATUS_NOT_IMPLEMENTED;
}
@ -587,7 +587,7 @@ NTSTATUS WINAPI NtAdjustPrivilegesToken( HANDLE token, BOOLEAN disable, TOKEN_PR
{
unsigned int ret;
TRACE( "(%p,0x%08x,%p,0x%08x,%p,%p)\n", token, disable, privs, length, prev, retlen );
TRACE( "(%p,0x%08x,%p,0x%08x,%p,%p)\n", token, disable, privs, (int)length, prev, retlen );
SERVER_START_REQ( adjust_token_privileges )
{
@ -623,11 +623,11 @@ NTSTATUS WINAPI NtFilterToken( HANDLE token, ULONG flags, TOKEN_GROUPS *disable_
SID *sids = NULL;
unsigned int status;
TRACE( "%p %#x %p %p %p %p\n", token, flags, disable_sids, privileges,
TRACE( "%p %#x %p %p %p %p\n", token, (int)flags, disable_sids, privileges,
restrict_sids, new_token );
if (flags)
FIXME( "flags %#x unsupported\n", flags );
FIXME( "flags %#x unsupported\n", (int)flags );
if (restrict_sids)
FIXME( "support for restricting sids not yet implemented\n" );
@ -720,7 +720,7 @@ NTSTATUS WINAPI NtAccessCheck( PSECURITY_DESCRIPTOR descr, HANDLE token, ACCESS_
ULONG priv_len;
TRACE( "(%p, %p, %08x, %p, %p, %p, %p, %p)\n",
descr, token, access, mapping, privs, retlen, access_granted, access_status );
descr, token, (int)access, mapping, privs, retlen, access_granted, access_status );
if (!privs || !retlen) return STATUS_ACCESS_VIOLATION;
priv_len = *retlen;
@ -771,7 +771,7 @@ NTSTATUS WINAPI NtAccessCheckAndAuditAlarm( UNICODE_STRING *subsystem, HANDLE ha
BOOLEAN *onclose )
{
FIXME( "(%s, %p, %s, %p, 0x%08x, %p, %d, %p, %p, %p), stub\n",
debugstr_us(subsystem), handle, debugstr_us(typename), descr, access,
debugstr_us(subsystem), handle, debugstr_us(typename), descr, (int)access,
mapping, creation, access_granted, access_status, onclose );
return STATUS_NOT_IMPLEMENTED;
}
@ -788,7 +788,7 @@ NTSTATUS WINAPI NtQuerySecurityObject( HANDLE handle, SECURITY_INFORMATION info,
void *buffer;
unsigned int buffer_size = 512;
TRACE( "(%p,0x%08x,%p,0x%08x,%p)\n", handle, info, descr, length, retlen );
TRACE( "(%p,0x%08x,%p,0x%08x,%p)\n", handle, (int)info, descr, (int)length, retlen );
for (;;)
{
@ -848,7 +848,7 @@ NTSTATUS WINAPI NtSetSecurityObject( HANDLE handle, SECURITY_INFORMATION info, P
OBJECT_ATTRIBUTES attr;
unsigned int status;
TRACE( "%p 0x%08x %p\n", handle, info, descr );
TRACE( "%p 0x%08x %p\n", handle, (int)info, descr );
if (!descr) return STATUS_ACCESS_VIOLATION;

5
dlls/ntdll/unix/serial.c
View file

@ -23,7 +23,6 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
@ -550,7 +549,7 @@ static NTSTATUS set_baud_rate(int fd, const SERIAL_BAUD_RATE* sbr)
"hardware. I hope you know what you are doing. Any disruption Wine\n"
"has caused to your linux system can be undone with setserial\n"
"(see man setserial). If you have incapacitated a Hayes type modem,\n"
"reset it and it will probably recover.\n", sbr->BaudRate, arby);
"reset it and it will probably recover.\n", (int)sbr->BaudRate, arby);
ioctl(fd, TIOCSSERIAL, &nuts);
cfsetospeed( &port, B38400 );
}
@ -757,7 +756,7 @@ static NTSTATUS set_line_control(int fd, const SERIAL_LINE_CONTROL* slc)
static NTSTATUS set_queue_size(int fd, const SERIAL_QUEUE_SIZE* sqs)
{
FIXME("insize %d outsize %d unimplemented stub\n", sqs->InSize, sqs->OutSize);
FIXME("insize %d outsize %d unimplemented stub\n", (int)sqs->InSize, (int)sqs->OutSize);
return STATUS_SUCCESS;
}

5
dlls/ntdll/unix/server.c
View file

@ -21,7 +21,6 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
@ -160,7 +159,7 @@ static DECLSPEC_NORETURN void server_protocol_error( const char *err, ... )
va_list args;
va_start( args, err );
fprintf( stderr, "wine client error:%x: ", GetCurrentThreadId() );
fprintf( stderr, "wine client error:%x: ", (int)GetCurrentThreadId() );
vfprintf( stderr, err, args );
va_end( args );
abort_thread(1);
@ -172,7 +171,7 @@ static DECLSPEC_NORETURN void server_protocol_error( const char *err, ... )
*/
static DECLSPEC_NORETURN void server_protocol_perror( const char *err )
{
fprintf( stderr, "wine client error:%x: ", GetCurrentThreadId() );
fprintf( stderr, "wine client error:%x: ", (int)GetCurrentThreadId() );
perror( err );
abort_thread(1);
}

34
dlls/ntdll/unix/signal_arm.c
View file

@ -22,7 +22,6 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#ifdef __arm__
@ -529,14 +528,14 @@ static NTSTATUS ehabi_virtual_unwind( UINT ip, DWORD *frame, CONTEXT *context,
* describes how both of them are restored separately, and as long as
* the unwind info restored Pc, it doesn't have to be set from Lr. */
TRACE( "next function pc=%08x\n", context->Pc );
TRACE(" r0=%08x r1=%08x r2=%08x r3=%08x\n",
TRACE( "next function pc=%08lx\n", context->Pc );
TRACE(" r0=%08lx r1=%08lx r2=%08lx r3=%08lx\n",
context->R0, context->R1, context->R2, context->R3 );
TRACE(" r4=%08x r5=%08x r6=%08x r7=%08x\n",
TRACE(" r4=%08lx r5=%08lx r6=%08lx r7=%08lx\n",
context->R4, context->R5, context->R6, context->R7 );
TRACE(" r8=%08x r9=%08x r10=%08x r11=%08x\n",
TRACE(" r8=%08lx r9=%08lx r10=%08lx r11=%08lx\n",
context->R8, context->R9, context->R10, context->R11 );
TRACE(" r12=%08x sp=%08x lr=%08x pc=%08x\n",
TRACE(" r12=%08lx sp=%08lx lr=%08lx pc=%08lx\n",
context->R12, context->Sp, context->Lr, context->Pc );
return STATUS_SUCCESS;
@ -712,14 +711,14 @@ static NTSTATUS libunwind_virtual_unwind( DWORD ip, DWORD *frame, CONTEXT *conte
context->Lr = *orig_lr;
}
TRACE( "next function pc=%08x%s\n", context->Pc, rc ? "" : " (last frame)" );
TRACE(" r0=%08x r1=%08x r2=%08x r3=%08x\n",
TRACE( "next function pc=%08lx%s\n", context->Pc, rc ? "" : " (last frame)" );
TRACE(" r0=%08lx r1=%08lx r2=%08lx r3=%08lx\n",
context->R0, context->R1, context->R2, context->R3 );
TRACE(" r4=%08x r5=%08x r6=%08x r7=%08x\n",
TRACE(" r4=%08lx r5=%08lx r6=%08lx r7=%08lx\n",
context->R4, context->R5, context->R6, context->R7 );
TRACE(" r8=%08x r9=%08x r10=%08x r11=%08x\n",
TRACE(" r8=%08lx r9=%08lx r10=%08lx r11=%08lx\n",
context->R8, context->R9, context->R10, context->R11 );
TRACE(" r12=%08x sp=%08x lr=%08x pc=%08x\n",
TRACE(" r12=%08lx sp=%08lx lr=%08lx pc=%08lx\n",
context->R12, context->Sp, context->Lr, context->Pc );
return STATUS_SUCCESS;
}
@ -1259,19 +1258,18 @@ static BOOL handle_syscall_fault( ucontext_t *context, EXCEPTION_RECORD *rec )
if (!is_inside_syscall( context ) && !ntdll_get_thread_data()->jmp_buf) return FALSE;
TRACE( "code=%x flags=%x addr=%p pc=%08x tid=%04x\n",
rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress,
(DWORD)PC_sig(context), GetCurrentThreadId() );
TRACE( "code=%lx flags=%lx addr=%p pc=%08lx\n",
rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, (DWORD)PC_sig(context) );
for (i = 0; i < rec->NumberParameters; i++)
TRACE( " info[%d]=%08lx\n", i, rec->ExceptionInformation[i] );
TRACE( " r0=%08x r1=%08x r2=%08x r3=%08x r4=%08x r5=%08x\n",
TRACE( " r0=%08lx r1=%08lx r2=%08lx r3=%08lx r4=%08lx r5=%08lx\n",
(DWORD)REGn_sig(0, context), (DWORD)REGn_sig(1, context), (DWORD)REGn_sig(2, context),
(DWORD)REGn_sig(3, context), (DWORD)REGn_sig(4, context), (DWORD)REGn_sig(5, context) );
TRACE( " r6=%08x r7=%08x r8=%08x r9=%08x r10=%08x r11=%08x\n",
TRACE( " r6=%08lx r7=%08lx r8=%08lx r9=%08lx r10=%08lx r11=%08lx\n",
(DWORD)REGn_sig(6, context), (DWORD)REGn_sig(7, context), (DWORD)REGn_sig(8, context),
(DWORD)REGn_sig(9, context), (DWORD)REGn_sig(10, context), (DWORD)FP_sig(context) );
TRACE( " r12=%08x sp=%08x lr=%08x pc=%08x cpsr=%08x\n",
TRACE( " r12=%08lx sp=%08lx lr=%08lx pc=%08lx cpsr=%08lx\n",
(DWORD)IP_sig(context), (DWORD)SP_sig(context), (DWORD)LR_sig(context),
(DWORD)PC_sig(context), (DWORD)CPSR_sig(context) );
@ -1285,7 +1283,7 @@ static BOOL handle_syscall_fault( ucontext_t *context, EXCEPTION_RECORD *rec )
}
else
{
TRACE( "returning to user mode ip=%08x ret=%08x\n", frame->pc, rec->ExceptionCode );
TRACE( "returning to user mode ip=%08x ret=%08lx\n", frame->pc, rec->ExceptionCode );
REGn_sig(0, context) = (DWORD)frame;
REGn_sig(1, context) = rec->ExceptionCode;
PC_sig(context) = (DWORD)__wine_syscall_dispatcher_return;

22
dlls/ntdll/unix/signal_i386.c
View file

@ -21,7 +21,6 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#ifdef __i386__
@ -1129,16 +1128,16 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context )
}
if (context->ContextFlags & (CONTEXT_INTEGER & ~CONTEXT_i386))
TRACE( "%p: eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x\n", handle,
TRACE( "%p: eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx esi=%08lx edi=%08lx\n", handle,
context->Eax, context->Ebx, context->Ecx, context->Edx, context->Esi, context->Edi );
if (context->ContextFlags & (CONTEXT_CONTROL & ~CONTEXT_i386))
TRACE( "%p: ebp=%08x esp=%08x eip=%08x cs=%04x ss=%04x flags=%08x\n", handle,
TRACE( "%p: ebp=%08lx esp=%08lx eip=%08lx cs=%04lx ss=%04lx flags=%08lx\n", handle,
context->Ebp, context->Esp, context->Eip, context->SegCs, context->SegSs, context->EFlags );
if (context->ContextFlags & (CONTEXT_SEGMENTS & ~CONTEXT_i386))
TRACE( "%p: ds=%04x es=%04x fs=%04x gs=%04x\n", handle,
TRACE( "%p: ds=%04lx es=%04lx fs=%04lx gs=%04lx\n", handle,
context->SegDs, context->SegEs, context->SegFs, context->SegGs );
if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_i386))
TRACE( "%p: dr0=%08x dr1=%08x dr2=%08x dr3=%08x dr6=%08x dr7=%08x\n", handle,
TRACE( "%p: dr0=%08lx dr1=%08lx dr2=%08lx dr3=%08lx dr6=%08lx dr7=%08lx\n", handle,
context->Dr0, context->Dr1, context->Dr2, context->Dr3, context->Dr6, context->Dr7 );
return STATUS_SUCCESS;
@ -1262,7 +1261,7 @@ static inline BOOL check_invalid_gs( ucontext_t *sigcontext, CONTEXT *context )
instr++;
continue;
case 0x65: /* %gs: */
TRACE( "%04x/%04x at %p, fixing up\n", context->SegGs, system_gs, instr );
TRACE( "%04lx/%04x at %p, fixing up\n", context->SegGs, system_gs, instr );
GS_sig(sigcontext) = system_gs;
return TRUE;
default:
@ -1774,15 +1773,14 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, void *stack_ptr,
if (!is_inside_syscall( sigcontext ) && !ntdll_get_thread_data()->jmp_buf) return FALSE;
TRACE( "code=%x flags=%x addr=%p ip=%08x tid=%04x\n",
rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress,
context->Eip, GetCurrentThreadId() );
TRACE( "code=%lx flags=%lx addr=%p ip=%08lx\n",
rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Eip );
for (i = 0; i < rec->NumberParameters; i++)
TRACE( " info[%d]=%08lx\n", i, rec->ExceptionInformation[i] );
TRACE(" eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x\n",
TRACE(" eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx esi=%08lx edi=%08lx\n",
context->Eax, context->Ebx, context->Ecx,
context->Edx, context->Esi, context->Edi );
TRACE(" ebp=%08x esp=%08x cs=%04x ds=%04x es=%04x fs=%04x gs=%04x flags=%08x\n",
TRACE(" ebp=%08lx esp=%08lx cs=%04lx ds=%04lx es=%04lx fs=%04lx gs=%04lx flags=%08lx\n",
context->Ebp, context->Esp, context->SegCs, context->SegDs,
context->SegEs, context->SegFs, context->SegGs, context->EFlags );
@ -1800,7 +1798,7 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, void *stack_ptr,
}
else
{
TRACE( "returning to user mode ip=%08x ret=%08x\n", frame->eip, rec->ExceptionCode );
TRACE( "returning to user mode ip=%08x ret=%08lx\n", frame->eip, rec->ExceptionCode );
stack = (UINT *)frame;
*(--stack) = rec->ExceptionCode;
*(--stack) = (UINT)frame;

42
dlls/ntdll/unix/sync.c
View file

@ -24,7 +24,6 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
@ -324,11 +323,11 @@ NTSTATUS WINAPI NtQuerySemaphore( HANDLE handle, SEMAPHORE_INFORMATION_CLASS cla
unsigned int ret;
SEMAPHORE_BASIC_INFORMATION *out = info;
TRACE("(%p, %u, %p, %u, %p)\n", handle, class, info, len, ret_len);
TRACE("(%p, %u, %p, %u, %p)\n", handle, class, info, (int)len, ret_len);
if (class != SemaphoreBasicInformation)
{
FIXME("(%p,%d,%u) Unknown class\n", handle, class, len);
FIXME("(%p,%d,%u) Unknown class\n", handle, class, (int)len);
return STATUS_INVALID_INFO_CLASS;
}
@ -501,12 +500,11 @@ NTSTATUS WINAPI NtQueryEvent( HANDLE handle, EVENT_INFORMATION_CLASS class,
unsigned int ret;
EVENT_BASIC_INFORMATION *out = info;
TRACE("(%p, %u, %p, %u, %p)\n", handle, class, info, len, ret_len);
TRACE("(%p, %u, %p, %u, %p)\n", handle, class, info, (int)len, ret_len);
if (class != EventBasicInformation)
{
FIXME("(%p, %d, %d) Unknown class\n",
handle, class, len);
FIXME("(%p, %d, %d) Unknown class\n", handle, class, (int)len);
return STATUS_INVALID_INFO_CLASS;
}
@ -607,11 +605,11 @@ NTSTATUS WINAPI NtQueryMutant( HANDLE handle, MUTANT_INFORMATION_CLASS class,
unsigned int ret;
MUTANT_BASIC_INFORMATION *out = info;
TRACE("(%p, %u, %p, %u, %p)\n", handle, class, info, len, ret_len);
TRACE("(%p, %u, %p, %u, %p)\n", handle, class, info, (int)len, ret_len);
if (class != MutantBasicInformation)
{
FIXME( "(%p, %d, %d) Unknown class\n", handle, class, len );
FIXME( "(%p, %d, %d) Unknown class\n", handle, class, (int)len );
return STATUS_INVALID_INFO_CLASS;
}
@ -690,7 +688,7 @@ NTSTATUS WINAPI NtTerminateJobObject( HANDLE handle, NTSTATUS status )
{
unsigned int ret;
TRACE( "(%p, %d)\n", handle, status );
TRACE( "(%p, %d)\n", handle, (int)status );
SERVER_START_REQ( terminate_job )
{
@ -712,7 +710,7 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c
{
unsigned int ret;
TRACE( "semi-stub: %p %u %p %u %p\n", handle, class, info, len, ret_len );
TRACE( "semi-stub: %p %u %p %u %p\n", handle, class, info, (int)len, ret_len );
if (class >= MaxJobObjectInfoClass) return STATUS_INVALID_PARAMETER;
@ -809,7 +807,7 @@ NTSTATUS WINAPI NtSetInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS cla
ULONG info_size = sizeof(JOBOBJECT_BASIC_LIMIT_INFORMATION);
DWORD limit_flags = JOB_OBJECT_BASIC_LIMIT_VALID_FLAGS;
TRACE( "(%p, %u, %p, %u)\n", handle, class, info, len );
TRACE( "(%p, %u, %p, %u)\n", handle, class, info, (int)len );
if (class >= MaxJobObjectInfoClass) return STATUS_INVALID_PARAMETER;
@ -848,7 +846,7 @@ NTSTATUS WINAPI NtSetInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS cla
status = STATUS_SUCCESS;
/* fall through */
default:
FIXME( "stub: %p %u %p %u\n", handle, class, info, len );
FIXME( "stub: %p %u %p %u\n", handle, class, info, (int)len );
}
return status;
}
@ -1325,7 +1323,7 @@ NTSTATUS WINAPI NtSetTimer( HANDLE handle, const LARGE_INTEGER *when, PTIMER_APC
{
unsigned int ret = STATUS_SUCCESS;
TRACE( "(%p,%p,%p,%p,%08x,0x%08x,%p)\n", handle, when, callback, arg, resume, period, state );
TRACE( "(%p,%p,%p,%p,%08x,0x%08x,%p)\n", handle, when, callback, arg, resume, (int)period, state );
SERVER_START_REQ( set_timer )
{
@ -1373,7 +1371,7 @@ NTSTATUS WINAPI NtQueryTimer( HANDLE handle, TIMER_INFORMATION_CLASS class,
unsigned int ret;
LARGE_INTEGER now;
TRACE( "(%p,%d,%p,0x%08x,%p)\n", handle, class, info, len, ret_len );
TRACE( "(%p,%d,%p,0x%08x,%p)\n", handle, class, info, (int)len, ret_len );
switch (class)
{
@ -1599,7 +1597,7 @@ NTSTATUS WINAPI NtSetTimerResolution( ULONG res, BOOLEAN set, ULONG *current_res
{
static BOOL has_request = FALSE;
TRACE( "(%u,%u,%p), semi-stub!\n", res, set, current_res );
TRACE( "(%u,%u,%p), semi-stub!\n", (int)res, set, current_res );
/* Wine has no support for anything other that 1 ms and does not keep of
* track resolution requests anyway.
@ -1625,7 +1623,7 @@ NTSTATUS WINAPI NtSetTimerResolution( ULONG res, BOOLEAN set, ULONG *current_res
*/
NTSTATUS WINAPI NtSetIntervalProfile( ULONG interval, KPROFILE_SOURCE source )
{
FIXME( "%u,%d\n", interval, source );
FIXME( "%u,%d\n", (int)interval, source );
return STATUS_SUCCESS;
}
@ -1761,7 +1759,7 @@ NTSTATUS WINAPI NtCreateIoCompletion( HANDLE *handle, ACCESS_MASK access, OBJECT
data_size_t len;
struct object_attributes *objattr;
TRACE( "(%p, %x, %p, %d)\n", handle, access, attr, threads );
TRACE( "(%p, %x, %p, %d)\n", handle, (int)access, attr, (int)threads );
*handle = 0;
if ((status = alloc_object_attributes( attr, &objattr, &len ))) return status;
@ -1813,7 +1811,7 @@ NTSTATUS WINAPI NtSetIoCompletion( HANDLE handle, ULONG_PTR key, ULONG_PTR value
{
unsigned int ret;
TRACE( "(%p, %lx, %lx, %x, %lx)\n", handle, key, value, status, count );
TRACE( "(%p, %lx, %lx, %x, %lx)\n", handle, key, value, (int)status, count );
SERVER_START_REQ( add_completion )
{
@ -1869,7 +1867,7 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE handle, FILE_IO_COMPLETION_INFORM
unsigned int status;
ULONG i = 0;
TRACE( "%p %p %u %p %p %u\n", handle, info, count, written, timeout, alertable );
TRACE( "%p %p %u %p %p %u\n", handle, info, (int)count, written, timeout, alertable );
for (;;)
{
@ -1911,7 +1909,7 @@ NTSTATUS WINAPI NtQueryIoCompletion( HANDLE handle, IO_COMPLETION_INFORMATION_CL
{
unsigned int status;
TRACE( "(%p, %d, %p, 0x%x, %p)\n", handle, class, buffer, len, ret_len );
TRACE( "(%p, %d, %p, 0x%x, %p)\n", handle, class, buffer, (int)len, ret_len );
if (!buffer) return STATUS_INVALID_PARAMETER;
@ -2026,7 +2024,7 @@ NTSTATUS WINAPI NtOpenSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_
NTSTATUS WINAPI NtCreatePort( HANDLE *handle, OBJECT_ATTRIBUTES *attr, ULONG info_len,
ULONG data_len, ULONG *reserved )
{
FIXME( "(%p,%p,%u,%u,%p),stub!\n", handle, attr, info_len, data_len, reserved );
FIXME( "(%p,%p,%u,%u,%p),stub!\n", handle, attr, (int)info_len, (int)data_len, reserved );
return STATUS_NOT_IMPLEMENTED;
}
@ -2074,7 +2072,7 @@ NTSTATUS WINAPI NtListenPort( HANDLE handle, LPC_MESSAGE *msg )
NTSTATUS WINAPI NtAcceptConnectPort( HANDLE *handle, ULONG id, LPC_MESSAGE *msg, BOOLEAN accept,
LPC_SECTION_WRITE *write, LPC_SECTION_READ *read )
{
FIXME("(%p,%u,%p,%d,%p,%p),stub!\n", handle, id, msg, accept, write, read );
FIXME("(%p,%u,%p,%d,%p,%p),stub!\n", handle, (int)id, msg, accept, write, read );
return STATUS_NOT_IMPLEMENTED;
}

52
dlls/ntdll/unix/system.c
View file

@ -21,7 +21,6 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
@ -1172,7 +1171,7 @@ static NTSTATUS create_logical_proc_info(void)
*/
void init_cpu_info(void)
{
NTSTATUS status;
unsigned int status;
long num;
#ifdef _SC_NPROCESSORS_ONLN
@ -1199,8 +1198,8 @@ void init_cpu_info(void)
peb->NumberOfProcessors = num;
get_cpuinfo( &cpu_info );
TRACE( "<- CPU arch %d, level %d, rev %d, features 0x%x\n",
cpu_info.ProcessorArchitecture, cpu_info.ProcessorLevel, cpu_info.ProcessorRevision,
cpu_info.ProcessorFeatureBits );
(int)cpu_info.ProcessorArchitecture, (int)cpu_info.ProcessorLevel,
(int)cpu_info.ProcessorRevision, (int)cpu_info.ProcessorFeatureBits );
if ((status = create_logical_proc_info()))
{
@ -1616,7 +1615,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON
&bios_args, &system_args, &board_args, &chassis_args );
}
default:
FIXME("info_class SYSTEM_FIRMWARE_TABLE_INFORMATION provider %08x\n", sfti->ProviderSignature);
FIXME("info_class SYSTEM_FIRMWARE_TABLE_INFORMATION provider %08x\n", (int)sfti->ProviderSignature);
return STATUS_NOT_IMPLEMENTED;
}
}
@ -2195,19 +2194,19 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const char*
reg_tzi.StandardDate = tz_data.std_date;
reg_tzi.DaylightDate = tz_data.dlt_date;
TRACE("%s: bias %d\n", debugstr_us(&nameW), reg_tzi.Bias);
TRACE("%s: bias %d\n", debugstr_us(&nameW), (int)reg_tzi.Bias);
TRACE("std (d/m/y): %u/%02u/%04u day of week %u %u:%02u:%02u.%03u bias %d\n",
reg_tzi.StandardDate.wDay, reg_tzi.StandardDate.wMonth,
reg_tzi.StandardDate.wYear, reg_tzi.StandardDate.wDayOfWeek,
reg_tzi.StandardDate.wHour, reg_tzi.StandardDate.wMinute,
reg_tzi.StandardDate.wSecond, reg_tzi.StandardDate.wMilliseconds,
reg_tzi.StandardBias);
(int)reg_tzi.StandardBias);
TRACE("dst (d/m/y): %u/%02u/%04u day of week %u %u:%02u:%02u.%03u bias %d\n",
reg_tzi.DaylightDate.wDay, reg_tzi.DaylightDate.wMonth,
reg_tzi.DaylightDate.wYear, reg_tzi.DaylightDate.wDayOfWeek,
reg_tzi.DaylightDate.wHour, reg_tzi.DaylightDate.wMinute,
reg_tzi.DaylightDate.wSecond, reg_tzi.DaylightDate.wMilliseconds,
reg_tzi.DaylightBias);
(int)reg_tzi.DaylightBias);
if (match_tz_info( tzi, &reg_tzi ) && match_tz_name( tz_name, &reg_tzi ))
{
@ -2225,7 +2224,7 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const char*
FIXME("Can't find matching timezone information in the registry for "
"%s, bias %d, std (d/m/y): %u/%02u/%04u, dlt (d/m/y): %u/%02u/%04u\n",
tz_name, tzi->Bias,
tz_name, (int)tzi->Bias,
tzi->StandardDate.wDay, tzi->StandardDate.wMonth, tzi->StandardDate.wYear,
tzi->DaylightDate.wDay, tzi->DaylightDate.wMonth, tzi->DaylightDate.wYear);
}
@ -2340,7 +2339,7 @@ static void get_timezone_info( RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi )
tzi->DaylightDate.wYear, tzi->DaylightDate.wDayOfWeek,
tzi->DaylightDate.wHour, tzi->DaylightDate.wMinute,
tzi->DaylightDate.wSecond, tzi->DaylightDate.wMilliseconds,
tzi->DaylightBias);
(int)tzi->DaylightBias);
tmp = std - tzi->Bias * 60 - tzi->DaylightBias * 60;
tm = gmtime(&tmp);
@ -2361,7 +2360,7 @@ static void get_timezone_info( RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi )
tzi->StandardDate.wYear, tzi->StandardDate.wDayOfWeek,
tzi->StandardDate.wHour, tzi->StandardDate.wMinute,
tzi->StandardDate.wSecond, tzi->StandardDate.wMilliseconds,
tzi->StandardBias);
(int)tzi->StandardBias);
}
find_reg_tz_info(tzi, tz_name, current_year + 1900);
@ -2518,7 +2517,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class,
unsigned int ret = STATUS_SUCCESS;
ULONG len = 0;
TRACE( "(0x%08x,%p,0x%08x,%p)\n", class, info, size, ret_size );
TRACE( "(0x%08x,%p,0x%08x,%p)\n", class, info, (int)size, ret_size );
switch (class)
{
@ -3139,7 +3138,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class,
{
SYSTEM_CODEINTEGRITY_INFORMATION *integrity_info = info;
FIXME("SystemCodeIntegrityInformation, size %u, info %p, stub!\n", size, info);
FIXME("SystemCodeIntegrityInformation, size %u, info %p, stub!\n", (int)size, info);
len = sizeof(SYSTEM_CODEINTEGRITY_INFORMATION);
@ -3186,7 +3185,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class,
}
default:
FIXME( "(0x%08x,%p,0x%08x,%p) stub\n", class, info, size, ret_size );
FIXME( "(0x%08x,%p,0x%08x,%p) stub\n", class, info, (int)size, ret_size );
/* Several Information Classes are not implemented on Windows and return 2 different values
* STATUS_NOT_IMPLEMENTED or STATUS_INVALID_INFO_CLASS
@ -3210,7 +3209,7 @@ NTSTATUS WINAPI NtQuerySystemInformationEx( SYSTEM_INFORMATION_CLASS class,
ULONG len = 0;
unsigned int ret = STATUS_NOT_IMPLEMENTED;
TRACE( "(0x%08x,%p,%u,%p,%u,%p) stub\n", class, query, query_len, info, size, ret_size );
TRACE( "(0x%08x,%p,%u,%p,%u,%p) stub\n", class, query, (int)query_len, info, (int)size, ret_size );
switch (class)
{
@ -3311,7 +3310,7 @@ NTSTATUS WINAPI NtQuerySystemInformationEx( SYSTEM_INFORMATION_CLASS class,
}
default:
FIXME( "(0x%08x,%p,%u,%p,%u,%p) stub\n", class, query, query_len, info, size, ret_size );
FIXME( "(0x%08x,%p,%u,%p,%u,%p) stub\n", class, query, (int)query_len, info, (int)size, ret_size );
break;
}
if (ret_size) *ret_size = len;
@ -3324,7 +3323,7 @@ NTSTATUS WINAPI NtQuerySystemInformationEx( SYSTEM_INFORMATION_CLASS class,
*/
NTSTATUS WINAPI NtSetSystemInformation( SYSTEM_INFORMATION_CLASS class, void *info, ULONG length )
{
FIXME( "(0x%08x,%p,0x%08x) stub\n", class, info, length );
FIXME( "(0x%08x,%p,0x%08x) stub\n", class, info, (int)length );
return STATUS_SUCCESS;
}
@ -3335,7 +3334,7 @@ NTSTATUS WINAPI NtSetSystemInformation( SYSTEM_INFORMATION_CLASS class, void *in
NTSTATUS WINAPI NtQuerySystemEnvironmentValue( UNICODE_STRING *name, WCHAR *buffer, ULONG length,
ULONG *retlen )
{
FIXME( "(%s, %p, %u, %p), stub\n", debugstr_us(name), buffer, length, retlen );
FIXME( "(%s, %p, %u, %p), stub\n", debugstr_us(name), buffer, (int)length, retlen );
return STATUS_NOT_IMPLEMENTED;
}
@ -3358,7 +3357,8 @@ NTSTATUS WINAPI NtQuerySystemEnvironmentValueEx( UNICODE_STRING *name, GUID *ven
NTSTATUS WINAPI NtSystemDebugControl( SYSDBG_COMMAND command, void *in_buff, ULONG in_len,
void *out_buff, ULONG out_len, ULONG *retlen )
{
FIXME( "(%d, %p, %d, %p, %d, %p), stub\n", command, in_buff, in_len, out_buff, out_len, retlen );
FIXME( "(%d, %p, %d, %p, %d, %p), stub\n",
command, in_buff, (int)in_len, out_buff, (int)out_len, retlen );
return STATUS_NOT_IMPLEMENTED;
}
@ -3612,7 +3612,7 @@ static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs )
NTSTATUS WINAPI NtPowerInformation( POWER_INFORMATION_LEVEL level, void *input, ULONG in_size,
void *output, ULONG out_size )
{
TRACE( "(%d,%p,%d,%p,%d)\n", level, input, in_size, output, out_size );
TRACE( "(%d,%p,%d,%p,%d)\n", level, input, (int)in_size, output, (int)out_size );
switch (level)
{
case SystemPowerCapabilities:
@ -3778,9 +3778,9 @@ NTSTATUS WINAPI NtPowerInformation( POWER_INFORMATION_LEVEL level, void *input,
WARN("Unable to detect CPU MHz for this platform. Reporting %d MHz.\n", cannedMHz);
#endif
for(i = 0; i < out_cpus; i++) {
TRACE("cpu_power[%d] = %u %u %u %u %u %u\n", i, cpu_power[i].Number,
cpu_power[i].MaxMhz, cpu_power[i].CurrentMhz, cpu_power[i].MhzLimit,
cpu_power[i].MaxIdleState, cpu_power[i].CurrentIdleState);
TRACE("cpu_power[%d] = %u %u %u %u %u %u\n", i, (int)cpu_power[i].Number,
(int)cpu_power[i].MaxMhz, (int)cpu_power[i].CurrentMhz, (int)cpu_power[i].MhzLimit,
(int)cpu_power[i].MaxIdleState, (int)cpu_power[i].CurrentIdleState);
}
return STATUS_SUCCESS;
}
@ -3830,7 +3830,7 @@ NTSTATUS WINAPI NtRaiseHardError( NTSTATUS status, ULONG count,
UNICODE_STRING *params_mask, void **params,
HARDERROR_RESPONSE_OPTION option, HARDERROR_RESPONSE *response )
{
FIXME( "%08x stub\n", status );
FIXME( "%08x stub\n", (int)status );
return STATUS_NOT_IMPLEMENTED;
}
@ -3841,7 +3841,7 @@ NTSTATUS WINAPI NtRaiseHardError( NTSTATUS status, ULONG count,
NTSTATUS WINAPI NtInitiatePowerAction( POWER_ACTION action, SYSTEM_POWER_STATE state,
ULONG flags, BOOLEAN async )
{
FIXME( "(%d,%d,0x%08x,%d),stub\n", action, state, flags, async );
FIXME( "(%d,%d,0x%08x,%d),stub\n", action, state, (int)flags, async );
return STATUS_NOT_IMPLEMENTED;
}
@ -3853,7 +3853,7 @@ NTSTATUS WINAPI NtSetThreadExecutionState( EXECUTION_STATE new_state, EXECUTION_
{
static EXECUTION_STATE current = ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED | ES_USER_PRESENT;
WARN( "(0x%x, %p): stub, harmless.\n", new_state, old_state );
WARN( "(0x%x, %p): stub, harmless.\n", (int)new_state, old_state );
*old_state = current;
if (!(current & ES_CONTINUOUS) || (new_state & ES_CONTINUOUS)) current = new_state;
return STATUS_SUCCESS;

25
dlls/ntdll/unix/tape.c
View file

@ -21,7 +21,6 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
@ -110,7 +109,7 @@ static NTSTATUS TAPE_CreatePartition( int fd, const TAPE_CREATE_PARTITION *data
struct mtop cmd;
TRACE( "fd: %d method: 0x%08x count: 0x%08x size: 0x%08x\n",
fd, data->Method, data->Count, data->Size );
fd, (int)data->Method, (int)data->Count, (int)data->Size );
if (data->Count > 1)
{
@ -132,7 +131,7 @@ static NTSTATUS TAPE_CreatePartition( int fd, const TAPE_CREATE_PARTITION *data
break;
#endif
default:
ERR( "Unhandled method: 0x%08x\n", data->Method );
ERR( "Unhandled method: 0x%08x\n", (int)data->Method );
return STATUS_INVALID_PARAMETER;
}
@ -152,7 +151,7 @@ static NTSTATUS TAPE_Erase( int fd, const TAPE_ERASE *data )
struct mtop cmd;
TRACE( "fd: %d type: 0x%08x immediate: 0x%02x\n",
fd, data->Type, data->Immediate );
fd, (int)data->Type, (int)data->Immediate );
switch (data->Type)
{
@ -165,7 +164,7 @@ static NTSTATUS TAPE_Erase( int fd, const TAPE_ERASE *data )
cmd.mt_count = 0;
break;
default:
ERR( "Unhandled type: 0x%08x\n", data->Type );
ERR( "Unhandled type: 0x%08x\n", (int)data->Type );
return STATUS_INVALID_PARAMETER;
}
@ -313,7 +312,7 @@ static NTSTATUS TAPE_Prepare( int fd, const TAPE_PREPARE *data )
struct mtop cmd;
TRACE( "fd: %d type: 0x%08x immediate: 0x%02x\n",
fd, data->Operation, data->Immediate );
fd, (int)data->Operation, (int)data->Immediate );
switch (data->Operation)
{
@ -346,7 +345,7 @@ static NTSTATUS TAPE_Prepare( int fd, const TAPE_PREPARE *data )
/* Native ignores this if the drive doesn't support it */
return STATUS_SUCCESS;
default:
ERR( "Unhandled operation: 0x%08x\n", data->Operation );
ERR( "Unhandled operation: 0x%08x\n", (int)data->Operation );
return STATUS_INVALID_PARAMETER;
}
@ -368,7 +367,7 @@ static NTSTATUS TAPE_SetDriveParams( int fd, const TAPE_SET_DRIVE_PARAMETERS *da
TRACE( "fd: %d ECC: 0x%02x, compression: 0x%02x padding: 0x%02x\n",
fd, data->ECC, data->Compression, data->DataPadding );
TRACE( "setmarks: 0x%02x zonesize: 0x%08x\n",
data->ReportSetmarks, data->EOTWarningZoneSize );
(int)data->ReportSetmarks, (int)data->EOTWarningZoneSize );
if (data->ECC || data->DataPadding || data->ReportSetmarks ||
data->EOTWarningZoneSize ) WARN( "Setting not supported\n" );
@ -391,7 +390,7 @@ static NTSTATUS TAPE_SetMediaParams( int fd, const TAPE_SET_MEDIA_PARAMETERS *da
#ifdef HAVE_SYS_MTIO_H
struct mtop cmd;
TRACE( "fd: %d blocksize: 0x%08x\n", fd, data->BlockSize );
TRACE( "fd: %d blocksize: 0x%08x\n", fd, (int)data->BlockSize );
cmd.mt_op = MTSETBLK;
cmd.mt_count = data->BlockSize;
@ -412,7 +411,7 @@ static NTSTATUS TAPE_SetPosition( int fd, const TAPE_SET_POSITION *data )
struct mtop cmd;
TRACE( "fd: %d method: 0x%08x partition: 0x%08x offset: 0x%s immediate: 0x%02x\n",
fd, data->Method, data->Partition, wine_dbgstr_longlong(data->Offset.QuadPart),
fd, (int)data->Method, (int)data->Partition, wine_dbgstr_longlong(data->Offset.QuadPart),
data->Immediate );
if (sizeof(cmd.mt_count) < sizeof(data->Offset.QuadPart) &&
@ -468,7 +467,7 @@ static NTSTATUS TAPE_SetPosition( int fd, const TAPE_SET_POSITION *data )
WARN( "Positioning method not supported\n" );
return STATUS_INVALID_PARAMETER;
default:
ERR( "Unhandled method: 0x%08x\n", data->Method );
ERR( "Unhandled method: 0x%08x\n", (int)data->Method );
return STATUS_INVALID_PARAMETER;
}
@ -488,7 +487,7 @@ static NTSTATUS TAPE_WriteMarks( int fd, const TAPE_WRITE_MARKS *data )
struct mtop cmd;
TRACE( "fd: %d type: 0x%08x count: 0x%08x immediate: 0x%02x\n",
fd, data->Type, data->Count, data->Immediate );
fd, (int)data->Type, (int)data->Count, data->Immediate );
switch (data->Type)
{
@ -505,7 +504,7 @@ static NTSTATUS TAPE_WriteMarks( int fd, const TAPE_WRITE_MARKS *data )
cmd.mt_count = data->Count;
break;
default:
ERR( "Unhandled type: 0x%08x\n", data->Type );
ERR( "Unhandled type: 0x%08x\n", (int)data->Type );
return STATUS_INVALID_PARAMETER;
}

18
dlls/ntdll/unix/thread.c
View file

@ -21,7 +21,6 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
@ -1235,7 +1234,8 @@ NTSTATUS WINAPI NtCreateThread( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRI
HANDLE process, CLIENT_ID *id, CONTEXT *ctx, INITIAL_TEB *teb,
BOOLEAN suspended )
{
FIXME( "%p %d %p %p %p %p %p %d, stub!\n", handle, access, attr, process, id, ctx, teb, suspended );
FIXME( "%p %d %p %p %p %p %p %d, stub!\n",
handle, (int)access, attr, process, id, ctx, teb, suspended );
return STATUS_NOT_IMPLEMENTED;
}
@ -1260,7 +1260,7 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT
unsigned int status;
if (flags & ~supported_flags)
FIXME( "Unsupported flags %#x.\n", flags );
FIXME( "Unsupported flags %#x.\n", (int)flags );
if (zero_bits > 21 && zero_bits < 32) return STATUS_INVALID_PARAMETER_3;
#ifndef _WIN64
@ -1523,7 +1523,7 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL
ERR_(seh)("Process attempted to continue execution after noncontinuable exception.\n");
else
ERR_(seh)("Unhandled exception code %x flags %x addr %p\n",
rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress );
(int)rec->ExceptionCode, (int)rec->ExceptionFlags, rec->ExceptionAddress );
NtTerminateProcess( NtCurrentProcess(), rec->ExceptionCode );
return STATUS_SUCCESS;
@ -1947,7 +1947,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class,
{
unsigned int status;
TRACE("(%p,%d,%p,%x,%p)\n", handle, class, data, length, ret_len);
TRACE("(%p,%d,%p,%x,%p)\n", handle, class, data, (int)length, ret_len);
switch (class)
{
@ -2204,7 +2204,7 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class,
{
unsigned int status;
TRACE("(%p,%d,%p,%x)\n", handle, class, data, length);
TRACE("(%p,%d,%p,%x)\n", handle, class, data, (int)length);
switch (class)
{
@ -2336,7 +2336,7 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class,
if (handle == GetCurrentThread() || (!status && (HandleToULong(tbi.ClientId.UniqueThread) == GetCurrentThreadId())))
WARN_(threadname)( "Thread renamed to %s\n", debugstr_us(&info->ThreadName) );
else if (!status)
WARN_(threadname)( "Thread ID %04x renamed to %s\n", HandleToULong( tbi.ClientId.UniqueThread ), debugstr_us(&info->ThreadName) );
WARN_(threadname)( "Thread ID %04x renamed to %s\n", (int)HandleToULong( tbi.ClientId.UniqueThread ), debugstr_us(&info->ThreadName) );
else
WARN_(threadname)( "Thread handle %p renamed to %s\n", handle, debugstr_us(&info->ThreadName) );
@ -2423,7 +2423,7 @@ ULONG WINAPI NtGetCurrentProcessorNumber(void)
{
if (thread_mask != processor_mask)
FIXME( "need multicore support (%d processors)\n",
peb->NumberOfProcessors );
(int)peb->NumberOfProcessors );
return processor;
}
}
@ -2444,7 +2444,7 @@ NTSTATUS WINAPI NtGetNextThread( HANDLE process, HANDLE thread, ACCESS_MASK acce
unsigned int ret;
TRACE( "process %p, thread %p, access %#x, attributes %#x, flags %#x, handle %p.\n",
process, thread, access, attributes, flags, handle );
process, thread, (int)access, (int)attributes, (int)flags, handle );
SERVER_START_REQ( get_next_thread )
{

62
dlls/ntdll/unix/virtual.c
View file

@ -21,7 +21,6 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
@ -2279,7 +2278,7 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena
if (sec->VirtualAddress > total_size || end > total_size || end < sec->VirtualAddress)
{
WARN_(module)( "%s section %.8s too large (%x+%lx/%lx)\n",
debugstr_w(filename), sec->Name, sec->VirtualAddress, map_size, total_size );
debugstr_w(filename), sec->Name, (int)sec->VirtualAddress, map_size, total_size );
return status;
}
@ -2288,8 +2287,8 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena
{
TRACE_(module)( "%s mapping shared section %.8s at %p off %x (%x) size %lx (%lx) flags %x\n",
debugstr_w(filename), sec->Name, ptr + sec->VirtualAddress,
sec->PointerToRawData, (int)pos, file_size, map_size,
sec->Characteristics );
(int)sec->PointerToRawData, (int)pos, file_size, map_size,
(int)sec->Characteristics );
if (map_file_into_view( view, shared_fd, sec->VirtualAddress, map_size, pos,
VPROT_COMMITTED | VPROT_READ | VPROT_WRITE, FALSE ) != STATUS_SUCCESS)
{
@ -2315,8 +2314,8 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena
TRACE_(module)( "mapping %s section %.8s at %p off %x size %x virt %x flags %x\n",
debugstr_w(filename), sec->Name, ptr + sec->VirtualAddress,
sec->PointerToRawData, sec->SizeOfRawData,
sec->Misc.VirtualSize, sec->Characteristics );
(int)sec->PointerToRawData, (int)sec->SizeOfRawData,
(int)sec->Misc.VirtualSize, (int)sec->Characteristics );
if (!sec->PointerToRawData || !file_size) continue;
@ -2368,7 +2367,7 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena
if (!set_vprot( view, ptr + sec->VirtualAddress, size, vprot ) && (vprot & VPROT_EXEC))
ERR( "failed to set %08x protection on %s section %.8s, noexec filesystem?\n",
sec->Characteristics, debugstr_w(filename), sec->Name );
(int)sec->Characteristics, debugstr_w(filename), sec->Name );
}
#ifdef VALGRIND_LOAD_PDB_DEBUGINFO
@ -2589,7 +2588,7 @@ static unsigned int virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG_P
res = map_view( &view, base, size, alloc_type & MEM_TOP_DOWN, vprot, get_zero_bits_mask( zero_bits ), 0 );
if (res) goto done;
TRACE( "handle=%p size=%lx offset=%x%08x\n", handle, size, offset.u.HighPart, offset.u.LowPart );
TRACE( "handle=%p size=%lx offset=%s\n", handle, size, wine_dbgstr_longlong(offset.QuadPart) );
res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, needs_close );
if (res == STATUS_SUCCESS)
{
@ -2604,7 +2603,7 @@ static unsigned int virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG_P
}
SERVER_END_REQ;
}
else ERR( "mapping %p %lx %x%08x failed\n", view->base, size, offset.u.HighPart, offset.u.LowPart );
else ERR( "mapping %p %lx %s failed\n", view->base, size, wine_dbgstr_longlong(offset.QuadPart) );
if (NT_SUCCESS(res))
{
@ -2940,7 +2939,7 @@ TEB *virtual_alloc_first_teb(void)
{
void *ptr;
TEB *teb;
NTSTATUS status;
unsigned int status;
SIZE_T data_size = page_size;
SIZE_T block_size = signal_stack_mask + 1;
SIZE_T total = 32 * block_size;
@ -3181,7 +3180,7 @@ void virtual_map_user_shared_data(void)
'\\','_','_','w','i','n','e','_','u','s','e','r','_','s','h','a','r','e','d','_','d','a','t','a',0};
UNICODE_STRING name_str = { sizeof(nameW) - sizeof(WCHAR), sizeof(nameW), (WCHAR *)nameW };
OBJECT_ATTRIBUTES attr = { sizeof(attr), 0, &name_str };
NTSTATUS status;
unsigned int status;
HANDLE section;
int res, fd, needs_close;
@ -3319,12 +3318,11 @@ void *virtual_setup_exception( void *stack_ptr, size_t size, EXCEPTION_RECORD *r
{
if (is_inside_signal_stack( stack ))
{
ERR( "nested exception on signal stack in thread %04x addr %p stack %p\n",
GetCurrentThreadId(), rec->ExceptionAddress, stack );
ERR( "nested exception on signal stack addr %p stack %p\n", rec->ExceptionAddress, stack );
abort_thread(1);
}
WARN( "exception outside of stack limits in thread %04x addr %p stack %p (%p-%p-%p)\n",
GetCurrentThreadId(), rec->ExceptionAddress, stack, NtCurrentTeb()->DeallocationStack,
WARN( "exception outside of stack limits addr %p stack %p (%p-%p-%p)\n",
rec->ExceptionAddress, stack, NtCurrentTeb()->DeallocationStack,
NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase );
return stack - size;
}
@ -3335,9 +3333,8 @@ void *virtual_setup_exception( void *stack_ptr, size_t size, EXCEPTION_RECORD *r
{
/* stack overflow on last page, unrecoverable */
UINT diff = stack_info.start + 4096 - stack;
ERR( "stack overflow %u bytes in thread %04x addr %p stack %p (%p-%p-%p)\n",
diff, GetCurrentThreadId(), rec->ExceptionAddress, stack, stack_info.start,
stack_info.limit, stack_info.end );
ERR( "stack overflow %u bytes addr %p stack %p (%p-%p-%p)\n",
diff, rec->ExceptionAddress, stack, stack_info.start, stack_info.limit, stack_info.end );
abort_thread(1);
}
else if (stack < stack_info.limit)
@ -3780,7 +3777,7 @@ static NTSTATUS allocate_virtual_memory( void **ret, SIZE_T *size_ptr, ULONG typ
if (!(type & (MEM_COMMIT | MEM_RESERVE | MEM_RESET)) ||
(type & ~(MEM_COMMIT | MEM_RESERVE | MEM_TOP_DOWN | MEM_WRITE_WATCH | MEM_RESET)))
{
WARN("called with wrong alloc type flags (%08x) !\n", type);
WARN("called with wrong alloc type flags (%08x) !\n", (int)type);
return STATUS_INVALID_PARAMETER;
}
@ -3848,7 +3845,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_PTR z
{
ULONG_PTR limit;
TRACE("%p %p %08lx %x %08x\n", process, *ret, *size_ptr, type, protect );
TRACE("%p %p %08lx %x %08x\n", process, *ret, *size_ptr, (int)type, (int)protect );
if (!*size_ptr) return STATUS_INVALID_PARAMETER;
if (zero_bits > 21 && zero_bits < 32) return STATUS_INVALID_PARAMETER_3;
@ -3902,7 +3899,8 @@ NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *s
ULONG_PTR limit = 0;
ULONG_PTR align = 0;
TRACE("%p %p %08lx %x %08x %p %u\n", process, *ret, *size_ptr, type, protect, parameters, count );
TRACE("%p %p %08lx %x %08x %p %u\n",
process, *ret, *size_ptr, (int)type, (int)protect, parameters, (int)count );
if (count && !parameters) return STATUS_INVALID_PARAMETER;
@ -3999,7 +3997,7 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *si
LPVOID addr = *addr_ptr;
SIZE_T size = *size_ptr;
TRACE("%p %p %08lx %x\n", process, addr, size, type );
TRACE("%p %p %08lx %x\n", process, addr, size, (int)type );
if (process != NtCurrentProcess())
{
@ -4066,7 +4064,7 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *si
}
else
{
WARN("called with wrong free type flags (%08x) !\n", type);
WARN("called with wrong free type flags (%08x) !\n", (int)type);
status = STATUS_INVALID_PARAMETER;
}
@ -4091,7 +4089,7 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T
LPVOID addr = *addr_ptr;
DWORD old;
TRACE("%p %p %08lx %08x\n", process, addr, size, new_prot );
TRACE("%p %p %08lx %08x\n", process, addr, size, (int)new_prot );
if (!old_prot)
return STATUS_ACCESS_VIOLATION;
@ -4637,8 +4635,8 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p
offset.QuadPart = offset_ptr ? offset_ptr->QuadPart : 0;
TRACE("handle=%p process=%p addr=%p off=%x%08x size=%lx access=%x\n",
handle, process, *addr_ptr, offset.u.HighPart, offset.u.LowPart, *size_ptr, protect );
TRACE("handle=%p process=%p addr=%p off=%s size=%lx access=%x\n",
handle, process, *addr_ptr, wine_dbgstr_longlong(offset.QuadPart), *size_ptr, (int)protect );
/* Check parameters */
if (zero_bits > 21 && zero_bits < 32)
@ -4777,7 +4775,7 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr )
*/
NTSTATUS WINAPI NtUnmapViewOfSectionEx( HANDLE process, PVOID addr, ULONG flags )
{
if (flags) FIXME("Ignoring flags %#x.\n", flags);
if (flags) FIXME("Ignoring flags %#x.\n", (int)flags);
return NtUnmapViewOfSection( process, addr );
}
@ -4936,7 +4934,7 @@ NTSTATUS WINAPI NtGetWriteWatch( HANDLE process, ULONG flags, PVOID base, SIZE_T
if (!addresses) return STATUS_ACCESS_VIOLATION;
TRACE( "%p %x %p-%p %p %lu\n", process, flags, base, (char *)base + size,
TRACE( "%p %x %p-%p %p %lu\n", process, (int)flags, base, (char *)base + size,
addresses, *count );
server_enter_uninterrupted_section( &virtual_mutex, &sigset );
@ -5103,7 +5101,7 @@ static NTSTATUS prefetch_memory( HANDLE process, ULONG_PTR count,
if (!once++)
{
FIXME( "(process=%p,flags=%u) NtSetInformationVirtualMemory(VmPrefetchInformation) partial stub\n",
process, flags );
process, (int)flags );
}
for (i = 0; i < count; i++)
@ -5133,7 +5131,7 @@ NTSTATUS WINAPI NtSetInformationVirtualMemory( HANDLE process,
PVOID ptr, ULONG size )
{
TRACE("(%p, info_class=%d, %lu, %p, %p, %u)\n",
process, info_class, count, addresses, ptr, size);
process, info_class, count, addresses, ptr, (int)size);
switch (info_class)
{
@ -5145,7 +5143,7 @@ NTSTATUS WINAPI NtSetInformationVirtualMemory( HANDLE process,
default:
FIXME("(%p,info_class=%d,%lu,%p,%p,%u) Unknown information class\n",
process, info_class, count, addresses, ptr, size);
process, info_class, count, addresses, ptr, (int)size);
return STATUS_INVALID_PARAMETER_2;
}
}
@ -5210,7 +5208,7 @@ NTSTATUS WINAPI NtWow64AllocateVirtualMemory64( HANDLE process, ULONG64 *ret, UL
unsigned int status;
TRACE("%p %s %s %x %08x\n", process,
wine_dbgstr_longlong(*ret), wine_dbgstr_longlong(*size_ptr), type, protect );
wine_dbgstr_longlong(*ret), wine_dbgstr_longlong(*size_ptr), (int)type, (int)protect );
if (!*size_ptr) return STATUS_INVALID_PARAMETER_4;
if (zero_bits > 21 && zero_bits < 32) return STATUS_INVALID_PARAMETER_3;