From f8ee161a1be7aecc1f9c857d498b30f2f645d992 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 12 Sep 2005 10:30:05 +0000 Subject: [PATCH] Fixed some traces to use the right printf format and avoid typecasts. --- dlls/dinput/device.c | 4 ++-- dlls/dinput/dinput_main.c | 8 ++++---- dlls/dinput/joystick_linux.c | 10 +++++----- dlls/dinput/joystick_linuxinput.c | 10 +++++----- dlls/dinput/keyboard.c | 10 +++++----- dlls/dinput/mouse.c | 12 ++++++------ dlls/dsound/buffer.c | 4 ++-- dlls/dsound/duplex.c | 8 ++++---- dlls/dsound/tests/ds3d.c | 16 ++++++++-------- dlls/dsound/tests/ds3d8.c | 14 ++++++-------- dlls/dsound/tests/dsound.c | 9 ++++----- dlls/dsound/tests/dsound8.c | 10 +++++----- dlls/gdi/printdrv.c | 2 +- dlls/imm32/imm.c | 2 +- dlls/iphlpapi/iphlpapi_main.c | 24 ++++++++++++------------ dlls/kernel/change.c | 2 +- dlls/kernel/except.c | 4 ++-- dlls/msrle32/msrle32.c | 3 +-- dlls/ntdll/cdrom.c | 6 +++--- dlls/ole32/ole2.c | 4 ++-- dlls/user/cursoricon.c | 4 ++-- dlls/x11drv/clipboard.c | 14 +++++++------- dlls/x11drv/xim.c | 12 ++++++------ 23 files changed, 94 insertions(+), 98 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 6139e53daed..a38dea64a5d 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -464,7 +464,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetCooperativeLevel( LPDIRECTINPUTDEVICE8A iface,HWND hwnd,DWORD dwflags ) { IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface; - TRACE("(this=%p,0x%08lx,0x%08lx)\n",This,(DWORD)hwnd,dwflags); + TRACE("(this=%p,%p,0x%08lx)\n",This,hwnd,dwflags); if (TRACE_ON(dinput)) { TRACE(" cooperative level : "); _dump_cooperativelevel_DI(dwflags); @@ -476,7 +476,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetEventNotification( LPDIRECTINPUTDEVICE8A iface,HANDLE hnd ) { IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface; - FIXME("(this=%p,0x%08lx): stub\n",This,(DWORD)hnd); + FIXME("(this=%p,%p): stub\n",This,hnd); return DI_OK; } diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 79eb621032d..bc03b72e6c9 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -86,7 +86,7 @@ HRESULT WINAPI DirectInputCreateEx( { IDirectInputImpl* This; - TRACE("(0x%08lx,%04lx,%s,%p,%p)\n", (DWORD)hinst,dwVersion,debugstr_guid(riid),ppDI,punkOuter); + TRACE("(%p,%04lx,%s,%p,%p)\n", hinst,dwVersion,debugstr_guid(riid),ppDI,punkOuter); if (IsEqualGUID(&IID_IDirectInputA,riid) || IsEqualGUID(&IID_IDirectInput2A,riid) || @@ -141,7 +141,7 @@ HRESULT WINAPI DirectInputCreateEx( HRESULT WINAPI DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter) { IDirectInputImpl* This; - TRACE("(0x%08lx,%04lx,%p,%p)\n", (DWORD)hinst,dwVersion,ppDI,punkOuter); + TRACE("(%p,%04lx,%p,%p)\n", hinst,dwVersion,ppDI,punkOuter); This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); This->lpVtbl = &ddi7avt; This->ref = 1; @@ -157,7 +157,7 @@ HRESULT WINAPI DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPU HRESULT WINAPI DirectInputCreateW(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTW *ppDI, LPUNKNOWN punkOuter) { IDirectInputImpl* This; - TRACE("(0x%08lx,%04lx,%p,%p)\n", (DWORD)hinst,dwVersion,ppDI,punkOuter); + TRACE("(%p,%04lx,%p,%p)\n", hinst,dwVersion,ppDI,punkOuter); This = HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputImpl)); This->lpVtbl = &ddi7wvt; This->ref = 1; @@ -384,7 +384,7 @@ static HRESULT WINAPI IDirectInputAImpl_RunControlPanel(LPDIRECTINPUT7A iface, HWND hwndOwner, DWORD dwFlags) { IDirectInputImpl *This = (IDirectInputImpl *)iface; - FIXME("(%p)->(%08lx,%08lx): stub\n",This, (DWORD) hwndOwner, dwFlags); + FIXME("(%p)->(%p,%08lx): stub\n",This, hwndOwner, dwFlags); return DI_OK; } diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 7fea65815ee..6c494277861 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -1131,7 +1131,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty( _dump_DIPROPHEADER(ph); if (!HIWORD(rguid)) { - switch ((DWORD)rguid) { + switch (LOWORD(rguid)) { case (DWORD) DIPROP_BUFFERSIZE: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; TRACE("buffersize = %ld\n",pd->dwData); @@ -1196,7 +1196,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty( break; } default: - FIXME("Unknown type %ld (%s)\n",(DWORD)rguid,debugstr_guid(rguid)); + FIXME("Unknown type %p (%s)\n",rguid,debugstr_guid(rguid)); break; } } @@ -1212,7 +1212,7 @@ static HRESULT WINAPI JoystickAImpl_SetEventNotification( ) { JoystickImpl *This = (JoystickImpl *)iface; - TRACE("(this=%p,0x%08lx)\n",This,(DWORD)hnd); + TRACE("(this=%p,%p)\n",This,hnd); This->hEvent = hnd; return DI_OK; } @@ -1427,7 +1427,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty( _dump_DIPROPHEADER(pdiph); if (!HIWORD(rguid)) { - switch ((DWORD)rguid) { + switch (LOWORD(rguid)) { case (DWORD) DIPROP_BUFFERSIZE: { LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; TRACE(" return buffersize = %d\n",This->queue_len); @@ -1468,7 +1468,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty( break; } default: - FIXME("Unknown type %ld (%s)\n",(DWORD)rguid,debugstr_guid(rguid)); + FIXME("Unknown type %p (%s)\n",rguid,debugstr_guid(rguid)); break; } } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index eca0a76ee0b..4660ca440d0 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -795,7 +795,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, FIXME("ph.dwSize = %ld, ph.dwHeaderSize =%ld, ph.dwObj = %ld, ph.dwHow= %ld\n",ph->dwSize, ph->dwHeaderSize,ph->dwObj,ph->dwHow); if (!HIWORD(rguid)) { - switch ((DWORD)rguid) { + switch (LOWORD(rguid)) { case (DWORD) DIPROP_BUFFERSIZE: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; @@ -831,7 +831,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, break; } default: - FIXME("Unknown type %ld (%s)\n",(DWORD)rguid,debugstr_guid(rguid)); + FIXME("Unknown type %p (%s)\n",rguid,debugstr_guid(rguid)); break; } } @@ -847,7 +847,7 @@ static HRESULT WINAPI JoystickAImpl_SetEventNotification( ) { JoystickImpl *This = (JoystickImpl *)iface; - TRACE("(this=%p,0x%08lx)\n",This,(DWORD)hnd); + TRACE("(this=%p,%p)\n",This,hnd); This->hEvent = hnd; return DI_OK; } @@ -1114,7 +1114,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, _dump_DIPROPHEADER(pdiph); if (!HIWORD(rguid)) { - switch ((DWORD)rguid) { + switch (LOWORD(rguid)) { case (DWORD) DIPROP_BUFFERSIZE: { LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; @@ -1135,7 +1135,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, } default: - FIXME("Unknown type %ld (%s)\n",(DWORD)rguid,debugstr_guid(rguid)); + FIXME("Unknown type %p (%s)\n",rguid,debugstr_guid(rguid)); break; } } diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 98bc31506c9..aa6cbcbe387 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -342,7 +342,7 @@ static HRESULT WINAPI SysKeyboardAImpl_SetProperty( TRACE("(size=%ld,headersize=%ld,obj=%ld,how=%ld\n", ph->dwSize,ph->dwHeaderSize,ph->dwObj,ph->dwHow); if (!HIWORD(rguid)) { - switch ((DWORD)rguid) { + switch (LOWORD(rguid)) { case (DWORD) DIPROP_BUFFERSIZE: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; @@ -356,7 +356,7 @@ static HRESULT WINAPI SysKeyboardAImpl_SetProperty( break; } default: - WARN("Unknown type %ld\n",(DWORD)rguid); + WARN("Unknown type %p\n",rguid); break; } } @@ -373,7 +373,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetProperty( TRACE("(size=%ld,headersize=%ld,obj=%ld,how=%ld\n", ph->dwSize,ph->dwHeaderSize,ph->dwObj,ph->dwHow); if (!HIWORD(rguid)) { - switch ((DWORD)rguid) { + switch (LOWORD(rguid)) { case (DWORD) DIPROP_BUFFERSIZE: { LPDIPROPDWORD pd = (LPDIPROPDWORD)ph; @@ -387,7 +387,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetProperty( break; } default: - WARN("Unknown type %ld\n",(DWORD)rguid); + WARN("Unknown type %p\n",rguid); break; } } @@ -597,7 +597,7 @@ static HRESULT WINAPI SysKeyboardAImpl_SetEventNotification(LPDIRECTINPUTDEVICE8 HANDLE hnd) { SysKeyboardImpl *This = (SysKeyboardImpl *)iface; - TRACE("(this=%p,0x%08lx)\n",This,(DWORD)hnd); + TRACE("(this=%p,%p)\n",This,hnd); This->hEvent = hnd; return DI_OK; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index ab7f15ad635..30f5727ca95 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -361,7 +361,7 @@ static HRESULT WINAPI SysMouseAImpl_SetCooperativeLevel( { SysMouseImpl *This = (SysMouseImpl *)iface; - TRACE("(this=%p,0x%08lx,0x%08lx)\n",This,(DWORD)hwnd,dwflags); + TRACE("(this=%p,%p,0x%08lx)\n",This,hwnd,dwflags); if (TRACE_ON(dinput)) { TRACE(" cooperative level : "); @@ -824,7 +824,7 @@ static HRESULT WINAPI SysMouseAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(rguid),ph); if (!HIWORD(rguid)) { - switch ((DWORD)rguid) { + switch (LOWORD(rguid)) { case (DWORD) DIPROP_BUFFERSIZE: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; @@ -843,7 +843,7 @@ static HRESULT WINAPI SysMouseAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, break; } default: - FIXME("Unknown type %ld (%s)\n",(DWORD)rguid,debugstr_guid(rguid)); + FIXME("Unknown type %p (%s)\n",rguid,debugstr_guid(rguid)); break; } } @@ -867,7 +867,7 @@ static HRESULT WINAPI SysMouseAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, _dump_DIPROPHEADER(pdiph); if (!HIWORD(rguid)) { - switch ((DWORD)rguid) { + switch (LOWORD(rguid)) { case (DWORD) DIPROP_BUFFERSIZE: { LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; @@ -902,7 +902,7 @@ static HRESULT WINAPI SysMouseAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, } default: - FIXME("Unknown type %ld (%s)\n",(DWORD)rguid,debugstr_guid(rguid)); + FIXME("Unknown type %p (%s)\n",rguid,debugstr_guid(rguid)); break; } } @@ -919,7 +919,7 @@ static HRESULT WINAPI SysMouseAImpl_SetEventNotification(LPDIRECTINPUTDEVICE8A i HANDLE hnd) { SysMouseImpl *This = (SysMouseImpl *)iface; - TRACE("(this=%p,0x%08lx)\n",This,(DWORD)hnd); + TRACE("(this=%p,%p)\n",This,hnd); This->hEvent = hnd; diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index bb1fca348e6..60ca6797fdf 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -89,8 +89,8 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions( if (TRACE_ON(dsound)) { unsigned int i; for (i=0;idsb->hwnotify) { diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index c0a97db3f19..044d764047e 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -91,9 +91,9 @@ DirectSoundFullDuplexCreate( LPUNKNOWN pUnkOuter) { IDirectSoundFullDuplexImpl** ippDSFD=(IDirectSoundFullDuplexImpl**)ppDSFD; - TRACE("(%s,%s,%p,%p,%lx,%lx,%p,%p,%p,%p)\n", debugstr_guid(pcGuidCaptureDevice), + TRACE("(%s,%s,%p,%p,%p,%lx,%p,%p,%p,%p)\n", debugstr_guid(pcGuidCaptureDevice), debugstr_guid(pcGuidRenderDevice), pcDSCBufferDesc, pcDSBufferDesc, - (DWORD)hWnd, dwLevel, ppDSFD, ppDSCBuffer8, ppDSBuffer8, pUnkOuter); + hWnd, dwLevel, ppDSFD, ppDSCBuffer8, ppDSBuffer8, pUnkOuter); if ( pUnkOuter ) { WARN("pUnkOuter != 0\n"); @@ -185,8 +185,8 @@ IDirectSoundFullDuplexImpl_Initialize( IDirectSoundCaptureBufferImpl** ippdscb=(IDirectSoundCaptureBufferImpl**)lplpDirectSoundCaptureBuffer8; IDirectSoundBufferImpl** ippdsc=(IDirectSoundBufferImpl**)lplpDirectSoundBuffer8; - FIXME( "(%p,%s,%s,%p,%p,%lx,%lx,%p,%p) stub!\n", This, debugstr_guid(pCaptureGuid), - debugstr_guid(pRendererGuid), lpDscBufferDesc, lpDsBufferDesc, (DWORD)hWnd, dwLevel, + FIXME( "(%p,%s,%s,%p,%p,%p,%lx,%p,%p) stub!\n", This, debugstr_guid(pCaptureGuid), + debugstr_guid(pRendererGuid), lpDscBufferDesc, lpDsBufferDesc, hWnd, dwLevel, ippdscb, ippdsc); return E_FAIL; diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index c10430c93d1..814f80ac04f 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -452,8 +452,8 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER dsbo, ok(rc==DS_OK && temp_buffer!=NULL, "IDirectSoundBuffer_QueryInterface() failed: %s\n", DXGetErrorString8(rc)); - ok(temp_buffer==dsbo,"COM interface broken: 0x%08lx != 0x%08lx\n", - (DWORD)temp_buffer,(DWORD)dsbo); + ok(temp_buffer==dsbo,"COM interface broken: %p != %p\n", + temp_buffer,dsbo); ref=IDirectSoundBuffer_Release(temp_buffer); ok(ref==1,"IDirectSoundBuffer_Release() has %d references, " "should have 1\n",ref); @@ -465,8 +465,8 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER dsbo, ok(rc==DS_OK && temp_buffer!=NULL, "IDirectSound3DBuffer_QueryInterface() failed: %s\n", DXGetErrorString8(rc)); - ok(temp_buffer==dsbo,"COM interface broken: 0x%08lx != 0x%08lx\n", - (DWORD)temp_buffer,(DWORD)dsbo); + ok(temp_buffer==dsbo,"COM interface broken: %p != %p\n", + temp_buffer,dsbo); ref=IDirectSoundBuffer_Release(temp_buffer); ok(ref==1,"IDirectSoundBuffer_Release() has %d references, " "should have 1\n",ref); @@ -1130,8 +1130,8 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) "IDirectSoundBuffer_QueryInterface() failed: %s\n", DXGetErrorString8(rc)); ok(temp_buffer==primary, - "COM interface broken: 0x%08lx != 0x%08lx\n", - (DWORD)temp_buffer,(DWORD)primary); + "COM interface broken: %p != %p\n", + temp_buffer,primary); if (rc==DS_OK && temp_buffer!=NULL) { ref=IDirectSoundBuffer_Release(temp_buffer); ok(ref==1,"IDirectSoundBuffer_Release() has %d references, " @@ -1144,8 +1144,8 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) "IDirectSoundBuffer_QueryInterface() failed: %s\n", DXGetErrorString8(rc)); ok(temp_buffer==primary, - "COM interface broken: 0x%08lx != 0x%08lx\n", - (DWORD)temp_buffer,(DWORD)primary); + "COM interface broken: %p != %p\n", + temp_buffer,primary); ref=IDirectSoundBuffer_Release(temp_buffer); ok(ref==1,"IDirectSoundBuffer_Release() has %d references, " "should have 1\n",ref); diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 23c5902c957..e217e40f448 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -339,8 +339,8 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER dsbo, ok(rc==DS_OK && temp_buffer!=NULL, "IDirectSoundBuffer_QueryInterface() failed: %s\n", DXGetErrorString8(rc)); - ok(temp_buffer==dsbo,"COM interface broken: 0x%08lx != 0x%08lx\n", - (DWORD)temp_buffer,(DWORD)dsbo); + ok(temp_buffer==dsbo,"COM interface broken: %p != %p\n", + temp_buffer,dsbo); ref=IDirectSoundBuffer_Release(temp_buffer); ok(ref==1,"IDirectSoundBuffer_Release() has %d references, " "should have 1\n",ref); @@ -351,8 +351,8 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER dsbo, ok(rc==DS_OK && temp_buffer!=NULL, "IDirectSound3DBuffer_QueryInterface() failed: %s\n", DXGetErrorString8(rc)); - ok(temp_buffer==dsbo,"COM interface broken: 0x%08lx != 0x%08lx\n", - (DWORD)temp_buffer,(DWORD)dsbo); + ok(temp_buffer==dsbo,"COM interface broken: %p != %p\n", + temp_buffer,dsbo); ref=IDirectSoundBuffer_Release(temp_buffer); ok(ref==1,"IDirectSoundBuffer_Release() has %d references, " "should have 1\n",ref); @@ -1024,8 +1024,7 @@ static HRESULT test_primary_3d_with_listener8(LPGUID lpGuid) ok(rc==DS_OK && temp_buffer!=NULL, "IDirectSoundBuffer_QueryInterface() failed: %s\n", DXGetErrorString8(rc)); - ok(temp_buffer==primary,"COM interface broken: 0x%08lx != " - "0x%08lx\n",(DWORD)temp_buffer,(DWORD)primary); + ok(temp_buffer==primary,"COM interface broken: %p != %p\n",temp_buffer,primary); if (rc==DS_OK && temp_buffer!=NULL) { ref=IDirectSoundBuffer_Release(temp_buffer); ok(ref==1,"IDirectSoundBuffer_Release() has %d references, " @@ -1037,8 +1036,7 @@ static HRESULT test_primary_3d_with_listener8(LPGUID lpGuid) ok(rc==DS_OK && temp_buffer!=NULL, "IDirectSoundBuffer_QueryInterface() failed: %s\n", DXGetErrorString8(rc)); - ok(temp_buffer==primary,"COM interface broken: 0x%08lx != " - "0x%08lx\n",(DWORD)temp_buffer,(DWORD)primary); + ok(temp_buffer==primary,"COM interface broken: %p != %p\n",temp_buffer,primary); ref=IDirectSoundBuffer_Release(temp_buffer); ok(ref==1,"IDirectSoundBuffer_Release() has %d references, " "should have 1\n",ref); diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 7431a1b4918..a353acf3e92 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -291,8 +291,7 @@ static HRESULT test_dsound(LPGUID lpGuid) ref=IDirectSound_Release(dso1); ok(ref==0,"IDirectSound_Release() has %d references, should have " "0\n",ref); - ok(dso!=dso1,"DirectSound objects should be unique: " - "dso=0x%08lx,dso1=0x%08lx\n",(DWORD)dso,(DWORD)dso1); + ok(dso!=dso1,"DirectSound objects should be unique: dso=%p,dso1=%p\n",dso,dso1); } /* Release the first DirectSound object */ @@ -385,13 +384,13 @@ static HRESULT test_primary(LPGUID lpGuid) rc=IDirectSound_CreateSoundBuffer(dso,0,&primary,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, "IDirectSound_CreateSoundBuffer() should have failed: rc=%s," - "dsbo=0x%lx\n",DXGetErrorString8(rc),(DWORD)primary); + "dsbo=%p\n",DXGetErrorString8(rc),primary); /* DSOUND: Error: Invalid buffer description pointer */ rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,0,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, "IDirectSound_CreateSoundBuffer() should have failed: rc=%s," - "dsbo=0x%lx\n",DXGetErrorString8(rc),(DWORD)primary); + "dsbo=0x%p\n",DXGetErrorString8(rc),primary); ZeroMemory(&bufdesc, sizeof(bufdesc)); @@ -400,7 +399,7 @@ static HRESULT test_primary(LPGUID lpGuid) rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, "IDirectSound_CreateSoundBuffer() should have failed: rc=%s," - "primary=0x%lx\n",DXGetErrorString8(rc),(DWORD)primary); + "primary=%p\n",DXGetErrorString8(rc),primary); /* We must call SetCooperativeLevel before calling CreateSoundBuffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 86989fdb0ee..764beaca877 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -306,7 +306,7 @@ static HRESULT test_dsound8(LPGUID lpGuid) ok(ref==0,"IDirectSound8_Release() has %d references, " "should have 0\n",ref); ok(dso!=dso1,"DirectSound8 objects should be unique: " - "dso=0x%08lx,dso1=0x%08lx\n",(DWORD)dso,(DWORD)dso1); + "dso=%p,dso1=%p\n",dso,dso1); } /* Release the first DirectSound8 object */ @@ -410,14 +410,14 @@ static HRESULT test_primary8(LPGUID lpGuid) rc=IDirectSound8_CreateSoundBuffer(dso,0,&primary,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, "IDirectSound8_CreateSoundBuffer() should have returned " - "DSERR_INVALIDPARAM, returned: rc=%s,dsbo=0x%lx\n", - DXGetErrorString8(rc),(DWORD)primary); + "DSERR_INVALIDPARAM, returned: rc=%s,dsbo=%p\n", + DXGetErrorString8(rc),primary); /* DSOUND: Error: Invalid buffer description pointer */ rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,0,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, "IDirectSound8_CreateSoundBuffer() should have failed: rc=%s," - "dsbo=0x%lx\n",DXGetErrorString8(rc),(DWORD)primary); + "dsbo=%p\n",DXGetErrorString8(rc),primary); ZeroMemory(&bufdesc, sizeof(bufdesc)); @@ -426,7 +426,7 @@ static HRESULT test_primary8(LPGUID lpGuid) rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, "IDirectSound8_CreateSoundBuffer() should have failed: rc=%s," - "primary=0x%lx\n",DXGetErrorString8(rc),(DWORD)primary); + "primary=%p\n",DXGetErrorString8(rc),primary); /* We must call SetCooperativeLevel before calling CreateSoundBuffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ diff --git a/dlls/gdi/printdrv.c b/dlls/gdi/printdrv.c index 4046d9a5ff8..ec2e8e48d22 100644 --- a/dlls/gdi/printdrv.c +++ b/dlls/gdi/printdrv.c @@ -635,7 +635,7 @@ INT16 WINAPI WriteSpool16(HPJOB16 hJob, LPSTR lpData, INT16 cch) int nRet = SP_ERROR; PPRINTJOB pPrintJob = NULL; - TRACE("%04x %08lx %04x\n", hJob, (DWORD)lpData, cch); + TRACE("%04x %p %04x\n", hJob, lpData, cch); pPrintJob = FindPrintJobFromHandle(hJob); if (pPrintJob != NULL && pPrintJob->fd >= 0 && cch) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 55c421dcfaa..9244a03702d 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -740,7 +740,7 @@ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) the_name, WS_POPUPWINDOW|WS_CAPTION, 0, 0, 120, 55, 0, 0, hImeInst, 0); - TRACE("Default created (0x%x)\n",(INT)hwndDefault); + TRACE("Default created (%p)\n",hwndDefault); } return (HWND)hwndDefault; diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index e657692a707..78217953d5c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -114,8 +114,8 @@ DWORD WINAPI AllocateAndGetIfTableFromStack(PMIB_IFTABLE *ppIfTable, { DWORD ret; - TRACE("ppIfTable %p, bOrder %ld, heap 0x%08lx, flags 0x%08lx\n", ppIfTable, - (DWORD)bOrder, (DWORD)heap, flags); + TRACE("ppIfTable %p, bOrder %d, heap %p, flags 0x%08lx\n", ppIfTable, + bOrder, heap, flags); if (!ppIfTable) ret = ERROR_INVALID_PARAMETER; else { @@ -155,8 +155,8 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack(PMIB_IPADDRTABLE *ppIpAddrTable, { DWORD ret; - TRACE("ppIpAddrTable %p, bOrder %ld, heap 0x%08lx, flags 0x%08lx\n", - ppIpAddrTable, (DWORD)bOrder, (DWORD)heap, flags); + TRACE("ppIpAddrTable %p, bOrder %d, heap %p, flags 0x%08lx\n", + ppIpAddrTable, bOrder, heap, flags); if (!ppIpAddrTable) ret = ERROR_INVALID_PARAMETER; else { @@ -196,8 +196,8 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE * { DWORD ret; - TRACE("ppIpForwardTable %p, bOrder %ld, heap 0x%08lx, flags 0x%08lx\n", - ppIpForwardTable, (DWORD)bOrder, (DWORD)heap, flags); + TRACE("ppIpForwardTable %p, bOrder %d, heap %p, flags 0x%08lx\n", + ppIpForwardTable, bOrder, heap, flags); if (!ppIpForwardTable) ret = ERROR_INVALID_PARAMETER; else { @@ -237,8 +237,8 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, { DWORD ret; - TRACE("ppIpNetTable %p, bOrder %ld, heap 0x%08lx, flags 0x%08lx\n", - ppIpNetTable, (DWORD)bOrder, (DWORD)heap, flags); + TRACE("ppIpNetTable %p, bOrder %d, heap %p, flags 0x%08lx\n", + ppIpNetTable, bOrder, heap, flags); if (!ppIpNetTable) ret = ERROR_INVALID_PARAMETER; else { @@ -278,8 +278,8 @@ DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, { DWORD ret; - TRACE("ppTcpTable %p, bOrder %ld, heap 0x%08lx, flags 0x%08lx\n", - ppTcpTable, (DWORD)bOrder, (DWORD)heap, flags); + TRACE("ppTcpTable %p, bOrder %d, heap %p, flags 0x%08lx\n", + ppTcpTable, bOrder, heap, flags); if (!ppTcpTable) ret = ERROR_INVALID_PARAMETER; else { @@ -319,8 +319,8 @@ DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, { DWORD ret; - TRACE("ppUdpTable %p, bOrder %ld, heap 0x%08lx, flags 0x%08lx\n", - ppUdpTable, (DWORD)bOrder, (DWORD)heap, flags); + TRACE("ppUdpTable %p, bOrder %d, heap %p, flags 0x%08lx\n", + ppUdpTable, bOrder, heap, flags); if (!ppUdpTable) ret = ERROR_INVALID_PARAMETER; else { diff --git a/dlls/kernel/change.c b/dlls/kernel/change.c index c758fc3fbf3..6f3d28df1d8 100644 --- a/dlls/kernel/change.c +++ b/dlls/kernel/change.c @@ -128,7 +128,7 @@ BOOL WINAPI FindCloseChangeNotification( HANDLE handle ) */ FARPROC16 WINAPI FileCDR16(FARPROC16 x) { - FIXME("(0x%8x): stub\n", (int) x); + FIXME("(%p): stub\n", x); return (FARPROC16)TRUE; } diff --git a/dlls/kernel/except.c b/dlls/kernel/except.c index 0d068b67496..f5395e8fcb5 100644 --- a/dlls/kernel/except.c +++ b/dlls/kernel/except.c @@ -168,8 +168,8 @@ static int format_exception_msg( const EXCEPTION_POINTERS *ptr, char *buffer, in else #endif len2 = snprintf(buffer+len, size-len, - " at address 0x%08lx.\nDo you wish to debug it ?", - (DWORD)ptr->ExceptionRecord->ExceptionAddress); + " at address %p.\nDo you wish to debug it ?", + ptr->ExceptionRecord->ExceptionAddress); if ((len2<0) || (len>=size-len)) return -1; return len+len2; diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 90b6f666f33..4d6898847b5 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1789,8 +1789,7 @@ LRESULT CALLBACK MSRLE32_DriverProc(DWORD dwDrvID, HDRVR hDrv, UINT uMsg, { CodecInfo *pi = (CodecInfo*)dwDrvID; - TRACE("(%p,%p,0x%04X,0x%08lX,0x%08lX)\n", (LPVOID)dwDrvID, (LPVOID)hDrv, - uMsg, lParam1, lParam2); + TRACE("(%lx,%p,0x%04X,0x%08lX,0x%08lX)\n", dwDrvID, hDrv, uMsg, lParam1, lParam2); switch (uMsg) { /* standard driver messages */ diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index df474fb2170..385ab20adff 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -2004,9 +2004,9 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice, NTSTATUS status = STATUS_SUCCESS; int fd, dev; - TRACE("%lx %s %lx %ld %lx %ld %p\n", - (DWORD)hDevice, iocodex(dwIoControlCode), (DWORD)lpInBuffer, nInBufferSize, - (DWORD)lpOutBuffer, nOutBufferSize, piosb); + TRACE("%p %s %p %ld %p %ld %p\n", + hDevice, iocodex(dwIoControlCode), lpInBuffer, nInBufferSize, + lpOutBuffer, nOutBufferSize, piosb); piosb->Information = 0; diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 6192ef2a2ed..aedd723ae8d 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -1339,8 +1339,8 @@ HRESULT WINAPI OleSetMenuDescriptor( if ( lpFrame || lpActiveObject ) { - FIXME("(%x, %p, %p, %p, %p), Context sensitive help filtering not implemented!\n", - (unsigned int)hOleMenu, + FIXME("(%p, %p, %p, %p, %p), Context sensitive help filtering not implemented!\n", + hOleMenu, hwndFrame, hwndActiveObject, lpFrame, diff --git a/dlls/user/cursoricon.c b/dlls/user/cursoricon.c index e2de02ec1d7..d8edb6b00bc 100644 --- a/dlls/user/cursoricon.c +++ b/dlls/user/cursoricon.c @@ -691,8 +691,8 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, hotspot.x = ICON_HOTSPOT; hotspot.y = ICON_HOTSPOT; - TRACE_(cursor)("%08x (%u bytes), ver %08x, %ix%i %s %s\n", - (unsigned)bits, cbSize, (unsigned)dwVersion, width, height, + TRACE_(cursor)("%p (%u bytes), ver %08x, %ix%i %s %s\n", + bits, cbSize, (unsigned)dwVersion, width, height, bIcon ? "icon" : "cursor", (cFlag & LR_MONOCHROME) ? "mono" : "" ); if (dwVersion == 0x00020000) { diff --git a/dlls/x11drv/clipboard.c b/dlls/x11drv/clipboard.c index 01d2c9748c0..8cfb3c8cb62 100644 --- a/dlls/x11drv/clipboard.c +++ b/dlls/x11drv/clipboard.c @@ -646,8 +646,8 @@ static BOOL X11DRV_CLIPBOARD_InsertClipboardData(UINT wFormat, HANDLE16 hData16, { LPWINE_CLIPDATA lpData = X11DRV_CLIPBOARD_LookupData(wFormat); - TRACE("format=%d lpData=%p hData16=%08x hData32=%08x flags=0x%08lx\n", - wFormat, lpData, hData16, (unsigned int)hData32, flags); + TRACE("format=%d lpData=%p hData16=%08x hData32=%p flags=0x%08lx\n", + wFormat, lpData, hData16, hData32, flags); if (lpData) { @@ -809,8 +809,8 @@ static BOOL X11DRV_CLIPBOARD_RenderFormat(LPWINE_CLIPDATA lpData) { BOOL bret = TRUE; - TRACE(" 0x%04x hData32(0x%08x) hData16(0x%08x)\n", - lpData->wFormatID, (unsigned int)lpData->hData32, lpData->hData16); + TRACE(" 0x%04x hData32(%p) hData16(0x%08x)\n", + lpData->wFormatID, lpData->hData32, lpData->hData16); if (lpData->hData32 || lpData->hData16) return bret; /* Already rendered */ @@ -1897,7 +1897,7 @@ static HANDLE X11DRV_CLIPBOARD_SerializeMetafile(INT wformat, HANDLE hdata, LPDW { HANDLE h = 0; - TRACE(" wFormat=%d hdata=%08x out=%d\n", wformat, (unsigned int) hdata, out); + TRACE(" wFormat=%d hdata=%p out=%d\n", wformat, hdata, out); if (out) /* Serialize out, caller should free memory */ { @@ -2404,8 +2404,8 @@ BOOL X11DRV_GetClipboardData(UINT wFormat, HANDLE16* phData16, HANDLE* phData32) if (phData32) *phData32 = lpRender->hData32; - TRACE(" returning hData16(%04x) hData32(%04x) (type %d)\n", - lpRender->hData16, (unsigned int) lpRender->hData32, lpRender->wFormatID); + TRACE(" returning hData16(%04x) hData32(%p) (type %d)\n", + lpRender->hData16, lpRender->hData32, lpRender->wFormatID); return lpRender->hData16 || lpRender->hData32; } diff --git a/dlls/x11drv/xim.c b/dlls/x11drv/xim.c index 2ecf360c818..10140ac3b2e 100644 --- a/dlls/x11drv/xim.c +++ b/dlls/x11drv/xim.c @@ -487,8 +487,8 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win) "*", /*FIXME*/ &list, &count, NULL); - TRACE("ximFontSet = 0x%x\n", (unsigned int) fontSet); - TRACE("list = 0x%x, count = %d\n", (unsigned int) list, count); + TRACE("ximFontSet = %p\n", fontSet); + TRACE("list = %p, count = %d\n", list, count); if (list != NULL) { @@ -521,7 +521,7 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win) XNPreeditDrawCallback, &P_DrawCB, XNPreeditCaretCallback, &P_CaretCB, NULL); - TRACE("preedit = 0x%x\n", (unsigned int) preedit); + TRACE("preedit = %p\n", preedit); } else { @@ -532,7 +532,7 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win) XNPreeditCaretCallback, &P_CaretCB, NULL); - TRACE("preedit = 0x%x\n", (unsigned int) preedit); + TRACE("preedit = %p\n", preedit); } if ((ximStyle & (XIMStatusNothing | XIMStatusNone)) == 0) @@ -540,7 +540,7 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win) status = XVaCreateNestedList(0, XNFontSet, fontSet, NULL); - TRACE("status = 0x%x\n", (unsigned int) status); + TRACE("status = %p\n", status); } if (preedit != NULL && status != NULL) @@ -580,7 +580,7 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win) NULL); } - TRACE("xic = 0x%x\n", (unsigned int) xic); + TRACE("xic = %p\n", xic); if (preedit != NULL) XFree(preedit);