Converted to the new debug interface, using script written by Patrik

graphics/d3dcommon.c

@@ -8,7 +8,7 @@
 #include "wine/obj_base.h"
 #include "ddraw.h"
 #include "d3d.h"
-#include "debug.h"
+#include "debugtools.h"
 
 #include "d3d_private.h"
 
@@ -106,7 +106,7 @@ static void _dump_renderstate(D3DRENDERSTATETYPE type,
     "D3DRENDERSTATE_STIPPLEPATTERN31"
   };
 
-  DUMP(" %s = 0x%08lx\n", states[type], value);
+  DPRINTF(" %s = 0x%08lx\n", states[type], value);
 }
 
 
@@ -120,7 +120,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
   /* First, all the stipple patterns */
   if ((dwRenderStateType >= D3DRENDERSTATE_STIPPLEPATTERN00) && 
       (dwRenderStateType <= D3DRENDERSTATE_STIPPLEPATTERN31)) {
-    ERR(ddraw, "Unhandled stipple !\n");
+    ERR("Unhandled stipple !\n");
   } else {
     ENTER_GL();
     
@@ -134,7 +134,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
 	glBindTexture(GL_TEXTURE_2D, 0);
 	glDisable(GL_TEXTURE_2D);
       } else {
-	TRACE(ddraw, "setting OpenGL texture handle : %d\n", tex->tex_name);
+	TRACE("setting OpenGL texture handle : %d\n", tex->tex_name);
 	glEnable(GL_TEXTURE_2D);
 	/* Default parameters */
 	glBindTexture(GL_TEXTURE_2D, tex->tex_name);
@@ -165,7 +165,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
 	break;
 
       default:
-	ERR(ddraw, "Unhandled fill mode !\n");
+	ERR("Unhandled fill mode !\n");
       }
       break;
 
@@ -180,7 +180,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
 	break;
 
       default:
-	ERR(ddraw, "Unhandled shade mode !\n");
+	ERR("Unhandled shade mode !\n");
       }
       break;
       
@@ -202,7 +202,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
 	break;
 	
       default:
-	ERR(ddraw, "Unhandled texture mag !\n");
+	ERR("Unhandled texture mag !\n");
       }
       break;
 
@@ -217,7 +217,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
 	break;
 	
       default:
-	ERR(ddraw, "Unhandled texture min !\n");
+	ERR("Unhandled texture min !\n");
       }
       break;
       
@@ -228,7 +228,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
 	break;
 
       default:
-	ERR(ddraw, "Unhandled blend mode !\n");
+	ERR("Unhandled blend mode !\n");
       }
       
       glBlendFunc(rs->src, rs->dst);
@@ -241,7 +241,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
 	break;
 	
       default:
-	ERR(ddraw, "Unhandled blend mode !\n");
+	ERR("Unhandled blend mode !\n");
       }
       
       glBlendFunc(rs->src, rs->dst);
@@ -255,7 +255,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
 	break;
 
       default:
-	ERR(ddraw, "Unhandled texture environment !\n");
+	ERR("Unhandled texture environment !\n");
       }
       break;
       
@@ -276,7 +276,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
 	break;
 	
       default:
-	ERR(ddraw, "Unhandled cull mode !\n");
+	ERR("Unhandled cull mode !\n");
       }
       break;
       
@@ -308,7 +308,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
 	break;
 
       default:
-	ERR(ddraw, "Unexpected value\n");
+	ERR("Unexpected value\n");
       }
       break;
       
@@ -337,7 +337,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
       break;
       
     default:
-      ERR(ddraw, "Unhandled Render State\n");
+      ERR("Unhandled Render State\n");
       break;
     }
 

graphics/d3dlight.c

@@ -11,7 +11,7 @@
 #include "heap.h"
 #include "ddraw.h"
 #include "d3d.h"
-#include "debug.h"
+#include "debugtools.h"
 
 #include "d3d_private.h"
 
@@ -36,18 +36,18 @@ static const float zero_value[] = {
 static void update(IDirect3DLightImpl* This) {
   switch (This->light.dltType) {
   case D3DLIGHT_POINT:         /* 1 */
-    TRACE(ddraw, "Activating POINT\n");
+    TRACE("Activating POINT\n");
     break;
     
   case D3DLIGHT_SPOT:          /* 2 */
-    TRACE(ddraw, "Activating SPOT\n");
+    TRACE("Activating SPOT\n");
     break;
     
   case D3DLIGHT_DIRECTIONAL: {  /* 3 */
     float direction[4];
     
-    TRACE(ddraw, "Activating DIRECTIONAL\n");
-    TRACE(ddraw, "  direction : %f %f %f\n",
+    TRACE("Activating DIRECTIONAL\n");
+    TRACE("  direction : %f %f %f\n",
 	  This->light.dvDirection.x.x,
 	  This->light.dvDirection.y.y,
 	  This->light.dvDirection.z.z);
@@ -71,11 +71,11 @@ static void update(IDirect3DLightImpl* This) {
   } break;
     
   case D3DLIGHT_PARALLELPOINT:  /* 4 */
-    TRACE(ddraw, "Activating PARRALLEL-POINT\n");
+    TRACE("Activating PARRALLEL-POINT\n");
     break;
 
   default:
-    TRACE(ddraw, "Not a know Light Type\n");
+    TRACE("Not a know Light Type\n");
     break;
   }
 }
@@ -147,7 +147,7 @@ static HRESULT WINAPI IDirect3DLightImpl_QueryInterface(LPDIRECT3DLIGHT iface,
   char xrefiid[50];
   
   WINE_StringFromCLSID((LPCLSID)riid,xrefiid);
-  FIXME(ddraw, "(%p)->(%s,%p): stub\n", This, xrefiid,ppvObj);
+  FIXME("(%p)->(%s,%p): stub\n", This, xrefiid,ppvObj);
   
   return S_OK;
 }
@@ -157,7 +157,7 @@ static HRESULT WINAPI IDirect3DLightImpl_QueryInterface(LPDIRECT3DLIGHT iface,
 static ULONG WINAPI IDirect3DLightImpl_AddRef(LPDIRECT3DLIGHT iface)
 {
   ICOM_THIS(IDirect3DLightImpl,iface);
-  TRACE(ddraw, "(%p)->()incrementing from %lu.\n", This, This->ref );
+  TRACE("(%p)->()incrementing from %lu.\n", This, This->ref );
   
   return ++(This->ref);
 }
@@ -167,7 +167,7 @@ static ULONG WINAPI IDirect3DLightImpl_AddRef(LPDIRECT3DLIGHT iface)
 static ULONG WINAPI IDirect3DLightImpl_Release(LPDIRECT3DLIGHT iface)
 {
   ICOM_THIS(IDirect3DLightImpl,iface);
-  FIXME( ddraw, "(%p)->() decrementing from %lu.\n", This, This->ref );
+  FIXME("(%p)->() decrementing from %lu.\n", This, This->ref );
   
   if (!--(This->ref)) {
     HeapFree(GetProcessHeap(),0,This);
@@ -187,7 +187,7 @@ static HRESULT WINAPI IDirect3DLightImpl_GetLight(LPDIRECT3DLIGHT iface,
 					      LPD3DLIGHT lpLight)
 {
   ICOM_THIS(IDirect3DLightImpl,iface);
-  TRACE(ddraw, "(%p)->(%p)\n", This, lpLight);
+  TRACE("(%p)->(%p)\n", This, lpLight);
   if (TRACE_ON(ddraw))
     dump_light(lpLight);
   
@@ -208,7 +208,7 @@ static HRESULT WINAPI IDirect3DLightImpl_SetLight(LPDIRECT3DLIGHT iface,
 					      LPD3DLIGHT lpLight)
 {
   ICOM_THIS(IDirect3DLightImpl,iface);
-  TRACE(ddraw, "(%p)->(%p)\n", This, lpLight);
+  TRACE("(%p)->(%p)\n", This, lpLight);
   if (TRACE_ON(ddraw))
     dump_light(lpLight);
   
@@ -235,7 +235,7 @@ static HRESULT WINAPI IDirect3DLightImpl_Initialize(LPDIRECT3DLIGHT iface,
 
 {
   ICOM_THIS(IDirect3DLightImpl,iface);
-  TRACE(ddraw, "(%p)->(%p)\n", This, lpDirect3D);
+  TRACE("(%p)->(%p)\n", This, lpDirect3D);
 
   return DDERR_ALREADYINITIALIZED;
 }
@@ -261,12 +261,12 @@ static ICOM_VTABLE(IDirect3DLight) light_vtable =
 
 /* These function should never be called if MesaGL is not present */
 LPDIRECT3DLIGHT d3dlight_create_dx3(IDirect3DImpl* d3d1) {
-  ERR(ddraw, "Should not be called...\n");
+  ERR("Should not be called...\n");
   return NULL;
 }
 
 LPDIRECT3DLIGHT d3dlight_create(IDirect3D2Impl* d3d2) {
-  ERR(ddraw, "Should not be called...\n");
+  ERR("Should not be called...\n");
   return NULL;
 }
 

graphics/d3dmaterial.c

@@ -10,7 +10,7 @@
 #include "heap.h"
 #include "ddraw.h"
 #include "d3d.h"
-#include "debug.h"
+#include "debugtools.h"
 
 #include "d3d_private.h"
 
@@ -25,7 +25,7 @@ static ICOM_VTABLE(IDirect3DMaterial) material_vtable;
  *				Matrial2 static functions
  */
 static void activate(IDirect3DMaterial2Impl* This) {
-  TRACE(ddraw, "Activating material %p\n", This);
+  TRACE("Activating material %p\n", This);
   
   ENTER_GL();
   /* First, set the rendering context */
@@ -52,10 +52,10 @@ static void activate(IDirect3DMaterial2Impl* This) {
 	       GL_EMISSION,
 	       (float *) &(This->mat.d.emissive));
   
-  TRACE(ddraw, "Size  : %ld\n", This->mat.dwSize);
-  TRACE(ddraw, "Power : %f\n", This->mat.e.power);
+  TRACE("Size  : %ld\n", This->mat.dwSize);
+  TRACE("Power : %f\n", This->mat.e.power);
 
-  TRACE(ddraw, "Texture handle : %08lx\n", (DWORD)This->mat.hTexture);
+  TRACE("Texture handle : %08lx\n", (DWORD)This->mat.hTexture);
   LEAVE_GL();
   
   return ;
@@ -108,7 +108,7 @@ static HRESULT WINAPI IDirect3DMaterial2Impl_QueryInterface(LPDIRECT3DMATERIAL2
   char xrefiid[50];
   
   WINE_StringFromCLSID((LPCLSID)riid,xrefiid);
-  FIXME(ddraw, "(%p)->(%s,%p): stub\n", This, xrefiid,ppvObj);
+  FIXME("(%p)->(%s,%p): stub\n", This, xrefiid,ppvObj);
   
   return S_OK;
 }
@@ -118,7 +118,7 @@ static HRESULT WINAPI IDirect3DMaterial2Impl_QueryInterface(LPDIRECT3DMATERIAL2
 static ULONG WINAPI IDirect3DMaterial2Impl_AddRef(LPDIRECT3DMATERIAL2 iface)
 {
   ICOM_THIS(IDirect3DMaterial2Impl,iface);
-  TRACE(ddraw, "(%p)->()incrementing from %lu.\n", This, This->ref );
+  TRACE("(%p)->()incrementing from %lu.\n", This, This->ref );
   
   return ++(This->ref);
 }
@@ -128,7 +128,7 @@ static ULONG WINAPI IDirect3DMaterial2Impl_AddRef(LPDIRECT3DMATERIAL2 iface)
 static ULONG WINAPI IDirect3DMaterial2Impl_Release(LPDIRECT3DMATERIAL2 iface)
 {
   ICOM_THIS(IDirect3DMaterial2Impl,iface);
-  FIXME( ddraw, "(%p)->() decrementing from %lu.\n", This, This->ref );
+  FIXME("(%p)->() decrementing from %lu.\n", This, This->ref );
   
   if (!--(This->ref)) {
     HeapFree(GetProcessHeap(),0,This);
@@ -148,7 +148,7 @@ static HRESULT WINAPI IDirect3DMaterial2Impl_GetMaterial(LPDIRECT3DMATERIAL2 ifa
 						     LPD3DMATERIAL lpMat)
 {
   ICOM_THIS(IDirect3DMaterial2Impl,iface);
-  TRACE(ddraw, "(%p)->(%p)\n", This, lpMat);
+  TRACE("(%p)->(%p)\n", This, lpMat);
   if (TRACE_ON(ddraw))
     dump_material(lpMat);
   
@@ -162,7 +162,7 @@ static HRESULT WINAPI IDirect3DMaterial2Impl_SetMaterial(LPDIRECT3DMATERIAL2 ifa
 						     LPD3DMATERIAL lpMat)
 {
   ICOM_THIS(IDirect3DMaterial2Impl,iface);
-  TRACE(ddraw, "(%p)->(%p)\n", This, lpMat);
+  TRACE("(%p)->(%p)\n", This, lpMat);
   if (TRACE_ON(ddraw))
     dump_material(lpMat);
   
@@ -178,7 +178,7 @@ static HRESULT WINAPI IDirect3DMaterial2Impl_GetHandle(LPDIRECT3DMATERIAL2 iface
 
 {
   ICOM_THIS(IDirect3DMaterial2Impl,iface);
-  FIXME(ddraw, "(%p)->(%p,%p): stub\n", This, lpD3DDevice2, lpMatHandle);
+  FIXME("(%p)->(%p,%p): stub\n", This, lpD3DDevice2, lpMatHandle);
 
   if (This->use_d3d2)
     This->device.active_device2 = (IDirect3DDevice2Impl*)lpD3DDevice2;
@@ -193,7 +193,7 @@ static HRESULT WINAPI IDirect3DMaterial2Impl_GetHandle(LPDIRECT3DMATERIAL2 iface
 static HRESULT WINAPI IDirect3DMaterialImpl_Reserve(LPDIRECT3DMATERIAL iface)
 {
   ICOM_THIS(IDirect3DMaterial2Impl,iface);
-  FIXME(ddraw, "(%p)->(): stub\n", This);
+  FIXME("(%p)->(): stub\n", This);
 
   return DDERR_INVALIDPARAMS;
 }
@@ -201,7 +201,7 @@ static HRESULT WINAPI IDirect3DMaterialImpl_Reserve(LPDIRECT3DMATERIAL iface)
 static HRESULT WINAPI IDirect3DMaterialImpl_Unreserve(LPDIRECT3DMATERIAL iface)
 {
   ICOM_THIS(IDirect3DMaterial2Impl,iface);
-  FIXME(ddraw, "(%p)->(): stub\n", This);
+  FIXME("(%p)->(): stub\n", This);
 
   return DDERR_INVALIDPARAMS;
 }
@@ -211,7 +211,7 @@ static HRESULT WINAPI IDirect3DMaterialImpl_Initialize(LPDIRECT3DMATERIAL iface,
 
 {
   ICOM_THIS(IDirect3DMaterial2Impl,iface);
-  TRACE(ddraw, "(%p)->(%p)\n", This, lpDirect3D);
+  TRACE("(%p)->(%p)\n", This, lpDirect3D);
   
   return DDERR_ALREADYINITIALIZED;
 }
@@ -256,12 +256,12 @@ static ICOM_VTABLE(IDirect3DMaterial2) material2_vtable =
 #else /* HAVE_MESAGL */
 
 LPDIRECT3DMATERIAL d3dmaterial_create(IDirect3DImpl* d3d1) {
-  ERR(ddraw, "Should not be called...\n");
+  ERR("Should not be called...\n");
   return NULL;
 }
 
 LPDIRECT3DMATERIAL2 d3dmaterial2_create(IDirect3D2Impl* d3d2) {
-  ERR(ddraw, "Should not be called...\n");
+  ERR("Should not be called...\n");
   return NULL;
 }
 

graphics/d3dtexture.c

@@ -12,7 +12,7 @@
 #include "heap.h"
 #include "ddraw.h"
 #include "d3d.h"
-#include "debug.h"
+#include "debugtools.h"
 
 #include "d3d_private.h"
 
@@ -133,7 +133,7 @@ HRESULT WINAPI  SetColorKey_cb(IDirect3DTexture2Impl *texture, DWORD dwFlags, LP
   int bpp;
   GLuint current_texture;
   
-  TRACE(ddraw, "(%p) : colorkey callback\n", texture);
+  TRACE("(%p) : colorkey callback\n", texture);
 
   /* Get the texture description */
   tex_d = &(texture->surface->s.surface_desc);
@@ -147,17 +147,17 @@ HRESULT WINAPI  SetColorKey_cb(IDirect3DTexture2Impl *texture, DWORD dwFlags, LP
 
   /* If the GetHandle was not done yet, it's an error */
   if (texture->tex_name == 0) {
-    ERR(ddraw, "Unloaded texture !\n");
+    ERR("Unloaded texture !\n");
     LEAVE_GL();
     return DD_OK;
   }
   glBindTexture(GL_TEXTURE_2D, texture->tex_name);
 
   if (tex_d->ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8) {
-    FIXME(ddraw, "Todo Paletted\n");
+    FIXME("Todo Paletted\n");
   } else if (tex_d->ddpfPixelFormat.dwFlags & DDPF_RGB) {
     if (tex_d->ddpfPixelFormat.x.dwRGBBitCount == 8) {
-      FIXME(ddraw, "Todo 3_3_2_0\n");
+      FIXME("Todo 3_3_2_0\n");
     } else if (tex_d->ddpfPixelFormat.x.dwRGBBitCount == 16) {
       if (tex_d->ddpfPixelFormat.xy.dwRGBAlphaBitMask == 0x00000000) {
 	/* Now transform the 5_6_5 into a 5_5_5_1 surface to support color keying */
@@ -192,21 +192,21 @@ HRESULT WINAPI  SetColorKey_cb(IDirect3DTexture2Impl *texture, DWORD dwFlags, LP
 	/* Frees the temporary surface */
 	HeapFree(GetProcessHeap(),0,dest);
       } else if (tex_d->ddpfPixelFormat.xy.dwRGBAlphaBitMask == 0x00000001) {
-	FIXME(ddraw, "Todo 5_5_5_1\n");
+	FIXME("Todo 5_5_5_1\n");
       } else if (tex_d->ddpfPixelFormat.xy.dwRGBAlphaBitMask == 0x0000000F) {
-	FIXME(ddraw, "Todo 4_4_4_4\n");
+	FIXME("Todo 4_4_4_4\n");
       } else {
-	ERR(ddraw, "Unhandled texture format (bad Aplha channel for a 16 bit texture)\n");
+	ERR("Unhandled texture format (bad Aplha channel for a 16 bit texture)\n");
       }
     } else if (tex_d->ddpfPixelFormat.x.dwRGBBitCount == 24) {
-      FIXME(ddraw, "Todo 8_8_8_0\n");
+      FIXME("Todo 8_8_8_0\n");
     } else if (tex_d->ddpfPixelFormat.x.dwRGBBitCount == 32) {
-      FIXME(ddraw, "Todo 8_8_8_8\n");
+      FIXME("Todo 8_8_8_8\n");
     } else {
-      ERR(ddraw, "Unhandled texture format (bad RGB count)\n");
+      ERR("Unhandled texture format (bad RGB count)\n");
     }
   } else {
-    ERR(ddraw, "Unhandled texture format (neither RGB nor INDEX)\n");
+    ERR("Unhandled texture format (neither RGB nor INDEX)\n");
   }
   LEAVE_GL();
 
@@ -225,7 +225,7 @@ static HRESULT WINAPI IDirect3DTexture2Impl_QueryInterface(LPDIRECT3DTEXTURE2 if
   char xrefiid[50];
   
   WINE_StringFromCLSID((LPCLSID)riid,xrefiid);
-  FIXME(ddraw, "(%p)->(%s,%p): stub\n", This, xrefiid,ppvObj);
+  FIXME("(%p)->(%s,%p): stub\n", This, xrefiid,ppvObj);
   
   return S_OK;
 }
@@ -235,7 +235,7 @@ static HRESULT WINAPI IDirect3DTexture2Impl_QueryInterface(LPDIRECT3DTEXTURE2 if
 static ULONG WINAPI IDirect3DTexture2Impl_AddRef(LPDIRECT3DTEXTURE2 iface)
 {
   ICOM_THIS(IDirect3DTexture2Impl,iface);
-  TRACE(ddraw, "(%p)->()incrementing from %lu.\n", This, This->ref );
+  TRACE("(%p)->()incrementing from %lu.\n", This, This->ref );
   
   return ++(This->ref);
 }
@@ -245,7 +245,7 @@ static ULONG WINAPI IDirect3DTexture2Impl_AddRef(LPDIRECT3DTEXTURE2 iface)
 static ULONG WINAPI IDirect3DTexture2Impl_Release(LPDIRECT3DTEXTURE2 iface)
 {
   ICOM_THIS(IDirect3DTexture2Impl,iface);
-  FIXME( ddraw, "(%p)->() decrementing from %lu.\n", This, This->ref );
+  FIXME("(%p)->() decrementing from %lu.\n", This, This->ref );
   
   if (!--(This->ref)) {
     /* Delete texture from OpenGL */
@@ -270,7 +270,7 @@ static HRESULT WINAPI IDirect3DTextureImpl_GetHandle(LPDIRECT3DTEXTURE iface,
 {
   ICOM_THIS(IDirect3DTexture2Impl,iface);
   IDirect3DDeviceImpl* ilpD3DDevice=(IDirect3DDeviceImpl*)lpD3DDevice;
-  FIXME(ddraw, "(%p)->(%p,%p): stub\n", This, ilpD3DDevice, lpHandle);
+  FIXME("(%p)->(%p,%p): stub\n", This, ilpD3DDevice, lpHandle);
 
   *lpHandle = (D3DTEXTUREHANDLE) This;
   
@@ -282,7 +282,7 @@ static HRESULT WINAPI IDirect3DTextureImpl_GetHandle(LPDIRECT3DTEXTURE iface,
     glGenTextures(1, &(This->tex_name));
   LEAVE_GL();
 
-  TRACE(ddraw, "OpenGL texture handle is : %d\n", This->tex_name);
+  TRACE("OpenGL texture handle is : %d\n", This->tex_name);
   
   return D3D_OK;
 }
@@ -292,7 +292,7 @@ static HRESULT WINAPI IDirect3DTextureImpl_Initialize(LPDIRECT3DTEXTURE iface,
 						  LPDIRECTDRAWSURFACE lpSurface)
 {
   ICOM_THIS(IDirect3DTexture2Impl,iface);
-  TRACE(ddraw, "(%p)->(%p,%p)\n", This, lpD3DDevice, lpSurface);
+  TRACE("(%p)->(%p,%p)\n", This, lpD3DDevice, lpSurface);
 
   return DDERR_ALREADYINITIALIZED;
 }
@@ -300,7 +300,7 @@ static HRESULT WINAPI IDirect3DTextureImpl_Initialize(LPDIRECT3DTEXTURE iface,
 static HRESULT WINAPI IDirect3DTextureImpl_Unload(LPDIRECT3DTEXTURE iface)
 {
   ICOM_THIS(IDirect3DTexture2Impl,iface);
-  FIXME(ddraw, "(%p)->(): stub\n", This);
+  FIXME("(%p)->(): stub\n", This);
 
   return D3D_OK;
 }
@@ -312,7 +312,7 @@ static HRESULT WINAPI IDirect3DTexture2Impl_GetHandle(LPDIRECT3DTEXTURE2 iface,
 {
   ICOM_THIS(IDirect3DTexture2Impl,iface);
   IDirect3DDevice2Impl* ilpD3DDevice2=(IDirect3DDevice2Impl*)lpD3DDevice2;
-  TRACE(ddraw, "(%p)->(%p,%p)\n", This, ilpD3DDevice2, lpHandle);
+  TRACE("(%p)->(%p,%p)\n", This, ilpD3DDevice2, lpHandle);
 
   /* For 32 bits OSes, handles = pointers */
   *lpHandle = (D3DTEXTUREHANDLE) This;
@@ -325,7 +325,7 @@ static HRESULT WINAPI IDirect3DTexture2Impl_GetHandle(LPDIRECT3DTEXTURE2 iface,
   glGenTextures(1, &(This->tex_name));
   LEAVE_GL();
 
-  TRACE(ddraw, "OpenGL texture handle is : %d\n", This->tex_name);
+  TRACE("OpenGL texture handle is : %d\n", This->tex_name);
   
   return D3D_OK;
 }
@@ -336,7 +336,7 @@ static HRESULT WINAPI IDirect3DTexture2Impl_PaletteChanged(LPDIRECT3DTEXTURE2 if
 						       DWORD dwCount)
 {
   ICOM_THIS(IDirect3DTexture2Impl,iface);
-  FIXME(ddraw, "(%p)->(%8ld,%8ld): stub\n", This, dwStart, dwCount);
+  FIXME("(%p)->(%8ld,%8ld): stub\n", This, dwStart, dwCount);
 
   return D3D_OK;
 }
@@ -349,9 +349,9 @@ static HRESULT WINAPI IDirect3DTexture2Impl_Load(LPDIRECT3DTEXTURE2 iface,
   ICOM_THIS(IDirect3DTexture2Impl,iface);
   IDirect3DTexture2Impl* ilpD3DTexture2=(IDirect3DTexture2Impl*)lpD3DTexture2;
   DDSURFACEDESC	*src_d, *dst_d;
-  TRACE(ddraw, "(%p)->(%p)\n", This, ilpD3DTexture2);
+  TRACE("(%p)->(%p)\n", This, ilpD3DTexture2);
 
-  TRACE(ddraw, "Copied surface %p to surface %p\n", ilpD3DTexture2->surface, This->surface);
+  TRACE("Copied surface %p to surface %p\n", ilpD3DTexture2->surface, This->surface);
 
   /* Suppress the ALLOCONLOAD flag */
   This->surface->s.surface_desc.ddsCaps.dwCaps &= ~DDSCAPS_ALLOCONLOAD;
@@ -366,7 +366,7 @@ static HRESULT WINAPI IDirect3DTexture2Impl_Load(LPDIRECT3DTEXTURE2 iface,
   
   if ((src_d->dwWidth != dst_d->dwWidth) || (src_d->dwHeight != dst_d->dwHeight)) {
     /* Should also check for same pixel format, lPitch, ... */
-    ERR(ddraw, "Error in surface sizes\n");
+    ERR("Error in surface sizes\n");
     return D3DERR_TEXTURE_LOAD_FAILED;
   } else {
     /* LPDIRECT3DDEVICE2 d3dd = (LPDIRECT3DDEVICE2) This->D3Ddevice; */
@@ -400,7 +400,7 @@ static HRESULT WINAPI IDirect3DTexture2Impl_Load(LPDIRECT3DTEXTURE2 iface,
       int i;
       
       if (pal == NULL) {
-	ERR(ddraw, "Palettized texture Loading with a NULL palette !\n");
+	ERR("Palettized texture Loading with a NULL palette !\n");
 	LEAVE_GL();
 	return D3DERR_TEXTURE_LOAD_FAILED;
       }
@@ -489,7 +489,7 @@ static HRESULT WINAPI IDirect3DTexture2Impl_Load(LPDIRECT3DTEXTURE2 iface,
 		       GL_UNSIGNED_SHORT_4_4_4_4,
 		       src_d->y.lpSurface);
 	} else {
-	  ERR(ddraw, "Unhandled texture format (bad Aplha channel for a 16 bit texture)\n");
+	  ERR("Unhandled texture format (bad Aplha channel for a 16 bit texture)\n");
 	}
       } else if (src_d->ddpfPixelFormat.x.dwRGBBitCount == 24) {
 	glTexImage2D(GL_TEXTURE_2D,
@@ -510,10 +510,10 @@ static HRESULT WINAPI IDirect3DTexture2Impl_Load(LPDIRECT3DTEXTURE2 iface,
 		     GL_UNSIGNED_BYTE,
 		     src_d->y.lpSurface);
       } else {
-	ERR(ddraw, "Unhandled texture format (bad RGB count)\n");
+	ERR("Unhandled texture format (bad RGB count)\n");
       }
     } else {
-      ERR(ddraw, "Unhandled texture format (neither RGB nor INDEX)\n");
+      ERR("Unhandled texture format (neither RGB nor INDEX)\n");
     }
 
     glBindTexture(GL_TEXTURE_2D, current_texture);
@@ -563,12 +563,12 @@ static ICOM_VTABLE(IDirect3DTexture) texture_vtable =
 
 /* These function should never be called if MesaGL is not present */
 LPDIRECT3DTEXTURE2 d3dtexture2_create(IDirectDrawSurface4Impl* surf) {
-  ERR(ddraw, "Should not be called...\n");
+  ERR("Should not be called...\n");
   return NULL;
 }
 
 LPDIRECT3DTEXTURE d3dtexture_create(IDirectDrawSurface4Impl* surf) {
-  ERR(ddraw, "Should not be called...\n");
+  ERR("Should not be called...\n");
   return NULL;
 }
 

graphics/d3dviewport.c

@@ -10,7 +10,7 @@
 #include "heap.h"
 #include "ddraw.h"
 #include "d3d.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "x11drv.h"
 
 #include "d3d_private.h"
@@ -91,7 +91,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_QueryInterface(LPDIRECT3DVIEWPORT2
   char xrefiid[50];
   
   WINE_StringFromCLSID((LPCLSID)riid,xrefiid);
-  FIXME(ddraw, "(%p)->(%s,%p): stub\n", This, xrefiid,ppvObj);
+  FIXME("(%p)->(%s,%p): stub\n", This, xrefiid,ppvObj);
   
   return S_OK;
 }
@@ -101,7 +101,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_QueryInterface(LPDIRECT3DVIEWPORT2
 static ULONG WINAPI IDirect3DViewport2Impl_AddRef(LPDIRECT3DVIEWPORT2 iface)
 {
   ICOM_THIS(IDirect3DViewport2Impl,iface);
-  TRACE(ddraw, "(%p)->()incrementing from %lu.\n", This, This->ref );
+  TRACE("(%p)->()incrementing from %lu.\n", This, This->ref );
   
   return ++(This->ref);
 }
@@ -111,7 +111,7 @@ static ULONG WINAPI IDirect3DViewport2Impl_AddRef(LPDIRECT3DVIEWPORT2 iface)
 static ULONG WINAPI IDirect3DViewport2Impl_Release(LPDIRECT3DVIEWPORT2 iface)
 {
   ICOM_THIS(IDirect3DViewport2Impl,iface);
-  FIXME( ddraw, "(%p)->() decrementing from %lu.\n", This, This->ref );
+  FIXME("(%p)->() decrementing from %lu.\n", This, This->ref );
   
   if (!--(This->ref)) {
     HeapFree(GetProcessHeap(),0,This);
@@ -126,7 +126,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_Initialize(LPDIRECT3DVIEWPORT2 ifac
 						    LPDIRECT3D d3d)
 {
   ICOM_THIS(IDirect3DViewport2Impl,iface);
-  FIXME(ddraw, "(%p)->(%p): stub\n", This, d3d);
+  FIXME("(%p)->(%p): stub\n", This, d3d);
   
   return DD_OK;
 }
@@ -135,7 +135,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_GetViewport(LPDIRECT3DVIEWPORT2 ifa
 						     LPD3DVIEWPORT lpvp)
 {
   ICOM_THIS(IDirect3DViewport2Impl,iface);
-  FIXME(ddraw, "(%p)->(%p): stub\n", This, lpvp);
+  FIXME("(%p)->(%p): stub\n", This, lpvp);
   
   if (This->use_vp2 != 0)
     return DDERR_INVALIDPARAMS;
@@ -149,20 +149,20 @@ static HRESULT WINAPI IDirect3DViewport2Impl_SetViewport(LPDIRECT3DVIEWPORT2 ifa
 						     LPD3DVIEWPORT lpvp)
 {
   ICOM_THIS(IDirect3DViewport2Impl,iface);
-  FIXME(ddraw, "(%p)->(%p): stub\n", This, lpvp);
+  FIXME("(%p)->(%p): stub\n", This, lpvp);
 
   This->use_vp2 = 0;
   This->viewport.vp1 = *lpvp;
   
-  TRACE(ddraw, "dwSize = %ld   dwX = %ld   dwY = %ld\n",
+  TRACE("dwSize = %ld   dwX = %ld   dwY = %ld\n",
 	lpvp->dwSize, lpvp->dwX, lpvp->dwY);
-  TRACE(ddraw, "dwWidth = %ld   dwHeight = %ld\n",
+  TRACE("dwWidth = %ld   dwHeight = %ld\n",
 	lpvp->dwWidth, lpvp->dwHeight);
-  TRACE(ddraw, "dvScaleX = %f   dvScaleY = %f\n",
+  TRACE("dvScaleX = %f   dvScaleY = %f\n",
 	lpvp->dvScaleX, lpvp->dvScaleY);
-  TRACE(ddraw, "dvMaxX = %f   dvMaxY = %f\n",
+  TRACE("dvMaxX = %f   dvMaxY = %f\n",
 	lpvp->dvMaxX, lpvp->dvMaxY);
-  TRACE(ddraw, "dvMinZ = %f   dvMaxZ = %f\n",
+  TRACE("dvMinZ = %f   dvMaxZ = %f\n",
 	lpvp->dvMinZ, lpvp->dvMaxZ);
 
   
@@ -176,7 +176,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_TransformVertices(LPDIRECT3DVIEWPOR
 							   LPDWORD lpOffScreen)
 {
   ICOM_THIS(IDirect3DViewport2Impl,iface);
-  FIXME(ddraw, "(%p)->(%8ld,%p,%08lx,%p): stub\n",
+  FIXME("(%p)->(%8ld,%p,%08lx,%p): stub\n",
 	This, dwVertexCount, lpData, dwFlags, lpOffScreen);
   
   return DD_OK;
@@ -187,7 +187,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_LightElements(LPDIRECT3DVIEWPORT2 i
 						       LPD3DLIGHTDATA lpData)
 {
   ICOM_THIS(IDirect3DViewport2Impl,iface);
-  FIXME(ddraw, "(%p)->(%8ld,%p): stub\n", This, dwElementCount, lpData);
+  FIXME("(%p)->(%8ld,%p): stub\n", This, dwElementCount, lpData);
   
   return DD_OK;
 }
@@ -196,7 +196,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_SetBackground(LPDIRECT3DVIEWPORT2 i
 						       D3DMATERIALHANDLE hMat)
 {
   ICOM_THIS(IDirect3DViewport2Impl,iface);
-  FIXME(ddraw, "(%p)->(%08lx): stub\n", This, (DWORD) hMat);
+  FIXME("(%p)->(%08lx): stub\n", This, (DWORD) hMat);
   
   return DD_OK;
 }
@@ -206,7 +206,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_GetBackground(LPDIRECT3DVIEWPORT2 i
 						       LPBOOL lpValid)
 {
   ICOM_THIS(IDirect3DViewport2Impl,iface);
-  FIXME(ddraw, "(%p)->(%p,%p): stub\n", This, lphMat, lpValid);
+  FIXME("(%p)->(%p,%p): stub\n", This, lphMat, lpValid);
   
   return DD_OK;
 }
@@ -215,7 +215,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_SetBackgroundDepth(LPDIRECT3DVIEWPO
 							    LPDIRECTDRAWSURFACE lpDDSurface)
 {
   ICOM_THIS(IDirect3DViewport2Impl,iface);
-  FIXME(ddraw, "(%p)->(%p): stub\n", This, lpDDSurface);
+  FIXME("(%p)->(%p): stub\n", This, lpDDSurface);
   
   return DD_OK;
 }
@@ -225,7 +225,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_GetBackgroundDepth(LPDIRECT3DVIEWPO
 							    LPBOOL lpValid)
 {
   ICOM_THIS(IDirect3DViewport2Impl,iface);
-  FIXME(ddraw, "(%p)->(%p,%p): stub\n", This, lplpDDSurface, lpValid);
+  FIXME("(%p)->(%p,%p): stub\n", This, lplpDDSurface, lpValid);
   
   return DD_OK;
 }
@@ -237,7 +237,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_Clear(LPDIRECT3DVIEWPORT2 iface,
 {
   ICOM_THIS(IDirect3DViewport2Impl,iface);
   GLboolean ztest;
-  FIXME(ddraw, "(%p)->(%8ld,%p,%08lx): stub\n", This, dwCount, lpRects, dwFlags);
+  FIXME("(%p)->(%8ld,%p,%08lx): stub\n", This, dwCount, lpRects, dwFlags);
 
   /* For the moment, ignore the rectangles */
   if (This->device.active_device1 != NULL) {
@@ -264,7 +264,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_AddLight(LPDIRECT3DVIEWPORT2 iface,
 {
   ICOM_THIS(IDirect3DViewport2Impl,iface);
   IDirect3DLightImpl* ilpLight=(IDirect3DLightImpl*)lpLight;
-  FIXME(ddraw, "(%p)->(%p): stub\n", This, ilpLight);
+  FIXME("(%p)->(%p): stub\n", This, ilpLight);
 
   /* Add the light in the 'linked' chain */
   ilpLight->next = This->lights;
@@ -290,7 +290,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_DeleteLight(LPDIRECT3DVIEWPORT2 ifa
 						     LPDIRECT3DLIGHT lpLight)
 {
   ICOM_THIS(IDirect3DViewport2Impl,iface);
-  FIXME(ddraw, "(%p)->(%p): stub\n", This, lpLight);
+  FIXME("(%p)->(%p): stub\n", This, lpLight);
   
   return DD_OK;
 }
@@ -301,7 +301,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_NextLight(LPDIRECT3DVIEWPORT2 iface
 						   DWORD dwFlags)
 {
   ICOM_THIS(IDirect3DViewport2Impl,iface);
-  FIXME(ddraw, "(%p)->(%p,%p,%08lx): stub\n", This, lpLight, lplpLight, dwFlags);
+  FIXME("(%p)->(%p,%p,%08lx): stub\n", This, lpLight, lplpLight, dwFlags);
   
   return DD_OK;
 }
@@ -311,7 +311,7 @@ static HRESULT WINAPI IDirect3DViewport2Impl_GetViewport2(LPDIRECT3DVIEWPORT2 if
 						      LPD3DVIEWPORT2 lpViewport2)
 {
   ICOM_THIS(IDirect3DViewport2Impl,iface);
-  TRACE(ddraw, "(%p)->(%p)\n", This, lpViewport2);
+  TRACE("(%p)->(%p)\n", This, lpViewport2);
 
   if (This->use_vp2 != 1)
     return DDERR_INVALIDPARAMS;
@@ -325,17 +325,17 @@ static HRESULT WINAPI IDirect3DViewport2Impl_SetViewport2(LPDIRECT3DVIEWPORT2 if
 						      LPD3DVIEWPORT2 lpViewport2)
 {
   ICOM_THIS(IDirect3DViewport2Impl,iface);
-  TRACE(ddraw, "(%p)->(%p)\n", This, lpViewport2);
+  TRACE("(%p)->(%p)\n", This, lpViewport2);
 
-  TRACE(ddraw, "dwSize = %ld   dwX = %ld   dwY = %ld\n",
+  TRACE("dwSize = %ld   dwX = %ld   dwY = %ld\n",
 	lpViewport2->dwSize, lpViewport2->dwX, lpViewport2->dwY);
-  TRACE(ddraw, "dwWidth = %ld   dwHeight = %ld\n",
+  TRACE("dwWidth = %ld   dwHeight = %ld\n",
 	lpViewport2->dwWidth, lpViewport2->dwHeight);
-  TRACE(ddraw, "dvClipX = %f   dvClipY = %f\n",
+  TRACE("dvClipX = %f   dvClipY = %f\n",
 	lpViewport2->dvClipX, lpViewport2->dvClipY);
-  TRACE(ddraw, "dvClipWidth = %f   dvClipHeight = %f\n",
+  TRACE("dvClipWidth = %f   dvClipHeight = %f\n",
 	lpViewport2->dvClipWidth, lpViewport2->dvClipHeight);
-  TRACE(ddraw, "dvMinZ = %f   dvMaxZ = %f\n",
+  TRACE("dvMinZ = %f   dvMaxZ = %f\n",
 	lpViewport2->dvMinZ, lpViewport2->dvMaxZ);
 
   This->viewport.vp2 = *lpViewport2;
@@ -377,12 +377,12 @@ static ICOM_VTABLE(IDirect3DViewport2) viewport2_vtable =
 #else /* HAVE_MESAGL */
 
 LPDIRECT3DVIEWPORT d3dviewport_create(IDirect3DImpl* d3d1) {
-  ERR(ddraw, "Should not be called...\n");
+  ERR("Should not be called...\n");
   return NULL;
 }
 
 LPDIRECT3DVIEWPORT2 d3dviewport2_create(IDirect3D2Impl* d3d2) {
-  ERR(ddraw, "Should not be called...\n");
+  ERR("Should not be called...\n");
   return NULL;
 }
 

graphics/dispdib.c

@@ -9,7 +9,7 @@
 #include "miscemu.h"
 #include "dispdib.h"
 #include "vga.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "wine/wingdi16.h"
 
 DEFAULT_DEBUG_CHANNEL(ddraw)
@@ -132,7 +132,7 @@ WORD WINAPI DisplayDib(
         DISPDIB_Show(&(lpbi->bmiHeader),lpBits,wFlags);
     }
     if (!(wFlags&DISPLAYDIB_NOWAIT)) {
-        FIXME(ddraw,"wait not implemented\n");
+        FIXME("wait not implemented\n");
     }
     if (!dispdib_multi) DISPDIB_End();
     return DISPLAYDIB_NOERROR;

graphics/enhmetafiledrv/graphics.c

@@ -9,7 +9,7 @@
 #include "dc.h"
 #include "enhmetafiledrv.h"
 #include "heap.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(enhmetafile)
 
@@ -212,7 +212,7 @@ EMFDRV_Ellipse( DC *dc, INT left, INT top, INT right, INT bottom )
     EMRELLIPSE emr;
     INT temp;
 
-    TRACE(enhmetafile, "%d,%d - %d,%d\n", left, top, right, bottom);
+    TRACE("%d,%d - %d,%d\n", left, top, right, bottom);
 
     if(left == right || top == bottom) return FALSE;
 
@@ -242,7 +242,7 @@ EMFDRV_Rectangle(DC *dc, INT left, INT top, INT right, INT bottom)
     EMRRECTANGLE emr;
     INT temp;
 
-    TRACE(enhmetafile, "%d,%d - %d,%d\n", left, top, right, bottom);
+    TRACE("%d,%d - %d,%d\n", left, top, right, bottom);
 
     if(left == right || top == bottom) return FALSE;
 

graphics/enhmetafiledrv/init.c

@@ -12,7 +12,7 @@
 #include "enhmetafile.h"
 #include "enhmetafiledrv.h"
 #include "wine/winestring.h"
-#include "debug.h"
+#include "debugtools.h"
 
 #include <string.h>
 
@@ -129,7 +129,7 @@ BOOL EMFDRV_WriteRecord( DC *dc, EMR *emr )
     physDev->emh->nRecords++;
 
     if(physDev->hFile) {
-        TRACE(enhmetafile,"Writing record to disk\n");
+        TRACE("Writing record to disk\n");
 	if (!WriteFile(physDev->hFile, (char *)emr, emr->nSize, NULL, NULL))
 	    return FALSE;
     } else {
@@ -230,7 +230,7 @@ HDC WINAPI CreateEnhMetaFileW(
     HFILE hFile;
     DWORD size = 0, length = 0;
 
-    TRACE(enhmetafile, "'%s'\n", debugstr_w(filename) );
+    TRACE("'%s'\n", debugstr_w(filename) );
 
     if (!(dc = DC_AllocDC( &EMFDRV_Funcs ))) return 0;
     dc->header.wMagic = ENHMETAFILE_DC_MAGIC;
@@ -286,7 +286,7 @@ HDC WINAPI CreateEnhMetaFileW(
 	physDev->hFile = hFile;
     }
 	
-    TRACE(enhmetafile, "returning %04x\n", dc->hSelf);
+    TRACE("returning %04x\n", dc->hSelf);
     return dc->hSelf;
 
 }
@@ -302,7 +302,7 @@ HENHMETAFILE WINAPI CloseEnhMetaFile( HDC hdc /* metafile DC */ )
     EMREOF emr;
     HANDLE hMapping = 0;
 
-    TRACE(enhmetafile, "(%04x)\n", hdc );
+    TRACE("(%04x)\n", hdc );
 
     if (!(dc = (DC *) GDI_GetObjPtr( hdc, ENHMETAFILE_DC_MAGIC ))) return 0;
     physDev = (EMFDRV_PDEVICE *)dc->physDev;
@@ -329,9 +329,9 @@ HENHMETAFILE WINAPI CloseEnhMetaFile( HDC hdc /* metafile DC */ )
 	HeapFree( SystemHeap, 0, physDev->emh );
         hMapping = CreateFileMappingA(physDev->hFile, NULL, PAGE_READONLY, 0,
 				      0, NULL);
-	TRACE(enhmetafile, "hMapping = %08x\n", hMapping );
+	TRACE("hMapping = %08x\n", hMapping );
 	physDev->emh = MapViewOfFile(hMapping, FILE_MAP_READ, 0, 0, 0);
-	TRACE(enhmetafile, "view = %p\n", physDev->emh );
+	TRACE("view = %p\n", physDev->emh );
     }
 
 

graphics/enhmetafiledrv/objects.c

@@ -11,7 +11,7 @@
 #include "font.h"
 #include "enhmetafiledrv.h"
 #include "pen.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "heap.h"
 
 DEFAULT_DEBUG_CHANNEL(enhmetafile)
@@ -82,11 +82,11 @@ DWORD EMFDRV_CreateBrushIndirect( DC *dc, HBRUSH hBrush )
       break;
 
     case BS_PATTERN:
-        FIXME(enhmetafile, "Unsupported style %x\n",
+        FIXME("Unsupported style %x\n",
 	      brushObj->logbrush.lbStyle);
         break;
     default:
-        FIXME(enhmetafile, "Unknown style %x\n", brushObj->logbrush.lbStyle);
+        FIXME("Unknown style %x\n", brushObj->logbrush.lbStyle);
 	return FALSE;
     }
     GDI_HEAP_UNLOCK( hBrush );
@@ -236,7 +236,7 @@ HGDIOBJ EMFDRV_SelectObject( DC *dc, HGDIOBJ handle )
     HGDIOBJ ret = 0;
 
     if (!ptr) return 0;
-    TRACE(enhmetafile, "hdc=%04x %04x\n", dc->hSelf, handle );
+    TRACE("hdc=%04x %04x\n", dc->hSelf, handle );
     
     switch(ptr->wMagic)
     {

graphics/env.c

@@ -10,7 +10,7 @@
 #include <string.h>
 #include "config.h"
 #include "gdi.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "heap.h"
 
 DEFAULT_DEBUG_CHANNEL(gdi)
@@ -82,7 +82,7 @@ INT16 WINAPI GetEnvironment16(LPCSTR lpPortName, LPDEVMODEA lpdev, UINT16 nMaxSi
     ENVTABLE *env;
     WORD size;
 
-    TRACE(gdi, "('%s', %p, %d)\n", lpPortName, lpdev, nMaxSize);
+    TRACE("('%s', %p, %d)\n", lpPortName, lpdev, nMaxSize);
 
     if (!(atom = PortNameToAtom(lpPortName, FALSE)))
 	return 0;
@@ -112,7 +112,7 @@ INT16 WINAPI SetEnvironment16(LPCSTR lpPortName, LPDEVMODEA lpdev, UINT16 nCount
     ENVTABLE *env;
     HGLOBAL16 handle;
 
-    TRACE(gdi, "('%s', %p, %d)\n", lpPortName, lpdev, nCount);
+    TRACE("('%s', %p, %d)\n", lpPortName, lpdev, nCount);
 
     if ((atom = PortNameToAtom(lpPortName, FALSE))) {
 	if (atom == GDI_GetNullPortAtom()) {

graphics/fontengine.c

@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include "winbase.h"
 #include "font.h"
-#include "debug.h"     
+#include "debugtools.h"     
 
 DEFAULT_DEBUG_CHANNEL(font)
 
@@ -22,7 +22,7 @@ DEFAULT_DEBUG_CHANNEL(font)
 WORD WINAPI 
 EngineEnumerateFont16(LPSTR fontname, FARPROC16 proc, DWORD data )
 {
-    FIXME(font,"(%s,%p,%lx),stub\n",fontname,proc,data);
+    FIXME("(%s,%p,%lx),stub\n",fontname,proc,data);
     return 0;
 }
 
@@ -57,7 +57,7 @@ WORD WINAPI EngineDeleteFont16(LPFONTINFO16 lpFontInfo)
  */
 WORD WINAPI EngineRealizeFont16(LPLOGFONT16 lplogFont, LPTEXTXFORM16 lptextxform, LPFONTINFO16 lpfontInfo)
 {
-    FIXME(font,"(%p,%p,%p),stub\n",lplogFont,lptextxform,lpfontInfo);
+    FIXME("(%p,%p,%p),stub\n",lplogFont,lptextxform,lpfontInfo);
     
     return 0;
 }
@@ -70,7 +70,7 @@ WORD WINAPI EngineGetCharWidth16(LPFONTINFO16 lpFontInfo, BYTE firstChar, BYTE l
     int i;
 
     for (i = firstChar; i <= lastChar; i++)
-       FIXME(font, " returns font's average width for range %d to %d\n", firstChar, lastChar);
+       FIXME(" returns font's average width for range %d to %d\n", firstChar, lastChar);
 	*buffer++ = lpFontInfo->dfAvgWidth; /* insert some charwidth functionality here; use average width for now */
     return 1;
 }
@@ -80,7 +80,7 @@ WORD WINAPI EngineGetCharWidth16(LPFONTINFO16 lpFontInfo, BYTE firstChar, BYTE l
  */
 WORD WINAPI EngineSetFontContext(LPFONTINFO16 lpFontInfo, WORD data)
 {
-   FIXME(font, "stub?\n");
+   FIXME("stub?\n");
 	return 0;
 }
 
@@ -89,7 +89,7 @@ WORD WINAPI EngineSetFontContext(LPFONTINFO16 lpFontInfo, WORD data)
  */
 WORD WINAPI EngineGetGlyphBMP(WORD word, LPFONTINFO16 lpFontInfo, WORD w1, WORD w2, LPSTR string, DWORD dword, /*LPBITMAPMETRICS16*/ LPVOID metrics)
 {
-   FIXME(font, "stub?\n");
+   FIXME("stub?\n");
     return 0;
 }
 
@@ -98,7 +98,7 @@ WORD WINAPI EngineGetGlyphBMP(WORD word, LPFONTINFO16 lpFontInfo, WORD w1, WORD
  */
 DWORD WINAPI EngineMakeFontDir(HDC16 hdc, LPFONTDIR16 fontdir, LPCSTR string)
 {
-   FIXME(font, " stub! (always fails)\n");
+   FIXME(" stub! (always fails)\n");
     return -1; /* error */
     
 }
@@ -109,6 +109,6 @@ DWORD WINAPI EngineMakeFontDir(HDC16 hdc, LPFONTDIR16 fontdir, LPCSTR string)
 
 WORD WINAPI EngineExtTextOut()
 {
-   FIXME(font, "stub!\n");
+   FIXME("stub!\n");
     return 0;
 }

graphics/mapping.c

@@ -5,7 +5,7 @@
  */
 
 #include "dc.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(gdi)
 
@@ -124,7 +124,7 @@ INT WINAPI SetMapMode( HDC hdc, INT mode )
     if (!dc) return 0;
     if (dc->funcs->pSetMapMode) return dc->funcs->pSetMapMode( dc, mode );
 
-    TRACE(gdi, "%04x %d\n", hdc, mode );
+    TRACE("%04x %d\n", hdc, mode );
     
     prevMode = dc->w.MapMode;
     switch(mode)

graphics/metafiledrv/bitblt.c

@@ -7,7 +7,7 @@
 #include "gdi.h"
 #include "metafiledrv.h"
 #include "heap.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "bitmap.h"
 
 DEFAULT_DEBUG_CHANNEL(metafile)
@@ -45,7 +45,7 @@ BOOL MFDRV_BitBlt( DC *dcDst, INT xDst, INT yDst, INT width, INT height,
     *(mr->rdParm + 9) = BM.bmWidthBytes;
     *(mr->rdParm +10) = BM.bmPlanes;
     *(mr->rdParm +11) = BM.bmBitsPixel;
-    TRACE(metafile,"len = %ld  rop=%lx  \n",len,rop);
+    TRACE("len = %ld  rop=%lx  \n",len,rop);
     if (GetBitmapBits(dcSrc->w.hBitmap,BM.bmWidthBytes * BM.bmHeight,
                         mr->rdParm +12))
     {
@@ -110,7 +110,7 @@ BOOL MFDRV_StretchBlt( DC *dcDst, INT xDst, INT yDst, INT widthDst,
     lpBMI->biYPelsPerMeter = MulDiv(GetDeviceCaps(dcSrc->hSelf,LOGPIXELSY),3937,100);
     lpBMI->biClrImportant  = 0;                          /* 1 meter  = 39.37 inch */
 
-    TRACE(metafile,"MF_StretchBltViaDIB->len = %ld  rop=%lx  PixYPM=%ld Caps=%d\n",
+    TRACE("MF_StretchBltViaDIB->len = %ld  rop=%lx  PixYPM=%ld Caps=%d\n",
                len,rop,lpBMI->biYPelsPerMeter,GetDeviceCaps(hdcSrc,LOGPIXELSY));
     if (GetDIBits(hdcSrc,dcSrc->w.hBitmap,0,(UINT)lpBMI->biHeight,
                   (LPSTR)lpBMI + DIB_BitmapInfoSize( (BITMAPINFO *)lpBMI,
@@ -126,7 +126,7 @@ BOOL MFDRV_StretchBlt( DC *dcDst, INT xDst, INT yDst, INT widthDst,
     *(mr->rdParm +12) = BM.bmWidthBytes;
     *(mr->rdParm +13) = BM.bmPlanes;
     *(mr->rdParm +14) = BM.bmBitsPixel;
-    TRACE(metafile,"len = %ld  rop=%lx  \n",len,rop);
+    TRACE("len = %ld  rop=%lx  \n",len,rop);
     if (GetBitmapBits( dcSrc->w.hBitmap, BM.bmWidthBytes * BM.bmHeight,
                          mr->rdParm +15))
 #endif    

graphics/metafiledrv/graphics.c

@@ -11,7 +11,7 @@
 #include "xmalloc.h"
 #include "metafiledrv.h"
 #include "heap.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(metafile)
 
@@ -233,7 +233,7 @@ static INT16 MFDRV_CreateRegion(DC *dc, HRGN hrgn)
 
     len = GetRegionData( hrgn, 0, NULL );
     if( !(rgndata = HeapAlloc( SystemHeap, 0, len )) ) {
-        WARN(metafile, "Can't alloc rgndata buffer\n");
+        WARN("Can't alloc rgndata buffer\n");
 	return -1;
     }
     GetRegionData( hrgn, len, rgndata );
@@ -243,7 +243,7 @@ static INT16 MFDRV_CreateRegion(DC *dc, HRGN hrgn)
      */
     len = sizeof(METARECORD) + 20 + (rgndata->rdh.nCount * 12);
     if( !(mr = HeapAlloc( SystemHeap, HEAP_ZERO_MEMORY, len )) ) {
-        WARN(metafile, "Can't alloc METARECORD buffer\n");
+        WARN("Can't alloc METARECORD buffer\n");
 	HeapFree( SystemHeap, 0, rgndata );
 	return -1;
     }
@@ -296,7 +296,7 @@ static INT16 MFDRV_CreateRegion(DC *dc, HRGN hrgn)
     HeapFree( SystemHeap, 0, rgndata );
     if(!ret) 
     {
-        WARN(metafile, "MFDRV_WriteRecord failed\n");
+        WARN("MFDRV_WriteRecord failed\n");
 	return -1;
     }
     return MFDRV_AddHandleDC( dc );

graphics/metafiledrv/init.c

@@ -11,7 +11,7 @@
 #include "global.h"
 #include "metafile.h"
 #include "metafiledrv.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(metafile)
 
@@ -170,7 +170,7 @@ HDC16 WINAPI CreateMetaFile16(
     METAFILEDRV_PDEVICE *physDev;
     HFILE hFile;
 
-    TRACE(metafile, "'%s'\n", filename );
+    TRACE("'%s'\n", filename );
 
     if (!(dc = MFDRV_AllocMetaFile())) return 0;
     physDev = (METAFILEDRV_PDEVICE *)dc->physDev;
@@ -196,7 +196,7 @@ HDC16 WINAPI CreateMetaFile16(
     else  /* memory based metafile */
 	physDev->mh->mtType = METAFILE_MEMORY;
 	
-    TRACE(metafile, "returning %04x\n", dc->hSelf);
+    TRACE("returning %04x\n", dc->hSelf);
     return dc->hSelf;
 }
 
@@ -236,7 +236,7 @@ static DC *MFDRV_CloseMetaFile( HDC hdc )
     DC *dc;
     METAFILEDRV_PDEVICE *physDev;
     
-    TRACE(metafile, "(%04x)\n", hdc );
+    TRACE("(%04x)\n", hdc );
 
     if (!(dc = (DC *) GDI_GetObjPtr( hdc, METAFILE_DC_MAGIC ))) return 0;
     physDev = (METAFILEDRV_PDEVICE *)dc->physDev;
@@ -343,12 +343,12 @@ BOOL MFDRV_WriteRecord( DC *dc, METARECORD *mr, DWORD rlen)
 	memcpy((WORD *)physDev->mh + physDev->mh->mtSize, mr, rlen);
         break;
     case METAFILE_DISK:
-        TRACE(metafile,"Writing record to disk\n");
+        TRACE("Writing record to disk\n");
 	if (!WriteFile(physDev->hFile, (char *)mr, rlen, NULL, NULL))
 	    return FALSE;
         break;
     default:
-        ERR(metafile, "Unknown metafile type %d\n", physDev->mh->mtType );
+        ERR("Unknown metafile type %d\n", physDev->mh->mtType );
         return FALSE;
     }
 

graphics/metafiledrv/text.c

@@ -7,7 +7,7 @@
 
 #include "windef.h"
 #include "metafiledrv.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "heap.h"
 
 DEFAULT_DEBUG_CHANNEL(metafile)
@@ -25,7 +25,7 @@ static BOOL MFDRV_MetaExtTextOut(DC*dc, short x, short y, UINT16 flags,
     METARECORD *mr;
     
     if((!flags && rect) || (flags && !rect))
-	WARN(metafile, "Inconsistent flags and rect\n");
+	WARN("Inconsistent flags and rect\n");
     len = sizeof(METARECORD) + (((count + 1) >> 1) * 2) + 2 * sizeof(short)
 	    + sizeof(UINT16);
     if(rect)

graphics/painting.c

@@ -13,7 +13,7 @@
 #include "cache.h"
 #include "region.h"
 #include "path.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "winerror.h"
 #include "winuser.h"
 #include "wine/winuser16.h"
@@ -462,7 +462,7 @@ COLORREF WINAPI GetPixel( HDC hdc, INT x, INT y )
  */
 INT WINAPI ChoosePixelFormat( HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd )
 {
-    FIXME(gdi, "(%d,%p): stub\n",hdc,ppfd);
+    FIXME("(%d,%p): stub\n",hdc,ppfd);
     return 1;
 }
 
@@ -481,7 +481,7 @@ INT WINAPI ChoosePixelFormat( HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd )
 BOOL WINAPI SetPixelFormat( HDC hdc, int iPixelFormat, 
                               const PIXELFORMATDESCRIPTOR* ppfd)
 {
-    FIXME(gdi, "(%d,%d,%p): stub\n",hdc,iPixelFormat,ppfd);
+    FIXME("(%d,%d,%p): stub\n",hdc,iPixelFormat,ppfd);
     return TRUE;
 }
 
@@ -499,7 +499,7 @@ BOOL WINAPI SetPixelFormat( HDC hdc, int iPixelFormat,
  */
 int WINAPI GetPixelFormat( HDC hdc )
 {
-    FIXME(gdi, "(%d): stub\n",hdc);
+    FIXME("(%d): stub\n",hdc);
     return 1;
 }
 
@@ -521,7 +521,7 @@ int WINAPI GetPixelFormat( HDC hdc )
 int WINAPI DescribePixelFormat( HDC hdc, int iPixelFormat, UINT nBytes,
                                 LPPIXELFORMATDESCRIPTOR ppfd )
 {
-    FIXME(gdi, "(%d,%d,%d,%p): stub\n",hdc,iPixelFormat,nBytes,ppfd);
+    FIXME("(%d,%d,%d,%p): stub\n",hdc,iPixelFormat,nBytes,ppfd);
     ppfd->nSize = nBytes;
     ppfd->nVersion = 1;
     return 3;
@@ -539,7 +539,7 @@ int WINAPI DescribePixelFormat( HDC hdc, int iPixelFormat, UINT nBytes,
  */
 BOOL WINAPI SwapBuffers( HDC hdc )
 {
-    FIXME(gdi, "(%d): stub\n",hdc);
+    FIXME("(%d): stub\n",hdc);
     return TRUE;
 }
 
@@ -908,7 +908,7 @@ BOOL WINAPI DrawAnimatedRects( HWND hwnd, int idAni,
                                    const RECT* lprcFrom,
                                    const RECT* lprcTo )
 {
-    FIXME(gdi,"(0x%x,%d,%p,%p): stub\n",hwnd,idAni,lprcFrom,lprcTo);
+    FIXME("(0x%x,%d,%p,%p): stub\n",hwnd,idAni,lprcFrom,lprcTo);
     return TRUE;
 }
 
@@ -1198,7 +1198,7 @@ BOOL WINAPI PolyBezier( HDC hdc, const POINT* lppt, DWORD cPoints )
     DC * dc = DC_GetDCPtr( hdc );
     if(!dc) return FALSE;
     if(dc && PATH_IsPathOpen(dc->w.path))
-        FIXME(gdi, "PATH_PolyBezier is not implemented!\n");
+        FIXME("PATH_PolyBezier is not implemented!\n");
 /*        if(!PATH_PolyBezier(hdc, x, y))
 	   return FALSE; */
     return dc->funcs->pPolyBezier&&
@@ -1225,7 +1225,7 @@ BOOL WINAPI PolyBezierTo( HDC hdc, const POINT* lppt, DWORD cPoints )
     pt.x=dc->w.CursPosX;
     pt.y=dc->w.CursPosY;
     if(dc && PATH_IsPathOpen(dc->w.path))
-        FIXME(gdi, "PATH_PolyBezierTo is not implemented!\n");
+        FIXME("PATH_PolyBezierTo is not implemented!\n");
 /*        if(!PATH_PolyBezier(hdc, x, y))
 	   return FALSE; */
     ret= dc->funcs->pPolyBezier &&
@@ -1242,7 +1242,7 @@ BOOL WINAPI PolyBezierTo( HDC hdc, const POINT* lppt, DWORD cPoints )
 BOOL WINAPI AngleArc(HDC hdc, INT x, INT y, DWORD dwRadius,
                        FLOAT eStartAngle, FLOAT eSweepAngle)
 {
-        FIXME(gdi,"AngleArc, stub\n");
+        FIXME("AngleArc, stub\n");
         return 0;
 }
 
@@ -1253,6 +1253,6 @@ BOOL WINAPI AngleArc(HDC hdc, INT x, INT y, DWORD dwRadius,
 BOOL WINAPI PolyDraw(HDC hdc, const POINT *lppt, const BYTE *lpbTypes,
                        DWORD cCount)
 {
-        FIXME(gdi,"PolyDraw, stub\n");
+        FIXME("PolyDraw, stub\n");
         return 0;
 }

graphics/path.c

@@ -18,7 +18,7 @@
 #include "winerror.h"
 
 #include "dc.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "path.h"
 
 DEFAULT_DEBUG_CHANNEL(gdi)
@@ -247,7 +247,7 @@ BOOL WINAPI CloseFigure(HDC hdc)
 INT16 WINAPI GetPath16(HDC16 hdc, LPPOINT16 pPoints, LPBYTE pTypes,
    INT16 nSize)
 {
-   FIXME(gdi, "(%d,%p,%p): stub\n",hdc,pPoints,pTypes);
+   FIXME("(%d,%p,%p): stub\n",hdc,pPoints,pTypes);
 
    return 0;
 }
@@ -1132,7 +1132,7 @@ static void PATH_NormalizePoint(FLOAT_POINT corners[],
  */
 BOOL WINAPI FlattenPath(HDC hdc)
 {
-        FIXME(gdi, "FlattenPath, stub\n");
+        FIXME("FlattenPath, stub\n");
         return 0;
 }
 
@@ -1143,7 +1143,7 @@ BOOL WINAPI FlattenPath(HDC hdc)
  */
 BOOL WINAPI StrokeAndFillPath(HDC hdc)
 {
-        FIXME(gdi, "StrokeAndFillPath, stub\n");
+        FIXME("StrokeAndFillPath, stub\n");
         return 0;
 }
 
@@ -1154,7 +1154,7 @@ BOOL WINAPI StrokeAndFillPath(HDC hdc)
  */
 BOOL WINAPI StrokePath(HDC hdc)
 {
-        FIXME(gdi, "StrokePath, stub\n");
+        FIXME("StrokePath, stub\n");
         return 0;
 }
 
@@ -1165,7 +1165,7 @@ BOOL WINAPI StrokePath(HDC hdc)
  */
 BOOL WINAPI WidenPath(HDC hdc)
 {
-        FIXME(gdi, "WidenPath, stub\n");
+        FIXME("WidenPath, stub\n");
         return 0;
 }
    

graphics/psdrv/afm.c

@@ -10,7 +10,7 @@
 #include "winnt.h" /* HEAP_ZERO_MEMORY */
 #include "psdrv.h"
 #include "options.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "heap.h"
 
 DEFAULT_DEBUG_CHANNEL(psdrv)
@@ -39,7 +39,7 @@ static void PSDRV_AFMGetCharMetrics(AFM *afm, FILE *fp)
     for(i = 0; i < afm->NumofMetrics; i++) {
 
         if(!fgets(line, sizeof(line), fp)) {
-	   ERR(psdrv, "Unexpected EOF\n");
+	   ERR("Unexpected EOF\n");
 	   return;
 	}
 
@@ -102,7 +102,7 @@ static void PSDRV_AFMGetCharMetrics(AFM *afm, FILE *fp)
 	}
 
 #if 0	
-	TRACE(psdrv, "Metrics for '%s' WX = %f B = %f,%f - %f,%f\n",
+	TRACE("Metrics for '%s' WX = %f B = %f,%f - %f,%f\n",
 	      metric->N, metric->WX, metric->B.llx, metric->B.lly,
 	      metric->B.urx, metric->B.ury);
 #endif
@@ -129,10 +129,10 @@ static AFM *PSDRV_AFMParse(char const *file)
     AFM *afm;
     char *cp;
 
-    TRACE(psdrv, "parsing '%s'\n", file);
+    TRACE("parsing '%s'\n", file);
 
     if((fp = fopen(file, "r")) == NULL) {
-        MSG("Can't open AFM file '%s'. Please check wine.conf .\n", file);
+        MESSAGE("Can't open AFM file '%s'. Please check wine.conf .\n", file);
         return NULL;
     }
 
@@ -181,7 +181,7 @@ static AFM *PSDRV_AFMParse(char const *file)
 	    else if(!strncmp("Light", value, 5))
 	        afm->Weight = FW_LIGHT;
 	    else {
-  	        FIXME(psdrv, "Unkown AFM Weight '%s'\n", value);
+  	        FIXME("Unkown AFM Weight '%s'\n", value);
 	        afm->Weight = FW_NORMAL;
 	    }
 	    continue;
@@ -373,7 +373,7 @@ static void PSDRV_ReencodeCharWidths(AFM *afm)
 	    }
 	}
 	if(!metric) {
-	    WARN(psdrv, "Couldn't find glyph '%s' in font '%s'\n",
+	    WARN("Couldn't find glyph '%s' in font '%s'\n",
 		 PSDRV_ANSIVector[i], afm->FontName);
 	    afm->CharWidths[i] = 0.0;
 	}
@@ -418,9 +418,9 @@ static void PSDRV_DumpFontList(void)
     AFMLISTENTRY *afmle;
 
     for(family = PSDRV_AFMFontList; family; family = family->next) {
-        TRACE(psdrv, "Family '%s'\n", family->FamilyName);
+        TRACE("Family '%s'\n", family->FamilyName);
 	for(afmle = family->afmlist; afmle; afmle = afmle->next) {
-	    TRACE(psdrv, "\tFontName '%s'\n", afmle->afm->FontName);
+	    TRACE("\tFontName '%s'\n", afmle->afm->FontName);
 	}
     }
     return;

graphics/psdrv/bitmap.c

@@ -7,7 +7,7 @@
 
 #include "gdi.h"
 #include "psdrv.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "bitmap.h"
 #include "winbase.h"
 
@@ -77,7 +77,7 @@ static BOOL PSDRV_WriteImageHeader(DC *dc, const BITMAPINFO *info, INT xDst,
       }
 
     default:
-        FIXME(psdrv, "Not implemented yet\n");
+        FIXME("Not implemented yet\n");
 	return FALSE;
 	break;
     }
@@ -108,7 +108,7 @@ INT PSDRV_StretchDIBits( DC *dc, INT xDst, INT yDst, INT widthDst,
     const char *ptr;
     INT line;
 
-    TRACE(psdrv, "%08x (%d,%d %dx%d) -> (%d,%d %dx%d)\n", dc->hSelf,
+    TRACE("%08x (%d,%d %dx%d) -> (%d,%d %dx%d)\n", dc->hSelf,
 	  xSrc, ySrc, widthSrc, heightSrc, xDst, yDst, widthDst, heightDst);
 
     DIB_GetBitmapInfo((const BITMAPINFOHEADER *)info, &fullSrcWidth,
@@ -116,12 +116,12 @@ INT PSDRV_StretchDIBits( DC *dc, INT xDst, INT yDst, INT widthDst,
 
     widthbytes = DIB_GetDIBWidthBytes(fullSrcWidth, bpp);
 
-    TRACE(psdrv, "full size=%ldx%d bpp=%d compression=%d\n", fullSrcWidth,
+    TRACE("full size=%ldx%d bpp=%d compression=%d\n", fullSrcWidth,
 	  fullSrcHeight, bpp, compression);
 
 
     if(compression != BI_RGB) {
-        FIXME(psdrv, "Compression not supported\n");
+        FIXME("Compression not supported\n");
 	return FALSE;
     }
 
@@ -139,7 +139,7 @@ INT PSDRV_StretchDIBits( DC *dc, INT xDst, INT yDst, INT widthDst,
 	ptr = bits;
 	ptr += (ySrc * widthbytes);
 	if(xSrc & 7 || widthSrc & 7)
-	    FIXME(psdrv, "This won't work...\n");
+	    FIXME("This won't work...\n");
         for(line = 0; line < heightSrc; line++, ptr += widthbytes)
 	    PSDRV_WriteBytes(dc, ptr + xSrc/8, widthSrc/8);
 	break;
@@ -151,7 +151,7 @@ INT PSDRV_StretchDIBits( DC *dc, INT xDst, INT yDst, INT widthDst,
 	ptr = bits;
 	ptr += (ySrc * widthbytes);
 	if(xSrc & 1 || widthSrc & 1)
-	    FIXME(psdrv, "This won't work...\n");
+	    FIXME("This won't work...\n");
         for(line = 0; line < heightSrc; line++, ptr += widthbytes)
 	    PSDRV_WriteBytes(dc, ptr + xSrc/2, widthSrc/2);
 	break;
@@ -201,7 +201,7 @@ INT PSDRV_StretchDIBits( DC *dc, INT xDst, INT yDst, INT widthDst,
 	break;
 
     default:
-        FIXME(psdrv, "Unsupported depth\n");
+        FIXME("Unsupported depth\n");
 	return FALSE;
 
     }

graphics/psdrv/brush.c

@@ -7,7 +7,7 @@
 
 #include "psdrv.h"
 #include "brush.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "gdi.h"
 
 DEFAULT_DEBUG_CHANNEL(psdrv)
@@ -20,7 +20,7 @@ HBRUSH PSDRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush, BRUSHOBJ * brush )
     HBRUSH prevbrush = dc->w.hBrush;
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
 
-    TRACE(psdrv, "hbrush = %08x\n", hbrush);
+    TRACE("hbrush = %08x\n", hbrush);
     dc->w.hBrush = hbrush;
 
     switch(brush->logbrush.lbStyle) {
@@ -39,11 +39,11 @@ HBRUSH PSDRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush, BRUSHOBJ * brush )
         break;
 
     case BS_PATTERN:
-        FIXME(psdrv, "Unsupported brush style %d\n", brush->logbrush.lbStyle);
+        FIXME("Unsupported brush style %d\n", brush->logbrush.lbStyle);
 	break;
 
     default:
-        FIXME(psdrv, "Unrecognized brush style %d\n", brush->logbrush.lbStyle);
+        FIXME("Unrecognized brush style %d\n", brush->logbrush.lbStyle);
 	break;
     }
 
@@ -63,7 +63,7 @@ static BOOL PSDRV_SetBrush(DC *dc)
     BRUSHOBJ *brush = (BRUSHOBJ *)GDI_GetObjPtr( dc->w.hBrush, BRUSH_MAGIC );
 
     if(!brush) {
-        ERR(psdrv, "Can't get BRUSHOBJ\n");
+        ERR("Can't get BRUSHOBJ\n");
 	return FALSE;
     }
     
@@ -123,7 +123,7 @@ BOOL PSDRV_Brush(DC *dc, BOOL EO)
     BRUSHOBJ *brush = (BRUSHOBJ *)GDI_GetObjPtr( dc->w.hBrush, BRUSH_MAGIC );
 
     if(!brush) {
-        ERR(psdrv, "Can't get BRUSHOBJ\n");
+        ERR("Can't get BRUSHOBJ\n");
 	return FALSE;
     }
 
@@ -182,7 +182,7 @@ BOOL PSDRV_Brush(DC *dc, BOOL EO)
 	    break;
 
 	default:
-	    ERR(psdrv, "Unknown hatch style\n");
+	    ERR("Unknown hatch style\n");
 	    return FALSE;
 	}
 	return TRUE;

graphics/psdrv/color.c

@@ -6,7 +6,7 @@
  */
 
 #include "psdrv.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(psdrv)
 
@@ -32,7 +32,7 @@ BOOL PSDRV_CmpColor(PSCOLOR *col1, PSCOLOR *col2)
 	    return TRUE;
 	break;
     default:
-        ERR(psdrv, "Unknown colour type %d\n", col1->type);
+        ERR("Unknown colour type %d\n", col1->type);
     }
     return FALSE;
 }
@@ -58,7 +58,7 @@ BOOL PSDRV_CopyColor(PSCOLOR *col1, PSCOLOR *col2)
 	break;
 
     default:
-        ERR(psdrv, "Unknown colour type %d\n", col1->type);
+        ERR("Unknown colour type %d\n", col1->type);
 	return FALSE;
     }
 
@@ -81,7 +81,7 @@ void PSDRV_CreateColor( PSDRV_PDEVICE *physDev, PSCOLOR *pscolor,
     float r, g, b;
 
     if(ctype != 0)
-        FIXME(psdrv, "Colour is %08lx\n", wincolor);
+        FIXME("Colour is %08lx\n", wincolor);
 
     r = (wincolor & 0xff) / 256.0;
     g = ((wincolor >> 8) & 0xff) / 256.0;

graphics/psdrv/escape.c

@@ -5,7 +5,7 @@
  */
 #include "wine/winuser16.h"
 #include "psdrv.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "winspool.h"
 
 DEFAULT_DEBUG_CHANNEL(psdrv)
@@ -24,20 +24,20 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
 	    physDev->job.banding = TRUE;
 	    SetRect16( r, 0, 0, dc->w.devCaps->horzRes,
 		                     dc->w.devCaps->vertRes );
-	    TRACE(psdrv, "NEXTBAND returning %d,%d - %d,%d\n", r->left,
+	    TRACE("NEXTBAND returning %d,%d - %d,%d\n", r->left,
 		  r->top, r->right, r->bottom );
 	    return 1;
 	}
         SetRect16( r, 0, 0, 0, 0 );
-	TRACE(psdrv, "NEXTBAND rect to 0,0 - 0,0\n" );
+	TRACE("NEXTBAND rect to 0,0 - 0,0\n" );
 	physDev->job.banding = FALSE;
     }	/* Fall through */
 
     case NEWFRAME:
-        TRACE(psdrv, "NEWFRAME\n");
+        TRACE("NEWFRAME\n");
 
         if(!physDev->job.hJob) {
-	    FIXME(psdrv, "hJob == 0. Now what?\n");
+	    FIXME("hJob == 0. Now what?\n");
 	    return 0;
 	}
 
@@ -49,11 +49,11 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
           
     case QUERYESCSUPPORT:
         if(cbInput != 2) {
-	    WARN(psdrv, "cbInput != 2 (=%d) for QUERYESCSUPPORT\n", cbInput);
+	    WARN("cbInput != 2 (=%d) for QUERYESCSUPPORT\n", cbInput);
 	    return 0;
 	} else {
 	    UINT16 num = *(UINT16 *)PTR_SEG_TO_LIN(lpInData);
-	    TRACE(psdrv, "QUERYESCSUPPORT for %d\n", num);	   
+	    TRACE("QUERYESCSUPPORT for %d\n", num);	   
 
 	    switch(num) {
 	    case NEWFRAME:
@@ -81,23 +81,23 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
 	}
 
     case SETABORTPROC:
-        FIXME(psdrv, "SETABORTPROC: Ignoring\n");
+        FIXME("SETABORTPROC: Ignoring\n");
 
 /*	dc->w.lpfnPrint = (FARPROC16)lpInData;
  */
 	return 1;
 
     case STARTDOC:
-        TRACE(psdrv, "STARTDOC\n");
+        TRACE("STARTDOC\n");
         if(physDev->job.hJob) {
-	    FIXME(psdrv, "hJob != 0. Now what?\n");
+	    FIXME("hJob != 0. Now what?\n");
 	    return 0;
 	}
 
 	physDev->job.hJob = OpenJob16(physDev->job.output,
 				    PTR_SEG_TO_LIN(lpInData), dc->hSelf);
 	if(!physDev->job.hJob) {
-	    WARN(psdrv, "OpenJob failed\n");
+	    WARN("OpenJob failed\n");
 	    return 0;
 	}
 	physDev->job.banding = FALSE;
@@ -111,9 +111,9 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
 	return 1;
 
     case ENDDOC:
-        TRACE(psdrv, "ENDDOC\n");
+        TRACE("ENDDOC\n");
         if(!physDev->job.hJob) {
-	    FIXME(psdrv, "hJob == 0. Now what?\n");
+	    FIXME("hJob == 0. Now what?\n");
 	    return 0;
 	}
 
@@ -123,7 +123,7 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
 	    return 0;
 
         if( CloseJob16( physDev->job.hJob ) == SP_ERROR ) {
-	    WARN(psdrv, "CloseJob error\n");
+	    WARN("CloseJob error\n");
 	    return 0;
 	}
 	physDev->job.hJob = 0;
@@ -135,7 +135,7 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
 	    
 	    p->x = dc->w.devCaps->horzRes;
 	    p->y = dc->w.devCaps->vertRes;
-	    TRACE(psdrv, "GETPHYSPAGESIZE: returning %dx%d\n", p->x, p->y);
+	    TRACE("GETPHYSPAGESIZE: returning %dx%d\n", p->x, p->y);
 	    return 1;
 	}
 
@@ -144,7 +144,7 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
 	    POINT16 *p = (POINT16 *)PTR_SEG_TO_LIN(lpOutData);
         
 	    p->x = p->y = 0;
-	    TRACE(psdrv, "GETPRINTINGOFFSET: returning %dx%d\n", p->x, p->y);
+	    TRACE("GETPRINTINGOFFSET: returning %dx%d\n", p->x, p->y);
 	    return 1;
 	}
       
@@ -153,7 +153,7 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
 	    POINT16 *p = (POINT16 *)PTR_SEG_TO_LIN(lpOutData);
         
 	    p->x = p->y = 0;
-	    TRACE(psdrv, "GETSCALINGFACTOR: returning %dx%d\n", p->x, p->y);
+	    TRACE("GETSCALINGFACTOR: returning %dx%d\n", p->x, p->y);
 	    return 1;
 	}
 
@@ -162,10 +162,10 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
 	    INT16 *NumCopies = (INT16 *)PTR_SEG_TO_LIN(lpInData);
 	    INT16 *ActualCopies = (INT16 *)PTR_SEG_TO_LIN(lpOutData);
 	    if(cbInput != 2) {
-	        WARN(psdrv, "cbInput != 2 (=%d) for SETCOPYCOUNT\n", cbInput);
+	        WARN("cbInput != 2 (=%d) for SETCOPYCOUNT\n", cbInput);
 		return 0;
 	    }
-	    TRACE(psdrv, "SETCOPYCOUNT %d\n", *NumCopies);
+	    TRACE("SETCOPYCOUNT %d\n", *NumCopies);
 	    *ActualCopies = 1;
 	    return 1;
 	}
@@ -182,10 +182,10 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
         {
 	    INT16 newCap = *(INT16 *)PTR_SEG_TO_LIN(lpInData);
 	    if(cbInput != 2) {
-	        WARN(psdrv, "cbInput != 2 (=%d) for SETLINECAP\n", cbInput);
+	        WARN("cbInput != 2 (=%d) for SETLINECAP\n", cbInput);
 		return 0;
 	    }	        	
-	    TRACE(psdrv, "SETLINECAP %d\n", newCap);
+	    TRACE("SETLINECAP %d\n", newCap);
 	    return 0;
 	}
 	    
@@ -193,10 +193,10 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
         {
 	    INT16 newJoin = *(INT16 *)PTR_SEG_TO_LIN(lpInData);
 	    if(cbInput != 2) {
-	        WARN(psdrv, "cbInput != 2 (=%d) for SETLINEJOIN\n", cbInput);
+	        WARN("cbInput != 2 (=%d) for SETLINEJOIN\n", cbInput);
 		return 0;
 	    }	        
-	    TRACE(psdrv, "SETLINEJOIN %d\n", newJoin);
+	    TRACE("SETLINEJOIN %d\n", newJoin);
 	    return 0;
 	}
 
@@ -204,10 +204,10 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
         {
 	    INT16 newLimit = *(INT16 *)PTR_SEG_TO_LIN(lpInData);
 	    if(cbInput != 2) {
-	        WARN(psdrv, "cbInput != 2 (=%d) for SETMITERLIMIT\n", cbInput);
+	        WARN("cbInput != 2 (=%d) for SETMITERLIMIT\n", cbInput);
 		return 0;
 	    }	        
-	    TRACE(psdrv, "SETMITERLIMIT %d\n", newLimit);
+	    TRACE("SETMITERLIMIT %d\n", newLimit);
 	    return 0;
 	}
 
@@ -234,11 +234,11 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
         {
 	    UINT16 cap = *(UINT16 *)PTR_SEG_TO_LIN(lpInData);
 	    if(cbInput != 2) {
-	        WARN(psdrv, "cbInput != 2 (=%d) for EXT_DEVICE_CAPS\n",
+	        WARN("cbInput != 2 (=%d) for EXT_DEVICE_CAPS\n",
 		     cbInput);
 		return 0;
 	    }	        
-	    TRACE(psdrv, "EXT_DEVICE_CAPS %d\n", cap);
+	    TRACE("EXT_DEVICE_CAPS %d\n", cap);
 	    return 0;
 	}
 
@@ -246,16 +246,16 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
         {
 	    RECT16 *r = (RECT16 *)PTR_SEG_TO_LIN(lpInData);
 	    if(cbInput != 8) {
-	        WARN(psdrv, "cbInput != 8 (=%d) for SET_BOUNDS\n", cbInput);
+	        WARN("cbInput != 8 (=%d) for SET_BOUNDS\n", cbInput);
 		return 0;
 	    }	        
-	    TRACE(psdrv, "SET_BOUNDS (%d,%d) - (%d,%d)\n", r->left, r->top,
+	    TRACE("SET_BOUNDS (%d,%d) - (%d,%d)\n", r->left, r->top,
 		  r->right, r->bottom);
 	    return 0;
 	}
 
     default:
-        FIXME(psdrv, "Unimplemented code 0x%x\n", nEscape);
+        FIXME("Unimplemented code 0x%x\n", nEscape);
 	return 0;
     }
 }

graphics/psdrv/font.c

@@ -7,7 +7,7 @@
 #include <string.h>
 #include "winspool.h"
 #include "psdrv.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(psdrv)
 
@@ -29,7 +29,7 @@ HFONT16 PSDRV_FONT_SelectObject( DC * dc, HFONT16 hfont,
     char FaceName[LF_FACESIZE];
 
 
-    TRACE(psdrv, "FaceName = '%s' Height = %d Italic = %d Weight = %d\n",
+    TRACE("FaceName = '%s' Height = %d Italic = %d Weight = %d\n",
 	  lf->lfFaceName, lf->lfHeight, lf->lfItalic, lf->lfWeight);
 
     dc->w.hFont = hfont;
@@ -71,7 +71,7 @@ HFONT16 PSDRV_FONT_SelectObject( DC * dc, HFONT16 hfont,
 	}
     }
 
-    TRACE(psdrv, "Trying to find facename '%s'\n", FaceName);
+    TRACE("Trying to find facename '%s'\n", FaceName);
 
     for(family = physDev->pi->Fonts; family; family = family->next) {
         if(!strcmp(FaceName, family->FamilyName))
@@ -80,7 +80,7 @@ HFONT16 PSDRV_FONT_SelectObject( DC * dc, HFONT16 hfont,
     if(!family)
         family = physDev->pi->Fonts;
 
-    TRACE(psdrv, "Got family '%s'\n", family->FamilyName);
+    TRACE("Got family '%s'\n", family->FamilyName);
 
     for(afmle = family->afmlist; afmle; afmle = afmle->next) {
         if( (bd == (afmle->afm->Weight == FW_BOLD)) && 
@@ -97,7 +97,7 @@ HFONT16 PSDRV_FONT_SelectObject( DC * dc, HFONT16 hfont,
     if(physDev->font.tm.tmHeight < 0) {
         physDev->font.tm.tmHeight *= - (afm->FullAscender - afm->Descender) /
 				       (afm->Ascender - afm->Descender);
-	TRACE(psdrv, "Fixed -ve height to %ld\n", physDev->font.tm.tmHeight);
+	TRACE("Fixed -ve height to %ld\n", physDev->font.tm.tmHeight);
     }
     physDev->font.size = physDev->font.tm.tmHeight * 1000.0 /
 				(afm->FullAscender - afm->Descender);
@@ -131,10 +131,10 @@ HFONT16 PSDRV_FONT_SelectObject( DC * dc, HFONT16 hfont,
 
     physDev->font.set = FALSE;
 
-    TRACE(psdrv, "Selected PS font '%s' size %d weight %ld.\n", 
+    TRACE("Selected PS font '%s' size %d weight %ld.\n", 
 	  physDev->font.afm->FontName, physDev->font.size,
 	  physDev->font.tm.tmWeight );
-    TRACE(psdrv, "H = %ld As = %ld Des = %ld IL = %ld EL = %ld\n",
+    TRACE("H = %ld As = %ld Des = %ld IL = %ld EL = %ld\n",
 	  physDev->font.tm.tmHeight, physDev->font.tm.tmAscent,
 	  physDev->font.tm.tmDescent, physDev->font.tm.tmInternalLeading,
 	  physDev->font.tm.tmExternalLeading);
@@ -172,7 +172,7 @@ BOOL PSDRV_GetTextExtentPoint( DC *dc, LPCSTR str, INT count,
 /*	TRACE(psdrv, "Width after %dth char '%c' = %f\n", i, str[i], width);*/
     }
     width *= physDev->font.scale;
-    TRACE(psdrv, "Width after scale (%f) is %f\n", physDev->font.scale, width);
+    TRACE("Width after scale (%f) is %f\n", physDev->font.scale, width);
     size->cx = XDSTOLS(dc, width);
 
     return TRUE;
@@ -188,7 +188,7 @@ BOOL PSDRV_GetCharWidth( DC *dc, UINT firstChar, UINT lastChar,
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
     UINT i;
 
-    TRACE(psdrv, "first = %d last = %d\n", firstChar, lastChar);
+    TRACE("first = %d last = %d\n", firstChar, lastChar);
 
     if(lastChar > 0xff) return FALSE;
     for( i = firstChar; i <= lastChar; i++ )
@@ -278,7 +278,7 @@ BOOL PSDRV_EnumDeviceFonts( DC* dc, LPLOGFONT16 plf,
     PSDRV_PDEVICE	*physDev = (PSDRV_PDEVICE *)dc->physDev;
 
     if( plf->lfFaceName[0] ) {
-        TRACE(psdrv, "lfFaceName = '%s'\n", plf->lfFaceName);
+        TRACE("lfFaceName = '%s'\n", plf->lfFaceName);
         for(family = physDev->pi->Fonts; family; family = family->next) {
             if(!strncmp(plf->lfFaceName, family->FamilyName, 
 			strlen(family->FamilyName)))
@@ -286,7 +286,7 @@ BOOL PSDRV_EnumDeviceFonts( DC* dc, LPLOGFONT16 plf,
 	}
 	if(family) {
 	    for(afmle = family->afmlist; afmle; afmle = afmle->next) {
-	        TRACE(psdrv, "Got '%s'\n", afmle->afm->FontName);
+	        TRACE("Got '%s'\n", afmle->afm->FontName);
 		if( (b = (*proc)( (LPENUMLOGFONT16)&lf, &tm, 
 			PSDRV_GetFontMetric( dc, afmle->afm, &tm, &lf, 200 ),
 				  lp )) )
@@ -296,10 +296,10 @@ BOOL PSDRV_EnumDeviceFonts( DC* dc, LPLOGFONT16 plf,
 	}
     } else {
 
-        TRACE(psdrv, "lfFaceName = NULL\n");
+        TRACE("lfFaceName = NULL\n");
         for(family = physDev->pi->Fonts; family; family = family->next) {
 	    afmle = family->afmlist;
-	    TRACE(psdrv, "Got '%s'\n", afmle->afm->FontName);
+	    TRACE("Got '%s'\n", afmle->afm->FontName);
 	    if( (b = (*proc)( (LPENUMLOGFONT16)&lf, &tm, 
 		   PSDRV_GetFontMetric( dc, afmle->afm, &tm, &lf, 200 ), 
 			      lp )) )

graphics/psdrv/graphics.c

@@ -14,7 +14,7 @@
  #define PI M_PI
 #endif
 #include "psdrv.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "winspool.h"
 
 DEFAULT_DEBUG_CHANNEL(psdrv)
@@ -24,7 +24,7 @@ DEFAULT_DEBUG_CHANNEL(psdrv)
  */
 BOOL PSDRV_MoveToEx(DC *dc, INT x, INT y, LPPOINT pt)
 {
-    TRACE(psdrv, "%d %d\n", x, y);
+    TRACE("%d %d\n", x, y);
     if (pt)
     {
 	pt->x = dc->w.CursPosX;
@@ -42,7 +42,7 @@ BOOL PSDRV_MoveToEx(DC *dc, INT x, INT y, LPPOINT pt)
  */
 BOOL PSDRV_LineTo(DC *dc, INT x, INT y)
 {
-    TRACE(psdrv, "%d %d\n", x, y);
+    TRACE("%d %d\n", x, y);
 
     PSDRV_SetPen(dc);
     PSDRV_WriteMoveTo(dc, XLPTODP(dc, dc->w.CursPosX),
@@ -66,7 +66,7 @@ BOOL PSDRV_Rectangle( DC *dc, INT left, INT top, INT right,
     INT height = YLSTODS(dc, bottom - top);
 
 
-    TRACE(psdrv, "%d %d - %d %d\n", left, top, right, bottom);
+    TRACE("%d %d - %d %d\n", left, top, right, bottom);
 
     PSDRV_WriteRectangle(dc, XLPTODP(dc, left), YLPTODP(dc, top),
 			     width, height);
@@ -202,7 +202,7 @@ BOOL PSDRV_Ellipse( DC *dc, INT left, INT top, INT right, INT bottom)
 {
     INT x, y, w, h;
 
-    TRACE(psdrv, "%d %d - %d %d\n", left, top, right, bottom);
+    TRACE("%d %d - %d %d\n", left, top, right, bottom);
 
     x = XLPTODP(dc, (left + right)/2);
     y = YLPTODP(dc, (top + bottom)/2);
@@ -227,7 +227,7 @@ BOOL PSDRV_PolyPolyline( DC *dc, const POINT* pts, const DWORD* counts,
 {
     DWORD polyline, line;
     const POINT* pt;
-    TRACE(psdrv, "\n");
+    TRACE("\n");
 
     pt = pts;
     for(polyline = 0; polyline < polylines; polyline++) {
@@ -261,7 +261,7 @@ BOOL PSDRV_PolyPolygon( DC *dc, const POINT* pts, const INT* counts,
 {
     DWORD polygon, line;
     const POINT* pt;
-    TRACE(psdrv, "\n");
+    TRACE("\n");
 
     pt = pts;
     for(polygon = 0; polygon < polygons; polygon++) {

graphics/psdrv/init.c

@@ -8,7 +8,7 @@
 
 #include "gdi.h"
 #include "psdrv.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "heap.h"
 #include "winreg.h"
 #include "winspool.h"
@@ -202,7 +202,7 @@ static LOGFONTA DefaultLogFont = {
  */
 BOOL PSDRV_Init(void)
 {
-    TRACE(psdrv, "\n");
+    TRACE("\n");
     PSDRV_Heap = HeapCreate(0, 0x10000, 0);
     PSDRV_GetFontMetrics();
     PSDRV_DefaultFont = CreateFontIndirectA(&DefaultLogFont);
@@ -229,12 +229,12 @@ static BOOL PSDRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device,
     }
     pi = PSDRV_FindPrinterInfo(device);
         
-    TRACE(psdrv, "(%s %s %s %p)\n", driver, device, output, initData);
+    TRACE("(%s %s %s %p)\n", driver, device, output, initData);
 
     if(!pi) return FALSE;
 
     if(!pi->Fonts) {
-        MSG("To use WINEPS you need to install some AFM files.\n");
+        MESSAGE("To use WINEPS you need to install some AFM files.\n");
 	return FALSE;
     }
 
@@ -312,7 +312,7 @@ static BOOL PSDRV_DeleteDC( DC *dc )
 {
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
     
-    TRACE(psdrv, "\n");
+    TRACE("\n");
 
     HeapFree( PSDRV_Heap, 0, physDev->Devmode );
     HeapFree( PSDRV_Heap, 0, physDev->job.output );
@@ -337,7 +337,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCSTR name)
     FONTNAME *font;
     AFM *afm;
 
-    TRACE(psdrv, "'%s'\n", name);
+    TRACE("'%s'\n", name);
     
     for( ; pi; last = &pi->next, pi = pi->next) {
         if(!strcmp(pi->FriendlyName, name))
@@ -368,7 +368,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCSTR name)
         HeapFree(PSDRV_Heap, 0, pi->Devmode);
         HeapFree(PSDRV_Heap, 0, pi);
 	*last = NULL;
-	MSG("Couldn't find PPD file '%s', expect a crash now!\n",
+	MESSAGE("Couldn't find PPD file '%s', expect a crash now!\n",
 	    pi->Devmode->dmDrvPrivate.ppdFileName);
 	return NULL;
     }
@@ -379,7 +379,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCSTR name)
     for(font = pi->ppd->InstalledFonts; font; font = font->next) {
         afm = PSDRV_FindAFMinList(PSDRV_AFMFontList, font->Name);
 	if(!afm) {
-	    MSG(
+	    MESSAGE(
 	 "Couldn't find AFM file for installed printer font '%s' - ignoring\n",
 	 font->Name);
 	} else {

graphics/psdrv/objects.c

@@ -10,7 +10,7 @@
 #include "pen.h"
 #include "brush.h"
 #include "bitmap.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(psdrv)
 
@@ -20,7 +20,7 @@ DEFAULT_DEBUG_CHANNEL(psdrv)
 static HBITMAP16 PSDRV_BITMAP_SelectObject( DC * dc, HBITMAP16 hbitmap,
                                             BITMAPOBJ * bmp )
 {
-    FIXME(psdrv, "stub\n");
+    FIXME("stub\n");
     return 0;
 }
 
@@ -34,7 +34,7 @@ HGDIOBJ PSDRV_SelectObject( DC *dc, HGDIOBJ handle )
     HGDIOBJ ret = 0;
 
     if (!ptr) return 0;
-    TRACE(psdrv, "hdc=%04x %04x\n", dc->hSelf, handle );
+    TRACE("hdc=%04x %04x\n", dc->hSelf, handle );
     
     switch(ptr->wMagic)
     {
@@ -54,7 +54,7 @@ HGDIOBJ PSDRV_SelectObject( DC *dc, HGDIOBJ handle )
 	  ret = (HGDIOBJ16)SelectClipRgn16( dc->hSelf, handle );
 	  break;
       default:
-	  ERR(psdrv, "Unknown object magic %04x\n", ptr->wMagic);
+	  ERR("Unknown object magic %04x\n", ptr->wMagic);
 	  break;
     }
     GDI_HEAP_UNLOCK( handle );

graphics/psdrv/pen.c

@@ -7,7 +7,7 @@
 
 #include "pen.h"
 #include "psdrv.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(psdrv)
 
@@ -25,7 +25,7 @@ extern HPEN PSDRV_PEN_SelectObject( DC * dc, HPEN hpen, PENOBJ * pen )
     HPEN prevpen = dc->w.hPen;
     PSDRV_PDEVICE *physDev = (PSDRV_PDEVICE *)dc->physDev;
 
-    TRACE(psdrv, "hpen = %08x colour = %08lx\n", hpen, pen->logpen.lopnColor);
+    TRACE("hpen = %08x colour = %08lx\n", hpen, pen->logpen.lopnColor);
     dc->w.hPen = hpen;
 
     physDev->pen.width = XLSTODS(dc, pen->logpen.lopnWidth.x);

graphics/psdrv/ppd.c

@@ -9,7 +9,7 @@
 #include <ctype.h>
 #include "winnt.h" /* HEAP_ZERO_MEMORY */
 #include "heap.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "psdrv.h"
 #include "winspool.h"
 
@@ -88,7 +88,7 @@ static char *PSDRV_PPDDecodeHex(char *str)
 	    else {
 	        int i;
 	        if(!isxdigit(*in) || !isxdigit(*(in + 1))) {
-		    ERR(psdrv, "Invalid hex char in hex string\n");
+		    ERR("Invalid hex char in hex string\n");
 		    HeapFree(PSDRV_Heap, 0, buf);
 		    return NULL;
 		}
@@ -224,7 +224,7 @@ static BOOL PSDRV_PPDGetStringValue(char *str, PPDTuple *tuple)
  */
 static BOOL PSDRV_PPDGetSymbolValue(char *pos, PPDTuple *tuple)
 {
-    FIXME(psdrv, "Stub\n");
+    FIXME("Stub\n");
     return FALSE;
 }
 
@@ -251,7 +251,7 @@ static BOOL PSDRV_PPDGetNextTuple(FILE *fp, PPDTuple *tuple)
     } while(1);
 
     if(line[strlen(line)-1] != '\n') {
-        ERR(psdrv, "Line too long.\n");
+        ERR("Line too long.\n");
 	return FALSE;
     }
 
@@ -276,7 +276,7 @@ static BOOL PSDRV_PPDGetNextTuple(FILE *fp, PPDTuple *tuple)
 	    opt++;
         cp = strpbrk(opt, ":/");
 	if(!cp) {
-	    ERR(psdrv, "Error in line '%s'?\n", line);
+	    ERR("Error in line '%s'?\n", line);
 	    return FALSE;
 	}
 	tuple->option = HeapAlloc( PSDRV_Heap, 0, cp - opt + 1 );
@@ -288,7 +288,7 @@ static BOOL PSDRV_PPDGetNextTuple(FILE *fp, PPDTuple *tuple)
 	    trans = cp + 1;
 	    cp = strchr(trans, ':');
 	    if(!cp) {
-	        ERR(psdrv, "Error in line '%s'?\n", line);
+	        ERR("Error in line '%s'?\n", line);
 		return FALSE;
 	    }
 	    buf = HeapAlloc( PSDRV_Heap, 0, cp - trans + 1 );
@@ -399,16 +399,16 @@ PPD *PSDRV_ParsePPD(char *fname)
     PPD *ppd;
     PPDTuple tuple;
 
-    TRACE(psdrv, "%s\n", fname);
+    TRACE("%s\n", fname);
 
     if((fp = fopen(fname, "r")) == NULL) {
-        WARN(psdrv, "Couldn't open ppd file '%s'\n", fname);
+        WARN("Couldn't open ppd file '%s'\n", fname);
         return NULL;
     }
 
     ppd = HeapAlloc( PSDRV_Heap, HEAP_ZERO_MEMORY, sizeof(*ppd));
     if(!ppd) {
-        ERR(psdrv, "Unable to allocate memory for ppd\n");
+        ERR("Unable to allocate memory for ppd\n");
 	fclose(fp);
 	return NULL;
     }
@@ -419,24 +419,24 @@ PPD *PSDRV_ParsePPD(char *fname)
 	if(!strcmp("*NickName", tuple.key)) {
 	    ppd->NickName = tuple.value;
 	    tuple.value = NULL;
-	    TRACE(psdrv, "NickName = '%s'\n", ppd->NickName);
+	    TRACE("NickName = '%s'\n", ppd->NickName);
 	}
 
 	else if(!strcmp("*LanguageLevel", tuple.key)) {
 	    sscanf(tuple.value, "%d", &(ppd->LanguageLevel));
-	    TRACE(psdrv, "LanguageLevel = %d\n", ppd->LanguageLevel);
+	    TRACE("LanguageLevel = %d\n", ppd->LanguageLevel);
 	}
 
 	else if(!strcmp("*ColorDevice", tuple.key)) {
 	    if(!strcasecmp(tuple.value, "true"))
 	        ppd->ColorDevice = TRUE;
-	    TRACE(psdrv, "ColorDevice = %d\n", (int)ppd->ColorDevice);
+	    TRACE("ColorDevice = %d\n", (int)ppd->ColorDevice);
 	}
 
 	else if((!strcmp("*DefaultResolution", tuple.key)) ||
 		(!strcmp("*DefaultJCLResolution", tuple.key))) {
 	    sscanf(tuple.value, "%d", &(ppd->DefaultResolution));
-	    TRACE(psdrv, "DefaultResolution = %d\n", ppd->DefaultResolution);
+	    TRACE("DefaultResolution = %d\n", ppd->DefaultResolution);
 	}
 
 	else if(!strcmp("*Font", tuple.key)) {
@@ -494,7 +494,7 @@ PPD *PSDRV_ParsePPD(char *fname)
 		    }
 		}
 		if(!page->WinPage)
-		    FIXME(psdrv, "Can't find Windows page type for '%s'\n",
+		    FIXME("Can't find Windows page type for '%s'\n",
 			  page->Name);
 	    }
 	    if(!page->FullName) {
@@ -559,7 +559,7 @@ PPD *PSDRV_ParsePPD(char *fname)
 
 	    /* anything else, namely 'any', leaves value at 0 */
 
-	    TRACE(psdrv, "LandscapeOrientation = %d\n", 
+	    TRACE("LandscapeOrientation = %d\n", 
 		  ppd->LandscapeOrientation);
 	}
 	
@@ -610,7 +610,7 @@ PPD *PSDRV_ParsePPD(char *fname)
 		}
 	    }
 	    if(!slot->WinBin)
-	        FIXME(psdrv, "Can't find Windows bin type for '%s'\n",
+	        FIXME("Can't find Windows bin type for '%s'\n",
 			  slot->Name);
 
 	}   
@@ -633,35 +633,35 @@ PPD *PSDRV_ParsePPD(char *fname)
 	OPTIONENTRY *optionEntry;
 
 	for(fn = ppd->InstalledFonts; fn; fn = fn->next)
-	    TRACE(psdrv, "'%s'\n", fn->Name);
+	    TRACE("'%s'\n", fn->Name);
 	
 	for(page = ppd->PageSizes; page; page = page->next) {
-	    TRACE(psdrv, "'%s' aka '%s' (%d) invoked by '%s'\n", page->Name,
+	    TRACE("'%s' aka '%s' (%d) invoked by '%s'\n", page->Name,
 	      page->FullName, page->WinPage, page->InvocationString);
 	    if(page->ImageableArea)
-	        TRACE(psdrv, "Area = %.2f,%.2f - %.2f, %.2f\n", 
+	        TRACE("Area = %.2f,%.2f - %.2f, %.2f\n", 
 		      page->ImageableArea->llx, page->ImageableArea->lly,
 		      page->ImageableArea->urx, page->ImageableArea->ury);
 	    if(page->PaperDimension)
-	        TRACE(psdrv, "Dimension = %.2f x %.2f\n", 
+	        TRACE("Dimension = %.2f x %.2f\n", 
 		      page->PaperDimension->x, page->PaperDimension->y);
 	}
 
 	for(con = ppd->Constraints; con; con = con->next)
-	    TRACE(psdrv, "CONSTRAINTS@ %s %s %s %s\n", con->Feature1,
+	    TRACE("CONSTRAINTS@ %s %s %s %s\n", con->Feature1,
 		  con->Value1, con->Feature2, con->Value2);
 
 	for(option = ppd->InstalledOptions; option; option = option->next) {
-	    TRACE(psdrv, "OPTION: %s %s %s\n", option->OptionName,
+	    TRACE("OPTION: %s %s %s\n", option->OptionName,
 		  option->FullName, option->DefaultOption);
 	    for(optionEntry = option->Options; optionEntry;
 		optionEntry = optionEntry->next)
-	        TRACE(psdrv, "\tOPTIONENTRY: %s %s %s\n", optionEntry->Name,
+	        TRACE("\tOPTIONENTRY: %s %s %s\n", optionEntry->Name,
 		      optionEntry->FullName, optionEntry->InvocationString);
 	}
 
 	for(slot = ppd->InputSlots; slot; slot = slot->next)
-	    TRACE(psdrv, "INPUTSLOTS '%s' Name '%s' (%d) Invocation '%s'\n",
+	    TRACE("INPUTSLOTS '%s' Name '%s' (%d) Invocation '%s'\n",
 		  slot->Name, slot->FullName, slot->WinBin, 
 		  slot->InvocationString);
     }

graphics/psdrv/ps.c

@@ -9,7 +9,7 @@
 #include <string.h>
 #include "psdrv.h"
 #include "winspool.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(psdrv)
 
@@ -280,7 +280,7 @@ INT PSDRV_WriteHeader( DC *dc, char *title, int len )
 
     titlebuf = (char *)HeapAlloc( PSDRV_Heap, 0, len+1 );
     if(!titlebuf) {
-        WARN(psdrv, "HeapAlloc failed\n");
+        WARN("HeapAlloc failed\n");
         return 0;
     }
     memcpy(titlebuf, title, len);
@@ -288,7 +288,7 @@ INT PSDRV_WriteHeader( DC *dc, char *title, int len )
 
     buf = (char *)HeapAlloc( PSDRV_Heap, 0, sizeof(psheader) + len + 30);
     if(!buf) {
-        WARN(psdrv, "HeapAlloc failed\n");
+        WARN("HeapAlloc failed\n");
 	HeapFree( PSDRV_Heap, 0, titlebuf );
         return 0;
     }
@@ -311,7 +311,7 @@ INT PSDRV_WriteHeader( DC *dc, char *title, int len )
 
     if( WriteSpool16( physDev->job.hJob, buf, strlen(buf) ) != 
 	                                             strlen(buf) ) {
-        WARN(psdrv, "WriteSpool error\n");
+        WARN("WriteSpool error\n");
 	HeapFree( PSDRV_Heap, 0, titlebuf );
 	HeapFree( PSDRV_Heap, 0, buf );
 	return 0;
@@ -378,7 +378,7 @@ INT PSDRV_WriteFooter( DC *dc )
 
     buf = (char *)HeapAlloc( PSDRV_Heap, 0, sizeof(psfooter) + 100 );
     if(!buf) {
-        WARN(psdrv, "HeapAlloc failed\n");
+        WARN("HeapAlloc failed\n");
         return 0;
     }
 
@@ -386,7 +386,7 @@ INT PSDRV_WriteFooter( DC *dc )
 
     if( WriteSpool16( physDev->job.hJob, buf, strlen(buf) ) != 
 	                                             strlen(buf) ) {
-        WARN(psdrv, "WriteSpool error\n");
+        WARN("WriteSpool error\n");
 	HeapFree( PSDRV_Heap, 0, buf );
 	return 0;
     }
@@ -402,7 +402,7 @@ INT PSDRV_WriteEndPage( DC *dc )
 
     if( WriteSpool16( physDev->job.hJob, psendpage, sizeof(psendpage)-1 ) != 
 	                                             sizeof(psendpage)-1 ) {
-        WARN(psdrv, "WriteSpool error\n");
+        WARN("WriteSpool error\n");
 	return 0;
     }
     return 1;
@@ -422,7 +422,7 @@ INT PSDRV_WriteNewPage( DC *dc )
 
     buf = (char *)HeapAlloc( PSDRV_Heap, 0, sizeof(psnewpage) + 200 );
     if(!buf) {
-        WARN(psdrv, "HeapAlloc failed\n");
+        WARN("HeapAlloc failed\n");
         return 0;
     }
 
@@ -447,7 +447,7 @@ INT PSDRV_WriteNewPage( DC *dc )
 
     if( WriteSpool16( physDev->job.hJob, buf, strlen(buf) ) != 
 	                                             strlen(buf) ) {
-        WARN(psdrv, "WriteSpool error\n");
+        WARN("WriteSpool error\n");
 	HeapFree( PSDRV_Heap, 0, buf );
 	return 0;
     }
@@ -520,7 +520,7 @@ BOOL PSDRV_WriteSetFont(DC *dc, BOOL UseANSI)
 	     sizeof(pssetfont) + strlen(physDev->font.afm->FontName) + 40);
 
     if(!buf) {
-        WARN(psdrv, "HeapAlloc failed\n");
+        WARN("HeapAlloc failed\n");
         return FALSE;
     }
 
@@ -528,7 +528,7 @@ BOOL PSDRV_WriteSetFont(DC *dc, BOOL UseANSI)
 	      strlen(physDev->font.afm->FontName) + sizeof(encodingext));
 
     if(!newbuf) {
-        WARN(psdrv, "HeapAlloc failed\n");
+        WARN("HeapAlloc failed\n");
 	HeapFree(PSDRV_Heap, 0, buf);
         return FALSE;
     }
@@ -567,7 +567,7 @@ BOOL PSDRV_WriteSetColor(DC *dc, PSCOLOR *color)
 	return PSDRV_WriteSpool(dc, buf, strlen(buf));
 	
     default:
-        ERR(psdrv, "Unkonwn colour type %d\n", color->type);
+        ERR("Unkonwn colour type %d\n", color->type);
 	break;
     }
 
@@ -600,7 +600,7 @@ BOOL PSDRV_WriteReencodeFont(DC *dc)
 			     + sizeof(encodingext));
 
     if(!buf) {
-        WARN(psdrv, "HeapAlloc failed\n");
+        WARN("HeapAlloc failed\n");
         return FALSE;
     }
 
@@ -608,7 +608,7 @@ BOOL PSDRV_WriteReencodeFont(DC *dc)
 	      strlen(physDev->font.afm->FontName) + sizeof(encodingext));
 
     if(!newbuf) {
-        WARN(psdrv, "HeapAlloc failed\n");
+        WARN("HeapAlloc failed\n");
 	HeapFree(PSDRV_Heap, 0, buf);
         return FALSE;
     }

graphics/psdrv/text.c

@@ -6,7 +6,7 @@
  */
 #include <string.h>
 #include "psdrv.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "winspool.h"
 
 DEFAULT_DEBUG_CHANNEL(psdrv)
@@ -22,12 +22,12 @@ BOOL PSDRV_ExtTextOut( DC *dc, INT x, INT y, UINT flags,
     char *strbuf;
     SIZE sz;
 
-    TRACE(psdrv, "(x=%d, y=%d, flags=0x%08x, str='%.*s', count=%d)\n", x, y,
+    TRACE("(x=%d, y=%d, flags=0x%08x, str='%.*s', count=%d)\n", x, y,
 	  flags, (int)count, str, count);
 
     strbuf = (char *)HeapAlloc( PSDRV_Heap, 0, count + 1);
     if(!strbuf) {
-        WARN(psdrv, "HeapAlloc failed\n");
+        WARN("HeapAlloc failed\n");
         return FALSE;
     }
 
@@ -94,7 +94,7 @@ BOOL PSDRV_ExtTextOut( DC *dc, INT x, INT y, UINT flags,
         SIZE size;
         INT escapement =  physDev->font.escapement;
 
-        TRACE(psdrv, "Position = %f Thickness %f Escapement %d\n",
+        TRACE("Position = %f Thickness %f Escapement %d\n",
               pos, thick, escapement);
 
         /* Get the width of the text */

graphics/ttydrv/init.c

@@ -8,7 +8,7 @@
 #include "bitmap.h"
 #include "color.h"
 #include "dc.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "heap.h"
 #include "palette.h"
 #include "ttydrv.h"
@@ -181,7 +181,7 @@ void TTYDRV_GDI_Finalize(void)
 BOOL TTYDRV_DC_CreateDC(DC *dc, LPCSTR driver, LPCSTR device,
 			    LPCSTR output, const DEVMODEA *initData)
 {
-  FIXME(ttydrv, "(%p, %s, %s, %s, %p): semistub\n",
+  FIXME("(%p, %s, %s, %s, %p): semistub\n",
     dc, debugstr_a(driver), debugstr_a(device), 
     debugstr_a(output), initData
   );
@@ -190,7 +190,7 @@ BOOL TTYDRV_DC_CreateDC(DC *dc, LPCSTR driver, LPCSTR device,
 			   sizeof(TTYDRV_PDEVICE) );
   
   if(!dc->physDev) {
-    ERR(ttydrv, "Can't allocate physDev\n");
+    ERR("Can't allocate physDev\n");
     return FALSE;
   }
 
@@ -205,7 +205,7 @@ BOOL TTYDRV_DC_CreateDC(DC *dc, LPCSTR driver, LPCSTR device,
  */
 BOOL TTYDRV_DC_DeleteDC(DC *dc)
 {
-  FIXME(ttydrv, "(%p): semistub\n", dc);
+  FIXME("(%p): semistub\n", dc);
 
   HeapFree( GetProcessHeap(), 0, dc->physDev );
   dc->physDev = NULL;

graphics/vga.c

@@ -12,7 +12,7 @@
 #include "miscemu.h"
 #include "vga.h"
 #include "ddraw.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(ddraw)
 
@@ -30,11 +30,11 @@ int VGA_SetMode(unsigned Xres,unsigned Yres,unsigned Depth)
     if (!lpddraw) {
         DirectDrawCreate(NULL,&lpddraw,NULL);
         if (!lpddraw) {
-            ERR(ddraw,"DirectDraw is not available\n");
+            ERR("DirectDraw is not available\n");
             return 1;
         }
         if (IDirectDraw_SetDisplayMode(lpddraw,Xres,Yres,Depth)) {
-            ERR(ddraw,"DirectDraw does not support requested display mode\n");
+            ERR("DirectDraw does not support requested display mode\n");
             IDirectDraw_Release(lpddraw);
             lpddraw=NULL;
             return 1;
@@ -45,7 +45,7 @@ int VGA_SetMode(unsigned Xres,unsigned Yres,unsigned Depth)
 	sdesc.dwFlags = DDSD_CAPS;
 	sdesc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
         if (IDirectDraw_CreateSurface(lpddraw,&sdesc,&lpddsurf,NULL)||(!lpddsurf)) {
-            ERR(ddraw,"DirectDraw surface is not available\n");
+            ERR("DirectDraw surface is not available\n");
             IDirectDraw_Release(lpddraw);
             lpddraw=NULL;
             return 1;
@@ -109,7 +109,7 @@ LPSTR VGA_Lock(unsigned*Pitch,unsigned*Height,unsigned*Width,unsigned*Depth)
     if (!lpddraw) return NULL;
     if (!lpddsurf) return NULL;
     if (IDirectDrawSurface_Lock(lpddsurf,NULL,&sdesc,0,0)) {
-        ERR(ddraw,"could not lock surface!\n");
+        ERR("could not lock surface!\n");
         return NULL;
     }
     if (Pitch) *Pitch=sdesc.lPitch;

graphics/win16drv/brush.c

@@ -8,7 +8,7 @@
 #include "brush.h"
 #include "win16drv.h"
 #include "heap.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(win16drv)
 
@@ -27,7 +27,7 @@ HBRUSH WIN16DRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush,
 
     if ( physDev->BrushInfo )
     {
-        TRACE(win16drv, "UnRealizing BrushInfo\n");
+        TRACE("UnRealizing BrushInfo\n");
         nSize = PRTDRV_RealizeObject (physDev->segptrPDEVICE, -DRVOBJ_BRUSH,
 				      physDev->BrushInfo,
 				      physDev->BrushInfo, 0);

graphics/win16drv/font.c

@@ -11,7 +11,7 @@
 #include "module.h"
 #include "font.h"
 #include "heap.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(win16drv)
 
@@ -25,7 +25,7 @@ BOOL WIN16DRV_GetTextExtentPoint( DC *dc, LPCSTR str, INT count,
     WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dc->physDev;
     DWORD dwRet;
     
-    TRACE(win16drv, "%04x %s %d %p\n",
+    TRACE("%04x %s %d %p\n",
 		                dc->hSelf, str, count, size);
 
     dwRet = PRTDRV_ExtTextOut(physDev->segptrPDEVICE, 0, 0, 
@@ -35,7 +35,7 @@ BOOL WIN16DRV_GetTextExtentPoint( DC *dc, LPCSTR str, INT count,
 			      win16drv_SegPtr_TextXForm, NULL, NULL, 0);
     size->cx = XDSTOLS(dc,LOWORD(dwRet));
     size->cy = YDSTOLS(dc,HIWORD(dwRet));
-    TRACE(win16drv, "cx=0x%x, cy=0x%x\n",
+    TRACE("cx=0x%x, cy=0x%x\n",
 		size->cx, size->cy );
     return TRUE;
 }
@@ -48,11 +48,11 @@ BOOL WIN16DRV_GetTextMetrics( DC *dc, TEXTMETRICA *metrics )
 {
     WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dc->physDev;
 
-    TRACE(win16drv, "%04x \n", dc->hSelf);
+    TRACE("%04x \n", dc->hSelf);
 
     FONT_TextMetric16to32A( &physDev->tm, metrics );
 
-    TRACE(win16drv,
+    TRACE(
 	  "H %ld, A %ld, D %ld, Int %ld, Ext %ld, AW %ld, MW %ld, W %ld\n",
            metrics->tmHeight,
            metrics->tmAscent,
@@ -74,13 +74,13 @@ HFONT WIN16DRV_FONT_SelectObject( DC * dc, HFONT hfont, FONTOBJ * font)
 
     dc->w.hFont = hfont;
 
-    TRACE(win16drv, "WIN16DRV_FONT_SelectObject '%s' h=%d\n",
+    TRACE("WIN16DRV_FONT_SelectObject '%s' h=%d\n",
 		     font->logfont.lfFaceName, font->logfont.lfHeight);
 
 
     if( physDev->FontInfo )
     {
-        TRACE(win16drv, "UnRealizing FontInfo\n");
+        TRACE("UnRealizing FontInfo\n");
         nSize = PRTDRV_RealizeObject (physDev->segptrPDEVICE, -DRVOBJ_FONT,
 				      physDev->FontInfo,
 				      physDev->FontInfo, 0);
@@ -130,7 +130,7 @@ HFONT WIN16DRV_FONT_SelectObject( DC * dc, HFONT hfont, FONTOBJ * font)
     physDev->tm.tmCharSet          = fi->dfCharSet;
 #undef fi
 
-    TRACE(win16drv, "H %d, A %d, D %d, Int %d, Ext %d, AW %d, MW %d, W %d\n",
+    TRACE("H %d, A %d, D %d, Int %d, Ext %d, AW %d, MW %d, W %d\n",
            physDev->tm.tmHeight,
            physDev->tm.tmAscent,
            physDev->tm.tmDescent,
@@ -154,7 +154,7 @@ BOOL WIN16DRV_GetCharWidth( DC *dc, UINT firstChar, UINT lastChar,
 
     WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dc->physDev;
     
-    TRACE(win16drv, "%d - %d into %p\n",
+    TRACE("%d - %d into %p\n",
 		      firstChar, lastChar, buffer );
 
     wRet = PRTDRV_GetCharWidth( physDev->segptrPDEVICE, buffer, firstChar, 
@@ -163,7 +163,7 @@ BOOL WIN16DRV_GetCharWidth( DC *dc, UINT firstChar, UINT lastChar,
 				win16drv_SegPtr_TextXForm );
     if( TRACE_ON(win16drv) ){
         for(i = 0; i <= lastChar - firstChar; i++)
-	    TRACE(win16drv, "Char %x: width %d\n", i + firstChar,
+	    TRACE("Char %x: width %d\n", i + firstChar,
 			                 buffer[i]);
     }
 
@@ -208,7 +208,7 @@ WORD WINAPI WineEnumDFontCallback(LPENUMLOGFONT16 lpLogFont,
                                   LPNEWTEXTMETRIC16 lpTextMetrics,
                                   WORD wFontType, LONG lpClientData) 
 {
-    TRACE(win16drv, "In WineEnumDFontCallback plf=%p\n", lpLogFont);
+    TRACE("In WineEnumDFontCallback plf=%p\n", lpLogFont);
     return (*(((WEPFC *)lpClientData)->proc))( lpLogFont, lpTextMetrics, 
 				     wFontType, ((WEPFC *)lpClientData)->lp );
 }

graphics/win16drv/graphics.c

@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include "heap.h"
 #include "win16drv.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(win16drv)
 
@@ -62,9 +62,9 @@ WIN16DRV_Rectangle(DC *dc, INT left, INT top, INT right, INT bottom)
     BOOL bRet = 0;
     POINT16 points[2];
 
-    TRACE(win16drv, "In WIN16DRV_Rectangle, x %d y %d DCOrgX %d y %d\n",
+    TRACE("In WIN16DRV_Rectangle, x %d y %d DCOrgX %d y %d\n",
            left, top, dc->w.DCOrgX, dc->w.DCOrgY);
-    TRACE(win16drv, "In WIN16DRV_Rectangle, VPortOrgX %d y %d\n",
+    TRACE("In WIN16DRV_Rectangle, VPortOrgX %d y %d\n",
            dc->vportOrgX, dc->vportOrgY);
     points[0].x = XLPTODP(dc, left);
     points[0].y = YLPTODP(dc, top);
@@ -154,9 +154,9 @@ WIN16DRV_Ellipse(DC *dc, INT left, INT top, INT right, INT bottom)
     WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dc->physDev;
     BOOL bRet = 0;
     POINT16 points[2];
-    TRACE(win16drv, "In WIN16DRV_Ellipse, x %d y %d DCOrgX %d y %d\n",
+    TRACE("In WIN16DRV_Ellipse, x %d y %d DCOrgX %d y %d\n",
            left, top, dc->w.DCOrgX, dc->w.DCOrgY);
-    TRACE(win16drv, "In WIN16DRV_Ellipse, VPortOrgX %d y %d\n",
+    TRACE("In WIN16DRV_Ellipse, VPortOrgX %d y %d\n",
            dc->vportOrgX, dc->vportOrgY);
     points[0].x = XLPTODP(dc, left);
     points[0].y = YLPTODP(dc, top);

graphics/win16drv/init.c

@@ -14,7 +14,7 @@
 #include "font.h"
 #include "options.h"
 #include "xmalloc.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "dc.h"
 
 DEFAULT_DEBUG_CHANNEL(win16drv)
@@ -184,12 +184,12 @@ BOOL WIN16DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device, LPCSTR output,
                              printerEnabled, sizeof(printerEnabled) );
     if (lstrcmpiA(printerEnabled,"on"))
     {
-        MSG("Printing disabled in wine.conf or .winerc file\n");
-        MSG("Use \"printer=on\" in the \"[wine]\" section to enable it.\n");
+        MESSAGE("Printing disabled in wine.conf or .winerc file\n");
+        MESSAGE("Use \"printer=on\" in the \"[wine]\" section to enable it.\n");
         return FALSE;
     }
 
-    TRACE(win16drv, "In creatdc for (%s,%s,%s) initData 0x%p\n",
+    TRACE("In creatdc for (%s,%s,%s) initData 0x%p\n",
 	  driver, device, output, initData);
 
     physDev = (WIN16DRV_PDEVICE *)HeapAlloc( SystemHeap, 0, sizeof(*physDev) );
@@ -199,11 +199,11 @@ BOOL WIN16DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device, LPCSTR output,
     pLPD = LoadPrinterDriver(driver);
     if (pLPD == NULL)
     {
-	WARN(win16drv, "Failed to find printer driver\n");
+	WARN("Failed to find printer driver\n");
         HeapFree( SystemHeap, 0, physDev );
         return FALSE;
     }
-    TRACE(win16drv, "windevCreateDC pLPD 0x%p\n", pLPD);
+    TRACE("windevCreateDC pLPD 0x%p\n", pLPD);
 
     /* Now Get the device capabilities from the printer driver */
     
@@ -218,7 +218,7 @@ BOOL WIN16DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device, LPCSTR output,
     dc->w.hVisRgn = CreateRectRgn(0, 0, dc->w.devCaps->horzRes, dc->w.devCaps->vertRes);
     dc->w.bitsPerPixel = dc->w.devCaps->bitsPixel;
     
-    TRACE(win16drv, "Got devcaps width %d height %d bits %d planes %d\n",
+    TRACE("Got devcaps width %d height %d bits %d planes %d\n",
 	  dc->w.devCaps->horzRes, dc->w.devCaps->vertRes, 
 	  dc->w.devCaps->bitsPixel, dc->w.devCaps->planes);
 
@@ -237,7 +237,7 @@ BOOL WIN16DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device, LPCSTR output,
     pPDH = (PDEVICE_HEADER *)((BYTE*)PTR_SEG_TO_LIN(physDev->segptrPDEVICE) - sizeof(PDEVICE_HEADER)); 
     pPDH->pLPD = pLPD;
     
-    TRACE(win16drv, "PDEVICE allocated %08lx\n",(DWORD)(physDev->segptrPDEVICE));
+    TRACE("PDEVICE allocated %08lx\n",(DWORD)(physDev->segptrPDEVICE));
     
     /* Now get the printer driver to initialise this data */
     wRet = PRTDRV_Enable((LPVOID)physDev->segptrPDEVICE, INITPDEVICE, device, driver, output, NULL); 
@@ -287,11 +287,11 @@ static INT WIN16DRV_Escape( DC *dc, INT nEscape, INT cbInput,
 	switch(nEscape)
           {
 	  case ENABLEPAIRKERNING:
-	    FIXME(win16drv,"Escape: ENABLEPAIRKERNING ignored.\n");
+	    FIXME("Escape: ENABLEPAIRKERNING ignored.\n");
             nRet = 1;
 	    break;
 	  case GETPAIRKERNTABLE:
-	    FIXME(win16drv,"Escape: GETPAIRKERNTABLE ignored.\n");
+	    FIXME("Escape: GETPAIRKERNTABLE ignored.\n");
             nRet = 0;
 	    break;
           case SETABORTPROC: {
@@ -357,7 +357,7 @@ static INT WIN16DRV_Escape( DC *dc, INT nEscape, INT cbInput,
 	}
     }
     else
-	WARN(win16drv, "Escape(nEscape = %04x) - ???\n", nEscape);      
+	WARN("Escape(nEscape = %04x) - ???\n", nEscape);      
     return nRet;
 }
 

graphics/win16drv/objects.c

@@ -10,7 +10,7 @@
 #include "brush.h"
 #include "font.h"
 #include "pen.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(gdi)
 
@@ -33,7 +33,7 @@ HGDIOBJ WIN16DRV_SelectObject( DC *dc, HGDIOBJ handle )
     HGDIOBJ ret = 0;
 
     if (!ptr) return 0;
-    TRACE(gdi, "hdc=%04x %04x\n", dc->hSelf, handle );
+    TRACE("hdc=%04x %04x\n", dc->hSelf, handle );
     
     switch(ptr->wMagic)
     {
@@ -44,7 +44,7 @@ HGDIOBJ WIN16DRV_SelectObject( DC *dc, HGDIOBJ handle )
         ret = WIN16DRV_BRUSH_SelectObject( dc, handle, (BRUSHOBJ *)ptr );	  
         break;
     case BITMAP_MAGIC:
-        FIXME(gdi, "WIN16DRV_SelectObject for BITMAP not implemented\n");
+        FIXME("WIN16DRV_SelectObject for BITMAP not implemented\n");
         ret = 1;
         break;
     case FONT_MAGIC:

graphics/win16drv/pen.c

@@ -7,7 +7,7 @@
 #include "pen.h"
 #include "win16drv.h"
 #include "heap.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(win16drv)
 
@@ -21,7 +21,7 @@ HPEN WIN16DRV_PEN_SelectObject( DC * dc, HPEN hpen, PENOBJ * pen )
     int		 nSize;
     LOGPEN16 	 lPen16;
     dc->w.hPen = hpen;
-    TRACE(win16drv, "In WIN16DRV_PEN_SelectObject\n");
+    TRACE("In WIN16DRV_PEN_SelectObject\n");
     lPen16.lopnStyle   = pen->logpen.lopnStyle;
     lPen16.lopnWidth.x = pen->logpen.lopnWidth.x;
     lPen16.lopnWidth.y = pen->logpen.lopnWidth.y;
@@ -29,7 +29,7 @@ HPEN WIN16DRV_PEN_SelectObject( DC * dc, HPEN hpen, PENOBJ * pen )
 
     if ( physDev->PenInfo )
     {
-        TRACE(win16drv, "UnRealizing PenInfo\n");
+        TRACE("UnRealizing PenInfo\n");
         nSize = PRTDRV_RealizeObject (physDev->segptrPDEVICE, -DRVOBJ_PEN,
 				      physDev->PenInfo,
 				      physDev->PenInfo, 0);

graphics/win16drv/text.c

@@ -9,7 +9,7 @@
 #include "win16drv.h"
 #include "dc.h"
 #include "gdi.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(win16drv)
 
@@ -32,7 +32,7 @@ BOOL WIN16DRV_ExtTextOut( DC *dc, INT x, INT y, UINT flags,
     if (count == 0)
       return FALSE;
 
-    TRACE(win16drv, "%04x %d %d %x %p %*s %p\n",
+    TRACE("%04x %d %d %x %p %*s %p\n",
 	   dc->hSelf, x, y, flags,  lprect, count > 0 ? count : 8, str, lpDx);
 
 
@@ -55,7 +55,7 @@ BOOL WIN16DRV_ExtTextOut( DC *dc, INT x, INT y, UINT flags,
             
         }
         
-	TRACE(win16drv, "textalign = %d\n", dc->w.textAlign);
+	TRACE("textalign = %d\n", dc->w.textAlign);
 
 	if (dc->w.textAlign & TA_UPDATECP)
 	{

graphics/wing.c

@@ -12,7 +12,7 @@
 
 #include "wine/winuser16.h"
 #include "bitmap.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "ldt.h"
 #include "monitor.h"
 #include "palette.h"
@@ -45,7 +45,7 @@ typedef enum WING_DITHER_TYPE
  */
 HDC16 WINAPI WinGCreateDC16(void)
 {
-    TRACE(wing, "(void)\n");
+    TRACE("(void)\n");
 	return CreateCompatibleDC16(0);
 }
 
@@ -54,7 +54,7 @@ HDC16 WINAPI WinGCreateDC16(void)
  */
 BOOL16 WINAPI WinGRecommendDIBFormat16(BITMAPINFO *bmpi)
 {
-    TRACE(wing, "(%p)\n", bmpi);
+    TRACE("(%p)\n", bmpi);
     if (!bmpi)
 	return FALSE;
 
@@ -79,8 +79,8 @@ BOOL16 WINAPI WinGRecommendDIBFormat16(BITMAPINFO *bmpi)
 HBITMAP16 WINAPI WinGCreateBitmap16(HDC16 hdc, BITMAPINFO *bmpi,
                                     SEGPTR *bits)
 {
-    TRACE(wing, "(%d,%p,%p)\n", hdc, bmpi, bits);
-    TRACE(wing, ": create %ldx%ldx%d bitmap\n", bmpi->bmiHeader.biWidth,
+    TRACE("(%d,%p,%p)\n", hdc, bmpi, bits);
+    TRACE(": create %ldx%ldx%d bitmap\n", bmpi->bmiHeader.biWidth,
 	  bmpi->bmiHeader.biHeight, bmpi->bmiHeader.biPlanes);
     return CreateDIBSection16(hdc, bmpi, 0, bits, 0, 0);
 		} 
@@ -92,11 +92,11 @@ SEGPTR WINAPI WinGGetDIBPointer16(HBITMAP16 hWinGBitmap, BITMAPINFO* bmpi)
 {
   BITMAPOBJ*	bmp = (BITMAPOBJ *) GDI_GetObjPtr( hWinGBitmap, BITMAP_MAGIC );
 
-    TRACE(wing, "(%d,%p)\n", hWinGBitmap, bmpi);
+    TRACE("(%d,%p)\n", hWinGBitmap, bmpi);
     if (!bmp) return (SEGPTR)NULL;
 
     if (bmpi)
-	FIXME(wing, ": Todo - implement setting BITMAPINFO\n");
+	FIXME(": Todo - implement setting BITMAPINFO\n");
 
 #ifndef X_DISPLAY_MISSING
     return PTR_SEG_OFF_TO_SEGPTR(((X11DRV_DIBSECTION *) bmp->dib)->selector, 0);
@@ -111,7 +111,7 @@ SEGPTR WINAPI WinGGetDIBPointer16(HBITMAP16 hWinGBitmap, BITMAPINFO* bmpi)
 UINT16 WINAPI WinGSetDIBColorTable16(HDC16 hdc, UINT16 start, UINT16 num,
                                      RGBQUAD *colors)
 {
-    TRACE(wing, "(%d,%d,%d,%p)\n", hdc, start, num, colors);
+    TRACE("(%d,%d,%d,%p)\n", hdc, start, num, colors);
     return SetDIBColorTable16(hdc, start, num, colors);
 }
 
@@ -121,7 +121,7 @@ UINT16 WINAPI WinGSetDIBColorTable16(HDC16 hdc, UINT16 start, UINT16 num,
 UINT16 WINAPI WinGGetDIBColorTable16(HDC16 hdc, UINT16 start, UINT16 num,
 				     RGBQUAD *colors)
 {
-    TRACE(wing, "(%d,%d,%d,%p)\n", hdc, start, num, colors);
+    TRACE("(%d,%d,%d,%p)\n", hdc, start, num, colors);
     return GetDIBColorTable16(hdc, start, num, colors);
 }
 
@@ -130,7 +130,7 @@ UINT16 WINAPI WinGGetDIBColorTable16(HDC16 hdc, UINT16 start, UINT16 num,
  */
 HPALETTE16 WINAPI WinGCreateHalfTonePalette16(void)
 {
-    TRACE(wing, "(void)\n");
+    TRACE("(void)\n");
     return CreateHalftonePalette16(GetDC16(0));
 }
 
@@ -140,7 +140,7 @@ HPALETTE16 WINAPI WinGCreateHalfTonePalette16(void)
 HBRUSH16 WINAPI WinGCreateHalfToneBrush16(HDC16 winDC, COLORREF col,
                                             WING_DITHER_TYPE type)
 {
-    TRACE(wing, "(%d,%ld,%d)\n", winDC, col, type);
+    TRACE("(%d,%ld,%d)\n", winDC, col, type);
     return CreateSolidBrush16(col);
 }
 
@@ -152,7 +152,7 @@ BOOL16 WINAPI WinGStretchBlt16(HDC16 destDC, INT16 xDest, INT16 yDest,
                                HDC16 srcDC, INT16 xSrc, INT16 ySrc,
                                INT16 widSrc, INT16 heiSrc)
 {
-    TRACE(wing, "(%d,%d,...)\n", destDC, srcDC);
+    TRACE("(%d,%d,...)\n", destDC, srcDC);
     return StretchBlt16(destDC, xDest, yDest, widDest, heiDest, srcDC,
 			xSrc, ySrc, widSrc, heiSrc, SRCCOPY);
 }
@@ -164,7 +164,7 @@ BOOL16 WINAPI WinGBitBlt16(HDC16 destDC, INT16 xDest, INT16 yDest,
                            INT16 widDest, INT16 heiDest, HDC16 srcDC,
                            INT16 xSrc, INT16 ySrc)
 {
-    TRACE(wing, "(%d,%d,...)\n", destDC, srcDC);
+    TRACE("(%d,%d,...)\n", destDC, srcDC);
     return BitBlt16(destDC, xDest, yDest, widDest, heiDest, srcDC,
 		    xSrc, ySrc, SRCCOPY);
 }

graphics/x11drv/bitblt.c

@@ -21,7 +21,7 @@
 #include "metafile.h"
 #include "options.h"
 #include "x11drv.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "xmalloc.h" /* for XCREATEIMAGE macro */
 
 DEFAULT_DEBUG_CHANNEL(bitblt)
@@ -1143,12 +1143,12 @@ static BOOL BITBLT_InternalStretchBlt( DC *dcDst, INT xDst, INT yDst,
     widthDst  = widthDst * dcDst->vportExtX / dcDst->wndExtX;
     heightDst = heightDst * dcDst->vportExtY / dcDst->wndExtY;
 
-    TRACE(bitblt, "    vportdst=%d,%d-%d,%d wnddst=%d,%d-%d,%d\n",
+    TRACE("    vportdst=%d,%d-%d,%d wnddst=%d,%d-%d,%d\n",
                     dcDst->vportOrgX, dcDst->vportOrgY,
                     dcDst->vportExtX, dcDst->vportExtY,
                     dcDst->wndOrgX, dcDst->wndOrgY,
                     dcDst->wndExtX, dcDst->wndExtY );
-    TRACE(bitblt, "    rectdst=%d,%d-%d,%d orgdst=%d,%d\n",
+    TRACE("    rectdst=%d,%d-%d,%d orgdst=%d,%d\n",
                     xDst, yDst, widthDst, heightDst,
                     dcDst->w.DCOrgX, dcDst->w.DCOrgY );
 
@@ -1159,19 +1159,19 @@ static BOOL BITBLT_InternalStretchBlt( DC *dcDst, INT xDst, INT yDst,
         widthSrc  = widthSrc * dcSrc->vportExtX / dcSrc->wndExtX;
         heightSrc = heightSrc * dcSrc->vportExtY / dcSrc->wndExtY;
         fStretch  = (widthSrc != widthDst) || (heightSrc != heightDst);
-        TRACE(bitblt,"    vportsrc=%d,%d-%d,%d wndsrc=%d,%d-%d,%d\n",
+        TRACE("    vportsrc=%d,%d-%d,%d wndsrc=%d,%d-%d,%d\n",
                         dcSrc->vportOrgX, dcSrc->vportOrgY,
                         dcSrc->vportExtX, dcSrc->vportExtY,
                         dcSrc->wndOrgX, dcSrc->wndOrgY,
                         dcSrc->wndExtX, dcSrc->wndExtY );
-        TRACE(bitblt, "    rectsrc=%d,%d-%d,%d orgsrc=%d,%d\n",
+        TRACE("    rectsrc=%d,%d-%d,%d orgsrc=%d,%d\n",
                         xSrc, ySrc, widthSrc, heightSrc,
                         dcSrc->w.DCOrgX, dcSrc->w.DCOrgY );
         if (!BITBLT_GetVisRectangles( dcDst, xDst, yDst, widthDst, heightDst,
                                       dcSrc, xSrc, ySrc, widthSrc, heightSrc,
                                       &visRectSrc, &visRectDst ))
             return TRUE;
-        TRACE(bitblt, "    vissrc=%d,%d-%d,%d visdst=%d,%d-%d,%d\n",
+        TRACE("    vissrc=%d,%d-%d,%d visdst=%d,%d-%d,%d\n",
                         visRectSrc.left, visRectSrc.top,
                         visRectSrc.right, visRectSrc.bottom,
                         visRectDst.left, visRectDst.top,
@@ -1183,7 +1183,7 @@ static BOOL BITBLT_InternalStretchBlt( DC *dcDst, INT xDst, INT yDst,
         if (!BITBLT_GetVisRectangles( dcDst, xDst, yDst, widthDst, heightDst,
                                       NULL, 0, 0, 0, 0, NULL, &visRectDst ))
             return TRUE;
-        TRACE(bitblt, "    vissrc=none visdst=%d,%d-%d,%d\n",
+        TRACE("    vissrc=none visdst=%d,%d-%d,%d\n",
                         visRectDst.left, visRectDst.top,
                         visRectDst.right, visRectDst.bottom );
     }

graphics/x11drv/bitmap.c

@@ -19,7 +19,7 @@
 #include "bitmap.h"
 #include "heap.h"
 #include "monitor.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "xmalloc.h"
 #include "local.h"
 #include "x11drv.h"
@@ -84,7 +84,7 @@ HBITMAP X11DRV_BITMAP_SelectObject( DC * dc, HBITMAP hbitmap,
 	    return 0;
 
     if(bmp->DDBitmap->funcs != dc->funcs) {
-        WARN(x11drv, "Trying to select non-X11 DDB into an X11 dc\n");
+        WARN("Trying to select non-X11 DDB into an X11 dc\n");
 	return 0;
     }
 
@@ -158,12 +158,12 @@ X11DRV_PHYSBITMAP *X11DRV_AllocBitmap( BITMAPOBJ *bmp )
     X11DRV_PHYSBITMAP *pbitmap;
 
     if(!(bmp->DDBitmap = HeapAlloc(GetProcessHeap(), 0, sizeof(DDBITMAP)))) {
-        WARN(x11drv, "Can't alloc DDBITMAP\n");
+        WARN("Can't alloc DDBITMAP\n");
 	return NULL;
     }
 
     if(!(pbitmap = HeapAlloc(GetProcessHeap(), 0,sizeof(X11DRV_PHYSBITMAP)))) {
-        WARN(x11drv, "Can't alloc X11DRV_PHYSBITMAP\n");
+        WARN("Can't alloc X11DRV_PHYSBITMAP\n");
         HeapFree(GetProcessHeap(), 0, bmp->DDBitmap);
 	return NULL;
     }
@@ -190,7 +190,7 @@ BOOL X11DRV_CreateBitmap( HBITMAP hbitmap )
     BITMAPOBJ *bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC );
 
     if(!bmp) {
-        WARN(x11drv, "Bad bitmap handle %08x\n", hbitmap);
+        WARN("Bad bitmap handle %08x\n", hbitmap);
 	return FALSE;
     }
 
@@ -198,13 +198,13 @@ BOOL X11DRV_CreateBitmap( HBITMAP hbitmap )
     if (bmp->bitmap.bmPlanes != 1) return 0;
     if ((bmp->bitmap.bmBitsPixel != 1) && 
 	(bmp->bitmap.bmBitsPixel != MONITOR_GetDepth(&MONITOR_PrimaryMonitor))) {
-        ERR(x11drv, "Trying to make bitmap with planes=%d, bpp=%d\n",
+        ERR("Trying to make bitmap with planes=%d, bpp=%d\n",
 	    bmp->bitmap.bmPlanes, bmp->bitmap.bmBitsPixel);
         GDI_HEAP_UNLOCK( hbitmap );
 	return FALSE;
     }
 
-    TRACE(x11drv, "(%08x) %dx%d %d bpp\n", hbitmap, bmp->bitmap.bmWidth,
+    TRACE("(%08x) %dx%d %d bpp\n", hbitmap, bmp->bitmap.bmWidth,
 	  bmp->bitmap.bmHeight, bmp->bitmap.bmBitsPixel);
 
     pbitmap = X11DRV_AllocBitmap( bmp );
@@ -214,7 +214,7 @@ BOOL X11DRV_CreateBitmap( HBITMAP hbitmap )
     pbitmap->pixmap = TSXCreatePixmap(display, X11DRV_GetXRootWindow(), bmp->bitmap.bmWidth,
 			      bmp->bitmap.bmHeight, bmp->bitmap.bmBitsPixel);
     if (!pbitmap->pixmap) {
-        WARN(x11drv, "Can't create Pixmap\n");
+        WARN("Can't create Pixmap\n");
         HeapFree(GetProcessHeap(), 0, bmp->DDBitmap->physBitmap);
         HeapFree(GetProcessHeap(), 0, bmp->DDBitmap);
 	GDI_HEAP_UNLOCK( hbitmap );
@@ -259,7 +259,7 @@ static LONG X11DRV_GetBitmapBits(BITMAPOBJ *bmp, void *buffer, LONG count)
     LPBYTE tbuf, startline;
     int	h, w;
 
-    TRACE(x11drv, "(bmp=%p, buffer=%p, count=0x%lx)\n", bmp, buffer, count);
+    TRACE("(bmp=%p, buffer=%p, count=0x%lx)\n", bmp, buffer, count);
 
     EnterCriticalSection( &X11DRV_CritSection );
 
@@ -362,7 +362,7 @@ static LONG X11DRV_GetBitmapBits(BITMAPOBJ *bmp, void *buffer, LONG count)
 	}
         break;
     default:
-        FIXME(x11drv, "Unhandled bits:%d\n", bmp->bitmap.bmBitsPixel);
+        FIXME("Unhandled bits:%d\n", bmp->bitmap.bmBitsPixel);
     }
     XDestroyImage( image );
     LeaveCriticalSection( &X11DRV_CritSection );
@@ -387,7 +387,7 @@ static LONG X11DRV_SetBitmapBits(BITMAPOBJ *bmp, void *bits, LONG count)
     LPBYTE sbuf, startline;
     int	w, h;
 
-    TRACE(x11drv, "(bmp=%p, bits=%p, count=0x%lx)\n", bmp, bits, count);
+    TRACE("(bmp=%p, bits=%p, count=0x%lx)\n", bmp, bits, count);
     
     height = count / bmp->bitmap.bmWidthBytes;
 
@@ -475,7 +475,7 @@ static LONG X11DRV_SetBitmapBits(BITMAPOBJ *bmp, void *bits, LONG count)
         }
         break;
     default:
-      FIXME(x11drv, "Unhandled bits:%d\n", bmp->bitmap.bmBitsPixel);
+      FIXME("Unhandled bits:%d\n", bmp->bitmap.bmBitsPixel);
 
     }
 
@@ -499,7 +499,7 @@ LONG X11DRV_BitmapBits(HBITMAP hbitmap, void *bits, LONG count, WORD flags)
     BITMAPOBJ *bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC );
     LONG ret;
     if(!bmp) {
-        WARN(x11drv, "Bad bitmap handle %08x\n", hbitmap);
+        WARN("Bad bitmap handle %08x\n", hbitmap);
 	return FALSE;
     }
 
@@ -508,7 +508,7 @@ LONG X11DRV_BitmapBits(HBITMAP hbitmap, void *bits, LONG count, WORD flags)
     else if(flags == DDB_SET)
         ret = X11DRV_SetBitmapBits(bmp, bits, count);
     else {
-        ERR(x11drv, "Unknown flags value %d\n", flags);
+        ERR("Unknown flags value %d\n", flags);
 	ret = 0;
     }
     

graphics/x11drv/brush.c

@@ -15,7 +15,7 @@
 #include "bitmap.h"
 #include "color.h"
 #include "x11drv.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "xmalloc.h" /* for XCREATEIMAGE macro */
 #include "monitor.h"
 #include "local.h"
@@ -186,7 +186,7 @@ static BOOL BRUSH_SelectPatternBrush( DC * dc, HBITMAP hbitmap )
 	    return 0;
 
     if(bmp->DDBitmap->funcs != dc->funcs) {
-        WARN(gdi, "Trying to select non-X11 DDB into an X11 dc\n");
+        WARN("Trying to select non-X11 DDB into an X11 dc\n");
 	return 0;
     }
 
@@ -235,7 +235,7 @@ HBRUSH X11DRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush, BRUSHOBJ * brush )
     HBRUSH16 prevHandle = dc->w.hBrush;
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
     
-    TRACE(gdi, "hdc=%04x hbrush=%04x\n",
+    TRACE("hdc=%04x hbrush=%04x\n",
                 dc->hSelf,hbrush);
 
     dc->w.hBrush = hbrush;
@@ -250,16 +250,16 @@ HBRUSH X11DRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush, BRUSHOBJ * brush )
     switch(brush->logbrush.lbStyle)
     {
       case BS_NULL:
-	TRACE(gdi,"BS_NULL\n" );
+	TRACE("BS_NULL\n" );
 	break;
 
       case BS_SOLID:
-        TRACE(gdi,"BS_SOLID\n" );
+        TRACE("BS_SOLID\n" );
 	BRUSH_SelectSolidBrush( dc, brush->logbrush.lbColor );
 	break;
 	
       case BS_HATCHED:
-	TRACE(gdi, "BS_HATCHED\n" );
+	TRACE("BS_HATCHED\n" );
 	physDev->brush.pixel = X11DRV_PALETTE_ToPhysical( dc, brush->logbrush.lbColor );
 	physDev->brush.pixmap = TSXCreateBitmapFromData( display, X11DRV_GetXRootWindow(),
 				 HatchBrushes[brush->logbrush.lbHatch], 8, 8 );
@@ -267,12 +267,12 @@ HBRUSH X11DRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush, BRUSHOBJ * brush )
 	break;
 	
       case BS_PATTERN:
-	TRACE(gdi, "BS_PATTERN\n");
+	TRACE("BS_PATTERN\n");
 	BRUSH_SelectPatternBrush( dc, (HBRUSH16)brush->logbrush.lbHatch );
 	break;
 
       case BS_DIBPATTERN:
-	TRACE(gdi, "BS_DIBPATTERN\n");
+	TRACE("BS_DIBPATTERN\n");
 	if ((bmpInfo = (BITMAPINFO *) GlobalLock16( (HGLOBAL16)brush->logbrush.lbHatch )))
 	{
 	    int size = DIB_BitmapInfoSize( bmpInfo, brush->logbrush.lbColor );

graphics/x11drv/graphics.c

@@ -40,7 +40,7 @@
 #include "color.h"
 #include "region.h"
 #include "struct32.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "xmalloc.h"
 
 DEFAULT_DEBUG_CHANNEL(graphics)
@@ -295,7 +295,7 @@ BOOL X11DRV_SetupGCForText( DC * dc )
 		   GCFont, &val );
 	return TRUE;
     } 
-    WARN(graphics, "Physical font failure\n" );
+    WARN("Physical font failure\n" );
     return FALSE;
 }
 
@@ -577,7 +577,7 @@ X11DRV_Rectangle(DC *dc, INT left, INT top, INT right, INT bottom)
     INT width, oldwidth, oldjoinstyle;
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
 
-    TRACE(graphics, "(%d %d %d %d)\n", 
+    TRACE("(%d %d %d %d)\n", 
     	left, top, right, bottom);
 
     left   = XLPTODP( dc, left );
@@ -637,7 +637,7 @@ X11DRV_RoundRect( DC *dc, INT left, INT top, INT right,
     INT width, oldwidth, oldendcap;
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
 
-    TRACE(graphics, "(%d %d %d %d  %d %d\n", 
+    TRACE("(%d %d %d %d  %d %d\n", 
     	left, top, right, bottom, ell_width, ell_height);
 
     left   = XLPTODP( dc, left );
@@ -1192,7 +1192,7 @@ X11DRV_ExtFloodFill( DC *dc, INT x, INT y, COLORREF color,
     BOOL result;
     struct FloodFill_params params;
 
-    TRACE(graphics, "X11DRV_ExtFloodFill %d,%d %06lx %d\n",
+    TRACE("X11DRV_ExtFloodFill %d,%d %06lx %d\n",
                       x, y, color, fillType );
 
     params.dc = dc;
@@ -1384,14 +1384,14 @@ X11DRV_PolyBezier(DC *dc, POINT start, const POINT* BezierPoints, DWORD count)
     XPoint* xpoints;
     X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
 
-    TRACE(graphics, "dc=%p count=%ld %ld,%ld - %ld,%ld - %ld,%ld - %ld,%ld\n", 
+    TRACE("dc=%p count=%ld %ld,%ld - %ld,%ld - %ld,%ld - %ld,%ld\n", 
             dc, count,
             start.x, start.y,
             (Points+0)->x, (Points+0)->y, 
             (Points+1)->x, (Points+1)->y, 
             (Points+2)->x, (Points+2)->y); 
     if(!count || count % 3){/* paranoid */
-        WARN(graphics," bad value for count : %ld\n", count);
+        WARN(" bad value for count : %ld\n", count);
         return FALSE; 
     }
     xpoints=(XPoint*) xmalloc( sizeof(XPoint)*BEZMAXPOINTS);

graphics/x11drv/init.c

@@ -14,7 +14,7 @@
 
 #include "bitmap.h"
 #include "color.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "ldt.h"
 #include "local.h"
 #include "monitor.h"
@@ -171,7 +171,7 @@ BOOL X11DRV_GDI_Initialize(void)
     /* Finish up device caps */
 
 #if 0
-    TRACE(x11drv, "Height = %-4i pxl, %-4i mm, Width  = %-4i pxl, %-4i mm\n",
+    TRACE("Height = %-4i pxl, %-4i mm, Width  = %-4i pxl, %-4i mm\n",
 	  HeightOfScreen(X11DRV_GetXScreen()), HeightMMOfScreen(X11DRV_GetXScreen()),
 	  WidthOfScreen(X11DRV_GetXScreen()), WidthMMOfScreen(X11DRV_GetXScreen()) );
 #endif
@@ -222,7 +222,7 @@ static BOOL X11DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device,
     dc->physDev = physDev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY,
 				       sizeof(*physDev) );
     if(!physDev) {
-        ERR(x11drv, "Can't allocate physDev\n");
+        ERR("Can't allocate physDev\n");
 	return FALSE;
     }
 

graphics/x11drv/objects.c

@@ -15,7 +15,7 @@
 #include "font.h"
 #include "pen.h"
 #include "local.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(gdi)
 
@@ -39,7 +39,7 @@ HGDIOBJ X11DRV_SelectObject( DC *dc, HGDIOBJ handle )
     HGDIOBJ ret = 0;
 
     if (!ptr) return 0;
-    TRACE(gdi, "hdc=%04x %04x\n", dc->hSelf, handle );
+    TRACE("hdc=%04x %04x\n", dc->hSelf, handle );
     
     switch(ptr->wMagic)
     {
@@ -80,7 +80,7 @@ BOOL X11DRV_DeleteObject( HGDIOBJ handle )
 	break;
 
     default:
-        ERR(gdi, "Shouldn't be here!\n");
+        ERR("Shouldn't be here!\n");
 	ret = FALSE;
 	break;
     }

graphics/x11drv/palette.c

@@ -15,7 +15,7 @@
 #include <string.h>
 
 #include "color.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "gdi.h"
 #include "monitor.h"
 #include "options.h"
@@ -104,7 +104,7 @@ BOOL X11DRV_PALETTE_Init(void)
 
     Visual *visual = DefaultVisual( display, DefaultScreen(display) );
 
-    TRACE(palette, "initializing palette manager...\n");
+    TRACE("initializing palette manager...\n");
 
     white = WhitePixelOfScreen( X11DRV_GetXScreen() );
     black = BlackPixelOfScreen( X11DRV_GetXScreen() );
@@ -179,7 +179,7 @@ BOOL X11DRV_PALETTE_Init(void)
     }
     }
 
-    TRACE(palette," visual class %i (%i)\n",  visual->class, monoPlane);
+    TRACE(" visual class %i (%i)\n",  visual->class, monoPlane);
 
     memset(X11DRV_PALETTE_freeList, 0, 256*sizeof(unsigned char));
 
@@ -256,7 +256,7 @@ static BOOL X11DRV_PALETTE_BuildPrivateMap(void)
 
     COLOR_sysPal = (PALETTEENTRY*)xmalloc(sizeof(PALETTEENTRY)*X11DRV_DevCaps.sizePalette);
 
-    TRACE(palette,"Building private map - %i palette entries\n", X11DRV_DevCaps.sizePalette);
+    TRACE("Building private map - %i palette entries\n", X11DRV_DevCaps.sizePalette);
 
       /* Allocate system palette colors */ 
 
@@ -319,9 +319,9 @@ static BOOL X11DRV_PALETTE_BuildSharedMap(void)
    COLOR_max = PROFILE_GetWineIniInt( "options", "AllocSystemColors", 256);
    if (COLOR_max > 256) COLOR_max = 256;
    else if (COLOR_max < 20) COLOR_max = 20;
-   TRACE(palette,"%d colors configured.\n", COLOR_max);
+   TRACE("%d colors configured.\n", COLOR_max);
    
-   TRACE(palette,"Building shared map - %i palette entries\n", X11DRV_DevCaps.sizePalette);
+   TRACE("Building shared map - %i palette entries\n", X11DRV_DevCaps.sizePalette);
 
    /* Be nice and allocate system colors as read-only */
 
@@ -338,7 +338,7 @@ static BOOL X11DRV_PALETTE_BuildSharedMap(void)
 	     
              if( !warn++ ) 
 	     {
-		  WARN(palette, "Not enough colors for the full system palette.\n");
+		  WARN("Not enough colors for the full system palette.\n");
 
 	          bp = BlackPixel(display, DefaultScreen(display));
 	          wp = WhitePixel(display, DefaultScreen(display));
@@ -376,7 +376,7 @@ static BOOL X11DRV_PALETTE_BuildSharedMap(void)
 
         sysPixel[i] = color.pixel;
 
-        TRACE(palette,"syscolor(%lx) -> pixel %i\n",
+        TRACE("syscolor(%lx) -> pixel %i\n",
 		      *(COLORREF*)(COLOR_sysPalTemplate+i), (int)color.pixel);
 
         /* Set EGA mapping if color in the first or last eight */
@@ -393,7 +393,7 @@ static BOOL X11DRV_PALETTE_BuildSharedMap(void)
      {
 	int c_min = 0, c_max = X11DRV_DevCaps.sizePalette, c_val;
 
-	TRACE(palette,"Dynamic colormap... \n");
+	TRACE("Dynamic colormap... \n");
 
 	/* comment this out if you want to debug palette init */
 
@@ -427,7 +427,7 @@ static BOOL X11DRV_PALETTE_BuildSharedMap(void)
 	  if( !TSXAllocColorCells(display, X11DRV_PALETTE_PaletteXColormap, False,
                                 plane_masks, 0, pixDynMapping, c_min) )
 	    {
-	      WARN(palette,"Inexplicable failure during colorcell allocation.\n");
+	      WARN("Inexplicable failure during colorcell allocation.\n");
 	      c_min = 0;
 	    }
 
@@ -435,7 +435,7 @@ static BOOL X11DRV_PALETTE_BuildSharedMap(void)
 
 	TSXUngrabServer(display);
 
-	TRACE(palette,"adjusted size %i colorcells\n", X11DRV_DevCaps.sizePalette);
+	TRACE("adjusted size %i colorcells\n", X11DRV_DevCaps.sizePalette);
      }
    else if( X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_VIRTUAL ) 
 	{
@@ -444,12 +444,12 @@ static BOOL X11DRV_PALETTE_BuildSharedMap(void)
 	   * to maintain compatibility
 	   */
 	  X11DRV_DevCaps.sizePalette = 256;
-	  TRACE(palette,"Virtual colorspace - screendepth %i\n", MONITOR_GetDepth(&MONITOR_PrimaryMonitor));
+	  TRACE("Virtual colorspace - screendepth %i\n", MONITOR_GetDepth(&MONITOR_PrimaryMonitor));
 	}
    else X11DRV_DevCaps.sizePalette = NB_RESERVED_COLORS;	/* system palette only - however we can alloc a bunch
 			                 * of colors and map to them */
 
-   TRACE(palette,"Shared system palette uses %i colors.\n", X11DRV_DevCaps.sizePalette);
+   TRACE("Shared system palette uses %i colors.\n", X11DRV_DevCaps.sizePalette);
 
    /* set gap to account for pixel shortage. It has to be right in the center
     * of the system palette because otherwise raster ops get screwed. */
@@ -503,7 +503,7 @@ static BOOL X11DRV_PALETTE_BuildSharedMap(void)
            else
              X11DRV_PALETTE_PaletteToXPixel[i] = i;
 
-      TRACE(palette,"index %i -> pixel %i\n", i, X11DRV_PALETTE_PaletteToXPixel[i]);
+      TRACE("index %i -> pixel %i\n", i, X11DRV_PALETTE_PaletteToXPixel[i]);
 
       if( X11DRV_PALETTE_XPixelToPalette )
           X11DRV_PALETTE_XPixelToPalette[X11DRV_PALETTE_PaletteToXPixel[i]] = i;
@@ -675,7 +675,7 @@ int X11DRV_PALETTE_ToPhysical( DC *dc, COLORREF color )
 
             if( (idx = color & 0xffff) >= palPtr->logpalette.palNumEntries)
             {
-                WARN(palette, "RGB(%lx) : idx %d is out of bounds, assuming black\n", color, idx);
+                WARN("RGB(%lx) : idx %d is out of bounds, assuming black\n", color, idx);
 		GDI_HEAP_UNLOCK( hPal );
                 return 0;
             }
@@ -728,7 +728,7 @@ int X11DRV_PALETTE_ToPhysical( DC *dc, COLORREF color )
 
 	if( !palPtr ) return 0;
 	else if( !palPtr->mapping ) 
-            WARN(palette, "Palette %04x is not realized\n", dc->w.hPalette);
+            WARN("Palette %04x is not realized\n", dc->w.hPalette);
 
 	switch(spec_type)	/* we have to peruse DC and system palette */
     	{
@@ -754,7 +754,7 @@ int X11DRV_PALETTE_ToPhysical( DC *dc, COLORREF color )
 		index = color & 0xffff;
 
 	        if( index >= palPtr->logpalette.palNumEntries )
-		    WARN(palette, "RGB(%lx) : index %i is out of bounds\n", color, index); 
+		    WARN("RGB(%lx) : index %i is out of bounds\n", color, index); 
 		else if( palPtr->mapping ) index = palPtr->mapping[index];
 
 		/*  TRACE(palette,"PALETTEINDEX(%04x) -> pixel %i\n", (WORD)color, index);
@@ -870,7 +870,7 @@ int X11DRV_PALETTE_SetMapping( PALETTEOBJ* palPtr, UINT uStart, UINT uNum, BOOL
             index = *(WORD*)(palPtr->logpalette.palPalEntry + uStart);
             if( index > 255 || (index >= COLOR_gapStart && index <= COLOR_gapEnd) ) 
             {
-                WARN(palette,"PC_EXPLICIT: idx %d out of system palette, assuming black.\n", index); 
+                WARN("PC_EXPLICIT: idx %d out of system palette, assuming black.\n", index); 
                 index = 0;
             }
             break;
@@ -927,7 +927,7 @@ int X11DRV_PALETTE_SetMapping( PALETTEOBJ* palPtr, UINT uStart, UINT uNum, BOOL
         if( !prevMapping || palPtr->mapping[uStart] != index ) iRemapped++;
         palPtr->mapping[uStart] = index;
 
-        TRACE(palette,"entry %i (%lx) -> pixel %i\n", uStart, 
+        TRACE("entry %i (%lx) -> pixel %i\n", uStart, 
 				*(COLORREF*)(palPtr->logpalette.palPalEntry + uStart), index);
 	
     }

graphics/x11drv/pen.c

@@ -11,7 +11,7 @@
 #include "pen.h"
 #include "color.h"
 #include "x11drv.h"
-#include "debug.h"
+#include "debugtools.h"
 
 static const char PEN_dash[]       = { 5,3 };      /* -----   -----   -----  */
 static const char PEN_dot[]        = { 1,1 };      /* --  --  --  --  --  -- */

graphics/x11drv/text.c

@@ -18,7 +18,7 @@
 #include "gdi.h"
 #include "heap.h"
 #include "x11font.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(text)
 
@@ -53,7 +53,7 @@ X11DRV_ExtTextOut( DC *dc, INT x, INT y, UINT flags,
     lfUnderline = (pfo->fo_flags & FO_SYNTH_UNDERLINE) ? 1 : 0;
     lfStrikeOut = (pfo->fo_flags & FO_SYNTH_STRIKEOUT) ? 1 : 0;
 
-    TRACE(text,"hdc=%04x df=%04x %d,%d %s, %d  flags=%d lpDx=%p\n",
+    TRACE("hdc=%04x df=%04x %d,%d %s, %d  flags=%d lpDx=%p\n",
 	  dc->hSelf, (UINT16)(physDev->font), x, y,
 	  debugstr_an (str, count), count, flags, lpDx);
 
@@ -62,7 +62,7 @@ X11DRV_ExtTextOut( DC *dc, INT x, INT y, UINT flags,
        terminating newlines seems ok.  MW, April 1998.  */
     if (count > 0 && str[count - 1] == '\n') count--;
 
-    if (lprect != NULL) TRACE(text, "\trect=(%d,%d - %d,%d)\n",
+    if (lprect != NULL) TRACE("\trect=(%d,%d - %d,%d)\n",
                                      lprect->left, lprect->top,
                                      lprect->right, lprect->bottom );
       /* Setup coordinates */
@@ -101,7 +101,7 @@ X11DRV_ExtTextOut( DC *dc, INT x, INT y, UINT flags,
     x = XLPTODP( dc, x );
     y = YLPTODP( dc, y );
 
-    TRACE(text,"\treal coord: x=%i, y=%i, rect=(%d,%d - %d,%d)\n",
+    TRACE("\treal coord: x=%i, y=%i, rect=(%d,%d - %d,%d)\n",
 			  x, y, rect.left, rect.top, rect.right, rect.bottom);
 
       /* Draw the rectangle */

misc/callback.c

@@ -12,7 +12,7 @@
 #include "cursoricon.h"
 #include "user.h"
 #include "queue.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "win.h"
 
 DEFAULT_DEBUG_CHANNEL(relay)
@@ -42,7 +42,7 @@ static LRESULT WINAPI CALLBACK_CallWndProc( WNDPROC16 proc, HWND16 hwnd,
  */
 static LONG WINAPI CALLBACK_CallRegisterProc( CONTEXT86 *context, INT offset)
 {
-    ERR(relay, "Cannot call a register proc in Winelib\n" );
+    ERR("Cannot call a register proc in Winelib\n" );
     assert( FALSE );
     return 0;
 }
@@ -142,7 +142,7 @@ static HGLOBAL16 WINAPI CALLBACK_CallResourceHandlerProc( FARPROC16 proc,
                                                           HMODULE16 hModule,
                                                           HRSRC16 hRsrc )
 {
-    ERR( relay, "Cannot call a 16-bit resource handler in Winelib\n" );
+    ERR("Cannot call a 16-bit resource handler in Winelib\n" );
     assert( FALSE );
     return 0;
 }
@@ -239,7 +239,7 @@ static BOOL WINAPI CALLBACK_CallWOWCallback16Ex(
 	    );
 	    break;
     default:
-	    WARN(relay,"(%ld) arguments not supported.\n",cbArgs);
+	    WARN("(%ld) arguments not supported.\n",cbArgs);
 	    if (dwFlags == WCB16_CDECL)
 		HeapFree(GetProcessHeap(),0,args);
 	    return FALSE;
@@ -256,7 +256,7 @@ static BOOL WINAPI CALLBACK_CallWOWCallback16Ex(
  */
 static DWORD WINAPI CALLBACK_CallUTProc( FARPROC16 proc, DWORD w1, DWORD w2 )
 {
-    ERR( relay, "Cannot call a UT thunk proc in Winelib\n" );
+    ERR("Cannot call a UT thunk proc in Winelib\n" );
     assert( FALSE );
     return 0;
 }

misc/cdrom.c

@@ -11,7 +11,7 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include "cdrom.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(cdaudio)
 
@@ -33,7 +33,7 @@ int	CDAUDIO_Open(WINE_CDAUDIO* wcda)
 #if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
     wcda->unixdev = open(CDAUDIO_DEV, O_RDONLY | O_NONBLOCK, 0);
     if (wcda->unixdev == -1) {
-	WARN(cdaudio,"can't open '%s'!.  errno=%d\n", CDAUDIO_DEV, errno);
+	WARN("can't open '%s'!.  errno=%d\n", CDAUDIO_DEV, errno);
 	return -1;
     }
     wcda->cdaMode = WINE_CDA_OPEN;	/* to force reading tracks info */
@@ -86,7 +86,7 @@ UINT16 CDAUDIO_GetNumberOfTracks(WINE_CDAUDIO* wcda)
 	if (ioctl(wcda->unixdev, CDIOREADTOCHEADER, &hdr))
 #endif
 	{
-	    WARN(cdaudio, "(%p) -- Error occured (%d)!\n", wcda, errno);
+	    WARN("(%p) -- Error occured (%d)!\n", wcda, errno);
 	    return (WORD)-1;
 	}
 #ifdef linux
@@ -123,7 +123,7 @@ BOOL CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda)
     if (wcda->nTracks == 0) {
 	if (CDAUDIO_GetNumberOfTracks(wcda) == (WORD)-1) return FALSE;
     }
-    TRACE(cdaudio,"nTracks=%u\n", wcda->nTracks);
+    TRACE("nTracks=%u\n", wcda->nTracks);
     
     if (wcda->lpdwTrackLen != NULL) 
 	free(wcda->lpdwTrackLen);
@@ -136,7 +136,7 @@ BOOL CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda)
     wcda->lpbTrackFlags = (LPBYTE)malloc((wcda->nTracks + 1) * sizeof(BYTE));
     if (wcda->lpdwTrackLen == NULL || wcda->lpdwTrackPos == NULL ||
 	wcda->lpbTrackFlags == NULL) {
-	WARN(cdaudio, "error allocating track table !\n");
+	WARN("error allocating track table !\n");
 	return FALSE;
     }
     memset(wcda->lpdwTrackLen, 0, (wcda->nTracks + 1) * sizeof(DWORD));
@@ -170,7 +170,7 @@ BOOL CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda)
 	if (ioctl(wcda->unixdev, CDIOREADTOCENTRYS, &entry))
 #endif
 	{
-	    WARN(cdaudio, "error read entry (%d)\n", errno);
+	    WARN("error read entry (%d)\n", errno);
 	    /* update status according to new status */
 	    CDAUDIO_GetCDStatus(wcda);
 
@@ -188,7 +188,7 @@ BOOL CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda)
 	if (i == 0) {
 	    last_start = start;
 	    wcda->dwFirstOffset = start;
-	    TRACE(cdaudio, "dwFirstOffset=%u\n", start);
+	    TRACE("dwFirstOffset=%u\n", start);
 	} else {
 	    length = start - last_start;
 	    last_start = start;
@@ -196,7 +196,7 @@ BOOL CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda)
 	    total_length += length;
 	    wcda->lpdwTrackLen[i - 1] = length;
 	    wcda->lpdwTrackPos[i - 1] = start;
-	    TRACE(cdaudio, "track #%u start=%u len=%u\n", i, start, length);
+	    TRACE("track #%u start=%u len=%u\n", i, start, length);
 	}
 #ifdef linux
 	wcda->lpbTrackFlags[i] =
@@ -205,10 +205,10 @@ BOOL CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda)
 	wcda->lpbTrackFlags[i] =
 	    (toc_buffer.addr_type << 4) | (toc_buffer.control & 0x0f);
 #endif 
-	TRACE(cdaudio, "track #%u flags=%02x\n", i + 1, wcda->lpbTrackFlags[i]);
+	TRACE("track #%u flags=%02x\n", i + 1, wcda->lpbTrackFlags[i]);
     }
     wcda->dwTotalLen = total_length;
-    TRACE(cdaudio,"total_len=%u\n", total_length);
+    TRACE("total_len=%u\n", total_length);
     return TRUE;
 #else
     return FALSE;
@@ -239,7 +239,7 @@ BOOL CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda)
     if (ioctl(wcda->unixdev, CDIOCREADSUBCHANNEL, &read_sc))
 #endif
     {
-	TRACE(cdaudio,"opened or no_media (%d)!\n", errno);
+	TRACE("opened or no_media (%d)!\n", errno);
 	wcda->cdaMode = WINE_CDA_OPEN; /* was NOT_READY */
 	return TRUE;
     }
@@ -255,7 +255,7 @@ BOOL CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda)
 #else
     case CD_AS_AUDIO_INVALID:
 #endif
-	WARN(cdaudio, "device doesn't support status.\n");
+	WARN("device doesn't support status.\n");
 	wcda->cdaMode = WINE_CDA_DONTKNOW;
 	break;
 #ifdef linux
@@ -264,7 +264,7 @@ BOOL CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda)
     case CD_AS_NO_STATUS:
 #endif
 	wcda->cdaMode = WINE_CDA_STOP;
-	TRACE(cdaudio,"WINE_CDA_STOP !\n");
+	TRACE("WINE_CDA_STOP !\n");
 	break;
 #ifdef linux
     case CDROM_AUDIO_PLAY: 
@@ -279,14 +279,14 @@ BOOL CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda)
     case CD_AS_PLAY_PAUSED:
 #endif
 	wcda->cdaMode = WINE_CDA_PAUSE;
-	TRACE(cdaudio,"WINE_CDA_PAUSE !\n");
+	TRACE("WINE_CDA_PAUSE !\n");
 	break;
     default:
 #ifdef linux
-	TRACE(cdaudio,"status=%02X !\n",
+	TRACE("status=%02X !\n",
 	      wcda->sc.cdsc_audiostatus);
 #else
-	TRACE(cdaudio,"status=%02X !\n",
+	TRACE("status=%02X !\n",
 	      wcda->sc.header.audio_status);
 #endif
     }
@@ -304,13 +304,13 @@ BOOL CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda)
 	wcda->sc.what.position.absaddr.msf.frame;
 #endif
 #ifdef linux
-    TRACE(cdaudio,"%02u-%02u:%02u:%02u \n",
+    TRACE("%02u-%02u:%02u:%02u \n",
 	  wcda->sc.cdsc_trk,
 	  wcda->sc.cdsc_absaddr.msf.minute,
 	  wcda->sc.cdsc_absaddr.msf.second,
 	  wcda->sc.cdsc_absaddr.msf.frame);
 #else
-    TRACE(cdaudio,"%02u-%02u:%02u:%02u \n",
+    TRACE("%02u-%02u:%02u:%02u \n",
 	  wcda->sc.what.position.track_number,
 	  wcda->sc.what.position.absaddr.msf.minute,
 	  wcda->sc.what.position.absaddr.msf.second,
@@ -319,7 +319,7 @@ BOOL CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda)
     
     if (oldmode != wcda->cdaMode && oldmode == WINE_CDA_OPEN) {
 	if (!CDAUDIO_GetTracksInfo(wcda)) {
-	    WARN(cdaudio, "error updating TracksInfo !\n");
+	    WARN("error updating TracksInfo !\n");
 	    return FALSE;
 	}
     }
@@ -362,7 +362,7 @@ int	CDAUDIO_Play(WINE_CDAUDIO* wcda, DWORD start, DWORD end)
     if (ioctl(wcda->unixdev, CDIOCSTART, NULL))
 #endif
     {
-	WARN(cdaudio, "motor doesn't start !\n");
+	WARN("motor doesn't start !\n");
 	return -1;
     }
 #ifdef linux
@@ -371,15 +371,15 @@ int	CDAUDIO_Play(WINE_CDAUDIO* wcda, DWORD start, DWORD end)
     if (ioctl(wcda->unixdev, CDIOCPLAYMSF, &msf))
 #endif
     {
-	WARN(cdaudio, "device doesn't play !\n");
+	WARN("device doesn't play !\n");
 	return -1;
     }
 #ifdef linux
-    TRACE(cdaudio,"msf = %d:%d:%d %d:%d:%d\n",
+    TRACE("msf = %d:%d:%d %d:%d:%d\n",
 	  msf.cdmsf_min0, msf.cdmsf_sec0, msf.cdmsf_frame0,
 	  msf.cdmsf_min1, msf.cdmsf_sec1, msf.cdmsf_frame1);
 #else
-    TRACE(cdaudio,"msf = %d:%d:%d %d:%d:%d\n",
+    TRACE("msf = %d:%d:%d %d:%d:%d\n",
 	  msf.start_m, msf.start_s, msf.start_f,
 	  msf.end_m,   msf.end_s,   msf.end_f);
 #endif
@@ -440,7 +440,7 @@ int	CDAUDIO_Seek(WINE_CDAUDIO* wcda, DWORD at)
    /* FIXME: the current end for play is lost 
     * use end of CD ROM instead
     */
-   FIXME(cdaudio, "Could a BSD expert implement the seek function ?\n");
+   FIXME("Could a BSD expert implement the seek function ?\n");
    CDAUDIO_Play(wcda, at, wcda->lpdwTrackPos[wcda->nTracks] + wcda->lpdwTrackLen[wcda->nTracks]);
    
 #endif

misc/cpu.c

@@ -15,7 +15,7 @@
 #include "winnt.h"
 #include "winerror.h"
 #include "winreg.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(reg)
 
@@ -76,7 +76,7 @@ VOID WINAPI GetSystemInfo(
 
         /* Create this registry key for all systems */
 	if (RegCreateKey16(HKEY_LOCAL_MACHINE,"HARDWARE\\DESCRIPTION\\System\\CentralProcessor",&hkey)!=ERROR_SUCCESS) {
-            WARN(reg,"Unable to register CPU information\n");
+            WARN("Unable to register CPU information\n");
         }
 
 #ifdef linux

misc/error.c

@@ -9,7 +9,7 @@
 
 #include "windef.h"
 #include "stackframe.h"
-#include "debug.h"
+#include "debugtools.h"
 
 #define ErrorString(manifest) { manifest, # manifest }
 
@@ -140,7 +140,7 @@ static const char *GetParamErrorString(UINT16 uErr) {
 */
 VOID WINAPI LogError16(UINT16 uErr, LPVOID lpvInfo)
 {
-	MSG("(%s, %p)\n", GetErrorString(uErr), lpvInfo);
+	MESSAGE("(%s, %p)\n", GetErrorString(uErr), lpvInfo);
 }
 
 
@@ -152,7 +152,7 @@ void WINAPI LogParamError16(UINT16 uErr, FARPROC16 lpfn, LPVOID lpvParam)
 	/* FIXME: is it possible to get the module name/function
 	 * from the lpfn param?
 	 */
-	MSG("(%s, %p, %p)\n", GetParamErrorString(uErr), lpfn, lpvParam);
+	MESSAGE("(%s, %p, %p)\n", GetParamErrorString(uErr), lpfn, lpvParam);
 }
 
 /***********************************************************************

misc/lstr.c

@@ -31,7 +31,7 @@
 #include "ldt.h"
 #include "stackframe.h"
 #include "module.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(resource)
 
@@ -520,10 +520,10 @@ DWORD WINAPI FormatMessageA(
 	DWORD	width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK;
 	DWORD	nolinefeed = 0;
 
-	TRACE(resource, "(0x%lx,%p,%ld,0x%lx,%p,%ld,%p)\n",
+	TRACE("(0x%lx,%p,%ld,0x%lx,%p,%ld,%p)\n",
 		     dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args);
 	if (width) 
-		FIXME(resource,"line wrapping not supported.\n");
+		FIXME("line wrapping not supported.\n");
 	from = NULL;
 	if (dwFlags & FORMAT_MESSAGE_FROM_STRING)
 		from = HEAP_strdupA( GetProcessHeap(), 0, (LPSTR)lpSource);
@@ -657,7 +657,7 @@ DWORD WINAPI FormatMessageA(
 	if (nSize && talloced<nSize) {
 		target = (char*)HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,nSize);
 	}
-    TRACE(resource,"-- %s\n",debugstr_a(target));
+    TRACE("-- %s\n",debugstr_a(target));
 	if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) {
 		/* nSize is the MINIMUM size */
 		*((LPVOID*)lpBuffer) = (LPVOID)LocalAlloc(GMEM_ZEROINIT,talloced);
@@ -696,10 +696,10 @@ DWORD WINAPI FormatMessageW(
 	DWORD	width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK;
 	DWORD	nolinefeed = 0;
 
-	TRACE(resource, "(0x%lx,%p,%ld,0x%lx,%p,%ld,%p)\n",
+	TRACE("(0x%lx,%p,%ld,0x%lx,%p,%ld,%p)\n",
 		     dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args);
 	if (width) 
-		FIXME(resource,"line wrapping not supported.\n");
+		FIXME("line wrapping not supported.\n");
 	from = NULL;
 	if (dwFlags & FORMAT_MESSAGE_FROM_STRING)
 		from = HEAP_strdupWtoA(GetProcessHeap(),0,(LPWSTR)lpSource);

misc/lzexpand.c

@@ -16,7 +16,7 @@
 #include "file.h"
 #include "heap.h"
 #include "lzexpand.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(file)
 
@@ -121,7 +121,7 @@ static INT read_header(HFILE fd,struct lzfileheader *head)
  */
 INT16 WINAPI LZStart16(void)
 {
-    TRACE(file,"(void)\n");
+    TRACE("(void)\n");
     return 1;
 }
 
@@ -131,7 +131,7 @@ INT16 WINAPI LZStart16(void)
  */
 INT WINAPI LZStart(void)
 {
-    TRACE(file,"(void)\n");
+    TRACE("(void)\n");
     return 1;
 }
 
@@ -167,7 +167,7 @@ HFILE WINAPI LZInit( HFILE hfSrc )
 	DWORD	ret;
         int i;
 
-	TRACE(file,"(%d)\n",hfSrc);
+	TRACE("(%d)\n",hfSrc);
 	ret=read_header(hfSrc,&head);
 	if (ret<=0) {
 		_llseek(hfSrc,0,SEEK_SET);
@@ -199,7 +199,7 @@ HFILE WINAPI LZInit( HFILE hfSrc )
  */
 void WINAPI LZDone(void)
 {
-    TRACE(file,"(void)\n");
+    TRACE("(void)\n");
 }
 
 
@@ -231,7 +231,7 @@ INT WINAPI GetExpandedNameA( LPCSTR in, LPSTR out )
 	INT		fnislowercased,ret,len;
 	LPSTR		s,t;
 
-	TRACE(file,"(%s)\n",in);
+	TRACE("(%s)\n",in);
 	fd=OpenFile(in,&ofs,OF_READ);
 	if (fd==HFILE_ERROR)
 		return (INT)(INT16)LZERROR_BADINHANDLE;
@@ -253,7 +253,7 @@ INT WINAPI GetExpandedNameA( LPCSTR in, LPSTR out )
 	/* now mangle the basename */
 	if (!*s) {
 		/* FIXME: hmm. shouldn't happen? */
-		WARN(file,"Specified a directory or what? (%s)\n",in);
+		WARN("Specified a directory or what? (%s)\n",in);
 		_lclose(fd);
 		return 1;
 	}
@@ -328,7 +328,7 @@ INT WINAPI LZRead( HFILE fd, LPVOID vbuf, UINT toread )
 	struct	lzstate	*lzs;
 
 	buf=(LPBYTE)vbuf;
-	TRACE(file,"(%d,%p,%d)\n",fd,buf,toread);
+	TRACE("(%d,%p,%d)\n",fd,buf,toread);
 	howmuch=toread;
 	if (!(lzs = GET_LZ_STATE(fd))) return _lread(fd,buf,toread);
 
@@ -427,7 +427,7 @@ LONG WINAPI LZSeek( HFILE fd, LONG off, INT type )
 	struct	lzstate	*lzs;
 	LONG	newwanted;
 
-	TRACE(file,"(%d,%ld,%d)\n",fd,off,type);
+	TRACE("(%d,%ld,%d)\n",fd,off,type);
 	/* not compressed? just use normal _llseek() */
         if (!(lzs = GET_LZ_STATE(fd))) return _llseek(fd,off,type);
 	newwanted = lzs->realwanted;
@@ -495,7 +495,7 @@ LONG WINAPI LZCopy( HFILE src, HFILE dest )
 
 	_readfun	xread;
 
-	TRACE(file,"(%d,%d)\n",src,dest);
+	TRACE("(%d,%d)\n",src,dest);
 	if (!IS_LZ_HANDLE(src)) {
 		src = LZInit(src);
                 if ((INT)src <= 0) return 0;
@@ -570,7 +570,7 @@ HFILE WINAPI LZOpenFileA( LPCSTR fn, LPOFSTRUCT ofs, UINT mode )
 {
 	HFILE	fd,cfd;
 
-	TRACE(file,"(%s,%p,%d)\n",fn,ofs,mode);
+	TRACE("(%s,%p,%d)\n",fn,ofs,mode);
 	/* 0x70 represents all OF_SHARE_* flags, ignore them for the check */
 	fd=OpenFile(fn,ofs,mode);
 	if (fd==HFILE_ERROR)
@@ -628,7 +628,7 @@ void WINAPI LZClose( HFILE fd )
 {
 	struct lzstate *lzs;
 
-	TRACE(file,"(%d)\n",fd);
+	TRACE("(%d)\n",fd);
         if (!(lzs = GET_LZ_STATE(fd))) _lclose(fd);
         else
         {
@@ -644,7 +644,7 @@ void WINAPI LZClose( HFILE fd )
  */
 LONG WINAPI CopyLZFile16( HFILE16 src, HFILE16 dest )
 {
-    TRACE(file,"(%d,%d)\n",src,dest);
+    TRACE("(%d,%d)\n",src,dest);
     return LZCopy16(src,dest);
 }
 
@@ -657,6 +657,6 @@ LONG WINAPI CopyLZFile16( HFILE16 src, HFILE16 dest )
  */
 LONG WINAPI CopyLZFile( HFILE src, HFILE dest )
 {
-    TRACE(file,"(%d,%d)\n",src,dest);
+    TRACE("(%d,%d)\n",src,dest);
     return LZCopy(src,dest);
 }

misc/main.c

@@ -30,7 +30,7 @@
 #include "options.h"
 #include "desktop.h"
 #include "builtin32.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "debugdefs.h"
 #include "xmalloc.h"
 #include "module.h"
@@ -143,7 +143,7 @@ static char szUsage[] =
  */
 void MAIN_Usage( char *name )
 {
-    MSG( szUsage, WINE_RELEASE_INFO, name );
+    MESSAGE( szUsage, WINE_RELEASE_INFO, name );
     exit(1);
 }
 
@@ -290,28 +290,28 @@ BOOL MAIN_ParseDebugOptions(char *options)
     return TRUE;
 
  error:  
-  MSG("%s: Syntax: -debugmsg [class]+xxx,...  or "
+  MESSAGE("%s: Syntax: -debugmsg [class]+xxx,...  or "
       "-debugmsg [class]-xxx,...\n",Options.argv[0]);
-  MSG("Example: -debugmsg +all,warn-heap\n"
+  MESSAGE("Example: -debugmsg +all,warn-heap\n"
       "  turn on all messages except warning heap messages\n");
-  MSG("Special case: -debugmsg +relay=DLL:DLL.###:FuncName\n"
+  MESSAGE("Special case: -debugmsg +relay=DLL:DLL.###:FuncName\n"
       "  turn on -debugmsg +relay only as specified\n"
       "Special case: -debugmsg -relay=DLL:DLL.###:FuncName\n"
       "  turn on -debugmsg +relay except as specified\n"
       "Also permitted, +snoop=..., -snoop=... as with relay.\n\n");
   
-  MSG("Available message classes:\n");
+  MESSAGE("Available message classes:\n");
   for(i=0;i<DEBUG_CLASS_COUNT;i++)
-    MSG( "%-9s", debug_cl_name[i]);
-  MSG("\n\n");
+    MESSAGE( "%-9s", debug_cl_name[i]);
+  MESSAGE("\n\n");
   
-  MSG("Available message types:\n");
-  MSG("%-9s ","all");
+  MESSAGE("Available message types:\n");
+  MESSAGE("%-9s ","all");
   for(i=0;i<DEBUG_CHANNEL_COUNT;i++)
     if(debug_ch_name[i])
-      MSG("%-9s%c",debug_ch_name[i],
+      MESSAGE("%-9s%c",debug_ch_name[i],
 	  (((i+2)%8==0)?'\n':' '));
-  MSG("\n\n");
+  MESSAGE("\n\n");
   exit(1);
 }
 
@@ -680,9 +680,9 @@ void MAIN_ParseLanguageOption( char *arg )
     const WINE_LANGUAGE_DEF *p = Languages;
 
 /* for compatibility whith non-iso names previously used */
-    if (!strcmp("Sw",arg)) { strcpy(arg,"Sv"); FIXME(system,"use 'Sv' instead of 'Sw'\n");}
-    if (!strcmp("Cz",arg)) { strcpy(arg,"Cs"); FIXME(system,"use 'Cs' instead of 'Cz'\n");}
-    if (!strcmp("Po",arg)) { strcpy(arg,"Pt"); FIXME(system,"use 'Pt' instead of 'Po'\n");}
+    if (!strcmp("Sw",arg)) { strcpy(arg,"Sv"); FIXME_(system)("use 'Sv' instead of 'Sw'\n");}
+    if (!strcmp("Cz",arg)) { strcpy(arg,"Cs"); FIXME_(system)("use 'Cs' instead of 'Cz'\n");}
+    if (!strcmp("Po",arg)) { strcpy(arg,"Pt"); FIXME_(system)("use 'Pt' instead of 'Po'\n");}
 
     Options.language = LANG_Xx;  /* First (dummy) language */
     for (;p->name;p++)
@@ -694,9 +694,9 @@ void MAIN_ParseLanguageOption( char *arg )
 	}
         Options.language++;
     }
-    MSG( "Invalid language specified '%s'. Supported languages are: ", arg );
-    for (p = Languages; p->name; p++) MSG( "%s ", p->name );
-    MSG( "\n" );
+    MESSAGE( "Invalid language specified '%s'. Supported languages are: ", arg );
+    for (p = Languages; p->name; p++) MESSAGE( "%s ", p->name );
+    MESSAGE( "\n" );
     exit(1);
 }
 
@@ -712,8 +712,8 @@ void MAIN_ParseModeOption( char *arg )
     else if (!lstrcmpiA("standard", arg)) Options.mode = MODE_STANDARD;
     else
     {
-        MSG( "Invalid mode '%s' specified.\n", arg);
-        MSG( "Valid modes are: 'standard', 'enhanced' (default).\n");
+        MESSAGE( "Invalid mode '%s' specified.\n", arg);
+        MESSAGE( "Valid modes are: 'standard', 'enhanced' (default).\n");
 	exit(1);
     }
 }
@@ -744,7 +744,7 @@ static void MAIN_ParseOptions( int *argc, char *argv[] )
     {
         if (!strcmp( argv[i], "-v" ) || !strcmp( argv[i], "-version" ))
         {
-            MSG( "%s\n", WINE_RELEASE_INFO );
+            MESSAGE( "%s\n", WINE_RELEASE_INFO );
             exit(0);
         }
         if (!strcmp( argv[i], "-h" ) || !strcmp( argv[i], "-help" ))
@@ -784,11 +784,11 @@ BOOL MAIN_WineInit( int *argc, char *argv[] )
     mcheck(NULL);
     if (!(trace = getenv("MALLOC_TRACE")))
     {       
-        MSG( "MALLOC_TRACE not set. No trace generated\n" );
+        MESSAGE( "MALLOC_TRACE not set. No trace generated\n" );
     }
     else
     {
-        MSG( "malloc trace goes to %s\n", trace );
+        MESSAGE( "malloc trace goes to %s\n", trace );
         mtrace();
     }
 #endif
@@ -1031,7 +1031,7 @@ BOOL WINAPI SystemParametersInfoA( UINT uAction, UINT uParam,
                 LPANIMATIONINFO lpAnimInfo = (LPANIMATIONINFO)lpvParam;
  
                 /* Do nothing */
-                WARN(system, "SPI_SETANIMATION ignored.\n");
+                WARN_(system)("SPI_SETANIMATION ignored.\n");
                 lpAnimInfo->cbSize = sizeof(ANIMATIONINFO);
                 uParam = sizeof(ANIMATIONINFO);
                 break;
@@ -1041,7 +1041,7 @@ BOOL WINAPI SystemParametersInfoA( UINT uAction, UINT uParam,
         {
                 LPHIGHCONTRASTA lpHighContrastA = (LPHIGHCONTRASTA)lpvParam;
 
-                FIXME(system,"SPI_GETHIGHCONTRAST not fully implemented\n");
+                FIXME_(system)("SPI_GETHIGHCONTRAST not fully implemented\n");
 
                 if ( lpHighContrastA->cbSize == sizeof( HIGHCONTRASTA ) )
                 {
@@ -1224,7 +1224,7 @@ BOOL16 WINAPI SystemParametersInfo16( UINT16 uAction, UINT16 uParam,
 		case SPI_SETFASTTASKSWITCH:
 		case SPI_SETKEYBOARDDELAY:
 		case SPI_SETKEYBOARDSPEED:
-			WARN(system, "Option %d ignored.\n", uAction);
+			WARN_(system)("Option %d ignored.\n", uAction);
 			break;
 
                 case SPI_GETWORKAREA:
@@ -1234,7 +1234,7 @@ BOOL16 WINAPI SystemParametersInfo16( UINT16 uAction, UINT16 uParam,
                     break;
 
 		default:
-			WARN(system, "Unknown option %d.\n", uAction);
+			WARN_(system)("Unknown option %d.\n", uAction);
 			break;
 	}
 	return 1;
@@ -1307,7 +1307,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uAction, UINT uParam,
     {
        LPHIGHCONTRASTW lpHighContrastW = (LPHIGHCONTRASTW)lpvParam;
 
-       FIXME(system,"SPI_GETHIGHCONTRAST not fully implemented\n");
+       FIXME_(system)("SPI_GETHIGHCONTRAST not fully implemented\n");
 
        if ( lpHighContrastW->cbSize == sizeof( HIGHCONTRASTW ) )
        {
@@ -1336,6 +1336,6 @@ BOOL WINAPI SystemParametersInfoW( UINT uAction, UINT uParam,
 */
 FARPROC16 WINAPI FileCDR16(FARPROC16 x)
 {
-	FIXME(file,"(0x%8x): stub\n", (int) x);
+	FIXME_(file)("(0x%8x): stub\n", (int) x);
 	return (FARPROC16)TRUE;
 }

misc/sound.c

@@ -5,56 +5,56 @@
 #include <stdlib.h>
 #include "windef.h"
 #include "wine/winesound.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(sound)
 
 INT16 WINAPI OpenSound16(void)
 {
-  FIXME(sound, "(void): stub\n");
+  FIXME("(void): stub\n");
   return -1;
 }
 
 void WINAPI OpenSound(void)
 {
-  FIXME(sound, "(void): stub\n");
+  FIXME("(void): stub\n");
 }
 
 void WINAPI CloseSound16(void)
 {
-  FIXME(sound, "(void): stub\n");
+  FIXME("(void): stub\n");
 }
 
 INT16 WINAPI SetVoiceQueueSize16(INT16 nVoice, INT16 nBytes)
 {
-  FIXME(sound, "(%d,%d): stub\n",nVoice,nBytes);
+  FIXME("(%d,%d): stub\n",nVoice,nBytes);
   return 0;
 }
 
 DWORD WINAPI SetVoiceQueueSize(DWORD nVoice, DWORD nBytes)
 {
-  FIXME(sound, "(%ld,%ld): stub\n",nVoice,nBytes);
+  FIXME("(%ld,%ld): stub\n",nVoice,nBytes);
   return 0;
 }
 
 INT16 WINAPI SetVoiceNote16(INT16 nVoice, INT16 nValue, INT16 nLength,
                             INT16 nCdots)
 {
-  FIXME(sound, "(%d,%d,%d,%d): stub\n",nVoice,nValue,nLength,nCdots);
+  FIXME("(%d,%d,%d,%d): stub\n",nVoice,nValue,nLength,nCdots);
   return 0;
 }
 
 DWORD WINAPI SetVoiceNote(DWORD nVoice, DWORD nValue, DWORD nLength,
                             DWORD nCdots)
 {
-  FIXME(sound, "(%ld,%ld,%ld,%ld): stub\n",nVoice,nValue,nLength,nCdots);
+  FIXME("(%ld,%ld,%ld,%ld): stub\n",nVoice,nValue,nLength,nCdots);
   return 0;
 }
 
 INT16 WINAPI SetVoiceAccent16(INT16 nVoice, INT16 nTempo, INT16 nVolume,
                               INT16 nMode, INT16 nPitch)
 {
-  FIXME(sound, "(%d,%d,%d,%d,%d): stub\n", nVoice, nTempo, 
+  FIXME("(%d,%d,%d,%d,%d): stub\n", nVoice, nTempo, 
 	nVolume, nMode, nPitch);
   return 0;
 }
@@ -62,44 +62,44 @@ INT16 WINAPI SetVoiceAccent16(INT16 nVoice, INT16 nTempo, INT16 nVolume,
 DWORD WINAPI SetVoiceAccent(DWORD nVoice, DWORD nTempo, DWORD nVolume,
                               DWORD nMode, DWORD nPitch)
 {
-  FIXME(sound, "(%ld,%ld,%ld,%ld,%ld): stub\n", nVoice, nTempo, 
+  FIXME("(%ld,%ld,%ld,%ld,%ld): stub\n", nVoice, nTempo, 
 	nVolume, nMode, nPitch);
   return 0;
 }
 
 INT16 WINAPI SetVoiceEnvelope16(INT16 nVoice, INT16 nShape, INT16 nRepeat)
 {
-  FIXME(sound, "(%d,%d,%d): stub\n",nVoice,nShape,nRepeat);
+  FIXME("(%d,%d,%d): stub\n",nVoice,nShape,nRepeat);
   return 0;
 }
 
 DWORD WINAPI SetVoiceEnvelope(DWORD nVoice, DWORD nShape, DWORD nRepeat)
 {
-  FIXME(sound, "(%ld,%ld,%ld): stub\n",nVoice,nShape,nRepeat);
+  FIXME("(%ld,%ld,%ld): stub\n",nVoice,nShape,nRepeat);
   return 0;
 }
 
 INT16 WINAPI SetSoundNoise16(INT16 nSource, INT16 nDuration)
 {
-  FIXME(sound, "(%d,%d): stub\n",nSource,nDuration);
+  FIXME("(%d,%d): stub\n",nSource,nDuration);
   return 0;
 }
 
 DWORD WINAPI SetSoundNoise(DWORD nSource, DWORD nDuration)
 {
-  FIXME(sound, "(%ld,%ld): stub\n",nSource,nDuration);
+  FIXME("(%ld,%ld): stub\n",nSource,nDuration);
   return 0;
 }
 
 INT16 WINAPI SetVoiceSound16(INT16 nVoice, DWORD lFrequency, INT16 nDuration)
 {
-  FIXME(sound, "(%d, %ld, %d): stub\n",nVoice,lFrequency, nDuration);
+  FIXME("(%d, %ld, %d): stub\n",nVoice,lFrequency, nDuration);
   return 0;
 }
 
 DWORD WINAPI SetVoiceSound(DWORD nVoice, DWORD lFrequency, DWORD nDuration)
 {
-  FIXME(sound, "(%ld, %ld, %ld): stub\n",nVoice,lFrequency, nDuration);
+  FIXME("(%ld, %ld, %ld): stub\n",nVoice,lFrequency, nDuration);
   return 0;
 }
 
@@ -115,79 +115,79 @@ INT16 WINAPI StopSound16(void)
 
 INT16 WINAPI WaitSoundState16(INT16 x)
 {
-    FIXME(sound, "(%d): stub\n", x);
+    FIXME("(%d): stub\n", x);
     return 0;
 }
 
 DWORD WINAPI WaitSoundState(DWORD x)
 {
-    FIXME(sound, "(%ld): stub\n", x);
+    FIXME("(%ld): stub\n", x);
     return 0;
 }
 
 INT16 WINAPI SyncAllVoices16(void)
 {
-    FIXME(sound, "(void): stub\n");
+    FIXME("(void): stub\n");
     return 0;
 }
 
 DWORD WINAPI SyncAllVoices(void)
 {
-    FIXME(sound, "(void): stub\n");
+    FIXME("(void): stub\n");
     return 0;
 }
 
 INT16 WINAPI CountVoiceNotes16(INT16 x)
 {
-    FIXME(sound, "(%d): stub\n", x);
+    FIXME("(%d): stub\n", x);
     return 0;
 }
 
 DWORD WINAPI CountVoiceNotes(DWORD x)
 {
-    FIXME(sound, "(%ld): stub\n", x);
+    FIXME("(%ld): stub\n", x);
     return 0;
 }
 
 LPINT16 WINAPI GetThresholdEvent16(void)
 {
-    FIXME(sound, "(void): stub\n");
+    FIXME("(void): stub\n");
     return NULL;
 }
 
 LPDWORD WINAPI GetThresholdEvent(void)
 {
-    FIXME(sound, "(void): stub\n");
+    FIXME("(void): stub\n");
     return NULL;
 }
 
 INT16 WINAPI GetThresholdStatus16(void)
 {
-    FIXME(sound, "(void): stub\n");
+    FIXME("(void): stub\n");
     return 0;
 }
 
 DWORD WINAPI GetThresholdStatus(void)
 {
-    FIXME(sound, "(void): stub\n");
+    FIXME("(void): stub\n");
     return 0;
 }
 
 INT16 WINAPI SetVoiceThreshold16(INT16 a, INT16 b)
 {
-    FIXME(sound, "(%d,%d): stub\n", a, b);
+    FIXME("(%d,%d): stub\n", a, b);
     return 0;
 }
 
 DWORD WINAPI SetVoiceThreshold(DWORD a, DWORD b)
 {
-    FIXME(sound, "(%ld,%ld): stub\n", a, b);
+    FIXME("(%ld,%ld): stub\n", a, b);
     return 0;
 }
 
 void WINAPI DoBeep16(void)
 {
-    FIXME(sound, "(void): stub!\n");
+    FIXME("(void): stub!\n");
 }
 
 

misc/spy.c

@@ -12,7 +12,7 @@
 #include "win.h"
 #include "module.h"
 #include "options.h"
-#include "debug.h"
+#include "debugtools.h"
 #include "spy.h"
 
 DEFAULT_DEBUG_CHANNEL(message)
@@ -670,22 +670,22 @@ void SPY_DumpStructure (UINT msg, LPARAM structure)
 	{
 	    case WM_DRAWITEM:
 		{   DRAWITEMSTRUCT *lpdis = (DRAWITEMSTRUCT*) structure;
-		    TRACE(message, "DRAWITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n", lpdis->CtlType, lpdis->CtlID);
-		    TRACE(message, "itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n", lpdis->itemID, lpdis->itemAction, lpdis->itemState);
-		    TRACE(message, "hWnd=0x%04x hDC=0x%04x (%d,%d)-(%d,%d) itemData=0x%08lx\n",
+		    TRACE("DRAWITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n", lpdis->CtlType, lpdis->CtlID);
+		    TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n", lpdis->itemID, lpdis->itemAction, lpdis->itemState);
+		    TRACE("hWnd=0x%04x hDC=0x%04x (%d,%d)-(%d,%d) itemData=0x%08lx\n",
 		    lpdis->hwndItem, lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top, lpdis->rcItem.right, lpdis->rcItem.bottom, lpdis->itemData);
 		}
 		break;
 	    case WM_MEASUREITEM:
 		{   MEASUREITEMSTRUCT *lpmis = (MEASUREITEMSTRUCT*) structure;
-		    TRACE(message, "MEASUREITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n", lpmis->CtlType, lpmis->CtlID);
-		    TRACE(message, "itemID=0x%08x itemWidth=0x%08x itemHeight=0x%08x\n", lpmis->itemID, lpmis->itemWidth, lpmis->itemHeight);
-		    TRACE(message, "itemData=0x%08lx\n", lpmis->itemData);
+		    TRACE("MEASUREITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n", lpmis->CtlType, lpmis->CtlID);
+		    TRACE("itemID=0x%08x itemWidth=0x%08x itemHeight=0x%08x\n", lpmis->itemID, lpmis->itemWidth, lpmis->itemHeight);
+		    TRACE("itemData=0x%08lx\n", lpmis->itemData);
 		}
 		break;
 	    case WM_NOTIFY:
 		{   NMHDR * pnmh = (NMHDR*) structure;
-		    TRACE(message, "NMHDR hwndFrom=0x%08x idFrom=0x%08x code=0x%08x\n", pnmh->hwndFrom, pnmh->idFrom, pnmh->code);
+		    TRACE("NMHDR hwndFrom=0x%08x idFrom=0x%08x code=0x%08x\n", pnmh->hwndFrom, pnmh->idFrom, pnmh->code);
 		}
 	    default:
 		break;
@@ -707,14 +707,14 @@ void SPY_EnterMessage( INT iFlag, HWND hWnd, UINT msg,
     {
     case SPY_DISPATCHMESSAGE16:
 	pname = SPY_GetWndName(hWnd);
-        TRACE(message,"%*s(%04x) %-16s message [%04x] %s dispatched  wp=%04x lp=%08lx\n",
+        TRACE("%*s(%04x) %-16s message [%04x] %s dispatched  wp=%04x lp=%08lx\n",
                         SPY_IndentLevel, "", hWnd, pname, msg, SPY_GetMsgName( msg ),
                         wParam, lParam);
         break;
 
     case SPY_DISPATCHMESSAGE:
 	pname = SPY_GetWndName(hWnd);
-        TRACE(message,"%*s(%08x) %-16s message [%04x] %s dispatched  wp=%08x lp=%08lx\n",
+        TRACE("%*s(%08x) %-16s message [%04x] %s dispatched  wp=%08x lp=%08lx\n",
                         SPY_IndentLevel, "", hWnd, pname, msg, SPY_GetMsgName( msg ),
                         wParam, lParam);
         break;
@@ -735,11 +735,11 @@ void SPY_EnterMessage( INT iFlag, HWND hWnd, UINT msg,
 	    pname = SPY_GetWndName(hWnd);
 
             if (iFlag == SPY_SENDMESSAGE16)
-                TRACE(message, "%*s(%04x) %-16s message [%04x] %s sent from %s wp=%04x lp=%08lx\n",
+                TRACE("%*s(%04x) %-16s message [%04x] %s sent from %s wp=%04x lp=%08lx\n",
 			     SPY_IndentLevel, "", hWnd, pname, msg, SPY_GetMsgName( msg ), 
 			     taskName, wParam, lParam );
             else
-            {   TRACE(message, "%*s(%08x) %-16s message [%04x] %s sent from %s wp=%08x lp=%08lx\n",
+            {   TRACE("%*s(%08x) %-16s message [%04x] %s sent from %s wp=%08x lp=%08lx\n",
 			     SPY_IndentLevel, "", hWnd, pname, msg, SPY_GetMsgName( msg ), 
 			     taskName, wParam, lParam );
 		SPY_DumpStructure(msg, lParam);
@@ -749,14 +749,14 @@ void SPY_EnterMessage( INT iFlag, HWND hWnd, UINT msg,
 
     case SPY_DEFWNDPROC16:
 	if( SPY_ExcludeDWP ) return;
-        TRACE(message, "%*s(%04x)  DefWindowProc16: %s [%04x]  wp=%04x lp=%08lx\n",
+        TRACE("%*s(%04x)  DefWindowProc16: %s [%04x]  wp=%04x lp=%08lx\n",
                         SPY_IndentLevel, "", hWnd, SPY_GetMsgName( msg ),
                         msg, wParam, lParam );
         break;
 
     case SPY_DEFWNDPROC:
 	if( SPY_ExcludeDWP ) return;
-        TRACE(message, "%*s(%08x)  DefWindowProc32: %s [%04x]  wp=%08x lp=%08lx\n",
+        TRACE("%*s(%08x)  DefWindowProc32: %s [%04x]  wp=%08x lp=%08lx\n",
                         SPY_IndentLevel, "", hWnd, SPY_GetMsgName( msg ),
                         msg, wParam, lParam );
         break;
@@ -781,39 +781,39 @@ void SPY_ExitMessage( INT iFlag, HWND hWnd, UINT msg, LRESULT lReturn )
     switch(iFlag)
     {
     case SPY_RESULT_DEFWND16:
-	TRACE(message," %*s(%04x)  DefWindowProc16: %s [%04x] returned %08lx\n",
+	TRACE(" %*s(%04x)  DefWindowProc16: %s [%04x] returned %08lx\n",
 			SPY_IndentLevel, "", hWnd, SPY_GetMsgName( msg ), msg, lReturn );
 	break;
 
     case SPY_RESULT_DEFWND:
-	TRACE(message," %*s(%08x)  DefWindowProc32: %s [%04x] returned %08lx\n",
+	TRACE(" %*s(%08x)  DefWindowProc32: %s [%04x] returned %08lx\n",
 			SPY_IndentLevel, "", hWnd, SPY_GetMsgName( msg ), msg, lReturn );
 	break;
 
     case SPY_RESULT_OK16:
 	pname = SPY_GetWndName(hWnd);
-        TRACE(message," %*s(%04x) %-16s message [%04x] %s returned %08lx\n",
+        TRACE(" %*s(%04x) %-16s message [%04x] %s returned %08lx\n",
                         SPY_IndentLevel, "", hWnd, pname, msg,
                         SPY_GetMsgName( msg ), lReturn );
         break;
 
     case SPY_RESULT_OK:
 	pname = SPY_GetWndName(hWnd);
-        TRACE(message," %*s(%08x) %-16s message [%04x] %s returned %08lx\n",
+        TRACE(" %*s(%08x) %-16s message [%04x] %s returned %08lx\n",
                         SPY_IndentLevel, "", hWnd, pname, msg,
                         SPY_GetMsgName( msg ), lReturn );
         break; 
 
     case SPY_RESULT_INVALIDHWND16:
 	pname = SPY_GetWndName(hWnd);
-        WARN(message, " %*s(%04x) %-16s message [%04x] %s HAS INVALID HWND\n",
+        WARN(" %*s(%04x) %-16s message [%04x] %s HAS INVALID HWND\n",
                         SPY_IndentLevel, "", hWnd, pname, msg,
                         SPY_GetMsgName( msg ) );
         break;
 
     case SPY_RESULT_INVALIDHWND:
 	pname = SPY_GetWndName(hWnd);
-        WARN(message, " %*s(%08x) %-16s message [%04x] %s HAS INVALID HWND\n",
+        WARN(" %*s(%08x) %-16s message [%04x] %s HAS INVALID HWND\n",
                         SPY_IndentLevel, "", hWnd, pname, msg,
                         SPY_GetMsgName( msg ) );
         break;
@@ -834,7 +834,7 @@ int SPY_Init(void)
     PROFILE_GetWineIniString( "Spy", "Include", "", buffer, sizeof(buffer) );
     if (buffer[0] && strcmp( buffer, "INCLUDEALL" ))
     {
-        TRACE(message, "Include=%s\n", buffer );
+        TRACE("Include=%s\n", buffer );
         for (i = 0; i <= SPY_MAX_MSGNUM; i++)
             SPY_Exclude[i] = (MessageTypeNames[i] && !strstr(buffer,MessageTypeNames[i]));
     }
@@ -842,7 +842,7 @@ int SPY_Init(void)
     PROFILE_GetWineIniString( "Spy", "Exclude", "", buffer, sizeof(buffer) );
     if (buffer[0])
     {
-        TRACE(message, "Exclude=%s\n", buffer );
+        TRACE("Exclude=%s\n", buffer );
         if (!strcmp( buffer, "EXCLUDEALL" ))
             for (i = 0; i <= SPY_MAX_MSGNUM; i++) SPY_Exclude[i] = TRUE;
         else

misc/stress.c

 #include <limits.h>
 #include "stress.h"
-#include "debug.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(stress)
 
 
 int WINAPI AllocDiskSpace(long lLeft, UINT16 uDrive)
 {
-	FIXME(stress, "(%d, %ld) - stub\n", 
+	FIXME("(%d, %ld) - stub\n", 
 		       uDrive, lLeft);
 
 	return 1;
@@ -15,7 +15,7 @@ int WINAPI AllocDiskSpace(long lLeft, UINT16 uDrive)
 
 int WINAPI AllocFileHandles(int Left)
 {
-	TRACE(stress, "(%d) - stub\n", Left);
+	TRACE("(%d) - stub\n", Left);
 
 	if (Left < 0)
 		return -1;
@@ -25,48 +25,48 @@ int WINAPI AllocFileHandles(int Left)
 
 BOOL16 WINAPI AllocGDIMem(UINT16 uLeft)
 {
-	TRACE(stress, "(%d) - stub\n", uLeft);
+	TRACE("(%d) - stub\n", uLeft);
 
 	return 1;
 }
 
 BOOL16 WINAPI AllocMem(DWORD dwLeft)
 {
-	FIXME(stress, "(%ld) - stub\n", dwLeft);
+	FIXME("(%ld) - stub\n", dwLeft);
 
 	return 1;
 }
 
 BOOL16 WINAPI AllocUserMem(UINT16 uContig)
 {
-	TRACE(stress, "AllocUserMem %d\n", uContig);
+	TRACE("AllocUserMem %d\n", uContig);
 
 	return 1;
 }
 
 void WINAPI FreeAllMem(void)
 {
-	TRACE(stress, "FreeAllMem\n");
+	TRACE("FreeAllMem\n");
 }
 
 void WINAPI FreeAllGDIMem(void)
 {
-	TRACE(stress, "FreeAllGDIMem\n");
+	TRACE("FreeAllGDIMem\n");
 }
 
 void WINAPI FreeAllUserMem(void)
 {
-	TRACE(stress, "FreeAllUserMem\n");
+	TRACE("FreeAllUserMem\n");
 }
 
 void WINAPI GetFreeAllUserMem(void)
 {
-       TRACE(stress, "GetFreeAllUserMem\n");
+       TRACE("GetFreeAllUserMem\n");
 }
 
 int WINAPI GetFreeFileHandles(void)
 {
-	TRACE(stress, "GetFreeFileHandles\n");
+	TRACE("GetFreeFileHandles\n");
 
 #ifndef OPEN_MAX
 	return _POSIX_OPEN_MAX;
@@ -77,10 +77,10 @@ int WINAPI GetFreeFileHandles(void)
 
 void WINAPI UnAllocDiskSpace(UINT16 drive)
 {
-	TRACE(stress, "UnAllocDiskSpace %d\n", drive);
+	TRACE("UnAllocDiskSpace %d\n", drive);
 }
 
 void WINAPI UnAllocFileHandles(void)
 {
-	TRACE(stress, "GetFreeAllUserMem\n");
+	TRACE("GetFreeAllUserMem\n");
 }