[PATCH 10/21] dlls/ntoskrnl.exe: enable compilation with long types
Eric Pouech
eric.pouech at gmail.com
Wed Feb 16 01:11:40 CST 2022
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
---
dlls/ntoskrnl.exe/Makefile.in | 1
dlls/ntoskrnl.exe/instr.c | 30 +++++----
dlls/ntoskrnl.exe/ntoskrnl.c | 132 +++++++++++++++++++++--------------------
dlls/ntoskrnl.exe/pnp.c | 62 ++++++++++---------
dlls/ntoskrnl.exe/sync.c | 26 ++++----
5 files changed, 125 insertions(+), 126 deletions(-)
diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in
index 1bbe6f2615f..e7b070bb750 100644
--- a/dlls/ntoskrnl.exe/Makefile.in
+++ b/dlls/ntoskrnl.exe/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = ntoskrnl.exe
IMPORTLIB = ntoskrnl
IMPORTS = advapi32 hal msvcrt
diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c
index f6c775e2597..8f1aa4d45a3 100644
--- a/dlls/ntoskrnl.exe/instr.c
+++ b/dlls/ntoskrnl.exe/instr.c
@@ -353,7 +353,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
{
int reg = (instr[2] >> 3) & 7;
DWORD *data = get_reg_address( context, instr[2] );
- TRACE( "mov cr%u,%s at 0x%08x\n", reg, reg_names[instr[2] & 7], context->Eip );
+ TRACE( "mov cr%u,%s at 0x%08lx\n", reg, reg_names[instr[2] & 7], context->Eip );
switch (reg)
{
case 0: *data = CR0_PE|CR0_ET|CR0_NE|CR0_WP|CR0_AM|CR0_PG; break;
@@ -369,7 +369,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
{
int reg = (instr[2] >> 3) & 7;
DWORD *data = get_reg_address( context, instr[2] );
- TRACE( "mov dr%u,%s at 0x%08x\n", reg, reg_names[instr[2] & 7], context->Eip );
+ TRACE( "mov dr%u,%s at 0x%08lx\n", reg, reg_names[instr[2] & 7], context->Eip );
switch (reg)
{
case 0: *data = context->Dr0; break;
@@ -387,7 +387,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
{
int reg = (instr[2] >> 3) & 7;
DWORD *data = get_reg_address( context, instr[2] );
- TRACE( "mov %s,cr%u at 0x%08x, %s=%08x\n", reg_names[instr[2] & 7],
+ TRACE( "mov %s,cr%u at 0x%08lx, %s=%08lx\n", reg_names[instr[2] & 7],
reg, context->Eip, reg_names[instr[2] & 7], *data );
switch (reg)
{
@@ -404,7 +404,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
{
int reg = (instr[2] >> 3) & 7;
DWORD *data = get_reg_address( context, instr[2] );
- TRACE( "mov %s,dr%u at 0x%08x %s=%08x\n", reg_names[instr[2] & 7],
+ TRACE( "mov %s,dr%u at 0x%08lx %s=%08lx\n", reg_names[instr[2] & 7],
reg, context->Eip, reg_names[instr[2] & 7], *data );
switch (reg)
{
@@ -735,7 +735,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
int reg = REGMODRM_REG( instr[2], rex );
int rm = REGMODRM_RM( instr[2], rex );
DWORD64 *data = get_int_reg( context, rm );
- TRACE( "mov cr%u,%s at %lx\n", reg, reg_names[rm], context->Rip );
+ TRACE( "mov cr%u,%s at %Ix\n", reg, reg_names[rm], context->Rip );
switch (reg)
{
case 0: *data = 0x10; break; /* FIXME: set more bits ? */
@@ -753,7 +753,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
int reg = REGMODRM_REG( instr[2], rex );
int rm = REGMODRM_RM( instr[2], rex );
DWORD64 *data = get_int_reg( context, rm );
- TRACE( "mov dr%u,%s at %lx\n", reg, reg_names[rm], context->Rip );
+ TRACE( "mov dr%u,%s at %Ix\n", reg, reg_names[rm], context->Rip );
switch (reg)
{
case 0: *data = context->Dr0; break;
@@ -774,7 +774,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
int reg = REGMODRM_REG( instr[2], rex );
int rm = REGMODRM_RM( instr[2], rex );
DWORD64 *data = get_int_reg( context, rm );
- TRACE( "mov %s,cr%u at %lx, %s=%lx\n", reg_names[rm], reg, context->Rip, reg_names[rm], *data );
+ TRACE( "mov %s,cr%u at %Ix, %s=%Ix\n", reg_names[rm], reg, context->Rip, reg_names[rm], *data );
switch (reg)
{
case 0: break;
@@ -792,7 +792,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
int reg = REGMODRM_REG( instr[2], rex );
int rm = REGMODRM_RM( instr[2], rex );
DWORD64 *data = get_int_reg( context, rm );
- TRACE( "mov %s,dr%u at %lx, %s=%lx\n", reg_names[rm], reg, context->Rip, reg_names[rm], *data );
+ TRACE( "mov %s,dr%u at %Ix, %s=%Ix\n", reg_names[rm], reg, context->Rip, reg_names[rm], *data );
switch (reg)
{
case 0: context->Dr0 = *data; break;
@@ -811,7 +811,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
case 0x32: /* rdmsr */
{
ULONG reg = context->Rcx;
- TRACE("rdmsr CR 0x%08x\n", reg);
+ TRACE("rdmsr CR 0x%08lx\n", reg);
switch (reg)
{
case MSR_LSTAR:
@@ -822,7 +822,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
break;
}
default:
- FIXME("reg %#x, returning 0.\n", reg);
+ FIXME("reg %#lx, returning 0.\n", reg);
context->Rdx = 0;
context->Rax = 0;
break;
@@ -935,14 +935,14 @@ LONG CALLBACK vectored_handler( EXCEPTION_POINTERS *ptrs )
{
if (emulate_instruction( record, context ) == ExceptionContinueExecution)
{
- TRACE( "next instruction rip=%lx\n", context->Rip );
- TRACE( " rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n",
+ TRACE( "next instruction rip=%Ix\n", context->Rip );
+ TRACE( " rax=%016Ix rbx=%016Ix rcx=%016Ix rdx=%016Ix\n",
context->Rax, context->Rbx, context->Rcx, context->Rdx );
- TRACE( " rsi=%016lx rdi=%016lx rbp=%016lx rsp=%016lx\n",
+ TRACE( " rsi=%016Ix rdi=%016Ix rbp=%016Ix rsp=%016Ix\n",
context->Rsi, context->Rdi, context->Rbp, context->Rsp );
- TRACE( " r8=%016lx r9=%016lx r10=%016lx r11=%016lx\n",
+ TRACE( " r8=%016Ix r9=%016Ix r10=%016Ix r11=%016Ix\n",
context->R8, context->R9, context->R10, context->R11 );
- TRACE( " r12=%016lx r13=%016lx r14=%016lx r15=%016lx\n",
+ TRACE( " r12=%016Ix r13=%016Ix r14=%016Ix r15=%016Ix\n",
context->R12, context->R13, context->R14, context->R15 );
return EXCEPTION_CONTINUE_EXECUTION;
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index 38a25bc5092..f8e1c24bb49 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -173,7 +173,7 @@ void *alloc_kernel_object( POBJECT_TYPE type, HANDLE handle, SIZE_T size, LONG r
status = wine_server_call( req );
}
SERVER_END_REQ;
- if (status) FIXME( "set_object_reference failed: %#x\n", status );
+ if (status) FIXME( "set_object_reference failed: %#lx\n", status );
}
header->ref = ref;
@@ -200,7 +200,7 @@ void WINAPI ObDereferenceObject( void *obj )
EnterCriticalSection( &obref_cs );
ref = --header->ref;
- TRACE( "(%p) ref=%u\n", obj, ref );
+ TRACE( "(%p) ref=%lu\n", obj, ref );
if (!ref)
{
if (header->type->release)
@@ -236,7 +236,7 @@ void ObReferenceObject( void *obj )
EnterCriticalSection( &obref_cs );
ref = ++header->ref;
- TRACE( "(%p) ref=%u\n", obj, ref );
+ TRACE( "(%p) ref=%lu\n", obj, ref );
if (ref == 1)
{
SERVER_START_REQ( grab_kernel_object )
@@ -357,7 +357,7 @@ NTSTATUS WINAPI ObReferenceObjectByHandle( HANDLE handle, ACCESS_MASK access,
{
NTSTATUS status;
- TRACE( "%p %x %p %d %p %p\n", handle, access, type, mode, ptr, info );
+ TRACE( "%p %lx %p %d %p %p\n", handle, access, type, mode, ptr, info );
if (mode != KernelMode)
{
@@ -379,7 +379,7 @@ NTSTATUS WINAPI ObOpenObjectByPointer( void *obj, ULONG attr, ACCESS_STATE *acce
{
NTSTATUS status;
- TRACE( "%p %x %p %x %p %d %p\n", obj, attr, access_state, access, type, mode, handle );
+ TRACE( "%p %lx %p %lx %p %d %p\n", obj, attr, access_state, access, type, mode, handle );
if (mode != KernelMode)
{
@@ -387,7 +387,7 @@ NTSTATUS WINAPI ObOpenObjectByPointer( void *obj, ULONG attr, ACCESS_STATE *acce
return STATUS_NOT_IMPLEMENTED;
}
- if (attr & ~OBJ_KERNEL_HANDLE) FIXME( "attr %#x not supported\n", attr );
+ if (attr & ~OBJ_KERNEL_HANDLE) FIXME( "attr %#lx not supported\n", attr );
if (access_state) FIXME( "access_state not implemented\n" );
if (type && ObGetObjectType( obj ) != type) return STATUS_OBJECT_TYPE_MISMATCH;
@@ -541,7 +541,7 @@ static NTSTATUS dispatch_irp( DEVICE_OBJECT *device, IRP *irp, struct dispatch_c
device->CurrentIrp = NULL;
if (status != STATUS_PENDING && !irp_data->complete)
- ERR( "dispatch routine returned %#x but didn't complete the IRP\n", status );
+ ERR( "dispatch routine returned %#lx but didn't complete the IRP\n", status );
return status;
}
@@ -640,7 +640,7 @@ static NTSTATUS dispatch_read( struct dispatch_context *context )
device = IoGetAttachedDevice( file->DeviceObject );
- TRACE( "device %p file %p size %u\n", device, file, out_size );
+ TRACE( "device %p file %p size %lu\n", device, file, out_size );
if (!(out_buff = HeapAlloc( GetProcessHeap(), 0, out_size ))) return STATUS_NO_MEMORY;
@@ -678,7 +678,7 @@ static NTSTATUS dispatch_write( struct dispatch_context *context )
device = IoGetAttachedDevice( file->DeviceObject );
- TRACE( "device %p file %p size %u\n", device, file, context->in_size );
+ TRACE( "device %p file %p size %lu\n", device, file, context->in_size );
offset.QuadPart = context->params.write.pos;
@@ -742,7 +742,7 @@ static NTSTATUS dispatch_ioctl( struct dispatch_context *context )
device = IoGetAttachedDevice( file->DeviceObject );
- TRACE( "ioctl %x device %p file %p in_size %u out_size %u\n",
+ TRACE( "ioctl %x device %p file %p in_size %lu out_size %lu\n",
context->params.ioctl.code, device, file, context->in_size, out_size );
if (out_size)
@@ -805,7 +805,7 @@ static NTSTATUS dispatch_volume( struct dispatch_context *context )
device = IoGetAttachedDevice( file->DeviceObject );
- TRACE( "class 0x%x device %p file %p in_size %u out_size %u\n",
+ TRACE( "class 0x%x device %p file %p in_size %lu out_size %lu\n",
context->params.volume.info_class, device, file, context->in_size, out_size );
if (!(out_buff = HeapAlloc( GetProcessHeap(), 0, out_size ))) return STATUS_NO_MEMORY;
@@ -1073,7 +1073,7 @@ NTSTATUS WINAPI IoAllocateDriverObjectExtension( PDRIVER_OBJECT DriverObject,
ULONG DriverObjectExtensionSize,
PVOID *DriverObjectExtension )
{
- FIXME( "stub: %p, %p, %u, %p\n", DriverObject, ClientIdentificationAddress,
+ FIXME( "stub: %p, %p, %lu, %p\n", DriverObject, ClientIdentificationAddress,
DriverObjectExtensionSize, DriverObjectExtension );
return STATUS_NOT_IMPLEMENTED;
}
@@ -1112,7 +1112,7 @@ void WINAPI IoReuseIrp(IRP *irp, NTSTATUS iostatus)
{
UCHAR AllocationFlags;
- TRACE("irp %p, iostatus %#x.\n", irp, iostatus);
+ TRACE("irp %p, iostatus %#lx.\n", irp, iostatus);
AllocationFlags = irp->AllocationFlags;
IoInitializeIrp(irp, irp->Size, irp->StackCount);
@@ -1216,7 +1216,7 @@ PMDL WINAPI IoAllocateMdl( PVOID va, ULONG length, BOOLEAN secondary, BOOLEAN ch
SIZE_T mdl_size;
PMDL mdl;
- TRACE("(%p, %u, %i, %i, %p)\n", va, length, secondary, charge_quota, irp);
+ TRACE("(%p, %lu, %i, %i, %p)\n", va, length, secondary, charge_quota, irp);
if (charge_quota)
FIXME("Charge quota is not yet supported\n");
@@ -1359,7 +1359,7 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device,
PIO_STACK_LOCATION irpsp;
MDL *mdl;
- TRACE( "%x, %p, %p, %u, %p, %u, %u, %p, %p\n",
+ TRACE( "%lx, %p, %p, %lu, %p, %lu, %u, %p, %p\n",
code, device, in_buff, in_len, out_buff, out_len, internal, event, iosb );
if (device == NULL)
@@ -1419,7 +1419,7 @@ PIRP WINAPI IoBuildAsynchronousFsdRequest(ULONG majorfunc, DEVICE_OBJECT *device
PIRP irp;
PIO_STACK_LOCATION irpsp;
- TRACE( "(%d %p %p %d %p %p)\n", majorfunc, device, buffer, length, startoffset, iosb );
+ TRACE( "(%ld %p %p %ld %p %p)\n", majorfunc, device, buffer, length, startoffset, iosb );
if (!(irp = IoAllocateIrp( device->StackSize, FALSE ))) return NULL;
@@ -1473,7 +1473,7 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device,
{
IRP *irp;
- TRACE("(%d %p %p %d %p %p)\n", majorfunc, device, buffer, length, startoffset, iosb);
+ TRACE("(%ld %p %p %ld %p %p)\n", majorfunc, device, buffer, length, startoffset, iosb);
irp = IoBuildAsynchronousFsdRequest( majorfunc, device, buffer, length, startoffset, iosb );
if (!irp) return NULL;
@@ -1619,7 +1619,7 @@ NTSTATUS WINAPI IoCreateDeviceSecure( DRIVER_OBJECT *driver, ULONG ext_size,
PCUNICODE_STRING sddl, LPCGUID guid,
DEVICE_OBJECT **ret_device )
{
- FIXME( "(%p, %u, %s, %u, %x, %u, %s, %s, %p): semi-stub\n",
+ FIXME( "(%p, %lu, %s, %lu, %lx, %u, %s, %s, %p): semi-stub\n",
driver, ext_size, debugstr_us(name), type, characteristics, exclusive,
debugstr_us(sddl), wine_dbgstr_guid(guid), ret_device );
@@ -1642,7 +1642,7 @@ NTSTATUS WINAPI IoCreateDevice( DRIVER_OBJECT *driver, ULONG ext_size,
static unsigned int auto_idx = 0;
WCHAR autoW[17];
- TRACE( "(%p, %u, %s, %u, %x, %u, %p)\n",
+ TRACE( "(%p, %lu, %s, %lu, %lx, %u, %p)\n",
driver, ext_size, debugstr_us(name), type, characteristics, exclusive, ret_device );
if (!(wine_device = alloc_kernel_object( IoDeviceObjectType, NULL, sizeof(struct wine_device) + ext_size, 1 )))
@@ -1811,7 +1811,7 @@ NTSTATUS WINAPI IoGetDeviceInterfaces( const GUID *InterfaceClassGuid,
PDEVICE_OBJECT PhysicalDeviceObject,
ULONG Flags, PWSTR *SymbolicLinkList )
{
- FIXME( "stub: %s %p %x %p\n", debugstr_guid(InterfaceClassGuid),
+ FIXME( "stub: %s %p %lx %p\n", debugstr_guid(InterfaceClassGuid),
PhysicalDeviceObject, Flags, SymbolicLinkList );
return STATUS_NOT_IMPLEMENTED;
}
@@ -1825,7 +1825,7 @@ NTSTATUS WINAPI IoGetDeviceObjectPointer( UNICODE_STRING *name, ACCESS_MASK acc
static DEVICE_OBJECT stub_device;
static DRIVER_OBJECT stub_driver;
- FIXME( "stub: %s %x %p %p\n", debugstr_us(name), access, file, device );
+ FIXME( "stub: %s %lx %p %p\n", debugstr_us(name), access, file, device );
stub_device.StackSize = 0x80; /* minimum value to appease SecuROM 5.x */
stub_device.DriverObject = &stub_driver;
@@ -1854,7 +1854,7 @@ NTSTATUS WINAPI IoCallDriver( DEVICE_OBJECT *device, IRP *irp )
status = dispatch( device, irp );
- TRACE_(relay)( "\1Ret driver dispatch %p (device=%p,irp=%p) retval=%08x\n",
+ TRACE_(relay)( "\1Ret driver dispatch %p (device=%p,irp=%p) retval=%08lx\n",
dispatch, device, irp, status );
return status;
@@ -2024,7 +2024,7 @@ NTSTATUS WINAPI IoReportResourceForDetection( DRIVER_OBJECT *drv_obj, CM_RESOURC
DEVICE_OBJECT *dev_obj, CM_RESOURCE_LIST *dev_list, ULONG dev_size,
BOOLEAN *conflict )
{
- FIXME( "(%p, %p, %u, %p, %p, %u, %p): stub\n", drv_obj, drv_list, drv_size,
+ FIXME( "(%p, %p, %lu, %p, %p, %lu, %p): stub\n", drv_obj, drv_list, drv_size,
dev_obj, dev_list, dev_size, conflict );
return STATUS_NOT_IMPLEMENTED;
@@ -2038,7 +2038,7 @@ NTSTATUS WINAPI IoReportResourceUsage( UNICODE_STRING *name, DRIVER_OBJECT *drv_
ULONG drv_size, DRIVER_OBJECT *dev_obj, CM_RESOURCE_LIST *dev_list,
ULONG dev_size, BOOLEAN overwrite, BOOLEAN *conflict )
{
- FIXME( "(%s, %p, %p, %u, %p, %p, %u, %d, %p): stub\n", debugstr_us(name),
+ FIXME( "(%s, %p, %p, %lu, %p, %p, %lu, %d, %p): stub\n", debugstr_us(name),
drv_obj, drv_list, drv_size, dev_obj, dev_list, dev_size, overwrite, conflict );
return STATUS_NOT_IMPLEMENTED;
@@ -2085,7 +2085,7 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost )
{
TRACE( "calling %p( %p, %p, %p )\n", routine, device, irp, irpsp->Context );
stat = routine( device, irp, irpsp->Context );
- TRACE( "CompletionRoutine returned %x\n", stat );
+ TRACE( "CompletionRoutine returned %lx\n", stat );
if (STATUS_MORE_PROCESSING_REQUIRED == stat)
return;
}
@@ -2211,7 +2211,7 @@ PVOID WINAPI ExAllocatePoolWithTag( POOL_TYPE type, SIZE_T size, ULONG tag )
{
/* FIXME: handle page alignment constraints */
void *ret = HeapAlloc( ntoskrnl_heap, 0, size );
- TRACE( "%lu pool %u -> %p\n", size, type, ret );
+ TRACE( "%Iu pool %u -> %p\n", size, type, ret );
return ret;
}
@@ -2301,7 +2301,7 @@ void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST lookaside,
ULONG tag,
USHORT depth)
{
- TRACE( "%p, %p, %p, %u, %lu, %u, %u\n", lookaside, allocate, free, flags, size, tag, depth );
+ TRACE( "%p, %p, %p, %lu, %Iu, %lu, %u\n", lookaside, allocate, free, flags, size, tag, depth );
initialize_lookaside_list( &lookaside->L, allocate, free, NonPagedPool | flags, size, tag );
}
@@ -2316,7 +2316,7 @@ void WINAPI ExInitializePagedLookasideList(PPAGED_LOOKASIDE_LIST lookaside,
ULONG tag,
USHORT depth)
{
- TRACE( "%p, %p, %p, %u, %lu, %u, %u\n", lookaside, allocate, free, flags, size, tag, depth );
+ TRACE( "%p, %p, %p, %lu, %Iu, %lu, %u\n", lookaside, allocate, free, flags, size, tag, depth );
initialize_lookaside_list( &lookaside->L, allocate, free, PagedPool | flags, size, tag );
}
@@ -2354,7 +2354,7 @@ NTSTATUS WINAPI ExInitializeZone(PZONE_HEADER Zone,
PVOID InitialSegment,
ULONG InitialSegmentSize)
{
- FIXME( "stub: %p, %u, %p, %u\n", Zone, BlockSize, InitialSegment, InitialSegmentSize );
+ FIXME( "stub: %p, %lu, %p, %lu\n", Zone, BlockSize, InitialSegment, InitialSegmentSize );
return STATUS_NOT_IMPLEMENTED;
}
@@ -2435,7 +2435,7 @@ NTSTATUS WINAPI PsLookupProcessByProcessId( HANDLE processid, PEPROCESS *process
*/
HANDLE WINAPI PsGetProcessId(PEPROCESS process)
{
- TRACE( "%p -> %lx\n", process, process->info.UniqueProcessId );
+ TRACE( "%p -> %Ix\n", process, process->info.UniqueProcessId );
return (HANDLE)process->info.UniqueProcessId;
}
@@ -2636,7 +2636,7 @@ ULONG WINAPI KeQueryTimeIncrement(void)
*/
KPRIORITY WINAPI KeSetPriorityThread( PKTHREAD Thread, KPRIORITY Priority )
{
- FIXME("(%p %d)\n", Thread, Priority);
+ FIXME("(%p %ld)\n", Thread, Priority);
return Priority;
}
@@ -2654,7 +2654,7 @@ KAFFINITY WINAPI KeSetSystemAffinityThreadEx(KAFFINITY affinity)
PKTHREAD thread = KeGetCurrentThread();
GROUP_AFFINITY old, new;
- TRACE("affinity %#lx.\n", affinity);
+ TRACE("affinity %#Ix.\n", affinity);
affinity &= system_affinity;
@@ -2686,7 +2686,7 @@ void WINAPI KeRevertToUserAffinityThreadEx(KAFFINITY affinity)
PRKTHREAD thread = KeGetCurrentThread();
GROUP_AFFINITY new;
- TRACE("affinity %#lx.\n", affinity);
+ TRACE("affinity %#Ix.\n", affinity);
affinity &= system_affinity;
@@ -2712,7 +2712,7 @@ VOID WINAPI IoRegisterFileSystem(PDEVICE_OBJECT DeviceObject)
NTSTATUS WINAPI KeExpandKernelStackAndCalloutEx(PEXPAND_STACK_CALLOUT callout, void *parameter, SIZE_T size,
BOOLEAN wait, void *context)
{
- WARN("(%p %p %lu %x %p) semi-stub: ignoring stack expand\n", callout, parameter, size, wait, context);
+ WARN("(%p %p %Iu %x %p) semi-stub: ignoring stack expand\n", callout, parameter, size, wait, context);
callout(parameter);
return STATUS_SUCCESS;
}
@@ -2738,7 +2738,7 @@ VOID WINAPI IoUnregisterFileSystem(PDEVICE_OBJECT DeviceObject)
*/
PVOID WINAPI MmAllocateNonCachedMemory( SIZE_T size )
{
- TRACE( "%lu\n", size );
+ TRACE( "%Iu\n", size );
return VirtualAlloc( NULL, size, MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE|PAGE_NOCACHE );
}
@@ -2747,7 +2747,7 @@ PVOID WINAPI MmAllocateNonCachedMemory( SIZE_T size )
*/
PVOID WINAPI MmAllocateContiguousMemory( SIZE_T size, PHYSICAL_ADDRESS highest_valid_address )
{
- FIXME( "%lu, %s stub\n", size, wine_dbgstr_longlong(highest_valid_address.QuadPart) );
+ FIXME( "%Iu, %s stub\n", size, wine_dbgstr_longlong(highest_valid_address.QuadPart) );
return NULL;
}
@@ -2770,7 +2770,7 @@ PVOID WINAPI MmAllocateContiguousMemorySpecifyCache( SIZE_T size,
PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS lowaddress, PHYSICAL_ADDRESS highaddress,
PHYSICAL_ADDRESS skipbytes, SIZE_T size)
{
- FIXME("%s %s %s %lu: stub\n", wine_dbgstr_longlong(lowaddress.QuadPart), wine_dbgstr_longlong(highaddress.QuadPart),
+ FIXME("%s %s %s %Iu: stub\n", wine_dbgstr_longlong(lowaddress.QuadPart), wine_dbgstr_longlong(highaddress.QuadPart),
wine_dbgstr_longlong(skipbytes.QuadPart), size);
return NULL;
}
@@ -2790,7 +2790,7 @@ NTSTATUS WINAPI MmCreateSection( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTR
LARGE_INTEGER *size, ULONG protect, ULONG alloc_attr,
HANDLE file, FILE_OBJECT *file_obj )
{
- FIXME("%p %#x %p %s %#x %#x %p %p: stub\n", handle, access, attr,
+ FIXME("%p %#lx %p %s %#lx %#lx %p %p: stub\n", handle, access, attr,
wine_dbgstr_longlong(size->QuadPart), protect, alloc_attr, file, file_obj);
return STATUS_NOT_IMPLEMENTED;
}
@@ -2800,7 +2800,7 @@ NTSTATUS WINAPI MmCreateSection( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTR
*/
void WINAPI MmFreeNonCachedMemory( void *addr, SIZE_T size )
{
- TRACE( "%p %lu\n", addr, size );
+ TRACE( "%p %Iu\n", addr, size );
VirtualFree( addr, 0, MEM_RELEASE );
}
@@ -2839,7 +2839,7 @@ PHYSICAL_ADDRESS WINAPI MmGetPhysicalAddress(void *virtual_address)
*/
PVOID WINAPI MmMapIoSpace( PHYSICAL_ADDRESS PhysicalAddress, DWORD NumberOfBytes, DWORD CacheType )
{
- FIXME( "stub: 0x%08x%08x, %d, %d\n", PhysicalAddress.u.HighPart, PhysicalAddress.u.LowPart, NumberOfBytes, CacheType );
+ FIXME( "stub: 0x%08lx%08lx, %ld, %ld\n", PhysicalAddress.u.HighPart, PhysicalAddress.u.LowPart, NumberOfBytes, CacheType );
return NULL;
}
@@ -2858,7 +2858,7 @@ VOID WINAPI MmLockPagableSectionByHandle(PVOID ImageSectionHandle)
PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDLX MemoryDescriptorList, KPROCESSOR_MODE AccessMode, MEMORY_CACHING_TYPE CacheType,
PVOID BaseAddress, ULONG BugCheckOnFailure, MM_PAGE_PRIORITY Priority)
{
- FIXME("(%p, %u, %u, %p, %u, %u): stub\n", MemoryDescriptorList, AccessMode, CacheType, BaseAddress, BugCheckOnFailure, Priority);
+ FIXME("(%p, %u, %u, %p, %lu, %u): stub\n", MemoryDescriptorList, AccessMode, CacheType, BaseAddress, BugCheckOnFailure, Priority);
return NULL;
}
@@ -2921,7 +2921,7 @@ void WINAPI MmUnlockPages(PMDLX MemoryDescriptorList)
*/
VOID WINAPI MmUnmapIoSpace( PVOID BaseAddress, SIZE_T NumberOfBytes )
{
- FIXME( "stub: %p, %lu\n", BaseAddress, NumberOfBytes );
+ FIXME( "stub: %p, %Iu\n", BaseAddress, NumberOfBytes );
}
@@ -2940,7 +2940,7 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName,
struct wine_driver *driver;
struct wine_rb_entry *entry;
- TRACE("mostly-stub:%s %i %p %i %p %i %p %p\n", debugstr_us(ObjectName),
+ TRACE("mostly-stub:%s %li %p %li %p %i %p %p\n", debugstr_us(ObjectName),
Attributes, AccessState, DesiredAccess, ObjectType, AccessMode,
ParseContext, Object);
@@ -2980,7 +2980,7 @@ NTSTATUS WINAPI ObOpenObjectByName(POBJECT_ATTRIBUTES attr, POBJECT_TYPE type,
NTSTATUS status;
void *object;
- TRACE( "attr(%p %s %x) %p %u %p %u %p %p\n", attr->RootDirectory, debugstr_us(attr->ObjectName),
+ TRACE( "attr(%p %s %lx) %p %u %p %lu %p %p\n", attr->RootDirectory, debugstr_us(attr->ObjectName),
attr->Attributes, type, mode, access_state, access, ctx, handle );
if (mode != KernelMode)
@@ -3009,7 +3009,7 @@ NTSTATUS WINAPI ObReferenceObjectByPointer(void *obj, ACCESS_MASK access,
POBJECT_TYPE type,
KPROCESSOR_MODE mode)
{
- FIXME("(%p, %x, %p, %d): stub\n", obj, access, type, mode);
+ FIXME("(%p, %lx, %p, %d): stub\n", obj, access, type, mode);
return STATUS_NOT_IMPLEMENTED;
}
@@ -3247,7 +3247,7 @@ NTSTATUS WINAPI PsReferenceProcessFilePointer(PEPROCESS process, FILE_OBJECT **f
*/
NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS status)
{
- TRACE("status %#x.\n", status);
+ TRACE("status %#lx.\n", status);
ExitThread( status );
}
@@ -3321,7 +3321,7 @@ BOOLEAN WINAPI MmIsThisAnNtAsSystem(void)
*/
NTSTATUS WINAPI MmProtectMdlSystemAddress(PMDL MemoryDescriptorList, ULONG NewProtect)
{
- FIXME("(%p, %u) stub\n", MemoryDescriptorList, NewProtect);
+ FIXME("(%p, %lu) stub\n", MemoryDescriptorList, NewProtect);
return STATUS_SUCCESS;
}
@@ -3375,7 +3375,7 @@ VOID WINAPI READ_REGISTER_BUFFER_UCHAR(PUCHAR Register, PUCHAR Buffer, ULONG Cou
*/
NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT DeviceObject, ULONG Action)
{
- FIXME("(%p %u) stub\n", DeviceObject, Action);
+ FIXME("(%p %lu) stub\n", DeviceObject, Action);
return STATUS_SUCCESS;
}
@@ -3384,7 +3384,7 @@ NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT DeviceObject, ULONG Acti
*/
NTSTATUS WINAPI IoWMIOpenBlock(LPCGUID guid, ULONG desired_access, PVOID *data_block_obj)
{
- FIXME("(%p %u %p) stub\n", guid, desired_access, data_block_obj);
+ FIXME("(%p %lu %p) stub\n", guid, desired_access, data_block_obj);
return STATUS_NOT_IMPLEMENTED;
}
@@ -3417,7 +3417,7 @@ BOOLEAN WINAPI IoSetThreadHardErrorMode(BOOLEAN EnableHardErrors)
*/
BOOLEAN WINAPI Ke386IoSetAccessProcess(PEPROCESS *process, ULONG flag)
{
- FIXME("(%p %d) stub\n", process, flag);
+ FIXME("(%p %ld) stub\n", process, flag);
return FALSE;
}
@@ -3426,7 +3426,7 @@ BOOLEAN WINAPI Ke386IoSetAccessProcess(PEPROCESS *process, ULONG flag)
*/
BOOLEAN WINAPI Ke386SetIoAccessMap(ULONG flag, PVOID buffer)
{
- FIXME("(%d %p) stub\n", flag, buffer);
+ FIXME("(%ld %p) stub\n", flag, buffer);
return FALSE;
}
@@ -3446,7 +3446,7 @@ NTSTATUS WINAPI ObQueryNameString( void *object, OBJECT_NAME_INFORMATION *name,
HANDLE handle;
NTSTATUS ret;
- TRACE("object %p, name %p, size %u, ret_size %p.\n", object, name, size, ret_size);
+ TRACE("object %p, name %p, size %lu, ret_size %p.\n", object, name, size, ret_size);
if ((ret = ObOpenObjectByPointer( object, 0, NULL, 0, NULL, KernelMode, &handle )))
return ret;
@@ -3463,7 +3463,7 @@ NTSTATUS WINAPI IoRegisterPlugPlayNotification(IO_NOTIFICATION_EVENT_CATEGORY ca
PDRIVER_OBJECT driver, PDRIVER_NOTIFICATION_CALLBACK_ROUTINE callback,
PVOID context, PVOID *notification)
{
- FIXME("(%u %u %p %p %p %p %p) stub\n", category, flags, data, driver, callback, context, notification);
+ FIXME("(%u %lu %p %p %p %p %p) stub\n", category, flags, data, driver, callback, context, notification);
return STATUS_SUCCESS;
}
@@ -3529,7 +3529,7 @@ void WINAPI KeBugCheck(ULONG code)
*/
void WINAPI KeBugCheckEx(ULONG code, ULONG_PTR param1, ULONG_PTR param2, ULONG_PTR param3, ULONG_PTR param4)
{
- ERR( "%x %lx %lx %lx %lx\n", code, param1, param2, param3, param4 );
+ ERR( "%lx %Ix %Ix %Ix %Ix\n", code, param1, param2, param3, param4 );
ExitProcess( code );
}
@@ -3538,7 +3538,7 @@ void WINAPI KeBugCheckEx(ULONG code, ULONG_PTR param1, ULONG_PTR param2, ULONG_P
*/
void WINAPI ProbeForRead(void *address, SIZE_T length, ULONG alignment)
{
- FIXME("(%p %lu %u) stub\n", address, length, alignment);
+ FIXME("(%p %Iu %lu) stub\n", address, length, alignment);
}
/***********************************************************************
@@ -3546,7 +3546,7 @@ void WINAPI ProbeForRead(void *address, SIZE_T length, ULONG alignment)
*/
void WINAPI ProbeForWrite(void *address, SIZE_T length, ULONG alignment)
{
- FIXME("(%p %lu %u) stub\n", address, length, alignment);
+ FIXME("(%p %Iu %lu) stub\n", address, length, alignment);
}
/***********************************************************************
@@ -3753,7 +3753,7 @@ static HMODULE load_driver( const WCHAR *driver_name, const UNICODE_STRING *keyn
if (RegOpenKeyW( HKEY_LOCAL_MACHINE, keyname->Buffer + 18 /* skip \registry\machine */, &driver_hkey ))
{
- ERR( "cannot open key %s, err=%u\n", wine_dbgstr_w(keyname->Buffer), GetLastError() );
+ ERR( "cannot open key %s, err=%lu\n", wine_dbgstr_w(keyname->Buffer), GetLastError() );
return NULL;
}
@@ -3870,7 +3870,7 @@ static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING
status = driver_object->DriverInit( driver_object, keyname );
- TRACE_(relay)( "\1Ret driver init %p (obj=%p,str=%s) retval=%08x\n",
+ TRACE_(relay)( "\1Ret driver init %p (obj=%p,str=%s) retval=%08lx\n",
driver_object->DriverInit, driver_object, wine_dbgstr_w(keyname->Buffer), status );
TRACE( "init done for %s obj %p\n", wine_dbgstr_w(driver_name), driver_object );
@@ -3935,7 +3935,7 @@ NTSTATUS WINAPI ZwLoadDriver( const UNICODE_STRING *service_name )
RtlFreeUnicodeString( &drv_name );
if (status != STATUS_SUCCESS)
{
- ERR( "failed to create driver %s: %08x\n", debugstr_us(service_name), status );
+ ERR( "failed to create driver %s: %08lx\n", debugstr_us(service_name), status );
goto error;
}
@@ -4076,7 +4076,7 @@ NTSTATUS WINAPI FsRtlRegisterFileSystemFilterCallbacks( DRIVER_OBJECT *object, P
BOOLEAN WINAPI SeSinglePrivilegeCheck(LUID privilege, KPROCESSOR_MODE mode)
{
static int once;
- if (!once++) FIXME("stub: %08x%08x %u\n", privilege.HighPart, privilege.LowPart, mode);
+ if (!once++) FIXME("stub: %08lx%08lx %u\n", privilege.HighPart, privilege.LowPart, mode);
return TRUE;
}
@@ -4112,7 +4112,7 @@ void WINAPI KeFlushQueuedDpcs(void)
*/
NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG component, ULONG level)
{
- FIXME("stub: %d %d\n", component, level);
+ FIXME("stub: %ld %ld\n", component, level);
return STATUS_NOT_IMPLEMENTED;
}
@@ -4132,7 +4132,7 @@ NTSTATUS WINAPI MmCopyVirtualMemory(PEPROCESS fromprocess, void *fromaddress, PE
void *toaddress, SIZE_T bufsize, KPROCESSOR_MODE mode,
SIZE_T *copied)
{
- FIXME("fromprocess %p, fromaddress %p, toprocess %p, toaddress %p, bufsize %lu, mode %d, copied %p stub.\n",
+ FIXME("fromprocess %p, fromaddress %p, toprocess %p, toaddress %p, bufsize %Iu, mode %d, copied %p stub.\n",
fromprocess, fromaddress, toprocess, toaddress, bufsize, mode, copied);
*copied = 0;
@@ -4201,7 +4201,7 @@ NTSTATUS WINAPI ExUuidCreate(UUID *uuid)
*/
ULONG WINAPI ExSetTimerResolution(ULONG time, BOOLEAN set_resolution)
{
- FIXME("stub: %u %d\n", time, set_resolution);
+ FIXME("stub: %lu %d\n", time, set_resolution);
return KeQueryTimeIncrement();
}
@@ -4230,7 +4230,7 @@ BOOLEAN WINAPI IoIs32bitProcess(IRP *irp)
*/
BOOLEAN WINAPI RtlIsNtDdiVersionAvailable(ULONG version)
{
- FIXME("stub: %d\n", version);
+ FIXME("stub: %ld\n", version);
return FALSE;
}
@@ -4406,7 +4406,7 @@ void * WINAPI PsGetProcessSectionBaseAddress(PEPROCESS process)
if ((status = ObOpenObjectByPointer(process, 0, NULL, PROCESS_ALL_ACCESS, NULL, KernelMode, &h)))
{
- WARN("Error opening process object, status %#x.\n", status);
+ WARN("Error opening process object, status %#lx.\n", status);
return NULL;
}
@@ -4417,7 +4417,7 @@ void * WINAPI PsGetProcessSectionBaseAddress(PEPROCESS process)
if (status || size != sizeof(image_base))
{
- WARN("Error reading process memory, status %#x, size %lu.\n", status, size);
+ WARN("Error reading process memory, status %#lx, size %Iu.\n", status, size);
return NULL;
}
diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c
index ee1402e0e49..5d9ca2dca38 100644
--- a/dlls/ntoskrnl.exe/pnp.c
+++ b/dlls/ntoskrnl.exe/pnp.c
@@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay);
static inline const char *debugstr_propkey( const DEVPROPKEY *id )
{
if (!id) return "(null)";
- return wine_dbg_sprintf( "{%s,%04x}", wine_dbgstr_guid( &id->fmtid ), id->pid );
+ return wine_dbg_sprintf( "{%s,%04lx}", wine_dbgstr_guid( &id->fmtid ), id->pid );
}
#define MAX_SERVICE_NAME 260
@@ -125,7 +125,7 @@ static NTSTATUS get_device_instance_id( DEVICE_OBJECT *device, WCHAR *buffer )
if ((status = get_device_id( device, BusQueryDeviceID, &id )))
{
- ERR("Failed to get device ID, status %#x.\n", status);
+ ERR("Failed to get device ID, status %#lx.\n", status);
return status;
}
@@ -134,7 +134,7 @@ static NTSTATUS get_device_instance_id( DEVICE_OBJECT *device, WCHAR *buffer )
if ((status = get_device_id( device, BusQueryInstanceID, &id )))
{
- ERR("Failed to get instance ID, status %#x.\n", status);
+ ERR("Failed to get instance ID, status %#lx.\n", status);
return status;
}
@@ -199,7 +199,7 @@ static void load_function_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVINF
status = ZwLoadDriver( &string );
if (status != STATUS_SUCCESS && status != STATUS_IMAGE_ALREADY_LOADED)
{
- ERR("Failed to load driver %s, status %#x.\n", debugstr_w(driver), status);
+ ERR("Failed to load driver %s, status %#lx.\n", debugstr_w(driver), status);
return;
}
@@ -218,12 +218,12 @@ static void load_function_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVINF
status = driver_obj->DriverExtension->AddDevice( driver_obj, device );
else
status = STATUS_NOT_IMPLEMENTED;
- TRACE("AddDevice routine %p returned %#x.\n", driver_obj->DriverExtension->AddDevice, status);
+ TRACE("AddDevice routine %p returned %#lx.\n", driver_obj->DriverExtension->AddDevice, status);
ObDereferenceObject( driver_obj );
if (status != STATUS_SUCCESS)
- ERR("AddDevice failed for driver %s, status %#x.\n", debugstr_w(driver), status);
+ ERR("AddDevice failed for driver %s, status %#lx.\n", debugstr_w(driver), status);
}
/* Return the total number of characters in a REG_MULTI_SZ string, including
@@ -257,7 +257,7 @@ static BOOL install_device_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVIN
if ((status = get_device_id( device, BusQueryHardwareIDs, &ids )) || !ids)
{
- ERR("Failed to get hardware IDs, status %#x.\n", status);
+ ERR("Failed to get hardware IDs, status %#lx.\n", status);
return FALSE;
}
@@ -267,7 +267,7 @@ static BOOL install_device_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVIN
if ((status = get_device_id( device, BusQueryCompatibleIDs, &ids )) || !ids)
{
- ERR("Failed to get compatible IDs, status %#x.\n", status);
+ ERR("Failed to get compatible IDs, status %#lx.\n", status);
return FALSE;
}
@@ -277,7 +277,7 @@ static BOOL install_device_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVIN
if (!SetupDiBuildDriverInfoList( set, sp_device, SPDIT_COMPATDRIVER ))
{
- ERR("Failed to build compatible driver list, error %#x.\n", GetLastError());
+ ERR("Failed to build compatible driver list, error %#lx.\n", GetLastError());
return FALSE;
}
@@ -285,7 +285,7 @@ static BOOL install_device_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVIN
{
if (!SetupDiCallClassInstaller(dif_list[i], set, sp_device) && GetLastError() != ERROR_DI_DO_DEFAULT)
{
- WARN("Install function %#x failed, error %#x.\n", dif_list[i], GetLastError());
+ WARN("Install function %#lx failed, error %#lx.\n", dif_list[i], GetLastError());
return FALSE;
}
}
@@ -319,7 +319,7 @@ static void enumerate_new_device( DEVICE_OBJECT *device, HDEVINFO set )
if (!SetupDiCreateDeviceInfoW( set, device_instance_id, &GUID_NULL, NULL, NULL, 0, &sp_device )
&& !SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device ))
{
- ERR("Failed to create or open device %s, error %#x.\n", debugstr_w(device_instance_id), GetLastError());
+ ERR("Failed to create or open device %s, error %#lx.\n", debugstr_w(device_instance_id), GetLastError());
return;
}
@@ -337,7 +337,7 @@ static void enumerate_new_device( DEVICE_OBJECT *device, HDEVINFO set )
if ((status = get_device_caps( device, &caps )))
{
- ERR("Failed to get caps for device %s, status %#x.\n", debugstr_w(device_instance_id), status);
+ ERR("Failed to get caps for device %s, status %#lx.\n", debugstr_w(device_instance_id), status);
return;
}
@@ -419,12 +419,12 @@ static void handle_bus_relations( DEVICE_OBJECT *parent )
relations = (DEVICE_RELATIONS *)irp_status.Information;
if (irp_status.u.Status)
{
- ERR("Failed to enumerate child devices, status %#x.\n", irp_status.u.Status);
+ ERR("Failed to enumerate child devices, status %#lx.\n", irp_status.u.Status);
SetupDiDestroyDeviceInfoList( set );
return;
}
- TRACE("Got %u devices.\n", relations->Count);
+ TRACE("Got %lu devices.\n", relations->Count);
for (i = 0; i < relations->Count; ++i)
{
@@ -488,7 +488,7 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP
NTSTATUS status;
HDEVINFO set;
- TRACE("device %p, property %u, length %u, buffer %p, needed %p.\n",
+ TRACE("device %p, property %u, length %lu, buffer %p, needed %p.\n",
device, property, length, buffer, needed);
switch (property)
@@ -500,7 +500,7 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP
status = get_device_id( device, BusQueryInstanceID, &id );
if (status != STATUS_SUCCESS)
{
- ERR("Failed to get instance ID, status %#x.\n", status);
+ ERR("Failed to get instance ID, status %#lx.\n", status);
break;
}
@@ -607,13 +607,13 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP
if ((set = SetupDiCreateDeviceInfoList( &GUID_NULL, NULL )) == INVALID_HANDLE_VALUE)
{
- ERR("Failed to create device list, error %#x.\n", GetLastError());
+ ERR("Failed to create device list, error %#lx.\n", GetLastError());
return GetLastError();
}
if (!SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device))
{
- ERR("Failed to open device, error %#x.\n", GetLastError());
+ ERR("Failed to open device, error %#lx.\n", GetLastError());
SetupDiDestroyDeviceInfoList( set );
return GetLastError();
}
@@ -676,7 +676,7 @@ static void send_devicechange( DWORD code, void *data, unsigned int size )
}
__EXCEPT(rpc_filter)
{
- WARN("Failed to send event, exception %#x.\n", GetExceptionCode());
+ WARN("Failed to send event, exception %#lx.\n", GetExceptionCode());
}
__ENDTRY
}
@@ -811,7 +811,7 @@ NTSTATUS WINAPI IoSetDevicePropertyData( DEVICE_OBJECT *device, const DEVPROPKEY
NTSTATUS status;
HDEVINFO set;
- TRACE( "device %p, property_key %s, lcid %#x, flags %#x, type %#x, size %u, data %p.\n",
+ TRACE( "device %p, property_key %s, lcid %#lx, flags %#lx, type %#lx, size %lu, data %p.\n",
device, debugstr_propkey(property_key), lcid, flags, type, size, data );
/* flags is always treated as PLUGPLAY_PROPERTY_PERSISTENT starting with Win 8 / 2012 */
@@ -822,20 +822,20 @@ NTSTATUS WINAPI IoSetDevicePropertyData( DEVICE_OBJECT *device, const DEVPROPKEY
if ((set = SetupDiCreateDeviceInfoList( &GUID_NULL, NULL )) == INVALID_HANDLE_VALUE)
{
- ERR( "Failed to create device list, error %#x.\n", GetLastError() );
+ ERR( "Failed to create device list, error %#lx.\n", GetLastError() );
return GetLastError();
}
if (!SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device ))
{
- ERR( "Failed to open device, error %#x.\n", GetLastError() );
+ ERR( "Failed to open device, error %#lx.\n", GetLastError() );
SetupDiDestroyDeviceInfoList( set );
return GetLastError();
}
if (!SetupDiSetDevicePropertyW( set, &sp_device, property_key, type, data, size, 0 ))
{
- ERR( "Failed to set property, error %#x.\n", GetLastError() );
+ ERR( "Failed to set property, error %#lx.\n", GetLastError() );
SetupDiDestroyDeviceInfoList( set );
return GetLastError();
}
@@ -874,7 +874,7 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla
if (!SetupDiCreateDeviceInfoW( set, device_instance_id, class_guid, NULL, NULL, 0, &sp_device )
&& !SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device ))
{
- ERR("Failed to create device %s, error %#x.\n", debugstr_w(device_instance_id), GetLastError());
+ ERR("Failed to create device %s, error %#lx.\n", debugstr_w(device_instance_id), GetLastError());
return GetLastError();
}
@@ -935,11 +935,11 @@ NTSTATUS WINAPI IoOpenDeviceRegistryKey( DEVICE_OBJECT *device, ULONG type, ACCE
NTSTATUS status;
HDEVINFO set;
- TRACE("device %p, type %#x, access %#x, key %p.\n", device, type, access, key);
+ TRACE("device %p, type %#lx, access %#lx, key %p.\n", device, type, access, key);
if ((status = get_device_instance_id( device, device_instance_id )))
{
- ERR("Failed to get device instance ID, error %#x.\n", status);
+ ERR("Failed to get device instance ID, error %#lx.\n", status);
return status;
}
@@ -1098,17 +1098,17 @@ void pnp_manager_start(void)
RtlInitUnicodeString( &driver_nameU, driver_nameW );
if ((status = IoCreateDriver( &driver_nameU, pnp_manager_driver_entry )))
- ERR("Failed to create PnP manager driver, status %#x.\n", status);
+ ERR("Failed to create PnP manager driver, status %#lx.\n", status);
if ((err = RpcStringBindingComposeW( NULL, protseq, NULL, endpoint, NULL, &binding_str )))
{
- ERR("RpcStringBindingCompose() failed, error %#x\n", err);
+ ERR("RpcStringBindingCompose() failed, error %#lx\n", err);
return;
}
err = RpcBindingFromStringBindingW( binding_str, &plugplay_binding_handle );
RpcStringFreeW( &binding_str );
if (err)
- ERR("RpcBindingFromStringBinding() failed, error %#x\n", err);
+ ERR("RpcBindingFromStringBinding() failed, error %#lx\n", err);
}
void pnp_manager_stop_driver( struct wine_driver *driver )
@@ -1146,7 +1146,7 @@ void CDECL wine_enumerate_root_devices( const WCHAR *driver_name )
set = SetupDiGetClassDevsW( NULL, rootW, NULL, DIGCF_ALLCLASSES );
if (set == INVALID_HANDLE_VALUE)
{
- ERR("Failed to build device set, error %#x.\n", GetLastError());
+ ERR("Failed to build device set, error %#lx.\n", GetLastError());
return;
}
@@ -1174,7 +1174,7 @@ void CDECL wine_enumerate_root_devices( const WCHAR *driver_name )
if ((status = IoCreateDevice( pnp_manager, sizeof(struct root_pnp_device), NULL,
FILE_DEVICE_CONTROLLER, FILE_AUTOGENERATED_DEVICE_NAME, FALSE, &device )))
{
- ERR("Failed to create root-enumerated PnP device %s, status %#x.\n", debugstr_w(id), status);
+ ERR("Failed to create root-enumerated PnP device %s, status %#lx.\n", debugstr_w(id), status);
continue;
}
diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c
index 13e2d3e7559..b8239b0cd7d 100644
--- a/dlls/ntoskrnl.exe/sync.c
+++ b/dlls/ntoskrnl.exe/sync.c
@@ -52,7 +52,7 @@ NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG count, void *pobjs[],
NTSTATUS ret;
ULONG i;
- TRACE("count %u, objs %p, wait_type %u, reason %u, mode %d, alertable %u, timeout %p, wait_blocks %p.\n",
+ TRACE("count %lu, objs %p, wait_type %u, reason %u, mode %d, alertable %u, timeout %p, wait_blocks %p.\n",
count, objs, wait_type, reason, mode, alertable, timeout, wait_blocks);
/* We co-opt DISPATCHER_HEADER.WaitListHead:
@@ -239,7 +239,7 @@ LONG WINAPI KeSetEvent( PRKEVENT event, KPRIORITY increment, BOOLEAN wait )
HANDLE handle;
LONG ret = 0;
- TRACE("event %p, increment %d, wait %u.\n", event, increment, wait);
+ TRACE("event %p, increment %ld, wait %u.\n", event, increment, wait);
if (event->Header.WaitListHead.Blink != INVALID_HANDLE_VALUE)
{
@@ -328,7 +328,7 @@ LONG WINAPI KeReadStateEvent( PRKEVENT event )
*/
void WINAPI KeInitializeSemaphore( PRKSEMAPHORE semaphore, LONG count, LONG limit )
{
- TRACE("semaphore %p, count %d, limit %d.\n", semaphore, count, limit);
+ TRACE("semaphore %p, count %ld, limit %ld.\n", semaphore, count, limit);
semaphore->Header.Type = TYPE_SEMAPHORE;
semaphore->Header.SignalState = count;
@@ -346,7 +346,7 @@ LONG WINAPI KeReleaseSemaphore( PRKSEMAPHORE semaphore, KPRIORITY increment,
HANDLE handle;
LONG ret;
- TRACE("semaphore %p, increment %d, count %d, wait %u.\n",
+ TRACE("semaphore %p, increment %ld, count %ld, wait %u.\n",
semaphore, increment, count, wait);
EnterCriticalSection( &sync_cs );
@@ -372,7 +372,7 @@ POBJECT_TYPE ExSemaphoreObjectType = &semaphore_type;
*/
void WINAPI KeInitializeMutex( PRKMUTEX mutex, ULONG level )
{
- TRACE("mutex %p, level %u.\n", mutex, level);
+ TRACE("mutex %p, level %lu.\n", mutex, level);
mutex->Header.Type = TYPE_MUTEX;
mutex->Header.SignalState = 1;
@@ -450,7 +450,7 @@ BOOLEAN WINAPI KeSetTimerEx( KTIMER *timer, LARGE_INTEGER duetime, LONG period,
{
BOOL ret;
- TRACE("timer %p, duetime %s, period %d, dpc %p.\n",
+ TRACE("timer %p, duetime %s, period %ld, dpc %p.\n",
timer, wine_dbgstr_longlong(duetime.QuadPart), period, dpc);
EnterCriticalSection( &sync_cs );
@@ -1150,7 +1150,7 @@ void WINAPI ExReleaseResourceForThreadLite( ERESOURCE *resource, ERESOURCE_THREA
OWNER_ENTRY *entry;
KIRQL irql;
- TRACE("resource %p, thread %#lx.\n", resource, thread);
+ TRACE("resource %p, thread %#Ix.\n", resource, thread);
KeAcquireSpinLock( &resource->SpinLock, &irql );
@@ -1166,7 +1166,7 @@ void WINAPI ExReleaseResourceForThreadLite( ERESOURCE *resource, ERESOURCE_THREA
}
else
{
- ERR("Trying to release %p for thread %#lx, but resource is exclusively owned by %#lx.\n",
+ ERR("Trying to release %p for thread %#Ix, but resource is exclusively owned by %#Ix.\n",
resource, thread, resource->OwnerEntry.OwnerThread);
return;
}
@@ -1181,7 +1181,7 @@ void WINAPI ExReleaseResourceForThreadLite( ERESOURCE *resource, ERESOURCE_THREA
}
else
{
- ERR("Trying to release %p for thread %#lx, but resource is not owned by that thread.\n", resource, thread);
+ ERR("Trying to release %p for thread %#Ix, but resource is not owned by that thread.\n", resource, thread);
return;
}
}
@@ -1299,7 +1299,7 @@ ULONG WINAPI ExIsResourceAcquiredSharedLite( ERESOURCE *resource )
void WINAPI IoInitializeRemoveLockEx( IO_REMOVE_LOCK *lock, ULONG tag,
ULONG max_minutes, ULONG max_count, ULONG size )
{
- TRACE("lock %p, tag %#x, max_minutes %u, max_count %u, size %u.\n",
+ TRACE("lock %p, tag %#lx, max_minutes %lu, max_count %lu, size %lu.\n",
lock, tag, max_minutes, max_count, size);
KeInitializeEvent( &lock->Common.RemoveEvent, NotificationEvent, FALSE );
@@ -1313,7 +1313,7 @@ void WINAPI IoInitializeRemoveLockEx( IO_REMOVE_LOCK *lock, ULONG tag,
NTSTATUS WINAPI IoAcquireRemoveLockEx( IO_REMOVE_LOCK *lock, void *tag,
const char *file, ULONG line, ULONG size )
{
- TRACE("lock %p, tag %p, file %s, line %u, size %u.\n", lock, tag, debugstr_a(file), line, size);
+ TRACE("lock %p, tag %p, file %s, line %lu, size %lu.\n", lock, tag, debugstr_a(file), line, size);
if (lock->Common.Removed)
return STATUS_DELETE_PENDING;
@@ -1329,7 +1329,7 @@ void WINAPI IoReleaseRemoveLockEx( IO_REMOVE_LOCK *lock, void *tag, ULONG size )
{
LONG count;
- TRACE("lock %p, tag %p, size %u.\n", lock, tag, size);
+ TRACE("lock %p, tag %p, size %lu.\n", lock, tag, size);
if (!(count = InterlockedDecrement( &lock->Common.IoCount )) && lock->Common.Removed)
KeSetEvent( &lock->Common.RemoveEvent, IO_NO_INCREMENT, FALSE );
@@ -1344,7 +1344,7 @@ void WINAPI IoReleaseRemoveLockAndWaitEx( IO_REMOVE_LOCK *lock, void *tag, ULONG
{
LONG count;
- TRACE("lock %p, tag %p, size %u.\n", lock, tag, size);
+ TRACE("lock %p, tag %p, size %lu.\n", lock, tag, size);
lock->Common.Removed = TRUE;
More information about the wine-devel
mailing list