Fixed some more traces to use the right printf format and avoid

dlls/ddraw/ddraw_main.c

@@ -1049,7 +1049,7 @@ Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc,
 				 LPDIRECTDRAWSURFACE7 *lpDDS)
 {
     IDirectDrawImpl *This = (IDirectDrawImpl *)iface;
-    FIXME("(%p)->(%08ld,%p)\n", This, (DWORD) hdc, lpDDS);
+    FIXME("(%p)->(%p,%p)\n", This, hdc, lpDDS);
 
     return DD_OK;
 }
@@ -1104,7 +1104,7 @@ Main_DirectDraw_SetCooperativeLevel(LPDIRECTDRAW7 iface, HWND hwnd,
 {
     IDirectDrawImpl *This = (IDirectDrawImpl *)iface;
 
-    FIXME("(%p)->(%08lx,%08lx)\n",This,(DWORD)hwnd,cooplevel);
+    FIXME("(%p)->(%p,%08lx)\n",This,hwnd,cooplevel);
     DDRAW_dump_cooperativelevel(cooplevel);
 
     /* Makes realMYST test happy. */

dlls/ddraw/surface_main.c

@@ -1085,7 +1085,7 @@ Main_DirectDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect,
     IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface;
 
     if (TRACE_ON(ddraw)) {
-        TRACE("(%p)->Lock(%p,%p,%08lx,%08lx)\n",This,prect,pDDSD,flags,(DWORD)h);
+        TRACE("(%p)->Lock(%p,%p,%08lx,%p)\n",This,prect,pDDSD,flags,h);
 	TRACE(" - locking flags : "); DDRAW_dump_lockflag(flags);
     }
     if (WARN_ON(ddraw)) {

dlls/dsound/capture.c

@@ -986,8 +986,8 @@ static HRESULT WINAPI IDirectSoundCaptureNotifyImpl_SetNotificationPositions(
     if (TRACE_ON(dsound)) {
 	unsigned int i;
 	for (i=0;i<howmuch;i++)
-	    TRACE("notify at %ld to 0x%08lx\n",
-	    notify[i].dwOffset,(DWORD)notify[i].hEventNotify);
+	    TRACE("notify at %ld to %p\n",
+	    notify[i].dwOffset,notify[i].hEventNotify);
     }
 
     if (This->dscb->hwnotify) {

dlls/dsound/dsound.c

@@ -575,7 +575,7 @@ static HRESULT WINAPI IDirectSoundImpl_SetCooperativeLevel(
     DWORD level)
 {
     IDirectSoundImpl *This = (IDirectSoundImpl *)iface;
-    TRACE("(%p,%08lx,%s)\n",This,(DWORD)hwnd,dumpCooperativeLevel(level));
+    TRACE("(%p,%p,%s)\n",This,hwnd,dumpCooperativeLevel(level));
 
     if (level==DSSCL_PRIORITY || level==DSSCL_EXCLUSIVE) {
         WARN("level=%s not fully supported\n",
@@ -1170,7 +1170,7 @@ static HRESULT WINAPI IDirectSound_IDirectSound_SetCooperativeLevel(
     DWORD level)
 {
     IDirectSound_IDirectSound *This = (IDirectSound_IDirectSound *)iface;
-    TRACE("(%p,%08lx,%s)\n",This,(DWORD)hwnd,dumpCooperativeLevel(level));
+    TRACE("(%p,%p,%s)\n",This,hwnd,dumpCooperativeLevel(level));
     return IDirectSoundImpl_SetCooperativeLevel(This->pds,hwnd,level);
 }
 
@@ -1409,7 +1409,7 @@ static HRESULT WINAPI IDirectSound8_IDirectSound_SetCooperativeLevel(
     DWORD level)
 {
     IDirectSound8_IDirectSound *This = (IDirectSound8_IDirectSound *)iface;
-    TRACE("(%p,%08lx,%s)\n",This,(DWORD)hwnd,dumpCooperativeLevel(level));
+    TRACE("(%p,%p,%s)\n",This,hwnd,dumpCooperativeLevel(level));
     return IDirectSoundImpl_SetCooperativeLevel(This->pds,hwnd,level);
 }
 
@@ -1570,7 +1570,7 @@ static HRESULT WINAPI IDirectSound8_IDirectSound8_SetCooperativeLevel(
     DWORD level)
 {
     IDirectSound8_IDirectSound8 *This = (IDirectSound8_IDirectSound8 *)iface;
-    TRACE("(%p,%08lx,%s)\n",This,(DWORD)hwnd,dumpCooperativeLevel(level));
+    TRACE("(%p,%p,%s)\n",This,hwnd,dumpCooperativeLevel(level));
     return IDirectSoundImpl_SetCooperativeLevel(This->pds,hwnd,level);
 }
 

dlls/kernel/instr.c

@@ -934,6 +934,6 @@ void WINAPI NetBIOSCall16( CONTEXT86 *context )
  */
 FARPROC16 WINAPI GetSetKernelDOSProc16( FARPROC16 DosProc )
 {
-    FIXME("(DosProc=0x%08x): stub\n", (UINT)DosProc);
+    FIXME("(DosProc=%p): stub\n", DosProc);
     return NULL;
 }

dlls/kernel/local16.c

@@ -1624,7 +1624,7 @@ FARPROC16 WINAPI LocalNotify16( FARPROC16 func )
 	LOCAL_PrintHeap( ds );
 	return 0;
     }
-    TRACE("(%04x): %08lx\n", ds, (DWORD)func );
+    TRACE("(%04x): %p\n", ds, func );
     FIXME("Half implemented\n");
     oldNotify = pInfo->notify;
     pInfo->notify = func;

dlls/kernel/ne_module.c

@@ -1742,7 +1742,7 @@ FARPROC16 WINAPI GetProcAddress16( HMODULE16 hModule, LPCSTR name )
 
     ret = NE_GetEntryPoint( hModule, ordinal );
 
-    TRACE("returning %08x\n", (UINT)ret );
+    TRACE("returning %p\n", ret );
     return ret;
 }
 

dlls/kernel/resource16.c

@@ -970,7 +970,7 @@ HRSRC16 WINAPI FindResource16( HMODULE16 hModule, LPCSTR name, LPCSTR type )
         if (!(pTypeInfo = NE_FindTypeSection( pResTab, pTypeInfo, type ))) break;
         if ((pNameInfo = NE_FindResourceFromType( pResTab, pTypeInfo, name )))
         {
-            TRACE("    Found id %08lx\n", (DWORD)name );
+            TRACE("    Found id %p\n", name );
             return (HRSRC16)( (char *)pNameInfo - (char *)pModule );
         }
         pTypeInfo = next_typeinfo(pTypeInfo);

dlls/kernel/task.c

@@ -854,11 +854,11 @@ FARPROC16 WINAPI MakeProcInstance16( FARPROC16 func, HANDLE16 hInstance )
 
     hInstanceSelector = GlobalHandleToSel16(hInstance);
 
-    TRACE("(%08lx, %04x);\n", (DWORD)func, hInstance);
+    TRACE("(%p, %04x);\n", func, hInstance);
 
     if (!HIWORD(func)) {
       /* Win95 actually protects via SEH, but this is better for debugging */
-      WARN("Ouch ! Called with invalid func 0x%08lx !\n", (DWORD)func);
+      WARN("Ouch ! Called with invalid func %p !\n", func);
       return (FARPROC16)0;
     }
 
@@ -887,8 +887,7 @@ FARPROC16 WINAPI MakeProcInstance16( FARPROC16 func, HANDLE16 hInstance )
     thunk = MapSL( thunkaddr );
     lfunc = MapSL( (SEGPTR)func );
 
-    TRACE("(%08lx,%04x): got thunk %08lx\n",
-          (DWORD)func, hInstance, (DWORD)thunkaddr );
+    TRACE("(%p,%04x): got thunk %08lx\n", func, hInstance, thunkaddr );
     if (((lfunc[0]==0x8c) && (lfunc[1]==0xd8)) || /* movw %ds, %ax */
     	((lfunc[0]==0x1e) && (lfunc[1]==0x58))    /* pushw %ds, popw %ax */
     ) {
@@ -910,7 +909,7 @@ FARPROC16 WINAPI MakeProcInstance16( FARPROC16 func, HANDLE16 hInstance )
  */
 void WINAPI FreeProcInstance16( FARPROC16 func )
 {
-    TRACE("(%08lx)\n", (DWORD)func );
+    TRACE("(%p)\n", func );
     TASK_FreeThunk( (SEGPTR)func );
 }
 

dlls/kernel/thunk.c

@@ -355,15 +355,15 @@ UINT WINAPI ThunkConnect32(
     {
         directionSL = TRUE;
 
-        TRACE("SL01 thunk %s (%lx) <- %s (%s), Reason: %ld\n",
-                     module32, (DWORD)TD, module16, thunkfun16, dwReason);
+        TRACE("SL01 thunk %s (%p) <- %s (%s), Reason: %ld\n",
+              module32, TD, module16, thunkfun16, dwReason);
     }
     else if (!strncmp(TD->magic, "LS01", 4))
     {
         directionSL = FALSE;
 
-        TRACE("LS01 thunk %s (%lx) -> %s (%s), Reason: %ld\n",
-                     module32, (DWORD)TD, module16, thunkfun16, dwReason);
+        TRACE("LS01 thunk %s (%p) -> %s (%s), Reason: %ld\n",
+              module32, TD, module16, thunkfun16, dwReason);
     }
     else
     {
@@ -401,8 +401,8 @@ UINT WINAPI ThunkConnect32(
                 tdb->next = SL32->data->targetDB;   /* FIXME: not thread-safe! */
                 SL32->data->targetDB = tdb;
 
-                TRACE("Process %08lx allocated TargetDB entry for ThunkDataSL %08lx\n",
-                             GetCurrentProcessId(), (DWORD)SL32->data);
+                TRACE("Process %08lx allocated TargetDB entry for ThunkDataSL %p\n",
+                      GetCurrentProcessId(), SL32->data);
             }
             else
             {
@@ -1379,15 +1379,15 @@ UINT WINAPI ThunkConnect16(
     {
         directionSL = TRUE;
 
-        TRACE("SL01 thunk %s (%lx) -> %s (%s), Reason: %ld\n",
-              module16, (DWORD)TD, module32, thunkfun32, dwReason);
+        TRACE("SL01 thunk %s (%p) -> %s (%s), Reason: %ld\n",
+              module16, TD, module32, thunkfun32, dwReason);
     }
     else if (!strncmp(TD->magic, "LS01", 4))
     {
         directionSL = FALSE;
 
-        TRACE("LS01 thunk %s (%lx) <- %s (%s), Reason: %ld\n",
-              module16, (DWORD)TD, module32, thunkfun32, dwReason);
+        TRACE("LS01 thunk %s (%p) <- %s (%s), Reason: %ld\n",
+              module16, TD, module32, thunkfun32, dwReason);
     }
     else
     {
@@ -1515,7 +1515,7 @@ void WINAPI C16ThkSL01(CONTEXT86 *context)
             return;
         }
 
-        TRACE("Creating stub for ThunkDataSL %08lx\n", (DWORD)td);
+        TRACE("Creating stub for ThunkDataSL %p\n", td);
 
 
         /* We produce the following code:
@@ -1556,8 +1556,8 @@ void WINAPI C16ThkSL01(CONTEXT86 *context)
         DWORD targetNr = LOWORD(context->Ecx) / 4;
         struct SLTargetDB *tdb;
 
-        TRACE("Process %08lx calling target %ld of ThunkDataSL %08lx\n",
-              GetCurrentProcessId(), targetNr, (DWORD)td);
+        TRACE("Process %08lx calling target %ld of ThunkDataSL %p\n",
+              GetCurrentProcessId(), targetNr, td);
 
         for (tdb = td->targetDB; tdb; tdb = tdb->next)
             if (tdb->process == GetCurrentProcessId())

dlls/msacm/driver.c

@@ -386,7 +386,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe
 
     /* FIXME: Create a WINE_ACMDRIVER32 */
     *phad = (HACMDRIVER)pad;
-    TRACE("'%s' => %08lx\n", debugstr_w(padid->pszDriverAlias), (DWORD)pad);
+    TRACE("'%s' => %p\n", debugstr_w(padid->pszDriverAlias), pad);
 
     return MMSYSERR_NOERROR;
  gotError:

dlls/msacm/msadp32/msadp32.c

@@ -716,8 +716,8 @@ static LRESULT ADPCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEAD
 LRESULT CALLBACK	ADPCM_DriverProc(DWORD dwDevID, HDRVR hDriv, UINT wMsg,
 					 LPARAM dwParam1, LPARAM dwParam2)
 {
-    TRACE("(%08lx %08lx %04x %08lx %08lx);\n",
-	  dwDevID, (DWORD)hDriv, wMsg, dwParam1, dwParam2);
+    TRACE("(%08lx %p %04x %08lx %08lx);\n",
+          dwDevID, hDriv, wMsg, dwParam1, dwParam2);
 
     switch (wMsg)
     {

dlls/msacm/msg711/msg711.c

@@ -1100,8 +1100,8 @@ static LRESULT G711_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADE
 LRESULT CALLBACK	G711_DriverProc(DWORD dwDevID, HDRVR hDriv, UINT wMsg,
 					 LPARAM dwParam1, LPARAM dwParam2)
 {
-    TRACE("(%08lx %08lx %04x %08lx %08lx);\n",
-	  dwDevID, (DWORD)hDriv, wMsg, dwParam1, dwParam2);
+    TRACE("(%08lx %p %04x %08lx %08lx);\n",
+          dwDevID, hDriv, wMsg, dwParam1, dwParam2);
 
     switch (wMsg)
     {

dlls/msacm/pcmconverter.c

@@ -1025,8 +1025,8 @@ static LRESULT PCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER
 LRESULT CALLBACK	PCM_DriverProc(DWORD dwDevID, HDRVR hDriv, UINT wMsg,
 				       LPARAM dwParam1, LPARAM dwParam2)
 {
-    TRACE("(%08lx %08lx %u %08lx %08lx);\n",
-	  dwDevID, (DWORD)hDriv, wMsg, dwParam1, dwParam2);
+    TRACE("(%08lx %p %u %08lx %08lx);\n",
+          dwDevID, hDriv, wMsg, dwParam1, dwParam2);
 
     switch (wMsg) {
     case DRV_LOAD:		return 1;

dlls/msacm/tests/msacm.c

@@ -188,8 +188,8 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid,
            "acmDriverID(): rc = %08x, should be %08x\n",
            rc, MMSYSERR_NOERROR);
         ok(hid == hadid,
-           "acmDriverID() returned ID %08lx doesn't equal %08lx\n",
-           (DWORD)hid, (DWORD)hadid);
+           "acmDriverID() returned ID %p doesn't equal %p\n",
+           hid, hadid);
 
         /* try bad pointer */
         rc = acmMetrics((HACMOBJ)had, ACM_METRIC_MAX_SIZE_FORMAT, 0);

dlls/quartz/filtergraph.c

@@ -3406,7 +3406,7 @@ static HRESULT WINAPI Videowindow_get_Owner(IVideoWindow *iface,
     IVideoWindow* pVideoWindow;
     HRESULT hr;
 
-    TRACE("(%p/%p)->(%08lx)\n", This, iface, (DWORD) Owner);
+    TRACE("(%p/%p)->(%p)\n", This, iface, Owner);
 
     EnterCriticalSection(&This->cs);
 

dlls/user/driver16.c

@@ -193,7 +193,7 @@ static	BOOL	DRIVER_AddToList(LPWINE_DRIVER lpNewDrv, LPARAM lParam1, LPARAM lPar
     /* First driver to be loaded for this module, need to load correctly the module */
     if (DRIVER_GetNumberOfModuleRefs(lpNewDrv) == 0) {
 	if (DRIVER_SendMessage(lpNewDrv, DRV_LOAD, 0L, 0L) != DRV_SUCCESS) {
-	    TRACE("DRV_LOAD failed on driver 0x%08lx\n", (DWORD)lpNewDrv);
+	    TRACE("DRV_LOAD failed on driver %p\n", lpNewDrv);
 	    return FALSE;
 	}
 	/* returned value is not checked */
@@ -216,7 +216,7 @@ static	BOOL	DRIVER_AddToList(LPWINE_DRIVER lpNewDrv, LPARAM lParam1, LPARAM lPar
     lpNewDrv->dwDriverID = DRIVER_SendMessage(lpNewDrv, DRV_OPEN, lParam1, lParam2);
 
     if (lpNewDrv->dwDriverID == 0) {
-	TRACE("DRV_OPEN failed on driver 0x%08lx\n", (DWORD)lpNewDrv);
+	TRACE("DRV_OPEN failed on driver %p\n", lpNewDrv);
 	DRIVER_RemoveFromList(lpNewDrv);
 	return FALSE;
     }
@@ -305,7 +305,7 @@ HDRVR16 WINAPI OpenDriver16(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lP
 	return 0;
     }
  the_end:
-    TRACE("=> %04x / %08lx\n", lpDrv->hDriver16, (DWORD)lpDrv);
+    TRACE("=> %04x / %p\n", lpDrv->hDriver16, lpDrv);
     return lpDrv->hDriver16;
 }
 

dlls/user/message.c

@@ -1308,7 +1308,7 @@ static BOOL post_dde_message( DWORD dest_tid, struct packed_message *data, const
                 /* send back the value of h on the other side */
                 push_data( data, &h, sizeof(HGLOBAL) );
                 lp = uiLo;
-                TRACE( "send dde-ack %x %08x => %08lx\n", uiLo, uiHi, (DWORD)h );
+                TRACE( "send dde-ack %x %08x => %p\n", uiLo, uiHi, h );
             }
         }
         else

dlls/user/resource.c

@@ -317,10 +317,10 @@ INT16 WINAPI LoadString16( HINSTANCE16 instance, UINT16 resource_id,
     int string_num;
     int i;
 
-    TRACE("inst=%04x id=%04x buff=%08x len=%d\n",
-          instance, resource_id, (int) buffer, buflen);
+    TRACE("inst=%04x id=%04x buff=%p len=%d\n",
+          instance, resource_id, buffer, buflen);
 
-    hrsrc = FindResource16( instance, (LPCSTR)((resource_id>>4)+1), (LPSTR)RT_STRING );
+    hrsrc = FindResource16( instance, MAKEINTRESOURCEA((resource_id>>4)+1), (LPSTR)RT_STRING );
     if (!hrsrc) return 0;
     hmem = LoadResource16( instance, hrsrc );
     if (!hmem) return 0;
@@ -364,12 +364,12 @@ INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id,
 
     if (HIWORD(resource_id)==0xFFFF) /* netscape 3 passes this */
 	resource_id = (UINT)(-((INT)resource_id));
-    TRACE("instance = %p, id = %04x, buffer = %08x, length = %d\n",
-          instance, (int)resource_id, (int) buffer, buflen);
+    TRACE("instance = %p, id = %04x, buffer = %p, length = %d\n",
+          instance, resource_id, buffer, buflen);
 
     /* Use bits 4 - 19 (incremented by 1) as resourceid, mask out
      * 20 - 31. */
-    hrsrc = FindResourceW( instance, (LPCWSTR)(((resource_id>>4)&0xffff)+1),
+    hrsrc = FindResourceW( instance, MAKEINTRESOURCEW(((resource_id>>4)&0xffff)+1),
                            (LPWSTR)RT_STRING );
     if (!hrsrc) return 0;
     hmem = LoadResource( instance, hrsrc );
@@ -410,8 +410,8 @@ INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id,
     INT    retval;
     LPWSTR wbuf;
 
-    TRACE("instance = %p, id = %04x, buffer = %08x, length = %d\n",
-          instance, (int)resource_id, (int) buffer, buflen);
+    TRACE("instance = %p, id = %04x, buffer = %p, length = %d\n",
+          instance, resource_id, buffer, buflen);
 
     if(buffer == NULL) /* asked size of string */
 	return LoadStringW(instance, resource_id, NULL, 0);

dlls/version/resource.c

@@ -440,8 +440,8 @@ DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType,
     OFSTRUCT ofs;
     DWORD reslen = dwResLen;
 
-    TRACE("(%s,type=0x%lx,id=0x%lx,off=%ld,len=%ld,data=%p)\n",
-		debugstr_a(lpszFileName), (LONG)lpszResType, (LONG)lpszResId,
+    TRACE("(%s,type=%p,id=%p,off=%ld,len=%ld,data=%p)\n",
+		debugstr_a(lpszFileName), lpszResType, lpszResId,
                 dwFileOffset, dwResLen, lpvData );
 
     lzfd = LZOpenFileA( (LPSTR)lpszFileName, &ofs, OF_READ );

dlls/vmm.vxd/vmm.c

@@ -162,7 +162,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT86 *context )
         /* FIXME: Handle flags in some way */
         address = (LPVOID )(page * psize);
         ret = VirtualAlloc ( address, ( npages * psize ), MEM_RESERVE, 0 );
-        TRACE("PageReserve: returning: %08lx\n", (DWORD )ret );
+        TRACE("PageReserve: returning: %p\n", ret );
         if ( ret == NULL )
           return -1;
         else
@@ -195,7 +195,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT86 *context )
 
         address = (LPVOID )(page * psize);
         ret = VirtualAlloc ( address, ( npages * psize ), MEM_COMMIT, virt_perm );
-        TRACE("PageCommit: Returning: %08lx\n", (DWORD )ret );
+        TRACE("PageCommit: Returning: %p\n", ret );
         return (DWORD )ret;
 
     }
@@ -269,7 +269,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT86 *context )
         }
 
         if ( ! VirtualProtect ( address, ( npages * psize ), virt_new_perm, &virt_old_perm ) ) {
-          ERR("Can't change page permissions for %08lx\n", (DWORD )address );
+          ERR("Can't change page permissions for %p\n", address );
           return 0xffffffff;
         }
         TRACE("Returning: %08lx\n", pg_old_perm );
@@ -282,8 +282,8 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT86 *context )
         LPVOID hmem = (LPVOID) stack32_pop( context );
         DWORD flags = (DWORD ) stack32_pop( context );
 
-        TRACE("PageFree: hmem: %08lx, flags: %08lx partial stub\n",
-              (DWORD )hmem, flags );
+        TRACE("PageFree: hmem: %p, flags: %08lx partial stub\n",
+              hmem, flags );
 
         ret = VirtualFree ( hmem, 0, MEM_RELEASE );
         TRACE("Returning: %d\n", ret );

dlls/winaspi/winaspi32.c

@@ -183,7 +183,7 @@ ASPI_DebugPrintCmd(SRB_ExecSCSICmd *prb)
   TRACE("SenseLen: %d\n", prb->SRB_SenseLen);
   TRACE("BufPtr: %p\n", prb->SRB_BufPointer);
   TRACE("CDB Length: %d\n", prb->SRB_CDBLen);
-  TRACE("POST Proc: %lx\n", (DWORD) prb->SRB_PostProc);
+  TRACE("POST Proc: %p\n", prb->SRB_PostProc);
   cdb = &prb->CDBByte[0];
   cmd = prb->CDBByte[0];
   if (TRACE_ON(aspi)) {
@@ -286,7 +286,7 @@ WNASPI32_DoPosting( SRB_ExecSCSICmd *lpPRB, DWORD status )
 	{
 		if (SRB_Flags & 0x1)
 		{
-			TRACE("Post Routine (%lx) called\n", (DWORD) SRB_PostProc);
+			TRACE("Post Routine (%p) called\n", SRB_PostProc);
 			/* Even though lpPRB could have been freed by
 			 * the program.. that's unlikely if it planned
 			 * to use it in the PostProc

dlls/wined3d/swapchain.c

@@ -146,7 +146,7 @@ HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CONST REC
             /* FIXME: Never access */
             IWineD3DSwapChainImpl *swapChainImpl;
             IWineD3DDevice_GetSwapChain((IWineD3DDevice *)This->wineD3DDevice, 0 , (IWineD3DSwapChain **)&swapChainImpl);
-            FIXME("Unable to render to a destination window %d\n", (int)hDestWindowOverride );
+            FIXME("Unable to render to a destination window %p\n", hDestWindowOverride );
             if(This == swapChainImpl){
                 /* FIXME: this will be fixed by moving to a context management system */
                 FIXME("Cannot change the target of the implicit swapchain\n");

dlls/wininet/utility.c

@@ -240,8 +240,8 @@ VOID SendSyncCallback(LPWININETHANDLEHEADER hdr, DWORD dwContext,
         }
     }
     
-    TRACE(" callback(%p) (%08lx (%p), %08lx, %ld (%s), %p, %ld)\n",
-	  hdr->lpfnStatusCB, (DWORD) hHttpSession, hdr, dwContext, dwInternetStatus, get_callback_name(dwInternetStatus),
+    TRACE(" callback(%p) (%p (%p), %08lx, %ld (%s), %p, %ld)\n",
+	  hdr->lpfnStatusCB, hHttpSession, hdr, dwContext, dwInternetStatus, get_callback_name(dwInternetStatus),
 	  lpvNewInfo, dwStatusInfoLength);
     
     hdr->lpfnStatusCB(hHttpSession, dwContext, dwInternetStatus,

dlls/winmm/driver.c

@@ -178,7 +178,7 @@ static	BOOL	DRIVER_AddToList(LPWINE_DRIVER lpNewDrv, LPARAM lParam1, LPARAM lPar
         /* first of this driver in list ? */
 	if (DRIVER_GetNumberOfModuleRefs(lpNewDrv->d.d32.hModule, NULL) == 0) {
 	    if (DRIVER_SendMessage(lpNewDrv, DRV_LOAD, 0L, 0L) != DRV_SUCCESS) {
-		TRACE("DRV_LOAD failed on driver 0x%08lx\n", (DWORD)lpNewDrv);
+		TRACE("DRV_LOAD failed on driver %p\n", lpNewDrv);
 		return FALSE;
 	    }
 	    /* returned value is not checked */
@@ -204,7 +204,7 @@ static	BOOL	DRIVER_AddToList(LPWINE_DRIVER lpNewDrv, LPARAM lParam1, LPARAM lPar
 	lpNewDrv->d.d32.dwDriverID = DRIVER_SendMessage(lpNewDrv, DRV_OPEN, lParam1, lParam2);
 
 	if (lpNewDrv->d.d32.dwDriverID == 0) {
-	    TRACE("DRV_OPEN failed on driver 0x%08lx\n", (DWORD)lpNewDrv);
+	    TRACE("DRV_OPEN failed on driver %p\n", lpNewDrv);
 	    DRIVER_RemoveFromList(lpNewDrv);
 	    return FALSE;
 	}
@@ -385,7 +385,7 @@ HDRVR WINAPI OpenDriver(LPCWSTR lpDriverName, LPCWSTR lpSectionName, LPARAM lPar
     return 0;
 
  the_end:
-    if (lpDrv)	TRACE("=> %08lx\n", (DWORD)lpDrv);
+    if (lpDrv)	TRACE("=> %p\n", lpDrv);
     return (HDRVR)lpDrv;
 }
 

dlls/winmm/winealsa/audio.c

@@ -2580,7 +2580,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
     }
     wwo->hStartUpEvent = INVALID_HANDLE_VALUE;
 
-    TRACE("handle=%08lx \n", (DWORD)pcm);
+    TRACE("handle=%p\n", pcm);
     TRACE("wBitsPerSample=%u, nAvgBytesPerSec=%lu, nSamplesPerSec=%lu, nChannels=%u nBlockAlign=%u!\n",
 	  wwo->format.Format.wBitsPerSample, wwo->format.Format.nAvgBytesPerSec,
 	  wwo->format.Format.nSamplesPerSec, wwo->format.Format.nChannels,

dlls/winsock/socket.c

@@ -1660,8 +1660,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
     int fd;
     INT ret = 0;
 
-    TRACE("socket: %04x, level 0x%x, name 0x%x, ptr %8x, len %d\n", s, level,
-          (int) optname, (int) optval, (int) *optlen);
+    TRACE("socket: %04x, level 0x%x, name 0x%x, ptr %p, len %d\n",
+          s, level, optname, optval, *optlen);
     /* SO_OPENTYPE does not require a valid socket handle. */
     if (level == WS_SOL_SOCKET && optname == WS_SO_OPENTYPE)
     {
@@ -2917,7 +2917,7 @@ int WINAPI WSAEnumNetworkEvents(SOCKET s, WSAEVENT hEvent, LPWSANETWORKEVENTS lp
 {
     int ret;
 
-    TRACE("%08x, hEvent %p, lpEvent %08x\n", s, hEvent, (unsigned)lpEvent );
+    TRACE("%08x, hEvent %p, lpEvent %p\n", s, hEvent, lpEvent );
 
     SERVER_START_REQ( get_socket_event )
     {

dlls/wintab32/context.c

@@ -68,8 +68,8 @@ static char* DUMPBITS(int x, char* buf)
 
 static inline void DUMPPACKET(WTPACKET packet)
 {
-    TRACE("pkContext: 0x%x pkStatus: 0x%x pkTime : 0x%x pkChanged: 0x%x pkSerialNumber: 0x%x pkCursor : %i pkButtons: %x pkX: %li pkY: %li pkZ: %li pkNormalPressure: %i pkTangentPressure: %i pkOrientation: (%i,%i,%i) pkRotation: (%i,%i,%i)\n"
-,(UINT)packet.pkContext,
+    TRACE("pkContext: %p pkStatus: 0x%x pkTime : 0x%x pkChanged: 0x%x pkSerialNumber: 0x%x pkCursor : %i pkButtons: %x pkX: %li pkY: %li pkZ: %li pkNormalPressure: %i pkTangentPressure: %i pkOrientation: (%i,%i,%i) pkRotation: (%i,%i,%i)\n",
+          packet.pkContext,
     (UINT)packet.pkStatus,
     (UINT)packet.pkTime,
     (UINT)packet.pkChanged,
@@ -132,7 +132,7 @@ int TABLET_PostTabletMessage(LPOPENCONTEXT newcontext, UINT msg, WPARAM wParam,
 {
     if ((send_always) || (newcontext->context.lcOptions & CXO_MESSAGES))
     {
-        TRACE("Posting message %x to %x\n",msg, (UINT)newcontext->hwndOwner);
+        TRACE("Posting message %x to %p\n",msg, newcontext->hwndOwner);
         return PostMessageA(newcontext->hwndOwner, msg, wParam, lParam);
     }
     return 0;