Skip to content

W
wine-cw
Commit 0adec25f authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

ntdll: Build the PE side without -DWINE_NO_LONG_TYPES.

parent af4378d4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 297 additions and 284 deletions
dlls/ntdll/Makefile.in
View file @ 0adec25f
EXTRADEFS = -DWINE_NO_LONG_TYPES -D_NTSYSTEM_ -D_ACRTIMP= -DWINBASEAPI=
EXTRADEFS = -D_NTSYSTEM_ -D_ACRTIMP= -DWINBASEAPI=
MODULE = ntdll.dll
UNIXLIB = ntdll.so
IMPORTLIB = ntdll
......
dlls/ntdll/actctx.c
View file @ 0adec25f
......@@ -918,7 +918,7 @@ static void free_entity_array(struct entity_array *array)
RtlFreeHeap(GetProcessHeap(), 0, entity->u.activatable_class.name);
break;
default:
FIXME("Unknown entity kind %d\n", entity->kind);
FIXME("Unknown entity kind %ld\n", entity->kind);
}
}
RtlFreeHeap( GetProcessHeap(), 0, array->base );
......@@ -3080,11 +3080,11 @@ static NTSTATUS get_manifest_in_associated_manifest( struct actctx_loader* acl,
NTSTATUS status;
UNICODE_STRING nameW;
HANDLE file;
ULONG_PTR resid = CREATEPROCESS_MANIFEST_RESOURCE_ID;
UINT resid = CREATEPROCESS_MANIFEST_RESOURCE_ID;
if (!((ULONG_PTR)resname >> 16)) resid = (ULONG_PTR)resname & 0xffff;
if (!((ULONG_PTR)resname >> 16)) resid = LOWORD(resname);
TRACE( "looking for manifest associated with %s id %lu\n", debugstr_w(filename), resid );
TRACE( "looking for manifest associated with %s id %u\n", debugstr_w(filename), resid );
if (module) /* use the module filename */
{
......@@ -3092,7 +3092,7 @@ static NTSTATUS get_manifest_in_associated_manifest( struct actctx_loader* acl,
if (!(status = get_module_filename( module, &name, sizeof(L".manifest") + 10*sizeof(WCHAR) )))
{
if (resid != 1) swprintf( name.Buffer + wcslen(name.Buffer), 10, L".%lu", resid );
if (resid != 1) swprintf( name.Buffer + wcslen(name.Buffer), 10, L".%u", resid );
wcscat( name.Buffer, L".manifest" );
if (!RtlDosPathNameToNtPathName_U( name.Buffer, &nameW, NULL, NULL ))
status = STATUS_RESOURCE_DATA_NOT_FOUND;
......@@ -3106,7 +3106,7 @@ static NTSTATUS get_manifest_in_associated_manifest( struct actctx_loader* acl,
(wcslen(filename) + 10) * sizeof(WCHAR) + sizeof(L".manifest") )))
return STATUS_NO_MEMORY;
wcscpy( buffer, filename );
if (resid != 1) swprintf( buffer + wcslen(buffer), 10, L".%lu", resid );
if (resid != 1) swprintf( buffer + wcslen(buffer), 10, L".%u", resid );
wcscat( buffer, L".manifest" );
RtlInitUnicodeString( &nameW, buffer );
}
......@@ -3546,7 +3546,7 @@ static struct string_index *find_string_index(const struct strsection_header *se
break;
}
else
WARN("hash collision 0x%08x, %s, %s\n", hash, debugstr_us(name), debugstr_us(&str));
WARN("hash collision 0x%08lx, %s, %s\n", hash, debugstr_us(name), debugstr_us(&str));
}
iter++;
}
......@@ -3806,7 +3806,7 @@ static NTSTATUS find_window_class(ACTIVATION_CONTEXT* actctx, const UNICODE_STRI
break;
}
else
WARN("hash collision 0x%08x, %s, %s\n", hash, debugstr_us(name), debugstr_us(&str));
WARN("hash collision 0x%08lx, %s, %s\n", hash, debugstr_us(name), debugstr_us(&str));
}
iter++;
}
......@@ -4006,7 +4006,7 @@ static NTSTATUS find_activatable_class(ACTIVATION_CONTEXT* actctx, const UNICODE
break;
}
else
WARN("hash collision 0x%08x, %s, %s\n", hash, debugstr_us(name), debugstr_us(&str));
WARN("hash collision 0x%08lx, %s, %s\n", hash, debugstr_us(name), debugstr_us(&str));
}
iter++;
}
......@@ -5107,13 +5107,13 @@ static NTSTATUS find_string(ACTIVATION_CONTEXT* actctx, ULONG section_kind,
status = find_progid_redirection(actctx, section_name, data);
break;
case ACTIVATION_CONTEXT_SECTION_GLOBAL_OBJECT_RENAME_TABLE:
FIXME("Unsupported yet section_kind %x\n", section_kind);
FIXME("Unsupported yet section_kind %lx\n", section_kind);
return STATUS_SXS_SECTION_NOT_FOUND;
case ACTIVATION_CONTEXT_SECTION_WINRT_ACTIVATABLE_CLASSES:
status = find_activatable_class(actctx, section_name, data);
break;
default:
WARN("Unknown section_kind %x\n", section_kind);
WARN("Unknown section_kind %lx\n", section_kind);
return STATUS_SXS_SECTION_NOT_FOUND;
}
......@@ -5147,7 +5147,7 @@ static NTSTATUS find_guid(ACTIVATION_CONTEXT* actctx, ULONG section_kind,
status = find_clr_surrogate(actctx, guid, data);
break;
default:
WARN("Unknown section_kind %x\n", section_kind);
WARN("Unknown section_kind %lx\n", section_kind);
return STATUS_SXS_SECTION_NOT_FOUND;
}
......@@ -5216,7 +5216,7 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr )
HANDLE file = 0;
struct actctx_loader acl;
TRACE("%p %08x\n", pActCtx, pActCtx ? pActCtx->dwFlags : 0);
TRACE("%p %08lx\n", pActCtx, pActCtx ? pActCtx->dwFlags : 0);
if (!pActCtx || pActCtx->cbSize < sizeof(*pActCtx) ||
(pActCtx->dwFlags & ~ACTCTX_FLAGS_ALL))
......@@ -5399,7 +5399,7 @@ NTSTATUS WINAPI RtlActivateActivationContextEx( ULONG flags, TEB *teb, HANDLE ha
RtlAddRefActivationContext( handle );
*cookie = (ULONG_PTR)frame;
TRACE( "%p cookie=%lx\n", handle, *cookie );
TRACE( "%p cookie=%Ix\n", handle, *cookie );
return STATUS_SUCCESS;
}
......@@ -5411,7 +5411,7 @@ void WINAPI RtlDeactivateActivationContext( ULONG flags, ULONG_PTR cookie )
{
RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame, *top;
TRACE( "%x cookie=%lx\n", flags, cookie );
TRACE( "%lx cookie=%Ix\n", flags, cookie );
/* find the right frame */
top = NtCurrentTeb()->ActivationContextStack.ActiveFrame;
......@@ -5499,7 +5499,7 @@ NTSTATUS WINAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle
ACTIVATION_CONTEXT *actctx;
NTSTATUS status;
TRACE("%08x %p %p %u %p %ld %p\n", flags, handle,
TRACE("%08lx %p %p %lu %p %Id %p\n", flags, handle,
subinst, class, buffer, bufsize, retlen);
if (retlen) *retlen = 0;
......@@ -5736,7 +5736,7 @@ NTSTATUS WINAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle
break;
default:
FIXME( "class %u not implemented\n", class );
FIXME( "class %lu not implemented\n", class );
return STATUS_NOT_IMPLEMENTED;
}
return STATUS_SUCCESS;
......@@ -5754,7 +5754,7 @@ NTSTATUS WINAPI RtlFindActivationContextSectionString( ULONG flags, const GUID *
PACTCTX_SECTION_KEYED_DATA data = ptr;
NTSTATUS status = STATUS_SXS_KEY_NOT_FOUND;
TRACE("%08x %s %u %s %p\n", flags, debugstr_guid(guid), section_kind,
TRACE("%08lx %s %lu %s %p\n", flags, debugstr_guid(guid), section_kind,
debugstr_us(section_name), data);
if (guid)
......@@ -5764,7 +5764,7 @@ NTSTATUS WINAPI RtlFindActivationContextSectionString( ULONG flags, const GUID *
}
if (flags & ~FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX)
{
FIXME("unknown flags %08x\n", flags);
FIXME("unknown flags %08lx\n", flags);
return STATUS_INVALID_PARAMETER;
}
if ((data && data->cbSize < offsetof(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex)) ||
......@@ -5798,7 +5798,7 @@ NTSTATUS WINAPI RtlFindActivationContextSectionGuid( ULONG flags, const GUID *ex
ACTCTX_SECTION_KEYED_DATA *data = ptr;
NTSTATUS status = STATUS_SXS_KEY_NOT_FOUND;
TRACE("%08x %s %u %s %p\n", flags, debugstr_guid(extguid), section_kind, debugstr_guid(guid), data);
TRACE("%08lx %s %lu %s %p\n", flags, debugstr_guid(extguid), section_kind, debugstr_guid(guid), data);
if (extguid)
{
......@@ -5808,7 +5808,7 @@ NTSTATUS WINAPI RtlFindActivationContextSectionGuid( ULONG flags, const GUID *ex
if (flags & ~FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX)
{
FIXME("unknown flags %08x\n", flags);
FIXME("unknown flags %08lx\n", flags);
return STATUS_INVALID_PARAMETER;
}
......@@ -5840,7 +5840,7 @@ NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings( DWORD flags, HANDL
if (flags)
{
WARN( "unknown flags %08x\n", flags );
WARN( "unknown flags %08lx\n", flags );
return STATUS_INVALID_PARAMETER;
}
......
dlls/ntdll/atom.c
View file @ 0adec25f
......@@ -245,7 +245,7 @@ NTSTATUS WINAPI RtlQueryAtomInAtomTable( RTL_ATOM_TABLE table, RTL_ATOM atom, UL
if (!*len) status = STATUS_BUFFER_TOO_SMALL;
*len = wlen;
}
TRACE( "%p %x -> %s (%x)\n",
TRACE( "%p %x -> %s (%lx)\n",
table, atom, len ? debugstr_wn(name, wlen / sizeof(WCHAR)) : "(null)", status );
return status;
}
......
dlls/ntdll/debugbuffer.c
View file @ 0adec25f
......@@ -36,17 +36,17 @@ static void dump_DEBUG_MODULE_INFORMATION(const DEBUG_MODULE_INFORMATION *iBuf)
{
TRACE( "MODULE_INFORMATION:%p\n", iBuf );
if (NULL == iBuf) return ;
TRACE( "Base:%d\n", iBuf->Base );
TRACE( "Size:%d\n", iBuf->Size );
TRACE( "Flags:%d\n", iBuf->Flags );
TRACE( "Base:%lx\n", iBuf->Base );
TRACE( "Size:%lx\n", iBuf->Size );
TRACE( "Flags:%lx\n", iBuf->Flags );
}
static void dump_DEBUG_HEAP_INFORMATION(const DEBUG_HEAP_INFORMATION *iBuf)
{
TRACE( "HEAP_INFORMATION:%p\n", iBuf );
if (NULL == iBuf) return ;
TRACE( "Base:%d\n", iBuf->Base );
TRACE( "Flags:%d\n", iBuf->Flags );
TRACE( "Base:%lx\n", iBuf->Base );
TRACE( "Flags:%lx\n", iBuf->Flags );
}
static void dump_DEBUG_LOCK_INFORMATION(const DEBUG_LOCK_INFORMATION *iBuf)
......@@ -58,13 +58,13 @@ static void dump_DEBUG_LOCK_INFORMATION(const DEBUG_LOCK_INFORMATION *iBuf)
TRACE( "Address:%p\n", iBuf->Address );
TRACE( "Type:%d\n", iBuf->Type );
TRACE( "CreatorBackTraceIndex:%d\n", iBuf->CreatorBackTraceIndex );
TRACE( "OwnerThreadId:%d\n", iBuf->OwnerThreadId );
TRACE( "ActiveCount:%d\n", iBuf->ActiveCount );
TRACE( "ContentionCount:%d\n", iBuf->ContentionCount );
TRACE( "EntryCount:%d\n", iBuf->EntryCount );
TRACE( "RecursionCount:%d\n", iBuf->RecursionCount );
TRACE( "NumberOfSharedWaiters:%d\n", iBuf->NumberOfSharedWaiters );
TRACE( "NumberOfExclusiveWaiters:%d\n", iBuf->NumberOfExclusiveWaiters );
TRACE( "OwnerThreadId:%lx\n", iBuf->OwnerThreadId );
TRACE( "ActiveCount:%ld\n", iBuf->ActiveCount );
TRACE( "ContentionCount:%ld\n", iBuf->ContentionCount );
TRACE( "EntryCount:%ld\n", iBuf->EntryCount );
TRACE( "RecursionCount:%ld\n", iBuf->RecursionCount );
TRACE( "NumberOfSharedWaiters:%ld\n", iBuf->NumberOfSharedWaiters );
TRACE( "NumberOfExclusiveWaiters:%ld\n", iBuf->NumberOfExclusiveWaiters );
}
static void dump_DEBUG_BUFFER(const DEBUG_BUFFER *iBuf)
......@@ -73,13 +73,13 @@ static void dump_DEBUG_BUFFER(const DEBUG_BUFFER *iBuf)
TRACE( "SectionHandle:%p\n", iBuf->SectionHandle);
TRACE( "SectionBase:%p\n", iBuf->SectionBase);
TRACE( "RemoteSectionBase:%p\n", iBuf->RemoteSectionBase);
TRACE( "SectionBaseDelta:%d\n", iBuf->SectionBaseDelta);
TRACE( "SectionBaseDelta:%lx\n", iBuf->SectionBaseDelta);
TRACE( "EventPairHandle:%p\n", iBuf->EventPairHandle);
TRACE( "RemoteThreadHandle:%p\n", iBuf->RemoteThreadHandle);
TRACE( "InfoClassMask:%x\n", iBuf->InfoClassMask);
TRACE( "SizeOfInfo:%d\n", iBuf->SizeOfInfo);
TRACE( "AllocatedSize:%d\n", iBuf->AllocatedSize);
TRACE( "SectionSize:%d\n", iBuf->SectionSize);
TRACE( "InfoClassMask:%lx\n", iBuf->InfoClassMask);
TRACE( "SizeOfInfo:%ld\n", iBuf->SizeOfInfo);
TRACE( "AllocatedSize:%ld\n", iBuf->AllocatedSize);
TRACE( "SectionSize:%ld\n", iBuf->SectionSize);
TRACE( "BackTraceInfo:%p\n", iBuf->BackTraceInformation);
dump_DEBUG_MODULE_INFORMATION(iBuf->ModuleInformation);
dump_DEBUG_HEAP_INFORMATION(iBuf->HeapInformation);
......@@ -89,13 +89,13 @@ static void dump_DEBUG_BUFFER(const DEBUG_BUFFER *iBuf)
PDEBUG_BUFFER WINAPI RtlCreateQueryDebugBuffer(IN ULONG iSize, IN BOOLEAN iEventPair)
{
PDEBUG_BUFFER oBuf;
FIXME("(%d, %d): stub\n", iSize, iEventPair);
FIXME("(%ld, %d): stub\n", iSize, iEventPair);
if (iSize < sizeof(DEBUG_BUFFER)) {
iSize = sizeof(DEBUG_BUFFER);
}
oBuf = RtlAllocateHeap(GetProcessHeap(), 0, iSize);
memset(oBuf, 0, iSize);
FIXME("(%d, %d): returning %p\n", iSize, iEventPair, oBuf);
FIXME("(%ld, %d): returning %p\n", iSize, iEventPair, oBuf);
return oBuf;
}
......@@ -124,9 +124,9 @@ NTSTATUS WINAPI RtlQueryProcessDebugInformation(IN ULONG iProcessId, IN ULONG iD
if ((status = NtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, NULL, &cid ))) return status;
NtClose( process );
FIXME("(%d, %x, %p): stub\n", iProcessId, iDebugInfoMask, iBuf);
FIXME("(%ld, %lx, %p): stub\n", iProcessId, iDebugInfoMask, iBuf);
iBuf->InfoClassMask = iDebugInfoMask;
if (iDebugInfoMask & PDI_MODULES) {
PDEBUG_MODULE_INFORMATION info = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(DEBUG_MODULE_INFORMATION));
memset(info, 0, sizeof(DEBUG_MODULE_INFORMATION));
......
dlls/ntdll/error.c
View file @ 0adec25f
......@@ -59,7 +59,7 @@ ULONG WINAPI RtlNtStatusToDosErrorNoTeb( NTSTATUS status )
ret = map_status( status );
if (ret == ERROR_MR_MID_NOT_FOUND && status != STATUS_MESSAGE_NOT_FOUND)
WARN( "no mapping for %08x\n", status );
WARN( "no mapping for %08lx\n", status );
return ret;
}
......
dlls/ntdll/exception.c
View file @ 0adec25f
......@@ -166,10 +166,10 @@ LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context )
RtlFreeHeap( GetProcessHeap(), 0, to_free );
to_free = NULL;
TRACE( "calling handler at %p code=%x flags=%x\n",
TRACE( "calling handler at %p code=%lx flags=%lx\n",
func, rec->ExceptionCode, rec->ExceptionFlags );
ret = func( &except_ptrs );
TRACE( "handler at %p returned %x\n", func, ret );
TRACE( "handler at %p returned %lx\n", func, ret );
RtlEnterCriticalSection( &vectored_handlers_section );
ptr = list_next( &vectored_exception_handlers, ptr );
......@@ -351,7 +351,7 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, ULONG_P
{
struct dynamic_unwind_entry *entry;
TRACE( "%p %u %lx\n", table, count, addr );
TRACE( "%p %lu %Ix\n", table, count, addr );
/* NOTE: Windows doesn't check if table is aligned or a NULL pointer */
......@@ -383,7 +383,7 @@ BOOLEAN CDECL RtlInstallFunctionTableCallback( ULONG_PTR table, ULONG_PTR base,
{
struct dynamic_unwind_entry *entry;
TRACE( "%lx %lx %d %p %p %s\n", table, base, length, callback, context, wine_dbgstr_w(dll) );
TRACE( "%Ix %Ix %ld %p %p %s\n", table, base, length, callback, context, wine_dbgstr_w(dll) );
/* NOTE: Windows doesn't check if the provided callback is a NULL pointer */
......@@ -419,7 +419,7 @@ DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functi
{
struct dynamic_unwind_entry *entry;
TRACE( "%p, %p, %u, %u, %lx, %lx\n", table, functions, count, max_count, base, end );
TRACE( "%p, %p, %lu, %lu, %Ix, %Ix\n", table, functions, count, max_count, base, end );
entry = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*entry) );
if (!entry)
......@@ -450,7 +450,7 @@ void WINAPI RtlGrowFunctionTable( void *table, DWORD count )
{
struct dynamic_unwind_entry *entry;
TRACE( "%p, %u\n", table, count );
TRACE( "%p, %lu\n", table, count );
RtlEnterCriticalSection( &dynamic_unwind_section );
LIST_FOR_EACH_ENTRY( entry, &dynamic_unwind_list, struct dynamic_unwind_entry, entry )
......@@ -612,7 +612,7 @@ PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG_PTR pc, ULONG_PTR *base,
if (!(func = lookup_function_info( pc, base, &module )))
{
*base = 0;
WARN( "no exception table found for %lx\n", pc );
WARN( "no exception table found for %Ix\n", pc );
}
return func;
}
......@@ -782,7 +782,7 @@ NTSTATUS WINAPI RtlGetExtendedContextLength2( ULONG context_flags, ULONG *length
ULONG64 supported_mask;
ULONG64 size;
TRACE( "context_flags %#x, length %p, compaction_mask %s.\n", context_flags, length,
TRACE( "context_flags %#lx, length %p, compaction_mask %s.\n", context_flags, length,
wine_dbgstr_longlong(compaction_mask) );
if (!(p = context_get_parameters( context_flags )))
......@@ -828,7 +828,7 @@ NTSTATUS WINAPI RtlInitializeExtendedContext2( void *context, ULONG context_flag
ULONG64 supported_mask = 0;
CONTEXT_EX *c_ex;
TRACE( "context %p, context_flags %#x, context_ex %p, compaction_mask %s.\n",
TRACE( "context %p, context_flags %#lx, context_ex %p, compaction_mask %s.\n",
context, context_flags, context_ex, wine_dbgstr_longlong(compaction_mask));
if (!(p = context_get_parameters( context_flags )))
......@@ -891,7 +891,7 @@ NTSTATUS WINAPI RtlInitializeExtendedContext( void *context, ULONG context_flags
void * WINAPI RtlLocateExtendedFeature2( CONTEXT_EX *context_ex, ULONG feature_id,
XSTATE_CONFIGURATION *xstate_config, ULONG *length )
{
TRACE( "context_ex %p, feature_id %u, xstate_config %p, length %p.\n",
TRACE( "context_ex %p, feature_id %lu, xstate_config %p, length %p.\n",
context_ex, feature_id, xstate_config, length );
if (!xstate_config)
......@@ -970,7 +970,7 @@ NTSTATUS WINAPI RtlCopyContext( CONTEXT *dst, DWORD context_flags, CONTEXT *src
static const DWORD arch_mask = CONTEXT_i386 | CONTEXT_AMD64;
BYTE *d, *s;
TRACE("dst %p, context_flags %#x, src %p.\n", dst, context_flags, src);
TRACE("dst %p, context_flags %#lx, src %p.\n", dst, context_flags, src);
if (context_flags & 0x40 && !RtlGetEnabledExtendedFeatures( ~(ULONG64)0 )) return STATUS_NOT_SUPPORTED;
......@@ -1017,7 +1017,7 @@ NTSTATUS WINAPI RtlCopyExtendedContext( CONTEXT_EX *dst, ULONG context_flags, CO
unsigned int start;
BYTE *d, *s;
TRACE( "dst %p, context_flags %#x, src %p.\n", dst, context_flags, src );
TRACE( "dst %p, context_flags %#lx, src %p.\n", dst, context_flags, src );
if (!(p = context_get_parameters( context_flags )))
return STATUS_INVALID_PARAMETER;
......
dlls/ntdll/handletable.c
View file @ 0adec25f
......@@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
*/
void WINAPI RtlInitializeHandleTable(ULONG MaxHandleCount, ULONG HandleSize, RTL_HANDLE_TABLE * HandleTable)
{
TRACE("(%u, %u, %p)\n", MaxHandleCount, HandleSize, HandleTable);
TRACE("(%lu, %lu, %p)\n", MaxHandleCount, HandleSize, HandleTable);
memset(HandleTable, 0, sizeof(*HandleTable));
HandleTable->MaxHandleCount = MaxHandleCount;
......@@ -292,7 +292,7 @@ BOOLEAN WINAPI RtlIsValidIndexHandle(const RTL_HANDLE_TABLE * HandleTable, ULONG
{
RTL_HANDLE * Handle;
TRACE("(%p, %u, %p)\n", HandleTable, Index, ValidHandle);
TRACE("(%p, %lu, %p)\n", HandleTable, Index, ValidHandle);
Handle = (RTL_HANDLE *)
((char *)HandleTable->FirstHandle + Index * HandleTable->HandleSize);
......
dlls/ntdll/heap.c
View file @ 0adec25f
......@@ -578,7 +578,7 @@ static const char *debugstr_heap_entry( struct rtl_heap_entry *entry )
const char *str = wine_dbg_sprintf( "data %p, size %#Ix, overhead %#x, region %#x, flags %#x", entry->lpData,
entry->cbData, entry->cbOverhead, entry->iRegionIndex, entry->wFlags );
if (!(entry->wFlags & RTL_HEAP_ENTRY_REGION)) return str;
return wine_dbg_sprintf( "%s, commit %#x, uncommit %#x, first %p, last %p", str, entry->Region.dwCommittedSize,
return wine_dbg_sprintf( "%s, commit %#lx, uncommit %#lx, first %p, last %p", str, entry->Region.dwCommittedSize,
entry->Region.dwUnCommittedSize, entry->Region.lpFirstBlock, entry->Region.lpLastBlock );
}
......@@ -799,7 +799,7 @@ static struct block *allocate_large_block( struct heap *heap, DWORD flags, SIZE_
if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &total_size,
MEM_COMMIT, get_protection_type( flags )))
{
WARN("Could not allocate block for %08lx bytes\n", size );
WARN("Could not allocate block for %08Ix bytes\n", size );
return NULL;
}
......@@ -858,7 +858,7 @@ static struct block *realloc_large_block( struct heap *heap, DWORD flags, struct
if (flags & HEAP_REALLOC_IN_PLACE_ONLY) return NULL;
if (!(block = allocate_large_block( heap, flags, size )))
{
WARN("Could not allocate block for %08lx bytes\n", size );
WARN("Could not allocate block for %08Ix bytes\n", size );
return NULL;
}
......@@ -932,13 +932,13 @@ static SUBHEAP *HEAP_CreateSubHeap( struct heap **heap_ptr, LPVOID address, DWOR
if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &totalSize,
MEM_RESERVE, get_protection_type( flags ) ))
{
WARN("Could not allocate %08lx bytes\n", totalSize );
WARN("Could not allocate %08Ix bytes\n", totalSize );
return NULL;
}
if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0,
&commitSize, MEM_COMMIT, get_protection_type( flags ) ))
{
WARN("Could not commit %08lx bytes for sub-heap %p\n", commitSize, address );
WARN("Could not commit %08Ix bytes for sub-heap %p\n", commitSize, address );
return NULL;
}
}
......@@ -1035,7 +1035,7 @@ static struct block *find_free_block( struct heap *heap, SIZE_T block_size, SUBH
if (!(heap->flags & HEAP_GROWABLE))
{
WARN("Not enough space in heap %p for %08lx bytes\n", heap, block_size );
WARN("Not enough space in heap %p for %08Ix bytes\n", heap, block_size );
return NULL;
}
......@@ -1056,7 +1056,7 @@ static struct block *find_free_block( struct heap *heap, SIZE_T block_size, SUBH
max( heap->grow_size, total_size ) );
}
TRACE( "created new sub-heap %p of %08lx bytes for heap %p\n", *subheap, subheap_size( *subheap ), heap );
TRACE( "created new sub-heap %p of %08Ix bytes for heap %p\n", *subheap, subheap_size( *subheap ), heap );
entry = first_block( *subheap );
list_remove( &entry->entry );
......@@ -1546,7 +1546,7 @@ void *WINAPI DECLSPEC_HOTPATCH RtlAllocateHeap( HANDLE handle, ULONG flags, SIZE
if (!status) valgrind_notify_alloc( ptr, size, flags & HEAP_ZERO_MEMORY );
TRACE( "handle %p, flags %#x, size %#Ix, return %p, status %#x.\n", handle, flags, size, ptr, status );
TRACE( "handle %p, flags %#lx, size %#Ix, return %p, status %#lx.\n", handle, flags, size, ptr, status );
heap_set_status( heap, flags, status );
return ptr;
}
......@@ -1585,7 +1585,7 @@ BOOLEAN WINAPI DECLSPEC_HOTPATCH RtlFreeHeap( HANDLE handle, ULONG flags, void *
heap_unlock( heap, flags );
}
TRACE( "handle %p, flags %#x, ptr %p, return %u, status %#x.\n", handle, flags, ptr, !status, status );
TRACE( "handle %p, flags %#lx, ptr %p, return %u, status %#lx.\n", handle, flags, ptr, !status, status );
heap_set_status( heap, flags, status );
return !status;
}
......@@ -1670,7 +1670,7 @@ void *WINAPI RtlReAllocateHeap( HANDLE handle, ULONG flags, void *ptr, SIZE_T si
heap_unlock( heap, flags );
}
TRACE( "handle %p, flags %#x, ptr %p, size %#Ix, return %p, status %#x.\n", handle, flags, ptr, size, ret, status );
TRACE( "handle %p, flags %#lx, ptr %p, size %#Ix, return %p, status %#lx.\n", handle, flags, ptr, size, ret, status );
heap_set_status( heap, flags, status );
return ret;
}
......@@ -1694,7 +1694,7 @@ void *WINAPI RtlReAllocateHeap( HANDLE handle, ULONG flags, void *ptr, SIZE_T si
ULONG WINAPI RtlCompactHeap( HANDLE handle, ULONG flags )
{
static BOOL reported;
if (!reported++) FIXME( "handle %p, flags %#x stub!\n", handle, flags );
if (!reported++) FIXME( "handle %p, flags %#lx stub!\n", handle, flags );
return 0;
}
......@@ -1775,7 +1775,7 @@ SIZE_T WINAPI RtlSizeHeap( HANDLE handle, ULONG flags, const void *ptr )
heap_unlock( heap, flags );
}
TRACE( "handle %p, flags %#x, ptr %p, return %#Ix, status %#x.\n", handle, flags, ptr, size, status );
TRACE( "handle %p, flags %#lx, ptr %p, return %#Ix, status %#lx.\n", handle, flags, ptr, size, status );
heap_set_status( heap, flags, status );
return size;
}
......@@ -1800,7 +1800,7 @@ BOOLEAN WINAPI RtlValidateHeap( HANDLE handle, ULONG flags, const void *ptr )
heap_unlock( heap, flags );
}
TRACE( "handle %p, flags %#x, ptr %p, return %u.\n", handle, flags, ptr, !!ret );
TRACE( "handle %p, flags %#lx, ptr %p, return %u.\n", handle, flags, ptr, !!ret );
return ret;
}
......@@ -1928,7 +1928,7 @@ NTSTATUS WINAPI RtlWalkHeap( HANDLE handle, void *entry_ptr )
heap_unlock( heap, 0 );
}
TRACE( "handle %p, entry %p %s, return %#x\n", handle, entry,
TRACE( "handle %p, entry %p %s, return %#lx\n", handle, entry,
status ? "<empty>" : debugstr_heap_entry(entry), status );
return status;
}
......@@ -1992,7 +1992,7 @@ NTSTATUS WINAPI RtlQueryHeapInformation( HANDLE handle, HEAP_INFORMATION_CLASS i
*/
NTSTATUS WINAPI RtlSetHeapInformation( HANDLE handle, HEAP_INFORMATION_CLASS info_class, void *info, SIZE_T size )
{
FIXME( "handle %p, info_class %d, info %p, size %ld stub!\n", handle, info_class, info, size );
FIXME( "handle %p, info_class %d, info %p, size %Id stub!\n", handle, info_class, info, size );
return STATUS_SUCCESS;
}
......@@ -2007,7 +2007,7 @@ BOOLEAN WINAPI RtlGetUserInfoHeap( HANDLE handle, ULONG flags, void *ptr, void *
SUBHEAP *subheap;
char *tmp;
TRACE( "handle %p, flags %#x, ptr %p, user_value %p, user_flags %p semi-stub!\n",
TRACE( "handle %p, flags %#lx, ptr %p, user_value %p, user_flags %p semi-stub!\n",
handle, flags, ptr, user_value, user_flags );
*user_flags = 0;
......@@ -2053,7 +2053,7 @@ BOOLEAN WINAPI RtlSetUserValueHeap( HANDLE handle, ULONG flags, void *ptr, void
SUBHEAP *subheap;
char *tmp;
TRACE( "handle %p, flags %#x, ptr %p, user_value %p.\n", handle, flags, ptr, user_value );
TRACE( "handle %p, flags %#lx, ptr %p, user_value %p.\n", handle, flags, ptr, user_value );
if (!(heap = unsafe_heap_from_handle( handle ))) return TRUE;
......@@ -2090,7 +2090,7 @@ BOOLEAN WINAPI RtlSetUserFlagsHeap( HANDLE handle, ULONG flags, void *ptr, ULONG
struct heap *heap;
SUBHEAP *subheap;
TRACE( "handle %p, flags %#x, ptr %p, clear %#x, set %#x.\n", handle, flags, ptr, clear, set );
TRACE( "handle %p, flags %#lx, ptr %p, clear %#lx, set %#lx.\n", handle, flags, ptr, clear, set );
if ((clear | set) & ~(0xe00))
{
......
dlls/ntdll/locale.c
View file @ 0adec25f
......@@ -107,7 +107,7 @@ void locale_init(void)
status = RtlGetLocaleFileMappingAddress( (void **)&header, &system_lcid, &unused );
if (status)
{
ERR( "locale init failed %x\n", status );
ERR( "locale init failed %lx\n", status );
return;
}
locale_table = (const NLS_LOCALE_HEADER *)((char *)header + header->locales);
......@@ -135,7 +135,7 @@ void locale_init(void)
user_resource_neutral_lcid = get_locale_data( locale_table, entry->idx )->unique_lcid;
}
}
TRACE( "resources: %04x/%04x/%04x\n", user_resource_lcid, user_resource_neutral_lcid, system_lcid );
TRACE( "resources: %04lx/%04lx/%04lx\n", user_resource_lcid, user_resource_neutral_lcid, system_lcid );
if (!RtlQueryActivationContextApplicationSettings( 0, NULL, L"http://schemas.microsoft.com/SMI/2019/WindowsSettings",
L"activeCodePage", locale, ARRAY_SIZE(locale), NULL ))
......@@ -193,7 +193,7 @@ static NTSTATUS get_dummy_preferred_ui_language( DWORD flags, LANGID lang, ULONG
NTSTATUS status;
ULONG len;
FIXME("(0x%x %p %p %p) returning a dummy value (current locale)\n", flags, count, buffer, size);
FIXME("(0x%lx %p %p %p) returning a dummy value (current locale)\n", flags, count, buffer, size);
if (flags & MUI_LANGUAGE_ID) swprintf( name, ARRAY_SIZE(name), L"%04lX", lang );
else
......@@ -219,7 +219,7 @@ static NTSTATUS get_dummy_preferred_ui_language( DWORD flags, LANGID lang, ULONG
}
*size = len;
*count = 1;
TRACE("returned variable content: %d, \"%s\", %d\n", *count, debugstr_w(buffer), *size);
TRACE("returned variable content: %ld, \"%s\", %ld\n", *count, debugstr_w(buffer), *size);
return STATUS_SUCCESS;
}
......@@ -231,7 +231,7 @@ NTSTATUS WINAPI RtlGetProcessPreferredUILanguages( DWORD flags, ULONG *count, WC
{
LANGID ui_language;
FIXME( "%08x, %p, %p %p\n", flags, count, buffer, size );
FIXME( "%08lx, %p, %p %p\n", flags, count, buffer, size );
NtQueryDefaultUILanguage( &ui_language );
return get_dummy_preferred_ui_language( flags, ui_language, count, buffer, size );
......@@ -262,7 +262,7 @@ NTSTATUS WINAPI RtlGetThreadPreferredUILanguages( DWORD flags, ULONG *count, WCH
{
LANGID ui_language;
FIXME( "%08x, %p, %p %p\n", flags, count, buffer, size );
FIXME( "%08lx, %p, %p %p\n", flags, count, buffer, size );
NtQueryDefaultUILanguage( &ui_language );
return get_dummy_preferred_ui_language( flags, ui_language, count, buffer, size );
......@@ -291,7 +291,7 @@ NTSTATUS WINAPI RtlGetUserPreferredUILanguages( DWORD flags, ULONG unknown, ULON
*/
NTSTATUS WINAPI RtlSetProcessPreferredUILanguages( DWORD flags, PCZZWSTR buffer, ULONG *count )
{
FIXME( "%u, %p, %p\n", flags, buffer, count );
FIXME( "%lu, %p, %p\n", flags, buffer, count );
return STATUS_SUCCESS;
}
......@@ -301,7 +301,7 @@ NTSTATUS WINAPI RtlSetProcessPreferredUILanguages( DWORD flags, PCZZWSTR buffer,
*/
NTSTATUS WINAPI RtlSetThreadPreferredUILanguages( DWORD flags, PCZZWSTR buffer, ULONG *count )
{
FIXME( "%u, %p, %p\n", flags, buffer, count );
FIXME( "%lu, %p, %p\n", flags, buffer, count );
return STATUS_SUCCESS;
}
......@@ -907,7 +907,7 @@ NTSTATUS WINAPI RtlLcidToLocaleName( LCID lcid, UNICODE_STRING *str, ULONG flags
wcscpy( str->Buffer, name );
str->Length = len * sizeof(WCHAR);
TRACE( "%04x -> %s\n", lcid, debugstr_us(str) );
TRACE( "%04lx -> %s\n", lcid, debugstr_us(str) );
return STATUS_SUCCESS;
}
......@@ -924,7 +924,7 @@ NTSTATUS WINAPI RtlLocaleNameToLcid( const WCHAR *name, LCID *lcid, ULONG flags
if (!(flags & 2) && !get_locale_data( locale_table, entry->idx )->inotneutral)
return STATUS_INVALID_PARAMETER_1;
*lcid = entry->id;
TRACE( "%s -> %04x\n", debugstr_w(name), *lcid );
TRACE( "%s -> %04lx\n", debugstr_w(name), *lcid );
return STATUS_SUCCESS;
}
......@@ -1054,7 +1054,7 @@ NTSTATUS WINAPI RtlNormalizeString( ULONG form, const WCHAR *src, INT src_len, W
const struct norm_table *info;
NTSTATUS status = STATUS_SUCCESS;
TRACE( "%x %s %d %p %d\n", form, debugstr_wn(src, src_len), src_len, dst, *dst_len );
TRACE( "%lx %s %d %p %d\n", form, debugstr_wn(src, src_len), src_len, dst, *dst_len );
if ((status = load_norm_table( form, &info ))) return status;
......@@ -1149,7 +1149,7 @@ NTSTATUS WINAPI RtlIdnToAscii( DWORD flags, const WCHAR *src, INT srclen, WCHAR
unsigned int ch, buffer[64];
int i, len, start, end, out_label, out = 0, normlen = ARRAY_SIZE(normstr);
TRACE( "%x %s %p %d\n", flags, debugstr_wn(src, srclen), dst, *dstlen );
TRACE( "%lx %s %p %d\n", flags, debugstr_wn(src, srclen), dst, *dstlen );
if ((status = load_norm_table( 13, &info ))) return status;
......@@ -1258,7 +1258,7 @@ NTSTATUS WINAPI RtlIdnToNameprepUnicode( DWORD flags, const WCHAR *src, INT srcl
if (flags & ~(IDN_ALLOW_UNASSIGNED | IDN_USE_STD3_ASCII_RULES)) return STATUS_INVALID_PARAMETER;
if (!src || srclen < -1) return STATUS_INVALID_PARAMETER;
TRACE( "%x %s %p %d\n", flags, debugstr_wn(src, srclen), dst, *dstlen );
TRACE( "%lx %s %p %d\n", flags, debugstr_wn(src, srclen), dst, *dstlen );
if ((status = load_norm_table( 13, &info ))) return status;
......@@ -1331,7 +1331,7 @@ NTSTATUS WINAPI RtlIdnToUnicode( DWORD flags, const WCHAR *src, INT srclen, WCHA
if (!src || srclen < -1) return STATUS_INVALID_PARAMETER;
if (srclen == -1) srclen = wcslen( src ) + 1;
TRACE( "%x %s %p %d\n", flags, debugstr_wn(src, srclen), dst, *dstlen );
TRACE( "%lx %s %p %d\n", flags, debugstr_wn(src, srclen), dst, *dstlen );
if ((status = load_norm_table( 13, &info ))) return status;
......
dlls/ntdll/misc.c
View file @ 0adec25f
......@@ -244,7 +244,7 @@ NTSTATUS WINAPI WinSqmEndSession(HANDLE session)
*/
void WINAPI WinSqmIncrementDWORD(DWORD unk1, DWORD unk2, DWORD unk3)
{
FIXME("(%d, %d, %d): stub\n", unk1, unk2, unk3);
FIXME("(%ld, %ld, %ld): stub\n", unk1, unk2, unk3);
}
/*********************************************************************
......@@ -261,7 +261,7 @@ BOOL WINAPI WinSqmIsOptedIn(void)
*/
HANDLE WINAPI WinSqmStartSession(GUID *sessionguid, DWORD sessionid, DWORD unknown1)
{
FIXME("(%p, 0x%x, 0x%x): stub\n", sessionguid, sessionid, unknown1);
FIXME("(%p, 0x%lx, 0x%lx): stub\n", sessionguid, sessionid, unknown1);
return INVALID_HANDLE_VALUE;
}
......@@ -270,7 +270,7 @@ HANDLE WINAPI WinSqmStartSession(GUID *sessionguid, DWORD sessionid, DWORD unkno
*/
void WINAPI WinSqmSetDWORD(HANDLE session, DWORD datapoint_id, DWORD datapoint_value)
{
FIXME("(%p, %d, %d): stub\n", session, datapoint_id, datapoint_value);
FIXME("(%p, %ld, %ld): stub\n", session, datapoint_id, datapoint_value);
}
/******************************************************************************
......@@ -280,7 +280,7 @@ ULONG WINAPI EtwEventActivityIdControl(ULONG code, GUID *guid)
{
static int once;
if (!once++) FIXME("0x%x, %p: stub\n", code, guid);
if (!once++) FIXME("0x%lx, %p: stub\n", code, guid);
return ERROR_SUCCESS;
}
......@@ -322,7 +322,7 @@ ULONG WINAPI EtwEventUnregister( REGHANDLE handle )
ULONG WINAPI EtwEventSetInformation( REGHANDLE handle, EVENT_INFO_CLASS class, void *info,
ULONG length )
{
FIXME("(%s, %u, %p, %u) stub\n", wine_dbgstr_longlong(handle), class, info, length);
FIXME("(%s, %u, %p, %lu) stub\n", wine_dbgstr_longlong(handle), class, info, length);
return ERROR_SUCCESS;
}
......@@ -342,7 +342,7 @@ ULONG WINAPI EtwEventWriteString( REGHANDLE handle, UCHAR level, ULONGLONG keywo
ULONG WINAPI EtwEventWriteTransfer( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor, LPCGUID activity,
LPCGUID related, ULONG count, PEVENT_DATA_DESCRIPTOR data )
{
FIXME("%s, %p, %s, %s, %u, %p: stub\n", wine_dbgstr_longlong(handle), descriptor,
FIXME("%s, %p, %s, %s, %lu, %p: stub\n", wine_dbgstr_longlong(handle), descriptor,
debugstr_guid(activity), debugstr_guid(related), count, data);
return ERROR_SUCCESS;
}
......@@ -372,7 +372,7 @@ ULONG WINAPI EtwRegisterTraceGuidsW( WMIDPREQUEST RequestAddress,
TRACE_GUID_REGISTRATION *TraceGuidReg, const WCHAR *MofImagePath,
const WCHAR *MofResourceName, TRACEHANDLE *RegistrationHandle )
{
WARN("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext,
WARN("(%p, %p, %s, %lu, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext,
debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_w(MofImagePath),
debugstr_w(MofResourceName), RegistrationHandle);
......@@ -397,7 +397,7 @@ ULONG WINAPI EtwRegisterTraceGuidsA( WMIDPREQUEST RequestAddress,
TRACE_GUID_REGISTRATION *TraceGuidReg, const char *MofImagePath,
const char *MofResourceName, TRACEHANDLE *RegistrationHandle )
{
WARN("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext,
WARN("(%p, %p, %s, %lu, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext,
debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_a(MofImagePath),
debugstr_a(MofResourceName), RegistrationHandle);
return ERROR_SUCCESS;
......@@ -430,7 +430,7 @@ BOOLEAN WINAPI EtwEventEnabled( REGHANDLE handle, const EVENT_DESCRIPTOR *descri
ULONG WINAPI EtwEventWrite( REGHANDLE handle, const EVENT_DESCRIPTOR *descriptor, ULONG count,
EVENT_DATA_DESCRIPTOR *data )
{
FIXME("(%s, %p, %u, %p): stub\n", wine_dbgstr_longlong(handle), descriptor, count, data);
FIXME("(%s, %p, %lu, %p): stub\n", wine_dbgstr_longlong(handle), descriptor, count, data);
return ERROR_SUCCESS;
}
......@@ -476,7 +476,7 @@ ULONG WINAPI EtwLogTraceEvent( TRACEHANDLE SessionHandle, PEVENT_TRACE_HEADER Ev
ULONG WINAPI EtwTraceMessageVa( TRACEHANDLE handle, ULONG flags, LPGUID guid, USHORT number,
va_list args )
{
FIXME("(%s %x %s %d) : stub\n", wine_dbgstr_longlong(handle), flags, debugstr_guid(guid), number);
FIXME("(%s %lx %s %d) : stub\n", wine_dbgstr_longlong(handle), flags, debugstr_guid(guid), number);
return ERROR_SUCCESS;
}
......
dlls/ntdll/path.c
View file @ 0adec25f
......@@ -723,7 +723,7 @@ DWORD WINAPI RtlGetFullPathName_U(const WCHAR* name, ULONG size, WCHAR* buffer,
DWORD dosdev;
DWORD reqsize;
TRACE("(%s %u %p %p)\n", debugstr_w(name), size, buffer, file_part);
TRACE("(%s %lu %p %p)\n", debugstr_w(name), size, buffer, file_part);
if (!name || !*name) return 0;
......@@ -879,7 +879,7 @@ ULONG WINAPI RtlGetCurrentDirectory_U(ULONG buflen, LPWSTR buf)
UNICODE_STRING* us;
ULONG len;
TRACE("(%u %p)\n", buflen, buf);
TRACE("(%lu %p)\n", buflen, buf);
RtlAcquirePebLock();
......
dlls/ntdll/reg.c
View file @ 0adec25f
......@@ -229,7 +229,7 @@ NTSTATUS WINAPI RtlOpenCurrentUser(
UNICODE_STRING ObjectName;
NTSTATUS ret;
TRACE("(0x%08x, %p)\n",DesiredAccess, KeyHandle);
TRACE("(0x%08lx, %p)\n",DesiredAccess, KeyHandle);
if ((ret = RtlFormatCurrentUserKeyPath(&ObjectName))) return ret;
InitializeObjectAttributes(&ObjectAttributes,&ObjectName,OBJ_CASE_INSENSITIVE,0, NULL);
......@@ -475,7 +475,7 @@ NTSTATUS WINAPI RtlQueryRegistryValues(IN ULONG RelativeTo, IN PCWSTR Path,
NTSTATUS status=STATUS_SUCCESS, ret = STATUS_SUCCESS;
INT i;
TRACE("(%d, %s, %p, %p, %p)\n", RelativeTo, debugstr_w(Path), QueryTable, Context, Environment);
TRACE("(%ld, %s, %p, %p, %p)\n", RelativeTo, debugstr_w(Path), QueryTable, Context, Environment);
if(Path == NULL)
return STATUS_INVALID_PARAMETER;
......@@ -643,7 +643,7 @@ NTSTATUS WINAPI RtlCheckRegistryKey(IN ULONG RelativeTo, IN PWSTR Path)
HANDLE handle;
NTSTATUS status;
TRACE("(%d, %s)\n", RelativeTo, debugstr_w(Path));
TRACE("(%ld, %s)\n", RelativeTo, debugstr_w(Path));
if(!RelativeTo && (Path == NULL || Path[0] == 0))
return STATUS_OBJECT_PATH_SYNTAX_BAD;
......@@ -712,7 +712,7 @@ NTSTATUS WINAPI RtlDeleteRegistryValue(IN ULONG RelativeTo, IN PCWSTR Path, IN P
HANDLE handle;
UNICODE_STRING Value;
TRACE("(%d, %s, %s)\n", RelativeTo, debugstr_w(Path), debugstr_w(ValueName));
TRACE("(%ld, %s, %s)\n", RelativeTo, debugstr_w(Path), debugstr_w(ValueName));
RtlInitUnicodeString(&Value, ValueName);
if(RelativeTo == RTL_REGISTRY_HANDLE)
......@@ -750,7 +750,7 @@ NTSTATUS WINAPI RtlWriteRegistryValue( ULONG RelativeTo, PCWSTR path, PCWSTR nam
NTSTATUS status;
UNICODE_STRING str;
TRACE( "(%d, %s, %s) -> %d: %p [%d]\n", RelativeTo, debugstr_w(path), debugstr_w(name),
TRACE( "(%ld, %s, %s) -> %ld: %p [%ld]\n", RelativeTo, debugstr_w(path), debugstr_w(name),
type, data, length );
RtlInitUnicodeString( &str, name );
......
dlls/ntdll/relay.c
View file @ 0adec25f
......@@ -324,11 +324,11 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi
switch (arg_types[i])
{
case 'j': /* int64 */
TRACE( "%x%08x", stack[pos+1], stack[pos] );
TRACE( "%lx%08lx", stack[pos+1], stack[pos] );
pos += 2;
break;
case 'k': /* int128 */
TRACE( "{%08x,%08x,%08x,%08x}", stack[pos], stack[pos+1], stack[pos+2], stack[pos+3] );
TRACE( "{%08lx,%08lx,%08lx,%08lx}", stack[pos], stack[pos+1], stack[pos+2], stack[pos+3] );
pos += 4;
break;
case 's': /* str */
......@@ -346,7 +346,7 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi
break;
case 'i': /* long */
default:
TRACE( "%08x", stack[pos++] );
TRACE( "%08lx", stack[pos++] );
break;
}
if (!is_ret_val( arg_types[i+1] )) TRACE( "," );
......@@ -357,7 +357,7 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi
*nb_args |= 0x80000000; /* thiscall/fastcall */
if (arg_types[1] == 't') *nb_args |= 0x40000000; /* fastcall */
}
TRACE( ") ret=%08x\n", stack[-1] );
TRACE( ") ret=%08lx\n", stack[-1] );
return entry_point->orig_func;
}
......@@ -624,13 +624,13 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi
break;
case 'i': /* long */
default:
TRACE( "%08zx", stack[i] );
TRACE( "%08Ix", stack[i] );
break;
}
if (!is_ret_val( arg_types[i + 1] )) TRACE( "," );
}
*nb_args = i;
TRACE( ") ret=%08zx\n", stack[-1] );
TRACE( ") ret=%08Ix\n", stack[-1] );
return entry_point->orig_func;
}
......@@ -640,7 +640,7 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi
DECLSPEC_HIDDEN void WINAPI relay_trace_exit( struct relay_descr *descr, unsigned int idx,
INT_PTR retaddr, INT_PTR retval )
{
TRACE( "\1Ret %s() retval=%08zx ret=%08zx\n",
TRACE( "\1Ret %s() retval=%08Ix ret=%08Ix\n",
func_name( descr->private, LOWORD(idx) ), retval, retaddr );
}
......@@ -730,13 +730,13 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi
break;
case 'i': /* long */
default:
TRACE( "%08zx", stack[i] );
TRACE( "%08Ix", stack[i] );
break;
}
if (!is_ret_val( arg_types[i+1] )) TRACE( "," );
}
*nb_args = i;
TRACE( ") ret=%08zx\n", stack[-1] );
TRACE( ") ret=%08Ix\n", stack[-1] );
return entry_point->orig_func;
}
......@@ -746,7 +746,7 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi
DECLSPEC_HIDDEN void WINAPI relay_trace_exit( struct relay_descr *descr, unsigned int idx,
INT_PTR retaddr, INT_PTR retval )
{
TRACE( "\1Ret %s() retval=%08zx ret=%08zx\n",
TRACE( "\1Ret %s() retval=%08Ix ret=%08Ix\n",
func_name( descr->private, LOWORD(idx) ), retval, retaddr );
}
......@@ -1157,7 +1157,7 @@ static void SNOOP_PrintArg(DWORD x)
{
int i,nostring;
TRACE_(snoop)("%08x",x);
TRACE_(snoop)("%08lx",x);
if (IS_INTARG(x) || TRACE_ON(seh)) return; /* trivial reject to avoid faults */
__TRY
{
......@@ -1255,7 +1255,7 @@ void WINAPI DECLSPEC_HIDDEN __regs_SNOOP_Entry( void **stack )
if (!TRACE_ON(snoop)) return;
if (fun->name) TRACE_(snoop)("\1CALL %s.%s(", dll->name, fun->name);
else TRACE_(snoop)("\1CALL %s.%d(", dll->name, dll->ordbase+ret->ordinal);
else TRACE_(snoop)("\1CALL %s.%ld(", dll->name, dll->ordbase+ret->ordinal);
if (fun->nrofargs>0) {
max = fun->nrofargs; if (max>16) max=16;
for (i=0;i<max;i++)
......@@ -1271,7 +1271,7 @@ void WINAPI DECLSPEC_HIDDEN __regs_SNOOP_Entry( void **stack )
0,16*sizeof(DWORD));
memcpy(ret->args, stack + 2, sizeof(DWORD)*16);
}
TRACE_(snoop)(") ret=%08x\n",(DWORD)ret->origreturn);
TRACE_(snoop)(") ret=%08lx\n",(DWORD)ret->origreturn);
}
void WINAPI DECLSPEC_HIDDEN __regs_SNOOP_Return( void **stack )
......@@ -1300,7 +1300,7 @@ void WINAPI DECLSPEC_HIDDEN __regs_SNOOP_Return( void **stack )
if (fun->name)
TRACE_(snoop)("\1RET %s.%s(", ret->dll->name, fun->name);
else
TRACE_(snoop)("\1RET %s.%d(", ret->dll->name, ret->dll->ordbase+ret->ordinal);
TRACE_(snoop)("\1RET %s.%ld(", ret->dll->name, ret->dll->ordbase+ret->ordinal);
max = fun->nrofargs;
if (max>16) max=16;
......@@ -1310,17 +1310,17 @@ void WINAPI DECLSPEC_HIDDEN __regs_SNOOP_Return( void **stack )
SNOOP_PrintArg(ret->args[i]);
if (i<max-1) TRACE_(snoop)(",");
}
TRACE_(snoop)(") retval=%08x ret=%08x\n", retval, (DWORD)ret->origreturn );
TRACE_(snoop)(") retval=%08lx ret=%08lx\n", retval, (DWORD)ret->origreturn );
RtlFreeHeap(GetProcessHeap(),0,ret->args);
ret->args = NULL;
}
else
{
if (fun->name)
TRACE_(snoop)("\1RET %s.%s() retval=%08x ret=%08x\n",
TRACE_(snoop)("\1RET %s.%s() retval=%08lx ret=%08lx\n",
ret->dll->name, fun->name, retval, (DWORD)ret->origreturn);
else
TRACE_(snoop)("\1RET %s.%d() retval=%08x ret=%08x\n",
TRACE_(snoop)("\1RET %s.%ld() retval=%08lx ret=%08lx\n",
ret->dll->name,ret->dll->ordbase+ret->ordinal,
retval, (DWORD)ret->origreturn);
}
......
dlls/ntdll/resource.c
View file @ 0adec25f
......@@ -264,7 +264,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrFindResourceDirectory_U( HMODULE hmod, cons
__TRY
{
if (info) TRACE( "module %p type %s name %s lang %04x level %d\n",
if (info) TRACE( "module %p type %s name %s lang %04lx level %ld\n",
hmod, debugstr_w((LPCWSTR)info->Type),
level > 1 ? debugstr_w((LPCWSTR)info->Name) : "",
level > 2 ? info->Language : 0, level );
......@@ -292,7 +292,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrFindResource_U( HMODULE hmod, const LDR_RES
__TRY
{
if (info) TRACE( "module %p type %s name %s lang %04x level %d\n",
if (info) TRACE( "module %p type %s name %s lang %04lx level %ld\n",
hmod, debugstr_w((LPCWSTR)info->Type),
level > 1 ? debugstr_w((LPCWSTR)info->Name) : "",
level > 2 ? info->Language : 0, level );
......
dlls/ntdll/rtl.c
View file @ 0adec25f
......@@ -355,7 +355,7 @@ NTSTATUS WINAPI vDbgPrintExWithPrefix( LPCSTR prefix, ULONG id, ULONG level, LPC
len += _vsnprintf( buf + len, sizeof(buf) - len, fmt, args );
end = buf + len - 1;
WARN_(debugstr)(*end == '\n' ? "%08x:%08x: %s" : "%08x:%08x: %s\n", id, level_mask, buf);
WARN_(debugstr)(*end == '\n' ? "%08lx:%08lx: %s" : "%08lx:%08lx: %s\n", id, level_mask, buf);
if (level_mask & (1 << DPFLTR_ERROR_LEVEL) && NtCurrentTeb()->Peb->BeingDebugged)
{
......@@ -443,7 +443,7 @@ ULONG WINAPI RtlNumberGenericTableElements(RTL_GENERIC_TABLE *table)
*/
void * WINAPI RtlGetElementGenericTable(RTL_GENERIC_TABLE *table, ULONG index)
{
FIXME("(%p, %u) stub!\n", table, index);
FIXME("(%p, %lu) stub!\n", table, index);
return NULL;
}
......@@ -575,7 +575,7 @@ void WINAPI RtlCopyMemory(void *dest, const void *src, SIZE_T len)
*/
void WINAPI RtlAssert(void *assertion, void *filename, ULONG linenumber, char *message)
{
FIXME("(%s, %s, %u, %s): stub\n", debugstr_a((char*)assertion), debugstr_a((char*)filename),
FIXME("(%s, %s, %lu, %s): stub\n", debugstr_a((char*)assertion), debugstr_a((char*)filename),
linenumber, debugstr_a(message));
}
......@@ -594,7 +594,7 @@ void WINAPI RtlAssert(void *assertion, void *filename, ULONG linenumber, char *m
*/
VOID WINAPI RtlFillMemoryUlong(ULONG* lpDest, ULONG ulCount, ULONG ulValue)
{
TRACE("(%p,%d,%d)\n", lpDest, ulCount, ulValue);
TRACE("(%p,%lu,%lu)\n", lpDest, ulCount, ulValue);
ulCount /= sizeof(ULONG);
while(ulCount--)
......@@ -618,7 +618,7 @@ DWORD WINAPI RtlComputeCrc32(DWORD dwInitial, const BYTE *pData, INT iLen)
{
DWORD crc = ~dwInitial;
TRACE("(%d,%p,%d)\n", dwInitial, pData, iLen);
TRACE("(%lu,%p,%d)\n", dwInitial, pData, iLen);
while (iLen > 0)
{
......@@ -1323,7 +1323,7 @@ NTSTATUS WINAPI RtlIpv4AddressToStringExW(const IN_ADDR *pin, USHORT port, LPWST
if (!pin || !buffer || !psize)
return STATUS_INVALID_PARAMETER;
TRACE("(%p:0x%x, %d, %p, %p:%d)\n", pin, pin->S_un.S_addr, port, buffer, psize, *psize);
TRACE("(%p:0x%lx, %d, %p, %p:%ld)\n", pin, pin->S_un.S_addr, port, buffer, psize, *psize);
needed = swprintf(tmp_ip, ARRAY_SIZE(tmp_ip), L"%u.%u.%u.%u",
pin->S_un.S_un_b.s_b1, pin->S_un.S_un_b.s_b2,
......@@ -1356,7 +1356,7 @@ NTSTATUS WINAPI RtlIpv4AddressToStringExA(const IN_ADDR *pin, USHORT port, LPSTR
if (!pin || !buffer || !psize)
return STATUS_INVALID_PARAMETER;
TRACE("(%p:0x%x, %d, %p, %p:%d)\n", pin, pin->S_un.S_addr, port, buffer, psize, *psize);
TRACE("(%p:0x%lx, %d, %p, %p:%ld)\n", pin, pin->S_un.S_addr, port, buffer, psize, *psize);
needed = sprintf(tmp_ip, "%u.%u.%u.%u",
pin->S_un.S_un_b.s_b1, pin->S_un.S_un_b.s_b2,
......@@ -1437,7 +1437,7 @@ NTSTATUS WINAPI RtlIpv6AddressToStringExA(const IN6_ADDR *address, ULONG scope,
ULONG needed;
NTSTATUS ret;
TRACE("(%p %u %u %p %p)\n", address, scope, port, str, size);
TRACE("(%p %lu %u %p %p)\n", address, scope, port, str, size);
if (!address || !str || !size)
return STATUS_INVALID_PARAMETER;
......@@ -1483,7 +1483,7 @@ NTSTATUS WINAPI RtlIpv6AddressToStringExA(const IN6_ADDR *address, ULONG scope,
p = RtlIpv4AddressToStringA((IN_ADDR *)(address->s6_words + 6), p);
}
if (scope) p += sprintf(p, "%%%u", scope);
if (scope) p += sprintf(p, "%%%lu", scope);
if (port) p += sprintf(p, "]:%u", ntohs(port));
......@@ -1837,7 +1837,7 @@ NTSTATUS WINAPI RtlCompressBuffer(USHORT format, PUCHAR uncompressed, ULONG unco
PUCHAR compressed, ULONG compressed_size, ULONG chunk_size,
PULONG final_size, PVOID workspace)
{
FIXME("0x%04x, %p, %u, %p, %u, %u, %p, %p: semi-stub\n", format, uncompressed,
FIXME("0x%04x, %p, %lu, %p, %lu, %lu, %p, %p: semi-stub\n", format, uncompressed,
uncompressed_size, compressed, compressed_size, chunk_size, final_size, workspace);
switch (format & ~COMPRESSION_ENGINE_MAXIMUM)
......@@ -2040,7 +2040,7 @@ NTSTATUS WINAPI RtlDecompressFragment(USHORT format, PUCHAR uncompressed, ULONG
PUCHAR compressed, ULONG compressed_size, ULONG offset,
PULONG final_size, PVOID workspace)
{
TRACE("0x%04x, %p, %u, %p, %u, %u, %p, %p\n", format, uncompressed,
TRACE("0x%04x, %p, %lu, %p, %lu, %lu, %p, %p\n", format, uncompressed,
uncompressed_size, compressed, compressed_size, offset, final_size, workspace);
switch (format & ~COMPRESSION_ENGINE_MAXIMUM)
......@@ -2066,7 +2066,7 @@ NTSTATUS WINAPI RtlDecompressFragment(USHORT format, PUCHAR uncompressed, ULONG
NTSTATUS WINAPI RtlDecompressBuffer(USHORT format, PUCHAR uncompressed, ULONG uncompressed_size,
PUCHAR compressed, ULONG compressed_size, PULONG final_size)
{
TRACE("0x%04x, %p, %u, %p, %u, %p\n", format, uncompressed,
TRACE("0x%04x, %p, %lu, %p, %lu, %p\n", format, uncompressed,
uncompressed_size, compressed, compressed_size, final_size);
return RtlDecompressFragment(format, uncompressed, uncompressed_size,
......@@ -2165,7 +2165,7 @@ void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE table, PRTL_AVL_COMPARE_
*/
void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE table, void *buffer, ULONG size, BOOL *element)
{
FIXME("%p %p %u %p: stub\n", table, buffer, size, element);
FIXME("%p %p %lu %p: stub\n", table, buffer, size, element);
}
/*********************************************************************
......
dlls/ntdll/rtlbitmap.c
View file @ 0adec25f
......@@ -74,7 +74,7 @@ static const signed char NTDLL_mostSignificant[16] = {
*/
VOID WINAPI RtlInitializeBitMap(PRTL_BITMAP lpBits, PULONG lpBuff, ULONG ulSize)
{
TRACE("(%p,%p,%u)\n", lpBits,lpBuff,ulSize);
TRACE("(%p,%p,%lu)\n", lpBits,lpBuff,ulSize);
lpBits->SizeOfBitMap = ulSize;
lpBits->Buffer = lpBuff;
}
......@@ -130,7 +130,7 @@ VOID WINAPI RtlSetBits(PRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount)
{
LPBYTE lpOut;
TRACE("(%p,%u,%u)\n", lpBits, ulStart, ulCount);
TRACE("(%p,%lu,%lu)\n", lpBits, ulStart, ulCount);
if (!lpBits || !ulCount ||
ulStart >= lpBits->SizeOfBitMap ||
......@@ -191,7 +191,7 @@ VOID WINAPI RtlClearBits(PRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount)
{
LPBYTE lpOut;
TRACE("(%p,%u,%u)\n", lpBits, ulStart, ulCount);
TRACE("(%p,%lu,%lu)\n", lpBits, ulStart, ulCount);
if (!lpBits || !ulCount ||
ulStart >= lpBits->SizeOfBitMap ||
......@@ -254,7 +254,7 @@ BOOLEAN WINAPI RtlAreBitsSet(PCRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount)
LPBYTE lpOut;
ULONG ulRemainder;
TRACE("(%p,%u,%u)\n", lpBits, ulStart, ulCount);
TRACE("(%p,%lu,%lu)\n", lpBits, ulStart, ulCount);
if (!lpBits || !ulCount ||
ulStart >= lpBits->SizeOfBitMap ||
......@@ -327,7 +327,7 @@ BOOLEAN WINAPI RtlAreBitsClear(PCRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount
LPBYTE lpOut;
ULONG ulRemainder;
TRACE("(%p,%u,%u)\n", lpBits, ulStart, ulCount);
TRACE("(%p,%lu,%lu)\n", lpBits, ulStart, ulCount);
if (!lpBits || !ulCount ||
ulStart >= lpBits->SizeOfBitMap ||
......@@ -395,7 +395,7 @@ ULONG WINAPI RtlFindSetBits(PCRTL_BITMAP lpBits, ULONG ulCount, ULONG ulHint)
{
ULONG ulPos, ulEnd;
TRACE("(%p,%u,%u)\n", lpBits, ulCount, ulHint);
TRACE("(%p,%lu,%lu)\n", lpBits, ulCount, ulHint);
if (!lpBits || !ulCount || ulCount > lpBits->SizeOfBitMap)
return ~0U;
......@@ -442,7 +442,7 @@ ULONG WINAPI RtlFindClearBits(PCRTL_BITMAP lpBits, ULONG ulCount, ULONG ulHint)
{
ULONG ulPos, ulEnd;
TRACE("(%p,%u,%u)\n", lpBits, ulCount, ulHint);
TRACE("(%p,%lu,%lu)\n", lpBits, ulCount, ulHint);
if (!lpBits || !ulCount || ulCount > lpBits->SizeOfBitMap)
return ~0U;
......@@ -489,7 +489,7 @@ ULONG WINAPI RtlFindSetBitsAndClear(PRTL_BITMAP lpBits, ULONG ulCount, ULONG ulH
{
ULONG ulPos;
TRACE("(%p,%u,%u)\n", lpBits, ulCount, ulHint);
TRACE("(%p,%lu,%lu)\n", lpBits, ulCount, ulHint);
ulPos = RtlFindSetBits(lpBits, ulCount, ulHint);
if (ulPos != ~0U)
......@@ -514,7 +514,7 @@ ULONG WINAPI RtlFindClearBitsAndSet(PRTL_BITMAP lpBits, ULONG ulCount, ULONG ulH
{
ULONG ulPos;
TRACE("(%p,%u,%u)\n", lpBits, ulCount, ulHint);
TRACE("(%p,%lu,%lu)\n", lpBits, ulCount, ulHint);
ulPos = RtlFindClearBits(lpBits, ulCount, ulHint);
if (ulPos != ~0U)
......@@ -882,7 +882,7 @@ ULONG WINAPI RtlFindNextForwardRunSet(PCRTL_BITMAP lpBits, ULONG ulStart, PULONG
{
ULONG ulSize = 0;
TRACE("(%p,%u,%p)\n", lpBits, ulStart, lpPos);
TRACE("(%p,%lu,%p)\n", lpBits, ulStart, lpPos);
if (lpBits && ulStart < lpBits->SizeOfBitMap && lpPos)
*lpPos = NTDLL_FindSetRun(lpBits, ulStart, &ulSize);
......@@ -909,7 +909,7 @@ ULONG WINAPI RtlFindNextForwardRunClear(PCRTL_BITMAP lpBits, ULONG ulStart, PULO
{
ULONG ulSize = 0;
TRACE("(%p,%u,%p)\n", lpBits, ulStart, lpPos);
TRACE("(%p,%lu,%p)\n", lpBits, ulStart, lpPos);
if (lpBits && ulStart < lpBits->SizeOfBitMap && lpPos)
*lpPos = NTDLL_FindClearRun(lpBits, ulStart, &ulSize);
......@@ -934,7 +934,7 @@ ULONG WINAPI RtlFindNextForwardRunClear(PCRTL_BITMAP lpBits, ULONG ulStart, PULO
*/
ULONG WINAPI RtlFindLastBackwardRunSet(PCRTL_BITMAP lpBits, ULONG ulStart, PULONG lpPos)
{
FIXME("(%p,%u,%p)-stub!\n", lpBits, ulStart, lpPos);
FIXME("(%p,%lu,%p)-stub!\n", lpBits, ulStart, lpPos);
return 0;
}
......@@ -955,7 +955,7 @@ ULONG WINAPI RtlFindLastBackwardRunSet(PCRTL_BITMAP lpBits, ULONG ulStart, PULON
*/
ULONG WINAPI RtlFindLastBackwardRunClear(PCRTL_BITMAP lpBits, ULONG ulStart, PULONG lpPos)
{
FIXME("(%p,%u,%p)-stub!\n", lpBits, ulStart, lpPos);
FIXME("(%p,%lu,%p)-stub!\n", lpBits, ulStart, lpPos);
return 0;
}
......@@ -971,7 +971,7 @@ static ULONG NTDLL_FindRuns(PCRTL_BITMAP lpBits, PRTL_BITMAP_RUN lpSeries,
BOOL bNeedSort = ulCount > 1;
ULONG ulPos = 0, ulRuns = 0;
TRACE("(%p,%p,%d,%d)\n", lpBits, lpSeries, ulCount, bLongest);
TRACE("(%p,%p,%ld,%d)\n", lpBits, lpSeries, ulCount, bLongest);
if (!ulCount)
return ~0U;
......@@ -1033,7 +1033,7 @@ static ULONG NTDLL_FindRuns(PCRTL_BITMAP lpBits, PRTL_BITMAP_RUN lpSeries,
ULONG WINAPI RtlFindSetRuns(PCRTL_BITMAP lpBits, PRTL_BITMAP_RUN lpSeries,
ULONG ulCount, BOOLEAN bLongest)
{
TRACE("(%p,%p,%u,%d)\n", lpBits, lpSeries, ulCount, bLongest);
TRACE("(%p,%p,%lu,%d)\n", lpBits, lpSeries, ulCount, bLongest);
return NTDLL_FindRuns(lpBits, lpSeries, ulCount, bLongest, NTDLL_FindSetRun);
}
......@@ -1055,7 +1055,7 @@ ULONG WINAPI RtlFindSetRuns(PCRTL_BITMAP lpBits, PRTL_BITMAP_RUN lpSeries,
ULONG WINAPI RtlFindClearRuns(PCRTL_BITMAP lpBits, PRTL_BITMAP_RUN lpSeries,
ULONG ulCount, BOOLEAN bLongest)
{
TRACE("(%p,%p,%u,%d)\n", lpBits, lpSeries, ulCount, bLongest);
TRACE("(%p,%p,%lu,%d)\n", lpBits, lpSeries, ulCount, bLongest);
return NTDLL_FindRuns(lpBits, lpSeries, ulCount, bLongest, NTDLL_FindClearRun);
}
......
dlls/ntdll/rtlstr.c
View file @ 0adec25f
......@@ -1835,7 +1835,7 @@ NTSTATUS WINAPI RtlFormatMessageEx( const WCHAR *src, ULONG width, BOOLEAN ignor
WCHAR *line = buffer; /* start of last line */
WCHAR *space = NULL; /* last space */
if (flags) FIXME( "%s unknown flags %x\n", debugstr_w(src), flags );
if (flags) FIXME( "%s unknown flags %lx\n", debugstr_w(src), flags );
args_data.last = 0;
args_data.array = is_array ? (ULONG_PTR *)args : NULL;
......
dlls/ntdll/sec.c
View file @ 0adec25f
......@@ -155,7 +155,7 @@ NTSTATUS WINAPI RtlAllocateAndInitializeSid (
{
SID *tmp_sid;
TRACE("(%p, 0x%04x,0x%08x,0x%08x,0x%08x,0x%08x,0x%08x,0x%08x,0x%08x,0x%08x,%p)\n",
TRACE("(%p, 0x%04x,0x%08lx,0x%08lx,0x%08lx,0x%08lx,0x%08lx,0x%08lx,0x%08lx,0x%08lx,%p)\n",
pIdentifierAuthority,nSubAuthorityCount,
nSubAuthority0, nSubAuthority1, nSubAuthority2, nSubAuthority3,
nSubAuthority4, nSubAuthority5, nSubAuthority6, nSubAuthority7, pSid);
......@@ -572,7 +572,7 @@ NTSTATUS WINAPI RtlValidSecurityDescriptor(
BOOLEAN WINAPI RtlValidRelativeSecurityDescriptor(PSECURITY_DESCRIPTOR descriptor,
ULONG length, SECURITY_INFORMATION info)
{
FIXME("%p,%u,%d: semi-stub\n", descriptor, length, info);
FIXME("%p,%lu,%ld: semi-stub\n", descriptor, length, info);
return RtlValidSecurityDescriptor(descriptor) == STATUS_SUCCESS;
}
......@@ -862,7 +862,7 @@ NTSTATUS WINAPI RtlMakeSelfRelativeSD(
SECURITY_DESCRIPTOR* pAbs = pAbsoluteSecurityDescriptor;
SECURITY_DESCRIPTOR_RELATIVE *pRel = pSelfRelativeSecurityDescriptor;
TRACE(" %p %p %p(%d)\n", pAbs, pRel, lpdwBufferLength,
TRACE(" %p %p %p(%ld)\n", pAbs, pRel, lpdwBufferLength,
lpdwBufferLength ? *lpdwBufferLength: -1);
if (!lpdwBufferLength || !pAbs)
......@@ -1140,7 +1140,7 @@ NTSTATUS WINAPI RtlNewSecurityObjectEx(PSECURITY_DESCRIPTOR parent, PSECURITY_DE
NTSTATUS status;
BYTE *buffer;
FIXME("%p, %p, %p, %p, %d, %#x, %p %p - semi-stub\n", parent, creator, descr, type, is_container, flags, token, mapping);
FIXME("%p, %p, %p, %p, %d, %#lx, %p %p - semi-stub\n", parent, creator, descr, type, is_container, flags, token, mapping);
needed = sizeof(SECURITY_DESCRIPTOR_RELATIVE);
needed += sizeof(world_sid);
......@@ -1210,7 +1210,7 @@ NTSTATUS WINAPI RtlDeleteSecurityObject( PSECURITY_DESCRIPTOR *descr )
*/
NTSTATUS WINAPI RtlCreateAcl(PACL acl,DWORD size,DWORD rev)
{
TRACE("%p 0x%08x 0x%08x\n", acl, size, rev);
TRACE("%p 0x%08lx 0x%08lx\n", acl, size, rev);
if (rev < MIN_ACL_REVISION || rev > MAX_ACL_REVISION)
return STATUS_INVALID_PARAMETER;
......@@ -1314,7 +1314,7 @@ NTSTATUS WINAPI RtlDeleteAce(PACL pAcl, DWORD dwAceIndex)
pAcl->AceCount--;
}
TRACE("pAcl=%p dwAceIndex=%d status=0x%08x\n", pAcl, dwAceIndex, status);
TRACE("pAcl=%p dwAceIndex=%ld status=0x%08lx\n", pAcl, dwAceIndex, status);
return status;
}
......@@ -1341,7 +1341,7 @@ NTSTATUS WINAPI RtlAddAccessAllowedAceEx(
IN DWORD AccessMask,
IN PSID pSid)
{
TRACE("(%p,0x%08x,0x%08x,%p)\n", pAcl, dwAceRevision, AccessMask, pSid);
TRACE("(%p,0x%08lx,0x%08lx,%p)\n", pAcl, dwAceRevision, AccessMask, pSid);
return add_access_ace(pAcl, dwAceRevision, AceFlags,
AccessMask, pSid, ACCESS_ALLOWED_ACE_TYPE);
......@@ -1359,7 +1359,7 @@ NTSTATUS WINAPI RtlAddAccessAllowedObjectAce(
IN GUID* pInheritedObjectTypeGuid,
IN PSID pSid)
{
FIXME("%p %x %x %x %p %p %p - stub\n", pAcl, dwAceRevision, dwAceFlags, dwAccessMask,
FIXME("%p %lx %lx %lx %p %p %p - stub\n", pAcl, dwAceRevision, dwAceFlags, dwAccessMask,
pObjectTypeGuid, pInheritedObjectTypeGuid, pSid);
return STATUS_NOT_IMPLEMENTED;
}
......@@ -1386,7 +1386,7 @@ NTSTATUS WINAPI RtlAddAccessDeniedAceEx(
IN DWORD AccessMask,
IN PSID pSid)
{
TRACE("(%p,0x%08x,0x%08x,%p)\n", pAcl, dwAceRevision, AccessMask, pSid);
TRACE("(%p,0x%08lx,0x%08lx,%p)\n", pAcl, dwAceRevision, AccessMask, pSid);
return add_access_ace(pAcl, dwAceRevision, AceFlags,
AccessMask, pSid, ACCESS_DENIED_ACE_TYPE);
......@@ -1404,7 +1404,7 @@ NTSTATUS WINAPI RtlAddAccessDeniedObjectAce(
IN GUID* pInheritedObjectTypeGuid,
IN PSID pSid)
{
FIXME("%p %x %x %x %p %p %p - stub\n", pAcl, dwAceRevision, dwAceFlags, dwAccessMask,
FIXME("%p %lx %lx %lx %p %p %p - stub\n", pAcl, dwAceRevision, dwAceFlags, dwAccessMask,
pObjectTypeGuid, pInheritedObjectTypeGuid, pSid);
return STATUS_NOT_IMPLEMENTED;
}
......@@ -1421,7 +1421,7 @@ NTSTATUS WINAPI RtlAddAuditAccessAceEx(
IN BOOL bAuditSuccess,
IN BOOL bAuditFailure)
{
TRACE("(%p,%d,0x%08x,0x%08x,%p,%u,%u)\n",pAcl,dwAceRevision,dwAceFlags,dwAccessMask,
TRACE("(%p,%ld,0x%08lx,0x%08lx,%p,%u,%u)\n",pAcl,dwAceRevision,dwAceFlags,dwAccessMask,
pSid,bAuditSuccess,bAuditFailure);
if (bAuditSuccess)
......@@ -1462,7 +1462,7 @@ NTSTATUS WINAPI RtlAddAuditAccessObjectAce(
IN BOOL bAuditSuccess,
IN BOOL bAuditFailure)
{
FIXME("%p %x %x %x %p %p %p %d %d - stub\n", pAcl, dwAceRevision, dwAceFlags, dwAccessMask,
FIXME("%p %lx %lx %lx %p %p %p %d %d - stub\n", pAcl, dwAceRevision, dwAceFlags, dwAccessMask,
pObjectTypeGuid, pInheritedObjectTypeGuid, pSid, bAuditSuccess, bAuditFailure);
return STATUS_NOT_IMPLEMENTED;
}
......@@ -1482,8 +1482,8 @@ NTSTATUS WINAPI RtlAddMandatoryAce(
SYSTEM_MANDATORY_LABEL_NO_READ_UP |
SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP;
TRACE("(%p, %u, 0x%08x, 0x%08x, %u, %p)\n", pAcl, dwAceRevision, dwAceFlags,
dwMandatoryFlags, dwAceType, pSid);
TRACE("(%p, %lu, 0x%08lx, 0x%08lx, %lu, %p)\n",
pAcl, dwAceRevision, dwAceFlags, dwMandatoryFlags, dwAceType, pSid);
if (dwAceType != SYSTEM_MANDATORY_LABEL_ACE_TYPE)
return STATUS_INVALID_PARAMETER;
......@@ -1542,7 +1542,7 @@ NTSTATUS WINAPI RtlGetAce(PACL pAcl,DWORD dwAceIndex,LPVOID *pAce )
{
PACE_HEADER ace;
TRACE("(%p,%d,%p)\n",pAcl,dwAceIndex,pAce);
TRACE("(%p,%ld,%p)\n",pAcl,dwAceIndex,pAce);
if (dwAceIndex >= pAcl->AceCount)
return STATUS_INVALID_PARAMETER;
......@@ -1591,7 +1591,7 @@ RtlAdjustPrivilege(ULONG Privilege,
HANDLE TokenHandle;
NTSTATUS Status;
TRACE("(%d, %s, %s, %p)\n", Privilege, Enable ? "TRUE" : "FALSE",
TRACE("(%ld, %s, %s, %p)\n", Privilege, Enable ? "TRUE" : "FALSE",
CurrentThread ? "TRUE" : "FALSE", Enabled);
if (CurrentThread)
......@@ -1610,7 +1610,7 @@ RtlAdjustPrivilege(ULONG Privilege,
if (Status)
{
WARN("Retrieving token handle failed (Status %x)\n", Status);
WARN("Retrieving token handle failed (Status %lx)\n", Status);
return Status;
}
......@@ -1635,7 +1635,7 @@ RtlAdjustPrivilege(ULONG Privilege,
}
if (Status)
{
WARN("NtAdjustPrivilegesToken() failed (Status %x)\n", Status);
WARN("NtAdjustPrivilegesToken() failed (Status %lx)\n", Status);
return Status;
}
......@@ -1755,7 +1755,7 @@ NTSTATUS WINAPI RtlQueryInformationAcl(
{
NTSTATUS status = STATUS_SUCCESS;
TRACE("pAcl=%p pAclInfo=%p len=%d, class=%d\n",
TRACE("pAcl=%p pAclInfo=%p len=%ld, class=%d\n",
pAcl, pAclInformation, nAclInformationLength, dwAclInformationClass);
switch (dwAclInformationClass)
......@@ -1784,7 +1784,7 @@ NTSTATUS WINAPI RtlQueryInformationAcl(
paclsize->AclBytesInUse = acl_bytesInUse(pAcl);
if (pAcl->AclSize < paclsize->AclBytesInUse)
{
WARN("Acl uses %d bytes, but only has %d allocated! Returning smaller of the two values.\n", pAcl->AclSize, paclsize->AclBytesInUse);
WARN("Acl uses %d bytes, but only has %ld allocated! Returning smaller of the two values.\n", pAcl->AclSize, paclsize->AclBytesInUse);
paclsize->AclBytesFree = 0;
paclsize->AclBytesInUse = pAcl->AclSize;
}
......
dlls/ntdll/signal_arm64.c
View file @ 0adec25f
......@@ -217,7 +217,7 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX
{
status = context->Pc != context->u.s.Lr ?
STATUS_SUCCESS : STATUS_INVALID_DISPOSITION;
WARN( "exception data not found in %s for %p, LR %p, status %x\n",
WARN( "exception data not found in %s for %p, LR %p, status %lx\n",
debugstr_w(module->BaseDllName.Buffer), (void*) context->Pc,
(void*) context->u.s.Lr, status );
dispatch->EstablisherFrame = context->Sp;
......@@ -283,7 +283,7 @@ static DWORD call_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dis
TRACE( "calling handler %p (rec=%p, frame=%I64x context=%p, dispatch=%p)\n",
dispatch->LanguageHandler, rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch );
res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch );
TRACE( "handler %p returned %x\n", dispatch->LanguageHandler, res );
TRACE( "handler %p returned %lx\n", dispatch->LanguageHandler, res );
__wine_pop_frame( &frame.frame );
......@@ -314,7 +314,7 @@ static DWORD call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT
TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n",
teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, dispatch );
res = teb_frame->Handler( rec, teb_frame, dispatch->ContextRecord, (EXCEPTION_REGISTRATION_RECORD**)dispatch );
TRACE( "handler at %p returned %u\n", teb_frame->Handler, res );
TRACE( "handler at %p returned %lu\n", teb_frame->Handler, res );
switch (res)
{
......@@ -357,7 +357,7 @@ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_C
TRACE( "calling handler %p (rec=%p, frame=%I64x context=%p, dispatch=%p)\n",
dispatch->LanguageHandler, rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch );
res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, context, dispatch );
TRACE( "handler at %p returned %u\n", dispatch->LanguageHandler, res );
TRACE( "handler at %p returned %lu\n", dispatch->LanguageHandler, res );
rec->ExceptionFlags &= EH_NONCONTINUABLE;
__wine_pop_frame( &frame );
......@@ -379,7 +379,7 @@ static DWORD call_teb_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCH
TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n",
teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, dispatch );
res = teb_frame->Handler( rec, teb_frame, context, (EXCEPTION_REGISTRATION_RECORD**)dispatch );
TRACE( "handler at %p returned %u\n", teb_frame->Handler, res );
TRACE( "handler at %p returned %lu\n", teb_frame->Handler, res );
return res;
}
......@@ -494,11 +494,10 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte
NTSTATUS status;
DWORD c;
TRACE( "code=%x flags=%x addr=%p pc=%016I64x tid=%04x\n",
rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress,
context->Pc, GetCurrentThreadId() );
TRACE( "code=%lx flags=%lx addr=%p pc=%016I64x\n",
rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Pc );
for (c = 0; c < rec->NumberParameters; c++)
TRACE( " info[%d]=%016I64x\n", c, rec->ExceptionInformation[c] );
TRACE( " info[%ld]=%016I64x\n", c, rec->ExceptionInformation[c] );
if (rec->ExceptionCode == EXCEPTION_WINE_STUB)
{
......@@ -507,7 +506,7 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte
rec->ExceptionAddress,
(char*)rec->ExceptionInformation[0], (char*)rec->ExceptionInformation[1] );
else
MESSAGE( "wine: Call from %p to unimplemented function %s.%ld, aborting\n",
MESSAGE( "wine: Call from %p to unimplemented function %s.%Id, aborting\n",
rec->ExceptionAddress,
(char*)rec->ExceptionInformation[0], rec->ExceptionInformation[1] );
}
......@@ -516,7 +515,7 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte
if ((DWORD)rec->ExceptionInformation[2] == -1)
WARN_(threadname)( "Thread renamed to %s\n", debugstr_a((char *)rec->ExceptionInformation[1]) );
else
WARN_(threadname)( "Thread ID %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2],
WARN_(threadname)( "Thread ID %04lx renamed to %s\n", (DWORD)rec->ExceptionInformation[2],
debugstr_a((char *)rec->ExceptionInformation[1]) );
set_native_thread_name((DWORD)rec->ExceptionInformation[2], (char *)rec->ExceptionInformation[1]);
......@@ -532,9 +531,9 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte
else
{
if (rec->ExceptionCode == STATUS_ASSERTION_FAILURE)
ERR( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode );
ERR( "%s exception (code=%lx) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode );
else
WARN( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode );
WARN( "%s exception (code=%lx) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode );
TRACE(" x0=%016I64x x1=%016I64x x2=%016I64x x3=%016I64x\n",
context->u.s.X0, context->u.s.X1, context->u.s.X2, context->u.s.X3 );
......@@ -1031,7 +1030,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG_PTR base, ULONG_PTR pc,
{
void *handler;
TRACE( "type %x pc %I64x sp %I64x func %I64x\n", type, pc, context->Sp, base + func->BeginAddress );
TRACE( "type %lx pc %I64x sp %I64x func %I64x\n", type, pc, context->Sp, base + func->BeginAddress );
*handler_data = NULL;
......@@ -1206,10 +1205,10 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec
rec->ExceptionFlags |= EH_UNWINDING | (end_frame ? 0 : EH_EXIT_UNWIND);
TRACE( "code=%x flags=%x end_frame=%p target_ip=%p pc=%016I64x\n",
TRACE( "code=%lx flags=%lx end_frame=%p target_ip=%p pc=%016I64x\n",
rec->ExceptionCode, rec->ExceptionFlags, end_frame, target_ip, context->Pc );
for (i = 0; i < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); i++)
TRACE( " info[%d]=%016I64x\n", i, rec->ExceptionInformation[i] );
TRACE( " info[%ld]=%016I64x\n", i, rec->ExceptionInformation[i] );
TRACE(" x0=%016I64x x1=%016I64x x2=%016I64x x3=%016I64x\n",
context->u.s.X0, context->u.s.X1, context->u.s.X2, context->u.s.X3 );
TRACE(" x4=%016I64x x5=%016I64x x6=%016I64x x7=%016I64x\n",
......@@ -1501,7 +1500,7 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4,
*/
USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash )
{
FIXME( "(%d, %d, %p, %p) stub!\n", skip, count, buffer, hash );
FIXME( "(%ld, %ld, %p, %p) stub!\n", skip, count, buffer, hash );
return 0;
}
......
dlls/ntdll/signal_i386.c
View file @ 0adec25f
......@@ -134,10 +134,10 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *context )
}
/* Call handler */
TRACE( "calling handler at %p code=%x flags=%x\n",
TRACE( "calling handler at %p code=%lx flags=%lx\n",
frame->Handler, rec->ExceptionCode, rec->ExceptionFlags );
res = EXC_CallHandler( rec, frame, context, &dispatch, frame->Handler, raise_handler );
TRACE( "handler at %p returned %x\n", frame->Handler, res );
TRACE( "handler at %p returned %lx\n", frame->Handler, res );
if (frame == nested_frame)
{
......@@ -174,11 +174,10 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context )
NTSTATUS status;
DWORD c;
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 (c = 0; c < rec->NumberParameters; c++)
TRACE( " info[%d]=%08lx\n", c, rec->ExceptionInformation[c] );
TRACE( " info[%ld]=%08Ix\n", c, rec->ExceptionInformation[c] );
if (rec->ExceptionCode == EXCEPTION_WINE_STUB)
{
......@@ -196,7 +195,7 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context )
if ((DWORD)rec->ExceptionInformation[2] == -1)
WARN_(threadname)( "Thread renamed to %s\n", debugstr_a((char *)rec->ExceptionInformation[1]) );
else
WARN_(threadname)( "Thread ID %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2],
WARN_(threadname)( "Thread ID %04lx renamed to %s\n", (DWORD)rec->ExceptionInformation[2],
debugstr_a((char *)rec->ExceptionInformation[1]) );
set_native_thread_name((DWORD)rec->ExceptionInformation[2], (char *)rec->ExceptionInformation[1]);
......@@ -212,14 +211,14 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context )
else
{
if (rec->ExceptionCode == STATUS_ASSERTION_FAILURE)
ERR( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode );
ERR( "%s exception (code=%lx) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode );
else
WARN( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode );
WARN( "%s exception (code=%lx) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode );
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 ss=%04x ds=%04x es=%04x fs=%04x gs=%04x flags=%08x\n",
TRACE(" ebp=%08lx esp=%08lx cs=%04lx ss=%04lx ds=%04lx es=%04lx fs=%04lx gs=%04lx flags=%08lx\n",
context->Ebp, context->Esp, context->SegCs, context->SegSs, context->SegDs,
context->SegEs, context->SegFs, context->SegGs, context->EFlags );
}
......@@ -393,10 +392,10 @@ void WINAPI DECLSPEC_HIDDEN __regs_RtlUnwind( EXCEPTION_REGISTRATION_RECORD* pEn
pRecord->ExceptionFlags |= EH_UNWINDING | (pEndFrame ? 0 : EH_EXIT_UNWIND);
TRACE( "code=%x flags=%x\n", pRecord->ExceptionCode, pRecord->ExceptionFlags );
TRACE( "eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x\n",
TRACE( "code=%lx flags=%lx\n", pRecord->ExceptionCode, pRecord->ExceptionFlags );
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 eip=%08x cs=%04x ds=%04x fs=%04x gs=%04x flags=%08x\n",
TRACE( "ebp=%08lx esp=%08lx eip=%08lx cs=%04x ds=%04x fs=%04x gs=%04x flags=%08lx\n",
context->Ebp, context->Esp, context->Eip, LOWORD(context->SegCs), LOWORD(context->SegDs),
LOWORD(context->SegFs), LOWORD(context->SegGs), context->EFlags );
......@@ -411,10 +410,10 @@ void WINAPI DECLSPEC_HIDDEN __regs_RtlUnwind( EXCEPTION_REGISTRATION_RECORD* pEn
if (!is_valid_frame( frame )) raise_status( STATUS_BAD_STACK, pRecord );
/* Call handler */
TRACE( "calling handler at %p code=%x flags=%x\n",
TRACE( "calling handler at %p code=%lx flags=%lx\n",
frame->Handler, pRecord->ExceptionCode, pRecord->ExceptionFlags );
res = EXC_CallHandler( pRecord, frame, context, &dispatch, frame->Handler, unwind_handler );
TRACE( "handler at %p returned %x\n", frame->Handler, res );
TRACE( "handler at %p returned %lx\n", frame->Handler, res );
switch(res)
{
......
dlls/ntdll/signal_x86_64.c
View file @ 0adec25f
......@@ -130,7 +130,7 @@ static void dump_unwind_info( ULONG64 base, RUNTIME_FUNCTION *function )
struct UNWIND_INFO *info;
unsigned int i, count;
TRACE( "**** func %x-%x\n", function->BeginAddress, function->EndAddress );
TRACE( "**** func %lx-%lx\n", function->BeginAddress, function->EndAddress );
for (;;)
{
if (function->UnwindData & 1)
......@@ -374,7 +374,7 @@ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_C
TRACE_(seh)( "calling handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n",
dispatch->LanguageHandler, rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch );
res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, context, dispatch );
TRACE_(seh)( "handler at %p returned %u\n", dispatch->LanguageHandler, res );
TRACE_(seh)( "handler at %p returned %lu\n", dispatch->LanguageHandler, res );
rec->ExceptionFlags &= EH_NONCONTINUABLE;
__wine_pop_frame( &frame );
......@@ -396,7 +396,7 @@ static DWORD call_teb_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCH
TRACE_(seh)( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n",
teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, dispatch );
res = teb_frame->Handler( rec, teb_frame, context, (EXCEPTION_REGISTRATION_RECORD**)dispatch );
TRACE_(seh)( "handler at %p returned %u\n", teb_frame->Handler, res );
TRACE_(seh)( "handler at %p returned %lu\n", teb_frame->Handler, res );
return res;
}
......@@ -508,11 +508,10 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context )
NTSTATUS status;
DWORD c;
TRACE_(seh)( "code=%x flags=%x addr=%p ip=%p tid=%04x\n",
rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress,
(void *)context->Rip, GetCurrentThreadId() );
TRACE_(seh)( "code=%lx flags=%lx addr=%p ip=%Ix\n",
rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Rip );
for (c = 0; c < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); c++)
TRACE_(seh)( " info[%d]=%016I64x\n", c, rec->ExceptionInformation[c] );
TRACE_(seh)( " info[%ld]=%016I64x\n", c, rec->ExceptionInformation[c] );
if (rec->ExceptionCode == EXCEPTION_WINE_STUB)
{
......@@ -530,7 +529,7 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context )
if ((DWORD)rec->ExceptionInformation[2] == -1)
WARN_(threadname)( "Thread renamed to %s\n", debugstr_a((char *)rec->ExceptionInformation[1]) );
else
WARN_(threadname)( "Thread ID %04x renamed to %s\n", (DWORD)rec->ExceptionInformation[2],
WARN_(threadname)( "Thread ID %04lx renamed to %s\n", (DWORD)rec->ExceptionInformation[2],
debugstr_a((char *)rec->ExceptionInformation[1]) );
set_native_thread_name((DWORD)rec->ExceptionInformation[2], (char *)rec->ExceptionInformation[1]);
......@@ -546,9 +545,9 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context )
else
{
if (rec->ExceptionCode == STATUS_ASSERTION_FAILURE)
ERR_(seh)( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode );
ERR_(seh)( "%s exception (code=%lx) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode );
else
WARN_(seh)( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode );
WARN_(seh)( "%s exception (code=%lx) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode );
TRACE_(seh)( " rax=%016I64x rbx=%016I64x rcx=%016I64x rdx=%016I64x\n",
context->Rax, context->Rbx, context->Rcx, context->Rdx );
......@@ -872,7 +871,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc,
unsigned int i, prolog_offset;
BOOL mach_frame = FALSE;
TRACE( "type %x rip %p rsp %p\n", type, (void *)pc, (void *)context->Rsp );
TRACE( "type %lx rip %I64x rsp %I64x\n", type, pc, context->Rsp );
if (TRACE_ON(seh)) dump_unwind_info( base, function );
frame = *frame_ret = context->Rsp;
......@@ -1039,7 +1038,7 @@ static DWORD call_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dis
TRACE( "calling handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n",
dispatch->LanguageHandler, rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch );
res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch );
TRACE( "handler %p returned %x\n", dispatch->LanguageHandler, res );
TRACE( "handler %p returned %lx\n", dispatch->LanguageHandler, res );
__wine_pop_frame( &frame.frame );
......@@ -1070,7 +1069,7 @@ static DWORD call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT
TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n",
teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, dispatch );
res = teb_frame->Handler( rec, teb_frame, dispatch->ContextRecord, (EXCEPTION_REGISTRATION_RECORD**)dispatch );
TRACE( "handler at %p returned %u\n", teb_frame->Handler, res );
TRACE( "handler at %p returned %lu\n", teb_frame->Handler, res );
switch (res)
{
......@@ -1291,10 +1290,10 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec
rec->ExceptionFlags |= EH_UNWINDING | (end_frame ? 0 : EH_EXIT_UNWIND);
TRACE( "code=%x flags=%x end_frame=%p target_ip=%p rip=%016I64x\n",
TRACE( "code=%lx flags=%lx end_frame=%p target_ip=%p rip=%016I64x\n",
rec->ExceptionCode, rec->ExceptionFlags, end_frame, target_ip, context->Rip );
for (i = 0; i < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); i++)
TRACE( " info[%d]=%016I64x\n", i, rec->ExceptionInformation[i] );
TRACE( " info[%ld]=%016I64x\n", i, rec->ExceptionInformation[i] );
TRACE(" rax=%016I64x rbx=%016I64x rcx=%016I64x rdx=%016I64x\n",
context->Rax, context->Rbx, context->Rcx, context->Rdx );
TRACE(" rsi=%016I64x rdi=%016I64x rbp=%016I64x rsp=%016I64x\n",
......@@ -1548,7 +1547,7 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer,
ULONG i;
USHORT num_entries = 0;
TRACE( "(%u, %u, %p, %p)\n", skip, count, buffer, hash );
TRACE( "(%lu, %lu, %p, %p)\n", skip, count, buffer, hash );
RtlCaptureContext( &context );
dispatch.TargetIp = 0;
......
dlls/ntdll/sync.c
View file @ 0adec25f
......@@ -218,7 +218,7 @@ NTSTATUS WINAPI RtlInitializeCriticalSectionAndSpinCount( RTL_CRITICAL_SECTION *
NTSTATUS WINAPI RtlInitializeCriticalSectionEx( RTL_CRITICAL_SECTION *crit, ULONG spincount, ULONG flags )
{
if (flags & (RTL_CRITICAL_SECTION_FLAG_DYNAMIC_SPIN|RTL_CRITICAL_SECTION_FLAG_STATIC_INIT))
FIXME("(%p,%u,0x%08x) semi-stub\n", crit, spincount, flags);
FIXME("(%p,%lu,0x%08lx) semi-stub\n", crit, spincount, flags);
/* FIXME: if RTL_CRITICAL_SECTION_FLAG_STATIC_INIT is given, we should use
* memory from a static pool to hold the debug info. Then heap.c could pass
......@@ -314,14 +314,14 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit )
const char *name = NULL;
if (crit_section_has_debuginfo( crit )) name = (char *)crit->DebugInfo->Spare[0];
if (!name) name = "?";
ERR( "section %p %s wait timed out in thread %04x, blocked by %04x, retrying (60 sec)\n",
ERR( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (60 sec)\n",
crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) );
status = wait_semaphore( crit, 60 );
timeout -= 60;
if ( status == STATUS_TIMEOUT && TRACE_ON(relay) )
{
ERR( "section %p %s wait timed out in thread %04x, blocked by %04x, retrying (5 min)\n",
ERR( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (5 min)\n",
crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) );
status = wait_semaphore( crit, 300 );
timeout -= 300;
......@@ -936,7 +936,7 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size
list_remove( &entry.entry );
spin_unlock( &queue->lock );
TRACE("returning %#x\n", ret);
TRACE("returning %#lx\n", ret);
if (ret == STATUS_ALERTED) ret = STATUS_SUCCESS;
return ret;
......
dlls/ntdll/thread.c
View file @ 0adec25f
......@@ -146,10 +146,10 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_
if (TRACE_ON(timestamp))
{
ULONG ticks = NtGetTickCount();
pos += sprintf( pos, "%3u.%03u:", ticks / 1000, ticks % 1000 );
pos += sprintf( pos, "%3lu.%03lu:", 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, "%04lx:", GetCurrentProcessId() );
pos += sprintf( pos, "%04lx:", GetCurrentThreadId() );
if (function && cls < ARRAY_SIZE( classes ))
pos += snprintf( pos, sizeof(info->output) - (pos - info->output), "%s:%s:%s ",
classes[cls], channel->name, function );
......@@ -357,7 +357,7 @@ NTSTATUS WINAPI RtlCreateUserStack( SIZE_T commit, SIZE_T reserve, ULONG zero_bi
PROCESS_STACK_ALLOCATION_INFORMATION alloc;
NTSTATUS status;
TRACE("commit %#lx, reserve %#lx, zero_bits %u, commit_align %#lx, reserve_align %#lx, stack %p\n",
TRACE("commit %#Ix, reserve %#Ix, zero_bits %lu, commit_align %#Ix, reserve_align %#Ix, stack %p\n",
commit, reserve, zero_bits, commit_align, reserve_align, stack);
if (!commit_align || !reserve_align)
......@@ -690,10 +690,10 @@ void WINAPI DECLSPEC_HOTPATCH RtlProcessFlsData( void *teb_fls_data, ULONG flags
TEB_FLS_DATA *fls = teb_fls_data;
unsigned int i, index;
TRACE_(thread)( "teb_fls_data %p, flags %#x.\n", teb_fls_data, flags );
TRACE_(thread)( "teb_fls_data %p, flags %#lx.\n", teb_fls_data, flags );
if (flags & ~3)
FIXME_(thread)( "Unknown flags %#x.\n", flags );
FIXME_(thread)( "Unknown flags %#lx.\n", flags );
if (!fls)
return;
......
dlls/ntdll/threadpool.c
View file @ 0adec25f
......@@ -442,7 +442,7 @@ NTSTATUS WINAPI RtlQueueWorkItem( PRTL_WORK_ITEM_ROUTINE function, PVOID context
struct rtl_work_item *item;
NTSTATUS status;
TRACE( "%p %p %u\n", function, context, flags );
TRACE( "%p %p %lu\n", function, context, flags );
item = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*item) );
if (!item)
......@@ -476,7 +476,7 @@ static DWORD CALLBACK iocp_poller(LPVOID Arg)
NTSTATUS res = NtRemoveIoCompletion( cport, (PULONG_PTR)&callback, (PULONG_PTR)&overlapped, &iosb, NULL );
if (res)
{
ERR("NtRemoveIoCompletion failed: 0x%x\n", res);
ERR("NtRemoveIoCompletion failed: 0x%lx\n", res);
}
else
{
......@@ -515,7 +515,7 @@ NTSTATUS WINAPI RtlSetIoCompletionCallback(HANDLE FileHandle, PRTL_OVERLAPPED_CO
IO_STATUS_BLOCK iosb;
FILE_COMPLETION_INFORMATION info;
if (Flags) FIXME("Unknown value Flags=0x%x\n", Flags);
if (Flags) FIXME("Unknown value Flags=0x%lx\n", Flags);
if (!old_threadpool.compl_port)
{
......@@ -1530,13 +1530,13 @@ static void CALLBACK ioqueue_thread_proc( void *param )
{
RtlLeaveCriticalSection( &ioqueue.cs );
if ((status = NtRemoveIoCompletion( ioqueue.port, &key, &value, &iosb, NULL )))
ERR("NtRemoveIoCompletion failed, status %#x.\n", status);
ERR("NtRemoveIoCompletion failed, status %#lx.\n", status);
RtlEnterCriticalSection( &ioqueue.cs );
destroy = skip = FALSE;
io = (struct threadpool_object *)key;
TRACE( "io %p, iosb.Status %#x.\n", io, iosb.u.Status );
TRACE( "io %p, iosb.Status %#lx.\n", io, iosb.u.Status );
if (io && (io->shutdown || io->u.io.shutting_down))
{
......@@ -1918,7 +1918,7 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa
if (environment)
{
if (environment->Version != 1 && environment->Version != 3)
FIXME( "unsupported environment version %u\n", environment->Version );
FIXME( "unsupported environment version %lu\n", environment->Version );
object->group = impl_from_TP_CLEANUP_GROUP( environment->CleanupGroup );
object->group_cancel_callback = environment->CleanupGroupCancelCallback;
......@@ -2245,7 +2245,7 @@ static void tp_object_execute( struct threadpool_object *object, BOOL wait_threa
case TP_OBJECT_TYPE_WAIT:
{
TRACE( "executing wait callback %p(%p, %p, %p, %u)\n",
TRACE( "executing wait callback %p(%p, %p, %p, %lu)\n",
object->u.wait.callback, callback_instance, object->userdata, object, wait_result );
object->u.wait.callback( callback_instance, object->userdata, (TP_WAIT *)object, wait_result );
TRACE( "callback %p returned\n", object->u.wait.callback );
......@@ -2254,7 +2254,7 @@ static void tp_object_execute( struct threadpool_object *object, BOOL wait_threa
case TP_OBJECT_TYPE_IO:
{
TRACE( "executing I/O callback %p(%p, %p, %#lx, %p, %p)\n",
TRACE( "executing I/O callback %p(%p, %p, %#Ix, %p, %p)\n",
object->u.io.callback, callback_instance, object->userdata,
completion.cvalue, &completion.iosb, (TP_IO *)object );
object->u.io.callback( callback_instance, object->userdata,
......@@ -2665,7 +2665,7 @@ VOID WINAPI TpCallbackReleaseSemaphoreOnCompletion( TP_CALLBACK_INSTANCE *instan
{
struct threadpool_instance *this = impl_from_TP_CALLBACK_INSTANCE( instance );
TRACE( "%p %p %u\n", instance, semaphore, count );
TRACE( "%p %p %lu\n", instance, semaphore, count );
if (!this->cleanup.semaphore)
{
......@@ -2926,7 +2926,7 @@ VOID WINAPI TpSetPoolMaxThreads( TP_POOL *pool, DWORD maximum )
{
struct threadpool *this = impl_from_TP_POOL( pool );
TRACE( "%p %u\n", pool, maximum );
TRACE( "%p %lu\n", pool, maximum );
RtlEnterCriticalSection( &this->cs );
this->max_workers = max( maximum, 1 );
......@@ -2942,7 +2942,7 @@ BOOL WINAPI TpSetPoolMinThreads( TP_POOL *pool, DWORD minimum )
struct threadpool *this = impl_from_TP_POOL( pool );
NTSTATUS status = STATUS_SUCCESS;
TRACE( "%p %u\n", pool, minimum );
TRACE( "%p %lu\n", pool, minimum );
RtlEnterCriticalSection( &this->cs );
......@@ -2973,7 +2973,7 @@ VOID WINAPI TpSetTimer( TP_TIMER *timer, LARGE_INTEGER *timeout, LONG period, LO
BOOL submit_timer = FALSE;
ULONGLONG timestamp;
TRACE( "%p %p %u %u\n", timer, timeout, period, window_length );
TRACE( "%p %p %lu %lu\n", timer, timeout, period, window_length );
RtlEnterCriticalSection( &timerqueue.cs );
......@@ -3273,7 +3273,7 @@ NTSTATUS WINAPI RtlRegisterWait( HANDLE *out, HANDLE handle, RTL_WAITORTIMERCALL
NTSTATUS status;
TP_WAIT *wait;
TRACE( "out %p, handle %p, callback %p, context %p, milliseconds %u, flags %x\n",
TRACE( "out %p, handle %p, callback %p, context %p, milliseconds %lu, flags %lx\n",
out, handle, callback, context, milliseconds, flags );
memset( &environment, 0, sizeof(environment) );
......
dlls/ntdll/unix/cdrom.c
View file @ 0adec25f
......@@ -24,6 +24,7 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
......
dlls/ntdll/unix/debug.c
View file @ 0adec25f
......@@ -21,6 +21,7 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
......
dlls/ntdll/unix/env.c
View file @ 0adec25f
......@@ -22,6 +22,7 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
......
dlls/ntdll/unix/file.c
View file @ 0adec25f
......@@ -23,6 +23,7 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
......
dlls/ntdll/unix/loader.c
View file @ 0adec25f
......@@ -21,6 +21,7 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
......
dlls/ntdll/unix/process.c
View file @ 0adec25f
......@@ -22,6 +22,7 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
......
dlls/ntdll/unix/registry.c
View file @ 0adec25f
......@@ -24,6 +24,7 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include <stdarg.h>
#include <string.h>
......
dlls/ntdll/unix/security.c
View file @ 0adec25f
......@@ -22,6 +22,7 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include <stdarg.h>
#include <stdlib.h>
......
dlls/ntdll/unix/serial.c
View file @ 0adec25f
......@@ -23,6 +23,7 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
......
dlls/ntdll/unix/server.c
View file @ 0adec25f
......@@ -21,6 +21,7 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
......
dlls/ntdll/unix/signal_arm.c
View file @ 0adec25f
......@@ -22,6 +22,7 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#ifdef __arm__
......
dlls/ntdll/unix/signal_i386.c
View file @ 0adec25f
......@@ -21,6 +21,7 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#ifdef __i386__
......
dlls/ntdll/unix/sync.c
View file @ 0adec25f
......@@ -24,6 +24,7 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
......
dlls/ntdll/unix/system.c
View file @ 0adec25f
......@@ -21,6 +21,7 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
......
dlls/ntdll/unix/tape.c
View file @ 0adec25f
......@@ -21,6 +21,7 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
......
dlls/ntdll/unix/thread.c
View file @ 0adec25f
......@@ -21,6 +21,7 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
......
dlls/ntdll/unix/virtual.c
View file @ 0adec25f
......@@ -21,6 +21,7 @@
#if 0
#pragma makedep unix
#endif
#define WINE_NO_LONG_TYPES
#include "config.h"
......
dlls/ntdll/version.c
View file @ 0adec25f
......@@ -525,7 +525,7 @@ done:
NtCurrentTeb()->Peb->OSBuildNumber = current_version->dwBuildNumber;
NtCurrentTeb()->Peb->OSPlatformId = current_version->dwPlatformId;
TRACE( "got %d.%d platform %d build %x name %s service pack %d.%d product %d\n",
TRACE( "got %ld.%ld platform %ld build %lx name %s service pack %d.%d product %d\n",
current_version->dwMajorVersion, current_version->dwMinorVersion,
current_version->dwPlatformId, current_version->dwBuildNumber,
debugstr_w(current_version->szCSDVersion),
......@@ -544,7 +544,7 @@ done:
BOOLEAN WINAPI RtlGetProductInfo(DWORD dwOSMajorVersion, DWORD dwOSMinorVersion, DWORD dwSpMajorVersion,
DWORD dwSpMinorVersion, PDWORD pdwReturnedProductType)
{
TRACE("(%d, %d, %d, %d, %p)\n", dwOSMajorVersion, dwOSMinorVersion,
TRACE("(%ld, %ld, %ld, %ld, %p)\n", dwOSMajorVersion, dwOSMinorVersion,
dwSpMajorVersion, dwSpMinorVersion, pdwReturnedProductType);
if (!pdwReturnedProductType)
......@@ -681,7 +681,7 @@ NTSTATUS WINAPI RtlVerifyVersionInfo( const RTL_OSVERSIONINFOEXW *info,
RTL_OSVERSIONINFOEXW ver;
NTSTATUS status;
TRACE("(%p,0x%x,0x%s)\n", info, dwTypeMask, wine_dbgstr_longlong(dwlConditionMask));
TRACE("(%p,0x%lx,0x%s)\n", info, dwTypeMask, wine_dbgstr_longlong(dwlConditionMask));
ver.dwOSVersionInfoSize = sizeof(ver);
if ((status = RtlGetVersion( &ver )) != STATUS_SUCCESS) return status;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment