-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Should fix all warnings
- --
Andrew :-)
Please avoid sending me Word or PowerPoint attachments.
See http://www.fsf.org/philosophy/no-word-attachments.html
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)
iD8DBQE92WZWSE/kMce1ABARApuoAJ49FI04qMlgt5dJvaG6ShzRdPthKACeOLmQ
UhjYFSZ6RYkpCxyEzPiAG3Q=
=Vykj
-----END PGP SIGNATURE-----
? patch-ntdll
? dlls/ntdll/warnings
? tools/missing
Index: dlls/ntdll/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/Makefile.in,v
retrieving revision 1.41
diff -u -3 -p -u -r1.41 Makefile.in
--- dlls/ntdll/Makefile.in 15 Nov 2002 01:01:48 -0000 1.41
+++ dlls/ntdll/Makefile.in 18 Nov 2002 21:51:06 -0000
@@ -1,4 +1,4 @@
-EXTRADEFS = -D_NTSYSTEM_ -DBINDIR="\"$(bindir)\"" -DETCDIR="\"$(sysconfdir)\"" -DWINE_NO_STRICT
+EXTRADEFS = -D_NTSYSTEM_ -DBINDIR="\"$(bindir)\"" -DETCDIR="\"$(sysconfdir)\""
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
Index: dlls/ntdll/file.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/file.c,v
retrieving revision 1.17
diff -u -3 -p -u -r1.17 file.c
--- dlls/ntdll/file.c 12 Sep 2002 22:07:03 -0000 1.17
+++ dlls/ntdll/file.c 18 Nov 2002 21:51:06 -0000
@@ -74,7 +74,7 @@ NTSTATUS WINAPI NtOpenFile(
if(ObjectAttributes->RootDirectory)
{
- FIXME("Object root directory unknown %x\n",
+ FIXME("Object root directory unknown %p\n",
ObjectAttributes->RootDirectory);
return STATUS_OBJECT_NAME_NOT_FOUND;
}
@@ -210,7 +210,7 @@ NTSTATUS WINAPI NtReadFile (
int fd, result, flags, ret;
enum fd_type type;
- FIXME("(0x%08x,0x%08x,%p,%p,%p,%p,0x%08lx,%p,%p),partial stub!\n",
+ FIXME("(0x%p,0x%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%08x,0x%08x,%p,%p,%p,%p,0x%08lx,%p,%p),stub!\n",
+ FIXME("(0x%p,0x%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%08x,0x%08x,%p,%p,%p,0x%08lx,%p,0x%08lx,%p,0x%08lx): empty stub\n",
+ FIXME("(0x%p,0x%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%08x,0x%08x,%p,%p,%p,0x%08lx,%p,0x%08lx,%p,0x%08lx): stub\n",
+ FIXME("(0x%p,0x%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 NtSetVolumeInformationFi
ULONG Length,
FS_INFORMATION_CLASS FsInformationClass)
{
- FIXME("(0x%08x,%p,%p,0x%08lx,0x%08x) stub\n",
+ FIXME("(0x%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%08x,%p,%p,0x%08lx,0x%08x),stub!\n",
+ FIXME("(0x%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%08x,%p,%p,0x%08lx,0x%08x)\n",
+ FIXME("(0x%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%08x 0x%08x %p %p %p %p 0x%08lx 0x%08x 0x%08x %p 0x%08x\n",
+ FIXME("(0x%p 0x%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 NtQueryVolumeInformation
{
ULONG len = 0;
- FIXME("(0x%08x %p %p 0x%08lx 0x%08x) stub!\n",
+ FIXME("(0x%p %p %p 0x%08lx 0x%08x) stub!\n",
FileHandle, IoStatusBlock, FSInformation, Length, FSInformationClass);
switch ( FSInformationClass )
Index: dlls/ntdll/heap.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/heap.c,v
retrieving revision 1.11
diff -u -3 -p -u -r1.11 heap.c
--- dlls/ntdll/heap.c 18 Sep 2002 23:13:35 -0000 1.11
+++ dlls/ntdll/heap.c 18 Nov 2002 21:51:07 -0000
@@ -229,7 +229,7 @@ static HEAP *HEAP_GetPtr(
HEAP *heapPtr = (HEAP *)heap;
if (!heapPtr || (heapPtr->magic != HEAP_MAGIC))
{
- ERR("Invalid heap %08x!\n", heap );
+ ERR("Invalid heap %p!\n", heap );
return NULL;
}
if (TRACE_ON(heap) && !HEAP_IsRealArena( heapPtr, 0, NULL, NOISY ))
@@ -974,7 +974,7 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE hea
HEAP *heapPtr = HEAP_GetPtr( heap );
SUBHEAP *subheap;
- TRACE("%08x\n", heap );
+ TRACE("%p\n", heap );
if (!heapPtr) return heap;
if (heap == processHeap) return heap; /* cannot delete the main process heap */
@@ -1027,7 +1027,7 @@ PVOID WINAPI RtlAllocateHeap( HANDLE hea
if (!(pArena = HEAP_FindFreeBlock( heapPtr, size, &subheap )))
{
- TRACE("(%08x,%08lx,%08lx): returning NULL\n",
+ TRACE("(%p,%08lx,%08lx): returning NULL\n",
heap, flags, size );
if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection );
if (flags & HEAP_GENERATE_EXCEPTIONS) RtlRaiseStatus( STATUS_NO_MEMORY );
@@ -1059,7 +1059,7 @@ PVOID WINAPI RtlAllocateHeap( HANDLE hea
if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection );
- TRACE("(%08x,%08lx,%08lx): returning %08lx\n",
+ TRACE("(%p,%08lx,%08lx): returning %08lx\n",
heap, flags, size, (DWORD)(pInUse + 1) );
return (LPVOID)(pInUse + 1);
}
@@ -1090,7 +1090,7 @@ BOOLEAN WINAPI RtlFreeHeap( HANDLE heap,
{
if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection );
set_status( STATUS_INVALID_PARAMETER );
- TRACE("(%08x,%08lx,%08lx): returning FALSE\n",
+ TRACE("(%p,%08lx,%08lx): returning FALSE\n",
heap, flags, (DWORD)ptr );
return FALSE;
}
@@ -1103,7 +1103,7 @@ BOOLEAN WINAPI RtlFreeHeap( HANDLE heap,
if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection );
- TRACE("(%08x,%08lx,%08lx): returning TRUE\n",
+ TRACE("(%p,%08lx,%08lx): returning TRUE\n",
heap, flags, (DWORD)ptr );
return TRUE;
}
@@ -1139,7 +1139,7 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE h
{
if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection );
set_status( STATUS_INVALID_PARAMETER );
- TRACE("(%08x,%08lx,%08lx,%08lx): returning NULL\n",
+ TRACE("(%p,%08lx,%08lx,%08lx): returning NULL\n",
heap, flags, (DWORD)ptr, size );
return NULL;
}
@@ -1222,7 +1222,7 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE h
if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection );
- TRACE("(%08x,%08lx,%08lx,%08lx): returning %08lx\n",
+ TRACE("(%p,%08lx,%08lx,%08lx): returning %08lx\n",
heap, flags, (DWORD)ptr, size, (DWORD)(pArena + 1) );
return (LPVOID)(pArena + 1);
}
@@ -1290,7 +1290,7 @@ ULONG WINAPI RtlSizeHeap( HANDLE heap, U
}
if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection );
- TRACE("(%08x,%08lx,%08lx): returning %08lx\n",
+ TRACE("(%p,%08lx,%08lx): returning %08lx\n",
heap, flags, (DWORD)ptr, ret );
return ret;
}
@@ -1332,7 +1332,7 @@ NTSTATUS WINAPI RtlWalkHeap( HANDLE heap
if (!entry->lpData) /* first call (init) ? */
{
- TRACE("begin walking of heap 0x%08x.\n", heap);
+ TRACE("begin walking of heap 0x%p.\n", heap);
currentheap = &heapPtr->subheap;
ptr = (char*)currentheap + currentheap->headerSize;
}
Index: dlls/ntdll/misc.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/misc.c,v
retrieving revision 1.15
diff -u -3 -p -u -r1.15 misc.c
--- dlls/ntdll/misc.c 13 Aug 2002 18:10:28 -0000 1.15
+++ dlls/ntdll/misc.c 18 Nov 2002 21:51:07 -0000
@@ -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%08x, sd=%p) \n",
+ TRACE("%p:(name=%s, attr=0x%08lx, hRoot=0x%p, sd=%p) \n",
oa, debugstr_us(oa->ObjectName),
oa->Attributes, oa->RootDirectory, oa->SecurityDescriptor);
}
Index: dlls/ntdll/nt.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/nt.c,v
retrieving revision 1.45
diff -u -3 -p -u -r1.45 nt.c
--- dlls/ntdll/nt.c 17 Sep 2002 18:54:42 -0000 1.45
+++ dlls/ntdll/nt.c 18 Nov 2002 21:51:07 -0000
@@ -65,7 +65,7 @@ NTSTATUS WINAPI NtSetTimer(
IN ULONG Period OPTIONAL,
OUT PBOOLEAN PreviousState OPTIONAL)
{
- FIXME("(0x%08x,%p,%p,%p,%08x,0x%08lx,%p) stub\n",
+ FIXME("(0x%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 NtQueryInformationProces
ret = STATUS_INFO_LENGTH_MISMATCH;
break;
default:
- FIXME("(0x%08x,0x%08x,%p,0x%08lx,%p),stub!\n",
+ FIXME("(0x%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%08x,0x%08x,%p,0x%08lx) stub\n",
+ FIXME("(0x%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%08x,%p),stub!\n",
+ FIXME("(0x%p,%p),stub!\n",
ThreadHandle,SuspendCount);
return 0;
}
@@ -219,7 +219,7 @@ NTSTATUS WINAPI NtQueryInformationThread
IN ULONG ThreadInformationLength,
OUT PULONG ReturnLength)
{
- FIXME("(0x%08x,0x%08x,%p,0x%08lx,%p),stub!\n",
+ FIXME("(0x%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%08x,0x%08x,%p,0x%08lx),stub!\n",
+ FIXME("(0x%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%08x,0x%08lx,%p,0x%08x,0x%08x,%p),stub!\n",
+ FIXME("(0x%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%08x,0x%08lx,%p): stub\n",
+ FIXME("(0x%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%08x,0x%08lx,0x%08x,%p): stub\n",
+ FIXME("(0x%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%08x,0x%08x,%p,0x%08lx,%p,%p),stub!\n",
+ FIXME("(0x%p,0x%08x,%p,0x%08lx,%p,%p),stub!\n",
TokenHandle, DisableAllPrivileges, NewState, BufferLength, PreviousState, ReturnLength);
return 0;
}
@@ -332,7 +332,7 @@ NTSTATUS WINAPI NtQueryInformationToken(
{
unsigned int len = 0;
- FIXME("(%08x,%ld,%p,%ld,%p): stub\n",
+ FIXME("(%p,%ld,%p,%ld,%p): stub\n",
token,tokeninfoclass,tokeninfo,tokeninfolength,retlen);
switch (tokeninfoclass)
@@ -427,7 +427,7 @@ NTSTATUS WINAPI NtQuerySection(
IN ULONG Length,
OUT PULONG ResultLength)
{
- FIXME("(0x%08x,%p,%p,0x%08lx,%p) stub!\n",
+ FIXME("(0x%p,%p,%p,0x%08lx,%p) stub!\n",
SectionHandle,SectionInformationClass,SectionInformation,Length,ResultLength);
return 0;
}
Index: dlls/ntdll/om.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/om.c,v
retrieving revision 1.22
diff -u -3 -p -u -r1.22 om.c
--- dlls/ntdll/om.c 16 Sep 2002 19:32:50 -0000 1.22
+++ dlls/ntdll/om.c 18 Nov 2002 21:51:08 -0000
@@ -54,7 +54,7 @@ NTSTATUS WINAPI NtQueryObject(
IN ULONG Length,
OUT PULONG ResultLength)
{
- FIXME("(0x%08x,0x%08x,%p,0x%08lx,%p): stub\n",
+ FIXME("(0x%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%08x,0x%08lx,%p,0x%08lx,%p) stub!\n",
+ FIXME("(0x%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%08x,0x%08x,%p),stub!\n",Object,Alertable,Time);
+ FIXME("(0x%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%08x,%p,0x%08lx,0x%08x,0x%08x,%p,%p) stub\n",
+ FIXME("(0x%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 NtQuerySymbolicLinkObjec
IN OUT PUNICODE_STRING LinkTarget,
OUT PULONG ReturnedLength OPTIONAL)
{
- FIXME("(0x%08x,%p,%p) stub\n",
+ FIXME("(0x%p,%p,%p) stub\n",
LinkHandle, debugstr_us(LinkTarget), ReturnedLength);
return 0;
Index: dlls/ntdll/reg.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/reg.c,v
retrieving revision 1.41
diff -u -3 -p -u -r1.41 reg.c
--- dlls/ntdll/reg.c 25 Oct 2002 19:14:29 -0000 1.41
+++ dlls/ntdll/reg.c 18 Nov 2002 21:51:08 -0000
@@ -55,7 +55,7 @@ NTSTATUS WINAPI NtCreateKey( PHKEY retke
{
NTSTATUS ret;
- TRACE( "(0x%x,%s,%s,%lx,%lx,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName),
+ TRACE( "(0x%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 retke
}
}
SERVER_END_REQ;
- TRACE("<- 0x%04x\n", *retkey);
+ TRACE("<- 0x%p\n", *retkey);
return ret;
}
@@ -95,7 +95,7 @@ NTSTATUS WINAPI NtOpenKey( PHKEY retkey,
NTSTATUS ret;
DWORD len = attr->ObjectName->Length;
- TRACE( "(0x%x,%s,%lx,%p)\n", attr->RootDirectory,
+ TRACE( "(0x%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,
*retkey = reply->hkey;
}
SERVER_END_REQ;
- TRACE("<- 0x%04x\n", *retkey);
+ TRACE("<- 0x%p\n", *retkey);
return ret;
}
@@ -123,7 +123,7 @@ NTSTATUS WINAPI NtDeleteKey( HKEY hkey )
{
NTSTATUS ret;
- TRACE( "(%x)\n", hkey );
+ TRACE( "(%p)\n", hkey );
SERVER_START_REQ( delete_key )
{
@@ -143,7 +143,7 @@ NTSTATUS WINAPI NtDeleteValueKey( HKEY h
{
NTSTATUS ret;
- TRACE( "(0x%x,%s)\n", hkey, debugstr_us(name) );
+ TRACE( "(0x%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( HKE
void *ptr;
size_t fixed_size;
- TRACE( "(0x%x,%lu,%d,%p,%ld)\n", handle, index, info_class, info, length );
+ TRACE( "(0x%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 ha
UCHAR *data_ptr;
int fixed_size = 0;
- TRACE( "(0x%x,%s,%d,%p,%ld)\n", handle, debugstr_us(name), info_class, info, length );
+ TRACE( "(0x%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 ha
*/
NTSTATUS WINAPI NtFlushKey(HKEY KeyHandle)
{
- FIXME("(0x%08x) stub!\n",
+ FIXME("(0x%p) stub!\n",
KeyHandle);
return 1;
}
@@ -457,7 +457,7 @@ NTSTATUS WINAPI NtNotifyChangeKey(
IN ULONG Length,
IN BOOLEAN WatchSubtree)
{
- FIXME("(0x%08x,0x%08x,%p,%p,%p,0x%08lx, 0x%08x,%p,0x%08lx,0x%08x) stub!\n",
+ FIXME("(0x%p,0x%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%08x,%p,0x%08lx,%p,0x%08lx,%p) stub!\n",
+ FIXME("(0x%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%08x),stub!\n", Key);
+ FIXME("(0x%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%08x,0x%08x,0x%08lx) stub\n",
+ FIXME("(0x%p,0x%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%08x,0x%08x) stub\n",
+ FIXME("(0x%p,0x%p) stub\n",
KeyHandle, FileHandle);
return STATUS_SUCCESS;
}
@@ -531,7 +531,7 @@ NTSTATUS WINAPI NtSetInformationKey(
IN PVOID KeyInformation,
IN ULONG KeyInformationLength)
{
- FIXME("(0x%08x,0x%08x,%p,0x%08lx) stub\n",
+ FIXME("(0x%p,0x%08x,%p,0x%08lx) stub\n",
KeyHandle, KeyInformationClass, KeyInformation, KeyInformationLength);
return STATUS_SUCCESS;
}
@@ -550,7 +550,7 @@ NTSTATUS WINAPI NtSetValueKey( HKEY hkey
{
NTSTATUS ret;
- TRACE( "(0x%x,%s,%ld,%p,%ld)\n", hkey, debugstr_us(name), type, data, count );
+ TRACE( "(0x%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
NTSTATUS WINAPI NtUnloadKey(
IN HKEY KeyHandle)
{
- FIXME("(0x%08x) stub\n",
+ FIXME("(0x%p) stub\n",
KeyHandle);
return STATUS_SUCCESS;
}
Index: dlls/ntdll/rtl.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/rtl.c,v
retrieving revision 1.51
diff -u -3 -p -u -r1.51 rtl.c
--- dlls/ntdll/rtl.c 15 Nov 2002 01:00:08 -0000 1.51
+++ dlls/ntdll/rtl.c 18 Nov 2002 21:51:08 -0000
@@ -221,7 +221,7 @@ void WINAPI RtlDumpResource(LPRTL_RWLOCK
MESSAGE("RtlDumpResource(%p):\n\tactive count = %i\n\twaiting readers = %i\n\twaiting writers = %i\n",
rwl, rwl->iNumberActive, rwl->uSharedWaiters, rwl->uExclusiveWaiters );
if( rwl->iNumberActive )
- MESSAGE("\towner thread = %08x\n", rwl->hOwningThreadId );
+ MESSAGE("\towner thread = %p\n", rwl->hOwningThreadId );
}
}
Index: dlls/ntdll/sec.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/sec.c,v
retrieving revision 1.29
diff -u -3 -p -u -r1.29 sec.c
--- dlls/ntdll/sec.c 12 Sep 2002 22:07:03 -0000 1.29
+++ dlls/ntdll/sec.c 18 Nov 2002 21:51:09 -0000
@@ -693,7 +693,7 @@ NtAccessCheck(
OUT PULONG GrantedAccess,
OUT PBOOLEAN AccessStatus)
{
- FIXME("(%p, %04x, %08lx, %p, %p, %p, %p, %p), stub\n",
+ FIXME("(%p, %p, %08lx, %p, %p, %p, %p, %p), stub\n",
SecurityDescriptor, ClientToken, DesiredAccess, GenericMapping,
PrivilegeSet, ReturnLength, GrantedAccess, AccessStatus);
*AccessStatus = TRUE;
@@ -709,7 +709,7 @@ NtSetSecurityObject(
IN SECURITY_INFORMATION SecurityInformation,
IN PSECURITY_DESCRIPTOR SecurityDescriptor)
{
- FIXME("0x%08x 0x%08lx %p\n", Handle, SecurityInformation, SecurityDescriptor);
+ FIXME("0x%p 0x%08lx %p\n", Handle, SecurityInformation, SecurityDescriptor);
return STATUS_SUCCESS;
}
Index: dlls/ntdll/sync.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/sync.c,v
retrieving revision 1.21
diff -u -3 -p -u -r1.21 sync.c
--- dlls/ntdll/sync.c 12 Sep 2002 22:07:03 -0000 1.21
+++ dlls/ntdll/sync.c 18 Nov 2002 21:51:09 -0000
@@ -97,7 +97,7 @@ NTSTATUS WINAPI NtQuerySemaphore(
ULONG Length,
PULONG ReturnLength)
{
- FIXME("(0x%08x,%p,%p,0x%08lx,%p) stub!\n",
+ FIXME("(0x%p,%p,%p,0x%08lx,%p) stub!\n",
SemaphoreHandle, SemaphoreInformationClass, SemaphoreInformation, Length, ReturnLength);
return STATUS_SUCCESS;
}
@@ -237,7 +237,7 @@ NTSTATUS WINAPI NtClearEvent ( HANDLE ha
NTSTATUS WINAPI NtPulseEvent( HANDLE handle, PULONG PulseCount )
{
NTSTATUS ret;
- FIXME("(0x%08x,%p)\n", handle, PulseCount);
+ FIXME("(0x%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%08x)\n", EventHandle);
+ FIXME("(0x%p)\n", EventHandle);
return STATUS_SUCCESS;
}
Index: dlls/ntdll/virtual.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/virtual.c,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 virtual.c
--- dlls/ntdll/virtual.c 6 Nov 2002 22:33:17 -0000 1.2
+++ dlls/ntdll/virtual.c 18 Nov 2002 21:51:10 -0000
@@ -154,7 +154,7 @@ static void VIRTUAL_DumpView( FILE_VIEW
else if (view->flags & VFLAG_VALLOC)
DPRINTF( " (valloc)\n" );
else if (view->mapping)
- DPRINTF( " %d\n", view->mapping );
+ DPRINTF( " %p\n", view->mapping );
else
DPRINTF( " (anonymous)\n");
@@ -1366,7 +1366,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HAND
return STATUS_ACCESS_DENIED;
}
- TRACE("handle=%x addr=%p off=%lx%08lx size=%x access=%lx\n",
+ TRACE("handle=%p addr=%p off=%lx%08lx size=%x access=%lx\n",
handle, *addr_ptr, offset->s.HighPart, offset->s.LowPart, size, protect );
/* Check parameters */
@@ -1464,7 +1464,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HAND
/* Map the file */
- TRACE("handle=%x size=%x offset=%lx\n", handle, size, offset->s.LowPart );
+ TRACE("handle=%p size=%x offset=%lx\n", handle, size, offset->s.LowPart );
ret = VIRTUAL_mmap( unix_handle, ptr, size, offset->s.LowPart, offset->s.HighPart,
VIRTUAL_GetUnixProt( prot ), flags | MAP_FIXED, &removable );
Index: files/dos_fs.c
===================================================================
RCS file: /home/wine/wine/files/dos_fs.c,v
retrieving revision 1.123
diff -u -3 -p -u -r1.123 dos_fs.c
--- files/dos_fs.c 28 Oct 2002 18:49:52 -0000 1.123
+++ files/dos_fs.c 18 Nov 2002 21:51:13 -0000
@@ -884,7 +884,7 @@ static HANDLE DOSFS_CreateCommPort(LPCWS
if(!ret)
ERR("Couldn't open device '%s' ! (check permissions)\n",devname);
else
- TRACE("return %08X\n", ret );
+ TRACE("return %p\n", ret );
return ret;
}
@@ -2149,7 +2149,7 @@ BOOL WINAPI FindClose( HANDLE handle )
}
__EXCEPT(page_fault)
{
- WARN("Illegal handle %x\n", handle);
+ WARN("Illegal handle %p\n", handle);
SetLastError( ERROR_INVALID_HANDLE );
return FALSE;
}
Index: files/file.c
===================================================================
RCS file: /home/wine/wine/files/file.c,v
retrieving revision 1.169
diff -u -3 -p -u -r1.169 file.c
--- files/file.c 15 Nov 2002 04:12:10 -0000 1.169
+++ files/file.c 18 Nov 2002 21:51:16 -0000
@@ -514,7 +514,7 @@ static HANDLE FILE_OpenPipe(LPCWSTR name
ret = reply->handle;
}
SERVER_END_REQ;
- TRACE("Returned %d\n",ret);
+ TRACE("Returned %p\n",ret);
return ret;
}
@@ -664,7 +664,7 @@ HANDLE WINAPI CreateFileW( LPCWSTR filen
GetDriveTypeW( full_name.short_name ) );
done:
if (!ret) ret = INVALID_HANDLE_VALUE;
- TRACE("returning %08x\n", ret);
+ TRACE("returning %p\n", ret);
return ret;
}
@@ -787,7 +787,7 @@ DWORD WINAPI GetFileInformationByHandle(
DWORD ret;
if (!info) return 0;
- TRACE("%08x\n", hFile);
+ TRACE("%p\n", hFile);
SERVER_START_REQ( get_file_info )
{
@@ -1363,7 +1363,7 @@ found:
ofs->Reserved2 = filedatetime[1];
success: /* We get here if the open was successful */
- TRACE("(%s): OK, return = %x\n", name, handle );
+ TRACE("(%s): OK, return = %p\n", name, handle );
if (win32)
{
hFileRet = (HFILE)handle;
@@ -1453,7 +1453,7 @@ HFILE WINAPI Win32HandleToDosFileHandle(
if (!dos_handles[i])
{
dos_handles[i] = handle;
- TRACE("Got %d for h32 %d\n", i, handle );
+ TRACE("Got %d for h32 %p\n", i, handle );
return (HFILE)i;
}
CloseHandle( handle );
@@ -1544,7 +1544,7 @@ HFILE16 WINAPI _lclose16( HFILE16 hFile
SetLastError( ERROR_INVALID_HANDLE );
return HFILE_ERROR16;
}
- TRACE("%d (handle32=%d)\n", hFile, dos_handles[hFile] );
+ TRACE("%d (handle32=%p)\n", hFile, dos_handles[hFile] );
CloseHandle( dos_handles[hFile] );
dos_handles[hFile] = 0;
return 0;
@@ -1586,7 +1586,7 @@ BOOL WINAPI GetOverlappedResult(
) {
DWORD r;
- TRACE("(%d %p %p %x)\n", hFile, lpOverlapped, lpTransferred, bWait);
+ TRACE("(%p %p %p %x)\n", hFile, lpOverlapped, lpTransferred, bWait);
if(lpOverlapped==NULL)
{
@@ -1645,7 +1645,7 @@ BOOL WINAPI CancelIo(HANDLE handle)
{
async_private *ovp,*t;
- TRACE("handle = %x\n",handle);
+ TRACE("handle = %p\n",handle);
for (ovp = NtCurrentTeb()->pending_list; ovp; ovp = t)
{
@@ -1723,7 +1723,7 @@ static BOOL FILE_ReadFileEx(HANDLE hFile
int flags;
enum fd_type type;
- TRACE("file %d to buf %p num %ld %p func %p\n",
+ TRACE("file %p to buf %p num %ld %p func %p\n",
hFile, buffer, bytesToRead, overlapped, lpCompletionRoutine);
/* check that there is an overlapped struct */
@@ -1784,7 +1784,7 @@ static BOOL FILE_TimeoutRead(HANDLE hFil
OVERLAPPED ov;
BOOL r = FALSE;
- TRACE("%d %p %ld %p\n", hFile, buffer, bytesToRead, bytesRead );
+ TRACE("%p %p %ld %p\n", hFile, buffer, bytesToRead, bytesRead );
ZeroMemory(&ov, sizeof (OVERLAPPED));
if(STATUS_SUCCESS==NtCreateEvent(&ov.hEvent, SYNCHRONIZE, NULL, 0, 0))
@@ -1807,7 +1807,7 @@ BOOL WINAPI ReadFile( HANDLE hFile, LPVO
int unix_handle, result, flags;
enum fd_type type;
- TRACE("%d %p %ld %p %p\n", hFile, buffer, bytesToRead,
+ TRACE("%p %p %ld %p %p\n", hFile, buffer, bytesToRead,
bytesRead, overlapped );
if (bytesRead) *bytesRead = 0; /* Do this before anything else */
@@ -1967,7 +1967,7 @@ static BOOL FILE_WriteFileEx(HANDLE hFil
int flags;
enum fd_type type;
- TRACE("file %d to buf %p num %ld %p func %p handle %d\n",
+ TRACE("file %p to buf %p num %ld %p func %p handle %p\n",
hFile, buffer, bytesToWrite, overlapped, lpCompletionRoutine, hEvent);
if (overlapped == NULL)
@@ -2031,7 +2031,7 @@ BOOL WINAPI WriteFile( HANDLE hFile, LPC
int unix_handle, result, flags;
enum fd_type type;
- TRACE("%d %p %ld %p %p\n", hFile, buffer, bytesToWrite,
+ TRACE("%p %p %ld %p %p\n", hFile, buffer, bytesToWrite,
bytesWritten, overlapped );
if (bytesWritten) *bytesWritten = 0; /* Do this before anything else */
@@ -2069,7 +2069,7 @@ BOOL WINAPI WriteFile( HANDLE hFile, LPC
switch(type)
{
case FD_TYPE_CONSOLE:
- TRACE("%d %s %ld %p %p\n", hFile, debugstr_an(buffer, bytesToWrite), bytesToWrite,
+ TRACE("%p %s %ld %p %p\n", hFile, debugstr_an(buffer, bytesToWrite), bytesToWrite,
bytesWritten, overlapped );
return FILE_WriteConsole(hFile, buffer, bytesToWrite, bytesWritten, NULL);
@@ -2207,7 +2207,7 @@ DWORD WINAPI SetFilePointer( HANDLE hFil
{
DWORD ret = INVALID_SET_FILE_POINTER;
- TRACE("handle %d offset %ld high %ld origin %ld\n",
+ TRACE("handle %p offset %ld high %ld origin %ld\n",
hFile, distance, highword?*highword:0, method );
SERVER_START_REQ( set_file_pointer )
@@ -3108,7 +3108,7 @@ BOOL WINAPI LockFileEx( HANDLE hFile, DW
DWORD nNumberOfBytesToLockLow, DWORD nNumberOfBytesToLockHigh,
LPOVERLAPPED pOverlapped )
{
- FIXME("hFile=%d,flags=%ld,reserved=%ld,lowbytes=%ld,highbytes=%ld,overlapped=%p: stub.\n",
+ FIXME("hFile=%p,flags=%ld,reserved=%ld,lowbytes=%ld,highbytes=%ld,overlapped=%p: stub.\n",
hFile, flags, reserved, nNumberOfBytesToLockLow, nNumberOfBytesToLockHigh,
pOverlapped);
if (reserved == 0)
@@ -3158,7 +3158,7 @@ BOOL WINAPI UnlockFileEx(
LPOVERLAPPED lpOverlapped
)
{
- FIXME("hFile=%d,reserved=%ld,lowbytes=%ld,highbytes=%ld,overlapped=%p: stub.\n",
+ FIXME("hFile=%p,reserved=%ld,lowbytes=%ld,highbytes=%ld,overlapped=%p: stub.\n",
hFile, dwReserved, nNumberOfBytesToUnlockLow, nNumberOfBytesToUnlockHigh,
lpOverlapped);
if (dwReserved == 0)
Index: files/smb.c
===================================================================
RCS file: /home/wine/wine/files/smb.c,v
retrieving revision 1.12
diff -u -3 -p -u -r1.12 smb.c
--- files/smb.c 17 Sep 2002 01:35:09 -0000 1.12
+++ files/smb.c 18 Nov 2002 21:51:17 -0000
@@ -1385,7 +1385,7 @@ static HANDLE SMB_RegisterFile( int fd,
SERVER_END_REQ;
if(!r)
- TRACE("created wineserver smb object, handle = %04x\n",ret);
+ TRACE("created wineserver smb object, handle = %p\n",ret);
else
SetLastError( ERROR_PATH_NOT_FOUND );
@@ -1507,7 +1507,7 @@ BOOL WINAPI SMB_ReadFile(HANDLE hFile, L
USHORT user_id, tree_id, dialect, file_id, read;
BOOL r=TRUE;
- TRACE("%04x %p %ld %p\n", hFile, buffer, bytesToRead, bytesRead);
+ TRACE("%p %p %ld %p\n", hFile, buffer, bytesToRead, bytesRead);
if(!SMB_GetSmbInfo(hFile, &tree_id, &user_id, &dialect, &file_id, &offset))
return FALSE;
Index: files/tape.c
===================================================================
RCS file: /home/wine/wine/files/tape.c,v
retrieving revision 1.7
diff -u -3 -p -u -r1.7 tape.c
--- files/tape.c 31 May 2002 23:06:47 -0000 1.7
+++ files/tape.c 18 Nov 2002 21:51:18 -0000
@@ -36,7 +36,7 @@ BOOL WINAPI BackupRead( HANDLE hFile, LP
LPDWORD lpNumberOfBytesRead, BOOL bAbort,
BOOL bProcessSecurity, LPVOID *lpContext )
{
- FIXME("(%04x, %p, %ld, %p, %d, %d, %p) stub!\n", hFile, lpBuffer,
+ FIXME("(%p, %p, %ld, %p, %d, %d, %p) stub!\n", hFile, lpBuffer,
nNumberOfBytesToRead, lpNumberOfBytesRead, bAbort, bProcessSecurity,
lpContext);
@@ -53,7 +53,7 @@ BOOL WINAPI BackupSeek( HANDLE hFile, DW
LPDWORD lpdwLowByteSeeked, LPDWORD lpdwHighByteSeeked,
LPVOID *lpContext )
{
- FIXME("(%04x, %ld, %ld, %p, %p, %p) stub!\n", hFile, dwLowBytesToSeek,
+ FIXME("(%p, %ld, %ld, %p, %p, %p) stub!\n", hFile, dwLowBytesToSeek,
dwHighBytesToSeek, lpdwLowByteSeeked, lpdwHighByteSeeked, lpContext);
SetLastError( ERROR_NOT_SUPPORTED );
@@ -69,7 +69,7 @@ BOOL WINAPI BackupWrite( HANDLE hFile, L
LPDWORD lpNumberOfBytesWritten, BOOL bAbort,
BOOL bProcessSecurity, LPVOID *lpContext )
{
- FIXME("(%04x, %p, %ld, %p, %d, %d, %p) stub!\n", hFile, lpBuffer,
+ FIXME("(%p, %p, %ld, %p, %d, %d, %p) stub!\n", hFile, lpBuffer,
nNumberOfBytesToWrite, lpNumberOfBytesWritten, bAbort,
bProcessSecurity, lpContext);
@@ -85,7 +85,7 @@ BOOL WINAPI BackupWrite( HANDLE hFile, L
DWORD WINAPI CreateTapePartition( HANDLE hDevice, DWORD dwPartitionMethod,
DWORD dwCount, DWORD dwSize )
{
- FIXME("(%04x, %ld, %ld, %ld) stub!\n", hDevice, dwPartitionMethod, dwCount,
+ FIXME("(%p, %ld, %ld, %ld) stub!\n", hDevice, dwPartitionMethod, dwCount,
dwSize);
SetLastError( ERROR_NOT_SUPPORTED );
@@ -99,7 +99,7 @@ DWORD WINAPI CreateTapePartition( HANDLE
*/
DWORD WINAPI EraseTape( HANDLE hDevice, DWORD dwEraseType, BOOL bImmediate )
{
- FIXME("(%04x, %ld, %d) stub!\n", hDevice, dwEraseType, bImmediate);
+ FIXME("(%p, %ld, %d) stub!\n", hDevice, dwEraseType, bImmediate);
SetLastError( ERROR_NOT_SUPPORTED );
@@ -113,7 +113,7 @@ DWORD WINAPI EraseTape( HANDLE hDevice,
DWORD WINAPI GetTapeParameters( HANDLE hDevice, DWORD dwOperation,
LPDWORD lpdwSize, LPVOID lpTapeInformation )
{
- FIXME("(%04x, %ld, %p, %p) stub!\n", hDevice, dwOperation, lpdwSize,
+ FIXME("(%p, %ld, %p, %p) stub!\n", hDevice, dwOperation, lpdwSize,
lpTapeInformation);
SetLastError( ERROR_NOT_SUPPORTED );
@@ -129,7 +129,7 @@ DWORD WINAPI GetTapePosition( HANDLE hDe
LPDWORD lpdwPartition, LPDWORD lpdwOffsetLow,
LPDWORD lpdwOffsetHigh )
{
- FIXME("(%04x, %ld, %p, %p, %p) stub!\n", hDevice, dwPositionType,
+ FIXME("(%p, %ld, %p, %p, %p) stub!\n", hDevice, dwPositionType,
lpdwPartition, lpdwOffsetLow, lpdwOffsetHigh);
SetLastError( ERROR_NOT_SUPPORTED );
@@ -143,7 +143,7 @@ DWORD WINAPI GetTapePosition( HANDLE hDe
*/
DWORD WINAPI GetTapeStatus( HANDLE hDevice )
{
- FIXME("(%04x) stub!\n", hDevice);
+ FIXME("(%p) stub!\n", hDevice);
SetLastError( ERROR_NOT_SUPPORTED );
@@ -156,7 +156,7 @@ DWORD WINAPI GetTapeStatus( HANDLE hDevi
*/
DWORD WINAPI PrepareTape( HANDLE hDevice, DWORD dwOperation, BOOL bImmediate )
{
- FIXME("(%04x, %ld, %d) stub!\n", hDevice, dwOperation, bImmediate);
+ FIXME("(%p, %ld, %d) stub!\n", hDevice, dwOperation, bImmediate);
SetLastError( ERROR_NOT_SUPPORTED );
@@ -170,7 +170,7 @@ DWORD WINAPI PrepareTape( HANDLE hDevice
DWORD WINAPI SetTapeParameters( HANDLE hDevice, DWORD dwOperation,
LPVOID lpTapeInformation )
{
- FIXME("(%04x, %ld, %p) stub!\n", hDevice, dwOperation, lpTapeInformation);
+ FIXME("(%p, %ld, %p) stub!\n", hDevice, dwOperation, lpTapeInformation);
SetLastError( ERROR_NOT_SUPPORTED );
@@ -185,7 +185,7 @@ DWORD WINAPI SetTapePosition( HANDLE hDe
dwPartition, DWORD dwOffsetLow, DWORD dwOffsetHigh,
BOOL bImmediate )
{
- FIXME("(%04x, %ld, %ld, %ld, %ld, %d) stub!\n", hDevice, dwPositionMethod,
+ FIXME("(%p, %ld, %ld, %ld, %ld, %d) stub!\n", hDevice, dwPositionMethod,
dwPartition, dwOffsetLow, dwOffsetHigh, bImmediate);
SetLastError( ERROR_NOT_SUPPORTED );
@@ -200,7 +200,7 @@ DWORD WINAPI SetTapePosition( HANDLE hDe
DWORD WINAPI WriteTapemark( HANDLE hDevice, DWORD dwTapemarkType, DWORD
dwTapemarkCount, BOOL bImmediate )
{
- FIXME("(%04x, %ld, %ld, %d) stub!\n", hDevice, dwTapemarkType,
+ FIXME("(%p, %ld, %ld, %d) stub!\n", hDevice, dwTapemarkType,
dwTapemarkCount, bImmediate);
SetLastError( ERROR_NOT_SUPPORTED );
Index: loader/module.c
===================================================================
RCS file: /home/wine/wine/loader/module.c,v
retrieving revision 1.168
diff -u -3 -p -u -r1.168 module.c
--- loader/module.c 15 Nov 2002 04:14:27 -0000 1.168
+++ loader/module.c 18 Nov 2002 21:51:19 -0000
@@ -85,7 +85,7 @@ static WINE_MODREF *MODULE32_LookupHMODU
return exe_modref;
if (!HIWORD(hmod)) {
- ERR("tried to lookup 0x%04x in win32 module handler!\n",hmod);
+ ERR("tried to lookup 0x%p in win32 module handler!\n",hmod);
SetLastError( ERROR_INVALID_HANDLE );
return NULL;
}
@@ -987,7 +987,7 @@ HINSTANCE WINAPI LoadModule( LPCSTR name
}
else if ((hInstance = (HINSTANCE)GetLastError()) >= (HINSTANCE)32)
{
- FIXME("Strange error set by CreateProcess: %d\n", hInstance );
+ FIXME("Strange error set by CreateProcess: %p\n", hInstance );
hInstance = (HINSTANCE)11;
}
@@ -1262,7 +1262,7 @@ WINE_MODREF *MODULE_LoadLibraryExA( LPCS
pwm->flags &= ~WINE_MODREF_DONT_RESOLVE_REFS;
PE_fixup_imports( pwm );
}
- TRACE("Already loaded module '%s' at 0x%08x, count=%d\n", filename, pwm->module, pwm->refCount);
+ TRACE("Already loaded module '%s' at 0x%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( LPCS
if(pwm)
{
/* Initialize DLL just loaded */
- TRACE("Loaded module '%s' at 0x%08x\n", filename, pwm->module);
+ TRACE("Loaded module '%s' at 0x%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 */
@@ -1574,7 +1574,7 @@ FARPROC16 WINAPI WIN32_GetProcAddress16(
}
if (HIWORD(hModule))
{
- WARN("hModule is Win32 handle (%08x)\n", hModule );
+ WARN("hModule is Win32 handle (%p)\n", hModule );
return (FARPROC16)0;
}
return GetProcAddress16( LOWORD(hModule), name );
Index: loader/pe_image.c
===================================================================
RCS file: /home/wine/wine/loader/pe_image.c,v
retrieving revision 1.116
diff -u -3 -p -u -r1.116 pe_image.c
--- loader/pe_image.c 4 Oct 2002 00:27:10 -0000 1.116
+++ loader/pe_image.c 18 Nov 2002 21:51:20 -0000
@@ -623,11 +623,11 @@ BOOL PE_InitDLL( HMODULE module, DWORD t
{
DLLENTRYPROC entry = (void*)((char*)module + nt->OptionalHeader.AddressOfEntryPoint);
if (TRACE_ON(relay))
- DPRINTF("%08lx:Call PE DLL (proc=%p,module=%08x,type=%ld,res=%p)\n",
+ DPRINTF("%08lx:Call PE DLL (proc=%p,module=%p,type=%ld,res=%p)\n",
GetCurrentThreadId(), entry, module, type, lpReserved );
retv = entry( module, type, lpReserved );
if (TRACE_ON(relay))
- DPRINTF("%08lx:Ret PE DLL (proc=%p,module=%08x,type=%ld,res=%p) retval=%x\n",
+ DPRINTF("%08lx:Ret PE DLL (proc=%p,module=%p,type=%ld,res=%p) retval=%x\n",
GetCurrentThreadId(), entry, module, type, lpReserved, retv );
}
Index: loader/resource.c
===================================================================
RCS file: /home/wine/wine/loader/resource.c,v
retrieving revision 1.63
diff -u -3 -p -u -r1.63 resource.c
--- loader/resource.c 24 Sep 2002 18:29:39 -0000 1.63
+++ loader/resource.c 18 Nov 2002 21:51:20 -0000
@@ -50,6 +50,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(resource);
/* handle conversions */
#define HRSRC_32(h16) ((HRSRC)(ULONG_PTR)(h16))
+#define HGLOBAL_32(h16) ((HGLOBAL)(ULONG_PTR)(h16))
+#define HGLOBAL_16(h32) (LOWORD(h32))
+#define HMODULE_32(h16) ((HMODULE)(ULONG_PTR)(h16))
typedef struct _HRSRC_ELEM
{
@@ -150,7 +153,7 @@ static HRSRC RES_FindResource2( HMODULE
{
HRSRC hRsrc = 0;
- TRACE("(%08x, %08x%s, %08x%s, %04x, %s, %s)\n",
+ TRACE("(%p, %08x%s, %08x%s, %04x, %s, %s)\n",
hModule,
(UINT)type, HIWORD(type)? (bUnicode? debugstr_w((LPWSTR)type) : debugstr_a(type)) : "",
(UINT)name, HIWORD(name)? (bUnicode? debugstr_w((LPWSTR)name) : debugstr_a(name)) : "",
@@ -258,7 +261,7 @@ static DWORD RES_SizeofResource( HMODULE
{
if (!hRsrc) return 0;
- TRACE("(%08x, %08x, %s)\n", hModule, hRsrc, bRet16? "NE" : "PE" );
+ TRACE("(%p, %p, %s)\n", hModule, hRsrc, bRet16? "NE" : "PE" );
if (!HIWORD(hModule))
{
@@ -287,7 +290,7 @@ static HGLOBAL RES_LoadResource( HMODULE
{
HGLOBAL hMem = 0;
- TRACE("(%08x, %08x, %s)\n", hModule, hRsrc, bRet16? "NE" : "PE" );
+ TRACE("(%p, %p, %s)\n", hModule, hRsrc, bRet16? "NE" : "PE" );
if (!hRsrc) return 0;
@@ -301,10 +304,10 @@ static HGLOBAL RES_LoadResource( HMODULE
/* 16-bit NE module */
/* If we got a 32-bit hRsrc, we don't need to convert it */
- hMem = NE_LoadResource( pModule, LOWORD(hRsrc) );
+ hMem = HGLOBAL_32(NE_LoadResource( pModule, LOWORD(hRsrc) ));
/* If we are to return a 32-bit resource, we should probably
- convert it but we don't for now. FIXME !!! */
+ convert it but we don't for now. FIXME !!! */ /* hMem is now converted to HGLOBAL */
return hMem;
}
else
@@ -321,7 +324,7 @@ static HGLOBAL RES_LoadResource( HMODULE
DWORD size = SizeofResource( hModule, hRsrc );
LPVOID bits = LockResource( hMem );
- hMem = NE_LoadPEResource( pModule, type, bits, size );
+ hMem = HGLOBAL_32(NE_LoadPEResource( pModule, type, bits, size ));
}
}
}
@@ -339,7 +342,7 @@ static HGLOBAL RES_LoadResource( HMODULE
*/
HRSRC16 WINAPI FindResource16( HMODULE16 hModule, LPCSTR name, LPCSTR type )
{
- return LOWORD( RES_FindResource( hModule, type, name,
+ return LOWORD( RES_FindResource( HMODULE_32(hModule), type, name,
MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), FALSE, TRUE ) );
}
@@ -386,7 +389,7 @@ HRSRC WINAPI FindResourceW(HINSTANCE hMo
*/
HGLOBAL16 WINAPI LoadResource16( HMODULE16 hModule, HRSRC16 hRsrc )
{
- return RES_LoadResource( hModule, HRSRC_32(hRsrc), TRUE );
+ return HGLOBAL_16(RES_LoadResource( HMODULE_32(hModule), HRSRC_32(hRsrc), TRUE ));
}
/**********************************************************************
@@ -420,7 +423,7 @@ LPVOID WINAPI LockResource16( HGLOBAL16
*/
LPVOID WINAPI LockResource( HGLOBAL handle )
{
- TRACE("(%08x)\n", handle );
+ TRACE("(%p)\n", handle );
if (HIWORD( handle )) /* 32-bit memory handle */
return (LPVOID)handle;
@@ -476,7 +479,7 @@ BOOL WINAPI FreeResource( HGLOBAL handle
*/
DWORD WINAPI SizeofResource16( HMODULE16 hModule, HRSRC16 hRsrc )
{
- return RES_SizeofResource( hModule, HRSRC_32(hRsrc), TRUE );
+ return RES_SizeofResource( HMODULE_32(hModule), HRSRC_32(hRsrc), TRUE );
}
/**********************************************************************
Index: loader/ne/module.c
===================================================================
RCS file: /home/wine/wine/loader/ne/module.c,v
retrieving revision 1.122
diff -u -3 -p -u -r1.122 module.c
--- loader/ne/module.c 23 Oct 2002 18:50:10 -0000 1.122
+++ loader/ne/module.c 18 Nov 2002 21:51:22 -0000
@@ -126,7 +126,7 @@ void NE_DumpModule( HMODULE16 hModule )
pModule->os_flags, pModule->min_swap_area,
pModule->expected_version );
if (pModule->flags & NE_FFLAGS_WIN32)
- DPRINTF( "PE module=%08x\n", pModule->module32 );
+ DPRINTF( "PE module=%p\n", pModule->module32 );
/* Dump the file info */
DPRINTF( "---\n" );
@@ -432,7 +432,7 @@ HANDLE NE_OpenFile( NE_MODULE *pModule )
if ((handle = CreateFileA( name, GENERIC_READ, FILE_SHARE_READ,
NULL, OPEN_EXISTING, 0, 0 )) == INVALID_HANDLE_VALUE)
MESSAGE( "Can't open file '%s' for module %04x\n", name, pModule->self );
- TRACE("opened '%s' -> %d\n", name, handle);
+ TRACE("opened '%s' -> %p\n", name, handle);
return handle;
}
@@ -440,7 +440,7 @@ HANDLE NE_OpenFile( NE_MODULE *pModule )
/***********************************************************************
* NE_LoadExeHeader
*/
-static HMODULE16 NE_LoadExeHeader( HANDLE hFile, LPCSTR path )
+static HMODULE16 NE_LoadExeHeader( HFILE hFile, LPCSTR path )
{
IMAGE_DOS_HEADER mz_header;
IMAGE_OS2_HEADER ne_header;
@@ -898,7 +898,7 @@ static HINSTANCE16 NE_LoadModule( LPCSTR
if ((hFile = OpenFile16( name, &ofs, OF_READ )) == HFILE_ERROR16)
return (HMODULE16)2; /* File not found */
- hModule = NE_LoadExeHeader( DosFileHandleToWin32Handle(hFile), ofs.szPathName );
+ hModule = NE_LoadExeHeader( hFile, ofs.szPathName );
_lclose16( hFile );
if (hModule < 32) return hModule;
@@ -1118,7 +1118,7 @@ HINSTANCE16 NE_StartMain( LPCSTR name, H
INT len;
LPSTR pCmdLine, cmdline = GetCommandLineA();
- if ((hModule = NE_LoadExeHeader( file, name )) < 32) return hModule;
+ if ((hModule = NE_LoadExeHeader( Win32HandleToDosFileHandle(file), name )) < 32) return hModule;
if (!(pModule = NE_GetPtr( hModule ))) return (HINSTANCE16)11;
if (pModule->flags & NE_FFLAGS_LIBMODULE)
Index: loader/ne/resource.c
===================================================================
RCS file: /home/wine/wine/loader/ne/resource.c,v
retrieving revision 1.40
diff -u -3 -p -u -r1.40 resource.c
--- loader/ne/resource.c 18 Oct 2002 00:27:38 -0000 1.40
+++ loader/ne/resource.c 18 Nov 2002 21:51:23 -0000
@@ -453,7 +453,7 @@ DWORD NE_SizeofResource( NE_MODULE *pMod
if (!pModule || !pModule->res_table) return 0;
- TRACE("module=%04x res=%04x\n", pModule->self, hRsrc );
+ TRACE("module=%04x res=%p\n", pModule->self, hRsrc );
sizeShift = *(WORD *)((char *)pModule + pModule->res_table);
pNameInfo = (NE_NAMEINFO*)((char*)pModule + LOWORD(hRsrc));
Index: loader/ne/segment.c
===================================================================
RCS file: /home/wine/wine/loader/ne/segment.c,v
retrieving revision 1.49
diff -u -3 -p -u -r1.49 segment.c
--- loader/ne/segment.c 28 Aug 2002 23:42:35 -0000 1.49
+++ loader/ne/segment.c 18 Nov 2002 21:51:23 -0000
@@ -165,7 +165,7 @@ BOOL NE_LoadSegment( NE_MODULE *pModule,
NtCurrentTeb()->cur_stack = MAKESEGPTR(pModule->self_loading_sel,
0xff00 - sizeof(STACK16FRAME));
- TRACE_(dll)("CallLoadAppSegProc(hmodule=0x%04x,hf=0x%04x,segnum=%d\n",
+ TRACE_(dll)("CallLoadAppSegProc(hmodule=0x%04x,hf=0x%p,segnum=%d\n",
pModule->self,hf,segnum );
DuplicateHandle( GetCurrentProcess(), hf, GetCurrentProcess(), &hFile32,
0, FALSE, DUPLICATE_SAME_ACCESS );
Index: memory/global.c
===================================================================
RCS file: /home/wine/wine/memory/global.c,v
retrieving revision 1.71
diff -u -3 -p -u -r1.71 global.c
--- memory/global.c 13 Nov 2002 19:48:07 -0000 1.71
+++ memory/global.c 18 Nov 2002 21:51:24 -0000
@@ -1499,7 +1499,7 @@ UINT WINAPI GlobalFlags(
}
else
{
- WARN("Invalid handle: %04x\n", hmem);
+ WARN("Invalid handle: %p\n", hmem);
retval=0;
}
/* HeapUnlock(GetProcessHeap()); */
Index: misc/registry.c
===================================================================
RCS file: /home/wine/wine/misc/registry.c,v
retrieving revision 1.119
diff -u -3 -p -u -r1.119 registry.c
--- misc/registry.c 15 Nov 2002 01:01:48 -0000 1.119
+++ misc/registry.c 18 Nov 2002 21:51:25 -0000
@@ -434,7 +434,7 @@ void _w31_loadreg(void)
return;
}
- if (!GetFileInformationByHandle(hf,&hfinfo)) {
+ if (!GetFileInformationByHandle(DosFileHandleToWin32Handle(hf),&hfinfo)) {
ERR("GetFileInformationByHandle failed?.\n");
free(tab);
free(txt);
Index: relay32/builtin32.c
===================================================================
RCS file: /home/wine/wine/relay32/builtin32.c,v
retrieving revision 1.89
diff -u -3 -p -u -r1.89 builtin32.c
--- relay32/builtin32.c 28 Aug 2002 23:42:36 -0000 1.89
+++ relay32/builtin32.c 18 Nov 2002 21:51:26 -0000
@@ -132,7 +132,7 @@ static void load_library( void *base, co
SetLastError( ERROR_OUTOFMEMORY );
return;
}
- TRACE( "loaded %s %p %x\n", fullname, wm, module );
+ TRACE( "loaded %s %p %p\n", fullname, wm, module );
HeapFree( GetProcessHeap(), 0, fullname );
wm->refCount++; /* we don't support freeing builtin dlls (FIXME)*/
Index: relay32/snoop.c
===================================================================
RCS file: /home/wine/wine/relay32/snoop.c,v
retrieving revision 1.58
diff -u -3 -p -u -r1.58 snoop.c
--- relay32/snoop.c 12 Sep 2002 22:07:06 -0000 1.58
+++ relay32/snoop.c 18 Nov 2002 21:51:26 -0000
@@ -143,7 +143,7 @@ SNOOP_RegisterDLL(HMODULE hmod,LPCSTR na
SNOOP_DLL **dll = &(firstdll);
char *s;
- TRACE("hmod=%x, name=%s, ordbase=%ld, nrofordinals=%ld\n",
+ TRACE("hmod=%p, name=%s, ordbase=%ld, nrofordinals=%ld\n",
hmod, name, ordbase, nrofordinals);
if (!TRACE_ON(snoop)) return;
Index: scheduler/handle.c
===================================================================
RCS file: /home/wine/wine/scheduler/handle.c,v
retrieving revision 1.34
diff -u -3 -p -u -r1.34 handle.c
--- scheduler/handle.c 16 Sep 2002 19:32:50 -0000 1.34
+++ scheduler/handle.c 18 Nov 2002 21:51:26 -0000
@@ -124,7 +124,7 @@ HANDLE WINAPI ConvertToGlobalHandle(HAND
* SetHandleContext (KERNEL32.@)
*/
BOOL WINAPI SetHandleContext(HANDLE hnd,DWORD context) {
- FIXME("(%d,%ld), stub. In case this got called by WSOCK32/WS2_32: the external WINSOCK DLLs won't work with WINE, don't use them.\n",hnd,context);
+ FIXME("(%p,%ld), stub. In case this got called by WSOCK32/WS2_32: the external WINSOCK DLLs won't work with WINE, don't use them.\n",hnd,context);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@@ -133,7 +133,7 @@ BOOL WINAPI SetHandleContext(HANDLE hnd,
* GetHandleContext (KERNEL32.@)
*/
DWORD WINAPI GetHandleContext(HANDLE hnd) {
- FIXME("(%d), stub. In case this got called by WSOCK32/WS2_32: the external WINSOCK DLLs won't work with WINE, don't use them.\n",hnd);
+ FIXME("(%p), stub. In case this got called by WSOCK32/WS2_32: the external WINSOCK DLLs won't work with WINE, don't use them.\n",hnd);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0;
}
Index: scheduler/process.c
===================================================================
RCS file: /home/wine/wine/scheduler/process.c,v
retrieving revision 1.202
diff -u -3 -p -u -r1.202 process.c
--- scheduler/process.c 17 Oct 2002 18:24:36 -0000 1.202
+++ scheduler/process.c 18 Nov 2002 21:51:27 -0000
@@ -583,7 +583,7 @@ void PROCESS_InitWine( int argc, char *a
argv++; /* remove argv[0] (wine itself) */
- TRACE( "starting process name=%s file=%x argv[0]=%s\n",
+ TRACE( "starting process name=%s file=%p argv[0]=%s\n",
debugstr_a(main_exe_name), main_exe_file, debugstr_a(argv[0]) );
if (!main_exe_name[0])
@@ -1635,7 +1635,7 @@ DWORD WINAPI GetProcessFlags( DWORD proc
BOOL WINAPI SetProcessWorkingSetSize(HANDLE hProcess, SIZE_T minset,
SIZE_T maxset)
{
- FIXME("(0x%08x,%ld,%ld): stub - harmless\n",hProcess,minset,maxset);
+ FIXME("(0x%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 */
@@ -1649,7 +1649,7 @@ BOOL WINAPI SetProcessWorkingSetSize(HAN
BOOL WINAPI GetProcessWorkingSetSize(HANDLE hProcess, PSIZE_T minset,
PSIZE_T maxset)
{
- FIXME("(0x%08x,%p,%p): stub\n",hProcess,minset,maxset);
+ FIXME("(0x%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;
@@ -1691,7 +1691,7 @@ BOOL WINAPI GetProcessShutdownParameters
*/
BOOL WINAPI SetProcessPriorityBoost(HANDLE hprocess,BOOL disableboost)
{
- FIXME("(%d,%d): stub\n",hprocess,disableboost);
+ FIXME("(%p,%d): stub\n",hprocess,disableboost);
/* Say we can do it. I doubt the program will notice that we don't. */
return TRUE;
}
Index: scheduler/syslevel.c
===================================================================
RCS file: /home/wine/wine/scheduler/syslevel.c,v
retrieving revision 1.34
diff -u -3 -p -u -r1.34 syslevel.c
--- scheduler/syslevel.c 3 Oct 2002 19:54:57 -0000 1.34
+++ scheduler/syslevel.c 18 Nov 2002 21:51:27 -0000
@@ -70,7 +70,7 @@ VOID WINAPI _CreateSysLevel(SYSLEVEL *lo
InitializeCriticalSection( &lock->crst );
lock->level = level;
- TRACE("(%p, %d): handle is %d\n",
+ TRACE("(%p, %d): handle is %p\n",
lock, level, lock->crst.LockSemaphore );
}
Index: scheduler/thread.c
===================================================================
RCS file: /home/wine/wine/scheduler/thread.c,v
retrieving revision 1.124
diff -u -3 -p -u -r1.124 thread.c
--- scheduler/thread.c 18 Oct 2002 00:29:33 -0000 1.124
+++ scheduler/thread.c 18 Nov 2002 21:51:28 -0000
@@ -562,7 +562,7 @@ DWORD WINAPI SetThreadIdealProcessor(
HANDLE hThread, /* [in] Specifies the thread of interest */
DWORD dwIdealProcessor) /* [in] Specifies the new preferred processor */
{
- FIXME("(0x%08x): stub\n",hThread);
+ FIXME("(0x%p): stub\n",hThread);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return -1L;
}
@@ -691,7 +691,7 @@ BOOL WINAPI GetThreadTimes(
LPFILETIME kerneltime, /* [out] Time thread spent in kernel mode */
LPFILETIME usertime) /* [out] Time thread spent in user mode */
{
- FIXME("(0x%08x): stub\n",thread);
+ FIXME("(0x%p): stub\n",thread);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
Index: win32/device.c
===================================================================
RCS file: /home/wine/wine/win32/device.c,v
retrieving revision 1.72
diff -u -3 -p -u -r1.72 device.c
--- win32/device.c 15 Nov 2002 01:35:52 -0000 1.72
+++ win32/device.c 18 Nov 2002 21:51:32 -0000
@@ -408,7 +408,7 @@ BOOL WINAPI DeviceIoControl(HANDLE hDevi
{
DWORD clientID;
- TRACE( "(%d,%ld,%p,%ld,%p,%ld,%p,%p)\n",
+ TRACE( "(%p,%ld,%p,%ld,%p,%ld,%p,%p)\n",
hDevice,dwIoControlCode,lpvInBuffer,cbInBuffer,
lpvOutBuffer,cbOutBuffer,lpcbBytesReturned,lpOverlapped );
@@ -639,7 +639,7 @@ static HKEY create_special_root_hkey( HK
if (NtCreateKey( &hkey, access, &attr, 0, NULL, 0, NULL )) return 0;
}
- if (!(ret = InterlockedCompareExchange( (PLONG)&special_root_keys[idx], hkey, 0 )))
+ if (!(ret = InterlockedCompareExchangePointer( (PVOID) &special_root_keys[idx], hkey, 0 )))
ret = hkey;
else
NtClose( hkey ); /* somebody beat us to it */
@@ -952,7 +952,7 @@ static DWORD VMM_RegEnumValueA( HKEY hke
KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer;
static const int info_size = offsetof( KEY_VALUE_FULL_INFORMATION, Name );
- TRACE("(%x,%ld,%p,%p,%p,%p,%p,%p)\n",
+ TRACE("(%p,%ld,%p,%p,%p,%p,%p,%p)\n",
hkey, index, value, val_count, reserved, type, data, count );
/* NT only checks count, not val_count */
@@ -1227,7 +1227,7 @@ static DWORD VxDCall_VMM( DWORD service,
case 0x001C: /* RegFlushKey */
{
HKEY hkey = (HKEY)stack32_pop( context );
- FIXME( "RegFlushKey(%x): stub\n", hkey );
+ FIXME( "RegFlushKey(%p): stub\n", hkey );
return ERROR_SUCCESS;
}
@@ -1252,7 +1252,7 @@ static DWORD VxDCall_VMM( DWORD service,
HKEY hkey = (HKEY) stack32_pop( context );
LPCSTR lpszSubKey = (LPCSTR)stack32_pop( context );
LPCSTR lpszFile = (LPCSTR)stack32_pop( context );
- FIXME("RegLoadKey(%x,%s,%s): stub\n",hkey, debugstr_a(lpszSubKey), debugstr_a(lpszFile));
+ FIXME("RegLoadKey(%p,%s,%s): stub\n",hkey, debugstr_a(lpszSubKey), debugstr_a(lpszFile));
return ERROR_SUCCESS;
}
@@ -1260,7 +1260,7 @@ static DWORD VxDCall_VMM( DWORD service,
{
HKEY hkey = (HKEY) stack32_pop( context );
LPCSTR lpszSubKey = (LPCSTR)stack32_pop( context );
- FIXME("RegUnLoadKey(%x,%s): stub\n",hkey, debugstr_a(lpszSubKey));
+ FIXME("RegUnLoadKey(%p,%s): stub\n",hkey, debugstr_a(lpszSubKey));
return ERROR_SUCCESS;
}
@@ -1269,7 +1269,7 @@ static DWORD VxDCall_VMM( DWORD service,
HKEY hkey = (HKEY) stack32_pop( context );
LPCSTR lpszFile = (LPCSTR)stack32_pop( context );
LPSECURITY_ATTRIBUTES sa = (LPSECURITY_ATTRIBUTES)stack32_pop( context );
- FIXME("RegSaveKey(%x,%s,%p): stub\n",hkey, debugstr_a(lpszFile),sa);
+ FIXME("RegSaveKey(%p,%s,%p): stub\n",hkey, debugstr_a(lpszFile),sa);
return ERROR_SUCCESS;
}
@@ -1284,7 +1284,7 @@ static DWORD VxDCall_VMM( DWORD service,
LPCSTR lpszSubKey = (LPCSTR)stack32_pop( context );
LPCSTR lpszNewFile= (LPCSTR)stack32_pop( context );
LPCSTR lpszOldFile= (LPCSTR)stack32_pop( context );
- FIXME("RegReplaceKey(%x,%s,%s,%s): stub\n", hkey, debugstr_a(lpszSubKey),
+ FIXME("RegReplaceKey(%p,%s,%s,%s): stub\n", hkey, debugstr_a(lpszSubKey),
debugstr_a(lpszNewFile),debugstr_a(lpszOldFile));
return ERROR_SUCCESS;
}
@@ -2124,7 +2124,7 @@ static BOOL DeviceIo_PCCARD (DWORD dwIoC
*/
HANDLE WINAPI OpenVxDHandle(HANDLE hHandleRing3)
{
- FIXME( "(0x%08x), stub! (returning Ring 3 handle instead of Ring 0)\n", hHandleRing3);
+ FIXME( "(0x%p), stub! (returning Ring 3 handle instead of Ring 0)\n", hHandleRing3);
return hHandleRing3;
}
Index: win32/except.c
===================================================================
RCS file: /home/wine/wine/win32/except.c,v
retrieving revision 1.61
diff -u -3 -p -u -r1.61 except.c
--- win32/except.c 28 Oct 2002 23:56:58 -0000 1.61
+++ win32/except.c 18 Nov 2002 21:51:32 -0000
@@ -304,7 +304,7 @@ static BOOL start_debugger(PEXCEPTION_PO
else
{
cmdline = HeapAlloc(GetProcessHeap(), 0, 80);
- sprintf(cmdline, "winedbg --debugmsg -all --auto %ld %d", GetCurrentProcessId(), hEvent);
+ sprintf(cmdline, "winedbg --debugmsg -all --auto %ld %p", GetCurrentProcessId(), hEvent);
}
if (!bAuto)
@@ -370,7 +370,7 @@ static int start_debugger_atomic(PEXCEPT
/* ask for manual reset, so that once the debugger is started,
* every thread will know it */
NtCreateEvent( &hEvent, EVENT_ALL_ACCESS, &attr, TRUE, FALSE );
- if (InterlockedCompareExchange( (LPLONG)&hRunOnce, hEvent, 0 ) == 0)
+ if (InterlockedCompareExchangePointer( (PVOID)&hRunOnce, hEvent, 0 ) == 0)
{
/* ok, our event has been set... we're the winning thread */
BOOL ret = start_debugger( epointers, hRunOnce );
Index: win32/newfns.c
===================================================================
RCS file: /home/wine/wine/win32/newfns.c,v
retrieving revision 1.42
diff -u -3 -p -u -r1.42 newfns.c
--- win32/newfns.c 15 Nov 2002 01:01:47 -0000 1.42
+++ win32/newfns.c 18 Nov 2002 21:51:32 -0000
@@ -246,7 +246,7 @@ BOOL WINAPI GetMailslotInfo( HANDLE hMai
LPDWORD lpNextSize, LPDWORD lpMessageCount,
LPDWORD lpReadTimeout )
{
- FIXME("(%04x): stub\n",hMailslot);
+ FIXME("(%p): stub\n",hMailslot);
if (lpMaxMessageSize) *lpMaxMessageSize = (DWORD)NULL;
if (lpNextSize) *lpNextSize = (DWORD)NULL;
if (lpMessageCount) *lpMessageCount = (DWORD)NULL;
@@ -293,7 +293,7 @@ HANDLE WINAPI CreateIoCompletionPort(HAN
HANDLE hExistingCompletionPort, DWORD dwCompletionKey,
DWORD dwNumberOfConcurrentThreads)
{
- FIXME("(%04x, %04x, %08lx, %08lx): stub.\n", hFileHandle, hExistingCompletionPort, dwCompletionKey, dwNumberOfConcurrentThreads);
+ FIXME("(%p, %p, %08lx, %08lx): stub.\n", hFileHandle, hExistingCompletionPort, dwCompletionKey, dwNumberOfConcurrentThreads);
return (HANDLE)NULL;
}
@@ -304,7 +304,7 @@ BOOL WINAPI GetQueuedCompletionStatus(
HANDLE CompletionPort, LPDWORD lpNumberOfBytesTransferred,
LPDWORD lpCompletionKey, LPOVERLAPPED *lpOverlapped, DWORD dwMilliseconds
) {
- FIXME("(%x,%p,%p,%p,%ld), stub!\n",CompletionPort,lpNumberOfBytesTransferred,lpCompletionKey,lpOverlapped,dwMilliseconds);
+ FIXME("(%p,%p,%p,%p,%ld), stub!\n",CompletionPort,lpNumberOfBytesTransferred,lpCompletionKey,lpOverlapped,dwMilliseconds);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
