Fixed warnings caused by conversion to -DSTRICT.

dlls/avicap32/avicap32_main.c

@@ -30,7 +30,7 @@ HWND VFWAPI capCreateCaptureWindowW(LPCWSTR lpszWindowName, DWORD dwStyle, INT x
                                     INT y, INT nWidth, INT nHeight, HWND hWnd,
                                     INT nID)
 {
-    FIXME("%s, %08lx, %08x, %08x, %08x, %08x, %x, %08x\n",
+    FIXME("%s, %08lx, %08x, %08x, %08x, %08x, %p, %08x\n",
            debugstr_w(lpszWindowName), dwStyle,
            x, y, nWidth, nHeight, hWnd, nID);
     return 0;

dlls/avifil32/api.c

@@ -889,7 +889,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving)
 BOOL WINAPI AVISaveOptions(HWND hWnd, UINT uFlags, INT nStream,
 			   PAVISTREAM *ppavi, LPAVICOMPRESSOPTIONS *ppOptions)
 {
-  FIXME("(0x%X,0x%X,%d,%p,%p): stub\n", hWnd, uFlags, nStream,
+  FIXME("(%p,0x%X,%d,%p,%p): stub\n", hWnd, uFlags, nStream,
 	ppavi, ppOptions);
 
   return FALSE;

dlls/avifil32/extrachunk.c

@@ -152,7 +152,7 @@ HRESULT FindChunkAndKeepExtras(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck,
   assert(hmmio != (HMMIO)NULL);
   assert(lpck  != NULL);
 
-  TRACE("({%p,%lu},%d,%p,%p,0x%X)\n", extra->lp, extra->cb, hmmio, lpck,
+  TRACE("({%p,%lu},%p,%p,%p,0x%X)\n", extra->lp, extra->cb, hmmio, lpck,
 	lpckParent, flags);
 
   /* what chunk id and form/list type shoiuld we search? */

dlls/avifil32/factory.c

@@ -200,7 +200,7 @@ DWORD WINAPI AVIFILE_DllCanUnloadNow(void)
 BOOL WINAPI AVIFILE_DllMain(HINSTANCE hInstDll, DWORD fdwReason,
 			    LPVOID lpvReserved)
 {
-  TRACE("(0x%X,%lu,%p)\n", hInstDll, fdwReason, lpvReserved);
+  TRACE("(%p,%lu,%p)\n", hInstDll, fdwReason, lpvReserved);
 
   switch (fdwReason) {
   case DLL_PROCESS_ATTACH:

dlls/comcat/comcat_main.c

@@ -66,7 +66,7 @@ static struct regsvr_entry regsvr_entries[6] = {
  */
 BOOL WINAPI COMCAT_DllEntryPoint(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
 {
-    TRACE("0x%x 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
+    TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
 
     switch(fdwReason) {
     case DLL_PROCESS_ATTACH:

dlls/crtdll/crtdll_main.c

@@ -81,7 +81,7 @@ static void convert_struct_stat( struct crtdll_stat *dst, const struct _stat *sr
  */
 BOOL WINAPI CRTDLL_Init(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
 {
-  TRACE("(0x%08x,%ld,%p)\n",hinstDLL,fdwReason,lpvReserved);
+  TRACE("(%p,%ld,%p)\n",hinstDLL,fdwReason,lpvReserved);
 
   if (fdwReason == DLL_PROCESS_ATTACH)
   {

dlls/d3d8/directx.c

@@ -389,7 +389,7 @@ HRESULT  WINAPI  IDirect3D8Impl_CreateDevice               (LPDIRECT3D8 iface,
     HWND whichHWND;
 
     ICOM_THIS(IDirect3D8Impl,iface);
-    TRACE("(%p)->(Adptr:%d, DevType: %x, FocusHwnd: %x, BehFlags: %lx, PresParms: %p, RetDevInt: %p)\n", This, Adapter, DeviceType,
+    TRACE("(%p)->(Adptr:%d, DevType: %x, FocusHwnd: %p, BehFlags: %lx, PresParms: %p, RetDevInt: %p)\n", This, Adapter, DeviceType,
           hFocusWindow, BehaviourFlags, pPresentationParameters, ppReturnedDeviceInterface);
 
     /* Allocate the storage for the device */
@@ -457,7 +457,7 @@ HRESULT  WINAPI  IDirect3D8Impl_CreateDevice               (LPDIRECT3D8 iface,
         ERR("Error in context creation !\n");
         return D3DERR_INVALIDCALL;
     } else {
-        TRACE("Context created (HWND=%x, glContext=%p, Window=%ld, VisInfo=%p)\n",
+        TRACE("Context created (HWND=%p, glContext=%p, Window=%ld, VisInfo=%p)\n",
 			whichHWND, object->glCtx, object->win, object->visInfo);
     }
 

dlls/ddraw/d3ddevice/mesa.c

@@ -251,7 +251,7 @@ is_OpenGL(
     ReleaseDC((*device)->surface->ddraw_owner->window,device_context);
     ENTER_GL();
 
-    template.visualid = GetPropA( GetDesktopWindow(), "__wine_x11_visual_id" );
+    template.visualid = (VisualID)GetPropA( GetDesktopWindow(), "__wine_x11_visual_id" );
     vis = XGetVisualInfo(odev->gdi_display, VisualIDMask, &template, &num);
     if (vis == NULL)
       ERR("No visual found !\n");

dlls/ddraw/ddraw/main.c

@@ -906,7 +906,7 @@ Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface)
 static void DDRAW_SubclassWindow(IDirectDrawImpl* This)
 {
     /* Well we don't actually subclass the window yet. */
-    SetPropA(This->window, ddProp, (LONG)This);
+    SetPropA(This->window, ddProp, This);
 }
 
 static void DDRAW_UnsubclassWindow(IDirectDrawImpl* This)
@@ -942,7 +942,7 @@ Main_DirectDraw_SetCooperativeLevel(LPDIRECTDRAW7 iface, HWND hwnd,
     This->window = hwnd;
     This->cooperative_level = cooplevel;
 
-    This->local.hWnd = hwnd;
+    This->local.hWnd = (ULONG_PTR)hwnd;
     This->local.dwLocalFlags |= DDRAWILCL_SETCOOPCALLED;
     /* not entirely sure about these */
     if (cooplevel & DDSCL_EXCLUSIVE)     This->local.dwLocalFlags |= DDRAWILCL_HASEXCLUSIVEMODE;
@@ -1039,7 +1039,7 @@ Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,
 				     HANDLE h)
 {
     ICOM_THIS(IDirectDrawImpl,iface);
-    FIXME("(%p)->(flags=0x%08lx,handle=0x%08x)\n",This,dwFlags,h);
+    FIXME("(%p)->(flags=0x%08lx,handle=%p)\n",This,dwFlags,h);
     return DD_OK;
 }
 

dlls/ddraw/dsurface/dib.c

@@ -174,7 +174,7 @@ static HRESULT create_dib(IDirectDrawSurfaceImpl* This)
 	ERR("unexpected error creating DirectDrawSurface DIB section\n");
 
     /* this seems like a good place to put the handle for HAL driver use */
-    This->global_more.hKernelSurface = priv->dib.DIBsection;
+    This->global_more.hKernelSurface = (ULONG_PTR)priv->dib.DIBsection;
 
     return S_OK;
 }

dlls/ddraw/dsurface/main.c

@@ -735,7 +735,7 @@ Main_DirectDrawSurface_GetDC(LPDIRECTDRAWSURFACE7 iface, HDC *phDC)
     hr = This->get_dc(This, &This->hDC);
     if (SUCCEEDED(hr))
     {
-	TRACE("returning %08x\n",This->hDC);
+	TRACE("returning %p\n",This->hDC);
 
 	*phDC = This->hDC;
 	This->dc_in_use = TRUE;
@@ -985,7 +985,7 @@ Main_DirectDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7 iface, HDC hDC)
     HRESULT hr;
     ICOM_THIS(IDirectDrawSurfaceImpl, iface);
 
-    TRACE("(%p)->(%08x)\n",This,hDC);
+    TRACE("(%p)->(%p)\n",This,hDC);
 
     if (!This->dc_in_use || This->hDC != hDC)
 	return DDERR_INVALIDPARAMS;

dlls/ddraw/dsurface/user.c

@@ -483,7 +483,7 @@ static DWORD CALLBACK User_update_thread(LPVOID arg)
 {
     IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)arg;
     USER_PRIV_VAR(priv, This);
-    volatile DWORD *pActive = (volatile DWORD *)&priv->user.update_event;
+    volatile HANDLE *pActive = (volatile HANDLE *)&priv->user.update_event;
     HANDLE event = *pActive;
 
 #ifdef OWN_WINDOW

dlls/dinput/device.c

@@ -412,7 +412,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_RunControlPanel(
 	HWND hwndOwner,
 	DWORD dwFlags)
 {
-  FIXME("(this=%p,0x%08x,0x%08lx): stub!\n",
+  FIXME("(this=%p,%p,0x%08lx): stub!\n",
 	iface, hwndOwner, dwFlags);
 
 	return DI_OK;
@@ -424,7 +424,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Initialize(
 	DWORD dwVersion,
 	REFGUID rguid)
 {
-	FIXME("(this=%p,%d,%ld,%s): stub!\n",
+	FIXME("(this=%p,%p,%ld,%s): stub!\n",
 	      iface, hinst, dwVersion, debugstr_guid(rguid));
 	return DI_OK;
 }

dlls/dsound/mixer.c

@@ -87,7 +87,7 @@ void DSOUND_CheckEvent(IDirectSoundBufferImpl *dsb, int len)
 	for (i = 0; i < dsb->nrofnotifies ; i++) {
 		event = dsb->notifies + i;
 		offset = event->dwOffset;
-		TRACE("checking %d, position %ld, event = %d\n",
+		TRACE("checking %d, position %ld, event = %p\n",
 			i, offset, event->hEventNotify);
 		/* DSBPN_OFFSETSTOP has to be the last element. So this is */
 		/* OK. [Inside DirectX, p274] */
@@ -97,7 +97,7 @@ void DSOUND_CheckEvent(IDirectSoundBufferImpl *dsb, int len)
 		if (offset == DSBPN_OFFSETSTOP) {
 			if (dsb->state == STATE_STOPPED) {
 				SetEvent(event->hEventNotify);
-				TRACE("signalled event %d (%d)\n", event->hEventNotify, i);
+				TRACE("signalled event %p (%d)\n", event->hEventNotify, i);
 				return;
 			} else
 				return;
@@ -105,12 +105,12 @@ void DSOUND_CheckEvent(IDirectSoundBufferImpl *dsb, int len)
 		if ((dsb->playpos + len) >= dsb->buflen) {
 			if ((offset < ((dsb->playpos + len) % dsb->buflen)) ||
 			    (offset >= dsb->playpos)) {
-				TRACE("signalled event %d (%d)\n", event->hEventNotify, i);
+				TRACE("signalled event %p (%d)\n", event->hEventNotify, i);
 				SetEvent(event->hEventNotify);
 			}
 		} else {
 			if ((offset >= dsb->playpos) && (offset < (dsb->playpos + len))) {
-				TRACE("signalled event %d (%d)\n", event->hEventNotify, i);
+				TRACE("signalled event %p (%d)\n", event->hEventNotify, i);
 				SetEvent(event->hEventNotify);
 			}
 		}

dlls/msimg32/msimg32_main.c

@@ -43,7 +43,7 @@ BOOL WINAPI AlphaBlend( HDC hdcDest, int xDest, int yDest, int widthDest, int he
                         HDC hdcSrc, int xSrc, int ySrc, int widthSrc, int heightSrc,
                         BLENDFUNCTION func )
 {
-    FIXME("stub: AlphaBlend from %x to %x\n", hdcSrc, hdcDest );
+    FIXME("stub: AlphaBlend from %p to %p\n", hdcSrc, hdcDest );
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return FALSE;
 }
@@ -56,7 +56,7 @@ BOOL WINAPI TransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, in
                             HDC hdcSrc, int xSrc, int ySrc, int widthSrc, int heightSrc,
                             UINT crTransparent )
 {
-    FIXME("stub: TransparentBlt from %x to %x\n", hdcSrc, hdcDest );
+    FIXME("stub: TransparentBlt from %p to %p\n", hdcSrc, hdcDest );
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return FALSE;
 }

dlls/msisys/msisys.c

@@ -57,7 +57,7 @@ BOOL WINAPI MSISYS_DllMain(
 	DWORD fdwReason,
 	LPVOID lpvReserved )
 {
-	TRACE("(%08x,%08lx,%p)\n",hInstDLL,fdwReason,lpvReserved);
+	TRACE("(%p,%08lx,%p)\n",hInstDLL,fdwReason,lpvReserved);
 
 	switch ( fdwReason )
 	{

dlls/netapi32/netapi32.c

@@ -186,7 +186,7 @@ static UCHAR NETBIOS_Astat(PNCB ncb)
 BOOL WINAPI
 NETAPI32_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-    TRACE("%x,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
+    TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
 
     switch (fdwReason) {
 	case DLL_PROCESS_ATTACH:

dlls/odbc32/proxyodbc.c

@@ -172,7 +172,7 @@ BOOL WINAPI
 MAIN_OdbcInit(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
     int i;
-    TRACE("Initializing or Finalizing proxy ODBC: %x,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
+    TRACE("Initializing or Finalizing proxy ODBC: %p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
 
     if (fdwReason == DLL_PROCESS_ATTACH)
     {

dlls/olecli/olecli_main.c

@@ -26,7 +26,7 @@
 #include "ole.h"
 #include "winbase.h"
 #include "wingdi.h"
-
+#include "wownt32.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
@@ -193,7 +193,7 @@ OLESTATUS WINAPI OleQueryCreateFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIP
  */
 BOOL WINAPI OleIsDcMeta(HDC hdc)
 {
-    TRACE("(%04x)\n",hdc);
+    TRACE("(%p)\n",hdc);
     return GetObjectType( hdc ) == OBJ_METADC;
 }
 
@@ -203,7 +203,7 @@ BOOL WINAPI OleIsDcMeta(HDC hdc)
  */
 BOOL16 WINAPI OleIsDcMeta16(HDC16 hdc)
 {
-    return OleIsDcMeta( hdc );
+    return OleIsDcMeta( HDC_32(hdc) );
 }
 
 

dlls/oledlg/oledlg_main.c

@@ -35,7 +35,7 @@ BOOL WINAPI OleUIAddVerbMenuA(
   HMENU hMenu, UINT uPos, UINT uIDVerbMin, UINT uIDVerbMax,
   BOOL bAddConvert, UINT idConvert, HMENU *lphMenu)
 {
-  FIXME("(%p, %s, 0x%08x, %d, %d, %d, %d, %d, %p): stub\n",
+  FIXME("(%p, %s, %p, %d, %d, %d, %d, %d, %p): stub\n",
     lpOleObj, debugstr_a(lpszShortType),
     hMenu, uPos, uIDVerbMin, uIDVerbMax,
     bAddConvert, idConvert, lphMenu
@@ -52,7 +52,7 @@ BOOL WINAPI OleUIAddVerbMenuW(
   HMENU hMenu, UINT uPos, UINT uIDVerbMin, UINT uIDVerbMax,
   BOOL bAddConvert, UINT idConvert, HMENU *lphMenu)
 {
-  FIXME("(%p, %s, 0x%08x, %d, %d, %d, %d, %d, %p): stub\n",
+  FIXME("(%p, %s, %p, %d, %d, %d, %d, %d, %p): stub\n",
     lpOleObj, debugstr_w(lpszShortType),
     hMenu, uPos, uIDVerbMin, uIDVerbMax,
     bAddConvert, idConvert, lphMenu
@@ -203,7 +203,7 @@ BOOL WINAPI OleUIUpdateLinksA(
   LPOLEUILINKCONTAINERA lpOleUILinkCntr,
   HWND hwndParent, LPSTR lpszTitle, INT cLinks)
 {
-  FIXME("(%p, 0x%08x, %s, %d): stub\n",
+  FIXME("(%p, %p, %s, %d): stub\n",
     lpOleUILinkCntr, hwndParent, debugstr_a(lpszTitle), cLinks
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -217,7 +217,7 @@ BOOL WINAPI OleUIUpdateLinksW(
   LPOLEUILINKCONTAINERW lpOleUILinkCntr,
   HWND hwndParent, LPWSTR lpszTitle, INT cLinks)
 {
-  FIXME("(%p, 0x%08x, %s, %d): stub\n",
+  FIXME("(%p, %p, %s, %d): stub\n",
     lpOleUILinkCntr, hwndParent, debugstr_w(lpszTitle), cLinks
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -230,7 +230,7 @@ BOOL WINAPI OleUIUpdateLinksW(
 INT __cdecl OleUIPromptUserA(
   INT nTemplate, HWND hwndParent, ...)
 {
-  FIXME("(%d, 0x%08x, ...): stub\n", nTemplate, hwndParent);
+  FIXME("(%d, %p, ...): stub\n", nTemplate, hwndParent);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return OLEUI_FALSE;
 }
@@ -241,7 +241,7 @@ INT __cdecl OleUIPromptUserA(
 INT __cdecl OleUIPromptUserW(
   INT nTemplate, HWND hwndParent, ...)
 {
-  FIXME("(%d, 0x%08x, ...): stub\n", nTemplate, hwndParent);
+  FIXME("(%d, %p, ...): stub\n", nTemplate, hwndParent);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return OLEUI_FALSE;
 }

dlls/olesvr/olesvr_main.c

@@ -127,7 +127,7 @@ OLESTATUS WINAPI OleRevokeServer16(LHSERVER hServer)
  * OleRegisterServer [OLESVR32.2]
  */
 OLESTATUS WINAPI OleRegisterServer(LPCSTR svrname,LPOLESERVER olesvr,LHSERVER* hRet,HINSTANCE hinst,OLE_SERVER_USE osu) {
-	FIXME("(%s,%p,%p,%08x,%d): stub!\n",svrname,olesvr,hRet,hinst,osu);
+	FIXME("(%s,%p,%p,%p,%d): stub!\n",svrname,olesvr,hRet,hinst,osu);
     	*hRet=++OLE_current_handle;
 	return OLE_OK;
 }

dlls/opengl32/wgl.c

@@ -133,11 +133,11 @@ HGLRC WINAPI wglCreateContext(HDC hdc)
   XVisualInfo template;
   Display *display = get_display( hdc );
 
-  TRACE("(%08x)\n", hdc);
+  TRACE("(%p)\n", hdc);
 
   /* First, get the visual in use by the X11DRV */
   if (!display) return 0;
-  template.visualid = GetPropA( GetDesktopWindow(), "__wine_x11_visual_id" );
+  template.visualid = (VisualID)GetPropA( GetDesktopWindow(), "__wine_x11_visual_id" );
   vis = XGetVisualInfo(display, VisualIDMask, &template, &num);
 
   if (vis == NULL) {
@@ -163,7 +163,7 @@ HGLRC WINAPI wglCreateContext(HDC hdc)
  */
 HGLRC WINAPI wglCreateLayerContext(HDC hdc,
 				   int iLayerPlane) {
-  FIXME("(%08x,%d): stub !\n", hdc, iLayerPlane);
+  FIXME("(%p,%d): stub !\n", hdc, iLayerPlane);
 
   return NULL;
 }
@@ -216,7 +216,7 @@ BOOL WINAPI wglDescribeLayerPlane(HDC hdc,
 				  int iLayerPlane,
 				  UINT nBytes,
 				  LPLAYERPLANEDESCRIPTOR plpd) {
-  FIXME("(%08x,%d,%d,%d,%p)\n", hdc, iPixelFormat, iLayerPlane, nBytes, plpd);
+  FIXME("(%p,%d,%d,%d,%p)\n", hdc, iPixelFormat, iLayerPlane, nBytes, plpd);
 
   return FALSE;
 }
@@ -255,7 +255,7 @@ HDC WINAPI wglGetCurrentDC(void) {
   LEAVE_GL();
 
   if (ret) {
-    TRACE(" returning %08x (GL context %p - Wine context %p)\n", ret->hdc, gl_ctx, ret);
+    TRACE(" returning %p (GL context %p - Wine context %p)\n", ret->hdc, gl_ctx, ret);
     return ret->hdc;
   } else {
     TRACE(" no Wine context found for GLX context %p\n", gl_ctx);
@@ -357,7 +357,7 @@ BOOL WINAPI wglMakeCurrent(HDC hdc,
 			   HGLRC hglrc) {
   BOOL ret;
 
-  TRACE("(%08x,%p)\n", hdc, hglrc);
+  TRACE("(%p,%p)\n", hdc, hglrc);
 
   ENTER_GL();
   if (hglrc == NULL) {
@@ -437,7 +437,7 @@ BOOL WINAPI wglShareLists(HGLRC hglrc1,
  */
 BOOL WINAPI wglSwapLayerBuffers(HDC hdc,
 				UINT fuPlanes) {
-  TRACE("(%08x, %08x)\n", hdc, fuPlanes);
+  TRACE("(%p, %08x)\n", hdc, fuPlanes);
 
   if (fuPlanes & WGL_SWAP_MAIN_PLANE) {
     if (!SwapBuffers(hdc)) return FALSE;
@@ -461,7 +461,7 @@ BOOL WINAPI wglUseFontBitmapsA(HDC hdc,
 {
   Font fid = get_font( hdc );
 
-  TRACE("(%08x, %ld, %ld, %ld) using font %ld\n", hdc, first, count, listBase, fid);
+  TRACE("(%p, %ld, %ld, %ld) using font %ld\n", hdc, first, count, listBase, fid);
 
   if (fid == 0) {
     /* We are running using client-side rendering fonts... */

dlls/rasapi32/rasapi.c

@@ -66,7 +66,7 @@ DWORD WINAPI RasGetEntryDialParamsA( LPCSTR lpszPhoneBook,
  */
 DWORD WINAPI RasHangUpA( HRASCONN hrasconn)
 {
-	FIXME("(%x),stub!\n",hrasconn);
+	FIXME("(%p),stub!\n",hrasconn);
 	return 0;
 }
 

dlls/richedit/richedit.c

@@ -47,7 +47,7 @@ HANDLE RICHED32_hHeap = (HANDLE)NULL;
 
 #define DPRINTF_EDIT_MSG32(str) \
         TRACE(\
-                     "32 bit : " str ": hwnd=%08x, wParam=%08x, lParam=%08x\n"\
+                     "32 bit : " str ": hwnd=%p, wParam=%08x, lParam=%08x\n"\
                      , \
                      hwnd, (UINT)wParam, (UINT)lParam)
 
@@ -112,9 +112,9 @@ static LRESULT WINAPI RICHED32_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
     int rtfBufferSize;
 
     CHARRANGE *cr;
-    TRACE("previous hwndEdit: 0x%x hwndParent 0x%x\n",hwndEdit,hwndParent);
+    TRACE("previous hwndEdit: %p hwndParent %p\n",hwndEdit,hwndParent);
     hwndEdit = GetWindow(hwnd,GW_CHILD);
-    TRACE("uMsg: 0x%x hwnd: 0x%x hwndEdit: 0x%x\n",uMsg,hwnd,hwndEdit);
+    TRACE("uMsg: 0x%x hwnd: %p hwndEdit: %p\n",uMsg,hwnd,hwndEdit);
 
     switch (uMsg)
     {
@@ -131,12 +131,12 @@ static LRESULT WINAPI RICHED32_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
             newstyle &= ~ES_AUTOHSCROLL;
             newstyle &= ~ES_AUTOVSCROLL;
 
-    TRACE("previous hwndEdit: 0x%d\n",hwndEdit);
+    TRACE("previous hwndEdit: %p\n",hwndEdit);
             hwndEdit = CreateWindowA ("edit", ((LPCREATESTRUCTA) lParam)->lpszName,
                                    style, 0, 0, 0, 0,
                                    hwnd, (HMENU) ID_EDIT,
                                    ((LPCREATESTRUCTA) lParam)->hInstance, NULL) ;
-    TRACE("hwndEdit: 0x%x hwnd: 0x%x\n",hwndEdit,hwnd);
+    TRACE("hwndEdit: %p hwnd: %p\n",hwndEdit,hwnd);
 
 	    SetWindowLongA(hwnd,GWL_STYLE, newstyle);
             return 0 ;
@@ -715,7 +715,7 @@ static LRESULT WINAPI RICHED32_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
 
     }
 
-    FIXME("Unknown message 0x%x Passed to default hwnd=%08x, wParam=%08x, lParam=%08x\n",
+    FIXME("Unknown message 0x%x Passed to default hwnd=%p, wParam=%08x, lParam=%08x\n",
            uMsg, hwnd, (UINT)wParam, (UINT)lParam);
 
    return DefWindowProcA( hwnd,uMsg,wParam,lParam);

dlls/rpcrt4/cpsf.c

@@ -160,7 +160,7 @@ HRESULT WINAPI NdrDllRegisterProxy(HMODULE hDll,
   char keyname[120], module[120];
   HKEY key, subkey;
 
-  TRACE("(%x,%p,%s)\n", hDll, pProxyFileList, debugstr_guid(pclsid));
+  TRACE("(%p,%p,%s)\n", hDll, pProxyFileList, debugstr_guid(pclsid));
   UuidToStringA((UUID*)pclsid, &clsid);
 
   /* register interfaces to point to clsid */
@@ -220,7 +220,7 @@ HRESULT WINAPI NdrDllUnregisterProxy(HMODULE hDll,
   LPSTR clsid;
   char keyname[120], module[120];
 
-  TRACE("(%x,%p,%s)\n", hDll, pProxyFileList, debugstr_guid(pclsid));
+  TRACE("(%p,%p,%s)\n", hDll, pProxyFileList, debugstr_guid(pclsid));
   UuidToStringA((UUID*)pclsid, &clsid);
 
   /* unregister interfaces */

dlls/rpcrt4/rpc_server.c

@@ -249,7 +249,7 @@ static DWORD CALLBACK RPCRT4_server_thread(LPVOID the_arg)
       if (bind) RPCRT4_SpawnBinding(&cbind, bind);
       LeaveCriticalSection(&server_cs);
       if (!bind) {
-        ERR("failed to locate binding for handle %d\n", b_handle);
+        ERR("failed to locate binding for handle %p\n", b_handle);
       }
       if (cbind) RPCRT4_new_client(cbind);
     }

dlls/serialui/confdlg.c

@@ -62,7 +62,7 @@ HMODULE SERIALUI_hModule = 0;
 BOOL WINAPI
 SERIALUI_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-    TRACE("%x,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
+    TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
 
     switch (fdwReason) {
 	case DLL_PROCESS_ATTACH:

dlls/setupapi/devinst.c

@@ -97,7 +97,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsA(
        HWND parent,
        DWORD flags)
 {
-    FIXME("%s %s %04x %08lx\n",debugstr_guid(class),enumstr,parent,flags);
+    FIXME("%s %s %p %08lx\n",debugstr_guid(class),enumstr,parent,flags);
 
     return (HDEVINFO) INVALID_HANDLE_VALUE;
 }
@@ -111,7 +111,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsW(
        HWND parent,
        DWORD flags)
 {
-    FIXME("%s %s %04x %08lx\n",debugstr_guid(class),debugstr_w(enumstr),parent,flags);
+    FIXME("%s %s %p %08lx\n",debugstr_guid(class),debugstr_w(enumstr),parent,flags);
 
     return (HDEVINFO) INVALID_HANDLE_VALUE;
 }

dlls/setupapi/install.c

@@ -393,10 +393,10 @@ static BOOL registry_callback( HINF hinf, PCWSTR field, void *arg )
         }
         else if (RegCreateKeyW( root_key, buffer, &hkey ))
         {
-            ERR( "could not create key %08x %s\n", root_key, debugstr_w(buffer) );
+            ERR( "could not create key %p %s\n", root_key, debugstr_w(buffer) );
             continue;
         }
-        TRACE( "key %08x %s\n", root_key, debugstr_w(buffer) );
+        TRACE( "key %p %s\n", root_key, debugstr_w(buffer) );
 
         /* get value name */
         if (!SetupGetStringFieldW( &context, 3, buffer, sizeof(buffer)/sizeof(WCHAR), NULL ))

dlls/setupapi/setupx_main.c

@@ -76,7 +76,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
  */
 DWORD WINAPI SURegOpenKey( HKEY hkey, LPCSTR lpszSubKey, PHKEY retkey )
 {
-    FIXME("(%x,%s,%p), semi-stub.\n",hkey,debugstr_a(lpszSubKey),retkey);
+    FIXME("(%p,%s,%p), semi-stub.\n",hkey,debugstr_a(lpszSubKey),retkey);
     return RegOpenKeyA( hkey, lpszSubKey, retkey );
 }
 
@@ -87,7 +87,7 @@ DWORD WINAPI SURegQueryValueEx( HKEY hkey, LPSTR lpszValueName,
                                 LPDWORD lpdwReserved, LPDWORD lpdwType,
                                 LPBYTE lpbData, LPDWORD lpcbData )
 {
-    FIXME("(%x,%s,%p,%p,%p,%ld), semi-stub.\n",hkey,debugstr_a(lpszValueName),
+    FIXME("(%p,%s,%p,%p,%p,%ld), semi-stub.\n",hkey,debugstr_a(lpszValueName),
           lpdwReserved,lpdwType,lpbData,lpcbData?*lpcbData:0);
     return RegQueryValueExA( hkey, lpszValueName, lpdwReserved, lpdwType,
                                lpbData, lpcbData );

dlls/snmpapi/main.c

@@ -34,7 +34,7 @@ BOOL WINAPI SNMPAPI_DllMain(
 	DWORD fdwReason,
 	LPVOID lpvReserved)
 {
-    TRACE("(%08x,%08lx,%p)\n", hInstDLL, fdwReason, lpvReserved);
+    TRACE("(%p,%08lx,%p)\n", hInstDLL, fdwReason, lpvReserved);
 
     switch(fdwReason) {
     case DLL_PROCESS_ATTACH:

dlls/twain/twain32_main.c

@@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain);
 BOOL WINAPI
 TWAIN_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-    TRACE("%x,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
+    TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
 
     switch (fdwReason)
     {

dlls/urlmon/urlmon_main.c

@@ -36,7 +36,7 @@ HINSTANCE URLMON_hInstance = 0;
 
 BOOL WINAPI URLMON_DllEntryPoint(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
 {
-    TRACE("0x%x 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
+    TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
 
     switch(fdwReason) {
     case DLL_PROCESS_ATTACH:

dlls/win32s/w32sys.c

@@ -102,7 +102,7 @@ BOOL16 WINAPI IsPeFormat16( LPSTR fn,      /* [in] filename to executeable */
     HFILE hf;
 
     if (fn) hf = OpenFile(fn,&ofs,OF_READ);
-    else hf = DosFileHandleToWin32Handle( hf16 );
+    else hf = (HFILE)DosFileHandleToWin32Handle( hf16 );
     if (hf == HFILE_ERROR) return FALSE;
     _llseek(hf,0,SEEK_SET);
     if (sizeof(mzh)!=_lread(hf,&mzh,sizeof(mzh))) goto done;

dlls/winaspi/winaspi32.c

@@ -286,7 +286,7 @@ WNASPI32_DoPosting( SRB_ExecSCSICmd *lpPRB, DWORD status )
 			(*SRB_PostProc)(lpPRB);
 		}
 		else if (SRB_Flags & SRB_EVENT_NOTIFY) {
-			TRACE("Setting event %04x\n", (HANDLE)SRB_PostProc);
+			TRACE("Setting event %p\n", (HANDLE)SRB_PostProc);
 			SetEvent((HANDLE)SRB_PostProc);
 		}
 	}

dlls/winedos/dosvm.c

@@ -417,8 +417,8 @@ DWORD WINAPI DOSVM_Loop( HANDLE hThread )
                           DOS_SPC *spc = (DOS_SPC *)msg.lParam;
                           TRACE_(int)("calling %p with arg %08lx\n", spc->proc, spc->arg);
                           (spc->proc)(spc->arg);
-                          TRACE_(int)("done, signalling event %d\n", msg.wParam);
-                          SetEvent(msg.wParam);
+                          TRACE_(int)("done, signalling event %x\n", msg.wParam);
+                          SetEvent( (HANDLE)msg.wParam );
                       }
                       break;
                   }
@@ -692,7 +692,7 @@ void DOSVM_RealModeInterrupt( BYTE intnum, CONTEXT86 *context )
  */
 BOOL WINAPI DOSVM_Init( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
 {
-    TRACE_(module)("(0x%08x,%ld,%p)\n", hinstDLL, fdwReason, lpvReserved);
+    TRACE_(module)("(%p,%ld,%p)\n", hinstDLL, fdwReason, lpvReserved);
 
     if (fdwReason == DLL_PROCESS_ATTACH)
     {

dlls/winedos/module.c

@@ -426,7 +426,7 @@ void WINAPI MZ_RunInThread( PAPCFUNC proc, ULONG_PTR arg )
     spc.proc = proc;
     spc.arg = arg;
     event = CreateEventA(NULL, TRUE, FALSE, NULL);
-    PostThreadMessageA(loop_tid, WM_USER, event, (LPARAM)&spc);
+    PostThreadMessageA(loop_tid, WM_USER, (WPARAM)event, (LPARAM)&spc);
     WaitForSingleObject(event, INFINITE);
     CloseHandle(event);
   } else

dlls/wineps/bitmap.c

@@ -173,7 +173,7 @@ INT PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT widthDs
     INT line;
     POINT pt[2];
 
-    TRACE("%08x (%d,%d %dx%d) -> (%d,%d %dx%d)\n", physDev->hdc,
+    TRACE("%p (%d,%d %dx%d) -> (%d,%d %dx%d)\n", physDev->hdc,
 	  xSrc, ySrc, widthSrc, heightSrc, xDst, yDst, widthDst, heightDst);
 
     if (!get_bitmap_info( info, &fullSrcWidth, &fullSrcHeight, &bpp, &compression )) return FALSE;

dlls/wineps/brush.c

@@ -33,7 +33,7 @@ HBRUSH PSDRV_SelectBrush( PSDRV_PDEVICE *physDev, HBRUSH hbrush )
 
     if (!GetObjectA( hbrush, sizeof(logbrush), &logbrush )) return 0;
 
-    TRACE("hbrush = %08x\n", hbrush);
+    TRACE("hbrush = %p\n", hbrush);
 
     switch(logbrush.lbStyle) {
 
@@ -207,11 +207,11 @@ BOOL PSDRV_Brush(PSDRV_PDEVICE *physDev, BOOL EO)
         {
 	    BITMAP bm;
 	    BYTE *bits;
-	    GetObjectA(logbrush.lbHatch, sizeof(BITMAP), &bm);
+	    GetObjectA( (HBITMAP)logbrush.lbHatch, sizeof(BITMAP), &bm);
 	    TRACE("BS_PATTERN %dx%d %d bpp\n", bm.bmWidth, bm.bmHeight,
 		  bm.bmBitsPixel);
 	    bits = HeapAlloc(PSDRV_Heap, 0, bm.bmWidthBytes * bm.bmHeight);
-	    GetBitmapBits(logbrush.lbHatch, bm.bmWidthBytes * bm.bmHeight, bits);
+	    GetBitmapBits( (HBITMAP)logbrush.lbHatch, bm.bmWidthBytes * bm.bmHeight, bits);
 
 	    if(physDev->pi->ppd->LanguageLevel > 1) {
 	        PSDRV_WriteGSave(physDev);

dlls/wineps/clipping.c

@@ -35,7 +35,7 @@ VOID PSDRV_SetDeviceClipping( PSDRV_PDEVICE *physDev, HRGN ignored )
     HRGN hrgn = CreateRectRgn(0,0,0,0);
     BOOL empty;
 
-    TRACE("hdc=%04x\n", physDev->hdc);
+    TRACE("hdc=%p\n", physDev->hdc);
 
     empty = !GetClipRgn(physDev->hdc, hrgn);
 

dlls/wineps/escape.c

@@ -20,6 +20,7 @@
 #include "windef.h"
 #include "wingdi.h"
 #include "wine/winuser16.h"
+#include "wownt32.h"
 #include "psdrv.h"
 #include "wine/debug.h"
 #include "winspool.h"
@@ -267,7 +268,7 @@ INT PSDRV_StartDoc( PSDRV_PDEVICE *physDev, const DOCINFOA *doc )
 	physDev->job.output = HeapAlloc( PSDRV_Heap, 0, strlen(doc->lpszOutput)+1 );
 	strcpy( physDev->job.output, doc->lpszOutput );
     }
-    physDev->job.hJob = OpenJob16(physDev->job.output,  doc->lpszDocName, physDev->hdc );
+    physDev->job.hJob = OpenJob16(physDev->job.output,  doc->lpszDocName, HDC_16(physDev->hdc) );
     if(!physDev->job.hJob) {
         WARN("OpenJob failed\n");
 	return 0;

dlls/wineps/font.c

@@ -36,7 +36,7 @@ HFONT PSDRV_SelectFont( PSDRV_PDEVICE *physDev, HFONT hfont )
     BOOL subst = FALSE;
     char FaceName[LF_FACESIZE];
 
-    if (!GetObjectW( hfont, sizeof(lf), &lf )) return 0;
+    if (!GetObjectW( hfont, sizeof(lf), &lf )) return HGDI_ERROR;
 
     TRACE("FaceName = %s Height = %ld Italic = %d Weight = %ld\n",
 	  debugstr_w(lf.lfFaceName), lf.lfHeight, lf.lfItalic,
@@ -107,11 +107,11 @@ HFONT PSDRV_SelectFont( PSDRV_PDEVICE *physDev, HFONT hfont )
 
     if(physDev->dc->gdiFont && !subst) {
         if(PSDRV_SelectDownloadFont(physDev))
-	    return FALSE; /* use gdi font */
+	    return 0; /* use gdi font */
     }
 
     PSDRV_SelectBuiltinFont(physDev, hfont, &lf, FaceName);
-    return TRUE; /* use device font */
+    return (HFONT)1; /* use device font */
 }
 
 /***********************************************************************

dlls/wineps/init.c

@@ -107,7 +107,7 @@ static LOGFONTA DefaultLogFont = {
  */
 BOOL WINAPI PSDRV_Init( HINSTANCE hinst, DWORD reason, LPVOID reserved )
 {
-    TRACE("(0x%4x, 0x%08lx, %p)\n", hinst, reason, reserved);
+    TRACE("(%p, 0x%08lx, %p)\n", hinst, reason, reserved);
 
     switch(reason) {
 
@@ -425,7 +425,7 @@ INT PSDRV_GetDeviceCaps( PSDRV_PDEVICE *physDev, INT cap )
     case BTLALIGNMENT:
         return 0;
     default:
-        FIXME("(%04x): unsupported capability %d, will return 0\n", physDev->hdc, cap );
+        FIXME("(%p): unsupported capability %d, will return 0\n", physDev->hdc, cap );
         return 0;
     }
 }

dlls/wineps/pen.c

@@ -39,7 +39,7 @@ HPEN PSDRV_SelectPen( PSDRV_PDEVICE *physDev, HPEN hpen )
 
     if (!GetObjectA( hpen, sizeof(logpen), &logpen )) return 0;
 
-    TRACE("hpen = %08x colour = %08lx\n", hpen, logpen.lopnColor);
+    TRACE("hpen = %p colour = %08lx\n", hpen, logpen.lopnColor);
 
     physDev->pen.width = INTERNAL_XWSTODS(physDev->dc, logpen.lopnWidth.x);
     if(physDev->pen.width < 0)

dlls/wininet/internet.c

@@ -109,7 +109,7 @@ LPWORKREQUEST lpWorkQueueTail;
 BOOL WINAPI
 WININET_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-    TRACE("%x,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
+    TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
 
     switch (fdwReason) {
         case DLL_PROCESS_ATTACH:

dlls/winmm/mciavi/info.c

@@ -402,7 +402,7 @@ DWORD	MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSA lpPar
 	    break;
 	case MCI_DGV_STATUS_HWND:
 	    lpParms->dwReturn = (DWORD)wma->hWnd;
-	    TRACE("MCI_DGV_STATUS_HWND => %u\n", wma->hWnd);
+	    TRACE("MCI_DGV_STATUS_HWND => %p\n", wma->hWnd);
 	    break;
 #if 0
 	case MCI_DGV_STATUS_KEY_COLOR:

dlls/winmm/mciavi/mciavi.c

@@ -936,7 +936,7 @@ static	DWORD	MCIAVI_mciRestore(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RESTORE_PAR
 LONG CALLBACK	MCIAVI_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
 				  DWORD dwParam1, DWORD dwParam2)
 {
-    TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n",
+    TRACE("(%08lX, %p, %08lX, %08lX, %08lX)\n",
 	  dwDevID, hDriv, wMsg, dwParam1, dwParam2);
 
     switch (wMsg) {

dlls/winmm/mciavi/wnd.c

@@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mciavi);
 
 static LRESULT WINAPI MCIAVI_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-    TRACE("hwnd=%x msg=%x wparam=%x lparam=%lx\n", hWnd, uMsg, wParam, lParam);
+    TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n", hWnd, uMsg, wParam, lParam);
 
     if (!(WINE_MCIAVI*)GetWindowLongA(hWnd, 0) && uMsg != WM_CREATE)
 	return DefWindowProcA(hWnd, uMsg, wParam, lParam);

dlls/winmm/mciseq/mcimidi.c

@@ -744,7 +744,7 @@ static DWORD MIDI_mciOpen(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSA lpParms)
 	    wmm->hFile = 0;
 	}
     }
-    TRACE("hFile=%u\n", wmm->hFile);
+    TRACE("hFile=%p\n", wmm->hFile);
 
     /* FIXME: should I get a strdup() of it instead? */
     wmm->lpstrElementName = HeapAlloc( GetProcessHeap(), 0, strlen(lpParms->lpstrElementName)+1 );

dlls/winmm/mciwave/mciwave.c

@@ -461,7 +461,7 @@ static DWORD WAVE_mciOpen(UINT wDevID, DWORD dwFlags, LPMCI_WAVE_OPEN_PARMSA lpO
 	}
     }
 
-    TRACE("hFile=%u\n", wmw->hFile);
+    TRACE("hFile=%p\n", wmw->hFile);
 
     memcpy(&wmw->openParms, lpOpenParms, sizeof(MCI_WAVE_OPEN_PARMSA));
 
@@ -1586,7 +1586,7 @@ static DWORD WAVE_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSA lpParms)
 LONG CALLBACK	MCIWAVE_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
 				   DWORD dwParam1, DWORD dwParam2)
 {
-    TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n",
+    TRACE("(%08lX, %p, %08lX, %08lX, %08lX)\n",
 	  dwDevID, hDriv, wMsg, dwParam1, dwParam2);
 
     switch (wMsg) {

dlls/winmm/wineoss/midi.c

@@ -584,7 +584,7 @@ static VOID WINAPI midTimeCallback(HWND hwnd, UINT msg, UINT id, DWORD dwTime)
     unsigned	char		buffer[256];
     int				len, idx;
 
-    TRACE("(%04X, %d, %d, %lu)\n", hwnd, msg, id, dwTime);
+    TRACE("(%p, %d, %d, %lu)\n", hwnd, msg, id, dwTime);
 
     len = read(midiSeqFD, buffer, sizeof(buffer));
 

dlls/wintrust/wintrust_main.c

@@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(win32);
  */
 LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID,  LPVOID ActionData )
 {
-    FIXME("(hwnd 0x%04x ActionId %p ActionData %p): stub (nothing will be verified)\n",
+    FIXME("(hwnd %p ActionId %p ActionData %p): stub (nothing will be verified)\n",
             hwnd, ActionID,  ActionData);
     return ERROR_SUCCESS;
 }