diff --git a/dlls/commdlg/filedlg95.c b/dlls/commdlg/filedlg95.c
index aaee3114e58..4cd31afbb44 100644
--- a/dlls/commdlg/filedlg95.c
+++ b/dlls/commdlg/filedlg95.c
@@ -769,7 +769,7 @@ HRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode)
 {
     FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwndParentDlg,FileOpenDlgInfosStr);
 
-    TRACE("0x%p 0x%04x\n",hwndParentDlg, uCode);
+    TRACE("%p 0x%04x\n",hwndParentDlg, uCode);
 
     if(!fodInfos) return 0;
 
@@ -1587,7 +1587,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
   int nOpenAction;
   FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
 
-  TRACE("hwnd=0x%p\n", hwnd);
+  TRACE("hwnd=%p\n", hwnd);
 
   /* get the files from the edit control */
   nFileCount = FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed);
@@ -1974,7 +1974,7 @@ static BOOL FILEDLG95_SHELL_ExecuteCommand(HWND hwnd, LPCSTR lpVerb)
   FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
 
   IContextMenu * pcm;
-  TRACE("(0x%p,%p)\n", hwnd, lpVerb);
+  TRACE("(%p,%p)\n", hwnd, lpVerb);
 
   if(SUCCEEDED(IShellView_GetItemObject(fodInfos->Shell.FOIShellView,
 					SVGIO_BACKGROUND,
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index a88880772ec..68793f56ff2 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -210,7 +210,7 @@ NTSTATUS WINAPI NtReadFile (
 	int fd, result, flags, ret;
 	enum fd_type type;
 
-	FIXME("(0x%p,0x%p,%p,%p,%p,%p,0x%08lx,%p,%p),partial stub!\n",
+	FIXME("(%p,%p,%p,%p,%p,%p,0x%08lx,%p,%p),partial stub!\n",
 		FileHandle,EventHandle,ApcRoutine,ApcContext,IoStatusBlock,Buffer,Length,ByteOffset,Key);
 
 	if (IsBadWritePtr( Buffer, Length ) ||
@@ -273,7 +273,7 @@ NTSTATUS WINAPI NtWriteFile (
 	PLARGE_INTEGER ByteOffset,
 	PULONG Key)
 {
-	FIXME("(0x%p,0x%p,%p,%p,%p,%p,0x%08lx,%p,%p),stub!\n",
+	FIXME("(%p,%p,%p,%p,%p,%p,0x%08lx,%p,%p),stub!\n",
 	FileHandle,EventHandle,ApcRoutine,ApcContext,IoStatusBlock,Buffer,Length,ByteOffset,Key);
 	return 0;
 }
@@ -294,7 +294,7 @@ NTSTATUS WINAPI NtDeviceIoControlFile(
 	OUT PVOID OutputBuffer,
 	IN ULONG OutputBufferSize)
 {
-	FIXME("(0x%p,0x%p,%p,%p,%p,0x%08lx,%p,0x%08lx,%p,0x%08lx): empty stub\n",
+	FIXME("(%p,%p,%p,%p,%p,0x%08lx,%p,0x%08lx,%p,0x%08lx): empty stub\n",
 	DeviceHandle, Event, UserApcRoutine, UserApcContext,
 	IoStatusBlock, IoControlCode, InputBuffer, InputBufferSize, OutputBuffer, OutputBufferSize);
 	return 0;
@@ -316,7 +316,7 @@ NTSTATUS WINAPI NtFsControlFile(
 	OUT PVOID OutputBuffer,
 	IN ULONG OutputBufferSize)
 {
-	FIXME("(0x%p,0x%p,%p,%p,%p,0x%08lx,%p,0x%08lx,%p,0x%08lx): stub\n",
+	FIXME("(%p,%p,%p,%p,%p,0x%08lx,%p,0x%08lx,%p,0x%08lx): stub\n",
 	DeviceHandle,Event,ApcRoutine,ApcContext,IoStatusBlock,IoControlCode,
 	InputBuffer,InputBufferSize,OutputBuffer,OutputBufferSize);
 	return 0;
@@ -333,7 +333,7 @@ NTSTATUS WINAPI NtSetVolumeInformationFile(
         ULONG Length,
 	FS_INFORMATION_CLASS FsInformationClass)
 {
-	FIXME("(0x%p,%p,%p,0x%08lx,0x%08x) stub\n",
+	FIXME("(%p,%p,%p,0x%08lx,0x%08x) stub\n",
 	FileHandle,IoStatusBlock,FsInformation,Length,FsInformationClass);
 	return 0;
 }
@@ -349,7 +349,7 @@ NTSTATUS WINAPI NtQueryInformationFile(
 	ULONG Length,
 	FILE_INFORMATION_CLASS FileInformationClass)
 {
-	FIXME("(0x%p,%p,%p,0x%08lx,0x%08x),stub!\n",
+	FIXME("(%p,%p,%p,0x%08lx,0x%08x),stub!\n",
 	FileHandle,IoStatusBlock,FileInformation,Length,FileInformationClass);
 	return 0;
 }
@@ -365,7 +365,7 @@ NTSTATUS WINAPI NtSetInformationFile(
 	ULONG Length,
 	FILE_INFORMATION_CLASS FileInformationClass)
 {
-	FIXME("(0x%p,%p,%p,0x%08lx,0x%08x)\n",
+	FIXME("(%p,%p,%p,0x%08lx,0x%08x)\n",
 	FileHandle,IoStatusBlock,FileInformation,Length,FileInformationClass);
 	return 0;
 }
@@ -388,7 +388,7 @@ NTSTATUS WINAPI NtQueryDirectoryFile(
 	IN PUNICODE_STRING FileName OPTIONAL,
 	IN BOOLEAN RestartScan)
 {
-	FIXME("(0x%p 0x%p %p %p %p %p 0x%08lx 0x%08x 0x%08x %p 0x%08x\n",
+	FIXME("(%p %p %p %p %p %p 0x%08lx 0x%08x 0x%08x %p 0x%08x\n",
 	FileHandle, Event, ApcRoutine, ApcContext, IoStatusBlock, FileInformation,
 	Length, FileInformationClass, ReturnSingleEntry,
 	debugstr_us(FileName),RestartScan);
@@ -408,7 +408,7 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile (
 {
 	ULONG len = 0;
 
-	FIXME("(0x%p %p %p 0x%08lx 0x%08x) stub!\n",
+	FIXME("(%p %p %p 0x%08lx 0x%08x) stub!\n",
 	FileHandle, IoStatusBlock, FSInformation, Length, FSInformationClass);
 
 	switch ( FSInformationClass )
diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index c6b41aec423..3e13756f115 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -1332,7 +1332,7 @@ NTSTATUS WINAPI RtlWalkHeap( HANDLE heap, PVOID entry_ptr )
 
     if (!entry->lpData) /* first call (init) ? */
     {
-        TRACE("begin walking of heap 0x%p.\n", heap);
+        TRACE("begin walking of heap %p.\n", heap);
         currentheap = &heapPtr->subheap;
         ptr = (char*)currentheap + currentheap->headerSize;
     }
diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
index e9cf586ba98..ff46d996f7d 100644
--- a/dlls/ntdll/misc.c
+++ b/dlls/ntdll/misc.c
@@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
 void dump_ObjectAttributes (const OBJECT_ATTRIBUTES *oa)
 {
 	if (oa)
-	  TRACE("%p:(name=%s, attr=0x%08lx, hRoot=0x%p, sd=%p) \n",
+	  TRACE("%p:(name=%s, attr=0x%08lx, hRoot=%p, sd=%p) \n",
 	    oa, debugstr_us(oa->ObjectName),
 	    oa->Attributes, oa->RootDirectory, oa->SecurityDescriptor);
 }
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index 31538ff60b6..79831c3b8a2 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -65,7 +65,7 @@ NTSTATUS WINAPI NtSetTimer(
 	IN ULONG Period OPTIONAL,
 	OUT PBOOLEAN PreviousState OPTIONAL)
 {
-	FIXME("(0x%p,%p,%p,%p,%08x,0x%08lx,%p) stub\n",
+	FIXME("(%p,%p,%p,%p,%08x,0x%08lx,%p) stub\n",
 	TimerHandle,DueTime,TimerApcRoutine,TimerContext,WakeTimer,Period,PreviousState);
 	return 0;
 }
@@ -132,7 +132,7 @@ NTSTATUS WINAPI NtQueryInformationProcess(
 			ret = STATUS_INFO_LENGTH_MISMATCH;
 		break;
 	default:
-		FIXME("(0x%p,0x%08x,%p,0x%08lx,%p),stub!\n",
+		FIXME("(%p,0x%08x,%p,0x%08lx,%p),stub!\n",
 			ProcessHandle,ProcessInformationClass,
 			ProcessInformation,ProcessInformationLength,
 			ReturnLength
@@ -156,7 +156,7 @@ NTSTATUS WINAPI NtSetInformationProcess(
 	IN PVOID ProcessInformation,
 	IN ULONG ProcessInformationLength)
 {
-	FIXME("(0x%p,0x%08x,%p,0x%08lx) stub\n",
+	FIXME("(%p,0x%08x,%p,0x%08lx) stub\n",
 	ProcessHandle,ProcessInformationClass,ProcessInformation,ProcessInformationLength);
 	return 0;
 }
@@ -173,7 +173,7 @@ NTSTATUS WINAPI NtResumeThread(
 	IN HANDLE ThreadHandle,
 	IN PULONG SuspendCount)
 {
-	FIXME("(0x%p,%p),stub!\n",
+	FIXME("(%p,%p),stub!\n",
 	ThreadHandle,SuspendCount);
 	return 0;
 }
@@ -219,7 +219,7 @@ NTSTATUS WINAPI NtQueryInformationThread(
 	IN ULONG ThreadInformationLength,
 	OUT PULONG ReturnLength)
 {
-	FIXME("(0x%p,0x%08x,%p,0x%08lx,%p),stub!\n",
+	FIXME("(%p,0x%08x,%p,0x%08lx,%p),stub!\n",
 		ThreadHandle, ThreadInformationClass, ThreadInformation,
 		ThreadInformationLength, ReturnLength);
 	return 0;
@@ -235,7 +235,7 @@ NTSTATUS WINAPI NtSetInformationThread(
 	PVOID ThreadInformation,
 	ULONG ThreadInformationLength)
 {
-	FIXME("(0x%p,0x%08x,%p,0x%08lx),stub!\n",
+	FIXME("(%p,0x%08x,%p,0x%08lx),stub!\n",
 	ThreadHandle, ThreadInformationClass, ThreadInformation, ThreadInformationLength);
 	return 0;
 }
@@ -256,7 +256,7 @@ NTSTATUS WINAPI NtDuplicateToken(
         IN TOKEN_TYPE TokenType,
         OUT PHANDLE NewToken)
 {
-	FIXME("(0x%p,0x%08lx,%p,0x%08x,0x%08x,%p),stub!\n",
+	FIXME("(%p,0x%08lx,%p,0x%08x,0x%08x,%p),stub!\n",
 	ExistingToken, DesiredAccess, ObjectAttributes,
 	ImpersonationLevel, TokenType, NewToken);
 	dump_ObjectAttributes(ObjectAttributes);
@@ -272,7 +272,7 @@ NTSTATUS WINAPI NtOpenProcessToken(
 	DWORD DesiredAccess,
 	HANDLE *TokenHandle)
 {
-	FIXME("(0x%p,0x%08lx,%p): stub\n",
+	FIXME("(%p,0x%08lx,%p): stub\n",
 	ProcessHandle,DesiredAccess, TokenHandle);
 	*TokenHandle = (HANDLE)0xcafe;
 	return 0;
@@ -288,7 +288,7 @@ NTSTATUS WINAPI NtOpenThreadToken(
 	BOOLEAN OpenAsSelf,
 	HANDLE *TokenHandle)
 {
-	FIXME("(0x%p,0x%08lx,0x%08x,%p): stub\n",
+	FIXME("(%p,0x%08lx,0x%08x,%p): stub\n",
 	ThreadHandle,DesiredAccess, OpenAsSelf, TokenHandle);
 	*TokenHandle = (HANDLE)0xcafe;
 	return 0;
@@ -308,7 +308,7 @@ NTSTATUS WINAPI NtAdjustPrivilegesToken(
 	OUT PTOKEN_PRIVILEGES PreviousState,
 	OUT PDWORD ReturnLength)
 {
-	FIXME("(0x%p,0x%08x,%p,0x%08lx,%p,%p),stub!\n",
+	FIXME("(%p,0x%08x,%p,0x%08lx,%p,%p),stub!\n",
 	TokenHandle, DisableAllPrivileges, NewState, BufferLength, PreviousState, ReturnLength);
 	return 0;
 }
@@ -427,7 +427,7 @@ NTSTATUS WINAPI NtQuerySection(
 	IN ULONG Length,
 	OUT PULONG ResultLength)
 {
-	FIXME("(0x%p,%p,%p,0x%08lx,%p) stub!\n",
+	FIXME("(%p,%p,%p,0x%08lx,%p) stub!\n",
 	SectionHandle,SectionInformationClass,SectionInformation,Length,ResultLength);
 	return 0;
 }
diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c
index 22652331477..4a990ca70ab 100644
--- a/dlls/ntdll/om.c
+++ b/dlls/ntdll/om.c
@@ -54,7 +54,7 @@ NTSTATUS WINAPI NtQueryObject(
 	IN ULONG Length,
 	OUT PULONG ResultLength)
 {
-	FIXME("(0x%p,0x%08x,%p,0x%08lx,%p): stub\n",
+	FIXME("(%p,0x%08x,%p,0x%08lx,%p): stub\n",
 	ObjectHandle, ObjectInformationClass, ObjectInformation, Length, ResultLength);
 	return 0;
 }
@@ -85,7 +85,7 @@ NtQuerySecurityObject(
 	PISECURITY_DESCRIPTOR_RELATIVE psd = (PISECURITY_DESCRIPTOR_RELATIVE)Buffer;
 	UINT BufferIndex = sizeof(SECURITY_DESCRIPTOR_RELATIVE);
 
-	FIXME("(0x%p,0x%08lx,%p,0x%08lx,%p) stub!\n",
+	FIXME("(%p,0x%08lx,%p,0x%08lx,%p) stub!\n",
 	Object, RequestedInformation, pSecurityDesriptor, Length, ResultLength);
 
 	RequestedInformation &= 0x0000000f;
@@ -271,7 +271,7 @@ NTSTATUS WINAPI NtWaitForSingleObject(
 	IN BOOLEAN Alertable,
 	IN PLARGE_INTEGER Time)
 {
-	FIXME("(0x%p,0x%08x,%p),stub!\n",Object,Alertable,Time);
+	FIXME("(%p,0x%08x,%p),stub!\n",Object,Alertable,Time);
 	return 0;
 }
 
@@ -338,7 +338,7 @@ NTSTATUS WINAPI NtQueryDirectoryObject(
 	IN OUT PULONG ObjectIndex,
 	OUT PULONG DataWritten OPTIONAL)
 {
-	FIXME("(0x%p,%p,0x%08lx,0x%08x,0x%08x,%p,%p) stub\n",
+	FIXME("(%p,%p,0x%08lx,0x%08x,0x%08x,%p,%p) stub\n",
 		DirObjHandle, DirObjInformation, BufferLength, GetNextIndex,
 		IgnoreInputIndex, ObjectIndex, DataWritten);
     return 0xc0000000; /* We don't have any. Whatever. (Yet.) */
@@ -385,7 +385,7 @@ NTSTATUS WINAPI NtQuerySymbolicLinkObject(
 	IN OUT PUNICODE_STRING LinkTarget,
 	OUT PULONG ReturnedLength OPTIONAL)
 {
-	FIXME("(0x%p,%p,%p) stub\n",
+	FIXME("(%p,%p,%p) stub\n",
 	LinkHandle, debugstr_us(LinkTarget), ReturnedLength);
 
 	return 0;
diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c
index 13bd9820eaf..09312fb84ce 100644
--- a/dlls/ntdll/reg.c
+++ b/dlls/ntdll/reg.c
@@ -55,7 +55,7 @@ NTSTATUS WINAPI NtCreateKey( PHKEY retkey, ACCESS_MASK access, const OBJECT_ATTR
 {
     NTSTATUS ret;
 
-    TRACE( "(0x%p,%s,%s,%lx,%lx,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName),
+    TRACE( "(%p,%s,%s,%lx,%lx,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName),
            debugstr_us(class), options, access, retkey );
 
     if (attr->ObjectName->Length > MAX_NAME_LENGTH) return STATUS_BUFFER_OVERFLOW;
@@ -77,7 +77,7 @@ NTSTATUS WINAPI NtCreateKey( PHKEY retkey, ACCESS_MASK access, const OBJECT_ATTR
         }
     }
     SERVER_END_REQ;
-    TRACE("<- 0x%p\n", *retkey);
+    TRACE("<- %p\n", *retkey);
     return ret;
 }
 
@@ -95,7 +95,7 @@ NTSTATUS WINAPI NtOpenKey( PHKEY retkey, ACCESS_MASK access, const OBJECT_ATTRIB
     NTSTATUS ret;
     DWORD len = attr->ObjectName->Length;
 
-    TRACE( "(0x%p,%s,%lx,%p)\n", attr->RootDirectory,
+    TRACE( "(%p,%s,%lx,%p)\n", attr->RootDirectory,
            debugstr_us(attr->ObjectName), access, retkey );
 
     if (len > MAX_NAME_LENGTH) return STATUS_BUFFER_OVERFLOW;
@@ -110,7 +110,7 @@ NTSTATUS WINAPI NtOpenKey( PHKEY retkey, ACCESS_MASK access, const OBJECT_ATTRIB
         *retkey = reply->hkey;
     }
     SERVER_END_REQ;
-    TRACE("<- 0x%p\n", *retkey);
+    TRACE("<- %p\n", *retkey);
     return ret;
 }
 
@@ -143,7 +143,7 @@ NTSTATUS WINAPI NtDeleteValueKey( HKEY hkey, const UNICODE_STRING *name )
 {
     NTSTATUS ret;
 
-    TRACE( "(0x%p,%s)\n", hkey, debugstr_us(name) );
+    TRACE( "(%p,%s)\n", hkey, debugstr_us(name) );
     if (name->Length > MAX_NAME_LENGTH) return STATUS_BUFFER_OVERFLOW;
 
     SERVER_START_REQ( delete_key_value )
@@ -328,7 +328,7 @@ NTSTATUS WINAPI NtEnumerateValueKey( HKEY handle, ULONG index,
     void *ptr;
     size_t fixed_size;
 
-    TRACE( "(0x%p,%lu,%d,%p,%ld)\n", handle, index, info_class, info, length );
+    TRACE( "(%p,%lu,%d,%p,%ld)\n", handle, index, info_class, info, length );
 
     /* compute the length we want to retrieve */
     switch(info_class)
@@ -376,7 +376,7 @@ NTSTATUS WINAPI NtQueryValueKey( HKEY handle, const UNICODE_STRING *name,
     UCHAR *data_ptr;
     int fixed_size = 0;
 
-    TRACE( "(0x%p,%s,%d,%p,%ld)\n", handle, debugstr_us(name), info_class, info, length );
+    TRACE( "(%p,%s,%d,%p,%ld)\n", handle, debugstr_us(name), info_class, info, length );
 
     if (name->Length > MAX_NAME_LENGTH) return STATUS_BUFFER_OVERFLOW;
 
@@ -424,7 +424,7 @@ NTSTATUS WINAPI NtQueryValueKey( HKEY handle, const UNICODE_STRING *name,
  */
 NTSTATUS WINAPI NtFlushKey(HKEY KeyHandle)
 {
-	FIXME("(0x%p) stub!\n",
+	FIXME("(%p) stub!\n",
 	KeyHandle);
 	return 1;
 }
@@ -457,7 +457,7 @@ NTSTATUS WINAPI NtNotifyChangeKey(
 	IN ULONG Length,
 	IN BOOLEAN WatchSubtree)
 {
-	FIXME("(0x%p,0x%p,%p,%p,%p,0x%08lx, 0x%08x,%p,0x%08lx,0x%08x) stub!\n",
+	FIXME("(%p,%p,%p,%p,%p,0x%08lx, 0x%08x,%p,0x%08lx,0x%08x) stub!\n",
 	KeyHandle, Event, ApcRoutine, ApcContext, IoStatusBlock, CompletionFilter,
 	Asynchroneous, ChangeBuffer, Length, WatchSubtree);
 	return STATUS_SUCCESS;
@@ -476,7 +476,7 @@ NTSTATUS WINAPI NtQueryMultipleValueKey(
 	ULONG Length,
 	PULONG  ReturnLength)
 {
-	FIXME("(0x%p,%p,0x%08lx,%p,0x%08lx,%p) stub!\n",
+	FIXME("(%p,%p,0x%08lx,%p,0x%08lx,%p) stub!\n",
 	KeyHandle, ListOfValuesToQuery, NumberOfItems, MultipleValueInformation,
 	Length,ReturnLength);
 	return STATUS_SUCCESS;
@@ -491,7 +491,7 @@ NTSTATUS WINAPI NtReplaceKey(
 	IN HKEY Key,
 	IN POBJECT_ATTRIBUTES ReplacedObjectAttributes)
 {
-	FIXME("(0x%p),stub!\n", Key);
+	FIXME("(%p),stub!\n", Key);
 	dump_ObjectAttributes(ObjectAttributes);
 	dump_ObjectAttributes(ReplacedObjectAttributes);
 	return STATUS_SUCCESS;
@@ -505,7 +505,7 @@ NTSTATUS WINAPI NtRestoreKey(
 	HANDLE FileHandle,
 	ULONG RestoreFlags)
 {
-	FIXME("(0x%p,0x%p,0x%08lx) stub\n",
+	FIXME("(%p,%p,0x%08lx) stub\n",
 	KeyHandle, FileHandle, RestoreFlags);
 	return STATUS_SUCCESS;
 }
@@ -517,7 +517,7 @@ NTSTATUS WINAPI NtSaveKey(
 	IN HKEY KeyHandle,
 	IN HANDLE FileHandle)
 {
-	FIXME("(0x%p,0x%p) stub\n",
+	FIXME("(%p,%p) stub\n",
 	KeyHandle, FileHandle);
 	return STATUS_SUCCESS;
 }
@@ -531,7 +531,7 @@ NTSTATUS WINAPI NtSetInformationKey(
 	IN PVOID KeyInformation,
 	IN ULONG KeyInformationLength)
 {
-	FIXME("(0x%p,0x%08x,%p,0x%08lx) stub\n",
+	FIXME("(%p,0x%08x,%p,0x%08lx) stub\n",
 	KeyHandle, KeyInformationClass, KeyInformation, KeyInformationLength);
 	return STATUS_SUCCESS;
 }
@@ -550,7 +550,7 @@ NTSTATUS WINAPI NtSetValueKey( HKEY hkey, const UNICODE_STRING *name, ULONG Titl
 {
     NTSTATUS ret;
 
-    TRACE( "(0x%p,%s,%ld,%p,%ld)\n", hkey, debugstr_us(name), type, data, count );
+    TRACE( "(%p,%s,%ld,%p,%ld)\n", hkey, debugstr_us(name), type, data, count );
 
     if (name->Length > MAX_NAME_LENGTH) return STATUS_BUFFER_OVERFLOW;
 
@@ -574,7 +574,7 @@ NTSTATUS WINAPI NtSetValueKey( HKEY hkey, const UNICODE_STRING *name, ULONG Titl
 NTSTATUS WINAPI NtUnloadKey(
 	IN HKEY KeyHandle)
 {
-	FIXME("(0x%p) stub\n",
+	FIXME("(%p) stub\n",
 	KeyHandle);
 	return STATUS_SUCCESS;
 }
diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c
index a2c0fde9669..9b5f555090c 100644
--- a/dlls/ntdll/sec.c
+++ b/dlls/ntdll/sec.c
@@ -709,7 +709,7 @@ NtSetSecurityObject(
         IN SECURITY_INFORMATION SecurityInformation,
         IN PSECURITY_DESCRIPTOR SecurityDescriptor)
 {
-	FIXME("0x%p 0x%08lx %p\n", Handle, SecurityInformation, SecurityDescriptor);
+	FIXME("%p 0x%08lx %p\n", Handle, SecurityInformation, SecurityDescriptor);
 	return STATUS_SUCCESS;
 }
 
diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c
index 7636834990b..a25f56cf0ef 100644
--- a/dlls/ntdll/sync.c
+++ b/dlls/ntdll/sync.c
@@ -97,7 +97,7 @@ NTSTATUS WINAPI NtQuerySemaphore(
 	ULONG Length,
 	PULONG ReturnLength)
 {
-	FIXME("(0x%p,%p,%p,0x%08lx,%p) stub!\n",
+	FIXME("(%p,%p,%p,0x%08lx,%p) stub!\n",
 	SemaphoreHandle, SemaphoreInformationClass, SemaphoreInformation, Length, ReturnLength);
 	return STATUS_SUCCESS;
 }
@@ -237,7 +237,7 @@ NTSTATUS WINAPI NtClearEvent ( HANDLE handle )
 NTSTATUS WINAPI NtPulseEvent( HANDLE handle, PULONG PulseCount )
 {
     NTSTATUS ret;
-    FIXME("(0x%p,%p)\n", handle, PulseCount);
+    FIXME("(%p,%p)\n", handle, PulseCount);
     SERVER_START_REQ( event_op )
     {
         req->handle = handle;
@@ -258,6 +258,6 @@ NTSTATUS WINAPI NtQueryEvent (
 	IN  ULONG EventInformationLength,
 	OUT PULONG  ReturnLength)
 {
-	FIXME("(0x%p)\n", EventHandle);
+	FIXME("(%p)\n", EventHandle);
 	return STATUS_SUCCESS;
 }
diff --git a/loader/module.c b/loader/module.c
index e50c78029f6..b7e2ab497c2 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -85,7 +85,7 @@ static WINE_MODREF *MODULE32_LookupHMODULE( HMODULE hmod )
     	return exe_modref;
 
     if (!HIWORD(hmod)) {
-    	ERR("tried to lookup 0x%p in win32 module handler!\n",hmod);
+    	ERR("tried to lookup %p in win32 module handler!\n",hmod);
         SetLastError( ERROR_INVALID_HANDLE );
 	return NULL;
     }
@@ -1262,7 +1262,7 @@ WINE_MODREF *MODULE_LoadLibraryExA( LPCSTR libname, HANDLE hfile, DWORD flags )
                     pwm->flags &= ~WINE_MODREF_DONT_RESOLVE_REFS;
                     PE_fixup_imports( pwm );
 		}
-		TRACE("Already loaded module '%s' at 0x%p, count=%d\n", filename, pwm->module, pwm->refCount);
+		TRACE("Already loaded module '%s' at %p, count=%d\n", filename, pwm->module, pwm->refCount);
                 if (allocated_libdir)
                 {
                     HeapFree ( GetProcessHeap(), 0, (LPSTR)libdir );
@@ -1308,7 +1308,7 @@ WINE_MODREF *MODULE_LoadLibraryExA( LPCSTR libname, HANDLE hfile, DWORD flags )
 		if(pwm)
 		{
 			/* Initialize DLL just loaded */
-			TRACE("Loaded module '%s' at 0x%p\n", filename, pwm->module);
+			TRACE("Loaded module '%s' at %p\n", filename, pwm->module);
                         if (!TRACE_ON(module))
                             TRACE_(loaddll)("Loaded module '%s' : %s\n", filename, filetype);
 			/* Set the refCount here so that an attach failure will */
diff --git a/scheduler/process.c b/scheduler/process.c
index f8396f7bb10..d208cfb2805 100644
--- a/scheduler/process.c
+++ b/scheduler/process.c
@@ -1658,7 +1658,7 @@ DWORD WINAPI GetProcessFlags( DWORD processid )
 BOOL WINAPI SetProcessWorkingSetSize(HANDLE hProcess, SIZE_T minset,
                                      SIZE_T maxset)
 {
-    FIXME("(0x%p,%ld,%ld): stub - harmless\n",hProcess,minset,maxset);
+    FIXME("(%p,%ld,%ld): stub - harmless\n",hProcess,minset,maxset);
     if(( minset == (SIZE_T)-1) && (maxset == (SIZE_T)-1)) {
         /* Trim the working set to zero */
         /* Swap the process out of physical RAM */
@@ -1672,7 +1672,7 @@ BOOL WINAPI SetProcessWorkingSetSize(HANDLE hProcess, SIZE_T minset,
 BOOL WINAPI GetProcessWorkingSetSize(HANDLE hProcess, PSIZE_T minset,
                                      PSIZE_T maxset)
 {
-	FIXME("(0x%p,%p,%p): stub\n",hProcess,minset,maxset);
+	FIXME("(%p,%p,%p): stub\n",hProcess,minset,maxset);
 	/* 32 MB working set size */
 	if (minset) *minset = 32*1024*1024;
 	if (maxset) *maxset = 32*1024*1024;
diff --git a/scheduler/thread.c b/scheduler/thread.c
index a7b62e4dcc2..1da9f4a43e2 100644
--- a/scheduler/thread.c
+++ b/scheduler/thread.c
@@ -565,7 +565,7 @@ DWORD WINAPI SetThreadIdealProcessor(
     HANDLE hThread,          /* [in] Specifies the thread of interest */
     DWORD dwIdealProcessor)  /* [in] Specifies the new preferred processor */
 {
-    FIXME("(0x%p): stub\n",hThread);
+    FIXME("(%p): stub\n",hThread);
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return -1L;
 }
diff --git a/win32/device.c b/win32/device.c
index ee7fa3423ce..2886dc3e3ff 100644
--- a/win32/device.c
+++ b/win32/device.c
@@ -1899,7 +1899,7 @@ static BOOL DeviceIo_PCCARD (DWORD dwIoControlCode,
  */
 HANDLE	WINAPI	OpenVxDHandle(HANDLE hHandleRing3)
 {
-	FIXME( "(0x%p), stub! (returning Ring 3 handle instead of Ring 0)\n", hHandleRing3);
+	FIXME( "(%p), stub! (returning Ring 3 handle instead of Ring 0)\n", hHandleRing3);
 	return hHandleRing3;
 }