diff --git a/graphics/d3dcommon.c b/graphics/d3dcommon.c index 1dd100c6608aa46e643d3ede04fae689ca4ec7d5..f217996cf37ccbd4836f88f4daea7398449a7d96 100644 --- a/graphics/d3dcommon.c +++ b/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; } diff --git a/graphics/d3ddevices.c b/graphics/d3ddevices.c index d7156da85d6cfafbd14a1ed2972095bf3c3da62a..6e9bca624fc3ac2bd0630533cb93393c4097cc14 100644 --- a/graphics/d3ddevices.c +++ b/graphics/d3ddevices.c @@ -12,7 +12,7 @@ #include "heap.h" #include "ddraw.h" #include "d3d.h" -#include "debug.h" +#include "debugtools.h" #include "d3d_private.h" @@ -59,7 +59,7 @@ static void set_context(IDirect3DDevice2Impl* This) { if (glXMakeCurrent(display, odev->common.surface->s.ddraw->d.drawable, odev->ctx) == False) { - ERR(ddraw, "Error in setting current context (context %p drawable %ld)!\n", + ERR("Error in setting current context (context %p drawable %ld)!\n", odev->ctx, odev->common.surface->s.ddraw->d.drawable); } #endif @@ -77,7 +77,7 @@ static void set_context_dx3(IDirect3DDeviceImpl* This) { if (glXMakeCurrent(display, odev->common.surface->s.ddraw->d.drawable, odev->ctx) == False) { - ERR(ddraw, "Error in setting current context !\n"); + ERR("Error in setting current context !\n"); } #endif } @@ -144,7 +144,7 @@ static void fill_opengl_caps(D3DDEVICEDESC *d1, D3DDEVICEDESC *d2) int d3d_OpenGL(LPD3DENUMDEVICESCALLBACK cb, LPVOID context) { D3DDEVICEDESC d1,d2; - TRACE(ddraw," Enumerating OpenGL D3D device.\n"); + TRACE(" Enumerating OpenGL D3D device.\n"); fill_opengl_caps(&d1, &d2); @@ -184,7 +184,7 @@ int is_OpenGL(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevice2I (*device)->set_context = set_context; - TRACE(ddraw, "Creating OpenGL device for surface %p\n", surface); + TRACE("Creating OpenGL device for surface %p\n", surface); /* Create the OpenGL context */ #ifdef USE_OSMESA @@ -193,7 +193,7 @@ int is_OpenGL(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevice2I surface->s.surface_desc.dwWidth * surface->s.surface_desc.dwHeight * 4); #else /* First get the correct visual */ - TRACE(ddraw, "Backbuffer : %d\n", surface->s.backbuffer == NULL); + TRACE("Backbuffer : %d\n", surface->s.backbuffer == NULL); /* if (surface->s.backbuffer == NULL) attributeList[3] = None; */ ENTER_GL(); @@ -201,18 +201,18 @@ int is_OpenGL(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevice2I DefaultScreen(display), attributeList); if (xvis == NULL) - ERR(ddraw, "No visual found !\n"); + ERR("No visual found !\n"); else - TRACE(ddraw, "Visual found\n"); + TRACE("Visual found\n"); /* Create the context */ odev->ctx = glXCreateContext(display, xvis, NULL, GL_TRUE); if (odev->ctx == NULL) - ERR(ddraw, "Error in context creation !\n"); + ERR("Error in context creation !\n"); else - TRACE(ddraw, "Context created (%p)\n", odev->ctx); + TRACE("Context created (%p)\n", odev->ctx); /* Now override the surface's Flip method (if in double buffering) */ surface->s.d3d_device = (void *) odev; @@ -230,14 +230,14 @@ int is_OpenGL(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevice2I memcpy(odev->proj_mat , id_mat, 16 * sizeof(float)); /* Initialisation */ - TRACE(ddraw, "Setting current context\n"); + TRACE("Setting current context\n"); (*device)->set_context(*device); - TRACE(ddraw, "Current context set\n"); + TRACE("Current context set\n"); glClearColor(0.0, 0.0, 0.0, 0.0); glColor3f(1.0, 1.0, 1.0); LEAVE_GL(); - TRACE(ddraw, "OpenGL device created \n"); + TRACE("OpenGL device created \n"); return 1; } @@ -258,7 +258,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_QueryInterface(LPDIRECT3DDEVICE2 ifac 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; } @@ -268,7 +268,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_QueryInterface(LPDIRECT3DDEVICE2 ifac static ULONG WINAPI IDirect3DDevice2Impl_AddRef(LPDIRECT3DDEVICE2 iface) { ICOM_THIS(IDirect3DDevice2Impl,iface); - TRACE(ddraw, "(%p)->()incrementing from %lu.\n", This, This->ref ); + TRACE("(%p)->()incrementing from %lu.\n", This, This->ref ); return ++(This->ref); } @@ -278,7 +278,7 @@ static ULONG WINAPI IDirect3DDevice2Impl_AddRef(LPDIRECT3DDEVICE2 iface) static ULONG WINAPI IDirect3DDevice2Impl_Release(LPDIRECT3DDEVICE2 iface) { ICOM_THIS(IDirect3DDevice2Impl,iface); - FIXME( ddraw, "(%p)->() decrementing from %lu.\n", This, This->ref ); + FIXME("(%p)->() decrementing from %lu.\n", This, This->ref ); if (!--(This->ref)) { OpenGL_IDirect3DDevice2 *odev = (OpenGL_IDirect3DDevice2 *) This; @@ -306,7 +306,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_GetCaps(LPDIRECT3DDEVICE2 iface, LPD3DDEVICEDESC lpdeschard) { ICOM_THIS(IDirect3DDevice2Impl,iface); - FIXME(ddraw, "(%p)->(%p,%p): stub\n", This, lpdescsoft, lpdeschard); + FIXME("(%p)->(%p,%p): stub\n", This, lpdescsoft, lpdeschard); fill_opengl_caps(lpdescsoft, lpdeschard); @@ -320,7 +320,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_SwapTextureHandles(LPDIRECT3DDEVICE2 LPDIRECT3DTEXTURE2 lptex2) { ICOM_THIS(IDirect3DDevice2Impl,iface); - FIXME(ddraw, "(%p)->(%p,%p): stub\n", This, lptex1, lptex2); + FIXME("(%p)->(%p,%p): stub\n", This, lptex1, lptex2); return DD_OK; } @@ -331,7 +331,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_GetStats(LPDIRECT3DDEVICE2 iface, LPD3DSTATS lpstats) { ICOM_THIS(IDirect3DDevice2Impl,iface); - FIXME(ddraw, "(%p)->(%p): stub\n", This, lpstats); + FIXME("(%p)->(%p): stub\n", This, lpstats); return DD_OK; } @@ -343,7 +343,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_AddViewport(LPDIRECT3DDEVICE2 iface, { ICOM_THIS(IDirect3DDevice2Impl,iface); IDirect3DViewport2Impl* ilpvp=(IDirect3DViewport2Impl*)lpvp; - FIXME(ddraw, "(%p)->(%p): stub\n", This, ilpvp); + FIXME("(%p)->(%p): stub\n", This, ilpvp); /* Adds this viewport to the viewport list */ ilpvp->next = This->viewport_list; @@ -360,7 +360,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_DeleteViewport(LPDIRECT3DDEVICE2 ifac ICOM_THIS(IDirect3DDevice2Impl,iface); IDirect3DViewport2Impl* ilpvp=(IDirect3DViewport2Impl*)lpvp; IDirect3DViewport2Impl *cur, *prev; - FIXME(ddraw, "(%p)->(%p): stub\n", This, lpvp); + FIXME("(%p)->(%p): stub\n", This, lpvp); /* Finds this viewport in the list */ prev = NULL; @@ -391,7 +391,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_NextViewport(LPDIRECT3DDEVICE2 iface, ICOM_THIS(IDirect3DDevice2Impl,iface); IDirect3DViewport2Impl* ilpvp=(IDirect3DViewport2Impl*)lpvp; IDirect3DViewport2Impl** ilplpvp=(IDirect3DViewport2Impl**)lplpvp; - FIXME(ddraw, "(%p)->(%p,%p,%08lx): stub\n", This, lpvp, lpvp, dwFlags); + FIXME("(%p)->(%p,%p,%08lx): stub\n", This, lpvp, lpvp, dwFlags); switch (dwFlags) { case D3DNEXT_NEXT: @@ -430,7 +430,7 @@ static HRESULT enum_texture_format_OpenGL(LPD3DENUMTEXTUREFORMATSCALLBACK cb, pformat->dwSize = sizeof(DDPIXELFORMAT); pformat->dwFourCC = 0; - TRACE(ddraw, "Enumerating GL_RGBA unpacked (32)\n"); + TRACE("Enumerating GL_RGBA unpacked (32)\n"); pformat->dwFlags = DDPF_RGB | DDPF_ALPHAPIXELS; pformat->x.dwRGBBitCount = 32; pformat->y.dwRBitMask = 0xFF000000; @@ -440,7 +440,7 @@ static HRESULT enum_texture_format_OpenGL(LPD3DENUMTEXTUREFORMATSCALLBACK cb, if (cb(&sdesc, context) == 0) return DD_OK; - TRACE(ddraw, "Enumerating GL_RGB unpacked (24)\n"); + TRACE("Enumerating GL_RGB unpacked (24)\n"); pformat->dwFlags = DDPF_RGB; pformat->x.dwRGBBitCount = 24; pformat->y.dwRBitMask = 0x00FF0000; @@ -453,7 +453,7 @@ static HRESULT enum_texture_format_OpenGL(LPD3DENUMTEXTUREFORMATSCALLBACK cb, #ifndef HAVE_BUGGY_MESAGL /* The packed texture format are buggy in Mesa. The bug was reported and corrected, so that future version will work great. */ - TRACE(ddraw, "Enumerating GL_RGB packed GL_UNSIGNED_SHORT_5_6_5 (16)\n"); + TRACE("Enumerating GL_RGB packed GL_UNSIGNED_SHORT_5_6_5 (16)\n"); pformat->dwFlags = DDPF_RGB; pformat->x.dwRGBBitCount = 16; pformat->y.dwRBitMask = 0x0000F800; @@ -463,7 +463,7 @@ static HRESULT enum_texture_format_OpenGL(LPD3DENUMTEXTUREFORMATSCALLBACK cb, if (cb(&sdesc, context) == 0) return DD_OK; - TRACE(ddraw, "Enumerating GL_RGBA packed GL_UNSIGNED_SHORT_5_5_5_1 (16)\n"); + TRACE("Enumerating GL_RGBA packed GL_UNSIGNED_SHORT_5_5_5_1 (16)\n"); pformat->dwFlags = DDPF_RGB | DDPF_ALPHAPIXELS; pformat->x.dwRGBBitCount = 16; pformat->y.dwRBitMask = 0x0000F800; @@ -473,7 +473,7 @@ static HRESULT enum_texture_format_OpenGL(LPD3DENUMTEXTUREFORMATSCALLBACK cb, if (cb(&sdesc, context) == 0) return DD_OK; - TRACE(ddraw, "Enumerating GL_RGBA packed GL_UNSIGNED_SHORT_4_4_4_4 (16)\n"); + TRACE("Enumerating GL_RGBA packed GL_UNSIGNED_SHORT_4_4_4_4 (16)\n"); pformat->dwFlags = DDPF_RGB | DDPF_ALPHAPIXELS; pformat->x.dwRGBBitCount = 16; pformat->y.dwRBitMask = 0x0000F000; @@ -483,7 +483,7 @@ static HRESULT enum_texture_format_OpenGL(LPD3DENUMTEXTUREFORMATSCALLBACK cb, if (cb(&sdesc, context) == 0) return DD_OK; - TRACE(ddraw, "Enumerating GL_RGB packed GL_UNSIGNED_BYTE_3_3_2 (8)\n"); + TRACE("Enumerating GL_RGB packed GL_UNSIGNED_BYTE_3_3_2 (8)\n"); pformat->dwFlags = DDPF_RGB; pformat->x.dwRGBBitCount = 8; pformat->y.dwRBitMask = 0x0000F800; @@ -494,7 +494,7 @@ static HRESULT enum_texture_format_OpenGL(LPD3DENUMTEXTUREFORMATSCALLBACK cb, return DD_OK; #endif - TRACE(ddraw, "Enumerating Paletted (8)\n"); + TRACE("Enumerating Paletted (8)\n"); pformat->dwFlags = DDPF_PALETTEINDEXED8; pformat->x.dwRGBBitCount = 8; pformat->y.dwRBitMask = 0x00000000; @@ -504,7 +504,7 @@ static HRESULT enum_texture_format_OpenGL(LPD3DENUMTEXTUREFORMATSCALLBACK cb, if (cb(&sdesc, context) == 0) return DD_OK; - TRACE(ddraw, "End of enumeration\n"); + TRACE("End of enumeration\n"); return DD_OK; } @@ -514,7 +514,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_EnumTextureFormats(LPDIRECT3DDEVICE2 LPVOID context) { ICOM_THIS(IDirect3DDevice2Impl,iface); - FIXME(ddraw, "(%p)->(%p,%p): stub\n", This, cb, context); + FIXME("(%p)->(%p,%p): stub\n", This, cb, context); return enum_texture_format_OpenGL(cb, context); } @@ -526,7 +526,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_BeginScene(LPDIRECT3DDEVICE2 iface) ICOM_THIS(IDirect3DDevice2Impl,iface); /* OpenGL_IDirect3DDevice2 *odev = (OpenGL_IDirect3DDevice2 *) This; */ - FIXME(ddraw, "(%p)->(): stub\n", This); + FIXME("(%p)->(): stub\n", This); /* Here, we should get the DDraw surface and 'copy it' to the OpenGL surface.... */ @@ -548,7 +548,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_EndScene(LPDIRECT3DDEVICE2 iface) unsigned short *dest; #endif - FIXME(ddraw, "(%p)->(): stub\n", This); + FIXME("(%p)->(): stub\n", This); #ifdef USE_OSMESA /* Here we copy back the OpenGL scene to the the DDraw surface */ @@ -593,7 +593,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_EndScene(LPDIRECT3DDEVICE2 iface) static HRESULT WINAPI IDirect3DDevice2Impl_GetDirect3D(LPDIRECT3DDEVICE2 iface, LPDIRECT3D2 *lpd3d2) { ICOM_THIS(IDirect3DDevice2Impl,iface); - TRACE(ddraw, "(%p)->(%p): stub\n", This, lpd3d2); + TRACE("(%p)->(%p): stub\n", This, lpd3d2); *lpd3d2 = (LPDIRECT3D2)This->d3d; @@ -608,7 +608,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_SetCurrentViewport(LPDIRECT3DDEVICE2 { ICOM_THIS(IDirect3DDevice2Impl,iface); IDirect3DViewport2Impl* ilpvp=(IDirect3DViewport2Impl*)lpvp; - FIXME(ddraw, "(%p)->(%p): stub\n", This, ilpvp); + FIXME("(%p)->(%p): stub\n", This, ilpvp); /* Should check if the viewport was added or not */ @@ -628,7 +628,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_GetCurrentViewport(LPDIRECT3DDEVICE2 LPDIRECT3DVIEWPORT2 *lplpvp) { ICOM_THIS(IDirect3DDevice2Impl,iface); - FIXME(ddraw, "(%p)->(%p): stub\n", This, lplpvp); + FIXME("(%p)->(%p): stub\n", This, lplpvp); /* Returns the current viewport */ *lplpvp = (LPDIRECT3DVIEWPORT2)This->current_viewport; @@ -643,7 +643,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_SetRenderTarget(LPDIRECT3DDEVICE2 ifa DWORD dwFlags) { ICOM_THIS(IDirect3DDevice2Impl,iface); - FIXME(ddraw, "(%p)->(%p,%08lx): stub\n", This, lpdds, dwFlags); + FIXME("(%p)->(%p,%08lx): stub\n", This, lpdds, dwFlags); return DD_OK; } @@ -654,7 +654,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_GetRenderTarget(LPDIRECT3DDEVICE2 ifa LPDIRECTDRAWSURFACE *lplpdds) { ICOM_THIS(IDirect3DDevice2Impl,iface); - FIXME(ddraw, "(%p)->(%p): stub\n", This, lplpdds); + FIXME("(%p)->(%p): stub\n", This, lplpdds); /* Returns the current rendering target (the surface on wich we render) */ *lplpdds = (LPDIRECTDRAWSURFACE)This->surface; @@ -670,7 +670,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_Begin(LPDIRECT3DDEVICE2 iface, DWORD dwFlags) { ICOM_THIS(IDirect3DDevice2Impl,iface); - FIXME(ddraw, "(%p)->(%d,%d,%08lx): stub\n", This, d3dp, d3dv, dwFlags); + FIXME("(%p)->(%d,%d,%08lx): stub\n", This, d3dp, d3dv, dwFlags); return DD_OK; } @@ -685,7 +685,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_BeginIndexed(LPDIRECT3DDEVICE2 iface, DWORD dwFlags) { ICOM_THIS(IDirect3DDevice2Impl,iface); - FIXME(ddraw, "(%p)->(%d,%d,%p,%ld,%08lx): stub\n", This, d3dp, d3dv, lpvert, numvert, dwFlags); + FIXME("(%p)->(%d,%d,%p,%ld,%08lx): stub\n", This, d3dp, d3dv, lpvert, numvert, dwFlags); return DD_OK; } @@ -696,7 +696,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_Vertex(LPDIRECT3DDEVICE2 iface, LPVOID lpvert) { ICOM_THIS(IDirect3DDevice2Impl,iface); - FIXME(ddraw, "(%p)->(%p): stub\n", This, lpvert); + FIXME("(%p)->(%p): stub\n", This, lpvert); return DD_OK; } @@ -707,7 +707,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_Index(LPDIRECT3DDEVICE2 iface, WORD index) { ICOM_THIS(IDirect3DDevice2Impl,iface); - FIXME(ddraw, "(%p)->(%d): stub\n", This, index); + FIXME("(%p)->(%d): stub\n", This, index); return DD_OK; } @@ -718,7 +718,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_End(LPDIRECT3DDEVICE2 iface, DWORD dwFlags) { ICOM_THIS(IDirect3DDevice2Impl,iface); - FIXME(ddraw, "(%p)->(%08lx): stub\n", This, dwFlags); + FIXME("(%p)->(%08lx): stub\n", This, dwFlags); return DD_OK; } @@ -731,7 +731,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_GetRenderState(LPDIRECT3DDEVICE2 ifac LPDWORD lprstate) { ICOM_THIS(IDirect3DDevice2Impl,iface); - FIXME(ddraw, "(%p)->(%d,%p): stub\n", This, d3drs, lprstate); + FIXME("(%p)->(%d,%p): stub\n", This, d3drs, lprstate); return DD_OK; } @@ -745,7 +745,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_SetRenderState(LPDIRECT3DDEVICE2 ifac ICOM_THIS(IDirect3DDevice2Impl,iface); OpenGL_IDirect3DDevice2 *odev = (OpenGL_IDirect3DDevice2 *) This; - TRACE(ddraw, "(%p)->(%d,%ld)\n", This, dwRenderStateType, dwRenderState); + TRACE("(%p)->(%d,%ld)\n", This, dwRenderStateType, dwRenderState); /* Call the render state functions */ set_render_state(dwRenderStateType, dwRenderState, &(odev->rs)); @@ -760,7 +760,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_GetLightState(LPDIRECT3DDEVICE2 iface LPDWORD lplstate) { ICOM_THIS(IDirect3DDevice2Impl,iface); - FIXME(ddraw, "(%p)->(%d,%p): stub\n", This, d3dls, lplstate); + FIXME("(%p)->(%d,%p): stub\n", This, d3dls, lplstate); return DD_OK; } @@ -772,7 +772,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_SetLightState(LPDIRECT3DDEVICE2 iface DWORD dwLightState) { ICOM_THIS(IDirect3DDevice2Impl,iface); - FIXME(ddraw, "(%p)->(%d,%08lx): stub\n", This, dwLightStateType, dwLightState); + FIXME("(%p)->(%d,%08lx): stub\n", This, dwLightStateType, dwLightState); switch (dwLightStateType) { case D3DLIGHTSTATE_MATERIAL: { /* 1 */ @@ -783,7 +783,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_SetLightState(LPDIRECT3DDEVICE2 iface mat->activate(mat); LEAVE_GL(); } else { - TRACE(ddraw, "Zoups !!!\n"); + TRACE("Zoups !!!\n"); } } break; @@ -815,7 +815,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_SetLightState(LPDIRECT3DDEVICE2 iface break; default: - TRACE(ddraw, "Unexpected Light State Type\n"); + TRACE("Unexpected Light State Type\n"); return DDERR_INVALIDPARAMS; } @@ -831,7 +831,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_SetTransform(LPDIRECT3DDEVICE2 iface, ICOM_THIS(IDirect3DDevice2Impl,iface); OpenGL_IDirect3DDevice2 *odev = (OpenGL_IDirect3DDevice2 *) This; - FIXME(ddraw, "(%p)->(%d,%p): stub\n", This, d3dts, lpmatrix); + FIXME("(%p)->(%d,%p): stub\n", This, d3dts, lpmatrix); ENTER_GL(); @@ -903,7 +903,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_GetTransform(LPDIRECT3DDEVICE2 iface, LPD3DMATRIX lpmatrix) { ICOM_THIS(IDirect3DDevice2Impl,iface); - FIXME(ddraw, "(%p)->(%d,%p): stub\n", This, d3dts, lpmatrix); + FIXME("(%p)->(%d,%p): stub\n", This, d3dts, lpmatrix); return DD_OK; } @@ -915,7 +915,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_MultiplyTransform(LPDIRECT3DDEVICE2 i LPD3DMATRIX lpmatrix) { ICOM_THIS(IDirect3DDevice2Impl,iface); - FIXME(ddraw, "(%p)->(%d,%p): stub\n", This, d3dts, lpmatrix); + FIXME("(%p)->(%d,%p): stub\n", This, d3dts, lpmatrix); return DD_OK; } @@ -934,19 +934,19 @@ static HRESULT WINAPI IDirect3DDevice2Impl_MultiplyTransform(LPDIRECT3DDEVICE2 i \ switch (d3dv) { \ case D3DVT_VERTEX: \ - TRACE(ddraw, "Standard Vertex\n"); \ + TRACE("Standard Vertex\n"); \ glEnable(GL_LIGHTING); \ break; \ \ case D3DVT_LVERTEX: \ - TRACE(ddraw, "Lighted Vertex\n"); \ + TRACE("Lighted Vertex\n"); \ glDisable(GL_LIGHTING); \ break; \ \ case D3DVT_TLVERTEX: { \ GLdouble height, width, minZ, maxZ; \ \ - TRACE(ddraw, "Transformed - Lighted Vertex\n"); \ + TRACE("Transformed - Lighted Vertex\n"); \ /* First, disable lighting */ \ glDisable(GL_LIGHTING); \ \ @@ -957,7 +957,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_MultiplyTransform(LPDIRECT3DDEVICE2 i glLoadIdentity(); \ \ if (This->current_viewport == NULL) { \ - ERR(ddraw, "No current viewport !\n"); \ + ERR("No current viewport !\n"); \ /* Using standard values */ \ height = 640.0; \ width = 480.0; \ @@ -981,7 +981,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_MultiplyTransform(LPDIRECT3DDEVICE2 i } break; \ \ default: \ - ERR(ddraw, "Unhandled vertex type\n"); \ + ERR("Unhandled vertex type\n"); \ break; \ } \ \ @@ -990,37 +990,37 @@ static HRESULT WINAPI IDirect3DDevice2Impl_MultiplyTransform(LPDIRECT3DDEVICE2 i \ switch (d3dp) { \ case D3DPT_POINTLIST: \ - TRACE(ddraw, "Start POINTS\n"); \ + TRACE("Start POINTS\n"); \ glBegin(GL_POINTS); \ break; \ \ case D3DPT_LINELIST: \ - TRACE(ddraw, "Start LINES\n"); \ + TRACE("Start LINES\n"); \ glBegin(GL_LINES); \ break; \ \ case D3DPT_LINESTRIP: \ - TRACE(ddraw, "Start LINE_STRIP\n"); \ + TRACE("Start LINE_STRIP\n"); \ glBegin(GL_LINE_STRIP); \ break; \ \ case D3DPT_TRIANGLELIST: \ - TRACE(ddraw, "Start TRIANGLES\n"); \ + TRACE("Start TRIANGLES\n"); \ glBegin(GL_TRIANGLES); \ break; \ \ case D3DPT_TRIANGLESTRIP: \ - TRACE(ddraw, "Start TRIANGLE_STRIP\n"); \ + TRACE("Start TRIANGLE_STRIP\n"); \ glBegin(GL_TRIANGLE_STRIP); \ break; \ \ case D3DPT_TRIANGLEFAN: \ - TRACE(ddraw, "Start TRIANGLE_FAN\n"); \ + TRACE("Start TRIANGLE_FAN\n"); \ glBegin(GL_TRIANGLE_FAN); \ break; \ \ default: \ - TRACE(ddraw, "Unhandled primitive\n"); \ + TRACE("Unhandled primitive\n"); \ break; \ } \ \ @@ -1032,7 +1032,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_MultiplyTransform(LPDIRECT3DDEVICE2 i \ glNormal3f(vx->nx.nx, vx->ny.ny, vx->nz.nz); \ glVertex3f(vx->x.x, vx->y.y, vx->z.z); \ - TRACE(ddraw, " V: %f %f %f\n", vx->x.x, vx->y.y, vx->z.z); \ + TRACE(" V: %f %f %f\n", vx->x.x, vx->y.y, vx->z.z); \ } break; \ \ case D3DVT_LVERTEX: { \ @@ -1043,7 +1043,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_MultiplyTransform(LPDIRECT3DDEVICE2 i ((col >> 8) & 0xFF) / 255.0, \ ((col >> 0) & 0xFF) / 255.0); \ glVertex3f(vx->x.x, vx->y.y, vx->z.z); \ - TRACE(ddraw, " LV: %f %f %f (%02lx %02lx %02lx)\n", \ + TRACE(" LV: %f %f %f (%02lx %02lx %02lx)\n", \ vx->x.x, vx->y.y, vx->z.z, \ ((col >> 16) & 0xFF), ((col >> 8) & 0xFF), ((col >> 0) & 0xFF)); \ } break; \ @@ -1065,20 +1065,20 @@ static HRESULT WINAPI IDirect3DDevice2Impl_MultiplyTransform(LPDIRECT3DDEVICE2 i vx->y.sy / vx->r.rhw, \ vx->z.sz / vx->r.rhw, \ 1.0 / vx->r.rhw); \ - TRACE(ddraw, " TLV: %f %f %f (%02lx %02lx %02lx) (%f %f) (%f)\n", \ + TRACE(" TLV: %f %f %f (%02lx %02lx %02lx) (%f %f) (%f)\n", \ vx->x.sx, vx->y.sy, vx->z.sz, \ ((col >> 16) & 0xFF), ((col >> 8) & 0xFF), ((col >> 0) & 0xFF), \ vx->u.tu, vx->v.tv, vx->r.rhw); \ } break; \ \ default: \ - TRACE(ddraw, "Unhandled vertex type\n"); \ + TRACE("Unhandled vertex type\n"); \ break; \ } \ } \ \ glEnd(); \ - TRACE(ddraw, "End\n"); + TRACE("End\n"); static HRESULT WINAPI IDirect3DDevice2Impl_DrawPrimitive(LPDIRECT3DDEVICE2 iface, @@ -1092,7 +1092,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_DrawPrimitive(LPDIRECT3DDEVICE2 iface OpenGL_IDirect3DDevice2 *odev = (OpenGL_IDirect3DDevice2 *) This; int vx_index; - TRACE(ddraw, "(%p)->(%d,%d,%p,%ld,%08lx): stub\n", This, d3dp, d3dv, lpvertex, vertcount, dwFlags); + TRACE("(%p)->(%d,%d,%p,%ld,%08lx): stub\n", This, d3dp, d3dv, lpvertex, vertcount, dwFlags); ENTER_GL(); DRAW_PRIMITIVE(vertcount, vx_index); @@ -1116,7 +1116,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_DrawIndexedPrimitive(LPDIRECT3DDEVICE OpenGL_IDirect3DDevice2 *odev = (OpenGL_IDirect3DDevice2 *) This; int vx_index; - TRACE(ddraw, "(%p)->(%d,%d,%p,%ld,%p,%ld,%08lx): stub\n", This, d3dp, d3dv, lpvertex, vertcount, lpindexes, indexcount, dwFlags); + TRACE("(%p)->(%d,%d,%p,%ld,%p,%ld,%08lx): stub\n", This, d3dp, d3dv, lpvertex, vertcount, lpindexes, indexcount, dwFlags); ENTER_GL(); DRAW_PRIMITIVE(indexcount, lpindexes[vx_index]); @@ -1131,7 +1131,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_SetClipStatus(LPDIRECT3DDEVICE2 iface LPD3DCLIPSTATUS lpcs) { ICOM_THIS(IDirect3DDevice2Impl,iface); - FIXME(ddraw, "(%p)->(%p): stub\n", This, lpcs); + FIXME("(%p)->(%p): stub\n", This, lpcs); return DD_OK; } @@ -1142,7 +1142,7 @@ static HRESULT WINAPI IDirect3DDevice2Impl_GetClipStatus(LPDIRECT3DDEVICE2 iface LPD3DCLIPSTATUS lpcs) { ICOM_THIS(IDirect3DDevice2Impl,iface); - FIXME(ddraw, "(%p)->(%p): stub\n", This, lpcs); + FIXME("(%p)->(%p): stub\n", This, lpcs); return DD_OK; } @@ -1209,7 +1209,7 @@ static ICOM_VTABLE(IDirect3DDevice2) OpenGL_vtable = int d3d_OpenGL_dx3(LPD3DENUMDEVICESCALLBACK cb, LPVOID context) { D3DDEVICEDESC d1,d2; - TRACE(ddraw," Enumerating OpenGL D3D device.\n"); + TRACE(" Enumerating OpenGL D3D device.\n"); fill_opengl_caps(&d1, &d2); @@ -1244,7 +1244,7 @@ int is_OpenGL_dx3(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevi (*device)->set_context = set_context_dx3; - TRACE(ddraw, "OpenGL device created \n"); + TRACE("OpenGL device created \n"); /* Create the OpenGL context */ #ifdef USE_OSMESA @@ -1253,7 +1253,7 @@ int is_OpenGL_dx3(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevi surface->s.surface_desc.dwWidth * surface->s.surface_desc.dwHeight * 4); #else /* First get the correct visual */ - TRACE(ddraw, "Backbuffer : %d\n", surface->s.backbuffer == NULL); + TRACE("Backbuffer : %d\n", surface->s.backbuffer == NULL); /* if (surface->s.backbuffer == NULL) attributeList[3] = None; */ ENTER_GL(); @@ -1261,15 +1261,15 @@ int is_OpenGL_dx3(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevi DefaultScreen(display), attributeList); if (xvis == NULL) - ERR(ddraw, "No visual found !\n"); + ERR("No visual found !\n"); else - TRACE(ddraw, "Visual found\n"); + TRACE("Visual found\n"); /* Create the context */ odev->ctx = glXCreateContext(display, xvis, NULL, GL_TRUE); - TRACE(ddraw, "Context created\n"); + TRACE("Context created\n"); /* Now override the surface's Flip method (if in double buffering) */ surface->s.d3d_device = (void *) odev; @@ -1309,7 +1309,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_QueryInterface(LPDIRECT3DDEVICE 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; } @@ -1319,7 +1319,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_QueryInterface(LPDIRECT3DDEVICE iface, static ULONG WINAPI IDirect3DDeviceImpl_AddRef(LPDIRECT3DDEVICE iface) { ICOM_THIS(IDirect3DDeviceImpl,iface); - TRACE(ddraw, "(%p)->()incrementing from %lu.\n", This, This->ref ); + TRACE("(%p)->()incrementing from %lu.\n", This, This->ref ); return ++(This->ref); } @@ -1329,7 +1329,7 @@ static ULONG WINAPI IDirect3DDeviceImpl_AddRef(LPDIRECT3DDEVICE iface) static ULONG WINAPI IDirect3DDeviceImpl_Release(LPDIRECT3DDEVICE iface) { ICOM_THIS(IDirect3DDeviceImpl,iface); - FIXME( ddraw, "(%p)->() decrementing from %lu.\n", This, This->ref ); + FIXME("(%p)->() decrementing from %lu.\n", This, This->ref ); if (!--(This->ref)) { OpenGL_IDirect3DDevice *odev = (OpenGL_IDirect3DDevice *) This; @@ -1356,7 +1356,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_Initialize(LPDIRECT3DDEVICE iface, LPD3DDEVICEDESC lpd3ddvdesc) { ICOM_THIS(IDirect3DDeviceImpl,iface); - TRACE(ddraw, "(%p)->(%p,%p,%p): stub\n", This, lpd3d,lpGUID, lpd3ddvdesc); + TRACE("(%p)->(%p,%p,%p): stub\n", This, lpd3d,lpGUID, lpd3ddvdesc); return DDERR_ALREADYINITIALIZED; } @@ -1367,7 +1367,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_GetCaps(LPDIRECT3DDEVICE iface, LPD3DDEVICEDESC lpD3DSWDevDesc) { ICOM_THIS(IDirect3DDeviceImpl,iface); - TRACE(ddraw, "(%p)->(%p,%p): stub\n", This, lpD3DHWDevDesc, lpD3DSWDevDesc); + TRACE("(%p)->(%p,%p): stub\n", This, lpD3DHWDevDesc, lpD3DSWDevDesc); fill_opengl_caps(lpD3DHWDevDesc, lpD3DSWDevDesc); @@ -1380,7 +1380,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_SwapTextureHandles(LPDIRECT3DDEVICE if LPDIRECT3DTEXTURE lpD3DTex2) { ICOM_THIS(IDirect3DDeviceImpl,iface); - TRACE(ddraw, "(%p)->(%p,%p): stub\n", This, lpD3DTex1, lpD3DTex2); + TRACE("(%p)->(%p,%p): stub\n", This, lpD3DTex1, lpD3DTex2); return DD_OK; } @@ -1391,7 +1391,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_CreateExecuteBuffer(LPDIRECT3DDEVICE i IUnknown *pUnkOuter) { ICOM_THIS(IDirect3DDeviceImpl,iface); - TRACE(ddraw, "(%p)->(%p,%p,%p)\n", This, lpDesc, lplpDirect3DExecuteBuffer, pUnkOuter); + TRACE("(%p)->(%p,%p,%p)\n", This, lpDesc, lplpDirect3DExecuteBuffer, pUnkOuter); *lplpDirect3DExecuteBuffer = d3dexecutebuffer_create(This, lpDesc); @@ -1403,7 +1403,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_GetStats(LPDIRECT3DDEVICE iface, LPD3DSTATS lpD3DStats) { ICOM_THIS(IDirect3DDeviceImpl,iface); - TRACE(ddraw, "(%p)->(%p): stub\n", This, lpD3DStats); + TRACE("(%p)->(%p): stub\n", This, lpD3DStats); return DD_OK; } @@ -1415,7 +1415,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_Execute(LPDIRECT3DDEVICE iface, DWORD dwFlags) { ICOM_THIS(IDirect3DDeviceImpl,iface); - TRACE(ddraw, "(%p)->(%p,%p,%08ld): stub\n", This, lpDirect3DExecuteBuffer, lpDirect3DViewport, dwFlags); + TRACE("(%p)->(%p,%p,%08ld): stub\n", This, lpDirect3DExecuteBuffer, lpDirect3DViewport, dwFlags); /* Put this as the default context */ @@ -1430,7 +1430,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_AddViewport(LPDIRECT3DDEVICE iface, { ICOM_THIS(IDirect3DDeviceImpl,iface); IDirect3DViewport2Impl* ilpvp=(IDirect3DViewport2Impl*)lpvp; - FIXME(ddraw, "(%p)->(%p): stub\n", This, ilpvp); + FIXME("(%p)->(%p): stub\n", This, ilpvp); /* Adds this viewport to the viewport list */ ilpvp->next = This->viewport_list; @@ -1447,7 +1447,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_DeleteViewport(LPDIRECT3DDEVICE iface, ICOM_THIS(IDirect3DDeviceImpl,iface); IDirect3DViewport2Impl* ilpvp=(IDirect3DViewport2Impl*)lpvp; IDirect3DViewport2Impl *cur, *prev; - FIXME(ddraw, "(%p)->(%p): stub\n", This, lpvp); + FIXME("(%p)->(%p): stub\n", This, lpvp); /* Finds this viewport in the list */ prev = NULL; @@ -1478,7 +1478,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_NextViewport(LPDIRECT3DDEVICE iface, ICOM_THIS(IDirect3DDeviceImpl,iface); IDirect3DViewport2Impl* ilpvp=(IDirect3DViewport2Impl*)lpvp; IDirect3DViewport2Impl** ilplpvp=(IDirect3DViewport2Impl**)lplpvp; - FIXME(ddraw, "(%p)->(%p,%p,%08lx): stub\n", This, ilpvp, ilplpvp, dwFlags); + FIXME("(%p)->(%p,%p,%08lx): stub\n", This, ilpvp, ilplpvp, dwFlags); switch (dwFlags) { case D3DNEXT_NEXT: @@ -1511,7 +1511,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_Pick(LPDIRECT3DDEVICE iface, LPD3DRECT lpRect) { ICOM_THIS(IDirect3DDeviceImpl,iface); - TRACE(ddraw, "(%p)->(%p,%p,%08lx,%p): stub\n", This, lpDirect3DExecuteBuffer, lpDirect3DViewport, + TRACE("(%p)->(%p,%p,%08lx,%p): stub\n", This, lpDirect3DExecuteBuffer, lpDirect3DViewport, dwFlags, lpRect); return DD_OK; @@ -1523,7 +1523,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_GetPickRecords(LPDIRECT3DDEVICE iface, LPD3DPICKRECORD lpD3DPickRec) { ICOM_THIS(IDirect3DDeviceImpl,iface); - TRACE(ddraw, "(%p)->(%p,%p): stub\n", This, lpCount, lpD3DPickRec); + TRACE("(%p)->(%p,%p): stub\n", This, lpCount, lpD3DPickRec); return DD_OK; } @@ -1534,7 +1534,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_EnumTextureFormats(LPDIRECT3DDEVICE if LPVOID lpArg) { ICOM_THIS(IDirect3DDeviceImpl,iface); - TRACE(ddraw, "(%p)->(%p,%p): stub\n", This, lpd3dEnumTextureProc, lpArg); + TRACE("(%p)->(%p,%p): stub\n", This, lpd3dEnumTextureProc, lpArg); return enum_texture_format_OpenGL(lpd3dEnumTextureProc, lpArg); } @@ -1544,7 +1544,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_CreateMatrix(LPDIRECT3DDEVICE iface, LPD3DMATRIXHANDLE lpD3DMatHandle) { ICOM_THIS(IDirect3DDeviceImpl,iface); - TRACE(ddraw, "(%p)->(%p)\n", This, lpD3DMatHandle); + TRACE("(%p)->(%p)\n", This, lpD3DMatHandle); *lpD3DMatHandle = (D3DMATRIXHANDLE) HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(D3DMATRIX)); @@ -1557,7 +1557,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_SetMatrix(LPDIRECT3DDEVICE iface, const LPD3DMATRIX lpD3DMatrix) { ICOM_THIS(IDirect3DDeviceImpl,iface); - TRACE(ddraw, "(%p)->(%08lx,%p)\n", This, d3dMatHandle, lpD3DMatrix); + TRACE("(%p)->(%08lx,%p)\n", This, d3dMatHandle, lpD3DMatrix); dump_mat(lpD3DMatrix); @@ -1572,7 +1572,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_GetMatrix(LPDIRECT3DDEVICE iface, LPD3DMATRIX lpD3DMatrix) { ICOM_THIS(IDirect3DDeviceImpl,iface); - TRACE(ddraw, "(%p)->(%08lx,%p)\n", This, D3DMatHandle, lpD3DMatrix); + TRACE("(%p)->(%08lx,%p)\n", This, D3DMatHandle, lpD3DMatrix); *lpD3DMatrix = *((D3DMATRIX *) D3DMatHandle); @@ -1584,7 +1584,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_DeleteMatrix(LPDIRECT3DDEVICE iface, D3DMATRIXHANDLE d3dMatHandle) { ICOM_THIS(IDirect3DDeviceImpl,iface); - TRACE(ddraw, "(%p)->(%08lx)\n", This, d3dMatHandle); + TRACE("(%p)->(%08lx)\n", This, d3dMatHandle); HeapFree(GetProcessHeap(),0, (void *) d3dMatHandle); @@ -1597,7 +1597,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_BeginScene(LPDIRECT3DDEVICE iface) ICOM_THIS(IDirect3DDeviceImpl,iface); /* OpenGL_IDirect3DDevice *odev = (OpenGL_IDirect3DDevice *) This; */ - FIXME(ddraw, "(%p)->(): stub\n", This); + FIXME("(%p)->(): stub\n", This); /* We get the pointer to the surface (should be done on flip) */ /* odev->zb->pbuf = This->surface->s.surface_desc.y.lpSurface; */ @@ -1620,7 +1620,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_EndScene(LPDIRECT3DDEVICE iface) unsigned short *dest; #endif - FIXME(ddraw, "(%p)->(): stub\n", This); + FIXME("(%p)->(): stub\n", This); #ifdef USE_OSMESA /* Here we copy back the OpenGL scene to the the DDraw surface */ @@ -1666,7 +1666,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_GetDirect3D(LPDIRECT3DDEVICE iface, LPDIRECT3D *lpDirect3D) { ICOM_THIS(IDirect3DDeviceImpl,iface); - TRACE(ddraw, "(%p)->(%p): stub\n", This, lpDirect3D); + TRACE("(%p)->(%p): stub\n", This, lpDirect3D); return DD_OK; } diff --git a/graphics/d3dexecutebuffer.c b/graphics/d3dexecutebuffer.c index 2bb00e0220e6f34f5e9bc06264abd3f434e3327d..5976d30a22f4d899041e711fc4e898a62203f7f8 100644 --- a/graphics/d3dexecutebuffer.c +++ b/graphics/d3dexecutebuffer.c @@ -12,7 +12,7 @@ #include "heap.h" #include "ddraw.h" #include "d3d.h" -#include "debug.h" +#include "debugtools.h" #include "d3d_private.h" @@ -58,10 +58,10 @@ void _dump_d3dstatus(LPD3DSTATUS lpStatus) { } void _dump_executedata(LPD3DEXECUTEDATA lpData) { - DUMP("dwSize : %ld\n", lpData->dwSize); - DUMP("Vertex Offset : %ld Count : %ld\n", lpData->dwVertexOffset, lpData->dwVertexCount); - DUMP("Instruction Offset : %ld Length : %ld\n", lpData->dwInstructionOffset, lpData->dwInstructionLength); - DUMP("HVertex Offset : %ld\n", lpData->dwHVertexOffset); + DPRINTF("dwSize : %ld\n", lpData->dwSize); + DPRINTF("Vertex Offset : %ld Count : %ld\n", lpData->dwVertexOffset, lpData->dwVertexCount); + DPRINTF("Instruction Offset : %ld Length : %ld\n", lpData->dwInstructionOffset, lpData->dwInstructionLength); + DPRINTF("HVertex Offset : %ld\n", lpData->dwHVertexOffset); _dump_d3dstatus(&(lpData->dsStatus)); } @@ -77,7 +77,7 @@ void _dump_executedata(LPD3DEXECUTEDATA lpData) { vx[index].z, \ vx[index].w); \ \ - TRACE(ddraw, " V: %f %f %f %f (%f %f %f) (%f %f)\n", \ + TRACE(" V: %f %f %f %f (%f %f %f) (%f %f)\n", \ vx[index].x, vx[index].y, vx[index].z, vx[index].w, \ vx[index].nx, vx[index].ny, vx[index].nz, \ vx[index].u, vx[index].v); \ @@ -97,7 +97,7 @@ void _dump_executedata(LPD3DEXECUTEDATA lpData) { l_vx[index].z, \ l_vx[index].w); \ \ - TRACE(ddraw, " LV: %f %f %f %f (%02lx %02lx %02lx) (%f %f)\n", \ + TRACE(" LV: %f %f %f %f (%02lx %02lx %02lx) (%f %f)\n", \ l_vx[index].x, l_vx[index].y, l_vx[index].z, l_vx[index].w, \ ((col >> 16) & 0xFF), ((col >> 8) & 0xFF), ((col >> 0) & 0xFF), \ l_vx[index].u, l_vx[index].v); \ @@ -121,7 +121,7 @@ void _dump_executedata(LPD3DEXECUTEDATA lpData) { vx->y.sy / vx->r.rhw, \ vx->z.sz / vx->r.rhw, \ 1.0 / vx->r.rhw); \ - TRACE(ddraw, " TLV: %f %f %f (%02lx %02lx %02lx) (%f %f) (%f)\n", \ + TRACE(" TLV: %f %f %f (%02lx %02lx %02lx) (%f %f) (%f)\n", \ vx->x.sx, vx->y.sy, vx->z.sz, \ ((col >> 16) & 0xFF), ((col >> 8) & 0xFF), ((col >> 0) & 0xFF), \ vx->u.tu, vx->v.tv, vx->r.rhw); \ @@ -133,28 +133,28 @@ void _dump_executedata(LPD3DEXECUTEDATA lpData) { for (i = 0; i < count; i++) { \ LPD3DTRIANGLE ci = (LPD3DTRIANGLE) instr; \ \ - TRACE(ddraw, " v1: %d v2: %d v3: %d\n", \ + TRACE(" v1: %d v2: %d v3: %d\n", \ ci->v1.v1, ci->v2.v2, ci->v3.v3); \ - TRACE(ddraw, " Flags : "); \ + TRACE(" Flags : "); \ if (TRACE_ON(ddraw)) { \ /* Wireframe */ \ if (ci->wFlags & D3DTRIFLAG_EDGEENABLE1) \ - DUMP("EDGEENABLE1 "); \ + DPRINTF("EDGEENABLE1 "); \ if (ci->wFlags & D3DTRIFLAG_EDGEENABLE2) \ - DUMP("EDGEENABLE2 "); \ + DPRINTF("EDGEENABLE2 "); \ if (ci->wFlags & D3DTRIFLAG_EDGEENABLE1) \ - DUMP("EDGEENABLE3 "); \ + DPRINTF("EDGEENABLE3 "); \ \ /* Strips / Fans */ \ if (ci->wFlags == D3DTRIFLAG_EVEN) \ - DUMP("EVEN "); \ + DPRINTF("EVEN "); \ if (ci->wFlags == D3DTRIFLAG_ODD) \ - DUMP("ODD "); \ + DPRINTF("ODD "); \ if (ci->wFlags == D3DTRIFLAG_START) \ - DUMP("START "); \ + DPRINTF("START "); \ if ((ci->wFlags > 0) && (ci->wFlags < 30)) \ - DUMP("STARTFLAT(%d) ", ci->wFlags); \ - DUMP("\n"); \ + DPRINTF("STARTFLAT(%d) ", ci->wFlags); \ + DPRINTF("\n"); \ } \ \ /* Draw the triangle */ \ @@ -182,7 +182,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, void *instr = ilpBuff->desc.lpData + is; OpenGL_IDirect3DDevice *odev = (OpenGL_IDirect3DDevice *) dev; - TRACE(ddraw, "ExecuteData : \n"); + TRACE("ExecuteData : \n"); if (TRACE_ON(ddraw)) _dump_executedata(&(ilpBuff->data)); @@ -199,13 +199,13 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, switch (current->bOpcode) { case D3DOP_POINT: { - TRACE(ddraw, "POINT-s (%d)\n", count); + TRACE("POINT-s (%d)\n", count); instr += count * size; } break; case D3DOP_LINE: { - TRACE(ddraw, "LINE-s (%d)\n", count); + TRACE("LINE-s (%d)\n", count); instr += count * size; } break; @@ -223,7 +223,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, OGL_LVertex *l_vx = (OGL_LVertex *) ilpBuff->vertex_data; D3DTLVERTEX *tl_vx = (D3DTLVERTEX *) ilpBuff->vertex_data; - TRACE(ddraw, "TRIANGLE (%d)\n", count); + TRACE("TRIANGLE (%d)\n", count); switch (ilpBuff->vertex_type) { case D3DVT_VERTEX: @@ -235,9 +235,9 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, glLoadIdentity(); /* The model transformation was done during the transformation phase */ glMatrixMode(GL_PROJECTION); - TRACE(ddraw, " Projection Matrix : (%p)\n", odev->proj_mat); + TRACE(" Projection Matrix : (%p)\n", odev->proj_mat); dump_mat(odev->proj_mat); - TRACE(ddraw, " View Matrix : (%p)\n", odev->view_mat); + TRACE(" View Matrix : (%p)\n", odev->view_mat); dump_mat(odev->view_mat); glLoadMatrixf((float *) z_inv_matrix); @@ -255,9 +255,9 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, transformation phase */ glMatrixMode(GL_PROJECTION); - TRACE(ddraw, " Projection Matrix : (%p)\n", odev->proj_mat); + TRACE(" Projection Matrix : (%p)\n", odev->proj_mat); dump_mat(odev->proj_mat); - TRACE(ddraw, " View Matrix : (%p)\n", odev->view_mat); + TRACE(" View Matrix : (%p)\n", odev->view_mat); dump_mat(odev->view_mat); glLoadMatrixf((float *) z_inv_matrix); @@ -278,7 +278,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, glLoadIdentity(); if (ivp == NULL) { - ERR(ddraw, "No current viewport !\n"); + ERR("No current viewport !\n"); /* Using standard values */ height = 640.0; width = 480.0; @@ -301,7 +301,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, } break; default: - ERR(ddraw, "Unhandled vertex type !\n"); + ERR("Unhandled vertex type !\n"); break; } @@ -319,20 +319,20 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, break; default: - ERR(ddraw, "Unhandled vertex type !\n"); + ERR("Unhandled vertex type !\n"); } } break; case D3DOP_MATRIXLOAD: { - TRACE(ddraw, "MATRIXLOAD-s (%d)\n", count); + TRACE("MATRIXLOAD-s (%d)\n", count); instr += count * size; } break; case D3DOP_MATRIXMULTIPLY: { int i; - TRACE(ddraw, "MATRIXMULTIPLY (%d)\n", count); + TRACE("MATRIXMULTIPLY (%d)\n", count); for (i = 0; i < count; i++) { LPD3DMATRIXMULTIPLY ci = (LPD3DMATRIXMULTIPLY) instr; @@ -340,7 +340,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, LPD3DMATRIX b = (LPD3DMATRIX) ci->hSrcMatrix1; LPD3DMATRIX c = (LPD3DMATRIX) ci->hSrcMatrix2; - TRACE(ddraw, " Dest : %08lx Src1 : %08lx Src2 : %08lx\n", + TRACE(" Dest : %08lx Src1 : %08lx Src2 : %08lx\n", ci->hDestMatrix, ci->hSrcMatrix1, ci->hSrcMatrix2); /* Do the multiplication.. @@ -361,7 +361,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, case D3DOP_STATETRANSFORM: { int i; - TRACE(ddraw, "STATETRANSFORM (%d)\n", count); + TRACE("STATETRANSFORM (%d)\n", count); for (i = 0; i < count; i++) { LPD3DSTATE ci = (LPD3DSTATE) instr; @@ -369,22 +369,22 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, /* Handle the state transform */ switch (ci->t.dtstTransformStateType) { case D3DTRANSFORMSTATE_WORLD: { - TRACE(ddraw, " WORLD (%p)\n", (D3DMATRIX*) ci->v.dwArg[0]); + TRACE(" WORLD (%p)\n", (D3DMATRIX*) ci->v.dwArg[0]); odev->world_mat = (D3DMATRIX*) ci->v.dwArg[0]; } break; case D3DTRANSFORMSTATE_VIEW: { - TRACE(ddraw, " VIEW (%p)\n", (D3DMATRIX*) ci->v.dwArg[0]); + TRACE(" VIEW (%p)\n", (D3DMATRIX*) ci->v.dwArg[0]); odev->view_mat = (D3DMATRIX*) ci->v.dwArg[0]; } break; case D3DTRANSFORMSTATE_PROJECTION: { - TRACE(ddraw, " PROJECTION (%p)\n", (D3DMATRIX*) ci->v.dwArg[0]); + TRACE(" PROJECTION (%p)\n", (D3DMATRIX*) ci->v.dwArg[0]); odev->proj_mat = (D3DMATRIX*) ci->v.dwArg[0]; } break; default: - ERR(ddraw, " Unhandled state transformation !! (%d)\n", (int) ci->t.dtstTransformStateType); + ERR(" Unhandled state transformation !! (%d)\n", (int) ci->t.dtstTransformStateType); break; } @@ -395,7 +395,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, case D3DOP_STATELIGHT: { int i; - TRACE(ddraw, "STATELIGHT (%d)\n", count); + TRACE("STATELIGHT (%d)\n", count); for (i = 0; i < count; i++) { LPD3DSTATE ci = (LPD3DSTATE) instr; @@ -404,19 +404,19 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, switch (ci->t.dlstLightStateType) { case D3DLIGHTSTATE_MATERIAL: { IDirect3DMaterial2Impl* mat = (IDirect3DMaterial2Impl*) ci->v.dwArg[0]; - TRACE(ddraw, " MATERIAL\n"); + TRACE(" MATERIAL\n"); if (mat != NULL) { mat->activate(mat); } else { - TRACE(ddraw, " bad Material Handle\n"); + TRACE(" bad Material Handle\n"); } } break ; case D3DLIGHTSTATE_AMBIENT: { float light[4]; DWORD dwLightState = ci->v.dwArg[0]; - TRACE(ddraw, " AMBIENT\n"); + TRACE(" AMBIENT\n"); light[0] = ((dwLightState >> 16) & 0xFF) / 255.0; light[1] = ((dwLightState >> 8) & 0xFF) / 255.0; @@ -424,7 +424,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, light[3] = 1.0; glLightModelfv(GL_LIGHT_MODEL_AMBIENT, (float *) light); - TRACE(ddraw, " R:%02lx G:%02lx B:%02lx A:%02lx\n", + TRACE(" R:%02lx G:%02lx B:%02lx A:%02lx\n", ((dwLightState >> 16) & 0xFF), ((dwLightState >> 8) & 0xFF), ((dwLightState >> 0) & 0xFF), @@ -432,27 +432,27 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, } break ; case D3DLIGHTSTATE_COLORMODEL: { - TRACE(ddraw, " COLORMODEL\n"); + TRACE(" COLORMODEL\n"); } break ; case D3DLIGHTSTATE_FOGMODE: { - TRACE(ddraw, " FOGMODE\n"); + TRACE(" FOGMODE\n"); } break ; case D3DLIGHTSTATE_FOGSTART: { - TRACE(ddraw, " FOGSTART\n"); + TRACE(" FOGSTART\n"); } break ; case D3DLIGHTSTATE_FOGEND: { - TRACE(ddraw, " FOGEND\n"); + TRACE(" FOGEND\n"); } break ; case D3DLIGHTSTATE_FOGDENSITY: { - TRACE(ddraw, " FOGDENSITY\n"); + TRACE(" FOGDENSITY\n"); } break ; default: - ERR(ddraw, " Unhandled light state !! (%d)\n", (int) ci->t.dlstLightStateType); + ERR(" Unhandled light state !! (%d)\n", (int) ci->t.dlstLightStateType); break; } instr += size; @@ -461,7 +461,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, case D3DOP_STATERENDER: { int i; - TRACE(ddraw, "STATERENDER (%d)\n", count); + TRACE("STATERENDER (%d)\n", count); for (i = 0; i < count; i++) { LPD3DSTATE ci = (LPD3DSTATE) instr; @@ -475,28 +475,28 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, case D3DOP_PROCESSVERTICES: { int i; - TRACE(ddraw, "PROCESSVERTICES (%d)\n", count); + TRACE("PROCESSVERTICES (%d)\n", count); for (i = 0; i < count; i++) { LPD3DPROCESSVERTICES ci = (LPD3DPROCESSVERTICES) instr; - TRACE(ddraw, " Start : %d Dest : %d Count : %ld\n", + TRACE(" Start : %d Dest : %d Count : %ld\n", ci->wStart, ci->wDest, ci->dwCount); - TRACE(ddraw, " Flags : "); + TRACE(" Flags : "); if (TRACE_ON(ddraw)) { if (ci->dwFlags & D3DPROCESSVERTICES_COPY) - DUMP("COPY "); + DPRINTF("COPY "); if (ci->dwFlags & D3DPROCESSVERTICES_NOCOLOR) - DUMP("NOCOLOR "); + DPRINTF("NOCOLOR "); if (ci->dwFlags == D3DPROCESSVERTICES_OPMASK) - DUMP("OPMASK "); + DPRINTF("OPMASK "); if (ci->dwFlags & D3DPROCESSVERTICES_TRANSFORM) - DUMP("TRANSFORM "); + DPRINTF("TRANSFORM "); if (ci->dwFlags == D3DPROCESSVERTICES_TRANSFORMLIGHT) - DUMP("TRANSFORMLIGHT "); + DPRINTF("TRANSFORMLIGHT "); if (ci->dwFlags & D3DPROCESSVERTICES_UPDATEEXTENTS) - DUMP("UPDATEEXTENTS "); - DUMP("\n"); + DPRINTF("UPDATEEXTENTS "); + DPRINTF("\n"); } /* This is where doing Direct3D on top on OpenGL is quite difficult. @@ -532,7 +532,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, OGL_Vertex *dst = ((OGL_Vertex *) (ilpBuff->vertex_data)) + ci->wDest; D3DMATRIX *mat = odev->world_mat; - TRACE(ddraw, " World Matrix : (%p)\n", mat); + TRACE(" World Matrix : (%p)\n", mat); dump_mat(mat); ilpBuff->vertex_type = D3DVT_VERTEX; @@ -561,7 +561,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, OGL_LVertex *dst = ((OGL_LVertex *) (ilpBuff->vertex_data)) + ci->wDest; D3DMATRIX *mat = odev->world_mat; - TRACE(ddraw, " World Matrix : (%p)\n", mat); + TRACE(" World Matrix : (%p)\n", mat); dump_mat(mat); ilpBuff->vertex_type = D3DVT_LVERTEX; @@ -589,7 +589,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, memcpy(dst, src, ci->dwCount * sizeof(D3DTLVERTEX)); } else { - ERR(ddraw, "Unhandled vertex processing !\n"); + ERR("Unhandled vertex processing !\n"); } instr += size; @@ -597,13 +597,13 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, } break; case D3DOP_TEXTURELOAD: { - TRACE(ddraw, "TEXTURELOAD-s (%d)\n", count); + TRACE("TEXTURELOAD-s (%d)\n", count); instr += count * size; } break; case D3DOP_EXIT: { - TRACE(ddraw, "EXIT (%d)\n", count); + TRACE("EXIT (%d)\n", count); /* We did this instruction */ instr += size; /* Exit this loop */ @@ -612,18 +612,18 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, case D3DOP_BRANCHFORWARD: { int i; - TRACE(ddraw, "BRANCHFORWARD (%d)\n", count); + TRACE("BRANCHFORWARD (%d)\n", count); for (i = 0; i < count; i++) { LPD3DBRANCH ci = (LPD3DBRANCH) instr; if ((ilpBuff->data.dsStatus.dwStatus & ci->dwMask) == ci->dwValue) { if (!ci->bNegate) { - TRACE(ddraw," Should branch to %ld\n", ci->dwOffset); + TRACE(" Should branch to %ld\n", ci->dwOffset); } } else { if (ci->bNegate) { - TRACE(ddraw," Should branch to %ld\n", ci->dwOffset); + TRACE(" Should branch to %ld\n", ci->dwOffset); } } @@ -632,14 +632,14 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, } break; case D3DOP_SPAN: { - TRACE(ddraw, "SPAN-s (%d)\n", count); + TRACE("SPAN-s (%d)\n", count); instr += count * size; } break; case D3DOP_SETSTATUS: { int i; - TRACE(ddraw, "SETSTATUS (%d)\n", count); + TRACE("SETSTATUS (%d)\n", count); for (i = 0; i < count; i++) { LPD3DSTATUS ci = (LPD3DSTATUS) instr; @@ -651,7 +651,7 @@ static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff, } break; default: - ERR(ddraw, "Unhandled OpCode !!!\n"); + ERR("Unhandled OpCode !!!\n"); /* Try to save ... */ instr += count * size; break; @@ -715,7 +715,7 @@ static HRESULT WINAPI IDirect3DExecuteBufferImpl_QueryInterface(LPDIRECT3DEXECUT 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; } @@ -725,7 +725,7 @@ static HRESULT WINAPI IDirect3DExecuteBufferImpl_QueryInterface(LPDIRECT3DEXECUT static ULONG WINAPI IDirect3DExecuteBufferImpl_AddRef(LPDIRECT3DEXECUTEBUFFER iface) { ICOM_THIS(IDirect3DExecuteBufferImpl,iface); - TRACE(ddraw, "(%p)->()incrementing from %lu.\n", This, This->ref ); + TRACE("(%p)->()incrementing from %lu.\n", This, This->ref ); return ++(This->ref); } @@ -735,7 +735,7 @@ static ULONG WINAPI IDirect3DExecuteBufferImpl_AddRef(LPDIRECT3DEXECUTEBUFFER if static ULONG WINAPI IDirect3DExecuteBufferImpl_Release(LPDIRECT3DEXECUTEBUFFER iface) { ICOM_THIS(IDirect3DExecuteBufferImpl,iface); - FIXME( ddraw, "(%p)->() decrementing from %lu.\n", This, This->ref ); + FIXME("(%p)->() decrementing from %lu.\n", This, This->ref ); if (!--(This->ref)) { if ((This->desc.lpData != NULL) && This->need_free) @@ -756,7 +756,7 @@ static HRESULT WINAPI IDirect3DExecuteBufferImpl_Initialize(LPDIRECT3DEXECUTEBUF LPD3DEXECUTEBUFFERDESC lpDesc) { ICOM_THIS(IDirect3DExecuteBufferImpl,iface); - FIXME(ddraw, "(%p)->(%p,%p): stub\n", This, lpDirect3DDevice, lpDesc); + FIXME("(%p)->(%p,%p): stub\n", This, lpDirect3DDevice, lpDesc); return DD_OK; } @@ -765,7 +765,7 @@ static HRESULT WINAPI IDirect3DExecuteBufferImpl_Lock(LPDIRECT3DEXECUTEBUFFER if LPD3DEXECUTEBUFFERDESC lpDesc) { ICOM_THIS(IDirect3DExecuteBufferImpl,iface); - TRACE(ddraw, "(%p)->(%p)\n", This, lpDesc); + TRACE("(%p)->(%p)\n", This, lpDesc); /* Copies the buffer description */ *lpDesc = This->desc; @@ -776,7 +776,7 @@ static HRESULT WINAPI IDirect3DExecuteBufferImpl_Lock(LPDIRECT3DEXECUTEBUFFER if static HRESULT WINAPI IDirect3DExecuteBufferImpl_Unlock(LPDIRECT3DEXECUTEBUFFER iface) { ICOM_THIS(IDirect3DExecuteBufferImpl,iface); - TRACE(ddraw, "(%p)->()\n", This); + TRACE("(%p)->()\n", This); return DD_OK; } @@ -787,7 +787,7 @@ static HRESULT WINAPI IDirect3DExecuteBufferImpl_SetExecuteData(LPDIRECT3DEXECUT ICOM_THIS(IDirect3DExecuteBufferImpl,iface); DWORD nbvert; - TRACE(ddraw, "(%p)->(%p)\n", This, lpData); + TRACE("(%p)->(%p)\n", This, lpData); This->data = *lpData; @@ -811,7 +811,7 @@ static HRESULT WINAPI IDirect3DExecuteBufferImpl_GetExecuteData(LPDIRECT3DEXECUT LPD3DEXECUTEDATA lpData) { ICOM_THIS(IDirect3DExecuteBufferImpl,iface); - TRACE(ddraw, "(%p)->(%p): stub\n", This, lpData); + TRACE("(%p)->(%p): stub\n", This, lpData); *lpData = This->data; @@ -825,7 +825,7 @@ static HRESULT WINAPI IDirect3DExecuteBufferImpl_Validate(LPDIRECT3DEXECUTEBUFFE DWORD dwReserved) { ICOM_THIS(IDirect3DExecuteBufferImpl,iface); - TRACE(ddraw, "(%p)->(%p,%p,%p,%lu)\n", This, lpdwOffset, lpFunc, lpUserArg, dwReserved); + TRACE("(%p)->(%p,%p,%p,%lu)\n", This, lpdwOffset, lpFunc, lpUserArg, dwReserved); return DD_OK; } @@ -834,7 +834,7 @@ static HRESULT WINAPI IDirect3DExecuteBufferImpl_Optimize(LPDIRECT3DEXECUTEBUFFE DWORD dwReserved) { ICOM_THIS(IDirect3DExecuteBufferImpl,iface); - TRACE(ddraw, "(%p)->(%lu)\n", This, dwReserved); + TRACE("(%p)->(%lu)\n", This, dwReserved); return DD_OK; } diff --git a/graphics/d3dlight.c b/graphics/d3dlight.c index 2ea2431067cee39cddfe4e512ecf3c3a7fe691ce..9a6a20d21bc4bb36f3c81f9b53bb2039a9568296 100644 --- a/graphics/d3dlight.c +++ b/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; } diff --git a/graphics/d3dmaterial.c b/graphics/d3dmaterial.c index 37ca54f7377ee771023e4e42f5fb021d7c4807e2..b08d0dd7d8e0a343becbb78d1b4935089a665b8a 100644 --- a/graphics/d3dmaterial.c +++ b/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; } diff --git a/graphics/d3dtexture.c b/graphics/d3dtexture.c index be8192d7c578a71f7acd2f3b86402874bb82b6a6..d6835ed7962d4d55da9528204a7ef45548893954 100644 --- a/graphics/d3dtexture.c +++ b/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; } diff --git a/graphics/d3dviewport.c b/graphics/d3dviewport.c index 2746b5408650d577487cfcd5f2c67699c88e59f6..bb25364b90463853ef85efd7fa20b7572714e903 100644 --- a/graphics/d3dviewport.c +++ b/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; } diff --git a/graphics/ddraw.c b/graphics/ddraw.c index 95d2d59a9de8840cf16fdfe63c90974f2a9f41f4..9c2aa9c5bfaff7b150e1bf6a87ad71ac01e73a6b 100644 --- a/graphics/ddraw.c +++ b/graphics/ddraw.c @@ -57,7 +57,7 @@ typedef int INT32; #include "wine/exception.h" #include "ddraw.h" #include "d3d.h" -#include "debug.h" +#include "debugtools.h" #include "spy.h" #include "message.h" #include "options.h" @@ -156,17 +156,17 @@ typedef struct { HRESULT WINAPI DirectDrawEnumerateExA( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags) { - TRACE(ddraw, "(%p,%p, %08lx)\n", lpCallback, lpContext, dwFlags); + TRACE("(%p,%p, %08lx)\n", lpCallback, lpContext, dwFlags); if (TRACE_ON(ddraw)) { - DUMP(" Flags : "); + DPRINTF(" Flags : "); if (dwFlags & DDENUM_ATTACHEDSECONDARYDEVICES) - DUMP("DDENUM_ATTACHEDSECONDARYDEVICES "); + DPRINTF("DDENUM_ATTACHEDSECONDARYDEVICES "); if (dwFlags & DDENUM_DETACHEDSECONDARYDEVICES) - DUMP("DDENUM_DETACHEDSECONDARYDEVICES "); + DPRINTF("DDENUM_DETACHEDSECONDARYDEVICES "); if (dwFlags & DDENUM_NONDISPLAYDEVICES) - DUMP("DDENUM_NONDISPLAYDEVICES "); - DUMP("\n"); + DPRINTF("DDENUM_NONDISPLAYDEVICES "); + DPRINTF("\n"); } if (dwFlags & DDENUM_NONDISPLAYDEVICES) { @@ -175,16 +175,16 @@ HRESULT WINAPI DirectDrawEnumerateExA( } if (DDRAW_DGA_Available()) { - TRACE(ddraw, "Enumerating DGA interface\n"); + TRACE("Enumerating DGA interface\n"); if (!lpCallback(&DGA_DirectDraw_GUID, "WINE with XFree86 DGA", "display", lpContext, 0)) return DD_OK; } - TRACE(ddraw, "Enumerating Xlib interface\n"); + TRACE("Enumerating Xlib interface\n"); if (!lpCallback(&XLIB_DirectDraw_GUID, "WINE with Xlib", "display", lpContext, 0)) return DD_OK; - TRACE(ddraw, "Enumerating Default interface\n"); + TRACE("Enumerating Default interface\n"); if (!lpCallback(NULL,"WINE (default)", "display", lpContext, 0)) return DD_OK; @@ -292,7 +292,7 @@ HRESULT WINAPI DirectDrawEnumerateW( /* What is this doing here? */ HRESULT WINAPI DSoundHelp(DWORD x,DWORD y,DWORD z) { - FIXME(ddraw,"(0x%08lx,0x%08lx,0x%08lx),stub!\n",x,y,z); + FIXME("(0x%08lx,0x%08lx,0x%08lx),stub!\n",x,y,z); return 0; } @@ -319,10 +319,10 @@ static void _dump_DDBLTFX(DWORD flagmask) { }; for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++) if (flags[i].mask & flagmask) { - DUMP("%s ",flags[i].name); + DPRINTF("%s ",flags[i].name); }; - DUMP("\n"); + DPRINTF("\n"); } @@ -341,8 +341,8 @@ static void _dump_DDBLTFAST(DWORD flagmask) { }; for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++) if (flags[i].mask & flagmask) - DUMP("%s ",flags[i].name); - DUMP("\n"); + DPRINTF("%s ",flags[i].name); + DPRINTF("\n"); } static void _dump_DDBLT(DWORD flagmask) { @@ -382,8 +382,8 @@ static void _dump_DDBLT(DWORD flagmask) { }; for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++) if (flags[i].mask & flagmask) - DUMP("%s ",flags[i].name); - DUMP("\n"); + DPRINTF("%s ",flags[i].name); + DPRINTF("\n"); } static void _dump_DDSCAPS(void *in) { @@ -428,7 +428,7 @@ static void _dump_DDSCAPS(void *in) { DWORD flagmask = *((DWORD *) in); for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++) if (flags[i].mask & flagmask) - DUMP("%s ",flags[i].name); + DPRINTF("%s ",flags[i].name); } static void _dump_pixelformat_flag(DWORD flagmask) { @@ -456,7 +456,7 @@ static void _dump_pixelformat_flag(DWORD flagmask) { }; for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++) if (flags[i].mask & flagmask) - DUMP("%s ",flags[i].name); + DPRINTF("%s ",flags[i].name); } static void _dump_paletteformat(DWORD dwFlags) { @@ -481,21 +481,21 @@ static void _dump_paletteformat(DWORD dwFlags) { }; for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++) if (flags[i].mask & dwFlags) - DUMP("%s ",flags[i].name); - DUMP("\n"); + DPRINTF("%s ",flags[i].name); + DPRINTF("\n"); } static void _dump_pixelformat(void *in) { LPDDPIXELFORMAT pf = (LPDDPIXELFORMAT) in; char *cmd; - DUMP("( "); + DPRINTF("( "); _dump_pixelformat_flag(pf->dwFlags); if (pf->dwFlags & DDPF_FOURCC) { - DUMP(", dwFourCC : %ld", pf->dwFourCC); + DPRINTF(", dwFourCC : %ld", pf->dwFourCC); } if (pf->dwFlags & DDPF_RGB) { - DUMP(", RGB bits: %ld, ", pf->x.dwRGBBitCount); + DPRINTF(", RGB bits: %ld, ", pf->x.dwRGBBitCount); switch (pf->x.dwRGBBitCount) { case 4: cmd = "%1lx"; @@ -513,26 +513,26 @@ static void _dump_pixelformat(void *in) { cmd = "%08lx"; break; default: - ERR(ddraw, "Unexpected bit depth !\n"); + ERR("Unexpected bit depth !\n"); cmd = "%d"; } - DUMP(" R "); DUMP(cmd, pf->y.dwRBitMask); - DUMP(" G "); DUMP(cmd, pf->z.dwGBitMask); - DUMP(" B "); DUMP(cmd, pf->xx.dwBBitMask); + DPRINTF(" R "); DPRINTF(cmd, pf->y.dwRBitMask); + DPRINTF(" G "); DPRINTF(cmd, pf->z.dwGBitMask); + DPRINTF(" B "); DPRINTF(cmd, pf->xx.dwBBitMask); if (pf->dwFlags & DDPF_ALPHAPIXELS) { - DUMP(" A "); DUMP(cmd, pf->xy.dwRGBAlphaBitMask); + DPRINTF(" A "); DPRINTF(cmd, pf->xy.dwRGBAlphaBitMask); } if (pf->dwFlags & DDPF_ZPIXELS) { - DUMP(" Z "); DUMP(cmd, pf->xy.dwRGBZBitMask); + DPRINTF(" Z "); DPRINTF(cmd, pf->xy.dwRGBZBitMask); } } if (pf->dwFlags & DDPF_ZBUFFER) { - DUMP(", Z bits : %ld", pf->x.dwZBufferBitDepth); + DPRINTF(", Z bits : %ld", pf->x.dwZBufferBitDepth); } if (pf->dwFlags & DDPF_ALPHA) { - DUMP(", Alpha bits : %ld", pf->x.dwAlphaBitDepth); + DPRINTF(", Alpha bits : %ld", pf->x.dwAlphaBitDepth); } - DUMP(")"); + DPRINTF(")"); } static void _dump_colorkeyflag(DWORD ck) { @@ -551,19 +551,19 @@ static void _dump_colorkeyflag(DWORD ck) { }; for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++) if (flags[i].mask & ck) - DUMP("%s ",flags[i].name); + DPRINTF("%s ",flags[i].name); } static void _dump_DWORD(void *in) { - DUMP("%ld", *((DWORD *) in)); + DPRINTF("%ld", *((DWORD *) in)); } static void _dump_PTR(void *in) { - DUMP("%p", *((void **) in)); + DPRINTF("%p", *((void **) in)); } static void _dump_DDCOLORKEY(void *in) { DDCOLORKEY *ddck = (DDCOLORKEY *) in; - DUMP(" Low : %ld - High : %ld", ddck->dwColorSpaceLowValue, ddck->dwColorSpaceHighValue); + DPRINTF(" Low : %ld - High : %ld", ddck->dwColorSpaceLowValue, ddck->dwColorSpaceHighValue); } static void _dump_surface_desc(DDSURFACEDESC *lpddsd) { @@ -595,9 +595,9 @@ static void _dump_surface_desc(DDSURFACEDESC *lpddsd) { }; for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++) if (flags[i].mask & lpddsd->dwFlags) { - DUMP(" - %s : ",flags[i].name); + DPRINTF(" - %s : ",flags[i].name); flags[i].func(flags[i].elt); - DUMP("\n"); + DPRINTF("\n"); } } @@ -613,20 +613,20 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_Lock( LPDIRECTDRAWSURFACE4 iface,LPRECT lprect,LPDDSURFACEDESC lpddsd,DWORD flags, HANDLE hnd ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - TRACE(ddraw, "(%p)->Lock(%p,%p,%08lx,%08lx)\n", + TRACE("(%p)->Lock(%p,%p,%08lx,%08lx)\n", This,lprect,lpddsd,flags,(DWORD)hnd); if (flags & ~(DDLOCK_WAIT|DDLOCK_READONLY|DDLOCK_WRITEONLY)) - WARN(ddraw, "(%p)->Lock(%p,%p,%08lx,%08lx)\n", + WARN("(%p)->Lock(%p,%p,%08lx,%08lx)\n", This,lprect,lpddsd,flags,(DWORD)hnd); /* First, copy the Surface description */ *lpddsd = This->s.surface_desc; - TRACE(ddraw,"locked surface: height=%ld, width=%ld, pitch=%ld\n", + TRACE("locked surface: height=%ld, width=%ld, pitch=%ld\n", lpddsd->dwHeight,lpddsd->dwWidth,lpddsd->lPitch); /* If asked only for a part, change the surface pointer */ if (lprect) { - FIXME(ddraw," lprect: %dx%d-%dx%d\n", + FIXME(" lprect: %dx%d-%dx%d\n", lprect->top,lprect->left,lprect->bottom,lprect->right ); lpddsd->y.lpSurface = (LPVOID) ((char *) This->s.surface_desc.y.lpSurface + @@ -643,7 +643,7 @@ static HRESULT WINAPI DGA_IDirectDrawSurface4Impl_Unlock( LPDIRECTDRAWSURFACE4 iface,LPVOID surface ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - TRACE(ddraw,"(%p)->Unlock(%p)\n",This,surface); + TRACE("(%p)->Unlock(%p)\n",This,surface); return DD_OK; } #endif /* defined(HAVE_LIBXXF86DGA) */ @@ -682,7 +682,7 @@ static HRESULT WINAPI Xlib_IDirectDrawSurface4Impl_Unlock( LPDIRECTDRAWSURFACE4 iface,LPVOID surface) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - TRACE(ddraw,"(%p)->Unlock(%p)\n",This,surface); + TRACE("(%p)->Unlock(%p)\n",This,surface); if (!This->s.ddraw->d.paintable) return DD_OK; @@ -705,7 +705,7 @@ static HRESULT WINAPI DGA_IDirectDrawSurface4Impl_Flip( ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); IDirectDrawSurface4Impl* iflipto=(IDirectDrawSurface4Impl*)flipto; - TRACE(ddraw,"(%p)->Flip(%p,%08lx)\n",This,iflipto,dwFlags); + TRACE("(%p)->Flip(%p,%08lx)\n",This,iflipto,dwFlags); if (!iflipto) { if (This->s.backbuffer) iflipto = This->s.backbuffer; @@ -740,12 +740,12 @@ static HRESULT WINAPI Xlib_IDirectDrawSurface4Impl_Flip( ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); IDirectDrawSurface4Impl* iflipto=(IDirectDrawSurface4Impl*)flipto; - TRACE(ddraw,"(%p)->Flip(%p,%08lx)\n",This,iflipto,dwFlags); + TRACE("(%p)->Flip(%p,%08lx)\n",This,iflipto,dwFlags); #ifdef HAVE_MESAGL if ((This->s.d3d_device != NULL) || ((This->s.backbuffer != NULL) && (This->s.backbuffer->s.d3d_device != NULL))) { - TRACE(ddraw," - OpenGL flip\n"); + TRACE(" - OpenGL flip\n"); ENTER_GL(); glXSwapBuffers(display, This->s.ddraw->d.drawable); @@ -794,7 +794,7 @@ static HRESULT WINAPI Xlib_IDirectDrawSurface4Impl_SetPalette( ICOM_THIS(IDirectDrawSurface4Impl,iface); IDirectDrawPaletteImpl* ipal=(IDirectDrawPaletteImpl*)pal; int i; - TRACE(ddraw,"(%p)->(%p)\n",This,ipal); + TRACE("(%p)->(%p)\n",This,ipal); if (ipal == NULL) { if( This->s.palette != NULL ) @@ -856,7 +856,7 @@ static HRESULT WINAPI DGA_IDirectDrawSurface4Impl_SetPalette( ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); IDirectDrawPaletteImpl* ipal=(IDirectDrawPaletteImpl*)pal; - TRACE(ddraw,"(%p)->(%p)\n",This,ipal); + TRACE("(%p)->(%p)\n",This,ipal); /* According to spec, we are only supposed to * AddRef if this is not the same palette. @@ -902,7 +902,7 @@ static HRESULT _Blt_ColorFill(LPBYTE buf, int width, int height, int bpp, LONG l case 2: COLORFILL_ROW(WORD) case 4: COLORFILL_ROW(DWORD) default: - FIXME(ddraw, "Stretched blit not implemented for bpp %d!\n", bpp*8); + FIXME("Stretched blit not implemented for bpp %d!\n", bpp*8); return DDERR_UNSUPPORTED; } @@ -929,18 +929,18 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_Blt( int x, y; LPBYTE dbuf, sbuf; - TRACE(ddraw,"(%p)->(%p,%p,%p,%08lx,%p)\n", This,rdst,src,rsrc,dwFlags,lpbltfx); + TRACE("(%p)->(%p,%p,%p,%08lx,%p)\n", This,rdst,src,rsrc,dwFlags,lpbltfx); if (src) IDirectDrawSurface4_Lock(src, NULL, &sdesc, 0, 0); IDirectDrawSurface4_Lock(iface,NULL,&ddesc,0,0); if (TRACE_ON(ddraw)) { - if (rdst) TRACE(ddraw," destrect :%dx%d-%dx%d\n",rdst->left,rdst->top,rdst->right,rdst->bottom); - if (rsrc) TRACE(ddraw," srcrect :%dx%d-%dx%d\n",rsrc->left,rsrc->top,rsrc->right,rsrc->bottom); - TRACE(ddraw,"\tflags: "); + if (rdst) TRACE(" destrect :%dx%d-%dx%d\n",rdst->left,rdst->top,rdst->right,rdst->bottom); + if (rsrc) TRACE(" srcrect :%dx%d-%dx%d\n",rsrc->left,rsrc->top,rsrc->right,rsrc->bottom); + TRACE("\tflags: "); _dump_DDBLT(dwFlags); if (dwFlags & DDBLT_DDFX) { - TRACE(ddraw," blitfx: \n"); + TRACE(" blitfx: \n"); _dump_DDBLTFX(lpbltfx->dwDDFX); } } @@ -989,7 +989,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_Blt( GLboolean ztest; /* Clears the screen */ - TRACE(ddraw, " Filling depth buffer with %ld\n", lpbltfx->b.dwFillDepth); + TRACE(" Filling depth buffer with %ld\n", lpbltfx->b.dwFillDepth); glClearDepth(lpbltfx->b.dwFillDepth / 65535.0); /* We suppose a 16 bit Z Buffer */ glGetBooleanv(GL_DEPTH_TEST, &ztest); glDepthMask(GL_TRUE); /* Enables Z writing to be sure to delete also the Z buffer */ @@ -1012,14 +1012,14 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_Blt( ret = _Blt_ColorFill(dbuf, dstwidth, dstheight, bpp, ddesc.lPitch, ~0); break; default: - FIXME(ddraw, "Unsupported raster op: %08lx Pattern: %p\n", lpbltfx->dwROP, lpbltfx->b.lpDDSPattern); + FIXME("Unsupported raster op: %08lx Pattern: %p\n", lpbltfx->dwROP, lpbltfx->b.lpDDSPattern); goto error; } dwFlags &= ~DDBLT_ROP; } if (dwFlags & DDBLT_DDROPS) { - FIXME(ddraw, "\tDdraw Raster Ops: %08lx Pattern: %p\n", lpbltfx->dwDDROP, lpbltfx->b.lpDDSPattern); + FIXME("\tDdraw Raster Ops: %08lx Pattern: %p\n", lpbltfx->dwDDROP, lpbltfx->b.lpDDSPattern); } /* Now the 'with source' blits */ @@ -1074,7 +1074,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_Blt( case 2: STRETCH_ROW(WORD) case 4: STRETCH_ROW(DWORD) default: - FIXME(ddraw, "Stretched blit not implemented for bpp %d!\n", bpp*8); + FIXME("Stretched blit not implemented for bpp %d!\n", bpp*8); ret = DDERR_UNSUPPORTED; goto error; } @@ -1094,7 +1094,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_Blt( keyhigh = sdesc.ddckCKSrcBlt.dwColorSpaceHighValue; } else { /* I'm not sure if this is correct */ - FIXME(ddraw, "DDBLT_KEYDEST not fully supported yet.\n"); + FIXME("DDBLT_KEYDEST not fully supported yet.\n"); keylow = ddesc.ddckCKDestBlt.dwColorSpaceLowValue; keyhigh = ddesc.ddckCKDestBlt.dwColorSpaceHighValue; } @@ -1116,7 +1116,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_Blt( case 2: COPYROW_COLORKEY(WORD) case 4: COPYROW_COLORKEY(DWORD) default: - FIXME(ddraw, "%s color-keyed blit not implemented for bpp %d!\n", + FIXME("%s color-keyed blit not implemented for bpp %d!\n", (dwFlags & DDBLT_KEYSRC) ? "Source" : "Destination", bpp*8); ret = DDERR_UNSUPPORTED; goto error; @@ -1134,7 +1134,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_Blt( error: if (dwFlags && FIXME_ON(ddraw)) { - FIXME(ddraw,"\tUnsupported flags: "); + FIXME("\tUnsupported flags: "); _dump_DDBLT(dwFlags); } @@ -1155,13 +1155,13 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_BltFast( if (TRACE_ON(ddraw)) { - FIXME(ddraw,"(%p)->(%ld,%ld,%p,%p,%08lx)\n", + FIXME("(%p)->(%ld,%ld,%p,%p,%08lx)\n", This,dstx,dsty,src,rsrc,trans ); - FIXME(ddraw," trans:"); + FIXME(" trans:"); if (FIXME_ON(ddraw)) _dump_DDBLTFAST(trans); - FIXME(ddraw," srcrect: %dx%d-%dx%d\n",rsrc->left,rsrc->top,rsrc->right,rsrc->bottom); + FIXME(" srcrect: %dx%d-%dx%d\n",rsrc->left,rsrc->top,rsrc->right,rsrc->bottom); } /* We need to lock the surfaces, or we won't get refreshes when done. */ IDirectDrawSurface4_Lock(src, NULL,&sdesc,DDLOCK_READONLY, 0); @@ -1189,7 +1189,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_BltFast( keyhigh = sdesc.ddckCKSrcBlt.dwColorSpaceHighValue; } else { /* I'm not sure if this is correct */ - FIXME(ddraw, "DDBLTFAST_DESTCOLORKEY not fully supported yet.\n"); + FIXME("DDBLTFAST_DESTCOLORKEY not fully supported yet.\n"); keylow = ddesc.ddckCKDestBlt.dwColorSpaceLowValue; keyhigh = ddesc.ddckCKDestBlt.dwColorSpaceHighValue; } @@ -1214,7 +1214,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_BltFast( case 2: COPYBOX_COLORKEY(WORD) case 4: COPYBOX_COLORKEY(DWORD) default: - FIXME(ddraw, "Source color key blitting not supported for bpp %d\n", bpp*8); + FIXME("Source color key blitting not supported for bpp %d\n", bpp*8); ret = DDERR_UNSUPPORTED; goto error; } @@ -1242,7 +1242,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_BltBatch( LPDIRECTDRAWSURFACE4 iface,LPDDBLTBATCH ddbltbatch,DWORD x,DWORD y ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw,"(%p)->BltBatch(%p,%08lx,%08lx),stub!\n", + FIXME("(%p)->BltBatch(%p,%08lx,%08lx),stub!\n", This,ddbltbatch,x,y ); return DD_OK; @@ -1252,7 +1252,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetCaps( LPDIRECTDRAWSURFACE4 iface,LPDDSCAPS caps ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - TRACE(ddraw,"(%p)->GetCaps(%p)\n",This,caps); + TRACE("(%p)->GetCaps(%p)\n",This,caps); caps->dwCaps = DDSCAPS_PALETTE; /* probably more */ return DD_OK; } @@ -1261,7 +1261,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetSurfaceDesc( LPDIRECTDRAWSURFACE4 iface,LPDDSURFACEDESC ddsd ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - TRACE(ddraw, "(%p)->GetSurfaceDesc(%p)\n", + TRACE("(%p)->GetSurfaceDesc(%p)\n", This,ddsd); /* Simply copy the surface description stored in the object */ @@ -1276,7 +1276,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetSurfaceDesc( static ULONG WINAPI IDirectDrawSurface4Impl_AddRef(LPDIRECTDRAWSURFACE4 iface) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - TRACE( ddraw, "(%p)->() incrementing from %lu.\n", This, This->ref ); + TRACE("(%p)->() incrementing from %lu.\n", This, This->ref ); return ++(This->ref); } @@ -1284,7 +1284,7 @@ static ULONG WINAPI IDirectDrawSurface4Impl_AddRef(LPDIRECTDRAWSURFACE4 iface) { #ifdef HAVE_LIBXXF86DGA static ULONG WINAPI DGA_IDirectDrawSurface4Impl_Release(LPDIRECTDRAWSURFACE4 iface) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - TRACE( ddraw, "(%p)->() decrementing from %lu.\n", This, This->ref ); + TRACE("(%p)->() decrementing from %lu.\n", This, This->ref ); if (!--(This->ref)) { IDirectDraw2_Release((IDirectDraw2*)This->s.ddraw); @@ -1315,7 +1315,7 @@ static ULONG WINAPI DGA_IDirectDrawSurface4Impl_Release(LPDIRECTDRAWSURFACE4 ifa static ULONG WINAPI Xlib_IDirectDrawSurface4Impl_Release(LPDIRECTDRAWSURFACE4 iface) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - TRACE( ddraw, "(%p)->() decrementing from %lu.\n", This, This->ref ); + TRACE("(%p)->() decrementing from %lu.\n", This, This->ref ); if (!--(This->ref)) { IDirectDraw2_Release((IDirectDraw2*)This->s.ddraw); @@ -1385,17 +1385,17 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetAttachedSurface( LPDIRECTDRAWSURFACE4 iface,LPDDSCAPS lpddsd,LPDIRECTDRAWSURFACE4 *lpdsf ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - TRACE(ddraw, "(%p)->GetAttachedSurface(%p,%p)\n", + TRACE("(%p)->GetAttachedSurface(%p,%p)\n", This, lpddsd, lpdsf); if (TRACE_ON(ddraw)) { - TRACE(ddraw," caps "); + TRACE(" caps "); _dump_DDSCAPS((void *) &(lpddsd->dwCaps)); - DUMP("\n"); + DPRINTF("\n"); } if (!(lpddsd->dwCaps & DDSCAPS_BACKBUFFER)) { - FIXME(ddraw,"whoops, can only handle backbuffers for now\n"); + FIXME("whoops, can only handle backbuffers for now\n"); return E_FAIL; } @@ -1412,7 +1412,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_Initialize( LPDIRECTDRAWSURFACE4 iface,LPDIRECTDRAW ddraw,LPDDSURFACEDESC lpdsfd ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - TRACE(ddraw,"(%p)->(%p, %p)\n",This,ddraw,lpdsfd); + TRACE("(%p)->(%p, %p)\n",This,ddraw,lpdsfd); return DDERR_ALREADYINITIALIZED; } @@ -1421,13 +1421,13 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetPixelFormat( LPDIRECTDRAWSURFACE4 iface,LPDDPIXELFORMAT pf ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - TRACE(ddraw,"(%p)->(%p)\n",This,pf); + TRACE("(%p)->(%p)\n",This,pf); *pf = This->s.surface_desc.ddpfPixelFormat; if (TRACE_ON(ddraw)) { _dump_pixelformat(pf); - DUMP("\n"); + DPRINTF("\n"); } return DD_OK; @@ -1435,7 +1435,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetPixelFormat( static HRESULT WINAPI IDirectDrawSurface4Impl_GetBltStatus(LPDIRECTDRAWSURFACE4 iface,DWORD dwFlags) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw,"(%p)->(0x%08lx),stub!\n",This,dwFlags); + FIXME("(%p)->(0x%08lx),stub!\n",This,dwFlags); return DD_OK; } @@ -1443,7 +1443,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetOverlayPosition( LPDIRECTDRAWSURFACE4 iface,LPLONG x1,LPLONG x2 ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw,"(%p)->(%p,%p),stub!\n",This,x1,x2); + FIXME("(%p)->(%p,%p),stub!\n",This,x1,x2); return DD_OK; } @@ -1451,7 +1451,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_SetClipper( LPDIRECTDRAWSURFACE4 iface,LPDIRECTDRAWCLIPPER clipper ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw,"(%p)->(%p),stub!\n",This,clipper); + FIXME("(%p)->(%p),stub!\n",This,clipper); return DD_OK; } @@ -1459,7 +1459,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_AddAttachedSurface( LPDIRECTDRAWSURFACE4 iface,LPDIRECTDRAWSURFACE4 surf ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw,"(%p)->(%p),stub!\n",This,surf); + FIXME("(%p)->(%p),stub!\n",This,surf); IDirectDrawSurface4_AddRef(iface); @@ -1475,7 +1475,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetDC(LPDIRECTDRAWSURFACE4 iface,H BITMAPINFO *b_info; UINT usage; - FIXME(ddraw,"(%p)->GetDC(%p)\n",This,lphdc); + FIXME("(%p)->GetDC(%p)\n",This,lphdc); /* Creates a DIB Section of the same size / format as the surface */ IDirectDrawSurface4_Lock(iface,NULL,&desc,0,0); @@ -1545,7 +1545,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetDC(LPDIRECTDRAWSURFACE4 iface,H usage = DIB_RGB_COLORS; if (This->s.palette == NULL) { - ERR(ddraw, "Bad palette !!!\n"); + ERR("Bad palette !!!\n"); } else { RGBQUAD *rgb = (RGBQUAD *) &(b_info->bmiColors); PALETTEENTRY *pent = (PALETTEENTRY *) &(This->s.palette->palents); @@ -1566,7 +1566,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetDC(LPDIRECTDRAWSURFACE4 iface,H (HANDLE)0, 0); EndPaint(This->s.ddraw->d.mainWindow,&This->s.ddraw->d.ps); - TRACE(ddraw, "DIBSection at : %p\n", This->s.bitmap_data); + TRACE("DIBSection at : %p\n", This->s.bitmap_data); /* b_info is not useful anymore */ HeapFree(GetProcessHeap(), 0, b_info); @@ -1581,10 +1581,10 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetDC(LPDIRECTDRAWSURFACE4 iface,H memcpy(This->s.bitmap_data, desc.y.lpSurface, desc.lPitch * desc.dwHeight); } else { /* TODO */ - FIXME(ddraw, "This case has to be done :/\n"); + FIXME("This case has to be done :/\n"); } - TRACE(ddraw, "HDC : %08lx\n", (DWORD) This->s.hdc); + TRACE("HDC : %08lx\n", (DWORD) This->s.hdc); *lphdc = This->s.hdc; return DD_OK; @@ -1593,16 +1593,16 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetDC(LPDIRECTDRAWSURFACE4 iface,H static HRESULT WINAPI IDirectDrawSurface4Impl_ReleaseDC(LPDIRECTDRAWSURFACE4 iface,HDC hdc) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw,"(%p)->(0x%08lx),stub!\n",This,(long)hdc); + FIXME("(%p)->(0x%08lx),stub!\n",This,(long)hdc); - TRACE(ddraw, "Copying DIBSection at : %p\n", This->s.bitmap_data); + TRACE("Copying DIBSection at : %p\n", This->s.bitmap_data); /* Copy the DIB section to our surface */ if ((GET_BPP(This->s.surface_desc) * This->s.surface_desc.dwWidth) == This->s.surface_desc.lPitch) { memcpy(This->s.surface_desc.y.lpSurface, This->s.bitmap_data, This->s.surface_desc.lPitch * This->s.surface_desc.dwHeight); } else { /* TODO */ - FIXME(ddraw, "This case has to be done :/\n"); + FIXME("This case has to be done :/\n"); } /* Unlock the surface */ @@ -1617,7 +1617,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_QueryInterface(LPDIRECTDRAWSURFACE char xrefiid[50]; WINE_StringFromCLSID((LPCLSID)refiid,xrefiid); - TRACE(ddraw,"(%p)->(%s,%p)\n",This,xrefiid,obj); + TRACE("(%p)->(%s,%p)\n",This,xrefiid,obj); /* All DirectDrawSurface versions (1, 2, 3 and 4) use * the same interface. And IUnknown does that too of course. @@ -1631,7 +1631,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_QueryInterface(LPDIRECTDRAWSURFACE *obj = This; IDirectDrawSurface4_AddRef(iface); - TRACE(ddraw, " Creating IDirectDrawSurface interface (%p)\n", *obj); + TRACE(" Creating IDirectDrawSurface interface (%p)\n", *obj); return S_OK; } @@ -1641,7 +1641,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_QueryInterface(LPDIRECTDRAWSURFACE *obj = d3dtexture2_create(This); IDirectDrawSurface4_AddRef(iface); - TRACE(ddraw, " Creating IDirect3DTexture2 interface (%p)\n", *obj); + TRACE(" Creating IDirect3DTexture2 interface (%p)\n", *obj); return S_OK; } @@ -1651,7 +1651,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_QueryInterface(LPDIRECTDRAWSURFACE *obj = d3dtexture_create(This); IDirectDrawSurface4_AddRef(iface); - TRACE(ddraw, " Creating IDirect3DTexture interface (%p)\n", *obj); + TRACE(" Creating IDirect3DTexture interface (%p)\n", *obj); return S_OK; } @@ -1660,28 +1660,28 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_QueryInterface(LPDIRECTDRAWSURFACE /* It is the OpenGL Direct3D Device */ IDirectDrawSurface4_AddRef(iface); - TRACE(ddraw, " Creating IDirect3DDevice interface (%p)\n", *obj); + TRACE(" Creating IDirect3DDevice interface (%p)\n", *obj); return S_OK; } - FIXME(ddraw,"(%p):interface for IID %s NOT found!\n",This,xrefiid); + FIXME("(%p):interface for IID %s NOT found!\n",This,xrefiid); return OLE_E_ENUM_NOMORE; } static HRESULT WINAPI IDirectDrawSurface4Impl_IsLost(LPDIRECTDRAWSURFACE4 iface) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - TRACE(ddraw,"(%p)->(), stub!\n",This); + TRACE("(%p)->(), stub!\n",This); return DD_OK; /* hmm */ } static HRESULT WINAPI IDirectDrawSurface4Impl_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE4 iface,LPVOID context,LPDDENUMSURFACESCALLBACK esfcb) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw,"(%p)->(%p,%p),stub!\n",This,context,esfcb); + FIXME("(%p)->(%p,%p),stub!\n",This,context,esfcb); /* For the moment, only enumerating the back buffer */ if (This->s.backbuffer != NULL) { - TRACE(ddraw, "Enumerating back-buffer (%p)\n", This->s.backbuffer); + TRACE("Enumerating back-buffer (%p)\n", This->s.backbuffer); if (esfcb((LPDIRECTDRAWSURFACE) This->s.backbuffer, &(This->s.backbuffer->s.surface_desc), context) == DDENUMRET_CANCEL) return DD_OK; } @@ -1691,7 +1691,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_EnumAttachedSurfaces(LPDIRECTDRAWS static HRESULT WINAPI IDirectDrawSurface4Impl_Restore(LPDIRECTDRAWSURFACE4 iface) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw,"(%p)->(),stub!\n",This); + FIXME("(%p)->(),stub!\n",This); return DD_OK; } @@ -1699,12 +1699,12 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_SetColorKey( LPDIRECTDRAWSURFACE4 iface, DWORD dwFlags, LPDDCOLORKEY ckey ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - TRACE(ddraw,"(%p)->(0x%08lx,%p)\n",This,dwFlags,ckey); + TRACE("(%p)->(0x%08lx,%p)\n",This,dwFlags,ckey); if (TRACE_ON(ddraw)) { _dump_colorkeyflag(dwFlags); - DUMP(" : "); + DPRINTF(" : "); _dump_DDCOLORKEY((void *) ckey); - DUMP("\n"); + DPRINTF("\n"); } /* If this surface was loaded as a texture, call also the texture @@ -1743,7 +1743,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_SetColorKey( if( dwFlags ) { - FIXME( ddraw, "unhandled dwFlags: 0x%08lx\n", dwFlags ); + FIXME("unhandled dwFlags: 0x%08lx\n", dwFlags ); } return DD_OK; @@ -1755,7 +1755,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_AddOverlayDirtyRect( LPRECT lpRect ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw,"(%p)->(%p),stub!\n",This,lpRect); + FIXME("(%p)->(%p),stub!\n",This,lpRect); return DD_OK; } @@ -1766,7 +1766,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_DeleteAttachedSurface( LPDIRECTDRAWSURFACE4 lpDDSAttachedSurface ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw,"(%p)->(0x%08lx,%p),stub!\n",This,dwFlags,lpDDSAttachedSurface); + FIXME("(%p)->(0x%08lx,%p),stub!\n",This,dwFlags,lpDDSAttachedSurface); return DD_OK; } @@ -1778,7 +1778,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_EnumOverlayZOrders( LPDDENUMSURFACESCALLBACK lpfnCallback ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw,"(%p)->(0x%08lx,%p,%p),stub!\n", This,dwFlags, + FIXME("(%p)->(0x%08lx,%p,%p),stub!\n", This,dwFlags, lpContext, lpfnCallback ); return DD_OK; @@ -1789,7 +1789,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetClipper( LPDIRECTDRAWCLIPPER* lplpDDClipper ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw,"(%p)->(%p),stub!\n", This, lplpDDClipper); + FIXME("(%p)->(%p),stub!\n", This, lplpDDClipper); return DD_OK; } @@ -1800,7 +1800,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetColorKey( LPDDCOLORKEY lpDDColorKey ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - TRACE(ddraw,"(%p)->(0x%08lx,%p)\n", This, dwFlags, lpDDColorKey); + TRACE("(%p)->(0x%08lx,%p)\n", This, dwFlags, lpDDColorKey); if( dwFlags & DDCKEY_SRCBLT ) { dwFlags &= ~DDCKEY_SRCBLT; @@ -1827,7 +1827,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetColorKey( if( dwFlags ) { - FIXME( ddraw, "unhandled dwFlags: 0x%08lx\n", dwFlags ); + FIXME("unhandled dwFlags: 0x%08lx\n", dwFlags ); } return DD_OK; @@ -1838,7 +1838,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetFlipStatus( DWORD dwFlags ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw,"(%p)->(0x%08lx),stub!\n", This, dwFlags); + FIXME("(%p)->(0x%08lx),stub!\n", This, dwFlags); return DD_OK; } @@ -1848,7 +1848,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetPalette( LPDIRECTDRAWPALETTE* lplpDDPalette ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw,"(%p)->(%p),stub!\n", This, lplpDDPalette); + FIXME("(%p)->(%p),stub!\n", This, lplpDDPalette); return DD_OK; } @@ -1859,7 +1859,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_SetOverlayPosition( LONG lY) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw,"(%p)->(%ld,%ld),stub!\n", This, lX, lY); + FIXME("(%p)->(%ld,%ld),stub!\n", This, lX, lY); return DD_OK; } @@ -1873,7 +1873,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_UpdateOverlay( LPDDOVERLAYFX lpDDOverlayFx ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw,"(%p)->(%p,%p,%p,0x%08lx,%p),stub!\n", This, + FIXME("(%p)->(%p,%p,%p,0x%08lx,%p),stub!\n", This, lpSrcRect, lpDDDestSurface, lpDestRect, dwFlags, lpDDOverlayFx ); return DD_OK; @@ -1884,7 +1884,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_UpdateOverlayDisplay( DWORD dwFlags ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw,"(%p)->(0x%08lx),stub!\n", This, dwFlags); + FIXME("(%p)->(0x%08lx),stub!\n", This, dwFlags); return DD_OK; } @@ -1895,7 +1895,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_UpdateOverlayZOrder( LPDIRECTDRAWSURFACE4 lpDDSReference ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw,"(%p)->(0x%08lx,%p),stub!\n", This, dwFlags, lpDDSReference); + FIXME("(%p)->(0x%08lx,%p),stub!\n", This, dwFlags, lpDDSReference); return DD_OK; } @@ -1905,7 +1905,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetDDInterface( LPVOID* lplpDD ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw,"(%p)->(%p),stub!\n", This, lplpDD); + FIXME("(%p)->(%p),stub!\n", This, lplpDD); /* Not sure about that... */ *lplpDD = (void *) This->s.ddraw; @@ -1918,7 +1918,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_PageLock( DWORD dwFlags ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw,"(%p)->(0x%08lx),stub!\n", This, dwFlags); + FIXME("(%p)->(0x%08lx),stub!\n", This, dwFlags); return DD_OK; } @@ -1928,7 +1928,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_PageUnlock( DWORD dwFlags ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw,"(%p)->(0x%08lx),stub!\n", This, dwFlags); + FIXME("(%p)->(0x%08lx),stub!\n", This, dwFlags); return DD_OK; } @@ -1939,7 +1939,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_SetSurfaceDesc( DWORD dwFlags ) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw,"(%p)->(%p,0x%08lx),stub!\n", This, lpDDSD, dwFlags); + FIXME("(%p)->(%p,0x%08lx),stub!\n", This, lpDDSD, dwFlags); return DD_OK; } @@ -1950,7 +1950,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_SetPrivateData(LPDIRECTDRAWSURFACE DWORD cbSize, DWORD dwFlags) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw, "(%p)->(%p,%p,%ld,%08lx\n", This, guidTag, lpData, cbSize, dwFlags); + FIXME("(%p)->(%p,%p,%ld,%08lx\n", This, guidTag, lpData, cbSize, dwFlags); return DD_OK; } @@ -1960,7 +1960,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetPrivateData(LPDIRECTDRAWSURFACE LPVOID lpBuffer, LPDWORD lpcbBufferSize) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw, "(%p)->(%p,%p,%p)\n", This, guidTag, lpBuffer, lpcbBufferSize); + FIXME("(%p)->(%p,%p,%p)\n", This, guidTag, lpBuffer, lpcbBufferSize); return DD_OK; } @@ -1968,7 +1968,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_GetPrivateData(LPDIRECTDRAWSURFACE static HRESULT WINAPI IDirectDrawSurface4Impl_FreePrivateData(LPDIRECTDRAWSURFACE4 iface, REFGUID guidTag) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw, "(%p)->(%p)\n", This, guidTag); + FIXME("(%p)->(%p)\n", This, guidTag); return DD_OK; } @@ -1976,14 +1976,14 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_FreePrivateData(LPDIRECTDRAWSURFAC static HRESULT WINAPI IDirectDrawSurface4Impl_GetUniquenessValue(LPDIRECTDRAWSURFACE4 iface, LPDWORD lpValue) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw, "(%p)->(%p)\n", This, lpValue); + FIXME("(%p)->(%p)\n", This, lpValue); return DD_OK; } static HRESULT WINAPI IDirectDrawSurface4Impl_ChangeUniquenessValue(LPDIRECTDRAWSURFACE4 iface) { ICOM_THIS(IDirectDrawSurface4Impl,iface); - FIXME(ddraw, "(%p)\n", This); + FIXME("(%p)\n", This); return DD_OK; } @@ -2098,7 +2098,7 @@ HRESULT WINAPI DirectDrawCreateClipper( DWORD dwFlags, LPUNKNOWN pUnkOuter) { IDirectDrawClipperImpl** ilplpDDClipper=(IDirectDrawClipperImpl**)lplpDDClipper; - TRACE(ddraw, "(%08lx,%p,%p)\n", dwFlags, ilplpDDClipper, pUnkOuter); + TRACE("(%08lx,%p,%p)\n", dwFlags, ilplpDDClipper, pUnkOuter); *ilplpDDClipper = (IDirectDrawClipperImpl*)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirectDrawClipperImpl)); (*ilplpDDClipper)->lpvtbl = &ddclipvt; @@ -2114,13 +2114,13 @@ static HRESULT WINAPI IDirectDrawClipperImpl_SetHwnd( LPDIRECTDRAWCLIPPER iface,DWORD x,HWND hwnd ) { ICOM_THIS(IDirectDrawClipperImpl,iface); - FIXME(ddraw,"(%p)->SetHwnd(0x%08lx,0x%08lx),stub!\n",This,x,(DWORD)hwnd); + FIXME("(%p)->SetHwnd(0x%08lx,0x%08lx),stub!\n",This,x,(DWORD)hwnd); return DD_OK; } static ULONG WINAPI IDirectDrawClipperImpl_Release(LPDIRECTDRAWCLIPPER iface) { ICOM_THIS(IDirectDrawClipperImpl,iface); - TRACE( ddraw, "(%p)->() decrementing from %lu.\n", This, This->ref ); + TRACE("(%p)->() decrementing from %lu.\n", This, This->ref ); This->ref--; if (This->ref) @@ -2133,7 +2133,7 @@ static HRESULT WINAPI IDirectDrawClipperImpl_GetClipList( LPDIRECTDRAWCLIPPER iface,LPRECT rects,LPRGNDATA lprgn,LPDWORD hmm ) { ICOM_THIS(IDirectDrawClipperImpl,iface); - FIXME(ddraw,"(%p,%p,%p,%p),stub!\n",This,rects,lprgn,hmm); + FIXME("(%p,%p,%p,%p),stub!\n",This,rects,lprgn,hmm); if (hmm) *hmm=0; return DD_OK; } @@ -2142,7 +2142,7 @@ static HRESULT WINAPI IDirectDrawClipperImpl_SetClipList( LPDIRECTDRAWCLIPPER iface,LPRGNDATA lprgn,DWORD hmm ) { ICOM_THIS(IDirectDrawClipperImpl,iface); - FIXME(ddraw,"(%p,%p,%ld),stub!\n",This,lprgn,hmm); + FIXME("(%p,%p,%ld),stub!\n",This,lprgn,hmm); return DD_OK; } @@ -2152,14 +2152,14 @@ static HRESULT WINAPI IDirectDrawClipperImpl_QueryInterface( LPVOID* ppvObj ) { ICOM_THIS(IDirectDrawClipperImpl,iface); - FIXME(ddraw,"(%p)->(%p,%p),stub!\n",This,riid,ppvObj); + FIXME("(%p)->(%p,%p),stub!\n",This,riid,ppvObj); return OLE_E_ENUM_NOMORE; } static ULONG WINAPI IDirectDrawClipperImpl_AddRef( LPDIRECTDRAWCLIPPER iface ) { ICOM_THIS(IDirectDrawClipperImpl,iface); - TRACE( ddraw, "(%p)->() incrementing from %lu.\n", This, This->ref ); + TRACE("(%p)->() incrementing from %lu.\n", This, This->ref ); return ++(This->ref); } @@ -2168,7 +2168,7 @@ static HRESULT WINAPI IDirectDrawClipperImpl_GetHWnd( HWND* HWndPtr ) { ICOM_THIS(IDirectDrawClipperImpl,iface); - FIXME(ddraw,"(%p)->(%p),stub!\n",This,HWndPtr); + FIXME("(%p)->(%p),stub!\n",This,HWndPtr); return DD_OK; } @@ -2178,7 +2178,7 @@ static HRESULT WINAPI IDirectDrawClipperImpl_Initialize( DWORD dwFlags ) { ICOM_THIS(IDirectDrawClipperImpl,iface); - FIXME(ddraw,"(%p)->(%p,0x%08lx),stub!\n",This,lpDD,dwFlags); + FIXME("(%p)->(%p,0x%08lx),stub!\n",This,lpDD,dwFlags); return DD_OK; } @@ -2187,7 +2187,7 @@ static HRESULT WINAPI IDirectDrawClipperImpl_IsClipListChanged( BOOL* lpbChanged ) { ICOM_THIS(IDirectDrawClipperImpl,iface); - FIXME(ddraw,"(%p)->(%p),stub!\n",This,lpbChanged); + FIXME("(%p)->(%p),stub!\n",This,lpbChanged); return DD_OK; } @@ -2215,14 +2215,14 @@ static HRESULT WINAPI IDirectDrawPaletteImpl_GetEntries( ICOM_THIS(IDirectDrawPaletteImpl,iface); int i; - TRACE(ddraw,"(%p)->GetEntries(%08lx,%ld,%ld,%p)\n", + TRACE("(%p)->GetEntries(%08lx,%ld,%ld,%p)\n", This,x,start,count,palent); /* No palette created and not in depth-convertion mode -> BUG ! */ if ((This->cm == None) && (This->ddraw->d.palette_convert == NULL)) { - FIXME(ddraw,"app tried to read colormap for non-palettized mode\n"); + FIXME("app tried to read colormap for non-palettized mode\n"); return DDERR_GENERIC; } for (i=0;i<count;i++) { @@ -2242,7 +2242,7 @@ static HRESULT WINAPI Xlib_IDirectDrawPaletteImpl_SetEntries( XColor xc; int i; - TRACE(ddraw,"(%p)->SetEntries(%08lx,%ld,%ld,%p)\n", + TRACE("(%p)->SetEntries(%08lx,%ld,%ld,%p)\n", This,x,start,count,palent ); for (i=0;i<count;i++) { @@ -2278,11 +2278,11 @@ static HRESULT WINAPI DGA_IDirectDrawPaletteImpl_SetEntries( Colormap cm; int i; - TRACE(ddraw,"(%p)->SetEntries(%08lx,%ld,%ld,%p)\n", + TRACE("(%p)->SetEntries(%08lx,%ld,%ld,%p)\n", This,x,start,count,palent ); if (!This->cm) /* should not happen */ { - FIXME(ddraw,"app tried to set colormap in non-palettized mode\n"); + FIXME("app tried to set colormap in non-palettized mode\n"); return DDERR_GENERIC; } /* FIXME: free colorcells instead of freeing whole map */ @@ -2311,7 +2311,7 @@ static HRESULT WINAPI DGA_IDirectDrawPaletteImpl_SetEntries( static ULONG WINAPI IDirectDrawPaletteImpl_Release(LPDIRECTDRAWPALETTE iface) { ICOM_THIS(IDirectDrawPaletteImpl,iface); - TRACE( ddraw, "(%p)->() decrementing from %lu.\n", This, This->ref ); + TRACE("(%p)->() decrementing from %lu.\n", This, This->ref ); if (!--(This->ref)) { if (This->cm) { TSXFreeColormap(display,This->cm); @@ -2326,7 +2326,7 @@ static ULONG WINAPI IDirectDrawPaletteImpl_Release(LPDIRECTDRAWPALETTE iface) { static ULONG WINAPI IDirectDrawPaletteImpl_AddRef(LPDIRECTDRAWPALETTE iface) { ICOM_THIS(IDirectDrawPaletteImpl,iface); - TRACE( ddraw, "(%p)->() incrementing from %lu.\n", This, This->ref ); + TRACE("(%p)->() incrementing from %lu.\n", This, This->ref ); return ++(This->ref); } @@ -2334,7 +2334,7 @@ static HRESULT WINAPI IDirectDrawPaletteImpl_Initialize( LPDIRECTDRAWPALETTE iface,LPDIRECTDRAW ddraw,DWORD x,LPPALETTEENTRY palent ) { ICOM_THIS(IDirectDrawPaletteImpl,iface); - TRACE(ddraw,"(%p)->(%p,%ld,%p)\n", This, ddraw, x, palent); + TRACE("(%p)->(%p,%ld,%p)\n", This, ddraw, x, palent); return DDERR_ALREADYINITIALIZED; } @@ -2343,7 +2343,7 @@ static HRESULT WINAPI IDirectDrawPaletteImpl_GetCaps( LPDIRECTDRAWPALETTE iface, LPDWORD lpdwCaps ) { ICOM_THIS(IDirectDrawPaletteImpl,iface); - FIXME( ddraw, "(%p)->(%p) stub.\n", This, lpdwCaps ); + FIXME("(%p)->(%p) stub.\n", This, lpdwCaps ); return DD_OK; } @@ -2354,7 +2354,7 @@ static HRESULT WINAPI IDirectDrawPaletteImpl_QueryInterface( char xrefiid[50]; WINE_StringFromCLSID((LPCLSID)refiid,xrefiid); - FIXME(ddraw,"(%p)->(%s,%p) stub.\n",This,xrefiid,obj); + FIXME("(%p)->(%s,%p) stub.\n",This,xrefiid,obj); return S_OK; } @@ -2396,14 +2396,14 @@ static HRESULT WINAPI IDirect3DImpl_QueryInterface( char xrefiid[50]; WINE_StringFromCLSID((LPCLSID)refiid,xrefiid); - TRACE(ddraw,"(%p)->(%s,%p)\n",This,xrefiid,obj); + TRACE("(%p)->(%s,%p)\n",This,xrefiid,obj); if ((!memcmp(&IID_IDirectDraw,refiid,sizeof(IID_IDirectDraw))) || (!memcmp(&IID_IDirectDraw2,refiid,sizeof(IID_IDirectDraw2))) || (!memcmp(&IID_IDirectDraw4,refiid,sizeof(IID_IDirectDraw4)))) { *obj = This->ddraw; IDirect3D_AddRef(iface); - TRACE(ddraw, " Creating IDirectDrawX interface (%p)\n", *obj); + TRACE(" Creating IDirectDrawX interface (%p)\n", *obj); return S_OK; } @@ -2412,7 +2412,7 @@ static HRESULT WINAPI IDirect3DImpl_QueryInterface( *obj = This; IDirect3D_AddRef(iface); - TRACE(ddraw, " Creating IDirect3D interface (%p)\n", *obj); + TRACE(" Creating IDirect3D interface (%p)\n", *obj); return S_OK; } @@ -2426,17 +2426,17 @@ static HRESULT WINAPI IDirect3DImpl_QueryInterface( d3d->lpvtbl = &d3d2vt; *obj = d3d; - TRACE(ddraw, " Creating IDirect3D2 interface (%p)\n", *obj); + TRACE(" Creating IDirect3D2 interface (%p)\n", *obj); return S_OK; } - FIXME(ddraw,"(%p):interface for IID %s NOT found!\n",This,xrefiid); + FIXME("(%p):interface for IID %s NOT found!\n",This,xrefiid); return OLE_E_ENUM_NOMORE; } static ULONG WINAPI IDirect3DImpl_AddRef(LPDIRECT3D iface) { ICOM_THIS(IDirect3DImpl,iface); - TRACE( ddraw, "(%p)->() incrementing from %lu.\n", This, This->ref ); + TRACE("(%p)->() incrementing from %lu.\n", This, This->ref ); return ++(This->ref); } @@ -2444,7 +2444,7 @@ static ULONG WINAPI IDirect3DImpl_AddRef(LPDIRECT3D iface) { static ULONG WINAPI IDirect3DImpl_Release(LPDIRECT3D iface) { ICOM_THIS(IDirect3DImpl,iface); - TRACE( ddraw, "(%p)->() decrementing from %lu.\n", This, This->ref ); + TRACE("(%p)->() decrementing from %lu.\n", This, This->ref ); if (!--(This->ref)) { IDirectDraw2_Release((IDirectDraw2*)This->ddraw); @@ -2462,7 +2462,7 @@ static HRESULT WINAPI IDirect3DImpl_Initialize( char xrefiid[50]; WINE_StringFromCLSID((LPCLSID)refiid,xrefiid); - FIXME(ddraw,"(%p)->(%s):stub.\n",This,xrefiid); + FIXME("(%p)->(%s):stub.\n",This,xrefiid); return DDERR_ALREADYINITIALIZED; } @@ -2471,7 +2471,7 @@ static HRESULT WINAPI IDirect3DImpl_EnumDevices(LPDIRECT3D iface, LPD3DENUMDEVICESCALLBACK cb, LPVOID context) { ICOM_THIS(IDirect3DImpl,iface); - FIXME(ddraw,"(%p)->(%p,%p),stub!\n",This,cb,context); + FIXME("(%p)->(%p,%p),stub!\n",This,cb,context); /* Call functions defined in d3ddevices.c */ if (!d3d_OpenGL_dx3(cb, context)) @@ -2485,7 +2485,7 @@ static HRESULT WINAPI IDirect3DImpl_CreateLight(LPDIRECT3D iface, IUnknown *lpunk) { ICOM_THIS(IDirect3DImpl,iface); - TRACE(ddraw, "(%p)->(%p,%p): stub\n", This, lplight, lpunk); + TRACE("(%p)->(%p,%p): stub\n", This, lplight, lpunk); /* Call the creation function that is located in d3dlight.c */ *lplight = d3dlight_create_dx3(This); @@ -2498,7 +2498,7 @@ static HRESULT WINAPI IDirect3DImpl_CreateMaterial(LPDIRECT3D iface, IUnknown *lpunk) { ICOM_THIS(IDirect3DImpl,iface); - TRACE(ddraw, "(%p)->(%p,%p): stub\n", This, lpmaterial, lpunk); + TRACE("(%p)->(%p,%p): stub\n", This, lpmaterial, lpunk); /* Call the creation function that is located in d3dviewport.c */ *lpmaterial = d3dmaterial_create(This); @@ -2511,7 +2511,7 @@ static HRESULT WINAPI IDirect3DImpl_CreateViewport(LPDIRECT3D iface, IUnknown *lpunk) { ICOM_THIS(IDirect3DImpl,iface); - TRACE(ddraw, "(%p)->(%p,%p): stub\n", This, lpviewport, lpunk); + TRACE("(%p)->(%p,%p): stub\n", This, lpviewport, lpunk); /* Call the creation function that is located in d3dviewport.c */ *lpviewport = d3dviewport_create(This); @@ -2524,7 +2524,7 @@ static HRESULT WINAPI IDirect3DImpl_FindDevice(LPDIRECT3D iface, LPD3DFINDDEVICERESULT lpfinddevrst) { ICOM_THIS(IDirect3DImpl,iface); - TRACE(ddraw, "(%p)->(%p,%p): stub\n", This, lpfinddevsrc, lpfinddevrst); + TRACE("(%p)->(%p,%p): stub\n", This, lpfinddevsrc, lpfinddevrst); return DD_OK; } @@ -2554,14 +2554,14 @@ static HRESULT WINAPI IDirect3D2Impl_QueryInterface( char xrefiid[50]; WINE_StringFromCLSID((LPCLSID)refiid,xrefiid); - TRACE(ddraw,"(%p)->(%s,%p)\n",This,xrefiid,obj); + TRACE("(%p)->(%s,%p)\n",This,xrefiid,obj); if ((!memcmp(&IID_IDirectDraw,refiid,sizeof(IID_IDirectDraw))) || (!memcmp(&IID_IDirectDraw2,refiid,sizeof(IID_IDirectDraw2))) || (!memcmp(&IID_IDirectDraw4,refiid,sizeof(IID_IDirectDraw4)))) { *obj = This->ddraw; IDirect3D2_AddRef(iface); - TRACE(ddraw, " Creating IDirectDrawX interface (%p)\n", *obj); + TRACE(" Creating IDirectDrawX interface (%p)\n", *obj); return S_OK; } @@ -2570,7 +2570,7 @@ static HRESULT WINAPI IDirect3D2Impl_QueryInterface( *obj = This; IDirect3D2_AddRef(iface); - TRACE(ddraw, " Creating IDirect3D2 interface (%p)\n", *obj); + TRACE(" Creating IDirect3D2 interface (%p)\n", *obj); return S_OK; } @@ -2584,24 +2584,24 @@ static HRESULT WINAPI IDirect3D2Impl_QueryInterface( d3d->lpvtbl = &d3dvt; *obj = d3d; - TRACE(ddraw, " Creating IDirect3D interface (%p)\n", *obj); + TRACE(" Creating IDirect3D interface (%p)\n", *obj); return S_OK; } - FIXME(ddraw,"(%p):interface for IID %s NOT found!\n",This,xrefiid); + FIXME("(%p):interface for IID %s NOT found!\n",This,xrefiid); return OLE_E_ENUM_NOMORE; } static ULONG WINAPI IDirect3D2Impl_AddRef(LPDIRECT3D2 iface) { ICOM_THIS(IDirect3D2Impl,iface); - TRACE( ddraw, "(%p)->() incrementing from %lu.\n", This, This->ref ); + TRACE("(%p)->() incrementing from %lu.\n", This, This->ref ); return ++(This->ref); } static ULONG WINAPI IDirect3D2Impl_Release(LPDIRECT3D2 iface) { ICOM_THIS(IDirect3D2Impl,iface); - TRACE( ddraw, "(%p)->() decrementing from %lu.\n", This, This->ref ); + TRACE("(%p)->() decrementing from %lu.\n", This, This->ref ); if (!--(This->ref)) { IDirectDraw2_Release((IDirectDraw2*)This->ddraw); @@ -2615,7 +2615,7 @@ static HRESULT WINAPI IDirect3D2Impl_EnumDevices( LPDIRECT3D2 iface,LPD3DENUMDEVICESCALLBACK cb, LPVOID context ) { ICOM_THIS(IDirect3D2Impl,iface); - FIXME(ddraw,"(%p)->(%p,%p),stub!\n",This,cb,context); + FIXME("(%p)->(%p,%p),stub!\n",This,cb,context); /* Call functions defined in d3ddevices.c */ if (!d3d_OpenGL(cb, context)) @@ -2629,7 +2629,7 @@ static HRESULT WINAPI IDirect3D2Impl_CreateLight(LPDIRECT3D2 iface, IUnknown *lpunk) { ICOM_THIS(IDirect3D2Impl,iface); - TRACE(ddraw, "(%p)->(%p,%p): stub\n", This, lplight, lpunk); + TRACE("(%p)->(%p,%p): stub\n", This, lplight, lpunk); /* Call the creation function that is located in d3dlight.c */ *lplight = d3dlight_create(This); @@ -2642,7 +2642,7 @@ static HRESULT WINAPI IDirect3D2Impl_CreateMaterial(LPDIRECT3D2 iface, IUnknown *lpunk) { ICOM_THIS(IDirect3D2Impl,iface); - TRACE(ddraw, "(%p)->(%p,%p): stub\n", This, lpmaterial, lpunk); + TRACE("(%p)->(%p,%p): stub\n", This, lpmaterial, lpunk); /* Call the creation function that is located in d3dviewport.c */ *lpmaterial = d3dmaterial2_create(This); @@ -2655,7 +2655,7 @@ static HRESULT WINAPI IDirect3D2Impl_CreateViewport(LPDIRECT3D2 iface, IUnknown *lpunk) { ICOM_THIS(IDirect3D2Impl,iface); - TRACE(ddraw, "(%p)->(%p,%p): stub\n", This, lpviewport, lpunk); + TRACE("(%p)->(%p,%p): stub\n", This, lpviewport, lpunk); /* Call the creation function that is located in d3dviewport.c */ *lpviewport = d3dviewport2_create(This); @@ -2668,7 +2668,7 @@ static HRESULT WINAPI IDirect3D2Impl_FindDevice(LPDIRECT3D2 iface, LPD3DFINDDEVICERESULT lpfinddevrst) { ICOM_THIS(IDirect3D2Impl,iface); - TRACE(ddraw, "(%p)->(%p,%p): stub\n", This, lpfinddevsrc, lpfinddevrst); + TRACE("(%p)->(%p,%p): stub\n", This, lpfinddevsrc, lpfinddevrst); return DD_OK; } @@ -2682,7 +2682,7 @@ static HRESULT WINAPI IDirect3D2Impl_CreateDevice(LPDIRECT3D2 iface, char xbuf[50]; WINE_StringFromCLSID(rguid,xbuf); - FIXME(ddraw,"(%p)->(%s,%p,%p): stub\n",This,xbuf,surface,device); + FIXME("(%p)->(%s,%p,%p): stub\n",This,xbuf,surface,device); if (is_OpenGL(rguid, (IDirectDrawSurfaceImpl*)surface, (IDirect3DDevice2Impl**)device, This)) { IDirect3D2_AddRef(iface); @@ -2721,11 +2721,11 @@ static HRESULT common_off_screen_CreateSurface(IDirectDraw2Impl* This, int bpp; /* The surface was already allocated when entering in this function */ - TRACE(ddraw,"using system memory for a surface (%p)\n", lpdsf); + TRACE("using system memory for a surface (%p)\n", lpdsf); if (lpdsf->s.surface_desc.dwFlags & DDSD_ZBUFFERBITDEPTH) { /* This is a Z Buffer */ - TRACE(ddraw, "Creating Z-Buffer of %ld bit depth\n", lpdsf->s.surface_desc.x.dwZBufferBitDepth); + TRACE("Creating Z-Buffer of %ld bit depth\n", lpdsf->s.surface_desc.x.dwZBufferBitDepth); bpp = lpdsf->s.surface_desc.x.dwZBufferBitDepth / 8; } else { /* This is a standard image */ @@ -2740,7 +2740,7 @@ static HRESULT common_off_screen_CreateSurface(IDirectDraw2Impl* This, if (lpdsf->s.surface_desc.dwFlags & DDSD_LPSURFACE) { /* The surface was preallocated : seems that we have nothing to do :-) */ - WARN(ddraw, "Creates a surface that is already allocated : assuming this is an application bug !\n"); + WARN("Creates a surface that is already allocated : assuming this is an application bug !\n"); } lpdsf->s.surface_desc.dwFlags |= DDSD_PITCH|DDSD_LPSURFACE; @@ -2759,7 +2759,7 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_CreateSurface( IDirectDrawSurfaceImpl** ilpdsf=(IDirectDrawSurfaceImpl**)lpdsf; int i; - TRACE(ddraw, "(%p)->(%p,%p,%p)\n",This,lpddsd,ilpdsf,lpunk); + TRACE("(%p)->(%p,%p,%p)\n",This,lpddsd,ilpdsf,lpunk); if (TRACE_ON(ddraw)) { _dump_surface_desc(lpddsd); } @@ -2794,7 +2794,7 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_CreateSurface( for (i=0;i<32;i++) if (!(This->e.dga.vpmask & (1<<i))) break; - TRACE(ddraw,"using viewport %d for a primary surface\n",i); + TRACE("using viewport %d for a primary surface\n",i); /* if i == 32 or maximum ... return error */ This->e.dga.vpmask|=(1<<i); (*ilpdsf)->s.surface_desc.y.lpSurface = @@ -2807,7 +2807,7 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_CreateSurface( (*ilpdsf)->s.surface_desc.dwFlags |= DDSD_WIDTH|DDSD_HEIGHT|DDSD_PITCH|DDSD_LPSURFACE|DDSD_PIXELFORMAT; (*ilpdsf)->s.surface_desc.dwWidth = This->d.width; (*ilpdsf)->s.surface_desc.dwHeight = This->d.height; - TRACE(ddraw,"primary surface: dwWidth=%ld, dwHeight=%ld, lPitch=%ld\n",This->d.width,This->d.height,lpddsd->lPitch); + TRACE("primary surface: dwWidth=%ld, dwHeight=%ld, lPitch=%ld\n",This->d.width,This->d.height,lpddsd->lPitch); /* We put our surface always in video memory */ (*ilpdsf)->s.surface_desc.ddsCaps.dwCaps |= DDSCAPS_VISIBLE|DDSCAPS_VIDEOMEMORY; (*ilpdsf)->s.surface_desc.ddpfPixelFormat = This->d.directdraw_pixelformat; @@ -2817,7 +2817,7 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_CreateSurface( IDirectDrawSurface4Impl* back; if (lpddsd->dwBackBufferCount>1) - FIXME(ddraw,"urks, wants to have more than one backbuffer (%ld)!\n",lpddsd->dwBackBufferCount); + FIXME("urks, wants to have more than one backbuffer (%ld)!\n",lpddsd->dwBackBufferCount); (*ilpdsf)->s.backbuffer = back = (IDirectDrawSurface4Impl*)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirectDrawSurface4Impl)); @@ -2827,7 +2827,7 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_CreateSurface( for (i=0;i<32;i++) if (!(This->e.dga.vpmask & (1<<i))) break; - TRACE(ddraw,"using viewport %d for backbuffer\n",i); + TRACE("using viewport %d for backbuffer\n",i); /* if i == 32 or maximum ... return error */ This->e.dga.vpmask|=(1<<i); back->t.dga.fb_height = i*This->e.dga.fb_height; @@ -2879,14 +2879,14 @@ static XImage *create_xshmimage(IDirectDraw2Impl* This, IDirectDrawSurface4Impl* lpdsf->s.surface_desc.dwHeight); if (img == NULL) { - MSG("Couldn't create XShm image (due to X11 remote display or failure).\nReverting to standard X images !\n"); + MESSAGE("Couldn't create XShm image (due to X11 remote display or failure).\nReverting to standard X images !\n"); This->e.xlib.xshm_active = 0; return NULL; } lpdsf->t.xlib.shminfo.shmid = shmget( IPC_PRIVATE, img->bytes_per_line * img->height, IPC_CREAT|0777 ); if (lpdsf->t.xlib.shminfo.shmid < 0) { - MSG("Couldn't create shared memory segment (due to X11 remote display or failure).\nReverting to standard X images !\n"); + MESSAGE("Couldn't create shared memory segment (due to X11 remote display or failure).\nReverting to standard X images !\n"); This->e.xlib.xshm_active = 0; TSXDestroyImage(img); return NULL; @@ -2895,7 +2895,7 @@ static XImage *create_xshmimage(IDirectDraw2Impl* This, IDirectDrawSurface4Impl* lpdsf->t.xlib.shminfo.shmaddr = img->data = (char*)shmat(lpdsf->t.xlib.shminfo.shmid, 0, 0); if (img->data == (char *) -1) { - MSG("Couldn't attach shared memory segment (due to X11 remote display or failure).\nReverting to standard X images !\n"); + MESSAGE("Couldn't attach shared memory segment (due to X11 remote display or failure).\nReverting to standard X images !\n"); This->e.xlib.xshm_active = 0; TSXDestroyImage(img); shmctl(lpdsf->t.xlib.shminfo.shmid, IPC_RMID, 0); @@ -2926,7 +2926,7 @@ static XImage *create_xshmimage(IDirectDraw2Impl* This, IDirectDrawSurface4Impl* shmctl(lpdsf->t.xlib.shminfo.shmid, IPC_RMID, 0); XSetErrorHandler(WineXHandler); - MSG("Couldn't attach shared memory segment to X server (due to X11 remote display or failure).\nReverting to standard X images !\n"); + MESSAGE("Couldn't attach shared memory segment to X server (due to X11 remote display or failure).\nReverting to standard X images !\n"); This->e.xlib.xshm_active = 0; /* Leave the critical section */ @@ -3012,7 +3012,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_CreateSurface( ) { ICOM_THIS(IDirectDraw2Impl,iface); IDirectDrawSurfaceImpl** ilpdsf=(IDirectDrawSurfaceImpl**)lpdsf; - TRACE(ddraw, "(%p)->CreateSurface(%p,%p,%p)\n", + TRACE("(%p)->CreateSurface(%p,%p,%p)\n", This,lpddsd,ilpdsf,lpunk); if (TRACE_ON(ddraw)) { @@ -3042,7 +3042,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_CreateSurface( (lpddsd->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) { XImage *img; - TRACE(ddraw,"using standard XImage for a primary surface (%p)\n", *ilpdsf); + TRACE("using standard XImage for a primary surface (%p)\n", *ilpdsf); /* Create the XImage */ img = create_ximage(This, (IDirectDrawSurface4Impl*) *ilpdsf); @@ -3064,12 +3064,12 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_CreateSurface( XImage *img; if (lpddsd->dwBackBufferCount>1) - FIXME(ddraw,"urks, wants to have more than one backbuffer (%ld)!\n",lpddsd->dwBackBufferCount); + FIXME("urks, wants to have more than one backbuffer (%ld)!\n",lpddsd->dwBackBufferCount); (*ilpdsf)->s.backbuffer = back = (IDirectDrawSurface4Impl*)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirectDrawSurface4Impl)); - TRACE(ddraw,"allocated back-buffer (%p)\n", back); + TRACE("allocated back-buffer (%p)\n", back); IDirectDraw2_AddRef(iface); back->s.ddraw = This; @@ -3108,7 +3108,7 @@ static HRESULT WINAPI IDirectDraw2Impl_DuplicateSurface( LPDIRECTDRAW2 iface,LPDIRECTDRAWSURFACE src,LPDIRECTDRAWSURFACE *dst ) { ICOM_THIS(IDirectDraw2Impl,iface); - FIXME(ddraw,"(%p)->(%p,%p) simply copies\n",This,src,dst); + FIXME("(%p)->(%p,%p) simply copies\n",This,src,dst); *dst = src; /* FIXME */ return DD_OK; } @@ -3139,13 +3139,13 @@ static HRESULT WINAPI IDirectDraw2Impl_SetCooperativeLevel( #undef FE }; - FIXME(ddraw,"(%p)->(%08lx,%08lx)\n",This,(DWORD)hwnd,cooplevel); + FIXME("(%p)->(%08lx,%08lx)\n",This,(DWORD)hwnd,cooplevel); if(TRACE_ON(ddraw)){ dbg_decl_str(ddraw, 512); for (i=0;i<sizeof(flagmap)/sizeof(flagmap[0]);i++) if (flagmap[i].mask & cooplevel) dsprintf(ddraw, "%s ", flagmap[i].name); - TRACE(ddraw," cooperative level %s\n", dbg_str(ddraw)); + TRACE(" cooperative level %s\n", dbg_str(ddraw)); } This->d.mainWindow = hwnd; @@ -3161,7 +3161,7 @@ static HRESULT WINAPI IDirectDraw2Impl_SetCooperativeLevel( This->d.drawable = ((X11DRV_WND_DATA *) WIN_GetDesktop()->pDriverData)->window; WIN_ReleaseDesktop(); } - TRACE(ddraw, "Setting drawable to %ld\n", This->d.drawable); + TRACE("Setting drawable to %ld\n", This->d.drawable); } return DD_OK; @@ -3255,7 +3255,7 @@ static int _common_depth_to_pixelformat(DWORD depth, DDPIXELFORMAT *pixelformat, } if (j == nvisuals) - ERR(ddraw, "No visual corresponding to pixmap format !\n"); + ERR("No visual corresponding to pixmap format !\n"); } } @@ -3295,7 +3295,7 @@ static int _common_depth_to_pixelformat(DWORD depth, DDPIXELFORMAT *pixelformat, } if (j == nvisuals) - ERR(ddraw, "No visual corresponding to pixmap format !\n"); + ERR("No visual corresponding to pixmap format !\n"); } } } @@ -3313,17 +3313,17 @@ static HRESULT WINAPI DGA_IDirectDrawImpl_SetDisplayMode( ICOM_THIS(IDirectDrawImpl,iface); int i,mode_count; - TRACE(ddraw, "(%p)->(%ld,%ld,%ld)\n", This, width, height, depth); + TRACE("(%p)->(%ld,%ld,%ld)\n", This, width, height, depth); /* We hope getting the asked for depth */ if (_common_depth_to_pixelformat(depth, &(This->d.directdraw_pixelformat), &(This->d.screen_pixelformat), NULL) != 1) { /* I.e. no visual found or emulated */ - ERR(ddraw,"(w=%ld,h=%ld,d=%ld), unsupported depth!\n",width,height,depth); + ERR("(w=%ld,h=%ld,d=%ld), unsupported depth!\n",width,height,depth); return DDERR_UNSUPPORTEDMODE; } if (This->d.width < width) { - ERR(ddraw,"SetDisplayMode(w=%ld,h=%ld,d=%ld), width %ld exceeds framebuffer width %ld\n",width,height,depth,width,This->d.width); + ERR("SetDisplayMode(w=%ld,h=%ld,d=%ld), width %ld exceeds framebuffer width %ld\n",width,height,depth,width,This->d.width); return DDERR_UNSUPPORTEDMODE; } This->d.width = width; @@ -3369,11 +3369,11 @@ static HRESULT WINAPI DGA_IDirectDrawImpl_SetDisplayMode( TSXFree(all_modes); if (!vidmode) - WARN(ddraw, "Fullscreen mode not available!\n"); + WARN("Fullscreen mode not available!\n"); if (vidmode) { - TRACE(ddraw,"SwitchToMode(%dx%d)\n",vidmode->hdisplay,vidmode->vdisplay); + TRACE("SwitchToMode(%dx%d)\n",vidmode->hdisplay,vidmode->vdisplay); TSXF86VidModeSwitchToMode(display, DefaultScreen(display), vidmode); #if 0 /* This messes up my screen (XF86_Mach64, 3.3.2.3a) for some reason, and should now be unnecessary */ TSXF86VidModeSetViewPort(display, DefaultScreen(display), 0, 0); @@ -3437,7 +3437,7 @@ static void pixel_convert_16_to_8(void *src, void *dst, DWORD width, DWORD heigh #endif } } else { - WARN(ddraw, "No palette set...\n"); + WARN("No palette set...\n"); memset(dst, 0, width * height * 2); } } @@ -3482,7 +3482,7 @@ static void pixel_convert_24_to_8(void *src, void *dst, DWORD width, DWORD heigh c_src+=(pitch-width); } } else { - WARN(ddraw, "No palette set...\n"); + WARN("No palette set...\n"); memset(dst, 0, width * height * 4); } } @@ -3521,7 +3521,7 @@ static void pixel_convert_32_to_8(void *src, void *dst, DWORD width, DWORD heigh #endif } } else { - WARN(ddraw, "No palette set...\n"); + WARN("No palette set...\n"); memset(dst, 0, width * height * 4); } } @@ -3543,7 +3543,7 @@ static HRESULT WINAPI Xlib_IDirectDrawImpl_SetDisplayMode( char buf[200]; WND *tmpWnd; - TRACE(ddraw, "(%p)->SetDisplayMode(%ld,%ld,%ld)\n", + TRACE("(%p)->SetDisplayMode(%ld,%ld,%ld)\n", This, width, height, depth); switch (_common_depth_to_pixelformat(depth, @@ -3564,7 +3564,7 @@ static HRESULT WINAPI Xlib_IDirectDrawImpl_SetDisplayMode( case 2: { int found = 0; - WARN(ddraw, "Warning : running in depth-convertion mode. Should run using a %ld depth for optimal performances.\n", depth); + WARN("Warning : running in depth-convertion mode. Should run using a %ld depth for optimal performances.\n", depth); /* Set the depth convertion routines */ switch (This->d.screen_pixelformat.x.dwRGBBitCount) { @@ -3636,7 +3636,7 @@ static HRESULT WINAPI Xlib_IDirectDrawImpl_SetDisplayMode( This->d.drawable = ((X11DRV_WND_DATA *) WIN_GetDesktop()->pDriverData)->window; WIN_ReleaseDesktop(); } - TRACE(ddraw, "Setting drawable to %ld\n", This->d.drawable); + TRACE("Setting drawable to %ld\n", This->d.drawable); return DD_OK; } @@ -3646,7 +3646,7 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_GetCaps( LPDIRECTDRAW2 iface,LPDDCAPS caps1,LPDDCAPS caps2 ) { ICOM_THIS(IDirectDraw2Impl,iface); - TRACE(ddraw,"(%p)->GetCaps(%p,%p)\n",This,caps1,caps2); + TRACE("(%p)->GetCaps(%p,%p)\n",This,caps1,caps2); if (!caps1 && !caps2) return DDERR_INVALIDPARAMS; if (caps1) { @@ -3701,7 +3701,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_GetCaps( LPDIRECTDRAW2 iface,LPDDCAPS caps1,LPDDCAPS caps2 ) { ICOM_THIS(IDirectDraw2Impl,iface); - TRACE(ddraw,"(%p)->GetCaps(%p,%p)\n",This,caps1,caps2); + TRACE("(%p)->GetCaps(%p,%p)\n",This,caps1,caps2); /* Put the same caps for the two capabilities */ fill_caps(caps1); @@ -3715,7 +3715,7 @@ static HRESULT WINAPI IDirectDraw2Impl_CreateClipper( ) { ICOM_THIS(IDirectDraw2Impl,iface); IDirectDrawClipperImpl** ilpddclip=(IDirectDrawClipperImpl**)lpddclip; - FIXME(ddraw,"(%p)->(%08lx,%p,%p),stub!\n", + FIXME("(%p)->(%08lx,%p,%p),stub!\n", This,x,ilpddclip,lpunk ); *ilpddclip = (IDirectDrawClipperImpl*)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirectDrawClipperImpl)); @@ -3747,7 +3747,7 @@ static HRESULT WINAPI common_IDirectDraw2Impl_CreatePalette( else if (dwFlags & DDPCAPS_8BIT) size = 256; else - ERR(ddraw, "unhandled palette format\n"); + ERR("unhandled palette format\n"); *psize = size; if (palent) @@ -3774,14 +3774,14 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_CreatePalette( HRESULT res; int xsize = 0,i; - TRACE(ddraw,"(%p)->(%08lx,%p,%p,%p)\n",This,dwFlags,palent,ilpddpal,lpunk); + TRACE("(%p)->(%08lx,%p,%p,%p)\n",This,dwFlags,palent,ilpddpal,lpunk); res = common_IDirectDraw2Impl_CreatePalette(This,dwFlags,palent,ilpddpal,lpunk,&xsize); if (res != 0) return res; (*ilpddpal)->lpvtbl = &dga_ddpalvt; if (This->d.directdraw_pixelformat.x.dwRGBBitCount<=8) { (*ilpddpal)->cm = TSXCreateColormap(display,DefaultRootWindow(display),DefaultVisualOfScreen(X11DRV_GetXScreen()),AllocAll); } else { - FIXME(ddraw,"why are we doing CreatePalette in hi/truecolor?\n"); + FIXME("why are we doing CreatePalette in hi/truecolor?\n"); (*ilpddpal)->cm = 0; } if (((*ilpddpal)->cm)&&xsize) { @@ -3808,7 +3808,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_CreatePalette( int xsize; HRESULT res; - TRACE(ddraw,"(%p)->(%08lx,%p,%p,%p)\n",This,dwFlags,palent,ilpddpal,lpunk); + TRACE("(%p)->(%08lx,%p,%p,%p)\n",This,dwFlags,palent,ilpddpal,lpunk); res = common_IDirectDraw2Impl_CreatePalette(This,dwFlags,palent,ilpddpal,lpunk,&xsize); if (res != 0) return res; (*ilpddpal)->lpvtbl = &xlib_ddpalvt; @@ -3818,7 +3818,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_CreatePalette( #ifdef HAVE_LIBXXF86DGA static HRESULT WINAPI DGA_IDirectDraw2Impl_RestoreDisplayMode(LPDIRECTDRAW2 iface) { ICOM_THIS(IDirectDraw2Impl,iface); - TRACE(ddraw, "(%p)->()\n",This); + TRACE("(%p)->()\n",This); Sleep(1000); TSXF86DGADirectVideo(display,DefaultScreen(display),0); #ifdef RESTORE_SIGNALS @@ -3830,7 +3830,7 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_RestoreDisplayMode(LPDIRECTDRAW2 ifac static HRESULT WINAPI Xlib_IDirectDraw2Impl_RestoreDisplayMode(LPDIRECTDRAW2 iface) { ICOM_THIS(IDirectDraw2Impl,iface); - TRACE(ddraw, "(%p)->RestoreDisplayMode()\n", This); + TRACE("(%p)->RestoreDisplayMode()\n", This); Sleep(1000); return DD_OK; } @@ -3839,13 +3839,13 @@ static HRESULT WINAPI IDirectDraw2Impl_WaitForVerticalBlank( LPDIRECTDRAW2 iface,DWORD x,HANDLE h ) { ICOM_THIS(IDirectDraw2Impl,iface); - TRACE(ddraw,"(%p)->(0x%08lx,0x%08x)\n",This,x,h); + TRACE("(%p)->(0x%08lx,0x%08x)\n",This,x,h); return DD_OK; } static ULONG WINAPI IDirectDraw2Impl_AddRef(LPDIRECTDRAW2 iface) { ICOM_THIS(IDirectDraw2Impl,iface); - TRACE( ddraw, "(%p)->() incrementing from %lu.\n", This, This->ref ); + TRACE("(%p)->() incrementing from %lu.\n", This, This->ref ); return ++(This->ref); } @@ -3853,7 +3853,7 @@ static ULONG WINAPI IDirectDraw2Impl_AddRef(LPDIRECTDRAW2 iface) { #ifdef HAVE_LIBXXF86DGA static ULONG WINAPI DGA_IDirectDraw2Impl_Release(LPDIRECTDRAW2 iface) { ICOM_THIS(IDirectDraw2Impl,iface); - TRACE( ddraw, "(%p)->() decrementing from %lu.\n", This, This->ref ); + TRACE("(%p)->() decrementing from %lu.\n", This, This->ref ); if (!--(This->ref)) { TSXF86DGADirectVideo(display,DefaultScreen(display),0); @@ -3884,7 +3884,7 @@ static ULONG WINAPI DGA_IDirectDraw2Impl_Release(LPDIRECTDRAW2 iface) { static ULONG WINAPI Xlib_IDirectDraw2Impl_Release(LPDIRECTDRAW2 iface) { ICOM_THIS(IDirectDraw2Impl,iface); - TRACE( ddraw, "(%p)->() decrementing from %lu.\n", This, This->ref ); + TRACE("(%p)->() decrementing from %lu.\n", This, This->ref ); if (!--(This->ref)) { if (This->d.window && (This->d.mainWindow != This->d.window)) @@ -3904,12 +3904,12 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_QueryInterface( char xrefiid[50]; WINE_StringFromCLSID((LPCLSID)refiid,xrefiid); - TRACE(ddraw,"(%p)->(%s,%p)\n",This,xrefiid,obj); + TRACE("(%p)->(%s,%p)\n",This,xrefiid,obj); if (!memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown))) { *obj = This; IDirectDraw2_AddRef(iface); - TRACE(ddraw, " Creating IUnknown interface (%p)\n", *obj); + TRACE(" Creating IUnknown interface (%p)\n", *obj); return S_OK; } @@ -3918,7 +3918,7 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_QueryInterface( IDirectDraw2_AddRef(iface); *obj = This; - TRACE(ddraw, " Creating IDirectDraw interface (%p)\n", *obj); + TRACE(" Creating IDirectDraw interface (%p)\n", *obj); return S_OK; } @@ -3927,7 +3927,7 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_QueryInterface( IDirectDraw2_AddRef(iface); *obj = This; - TRACE(ddraw, " Creating IDirectDraw2 interface (%p)\n", *obj); + TRACE(" Creating IDirectDraw2 interface (%p)\n", *obj); return S_OK; } @@ -3936,7 +3936,7 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_QueryInterface( IDirectDraw2_AddRef(iface); *obj = This; - TRACE(ddraw, " Creating IDirectDraw4 interface (%p)\n", *obj); + TRACE(" Creating IDirectDraw4 interface (%p)\n", *obj); return S_OK; } @@ -3950,7 +3950,7 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_QueryInterface( d3d->lpvtbl = &d3dvt; *obj = d3d; - TRACE(ddraw, " Creating IDirect3D interface (%p)\n", *obj); + TRACE(" Creating IDirect3D interface (%p)\n", *obj); return S_OK; } @@ -3964,11 +3964,11 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_QueryInterface( d3d->lpvtbl = &d3d2vt; *obj = d3d; - TRACE(ddraw, " Creating IDirect3D2 interface (%p)\n", *obj); + TRACE(" Creating IDirect3D2 interface (%p)\n", *obj); return S_OK; } - WARN(ddraw,"(%p):interface for IID %s _NOT_ found!\n",This,xrefiid); + WARN("(%p):interface for IID %s _NOT_ found!\n",This,xrefiid); return OLE_E_ENUM_NOMORE; } #endif /* defined(HAVE_LIBXXF86DGA) */ @@ -3980,12 +3980,12 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_QueryInterface( char xrefiid[50]; WINE_StringFromCLSID((LPCLSID)refiid,xrefiid); - TRACE(ddraw,"(%p)->(%s,%p)\n",This,xrefiid,obj); + TRACE("(%p)->(%s,%p)\n",This,xrefiid,obj); if (!memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown))) { *obj = This; IDirectDraw2_AddRef(iface); - TRACE(ddraw, " Creating IUnknown interface (%p)\n", *obj); + TRACE(" Creating IUnknown interface (%p)\n", *obj); return S_OK; } @@ -3994,7 +3994,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_QueryInterface( IDirectDraw2_AddRef(iface); *obj = This; - TRACE(ddraw, " Creating IDirectDraw interface (%p)\n", *obj); + TRACE(" Creating IDirectDraw interface (%p)\n", *obj); return S_OK; } @@ -4003,7 +4003,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_QueryInterface( IDirectDraw2_AddRef(iface); *obj = This; - TRACE(ddraw, " Creating IDirectDraw2 interface (%p)\n", *obj); + TRACE(" Creating IDirectDraw2 interface (%p)\n", *obj); return S_OK; } @@ -4012,7 +4012,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_QueryInterface( IDirectDraw2_AddRef(iface); *obj = This; - TRACE(ddraw, " Creating IDirectDraw4 interface (%p)\n", *obj); + TRACE(" Creating IDirectDraw4 interface (%p)\n", *obj); return S_OK; } @@ -4026,7 +4026,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_QueryInterface( d3d->lpvtbl = &d3dvt; *obj = d3d; - TRACE(ddraw, " Creating IDirect3D interface (%p)\n", *obj); + TRACE(" Creating IDirect3D interface (%p)\n", *obj); return S_OK; } @@ -4040,11 +4040,11 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_QueryInterface( d3d->lpvtbl = &d3d2vt; *obj = d3d; - TRACE(ddraw, " Creating IDirect3D2 interface (%p)\n", *obj); + TRACE(" Creating IDirect3D2 interface (%p)\n", *obj); return S_OK; } - WARN(ddraw,"(%p):interface for IID %s _NOT_ found!\n",This,xrefiid); + WARN("(%p):interface for IID %s _NOT_ found!\n",This,xrefiid); return OLE_E_ENUM_NOMORE; } @@ -4052,7 +4052,7 @@ static HRESULT WINAPI IDirectDraw2Impl_GetVerticalBlankStatus( LPDIRECTDRAW2 iface,BOOL *status ) { ICOM_THIS(IDirectDraw2Impl,iface); - TRACE(ddraw,"(%p)->(%p)\n",This,status); + TRACE("(%p)->(%p)\n",This,status); *status = TRUE; return DD_OK; } @@ -4075,7 +4075,7 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_EnumDisplayModes( static int depths[4] = {8,16,24,32}; int i,j; - TRACE(ddraw,"(%p)->(0x%08lx,%p,%p,%p)\n",This,dwFlags,lpddsfd,context,modescb); + TRACE("(%p)->(0x%08lx,%p,%p,%p)\n",This,dwFlags,lpddsfd,context,modescb); ddsfd.dwSize = sizeof(ddsfd); ddsfd.dwFlags = DDSD_HEIGHT|DDSD_WIDTH|DDSD_BACKBUFFERCOUNT|DDSD_PIXELFORMAT|DDSD_CAPS; if (dwFlags & DDEDM_REFRESHRATES) { @@ -4121,13 +4121,13 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_EnumDisplayModes( ddsfd.dwWidth = MONITOR_GetWidth(&MONITOR_PrimaryMonitor); ddsfd.dwHeight = MONITOR_GetHeight(&MONITOR_PrimaryMonitor); - TRACE(ddraw," enumerating (%ldx%ldx%d)\n",ddsfd.dwWidth,ddsfd.dwHeight,depths[i]); + TRACE(" enumerating (%ldx%ldx%d)\n",ddsfd.dwWidth,ddsfd.dwHeight,depths[i]); if (!modescb(&ddsfd,context)) return DD_OK; for (j=0;j<sizeof(modes)/sizeof(modes[0]);j++) { ddsfd.dwWidth = modes[j].w; ddsfd.dwHeight = modes[j].h; - TRACE(ddraw," enumerating (%ldx%ldx%d)\n",ddsfd.dwWidth,ddsfd.dwHeight,depths[i]); + TRACE(" enumerating (%ldx%ldx%d)\n",ddsfd.dwWidth,ddsfd.dwHeight,depths[i]); if (!modescb(&ddsfd,context)) return DD_OK; } @@ -4136,7 +4136,7 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_EnumDisplayModes( ddsfd.dwHeight = 200; ddsfd.dwWidth = 320; - TRACE(ddraw," enumerating (320x200x%d)\n",depths[i]); + TRACE(" enumerating (320x200x%d)\n",depths[i]); if (!modescb(&ddsfd,context)) return DD_OK; } } @@ -4167,7 +4167,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_EnumDisplayModes( }; DWORD maxWidth, maxHeight; - TRACE(ddraw,"(%p)->(0x%08lx,%p,%p,%p)\n",This,dwFlags,lpddsfd,context,modescb); + TRACE("(%p)->(0x%08lx,%p,%p,%p)\n",This,dwFlags,lpddsfd,context,modescb); ddsfd.dwSize = sizeof(ddsfd); ddsfd.dwFlags = DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT|DDSD_CAPS; if (dwFlags & DDEDM_REFRESHRATES) { @@ -4220,7 +4220,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_EnumDisplayModes( } if (j == nvisuals) - ERR(ddraw, "Did not find visual corresponding the the pixmap format !\n"); + ERR("Did not find visual corresponding the the pixmap format !\n"); } else { send_mode = 0; } @@ -4229,9 +4229,9 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_EnumDisplayModes( int mode; if (TRACE_ON(ddraw)) { - TRACE(ddraw, "Enumerating with pixel format : \n"); + TRACE("Enumerating with pixel format : \n"); _dump_pixelformat(&(ddsfd.ddpfPixelFormat)); - DUMP("\n"); + DPRINTF("\n"); } for (mode = 0; mode < sizeof(modes)/sizeof(modes[0]); mode++) { @@ -4243,7 +4243,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_EnumDisplayModes( ddsfd.dwHeight = modes[mode].h; /* Now, send the mode description to the application */ - TRACE(ddraw, " - mode %4ld - %4ld\n", ddsfd.dwWidth, ddsfd.dwHeight); + TRACE(" - mode %4ld - %4ld\n", ddsfd.dwWidth, ddsfd.dwHeight); if (!modescb(&ddsfd, context)) goto exit_enum; } @@ -4277,7 +4277,7 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_GetDisplayMode( LPDIRECTDRAW2 iface,LPDDSURFACEDESC lpddsfd ) { ICOM_THIS(IDirectDraw2Impl,iface); - TRACE(ddraw,"(%p)->(%p)\n",This,lpddsfd); + TRACE("(%p)->(%p)\n",This,lpddsfd); lpddsfd->dwFlags = DDSD_HEIGHT|DDSD_WIDTH|DDSD_PITCH|DDSD_BACKBUFFERCOUNT|DDSD_PIXELFORMAT|DDSD_CAPS; lpddsfd->dwHeight = This->d.height; lpddsfd->dwWidth = This->d.width; @@ -4294,7 +4294,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_GetDisplayMode( LPDIRECTDRAW2 iface,LPDDSURFACEDESC lpddsfd ) { ICOM_THIS(IDirectDraw2Impl,iface); - TRACE(ddraw,"(%p)->GetDisplayMode(%p)\n",This,lpddsfd); + TRACE("(%p)->GetDisplayMode(%p)\n",This,lpddsfd); lpddsfd->dwFlags = DDSD_HEIGHT|DDSD_WIDTH|DDSD_PITCH|DDSD_BACKBUFFERCOUNT|DDSD_PIXELFORMAT|DDSD_CAPS; lpddsfd->dwHeight = This->d.height; lpddsfd->dwWidth = This->d.width; @@ -4308,7 +4308,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_GetDisplayMode( static HRESULT WINAPI IDirectDraw2Impl_FlipToGDISurface(LPDIRECTDRAW2 iface) { ICOM_THIS(IDirectDraw2Impl,iface); - TRACE(ddraw,"(%p)->()\n",This); + TRACE("(%p)->()\n",This); return DD_OK; } @@ -4316,7 +4316,7 @@ static HRESULT WINAPI IDirectDraw2Impl_GetMonitorFrequency( LPDIRECTDRAW2 iface,LPDWORD freq ) { ICOM_THIS(IDirectDraw2Impl,iface); - FIXME(ddraw,"(%p)->(%p) returns 60 Hz always\n",This,freq); + FIXME("(%p)->(%p) returns 60 Hz always\n",This,freq); *freq = 60*100; /* 60 Hz */ return DD_OK; } @@ -4326,7 +4326,7 @@ static HRESULT WINAPI IDirectDraw2Impl_GetFourCCCodes( LPDIRECTDRAW2 iface,LPDWORD x,LPDWORD y ) { ICOM_THIS(IDirectDraw2Impl,iface); - FIXME(ddraw,"(%p,%p,%p), stub\n",This,x,y); + FIXME("(%p,%p,%p), stub\n",This,x,y); return DD_OK; } @@ -4334,7 +4334,7 @@ static HRESULT WINAPI IDirectDraw2Impl_EnumSurfaces( LPDIRECTDRAW2 iface,DWORD x,LPDDSURFACEDESC ddsfd,LPVOID context,LPDDENUMSURFACESCALLBACK ddsfcb ) { ICOM_THIS(IDirectDraw2Impl,iface); - FIXME(ddraw,"(%p)->(0x%08lx,%p,%p,%p),stub!\n",This,x,ddsfd,context,ddsfcb); + FIXME("(%p)->(0x%08lx,%p,%p,%p),stub!\n",This,x,ddsfd,context,ddsfcb); return DD_OK; } @@ -4342,7 +4342,7 @@ static HRESULT WINAPI IDirectDraw2Impl_Compact( LPDIRECTDRAW2 iface ) { ICOM_THIS(IDirectDraw2Impl,iface); - FIXME(ddraw,"(%p)->()\n", This ); + FIXME("(%p)->()\n", This ); return DD_OK; } @@ -4350,7 +4350,7 @@ static HRESULT WINAPI IDirectDraw2Impl_Compact( static HRESULT WINAPI IDirectDraw2Impl_GetGDISurface(LPDIRECTDRAW2 iface, LPDIRECTDRAWSURFACE *lplpGDIDDSSurface) { ICOM_THIS(IDirectDraw2Impl,iface); - FIXME(ddraw,"(%p)->(%p)\n", This, lplpGDIDDSSurface); + FIXME("(%p)->(%p)\n", This, lplpGDIDDSSurface); return DD_OK; } @@ -4358,7 +4358,7 @@ static HRESULT WINAPI IDirectDraw2Impl_GetGDISurface(LPDIRECTDRAW2 iface, static HRESULT WINAPI IDirectDraw2Impl_GetScanLine(LPDIRECTDRAW2 iface, LPDWORD lpdwScanLine) { ICOM_THIS(IDirectDraw2Impl,iface); - FIXME(ddraw,"(%p)->(%p)\n", This, lpdwScanLine); + FIXME("(%p)->(%p)\n", This, lpdwScanLine); return DD_OK; } @@ -4366,7 +4366,7 @@ static HRESULT WINAPI IDirectDraw2Impl_GetScanLine(LPDIRECTDRAW2 iface, static HRESULT WINAPI IDirectDraw2Impl_Initialize(LPDIRECTDRAW2 iface, GUID *lpGUID) { ICOM_THIS(IDirectDraw2Impl,iface); - FIXME(ddraw,"(%p)->(%p)\n", This, lpGUID); + FIXME("(%p)->(%p)\n", This, lpGUID); return DD_OK; } @@ -4474,7 +4474,7 @@ static HRESULT WINAPI DGA_IDirectDraw2Impl_GetAvailableVidMem( LPDIRECTDRAW2 iface,LPDDSCAPS ddscaps,LPDWORD total,LPDWORD free ) { ICOM_THIS(IDirectDraw2Impl,iface); - TRACE(ddraw,"(%p)->(%p,%p,%p)\n", + TRACE("(%p)->(%p,%p,%p)\n", This,ddscaps,total,free ); if (total) *total = This->e.dga.fb_memsize * 1024; @@ -4487,7 +4487,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_GetAvailableVidMem( LPDIRECTDRAW2 iface,LPDDSCAPS ddscaps,LPDWORD total,LPDWORD free ) { ICOM_THIS(IDirectDraw2Impl,iface); - TRACE(ddraw,"(%p)->(%p,%p,%p)\n", + TRACE("(%p)->(%p,%p,%p)\n", This,ddscaps,total,free ); if (total) *total = 2048 * 1024; @@ -4564,21 +4564,21 @@ static HRESULT WINAPI IDirectDraw4Impl_GetSurfaceFromDC(LPDIRECTDRAW4 iface, HDC hdc, LPDIRECTDRAWSURFACE *lpDDS) { ICOM_THIS(IDirectDraw4Impl,iface); - FIXME(ddraw, "(%p)->(%08ld,%p)\n", This, (DWORD) hdc, lpDDS); + FIXME("(%p)->(%08ld,%p)\n", This, (DWORD) hdc, lpDDS); return DD_OK; } static HRESULT WINAPI IDirectDraw4Impl_RestoreAllSurfaces(LPDIRECTDRAW4 iface) { ICOM_THIS(IDirectDraw4Impl,iface); - FIXME(ddraw, "(%p)->()\n", This); + FIXME("(%p)->()\n", This); return DD_OK; } static HRESULT WINAPI IDirectDraw4Impl_TestCooperativeLevel(LPDIRECTDRAW4 iface) { ICOM_THIS(IDirectDraw4Impl,iface); - FIXME(ddraw, "(%p)->()\n", This); + FIXME("(%p)->()\n", This); return DD_OK; } @@ -4587,7 +4587,7 @@ static HRESULT WINAPI IDirectDraw4Impl_GetDeviceIdentifier(LPDIRECTDRAW4 iface, LPDDDEVICEIDENTIFIER lpdddi, DWORD dwFlags) { ICOM_THIS(IDirectDraw4Impl,iface); - FIXME(ddraw, "(%p)->(%p,%08lx)\n", This, lpdddi, dwFlags); + FIXME("(%p)->(%p,%08lx)\n", This, lpdddi, dwFlags); return DD_OK; } @@ -4696,7 +4696,7 @@ LRESULT WINAPI Xlib_DDWndProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam) ( ( lastError = GetLastError() ) != ERROR_SUCCESS ) ) { - ERR( ddraw, "Unable to retrieve this ptr from window. Error %08lx\n", lastError ); + ERR("Unable to retrieve this ptr from window. Error %08lx\n", lastError ); } if( ddraw ) @@ -4758,31 +4758,31 @@ HRESULT WINAPI DGA_DirectDrawCreate( LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnkOuter) close(fd); if (fd == -1) { - MSG("Must be able to access /dev/mem to use XF86DGA!\n"); + MESSAGE("Must be able to access /dev/mem to use XF86DGA!\n"); MessageBoxA(0,"Using the XF86DGA extension requires access to /dev/mem.","WINE DirectDraw",MB_OK|MB_ICONSTOP); return E_UNEXPECTED; } if (!DDRAW_DGA_Available()) { - TRACE(ddraw,"No XF86DGA detected.\n"); + TRACE("No XF86DGA detected.\n"); return DDERR_GENERIC; } *ilplpDD = (IDirectDrawImpl*)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirectDrawImpl)); (*ilplpDD)->lpvtbl = &dga_ddvt; (*ilplpDD)->ref = 1; TSXF86DGAQueryVersion(display,&major,&minor); - TRACE(ddraw,"XF86DGA is version %d.%d\n",major,minor); + TRACE("XF86DGA is version %d.%d\n",major,minor); TSXF86DGAQueryDirectVideo(display,DefaultScreen(display),&flags); if (!(flags & XF86DGADirectPresent)) - MSG("direct video is NOT PRESENT.\n"); + MESSAGE("direct video is NOT PRESENT.\n"); TSXF86DGAGetVideo(display,DefaultScreen(display),&addr,&width,&banksize,&memsize); (*ilplpDD)->e.dga.fb_width = width; TSXF86DGAGetViewPortSize(display,DefaultScreen(display),&width,&height); TSXF86DGASetViewPort(display,DefaultScreen(display),0,0); (*ilplpDD)->e.dga.fb_height = height; - TRACE(ddraw,"video framebuffer: begin %p, width %d,banksize %d,memsize %d\n", + TRACE("video framebuffer: begin %p, width %d,banksize %d,memsize %d\n", addr,width,banksize,memsize ); - TRACE(ddraw,"viewport height: %d\n",height); + TRACE("viewport height: %d\n",height); /* Get the screen dimensions as seen by Wine. In that case, it may be better to ignore the -desktop mode and return the @@ -4791,7 +4791,7 @@ HRESULT WINAPI DGA_DirectDrawCreate( LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnkOuter) (*ilplpDD)->d.width = MONITOR_GetWidth(&MONITOR_PrimaryMonitor); if (((*ilplpDD)->d.height != height) || ((*ilplpDD)->d.width != width)) - WARN(ddraw, "You seem to be runnin in -desktop mode. This may prove dangerous in DGA mode...\n"); + WARN("You seem to be runnin in -desktop mode. This may prove dangerous in DGA mode...\n"); (*ilplpDD)->e.dga.fb_addr = addr; (*ilplpDD)->e.dga.fb_memsize = memsize; (*ilplpDD)->e.dga.fb_banksize = banksize; @@ -4852,7 +4852,7 @@ HRESULT WINAPI Xlib_DirectDrawCreate( LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnkOuter) #ifdef HAVE_LIBXXSHM /* Test if XShm is available. */ if (((*ilplpDD)->e.xlib.xshm_active = DDRAW_XSHM_Available())) - TRACE(ddraw, "Using XShm extension.\n"); + TRACE("Using XShm extension.\n"); #endif return DD_OK; @@ -4872,7 +4872,7 @@ HRESULT WINAPI DirectDrawCreate( LPGUID lpGUID, LPDIRECTDRAW *lplpDD, LPUNKNOWN lpGUID = NULL; } - TRACE(ddraw,"(%s,%p,%p)\n",xclsid,ilplpDD,pUnkOuter); + TRACE("(%s,%p,%p)\n",xclsid,ilplpDD,pUnkOuter); if ((!lpGUID) || (!memcmp(lpGUID,&IID_IDirectDraw ,sizeof(IID_IDirectDraw ))) || @@ -4920,7 +4920,7 @@ HRESULT WINAPI DirectDrawCreate( LPGUID lpGUID, LPDIRECTDRAW *lplpDD, LPUNKNOWN return ret; err: - ERR(ddraw, "DirectDrawCreate(%s,%p,%p): did not recognize requested GUID\n",xclsid,lplpDD,pUnkOuter); + ERR("DirectDrawCreate(%s,%p,%p): did not recognize requested GUID\n",xclsid,lplpDD,pUnkOuter); return DDERR_INVALIDDIRECTDRAWGUID; } @@ -5006,7 +5006,7 @@ DDCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { WINE_StringFromCLSID(riid,buf); else sprintf(buf,"<guid-0x%04x>",LOWORD(riid)); - FIXME(ddraw,"(%p)->(%s,%p),stub!\n",This,buf,ppobj); + FIXME("(%p)->(%s,%p),stub!\n",This,buf,ppobj); return E_NOINTERFACE; } @@ -5029,7 +5029,7 @@ static HRESULT WINAPI DDCF_CreateInstance( char buf[80]; WINE_StringFromCLSID(riid,buf); - TRACE(ddraw,"(%p)->(%p,%s,%p)\n",This,pOuter,buf,ppobj); + TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,buf,ppobj); if ((!memcmp(riid,&IID_IDirectDraw ,sizeof(IID_IDirectDraw ))) || (!memcmp(riid,&IID_IDirectDraw2,sizeof(IID_IDirectDraw2))) || (!memcmp(riid,&IID_IDirectDraw4,sizeof(IID_IDirectDraw4)))) { @@ -5041,7 +5041,7 @@ static HRESULT WINAPI DDCF_CreateInstance( static HRESULT WINAPI DDCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { ICOM_THIS(IClassFactoryImpl,iface); - FIXME(ddraw,"(%p)->(%d),stub!\n",This,dolock); + FIXME("(%p)->(%d),stub!\n",This,dolock); return S_OK; } @@ -5086,13 +5086,13 @@ DWORD WINAPI DDRAW_DllGetClassObject(REFCLSID rclsid,REFIID riid,LPVOID *ppv) else sprintf(buf,"<guid-0x%04x>",LOWORD(riid)); WINE_StringFromCLSID(riid,xbuf); - TRACE(ddraw, "(%p,%p,%p)\n", xbuf, buf, ppv); + TRACE("(%p,%p,%p)\n", xbuf, buf, ppv); if (!memcmp(riid,&IID_IClassFactory,sizeof(IID_IClassFactory))) { *ppv = (LPVOID)&DDRAW_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } - FIXME(ddraw, "(%p,%p,%p): no interface found.\n", xbuf, buf, ppv); + FIXME("(%p,%p,%p): no interface found.\n", xbuf, buf, ppv); return E_NOINTERFACE; } @@ -5106,6 +5106,6 @@ DWORD WINAPI DDRAW_DllGetClassObject(REFCLSID rclsid,REFIID riid,LPVOID *ppv) */ DWORD WINAPI DDRAW_DllCanUnloadNow(void) { - FIXME(ddraw, "(void): stub\n"); + FIXME("(void): stub\n"); return S_FALSE; } diff --git a/graphics/dispdib.c b/graphics/dispdib.c index 3ef7b166ad90b75cfd45e7558184f3f25d1cd1ce..dc5ec4fdaff5716bd129efa0218b2ad0cf711c90 100644 --- a/graphics/dispdib.c +++ b/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; diff --git a/graphics/enhmetafiledrv/graphics.c b/graphics/enhmetafiledrv/graphics.c index d62b1f88f080bdfbd77c84c2819aa7f75ab9089c..f11d9e4584ce03baba50e75c99781932c44985b2 100644 --- a/graphics/enhmetafiledrv/graphics.c +++ b/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; diff --git a/graphics/enhmetafiledrv/init.c b/graphics/enhmetafiledrv/init.c index 51c7670daff68b804e9eab2488d96f5017db6fb8..fb51af6bec6bbbf8731d12f29e5556d2ae9048b5 100644 --- a/graphics/enhmetafiledrv/init.c +++ b/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 ); } diff --git a/graphics/enhmetafiledrv/objects.c b/graphics/enhmetafiledrv/objects.c index 3a2dbd7431f2b15f295363690a00660b0f87c815..b25715ddde031eefa76b33845bec3f605b97924c 100644 --- a/graphics/enhmetafiledrv/objects.c +++ b/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) { diff --git a/graphics/env.c b/graphics/env.c index 26f8e095bbeedd57dc5164cd54aca6ba1d55f764..e4af5a65ccc2f79f87fa11d243b3cda72e828a58 100644 --- a/graphics/env.c +++ b/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()) { diff --git a/graphics/fontengine.c b/graphics/fontengine.c index 169838324aea275d85110f6ca75ac5b4482b15dd..51f1b92b6e54e1b3da1fa3b5db72fe7698732806 100644 --- a/graphics/fontengine.c +++ b/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; } diff --git a/graphics/mapping.c b/graphics/mapping.c index 4de12e5ae5df569409f362a943221882740c5e65..429dbf10457d0b57bffa6cbd729b4d33017338b1 100644 --- a/graphics/mapping.c +++ b/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) diff --git a/graphics/metafiledrv/bitblt.c b/graphics/metafiledrv/bitblt.c index 1f6cbafaf9ebf240623c8bae6af5647cb921aef8..af3e9d6a63dccc9d07200a835c941046fdcf0aa6 100644 --- a/graphics/metafiledrv/bitblt.c +++ b/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 diff --git a/graphics/metafiledrv/graphics.c b/graphics/metafiledrv/graphics.c index bfd4b6be459c27d60ad89bb41061c906758a06be..4c579d6f0199beffb4a502d76c7f73317dccd591 100644 --- a/graphics/metafiledrv/graphics.c +++ b/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 ); diff --git a/graphics/metafiledrv/init.c b/graphics/metafiledrv/init.c index 21f60a85c3811d34dd0ce431d2e58ee8484fd1af..439318d6f3d0c272f7443882cfa66d778f5b5511 100644 --- a/graphics/metafiledrv/init.c +++ b/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; } diff --git a/graphics/metafiledrv/text.c b/graphics/metafiledrv/text.c index 943b19053d530e2b2a7e6e10160b10a2dbbe6421..c7446164c7e977d84254fe68cbf70fb2bed92c52 100644 --- a/graphics/metafiledrv/text.c +++ b/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) diff --git a/graphics/painting.c b/graphics/painting.c index 70e894591178258e3b3522451ea78166fd696b66..acfc5c9ce71234131f1ac36420ca91ba1094d815 100644 --- a/graphics/painting.c +++ b/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; } diff --git a/graphics/path.c b/graphics/path.c index b10b464a317d724942a78fabf2d5df73302c1147..147a921471192fb9a140f82b3995433a2112fb1f 100644 --- a/graphics/path.c +++ b/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; } diff --git a/graphics/psdrv/afm.c b/graphics/psdrv/afm.c index 96d76ef96485e8b9d8097c0146409888e2b5835f..f7d095a6b8b323b0771691a2618d16554d84dd1e 100644 --- a/graphics/psdrv/afm.c +++ b/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; diff --git a/graphics/psdrv/bitmap.c b/graphics/psdrv/bitmap.c index 6085c8c1b44450cec99c275b96dedace4fb4e40a..46987391eda2f68ec8bd7b59b74bed609cfe8855 100644 --- a/graphics/psdrv/bitmap.c +++ b/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; } diff --git a/graphics/psdrv/brush.c b/graphics/psdrv/brush.c index 69dbb0372bfefb4ab77d9e4abed2c7fc9d1ad7dc..5a3c103658cd36201bdaea83284c88d6911f55b3 100644 --- a/graphics/psdrv/brush.c +++ b/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; diff --git a/graphics/psdrv/color.c b/graphics/psdrv/color.c index a5a56e5a4d40668b0bb907983b37a4491451debe..91a3f5a14ed743c526fc8f34c1abe70897a69696 100644 --- a/graphics/psdrv/color.c +++ b/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; diff --git a/graphics/psdrv/escape.c b/graphics/psdrv/escape.c index 9ae28cc86f1ce659986dde6caefba19e5ae5dca7..9f052af34c2528bceed2b40834b2eaa971317521 100644 --- a/graphics/psdrv/escape.c +++ b/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; } } diff --git a/graphics/psdrv/font.c b/graphics/psdrv/font.c index e1ffec23875c41ed367580d1a2f6151cc0eaffb6..e3f9b0c699934c216608a8f878439feb1c365f38 100644 --- a/graphics/psdrv/font.c +++ b/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 )) ) diff --git a/graphics/psdrv/graphics.c b/graphics/psdrv/graphics.c index 9177977c44f0217658efedd221b4ea028e15cbe0..318800d3bc557c7590079a2705ab41a662759fca 100644 --- a/graphics/psdrv/graphics.c +++ b/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++) { diff --git a/graphics/psdrv/init.c b/graphics/psdrv/init.c index f11882882b0a700b4664db9ba1c65c728b53d075..226327ee727d4106f0b98f3b6fc23d42db2b75ce 100644 --- a/graphics/psdrv/init.c +++ b/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 { diff --git a/graphics/psdrv/objects.c b/graphics/psdrv/objects.c index 81e1095a5e8cca71ac30dc5f6af304218aaf5dc2..d51f0dc2db8a9c7467ba08ea9e1d4c4b87ed235f 100644 --- a/graphics/psdrv/objects.c +++ b/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 ); diff --git a/graphics/psdrv/pen.c b/graphics/psdrv/pen.c index 78c83f704f9ba12d07f28e31644b4613dc80ad71..157adaec5326a98f40ee9925234fa3a8df2aeab0 100644 --- a/graphics/psdrv/pen.c +++ b/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); diff --git a/graphics/psdrv/ppd.c b/graphics/psdrv/ppd.c index b8c1c72a0bf11ce42a957618199569029f2eba49..6b17ed8f77e33ea0a1f78ae96c1dae45c223a107 100644 --- a/graphics/psdrv/ppd.c +++ b/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); } diff --git a/graphics/psdrv/ps.c b/graphics/psdrv/ps.c index 04e23aaa5040b6d895668b6149641895f73e5316..6092c3e5e4dfd8a1c6cce5b748d4e0743f84a6da 100644 --- a/graphics/psdrv/ps.c +++ b/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; } diff --git a/graphics/psdrv/text.c b/graphics/psdrv/text.c index 1dfba92b923fff5f62d8bafd004865a4e5f27b15..9a0a7a34e3daa2560eb1e307c6c736ab40c6428a 100644 --- a/graphics/psdrv/text.c +++ b/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 */ diff --git a/graphics/ttydrv/init.c b/graphics/ttydrv/init.c index 01fd7a03b4c7c375d1e235e9163c79d1eaa19854..122b6d2f2e6efd37f3caa7836e6caf4082061310 100644 --- a/graphics/ttydrv/init.c +++ b/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; diff --git a/graphics/vga.c b/graphics/vga.c index bb212c392e4e5b7bd16640a746ebd7ab3475366f..676706f0024dde0c2cb6e883c4caa8091aefb133 100644 --- a/graphics/vga.c +++ b/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; diff --git a/graphics/win16drv/brush.c b/graphics/win16drv/brush.c index 2adce14220a9cb080cc8ba8c087757a7c1f5b600..61a4fe3263c94523b021b433ff367814bdd6ec8a 100644 --- a/graphics/win16drv/brush.c +++ b/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); diff --git a/graphics/win16drv/font.c b/graphics/win16drv/font.c index d78a20b1ac2bf6520f74880a4dd5922e5d788b66..9a71b40a1bb741aae83effd7d9622c838ca367b1 100644 --- a/graphics/win16drv/font.c +++ b/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 ); } diff --git a/graphics/win16drv/graphics.c b/graphics/win16drv/graphics.c index 530a3cb55e7eaf2dbc3ef6837e383d95c92f9de4..9bf8b065f66da1e42be63aad99ad12edf3af1559 100644 --- a/graphics/win16drv/graphics.c +++ b/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); diff --git a/graphics/win16drv/init.c b/graphics/win16drv/init.c index 303eb7e6426c08324f4d949a4ca405228b309527..2301f8d54718d1f01de4ce9c6f62c1189b5bd2ef 100644 --- a/graphics/win16drv/init.c +++ b/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; } diff --git a/graphics/win16drv/objects.c b/graphics/win16drv/objects.c index ad6d823484c90723b276e6b2cea75045fb558c80..e21fb3172c2ee0c071b6001a9f6b09d554a5d73b 100644 --- a/graphics/win16drv/objects.c +++ b/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: diff --git a/graphics/win16drv/pen.c b/graphics/win16drv/pen.c index 00cadccb34d998c5c048d099881abe36a01ae9d3..d6ad8b064e7f8b22583ef55346104726a11bd461 100644 --- a/graphics/win16drv/pen.c +++ b/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); diff --git a/graphics/win16drv/prtdrv.c b/graphics/win16drv/prtdrv.c index a7f18ab9a6187b7b554d11c96042fec030ba8fb6..84a0726ab5fec2acc0515adb582a94b6bd1486aa 100644 --- a/graphics/win16drv/prtdrv.c +++ b/graphics/win16drv/prtdrv.c @@ -15,7 +15,7 @@ #include "heap.h" #include "brush.h" #include "callback.h" -#include "debug.h" +#include "debugtools.h" #include "bitmap.h" #include "pen.h" @@ -57,7 +57,7 @@ static void GetPrinterDriverFunctions(HINSTANCE16 hInst, LOADED_PRINTER_DRIVER * LoadPrinterDrvFunc(ADVANCEDSETUPDIALOG); LoadPrinterDrvFunc(DIALOGFN); LoadPrinterDrvFunc(PSEUDOEDIT); - TRACE(win16drv,"got func CONTROL 0x%p enable 0x%p enumDfonts 0x%p realizeobject 0x%p extextout 0x%p\n", + TRACE("got func CONTROL 0x%p enable 0x%p enumDfonts 0x%p realizeobject 0x%p extextout 0x%p\n", pLPD->fn[FUNC_CONTROL], pLPD->fn[FUNC_ENABLE], pLPD->fn[FUNC_ENUMDFONTS], @@ -80,7 +80,7 @@ static LOADED_PRINTER_DRIVER *FindPrinterDriverFromName(const char *pszDriver) ptmpLPD = gapLoadedPrinterDrivers[nDriverSlot++]; if (ptmpLPD != NULL) { - TRACE(win16drv, "Comparing %s,%s\n",ptmpLPD->szDriver,pszDriver); + TRACE("Comparing %s,%s\n",ptmpLPD->szDriver,pszDriver); /* Found driver store info, exit loop */ if (lstrcmpiA(ptmpLPD->szDriver, pszDriver) == 0) pLPD = ptmpLPD; @@ -135,7 +135,7 @@ LOADED_PRINTER_DRIVER *LoadPrinterDriver(const char *pszDriver) } if (!bSlotFound) { - WARN(win16drv,"Too many printers drivers loaded\n"); + WARN("Too many printers drivers loaded\n"); return NULL; } @@ -150,9 +150,9 @@ LOADED_PRINTER_DRIVER *LoadPrinterDriver(const char *pszDriver) if (hInst <= 32) { /* Failed to load driver */ - WARN(win16drv, "Failed to load printer driver %s\n", pszDriver); + WARN("Failed to load printer driver %s\n", pszDriver); } else { - TRACE(win16drv, "Loaded the library\n"); + TRACE("Loaded the library\n"); /* Allocate some memory for printer driver info */ pLPD = malloc(sizeof(LOADED_PRINTER_DRIVER)); memset(pLPD, 0 , sizeof(LOADED_PRINTER_DRIVER)); @@ -163,7 +163,7 @@ LOADED_PRINTER_DRIVER *LoadPrinterDriver(const char *pszDriver) /* Get DS for the printer module */ pLPD->ds_reg = hInst; - TRACE(win16drv, "DS for %s is %x\n", pszDriver, pLPD->ds_reg); + TRACE("DS for %s is %x\n", pszDriver, pLPD->ds_reg); /* Get address of printer driver functions */ GetPrinterDriverFunctions(hInst, pLPD); @@ -190,20 +190,20 @@ INT16 PRTDRV_Control(LPPDEVICE lpDestDev, WORD wfunction, SEGPTR lpInData, SEGPT WORD wRet = 0; LOADED_PRINTER_DRIVER *pLPD = NULL; - TRACE(win16drv, "%08x 0x%x %08lx %08lx\n", (unsigned int)lpDestDev, wfunction, lpInData, lpOutData); + TRACE("%08x 0x%x %08lx %08lx\n", (unsigned int)lpDestDev, wfunction, lpInData, lpOutData); if ((pLPD = FindPrinterDriverFromPDEVICE(lpDestDev)) != NULL) { if (pLPD->fn[FUNC_CONTROL] == NULL) { - WARN(win16drv, "Not supported by driver\n"); + WARN("Not supported by driver\n"); return 0; } wRet = Callbacks->CallDrvControlProc( pLPD->fn[FUNC_CONTROL], (SEGPTR)lpDestDev, wfunction, lpInData, lpOutData ); } - TRACE(win16drv, "return %x\n", wRet); + TRACE("return %x\n", wRet); return wRet; } @@ -216,7 +216,7 @@ WORD PRTDRV_Enable(LPVOID lpDevInfo, WORD wStyle, LPCSTR lpDestDevType, WORD wRet = 0; LOADED_PRINTER_DRIVER *pLPD = NULL; - TRACE(win16drv, "%s %s\n",lpDestDevType, lpOutputFile); + TRACE("%s %s\n",lpDestDevType, lpOutputFile); /* Get the printer driver info */ if (wStyle == INITPDEVICE) @@ -230,7 +230,7 @@ WORD PRTDRV_Enable(LPVOID lpDevInfo, WORD wStyle, LPCSTR lpDestDevType, WORD wP2; if (!pLPD->fn[FUNC_ENABLE]) { - WARN(win16drv, "Not supported by driver\n"); + WARN("Not supported by driver\n"); return 0; } @@ -261,7 +261,7 @@ WORD PRTDRV_Enable(LPVOID lpDevInfo, WORD wStyle, LPCSTR lpDestDevType, SEGPTR_FREE(lP1); } } - TRACE(win16drv, "return %x\n", wRet); + TRACE("return %x\n", wRet); return wRet; } @@ -275,7 +275,7 @@ WORD PRTDRV_EnumDFonts(LPPDEVICE lpDestDev, LPSTR lpFaceName, WORD wRet = 0; LOADED_PRINTER_DRIVER *pLPD = NULL; - TRACE(win16drv, "%08lx %s %p %p\n", + TRACE("%08lx %s %p %p\n", lpDestDev, lpFaceName, lpCallbackFunc, lpClientData); if ((pLPD = FindPrinterDriverFromPDEVICE(lpDestDev)) != NULL) @@ -284,7 +284,7 @@ WORD PRTDRV_EnumDFonts(LPPDEVICE lpDestDev, LPSTR lpFaceName, LPBYTE lP2; if (pLPD->fn[FUNC_ENUMDFONTS] == NULL) { - WARN(win16drv, "Not supported by driver\n"); + WARN("Not supported by driver\n"); return 0; } @@ -299,9 +299,9 @@ WORD PRTDRV_EnumDFonts(LPPDEVICE lpDestDev, LPSTR lpFaceName, if(lpFaceName) SEGPTR_FREE(lP2); } else - WARN(win16drv,"Failed to find device\n"); + WARN("Failed to find device\n"); - TRACE(win16drv, "return %x\n", wRet); + TRACE("return %x\n", wRet); return wRet; } /* @@ -313,7 +313,7 @@ BOOL16 PRTDRV_EnumObj(LPPDEVICE lpDestDev, WORD iStyle, WORD wRet = 0; LOADED_PRINTER_DRIVER *pLPD = NULL; - TRACE(win16drv, "(some params - fixme)\n"); + TRACE("(some params - fixme)\n"); if ((pLPD = FindPrinterDriverFromPDEVICE(lpDestDev)) != NULL) { @@ -323,7 +323,7 @@ BOOL16 PRTDRV_EnumObj(LPPDEVICE lpDestDev, WORD iStyle, if (pLPD->fn[FUNC_ENUMOBJ] == NULL) { - WARN(win16drv, "Not supported by driver\n"); + WARN("Not supported by driver\n"); return 0; } @@ -342,9 +342,9 @@ BOOL16 PRTDRV_EnumObj(LPPDEVICE lpDestDev, WORD iStyle, lP1, wP2, lP3, lP4 ); } else - WARN(win16drv,"Failed to find device\n"); + WARN("Failed to find device\n"); - TRACE(win16drv, "return %x\n", wRet); + TRACE("return %x\n", wRet); return wRet; } @@ -363,7 +363,7 @@ WORD PRTDRV_Output(LPPDEVICE lpDestDev, WORD wRet = 0; LOADED_PRINTER_DRIVER *pLPD = NULL; - TRACE(win16drv, "PRTDRV_OUTPUT %d\n", wStyle ); + TRACE("PRTDRV_OUTPUT %d\n", wStyle ); if ((pLPD = FindPrinterDriverFromPDEVICE(lpDestDev)) != NULL) { @@ -374,7 +374,7 @@ WORD PRTDRV_Output(LPPDEVICE lpDestDev, int nSize; if (pLPD->fn[FUNC_OUTPUT] == NULL) { - WARN(win16drv, "Not supported by driver\n"); + WARN("Not supported by driver\n"); return 0; } @@ -397,7 +397,7 @@ WORD PRTDRV_Output(LPPDEVICE lpDestDev, clip = HeapAlloc( SystemHeap, 0, size ); if(!clip) { - WARN(win16drv, "Can't alloc clip array in PRTDRV_Output\n"); + WARN("Can't alloc clip array in PRTDRV_Output\n"); return FALSE; } GetRegionData( hClipRgn, size, clip ); @@ -417,7 +417,7 @@ WORD PRTDRV_Output(LPPDEVICE lpDestDev, { CONV_RECT32TO16( pRect, lP8 ); - TRACE(win16drv, "rect = %d,%d - %d,%d\n", + TRACE("rect = %d,%d - %d,%d\n", lP8->left, lP8->top, lP8->right, lP8->bottom ); wRet = Callbacks->CallDrvOutputProc(pLPD->fn[FUNC_OUTPUT], lP1, wP2, wP3, SEGPTR_GET(lP4), @@ -435,7 +435,7 @@ WORD PRTDRV_Output(LPPDEVICE lpDestDev, } SEGPTR_FREE(lP4); } - TRACE(win16drv, "PRTDRV_Output return %d\n", wRet); + TRACE("PRTDRV_Output return %d\n", wRet); return wRet; } @@ -449,7 +449,7 @@ DWORD PRTDRV_RealizeObject(LPPDEVICE lpDestDev, WORD wStyle, WORD dwRet = 0; LOADED_PRINTER_DRIVER *pLPD = NULL; - TRACE(win16drv, "%08lx %04x %p %p %08lx\n", + TRACE("%08lx %04x %p %p %08lx\n", lpDestDev, wStyle, lpInObj, lpOutObj, lpTextXForm); if ((pLPD = FindPrinterDriverFromPDEVICE(lpDestDev)) != NULL) @@ -461,7 +461,7 @@ DWORD PRTDRV_RealizeObject(LPPDEVICE lpDestDev, WORD wStyle, if (pLPD->fn[FUNC_REALIZEOBJECT] == NULL) { - WARN(win16drv, "Not supported by driver\n"); + WARN("Not supported by driver\n"); return 0; } @@ -488,7 +488,7 @@ DWORD PRTDRV_RealizeObject(LPPDEVICE lpDestDev, WORD wStyle, case DRVOBJ_PBITMAP: default: - WARN(win16drv, "Object type %d not supported\n", wStyle); + WARN("Object type %d not supported\n", wStyle); nSize = 0; } @@ -505,7 +505,7 @@ DWORD PRTDRV_RealizeObject(LPPDEVICE lpDestDev, WORD wStyle, lP4 = SEGPTR_GET( lpOutObj ); lP5 = lpTextXForm; - TRACE(win16drv, "Calling Realize %08lx %04x %08lx %08lx %08lx\n", + TRACE("Calling Realize %08lx %04x %08lx %08lx %08lx\n", lP1, wP2, lP3, lP4, lP5); dwRet = Callbacks->CallDrvRealizeProc(pLPD->fn[FUNC_REALIZEOBJECT], lP1, wP2, lP3, lP4, lP5); @@ -513,7 +513,7 @@ DWORD PRTDRV_RealizeObject(LPPDEVICE lpDestDev, WORD wStyle, SEGPTR_FREE(lpBuf); } - TRACE(win16drv, "return %x\n", dwRet); + TRACE("return %x\n", dwRet); return dwRet; } @@ -534,7 +534,7 @@ DWORD PRTDRV_StretchBlt(LPPDEVICE lpDestDev, WORD wRet = 0; LOADED_PRINTER_DRIVER *pLPD = NULL; - TRACE(win16drv, "(lots of params - fixme)\n"); + TRACE("(lots of params - fixme)\n"); if ((pLPD = FindPrinterDriverFromPDEVICE(lpDestDev)) != NULL) { @@ -544,7 +544,7 @@ DWORD PRTDRV_StretchBlt(LPPDEVICE lpDestDev, if (pLPD->fn[FUNC_STRETCHBLT] == NULL) { - WARN(win16drv, "Not supported by driver\n"); + WARN("Not supported by driver\n"); return 0; } lP1 = lpDestDev; @@ -574,7 +574,7 @@ DWORD PRTDRV_StretchBlt(LPPDEVICE lpDestDev, lP11, lP12, lP13, SEGPTR_GET(lP14)); SEGPTR_FREE(lP14); - TRACE(win16drv, "Called StretchBlt ret %d\n",wRet); + TRACE("Called StretchBlt ret %d\n",wRet); } return wRet; } @@ -588,7 +588,7 @@ DWORD PRTDRV_ExtTextOut(LPPDEVICE lpDestDev, WORD wDestXOrg, WORD wDestYOrg, DWORD dwRet = 0; LOADED_PRINTER_DRIVER *pLPD = NULL; - TRACE(win16drv, "(lots of params - fixme)\n"); + TRACE("(lots of params - fixme)\n"); if ((pLPD = FindPrinterDriverFromPDEVICE(lpDestDev)) != NULL) { @@ -601,7 +601,7 @@ DWORD PRTDRV_ExtTextOut(LPPDEVICE lpDestDev, WORD wDestXOrg, WORD wDestYOrg, if (pLPD->fn[FUNC_EXTTEXTOUT] == NULL) { - WARN(win16drv, "Not supported by driver\n"); + WARN("Not supported by driver\n"); return 0; } @@ -611,7 +611,7 @@ DWORD PRTDRV_ExtTextOut(LPPDEVICE lpDestDev, WORD wDestXOrg, WORD wDestYOrg, if (lpClipRect != NULL) { lP4 = SEGPTR_NEW(RECT16); - TRACE(win16drv, "Adding lpClipRect\n"); + TRACE("Adding lpClipRect\n"); memcpy(lP4,lpClipRect,sizeof(RECT16)); } else lP4 = 0L; @@ -621,7 +621,7 @@ DWORD PRTDRV_ExtTextOut(LPPDEVICE lpDestDev, WORD wDestXOrg, WORD wDestYOrg, if (nSize>abs(wCount)) nSize = abs(wCount); lP5 = SEGPTR_ALLOC(nSize+1); - TRACE(win16drv, "Adding lpString (nSize is %d)\n",nSize); + TRACE("Adding lpString (nSize is %d)\n",nSize); memcpy(lP5,lpString,nSize); *((char *)lP5 + nSize) = '\0'; } else @@ -635,22 +635,22 @@ DWORD PRTDRV_ExtTextOut(LPPDEVICE lpDestDev, WORD wDestXOrg, WORD wDestYOrg, lP9 = lpTextXForm; if (lpCharWidths != NULL) - FIXME(win16drv, "Char widths not supported\n"); + FIXME("Char widths not supported\n"); lP10 = 0; if (lpOpaqueRect != NULL) { lP11 = SEGPTR_NEW(RECT16); - TRACE(win16drv, "Adding lpOpaqueRect\n"); + TRACE("Adding lpOpaqueRect\n"); memcpy(lP11,lpOpaqueRect,sizeof(RECT16)); } else lP11 = 0L; wP12 = wOptions; - TRACE(win16drv, "Calling ExtTextOut 0x%lx 0x%x 0x%x %p\n", + TRACE("Calling ExtTextOut 0x%lx 0x%x 0x%x %p\n", lP1, wP2, wP3, lP4); - TRACE(win16drv, "%*s 0x%x 0x%lx 0x%lx\n", + TRACE("%*s 0x%x 0x%lx 0x%lx\n", nSize,lP5, iP6, lP7, lP8); - TRACE(win16drv, "0x%lx 0x%lx %p 0x%x\n", + TRACE("0x%lx 0x%lx %p 0x%x\n", lP9, lP10, lP11, wP12); dwRet = Callbacks->CallDrvExtTextOutProc(pLPD->fn[FUNC_EXTTEXTOUT], lP1, wP2, wP3, @@ -659,7 +659,7 @@ DWORD PRTDRV_ExtTextOut(LPPDEVICE lpDestDev, WORD wDestXOrg, WORD wDestYOrg, lP8, lP9, lP10, SEGPTR_GET(lP11), wP12); } - TRACE(win16drv, "return %lx\n", dwRet); + TRACE("return %lx\n", dwRet); return dwRet; } @@ -671,27 +671,27 @@ int WINAPI dmEnumDFonts16(LPPDEVICE lpDestDev, LPSTR lpFaceName, FARPROC16 lpCal int WINAPI dmRealizeObject16(LPPDEVICE lpDestDev, INT16 wStyle, LPSTR lpInObj, LPSTR lpOutObj, SEGPTR lpTextXForm) { - FIXME(win16drv, "(lpDestDev=%08x,wStyle=%04x,lpInObj=%08x,lpOutObj=%08x,lpTextXForm=%08x): stub\n", + FIXME("(lpDestDev=%08x,wStyle=%04x,lpInObj=%08x,lpOutObj=%08x,lpTextXForm=%08x): stub\n", (UINT)lpDestDev, wStyle, (UINT)lpInObj, (UINT)lpOutObj, (UINT)lpTextXForm); if (wStyle < 0) { /* Free extra memory of given object's structure */ switch ( -wStyle ) { case DRVOBJ_PEN: { /* LPLOGPEN16 DeletePen = (LPLOGPEN16)lpInObj; */ - TRACE(win16drv, "DRVOBJ_PEN_delete\n"); + TRACE("DRVOBJ_PEN_delete\n"); break; } case DRVOBJ_BRUSH: { - TRACE(win16drv, "DRVOBJ_BRUSH_delete\n"); + TRACE("DRVOBJ_BRUSH_delete\n"); break; } case DRVOBJ_FONT: { /* LPTEXTXFORM16 TextXForm = (LPTEXTXFORM16)lpTextXForm; */ - TRACE(win16drv, "DRVOBJ_FONT_delete\n"); + TRACE("DRVOBJ_FONT_delete\n"); break; } - case DRVOBJ_PBITMAP: TRACE(win16drv, "DRVOBJ_PBITMAP_delete\n"); + case DRVOBJ_PBITMAP: TRACE("DRVOBJ_PBITMAP_delete\n"); break; } } @@ -701,7 +701,7 @@ int WINAPI dmRealizeObject16(LPPDEVICE lpDestDev, INT16 wStyle, LPSTR lpInObj, L case DRVOBJ_PEN: { LPLOGPEN16 InPen = (LPLOGPEN16)lpInObj; - TRACE(win16drv, "DRVOBJ_PEN\n"); + TRACE("DRVOBJ_PEN\n"); if (lpOutObj) { if (InPen->lopnStyle == PS_NULL) { *(DWORD *)lpOutObj = 0; @@ -724,7 +724,7 @@ int WINAPI dmRealizeObject16(LPPDEVICE lpDestDev, INT16 wStyle, LPSTR lpInObj, L LPLOGBRUSH16 OutBrush = (LPLOGBRUSH16)lpOutObj; /* LPPOINT16 Point = (LPPOINT16)lpTextXForm; */ - TRACE(win16drv, "DRVOBJ_BRUSH\n"); + TRACE("DRVOBJ_BRUSH\n"); if (!lpOutObj) return sizeof(LOGBRUSH16); else { OutBrush->lbStyle = InBrush->lbStyle; @@ -738,10 +738,10 @@ int WINAPI dmRealizeObject16(LPPDEVICE lpDestDev, INT16 wStyle, LPSTR lpInObj, L case DRVOBJ_FONT: { /* LPTEXTXFORM16 TextXForm = (LPTEXTXFORM16)lpTextXForm; */ - TRACE(win16drv, "DRVOBJ_FONT\n"); + TRACE("DRVOBJ_FONT\n"); return 0;/* DISPLAY.DRV doesn't realize fonts */ } - case DRVOBJ_PBITMAP: TRACE(win16drv, "DRVOBJ_PBITMAP\n"); + case DRVOBJ_PBITMAP: TRACE("DRVOBJ_PBITMAP\n"); return 0; /* create memory bitmap */ } } @@ -757,7 +757,7 @@ WORD PRTDRV_GetCharWidth(LPPDEVICE lpDestDev, LPINT lpBuffer, WORD wRet = 0; LOADED_PRINTER_DRIVER *pLPD = NULL; - TRACE(win16drv, "(lots of params - fixme)\n"); + TRACE("(lots of params - fixme)\n"); if ((pLPD = FindPrinterDriverFromPDEVICE(lpDestDev)) != NULL) { @@ -767,7 +767,7 @@ WORD PRTDRV_GetCharWidth(LPPDEVICE lpDestDev, LPINT lpBuffer, if (pLPD->fn[FUNC_GETCHARWIDTH] == NULL) { - WARN(win16drv, "Not supported by driver\n"); + WARN("Not supported by driver\n"); return 0; } diff --git a/graphics/win16drv/text.c b/graphics/win16drv/text.c index 580a152e0c866be75a8acac4a57dda141351897e..ffe688d1fe7d164d4ec337c5075fb4c871641221 100644 --- a/graphics/win16drv/text.c +++ b/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) { diff --git a/graphics/wing.c b/graphics/wing.c index 21d468ed40817c3f4ed50b016f0b0e4b1347a573..abbcc6b23a2d15b13737fa4bc253f491c647771b 100644 --- a/graphics/wing.c +++ b/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); } diff --git a/graphics/x11drv/bitblt.c b/graphics/x11drv/bitblt.c index 4d642f4c2462e204d239ee8d1ee7f6f9bc841680..dbf75c68c7c95bcfd1e9571db9abd9e1fea99c7d 100644 --- a/graphics/x11drv/bitblt.c +++ b/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 ); } diff --git a/graphics/x11drv/bitmap.c b/graphics/x11drv/bitmap.c index 9fd6cb5c8abd21eb60a6d780a3c00294b70e57a4..51c31b3d8083c0124f804f2eacf12a0ab1cb7a27 100644 --- a/graphics/x11drv/bitmap.c +++ b/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; } diff --git a/graphics/x11drv/brush.c b/graphics/x11drv/brush.c index 95f406de2cd2aa591f570f40c31504e69ebd5c50..c22aa9122f789fa4f068dfeb18fdfb2b3fdb1463 100644 --- a/graphics/x11drv/brush.c +++ b/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 ); diff --git a/graphics/x11drv/graphics.c b/graphics/x11drv/graphics.c index 4abd5e6d1964f475f1966e846a3b6619c3dfa86d..c56fa26e3d2b7614244918f641ae7adbf4b20fe9 100644 --- a/graphics/x11drv/graphics.c +++ b/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); diff --git a/graphics/x11drv/init.c b/graphics/x11drv/init.c index 76c597a6742dd4d803ed5afcd5dba69a350f38de..2ea67e73570a3510df69673a3e1e221f6fa80f05 100644 --- a/graphics/x11drv/init.c +++ b/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; } diff --git a/graphics/x11drv/objects.c b/graphics/x11drv/objects.c index add1de9dc261f042ae1b177afe9c096c44968eee..497abe1a6b2f852996a16c34d55ab3c53f140721 100644 --- a/graphics/x11drv/objects.c +++ b/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; } diff --git a/graphics/x11drv/palette.c b/graphics/x11drv/palette.c index 99db30aef30bef903eef6c81a4be917e335878f2..8657ed81893d50f46b6c10e58ee4e115c35fdc5f 100644 --- a/graphics/x11drv/palette.c +++ b/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); } diff --git a/graphics/x11drv/pen.c b/graphics/x11drv/pen.c index 76bb905e2914d9de3f5e2df9f66d09fbaeddcfbd..4e9d6ca31a831a90cbb3ab4c90abb95e34c005da 100644 --- a/graphics/x11drv/pen.c +++ b/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 }; /* -- -- -- -- -- -- */ diff --git a/graphics/x11drv/text.c b/graphics/x11drv/text.c index ca6bf18b8d10aa51d1619e56dacc237132081fa7..01d2292b911e48ab2bdc8341ab6ba634c102422a 100644 --- a/graphics/x11drv/text.c +++ b/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 */ diff --git a/graphics/x11drv/xfont.c b/graphics/x11drv/xfont.c index cdd12f6199c15e89080397cb259bb784ebc61f85..c40b7825be6aac73ca2e9c65ecf9f779ee65f5b8 100644 --- a/graphics/x11drv/xfont.c +++ b/graphics/x11drv/xfont.c @@ -29,7 +29,7 @@ #include "heap.h" #include "options.h" #include "font.h" -#include "debug.h" +#include "debugtools.h" #include "ldt.h" DEFAULT_DEBUG_CHANNEL(font) @@ -657,7 +657,7 @@ static BOOL LFD_ComposeLFD( fontObject* fo, break; } - TRACE(font,"\tLFD(uRelax=%d): %s\n", uRelax, lpLFD ); + TRACE("\tLFD(uRelax=%d): %s\n", uRelax, lpLFD ); assert(*(lpLFD+MAX_LFD_LENGTH-1)==0); /* check if overwrittem */ return TRUE; } @@ -1017,7 +1017,7 @@ static void XFONT_WindowsNames( char* buffer ) fi->df.dfPitchAndFamily |= bFamilyStyle; } - TRACE(font,"typeface \'%s\'\n", fr->lfFaceName); + TRACE("typeface \'%s\'\n", fr->lfFaceName); fr->fr_flags |= FR_NAMESET; } @@ -1057,7 +1057,7 @@ static fontAlias* XFONT_CreateAlias( LPCSTR lpTypeFace, LPCSTR lpAlias ) /* check if we already got one */ if( !strcasecmp( pfa->faTypeFace, lpAlias ) ) { - TRACE(font,"\tredundant alias '%s' -> '%s'\n", + TRACE("\tredundant alias '%s' -> '%s'\n", lpAlias, lpTypeFace ); return NULL; } @@ -1076,7 +1076,7 @@ static fontAlias* XFONT_CreateAlias( LPCSTR lpTypeFace, LPCSTR lpAlias ) pfa->faAlias = pfa->faTypeFace + j; lstrcpyA( pfa->faAlias, lpAlias ); - TRACE(font, "\tadded alias '%s' for %s\n", lpAlias, lpTypeFace ); + TRACE("\tadded alias '%s' for %s\n", lpAlias, lpTypeFace ); return pfa; } @@ -1180,7 +1180,7 @@ static void XFONT_LoadAliases( char** buffer, int *buf_size ) prev = pfa; } - TRACE(font, "\tsubstituted '%s' with %s\n", + TRACE("\tsubstituted '%s' with %s\n", frMatch->lfFaceName, lpAlias ); lstrcpynA( frMatch->lfFaceName, lpAlias, LF_FACESIZE ); @@ -1193,7 +1193,7 @@ static void XFONT_LoadAliases( char** buffer, int *buf_size ) } } } - else ERR(font, " malformed font alias '%s'\n", *buffer ); + else ERR(" malformed font alias '%s'\n", *buffer ); } else break; } while(TRUE); @@ -1238,7 +1238,7 @@ static void XFONT_LoadPenalties( char** buffer, int *buf_size ) { if( !strncasecmp( (*ppfr)->resource, *buffer, length ) ) { - TRACE(font, "Ignoring '%s'\n", (*ppfr)->resource ); + TRACE("Ignoring '%s'\n", (*ppfr)->resource ); XFONT_RemoveFontResource( ppfr ); } @@ -1311,7 +1311,7 @@ static BOOL XFONT_ReadCachedMetrics( int fd, int res, unsigned x_checksum, int x fontResource* pfr = fontList; fontInfo* pfi = NULL; - TRACE(font,"Reading cached font metrics:\n"); + TRACE("Reading cached font metrics:\n"); read( fd, fontList, i); /* read all metrics at once */ while( offset < length ) @@ -1351,7 +1351,7 @@ static BOOL XFONT_ReadCachedMetrics( int fd, int res, unsigned x_checksum, int x offset += sizeof(int); for( pfr = fontList; pfr; pfr = pfr->next ) { - TRACE(font,"\t%s, %i instances\n", lpch, pfr->fi_count ); + TRACE("\t%s, %i instances\n", lpch, pfr->fi_count ); pfr->resource = lpch; while( TRUE ) { @@ -1409,13 +1409,13 @@ static BOOL XFONT_WriteCachedMetrics( int fd, unsigned x_checksum, int x_count, i += n_ff * sizeof(fontResource) + j * sizeof(fontInfo) + sizeof(int); write( fd, &i, sizeof(int) ); - TRACE(font,"Writing font cache:\n"); + TRACE("Writing font cache:\n"); for( pfr = fontList; pfr; pfr = pfr->next ) { fontInfo fi; - TRACE(font,"\t%s, %i instances\n", pfr->resource, pfr->fi_count ); + TRACE("\t%s, %i instances\n", pfr->resource, pfr->fi_count ); i = write( fd, pfr, sizeof(fontResource) ); if( i == sizeof(fontResource) ) @@ -1480,7 +1480,7 @@ static int XFONT_CheckIniSection() PROFILE_EnumerateWineIniSection("Fonts", &XFONT_CheckIniCallback, (void *)&found); if(found) - MSG(fontmsgepilogue); + MESSAGE(fontmsgepilogue); return 1; } @@ -1508,21 +1508,21 @@ static void XFONT_CheckIniCallback( /* Valid key; make sure the value doesn't contain a wildcard */ if(strchr(value, '*')) { if(*(int *)found == 0) { - MSG(fontmsgprologue); + MESSAGE(fontmsgprologue); ++*(int *)found; } - MSG(" %s=%s [no wildcards allowed]\n", key, value); + MESSAGE(" %s=%s [no wildcards allowed]\n", key, value); } } else { /* Not a valid key */ if(*(int *)found == 0) { - MSG(fontmsgprologue); + MESSAGE(fontmsgprologue); ++*(int *)found; } - MSG(" %s=%s [obsolete]\n", key, value); + MESSAGE(" %s=%s [obsolete]\n", key, value); } return; @@ -1606,13 +1606,13 @@ static int XFONT_BuildDefaultAliases( char** buffer, int* buf_size ) if( fr ) { - TRACE(font, "Using \'%s\' as default serif font\n", fr->lfFaceName); + TRACE("Using \'%s\' as default serif font\n", fr->lfFaceName); aliasTable[1].faTypeFace = fr->lfFaceName; faTemplate[1].fatResource = fr->resource; } else { - WARN(font, "No typeface found for \'%s\'; using \'%s\'\n", *buffer, + WARN("No typeface found for \'%s\'; using \'%s\'\n", *buffer, fatDefaultSerif.fatAlias); aliasTable[1].faTypeFace = fatDefaultSerif.fatAlias; /* Charter */ faTemplate[1].fatResource = fatDefaultSerif.fatResource; @@ -1638,13 +1638,13 @@ static int XFONT_BuildDefaultAliases( char** buffer, int* buf_size ) if( fr ) { - TRACE(font, "Using \'%s\' as default sans serif font\n", fr->lfFaceName); + TRACE("Using \'%s\' as default sans serif font\n", fr->lfFaceName); aliasTable[0].faTypeFace = fr->lfFaceName; faTemplate[0].fatResource = fr->resource; } else { - WARN(font, "No typeface found for \'%s\'; using \'%s\'\n", *buffer, + WARN("No typeface found for \'%s\'; using \'%s\'\n", *buffer, fatDefaultSansSerif.fatAlias); aliasTable[0].faTypeFace = fatDefaultSansSerif.fatAlias; /* Helvetica */ faTemplate[0].fatResource = fatDefaultSansSerif.fatResource; @@ -1674,7 +1674,7 @@ BOOL X11DRV_FONT_Init( DeviceCaps* pDevCaps ) x_pattern = TSXListFonts(display, "*", MAX_FONT_FAMILIES * 16, &x_count ); - TRACE(font,"Font Mapper: initializing %i fonts [LPY=%i, XDR=%i, DR=%i]\n", + TRACE("Font Mapper: initializing %i fonts [LPY=%i, XDR=%i, DR=%i]\n", x_count, pDevCaps->logPixelsY, DefResolution, res); for( i = x_checksum = 0; i < x_count; i++ ) { @@ -1746,7 +1746,7 @@ BOOL X11DRV_FONT_Init( DeviceCaps* pDevCaps ) fr->resource = (char*) HeapAlloc(SystemHeap, 0, j + 1 ); lstrcpynA( fr->resource, typeface, j + 1 ); - TRACE(font," family: %s\n", fr->resource ); + TRACE(" family: %s\n", fr->resource ); if( pfr ) pfr->next = fr; else fontList = fr; @@ -1788,14 +1788,14 @@ BOOL X11DRV_FONT_Init( DeviceCaps* pDevCaps ) XFONT_SetFontMetric( fi, fr, x_fs ); TSXFreeFont( display, x_fs ); - TRACE(font,"\t[% 2ipt] '%s'\n", fi->df.dfPoints, typeface ); + TRACE("\t[% 2ipt] '%s'\n", fi->df.dfPoints, typeface ); XFONT_CheckFIList( fr, fi, REMOVE_SUBSETS ); fi = NULL; /* preventing reuse */ } else { - ERR(font, "failed to load %s\n", lpstr ); + ERR("failed to load %s\n", lpstr ); XFONT_CheckFIList( fr, fi, UNMARK_SUBSETS ); } @@ -1836,7 +1836,7 @@ BOOL X11DRV_FONT_Init( DeviceCaps* pDevCaps ) fontCache = (fontObject*) HeapAlloc(SystemHeap, 0, fontCacheSize * sizeof(fontObject)); XFONT_GrowFreeList(0, fontCacheSize - 1); - TRACE(font,"done!\n"); + TRACE("done!\n"); /* update text caps parameter */ @@ -1925,7 +1925,7 @@ static UINT XFONT_Match( fontMatch* pfm ) BOOL bScale = pfi->fi_flags & FI_SCALABLE; INT d, h; - TRACE(font,"\t[ %-2ipt h=%-3i w=%-3i %s%s]\n", pfi->df.dfPoints, + TRACE("\t[ %-2ipt h=%-3i w=%-3i %s%s]\n", pfi->df.dfPoints, pfi->df.dfPixHeight, pfi->df.dfAvgWidth, (pfi->df.dfWeight > 400) ? "Bold " : "Normal ", (pfi->df.dfItalic) ? "Italic" : "" ); @@ -2022,7 +2022,7 @@ static UINT XFONT_Match( fontMatch* pfm ) if( penalty && pfi->lfd_resolution != DefResolution ) penalty++; - TRACE(font," returning %i\n", penalty ); + TRACE(" returning %i\n", penalty ); return penalty; } @@ -2099,7 +2099,7 @@ static void XFONT_CheckFIList( fontResource* fr, fontInfo* fi, int action) fr->fi_count++; } - if( i ) TRACE(font,"\t purged %i subsets [%i]\n", i , fr->fi_count); + if( i ) TRACE("\t purged %i subsets [%i]\n", i , fr->fi_count); } /*********************************************************************** @@ -2142,7 +2142,7 @@ static BOOL XFONT_MatchDeviceFont( fontResource* start, fontMatch* pfm ) if( fm.pfr ) /* match family */ { - TRACE(font, "%s\n", fm.pfr->lfFaceName ); + TRACE("%s\n", fm.pfr->lfFaceName ); if( fm.pfr->fr_flags & FR_REMOVED ) fm.pfr = 0; @@ -2169,7 +2169,7 @@ static BOOL XFONT_MatchDeviceFont( fontResource* start, fontMatch* pfm ) fm.pfr = *ppfr; - TRACE(font, "%s\n", fm.pfr->lfFaceName ); + TRACE("%s\n", fm.pfr->lfFaceName ); current_score = XFONT_MatchFIList( &fm ); if( current_score < score ) @@ -2244,7 +2244,7 @@ static fontObject* XFONT_GetCacheEntry() { int prev_i, prev_j, j; - TRACE(font,"font cache is full\n"); + TRACE("font cache is full\n"); /* lookup the least recently used font */ @@ -2263,7 +2263,7 @@ static fontObject* XFONT_GetCacheEntry() { /* detach from the lru list */ - TRACE(font,"\tfreeing entry %i\n", j ); + TRACE("\tfreeing entry %i\n", j ); fontCache[j].fr->fo_count--; @@ -2286,7 +2286,7 @@ static fontObject* XFONT_GetCacheEntry() prev_i = fontCacheSize + FONTCACHE; - TRACE(font,"\tgrowing font cache from %i to %i\n", fontCacheSize, prev_i ); + TRACE("\tgrowing font cache from %i to %i\n", fontCacheSize, prev_i ); if( (newCache = (fontObject*)HeapReAlloc(SystemHeap, 0, fontCache, prev_i)) ) @@ -2348,7 +2348,7 @@ static BOOL XFONT_SetX11Trans( fontObject *pfo ) PX->ascent = PX->pixelsize / 1000.0 * PX->RAW_ASCENT; PX->descent = PX->pixelsize / 1000.0 * PX->RAW_DESCENT; - TRACE(font, "[%f %f %f %f] RA = %ld RD = %ld\n", pfo->lpX11Trans->a, + TRACE("[%f %f %f %f] RA = %ld RD = %ld\n", pfo->lpX11Trans->a, pfo->lpX11Trans->b, pfo->lpX11Trans->c, pfo->lpX11Trans->d, pfo->lpX11Trans->RAW_ASCENT, pfo->lpX11Trans->RAW_DESCENT); @@ -2387,12 +2387,12 @@ static X_PHYSFONT XFONT_RealizeFont( LPLOGFONT16 plf ) { UINT uRelaxLevel = 0; - TRACE(font,"(%u) '%s' h=%i weight=%i %s\n", + TRACE("(%u) '%s' h=%i weight=%i %s\n", plf->lfCharSet, plf->lfFaceName, plf->lfHeight, plf->lfWeight, (plf->lfItalic) ? "Italic" : "" ); if(abs(plf->lfHeight) > MAX_FONT_SIZE) { - ERR(font, + ERR( "plf->lfHeight = %d, this is probably not right. Setting to 12\n", plf->lfHeight); plf->lfHeight = 12; @@ -2493,7 +2493,7 @@ static X_PHYSFONT XFONT_RealizeFont( LPLOGFONT16 plf ) pfo->lru = fontMRU; fontMRU = (pfo - fontCache); - TRACE(font,"physfont %i\n", fontMRU); + TRACE("physfont %i\n", fontMRU); return (X_PHYSFONT)(X_PFONT_MAGIC | fontMRU); } @@ -2636,7 +2636,7 @@ BOOL X11DRV_GetTextExtentPoint( DC *dc, LPCSTR str, INT count, pfo->fs->min_bounds.attributes; } y = pfo->lpX11Trans->RAW_ASCENT + pfo->lpX11Trans->RAW_DESCENT; - TRACE(font, "x = %f y = %f\n", x, y); + TRACE("x = %f y = %f\n", x, y); x *= pfo->lpX11Trans->pixelsize / 1000.0; y *= pfo->lpX11Trans->pixelsize / 1000.0; size->cx = fabs((x + dc->w.breakRem + count * dc->w.charExtra) * @@ -2746,7 +2746,7 @@ INT16 WINAPI AddFontResource16( LPCSTR filename ) */ INT WINAPI AddFontResourceA( LPCSTR str ) { - FIXME(font, "(%s): stub\n", debugres_a(str)); + FIXME("(%s): stub\n", debugres_a(str)); return 1; } @@ -2756,7 +2756,7 @@ INT WINAPI AddFontResourceA( LPCSTR str ) */ INT WINAPI AddFontResourceW( LPCWSTR str ) { - FIXME(font, "(%s): stub\n", debugres_w(str) ); + FIXME("(%s): stub\n", debugres_w(str) ); return 1; } @@ -2765,7 +2765,7 @@ INT WINAPI AddFontResourceW( LPCWSTR str ) */ BOOL16 WINAPI RemoveFontResource16( SEGPTR str ) { - FIXME(font, "(%s): stub\n", debugres_a(PTR_SEG_TO_LIN(str))); + FIXME("(%s): stub\n", debugres_a(PTR_SEG_TO_LIN(str))); return TRUE; } @@ -2797,7 +2797,7 @@ BOOL WINAPI RemoveFontResourceA( LPCSTR str ) LeaveCriticalSection( &crtsc_fontList ); return retVal; */ - FIXME(font, "(%s): stub\n", debugres_a(str)); + FIXME("(%s): stub\n", debugres_a(str)); return TRUE; } @@ -2807,7 +2807,7 @@ BOOL WINAPI RemoveFontResourceA( LPCSTR str ) */ BOOL WINAPI RemoveFontResourceW( LPCWSTR str ) { - FIXME(font, "(%s): stub\n", debugres_w(str) ); + FIXME("(%s): stub\n", debugres_w(str) ); return TRUE; } diff --git a/misc/callback.c b/misc/callback.c index e7d48fbe91747255b0df4997ea03e8df98e19641..dd46fb047f7a2821c2bf24bd3c1148f00b89a7f4 100644 --- a/misc/callback.c +++ b/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; } diff --git a/misc/cdrom.c b/misc/cdrom.c index fe4e0b4fef2eb031c29981018dac8e0cd07d43e6..633bc7a7c7e4d18fefe74b89415e6db6423984ea 100644 --- a/misc/cdrom.c +++ b/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 diff --git a/misc/comm.c b/misc/comm.c index 73b67db072320baaa7b618f053b976fd884f624a..c00aa26c54c0a6c08e0a20c230c009b644972ec4 100644 --- a/misc/comm.c +++ b/misc/comm.c @@ -66,7 +66,7 @@ #include "winerror.h" #include "async.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(comm) @@ -108,15 +108,15 @@ void COMM_Init(void) } stat(temp, &st); if (!S_ISCHR(st.st_mode)) - WARN(comm,"Can't use `%s' as %s !\n", temp, option); + WARN("Can't use `%s' as %s !\n", temp, option); else if ((COM[x].devicename = malloc(strlen(temp)+1)) == NULL) - WARN(comm,"Can't malloc for device info!\n"); + WARN("Can't malloc for device info!\n"); else { COM[x].fd = 0; strcpy(COM[x].devicename, temp); } - TRACE(comm, "%s = %s\n", option, COM[x].devicename); + TRACE("%s = %s\n", option, COM[x].devicename); } strcpy(option, "LPTx"); @@ -130,15 +130,15 @@ void COMM_Init(void) else { stat(temp, &st); if (!S_ISCHR(st.st_mode)) - WARN(comm,"Can't use `%s' as %s !\n", temp, option); + WARN("Can't use `%s' as %s !\n", temp, option); else if ((LPT[x].devicename = malloc(strlen(temp)+1)) == NULL) - WARN(comm,"Can't malloc for device info!\n"); + WARN("Can't malloc for device info!\n"); else { LPT[x].fd = 0; strcpy(LPT[x].devicename, temp); } - TRACE(comm, "%s = %s\n", option, LPT[x].devicename); + TRACE("%s = %s\n", option, LPT[x].devicename); } } @@ -184,7 +184,7 @@ static int ValidLPTPort(int x) static int WinError(void) { - TRACE(comm, "errno = %d\n", errno); + TRACE("errno = %d\n", errno); switch (errno) { default: return CE_IOE; @@ -220,7 +220,7 @@ static void comm_notification(int fd,void*private) WORD mask = 0; int cid = GetCommPort_fd(fd); - TRACE(comm, "async notification\n"); + TRACE("async notification\n"); /* read data from comm port */ prev = comm_inbuf(ptr); do { @@ -286,7 +286,7 @@ static void comm_notification(int fd,void*private) /* send notifications, if any */ if (ptr->wnd && mask) { - TRACE(comm, "notifying %04x: cid=%d, mask=%02x\n", ptr->wnd, cid, mask); + TRACE("notifying %04x: cid=%d, mask=%02x\n", ptr->wnd, cid, mask); PostMessage16(ptr->wnd, WM_COMMNOTIFY, cid, mask); } } @@ -301,14 +301,14 @@ BOOL16 WINAPI BuildCommDCB16(LPCSTR device, LPDCB16 lpdcb) int port; char *ptr, temp[256]; - TRACE(comm, "(%s), ptr %p\n", device, lpdcb); + TRACE("(%s), ptr %p\n", device, lpdcb); if (!lstrncmpiA(device,"COM",3)) { port = device[3] - '0'; if (port-- == 0) { - ERR(comm, "BUG ! COM0 can't exist!.\n"); + ERR("BUG ! COM0 can't exist!.\n"); return -1; } @@ -333,13 +333,13 @@ BOOL16 WINAPI BuildCommDCB16(LPCSTR device, LPDCB16 lpdcb) lpdcb->BaudRate = COM[port].baudrate; else lpdcb->BaudRate = atoi(ptr); - TRACE(comm,"baudrate (%d)\n", lpdcb->BaudRate); + TRACE("baudrate (%d)\n", lpdcb->BaudRate); ptr = strtok(NULL, ", "); if (islower(*ptr)) *ptr = toupper(*ptr); - TRACE(comm,"parity (%c)\n", *ptr); + TRACE("parity (%c)\n", *ptr); lpdcb->fParity = TRUE; switch (*ptr) { case 'N': @@ -356,16 +356,16 @@ BOOL16 WINAPI BuildCommDCB16(LPCSTR device, LPDCB16 lpdcb) lpdcb->Parity = ODDPARITY; break; default: - WARN(comm,"Unknown parity `%c'!\n", *ptr); + WARN("Unknown parity `%c'!\n", *ptr); return -1; } ptr = strtok(NULL, ", "); - TRACE(comm, "charsize (%c)\n", *ptr); + TRACE("charsize (%c)\n", *ptr); lpdcb->ByteSize = *ptr - '0'; ptr = strtok(NULL, ", "); - TRACE(comm, "stopbits (%c)\n", *ptr); + TRACE("stopbits (%c)\n", *ptr); switch (*ptr) { case '1': lpdcb->StopBits = ONESTOPBIT; @@ -374,7 +374,7 @@ BOOL16 WINAPI BuildCommDCB16(LPCSTR device, LPDCB16 lpdcb) lpdcb->StopBits = TWOSTOPBITS; break; default: - WARN(comm,"Unknown # of stopbits `%c'!\n", *ptr); + WARN("Unknown # of stopbits `%c'!\n", *ptr); return -1; } } @@ -389,16 +389,16 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue) { int port,fd; - TRACE(comm, "%s, %d, %d\n", device, cbInQueue, cbOutQueue); + TRACE("%s, %d, %d\n", device, cbInQueue, cbOutQueue); port = device[3] - '0'; if (port-- == 0) - ERR(comm, "BUG ! COM0 or LPT0 don't exist !\n"); + ERR("BUG ! COM0 or LPT0 don't exist !\n"); if (!lstrncmpiA(device,"COM",3)) { - TRACE(comm, "%s = %s\n", device, COM[port].devicename); + TRACE("%s = %s\n", device, COM[port].devicename); if (!ValidCOMPort(port)) return IE_BADID; @@ -408,7 +408,7 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue) fd = open(COM[port].devicename, O_RDWR | O_NONBLOCK); if (fd == -1) { - ERR(comm, "error=%d\n", errno); + ERR("error=%d\n", errno); return IE_HARDWARE; } else { unknown[port] = SEGPTR_ALLOC(40); @@ -448,7 +448,7 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue) /* not enough memory */ tcsetattr(COM[port].fd,TCSANOW,&m_stat[port]); close(COM[port].fd); - ERR(comm, "out of memory"); + ERR("out of memory"); return IE_MEMORY; } @@ -488,7 +488,7 @@ INT16 WINAPI CloseComm16(INT16 cid) { struct DosDeviceStruct *ptr; - TRACE(comm,"cid=%d\n", cid); + TRACE("cid=%d\n", cid); if ((ptr = GetDeviceStruct(cid)) == NULL) { return -1; } @@ -524,7 +524,7 @@ INT16 WINAPI SetCommBreak16(INT16 cid) { struct DosDeviceStruct *ptr; - TRACE(comm,"cid=%d\n", cid); + TRACE("cid=%d\n", cid); if ((ptr = GetDeviceStruct(cid)) == NULL) { return -1; } @@ -541,7 +541,7 @@ INT16 WINAPI ClearCommBreak16(INT16 cid) { struct DosDeviceStruct *ptr; - TRACE(comm,"cid=%d\n", cid); + TRACE("cid=%d\n", cid); if ((ptr = GetDeviceStruct(cid)) == NULL) { return -1; } @@ -560,7 +560,7 @@ LONG WINAPI EscapeCommFunction16(UINT16 cid,UINT16 nFunction) struct DosDeviceStruct *ptr; struct termios port; - TRACE(comm,"cid=%d, function=%d\n", cid, nFunction); + TRACE("cid=%d, function=%d\n", cid, nFunction); if ((ptr = GetDeviceStruct(cid)) == NULL) { return -1; } @@ -613,7 +613,7 @@ LONG WINAPI EscapeCommFunction16(UINT16 cid,UINT16 nFunction) break; default: - WARN(comm,"(cid=%d,nFunction=%d): Unknown function\n", + WARN("(cid=%d,nFunction=%d): Unknown function\n", cid, nFunction); break; } @@ -635,7 +635,7 @@ INT16 WINAPI FlushComm16(INT16 cid,INT16 fnQueue) int queue; struct DosDeviceStruct *ptr; - TRACE(comm,"cid=%d, queue=%d\n", cid, fnQueue); + TRACE("cid=%d, queue=%d\n", cid, fnQueue); if ((ptr = GetDeviceStruct(cid)) == NULL) { return -1; } @@ -649,7 +649,7 @@ INT16 WINAPI FlushComm16(INT16 cid,INT16 fnQueue) ptr->ibuf_head = ptr->ibuf_tail; break; default: - WARN(comm,"(cid=%d,fnQueue=%d):Unknown queue\n", + WARN("(cid=%d,fnQueue=%d):Unknown queue\n", cid, fnQueue); return -1; } @@ -676,7 +676,7 @@ INT16 WINAPI GetCommError16(INT16 cid,LPCOMSTAT16 lpStat) return -1; } if (cid&FLAG_LPT) { - WARN(comm," cid %d not comm port\n",cid); + WARN(" cid %d not comm port\n",cid); return CE_MODE; } stol = (unsigned char *)unknown[cid] + COMM_MSR_OFFSET; @@ -692,12 +692,12 @@ INT16 WINAPI GetCommError16(INT16 cid,LPCOMSTAT16 lpStat) lpStat->cbOutQue = comm_outbuf(ptr); lpStat->cbInQue = comm_inbuf(ptr); - TRACE(comm, "cid %d, error %d, lpStat %d %d %d stol %x\n", + TRACE("cid %d, error %d, lpStat %d %d %d stol %x\n", cid, ptr->commerror, lpStat->status, lpStat->cbInQue, lpStat->cbOutQue, *stol); } else - TRACE(comm, "cid %d, error %d, lpStat NULL stol %x\n", + TRACE("cid %d, error %d, lpStat NULL stol %x\n", cid, ptr->commerror, *stol); /* Return any errors and clear it */ @@ -716,26 +716,26 @@ SEGPTR WINAPI SetCommEventMask16(INT16 cid,UINT16 fuEvtMask) int repid; unsigned int mstat; - TRACE(comm,"cid %d,mask %d\n",cid,fuEvtMask); + TRACE("cid %d,mask %d\n",cid,fuEvtMask); if ((ptr = GetDeviceStruct(cid)) == NULL) return (SEGPTR)NULL; ptr->eventmask = fuEvtMask; if ((cid&FLAG_LPT) || !ValidCOMPort(cid)) { - WARN(comm," cid %d not comm port\n",cid); + WARN(" cid %d not comm port\n",cid); return (SEGPTR)NULL; } /* it's a COM port ? -> modify flags */ stol = (unsigned char *)unknown[cid] + COMM_MSR_OFFSET; repid = ioctl(ptr->fd,TIOCMGET,&mstat); - TRACE(comm, " ioctl %d, msr %x at %p %p\n",repid,mstat,stol,unknown[cid]); + TRACE(" ioctl %d, msr %x at %p %p\n",repid,mstat,stol,unknown[cid]); if ((mstat&TIOCM_CAR)) *stol |= 0x80; else *stol &=0x7f; - TRACE(comm," modem dcd construct %x\n",*stol); + TRACE(" modem dcd construct %x\n",*stol); return SEGPTR_GET(unknown[cid]); } @@ -747,12 +747,12 @@ UINT16 WINAPI GetCommEventMask16(INT16 cid,UINT16 fnEvtClear) struct DosDeviceStruct *ptr; WORD events; - TRACE(comm, "cid %d, mask %d\n", cid, fnEvtClear); + TRACE("cid %d, mask %d\n", cid, fnEvtClear); if ((ptr = GetDeviceStruct(cid)) == NULL) return 0; if ((cid&FLAG_LPT) || !ValidCOMPort(cid)) { - WARN(comm," cid %d not comm port\n",cid); + WARN(" cid %d not comm port\n",cid); return 0; } @@ -769,7 +769,7 @@ INT16 WINAPI SetCommState16(LPDCB16 lpdcb) struct termios port; struct DosDeviceStruct *ptr; - TRACE(comm, "cid %d, ptr %p\n", lpdcb->Id, lpdcb); + TRACE("cid %d, ptr %p\n", lpdcb->Id, lpdcb); if ((ptr = GetDeviceStruct(lpdcb->Id)) == NULL) { return -1; } @@ -796,7 +796,7 @@ INT16 WINAPI SetCommState16(LPDCB16 lpdcb) port.c_lflag &= ~(ICANON|ECHO|ISIG); port.c_lflag |= NOFLSH; - TRACE(comm,"baudrate %d\n",lpdcb->BaudRate); + TRACE("baudrate %d\n",lpdcb->BaudRate); #ifdef CBAUD port.c_cflag &= ~CBAUD; switch (lpdcb->BaudRate) { @@ -894,7 +894,7 @@ INT16 WINAPI SetCommState16(LPDCB16 lpdcb) } port.c_ispeed = port.c_ospeed; #endif - TRACE(comm,"bytesize %d\n",lpdcb->ByteSize); + TRACE("bytesize %d\n",lpdcb->ByteSize); port.c_cflag &= ~CSIZE; switch (lpdcb->ByteSize) { case 5: @@ -914,7 +914,7 @@ INT16 WINAPI SetCommState16(LPDCB16 lpdcb) return -1; } - TRACE(comm,"fParity %d Parity %d\n",lpdcb->fParity, lpdcb->Parity); + TRACE("fParity %d Parity %d\n",lpdcb->fParity, lpdcb->Parity); port.c_cflag &= ~(PARENB | PARODD); if (lpdcb->fParity) port.c_iflag |= INPCK; @@ -935,7 +935,7 @@ INT16 WINAPI SetCommState16(LPDCB16 lpdcb) } - TRACE(comm,"stopbits %d\n",lpdcb->StopBits); + TRACE("stopbits %d\n",lpdcb->StopBits); switch (lpdcb->StopBits) { case ONESTOPBIT: @@ -984,7 +984,7 @@ INT16 WINAPI GetCommState16(INT16 cid, LPDCB16 lpdcb) struct DosDeviceStruct *ptr; struct termios port; - TRACE(comm,"cid %d, ptr %p\n", cid, lpdcb); + TRACE("cid %d, ptr %p\n", cid, lpdcb); if ((ptr = GetDeviceStruct(cid)) == NULL) { return -1; } @@ -1122,7 +1122,7 @@ INT16 WINAPI TransmitCommChar16(INT16 cid,CHAR chTransmit) { struct DosDeviceStruct *ptr; - TRACE(comm, "cid %d, data %d \n", cid, chTransmit); + TRACE("cid %d, data %d \n", cid, chTransmit); if ((ptr = GetDeviceStruct(cid)) == NULL) { return -1; } @@ -1161,7 +1161,7 @@ INT16 WINAPI UngetCommChar16(INT16 cid,CHAR chUnget) { struct DosDeviceStruct *ptr; - TRACE(comm,"cid %d (char %d)\n", cid, chUnget); + TRACE("cid %d (char %d)\n", cid, chUnget); if ((ptr = GetDeviceStruct(cid)) == NULL) { return -1; } @@ -1193,7 +1193,7 @@ INT16 WINAPI ReadComm16(INT16 cid,LPSTR lpvBuf,INT16 cbRead) struct DosDeviceStruct *ptr; LPSTR orgBuf = lpvBuf; - TRACE(comm, "cid %d, ptr %p, length %d\n", cid, lpvBuf, cbRead); + TRACE("cid %d, ptr %p, length %d\n", cid, lpvBuf, cbRead); if ((ptr = GetDeviceStruct(cid)) == NULL) { return -1; } @@ -1228,7 +1228,7 @@ INT16 WINAPI ReadComm16(INT16 cid,LPSTR lpvBuf,INT16 cbRead) length += status; } - TRACE(comm,"%.*s\n", length, orgBuf); + TRACE("%.*s\n", length, orgBuf); ptr->commerror = 0; return length; } @@ -1241,7 +1241,7 @@ INT16 WINAPI WriteComm16(INT16 cid, LPSTR lpvBuf, INT16 cbWrite) int status, length; struct DosDeviceStruct *ptr; - TRACE(comm,"cid %d, ptr %p, length %d\n", + TRACE("cid %d, ptr %p, length %d\n", cid, lpvBuf, cbWrite); if ((ptr = GetDeviceStruct(cid)) == NULL) { return -1; @@ -1252,7 +1252,7 @@ INT16 WINAPI WriteComm16(INT16 cid, LPSTR lpvBuf, INT16 cbWrite) return -1; } - TRACE(comm,"%.*s\n", cbWrite, lpvBuf ); + TRACE("%.*s\n", cbWrite, lpvBuf ); length = 0; while (length < cbWrite) { @@ -1291,7 +1291,7 @@ BOOL16 WINAPI EnableCommNotification16( INT16 cid, HWND16 hwnd, { struct DosDeviceStruct *ptr; - TRACE(comm, "(%d, %x, %d, %d)\n", cid, hwnd, cbWriteNotify, cbOutQueue); + TRACE("(%d, %x, %d, %d)\n", cid, hwnd, cbWriteNotify, cbOutQueue); if ((ptr = GetDeviceStruct(cid)) == NULL) { ptr->commerror = IE_BADID; return -1; @@ -1320,12 +1320,12 @@ BOOL WINAPI BuildCommDCBAndTimeoutsA(LPCSTR device, LPDCB lpdcb, int port; char *ptr,*temp; - TRACE(comm,"(%s,%p,%p)\n",device,lpdcb,lptimeouts); + TRACE("(%s,%p,%p)\n",device,lpdcb,lptimeouts); if (!lstrncmpiA(device,"COM",3)) { port=device[3]-'0'; if (port--==0) { - ERR(comm,"BUG! COM0 can't exists!.\n"); + ERR("BUG! COM0 can't exists!.\n"); return FALSE; } if (!ValidCOMPort(port)) @@ -1393,19 +1393,19 @@ BOOL WINAPI BuildCommDCBAndTimeoutsA(LPCSTR device, LPDCB lpdcb, flag=0; if (!strncmp("baud=",ptr,5)) { if (!sscanf(ptr+5,"%ld",&x)) - WARN(comm,"Couldn't parse %s\n",ptr); + WARN("Couldn't parse %s\n",ptr); lpdcb->BaudRate = x; flag=1; } if (!strncmp("stop=",ptr,5)) { if (!sscanf(ptr+5,"%ld",&x)) - WARN(comm,"Couldn't parse %s\n",ptr); + WARN("Couldn't parse %s\n",ptr); lpdcb->StopBits = x; flag=1; } if (!strncmp("data=",ptr,5)) { if (!sscanf(ptr+5,"%ld",&x)) - WARN(comm,"Couldn't parse %s\n",ptr); + WARN("Couldn't parse %s\n",ptr); lpdcb->ByteSize = x; flag=1; } @@ -1429,7 +1429,7 @@ BOOL WINAPI BuildCommDCBAndTimeoutsA(LPCSTR device, LPDCB lpdcb, flag=1; } if (!flag) - ERR(comm,"Unhandled specifier '%s', please report.\n",ptr); + ERR("Unhandled specifier '%s', please report.\n",ptr); ptr=strtok(NULL," "); } if (lpdcb->BaudRate==110) @@ -1446,7 +1446,7 @@ BOOL WINAPI BuildCommDCBAndTimeoutsW( LPCWSTR devid, LPDCB lpdcb, LPSTR devidA; BOOL ret; - TRACE(comm,"(%p,%p,%p)\n",devid,lpdcb,lptimeouts); + TRACE("(%p,%p,%p)\n",devid,lpdcb,lptimeouts); devidA = HEAP_strdupWtoA( GetProcessHeap(), 0, devid ); ret=BuildCommDCBAndTimeoutsA(devidA,lpdcb,lptimeouts); HeapFree( GetProcessHeap(), 0, devidA ); @@ -1497,7 +1497,7 @@ int commerror=0,eventmask=0; */ BOOL WINAPI SetCommBreak(HANDLE handle) { - FIXME(comm,"handle %d, stub!\n", handle); + FIXME("handle %d, stub!\n", handle); return TRUE; } @@ -1506,7 +1506,7 @@ BOOL WINAPI SetCommBreak(HANDLE handle) */ BOOL WINAPI ClearCommBreak(HANDLE handle) { - FIXME(comm,"handle %d, stub!\n", handle); + FIXME("handle %d, stub!\n", handle); return TRUE; } @@ -1518,7 +1518,7 @@ BOOL WINAPI EscapeCommFunction(HANDLE handle,UINT nFunction) int fd; struct termios port; - TRACE(comm,"handle %d, function=%d\n", handle, nFunction); + TRACE("handle %d, function=%d\n", handle, nFunction); fd = COMM_GetWriteFd(handle); if(fd<0) return FALSE; @@ -1563,15 +1563,15 @@ BOOL WINAPI EscapeCommFunction(HANDLE handle,UINT nFunction) port.c_iflag |= IXON; break; case SETBREAK: - FIXME(comm,"setbreak, stub\n"); + FIXME("setbreak, stub\n"); /* ptr->suspended = 1; */ break; case CLRBREAK: - FIXME(comm,"clrbreak, stub\n"); + FIXME("clrbreak, stub\n"); /* ptr->suspended = 0; */ break; default: - WARN(comm,"(handle=%d,nFunction=%d): Unknown function\n", + WARN("(handle=%d,nFunction=%d): Unknown function\n", handle, nFunction); break; } @@ -1594,7 +1594,7 @@ BOOL WINAPI PurgeComm( HANDLE handle, DWORD flags) { int fd; - TRACE(comm,"handle %d, flags %lx\n", handle, flags); + TRACE("handle %d, flags %lx\n", handle, flags); fd = COMM_GetWriteFd(handle); if(fd<0) @@ -1644,15 +1644,15 @@ BOOL WINAPI ClearCommError(INT handle,LPDWORD errors,LPCOMSTAT lpStat) lpStat->status = 0; if(ioctl(fd, TIOCOUTQ, &lpStat->cbOutQue)) - WARN(comm, "ioctl returned error\n"); + WARN("ioctl returned error\n"); if(ioctl(fd, TIOCINQ, &lpStat->cbInQue)) - WARN(comm, "ioctl returned error\n"); + WARN("ioctl returned error\n"); } close(fd); - TRACE(comm,"handle %d cbInQue = %ld cbOutQue = %ld\n", + TRACE("handle %d cbInQue = %ld cbOutQue = %ld\n", handle, lpStat->cbInQue, lpStat->cbOutQue); @@ -1677,7 +1677,7 @@ BOOL WINAPI SetupComm( HANDLE handle, DWORD insize, DWORD outsize) { int fd; - FIXME(comm, "insize %ld outsize %ld unimplemented stub\n", insize, outsize); + FIXME("insize %ld outsize %ld unimplemented stub\n", insize, outsize); fd=COMM_GetWriteFd(handle); if(0>fd) { @@ -1694,7 +1694,7 @@ BOOL WINAPI GetCommMask(HANDLE handle,LPDWORD evtmask) { int fd; - TRACE(comm, "handle %d, mask %p\n", handle, evtmask); + TRACE("handle %d, mask %p\n", handle, evtmask); if(0>(fd=COMM_GetReadFd(handle))) { return FALSE; @@ -1711,7 +1711,7 @@ BOOL WINAPI SetCommMask(INT handle,DWORD evtmask) { int fd; - TRACE(comm, "handle %d, mask %lx\n", handle, evtmask); + TRACE("handle %d, mask %lx\n", handle, evtmask); if(0>(fd=COMM_GetWriteFd(handle))) { return FALSE; } @@ -1728,7 +1728,7 @@ BOOL WINAPI SetCommState(INT handle,LPDCB lpdcb) struct termios port; int fd; - TRACE(comm,"handle %d, ptr %p\n", handle, lpdcb); + TRACE("handle %d, ptr %p\n", handle, lpdcb); if ((fd = COMM_GetWriteFd(handle)) < 0) return FALSE; @@ -1849,7 +1849,7 @@ BOOL WINAPI SetCommState(INT handle,LPDCB lpdcb) } port.c_ispeed = port.c_ospeed; #endif - TRACE(comm,"bytesize %d\n",lpdcb->ByteSize); + TRACE("bytesize %d\n",lpdcb->ByteSize); port.c_cflag &= ~CSIZE; switch (lpdcb->ByteSize) { case 5: @@ -1870,7 +1870,7 @@ BOOL WINAPI SetCommState(INT handle,LPDCB lpdcb) return FALSE; } - TRACE(comm,"fParity %d Parity %d\n",lpdcb->fParity, lpdcb->Parity); + TRACE("fParity %d Parity %d\n",lpdcb->fParity, lpdcb->Parity); port.c_cflag &= ~(PARENB | PARODD); if (lpdcb->fParity) port.c_iflag |= INPCK; @@ -1892,7 +1892,7 @@ BOOL WINAPI SetCommState(INT handle,LPDCB lpdcb) } - TRACE(comm,"stopbits %d\n",lpdcb->StopBits); + TRACE("stopbits %d\n",lpdcb->StopBits); switch (lpdcb->StopBits) { case ONESTOPBIT: port.c_cflag &= ~CSTOPB; @@ -1944,12 +1944,12 @@ BOOL WINAPI GetCommState(INT handle, LPDCB lpdcb) struct termios port; int fd; - TRACE(comm,"handle %d, ptr %p\n", handle, lpdcb); + TRACE("handle %d, ptr %p\n", handle, lpdcb); if ((fd = COMM_GetReadFd(handle)) < 0) return FALSE; if (tcgetattr(fd, &port) == -1) { - TRACE(comm,"tcgetattr(%d, ...) returned -1",fd); + TRACE("tcgetattr(%d, ...) returned -1",fd); commerror = WinError(); close( fd ); return FALSE; @@ -2060,7 +2060,7 @@ BOOL WINAPI GetCommState(INT handle, LPDCB lpdcb) commerror = 0; - TRACE(comm,"OK\n"); + TRACE("OK\n"); return TRUE; } @@ -2072,7 +2072,7 @@ BOOL WINAPI TransmitCommChar(INT cid,CHAR chTransmit) { struct DosDeviceStruct *ptr; - FIXME(comm,"(%d,'%c'), use win32 handle!\n",cid,chTransmit); + FIXME("(%d,'%c'), use win32 handle!\n",cid,chTransmit); if ((ptr = GetDeviceStruct(cid)) == NULL) { return FALSE; } @@ -2095,7 +2095,7 @@ BOOL WINAPI TransmitCommChar(INT cid,CHAR chTransmit) */ BOOL WINAPI GetCommTimeouts(INT cid,LPCOMMTIMEOUTS lptimeouts) { - FIXME(comm,"(%x,%p):stub.\n",cid,lptimeouts); + FIXME("(%x,%p):stub.\n",cid,lptimeouts); return TRUE; } @@ -2103,7 +2103,7 @@ BOOL WINAPI GetCommTimeouts(INT cid,LPCOMMTIMEOUTS lptimeouts) * SetCommTimeouts (KERNEL32.453) */ BOOL WINAPI SetCommTimeouts(INT cid,LPCOMMTIMEOUTS lptimeouts) { - FIXME(comm,"(%x,%p):stub.\n",cid,lptimeouts); + FIXME("(%x,%p):stub.\n",cid,lptimeouts); return TRUE; } @@ -2112,7 +2112,7 @@ BOOL WINAPI SetCommTimeouts(INT cid,LPCOMMTIMEOUTS lptimeouts) { */ BOOL WINAPI GetCommModemStatus(HANDLE hFile,LPDWORD lpModemStat ) { - FIXME(comm, "(%d %p)\n",hFile,lpModemStat ); + FIXME("(%d %p)\n",hFile,lpModemStat ); return TRUE; } /*********************************************************************** @@ -2120,7 +2120,7 @@ BOOL WINAPI GetCommModemStatus(HANDLE hFile,LPDWORD lpModemStat ) */ BOOL WINAPI WaitCommEvent(HANDLE hFile,LPDWORD eventmask ,LPOVERLAPPED overlapped) { - FIXME(comm, "(%d %p %p )\n",hFile, eventmask,overlapped); + FIXME("(%d %p %p )\n",hFile, eventmask,overlapped); return TRUE; } @@ -2129,7 +2129,7 @@ BOOL WINAPI WaitCommEvent(HANDLE hFile,LPDWORD eventmask ,LPOVERLAPPED overlappe */ BOOL WINAPI GetCommProperties(HANDLE hFile, LPDCB *dcb) { - FIXME(comm, "(%d %p )\n",hFile,dcb); + FIXME("(%d %p )\n",hFile,dcb); return TRUE; } @@ -2138,7 +2138,7 @@ BOOL WINAPI GetCommProperties(HANDLE hFile, LPDCB *dcb) */ BOOL WINAPI SetCommProperties(HANDLE hFile, LPDCB dcb) { - FIXME(comm, "(%d %p )\n",hFile,dcb); + FIXME("(%d %p )\n",hFile,dcb); return TRUE; } diff --git a/misc/cpu.c b/misc/cpu.c index 8ad04bbbb40a3303fcea6779d9ba3a2d6aae955d..629d136101a30032face1c62ff2b910f38a2b225 100644 --- a/misc/cpu.c +++ b/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 diff --git a/misc/crtdll.c b/misc/crtdll.c index 5b92d69cf2fddd9792b432b9e58fab7bf06efe1f..98d93f4143623de25ba205d54efe2549ed4793c4 100644 --- a/misc/crtdll.c +++ b/misc/crtdll.c @@ -42,7 +42,7 @@ AJ 990101: #include "winuser.h" #include "winerror.h" #include "ntddk.h" -#include "debug.h" +#include "debugtools.h" #include "module.h" #include "heap.h" #include "crtdll.h" @@ -106,7 +106,7 @@ CRTDLL_FILE * __cdecl CRTDLL__fdopen(INT handle, LPCSTR mode); */ BOOL WINAPI CRTDLL_Init(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE(crtdll,"(0x%08x,%ld,%p)\n",hinstDLL,fdwReason,lpvReserved); + TRACE("(0x%08x,%ld,%p)\n",hinstDLL,fdwReason,lpvReserved); if (fdwReason == DLL_PROCESS_ATTACH) { CRTDLL__fdopen(0,"r"); @@ -127,12 +127,12 @@ DWORD __cdecl CRTDLL__GetMainArgs(LPDWORD argc,LPSTR **argv, int xargc,i,afterlastspace; DWORD version; - TRACE(crtdll,"(%p,%p,%p,%ld).\n", + TRACE("(%p,%p,%p,%ld).\n", argc,argv,environ,flag ); CRTDLL_acmdln_dll = cmdline = HEAP_strdupA( GetProcessHeap(), 0, GetCommandLineA() ); - TRACE(crtdll,"got '%s'\n", cmdline); + TRACE("got '%s'\n", cmdline); version = GetVersion(); CRTDLL_osver_dll = version >> 16; @@ -174,7 +174,7 @@ DWORD __cdecl CRTDLL__GetMainArgs(LPDWORD argc,LPSTR **argv, CRTDLL_argv_dll = xargv; *argv = xargv; - TRACE(crtdll,"found %d arguments\n", + TRACE("found %d arguments\n", CRTDLL_argc_dll); CRTDLL_environ_dll = *environ = GetEnvironmentStringsA(); return 0; @@ -200,7 +200,7 @@ struct find_t */ DWORD __cdecl CRTDLL__findfirst(LPCSTR fname, struct find_t * x2) { - FIXME(crtdll, ":(%s,%p): stub\n",fname,x2); + FIXME(":(%s,%p): stub\n",fname,x2); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -213,7 +213,7 @@ DWORD __cdecl CRTDLL__findfirst(LPCSTR fname, struct find_t * x2) */ INT __cdecl CRTDLL__findnext(DWORD hand, struct find_t * x2) { - FIXME(crtdll, ":(%ld,%p): stub\n",hand,x2); + FIXME(":(%ld,%p): stub\n",hand,x2); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -226,7 +226,7 @@ INT __cdecl CRTDLL__findnext(DWORD hand, struct find_t * x2) */ int __cdecl CRTDLL__fstat(int file, struct stat* buf) { - FIXME(crtdll, ":(%d,%p): stub\n",file,buf); + FIXME(":(%d,%p): stub\n",file,buf); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -238,7 +238,7 @@ DWORD __cdecl CRTDLL__initterm(_INITTERMFUN *start,_INITTERMFUN *end) { _INITTERMFUN *current; - TRACE(crtdll,"(%p,%p)\n",start,end); + TRACE("(%p,%p)\n",start,end); current=start; while (current<end) { if (*current) (*current)(); @@ -273,7 +273,7 @@ CRTDLL_FILE * __cdecl CRTDLL__fdopen(INT handle, LPCSTR mode) file->handle = handle; break; } - TRACE(crtdll, "open handle %d mode %s got file %p\n", + TRACE("open handle %d mode %s got file %p\n", handle, mode, file); return file; } @@ -292,7 +292,7 @@ void __cdecl CRTDLL__global_unwind2( PEXCEPTION_FRAME frame ) */ void __cdecl CRTDLL__local_unwind2( PEXCEPTION_FRAME endframe, DWORD nr ) { - TRACE(crtdll,"(%p,%ld)\n",endframe,nr); + TRACE("(%p,%ld)\n",endframe,nr); } /********************************************************************* * _read (CRTDLL.256) @@ -302,7 +302,7 @@ void __cdecl CRTDLL__local_unwind2( PEXCEPTION_FRAME endframe, DWORD nr ) */ INT __cdecl CRTDLL__read(INT fd, LPVOID buf, UINT count) { - FIXME(crtdll,":(%d,%p,%d): stub\n",fd,buf,count); + FIXME(":(%d,%p,%d): stub\n",fd,buf,count); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -318,7 +318,7 @@ CRTDLL_FILE * __cdecl CRTDLL_fopen(LPCSTR path, LPCSTR mode) DOS_FULL_NAME full_name; if (!DOSFS_GetFullName( path, FALSE, &full_name )) { - WARN(crtdll, "file %s bad name\n",path); + WARN("file %s bad name\n",path); return 0; } @@ -359,7 +359,7 @@ CRTDLL_FILE * __cdecl CRTDLL_fopen(LPCSTR path, LPCSTR mode) file = HeapAlloc( GetProcessHeap(), 0, sizeof(*file) ); file->handle = handle; } - TRACE(crtdll, "file %s mode %s got handle %d file %p\n", + TRACE("file %s mode %s got handle %d file %p\n", path,mode,handle,file); return file; } @@ -378,7 +378,7 @@ DWORD __cdecl CRTDLL_fread(LPVOID ptr, INT size, INT nmemb, CRTDLL_FILE *file) known binary extensions must be unchanged */ while ( (i < (nmemb*size)) && (ret==1)) { ret=fread(temp,1,1,file); - TRACE(crtdll, "got %c 0x%02x ret %d\n", + TRACE("got %c 0x%02x ret %d\n", (isalpha(*(unsigned char*)temp))? *(unsigned char*)temp: ' ',*(unsigned char*)temp, ret); if (*(unsigned char*)temp != 0xd) { /* skip CR */ @@ -386,21 +386,21 @@ DWORD __cdecl CRTDLL_fread(LPVOID ptr, INT size, INT nmemb, CRTDLL_FILE *file) i++; } else - TRACE(crtdll, "skipping ^M\n"); + TRACE("skipping ^M\n"); } - TRACE(crtdll, "0x%08x items of size %d from file %p to %p\n", + TRACE("0x%08x items of size %d from file %p to %p\n", nmemb,size,file,ptr,); if(i!=nmemb) - WARN(crtdll, " failed!\n"); + WARN(" failed!\n"); return i; #else DWORD ret; - TRACE(crtdll, "0x%08x items of size %d from file %p to %p\n", + TRACE("0x%08x items of size %d from file %p to %p\n", nmemb,size,file,ptr); if (!ReadFile( file->handle, ptr, size * nmemb, &ret, NULL )) - WARN(crtdll, " failed!\n"); + WARN(" failed!\n"); return ret / size; #endif @@ -413,7 +413,7 @@ DWORD __cdecl CRTDLL_fread(LPVOID ptr, INT size, INT nmemb, CRTDLL_FILE *file) */ DWORD __cdecl CRTDLL_freopen(LPCSTR path, LPCSTR mode, LPVOID stream) { - FIXME(crtdll, ":(%s,%s,%p): stub\n", path, mode, stream); + FIXME(":(%s,%s,%p): stub\n", path, mode, stream); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -434,7 +434,7 @@ INT __cdecl CRTDLL_fscanf( CRTDLL_FILE *stream, LPSTR format, ... ) va_end( valist ); return res; #endif - FIXME(crtdll,"broken\n"); + FIXME("broken\n"); return 0; } @@ -443,13 +443,13 @@ INT __cdecl CRTDLL_fscanf( CRTDLL_FILE *stream, LPSTR format, ... ) */ LONG __cdecl CRTDLL_fseek( CRTDLL_FILE *file, LONG offset, INT whence) { - TRACE(crtdll, "file %p to 0x%08lx pos %s\n", + TRACE("file %p to 0x%08lx pos %s\n", file,offset,(whence==SEEK_SET)?"SEEK_SET": (whence==SEEK_CUR)?"SEEK_CUR": (whence==SEEK_END)?"SEEK_END":"UNKNOWN"); if (SetFilePointer( file->handle, offset, NULL, whence ) != 0xffffffff) return 0; - WARN(crtdll, " failed!\n"); + WARN(" failed!\n"); return -1; } @@ -458,7 +458,7 @@ LONG __cdecl CRTDLL_fseek( CRTDLL_FILE *file, LONG offset, INT whence) */ INT __cdecl CRTDLL_fsetpos( CRTDLL_FILE *file, INT *pos ) { - TRACE(crtdll, "file %p pos %d\n", file, *pos ); + TRACE("file %p pos %d\n", file, *pos ); return CRTDLL_fseek(file, *pos, SEEK_SET); } @@ -477,12 +477,12 @@ DWORD __cdecl CRTDLL_fwrite( LPVOID ptr, INT size, INT nmemb, CRTDLL_FILE *file { DWORD ret; - TRACE(crtdll, "0x%08x items of size %d to file %p(%d) from %p\n", + TRACE("0x%08x items of size %d to file %p(%d) from %p\n", nmemb,size,file,file-(CRTDLL_FILE*)CRTDLL_iob,ptr); if (!WriteFile( file->handle, ptr, size * nmemb, &ret, NULL )) - WARN(crtdll, " failed!\n"); + WARN(" failed!\n"); return ret / size; } @@ -491,7 +491,7 @@ DWORD __cdecl CRTDLL_fwrite( LPVOID ptr, INT size, INT nmemb, CRTDLL_FILE *file */ INT __cdecl CRTDLL_setbuf(CRTDLL_FILE *file, LPSTR buf) { - TRACE(crtdll, "(file %p buf %p)\n", file, buf); + TRACE("(file %p buf %p)\n", file, buf); /* this doesn't work:"void value not ignored as it ought to be" return setbuf(file,buf); */ @@ -522,7 +522,7 @@ HFILE handle; default: return (-1); } - TRACE(crtdll, "(handle %08lx,flags %d) return %d\n", + TRACE("(handle %08lx,flags %d) return %d\n", osfhandle,flags,handle); return handle; @@ -598,7 +598,7 @@ clock_t __cdecl CRTDLL_clock(void) */ BOOL __cdecl CRTDLL__isatty(DWORD x) { - TRACE(crtdll,"(%ld)\n",x); + TRACE("(%ld)\n",x); return TRUE; } @@ -615,7 +615,7 @@ INT __cdecl CRTDLL__write(INT fd,LPCVOID buf,UINT count) len = (UINT)write(fd,buf,(LONG)count); else len = _lwrite(fd,buf,count); - TRACE(crtdll,"%d/%d byte to dfh %d from %p,\n", + TRACE("%d/%d byte to dfh %d from %p,\n", len,count,fd,buf); return len; } @@ -635,7 +635,7 @@ INT __cdecl CRTDLL__write(INT fd,LPCVOID buf,UINT count) */ void __cdecl CRTDLL__cexit(INT ret) { - TRACE(crtdll,"(%d)\n",ret); + TRACE("(%d)\n",ret); ExitProcess(ret); } @@ -645,7 +645,7 @@ void __cdecl CRTDLL__cexit(INT ret) */ void __cdecl CRTDLL_exit(DWORD ret) { - TRACE(crtdll,"(%ld)\n",ret); + TRACE("(%ld)\n",ret); ExitProcess(ret); } @@ -655,7 +655,7 @@ void __cdecl CRTDLL_exit(DWORD ret) */ INT __cdecl CRTDLL__abnormal_termination(void) { - TRACE(crtdll,"(void)\n"); + TRACE("(void)\n"); return 0; } @@ -720,7 +720,7 @@ INT __cdecl CRTDLL_fputc( INT c, CRTDLL_FILE *file ) { char ch = (char)c; DWORD res; - TRACE(crtdll, "%c to file %p\n",c,file); + TRACE("%c to file %p\n",c,file); if (!WriteFile( file->handle, &ch, 1, &res, NULL )) return -1; return c; } @@ -732,7 +732,7 @@ INT __cdecl CRTDLL_fputc( INT c, CRTDLL_FILE *file ) INT __cdecl CRTDLL_fputs( LPCSTR s, CRTDLL_FILE *file ) { DWORD res; - TRACE(crtdll, "%s to file %p\n",s,file); + TRACE("%s to file %p\n",s,file); if (!WriteFile( file->handle, s, strlen(s), &res, NULL )) return -1; return res; } @@ -743,7 +743,7 @@ INT __cdecl CRTDLL_fputs( LPCSTR s, CRTDLL_FILE *file ) */ INT __cdecl CRTDLL_puts(LPCSTR s) { - TRACE(crtdll, "%s \n",s); + TRACE("%s \n",s); return puts(s); } @@ -799,7 +799,7 @@ CHAR* __cdecl CRTDLL_fgets( LPSTR s, INT size, CRTDLL_FILE *file ) *s = '\0'; - TRACE(crtdll,"got '%s'\n", buf_start); + TRACE("got '%s'\n", buf_start); return buf_start; } @@ -821,7 +821,7 @@ LPSTR __cdecl CRTDLL_gets(LPSTR buf) *buf = '\0'; - TRACE(crtdll,"got '%s'\n", buf_start); + TRACE("got '%s'\n", buf_start); return buf_start; } @@ -833,7 +833,7 @@ UINT __cdecl CRTDLL__rotl(UINT x,INT shift) { unsigned int ret = (x >> shift)|( x >>((sizeof(x))-shift)); - TRACE(crtdll, "got 0x%08x rot %d ret 0x%08x\n", + TRACE("got 0x%08x rot %d ret 0x%08x\n", x,shift,ret); return ret; @@ -845,7 +845,7 @@ DWORD __cdecl CRTDLL__lrotl(DWORD x,INT shift) { unsigned long ret = (x >> shift)|( x >>((sizeof(x))-shift)); - TRACE(crtdll, "got 0x%08lx rot %d ret 0x%08lx\n", + TRACE("got 0x%08lx rot %d ret 0x%08lx\n", x,shift,ret); return ret; @@ -902,7 +902,7 @@ INT __cdecl CRTDLL_vswprintf( LPWSTR buffer, LPCWSTR spec, va_list args ) */ unsigned char* __cdecl CRTDLL__mbscpy(unsigned char *x,unsigned char *y) { - TRACE(crtdll,"CRTDLL_mbscpy %s and %s\n",x,y); + TRACE("CRTDLL_mbscpy %s and %s\n",x,y); return strcpy(x,y); } @@ -943,13 +943,13 @@ LPSTR __cdecl CRTDLL__strlwr(LPSTR x) { unsigned char *y =x; - TRACE(crtdll, "CRTDLL_strlwr got %s\n", x); + TRACE("CRTDLL_strlwr got %s\n", x); while (*y) { if ((*y > 0x40) && (*y< 0x5b)) *y = *y + 0x20; y++; } - TRACE(crtdll, " returned %s\n", x); + TRACE(" returned %s\n", x); return x; } @@ -976,7 +976,7 @@ INT __cdecl CRTDLL_system(LPSTR x) } /* If buffer too short, exit. */ if (i > SYSBUF_LENGTH) { - TRACE(crtdll,"_system buffer to small\n"); + TRACE("_system buffer to small\n"); return 127; } @@ -993,7 +993,7 @@ INT __cdecl CRTDLL_system(LPSTR x) } *bp++ = '"'; *bp = 0; - TRACE(crtdll, "_system got '%s', executing '%s'\n",x,buffer); + TRACE("_system got '%s', executing '%s'\n",x,buffer); return system(buffer); } @@ -1046,7 +1046,7 @@ LPWSTR __cdecl CRTDLL__wcslwr(LPWSTR x) */ VOID __cdecl CRTDLL_longjmp(jmp_buf env, int val) { - FIXME(crtdll,"CRTDLL_longjmp semistup, expect crash\n"); + FIXME("CRTDLL_longjmp semistup, expect crash\n"); longjmp(env, val); } @@ -1132,7 +1132,7 @@ LPWSTR __cdecl CRTDLL__wcsdup(LPCWSTR ptr) */ INT __cdecl CRTDLL_fclose( CRTDLL_FILE *file ) { - TRACE(crtdll,"%p\n", file ); + TRACE("%p\n", file ); if (!CloseHandle( file->handle )) return -1; HeapFree( GetProcessHeap(), 0, file ); return 0; @@ -1147,15 +1147,15 @@ INT __cdecl CRTDLL__unlink(LPCSTR pathname) DOS_FULL_NAME full_name; if (!DOSFS_GetFullName( pathname, FALSE, &full_name )) { - WARN(crtdll, "CRTDLL_unlink file %s bad name\n",pathname); + WARN("CRTDLL_unlink file %s bad name\n",pathname); return EOF; } ret=unlink(full_name.long_name); - TRACE(crtdll,"(%s unix %s)\n", + TRACE("(%s unix %s)\n", pathname,full_name.long_name); if(ret) - WARN(crtdll, " Failed!\n"); + WARN(" Failed!\n"); return ret; } @@ -1197,13 +1197,13 @@ int __cdecl CRTDLL__stat(const char * filename, struct win_stat * buf) if (!DOSFS_GetFullName( filename, TRUE, &full_name )) { - WARN(crtdll, "CRTDLL__stat filename %s bad name\n",filename); + WARN("CRTDLL__stat filename %s bad name\n",filename); return -1; } ret=stat(full_name.long_name,&mystat); - TRACE(crtdll,"CRTDLL__stat %s\n", filename); + TRACE("CRTDLL__stat %s\n", filename); if(ret) - WARN(crtdll, " Failed!\n"); + WARN(" Failed!\n"); /* FIXME: should check what Windows returns */ @@ -1260,14 +1260,14 @@ HFILE __cdecl CRTDLL__open(LPCSTR path,INT flags) creation = OPEN_EXISTING; } if (flags & 0x0008) /* O_APPEND */ - FIXME(crtdll, "O_APPEND not supported\n" ); + FIXME("O_APPEND not supported\n" ); if (flags & 0xf0f4) - TRACE(crtdll,"CRTDLL_open file unsupported flags 0x%04x\n",flags); + TRACE("CRTDLL_open file unsupported flags 0x%04x\n",flags); /* End Fixme */ ret = CreateFileA( path, access, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, creation, FILE_ATTRIBUTE_NORMAL, -1 ); - TRACE(crtdll,"CRTDLL_open file %s mode 0x%04x got handle %d\n", path,flags,ret); + TRACE("CRTDLL_open file %s mode 0x%04x got handle %d\n", path,flags,ret); return ret; } @@ -1278,9 +1278,9 @@ INT __cdecl CRTDLL__close(HFILE fd) { int ret=_lclose(fd); - TRACE(crtdll,"(%d)\n",fd); + TRACE("(%d)\n",fd); if(ret) - WARN(crtdll, " Failed!\n"); + WARN(" Failed!\n"); return ret; } @@ -1290,7 +1290,7 @@ INT __cdecl CRTDLL__close(HFILE fd) */ INT __cdecl CRTDLL_feof( CRTDLL_FILE *file ) { - FIXME(crtdll,"stub\n" ); + FIXME("stub\n" ); return 0; } @@ -1310,7 +1310,7 @@ LPSTR __cdecl CRTDLL_setlocale(INT category,LPCSTR locale) case CRTDLL_LC_TIME: categorystr="LC_TIME";break; default: categorystr = "UNKNOWN?";break; } - FIXME(crtdll,"(%s,%s),stub!\n",categorystr,locale); + FIXME("(%s,%s),stub!\n",categorystr,locale); return "C"; } @@ -1528,7 +1528,7 @@ INT __cdecl CRTDLL__setmode( INT fh,INT mode) #define O_TEXT 0x4000 #define O_BINARY 0x8000 - FIXME(crtdll, "on fhandle %d mode %s, STUB.\n", + FIXME("on fhandle %d mode %s, STUB.\n", fh,(mode=O_TEXT)?"O_TEXT": (mode=O_BINARY)?"O_BINARY":"UNKNOWN"); return -1; @@ -1539,7 +1539,7 @@ INT __cdecl CRTDLL__setmode( INT fh,INT mode) */ VOID __cdecl CRTDLL__fpreset(void) { - FIXME(crtdll," STUB.\n"); + FIXME(" STUB.\n"); } /********************************************************************* @@ -1547,7 +1547,7 @@ VOID __cdecl CRTDLL__fpreset(void) */ INT __cdecl CRTDLL_atexit(LPVOID x) { - FIXME(crtdll,"(%p), STUB.\n",x); + FIXME("(%p), STUB.\n",x); return 0; /* successful */ } @@ -1567,7 +1567,7 @@ WCHAR __cdecl CRTDLL_mblen(CHAR *mb,INT size) else if (!(*mb)) ret =0; - TRACE(crtdll,"CRTDLL_mlen %s for max %d bytes ret %d\n",mb,size,ret); + TRACE("CRTDLL_mlen %s for max %d bytes ret %d\n",mb,size,ret); return ret; } @@ -1594,7 +1594,7 @@ INT __cdecl CRTDLL_mbstowcs(LPWSTR wcs, LPCSTR mbs, INT size) p++; ret = (p -wcs); - TRACE(crtdll,"CRTDLL_mbstowcs %s for %d chars put %d wchars\n", + TRACE("CRTDLL_mbstowcs %s for %d chars put %d wchars\n", mbs,size,ret); return ret; } @@ -1622,7 +1622,7 @@ WCHAR __cdecl CRTDLL_mbtowc(WCHAR* wc,CHAR* mb,INT size) else ret = -1; - TRACE(crtdll,"CRTDLL_mbtowc %s for %d chars\n",mb,size); + TRACE("CRTDLL_mbtowc %s for %d chars\n",mb,size); return ret; } @@ -1686,7 +1686,7 @@ LPSTR __cdecl CRTDLL__fullpath(LPSTR buf, LPCSTR name, INT size) } if (!DOSFS_GetFullName( name, FALSE, &full_name )) return NULL; lstrcpynA(buf,full_name.short_name,size); - TRACE(crtdll,"CRTDLL_fullpath got %s\n",buf); + TRACE("CRTDLL_fullpath got %s\n",buf); return buf; } @@ -1702,7 +1702,7 @@ VOID __cdecl CRTDLL__splitpath(LPCSTR path, LPSTR drive, LPSTR directory, LPSTR */ char * drivechar,*dirchar,*namechar; - TRACE(crtdll,"CRTDLL__splitpath got %s\n",path); + TRACE("CRTDLL__splitpath got %s\n",path); drivechar = strchr(path,':'); dirchar = strrchr(path,'/'); @@ -1746,7 +1746,7 @@ VOID __cdecl CRTDLL__splitpath(LPCSTR path, LPSTR drive, LPSTR directory, LPSTR } } - TRACE(crtdll,"CRTDLL__splitpath found %s %s %s %s\n",drive,directory,filename,extension); + TRACE("CRTDLL__splitpath found %s %s %s %s\n",drive,directory,filename,extension); } @@ -1760,7 +1760,7 @@ VOID __cdecl CRTDLL__makepath(LPSTR path, LPCSTR drive, LPCSTR extension ) { char ch; - TRACE(crtdll,"CRTDLL__makepath got %s %s %s %s\n", drive, directory, + TRACE("CRTDLL__makepath got %s %s %s %s\n", drive, directory, filename, extension); if ( !path ) @@ -1791,7 +1791,7 @@ VOID __cdecl CRTDLL__makepath(LPSTR path, LPCSTR drive, } } - TRACE(crtdll,"CRTDLL__makepath returns %s\n",path); + TRACE("CRTDLL__makepath returns %s\n",path); } /********************************************************************* @@ -1820,7 +1820,7 @@ CHAR* __cdecl CRTDLL__getcwd(LPSTR buf, INT size) if (len > size) { /* set error to ERANGE */ - TRACE(crtdll,"CRTDLL_getcwd buffer to small\n"); + TRACE("CRTDLL_getcwd buffer to small\n"); return NULL; } return buf; @@ -1835,7 +1835,7 @@ CHAR* __cdecl CRTDLL__getdcwd(INT drive,LPSTR buf, INT size) char test[1]; int len; - FIXME(crtdll,"(\"%c:\",%s,%d)\n",drive+'A',buf,size); + FIXME("(\"%c:\",%s,%d)\n",drive+'A',buf,size); len = size; if (!buf) { if (size < 0) /* allocate as big as nescessary */ @@ -1854,7 +1854,7 @@ CHAR* __cdecl CRTDLL__getdcwd(INT drive,LPSTR buf, INT size) if (len > size) { /* set error to ERANGE */ - TRACE(crtdll,"buffer to small\n"); + TRACE("buffer to small\n"); return NULL; } return buf; @@ -1915,25 +1915,25 @@ LPSTR __cdecl CRTDLL__tempnam(LPCSTR dir, LPCSTR prefix) DOS_FULL_NAME tempname; if ((ret = tempnam(dir,prefix))==NULL) { - WARN(crtdll, "Unable to get unique filename\n"); + WARN("Unable to get unique filename\n"); return NULL; } if (!DOSFS_GetFullName(ret,FALSE,&tempname)) { - TRACE(crtdll, "Wrong path?\n"); + TRACE("Wrong path?\n"); return NULL; } free(ret); if ((ret = CRTDLL_malloc(strlen(tempname.short_name)+1)) == NULL) { - WARN(crtdll, "CRTDL_malloc for shortname failed\n"); + WARN("CRTDL_malloc for shortname failed\n"); return NULL; } if ((ret = strcpy(ret,tempname.short_name)) == NULL) { - WARN(crtdll, "Malloc for shortname failed\n"); + WARN("Malloc for shortname failed\n"); return NULL; } - TRACE(crtdll,"dir %s prefix %s got %s\n", + TRACE("dir %s prefix %s got %s\n", dir,prefix,ret); return ret; @@ -1949,18 +1949,18 @@ LPSTR __cdecl CRTDLL_tmpnam(LPSTR s) char *ret; if ((ret =tmpnam(s))== NULL) { - WARN(crtdll, "Unable to get unique filename\n"); + WARN("Unable to get unique filename\n"); return NULL; } if (!DOSFS_GetFullName(ret,FALSE,&CRTDLL_tmpname)) { - TRACE(crtdll, "Wrong path?\n"); + TRACE("Wrong path?\n"); return NULL; } strcat(CRTDLL_tmpname.short_name,"."); - TRACE(crtdll,"for buf %p got %s\n", + TRACE("for buf %p got %s\n", s,CRTDLL_tmpname.short_name); - TRACE(crtdll,"long got %s\n", + TRACE("long got %s\n", CRTDLL_tmpname.long_name); if ( s != NULL) return strcpy(s,CRTDLL_tmpname.short_name); @@ -1984,7 +1984,7 @@ LPSTR __cdecl CRTDLL__itoa(INT x,LPSTR buf,INT buflen) LPSTR __cdecl CRTDLL__ltoa(long x,LPSTR buf,INT radix) { switch(radix) { - case 2: FIXME(crtdll, "binary format not implemented !\n"); + case 2: FIXME("binary format not implemented !\n"); break; case 8: wsnprintfA(buf,0x80,"%o",x); break; @@ -1992,7 +1992,7 @@ LPSTR __cdecl CRTDLL__ltoa(long x,LPSTR buf,INT radix) break; case 16: wsnprintfA(buf,0x80,"%x",x); break; - default: FIXME(crtdll, "radix %d not implemented !\n", radix); + default: FIXME("radix %d not implemented !\n", radix); } return buf; } @@ -2003,7 +2003,7 @@ LPSTR __cdecl CRTDLL__ltoa(long x,LPSTR buf,INT radix) LPSTR __cdecl CRTDLL__ultoa(long x,LPSTR buf,INT radix) { switch(radix) { - case 2: FIXME(crtdll, "binary format not implemented !\n"); + case 2: FIXME("binary format not implemented !\n"); break; case 8: wsnprintfA(buf,0x80,"%lo",x); break; @@ -2011,7 +2011,7 @@ LPSTR __cdecl CRTDLL__ultoa(long x,LPSTR buf,INT radix) break; case 16: wsnprintfA(buf,0x80,"%lx",x); break; - default: FIXME(crtdll, "radix %d not implemented !\n", radix); + default: FIXME("radix %d not implemented !\n", radix); } return buf; } @@ -2023,7 +2023,7 @@ typedef VOID (*sig_handler_type)(VOID); */ VOID __cdecl CRTDLL_signal(int sig, sig_handler_type ptr) { - FIXME(crtdll, "(%d %p):stub.\n", sig, ptr); + FIXME("(%d %p):stub.\n", sig, ptr); } /********************************************************************* @@ -2039,7 +2039,7 @@ LONG __cdecl CRTDLL__ftol(void) { } #else LONG __cdecl CRTDLL__ftol(double fl) { - FIXME(crtdll,"should be register function\n"); + FIXME("should be register function\n"); return (LONG)fl; } #endif @@ -2056,7 +2056,7 @@ LONG __cdecl CRTDLL__CIpow(void) { } #else LONG __cdecl CRTDLL__CIpow(double x,double y) { - FIXME(crtdll,"should be register function\n"); + FIXME("should be register function\n"); return pow(x,y); } #endif @@ -2066,7 +2066,7 @@ LONG __cdecl CRTDLL__CIpow(double x,double y) { */ VOID __cdecl CRTDLL__sleep(unsigned long timeout) { - TRACE(crtdll,"CRTDLL__sleep for %ld milliseconds\n",timeout); + TRACE("CRTDLL__sleep for %ld milliseconds\n",timeout); Sleep((timeout)?timeout:1); } @@ -2091,7 +2091,7 @@ LPSTR __cdecl CRTDLL_getenv(const char *name) if ((pp)&& (pos)) { pp = pos+1; - TRACE(crtdll,"got %s\n",pp); + TRACE("got %s\n",pp); } FreeEnvironmentStringsA( environ ); return pp; @@ -2133,7 +2133,7 @@ INT __cdecl CRTDLL__memicmp( */ VOID __cdecl CRTDLL__dllonexit () { - FIXME(crtdll,"stub\n"); + FIXME("stub\n"); } /********************************************************************* @@ -2176,7 +2176,7 @@ INT __cdecl CRTDLL_wcstol(LPWSTR s,LPWSTR *end,INT base) { * strdate (CRTDLL.283) */ LPSTR __cdecl CRTDLL__strdate (LPSTR date) -{ FIXME (crtdll,"%p stub\n", date); +{ FIXME("%p stub\n", date); return 0; } @@ -2184,6 +2184,6 @@ LPSTR __cdecl CRTDLL__strdate (LPSTR date) * strtime (CRTDLL.299) */ LPSTR __cdecl CRTDLL__strtime (LPSTR date) -{ FIXME (crtdll,"%p stub\n", date); +{ FIXME("%p stub\n", date); return 0; } diff --git a/misc/ddeml.c b/misc/ddeml.c index 066e62c498a0e833ab00dac610191d5af1a6d2c1..a72ce481644cc94769a20b5e6388789d43785c50 100644 --- a/misc/ddeml.c +++ b/misc/ddeml.c @@ -16,7 +16,7 @@ #include "winerror.h" #include "heap.h" #include "shm_semaph.h" -#include "debug.h" +#include "debugtools.h" #include "tchar.h" #include "winnt.h" @@ -217,7 +217,7 @@ static void InsertHSZNode( HSZ hsz ) * so set the global list pointer to it. */ reference_inst->Node_list = pNew; - TRACE(ddeml,"HSZ node list entry added\n"); + TRACE("HSZ node list entry added\n"); } } } @@ -245,12 +245,12 @@ static void InsertHSZNode( HSZ hsz ) { if ( reference_inst->Instance_id == InstId ) { - TRACE(ddeml,"Instance entry found\n"); + TRACE("Instance entry found\n"); return reference_inst; } reference_inst = reference_inst->Next_Entry; } - TRACE(ddeml,"Instance entry missing\n"); + TRACE("Instance entry missing\n"); return NULL; } @@ -277,12 +277,12 @@ static void InsertHSZNode( HSZ hsz ) { if ( reference_name->hsz == Service_Name ) { - TRACE(ddeml,"Service Name found\n"); + TRACE("Service Name found\n"); return reference_name; } reference_name = reference_name->next; } - TRACE(ddeml,"Service name missing\n"); + TRACE("Service name missing\n"); return NULL; } @@ -308,7 +308,7 @@ static DWORD Release_reserved_mutex (HANDLE mutex, LPSTR mutex_name, BOOL releas ReleaseMutex(mutex); if ( (err_no=GetLastError()) != 0 ) { - ERR(ddeml,"ReleaseMutex failed - %s mutex %li\n",mutex_name,err_no); + ERR("ReleaseMutex failed - %s mutex %li\n",mutex_name,err_no); HeapFree(SystemHeap, 0, this_instance); if ( release_handle_m ) { @@ -354,13 +354,13 @@ DWORD IncrementInstanceId() } if ( (err_no=GetLastError()) != 0 ) { - ERR(ddeml,"CreateMutex failed - inst_count %li\n",err_no); + ERR("CreateMutex failed - inst_count %li\n",err_no); err_no=Release_reserved_mutex (handle_mutex,"handle_mutex",0,1); return DMLERR_SYS_ERROR; } DDE_Max_Assigned_Instance++; this_instance->Instance_id = DDE_Max_Assigned_Instance; - TRACE(ddeml,"New instance id %ld allocated\n",DDE_Max_Assigned_Instance); + TRACE("New instance id %ld allocated\n",DDE_Max_Assigned_Instance); if (Release_reserved_mutex(inst_count_mutex,"instance_count",1,0)) return DMLERR_SYS_ERROR; return DMLERR_NO_ERROR; } @@ -462,7 +462,7 @@ void DdeReleaseAtom( DDE_HANDLE_ENTRY * reference_inst,HSZ hsz) UINT16 WINAPI DdeInitialize16( LPDWORD pidInst, PFNCALLBACK16 pfnCallback, DWORD afCmd, DWORD ulRes) { - TRACE(ddeml,"DdeInitialize16 called - calling DdeInitializeA\n"); + TRACE("DdeInitialize16 called - calling DdeInitializeA\n"); return (UINT16)DdeInitializeA(pidInst,(PFNCALLBACK)pfnCallback, afCmd, ulRes); } @@ -474,7 +474,7 @@ UINT16 WINAPI DdeInitialize16( LPDWORD pidInst, PFNCALLBACK16 pfnCallback, UINT WINAPI DdeInitializeA( LPDWORD pidInst, PFNCALLBACK pfnCallback, DWORD afCmd, DWORD ulRes ) { - TRACE(ddeml,"DdeInitializeA called - calling DdeInitializeW\n"); + TRACE("DdeInitializeA called - calling DdeInitializeW\n"); return DdeInitializeW(pidInst,pfnCallback,afCmd,ulRes); } @@ -516,8 +516,8 @@ UINT WINAPI DdeInitializeW( LPDWORD pidInst, PFNCALLBACK pfnCallback, if( ulRes ) { - ERR(ddeml, "Reserved value not zero? What does this mean?\n"); - FIXME(ddeml, "(%p,%p,0x%lx,%ld): stub\n", pidInst, pfnCallback, + ERR("Reserved value not zero? What does this mean?\n"); + FIXME("(%p,%p,0x%lx,%ld): stub\n", pidInst, pfnCallback, afCmd,ulRes); /* trap this and no more until we know more */ return DMLERR_NO_ERROR; @@ -529,7 +529,7 @@ UINT WINAPI DdeInitializeW( LPDWORD pidInst, PFNCALLBACK pfnCallback, /* can't set up the instance with nothing to act as a callback */ - TRACE(ddeml,"No callback provided\n"); + TRACE("No callback provided\n"); return DMLERR_INVALIDPARAMETER; /* might be DMLERR_DLL_USAGE */ } @@ -539,7 +539,7 @@ UINT WINAPI DdeInitializeW( LPDWORD pidInst, PFNCALLBACK pfnCallback, if ( this_instance == NULL ) { /* catastrophe !! warn user & abort */ - ERR (ddeml, "Instance create failed - out of memory\n"); + ERR("Instance create failed - out of memory\n"); return DMLERR_SYS_ERROR; } this_instance->Next_Entry = NULL; @@ -570,11 +570,11 @@ UINT WINAPI DdeInitializeW( LPDWORD pidInst, PFNCALLBACK pfnCallback, ==CBF_FAIL_ALLSVRXACTIONS; } - TRACE(ddeml,"instance created - checking validity \n"); + TRACE("instance created - checking validity \n"); if( *pidInst == 0 ) { /* Initialisation of new Instance Identifier */ - TRACE(ddeml,"new instance, callback %p flags %lX\n",pfnCallback,afCmd); + TRACE("new instance, callback %p flags %lX\n",pfnCallback,afCmd); if ( DDE_Max_Assigned_Instance == 0 ) { /* Nothing has been initialised - exit now ! can return TRUE since effect is the same */ @@ -585,7 +585,7 @@ UINT WINAPI DdeInitializeW( LPDWORD pidInst, PFNCALLBACK pfnCallback, handle_mutex = CreateMutexW(s_att,1,DDEHandleAccess); if ( (err_no=GetLastError()) != 0 ) { - ERR(ddeml,"CreateMutex failed - handle list %li\n",err_no); + ERR("CreateMutex failed - handle list %li\n",err_no); HeapFree(SystemHeap, 0, this_instance); return DMLERR_SYS_ERROR; } @@ -596,12 +596,12 @@ UINT WINAPI DdeInitializeW( LPDWORD pidInst, PFNCALLBACK pfnCallback, { /* FIXME - needs refinement with popup for timeout, also is timeout interval OK */ - ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no); + ERR("WaitForSingleObject failed - handle list %li\n",err_no); return DMLERR_SYS_ERROR; } } - TRACE(ddeml,"Handle Mutex created/reserved\n"); + TRACE("Handle Mutex created/reserved\n"); if (DDE_Handle_Table_Base == NULL ) { /* can't be another instance in this case, assign to the base pointer */ @@ -617,14 +617,14 @@ UINT WINAPI DdeInitializeW( LPDWORD pidInst, PFNCALLBACK pfnCallback, */ this_instance->CBF_Flags=this_instance->CBF_Flags|APPCMD_FILTERINITS; - TRACE(ddeml,"First application instance detected OK\n"); + TRACE("First application instance detected OK\n"); /* allocate new instance ID */ if ((err_no = IncrementInstanceId()) ) return err_no; } else { /* really need to chain the new one in to the latest here, but after checking conditions * such as trying to start a conversation from an application trying to monitor */ reference_inst = DDE_Handle_Table_Base; - TRACE(ddeml,"Subsequent application instance - starting checks\n"); + TRACE("Subsequent application instance - starting checks\n"); while ( reference_inst->Next_Entry != NULL ) { /* @@ -667,23 +667,23 @@ UINT WINAPI DdeInitializeW( LPDWORD pidInst, PFNCALLBACK pfnCallback, } /* All cleared, add to chain */ - TRACE(ddeml,"Application Instance checks finished\n"); + TRACE("Application Instance checks finished\n"); if ((err_no = IncrementInstanceId())) return err_no; if ( Release_reserved_mutex(handle_mutex,"handle_mutex",0,0)) return DMLERR_SYS_ERROR; reference_inst->Next_Entry = this_instance; } *pidInst = this_instance->Instance_id; - TRACE(ddeml,"New application instance processing finished OK\n"); + TRACE("New application instance processing finished OK\n"); } else { /* Reinitialisation situation --- FIX */ - TRACE(ddeml,"reinitialisation of (%p,%p,0x%lx,%ld): stub\n",pidInst,pfnCallback,afCmd,ulRes); + TRACE("reinitialisation of (%p,%p,0x%lx,%ld): stub\n",pidInst,pfnCallback,afCmd,ulRes); WaitForSingleObject(handle_mutex,1000); if ( (err_no=GetLastError()) != 0 ) { /* FIXME - needs refinement with popup for timeout, also is timeout interval OK */ - ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no); + ERR("WaitForSingleObject failed - handle list %li\n",err_no); HeapFree(SystemHeap, 0, this_instance); return DMLERR_SYS_ERROR; } @@ -769,7 +769,7 @@ UINT WINAPI DdeInitializeW( LPDWORD pidInst, PFNCALLBACK pfnCallback, */ BOOL16 WINAPI DdeUninitialize16( DWORD idInst ) { - FIXME(ddeml," stub calling DdeUninitialize\n"); + FIXME(" stub calling DdeUninitialize\n"); return (BOOL16)DdeUninitialize( idInst ); } @@ -802,10 +802,10 @@ BOOL WINAPI DdeUninitialize( DWORD idInst ) { /* FIXME - needs refinement with popup for timeout, also is timeout interval OK */ - ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no); + ERR("WaitForSingleObject failed - handle list %li\n",err_no); return DMLERR_SYS_ERROR; } - TRACE(ddeml,"Handle Mutex created/reserved\n"); + TRACE("Handle Mutex created/reserved\n"); /* First check instance */ this_instance = Find_Instance_Entry(idInst); @@ -817,7 +817,7 @@ BOOL WINAPI DdeUninitialize( DWORD idInst ) */ return FALSE; } - FIXME(ddeml, "(%ld): partial stub\n", idInst); + FIXME("(%ld): partial stub\n", idInst); /* FIXME ++++++++++++++++++++++++++++++++++++++++++ * Needs to de-register all service names @@ -887,7 +887,7 @@ HCONVLIST WINAPI DdeConnectList16( DWORD idInst, HSZ hszService, HSZ hszTopic, HCONVLIST WINAPI DdeConnectList( DWORD idInst, HSZ hszService, HSZ hszTopic, HCONVLIST hConvList, LPCONVCONTEXT pCC ) { - FIXME(ddeml, "(%ld,%ld,%ld,%ld,%p): stub\n", idInst, hszService, hszTopic, + FIXME("(%ld,%ld,%ld,%ld,%p): stub\n", idInst, hszService, hszTopic, hConvList,pCC); return 1; } @@ -907,7 +907,7 @@ HCONV WINAPI DdeQueryNextServer16( HCONVLIST hConvList, HCONV hConvPrev ) */ HCONV WINAPI DdeQueryNextServer( HCONVLIST hConvList, HCONV hConvPrev ) { - FIXME(ddeml, "(%ld,%ld): stub\n",hConvList,hConvPrev); + FIXME("(%ld,%ld): stub\n",hConvList,hConvPrev); return 0; } @@ -929,7 +929,7 @@ DWORD WINAPI DdeQueryStringA(DWORD idInst, HSZ hsz, LPSTR psz, DWORD cchMax, INT DWORD ret = 0; CHAR pString[MAX_BUFFER_LEN]; - FIXME(ddeml, + FIXME( "(%ld, 0x%lx, %p, %ld, %d): partial stub\n", idInst, hsz, @@ -947,11 +947,11 @@ DWORD WINAPI DdeQueryStringA(DWORD idInst, HSZ hsz, LPSTR psz, DWORD cchMax, INT { /* FIXME - needs refinement with popup for timeout, also is timeout interval OK */ - ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no); + ERR("WaitForSingleObject failed - handle list %li\n",err_no); /* needs something for DdeGetLAstError even if the manual doesn't say so */ return FALSE; } - TRACE(ddeml,"Handle Mutex created/reserved\n"); + TRACE("Handle Mutex created/reserved\n"); /* First check instance */ @@ -980,7 +980,7 @@ DWORD WINAPI DdeQueryStringA(DWORD idInst, HSZ hsz, LPSTR psz, DWORD cchMax, INT } else { Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE); } - TRACE(ddeml,"returning pointer\n"); + TRACE("returning pointer\n"); return ret; } @@ -1003,7 +1003,7 @@ DWORD WINAPI DdeQueryStringW(DWORD idInst, HSZ hsz, LPWSTR psz, DWORD cchMax, IN WCHAR pString[MAX_BUFFER_LEN]; int factor = 1; - FIXME(ddeml, + FIXME( "(%ld, 0x%lx, %p, %ld, %d): stub\n", idInst, hsz, @@ -1045,7 +1045,7 @@ DWORD WINAPI DdeQueryStringW(DWORD idInst, HSZ hsz, LPWSTR psz, DWORD cchMax, IN DWORD WINAPI DdeQueryString16(DWORD idInst, HSZ hsz, LPSTR lpsz, DWORD cchMax, int codepage) { - FIXME(ddeml,"(%ld, 0x%lx, %p, %ld, %d): stub \n", + FIXME("(%ld, 0x%lx, %p, %ld, %d): stub \n", idInst, hsz, lpsz, @@ -1074,7 +1074,7 @@ BOOL16 WINAPI DdeDisconnectList16( HCONVLIST hConvList ) BOOL WINAPI DdeDisconnectList( HCONVLIST hConvList) /* [in] Handle to conversation list */ { - FIXME(ddeml, "(%ld): stub\n", hConvList); + FIXME("(%ld): stub\n", hConvList); return TRUE; } @@ -1085,7 +1085,7 @@ BOOL WINAPI DdeDisconnectList( HCONV WINAPI DdeConnect16( DWORD idInst, HSZ hszService, HSZ hszTopic, LPCONVCONTEXT16 pCC ) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return 0; } @@ -1096,7 +1096,7 @@ HCONV WINAPI DdeConnect16( DWORD idInst, HSZ hszService, HSZ hszTopic, HCONV WINAPI DdeConnect( DWORD idInst, HSZ hszService, HSZ hszTopic, LPCONVCONTEXT pCC ) { - FIXME(ddeml, "(0x%lx,%ld,%ld,%p): stub\n",idInst,hszService,hszTopic, + FIXME("(0x%lx,%ld,%ld,%p): stub\n",idInst,hszService,hszTopic, pCC); return 0; } @@ -1115,7 +1115,7 @@ BOOL16 WINAPI DdeDisconnect16( HCONV hConv ) */ BOOL16 WINAPI DdeSetUserHandle16( HCONV hConv, DWORD id, DWORD hUser ) { - FIXME( ddeml, "(%ld,%ld,%ld): stub\n",hConv,id, hUser ); + FIXME("(%ld,%ld,%ld): stub\n",hConv,id, hUser ); return 0; } @@ -1142,7 +1142,7 @@ HDDEDATA WINAPI DdeCreateDataHandle( DWORD idInst, LPBYTE pSrc, DWORD cb, DWORD cbOff, HSZ hszItem, UINT wFmt, UINT afCmd ) { - FIXME( ddeml, + FIXME( "(%ld,%p,%ld,%ld,0x%lx,%d,%d): stub\n", idInst, pSrc, @@ -1160,7 +1160,7 @@ HDDEDATA WINAPI DdeCreateDataHandle( DWORD idInst, LPBYTE pSrc, DWORD cb, */ BOOL WINAPI DdeDisconnect( HCONV hConv ) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return 0; } @@ -1170,7 +1170,7 @@ BOOL WINAPI DdeDisconnect( HCONV hConv ) */ HCONV WINAPI DdeReconnect( HCONV hConv ) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return 0; } @@ -1194,7 +1194,7 @@ HSZ WINAPI DdeCreateStringHandle16( DWORD idInst, LPCSTR str, INT16 codepage ) { return DdeCreateStringHandleA( idInst, str, codepage ); } else { - TRACE(ddeml,"Default codepage supplied\n"); + TRACE("Default codepage supplied\n"); return DdeCreateStringHandleA( idInst, str, CP_WINANSI); } } @@ -1220,7 +1220,7 @@ HSZ WINAPI DdeCreateStringHandle16( DWORD idInst, LPCSTR str, INT16 codepage ) HSZ WINAPI DdeCreateStringHandleA( DWORD idInst, LPCSTR psz, INT codepage ) { HSZ hsz = 0; - TRACE(ddeml, "(%ld,%s,%d): partial stub\n",idInst,debugstr_a(psz),codepage); + TRACE("(%ld,%s,%d): partial stub\n",idInst,debugstr_a(psz),codepage); if ( DDE_Max_Assigned_Instance == 0 ) @@ -1233,10 +1233,10 @@ HSZ WINAPI DdeCreateStringHandleA( DWORD idInst, LPCSTR psz, INT codepage ) { /* FIXME - needs refinement with popup for timeout, also is timeout interval OK */ - ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no); + ERR("WaitForSingleObject failed - handle list %li\n",err_no); return DMLERR_SYS_ERROR; } - TRACE(ddeml,"Handle Mutex created/reserved\n"); + TRACE("Handle Mutex created/reserved\n"); /* First check instance */ @@ -1256,19 +1256,19 @@ HSZ WINAPI DdeCreateStringHandleA( DWORD idInst, LPCSTR psz, INT codepage ) /* Save the handle so we know to clean it when * uninitialize is called. */ - TRACE(ddeml,"added atom %s with HSZ 0x%lx, \n",debugstr_a(psz),hsz); + TRACE("added atom %s with HSZ 0x%lx, \n",debugstr_a(psz),hsz); InsertHSZNode( hsz ); if ( Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE)) { reference_inst->Last_Error = DMLERR_SYS_ERROR; return 0; } - TRACE(ddeml,"Returning pointer\n"); + TRACE("Returning pointer\n"); return hsz; } else { Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE); } - TRACE(ddeml,"Returning error\n"); + TRACE("Returning error\n"); return 0; } @@ -1297,7 +1297,7 @@ HSZ WINAPI DdeCreateStringHandleW( { HSZ hsz = 0; - TRACE(ddeml, "(%ld,%s,%d): partial stub\n",idInst,debugstr_w(psz),codepage); + TRACE("(%ld,%s,%d): partial stub\n",idInst,debugstr_w(psz),codepage); if ( DDE_Max_Assigned_Instance == 0 ) @@ -1310,10 +1310,10 @@ HSZ WINAPI DdeCreateStringHandleW( { /* FIXME - needs refinement with popup for timeout, also is timeout interval OK */ - ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no); + ERR("WaitForSingleObject failed - handle list %li\n",err_no); return DMLERR_SYS_ERROR; } - TRACE(ddeml,"CreateString - Handle Mutex created/reserved\n"); + TRACE("CreateString - Handle Mutex created/reserved\n"); /* First check instance */ @@ -1327,7 +1327,7 @@ HSZ WINAPI DdeCreateStringHandleW( return 0; } - FIXME(ddeml, "(%ld,%s,%d): partial stub\n",idInst,debugstr_w(psz),codepage); + FIXME("(%ld,%s,%d): partial stub\n",idInst,debugstr_w(psz),codepage); if (codepage==CP_WINUNICODE) /* @@ -1344,12 +1344,12 @@ HSZ WINAPI DdeCreateStringHandleW( reference_inst->Last_Error = DMLERR_SYS_ERROR; return 0; } - TRACE(ddeml,"Returning pointer\n"); + TRACE("Returning pointer\n"); return hsz; } else { Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE); } - TRACE(ddeml,"Returning error\n"); + TRACE("Returning error\n"); return 0; } @@ -1359,7 +1359,7 @@ HSZ WINAPI DdeCreateStringHandleW( */ BOOL16 WINAPI DdeFreeStringHandle16( DWORD idInst, HSZ hsz ) { - FIXME(ddeml,"idInst %ld hsz 0x%lx\n",idInst,hsz); + FIXME("idInst %ld hsz 0x%lx\n",idInst,hsz); return (BOOL)DdeFreeStringHandle( idInst, hsz ); } @@ -1381,7 +1381,7 @@ BOOL16 WINAPI DdeFreeStringHandle16( DWORD idInst, HSZ hsz ) */ BOOL WINAPI DdeFreeStringHandle( DWORD idInst, HSZ hsz ) { - TRACE(ddeml, "(%ld,%ld): \n",idInst,hsz); + TRACE("(%ld,%ld): \n",idInst,hsz); if ( DDE_Max_Assigned_Instance == 0 ) { /* Nothing has been initialised - exit now ! can return TRUE since effect is the same */ @@ -1390,17 +1390,17 @@ BOOL WINAPI DdeFreeStringHandle( DWORD idInst, HSZ hsz ) if ( ( prev_err = GetLastError()) != 0 ) { /* something earlier failed !! */ - ERR(ddeml,"Error %li before WaitForSingleObject - trying to continue\n",prev_err); + ERR("Error %li before WaitForSingleObject - trying to continue\n",prev_err); } WaitForSingleObject(handle_mutex,1000); if ( ((err_no=GetLastError()) != 0 ) && (err_no != prev_err )) { /* FIXME - needs refinement with popup for timeout, also is timeout interval OK */ - ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no); + ERR("WaitForSingleObject failed - handle list %li\n",err_no); return DMLERR_SYS_ERROR; } - TRACE(ddeml,"Handle Mutex created/reserved\n"); + TRACE("Handle Mutex created/reserved\n"); /* First check instance */ @@ -1437,7 +1437,7 @@ BOOL16 WINAPI DdeFreeDataHandle16( HDDEDATA hData ) */ BOOL WINAPI DdeFreeDataHandle( HDDEDATA hData ) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return TRUE; } @@ -1472,7 +1472,7 @@ BOOL16 WINAPI DdeKeepStringHandle16( DWORD idInst, HSZ hsz ) BOOL WINAPI DdeKeepStringHandle( DWORD idInst, HSZ hsz ) { - TRACE(ddeml, "(%ld,%ld): \n",idInst,hsz); + TRACE("(%ld,%ld): \n",idInst,hsz); if ( DDE_Max_Assigned_Instance == 0 ) { /* Nothing has been initialised - exit now ! can return FALSE since effect is the same */ @@ -1481,17 +1481,17 @@ BOOL WINAPI DdeKeepStringHandle( DWORD idInst, HSZ hsz ) if ( ( prev_err = GetLastError()) != 0 ) { /* something earlier failed !! */ - ERR(ddeml,"Error %li before WaitForSingleObject - trying to continue\n",prev_err); + ERR("Error %li before WaitForSingleObject - trying to continue\n",prev_err); } WaitForSingleObject(handle_mutex,1000); if ( ((err_no=GetLastError()) != 0 ) && (err_no != prev_err )) { /* FIXME - needs refinement with popup for timeout, also is timeout interval OK */ - ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no); + ERR("WaitForSingleObject failed - handle list %li\n",err_no); return FALSE; } - TRACE(ddeml,"Handle Mutex created/reserved\n"); + TRACE("Handle Mutex created/reserved\n"); /* First check instance */ @@ -1530,7 +1530,7 @@ HDDEDATA WINAPI DdeClientTransaction( LPBYTE pData, DWORD cbData, UINT wType, DWORD dwTimeout, LPDWORD pdwResult ) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return 0; } @@ -1542,7 +1542,7 @@ HDDEDATA WINAPI DdeClientTransaction( LPBYTE pData, DWORD cbData, BOOL16 WINAPI DdeAbandonTransaction16( DWORD idInst, HCONV hConv, DWORD idTransaction ) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return TRUE; } @@ -1562,7 +1562,7 @@ BOOL16 WINAPI DdeAbandonTransaction16( DWORD idInst, HCONV hConv, BOOL WINAPI DdeAbandonTransaction( DWORD idInst, HCONV hConv, DWORD idTransaction ) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return TRUE; } @@ -1587,7 +1587,7 @@ BOOL WINAPI DdePostAdvise( HSZ hszTopic, /* [in] Handle to topic name string */ HSZ hszItem) /* [in] Handle to item name string */ { - FIXME(ddeml, "(%ld,%ld,%ld): stub\n",idInst,hszTopic,hszItem); + FIXME("(%ld,%ld,%ld): stub\n",idInst,hszTopic,hszItem); return TRUE; } @@ -1598,7 +1598,7 @@ BOOL WINAPI DdePostAdvise( HDDEDATA WINAPI DdeAddData16( HDDEDATA hData, LPBYTE pSrc, DWORD cb, DWORD cbOff ) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return 0; } @@ -1617,7 +1617,7 @@ HDDEDATA WINAPI DdeAddData16( HDDEDATA hData, LPBYTE pSrc, DWORD cb, HDDEDATA WINAPI DdeAddData( HDDEDATA hData, LPBYTE pSrc, DWORD cb, DWORD cbOff ) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return 0; } @@ -1637,7 +1637,7 @@ HDDEDATA WINAPI DdeAddData( HDDEDATA hData, LPBYTE pSrc, DWORD cb, BOOL WINAPI DdeImpersonateClient( HCONV hConv) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return TRUE; } @@ -1658,7 +1658,7 @@ BOOL WINAPI DdeImpersonateClient( HCONV hConv) BOOL WINAPI DdeSetQualityOfService( HWND hwndClient, CONST SECURITY_QUALITY_OF_SERVICE *pqosNew, PSECURITY_QUALITY_OF_SERVICE pqosPrev) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return TRUE; } @@ -1677,7 +1677,7 @@ BOOL WINAPI DdeSetQualityOfService( HWND hwndClient, CONST SECURITY_QUALITY_OF_S BOOL WINAPI DdeSetUserHandle( HCONV hConv, DWORD id, DWORD hUser) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return TRUE; } @@ -1693,7 +1693,7 @@ DWORD WINAPI DdeGetData( DWORD cbMax, /* [in] Amount of data to copy */ DWORD cbOff) /* [in] Offset to beginning of data */ { - FIXME(ddeml, "(%ld,%p,%ld,%ld): stub\n",hData,pDst,cbMax,cbOff); + FIXME("(%ld,%p,%ld,%ld): stub\n",hData,pDst,cbMax,cbOff); return cbMax; } @@ -1724,7 +1724,7 @@ LPBYTE WINAPI DdeAccessData16( HDDEDATA hData, LPDWORD pcbDataSize ) */ LPBYTE WINAPI DdeAccessData( HDDEDATA hData, LPDWORD pcbDataSize ) { - FIXME( ddeml, "(%ld,%p): stub\n", hData, pcbDataSize); + FIXME("(%ld,%p): stub\n", hData, pcbDataSize); return 0; } @@ -1741,7 +1741,7 @@ BOOL16 WINAPI DdeUnaccessData16( HDDEDATA hData ) */ BOOL WINAPI DdeUnaccessData( HDDEDATA hData ) { - FIXME( ddeml, "(0x%lx): stub\n", hData); + FIXME("(0x%lx): stub\n", hData); return 0; } @@ -1759,7 +1759,7 @@ BOOL16 WINAPI DdeEnableCallback16( DWORD idInst, HCONV hConv, UINT16 wCmd ) */ BOOL WINAPI DdeEnableCallback( DWORD idInst, HCONV hConv, UINT wCmd ) { - FIXME( ddeml, "(%ld, 0x%lx, %d) stub\n", idInst, hConv, wCmd); + FIXME("(%ld, 0x%lx, %d) stub\n", idInst, hConv, wCmd); return 0; } @@ -1808,7 +1808,7 @@ HDDEDATA WINAPI DdeNameService( DWORD idInst, HSZ hsz1, HSZ hsz2, CHAR SNameBuffer[MAX_BUFFER_LEN]; UINT rcode; this_service = NULL; - FIXME(ddeml, "(%ld,%ld,%ld,%d): stub\n",idInst,hsz1,hsz2,afCmd); + FIXME("(%ld,%ld,%ld,%d): stub\n",idInst,hsz1,hsz2,afCmd); if ( DDE_Max_Assigned_Instance == 0 ) { /* Nothing has been initialised - exit now ! @@ -1820,10 +1820,10 @@ HDDEDATA WINAPI DdeNameService( DWORD idInst, HSZ hsz1, HSZ hsz2, { /* FIXME - needs refinement with popup for timeout, also is timeout interval OK */ - ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no); + ERR("WaitForSingleObject failed - handle list %li\n",err_no); return DMLERR_SYS_ERROR; } - TRACE(ddeml,"Handle Mutex created/reserved\n"); + TRACE("Handle Mutex created/reserved\n"); /* First check instance */ @@ -1831,7 +1831,7 @@ HDDEDATA WINAPI DdeNameService( DWORD idInst, HSZ hsz1, HSZ hsz2, this_instance = reference_inst; if (reference_inst == NULL) { - TRACE(ddeml,"Instance not found as initialised\n"); + TRACE("Instance not found as initialised\n"); if ( Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE)) return TRUE; /* Nothing has been initialised - exit now ! can return TRUE since effect is the same */ return FALSE; @@ -1844,7 +1844,7 @@ HDDEDATA WINAPI DdeNameService( DWORD idInst, HSZ hsz1, HSZ hsz2, */ reference_inst->Last_Error = DMLERR_INVALIDPARAMETER; Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE); - FIXME(ddeml,"Reserved parameter no-zero !!\n"); + FIXME("Reserved parameter no-zero !!\n"); return FALSE; } if ( hsz1 == 0L ) @@ -1857,7 +1857,7 @@ HDDEDATA WINAPI DdeNameService( DWORD idInst, HSZ hsz1, HSZ hsz2, /* don't know if we should check this but it makes sense * why supply REGISTER or filter flags if de-registering all */ - TRACE(ddeml,"General unregister unexpected flags\n"); + TRACE("General unregister unexpected flags\n"); reference_inst->Last_Error = DMLERR_DLL_USAGE; Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE); return FALSE; @@ -1868,7 +1868,7 @@ HDDEDATA WINAPI DdeNameService( DWORD idInst, HSZ hsz1, HSZ hsz2, { /* None to unregister !! */ - TRACE(ddeml,"General de-register - nothing registered\n"); + TRACE("General de-register - nothing registered\n"); reference_inst->Last_Error = DMLERR_DLL_USAGE; Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE); return FALSE; @@ -1883,12 +1883,12 @@ HDDEDATA WINAPI DdeNameService( DWORD idInst, HSZ hsz1, HSZ hsz2, HeapFree(SystemHeap, 0, this_service); /* finished - release heap space used as work store */ } HeapFree(SystemHeap, 0, this_service); /* finished - release heap space used as work store */ - TRACE(ddeml,"General de-register - finished\n"); + TRACE("General de-register - finished\n"); } Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE); return TRUE; } - TRACE(ddeml,"Specific name action detected\n"); + TRACE("Specific name action detected\n"); reference_service = Find_Service_Name(hsz1,reference_inst); if (( Cmd_flags && DNS_REGISTER ) == DNS_REGISTER ) { @@ -1905,7 +1905,7 @@ HDDEDATA WINAPI DdeNameService( DWORD idInst, HSZ hsz1, HSZ hsz2, { /* easy one - nothing else there */ - TRACE(ddeml,"Adding 1st service name\n"); + TRACE("Adding 1st service name\n"); reference_inst->ServiceNames = this_service; GlobalAddAtomA(SNameBuffer); } else @@ -1918,12 +1918,12 @@ HDDEDATA WINAPI DdeNameService( DWORD idInst, HSZ hsz1, HSZ hsz2, * what do we do ? */ HeapFree(SystemHeap, 0, this_service); /* finished - release heap space used as work store */ - FIXME(ddeml,"Trying to register already registered service !!\n"); + FIXME("Trying to register already registered service !!\n"); } else { /* Add this one into the chain */ - TRACE(ddeml,"Adding subsequent service name\n"); + TRACE("Adding subsequent service name\n"); this_service->next = reference_inst->ServiceNames; reference_inst->ServiceNames = this_service; GlobalAddAtomA(SNameBuffer); @@ -1949,7 +1949,7 @@ HDDEDATA WINAPI DdeNameService( DWORD idInst, HSZ hsz1, HSZ hsz2, /* Service name not registered !! * what do we do ? */ - FIXME(ddeml,"Trying to de-register unregistered service !!\n"); + FIXME("Trying to de-register unregistered service !!\n"); } else { /* Delete this one from the chain @@ -2049,7 +2049,7 @@ UINT16 WINAPI DdeGetLastError16( DWORD idInst ) UINT WINAPI DdeGetLastError( DWORD idInst ) { DWORD error_code; - FIXME(ddeml, "(%ld): stub\n",idInst); + FIXME("(%ld): stub\n",idInst); if ( DDE_Max_Assigned_Instance == 0 ) { /* Nothing has been initialised - exit now ! */ @@ -2058,17 +2058,17 @@ UINT WINAPI DdeGetLastError( DWORD idInst ) if ( ( prev_err = GetLastError()) != 0 ) { /* something earlier failed !! */ - ERR(ddeml,"Error %li before WaitForSingleObject - trying to continue\n",prev_err); + ERR("Error %li before WaitForSingleObject - trying to continue\n",prev_err); } WaitForSingleObject(handle_mutex,1000); if ( ((err_no=GetLastError()) != 0 ) && (err_no != prev_err )) { /* FIXME - needs refinement with popup for timeout, also is timeout interval OK */ - ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no); + ERR("WaitForSingleObject failed - handle list %li\n",err_no); return DMLERR_SYS_ERROR; } - TRACE(ddeml,"Handle Mutex created/reserved\n"); + TRACE("Handle Mutex created/reserved\n"); /* First check instance */ @@ -2113,7 +2113,7 @@ int WINAPI DdeCmpStringHandles( HSZ hsz1, HSZ hsz2 ) int ret = 0; int ret1, ret2; - TRACE( ddeml, "handle 1, handle 2\n" ); + TRACE("handle 1, handle 2\n" ); ret1 = GlobalGetAtomNameA( hsz1, psz1, MAX_BUFFER_LEN ); ret2 = GlobalGetAtomNameA( hsz2, psz2, MAX_BUFFER_LEN ); @@ -2169,7 +2169,7 @@ int WINAPI DdeCmpStringHandles( HSZ hsz1, HSZ hsz2 ) */ UINT WINAPI PackDDElParam(UINT msg, UINT uiLo, UINT uiHi) { - FIXME(ddeml, "stub.\n"); + FIXME("stub.\n"); return 0; } @@ -2184,7 +2184,7 @@ UINT WINAPI PackDDElParam(UINT msg, UINT uiLo, UINT uiHi) UINT WINAPI UnpackDDElParam(UINT msg, UINT lParam, UINT *uiLo, UINT *uiHi) { - FIXME(ddeml, "stub.\n"); + FIXME("stub.\n"); return 0; } @@ -2198,7 +2198,7 @@ UINT WINAPI UnpackDDElParam(UINT msg, UINT lParam, */ UINT WINAPI FreeDDElParam(UINT msg, UINT lParam) { - FIXME(ddeml, "stub.\n"); + FIXME("stub.\n"); return 0; } @@ -2209,7 +2209,7 @@ UINT WINAPI FreeDDElParam(UINT msg, UINT lParam) UINT WINAPI ReuseDDElParam(UINT lParam, UINT msgIn, UINT msgOut, UINT uiLi, UINT uiHi) { - FIXME(ddeml, "stub.\n"); + FIXME("stub.\n"); return 0; } @@ -2219,7 +2219,7 @@ UINT WINAPI ReuseDDElParam(UINT lParam, UINT msgIn, UINT msgOut, */ UINT16 WINAPI DdeQueryConvInfo16( HCONV hconv, DWORD idTransaction , LPCONVINFO16 lpConvInfo) { - FIXME(ddeml,"stub.\n"); + FIXME("stub.\n"); return 0; } @@ -2230,6 +2230,6 @@ UINT16 WINAPI DdeQueryConvInfo16( HCONV hconv, DWORD idTransaction , LPCONVINFO1 */ UINT WINAPI DdeQueryConvInfo( HCONV hconv, DWORD idTransaction , LPCONVINFO lpConvInfo) { - FIXME(ddeml,"stub.\n"); + FIXME("stub.\n"); return 0; } diff --git a/misc/error.c b/misc/error.c index 52be9f767a02cdafaab53caef78916c035a92f5d..2255e059e36d3e5298c428cde2cb02b609675be8 100644 --- a/misc/error.c +++ b/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); } /*********************************************************************** diff --git a/misc/imm.c b/misc/imm.c index 47e9927007a8f7bdad7b96649839359a23445cb7..d84f68bb863c2095dcefaf41af0f6fc1e4cfec69 100644 --- a/misc/imm.c +++ b/misc/imm.c @@ -8,7 +8,7 @@ #include "winuser.h" #include "winerror.h" #include "windef.h" -#include "debug.h" +#include "debugtools.h" #include "winversion.h" #include "imm.h" @@ -19,7 +19,7 @@ DEFAULT_DEBUG_CHANNEL(imm) */ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) { - FIXME(imm, "(0x%08x, 0x%08x): stub\n",hWnd,hIMC); + FIXME("(0x%08x, 0x%08x): stub\n",hWnd,hIMC); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return (HIMC)NULL; } @@ -30,7 +30,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) BOOL WINAPI ImmConfigureIMEA( HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) { - FIXME(imm, "(0x%08x, 0x%08x, %ld, %p): stub\n", + FIXME("(0x%08x, 0x%08x, %ld, %p): stub\n", hKL, hWnd, dwMode, lpData ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -43,7 +43,7 @@ BOOL WINAPI ImmConfigureIMEA( BOOL WINAPI ImmConfigureIMEW( HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) { - FIXME(imm, "(0x%08x, 0x%08x, %ld, %p): stub\n", + FIXME("(0x%08x, 0x%08x, %ld, %p): stub\n", hKL, hWnd, dwMode, lpData ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -55,7 +55,7 @@ BOOL WINAPI ImmConfigureIMEW( */ HIMC WINAPI ImmCreateContext() { - FIXME(imm, "(): stub\n"); + FIXME("(): stub\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return (HIMC)NULL; } @@ -65,7 +65,7 @@ HIMC WINAPI ImmCreateContext() */ BOOL WINAPI ImmDestroyContext(HIMC hIMC) { - FIXME(imm, "(0x%08x): stub\n",hIMC); + FIXME("(0x%08x): stub\n",hIMC); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -78,7 +78,7 @@ UINT WINAPI ImmEnumRegisterWordA( LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister, LPVOID lpData) { - FIXME(imm, "(0x%08x, %p, %s, %ld, %s, %p): stub\n", + FIXME("(0x%08x, %p, %s, %ld, %s, %p): stub\n", hKL, lpfnEnumProc, debugstr_a(lpszReading), dwStyle, debugstr_a(lpszRegister), lpData @@ -95,7 +95,7 @@ UINT WINAPI ImmEnumRegisterWordW( LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegister, LPVOID lpData) { - FIXME(imm, "(0x%08x, %p, %s, %ld, %s, %p): stub\n", + FIXME("(0x%08x, %p, %s, %ld, %s, %p): stub\n", hKL, lpfnEnumProc, debugstr_w(lpszReading), dwStyle, debugstr_w(lpszRegister), lpData @@ -111,7 +111,7 @@ LRESULT WINAPI ImmEscapeA( HKL hKL, HIMC hIMC, UINT uEscape, LPVOID lpData) { - FIXME(imm, "(0x%08x, 0x%08x, %d, %p): stub\n", + FIXME("(0x%08x, 0x%08x, %d, %p): stub\n", hKL, hIMC, uEscape, lpData ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -125,7 +125,7 @@ LRESULT WINAPI ImmEscapeW( HKL hKL, HIMC hIMC, UINT uEscape, LPVOID lpData) { - FIXME(imm, "(0x%08x, 0x%08x, %d, %p): stub\n", + FIXME("(0x%08x, 0x%08x, %d, %p): stub\n", hKL, hIMC, uEscape, lpData ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -139,7 +139,7 @@ DWORD WINAPI ImmGetCandidateListA( HIMC hIMC, DWORD deIndex, LPCANDIDATELIST lpCandList, DWORD dwBufLen) { - FIXME(imm, "(0x%08x, %ld, %p, %ld): stub\n", + FIXME("(0x%08x, %ld, %p, %ld): stub\n", hIMC, deIndex, lpCandList, dwBufLen ); @@ -153,7 +153,7 @@ DWORD WINAPI ImmGetCandidateListA( DWORD WINAPI ImmGetCandidateListCountA( HIMC hIMC, LPDWORD lpdwListCount) { - FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpdwListCount); + FIXME("(0x%08x, %p): stub\n", hIMC, lpdwListCount); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -164,7 +164,7 @@ DWORD WINAPI ImmGetCandidateListCountA( DWORD WINAPI ImmGetCandidateListCountW( HIMC hIMC, LPDWORD lpdwListCount) { - FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpdwListCount); + FIXME("(0x%08x, %p): stub\n", hIMC, lpdwListCount); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -176,7 +176,7 @@ DWORD WINAPI ImmGetCandidateListW( HIMC hIMC, DWORD deIndex, LPCANDIDATELIST lpCandList, DWORD dwBufLen) { - FIXME(imm, "(0x%08x, %ld, %p, %ld): stub\n", + FIXME("(0x%08x, %ld, %p, %ld): stub\n", hIMC, deIndex, lpCandList, dwBufLen ); @@ -190,7 +190,7 @@ DWORD WINAPI ImmGetCandidateListW( BOOL WINAPI ImmGetCandidateWindow( HIMC hIMC, DWORD dwBufLen, LPCANDIDATEFORM lpCandidate) { - FIXME(imm, "(0x%08x, %ld, %p): stub\n", hIMC, dwBufLen, lpCandidate); + FIXME("(0x%08x, %ld, %p): stub\n", hIMC, dwBufLen, lpCandidate); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -200,7 +200,7 @@ BOOL WINAPI ImmGetCandidateWindow( */ BOOL WINAPI ImmGetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) { - FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lplf); + FIXME("(0x%08x, %p): stub\n", hIMC, lplf); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -210,7 +210,7 @@ BOOL WINAPI ImmGetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) */ BOOL WINAPI ImmGetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) { - FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lplf); + FIXME("(0x%08x, %p): stub\n", hIMC, lplf); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -221,14 +221,14 @@ BOOL WINAPI ImmGetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) LONG WINAPI ImmGetCompositionStringA( HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen) { - FIXME(imm, "(0x%08x, %ld, %p, %ld): stub\n", + FIXME("(0x%08x, %ld, %p, %ld): stub\n", hIMC, dwIndex, lpBuf, dwBufLen ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); switch(VERSION_GetVersion()) { default: - FIXME(imm, "%s not supported",VERSION_GetVersionName()); + FIXME("%s not supported",VERSION_GetVersionName()); case WIN95: return 0xffffffff; case NT40: @@ -243,14 +243,14 @@ LONG WINAPI ImmGetCompositionStringW( HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen) { - FIXME(imm, "(0x%08x, %ld, %p, %ld): stub\n", + FIXME("(0x%08x, %ld, %p, %ld): stub\n", hIMC, dwIndex, lpBuf, dwBufLen ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); switch(VERSION_GetVersion()) { default: - FIXME(imm, "%s not supported",VERSION_GetVersionName()); + FIXME("%s not supported",VERSION_GetVersionName()); case WIN95: return 0xffffffff; case NT40: @@ -263,7 +263,7 @@ LONG WINAPI ImmGetCompositionStringW( */ BOOL WINAPI ImmGetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) { - FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpCompForm); + FIXME("(0x%08x, %p): stub\n", hIMC, lpCompForm); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -273,7 +273,7 @@ BOOL WINAPI ImmGetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) */ HIMC WINAPI ImmGetContext(HWND hWnd) { - FIXME(imm, "(0x%08x): stub\n", hWnd); + FIXME("(0x%08x): stub\n", hWnd); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return (HIMC)NULL; } @@ -286,7 +286,7 @@ DWORD WINAPI ImmGetConversionListA( LPCSTR pSrc, LPCANDIDATELIST lpDst, DWORD dwBufLen, UINT uFlag) { - FIXME(imm, "(0x%08x, 0x%08x, %s, %p, %ld, %d): stub\n", + FIXME("(0x%08x, 0x%08x, %s, %p, %ld, %d): stub\n", hKL, hIMC, debugstr_a(pSrc), lpDst, dwBufLen, uFlag ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -301,7 +301,7 @@ DWORD WINAPI ImmGetConversionListW( LPCWSTR pSrc, LPCANDIDATELIST lpDst, DWORD dwBufLen, UINT uFlag) { - FIXME(imm, "(0x%08x, 0x%08x, %s, %p, %ld, %d): stub\n", + FIXME("(0x%08x, 0x%08x, %s, %p, %ld, %d): stub\n", hKL, hIMC, debugstr_w(pSrc), lpDst, dwBufLen, uFlag ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -314,7 +314,7 @@ DWORD WINAPI ImmGetConversionListW( BOOL WINAPI ImmGetConversionStatus( HIMC hIMC, LPDWORD lpfdwConversion, LPDWORD lpfdwSentence) { - FIXME(imm, "(0x%08x, %p, %p): stub\n", + FIXME("(0x%08x, %p, %p): stub\n", hIMC, lpfdwConversion, lpfdwSentence ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -326,7 +326,7 @@ BOOL WINAPI ImmGetConversionStatus( */ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { - FIXME(imm, "(0x%08x): stub\n", hWnd); + FIXME("(0x%08x): stub\n", hWnd); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return (HWND)NULL; } @@ -337,7 +337,7 @@ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) UINT WINAPI ImmGetDescriptionA( HKL hKL, LPSTR lpszDescription, UINT uBufLen) { - FIXME(imm, "(0x%08x, %s, %d): stub\n", + FIXME("(0x%08x, %s, %d): stub\n", hKL, debugstr_a(lpszDescription), uBufLen ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -349,7 +349,7 @@ UINT WINAPI ImmGetDescriptionA( */ UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen) { - FIXME(imm, "(0x%08x, %s, %d): stub\n", + FIXME("(0x%08x, %s, %d): stub\n", hKL, debugstr_w(lpszDescription), uBufLen ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -362,7 +362,7 @@ UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen) DWORD WINAPI ImmGetGuideLineA( HIMC hIMC, DWORD dwIndex, LPSTR lpBuf, DWORD dwBufLen) { - FIXME(imm, "(0x%08x, %ld, %s, %ld): stub\n", + FIXME("(0x%08x, %ld, %s, %ld): stub\n", hIMC, dwIndex, debugstr_a(lpBuf), dwBufLen ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -374,7 +374,7 @@ DWORD WINAPI ImmGetGuideLineA( */ DWORD WINAPI ImmGetGuideLineW(HIMC hIMC, DWORD dwIndex, LPWSTR lpBuf, DWORD dwBufLen) { - FIXME(imm, "(0x%08x, %ld, %s, %ld): stub\n", + FIXME("(0x%08x, %ld, %s, %ld): stub\n", hIMC, dwIndex, debugstr_w(lpBuf), dwBufLen ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -387,7 +387,7 @@ DWORD WINAPI ImmGetGuideLineW(HIMC hIMC, DWORD dwIndex, LPWSTR lpBuf, DWORD dwBu UINT WINAPI ImmGetIMEFileNameA( HKL hKL, LPSTR lpszFileName, UINT uBufLen) { - FIXME(imm, "(0x%08x, %s, %d): stub\n", + FIXME("(0x%08x, %s, %d): stub\n", hKL, debugstr_a(lpszFileName), uBufLen ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -400,7 +400,7 @@ UINT WINAPI ImmGetIMEFileNameA( UINT WINAPI ImmGetIMEFileNameW( HKL hKL, LPWSTR lpszFileName, UINT uBufLen) { - FIXME(imm, "(0x%08x, %s, %d): stub\n", + FIXME("(0x%08x, %s, %d): stub\n", hKL, debugstr_w(lpszFileName), uBufLen ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -412,7 +412,7 @@ UINT WINAPI ImmGetIMEFileNameW( */ BOOL WINAPI ImmGetOpenStatus(HIMC hIMC) { - FIXME(imm, "(0x%08x): stub\n", hIMC); + FIXME("(0x%08x): stub\n", hIMC); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -422,7 +422,7 @@ BOOL WINAPI ImmGetOpenStatus(HIMC hIMC) */ DWORD WINAPI ImmGetProperty(HKL hKL, DWORD fdwIndex) { - FIXME(imm, "(0x%08x, %ld): stub\n", hKL, fdwIndex); + FIXME("(0x%08x, %ld): stub\n", hKL, fdwIndex); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -433,7 +433,7 @@ DWORD WINAPI ImmGetProperty(HKL hKL, DWORD fdwIndex) UINT WINAPI ImmGetRegisterWordStyleA( HKL hKL, UINT nItem, LPSTYLEBUFA lpStyleBuf) { - FIXME(imm, "(0x%08x, %d, %p): stub\n", hKL, nItem, lpStyleBuf); + FIXME("(0x%08x, %d, %p): stub\n", hKL, nItem, lpStyleBuf); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -444,7 +444,7 @@ UINT WINAPI ImmGetRegisterWordStyleA( UINT WINAPI ImmGetRegisterWordStyleW( HKL hKL, UINT nItem, LPSTYLEBUFW lpStyleBuf) { - FIXME(imm, "(0x%08x, %d, %p): stub\n", hKL, nItem, lpStyleBuf); + FIXME("(0x%08x, %d, %p): stub\n", hKL, nItem, lpStyleBuf); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -454,7 +454,7 @@ UINT WINAPI ImmGetRegisterWordStyleW( */ BOOL WINAPI ImmGetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) { - FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpptPos); + FIXME("(0x%08x, %p): stub\n", hIMC, lpptPos); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -464,12 +464,12 @@ BOOL WINAPI ImmGetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) */ UINT WINAPI ImmGetVirtualKey(HWND hWnd) { - FIXME(imm, "(0x%08x): stub\n", hWnd); + FIXME("(0x%08x): stub\n", hWnd); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); switch(VERSION_GetVersion()) { default: - FIXME(imm, "%s not supported", VERSION_GetVersionName()); + FIXME("%s not supported", VERSION_GetVersionName()); case WIN95: return VK_PROCESSKEY; case NT40: @@ -483,7 +483,7 @@ UINT WINAPI ImmGetVirtualKey(HWND hWnd) HKL WINAPI ImmInstallIMEA( LPCSTR lpszIMEFileName, LPCSTR lpszLayoutText) { - FIXME(imm, "(%s, %s): stub\n", + FIXME("(%s, %s): stub\n", debugstr_a(lpszIMEFileName), debugstr_a(lpszLayoutText) ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -496,7 +496,7 @@ HKL WINAPI ImmInstallIMEA( HKL WINAPI ImmInstallIMEW( LPCWSTR lpszIMEFileName, LPCWSTR lpszLayoutText) { - FIXME(imm, "(%s, %s): stub\n", + FIXME("(%s, %s): stub\n", debugstr_w(lpszIMEFileName), debugstr_w(lpszLayoutText) ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -508,7 +508,7 @@ HKL WINAPI ImmInstallIMEW( */ BOOL WINAPI ImmIsIME(HKL hKL) { - FIXME(imm, "(0x%08x): stub\n", hKL); + FIXME("(0x%08x): stub\n", hKL); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -519,7 +519,7 @@ BOOL WINAPI ImmIsIME(HKL hKL) BOOL WINAPI ImmIsUIMessageA( HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam) { - FIXME(imm, "(0x%08x, %d, %d, %ld): stub\n", + FIXME("(0x%08x, %d, %d, %ld): stub\n", hWndIME, msg, wParam, lParam ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -532,7 +532,7 @@ BOOL WINAPI ImmIsUIMessageA( BOOL WINAPI ImmIsUIMessageW( HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam) { - FIXME(imm, "(0x%08x, %d, %d, %ld): stub\n", + FIXME("(0x%08x, %d, %d, %ld): stub\n", hWndIME, msg, wParam, lParam ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -545,7 +545,7 @@ BOOL WINAPI ImmIsUIMessageW( BOOL WINAPI ImmNotifyIME( HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) { - FIXME(imm, "(0x%08x, %ld, %ld, %ld): stub\n", + FIXME("(0x%08x, %ld, %ld, %ld): stub\n", hIMC, dwAction, dwIndex, dwValue ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -558,7 +558,7 @@ BOOL WINAPI ImmNotifyIME( BOOL WINAPI ImmRegisterWordA( HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister) { - FIXME(imm, "(0x%08x, %s, %ld, %s): stub\n", + FIXME("(0x%08x, %s, %ld, %s): stub\n", hKL, debugstr_a(lpszReading), dwStyle, debugstr_a(lpszRegister) ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -571,7 +571,7 @@ BOOL WINAPI ImmRegisterWordA( BOOL WINAPI ImmRegisterWordW( HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegister) { - FIXME(imm, "(0x%08x, %s, %ld, %s): stub\n", + FIXME("(0x%08x, %s, %ld, %s): stub\n", hKL, debugstr_w(lpszReading), dwStyle, debugstr_w(lpszRegister) ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -583,7 +583,7 @@ BOOL WINAPI ImmRegisterWordW( */ BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC) { - FIXME(imm, "(0x%08x, 0x%08x): stub\n", hWnd, hIMC); + FIXME("(0x%08x, 0x%08x): stub\n", hWnd, hIMC); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -594,7 +594,7 @@ BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC) BOOL WINAPI ImmSetCandidateWindow( HIMC hIMC, LPCANDIDATEFORM lpCandidate) { - FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpCandidate); + FIXME("(0x%08x, %p): stub\n", hIMC, lpCandidate); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -604,7 +604,7 @@ BOOL WINAPI ImmSetCandidateWindow( */ BOOL WINAPI ImmSetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) { - FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lplf); + FIXME("(0x%08x, %p): stub\n", hIMC, lplf); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -614,7 +614,7 @@ BOOL WINAPI ImmSetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) */ BOOL WINAPI ImmSetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) { - FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lplf); + FIXME("(0x%08x, %p): stub\n", hIMC, lplf); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -627,7 +627,7 @@ BOOL WINAPI ImmSetCompositionStringA( LPCVOID lpComp, DWORD dwCompLen, LPCVOID lpRead, DWORD dwReadLen) { - FIXME(imm, "(0x%08x, %ld, %p, %ld, %p, %ld): stub\n", + FIXME("(0x%08x, %ld, %p, %ld, %p, %ld): stub\n", hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -642,7 +642,7 @@ BOOL WINAPI ImmSetCompositionStringW( LPCVOID lpComp, DWORD dwCompLen, LPCVOID lpRead, DWORD dwReadLen) { - FIXME(imm, "(0x%08x, %ld, %p, %ld, %p, %ld): stub\n", + FIXME("(0x%08x, %ld, %p, %ld, %p, %ld): stub\n", hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -655,7 +655,7 @@ BOOL WINAPI ImmSetCompositionStringW( BOOL WINAPI ImmSetCompositionWindow( HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) { - FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpCompForm); + FIXME("(0x%08x, %p): stub\n", hIMC, lpCompForm); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -666,7 +666,7 @@ BOOL WINAPI ImmSetCompositionWindow( BOOL WINAPI ImmSetConversionStatus( HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence) { - FIXME(imm, "(0x%08x, %ld, %ld): stub\n", + FIXME("(0x%08x, %ld, %ld): stub\n", hIMC, fdwConversion, fdwSentence ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -678,7 +678,7 @@ BOOL WINAPI ImmSetConversionStatus( */ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) { - FIXME(imm, "(0x%08x, %d): stub\n", hIMC, fOpen); + FIXME("(0x%08x, %d): stub\n", hIMC, fOpen); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -688,7 +688,7 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) */ BOOL WINAPI ImmSetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) { - FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpptPos); + FIXME("(0x%08x, %p): stub\n", hIMC, lpptPos); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -698,7 +698,7 @@ BOOL WINAPI ImmSetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) */ BOOL WINAPI ImmSimulateHotKey(HWND hWnd, DWORD dwHotKeyID) { - FIXME(imm, "(0x%08x, %ld): stub\n", hWnd, dwHotKeyID); + FIXME("(0x%08x, %ld): stub\n", hWnd, dwHotKeyID); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -709,7 +709,7 @@ BOOL WINAPI ImmSimulateHotKey(HWND hWnd, DWORD dwHotKeyID) BOOL WINAPI ImmUnregisterWordA( HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszUnregister) { - FIXME(imm, "(0x%08x, %s, %ld, %s): stub\n", + FIXME("(0x%08x, %s, %ld, %s): stub\n", hKL, debugstr_a(lpszReading), dwStyle, debugstr_a(lpszUnregister) ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -725,7 +725,7 @@ BOOL WINAPI ImmUnregisterWordA( BOOL WINAPI ImmUnregisterWordW( HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszUnregister) { - FIXME(imm, "(0x%08x, %s, %ld, %s): stub\n", + FIXME("(0x%08x, %s, %ld, %s): stub\n", hKL, debugstr_w(lpszReading), dwStyle, debugstr_w(lpszUnregister) ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); diff --git a/misc/lstr.c b/misc/lstr.c index 8054ccafe9bffe073271a4d668a0f3626ba37fb3..7fb9f56e188f5d0aceebf8dc41aeb5237e10482e 100644 --- a/misc/lstr.c +++ b/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); diff --git a/misc/lzexpand.c b/misc/lzexpand.c index 5fab3fea8d7cfe884911b9626db687c03f878814..72f1363e34b3e16fb621bb752bb4dc0b993bd836 100644 --- a/misc/lzexpand.c +++ b/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); } diff --git a/misc/main.c b/misc/main.c index 9e83491fa3ba8b24db1bfbaa6de64a2c1c795793..3129ef734113dba4cc98470ea667b343f0a7c916 100644 --- a/misc/main.c +++ b/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; } diff --git a/misc/sound.c b/misc/sound.c index 97d5622f4191df3e7ca5b9b3756735178bb132a5..8ceeca64dfc6bbecdf92f16409fa6c1587ca1431 100644 --- a/misc/sound.c +++ b/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"); } diff --git a/misc/spy.c b/misc/spy.c index f8afbe231cf1b0e4a5c196719a1a6752f8ddb054..230ba2267775a26e488e97c75f263395142495e7 100644 --- a/misc/spy.c +++ b/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 diff --git a/misc/stress.c b/misc/stress.c index 373c6eb05b6ce2b457faaa4ea79e33f31c21c8b6..860c35db2d2718ca445322225324840c94927ede 100644 --- a/misc/stress.c +++ b/misc/stress.c @@ -1,13 +1,13 @@ #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"); } diff --git a/misc/system.c b/misc/system.c index 14f73b91ebbcfeb423c8b466772b9d2422a6b6a3..2cab5cd564e4d8cef01842ee3b1b11b1043d9bf2 100644 --- a/misc/system.c +++ b/misc/system.c @@ -7,7 +7,7 @@ #include "wine/winbase16.h" #include "wine/winuser16.h" #include "services.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(system) @@ -91,10 +91,10 @@ DWORD WINAPI InquireSystem16( WORD code, WORD arg ) return MAKELONG( drivetype, drivetype ); case 2: /* Enable one-drive logic */ - FIXME(system, "Case %d: set single-drive %d not supported\n", code, arg ); + FIXME("Case %d: set single-drive %d not supported\n", code, arg ); return 0; } - WARN(system, "Unknown code %d\n", code ); + WARN("Unknown code %d\n", code ); return 0; } diff --git a/misc/toolhelp.c b/misc/toolhelp.c index 7abf041ad278ca3b235cd78c0ebdd95444ae0b2d..d9a88b81e70bf78910113e04bef354d0a0db299a 100644 --- a/misc/toolhelp.c +++ b/misc/toolhelp.c @@ -17,7 +17,7 @@ #include "toolhelp.h" #include "heap.h" #include "server.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(toolhelp) @@ -42,7 +42,7 @@ BOOL16 WINAPI NotifyRegister16( HTASK16 htask, FARPROC16 lpfnCallback, { int i; - TRACE(toolhelp, "(%x,%lx,%x) called.\n", + TRACE("(%x,%lx,%x) called.\n", htask, (DWORD)lpfnCallback, wFlags ); if (!htask) htask = GetCurrentTask(); for (i=0;i<nrofnotifys;i++) @@ -68,7 +68,7 @@ BOOL16 WINAPI NotifyUnregister16( HTASK16 htask ) { int i; - TRACE(toolhelp, "(%x) called.\n", htask ); + TRACE("(%x) called.\n", htask ); if (!htask) htask = GetCurrentTask(); for (i=nrofnotifys;i--;) if (notifys[i].htask==htask) @@ -118,9 +118,9 @@ HANDLE WINAPI CreateToolhelp32Snapshot( DWORD flags, DWORD process ) { struct create_snapshot_request *req = get_req_buffer(); - TRACE( toolhelp, "%lx,%lx\n", flags, process ); + TRACE("%lx,%lx\n", flags, process ); if (flags & (TH32CS_SNAPHEAPLIST|TH32CS_SNAPMODULE|TH32CS_SNAPTHREAD)) - FIXME( toolhelp, "flags %lx not implemented\n", flags ); + FIXME("flags %lx not implemented\n", flags ); if (!(flags & TH32CS_SNAPPROCESS)) { SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); @@ -147,7 +147,7 @@ static BOOL TOOLHELP_Process32Next( HANDLE handle, LPPROCESSENTRY lppe, BOOL fir if (lppe->dwSize < sizeof (PROCESSENTRY)) { SetLastError( ERROR_INSUFFICIENT_BUFFER ); - ERR (toolhelp, "Result buffer too small\n"); + ERR("Result buffer too small\n"); return FALSE; } req->handle = handle; @@ -193,7 +193,7 @@ BOOL WINAPI Process32Next(HANDLE hSnapshot, LPPROCESSENTRY lppe) */ BOOL WINAPI Module32First(HANDLE hSnapshot, LPMODULEENTRY lpme) { - FIXME(toolhelp,"(%d,%p),stub!\n",hSnapshot,lpme); + FIXME("(%d,%p),stub!\n",hSnapshot,lpme); return FALSE; } @@ -204,7 +204,7 @@ BOOL WINAPI Module32First(HANDLE hSnapshot, LPMODULEENTRY lpme) */ BOOL WINAPI Module32Next(HANDLE hSnapshot, LPMODULEENTRY lpme) { - FIXME(toolhelp,"(%d,%p),stub!\n",hSnapshot,lpme); + FIXME("(%d,%p),stub!\n",hSnapshot,lpme); return FALSE; } @@ -220,6 +220,6 @@ BOOL WINAPI Module32Next(HANDLE hSnapshot, LPMODULEENTRY lpme) */ DWORD WINAPI GlobalMasterHandle16(void) { - FIXME(toolhelp,": stub\n"); + FIXME(": stub\n"); return 0; } diff --git a/misc/tweak.c b/misc/tweak.c index c538ca644f1fbe5bf52884fae223057da90b0b3b..4c30596d4be963ed457cf73a6e58b06e092a43da 100644 --- a/misc/tweak.c +++ b/misc/tweak.c @@ -32,7 +32,7 @@ #include "winuser.h" #include "tweak.h" #include "options.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(tweak) @@ -65,13 +65,13 @@ int TWEAK_Init (void) if (strncmp (szIniString, "TestString", 10)) { if (PROFILE_GetWineIniBool ("Tweak.Layout", "Win95Look", 0)) { TWEAK_WineLook = WIN95_LOOK; - TRACE (tweak, "Using Win95 look and feel.\n"); + TRACE("Using Win95 look and feel.\n"); } else { TWEAK_WineLook = WIN31_LOOK; - TRACE (tweak, "Using Win3.1 look and feel.\n"); + TRACE("Using Win3.1 look and feel.\n"); } - ERR (tweak, + ERR( "Replace \"Win95Look\" by \"WineLook\" in your \"wine.ini\"!\n"); } @@ -80,19 +80,19 @@ int TWEAK_Init (void) if (!strncasecmp (szIniString, "Win31", 5)) { TWEAK_WineLook = WIN31_LOOK; - TRACE (tweak, "Using Win3.1 look and feel.\n"); + TRACE("Using Win3.1 look and feel.\n"); } else if (!strncasecmp (szIniString, "Win95", 5)) { TWEAK_WineLook = WIN95_LOOK; - TRACE (tweak, "Using Win95 look and feel.\n"); + TRACE("Using Win95 look and feel.\n"); } else if (!strncasecmp (szIniString, "Win98", 5)) { TWEAK_WineLook = WIN98_LOOK; - TRACE (tweak, "Using Win98 look and feel.\n"); + TRACE("Using Win98 look and feel.\n"); } else { TWEAK_WineLook = WIN31_LOOK; - TRACE (tweak, "Using Win3.1 look and feel.\n"); + TRACE("Using Win3.1 look and feel.\n"); } return 1; diff --git a/misc/version.c b/misc/version.c index fa6d44851b714396d6142d6ef4291edce61bf297..67411d96fc1694028113fe1e728387fcb968d2f1 100644 --- a/misc/version.c +++ b/misc/version.c @@ -14,7 +14,7 @@ #include "wine/winbase16.h" #include "process.h" #include "options.h" -#include "debug.h" +#include "debugtools.h" #include "neexe.h" #include "winversion.h" @@ -97,10 +97,10 @@ void VERSION_ParseWinVersion( const char *arg ) return; } } - MSG("Invalid winver value '%s' specified.\n", arg ); - MSG("Valid versions are:" ); + MESSAGE("Invalid winver value '%s' specified.\n", arg ); + MESSAGE("Valid versions are:" ); for (i = 0; i < NB_WINDOWS_VERSIONS; i++) - MSG(" '%s'%c", WinVersionNames[i], + MESSAGE(" '%s'%c", WinVersionNames[i], (i == NB_WINDOWS_VERSIONS - 1) ? '\n' : ',' ); } @@ -143,7 +143,7 @@ WINDOWS_VERSION VERSION_GetImageVersion(PDB *pdb) peheader = PE_HEADER(pdb->exe_modref->module); #define OPTHD peheader->OptionalHeader - TRACE(ver, "%02x.%02x/%02x.%02x/%02x.%02x/%02x.%02x\n", + TRACE("%02x.%02x/%02x.%02x/%02x.%02x/%02x.%02x\n", OPTHD.MajorLinkerVersion, OPTHD.MinorLinkerVersion, OPTHD.MajorOperatingSystemVersion, @@ -191,7 +191,7 @@ WINDOWS_VERSION VERSION_GetImageVersion(PDB *pdb) } default: if (OPTHD.MajorSubsystemVersion) - ERR(ver,"unknown subsystem version: %04x.%04x, please report.\n", + ERR("unknown subsystem version: %04x.%04x, please report.\n", OPTHD.MajorSubsystemVersion, OPTHD.MinorSubsystemVersion ); return defaultWinVersion; @@ -285,7 +285,7 @@ char *VERSION_GetVersionName() case NT40: return "Windows NT 4.0"; default: - FIXME(ver,"Windows version %d not named",ver); + FIXME("Windows version %d not named",ver); return "Windows <Unknown>"; } } @@ -318,7 +318,7 @@ BOOL16 WINAPI GetVersionEx16(OSVERSIONINFO16 *v) WINDOWS_VERSION ver = VERSION_GetVersion(); if (v->dwOSVersionInfoSize != sizeof(OSVERSIONINFO16)) { - WARN(ver,"wrong OSVERSIONINFO size from app"); + WARN("wrong OSVERSIONINFO size from app"); return FALSE; } v->dwMajorVersion = VersionData[ver].getVersionEx.dwMajorVersion; @@ -338,7 +338,7 @@ BOOL WINAPI GetVersionExA(OSVERSIONINFOA *v) WINDOWS_VERSION ver = VERSION_GetVersion(); if (v->dwOSVersionInfoSize != sizeof(OSVERSIONINFOA)) { - WARN(ver,"wrong OSVERSIONINFO size from app"); + WARN("wrong OSVERSIONINFO size from app"); return FALSE; } v->dwMajorVersion = VersionData[ver].getVersionEx.dwMajorVersion; @@ -359,7 +359,7 @@ BOOL WINAPI GetVersionExW(OSVERSIONINFOW *v) if (v->dwOSVersionInfoSize!=sizeof(OSVERSIONINFOW)) { - WARN(ver,"wrong OSVERSIONINFO size from app"); + WARN("wrong OSVERSIONINFO size from app"); return FALSE; } v->dwMajorVersion = VersionData[ver].getVersionEx.dwMajorVersion; @@ -398,7 +398,7 @@ DWORD WINAPI GetWinFlags16(void) break; default: - ERR(ver, "Unknown mode set? This shouldn't happen. Check GetWinFlags()!\n"); + ERR("Unknown mode set? This shouldn't happen. Check GetWinFlags()!\n"); break; } if (si.wProcessorLevel >= 4) result |= WF_HASCPUID; @@ -415,7 +415,7 @@ DWORD WINAPI GetWinFlags16(void) */ BOOL16 WINAPI GetWinDebugInfo16(WINDEBUGINFO *lpwdi, UINT16 flags) { - FIXME(ver, "(%8lx,%d): stub returning 0\n", + FIXME("(%8lx,%d): stub returning 0\n", (unsigned long)lpwdi, flags); /* 0 means not in debugging mode/version */ /* Can this type of debugging be used in wine ? */ @@ -429,7 +429,7 @@ BOOL16 WINAPI GetWinDebugInfo16(WINDEBUGINFO *lpwdi, UINT16 flags) */ BOOL16 WINAPI SetWinDebugInfo16(WINDEBUGINFO *lpwdi) { - FIXME(ver, "(%8lx): stub returning 0\n", (unsigned long)lpwdi); + FIXME("(%8lx): stub returning 0\n", (unsigned long)lpwdi); /* 0 means not in debugging mode/version */ /* Can this type of debugging be used in wine ? */ /* Constants: WDI_OPTIONS WDI_FILTER WDI_ALLOCBREAK */ @@ -477,7 +477,7 @@ UINT WINAPI OaBuildVersion() { WINDOWS_VERSION ver = VERSION_GetVersion(); - FIXME(ver, "Please report to a.mohr@mailto.de if you get version error messages !\n"); + FIXME("Please report to a.mohr@mailto.de if you get version error messages !\n"); switch(VersionData[ver].getVersion32) { case 0x80000a03: /* Win 3.1 */ @@ -485,7 +485,7 @@ UINT WINAPI OaBuildVersion() case 0xc0000004: /* Win 95 */ return 0x1e10a9; /* some older version: 0x0a0bd3 */ case 0x04213303: /* NT 3.51 */ - FIXME(ver, "NT 3.51 version value unknown !\n"); + FIXME("NT 3.51 version value unknown !\n"); return 0x1e10a9; /* value borrowed from Win95 */ case 0x05650004: /* NT 4.0 */ return 0x141016; diff --git a/misc/win32s16.c b/misc/win32s16.c index afe644dfceb2dc262872cf6a2751617f963a9399..506bdaa263ef373dbfe68f9aa932dd0156e27545 100644 --- a/misc/win32s16.c +++ b/misc/win32s16.c @@ -8,13 +8,13 @@ #include <string.h> #include <stdlib.h> #include "windef.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(dll) void WINAPI BootTask16() { - MSG("BootTask(): should only be used by WIN32S.EXE.\n"); + MESSAGE("BootTask(): should only be used by WIN32S.EXE.\n"); } /*********************************************************************** @@ -24,6 +24,6 @@ void WINAPI BootTask16() */ SEGPTR WINAPI StackLinearToSegmented16(WORD w1, WORD w2) { - FIXME(dll,"(%d,%d):stub.\n",w1,w2); + FIXME("(%d,%d):stub.\n",w1,w2); return (SEGPTR)NULL; } diff --git a/misc/windebug.c b/misc/windebug.c index e1509fa79810a9c30e49f935d881a21b42944ffd..cec98976253f52156e088aeacc5e955e7a525dc4 100644 --- a/misc/windebug.c +++ b/misc/windebug.c @@ -8,7 +8,7 @@ #include <stdlib.h> #include "windef.h" #include "module.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(dll) @@ -18,7 +18,7 @@ DEFAULT_DEBUG_CHANNEL(dll) */ void WINAPI WinNotify16(CONTEXT86 *context) { - FIXME(dll, "(AX=%04x):stub.\n", AX_reg(context)); + FIXME("(AX=%04x):stub.\n", AX_reg(context)); switch (AX_reg(context)) { case 0x000D: diff --git a/misc/winsock.c b/misc/winsock.c index 6aff24ab9da413bea0d4902b42e1c00c467faa63..ebffea24c871282831e9cc3cde49168acd1b5411 100644 --- a/misc/winsock.c +++ b/misc/winsock.c @@ -58,13 +58,13 @@ #include "task.h" #include "message.h" #include "miscemu.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(winsock) #define DEBUG_SOCKADDR 0 #define dump_sockaddr(a) \ - DUMP("sockaddr_in: family %d, address %s, port %d\n", \ + DPRINTF("sockaddr_in: family %d, address %s, port %d\n", \ ((struct sockaddr_in *)a)->sin_family, \ inet_ntoa(((struct sockaddr_in *)a)->sin_addr), \ ntohs(((struct sockaddr_in *)a)->sin_port)) @@ -149,14 +149,14 @@ static void convert_sockopt(INT *level, INT *optname) for(i=0; _ws_sock_ops[i]; i++) if( _ws_sock_ops[i] == *optname ) break; if( _ws_sock_ops[i] ) *optname = _px_sock_ops[i]; - else FIXME(winsock, "Unknown SOL_SOCKET optname %d\n", *optname); + else FIXME("Unknown SOL_SOCKET optname %d\n", *optname); break; case WS_IPPROTO_TCP: *level = IPPROTO_TCP; for(i=0; _ws_tcp_ops[i]; i++) if ( _ws_tcp_ops[i] == *optname ) break; if( _ws_tcp_ops[i] ) *optname = _px_tcp_ops[i]; - else FIXME(winsock, "Unknown IPPROTO_TCP optname %d\n", *optname); + else FIXME("Unknown IPPROTO_TCP optname %d\n", *optname); break; } } @@ -174,7 +174,7 @@ static LPWSINFO wsi_find(HTASK16 hTask) LPWSINFO pwsi = _wsi_list; while( pwsi && pwsi->tid != hTask ) pwsi = pwsi->next; if( pwsi ) - WARN(winsock,"(pwsi=0x%08x,task=0x%04x):Loose wsi struct! \n", + WARN("(pwsi=0x%08x,task=0x%04x):Loose wsi struct! \n", (unsigned)pwsi, hTask ); return pwsi; } @@ -252,7 +252,7 @@ inline static int sock_error_p(int s) optlen = sizeof(optval); getsockopt(s, SOL_SOCKET, SO_ERROR, (void *) &optval, &optlen); - if (optval) WARN(winsock, "\t[%i] error: %d\n", s, optval); + if (optval) WARN("\t[%i] error: %d\n", s, optval); return optval != 0; } @@ -295,7 +295,7 @@ static int fd_set_export( LPWSINFO pwsi, fd_set* fds, fd_set* exceptfds, void* w if( b32 ) wsfds32->fd_count = j; else wsfds16->fd_count = j; - TRACE(winsock, "\n"); + TRACE("\n"); #undef wsfds32 #undef wsfds16 } @@ -440,7 +440,7 @@ static void WINSOCK_WakeUp(void) } if (write (__wakeup_pipe[1], "A", 1) != 1) - ERR(winsock, "unable to write in wakeup_pipe\n"); + ERR("unable to write in wakeup_pipe\n"); } /*********************************************************************** @@ -502,7 +502,7 @@ INT16 WINAPI WSAStartup16(UINT16 wVersionRequested, LPWSADATA lpWSAData) HTASK16 tid = GetCurrentTask(); LPWSINFO pwsi; - TRACE(winsock, "verReq=%x\n", wVersionRequested); + TRACE("verReq=%x\n", wVersionRequested); if (LOBYTE(wVersionRequested) < 1 || (LOBYTE(wVersionRequested) == 1 && HIBYTE(wVersionRequested) < 1)) return WSAVERNOTSUPPORTED; @@ -516,7 +516,7 @@ INT16 WINAPI WSAStartup16(UINT16 wVersionRequested, LPWSADATA lpWSAData) _WSHeap = HeapCreate(HEAP_ZERO_MEMORY, 8120, 32768); if( !(_ws_stub = WS_ALLOC(0x10)) ) { - ERR(winsock,"Fatal: failed to create WinSock heap\n"); + ERR("Fatal: failed to create WinSock heap\n"); return 0; } } @@ -557,7 +557,7 @@ INT16 WINAPI WSAStartup16(UINT16 wVersionRequested, LPWSADATA lpWSAData) memcpy(lpWSAData, &WINSOCK_data, sizeof(WINSOCK_data)); - TRACE(winsock, "succeeded\n"); + TRACE("succeeded\n"); return 0; } @@ -599,7 +599,7 @@ INT WINSOCK_DeleteTaskWSI( TDB* pTask, LPWSINFO pwsi ) WINSOCK_Shutdown(); /* just in case */ if( pwsi->flags & WSI_BLOCKINGCALL ) - TRACE(winsock,"\tinside blocking call!\n"); + TRACE("\tinside blocking call!\n"); /* FIXME: aop_control() doesn't decrement pwsi->num_async_rq * @@ -618,7 +618,7 @@ INT WINSOCK_DeleteTaskWSI( TDB* pTask, LPWSINFO pwsi ) close(pwsi->sock[i].fd); j++; } if( j ) - TRACE(winsock,"\tclosed %i sockets, killed %i async selects!\n", j, n); + TRACE("\tclosed %i sockets, killed %i async selects!\n", j, n); /* delete scratch buffers */ @@ -636,7 +636,7 @@ INT WINAPI WSACleanup(void) { HTASK16 hTask = GetCurrentTask(); - TRACE(winsock, "(%04x)\n", hTask ); + TRACE("(%04x)\n", hTask ); if( hTask ) { LPWSINFO pwsi = wsi_find(hTask); @@ -734,7 +734,7 @@ SOCKET WINAPI WINSOCK_accept(SOCKET s, struct sockaddr *addr, struct ws_sockaddr_ipx* addr2 = (struct ws_sockaddr_ipx *)addr; #endif - TRACE(winsock, "(%08x): socket %04x\n", + TRACE("(%08x): socket %04x\n", (unsigned)pwsi, (UINT16)s ); if( _check_ws(pwsi, pws) ) { @@ -814,7 +814,7 @@ INT WINAPI WINSOCK_bind(SOCKET s, struct sockaddr *name, INT namelen) struct ws_sockaddr_ipx* name2 = (struct ws_sockaddr_ipx *)name; #endif - TRACE(winsock, "(%08x): socket %04x, ptr %8x, length %d\n", + TRACE("(%08x): socket %04x, ptr %8x, length %d\n", (unsigned)pwsi, s, (int) name, namelen); #if DEBUG_SOCKADDR dump_sockaddr(name); @@ -850,7 +850,7 @@ INT WINAPI WINSOCK_bind(SOCKET s, struct sockaddr *name, INT namelen) if ( bind(pws->fd, name, namelen) < 0 ) { int loc_errno = errno; - WARN(winsock, "\tfailure - errno = %i\n", errno); + WARN("\tfailure - errno = %i\n", errno); errno = loc_errno; switch(errno) { @@ -892,7 +892,7 @@ INT WINAPI WINSOCK_closesocket(SOCKET s) ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s); LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): socket %08x\n", (unsigned)pwsi, s); + TRACE("(%08x): socket %08x\n", (unsigned)pwsi, s); if( _check_ws(pwsi, pws) ) { @@ -930,7 +930,7 @@ INT WINAPI WINSOCK_connect(SOCKET s, struct sockaddr *name, INT namelen) struct ws_sockaddr_ipx* name2 = (struct ws_sockaddr_ipx *)name; #endif - TRACE(winsock, "(%08x): socket %04x, ptr %8x, length %d\n", + TRACE("(%08x): socket %04x, ptr %8x, length %d\n", (unsigned)pwsi, s, (int) name, namelen); #if DEBUG_SOCKADDR dump_sockaddr(name); @@ -1014,7 +1014,7 @@ INT WINAPI WINSOCK_getpeername(SOCKET s, struct sockaddr *name, struct ws_sockaddr_ipx* name2 = (struct ws_sockaddr_ipx *)name; #endif - TRACE(winsock, "(%08x): socket: %04x, ptr %8x, ptr %8x\n", + TRACE("(%08x): socket: %04x, ptr %8x, ptr %8x\n", (unsigned)pwsi, s, (int) name, *namelen); if( _check_ws(pwsi, pws) ) { @@ -1080,7 +1080,7 @@ INT WINAPI WINSOCK_getsockname(SOCKET s, struct sockaddr *name, struct ws_sockaddr_ipx* name2 = (struct ws_sockaddr_ipx *)name; #endif - TRACE(winsock, "(%08x): socket: %04x, ptr %8x, ptr %8x\n", + TRACE("(%08x): socket: %04x, ptr %8x, ptr %8x\n", (unsigned)pwsi, s, (int) name, (int) *namelen); if( _check_ws(pwsi, pws) ) { @@ -1150,7 +1150,7 @@ INT WINAPI WINSOCK_getsockopt(SOCKET s, INT level, ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s); LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): socket: %04x, opt %d, ptr %8x, ptr %8x\n", + TRACE("(%08x): socket: %04x, opt %d, ptr %8x, ptr %8x\n", (unsigned)pwsi, s, level, (int) optval, (int) *optlen); if( _check_ws(pwsi, pws) ) { @@ -1243,7 +1243,7 @@ INT WINAPI WINSOCK_ioctlsocket(SOCKET s, UINT cmd, UINT *argp) ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s); LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): socket %04x, cmd %08x, ptr %8x\n", + TRACE("(%08x): socket %04x, cmd %08x, ptr %8x\n", (unsigned)pwsi, s, cmd, (unsigned) argp); if( _check_ws(pwsi, pws) ) { @@ -1270,13 +1270,13 @@ INT WINAPI WINSOCK_ioctlsocket(SOCKET s, UINT cmd, UINT *argp) break; case WS_IOW('f',125,u_long): - WARN(winsock,"Warning: WS1.1 shouldn't be using async I/O\n"); + WARN("Warning: WS1.1 shouldn't be using async I/O\n"); SetLastError(WSAEINVAL); return SOCKET_ERROR; default: /* Netscape tries hard to use bogus ioctl 0x667e */ - WARN(winsock, "\tunknown WS_IOCTL cmd (%08x)\n", cmd); + WARN("\tunknown WS_IOCTL cmd (%08x)\n", cmd); } if( ioctl(pws->fd, newcmd, (char*)argp ) == 0 ) return 0; SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); @@ -1301,7 +1301,7 @@ INT WINAPI WINSOCK_listen(SOCKET s, INT backlog) ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s); LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): socket %04x, backlog %d\n", + TRACE("(%08x): socket %04x, backlog %d\n", (unsigned)pwsi, s, backlog); if( _check_ws(pwsi, pws) ) { @@ -1339,7 +1339,7 @@ INT WINAPI WINSOCK_recv(SOCKET s, char *buf, INT len, INT flags) ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s); LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): socket %04x, buf %8x, len %d, " + TRACE("(%08x): socket %04x, buf %8x, len %d, " "flags %d\n", (unsigned)pwsi, s, (unsigned)buf, len, flags); if( _check_ws(pwsi, pws) ) @@ -1347,7 +1347,7 @@ INT WINAPI WINSOCK_recv(SOCKET s, char *buf, INT len, INT flags) INT length; if ((length = recv(pws->fd, buf, len, flags)) >= 0) { - TRACE(winsock, " -> %i bytes\n", length); + TRACE(" -> %i bytes\n", length); if( pws->psop && (pws->flags & (WS_FD_READ | WS_FD_CLOSE)) ) EVENT_AddIO( pws->fd, EVENT_IO_READ ); /* reenabler */ @@ -1357,7 +1357,7 @@ INT WINAPI WINSOCK_recv(SOCKET s, char *buf, INT len, INT flags) SetLastError(wsaErrno()); } else SetLastError(WSAENOTSOCK); - WARN(winsock, " -> ERROR\n"); + WARN(" -> ERROR\n"); return SOCKET_ERROR; } @@ -1382,12 +1382,12 @@ INT WINAPI WINSOCK_recvfrom(SOCKET s, char *buf, INT len, INT flags, struct ws_sockaddr_ipx* from2 = (struct ws_sockaddr_ipx *)from; #endif - TRACE(winsock, "(%08x): socket %04x, ptr %08x, " + TRACE("(%08x): socket %04x, ptr %08x, " "len %d, flags %d\n", (unsigned)pwsi, s, (unsigned)buf, len, flags); #if DEBUG_SOCKADDR if( from ) dump_sockaddr(from); - else DUMP("from = NULL\n"); + else DPRINTF("from = NULL\n"); #endif if( _check_ws(pwsi, pws) ) @@ -1396,7 +1396,7 @@ INT WINAPI WINSOCK_recvfrom(SOCKET s, char *buf, INT len, INT flags, if ((length = recvfrom(pws->fd, buf, len, flags, from, fromlen32)) >= 0) { - TRACE(winsock, " -> %i bytes\n", length); + TRACE(" -> %i bytes\n", length); if( pws->psop && (pws->flags & (WS_FD_READ | WS_FD_CLOSE)) ) EVENT_AddIO( pws->fd, EVENT_IO_READ ); /* reenabler */ @@ -1419,7 +1419,7 @@ INT WINAPI WINSOCK_recvfrom(SOCKET s, char *buf, INT len, INT flags, SetLastError(wsaErrno()); } else SetLastError(WSAENOTSOCK); - WARN(winsock, " -> ERROR\n"); + WARN(" -> ERROR\n"); #ifdef HAVE_IPX if (from && ((struct sockaddr_ipx *)from)->sipx_family == AF_IPX) { from = (struct sockaddr *) @@ -1460,7 +1460,7 @@ static INT __ws_select( BOOL b32, void *ws_readfds, void *ws_writefds, void *ws_ { LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): read %8x, write %8x, excp %8x\n", + TRACE("(%08x): read %8x, write %8x, excp %8x\n", (unsigned) pwsi, (unsigned) ws_readfds, (unsigned) ws_writefds, (unsigned) ws_exceptfds); if( pwsi ) @@ -1539,7 +1539,7 @@ INT WINAPI WINSOCK_send(SOCKET s, char *buf, INT len, INT flags) ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s); LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): socket %04x, ptr %08x, length %d, flags %d\n", + TRACE("(%08x): socket %04x, ptr %08x, length %d, flags %d\n", (unsigned)pwsi, s, (unsigned) buf, len, flags); if( _check_ws(pwsi, pws) ) { @@ -1578,7 +1578,7 @@ INT WINAPI WINSOCK_sendto(SOCKET s, char *buf, INT len, INT flags, struct ws_sockaddr_ipx* to2 = (struct ws_sockaddr_ipx *)to; #endif - TRACE(winsock, "(%08x): socket %04x, ptr %08x, length %d, flags %d\n", + TRACE("(%08x): socket %04x, ptr %08x, length %d, flags %d\n", (unsigned)pwsi, s, (unsigned) buf, len, flags); if( _check_ws(pwsi, pws) ) { @@ -1643,7 +1643,7 @@ INT WINAPI WINSOCK_setsockopt(SOCKET16 s, INT level, INT optname, ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s); LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): socket %04x, lev %d, opt %d, ptr %08x, len %d\n", + TRACE("(%08x): socket %04x, lev %d, opt %d, ptr %08x, len %d\n", (unsigned)pwsi, s, level, optname, (int) optval, optlen); if( _check_ws(pwsi, pws) ) { @@ -1685,7 +1685,7 @@ INT WINAPI WINSOCK_shutdown(SOCKET s, INT how) ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s); LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): socket %04x, how %i\n", + TRACE("(%08x): socket %04x, how %i\n", (unsigned)pwsi, s, how ); if( _check_ws(pwsi, pws) ) { @@ -1750,7 +1750,7 @@ SOCKET WINAPI WINSOCK_socket(INT af, INT type, INT protocol) { LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): af=%d type=%d protocol=%d\n", + TRACE("(%08x): af=%d type=%d protocol=%d\n", (unsigned)pwsi, af, type, protocol); if( pwsi ) @@ -1797,7 +1797,7 @@ SOCKET WINAPI WINSOCK_socket(INT af, INT type, INT protocol) { ws_socket* pnew = wsi_alloc_socket(pwsi, sock); - TRACE(winsock,"\tcreated %i (handle %04x)\n", sock, (UINT16)WS_PTR2HANDLE(pnew)); + TRACE("\tcreated %i (handle %04x)\n", sock, (UINT16)WS_PTR2HANDLE(pnew)); if( pnew ) { @@ -1813,14 +1813,14 @@ SOCKET WINAPI WINSOCK_socket(INT af, INT type, INT protocol) if (errno == EPERM) /* raw socket denied */ { if (type == SOCK_RAW) - MSG("WARNING: Trying to create a socket of type SOCK_RAW, will fail unless running as root\n"); + MESSAGE("WARNING: Trying to create a socket of type SOCK_RAW, will fail unless running as root\n"); else - MSG("WS_SOCKET: not enough privileges to create socket, try running as root\n"); + MESSAGE("WS_SOCKET: not enough privileges to create socket, try running as root\n"); SetLastError(WSAESOCKTNOSUPPORT); } else SetLastError(wsaErrno()); } - WARN(winsock, "\t\tfailed!\n"); + WARN("\t\tfailed!\n"); return INVALID_SOCKET; } @@ -1867,7 +1867,7 @@ static struct WIN_hostent* __ws_gethostbyaddr(const char *addr, int len, int typ SEGPTR WINAPI WINSOCK_gethostbyaddr16(const char *addr, INT16 len, INT16 type) { struct WIN_hostent* retval; - TRACE(winsock, "ptr %08x, len %d, type %d\n", + TRACE("ptr %08x, len %d, type %d\n", (unsigned) addr, len, type); retval = __ws_gethostbyaddr( addr, len, type, WS_DUP_SEGPTR ); return retval ? SEGPTR_GET(retval) : ((SEGPTR)NULL); @@ -1876,7 +1876,7 @@ SEGPTR WINAPI WINSOCK_gethostbyaddr16(const char *addr, INT16 len, INT16 type) struct WIN_hostent* WINAPI WINSOCK_gethostbyaddr(const char *addr, INT len, INT type) { - TRACE(winsock, "ptr %08x, len %d, type %d\n", + TRACE("ptr %08x, len %d, type %d\n", (unsigned) addr, len, type); return __ws_gethostbyaddr(addr, len, type, WS_DUP_LINEAR); } @@ -1903,14 +1903,14 @@ static struct WIN_hostent * __ws_gethostbyname(const char *name, int dup_flag) SEGPTR WINAPI WINSOCK_gethostbyname16(const char *name) { struct WIN_hostent* retval; - TRACE(winsock, "%s\n", (name)?name:NULL_STRING); + TRACE("%s\n", (name)?name:NULL_STRING); retval = __ws_gethostbyname( name, WS_DUP_SEGPTR ); return (retval)? SEGPTR_GET(retval) : ((SEGPTR)NULL) ; } struct WIN_hostent* WINAPI WINSOCK_gethostbyname(const char* name) { - TRACE(winsock, "%s\n", (name)?name:NULL_STRING); + TRACE("%s\n", (name)?name:NULL_STRING); return __ws_gethostbyname( name, WS_DUP_LINEAR ); } @@ -1937,14 +1937,14 @@ static struct WIN_protoent* __ws_getprotobyname(const char *name, int dup_flag) SEGPTR WINAPI WINSOCK_getprotobyname16(const char *name) { struct WIN_protoent* retval; - TRACE(winsock, "%s\n", (name)?name:NULL_STRING); + TRACE("%s\n", (name)?name:NULL_STRING); retval = __ws_getprotobyname(name, WS_DUP_SEGPTR); return retval ? SEGPTR_GET(retval) : ((SEGPTR)NULL); } struct WIN_protoent* WINAPI WINSOCK_getprotobyname(const char* name) { - TRACE(winsock, "%s\n", (name)?name:NULL_STRING); + TRACE("%s\n", (name)?name:NULL_STRING); return __ws_getprotobyname(name, WS_DUP_LINEAR); } @@ -1971,14 +1971,14 @@ static struct WIN_protoent* __ws_getprotobynumber(int number, int dup_flag) SEGPTR WINAPI WINSOCK_getprotobynumber16(INT16 number) { struct WIN_protoent* retval; - TRACE(winsock, "%i\n", number); + TRACE("%i\n", number); retval = __ws_getprotobynumber(number, WS_DUP_SEGPTR); return retval ? SEGPTR_GET(retval) : ((SEGPTR)NULL); } struct WIN_protoent* WINAPI WINSOCK_getprotobynumber(INT number) { - TRACE(winsock, "%i\n", number); + TRACE("%i\n", number); return __ws_getprotobynumber(number, WS_DUP_LINEAR); } @@ -2009,7 +2009,7 @@ struct WIN_servent* __ws_getservbyname(const char *name, const char *proto, int SEGPTR WINAPI WINSOCK_getservbyname16(const char *name, const char *proto) { struct WIN_servent* retval; - TRACE(winsock, "'%s', '%s'\n", + TRACE("'%s', '%s'\n", (name)?name:NULL_STRING, (proto)?proto:NULL_STRING); retval = __ws_getservbyname(name, proto, WS_DUP_SEGPTR); return retval ? SEGPTR_GET(retval) : ((SEGPTR)NULL); @@ -2017,7 +2017,7 @@ SEGPTR WINAPI WINSOCK_getservbyname16(const char *name, const char *proto) struct WIN_servent* WINAPI WINSOCK_getservbyname(const char *name, const char *proto) { - TRACE(winsock, "'%s', '%s'\n", + TRACE("'%s', '%s'\n", (name)?name:NULL_STRING, (proto)?proto:NULL_STRING); return __ws_getservbyname(name, proto, WS_DUP_LINEAR); } @@ -2049,7 +2049,7 @@ static struct WIN_servent* __ws_getservbyport(int port, const char* proto, int d SEGPTR WINAPI WINSOCK_getservbyport16(INT16 port, const char *proto) { struct WIN_servent* retval; - TRACE(winsock, "%i, '%s'\n", + TRACE("%i, '%s'\n", (int)port, (proto)?proto:NULL_STRING); retval = __ws_getservbyport(port, proto, WS_DUP_SEGPTR); return retval ? SEGPTR_GET(retval) : ((SEGPTR)NULL); @@ -2057,7 +2057,7 @@ SEGPTR WINAPI WINSOCK_getservbyport16(INT16 port, const char *proto) struct WIN_servent* WINAPI WINSOCK_getservbyport(INT port, const char *proto) { - TRACE(winsock, "%i, '%s'\n", + TRACE("%i, '%s'\n", (int)port, (proto)?proto:NULL_STRING); return __ws_getservbyport(port, proto, WS_DUP_LINEAR); } @@ -2070,7 +2070,7 @@ INT WINAPI WINSOCK_gethostname(char *name, INT namelen) { LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): name %s, len %d\n", + TRACE("(%08x): name %s, len %d\n", (unsigned)pwsi, (name)?name:NULL_STRING, namelen); if( pwsi ) { @@ -2110,7 +2110,7 @@ BOOL WINSOCK_HandleIO( int* max_fd, int num_pending, DWORD dwEvent, dwErrBytes; int num_posted; - TRACE(winsock,"%i pending descriptors\n", num_pending ); + TRACE("%i pending descriptors\n", num_pending ); for( num_posted = dwEvent = 0 ; psop; psop = psop->next ) { @@ -2128,7 +2128,7 @@ BOOL WINSOCK_HandleIO( int* max_fd, int num_pending, * Reenabling calls turn them back on. */ - TRACE(winsock,"\tchecking psop = 0x%08x\n", (unsigned) psop ); + TRACE("\tchecking psop = 0x%08x\n", (unsigned) psop ); num_pending--; @@ -2204,7 +2204,7 @@ BOOL WINSOCK_HandleIO( int* max_fd, int num_pending, if( PostMessageA( psop->hWnd, psop->uMsg, (WPARAM)WS_PTR2HANDLE(psop->pws), (LPARAM)WSAMAKESELECTREPLY( WS_FD_WRITE, 0 ) ) ) { - TRACE(winsock, "\t hwnd %04x - %04x, %08x\n", + TRACE("\t hwnd %04x - %04x, %08x\n", psop->hWnd, psop->uMsg, (unsigned)MAKELONG(WS_FD_WRITE, 0) ); FD_CLR( fd, &event_set[EVENT_IO_WRITE] ); num_posted++; @@ -2266,7 +2266,7 @@ BOOL WINSOCK_HandleIO( int* max_fd, int num_pending, if( bPost ) { - TRACE(winsock, "\t hwnd %04x - %04x, %08x\n", + TRACE("\t hwnd %04x - %04x, %08x\n", psop->hWnd, psop->uMsg, (unsigned)dwEvent ); PostMessageA( psop->hWnd, psop->uMsg, (WPARAM)WS_PTR2HANDLE(psop->pws), (LPARAM)dwEvent ); @@ -2277,7 +2277,7 @@ BOOL WINSOCK_HandleIO( int* max_fd, int num_pending, if( num_pending <= 0 ) break; } - TRACE(winsock, "\tdone, %i posted events\n", num_posted ); + TRACE("\tdone, %i posted events\n", num_posted ); return ( num_posted ) ? TRUE : FALSE; } @@ -2286,7 +2286,7 @@ INT WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, UINT lEvent) ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s); LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): %04x, hWnd %04x, uMsg %08x, event %08x\n", + TRACE("(%08x): %04x, hWnd %04x, uMsg %08x, event %08x\n", (unsigned)pwsi, (SOCKET16)s, (HWND16)hWnd, uMsg, (unsigned)lEvent ); if( _check_ws(pwsi, pws) ) { @@ -2307,7 +2307,7 @@ INT WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, UINT lEvent) if( pws->flags & (WS_FD_CONNECT | WS_FD_WRITE) ) EVENT_DeleteIO( pws->fd, EVENT_IO_WRITE ); - TRACE(winsock,"\tremoving psop = 0x%08x\n", (unsigned) psop ); + TRACE("\tremoving psop = 0x%08x\n", (unsigned) psop ); WS_FREE( pws->psop ); pws->flags &= ~(WS_FD_RAW | WS_FD_ACCEPT | WS_FD_CONNECT | @@ -2346,7 +2346,7 @@ INT WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, UINT lEvent) /* TODO: handle WS_FD_ACCEPT right away if the socket is readable */ - TRACE(winsock,"\tcreating psop = 0x%08x\n", (unsigned)psop ); + TRACE("\tcreating psop = 0x%08x\n", (unsigned)psop ); return 0; /* success */ } @@ -2371,7 +2371,7 @@ INT16 WINAPI __WSAFDIsSet16(SOCKET16 s, ws_fd_set16 *set) { int i = set->fd_count; - TRACE(winsock, "(%d,%8lx(%i))\n", s,(unsigned long)set, i); + TRACE("(%d,%8lx(%i))\n", s,(unsigned long)set, i); while (i--) if (set->fd_array[i] == s) return 1; @@ -2385,7 +2385,7 @@ INT WINAPI __WSAFDIsSet(SOCKET s, ws_fd_set32 *set) { int i = set->fd_count; - TRACE(winsock, "(%d,%8lx(%i))\n", s,(unsigned long)set, i); + TRACE("(%d,%8lx(%i))\n", s,(unsigned long)set, i); while (i--) if (set->fd_array[i] == s) return 1; @@ -2405,7 +2405,7 @@ BOOL WINAPI WSAIsBlocking(void) * Note: It is allowed to call this function without prior WSAStartup(). */ - TRACE(winsock, "\n"); + TRACE("\n"); return FALSE; } @@ -2416,7 +2416,7 @@ INT WINAPI WSACancelBlockingCall(void) { LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x)\n", (unsigned)pwsi); + TRACE("(%08x)\n", (unsigned)pwsi); if( pwsi ) return 0; return SOCKET_ERROR; @@ -2431,7 +2431,7 @@ FARPROC16 WINAPI WSASetBlockingHook16(FARPROC16 lpBlockFunc) FARPROC16 prev; LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): hook %08x\n", + TRACE("(%08x): hook %08x\n", (unsigned)pwsi, (unsigned) lpBlockFunc); if( pwsi ) { @@ -2452,7 +2452,7 @@ FARPROC WINAPI WSASetBlockingHook(FARPROC lpBlockFunc) FARPROC prev; LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): hook %08x\n", + TRACE("(%08x): hook %08x\n", (unsigned)pwsi, (unsigned) lpBlockFunc); if( pwsi ) { prev = (FARPROC)pwsi->blocking_hook; @@ -2471,7 +2471,7 @@ INT16 WINAPI WSAUnhookBlockingHook16(void) { LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x)\n", (unsigned)pwsi); + TRACE("(%08x)\n", (unsigned)pwsi); if( pwsi ) return (INT16)(pwsi->blocking_hook = 0); return SOCKET_ERROR; } @@ -2484,7 +2484,7 @@ INT WINAPI WSAUnhookBlockingHook(void) { LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x)\n", (unsigned)pwsi); + TRACE("(%08x)\n", (unsigned)pwsi); if( pwsi ) { pwsi->blocking_hook = 0; @@ -2534,11 +2534,11 @@ DWORD WINAPI WsControl(DWORD protocoll,DWORD action, char type= *(unsigned char*)(inbuf+15); /* 0x2: don't fragment*/ #endif - FIXME(winsock,"(ICMP_ECHO) to 0x%08x stub \n", addr); + FIXME("(ICMP_ECHO) to 0x%08x stub \n", addr); break; } default: - FIXME(winsock,"(%lx,%lx,%p,%p,%p,%p) stub\n", + FIXME("(%lx,%lx,%p,%p,%p,%p) stub\n", protocoll,action,inbuf,inbuflen,outbuf,outbuflen); } return FALSE; @@ -2548,7 +2548,7 @@ DWORD WINAPI WsControl(DWORD protocoll,DWORD action, */ void WINAPI WS_s_perror(LPCSTR message) { - FIXME(winsock,"(%s): stub\n",message); + FIXME("(%s): stub\n",message); return; } @@ -2731,9 +2731,9 @@ UINT16 wsaErrno(void) { int loc_errno = errno; #ifdef HAVE_STRERROR - WARN(winsock, "errno %d, (%s).\n", loc_errno, strerror(loc_errno)); + WARN("errno %d, (%s).\n", loc_errno, strerror(loc_errno)); #else - WARN(winsock, "errno %d\n", loc_errno); + WARN("errno %d\n", loc_errno); #endif switch(loc_errno) @@ -2796,7 +2796,7 @@ UINT16 wsaErrno(void) /* just in case we ever get here and there are no problems */ case 0: return 0; default: - WARN(winsock, "Unknown errno %d!\n", loc_errno); + WARN("Unknown errno %d!\n", loc_errno); return WSAEOPNOTSUPP; } } @@ -2805,7 +2805,7 @@ UINT16 wsaHerrno(void) { int loc_errno = h_errno; - WARN(winsock, "h_errno %d.\n", loc_errno); + WARN("h_errno %d.\n", loc_errno); switch(loc_errno) { @@ -2816,7 +2816,7 @@ UINT16 wsaHerrno(void) case 0: return 0; default: - WARN(winsock,"Unknown h_errno %d!\n", loc_errno); + WARN("Unknown h_errno %d!\n", loc_errno); return WSAEOPNOTSUPP; } } diff --git a/misc/winsock_async.c b/misc/winsock_async.c index 833c6c61bfb2058cf25b92cad99238441ac07959..f18e21bb4e6db707a286d7961216f06b606ab12c 100644 --- a/misc/winsock_async.c +++ b/misc/winsock_async.c @@ -67,7 +67,7 @@ #include "task.h" #include "message.h" #include "miscemu.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(winsock) @@ -372,7 +372,7 @@ static HANDLE16 __WSAsyncDBQuery( HANDLE16 WINAPI WSAAsyncGetHostByAddr16(HWND16 hWnd, UINT16 uMsg, LPCSTR addr, INT16 len, INT16 type, SEGPTR sbuf, INT16 buflen) { - TRACE(winsock, "hwnd %04x, msg %04x, addr %08x[%i]\n", + TRACE("hwnd %04x, msg %04x, addr %08x[%i]\n", hWnd, uMsg, (unsigned)addr , len ); return __WSAsyncDBQuery(hWnd,uMsg,len,addr,type,NULL,(void*)sbuf,buflen,AQ_NUMBER|AQ_WIN16|AQ_GETHOST); } @@ -383,7 +383,7 @@ HANDLE16 WINAPI WSAAsyncGetHostByAddr16(HWND16 hWnd, UINT16 uMsg, LPCSTR addr, HANDLE WINAPI WSAAsyncGetHostByAddr(HWND hWnd, UINT uMsg, LPCSTR addr, INT len, INT type, LPSTR sbuf, INT buflen) { - TRACE(winsock, "hwnd %04x, msg %04x, addr %08x[%i]\n", + TRACE("hwnd %04x, msg %04x, addr %08x[%i]\n", hWnd, uMsg, (unsigned)addr , len ); return __WSAsyncDBQuery(hWnd,uMsg,len,addr,type,NULL,sbuf,buflen,AQ_NUMBER|AQ_WIN32|AQ_GETHOST); } @@ -394,7 +394,7 @@ HANDLE WINAPI WSAAsyncGetHostByAddr(HWND hWnd, UINT uMsg, LPCSTR addr, HANDLE16 WINAPI WSAAsyncGetHostByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name, SEGPTR sbuf, INT16 buflen) { - TRACE(winsock, "hwnd %04x, msg %04x, host %s, buffer %i\n", hWnd, uMsg, (name)?name:"<null>", (int)buflen ); + TRACE("hwnd %04x, msg %04x, host %s, buffer %i\n", hWnd, uMsg, (name)?name:"<null>", (int)buflen ); return __WSAsyncDBQuery(hWnd,uMsg,0,name,0,NULL,(void*)sbuf,buflen,AQ_NAME|AQ_WIN16|AQ_GETHOST); } @@ -405,7 +405,7 @@ HANDLE16 WINAPI WSAAsyncGetHostByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name, HANDLE WINAPI WSAAsyncGetHostByName(HWND hWnd, UINT uMsg, LPCSTR name, LPSTR sbuf, INT buflen) { - TRACE(winsock, "hwnd %04x, msg %08x, host %s, buffer %i\n", + TRACE("hwnd %04x, msg %08x, host %s, buffer %i\n", (HWND16)hWnd, uMsg, (name)?name:"<null>", (int)buflen ); return __WSAsyncDBQuery(hWnd,uMsg,0,name,0,NULL,sbuf,buflen,AQ_NAME|AQ_WIN32|AQ_GETHOST); } @@ -416,7 +416,7 @@ HANDLE WINAPI WSAAsyncGetHostByName(HWND hWnd, UINT uMsg, LPCSTR name, HANDLE16 WINAPI WSAAsyncGetProtoByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name, SEGPTR sbuf, INT16 buflen) { - TRACE(winsock, "hwnd %04x, msg %08x, protocol %s\n", + TRACE("hwnd %04x, msg %08x, protocol %s\n", (HWND16)hWnd, uMsg, (name)?name:"<null>" ); return __WSAsyncDBQuery(hWnd,uMsg,0,name,0,NULL,(void*)sbuf,buflen,AQ_GETPROTO|AQ_NAME|AQ_WIN16); } @@ -427,7 +427,7 @@ HANDLE16 WINAPI WSAAsyncGetProtoByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name, HANDLE WINAPI WSAAsyncGetProtoByName(HWND hWnd, UINT uMsg, LPCSTR name, LPSTR sbuf, INT buflen) { - TRACE(winsock, "hwnd %04x, msg %08x, protocol %s\n", + TRACE("hwnd %04x, msg %08x, protocol %s\n", (HWND16)hWnd, uMsg, (name)?name:"<null>" ); return __WSAsyncDBQuery(hWnd,uMsg,0,name,0,NULL,sbuf,buflen,AQ_GETPROTO|AQ_NAME|AQ_WIN32); } @@ -439,7 +439,7 @@ HANDLE WINAPI WSAAsyncGetProtoByName(HWND hWnd, UINT uMsg, LPCSTR name, HANDLE16 WINAPI WSAAsyncGetProtoByNumber16(HWND16 hWnd,UINT16 uMsg,INT16 number, SEGPTR sbuf, INT16 buflen) { - TRACE(winsock, "hwnd %04x, msg %04x, num %i\n", hWnd, uMsg, number ); + TRACE("hwnd %04x, msg %04x, num %i\n", hWnd, uMsg, number ); return __WSAsyncDBQuery(hWnd,uMsg,number,NULL,0,NULL,(void*)sbuf,buflen,AQ_GETPROTO|AQ_NUMBER|AQ_WIN16); } @@ -449,7 +449,7 @@ HANDLE16 WINAPI WSAAsyncGetProtoByNumber16(HWND16 hWnd,UINT16 uMsg,INT16 number, HANDLE WINAPI WSAAsyncGetProtoByNumber(HWND hWnd, UINT uMsg, INT number, LPSTR sbuf, INT buflen) { - TRACE(winsock, "hwnd %04x, msg %04x, num %i\n", hWnd, uMsg, number ); + TRACE("hwnd %04x, msg %04x, num %i\n", hWnd, uMsg, number ); return __WSAsyncDBQuery(hWnd,uMsg,number,NULL,0,NULL,sbuf,buflen,AQ_GETPROTO|AQ_NUMBER|AQ_WIN32); } @@ -460,7 +460,7 @@ HANDLE WINAPI WSAAsyncGetProtoByNumber(HWND hWnd, UINT uMsg, INT number, HANDLE16 WINAPI WSAAsyncGetServByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name, LPCSTR proto, SEGPTR sbuf, INT16 buflen) { - TRACE(winsock, "hwnd %04x, msg %04x, name %s, proto %s\n", + TRACE("hwnd %04x, msg %04x, name %s, proto %s\n", hWnd, uMsg, (name)?name:"<null>", (proto)?proto:"<null>" ); return __WSAsyncDBQuery(hWnd,uMsg,0,name,0,proto,(void*)sbuf,buflen,AQ_GETSERV|AQ_NAME|AQ_WIN16); @@ -472,7 +472,7 @@ HANDLE16 WINAPI WSAAsyncGetServByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name, HANDLE WINAPI WSAAsyncGetServByName(HWND hWnd, UINT uMsg, LPCSTR name, LPCSTR proto, LPSTR sbuf, INT buflen) { - TRACE(winsock, "hwnd %04x, msg %04x, name %s, proto %s\n", + TRACE("hwnd %04x, msg %04x, name %s, proto %s\n", hWnd, uMsg, (name)?name:"<null>", (proto)?proto:"<null>" ); return __WSAsyncDBQuery(hWnd,uMsg,0,name,0,proto,sbuf,buflen,AQ_GETSERV|AQ_NAME|AQ_WIN32); } @@ -483,7 +483,7 @@ HANDLE WINAPI WSAAsyncGetServByName(HWND hWnd, UINT uMsg, LPCSTR name, HANDLE16 WINAPI WSAAsyncGetServByPort16(HWND16 hWnd, UINT16 uMsg, INT16 port, LPCSTR proto, SEGPTR sbuf, INT16 buflen) { - TRACE(winsock, "hwnd %04x, msg %04x, port %i, proto %s\n", + TRACE("hwnd %04x, msg %04x, port %i, proto %s\n", hWnd, uMsg, port, (proto)?proto:"<null>" ); return __WSAsyncDBQuery(hWnd,uMsg,port,NULL,0,proto,(void*)sbuf,buflen,AQ_GETSERV|AQ_NUMBER|AQ_WIN16); } @@ -494,7 +494,7 @@ HANDLE16 WINAPI WSAAsyncGetServByPort16(HWND16 hWnd, UINT16 uMsg, INT16 port, HANDLE WINAPI WSAAsyncGetServByPort(HWND hWnd, UINT uMsg, INT port, LPCSTR proto, LPSTR sbuf, INT buflen) { - TRACE(winsock, "hwnd %04x, msg %04x, port %i, proto %s\n", + TRACE("hwnd %04x, msg %04x, port %i, proto %s\n", hWnd, uMsg, port, (proto)?proto:"<null>" ); return __WSAsyncDBQuery(hWnd,uMsg,port,NULL,0,proto,sbuf,buflen,AQ_GETSERV|AQ_NUMBER|AQ_WIN32); } @@ -504,7 +504,7 @@ HANDLE WINAPI WSAAsyncGetServByPort(HWND hWnd, UINT uMsg, INT port, */ INT WINAPI WSACancelAsyncRequest(HANDLE hAsyncTaskHandle) { - FIXME(winsock, "(%08x),stub\n", hAsyncTaskHandle); + FIXME("(%08x),stub\n", hAsyncTaskHandle); return 0; } diff --git a/misc/wsprintf.c b/misc/wsprintf.c index bf6852859d6b1a7df4256fd4c3e1798c4dcae12a..9e5506be6bbd1fe038e142a0a66c678ec38a286a 100644 --- a/misc/wsprintf.c +++ b/misc/wsprintf.c @@ -12,7 +12,7 @@ #include "stackframe.h" #include "module.h" #include "global.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(string) @@ -448,7 +448,7 @@ INT WINAPI wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, maxlen -= len; } *p = 0; - TRACE(string,"%s\n",buffer); + TRACE("%s\n",buffer); return (maxlen > 1) ? (INT)(p - buffer) : -1; } @@ -533,7 +533,7 @@ INT WINAPI wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, */ INT16 WINAPI wvsprintf16( LPSTR buffer, LPCSTR spec, LPCVOID args ) { - TRACE(string,"for %p got:\n",buffer); + TRACE("for %p got:\n",buffer); return wvsnprintf16( buffer, 0xffff, spec, args ); } @@ -543,7 +543,7 @@ INT16 WINAPI wvsprintf16( LPSTR buffer, LPCSTR spec, LPCVOID args ) */ INT WINAPI wvsprintfA( LPSTR buffer, LPCSTR spec, va_list args ) { - TRACE(string,"for %p got:\n",buffer); + TRACE("for %p got:\n",buffer); return wvsnprintfA( buffer, 0xffffffff, spec, args ); } @@ -553,7 +553,7 @@ INT WINAPI wvsprintfA( LPSTR buffer, LPCSTR spec, va_list args ) */ INT WINAPI wvsprintfW( LPWSTR buffer, LPCWSTR spec, va_list args ) { - TRACE(string,"for %p got:\n",buffer); + TRACE("for %p got:\n",buffer); return wvsnprintfW( buffer, 0xffffffff, spec, args ); } @@ -567,7 +567,7 @@ INT16 WINAPIV wsprintf16( LPSTR buffer, LPCSTR spec, ... ) va_list valist; INT16 res; - TRACE(string,"for %p got:\n",buffer); + TRACE("for %p got:\n",buffer); va_start( valist, spec ); /* Note: we call the 32-bit version, because the args are 32-bit */ res = (INT16)wvsnprintfA( buffer, 0xffffffff, spec, valist ); @@ -585,7 +585,7 @@ INT16 WINAPIV WIN16_wsprintf16(void) VA_START16( valist ); buffer = VA_ARG16( valist, SEGPTR ); spec = VA_ARG16( valist, SEGPTR ); - TRACE(string,"got:\n"); + TRACE("got:\n"); res = wvsnprintf16( (LPSTR)PTR_SEG_TO_LIN(buffer), 0xffff, (LPCSTR)PTR_SEG_TO_LIN(spec), valist ); VA_END16( valist ); @@ -601,7 +601,7 @@ INT WINAPIV wsprintfA( LPSTR buffer, LPCSTR spec, ... ) va_list valist; INT res; - TRACE(string,"for %p got:\n",buffer); + TRACE("for %p got:\n",buffer); va_start( valist, spec ); res = wvsnprintfA( buffer, 0xffffffff, spec, valist ); va_end( valist ); @@ -617,7 +617,7 @@ INT WINAPIV wsprintfW( LPWSTR buffer, LPCWSTR spec, ... ) va_list valist; INT res; - TRACE(string,"wsprintfW for %p\n",buffer); + TRACE("wsprintfW for %p\n",buffer); va_start( valist, spec ); res = wvsnprintfW( buffer, 0xffffffff, spec, valist ); va_end( valist ); diff --git a/misc/xmalloc.c b/misc/xmalloc.c index 0e757e88203a233f7915d8efbf10b129d16b4dca..e76ce516528f2c9acfc64d6b101c9191bcaaa01e 100644 --- a/misc/xmalloc.c +++ b/misc/xmalloc.c @@ -16,7 +16,7 @@ #include <stdlib.h> #include <string.h> #include "xmalloc.h" -#include "debug.h" +#include "debugtools.h" void *xmalloc( int size ) { @@ -25,7 +25,7 @@ void *xmalloc( int size ) res = malloc (size ? size : 1); if (res == NULL) { - MSG("Virtual memory exhausted.\n"); + MESSAGE("Virtual memory exhausted.\n"); exit (1); } memset(res,0,size); @@ -47,7 +47,7 @@ void *xrealloc( void *ptr, int size ) void *res = realloc (ptr, size); if ((res == NULL) && size) { - MSG("Virtual memory exhausted.\n"); + MESSAGE("Virtual memory exhausted.\n"); exit (1); } return res; @@ -59,7 +59,7 @@ char *xstrdup( const char *str ) char *res = strdup( str ); if (!res) { - MSG("Virtual memory exhausted.\n"); + MESSAGE("Virtual memory exhausted.\n"); exit (1); } return res; diff --git a/miscemu/emulate.c b/miscemu/emulate.c index 58e3718ad295b45e8077343fb1ff431f4739a813..26384013ea1643b356a8f5863c9b85422c5b0a49 100644 --- a/miscemu/emulate.c +++ b/miscemu/emulate.c @@ -1,6 +1,6 @@ #include <stdlib.h> #include "miscemu.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(int) @@ -29,7 +29,7 @@ struct Win87EmInfoStruct void WINAPI WIN87_fpmath( CONTEXT86 *context ) { - TRACE(int, "(cs:eip=%x:%lx es=%x bx=%04x ax=%04x dx==%04x)\n", + TRACE("(cs:eip=%x:%lx es=%x bx=%04x ax=%04x dx==%04x)\n", (WORD)CS_reg(context), EIP_reg(context), (WORD)ES_reg(context), BX_reg(context), AX_reg(context), DX_reg(context) ); @@ -70,7 +70,7 @@ void WINAPI WIN87_fpmath( CONTEXT86 *context ) */ __asm__ __volatile__("frndint"); __asm__ __volatile__("fist %0;wait" : "=m" (dw) : : "memory"); - TRACE(int,"On top of stack is %ld\n",dw); + TRACE("On top of stack is %ld\n",dw); } break; @@ -84,7 +84,7 @@ void WINAPI WIN87_fpmath( CONTEXT86 *context ) */ /* FIXME: could someone who really understands asm() fix this please? --AJ */ /* __asm__("fistp %0;wait" : "=m" (dw) : : "memory"); */ - TRACE(int,"On top of stack was %ld\n",dw); + TRACE("On top of stack was %ld\n",dw); AX_reg(context) = LOWORD(dw); DX_reg(context) = HIWORD(dw); } @@ -109,7 +109,7 @@ void WINAPI WIN87_fpmath( CONTEXT86 *context ) break; default: /* error. Say that loud and clear */ - FIXME(int,"unhandled switch %d\n",BX_reg(context)); + FIXME("unhandled switch %d\n",BX_reg(context)); AX_reg(context) = DX_reg(context) = 0xFFFF; break; } @@ -119,18 +119,18 @@ void WINAPI WIN87_fpmath( CONTEXT86 *context ) void WINAPI WIN87_WinEm87Info(struct Win87EmInfoStruct *pWIS, int cbWin87EmInfoStruct) { - TRACE(int, "(%p,%d)\n",pWIS,cbWin87EmInfoStruct); + TRACE("(%p,%d)\n",pWIS,cbWin87EmInfoStruct); } void WINAPI WIN87_WinEm87Restore(void *pWin87EmSaveArea, int cbWin87EmSaveArea) { - TRACE(int, "(%p,%d)\n", + TRACE("(%p,%d)\n", pWin87EmSaveArea,cbWin87EmSaveArea); } void WINAPI WIN87_WinEm87Save(void *pWin87EmSaveArea, int cbWin87EmSaveArea) { - TRACE(int, "(%p,%d)\n", + TRACE("(%p,%d)\n", pWin87EmSaveArea,cbWin87EmSaveArea); } diff --git a/miscemu/main.c b/miscemu/main.c index 3df298308c0516a773209bbb34bcb2912751aaf4..a4ce5453ef2e23aa18213f7e9443c5e2cc65dd57 100644 --- a/miscemu/main.c +++ b/miscemu/main.c @@ -18,7 +18,7 @@ #include "task.h" #include "stackframe.h" #include "wine/exception.h" -#include "debug.h" +#include "debugtools.h" static int MAIN_argc; static char **MAIN_argv; @@ -100,12 +100,12 @@ void MAIN_EmulatorRun( void ) { if ((handle = WinExec( MAIN_argv[i], SW_SHOWNORMAL )) < 32) { - MSG("wine: can't exec '%s': ", MAIN_argv[i]); + MESSAGE("wine: can't exec '%s': ", MAIN_argv[i]); switch (handle) { - case 2: MSG("file not found\n" ); break; - case 11: MSG("invalid exe file\n" ); break; - default: MSG("error=%d\n", handle ); break; + case 2: MESSAGE("file not found\n" ); break; + case 11: MESSAGE("invalid exe file\n" ); break; + default: MESSAGE("error=%d\n", handle ); break; } } else tasks++; @@ -113,7 +113,7 @@ void MAIN_EmulatorRun( void ) if (!tasks) { - MSG("wine: no executable file found.\n" ); + MESSAGE("wine: no executable file found.\n" ); ExitProcess( 0 ); } @@ -177,6 +177,6 @@ int main( int argc, char *argv[] ) /* Switch stacks and jump to MAIN_EmulatorRun */ CALL32_Init( &IF1632_CallLargeStack, MAIN_EmulatorRun, NtCurrentTeb()->stack_top ); - MSG( "main: Should never happen: returned from CALL32_Init()\n" ); + MESSAGE( "main: Should never happen: returned from CALL32_Init()\n" ); return 0; } diff --git a/msdos/devices.c b/msdos/devices.c index 4ae228f0b9f1a78a067652a88806305037e23fc2..b6cd11568e15c383adfbc90ffcebf0b88be5f9e0 100644 --- a/msdos/devices.c +++ b/msdos/devices.c @@ -10,7 +10,7 @@ #include "msdos.h" #include "miscemu.h" #include "dosexe.h" -#include "debug.h" +#include "debugtools.h" #include "pshpack1.h" diff --git a/msdos/dosconf.c b/msdos/dosconf.c index 01707203d40062c939c9ff5f9d05f1d749496918..eea01704fcee46f954de6072461f66bc8537294a 100644 --- a/msdos/dosconf.c +++ b/msdos/dosconf.c @@ -12,7 +12,7 @@ #include <ctype.h> #include "winbase.h" #include "msdos.h" -#include "debug.h" +#include "debugtools.h" #include "options.h" #include "file.h" @@ -133,7 +133,7 @@ static int DOSCONF_Device(char **confline) /* FIXME: get DEVICEHIGH parameters if avail ? */ } if (!(DOSCONF_JumpToEntry(confline, '='))) return 0; - TRACE(profile, "Loading device '%s'\n", *confline); + TRACE("Loading device '%s'\n", *confline); #if 0 DOSMOD_LoadDevice(*confline, loadhigh); #endif @@ -160,7 +160,7 @@ static int DOSCONF_Dos(char **confline) else (*confline)++; DOSCONF_JumpToEntry(confline, ','); } - TRACE(profile, "DOSCONF_Dos: HIGH is %d, UMB is %d\n", + TRACE("DOSCONF_Dos: HIGH is %d, UMB is %d\n", (DOSCONF_config.flags & DOSCONF_MEM_HIGH) != 0, (DOSCONF_config.flags & DOSCONF_MEM_UMB) != 0); return 1; } @@ -172,10 +172,10 @@ static int DOSCONF_Fcbs(char **confline) DOSCONF_config.fcbs = atoi(*confline); if (DOSCONF_config.fcbs > 255) { - MSG("The FCBS value in the config.sys file is too high ! Setting to 255.\n"); + MESSAGE("The FCBS value in the config.sys file is too high ! Setting to 255.\n"); DOSCONF_config.fcbs = 255; } - TRACE(profile, "DOSCONF_Fcbs returning %d\n", DOSCONF_config.fcbs); + TRACE("DOSCONF_Fcbs returning %d\n", DOSCONF_config.fcbs); return 1; } @@ -185,7 +185,7 @@ static int DOSCONF_Break(char **confline) if (!(DOSCONF_JumpToEntry(confline, '='))) return 0; if (!(strcasecmp(*confline, "ON"))) DOSCONF_config.brk_flag = 1; - TRACE(profile, "BREAK is %d\n", DOSCONF_config.brk_flag); + TRACE("BREAK is %d\n", DOSCONF_config.brk_flag); return 1; } @@ -196,15 +196,15 @@ static int DOSCONF_Files(char **confline) DOSCONF_config.files = atoi(*confline); if (DOSCONF_config.files > 255) { - MSG("The FILES value in the config.sys file is too high ! Setting to 255.\n"); + MESSAGE("The FILES value in the config.sys file is too high ! Setting to 255.\n"); DOSCONF_config.files = 255; } if (DOSCONF_config.files < 8) { - MSG("The FILES value in the config.sys file is too low ! Setting to 8.\n"); + MESSAGE("The FILES value in the config.sys file is too low ! Setting to 8.\n"); DOSCONF_config.files = 8; } - TRACE(profile, "DOSCONF_Files returning %d\n", DOSCONF_config.files); + TRACE("DOSCONF_Files returning %d\n", DOSCONF_config.files); return 1; } @@ -216,7 +216,7 @@ static int DOSCONF_Install(char **confline) *confline += 7; /* strlen("INSTALL") */ if (!(DOSCONF_JumpToEntry(confline, '='))) return 0; - TRACE(profile, "Installing '%s'\n", *confline); + TRACE("Installing '%s'\n", *confline); #if 0 DOSMOD_Install(*confline, loadhigh); #endif @@ -228,7 +228,7 @@ static int DOSCONF_Lastdrive(char **confline) *confline += 9; /* strlen("LASTDRIVE") */ if (!(DOSCONF_JumpToEntry(confline, '='))) return 0; DOSCONF_config.lastdrive = toupper(**confline); - TRACE(profile, "Lastdrive %c\n", DOSCONF_config.lastdrive); + TRACE("Lastdrive %c\n", DOSCONF_config.lastdrive); return 1; } @@ -236,7 +236,7 @@ static int DOSCONF_Country(char **confline) { *confline += 7; /* strlen("COUNTRY") */ if (!(DOSCONF_JumpToEntry(confline, '='))) return 0; - TRACE(profile, "Country '%s'\n", *confline); + TRACE("Country '%s'\n", *confline); if (DOSCONF_config.country == NULL) DOSCONF_config.country = malloc(strlen(*confline) + 1); strcpy(DOSCONF_config.country, *confline); @@ -249,7 +249,7 @@ static int DOSCONF_Numlock(char **confline) if (!(DOSCONF_JumpToEntry(confline, '='))) return 0; if (!(strcasecmp(*confline, "ON"))) DOSCONF_config.flags |= DOSCONF_NUMLOCK; - TRACE(profile, "NUMLOCK is %d\n", (DOSCONF_config.flags & DOSCONF_NUMLOCK) != 0); + TRACE("NUMLOCK is %d\n", (DOSCONF_config.flags & DOSCONF_NUMLOCK) != 0); return 1; } @@ -266,7 +266,7 @@ static int DOSCONF_Switches(char **confline) DOSCONF_config.flags |= DOSCONF_KEYB_CONV; } while ((p = strtok(NULL, "/"))); - TRACE(profile, "'Force conventional keyboard' is %d\n", + TRACE("'Force conventional keyboard' is %d\n", (DOSCONF_config.flags & DOSCONF_KEYB_CONV) != 0); return 1; } @@ -275,7 +275,7 @@ static int DOSCONF_Shell(char **confline) { *confline += 5; /* strlen("SHELL") */ if (!(DOSCONF_JumpToEntry(confline, '='))) return 0; - TRACE(profile, "Shell '%s'\n", *confline); + TRACE("Shell '%s'\n", *confline); if (DOSCONF_config.shell == NULL) DOSCONF_config.shell = malloc(strlen(*confline) + 1); strcpy(DOSCONF_config.shell, *confline); @@ -289,7 +289,7 @@ static int DOSCONF_Stacks(char **confline) if (!(DOSCONF_JumpToEntry(confline, '='))) return 0; DOSCONF_config.stacks_nr = atoi(strtok(*confline, ",")); DOSCONF_config.stacks_sz = atoi((strtok(NULL, ","))); - TRACE(profile, "%d stacks of size %d\n", + TRACE("%d stacks of size %d\n", DOSCONF_config.stacks_nr, DOSCONF_config.stacks_sz); return 1; } @@ -304,7 +304,7 @@ static int DOSCONF_Buffers(char **confline) DOSCONF_config.buf = atoi(p); if ((p = strtok(NULL, ","))) DOSCONF_config.buf2 = atoi(p); - TRACE(profile, "%d primary buffers, %d secondary buffers\n", + TRACE("%d primary buffers, %d secondary buffers\n", DOSCONF_config.buf, DOSCONF_config.buf2); return 1; } @@ -352,7 +352,7 @@ static int DOSCONF_Include(char **confline) if (!(DOSCONF_JumpToEntry(confline, '='))) return 0; fgetpos(cfg_fd, &oldpos); fseek(cfg_fd, 0, SEEK_SET); - TRACE(profile, "Including menu '%s'\n", *confline); + TRACE("Including menu '%s'\n", *confline); temp = malloc(strlen(*confline) + 1); strcpy(temp, *confline); DOSCONF_Parse(temp); @@ -403,7 +403,7 @@ static void DOSCONF_Parse(char *menuname) if (!(strncasecmp(p, tag_entries[i].tag_name, strlen(tag_entries[i].tag_name)))) { - TRACE(profile, "tag '%s'\n", tag_entries[i].tag_name); + TRACE("tag '%s'\n", tag_entries[i].tag_name); if (tag_entries[i].tag_handler != NULL) tag_entries[i].tag_handler(&p); break; @@ -435,7 +435,7 @@ int DOSCONF_ReadConfig(void) } else { - MSG("Couldn't open config.sys file given as \"%s\" in" \ + MESSAGE("Couldn't open config.sys file given as \"%s\" in" \ " wine.conf or .winerc, section [wine] !\n", filename); ret = 0; } diff --git a/msdos/dpmi.c b/msdos/dpmi.c index 2636c602010fb952b54bdf98872a4eee93a8b731..0d36bc5be38f6266613b17274a2a20c924011e9a 100644 --- a/msdos/dpmi.c +++ b/msdos/dpmi.c @@ -20,7 +20,7 @@ #include "selectors.h" #include "process.h" #include "callback.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(int31) @@ -86,7 +86,7 @@ DPMI_xalloc(int len) { * try non-linear */ if (!xflag && (lastvalloced<oldlastv)) { /* wrapped */ - FIXME(int31,"failed to allocate lineary growing memory (%d bytes), using non-linear growing...\n",len); + FIXME("failed to allocate lineary growing memory (%d bytes), using non-linear growing...\n",len); xflag++; } /* if we even fail to allocate something in the next @@ -95,7 +95,7 @@ DPMI_xalloc(int len) { if ((xflag==1) && (lastvalloced >= oldlastv)) xflag++; if ((xflag==2) && (lastvalloced < oldlastv)) { - FIXME(int31,"failed to allocate any memory of %d bytes!\n",len); + FIXME("failed to allocate any memory of %d bytes!\n",len); return NULL; } } @@ -119,11 +119,11 @@ DPMI_xrealloc(LPVOID ptr,int newsize) { newptr = DPMI_xalloc(newsize); if (ptr) { if (!VirtualQuery(ptr,&mbi,sizeof(mbi))) { - FIXME(int31,"realloc of DPMI_xallocd region %p?\n",ptr); + FIXME("realloc of DPMI_xallocd region %p?\n",ptr); return NULL; } if (mbi.State == MEM_FREE) { - FIXME(int31,"realloc of DPMI_xallocd region %p?\n",ptr); + FIXME("realloc of DPMI_xallocd region %p?\n",ptr); return NULL; } /* We do not shrink allocated memory. most reallocs @@ -203,7 +203,7 @@ static void DPMI_CallRMCBProc( CONTEXT86 *context, RMCB *rmcb, WORD flag ) INT_SetRealModeContext((REALMODECALL *)PTR_SEG_OFF_TO_LIN( rmcb->regs_sel, rmcb->regs_ofs ), context); ss = SELECTOR_AllocBlock( DOSMEM_MemoryBase(0) + (DWORD)(SS_reg(context)<<4), 0x10000, SEGMENT_DATA, FALSE, FALSE ); - FIXME(int31,"untested!\n"); + FIXME("untested!\n"); /* The called proc ends with an IRET, and takes these parameters: * DS:ESI = pointer to real-mode SS:SP @@ -246,7 +246,7 @@ static void DPMI_CallRMCBProc( CONTEXT86 *context, RMCB *rmcb, WORD flag ) SELECTOR_FreeBlock(ss, 1); INT_GetRealModeContext((REALMODECALL*)PTR_SEG_OFF_TO_LIN( es, edi ), context); #else - ERR(int31,"RMCBs only implemented for i386\n"); + ERR("RMCBs only implemented for i386\n"); #endif } } @@ -273,9 +273,9 @@ int DPMI_CallRMProc( CONTEXT86 *context, LPWORD stack, int args, int iret ) GlobalUnlock16( GetCurrentTask() ); - TRACE(int31, "EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n", + TRACE("EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n", EAX_reg(context), EBX_reg(context), ECX_reg(context), EDX_reg(context) ); - TRACE(int31, "ESI=%08lx EDI=%08lx ES=%04lx DS=%04lx CS:IP=%04lx:%04x, %d WORD arguments, %s\n", + TRACE("ESI=%08lx EDI=%08lx ES=%04lx DS=%04lx CS:IP=%04lx:%04x, %d WORD arguments, %s\n", ESI_reg(context), EDI_reg(context), ES_reg(context), DS_reg(context), CS_reg(context), IP_reg(context), args, iret?"IRET":"FAR" ); @@ -313,10 +313,10 @@ callrmproc_again: #ifdef MZ_SUPPORTED if (!(CurrRMCB || pModule->lpDosTask)) { - FIXME(int31,"DPMI real-mode call using DOS VM task system, not fully tested!\n"); - TRACE(int31,"creating VM86 task\n"); + FIXME("DPMI real-mode call using DOS VM task system, not fully tested!\n"); + TRACE("creating VM86 task\n"); if (!MZ_InitTask( MZ_AllocDPMITask( pModule->self ) )) { - ERR(int31,"could not setup VM86 task\n"); + ERR("could not setup VM86 task\n"); return 1; } } @@ -327,7 +327,7 @@ callrmproc_again: SP_reg(context) = 64-2; stack16 += 32-1; if (!addr) { - ERR(int31,"could not allocate default stack\n"); + ERR("could not allocate default stack\n"); return 1; } } else { @@ -377,9 +377,9 @@ callrmproc_again: CS_reg(context) = DPMI_wrap_seg; IP_reg(context) = 2; #endif - TRACE(int31,"entering real mode...\n"); + TRACE("entering real mode...\n"); DOSVM_Enter( context ); - TRACE(int31,"returned from real-mode call\n"); + TRACE("returned from real-mode call\n"); #else addr = CTX_SEG_OFF_TO_LIN(context, CS_reg(context), EIP_reg(context)); sel = SELECTOR_AllocBlock( addr, 0x10000, SEGMENT_CODE, FALSE, FALSE ); @@ -423,10 +423,10 @@ static void CallRMInt( CONTEXT86 *context ) if (INT_RealModeInterrupt( LOWORD(rm_int)/4, &realmode_ctx )) SET_CFLAG(context); if (EFL_reg(context)&1) { - FIXME(int31,"%02x: EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n", + FIXME("%02x: EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n", BL_reg(context), EAX_reg(&realmode_ctx), EBX_reg(&realmode_ctx), ECX_reg(&realmode_ctx), EDX_reg(&realmode_ctx)); - FIXME(int31," ESI=%08lx EDI=%08lx DS=%04lx ES=%04lx\n", + FIXME(" ESI=%08lx EDI=%08lx DS=%04lx ES=%04lx\n", ESI_reg(&realmode_ctx), EDI_reg(&realmode_ctx), DS_reg(&realmode_ctx), ES_reg(&realmode_ctx) ); } @@ -440,9 +440,9 @@ static void CallRMProc( CONTEXT86 *context, int iret ) REALMODECALL *p = (REALMODECALL *)PTR_SEG_OFF_TO_LIN( ES_reg(context), DI_reg(context) ); CONTEXT86 context16; - TRACE(int31, "RealModeCall: EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n", + TRACE("RealModeCall: EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n", p->eax, p->ebx, p->ecx, p->edx); - TRACE(int31, " ESI=%08lx EDI=%08lx ES=%04x DS=%04x CS:IP=%04x:%04x, %d WORD arguments, %s\n", + TRACE(" ESI=%08lx EDI=%08lx ES=%04x DS=%04x CS:IP=%04x:%04x, %d WORD arguments, %s\n", p->esi, p->edi, p->es, p->ds, p->cs, p->ip, CX_reg(context), iret?"IRET":"FAR" ); if (!(p->cs) && !(p->ip)) { /* remove this check @@ -464,7 +464,7 @@ static void WINAPI WINE_UNUSED RMCallbackProc( RMCB *rmcb ) register structure available - this is easily fixed by going through a Win16 register relay instead of calling RMCallbackProc "directly", but I won't bother at this time. */ - FIXME(int31,"not properly supported on your architecture!\n"); + FIXME("not properly supported on your architecture!\n"); } static RMCB *DPMI_AllocRMCB( void ) @@ -510,7 +510,7 @@ static void AllocRMCB( CONTEXT86 *context ) { RMCB *NewRMCB = DPMI_AllocRMCB(); - TRACE(int31, "Function to call: %04x:%04x\n", (WORD)DS_reg(context), SI_reg(context) ); + TRACE("Function to call: %04x:%04x\n", (WORD)DS_reg(context), SI_reg(context) ); if (NewRMCB) { @@ -571,7 +571,7 @@ static int DPMI_FreeRMCB( DWORD address ) static void FreeRMCB( CONTEXT86 *context ) { - FIXME(int31, "callback address: %04x:%04x\n", + FIXME("callback address: %04x:%04x\n", CX_reg(context), DX_reg(context)); if (DPMI_FreeRMCB(MAKELONG(DX_reg(context), CX_reg(context)))) { @@ -628,7 +628,7 @@ static void StartPM( CONTEXT86 *context, LPDOSTASK lpDosTask ) FS_reg(&pm_ctx) = 0; GS_reg(&pm_ctx) = 0; - TRACE(int31,"DOS program is now entering protected mode\n"); + TRACE("DOS program is now entering protected mode\n"); Callbacks->CallRegisterShortProc(&pm_ctx, 0); /* in the current state of affairs, we won't ever actually return here... */ @@ -653,7 +653,7 @@ void WINAPI DPMI_RawModeSwitch( SIGCONTEXT *context ) if (!lpDosTask) { /* we could probably start a DPMI-only dosmod task here, but I doubt anything other than real DOS apps want to call raw mode switch */ - ERR(int31,"attempting raw mode switch without DOS task!\n"); + ERR("attempting raw mode switch without DOS task!\n"); ExitProcess(1); } /* initialize real-mode context as per spec */ @@ -670,7 +670,7 @@ void WINAPI DPMI_RawModeSwitch( SIGCONTEXT *context ) EFL_reg(&rm_ctx) = EFL_sig(context); /* at least we need the IF flag */ /* enter real mode again */ - TRACE(int31,"re-entering real mode at %04lx:%04lx\n", + TRACE("re-entering real mode at %04lx:%04lx\n", CS_reg(&rm_ctx),EIP_reg(&rm_ctx)); ret = DOSVM_Enter( &rm_ctx ); /* when the real-mode stuff call its mode switch address, @@ -693,14 +693,14 @@ void WINAPI DPMI_RawModeSwitch( SIGCONTEXT *context ) GS_sig(context) = 0; /* Return to new address and hope that we didn't mess up */ - TRACE(int31,"re-entering protected mode at %04x:%08lx\n", + TRACE("re-entering protected mode at %04x:%08lx\n", CS_sig(context), EIP_sig(context)); } #else void WINAPI DPMI_RawModeSwitch( SIGCONTEXT *context ) { - ERR(int31,"don't even think about DPMI raw mode switch without DOS support!\n"); + ERR("don't even think about DPMI raw mode switch without DOS support!\n"); ExitProcess(1); } #endif @@ -739,7 +739,7 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context ) #ifdef MZ_SUPPORTED if (ISV86(context) && lpDosTask) { /* Called from real mode, check if it's our wrapper */ - TRACE(int31,"called from real mode\n"); + TRACE("called from real mode\n"); if (CS_reg(context)==lpDosTask->dpmi_seg) { /* This is the protected mode switch */ StartPM(context,lpDosTask); @@ -770,18 +770,18 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context ) switch(AX_reg(context)) { case 0x0000: /* Allocate LDT descriptors */ - TRACE(int31,"allocate LDT descriptors (%d)\n",CX_reg(context)); + TRACE("allocate LDT descriptors (%d)\n",CX_reg(context)); if (!(AX_reg(context) = AllocSelectorArray16( CX_reg(context) ))) { - TRACE(int31,"failed\n"); + TRACE("failed\n"); AX_reg(context) = 0x8011; /* descriptor unavailable */ SET_CFLAG(context); } - TRACE(int31,"success, array starts at 0x%04x\n",AX_reg(context)); + TRACE("success, array starts at 0x%04x\n",AX_reg(context)); break; case 0x0001: /* Free LDT descriptor */ - TRACE(int31,"free LDT descriptor (0x%04x)\n",BX_reg(context)); + TRACE("free LDT descriptor (0x%04x)\n",BX_reg(context)); if (FreeSelector16( BX_reg(context) )) { AX_reg(context) = 0x8022; /* invalid selector */ @@ -799,7 +799,7 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context ) break; case 0x0002: /* Real mode segment to descriptor */ - TRACE(int31,"real mode segment to descriptor (0x%04x)\n",BX_reg(context)); + TRACE("real mode segment to descriptor (0x%04x)\n",BX_reg(context)); { WORD entryPoint = 0; /* KERNEL entry point for descriptor */ switch(BX_reg(context)) @@ -825,22 +825,22 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context ) break; case 0x0003: /* Get next selector increment */ - TRACE(int31,"get selector increment (__AHINCR)\n"); + TRACE("get selector increment (__AHINCR)\n"); AX_reg(context) = __AHINCR; break; case 0x0004: /* Lock selector (not supported) */ - FIXME(int31,"lock selector not supported\n"); + FIXME("lock selector not supported\n"); AX_reg(context) = 0; /* FIXME: is this a correct return value? */ break; case 0x0005: /* Unlock selector (not supported) */ - FIXME(int31,"unlock selector not supported\n"); + FIXME("unlock selector not supported\n"); AX_reg(context) = 0; /* FIXME: is this a correct return value? */ break; case 0x0006: /* Get selector base address */ - TRACE(int31,"get selector base address (0x%04x)\n",BX_reg(context)); + TRACE("get selector base address (0x%04x)\n",BX_reg(context)); if (!(dw = GetSelectorBase( BX_reg(context) ))) { AX_reg(context) = 0x8022; /* invalid selector */ @@ -860,7 +860,7 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context ) break; case 0x0007: /* Set selector base address */ - TRACE(int31, "set selector base address (0x%04x,0x%08lx)\n", + TRACE("set selector base address (0x%04x,0x%08lx)\n", BX_reg(context), W32S_APP2WINE(MAKELONG(DX_reg(context),CX_reg(context)), offset)); dw = W32S_APP2WINE(MAKELONG(DX_reg(context), CX_reg(context)), offset); @@ -874,7 +874,7 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context ) break; case 0x0008: /* Set selector limit */ - TRACE(int31,"set selector limit (0x%04x,0x%08lx)\n",BX_reg(context),MAKELONG(DX_reg(context),CX_reg(context))); + TRACE("set selector limit (0x%04x,0x%08lx)\n",BX_reg(context),MAKELONG(DX_reg(context),CX_reg(context))); dw = MAKELONG( DX_reg(context), CX_reg(context) ); #ifdef MZ_SUPPORTED if (lpDosTask) { @@ -902,12 +902,12 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context ) break; case 0x0009: /* Set selector access rights */ - TRACE(int31,"set selector access rights(0x%04x,0x%04x)\n",BX_reg(context),CX_reg(context)); + TRACE("set selector access rights(0x%04x,0x%04x)\n",BX_reg(context),CX_reg(context)); SelectorAccessRights16( BX_reg(context), 1, CX_reg(context) ); break; case 0x000a: /* Allocate selector alias */ - TRACE(int31,"allocate selector alias (0x%04x)\n",BX_reg(context)); + TRACE("allocate selector alias (0x%04x)\n",BX_reg(context)); if (!(AX_reg(context) = AllocCStoDSAlias16( BX_reg(context) ))) { AX_reg(context) = 0x8011; /* descriptor unavailable */ @@ -916,7 +916,7 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context ) break; case 0x000b: /* Get descriptor */ - TRACE(int31,"get descriptor (0x%04x)\n",BX_reg(context)); + TRACE("get descriptor (0x%04x)\n",BX_reg(context)); { ldt_entry entry; LDT_GetEntry( SELECTOR_TO_ENTRY( BX_reg(context) ), &entry ); @@ -935,7 +935,7 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context ) break; case 0x000c: /* Set descriptor */ - TRACE(int31,"set descriptor (0x%04x)\n",BX_reg(context)); + TRACE("set descriptor (0x%04x)\n",BX_reg(context)); { ldt_entry entry; LDT_BytesToEntry( PTR_SEG_OFF_TO_LIN( ES_reg(context), @@ -958,12 +958,12 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context ) break; case 0x000d: /* Allocate specific LDT descriptor */ - FIXME(int31,"allocate descriptor (0x%04x), stub!\n",BX_reg(context)); + FIXME("allocate descriptor (0x%04x), stub!\n",BX_reg(context)); AX_reg(context) = 0x8011; /* descriptor unavailable */ SET_CFLAG(context); break; case 0x0100: /* Allocate DOS memory block */ - TRACE(int31,"allocate DOS memory block (0x%x paragraphs)\n",BX_reg(context)); + TRACE("allocate DOS memory block (0x%x paragraphs)\n",BX_reg(context)); dw = GlobalDOSAlloc16((DWORD)BX_reg(context)<<4); if (dw) { AX_reg(context) = HIWORD(dw); @@ -975,7 +975,7 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context ) } break; case 0x0101: /* Free DOS memory block */ - TRACE(int31,"free DOS memory block (0x%04x)\n",DX_reg(context)); + TRACE("free DOS memory block (0x%04x)\n",DX_reg(context)); dw = GlobalDOSFree16(DX_reg(context)); if (!dw) { AX_reg(context) = 0x0009; /* memory block address invalid */ @@ -983,23 +983,23 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context ) } break; case 0x0200: /* get real mode interrupt vector */ - FIXME(int31,"get realmode interupt vector(0x%02x) unimplemented.\n", + FIXME("get realmode interupt vector(0x%02x) unimplemented.\n", BL_reg(context)); SET_CFLAG(context); break; case 0x0201: /* set real mode interrupt vector */ - FIXME(int31, "set realmode interupt vector(0x%02x,0x%04x:0x%04x) unimplemented\n", BL_reg(context),CX_reg(context),DX_reg(context)); + FIXME("set realmode interupt vector(0x%02x,0x%04x:0x%04x) unimplemented\n", BL_reg(context),CX_reg(context),DX_reg(context)); SET_CFLAG(context); break; case 0x0204: /* Get protected mode interrupt vector */ - TRACE(int31,"get protected mode interrupt handler (0x%02x), stub!\n",BL_reg(context)); + TRACE("get protected mode interrupt handler (0x%02x), stub!\n",BL_reg(context)); dw = (DWORD)INT_GetPMHandler( BL_reg(context) ); CX_reg(context) = HIWORD(dw); DX_reg(context) = LOWORD(dw); break; case 0x0205: /* Set protected mode interrupt vector */ - TRACE(int31,"set protected mode interrupt handler (0x%02x,%p), stub!\n", + TRACE("set protected mode interrupt handler (0x%02x,%p), stub!\n", BL_reg(context),PTR_SEG_OFF_TO_LIN(CX_reg(context),DX_reg(context))); INT_SetPMHandler( BL_reg(context), (FARPROC16)PTR_SEG_OFF_TO_SEGPTR( CX_reg(context), @@ -1027,20 +1027,20 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context ) break; case 0x0305: /* Get State Save/Restore Addresses */ - TRACE(int31,"get state save/restore addresses\n"); + TRACE("get state save/restore addresses\n"); /* we probably won't need this kind of state saving */ AX_reg(context) = 0; /* real mode: just point to the lret */ BX_reg(context) = DPMI_wrap_seg; ECX_reg(context) = 2; /* protected mode: don't have any handler yet... */ - FIXME(int31,"no protected-mode dummy state save/restore handler yet\n"); + FIXME("no protected-mode dummy state save/restore handler yet\n"); SI_reg(context) = 0; EDI_reg(context) = 0; break; case 0x0306: /* Get Raw Mode Switch Addresses */ - TRACE(int31,"get raw mode switch addresses\n"); + TRACE("get raw mode switch addresses\n"); if (lpDosTask) { /* real mode, point to standard DPMI return wrapper */ BX_reg(context) = DPMI_wrap_seg; @@ -1049,13 +1049,13 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context ) SI_reg(context) = lpDosTask->dpmi_sel; EDI_reg(context) = 8; /* offset of the INT 0x31 call */ } else { - ERR(int31,"win app attempting to get raw mode switch!\n"); + ERR("win app attempting to get raw mode switch!\n"); AX_reg(context) = 0x8001; /* unsupported function */ SET_CFLAG(context); } break; case 0x0400: /* Get DPMI version */ - TRACE(int31,"get DPMI version\n"); + TRACE("get DPMI version\n"); { SYSTEM_INFO si; @@ -1067,7 +1067,7 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context ) break; } case 0x0500: /* Get free memory information */ - TRACE(int31,"get free memory information\n"); + TRACE("get free memory information\n"); { MEMMANINFO mmi; @@ -1081,7 +1081,7 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context ) break; } case 0x0501: /* Allocate memory block */ - TRACE(int31,"allocate memory block (%ld)\n",MAKELONG(CX_reg(context),BX_reg(context))); + TRACE("allocate memory block (%ld)\n",MAKELONG(CX_reg(context),BX_reg(context))); if (!(ptr = (BYTE *)DPMI_xalloc(MAKELONG(CX_reg(context), BX_reg(context))))) { AX_reg(context) = 0x8012; /* linear memory not available */ @@ -1093,14 +1093,14 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context ) break; case 0x0502: /* Free memory block */ - TRACE(int31, "free memory block (0x%08lx)\n", + TRACE("free memory block (0x%08lx)\n", W32S_APP2WINE(MAKELONG(DI_reg(context),SI_reg(context)), offset)); DPMI_xfree( (void *)W32S_APP2WINE(MAKELONG(DI_reg(context), SI_reg(context)), offset) ); break; case 0x0503: /* Resize memory block */ - TRACE(int31, "resize memory block (0x%08lx,%ld)\n", + TRACE("resize memory block (0x%08lx,%ld)\n", W32S_APP2WINE(MAKELONG(DI_reg(context),SI_reg(context)), offset), MAKELONG(CX_reg(context),BX_reg(context))); if (!(ptr = (BYTE *)DPMI_xrealloc( @@ -1116,41 +1116,41 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context ) break; case 0x0507: /* Modify page attributes */ - FIXME(int31,"modify page attributes unimplemented\n"); + FIXME("modify page attributes unimplemented\n"); break; /* Just ignore it */ case 0x0600: /* Lock linear region */ - FIXME(int31,"lock linear region unimplemented\n"); + FIXME("lock linear region unimplemented\n"); break; /* Just ignore it */ case 0x0601: /* Unlock linear region */ - FIXME(int31,"unlock linear region unimplemented\n"); + FIXME("unlock linear region unimplemented\n"); break; /* Just ignore it */ case 0x0602: /* Unlock real-mode region */ - FIXME(int31,"unlock realmode region unimplemented\n"); + FIXME("unlock realmode region unimplemented\n"); break; /* Just ignore it */ case 0x0603: /* Lock real-mode region */ - FIXME(int31,"lock realmode region unimplemented\n"); + FIXME("lock realmode region unimplemented\n"); break; /* Just ignore it */ case 0x0604: /* Get page size */ - TRACE(int31,"get pagesize\n"); + TRACE("get pagesize\n"); BX_reg(context) = 0; CX_reg(context) = VIRTUAL_GetPageSize(); break; case 0x0702: /* Mark page as demand-paging candidate */ - FIXME(int31,"mark page as demand-paging candidate\n"); + FIXME("mark page as demand-paging candidate\n"); break; /* Just ignore it */ case 0x0703: /* Discard page contents */ - FIXME(int31,"discard page contents\n"); + FIXME("discard page contents\n"); break; /* Just ignore it */ case 0x0800: /* Physical address mapping */ - FIXME(int31,"map real to linear (0x%08lx)\n",MAKELONG(CX_reg(context),BX_reg(context))); + FIXME("map real to linear (0x%08lx)\n",MAKELONG(CX_reg(context),BX_reg(context))); if(!(ptr=DOSMEM_MapRealToLinear(MAKELONG(CX_reg(context),BX_reg(context))))) { AX_reg(context) = 0x8021; diff --git a/msdos/int09.c b/msdos/int09.c index 2e025540e5d74202db520bb28157fd874a14ad82..3852ae6f438fdf2565a139d00d5839b9d5609cbc 100644 --- a/msdos/int09.c +++ b/msdos/int09.c @@ -7,7 +7,7 @@ #include "winuser.h" #include "miscemu.h" #include "input.h" -#include "debug.h" +#include "debugtools.h" #include "dosexe.h" DEFAULT_DEBUG_CHANNEL(int) @@ -32,7 +32,7 @@ void WINAPI INT_Int09Handler( CONTEXT86 *context ) /* as in TranslateMessage, windows/input.c */ cnt = ToAscii(vkey, scan&0x7f, QueueKeyStateTable, (LPWORD)ch, 0); if (cnt==1) { - FIXME(int,"enter character %c into console input, not implemented\n",ch[0]); + FIXME("enter character %c into console input, not implemented\n",ch[0]); } } DOSVM_PIC_ioport_out(0x20, 0x20); /* send EOI */ diff --git a/msdos/int10.c b/msdos/int10.c index 69138a7e7d5afca452fb2fb5074d5d9aa6ae9fe7..ef2ec83f5634f80aa83c2f82711f093e9b9e071c 100644 --- a/msdos/int10.c +++ b/msdos/int10.c @@ -5,7 +5,7 @@ #include <stdlib.h> #include "miscemu.h" #include "vga.h" -#include "debug.h" +#include "debugtools.h" #include "console.h" DEFAULT_DEBUG_CHANNEL(int10) @@ -101,12 +101,12 @@ void WINAPI INT_Int10Handler( CONTEXT86 *context ) switch(AH_reg(context)) { case 0x00: /* GET SuperVGA INFORMATION */ - FIXME(int10, "Vesa Get SuperVGA Info STUB!\n"); + FIXME("Vesa Get SuperVGA Info STUB!\n"); AL_reg(context) = 0x4f; AH_reg(context) = 0x01; /* 0x01=failed 0x00=succesful */ break; case 0x01: /* GET SuperVGA MODE INFORMATION */ - FIXME(int10, "VESA GET SuperVGA Mode Information - Not supported\n"); + FIXME("VESA GET SuperVGA Mode Information - Not supported\n"); AL_reg(context) = 0x4f; AH_reg(context) = 0x01; /* 0x00 = successful 0x01 = failed */ break; @@ -116,7 +116,7 @@ void WINAPI INT_Int10Handler( CONTEXT86 *context ) case 0x00: /* 40x25 */ case 0x01: VGA_Exit(); - TRACE(int10, "Set VESA Text Mode - 0x0%x\n", + TRACE("Set VESA Text Mode - 0x0%x\n", BX_reg(context)); CONSOLE_ResizeScreen(40, 25); CONSOLE_ClearScreen(); @@ -126,129 +126,129 @@ void WINAPI INT_Int10Handler( CONTEXT86 *context ) case 0x03: case 0x07: VGA_Exit(); - TRACE(int10, "Set VESA Text Mode - 0x0%x\n", + TRACE("Set VESA Text Mode - 0x0%x\n", BX_reg(context)); CONSOLE_ResizeScreen(80, 25); CONSOLE_ClearScreen(); DOSMEM_BiosData()->VideoColumns = 80; break; case 0x0D: - TRACE(int10, "Setting VESA 320x200 16-color mode\n"); + TRACE("Setting VESA 320x200 16-color mode\n"); VGA_SetMode(320,200,4); break; case 0x0E: - TRACE(int10, "Setting VESA 640x200 16-color mode\n"); + TRACE("Setting VESA 640x200 16-color mode\n"); VGA_SetMode(640,200,4); break; case 0x10: - TRACE(int10, "Setting VESA 640x350 16-color mode\n"); + TRACE("Setting VESA 640x350 16-color mode\n"); VGA_SetMode(640,350,4); break; case 0x12: - TRACE(int10, "Setting VESA 640x480 16-color mode\n"); + TRACE("Setting VESA 640x480 16-color mode\n"); VGA_SetMode(640,480,4); break; case 0x13: - TRACE(int10, "Setting VESA 320x200 256-color mode\n"); + TRACE("Setting VESA 320x200 256-color mode\n"); VGA_SetMode(320,200,8); break; /* VBE Modes */ case 0x100: - TRACE(int10, "Setting VESA 640x400 256-color mode\n"); + TRACE("Setting VESA 640x400 256-color mode\n"); VGA_SetMode(640,400,8); break; case 0x101: - TRACE(int10, "Setting VESA 640x480 256-color mode\n"); + TRACE("Setting VESA 640x480 256-color mode\n"); VGA_SetMode(640,480,8); break; case 0x102: - TRACE(int10, "Setting VESA 800x600 16-color mode\n"); + TRACE("Setting VESA 800x600 16-color mode\n"); VGA_SetMode(800,600,4); break; case 0x103: - TRACE(int10, "Setting VESA 800x600 256-color mode\n"); + TRACE("Setting VESA 800x600 256-color mode\n"); VGA_SetMode(800,600,8); break; case 0x104: - TRACE(int10, "Setting VESA 1024x768 16-color mode\n"); + TRACE("Setting VESA 1024x768 16-color mode\n"); VGA_SetMode(1024,768,4); break; case 0x105: - TRACE(int10, "Setting VESA 1024x768 256-color mode\n"); + TRACE("Setting VESA 1024x768 256-color mode\n"); VGA_SetMode(1024,768,8); break; case 0x106: - TRACE(int10, "Setting VESA 1280x1024 16-color mode\n"); + TRACE("Setting VESA 1280x1024 16-color mode\n"); VGA_SetMode(1280,1024,4); break; case 0x107: - TRACE(int10, "Setting VESA 1280x1024 256-color mode\n"); + TRACE("Setting VESA 1280x1024 256-color mode\n"); VGA_SetMode(1280,1024,8); break; /* 108h - 10Ch are text modes and im lazy so :p */ /* VBE v1.2+ */ case 0x10D: - TRACE(int10, "Setting VESA 320x200 15bpp\n"); + TRACE("Setting VESA 320x200 15bpp\n"); VGA_SetMode(320,200,15); break; case 0x10E: - TRACE(int10, "Setting VESA 320x200 16bpp\n"); + TRACE("Setting VESA 320x200 16bpp\n"); VGA_SetMode(320,200,16); break; case 0x10F: - TRACE(int10, "Setting VESA 320x200 24bpp\n"); + TRACE("Setting VESA 320x200 24bpp\n"); VGA_SetMode(320,200,24); break; case 0x110: - TRACE(int10, "Setting VESA 640x480 15bpp\n"); + TRACE("Setting VESA 640x480 15bpp\n"); VGA_SetMode(640,480,15); break; case 0x111: - TRACE(int10, "Setting VESA 640x480 16bpp\n"); + TRACE("Setting VESA 640x480 16bpp\n"); VGA_SetMode(640,480,16); break; case 0x112: - TRACE(int10, "Setting VESA 640x480 24bpp\n"); + TRACE("Setting VESA 640x480 24bpp\n"); VGA_SetMode(640,480,24); break; case 0x113: - TRACE(int10, "Setting VESA 800x600 15bpp\n"); + TRACE("Setting VESA 800x600 15bpp\n"); VGA_SetMode(800,600,15); break; case 0x114: - TRACE(int10, "Setting VESA 800x600 16bpp\n"); + TRACE("Setting VESA 800x600 16bpp\n"); VGA_SetMode(800,600,16); break; case 0x115: - TRACE(int10, "Setting VESA 800x600 24bpp\n"); + TRACE("Setting VESA 800x600 24bpp\n"); VGA_SetMode(800,600,24); break; case 0x116: - TRACE(int10, "Setting VESA 1024x768 15bpp\n"); + TRACE("Setting VESA 1024x768 15bpp\n"); VGA_SetMode(1024,768,15); break; case 0x117: - TRACE(int10, "Setting VESA 1024x768 16bpp\n"); + TRACE("Setting VESA 1024x768 16bpp\n"); VGA_SetMode(1024,768,16); break; case 0x118: - TRACE(int10, "Setting VESA 1024x768 24bpp\n"); + TRACE("Setting VESA 1024x768 24bpp\n"); VGA_SetMode(1024,768,24); break; case 0x119: - TRACE(int10, "Setting VESA 1280x1024 15bpp\n"); + TRACE("Setting VESA 1280x1024 15bpp\n"); VGA_SetMode(1280,1024,15); break; case 0x11A: - TRACE(int10, "Setting VESA 1280x1024 16bpp\n"); + TRACE("Setting VESA 1280x1024 16bpp\n"); VGA_SetMode(1280,1024,16); break; case 0x11B: - TRACE(int10, "Setting VESA 1280x1024 24bpp\n"); + TRACE("Setting VESA 1280x1024 24bpp\n"); VGA_SetMode(1280,1024,24); break; default: - FIXME(int10,"VESA Set Video Mode (0x%x) - Not Supported\n", BX_reg(context)); + FIXME("VESA Set Video Mode (0x%x) - Not Supported\n", BX_reg(context)); } DOSMEM_BiosData()->VideoMode = BX_reg(context); AL_reg(context) = 0x4f; @@ -260,43 +260,43 @@ void WINAPI INT_Int10Handler( CONTEXT86 *context ) BX_reg(context) = DOSMEM_BiosData()->VideoMode; break; case 0x04: /* VESA SuperVGA BIOS - SAVE/RESTORE SuperVGA VIDEO STATE */ - ERR(int10,"VESA SAVE/RESTORE Video State - Not Implemented\n"); + ERR("VESA SAVE/RESTORE Video State - Not Implemented\n"); /* AL_reg(context) = 0x4f; = supported so dont set since not implemented */ /* maby we should do this instead ? */ /* AH_reg(context = 0x01; not implemented so just fail */ break; case 0x05: /* VESA SuperVGA BIOS - CPU VIDEO MEMORY CONTROL */ - ERR(int10,"VESA CPU VIDEO MEMORY CONTROL\n"); + ERR("VESA CPU VIDEO MEMORY CONTROL\n"); /* AL_reg(context) = 0x4f; = supported so dont set since not implemented */ /* maby we should do this instead ? */ /* AH_reg(context = 0x001; not implemented so just fail */ break; case 0x06: /* VESA GET/SET LOGICAL SCAN LINE LENGTH */ - ERR(int10,"VESA GET/SET LOGICAL SCAN LINE LENGTH - Not Implemented\n"); + ERR("VESA GET/SET LOGICAL SCAN LINE LENGTH - Not Implemented\n"); /* AL_reg(context) = 0x4f; = supported so dont set since not implemented */ /* maby we should do this instead ? */ /* AH_reg(context = 0x001; not implemented so just fail */ break; case 0x07: /* GET/SET DISPLAY START */ - ERR(int10,"VESA GET/SET DISPLAY START - Not Implemented\n"); + ERR("VESA GET/SET DISPLAY START - Not Implemented\n"); /* AL_reg(context) = 0x4f; = supported so dont set since not implemented */ /* maby we should do this instead ? */ /* AH_reg(context = 0x001; not implemented so just fail */ break; case 0x08: /* GET/SET DAC PALETTE CONTROL */ - ERR(int10,"VESA GET/SET DAC PALETTE CONTROL- Not Implemented\n"); + ERR("VESA GET/SET DAC PALETTE CONTROL- Not Implemented\n"); /* AL_reg(context) = 0x4f; = supported so dont set since not implemented */ /* maby we should do this instead ? */ /* AH_reg(context = 0x001; not implemented so just fail */ break; case 0x09: /* SET PALETTE ENTRIES */ - FIXME(int10, "VESA Set palette entries - not implemented\n"); + FIXME("VESA Set palette entries - not implemented\n"); break; case 0xff: /* Turn VESA ON/OFF */ /* i dont know what to do */ break; default: - FIXME(int10,"VESA Function (0x%x) - Not Supported\n", AH_reg(context)); + FIXME("VESA Function (0x%x) - Not Supported\n", AH_reg(context)); break; } } @@ -318,7 +318,7 @@ else { case 0x00: /* 40x25 */ case 0x01: VGA_Exit(); - TRACE(int10, "Set Video Mode - Set to Text - 0x0%x\n", + TRACE("Set Video Mode - Set to Text - 0x0%x\n", AL_reg(context)); CONSOLE_ResizeScreen(40, 25); CONSOLE_ClearScreen(); @@ -328,41 +328,41 @@ else { case 0x03: case 0x07: VGA_Exit(); - TRACE(int10, "Set Video Mode - Set to Text - 0x0%x\n", + TRACE("Set Video Mode - Set to Text - 0x0%x\n", AL_reg(context)); CONSOLE_ResizeScreen(80, 25); CONSOLE_ClearScreen(); DOSMEM_BiosData()->VideoColumns = 80; break; case 0x0D: - TRACE(int10, "Setting VGA 320x200 16-color mode\n"); + TRACE("Setting VGA 320x200 16-color mode\n"); VGA_SetMode(320,200,4); break; case 0x0E: - TRACE(int10, "Setting VGA 640x200 16-color mode\n"); + TRACE("Setting VGA 640x200 16-color mode\n"); VGA_SetMode(640,200,4); break; case 0x10: - TRACE(int10, "Setting VGA 640x350 16-color mode\n"); + TRACE("Setting VGA 640x350 16-color mode\n"); VGA_SetMode(640,350,4); break; case 0x12: - TRACE(int10, "Setting VGA 640x480 16-color mode\n"); + TRACE("Setting VGA 640x480 16-color mode\n"); VGA_SetMode(640,480,4); break; case 0x13: - TRACE(int10, "Setting VGA 320x200 256-color mode\n"); + TRACE("Setting VGA 320x200 256-color mode\n"); VGA_SetMode(320,200,8); break; default: - FIXME(int10, "Set Video Mode (0x%x) - Not Supported\n", + FIXME("Set Video Mode (0x%x) - Not Supported\n", AL_reg(context)); } DOSMEM_BiosData()->VideoMode = AL_reg(context); break; case 0x01: /* SET CURSOR SHAPE */ - FIXME(int10, "Set Cursor Shape - Not Supported\n"); + FIXME("Set Cursor Shape - Not Supported\n"); break; case 0x02: /* SET CURSOR POSITION */ @@ -371,13 +371,13 @@ else { /* DL = Column */ /* 0 is top */ if (BH_reg(context)) { - FIXME(int10, "Set Cursor Position: Cannot set to page %d\n", + FIXME("Set Cursor Position: Cannot set to page %d\n", BH_reg(context)); } else { CONSOLE_MoveCursor(DH_reg(context), DL_reg(context)); - TRACE(int10, "Set Cursor Position: %d %d\n", DH_reg(context), + TRACE("Set Cursor Position: %d %d\n", DH_reg(context), DL_reg(context)); } break; @@ -386,7 +386,7 @@ else { { CHAR row, col; - FIXME(int10, "Get cursor position and size - partially supported\n"); + FIXME("Get cursor position and size - partially supported\n"); CX_reg(context) = 0x0a0b; /* Bogus cursor data */ CONSOLE_GetCursorPosition(&row, &col); DH_reg(context) = row; @@ -395,12 +395,12 @@ else { break; case 0x04: /* READ LIGHT PEN POSITION */ - FIXME(int10, "Read Light Pen Position - Not Supported\n"); + FIXME("Read Light Pen Position - Not Supported\n"); AH_reg(context) = 0x00; /* Not down */ break; case 0x05: /* SELECT ACTIVE DISPLAY PAGE */ - FIXME(int10, "Select Active Display Page - Not Supported\n"); + FIXME("Select Active Display Page - Not Supported\n"); break; case 0x06: /* SCROLL UP WINDOW */ @@ -411,7 +411,7 @@ else { scroll_window(SCROLL_UP, AL_reg(context), CH_reg(context), CL_reg(context), DH_reg(context), DL_reg(context), BH_reg(context)); - TRACE(int10, "Scroll Up Window %d\n", AL_reg(context)); + TRACE("Scroll Up Window %d\n", AL_reg(context)); break; case 0x07: /* SCROLL DOWN WINDOW */ @@ -422,7 +422,7 @@ else { scroll_window(SCROLL_DOWN, AL_reg(context), CH_reg(context), CL_reg(context), DH_reg(context), DL_reg(context), BH_reg(context)); - TRACE(int10, "Scroll Down Window %d\n", AL_reg(context)); + TRACE("Scroll Down Window %d\n", AL_reg(context)); break; case 0x08: /* READ CHARACTER AND ATTRIBUTE AT CURSOR POSITION */ @@ -432,14 +432,14 @@ else { int bg, fg, attr; if (BH_reg(context)) /* Write to different page */ { - FIXME(int10, "Read character and attribute at cursor position -" + FIXME("Read character and attribute at cursor position -" " Can't read from non-0 page\n"); AL_reg(context) = ' '; /* That page is blank */ AH_reg(context) = 7; } else { - TRACE(int10, + TRACE( "Read Character and Attribute at Cursor Position\n"); CONSOLE_GetCharacterAtCursor(&ch, &fg, &bg, &attr); AL_reg(context) = ch; @@ -457,10 +457,10 @@ else { write_char_attribute_at_cursor(AL_reg(context), BH_reg(context), BL_reg(context), CX_reg(context)); if (CX_reg(context) > 1) - TRACE(int10, "Write Character and Attribute at Cursor Position " + TRACE("Write Character and Attribute at Cursor Position " "(Rep. %d) %c\n", CX_reg(context), AL_reg(context)); else - TRACE(int10, "Write Character and Attribute at Cursor" + TRACE("Write Character and Attribute at Cursor" "Position: %c\n", AL_reg(context)); break; @@ -468,7 +468,7 @@ else { /* AL = Character to display. */ /* BH = Page Number */ /* We can't write to non-0 pages, yet. */ /* CX = Times to Write Char */ - TRACE(int10, "Write Character at Cursor\n"); + TRACE("Write Character at Cursor\n"); write_char_attribute_at_cursor(AL_reg(context), BH_reg(context), 0, CX_reg(context)); break; @@ -485,16 +485,16 @@ else { apparantly, the foreground or attribute of the background with this call, so we should check first to see what the foreground already is... FIXME */ - TRACE(int10, "Set Background/Border Color: %d\n", + TRACE("Set Background/Border Color: %d\n", BL_reg(context)); CONSOLE_SetBackgroundColor(color_palette[0], color_palette[BL_reg(context)]); break; case 0x01: /* SET PALETTE */ - FIXME(int10, "Set Palette - Not Supported\n"); + FIXME("Set Palette - Not Supported\n"); break; default: - FIXME(int10, "INT 10 AH = 0x0b BH = 0x%x - Unknown\n", + FIXME("INT 10 AH = 0x0b BH = 0x%x - Unknown\n", BH_reg(context)); break; } @@ -502,21 +502,21 @@ else { case 0x0c: /* WRITE GRAPHICS PIXEL */ /* Not in graphics mode, can ignore w/o error */ - FIXME(int10, "Write Graphics Pixel - Not Supported\n"); + FIXME("Write Graphics Pixel - Not Supported\n"); break; case 0x0d: /* READ GRAPHICS PIXEL */ /* Not in graphics mode, can ignore w/o error */ - FIXME(int10, "Read Graphics Pixel - Not Supported\n"); + FIXME("Read Graphics Pixel - Not Supported\n"); break; case 0x0e: /* TELETYPE OUTPUT */ - TRACE(int10, "Teletype Output\n"); + TRACE("Teletype Output\n"); CONSOLE_Write(AL_reg(context), 0, 0, 0); break; case 0x0f: /* GET CURRENT VIDEO MODE */ - TRACE(int10, "Get current video mode\n"); + TRACE("Get current video mode\n"); /* Note: This should not be a constant value. */ AL_reg(context) = DOSMEM_BiosData()->VideoMode; AH_reg(context) = DOSMEM_BiosData()->VideoColumns; @@ -526,59 +526,59 @@ else { case 0x10: switch AL_reg(context) { case 0x00: /* SET SINGLE PALETTE REGISTER */ - FIXME(int10, "Set Single Palette Register - Not Supported\n"); + FIXME("Set Single Palette Register - Not Supported\n"); break; case 0x01: /* SET BORDER (OVERSCAN) */ /* Text terminals have no overscan */ - TRACE(int10, "Set Border (Overscan) - Ignored\n"); + TRACE("Set Border (Overscan) - Ignored\n"); break; case 0x02: /* SET ALL PALETTE REGISTERS */ - FIXME(int10, "Set all palette registers - Not Supported\n"); + FIXME("Set all palette registers - Not Supported\n"); break; case 0x03: /* TOGGLE INTENSITY/BLINKING BIT */ - FIXME(int10, "Toggle Intensity/Blinking Bit - Not Supported\n"); + FIXME("Toggle Intensity/Blinking Bit - Not Supported\n"); break; case 0x07: /* GET INDIVIDUAL PALETTE REGISTER */ - FIXME(int10, "Get Individual Palette Register - Not Supported\n"); + FIXME("Get Individual Palette Register - Not Supported\n"); break; case 0x08: /* READ OVERSCAN (BORDER COLOR) REGISTER */ - FIXME(int10, + FIXME( "Read Overscan (Border Color) Register - Not Supported\n"); break; case 0x09: /* READ ALL PALETTE REGISTERS AND OVERSCAN REGISTER */ - FIXME(int10, + FIXME( "Read All Palette Registers and Overscan Register " " - Not Supported\n"); break; case 0x10: /* SET INDIVIDUAL DAC REGISTER */ - FIXME(int10, "Set Individual DAC register - Not Supported\n"); + FIXME("Set Individual DAC register - Not Supported\n"); break; case 0x12: /* SET BLOCK OF DAC REGISTERS */ - FIXME(int10, "Set Block of DAC registers - Not Supported\n"); + FIXME("Set Block of DAC registers - Not Supported\n"); break; case 0x13: /* SELECT VIDEO DAC COLOR PAGE */ - FIXME(int10, "Select video DAC color page - Not Supported\n"); + FIXME("Select video DAC color page - Not Supported\n"); break; case 0x15: /* READ INDIVIDUAL DAC REGISTER */ - FIXME(int10, "Read individual DAC register - Not Supported\n"); + FIXME("Read individual DAC register - Not Supported\n"); break; case 0x17: /* READ BLOCK OF DAC REGISTERS */ - FIXME(int10, "Read block of DAC registers - Not Supported\n"); + FIXME("Read block of DAC registers - Not Supported\n"); break; case 0x18: /* SET PEL MASK */ - FIXME(int10, "Set PEL mask - Not Supported\n"); + FIXME("Set PEL mask - Not Supported\n"); break; case 0x19: /* READ PEL MASK */ - FIXME(int10, "Read PEL mask - Not Supported\n"); + FIXME("Read PEL mask - Not Supported\n"); break; case 0x1a: /* GET VIDEO DAC COLOR PAGE STATE */ - FIXME(int10, "Get video DAC color page state - Not Supported\n"); + FIXME("Get video DAC color page state - Not Supported\n"); break; case 0x1b: /* PERFORM GRAY-SCALE SUMMING */ - FIXME(int10, "Perform Gray-scale summing - Not Supported\n"); + FIXME("Perform Gray-scale summing - Not Supported\n"); break; default: - FIXME(int10, "INT 10 AH = 0x10 AL = 0x%x - Unknown\n", + FIXME("INT 10 AH = 0x10 AL = 0x%x - Unknown\n", AL_reg(context)); break; } @@ -590,45 +590,45 @@ else { switch AL_reg(context) { case 0x00: /* LOAD USER SPECIFIED PATTERNS */ case 0x10: - FIXME(int10, "Load User Specified Patterns - Not Supported\n"); + FIXME("Load User Specified Patterns - Not Supported\n"); break; case 0x01: /* LOAD ROM MONOCHROME PATTERNS */ case 0x11: - FIXME(int10, "Load ROM Monochrome Patterns - Not Supported\n"); + FIXME("Load ROM Monochrome Patterns - Not Supported\n"); break; case 0x02: /* LOAD ROM 8x8 DOUBLE-DOT PATTERNS */ case 0x12: - FIXME(int10, + FIXME( "Load ROM 8x8 Double Dot Patterns - Not Supported\n"); break; case 0x03: /* SET BLOCK SPECIFIER */ - FIXME(int10, "Set Block Specifier - Not Supported\n"); + FIXME("Set Block Specifier - Not Supported\n"); break; case 0x04: /* LOAD ROM 8x16 CHARACTER SET */ case 0x14: - FIXME(int10, "Load ROM 8x16 Character Set - Not Supported\n"); + FIXME("Load ROM 8x16 Character Set - Not Supported\n"); break; case 0x20: /* SET USER 8x16 GRAPHICS CHARS */ - FIXME(int10, "Set User 8x16 Graphics Chars - Not Supported\n"); + FIXME("Set User 8x16 Graphics Chars - Not Supported\n"); break; case 0x21: /* SET USER GRAPICS CHARACTERS */ - FIXME(int10, "Set User Graphics Characters - Not Supported\n"); + FIXME("Set User Graphics Characters - Not Supported\n"); break; case 0x22: /* SET ROM 8x14 GRAPHICS CHARS */ - FIXME(int10, "Set ROM 8x14 Graphics Chars - Not Supported\n"); + FIXME("Set ROM 8x14 Graphics Chars - Not Supported\n"); break; case 0x23: /* SET ROM 8x8 DBL DOT CHARS */ - FIXME(int10, + FIXME( "Set ROM 8x8 Dbl Dot Chars (Graphics) - Not Supported\n"); break; case 0x24: /* LOAD 8x16 GRAPHIC CHARS */ - FIXME(int10, "Load 8x16 Graphic Chars - Not Supported\n"); + FIXME("Load 8x16 Graphic Chars - Not Supported\n"); break; case 0x30: /* GET FONT INFORMATION */ - FIXME(int10, "Get Font Information - Not Supported\n"); + FIXME("Get Font Information - Not Supported\n"); break; default: - FIXME(int10, "INT 10 AH = 0x11 AL = 0x%x - Unknown\n", + FIXME("INT 10 AH = 0x11 AL = 0x%x - Unknown\n", AL_reg(context)); break; } @@ -637,7 +637,7 @@ else { case 0x12: /* ALTERNATE FUNCTION SELECT */ switch BL_reg(context) { case 0x10: /* GET EGA INFO */ - TRACE(int10, "EGA info requested\n"); + TRACE("EGA info requested\n"); BH_reg(context) = 0x00; /* Color screen */ BL_reg(context) = DOSMEM_BiosData()->ModeOptions >> 5; /* EGA memory size */ @@ -645,33 +645,33 @@ else { DOSMEM_BiosData()->FeatureBitsSwitches; break; case 0x20: /* ALTERNATE PRTSC */ - FIXME(int10, "Install Alternate Print Screen - Not Supported\n"); + FIXME("Install Alternate Print Screen - Not Supported\n"); break; case 0x30: /* SELECT VERTICAL RESOULTION */ - FIXME(int10, "Select vertical resolution - not supported\n"); + FIXME("Select vertical resolution - not supported\n"); break; case 0x31: /* ENABLE/DISABLE DEFAULT PALETTE LOADING */ - FIXME(int10, "Default palette loading - not supported\n"); + FIXME("Default palette loading - not supported\n"); DOSMEM_BiosData()->VGASettings = (DOSMEM_BiosData()->VGASettings & 0xf7) | ((AL_reg(context) == 1) << 3); break; case 0x32: /* ENABLE/DISABLE VIDEO ADDRERSSING */ - FIXME(int10, "Video Addressing - Not Supported\n"); + FIXME("Video Addressing - Not Supported\n"); break; case 0x33: /* ENABLE/DISABLE GRAY SCALE SUMMING */ - FIXME(int10, "Gray Scale Summing - Not Supported\n"); + FIXME("Gray Scale Summing - Not Supported\n"); break; case 0x34: /* ENABLE/DISABLE CURSOR EMULATION */ - TRACE(int10, "Set cursor emulation to %d\n", AL_reg(context)); + TRACE("Set cursor emulation to %d\n", AL_reg(context)); DOSMEM_BiosData()->ModeOptions = (DOSMEM_BiosData()->ModeOptions & 0xfe)|(AL_reg(context) == 1); break; case 0x36: /* VIDEO ADDRESS CONTROL */ - FIXME(int10, "Video Address Control - Not Supported\n"); + FIXME("Video Address Control - Not Supported\n"); break; default: - FIXME(int10, "INT 10 AH = 0x11 AL = 0x%x - Unknown\n", + FIXME("INT 10 AH = 0x11 AL = 0x%x - Unknown\n", AL_reg(context)); break; } @@ -679,29 +679,29 @@ else { case 0x13: /* WRITE STRING */ /* This one does not imply that string be at cursor. */ - FIXME(int10, "Write String - Not Supported\n"); + FIXME("Write String - Not Supported\n"); break; case 0x1a: switch AL_reg(context) { case 0x00: /* GET DISPLAY COMBINATION CODE */ - TRACE(int10, "Get Display Combination Code\n"); + TRACE("Get Display Combination Code\n"); AX_reg(context) = 0x001a; BL_reg(context) = 0x08; /* VGA w/ color analog display */ BH_reg(context) = 0x00; /* No secondary hardware */ break; case 0x01: /* SET DISPLAY COMBINATION CODE */ - FIXME(int10, "Set Display Combination Code - Not Supported\n"); + FIXME("Set Display Combination Code - Not Supported\n"); break; default: - FIXME(int10, "INT 10 AH = 0x1a AL = 0x%x - Unknown\n", + FIXME("INT 10 AH = 0x1a AL = 0x%x - Unknown\n", AL_reg(context)); break; } break; case 0x1b: /* FUNCTIONALITY/STATE INFORMATION */ - FIXME(int10, "Get functionality/state information - partially implemented\n"); + FIXME("Get functionality/state information - partially implemented\n"); if (BX_reg(context) == 0x0) { AL_reg(context) = 0x1b; @@ -714,7 +714,7 @@ else { break; case 0x1c: /* SAVE/RESTORE VIDEO STATE */ - FIXME(int10, "Save/Restore Video State - Not Supported\n"); + FIXME("Save/Restore Video State - Not Supported\n"); break; case 0x4f: /* Get SuperVGA INFORMATION */ @@ -723,7 +723,7 @@ else { CTX_SEG_OFF_TO_LIN(context, ES_reg(context), EDI_reg(context)); /* BOOL16 vesa20 = (*(DWORD *)p == *(DWORD *)"VBE2"); */ - TRACE(int10, "Get SuperVGA information\n"); + TRACE("Get SuperVGA information\n"); AH_reg(context) = 0; *(DWORD *)p = *(DWORD *)"VESA"; *(WORD *)(p+0x04) = 0x0200; /* VESA 2.0 */ @@ -732,7 +732,7 @@ else { } break; default: - FIXME(int10, "Unknown - 0x%x\n", AH_reg(context)); + FIXME("Unknown - 0x%x\n", AH_reg(context)); INT_BARF( context, 0x10 ); } } @@ -751,14 +751,14 @@ static void write_char_attribute_at_cursor(char output, char page_num, if (page_num) /* Only support one text page right now */ { - FIXME(int10, "Cannot write to alternate page %d", page_num); + FIXME("Cannot write to alternate page %d", page_num); return; } conv_text_mode_attributes(attribute, &fg_color, &bg_color, &wattribute); - TRACE(int10, "Fore: %d Back: %d\n", fg_color, bg_color); + TRACE("Fore: %d Back: %d\n", fg_color, bg_color); CONSOLE_GetCursorPosition(&x, &y); diff --git a/msdos/int11.c b/msdos/int11.c index ebc5e1bebafdf3e6341a8c7b403482aee6cba756..f6e9d72f7ea50d6223b8343bd012502aeb6d88a6 100644 --- a/msdos/int11.c +++ b/msdos/int11.c @@ -6,7 +6,7 @@ #include "miscemu.h" #include "msdos.h" #include "drive.h" -#include "debug.h" +#include "debugtools.h" /********************************************************************** * INT_Int11Handler diff --git a/msdos/int13.c b/msdos/int13.c index 7fff05e28e5fcd0336a5b223b893f18d8167a1d2..5574d4783b6c0393f5ef51afee125104d9e0969a 100644 --- a/msdos/int13.c +++ b/msdos/int13.c @@ -13,7 +13,7 @@ #endif #include "miscemu.h" /* #define DEBUG_INT */ -#include "debug.h" +#include "debugtools.h" #include "drive.h" DEFAULT_DEBUG_CHANNEL(int) @@ -79,7 +79,7 @@ void WINAPI INT_Int13Handler( CONTEXT86 *context ) if ( (floppy_fd = DRIVE_OpenDevice( drive_nr, O_NONBLOCK)) == -1) { - WARN(int, "(GET DRIVE PARAMETERS): Can't determine floppy geometry !\n"); + WARN("(GET DRIVE PARAMETERS): Can't determine floppy geometry !\n"); BX_reg(context) = 0; CX_reg(context) = 0; DH_reg(context) = 0; diff --git a/msdos/int15.c b/msdos/int15.c index 17be10d515bb976ecdd75afa835bc224f15262fe..32ee1146caf05fcc789a6faabeaad10d6a79cbda 100644 --- a/msdos/int15.c +++ b/msdos/int15.c @@ -4,7 +4,7 @@ #include <stdlib.h> #include "miscemu.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(int) @@ -40,10 +40,10 @@ void WINAPI INT_Int15Handler( CONTEXT86 *context ) switch(BH_reg(context)) { case 0x00: - FIXME(int, "Disable Pointing Device - not implemented\n"); + FIXME("Disable Pointing Device - not implemented\n"); break; case 0x01: - FIXME(int, "Enable Pointing Device - not implemented\n"); + FIXME("Enable Pointing Device - not implemented\n"); break; default: INT_BARF( context, 0x15 ); @@ -53,11 +53,11 @@ void WINAPI INT_Int15Handler( CONTEXT86 *context ) break; case 0x02: /* Set Sampling Rate */ /* BH = sampling rate */ - FIXME(int, "Set Sampling Rate - not implemented\n"); + FIXME("Set Sampling Rate - not implemented\n"); AH_reg(context) = 0x00; /* successful */ break; case 0x04: /* Get Pointing Device Type */ - FIXME(int, "Get Pointing Device Type - not implemented\n"); + FIXME("Get Pointing Device Type - not implemented\n"); BH_reg(context) = 0x01;/*Device id FIXME what is it suposed to be?*/ break; default: diff --git a/msdos/int16.c b/msdos/int16.c index 9a78a96036deddb272440a696f408a07d0923c0f..1ef4c2b776f4e4a2affdbe8d93e2a04fc0448651 100644 --- a/msdos/int16.c +++ b/msdos/int16.c @@ -10,7 +10,7 @@ #include "module.h" #include "console.h" #include "wincon.h" -#include "debug.h" +#include "debugtools.h" #include "winuser.h" #include "miscemu.h" @@ -34,7 +34,7 @@ void WINAPI INT_Int16Handler( CONTEXT86 *context ) case 0x00: /* Get Keystroke */ /* Returns: AH = Scan code AL = ASCII character */ - TRACE(int16, "Get Keystroke\n"); + TRACE("Get Keystroke\n"); CONSOLE_GetKeystroke(&AH_reg(context), &AL_reg(context)); break; @@ -42,7 +42,7 @@ void WINAPI INT_Int16Handler( CONTEXT86 *context ) /* Returns: ZF set if no keystroke */ /* AH = Scan code */ /* AL = ASCII character */ - TRACE(int16, "Check for Keystroke\n"); + TRACE("Check for Keystroke\n"); if (!CONSOLE_CheckForKeystroke(&AH_reg(context), &AL_reg(context))) { SET_ZFLAG(context); @@ -72,25 +72,25 @@ void WINAPI INT_Int16Handler( CONTEXT86 *context ) AL_reg(context) |= 0x40; if (GetAsyncKeyState(VK_INSERT)) AL_reg(context) |= 0x80; - TRACE(int16, "Get Shift Flags: returning 0x%02x\n", AL_reg(context)); + TRACE("Get Shift Flags: returning 0x%02x\n", AL_reg(context)); break; case 0x03: /* Set Typematic Rate and Delay */ - FIXME(int16, "Set Typematic Rate and Delay - Not Supported\n"); + FIXME("Set Typematic Rate and Delay - Not Supported\n"); break; case 0x09: /* Get Keyboard Functionality */ - FIXME(int16, "Get Keyboard Functionality - Not Supported\n"); + FIXME("Get Keyboard Functionality - Not Supported\n"); /* As a temporary measure, say that "nothing" is supported... */ AL_reg(context) = 0; break; case 0x0a: /* Get Keyboard ID */ - FIXME(int16, "Get Keyboard ID - Not Supported\n"); + FIXME("Get Keyboard ID - Not Supported\n"); break; case 0x10: /* Get Enhanced Keystroke */ - TRACE(int16, "Get Enhanced Keystroke - Partially supported\n"); + TRACE("Get Enhanced Keystroke - Partially supported\n"); /* Returns: AH = Scan code AL = ASCII character */ CONSOLE_GetKeystroke(&AH_reg(context), &AL_reg(context)); @@ -101,7 +101,7 @@ void WINAPI INT_Int16Handler( CONTEXT86 *context ) /* Returns: ZF set if no keystroke */ /* AH = Scan code */ /* AL = ASCII character */ - TRACE(int16, "Check for Enhanced Keystroke - Partially supported\n"); + TRACE("Check for Enhanced Keystroke - Partially supported\n"); if (!CONSOLE_CheckForKeystroke(&AH_reg(context), &AL_reg(context))) { SET_ZFLAG(context); @@ -113,11 +113,11 @@ void WINAPI INT_Int16Handler( CONTEXT86 *context ) break; case 0x12: /* Get Extended Shift States */ - FIXME(int16, "Get Extended Shift States - Not Supported\n"); + FIXME("Get Extended Shift States - Not Supported\n"); break; default: - FIXME(int16, "Unknown INT 16 function - 0x%x\n", AH_reg(context)); + FIXME("Unknown INT 16 function - 0x%x\n", AH_reg(context)); break; } diff --git a/msdos/int17.c b/msdos/int17.c index 5fb337ab60057ac97703619252f91a92f8cb98d0..319e77379dbc732da19f2711b8d6c39d8eaee55b 100644 --- a/msdos/int17.c +++ b/msdos/int17.c @@ -5,7 +5,7 @@ #include <stdlib.h> #include "miscemu.h" -#include "debug.h" +#include "debugtools.h" #include "msdos.h" #include "drive.h" #include "winnt.h" @@ -22,11 +22,11 @@ void WINAPI INT_Int17Handler( CONTEXT86 *context ) switch( AH_reg(context) ) { case 0x01: /* PRINTER - INITIALIZE */ - FIXME(int17, "Initialize Printer - Not Supported\n"); + FIXME("Initialize Printer - Not Supported\n"); AH_reg(context) = 0; /* time out */ break; case 0x02: /* PRINTER - GET STATUS */ - FIXME(int17, "Get Printer Status - Not Supported\n"); + FIXME("Get Printer Status - Not Supported\n"); break; default: AH_reg(context) = 0; /* time out */ diff --git a/msdos/int19.c b/msdos/int19.c index f745e3501161acae6ad69a5be7e2e07bc841cda6..a469d0aa43fef6cc8731befb209f090f71481294 100644 --- a/msdos/int19.c +++ b/msdos/int19.c @@ -4,7 +4,7 @@ #include <stdlib.h> #include "miscemu.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(int19) @@ -16,5 +16,5 @@ DEFAULT_DEBUG_CHANNEL(int19) */ void WINAPI INT_Int19Handler( CONTEXT86 *context ) { - WARN(int19, "Attempted Reboot\n"); + WARN("Attempted Reboot\n"); } diff --git a/msdos/int1a.c b/msdos/int1a.c index 170d2b94a3b37c20c9ce197db4ed6d710d895bc5..2ab783d20a0903a30f562d3aa2b247b12e838547 100644 --- a/msdos/int1a.c +++ b/msdos/int1a.c @@ -7,7 +7,7 @@ #include <stdlib.h> #include "options.h" #include "miscemu.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(int) @@ -58,7 +58,7 @@ void WINAPI INT_Int1aHandler( CONTEXT86 *context ) CX_reg(context) = HIWORD(ticks); DX_reg(context) = LOWORD(ticks); AX_reg(context) = 0; /* No midnight rollover */ - TRACE(int,"int1a: AH=00 -- ticks=%ld\n", ticks); + TRACE("int1a: AH=00 -- ticks=%ld\n", ticks); break; case 0x02: diff --git a/msdos/int20.c b/msdos/int20.c index 1ad5b42625735f07b5d1f10a0d26e4854fc26bd4..a818acfb6d3b0f2b77b5db97bbb84ff1337f4e84 100644 --- a/msdos/int20.c +++ b/msdos/int20.c @@ -6,7 +6,7 @@ #include "winbase.h" #include "miscemu.h" /* #define DEBUG_INT */ -#include "debug.h" +#include "debugtools.h" #include "task.h" /********************************************************************** diff --git a/msdos/int21.c b/msdos/int21.c index c2ec5a35f8347f71babf9aeead6b8ff85fdeb60d..a1559226a84ae51f3175d4dac9640a61e285e87a 100644 --- a/msdos/int21.c +++ b/msdos/int21.c @@ -31,7 +31,7 @@ #include "miscemu.h" #include "dosexe.h" /* for the MZ_SUPPORTED define */ #include "module.h" -#include "debug.h" +#include "debugtools.h" #include "console.h" DEFAULT_DEBUG_CHANNEL(int21) @@ -91,7 +91,7 @@ static BOOL INT21_CreateHeap(void) { if (!(DosHeapHandle = GlobalAlloc16(GMEM_FIXED,sizeof(struct DosHeap)))) { - WARN(int21, "Out of memory\n"); + WARN("Out of memory\n"); return FALSE; } heap = (struct DosHeap *) GlobalLock16(DosHeapHandle); @@ -186,7 +186,7 @@ static void GetDrivePB( CONTEXT86 *context, int drive ) } else if (heap || INT21_CreateHeap()) { - FIXME(int21, "GetDrivePB not fully implemented.\n"); + FIXME("GetDrivePB not fully implemented.\n"); /* FIXME: I have no idea what a lot of this information should * say or whether it even really matters since we're not allowing @@ -225,7 +225,7 @@ static void ioctlGetDeviceInfo( CONTEXT86 *context ) int curr_drive; const DOS_DEVICE *dev; - TRACE(int21, "(%d)\n", BX_reg(context)); + TRACE("(%d)\n", BX_reg(context)); RESET_CFLAG(context); @@ -269,7 +269,7 @@ static BOOL ioctlGenericBlkDevReq( CONTEXT86 *context ) switch (CL_reg(context)) { case 0x4a: /* lock logical volume */ - TRACE(int21,"lock logical volume (%d) level %d mode %d\n",drive,BH_reg(context),DX_reg(context)); + TRACE("lock logical volume (%d) level %d mode %d\n",drive,BH_reg(context),DX_reg(context)); break; case 0x60: /* get device parameters */ @@ -334,7 +334,7 @@ static BOOL ioctlGenericBlkDevReq( CONTEXT86 *context ) break; case 0x6a: - TRACE(int21,"logical volume %d unlocked.\n",drive); + TRACE("logical volume %d unlocked.\n",drive); break; case 0x6f: @@ -366,7 +366,7 @@ static void INT21_ParseFileNameIntoFCB( CONTEXT86 *context ) AL_reg(context) = 0xff; /* failed */ - TRACE(int21, "filename: '%s'\n", filename); + TRACE("filename: '%s'\n", filename); buffer = HeapAlloc( GetProcessHeap(), 0, strlen(filename) + 1); @@ -383,7 +383,7 @@ static void INT21_ParseFileNameIntoFCB( CONTEXT86 *context ) *d = '\0'; DOSFS_ToDosFCBFormat(buffer, fcb + 1); *fcb = 0; - TRACE(int21, "FCB: '%s'\n", ((CHAR *)fcb + 1)); + TRACE("FCB: '%s'\n", ((CHAR *)fcb + 1)); HeapFree( GetProcessHeap(), 0, buffer); @@ -476,7 +476,7 @@ static BOOL INT21_ExtendedOpenCreateFile(CONTEXT86 *context ) _lclose16( AX_reg(context) ); AX_reg(context) = 0x0050; /*File exists*/ SET_CFLAG(context); - WARN(int21, "extended open/create: failed because file exists \n"); + WARN("extended open/create: failed because file exists \n"); } else if ((action & 0x07) == 2) { @@ -484,23 +484,23 @@ static BOOL INT21_ExtendedOpenCreateFile(CONTEXT86 *context ) if ((BL_reg(context) & 0x0007)== 0) { _lclose16( AX_reg(context) ); - WARN(int21, "extended open/create: failed, trunc on ro file\n"); + WARN("extended open/create: failed, trunc on ro file\n"); AX_reg(context) = 0x000C; /*Access code invalid*/ SET_CFLAG(context); } else { - TRACE(int21, "extended open/create: Closing before truncate\n"); + TRACE("extended open/create: Closing before truncate\n"); if (_lclose16( AX_reg(context) )) { - WARN(int21, "extended open/create: close before trunc failed\n"); + WARN("extended open/create: close before trunc failed\n"); AX_reg(context) = 0x0019; /*Seek Error*/ CX_reg(context) = 0; SET_CFLAG(context); } /* Shuffle arguments to call CreateFile */ - TRACE(int21, "extended open/create: Truncating\n"); + TRACE("extended open/create: Truncating\n"); AL_reg(context) = BL_reg(context); /* CX is still the same */ DX_reg(context) = SI_reg(context); @@ -508,7 +508,7 @@ static BOOL INT21_ExtendedOpenCreateFile(CONTEXT86 *context ) if (EFL_reg(context) & 0x0001) /*no file open, flags set */ { - WARN(int21, "extended open/create: trunc failed\n"); + WARN("extended open/create: trunc failed\n"); return bExtendedError; } uReturnCX = 0x3; @@ -525,19 +525,19 @@ static BOOL INT21_ExtendedOpenCreateFile(CONTEXT86 *context ) { CX_reg(context) = 0; SET_CFLAG(context); - WARN(int21, "extended open/create: failed, file dosen't exist\n"); + WARN("extended open/create: failed, file dosen't exist\n"); } else { /* Shuffle arguments to call CreateFile */ - TRACE(int21, "extended open/create: Creating\n"); + TRACE("extended open/create: Creating\n"); AL_reg(context) = BL_reg(context); /* CX should still be the same */ DX_reg(context) = SI_reg(context); bExtendedError = INT21_CreateFile(context); if (EFL_reg(context) & 0x0001) /*no file open, flags set */ { - WARN(int21, "extended open/create: create failed\n"); + WARN("extended open/create: create failed\n"); return bExtendedError; } CX_reg(context) = 2; @@ -553,7 +553,7 @@ static BOOL INT21_ChangeDir( CONTEXT86 *context ) int drive; char *dirname = CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context)); - TRACE(int21,"changedir %s\n", dirname); + TRACE("changedir %s\n", dirname); if (dirname[0] && (dirname[1] == ':')) { drive = toupper(dirname[0]) - 'A'; @@ -619,7 +619,7 @@ static int INT21_FindNext( CONTEXT86 *context ) } if ((int)dta->count + count > 0xffff) { - WARN(int21, "Too many directory entries in %s\n", dta->unixPath ); + WARN("Too many directory entries in %s\n", dta->unixPath ); HeapFree( GetProcessHeap(), 0, dta->unixPath ); dta->unixPath = NULL; return 0; @@ -658,7 +658,7 @@ static BOOL INT21_CreateTempFile( CONTEXT86 *context ) if ((AX_reg(context) = _lcreat16_uniq( name, 0 )) != (WORD)HFILE_ERROR16) { - TRACE(int21, "created %s\n", name ); + TRACE("created %s\n", name ); return TRUE; } if (GetLastError() != ERROR_FILE_EXISTS) return FALSE; @@ -830,12 +830,12 @@ static int INT21_FindNextFCB( CONTEXT86 *context ) static void DeleteFileFCB( CONTEXT86 *context ) { - FIXME(int21, "(%p): stub\n", context); + FIXME("(%p): stub\n", context); } static void RenameFileFCB( CONTEXT86 *context ) { - FIXME(int21, "(%p): stub\n", context); + FIXME("(%p): stub\n", context); } @@ -846,7 +846,7 @@ static void fLock( CONTEXT86 * context ) switch ( AX_reg(context) & 0xff ) { case 0x00: /* LOCK */ - TRACE(int21,"lock handle %d offset %ld length %ld\n", + TRACE("lock handle %d offset %ld length %ld\n", BX_reg(context), MAKELONG(DX_reg(context),CX_reg(context)), MAKELONG(DI_reg(context),SI_reg(context))) ; @@ -859,7 +859,7 @@ static void fLock( CONTEXT86 * context ) break; case 0x01: /* UNLOCK */ - TRACE(int21,"unlock handle %d offset %ld length %ld\n", + TRACE("unlock handle %d offset %ld length %ld\n", BX_reg(context), MAKELONG(DX_reg(context),CX_reg(context)), MAKELONG(DI_reg(context),SI_reg(context))) ; @@ -884,10 +884,10 @@ INT21_networkfunc (CONTEXT86 *context) case 0x00: /* Get machine name. */ { char *dst = CTX_SEG_OFF_TO_LIN (context,DS_reg(context),EDX_reg(context)); - TRACE(int21, "getting machine name to %p\n", dst); + TRACE("getting machine name to %p\n", dst); if (gethostname (dst, 15)) { - WARN(int21,"failed!\n"); + WARN("failed!\n"); SetLastError( ER_NoNetwork ); return TRUE; } else { @@ -897,7 +897,7 @@ INT21_networkfunc (CONTEXT86 *context) dst[15] = 0; CH_reg(context) = 1; /* Valid */ CL_reg(context) = 1; /* NETbios number??? */ - TRACE(int21, "returning %s\n", debugstr_an (dst, 16)); + TRACE("returning %s\n", debugstr_an (dst, 16)); return FALSE; } } @@ -919,7 +919,7 @@ static void INT21_SetCurrentPSP(WORD psp) pModule->lpDosTask->psp_seg = psp; else #endif - ERR(int21, "Cannot change PSP for non-DOS task!\n"); + ERR("Cannot change PSP for non-DOS task!\n"); } static WORD INT21_GetCurrentPSP() @@ -1038,13 +1038,13 @@ static void INT21_GetExtendedError( CONTEXT86 *context ) locus = EL_Disk; break; default: - FIXME( int21, "Unknown error %d\n", error ); + FIXME("Unknown error %d\n", error ); class = EC_SystemFailure; action = SA_Abort; locus = EL_Unknown; break; } - TRACE( int21, "GET EXTENDED ERROR code 0x%02x class 0x%02x action 0x%02x locus %02x\n", + TRACE("GET EXTENDED ERROR code 0x%02x class 0x%02x action 0x%02x locus %02x\n", error, class, action, locus ); AX_reg(context) = error; BH_reg(context) = class; @@ -1060,7 +1060,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) BOOL bSetDOSExtendedError = FALSE; - TRACE(int21, "AX=%04x BX=%04x CX=%04x DX=%04x " + TRACE("AX=%04x BX=%04x CX=%04x DX=%04x " "SI=%04x DI=%04x DS=%04x ES=%04x EFL=%08lx\n", AX_reg(context), BX_reg(context), CX_reg(context), DX_reg(context), SI_reg(context), DI_reg(context), @@ -1076,7 +1076,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) if (AH_reg(context) == 0x0C) /* Flush buffer and read standard input */ { - TRACE(int21, "FLUSH BUFFER AND READ STANDARD INPUT\n"); + TRACE("FLUSH BUFFER AND READ STANDARD INPUT\n"); /* no flush here yet */ AH_reg(context) = AL_reg(context); } @@ -1108,25 +1108,25 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x00: /* TERMINATE PROGRAM */ - TRACE(int21,"TERMINATE PROGRAM\n"); + TRACE("TERMINATE PROGRAM\n"); ExitProcess( 0 ); break; case 0x01: /* READ CHARACTER FROM STANDARD INPUT, WITH ECHO */ - TRACE(int21,"DIRECT CHARACTER INPUT WITH ECHO\n"); + TRACE("DIRECT CHARACTER INPUT WITH ECHO\n"); AL_reg(context) = CONSOLE_GetCharacter(); /* FIXME: no echo */ break; case 0x02: /* WRITE CHARACTER TO STANDARD OUTPUT */ - TRACE(int21, "Write Character to Standard Output\n"); + TRACE("Write Character to Standard Output\n"); CONSOLE_Write(DL_reg(context), 0, 0, 0); break; case 0x06: /* DIRECT CONSOLE IN/OUTPUT */ if (DL_reg(context) == 0xff) { static char scan = 0; - TRACE(int21, "Direct Console Input\n"); + TRACE("Direct Console Input\n"); if (scan) { /* return pending scancode */ AL_reg(context) = scan; @@ -1149,23 +1149,23 @@ void WINAPI DOS3Call( CONTEXT86 *context ) } } } else { - TRACE(int21, "Direct Console Output\n"); + TRACE("Direct Console Output\n"); CONSOLE_Write(DL_reg(context), 0, 0, 0); } break; case 0x07: /* DIRECT CHARACTER INPUT WITHOUT ECHO */ - TRACE(int21,"DIRECT CHARACTER INPUT WITHOUT ECHO\n"); + TRACE("DIRECT CHARACTER INPUT WITHOUT ECHO\n"); AL_reg(context) = CONSOLE_GetCharacter(); break; case 0x08: /* CHARACTER INPUT WITHOUT ECHO */ - TRACE(int21,"CHARACTER INPUT WITHOUT ECHO\n"); + TRACE("CHARACTER INPUT WITHOUT ECHO\n"); AL_reg(context) = CONSOLE_GetCharacter(); break; case 0x09: /* WRITE STRING TO STANDARD OUTPUT */ - TRACE(int21,"WRITE '$'-terminated string from %04lX:%04X to stdout\n", + TRACE("WRITE '$'-terminated string from %04lX:%04X to stdout\n", DS_reg(context),DX_reg(context) ); { LPSTR data = CTX_SEG_OFF_TO_LIN(context,DS_reg(context),EDX_reg(context)); @@ -1185,9 +1185,9 @@ void WINAPI DOS3Call( CONTEXT86 *context ) EDX_reg(context) )); int res; - TRACE(int21,"BUFFERED INPUT (size=%d)\n",buffer[0]); + TRACE("BUFFERED INPUT (size=%d)\n",buffer[0]); if (buffer[1]) - TRACE(int21,"Handle old chars in buffer!\n"); + TRACE("Handle old chars in buffer!\n"); res=_lread16( 0, buffer+2,buffer[0]); buffer[1]=res; if(buffer[res+1] == '\n') @@ -1205,7 +1205,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; } case 0x2e: /* SET VERIFY FLAG */ - TRACE(int21,"SET VERIFY FLAG ignored\n"); + TRACE("SET VERIFY FLAG ignored\n"); /* we cannot change the behaviour anyway, so just ignore it */ break; @@ -1222,18 +1222,18 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x0d: /* DISK BUFFER FLUSH */ - TRACE(int21,"DISK BUFFER FLUSH ignored\n"); + TRACE("DISK BUFFER FLUSH ignored\n"); RESET_CFLAG(context); /* dos 6+ only */ break; case 0x0e: /* SELECT DEFAULT DRIVE */ - TRACE(int21,"SELECT DEFAULT DRIVE %d\n", DL_reg(context)); + TRACE("SELECT DEFAULT DRIVE %d\n", DL_reg(context)); DRIVE_SetCurrentDrive( DL_reg(context) ); AL_reg(context) = MAX_DOS_DRIVES; break; case 0x11: /* FIND FIRST MATCHING FILE USING FCB */ - TRACE(int21,"FIND FIRST MATCHING FILE USING FCB %p\n", + TRACE("FIND FIRST MATCHING FILE USING FCB %p\n", CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); if (!INT21_FindFirstFCB(context)) { @@ -1262,7 +1262,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) { TDB *pTask = (TDB *)GlobalLock16( GetCurrentTask() ); pTask->dta = PTR_SEG_OFF_TO_SEGPTR(DS_reg(context),DX_reg(context)); - TRACE(int21, "Set DTA: %08lx\n", pTask->dta); + TRACE("Set DTA: %08lx\n", pTask->dta); } break; @@ -1294,7 +1294,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x2b: /* SET SYSTEM DATE */ - FIXME(int21, "SetSystemDate(%02d/%02d/%04d): not allowed\n", + FIXME("SetSystemDate(%02d/%02d/%04d): not allowed\n", DL_reg(context), DH_reg(context), CX_reg(context) ); AL_reg(context) = 0; /* Let's pretend we succeeded */ break; @@ -1304,14 +1304,14 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x2d: /* SET SYSTEM TIME */ - FIXME(int21, "SetSystemTime(%02d:%02d:%02d.%02d): not allowed\n", + FIXME("SetSystemTime(%02d:%02d:%02d.%02d): not allowed\n", CH_reg(context), CL_reg(context), DH_reg(context), DL_reg(context) ); AL_reg(context) = 0; /* Let's pretend we succeeded */ break; case 0x2f: /* GET DISK TRANSFER AREA ADDRESS */ - TRACE(int21,"GET DISK TRANSFER AREA ADDRESS\n"); + TRACE("GET DISK TRANSFER AREA ADDRESS\n"); { TDB *pTask = (TDB *)GlobalLock16( GetCurrentTask() ); ES_reg(context) = SELECTOROF( pTask->dta ); @@ -1320,7 +1320,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x30: /* GET DOS VERSION */ - TRACE(int21,"GET DOS VERSION %s requested\n", + TRACE("GET DOS VERSION %s requested\n", (AL_reg(context) == 0x00)?"OEM number":"version flag"); AX_reg(context) = (HIWORD(GetVersion16()) >> 8) | (HIWORD(GetVersion16()) << 8); @@ -1334,11 +1334,11 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x31: /* TERMINATE AND STAY RESIDENT */ - FIXME(int21,"TERMINATE AND STAY RESIDENT stub\n"); + FIXME("TERMINATE AND STAY RESIDENT stub\n"); break; case 0x32: /* GET DOS DRIVE PARAMETER BLOCK FOR SPECIFIC DRIVE */ - TRACE(int21,"GET DOS DRIVE PARAMETER BLOCK FOR DRIVE %s\n", + TRACE("GET DOS DRIVE PARAMETER BLOCK FOR DRIVE %s\n", INT21_DriveName( DL_reg(context))); GetDrivePB(context, DOS_GET_DRIVE( DL_reg(context) ) ); break; @@ -1347,17 +1347,17 @@ void WINAPI DOS3Call( CONTEXT86 *context ) switch (AL_reg(context)) { case 0x00: /* GET CURRENT EXTENDED BREAK STATE */ - TRACE(int21,"GET CURRENT EXTENDED BREAK STATE\n"); + TRACE("GET CURRENT EXTENDED BREAK STATE\n"); DL_reg(context) = DOSCONF_config.brk_flag; break; case 0x01: /* SET EXTENDED BREAK STATE */ - TRACE(int21,"SET CURRENT EXTENDED BREAK STATE\n"); + TRACE("SET CURRENT EXTENDED BREAK STATE\n"); DOSCONF_config.brk_flag = (DL_reg(context) > 0); break; case 0x02: /* GET AND SET EXTENDED CONTROL-BREAK CHECKING STATE*/ - TRACE(int21,"GET AND SET EXTENDED CONTROL-BREAK CHECKING STATE\n"); + TRACE("GET AND SET EXTENDED CONTROL-BREAK CHECKING STATE\n"); /* ugly coding in order to stay reentrant */ if (DL_reg(context)) { @@ -1372,13 +1372,13 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x05: /* GET BOOT DRIVE */ - TRACE(int21,"GET BOOT DRIVE\n"); + TRACE("GET BOOT DRIVE\n"); DL_reg(context) = 3; /* c: is Wine's bootdrive (a: is 1)*/ break; case 0x06: /* GET TRUE VERSION NUMBER */ - TRACE(int21,"GET TRUE VERSION NUMBER\n"); + TRACE("GET TRUE VERSION NUMBER\n"); BX_reg(context) = (HIWORD(GetVersion16() >> 8)) | (HIWORD(GetVersion16() << 8)); DX_reg(context) = 0x00; @@ -1391,14 +1391,14 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x34: /* GET ADDRESS OF INDOS FLAG */ - TRACE(int21,"GET ADDRESS OF INDOS FLAG\n"); + TRACE("GET ADDRESS OF INDOS FLAG\n"); if (!heap) INT21_CreateHeap(); ES_reg(context) = DosHeapHandle; BX_reg(context) = (int)&heap->InDosFlag - (int)heap; break; case 0x35: /* GET INTERRUPT VECTOR */ - TRACE(int21,"GET INTERRUPT VECTOR 0x%02x\n",AL_reg(context)); + TRACE("GET INTERRUPT VECTOR 0x%02x\n",AL_reg(context)); { FARPROC16 addr = INT_CtxGetHandler( context, AL_reg(context) ); ES_reg(context) = SELECTOROF(addr); @@ -1407,7 +1407,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x36: /* GET FREE DISK SPACE */ - TRACE(int21,"GET FREE DISK SPACE FOR DRIVE %s\n", + TRACE("GET FREE DISK SPACE FOR DRIVE %s\n", INT21_DriveName( DL_reg(context))); if (!INT21_GetFreeDiskSpace(context)) AX_reg(context) = 0xffff; break; @@ -1418,12 +1418,12 @@ void WINAPI DOS3Call( CONTEXT86 *context ) switch (AL_reg(context)) { case 0x00: /* "SWITCHAR" - GET SWITCH CHARACTER */ - TRACE(int21,"SWITCHAR - GET SWITCH CHARACTER\n"); + TRACE("SWITCHAR - GET SWITCH CHARACTER\n"); AL_reg(context) = 0x00; /* success*/ DL_reg(context) = switchchar; break; case 0x01: /*"SWITCHAR" - SET SWITCH CHARACTER*/ - TRACE(int21,"SWITCHAR - SET SWITCH CHARACTER\n"); + TRACE("SWITCHAR - SET SWITCH CHARACTER\n"); switchchar = DL_reg(context); AL_reg(context) = 0x00; /* success*/ break; @@ -1435,14 +1435,14 @@ void WINAPI DOS3Call( CONTEXT86 *context ) } case 0x38: /* GET COUNTRY-SPECIFIC INFORMATION */ - TRACE(int21,"GET COUNTRY-SPECIFIC INFORMATION for country 0x%02x\n", + TRACE("GET COUNTRY-SPECIFIC INFORMATION for country 0x%02x\n", AL_reg(context)); AX_reg(context) = 0x02; /* no country support available */ SET_CFLAG(context); break; case 0x39: /* "MKDIR" - CREATE SUBDIRECTORY */ - TRACE(int21,"MKDIR %s\n", + TRACE("MKDIR %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); bSetDOSExtendedError = (!CreateDirectory16( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context) ), NULL)); @@ -1464,37 +1464,37 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x3a: /* "RMDIR" - REMOVE SUBDIRECTORY */ - TRACE(int21,"RMDIR %s\n", + TRACE("RMDIR %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); bSetDOSExtendedError = (!RemoveDirectory16( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context) ))); break; case 0x3b: /* "CHDIR" - SET CURRENT DIRECTORY */ - TRACE(int21,"CHDIR %s\n", + TRACE("CHDIR %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); bSetDOSExtendedError = !INT21_ChangeDir(context); break; case 0x3c: /* "CREAT" - CREATE OR TRUNCATE FILE */ - TRACE(int21,"CREAT flag 0x%02x %s\n",CX_reg(context), + TRACE("CREAT flag 0x%02x %s\n",CX_reg(context), (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); bSetDOSExtendedError = INT21_CreateFile( context ); break; case 0x3d: /* "OPEN" - OPEN EXISTING FILE */ - TRACE(int21,"OPEN mode 0x%02x %s\n",AL_reg(context), + TRACE("OPEN mode 0x%02x %s\n",AL_reg(context), (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); OpenExistingFile(context); break; case 0x3e: /* "CLOSE" - CLOSE FILE */ - TRACE(int21,"CLOSE handle %d\n",BX_reg(context)); + TRACE("CLOSE handle %d\n",BX_reg(context)); bSetDOSExtendedError = ((AX_reg(context) = _lclose16( BX_reg(context) )) != 0); break; case 0x3f: /* "READ" - READ FROM FILE OR DEVICE */ - TRACE(int21,"READ from %d to %04lX:%04X for %d byte\n",BX_reg(context), + TRACE("READ from %d to %04lX:%04X for %d byte\n",BX_reg(context), DS_reg(context),DX_reg(context),CX_reg(context) ); { LONG result; @@ -1514,7 +1514,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x40: /* "WRITE" - WRITE TO FILE OR DEVICE */ - TRACE(int21,"WRITE from %04lX:%04X to handle %d for %d byte\n", + TRACE("WRITE from %04lX:%04X to handle %d for %d byte\n", DS_reg(context),DX_reg(context),BX_reg(context),CX_reg(context) ); { LONG result = _hwrite16( BX_reg(context), @@ -1527,14 +1527,14 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x41: /* "UNLINK" - DELETE FILE */ - TRACE(int21,"UNLINK%s\n", + TRACE("UNLINK%s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); bSetDOSExtendedError = (!DeleteFileA( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context) ))); break; case 0x42: /* "LSEEK" - SET CURRENT FILE POSITION */ - TRACE(int21,"LSEEK handle %d offset %ld from %s\n", + TRACE("LSEEK handle %d offset %ld from %s\n", BX_reg(context), MAKELONG(DX_reg(context),CX_reg(context)), (AL_reg(context)==0)?"start of file":(AL_reg(context)==1)? "current file position":"end of file"); @@ -1555,7 +1555,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) switch (AL_reg(context)) { case 0x00: - TRACE(int21,"GET FILE ATTRIBUTES for %s\n", + TRACE("GET FILE ATTRIBUTES for %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); AX_reg(context) = (WORD)GetFileAttributesA( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), @@ -1565,7 +1565,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x01: - TRACE(int21,"SET FILE ATTRIBUTES 0x%02x for %s\n", CX_reg(context), + TRACE("SET FILE ATTRIBUTES 0x%02x for %s\n", CX_reg(context), (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); bSetDOSExtendedError = (!SetFileAttributesA( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), @@ -1573,7 +1573,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) CX_reg(context) )); break; case 0x02: - TRACE(int21,"GET COMPRESSED FILE SIZE for %s stub\n", + TRACE("GET COMPRESSED FILE SIZE for %s stub\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); } break; @@ -1600,7 +1600,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) /*BYTE *dataptr = CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context));*/ int drive = DOS_GET_DRIVE(BL_reg(context)); - FIXME(int21,"program tried to write to block device control channel of drive %d:\n",drive); + FIXME("program tried to write to block device control channel of drive %d:\n",drive); /* for (i=0;i<CX_reg(context);i++) fprintf(stdnimp,"%02x ",dataptr[i]); fprintf(stdnimp,"\n");*/ @@ -1608,7 +1608,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; } case 0x08: /* Check if drive is removable. */ - TRACE(int21,"IOCTL - CHECK IF BLOCK DEVICE REMOVABLE for drive %s\n", + TRACE("IOCTL - CHECK IF BLOCK DEVICE REMOVABLE for drive %s\n", INT21_DriveName( BL_reg(context))); switch(GetDriveType16( DOS_GET_DRIVE( BL_reg(context) ))) { @@ -1627,7 +1627,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x09: /* CHECK IF BLOCK DEVICE REMOTE */ - TRACE(int21,"IOCTL - CHECK IF BLOCK DEVICE REMOTE for drive %s\n", + TRACE("IOCTL - CHECK IF BLOCK DEVICE REMOTE for drive %s\n", INT21_DriveName( BL_reg(context))); switch(GetDriveType16( DOS_GET_DRIVE( BL_reg(context) ))) { @@ -1646,7 +1646,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x0a: /* check if handle (BX) is remote */ - TRACE(int21,"IOCTL - CHECK IF HANDLE %d IS REMOTE\n",BX_reg(context)); + TRACE("IOCTL - CHECK IF HANDLE %d IS REMOTE\n",BX_reg(context)); /* returns DX, bit 15 set if remote, bit 14 set if date/time * not set on close */ @@ -1654,7 +1654,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x0b: /* SET SHARING RETRY COUNT */ - TRACE(int21,"IOCTL - SET SHARING RETRY COUNT pause %d retries %d\n", + TRACE("IOCTL - SET SHARING RETRY COUNT pause %d retries %d\n", CX_reg(context), DX_reg(context)); if (!CX_reg(context)) { @@ -1669,13 +1669,13 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x0d: - TRACE(int21,"IOCTL - GENERIC BLOCK DEVICE REQUEST %s\n", + TRACE("IOCTL - GENERIC BLOCK DEVICE REQUEST %s\n", INT21_DriveName( BL_reg(context))); bSetDOSExtendedError = ioctlGenericBlkDevReq(context); break; case 0x0e: /* get logical drive mapping */ - TRACE(int21,"IOCTL - GET LOGICAL DRIVE MAP for drive %s\n", + TRACE("IOCTL - GET LOGICAL DRIVE MAP for drive %s\n", INT21_DriveName( BL_reg(context))); AL_reg(context) = 0; /* drive has no mapping - FIXME: may be wrong*/ break; @@ -1683,7 +1683,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) case 0x0F: /* Set logical drive mapping */ { int drive; - TRACE(int21,"IOCTL - SET LOGICAL DRIVE MAP for drive %s\n", + TRACE("IOCTL - SET LOGICAL DRIVE MAP for drive %s\n", INT21_DriveName( BL_reg(context))); drive = DOS_GET_DRIVE ( BL_reg(context) ); if ( ! DRIVE_SetLogicalMapping ( drive, drive+1 ) ) @@ -1707,7 +1707,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) case 0x45: /* "DUP" - DUPLICATE FILE HANDLE */ { HANDLE handle; - TRACE(int21,"DUP - DUPLICATE FILE HANDLE %d\n",BX_reg(context)); + TRACE("DUP - DUPLICATE FILE HANDLE %d\n",BX_reg(context)); if ((bSetDOSExtendedError = !DuplicateHandle( GetCurrentProcess(), FILE_GetHandle(BX_reg(context)), GetCurrentProcess(), &handle, @@ -1719,19 +1719,19 @@ void WINAPI DOS3Call( CONTEXT86 *context ) } case 0x46: /* "DUP2", "FORCEDUP" - FORCE DUPLICATE FILE HANDLE */ - TRACE(int21,"FORCEDUP - FORCE DUPLICATE FILE HANDLE %d to %d\n", + TRACE("FORCEDUP - FORCE DUPLICATE FILE HANDLE %d to %d\n", BX_reg(context),CX_reg(context)); bSetDOSExtendedError = (FILE_Dup2( BX_reg(context), CX_reg(context) ) == HFILE_ERROR16); break; case 0x47: /* "CWD" - GET CURRENT DIRECTORY */ - TRACE(int21,"CWD - GET CURRENT DIRECTORY for drive %s\n", + TRACE("CWD - GET CURRENT DIRECTORY for drive %s\n", INT21_DriveName( DL_reg(context))); bSetDOSExtendedError = !INT21_GetCurrentDirectory(context); break; case 0x48: /* ALLOCATE MEMORY */ - TRACE(int21,"ALLOCATE MEMORY for %d paragraphs\n", BX_reg(context)); + TRACE("ALLOCATE MEMORY for %d paragraphs\n", BX_reg(context)); { LPVOID *mem; if (ISV86(context)) @@ -1756,7 +1756,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x49: /* FREE MEMORY */ - TRACE(int21,"FREE MEMORY segment %04lX\n", ES_reg(context)); + TRACE("FREE MEMORY segment %04lX\n", ES_reg(context)); { BOOL ret; if (ISV86(context)) @@ -1769,7 +1769,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) } if (!ret) { - TRACE(int21,"FREE MEMORY failed\n"); + TRACE("FREE MEMORY failed\n"); SET_CFLAG(context); AX_reg(context) = 0x0009; /* memory block address invalid */ } @@ -1777,9 +1777,9 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x4a: /* RESIZE MEMORY BLOCK */ - TRACE(int21,"RESIZE MEMORY segment %04lX to %d paragraphs\n", ES_reg(context), BX_reg(context)); + TRACE("RESIZE MEMORY segment %04lX to %d paragraphs\n", ES_reg(context), BX_reg(context)); if (!ISV86(context)) - FIXME(int21,"RESIZE MEMORY probably insufficient implementation. Expect crash soon\n"); + FIXME("RESIZE MEMORY probably insufficient implementation. Expect crash soon\n"); { LPVOID *mem = DOSMEM_ResizeBlock(0,DOSMEM_MapDosToLinear(ES_reg(context)<<4), BX_reg(context)<<4,NULL); @@ -1794,7 +1794,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x4b: /* "EXEC" - LOAD AND/OR EXECUTE PROGRAM */ - TRACE(int21,"EXEC %s\n", + TRACE("EXEC %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context) )); AX_reg(context) = WinExec16( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context) ), @@ -1803,23 +1803,23 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x4c: /* "EXIT" - TERMINATE WITH RETURN CODE */ - TRACE(int21,"EXIT with return code %d\n",AL_reg(context)); + TRACE("EXIT with return code %d\n",AL_reg(context)); ExitProcess( AL_reg(context) ); break; case 0x4d: /* GET RETURN CODE */ - TRACE(int21,"GET RETURN CODE (ERRORLEVEL)\n"); + TRACE("GET RETURN CODE (ERRORLEVEL)\n"); AX_reg(context) = 0; /* normal exit */ break; case 0x4e: /* "FINDFIRST" - FIND FIRST MATCHING FILE */ - TRACE(int21,"FINDFIRST mask 0x%04x spec %s\n",CX_reg(context), + TRACE("FINDFIRST mask 0x%04x spec %s\n",CX_reg(context), (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); if (!INT21_FindFirst(context)) break; /* fall through */ case 0x4f: /* "FINDNEXT" - FIND NEXT MATCHING FILE */ - TRACE(int21,"FINDNEXT\n"); + TRACE("FINDNEXT\n"); if (!INT21_FindNext(context)) { SetLastError( ERROR_NO_MORE_FILES ); @@ -1829,24 +1829,24 @@ void WINAPI DOS3Call( CONTEXT86 *context ) else AX_reg(context) = 0; /* OK */ break; case 0x50: /* SET CURRENT PROCESS ID (SET PSP ADDRESS) */ - TRACE(int21, "SET CURRENT PROCESS ID (SET PSP ADDRESS)\n"); + TRACE("SET CURRENT PROCESS ID (SET PSP ADDRESS)\n"); INT21_SetCurrentPSP(BX_reg(context)); break; case 0x51: /* GET PSP ADDRESS */ - TRACE(int21,"GET CURRENT PROCESS ID (GET PSP ADDRESS)\n"); + TRACE("GET CURRENT PROCESS ID (GET PSP ADDRESS)\n"); /* FIXME: should we return the original DOS PSP upon */ /* Windows startup ? */ BX_reg(context) = INT21_GetCurrentPSP(); break; case 0x62: /* GET PSP ADDRESS */ - TRACE(int21,"GET CURRENT PSP ADDRESS\n"); + TRACE("GET CURRENT PSP ADDRESS\n"); /* FIXME: should we return the original DOS PSP upon */ /* Windows startup ? */ BX_reg(context) = INT21_GetCurrentPSP(); break; case 0x52: /* "SYSVARS" - GET LIST OF LISTS */ - TRACE(int21,"SYSVARS - GET LIST OF LISTS\n"); + TRACE("SYSVARS - GET LIST OF LISTS\n"); { ES_reg(context) = ISV86(context) ? HIWORD(DOS_LOLSeg) : LOWORD(DOS_LOLSeg); BX_reg(context) = FIELD_OFFSET(DOS_LISTOFLISTS, ptr_first_DPB); @@ -1854,12 +1854,12 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x54: /* Get Verify Flag */ - TRACE(int21,"Get Verify Flag - Not Supported\n"); + TRACE("Get Verify Flag - Not Supported\n"); AL_reg(context) = 0x00; /* pretend we can tell. 00h = off 01h = on */ break; case 0x56: /* "RENAME" - RENAME FILE */ - TRACE(int21,"RENAME %s to %s\n", + TRACE("RENAME %s to %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context)), (LPCSTR)CTX_SEG_OFF_TO_LIN(context, ES_reg(context),EDI_reg(context))); bSetDOSExtendedError = @@ -1873,7 +1873,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) case 0x00: /* Get */ { FILETIME filetime; - TRACE(int21,"GET FILE DATE AND TIME for handle %d\n", + TRACE("GET FILE DATE AND TIME for handle %d\n", BX_reg(context)); if (!GetFileTime( FILE_GetHandle(BX_reg(context)), NULL, NULL, &filetime )) bSetDOSExtendedError = TRUE; @@ -1885,7 +1885,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) case 0x01: /* Set */ { FILETIME filetime; - TRACE(int21,"SET FILE DATE AND TIME for handle %d\n", + TRACE("SET FILE DATE AND TIME for handle %d\n", BX_reg(context)); DosDateTimeToFileTime( DX_reg(context), CX_reg(context), &filetime ); @@ -1898,7 +1898,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x58: /* GET OR SET MEMORY/UMB ALLOCATION STRATEGY */ - TRACE(int21,"GET OR SET MEMORY/UMB ALLOCATION STRATEGY subfunction %d\n", + TRACE("GET OR SET MEMORY/UMB ALLOCATION STRATEGY subfunction %d\n", AL_reg(context)); switch (AL_reg(context)) { @@ -1916,12 +1916,12 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x5a: /* CREATE TEMPORARY FILE */ - TRACE(int21,"CREATE TEMPORARY FILE\n"); + TRACE("CREATE TEMPORARY FILE\n"); bSetDOSExtendedError = !INT21_CreateTempFile(context); break; case 0x5b: /* CREATE NEW FILE */ - TRACE(int21,"CREATE NEW FILE 0x%02x for %s\n", CX_reg(context), + TRACE("CREATE NEW FILE 0x%02x for %s\n", CX_reg(context), (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); bSetDOSExtendedError = ((AX_reg(context) = _lcreat16_uniq( CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context)), @@ -1929,7 +1929,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x5d: /* NETWORK */ - FIXME(int21,"Function 0x%04x not implemented.\n", AX_reg (context)); + FIXME("Function 0x%04x not implemented.\n", AX_reg (context)); /* Fix the following while you're at it. */ SetLastError( ER_NoNetwork ); bSetDOSExtendedError = TRUE; @@ -1943,7 +1943,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) switch (AL_reg(context)) { case 0x07: /* ENABLE DRIVE */ - TRACE(int21,"ENABLE DRIVE %c:\n",(DL_reg(context)+'A')); + TRACE("ENABLE DRIVE %c:\n",(DL_reg(context)+'A')); if (!DRIVE_Enable( DL_reg(context) )) { SetLastError( ERROR_INVALID_DRIVE ); @@ -1952,7 +1952,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x08: /* DISABLE DRIVE */ - TRACE(int21,"DISABLE DRIVE %c:\n",(DL_reg(context)+'A')); + TRACE("DISABLE DRIVE %c:\n",(DL_reg(context)+'A')); if (!DRIVE_Disable( DL_reg(context) )) { SetLastError( ERROR_INVALID_DRIVE ); @@ -1962,7 +1962,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) default: /* network software not installed */ - TRACE(int21,"NETWORK function AX=%04x not implemented\n",AX_reg(context)); + TRACE("NETWORK function AX=%04x not implemented\n",AX_reg(context)); SetLastError( ER_NoNetwork ); bSetDOSExtendedError = TRUE; break; @@ -1970,7 +1970,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x60: /* "TRUENAME" - CANONICALIZE FILENAME OR PATH */ - TRACE(int21,"TRUENAME %s\n", + TRACE("TRUENAME %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context),ESI_reg(context))); { if (!GetFullPathNameA( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), @@ -1998,11 +1998,11 @@ void WINAPI DOS3Call( CONTEXT86 *context ) case 0x65:{/* GET EXTENDED COUNTRY INFORMATION */ extern WORD WINE_LanguageId; BYTE *dataptr=CTX_SEG_OFF_TO_LIN(context, ES_reg(context),EDI_reg(context)); - TRACE(int21,"GET EXTENDED COUNTRY INFORMATION code page %d country %d\n", + TRACE("GET EXTENDED COUNTRY INFORMATION code page %d country %d\n", BX_reg(context), DX_reg(context)); switch (AL_reg(context)) { case 0x01: - TRACE(int21,"\tget general internationalization info\n"); + TRACE("\tget general internationalization info\n"); dataptr[0] = 0x1; *(WORD*)(dataptr+1) = 41; *(WORD*)(dataptr+3) = WINE_LanguageId; @@ -2010,13 +2010,13 @@ void WINAPI DOS3Call( CONTEXT86 *context ) *(DWORD*)(dataptr+0x19) = 0; /* FIXME: ptr to case map routine */ break; case 0x06: - TRACE(int21,"\tget pointer to collating sequence table\n"); + TRACE("\tget pointer to collating sequence table\n"); dataptr[0] = 0x06; *(DWORD*)(dataptr+1) = MAKELONG(DOSMEM_CollateTable & 0xFFFF,DOSMEM_AllocSelector(DOSMEM_CollateTable>>16)); CX_reg(context) = 258;/*FIXME: size of table?*/ break; default: - TRACE(int21,"\tunimplemented function %d\n",AL_reg(context)); + TRACE("\tunimplemented function %d\n",AL_reg(context)); INT_BARF( context, 0x21 ); SET_CFLAG(context); break; @@ -2027,12 +2027,12 @@ void WINAPI DOS3Call( CONTEXT86 *context ) switch (AL_reg(context)) { case 0x01: - TRACE(int21,"GET GLOBAL CODE PAGE TABLE\n"); + TRACE("GET GLOBAL CODE PAGE TABLE\n"); DX_reg(context) = BX_reg(context) = CodePage; RESET_CFLAG(context); break; case 0x02: - TRACE(int21,"SET GLOBAL CODE PAGE TABLE active page %d system page %d\n", + TRACE("SET GLOBAL CODE PAGE TABLE active page %d system page %d\n", BX_reg(context),DX_reg(context)); CodePage = BX_reg(context); RESET_CFLAG(context); @@ -2041,14 +2041,14 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x67: /* SET HANDLE COUNT */ - TRACE(int21,"SET HANDLE COUNT to %d\n",BX_reg(context) ); + TRACE("SET HANDLE COUNT to %d\n",BX_reg(context) ); SetHandleCount16( BX_reg(context) ); if (GetLastError()) bSetDOSExtendedError = TRUE; break; case 0x68: /* "FFLUSH" - COMMIT FILE */ case 0x6a: /* COMMIT FILE */ - TRACE(int21,"FFLUSH/COMMIT handle %d\n",BX_reg(context)); + TRACE("FFLUSH/COMMIT handle %d\n",BX_reg(context)); bSetDOSExtendedError = (!FlushFileBuffers( FILE_GetHandle(BX_reg(context)) )); break; @@ -2056,14 +2056,14 @@ void WINAPI DOS3Call( CONTEXT86 *context ) switch (AL_reg(context)) { case 0x00: - TRACE(int21,"GET DISK SERIAL NUMBER for drive %s\n", + TRACE("GET DISK SERIAL NUMBER for drive %s\n", INT21_DriveName(BL_reg(context))); if (!INT21_GetDiskSerialNumber(context)) bSetDOSExtendedError = TRUE; else AX_reg(context) = 0; break; case 0x01: - TRACE(int21,"SET DISK SERIAL NUMBER for drive %s\n", + TRACE("SET DISK SERIAL NUMBER for drive %s\n", INT21_DriveName(BL_reg(context))); if (!INT21_SetDiskSerialNumber(context)) bSetDOSExtendedError = TRUE; else AX_reg(context) = 1; @@ -2072,7 +2072,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) break; case 0x6C: /* Extended Open/Create*/ - TRACE(int21,"EXTENDED OPEN/CREATE %s\n", + TRACE("EXTENDED OPEN/CREATE %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDI_reg(context))); bSetDOSExtendedError = INT21_ExtendedOpenCreateFile(context); break; @@ -2080,47 +2080,47 @@ void WINAPI DOS3Call( CONTEXT86 *context ) case 0x71: /* MS-DOS 7 (Windows95) - LONG FILENAME FUNCTIONS */ if ((GetVersion()&0xC0000004)!=0xC0000004) { /* not supported on anything but Win95 */ - TRACE(int21,"LONG FILENAME functions supported only by win95\n"); + TRACE("LONG FILENAME functions supported only by win95\n"); SET_CFLAG(context); AL_reg(context) = 0; } else switch(AL_reg(context)) { case 0x39: /* Create directory */ - TRACE(int21,"LONG FILENAME - MAKE DIRECTORY %s\n", + TRACE("LONG FILENAME - MAKE DIRECTORY %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context))); bSetDOSExtendedError = (!CreateDirectoryA( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context) ), NULL)); break; case 0x3a: /* Remove directory */ - TRACE(int21,"LONG FILENAME - REMOVE DIRECTORY %s\n", + TRACE("LONG FILENAME - REMOVE DIRECTORY %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context))); bSetDOSExtendedError = (!RemoveDirectoryA( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context) ))); break; case 0x43: /* Get/Set file attributes */ - TRACE(int21,"LONG FILENAME -EXTENDED GET/SET FILE ATTRIBUTES %s\n", + TRACE("LONG FILENAME -EXTENDED GET/SET FILE ATTRIBUTES %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context))); switch (BL_reg(context)) { case 0x00: /* Get file attributes */ - TRACE(int21,"\tretrieve attributes\n"); + TRACE("\tretrieve attributes\n"); CX_reg(context) = (WORD)GetFileAttributesA( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); if (CX_reg(context) == 0xffff) bSetDOSExtendedError = TRUE; break; case 0x01: - TRACE(int21,"\tset attributes 0x%04x\n",CX_reg(context)); + TRACE("\tset attributes 0x%04x\n",CX_reg(context)); bSetDOSExtendedError = (!SetFileAttributesA( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context)), CX_reg(context) ) ); break; default: - FIXME(int21, "Unimplemented long file name function:\n"); + FIXME("Unimplemented long file name function:\n"); INT_BARF( context, 0x21 ); SET_CFLAG(context); AL_reg(context) = 0; @@ -2128,13 +2128,13 @@ void WINAPI DOS3Call( CONTEXT86 *context ) } break; case 0x47: /* Get current directory */ - TRACE(int21," LONG FILENAME - GET CURRENT DIRECTORY for drive %s\n", + TRACE(" LONG FILENAME - GET CURRENT DIRECTORY for drive %s\n", INT21_DriveName(DL_reg(context))); bSetDOSExtendedError = !INT21_GetCurrentDirectory(context); break; case 0x4e: /* Find first file */ - TRACE(int21," LONG FILENAME - FIND FIRST MATCHING FILE for %s\n", + TRACE(" LONG FILENAME - FIND FIRST MATCHING FILE for %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context))); /* FIXME: use attributes in CX */ if ((AX_reg(context) = FindFirstFile16( @@ -2145,7 +2145,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) bSetDOSExtendedError = TRUE; break; case 0x4f: /* Find next file */ - TRACE(int21,"LONG FILENAME - FIND NEXT MATCHING FILE for handle %d\n", + TRACE("LONG FILENAME - FIND NEXT MATCHING FILE for handle %d\n", BX_reg(context)); if (!FindNextFile16( BX_reg(context), (WIN32_FIND_DATAA *)CTX_SEG_OFF_TO_LIN(context, ES_reg(context), @@ -2153,12 +2153,12 @@ void WINAPI DOS3Call( CONTEXT86 *context ) bSetDOSExtendedError = TRUE; break; case 0xa1: /* Find close */ - TRACE(int21,"LONG FILENAME - FINDCLOSE for handle %d\n", + TRACE("LONG FILENAME - FINDCLOSE for handle %d\n", BX_reg(context)); bSetDOSExtendedError = (!FindClose16( BX_reg(context) )); break; case 0xa0: - TRACE(int21,"LONG FILENAME - GET VOLUME INFORMATION for drive %s stub\n", + TRACE("LONG FILENAME - GET VOLUME INFORMATION for drive %s stub\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context))); break; case 0x60: @@ -2183,7 +2183,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) else AX_reg(context) = 0; break; default: - FIXME(int21, "Unimplemented long file name function:\n"); + FIXME("Unimplemented long file name function:\n"); INT_BARF( context, 0x21 ); SET_CFLAG(context); AL_reg(context) = 0; @@ -2191,14 +2191,14 @@ void WINAPI DOS3Call( CONTEXT86 *context ) } break; case 0x6c: /* Create or open file */ - TRACE(int21,"LONG FILENAME - CREATE OR OPEN FILE %s\n", + TRACE("LONG FILENAME - CREATE OR OPEN FILE %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), ESI_reg(context))); /* translate Dos 7 action to Dos 6 action */ bSetDOSExtendedError = INT21_ExtendedOpenCreateFile(context); break; case 0x3b: /* Change directory */ - TRACE(int21,"LONG FILENAME - CHANGE DIRECTORY %s\n", + TRACE("LONG FILENAME - CHANGE DIRECTORY %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); if (!SetCurrentDirectoryA(CTX_SEG_OFF_TO_LIN(context, DS_reg(context), @@ -2210,7 +2210,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) } break; case 0x41: /* Delete file */ - TRACE(int21,"LONG FILENAME - DELETE FILE %s\n", + TRACE("LONG FILENAME - DELETE FILE %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); if (!DeleteFileA(CTX_SEG_OFF_TO_LIN(context, DS_reg(context), @@ -2221,11 +2221,11 @@ void WINAPI DOS3Call( CONTEXT86 *context ) } break; case 0x56: /* Move (rename) file */ - TRACE(int21,"LONG FILENAME - RENAME FILE %s to %s stub\n", + TRACE("LONG FILENAME - RENAME FILE %s to %s stub\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context)), (LPCSTR)CTX_SEG_OFF_TO_LIN(context, ES_reg(context), EDI_reg(context))); default: - FIXME(int21, "Unimplemented long file name function:\n"); + FIXME("Unimplemented long file name function:\n"); INT_BARF( context, 0x21 ); SET_CFLAG(context); AL_reg(context) = 0; @@ -2236,9 +2236,9 @@ void WINAPI DOS3Call( CONTEXT86 *context ) case 0x70: /* MS-DOS 7 (Windows95) - ??? (country-specific?)*/ case 0x72: /* MS-DOS 7 (Windows95) - ??? */ case 0x73: /* MS-DOS 7 (Windows95) - DRIVE LOCKING ??? */ - TRACE(int21,"windows95 function AX %04x\n", + TRACE("windows95 function AX %04x\n", AX_reg(context)); - WARN(int21, " returning unimplemented\n"); + WARN(" returning unimplemented\n"); SET_CFLAG(context); AL_reg(context) = 0; break; @@ -2260,9 +2260,9 @@ void WINAPI DOS3Call( CONTEXT86 *context ) } if ((EFL_reg(context) & 0x0001)) - TRACE(int21, "failed, error 0x%04lx\n", GetLastError() ); + TRACE("failed, error 0x%04lx\n", GetLastError() ); - TRACE(int21, "returning: AX=%04x BX=%04x CX=%04x DX=%04x " + TRACE("returning: AX=%04x BX=%04x CX=%04x DX=%04x " "SI=%04x DI=%04x DS=%04x ES=%04x EFL=%08lx\n", AX_reg(context), BX_reg(context), CX_reg(context), DX_reg(context), SI_reg(context), DI_reg(context), @@ -2272,7 +2272,7 @@ void WINAPI DOS3Call( CONTEXT86 *context ) FARPROC16 WINAPI GetSetKernelDOSProc16(FARPROC16 DosProc) { - FIXME(int21, "(DosProc=0x%08x): stub\n", (UINT)DosProc); + FIXME("(DosProc=0x%08x): stub\n", (UINT)DosProc); return NULL; } diff --git a/msdos/int25.c b/msdos/int25.c index 84b221c1b11f2421e3582579283c4160a7e0eaee..1a628ba1cea06919326bfb21544c1cd43978e9b2 100644 --- a/msdos/int25.c +++ b/msdos/int25.c @@ -10,7 +10,7 @@ #include "ldt.h" #include "miscemu.h" #include "drive.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(int) @@ -44,7 +44,7 @@ void WINAPI INT_Int25Handler( CONTEXT86 *context ) begin = DX_reg(context); length = CX_reg(context); } - TRACE(int, "int25: abs diskread, drive %d, sector %ld, " + TRACE("int25: abs diskread, drive %d, sector %ld, " "count %ld, buffer %p\n", AL_reg(context), begin, length, dataptr); diff --git a/msdos/int26.c b/msdos/int26.c index bf76c649c4292579f1426b2c294da4947727f2e3..df84e6ad4d5b6c4c8939a2b1b674d4fd8e0d14fb 100644 --- a/msdos/int26.c +++ b/msdos/int26.c @@ -9,7 +9,7 @@ #include "ldt.h" #include "miscemu.h" #include "drive.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(int) @@ -43,7 +43,7 @@ void WINAPI INT_Int26Handler( CONTEXT86 *context ) length = CX_reg(context); } - TRACE(int,"int26: abs diskwrite, drive %d, sector %ld, " + TRACE("int26: abs diskwrite, drive %d, sector %ld, " "count %ld, buffer %p\n", AL_reg(context), begin, length, dataptr ); diff --git a/msdos/int2a.c b/msdos/int2a.c index efcf0c2eca80bb1277bdacbaff1d5c462136a786..ecef77a6b3b2e16f847a711506e860dbdc363ccf 100644 --- a/msdos/int2a.c +++ b/msdos/int2a.c @@ -5,7 +5,7 @@ #include <stdlib.h> #include "msdos.h" #include "miscemu.h" -#include "debug.h" +#include "debugtools.h" /********************************************************************** * INT_Int2aHandler diff --git a/msdos/int2f.c b/msdos/int2f.c index 52ec327ba57101ed391baee8f14bfd618b4fe536..2b77bf9b23dbe032d27b796b63bbdf9601bb8559 100644 --- a/msdos/int2f.c +++ b/msdos/int2f.c @@ -21,7 +21,7 @@ #include "dosexe.h" #include "heap.h" /* #define DEBUG_INT */ -#include "debug.h" +#include "debugtools.h" #include "cdrom.h" DEFAULT_DEBUG_CHANNEL(int) @@ -39,7 +39,7 @@ static void MSCDEX_Handler( CONTEXT86 *context ); */ void WINAPI INT_Int2fHandler( CONTEXT86 *context ) { - TRACE(int,"Subfunction 0x%X\n", AX_reg(context)); + TRACE("Subfunction 0x%X\n", AX_reg(context)); switch(AH_reg(context)) { @@ -87,7 +87,7 @@ void WINAPI INT_Int2fHandler( CONTEXT86 *context ) DI_reg(context) = 0x0000; break; case 0x08: - FIXME(int, "No real-mode handler for errors yet! (bye!)"); + FIXME("No real-mode handler for errors yet! (bye!)"); break; default: INT_BARF(context, 0x2f); @@ -115,7 +115,7 @@ void WINAPI INT_Int2fHandler( CONTEXT86 *context ) switch (AL_reg(context)) { case 0x00: /* XMS v2+ installation check */ - WARN(int,"XMS is not fully implemented\n"); + WARN("XMS is not fully implemented\n"); AL_reg(context) = 0x80; break; case 0x10: /* XMS v2+ get driver address */ @@ -137,7 +137,7 @@ void WINAPI INT_Int2fHandler( CONTEXT86 *context ) INT_BARF( context, 0x2f ); } #else - FIXME(int,"check for XMS (not supported)\n"); + FIXME("check for XMS (not supported)\n"); AL_reg(context) = 0x42; /* != 0x80 */ #endif break; @@ -184,7 +184,7 @@ void WINAPI INT_Int2fHandler( CONTEXT86 *context ) case 0x03: case 0x04: case 0x05: - FIXME(int,"Task Switcher - not implemented\n"); + FIXME("Task Switcher - not implemented\n"); break; default: INT_BARF( context, 0x2f ); @@ -248,7 +248,7 @@ void WINAPI INT_Int2fHandler( CONTEXT86 *context ) case 0x01: /* Quarterdeck RPCI - QEMM/QRAM - PCL-838.EXE functions */ if(BX_reg(context) == 0x5145 && CX_reg(context) == 0x4D4D && DX_reg(context) == 0x3432) - TRACE(int, "Check for QEMM v5.0+ (not installed)\n"); + TRACE("Check for QEMM v5.0+ (not installed)\n"); break; default: INT_BARF( context, 0x2f ); @@ -272,7 +272,7 @@ void WINAPI INT_Int2fHandler( CONTEXT86 *context ) case 0x01: /* Quarterdeck QDPMI.SYS - DESQview */ if(BX_reg(context) == 0x4450 && CX_reg(context) == 0x4d49 && DX_reg(context) == 0x8f4f) - TRACE(int, "Check for QDPMI.SYS (not installed)\n"); + TRACE("Check for QDPMI.SYS (not installed)\n"); break; default: INT_BARF( context, 0x2f ); @@ -315,7 +315,7 @@ static void do_int2f_16( CONTEXT86 *context ) case 0x11: /* Get Shell Parameters - (SHELL= in CONFIG.SYS) */ /* We can mock this up. But not today... */ - FIXME(int, "Get Shell Parameters\n"); + FIXME("Get Shell Parameters\n"); break; case 0x80: /* Release time-slice */ @@ -344,7 +344,7 @@ static void do_int2f_16( CONTEXT86 *context ) VXD_BASE + BX_reg(context) ); if (!addr) /* not supported */ { - ERR(int, "Accessing unknown VxD %04x - Expect a failure now.\n", + ERR("Accessing unknown VxD %04x - Expect a failure now.\n", BX_reg(context) ); } ES_reg(context) = SELECTOROF(addr); @@ -437,7 +437,7 @@ static void MSCDEX_Dump(char* pfx, BYTE* req, int dorealmode) } break; } - TRACE(int, "%s\n", buf); + TRACE("%s\n", buf); } #else #define MSCDEX_Dump(pfx, req, drm) @@ -466,7 +466,7 @@ static void MSCDEX_Handler(CONTEXT86* context) break; } } - TRACE(int, "Installation check: %d cdroms, starting at %d\n", count, drive); + TRACE("Installation check: %d cdroms, starting at %d\n", count, drive); BX_reg(context) = count; CX_reg(context) = (drive < MAX_DOS_DRIVES) ? drive : 0; break; @@ -478,7 +478,7 @@ static void MSCDEX_Handler(CONTEXT86* context) case 0x0C: /* get version */ BX_reg(context) = 0x020a; - TRACE(int, "Version number => %04x\n", BX_reg(context)); + TRACE("Version number => %04x\n", BX_reg(context)); break; case 0x0D: /* get drive letters */ @@ -487,7 +487,7 @@ static void MSCDEX_Handler(CONTEXT86* context) for (drive = 0; drive < MAX_DOS_DRIVES; drive++) { if (DRIVE_GetType(drive) == TYPE_CDROM) *p++ = drive; } - TRACE(int, "Get drive letters\n"); + TRACE("Get drive letters\n"); break; case 0x10: /* direct driver acces */ @@ -504,8 +504,8 @@ static void MSCDEX_Handler(CONTEXT86* context) if (!driver_request) { /* FIXME - to be deleted ?? */ - ERR(int, "ES:BX==0 ! SEGFAULT ?\n"); - ERR(int, "-->BX=0x%04x, ES=0x%04lx, DS=0x%04lx, CX=0x%04x\n", + ERR("ES:BX==0 ! SEGFAULT ?\n"); + ERR("-->BX=0x%04x, ES=0x%04lx, DS=0x%04lx, CX=0x%04x\n", BX_reg(context), ES_reg(context), DS_reg(context), CX_reg(context)); driver_request[4] |= 0x80; driver_request[3] = 5; /* bad request length */ @@ -517,14 +517,14 @@ static void MSCDEX_Handler(CONTEXT86* context) */ if (wcda.unixdev <= 0) CDAUDIO_Open(&wcda); - TRACE(int, "CDROM device driver -> command <%d>\n", (unsigned char)driver_request[2]); + TRACE("CDROM device driver -> command <%d>\n", (unsigned char)driver_request[2]); for (drive = 0; drive < MAX_DOS_DRIVES && DRIVE_GetType(drive) != TYPE_CDROM; drive++); /* drive contains the first CD ROM */ if (CX_reg(context) != drive) { - WARN(int, "Request made doesn't match a CD ROM drive (%d/%d)\n", CX_reg(context), drive); + WARN("Request made doesn't match a CD ROM drive (%d/%d)\n", CX_reg(context), drive); driver_request[4] |= 0x80; driver_request[3] = 1; /* unknown unit */ return; @@ -542,7 +542,7 @@ static void MSCDEX_Handler(CONTEXT86* context) DOSMEM_MapRealToLinear(MAKELONG(PTR_AT(driver_request, 14, WORD), PTR_AT(driver_request, 16, WORD))) : PTR_SEG_OFF_TO_LIN(PTR_AT(driver_request, 16, WORD), PTR_AT(driver_request, 14, WORD)); - TRACE(int, " --> IOCTL INPUT <%d>\n", io_stru[0]); + TRACE(" --> IOCTL INPUT <%d>\n", io_stru[0]); switch (io_stru[0]) { #if 0 case 0: /* Get device Header */ @@ -580,10 +580,10 @@ static void MSCDEX_Handler(CONTEXT86* context) MSCDEX_StoreMSF(wcda.dwCurFrame, io_stru + 2); break; default: - ERR(int, "CDRom-Driver: Unsupported addressing mode !!\n"); + ERR("CDRom-Driver: Unsupported addressing mode !!\n"); Error = 0x0c; } - TRACE(int, " ----> HEAD LOCATION <%ld>\n", PTR_AT(io_stru, 2, DWORD)); + TRACE(" ----> HEAD LOCATION <%ld>\n", PTR_AT(io_stru, 2, DWORD)); break; case 4: /* Audio channel info */ @@ -595,7 +595,7 @@ static void MSCDEX_Handler(CONTEXT86* context) io_stru[6] = 0; io_stru[7] = 3; io_stru[8] = 0; - TRACE(int, " ----> AUDIO CHANNEL INFO\n"); + TRACE(" ----> AUDIO CHANNEL INFO\n"); break; case 6: /* device status */ @@ -616,18 +616,18 @@ static void MSCDEX_Handler(CONTEXT86* context) */ if (wcda.cdaMode == WINE_CDA_OPEN) io_stru[1] |= 1; - TRACE(int, " ----> DEVICE STATUS <0x%08lx>\n", PTR_AT(io_stru, 1, DWORD)); + TRACE(" ----> DEVICE STATUS <0x%08lx>\n", PTR_AT(io_stru, 1, DWORD)); break; case 8: /* Volume size */ PTR_AT(io_stru, 1, DWORD) = wcda.dwTotalLen; - TRACE(int, " ----> VOLUME SIZE <%ld>\n", PTR_AT(io_stru, 1, DWORD)); + TRACE(" ----> VOLUME SIZE <%ld>\n", PTR_AT(io_stru, 1, DWORD)); break; case 9: /* media changed ? */ /* answers don't know... -1/1 for yes/no would be better */ io_stru[1] = 0; /* FIXME? 1? */ - TRACE(int, " ----> MEDIA CHANGED <%d>\n", io_stru[1]); + TRACE(" ----> MEDIA CHANGED <%d>\n", io_stru[1]); break; case 10: /* audio disk info */ @@ -635,7 +635,7 @@ static void MSCDEX_Handler(CONTEXT86* context) io_stru[2] = wcda.nLastTrack; /* ending track */ MSCDEX_StoreMSF(wcda.dwTotalLen, io_stru + 3); - TRACE(int, " ----> AUDIO DISK INFO <%d-%d/%08lx>\n", + TRACE(" ----> AUDIO DISK INFO <%d-%d/%08lx>\n", io_stru[1], io_stru[2], PTR_AT(io_stru, 3, DWORD)); break; @@ -649,7 +649,7 @@ static void MSCDEX_Handler(CONTEXT86* context) PTR_AT(io_stru, 2, DWORD) = 0; io_stru[6] = 0; } - TRACE(int, " ----> AUDIO TRACK INFO[%d] = [%08lx:%d]\n", + TRACE(" ----> AUDIO TRACK INFO[%d] = [%08lx:%d]\n", io_stru[1], PTR_AT(io_stru, 2, DWORD), io_stru[6]); break; @@ -674,7 +674,7 @@ static void MSCDEX_Handler(CONTEXT86* context) io_stru[10] = bTmp[0]; io_stru[11] = 0; } - TRACE(int, "Q-Channel info: Ctrl/adr=%02x TNO=%02x X=%02x rtt=%02x:%02x:%02x rtd=%02x:%02x:%02x (cf=%08lx, tp=%08lx)\n", + TRACE("Q-Channel info: Ctrl/adr=%02x TNO=%02x X=%02x rtt=%02x:%02x:%02x rtd=%02x:%02x:%02x (cf=%08lx, tp=%08lx)\n", io_stru[ 1], io_stru[ 2], io_stru[ 3], io_stru[ 4], io_stru[ 5], io_stru[ 6], io_stru[ 8], io_stru[ 9], io_stru[10], @@ -691,12 +691,12 @@ static void MSCDEX_Handler(CONTEXT86* context) PTR_AT(io_stru, 3, DWORD) = wcda.lpdwTrackPos[0]; PTR_AT(io_stru, 7, DWORD) = wcda.lpdwTrackPos[wcda.nTracks - 1]; } - TRACE(int, "Audio status info: status=%04x startLoc=%ld endLoc=%ld\n", + TRACE("Audio status info: status=%04x startLoc=%ld endLoc=%ld\n", PTR_AT(io_stru, 1, WORD), PTR_AT(io_stru, 3, DWORD), PTR_AT(io_stru, 7, DWORD)); break; default: - FIXME(int, "IOCTL INPUT: Unimplemented <%d>!!\n", io_stru[0]); + FIXME("IOCTL INPUT: Unimplemented <%d>!!\n", io_stru[0]); Error = 0x0c; break; } @@ -707,25 +707,25 @@ static void MSCDEX_Handler(CONTEXT86* context) DOSMEM_MapRealToLinear(MAKELONG(PTR_AT(driver_request, 14, WORD), PTR_AT(driver_request, 16, WORD))) : PTR_SEG_OFF_TO_LIN(PTR_AT(driver_request, 16, WORD), PTR_AT(driver_request, 14, WORD)); - TRACE(int, " --> IOCTL OUTPUT <%d>\n", io_stru[0]); + TRACE(" --> IOCTL OUTPUT <%d>\n", io_stru[0]); switch (io_stru[0]) { case 0: /* eject */ CDAUDIO_SetDoor(&wcda, 1); - TRACE(int, " ----> EJECT\n"); + TRACE(" ----> EJECT\n"); break; case 2: /* reset drive */ CDAUDIO_Reset(&wcda); - TRACE(int, " ----> RESET\n"); + TRACE(" ----> RESET\n"); break; case 3: /* Audio Channel Control */ - FIXME(int, " ----> AUDIO CHANNEL CONTROL (NIY)\n"); + FIXME(" ----> AUDIO CHANNEL CONTROL (NIY)\n"); break; case 5: /* close tray */ CDAUDIO_SetDoor(&wcda, 0); - TRACE(int, " ----> CLOSE TRAY\n"); + TRACE(" ----> CLOSE TRAY\n"); break; default: - FIXME(int, " IOCTL OUPUT: Unimplemented <%d>!!\n", io_stru[0]); + FIXME(" IOCTL OUPUT: Unimplemented <%d>!!\n", io_stru[0]); Error = 0x0c; break; } @@ -737,7 +737,7 @@ static void MSCDEX_Handler(CONTEXT86* context) at = PTR_AT(driver_request, 20, DWORD); - TRACE(int, " --> SEEK AUDIO mode :<0x%02X>, [%ld]\n", + TRACE(" --> SEEK AUDIO mode :<0x%02X>, [%ld]\n", (BYTE)driver_request[13], at); switch (driver_request[13]) { @@ -753,7 +753,7 @@ static void MSCDEX_Handler(CONTEXT86* context) CDAUDIO_Seek(&wcda, at); break; default: - ERR(int, "Unsupported address mode !!\n"); + ERR("Unsupported address mode !!\n"); Error = 0x0c; break; } @@ -767,7 +767,7 @@ static void MSCDEX_Handler(CONTEXT86* context) beg = end = PTR_AT(driver_request, 14, DWORD); end += PTR_AT(driver_request, 18, DWORD); - TRACE(int, " --> PLAY AUDIO mode :<0x%02X>, [%ld-%ld]\n", + TRACE(" --> PLAY AUDIO mode :<0x%02X>, [%ld-%ld]\n", (BYTE)driver_request[13], beg, end); switch (driver_request[13]) { @@ -786,7 +786,7 @@ static void MSCDEX_Handler(CONTEXT86* context) CDAUDIO_Play(&wcda, beg, end); break; default: - ERR(int, "Unsupported address mode !!\n"); + ERR("Unsupported address mode !!\n"); Error = 0x0c; break; } @@ -796,20 +796,20 @@ static void MSCDEX_Handler(CONTEXT86* context) case 133: if (wcda.cdaMode == WINE_CDA_PLAY) { CDAUDIO_Pause(&wcda, 1); - TRACE(int, " --> STOP AUDIO (Paused)\n"); + TRACE(" --> STOP AUDIO (Paused)\n"); } else { CDAUDIO_Stop(&wcda); - TRACE(int, " --> STOP AUDIO (Stopped)\n"); + TRACE(" --> STOP AUDIO (Stopped)\n"); } break; case 136: - TRACE(int, " --> RESUME AUDIO\n"); + TRACE(" --> RESUME AUDIO\n"); CDAUDIO_Pause(&wcda, 0); break; default: - FIXME(int, " ioctl uninplemented <%d>\n", driver_request[2]); + FIXME(" ioctl uninplemented <%d>\n", driver_request[2]); Error = 0x0c; } @@ -829,7 +829,7 @@ static void MSCDEX_Handler(CONTEXT86* context) } break; default: - FIXME(int, "Unimplemented MSCDEX function 0x%02X.\n", AL_reg(context)); + FIXME("Unimplemented MSCDEX function 0x%02X.\n", AL_reg(context)); break; } } diff --git a/msdos/int33.c b/msdos/int33.c index 23069fc620404f2a362de4d396c856c9ced4dc14..1f5f22923f0760a90e1a785a77800af410e6132f 100644 --- a/msdos/int33.c +++ b/msdos/int33.c @@ -6,7 +6,7 @@ #include "winuser.h" #include "miscemu.h" #include "dosexe.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(int) @@ -27,20 +27,20 @@ void WINAPI INT_Int33Handler( CONTEXT86 *context ) switch (AX_reg(context)) { case 0x00: - TRACE(int,"Reset mouse driver and request status\n"); + TRACE("Reset mouse driver and request status\n"); AX_reg(context) = 0xFFFF; /* installed */ BX_reg(context) = 3; /* # of buttons */ sys = calloc(1,sizeof(MOUSESYSTEM)); DOSVM_SetSystemData(0x33, sys); break; case 0x03: - TRACE(int,"Return mouse position and button status\n"); + TRACE("Return mouse position and button status\n"); BX_reg(context) = sys->but; CX_reg(context) = sys->x; DX_reg(context) = sys->y; break; case 0x0C: /* Define interrupt subroutine */ - TRACE(int,"Define mouse interrupt subroutine\n"); + TRACE("Define mouse interrupt subroutine\n"); sys->callmask = CX_reg(context); sys->callback = (FARPROC16)PTR_SEG_OFF_TO_SEGPTR(ES_reg(context), DX_reg(context)); break; diff --git a/msdos/int3d.c b/msdos/int3d.c index 30fabe5307738e01b74dc67787f26cda80e54311..768e260fc354ada37d542b38fcfa430330ac24c2 100644 --- a/msdos/int3d.c +++ b/msdos/int3d.c @@ -7,7 +7,7 @@ #include "msdos.h" #include "miscemu.h" /* #define DEBUG_INT */ -#include "debug.h" +#include "debugtools.h" /********************************************************************** * INT_Int3dHandler diff --git a/msdos/int5c.c b/msdos/int5c.c index 79440b7422b9fb4479372b5c61aead534a8698dc..feb1c7c71b529d61c973fefa83cb24103ec600e9 100644 --- a/msdos/int5c.c +++ b/msdos/int5c.c @@ -6,7 +6,7 @@ #include "ldt.h" #include "miscemu.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(int) @@ -20,7 +20,7 @@ void WINAPI NetBIOSCall16( CONTEXT86 *context ) { BYTE* ptr; ptr = (BYTE*) PTR_SEG_OFF_TO_LIN(ES_reg(context),BX_reg(context)); - FIXME(int,"(%p): command code %02x (ignored)\n",context, *ptr); + FIXME("(%p): command code %02x (ignored)\n",context, *ptr); AL_reg(context) = *(ptr+0x01) = 0xFB; /* NetBIOS emulator not found */ } diff --git a/msdos/interrupts.c b/msdos/interrupts.c index 36282a05391d80c8508a82096f48c3729572d705..abfe861614d2e690b723ef3858ab2e4cecfe0308 100644 --- a/msdos/interrupts.c +++ b/msdos/interrupts.c @@ -8,7 +8,7 @@ #include "windef.h" #include "miscemu.h" #include "msdos.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(int) @@ -33,7 +33,7 @@ FARPROC16 INT_GetPMHandler( BYTE intnum ) */ void INT_SetPMHandler( BYTE intnum, FARPROC16 handler ) { - TRACE(int, "Set protected mode interrupt vector %02x <- %04x:%04x\n", + TRACE("Set protected mode interrupt vector %02x <- %04x:%04x\n", intnum, HIWORD(handler), LOWORD(handler) ); INT_Vectors[intnum] = handler; } @@ -57,7 +57,7 @@ FARPROC16 INT_GetRMHandler( BYTE intnum ) */ void INT_SetRMHandler( BYTE intnum, FARPROC16 handler ) { - TRACE(int, "Set real mode interrupt vector %02x <- %04x:%04x\n", + TRACE("Set real mode interrupt vector %02x <- %04x:%04x\n", intnum, HIWORD(handler), LOWORD(handler) ); ((FARPROC16*)DOSMEM_MemoryBase(0))[intnum] = handler; } @@ -85,7 +85,7 @@ FARPROC16 INT_CtxGetHandler( CONTEXT86 *context, BYTE intnum ) void INT_CtxSetHandler( CONTEXT86 *context, BYTE intnum, FARPROC16 handler ) { if (ISV86(context)) { - TRACE(int, "Set real mode interrupt vector %02x <- %04x:%04x\n", + TRACE("Set real mode interrupt vector %02x <- %04x:%04x\n", intnum, HIWORD(handler), LOWORD(handler) ); ((FARPROC16*)V86BASE(context))[intnum] = handler; } else @@ -152,7 +152,7 @@ int INT_RealModeInterrupt( BYTE intnum, CONTEXT86 *context ) INT_Int33Handler(context); break; default: - FIXME(int, "Unknown Interrupt in DOS mode: 0x%x\n", intnum); + FIXME("Unknown Interrupt in DOS mode: 0x%x\n", intnum); return 1; } return 0; diff --git a/msdos/ioports.c b/msdos/ioports.c index 41f0931cd83cbf7c0b3abdc5bef1616b6b96b3b6..931970ecabb21fce3e1df87ef7d7ac1929b3afad 100644 --- a/msdos/ioports.c +++ b/msdos/ioports.c @@ -21,7 +21,7 @@ #include "dosexe.h" #include "options.h" #include "miscemu.h" -#include "debug.h" +#include "debugtools.h" #include "miscemu.h" DEFAULT_DEBUG_CHANNEL(int) @@ -80,7 +80,7 @@ static void IO_FixCMOSCheckSum(void) sum += cmosimage[i]; cmosimage[0x2e] = sum >> 8; /* yes, this IS hi byte !! */ cmosimage[0x2f] = sum & 0xff; - TRACE(int, "calculated hi %02x, lo %02x\n", cmosimage[0x2e], cmosimage[0x2f]); + TRACE("calculated hi %02x, lo %02x\n", cmosimage[0x2e], cmosimage[0x2f]); } static void set_timer_maxval(unsigned timer, unsigned maxval) @@ -90,13 +90,13 @@ static void set_timer_maxval(unsigned timer, unsigned maxval) DOSVM_SetTimer(maxval); break; case 1: /* RAM refresh */ - FIXME(int, "RAM refresh counter handling not implemented !"); + FIXME("RAM refresh counter handling not implemented !"); break; case 2: /* cassette & speaker */ /* speaker on ? */ if (((BYTE)parport_8255[1] & 3) == 3) { - TRACE(int, "Beep (freq: %d) !\n", 1193180 / maxval ); + TRACE("Beep (freq: %d) !\n", 1193180 / maxval ); Beep(1193180 / maxval, 20); } break; @@ -138,7 +138,7 @@ static void do_IO_port_init_read_or_write(char* temp, char rw) { int val, val1, i, len; if (!strcasecmp(temp, "all")) { - MSG("Warning!!! Granting FULL IO port access to" + MESSAGE("Warning!!! Granting FULL IO port access to" " windoze programs!\nWarning!!! " "*** THIS IS NOT AT ALL " "RECOMMENDED!!! ***\n"); @@ -253,7 +253,7 @@ DWORD IO_inport( int port, int size ) { DWORD res = 0; - TRACE(int, "%d-byte value from port 0x%02x\n", size, port ); + TRACE("%d-byte value from port 0x%02x\n", size, port ); #ifdef DIRECT_IO_ACCESS if ((do_direct_port_access) @@ -267,7 +267,7 @@ DWORD IO_inport( int port, int size ) case 2: res = inw( port ); break; case 4: res = inl( port ); break; default: - ERR(int, "invalid data size %d\n", size); + ERR("invalid data size %d\n", size); } iopl(0); return res; @@ -347,11 +347,11 @@ DWORD IO_inport( int port, int size ) res = 0xffffffff; /* no joystick */ break; default: - WARN( int, "Direct I/O read attempted from port %x\n", port); + WARN("Direct I/O read attempted from port %x\n", port); res = 0xffffffff; break; } - TRACE(int, " returning ( 0x%lx )\n", res ); + TRACE(" returning ( 0x%lx )\n", res ); return res; } @@ -361,7 +361,7 @@ DWORD IO_inport( int port, int size ) */ void IO_outport( int port, int size, DWORD value ) { - TRACE(int, "IO: 0x%lx (%d-byte value) to port 0x%02x\n", + TRACE("IO: 0x%lx (%d-byte value) to port 0x%02x\n", value, size, port ); #ifdef DIRECT_IO_ACCESS @@ -376,7 +376,7 @@ void IO_outport( int port, int size, DWORD value ) case 2: outw( LOWORD(value), port ); break; case 4: outl( value, port ); break; default: - WARN(int, "Invalid data size %d\n", size); + WARN("Invalid data size %d\n", size); } iopl(0); return; @@ -442,7 +442,7 @@ void IO_outport( int port, int size, DWORD value ) /* ctrl byte for specific timer channel */ tmr_8253_ctrlbyte_ch[chan] = (BYTE)value; if (chan == 3) { - FIXME(int,"8254 timer readback not implemented yet\n"); + FIXME("8254 timer readback not implemented yet\n"); } else if (((BYTE)value&0x30)==0) { /* latch timer */ @@ -463,7 +463,7 @@ void IO_outport( int port, int size, DWORD value ) parport_8255[1] = (BYTE)value; if ((((BYTE)parport_8255[1] & 3) == 3) && (tmr_8253_countmax[2] != 1)) { - TRACE(int, "Beep (freq: %d) !\n", 1193180 / tmr_8253_countmax[2]); + TRACE("Beep (freq: %d) !\n", 1193180 / tmr_8253_countmax[2]); Beep(1193180 / tmr_8253_countmax[2], 20); } break; @@ -474,7 +474,7 @@ void IO_outport( int port, int size, DWORD value ) cmosimage[cmosaddress & 0x3f] = (BYTE)value; break; default: - WARN(int, "Direct I/O write attempted to port %x\n", port ); + WARN("Direct I/O write attempted to port %x\n", port ); break; } } diff --git a/msdos/vxd.c b/msdos/vxd.c index 3281c7a4238108ab3e88b2cdc13249b8fd7c214e..87194f4d7ffba27757b2be0a2383014a42e86b86 100644 --- a/msdos/vxd.c +++ b/msdos/vxd.c @@ -17,13 +17,13 @@ #include "task.h" #include "process.h" #include "file.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(vxd) #define VXD_BARF(context,name) \ - DUMP( "vxd %s: unknown/not implemented parameters:\n" \ + DPRINTF( "vxd %s: unknown/not implemented parameters:\n" \ "vxd %s: AX %04x, BX %04x, CX %04x, DX %04x, " \ "SI %04x, DI %04x, DS %04x, ES %04x\n", \ (name), (name), AX_reg(context), BX_reg(context), \ @@ -44,7 +44,7 @@ void VXD_VMM ( CONTEXT86 *context ) { unsigned service = AX_reg(context); - TRACE(vxd,"[%04x] VMM \n", (UINT16)service); + TRACE("[%04x] VMM \n", (UINT16)service); switch(service) { @@ -73,18 +73,18 @@ void WINAPI VXD_PageFile( CONTEXT86 *context ) /* taken from Ralf Brown's Interrupt List */ - TRACE(vxd,"[%04x] PageFile\n", (UINT16)service ); + TRACE("[%04x] PageFile\n", (UINT16)service ); switch(service) { case 0x00: /* get version, is this windows version? */ - TRACE(vxd,"returning version\n"); + TRACE("returning version\n"); AX_reg(context) = VXD_WinVersion(); RESET_CFLAG(context); break; case 0x01: /* get swap file info */ - TRACE(vxd,"VxD PageFile: returning swap file info\n"); + TRACE("VxD PageFile: returning swap file info\n"); AX_reg(context) = 0x00; /* paging disabled */ ECX_reg(context) = 0; /* maximum size of paging file */ /* FIXME: do I touch DS:SI or DS:DI? */ @@ -92,12 +92,12 @@ void WINAPI VXD_PageFile( CONTEXT86 *context ) break; case 0x02: /* delete permanent swap on exit */ - TRACE(vxd,"VxD PageFile: supposed to delete swap\n"); + TRACE("VxD PageFile: supposed to delete swap\n"); RESET_CFLAG(context); break; case 0x03: /* current temporary swap file size */ - TRACE(vxd,"VxD PageFile: what is current temp. swap size\n"); + TRACE("VxD PageFile: what is current temp. swap size\n"); RESET_CFLAG(context); break; @@ -117,7 +117,7 @@ void VXD_Reboot ( CONTEXT86 *context ) { unsigned service = AX_reg(context); - TRACE(vxd,"[%04x] VMM \n", (UINT16)service); + TRACE("[%04x] VMM \n", (UINT16)service); switch(service) { @@ -138,7 +138,7 @@ void VXD_VDD ( CONTEXT86 *context ) { unsigned service = AX_reg(context); - TRACE(vxd,"[%04x] VDD \n", (UINT16)service); + TRACE("[%04x] VDD \n", (UINT16)service); switch(service) { @@ -159,7 +159,7 @@ void VXD_VMD ( CONTEXT86 *context ) { unsigned service = AX_reg(context); - TRACE(vxd,"[%04x] VMD \n", (UINT16)service); + TRACE("[%04x] VMD \n", (UINT16)service); switch(service) { @@ -180,12 +180,12 @@ void WINAPI VXD_Shell( CONTEXT86 *context ) { unsigned service = DX_reg(context); - TRACE(vxd,"[%04x] Shell\n", (UINT16)service); + TRACE("[%04x] Shell\n", (UINT16)service); switch (service) /* Ralf Brown says EDX, but I use DX instead */ { case 0x0000: - TRACE(vxd,"returning version\n"); + TRACE("returning version\n"); AX_reg(context) = VXD_WinVersion(); EBX_reg(context) = 1; /* system VM Handle */ break; @@ -215,7 +215,7 @@ void WINAPI VXD_Shell( CONTEXT86 *context ) break; case 0x0006: /* SHELL_Get_VM_State */ - TRACE(vxd,"VxD Shell: returning VM state\n"); + TRACE("VxD Shell: returning VM state\n"); /* Actually we don't, not yet. We have to return a structure * and I am not to sure how to set it up and return it yet, * so for now let's do nothing. I can (hopefully) get this @@ -254,7 +254,7 @@ void WINAPI VXD_Shell( CONTEXT86 *context ) break; case 0x0106: /* install timeout callback */ - TRACE( vxd, "VxD Shell: ignoring shell callback (%ld sec.)\n", + TRACE("VxD Shell: ignoring shell callback (%ld sec.)\n", EBX_reg( context ) ); SET_CFLAG(context); break; @@ -274,12 +274,12 @@ void WINAPI VXD_Comm( CONTEXT86 *context ) { unsigned service = AX_reg(context); - TRACE(vxd,"[%04x] Comm\n", (UINT16)service); + TRACE("[%04x] Comm\n", (UINT16)service); switch (service) { case 0x0000: /* get version */ - TRACE(vxd,"returning version\n"); + TRACE("returning version\n"); AX_reg(context) = VXD_WinVersion(); RESET_CFLAG(context); break; @@ -299,7 +299,7 @@ void VXD_Timer( CONTEXT86 *context ) { unsigned service = AX_reg(context); - TRACE(vxd,"[%04x] Virtual Timer\n", (UINT16)service); + TRACE("[%04x] Virtual Timer\n", (UINT16)service); switch(service) { @@ -335,7 +335,7 @@ void VXD_TimerAPI ( CONTEXT86 *context ) { unsigned service = AX_reg(context); - TRACE(vxd,"[%04x] TimerAPI \n", (UINT16)service); + TRACE("[%04x] TimerAPI \n", (UINT16)service); switch(service) { @@ -368,7 +368,7 @@ void VXD_ConfigMG ( CONTEXT86 *context ) { unsigned service = AX_reg(context); - TRACE(vxd,"[%04x] ConfigMG \n", (UINT16)service); + TRACE("[%04x] ConfigMG \n", (UINT16)service); switch(service) { @@ -389,7 +389,7 @@ void VXD_Enable ( CONTEXT86 *context ) { unsigned service = AX_reg(context); - TRACE(vxd,"[%04x] Enable \n", (UINT16)service); + TRACE("[%04x] Enable \n", (UINT16)service); switch(service) { @@ -410,7 +410,7 @@ void VXD_APM ( CONTEXT86 *context ) { unsigned service = AX_reg(context); - TRACE(vxd,"[%04x] APM \n", (UINT16)service); + TRACE("[%04x] APM \n", (UINT16)service); switch(service) { @@ -501,7 +501,7 @@ void VXD_Win32s( CONTEXT86 *context ) * 1 if VMCPD VxD not found */ - TRACE(vxd, "GetVersion()\n"); + TRACE("GetVersion()\n"); EAX_reg(context) = VXD_WinVersion() | (200 << 16); EBX_reg(context) = 0; @@ -577,7 +577,7 @@ void VXD_Win32s( CONTEXT86 *context ) if (found == 3 && retv) { - TRACE(vxd, "PERF130 hack: " + TRACE("PERF130 hack: " "Replacing byte %02X at offset %04X:%04X\n", *(retv+1), SELECTOROF(func1), OFFSETOF(func1) + retv+1-start); @@ -613,7 +613,7 @@ void VXD_Win32s( CONTEXT86 *context ) * Output: EAX: 0 if OK */ - TRACE(vxd, "[0001] EBX=%lx ECX=%lx EDX=%lx ESI=%lx EDI=%lx\n", + TRACE("[0001] EBX=%lx ECX=%lx EDX=%lx ESI=%lx EDI=%lx\n", EBX_reg(context), ECX_reg(context), EDX_reg(context), ESI_reg(context), EDI_reg(context)); @@ -636,7 +636,7 @@ void VXD_Win32s( CONTEXT86 *context ) * Output: EAX: Size of area changed */ - TRACE(vxd, "[0002] EBX=%lx ECX=%lx EDX=%lx\n", + TRACE("[0002] EBX=%lx ECX=%lx EDX=%lx\n", EBX_reg(context), ECX_reg(context), EDX_reg(context)); /* FIXME */ @@ -654,7 +654,7 @@ void VXD_Win32s( CONTEXT86 *context ) * Bit 1: Read-Write if set, Read-Only if clear */ - TRACE(vxd, "[0003] EDX=%lx\n", EDX_reg(context)); + TRACE("[0003] EDX=%lx\n", EDX_reg(context)); /* FIXME */ @@ -673,7 +673,7 @@ void VXD_Win32s( CONTEXT86 *context ) if (!EDX_reg(context) || CX_reg(context) == 0xFFFF) { - TRACE(vxd, "MapModule: Initialization call\n"); + TRACE("MapModule: Initialization call\n"); EAX_reg(context) = 0; } else @@ -711,7 +711,7 @@ void VXD_Win32s( CONTEXT86 *context ) BOOL error = (image == INVALID_HANDLE_VALUE); UINT i; - TRACE(vxd, "MapModule: Loading %s\n", module->pathName); + TRACE("MapModule: Loading %s\n", module->pathName); for (i = 0; !error && i < nt_header->FileHeader.NumberOfSections; @@ -722,7 +722,7 @@ void VXD_Win32s( CONTEXT86 *context ) DWORD len = pe_seg->SizeOfRawData; LPBYTE addr = module->baseAddr + pe_seg->VirtualAddress; - TRACE(vxd, "MapModule: " + TRACE("MapModule: " "Section %d at %08lx from %08lx len %08lx\n", i, (DWORD)addr, off, len); @@ -734,7 +734,7 @@ void VXD_Win32s( CONTEXT86 *context ) _lclose(image); if (error) - ERR(vxd, "MapModule: Unable to load %s\n", module->pathName); + ERR("MapModule: Unable to load %s\n", module->pathName); else if (module->relocDelta != 0) { @@ -743,14 +743,14 @@ void VXD_Win32s( CONTEXT86 *context ) IMAGE_BASE_RELOCATION *r = (IMAGE_BASE_RELOCATION *) (dir->Size? module->baseAddr + dir->VirtualAddress : 0); - TRACE(vxd, "MapModule: Reloc delta %08lx\n", module->relocDelta); + TRACE("MapModule: Reloc delta %08lx\n", module->relocDelta); while (r && r->VirtualAddress) { LPBYTE page = module->baseAddr + r->VirtualAddress; int count = (r->SizeOfBlock - 8) / 2; - TRACE(vxd, "MapModule: %d relocations for page %08lx\n", + TRACE("MapModule: %d relocations for page %08lx\n", count, (DWORD)page); for(i = 0; i < count; i++) @@ -771,7 +771,7 @@ void VXD_Win32s( CONTEXT86 *context ) *(DWORD*)(page+offset) += module->relocDelta; break; default: - WARN(vxd, "MapModule: Unsupported fixup type\n"); + WARN("MapModule: Unsupported fixup type\n"); break; } } @@ -793,7 +793,7 @@ void VXD_Win32s( CONTEXT86 *context ) * Output: EAX: 1 if OK */ - TRACE(vxd, "UnMapModule: %lx\n", (DWORD)W32S_APP2WINE(EDX_reg(context), W32S_OFFSET)); + TRACE("UnMapModule: %lx\n", (DWORD)W32S_APP2WINE(EDX_reg(context), W32S_OFFSET)); /* As we didn't map anything, there's nothing to unmap ... */ @@ -824,18 +824,18 @@ void VXD_Win32s( CONTEXT86 *context ) DWORD prot = stack[4]; DWORD result; - TRACE(vxd, "VirtualAlloc(%lx, %lx, %lx, %lx, %lx)\n", + TRACE("VirtualAlloc(%lx, %lx, %lx, %lx, %lx)\n", (DWORD)retv, (DWORD)base, size, type, prot); if (type & 0x80000000) { - WARN(vxd, "VirtualAlloc: strange type %lx\n", type); + WARN("VirtualAlloc: strange type %lx\n", type); type &= 0x7fffffff; } if (!base && (type & MEM_COMMIT) && prot == PAGE_READONLY) { - WARN(vxd, "VirtualAlloc: NLS hack, allowing write access!\n"); + WARN("VirtualAlloc: NLS hack, allowing write access!\n"); prot = PAGE_READWRITE; } @@ -872,7 +872,7 @@ void VXD_Win32s( CONTEXT86 *context ) DWORD type = stack[3]; DWORD result; - TRACE(vxd, "VirtualFree(%lx, %lx, %lx, %lx)\n", + TRACE("VirtualFree(%lx, %lx, %lx, %lx)\n", (DWORD)retv, (DWORD)base, size, type); result = VirtualFree(base, size, type); @@ -910,7 +910,7 @@ void VXD_Win32s( CONTEXT86 *context ) DWORD *old_prot = (DWORD *)W32S_APP2WINE(stack[4], W32S_OFFSET); DWORD result; - TRACE(vxd, "VirtualProtect(%lx, %lx, %lx, %lx, %lx)\n", + TRACE("VirtualProtect(%lx, %lx, %lx, %lx, %lx)\n", (DWORD)retv, (DWORD)base, size, new_prot, (DWORD)old_prot); result = VirtualProtect(base, size, new_prot, old_prot); @@ -947,7 +947,7 @@ void VXD_Win32s( CONTEXT86 *context ) DWORD len = stack[3]; DWORD result; - TRACE(vxd, "VirtualQuery(%lx, %lx, %lx, %lx)\n", + TRACE("VirtualQuery(%lx, %lx, %lx, %lx)\n", (DWORD)retv, (DWORD)base, (DWORD)info, len); result = VirtualQuery(base, info, len); @@ -967,7 +967,7 @@ void VXD_Win32s( CONTEXT86 *context ) * Output: EAX: NtStatus */ - TRACE(vxd, "[000a] ECX=%lx EDX=%lx\n", + TRACE("[000a] ECX=%lx EDX=%lx\n", ECX_reg(context), EDX_reg(context)); /* FIXME */ @@ -983,7 +983,7 @@ void VXD_Win32s( CONTEXT86 *context ) * Output: EAX: NtStatus */ - TRACE(vxd, "[000b] ECX=%lx\n", ECX_reg(context)); + TRACE("[000b] ECX=%lx\n", ECX_reg(context)); /* FIXME */ @@ -998,7 +998,7 @@ void VXD_Win32s( CONTEXT86 *context ) * Output: EDX: Previous Debug Flags */ - FIXME(vxd, "[000c] EDX=%lx\n", EDX_reg(context)); + FIXME("[000c] EDX=%lx\n", EDX_reg(context)); /* FIXME */ @@ -1035,13 +1035,13 @@ void VXD_Win32s( CONTEXT86 *context ) HANDLE result = INVALID_HANDLE_VALUE; char name[128]; - TRACE(vxd, "NtCreateSection(%lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx)\n", + TRACE("NtCreateSection(%lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx)\n", (DWORD)retv, flags1, atom, (DWORD)size, protect, flags2, (DWORD)hFile, psp); if (!atom || GlobalGetAtomNameA(atom, name, sizeof(name))) { - TRACE(vxd, "NtCreateSection: name=%s\n", atom? name : NULL); + TRACE("NtCreateSection: name=%s\n", atom? name : NULL); result = CreateFileMappingA(hFile, NULL, protect, size? size->HighPart : 0, @@ -1050,9 +1050,9 @@ void VXD_Win32s( CONTEXT86 *context ) } if (result == INVALID_HANDLE_VALUE) - WARN(vxd, "NtCreateSection: failed!\n"); + WARN("NtCreateSection: failed!\n"); else - TRACE(vxd, "NtCreateSection: returned %lx\n", (DWORD)result); + TRACE("NtCreateSection: returned %lx\n", (DWORD)result); if (result != INVALID_HANDLE_VALUE) *retv = result, @@ -1083,20 +1083,20 @@ void VXD_Win32s( CONTEXT86 *context ) HANDLE result = INVALID_HANDLE_VALUE; char name[128]; - TRACE(vxd, "NtOpenSection(%lx, %lx, %lx)\n", + TRACE("NtOpenSection(%lx, %lx, %lx)\n", (DWORD)retv, protect, atom); if (atom && GlobalGetAtomNameA(atom, name, sizeof(name))) { - TRACE(vxd, "NtOpenSection: name=%s\n", name); + TRACE("NtOpenSection: name=%s\n", name); result = OpenFileMappingA(protect, FALSE, name); } if (result == INVALID_HANDLE_VALUE) - WARN(vxd, "NtOpenSection: failed!\n"); + WARN("NtOpenSection: failed!\n"); else - TRACE(vxd, "NtOpenSection: returned %lx\n", (DWORD)result); + TRACE("NtOpenSection: returned %lx\n", (DWORD)result); if (result != INVALID_HANDLE_VALUE) *retv = result, @@ -1122,7 +1122,7 @@ void VXD_Win32s( CONTEXT86 *context ) HANDLE handle = stack[0]; DWORD *id = (DWORD *)W32S_APP2WINE(stack[1], W32S_OFFSET); - TRACE(vxd, "NtCloseSection(%lx, %lx)\n", (DWORD)handle, (DWORD)id); + TRACE("NtCloseSection(%lx, %lx)\n", (DWORD)handle, (DWORD)id); CloseHandle(handle); if (id) *id = 0; /* FIXME */ @@ -1145,7 +1145,7 @@ void VXD_Win32s( CONTEXT86 *context ) HANDLE handle = stack[0]; HANDLE new_handle; - TRACE(vxd, "NtDupSection(%lx)\n", (DWORD)handle); + TRACE("NtDupSection(%lx)\n", (DWORD)handle); DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &new_handle, @@ -1200,12 +1200,12 @@ void VXD_Win32s( CONTEXT86 *context ) case PAGE_EXECUTE_WRITECOPY: access = FILE_MAP_COPY; break; } - TRACE(vxd, "NtMapViewOfSection" + TRACE("NtMapViewOfSection" "(%lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx)\n", (DWORD)SectionHandle, ProcessHandle, (DWORD)BaseAddress, ZeroBits, CommitSize, (DWORD)SectionOffset, (DWORD)ViewSize, InheritDisposition, AllocationType, Protect); - TRACE(vxd, "NtMapViewOfSection: " + TRACE("NtMapViewOfSection: " "base=%lx, offset=%lx, size=%lx, access=%lx\n", (DWORD)address, SectionOffset? SectionOffset->LowPart : 0, ViewSize? *ViewSize : 0, access); @@ -1215,7 +1215,7 @@ void VXD_Win32s( CONTEXT86 *context ) SectionOffset? SectionOffset->LowPart : 0, ViewSize? *ViewSize : 0, address); - TRACE(vxd, "NtMapViewOfSection: result=%lx\n", result); + TRACE("NtMapViewOfSection: result=%lx\n", result); if (W32S_WINE2APP(result, W32S_OFFSET)) { @@ -1242,7 +1242,7 @@ void VXD_Win32s( CONTEXT86 *context ) DWORD ProcessHandle = stack[0]; /* ignored */ LPBYTE BaseAddress = (LPBYTE)W32S_APP2WINE(stack[1], W32S_OFFSET); - TRACE(vxd, "NtUnmapViewOfSection(%lx, %lx)\n", + TRACE("NtUnmapViewOfSection(%lx, %lx)\n", ProcessHandle, (DWORD)BaseAddress); UnmapViewOfFile(BaseAddress); @@ -1273,10 +1273,10 @@ void VXD_Win32s( CONTEXT86 *context ) LPBYTE address = (LPBYTE)(BaseAddress? W32S_APP2WINE(*BaseAddress, W32S_OFFSET) : 0); DWORD size = ViewSize? *ViewSize : 0; - TRACE(vxd, "NtFlushVirtualMemory(%lx, %lx, %lx, %lx)\n", + TRACE("NtFlushVirtualMemory(%lx, %lx, %lx, %lx)\n", ProcessHandle, (DWORD)BaseAddress, (DWORD)ViewSize, (DWORD)unknown); - TRACE(vxd, "NtFlushVirtualMemory: base=%lx, size=%lx\n", + TRACE("NtFlushVirtualMemory: base=%lx, size=%lx\n", (DWORD)address, size); FlushViewOfFile(address, size); @@ -1297,7 +1297,7 @@ void VXD_Win32s( CONTEXT86 *context ) * Output: None */ - FIXME(vxd, "[0014] ECX=%lx EDX=%lx\n", + FIXME("[0014] ECX=%lx EDX=%lx\n", ECX_reg(context), EDX_reg(context)); /* FIXME */ @@ -1311,7 +1311,7 @@ void VXD_Win32s( CONTEXT86 *context ) * Output: None */ - TRACE(vxd, "[0015] EDX=%lx\n", EDX_reg(context)); + TRACE("[0015] EDX=%lx\n", EDX_reg(context)); /* We don't care, as we always have a coprocessor anyway */ break; @@ -1351,7 +1351,7 @@ void VXD_Win32s( CONTEXT86 *context ) * Output: None */ - FIXME(vxd, "[0017] EBX=%lx CX=%x\n", + FIXME("[0017] EBX=%lx CX=%x\n", EBX_reg(context), CX_reg(context)); /* FIXME */ @@ -1377,7 +1377,7 @@ void VXD_Win32s( CONTEXT86 *context ) DWORD size = stack[2]; DWORD result; - TRACE(vxd, "VirtualLock(%lx, %lx, %lx)\n", + TRACE("VirtualLock(%lx, %lx, %lx)\n", (DWORD)retv, (DWORD)base, size); result = VirtualLock(base, size); @@ -1411,7 +1411,7 @@ void VXD_Win32s( CONTEXT86 *context ) DWORD size = stack[2]; DWORD result; - TRACE(vxd, "VirtualUnlock(%lx, %lx, %lx)\n", + TRACE("VirtualUnlock(%lx, %lx, %lx)\n", (DWORD)retv, (DWORD)base, size); result = VirtualUnlock(base, size); @@ -1434,7 +1434,7 @@ void VXD_Win32s( CONTEXT86 *context ) * EDX: End of sparse memory arena */ - TRACE(vxd, "KGetSystemInfo()\n"); + TRACE("KGetSystemInfo()\n"); /* * Note: Win32s reserves 0GB - 2GB for Win 3.1 and uses 2GB - 4GB as @@ -1471,7 +1471,7 @@ void VXD_Win32s( CONTEXT86 *context ) struct Win32sMemoryInfo *info = (struct Win32sMemoryInfo *)W32S_APP2WINE(ESI_reg(context), W32S_OFFSET); - FIXME(vxd, "KGlobalMemStat(%lx)\n", (DWORD)info); + FIXME("KGlobalMemStat(%lx)\n", (DWORD)info); /* FIXME */ } @@ -1485,7 +1485,7 @@ void VXD_Win32s( CONTEXT86 *context ) * Output: None */ - TRACE(vxd, "[001c] ECX=%lx\n", ECX_reg(context)); + TRACE("[001c] ECX=%lx\n", ECX_reg(context)); /* FIXME */ break; @@ -1512,12 +1512,12 @@ void VXD_Win32s( CONTEXT86 *context ) DWORD prot = stack[3]; DWORD result; - TRACE(vxd, "VirtualAlloc16(%lx, %lx, %lx, %lx)\n", + TRACE("VirtualAlloc16(%lx, %lx, %lx, %lx)\n", (DWORD)base, size, type, prot); if (type & 0x80000000) { - WARN(vxd, "VirtualAlloc16: strange type %lx\n", type); + WARN("VirtualAlloc16: strange type %lx\n", type); type &= 0x7fffffff; } @@ -1529,7 +1529,7 @@ void VXD_Win32s( CONTEXT86 *context ) else EDX_reg(context) = 0, EAX_reg(context) = STATUS_NO_MEMORY; /* FIXME */ - TRACE(vxd, "VirtualAlloc16: returning base %lx\n", EDX_reg(context)); + TRACE("VirtualAlloc16: returning base %lx\n", EDX_reg(context)); } break; @@ -1553,7 +1553,7 @@ void VXD_Win32s( CONTEXT86 *context ) DWORD type = stack[2]; DWORD result; - TRACE(vxd, "VirtualFree16(%lx, %lx, %lx)\n", + TRACE("VirtualFree16(%lx, %lx, %lx)\n", (DWORD)base, size, type); result = VirtualFree(base, size, type); @@ -1581,7 +1581,7 @@ void VXD_Win32s( CONTEXT86 *context ) DWORD *ptr = (DWORD *)W32S_APP2WINE(ECX_reg(context), W32S_OFFSET); BOOL set = EDX_reg(context); - TRACE(vxd, "FWorkingSetSize(%lx, %lx)\n", (DWORD)ptr, (DWORD)set); + TRACE("FWorkingSetSize(%lx, %lx)\n", (DWORD)ptr, (DWORD)set); if (set) /* We do it differently ... */; diff --git a/msdos/xms.c b/msdos/xms.c index 0653d522b28f4a06191341c81baa842226b9d43d..c1dbfb7b520b94b686158db879f01e1693736bbf 100644 --- a/msdos/xms.c +++ b/msdos/xms.c @@ -13,7 +13,7 @@ #include "module.h" #include "miscemu.h" #include "toolhelp.h" -#include "debug.h" +#include "debugtools.h" #include "selectors.h" DEFAULT_DEBUG_CHANNEL(int31) @@ -44,7 +44,7 @@ void WINAPI XMS_Handler( CONTEXT86 *context ) switch(AH_reg(context)) { case 0x00: /* Get XMS version number */ - TRACE(int31, "get XMS version number\n"); + TRACE("get XMS version number\n"); AX_reg(context) = 0x0200; /* 2.0 */ BX_reg(context) = 0x0000; /* internal revision */ DX_reg(context) = 0x0001; /* HMA exists */ @@ -53,16 +53,16 @@ void WINAPI XMS_Handler( CONTEXT86 *context ) { MEMMANINFO mmi; - TRACE(int31, "query free extended memory\n"); + TRACE("query free extended memory\n"); mmi.dwSize = sizeof(mmi); MemManInfo16(&mmi); AX_reg(context) = mmi.dwLargestFreeBlock >> 10; DX_reg(context) = (mmi.dwFreePages * VIRTUAL_GetPageSize()) >> 10; - TRACE(int31, "returning largest %dK, total %dK\n", AX_reg(context), DX_reg(context)); + TRACE("returning largest %dK, total %dK\n", AX_reg(context), DX_reg(context)); } break; case 0x09: /* Allocate Extended Memory Block */ - TRACE(int31, "allocate extended memory block (%dK)\n", + TRACE("allocate extended memory block (%dK)\n", DX_reg(context)); DX_reg(context) = GlobalAlloc16(GMEM_MOVEABLE, (DWORD)DX_reg(context)<<10); @@ -70,7 +70,7 @@ void WINAPI XMS_Handler( CONTEXT86 *context ) if (!DX_reg(context)) BL_reg(context) = 0xA0; /* out of memory */ break; case 0x0a: /* Free Extended Memory Block */ - TRACE(int31, "free extended memory block %04x\n",DX_reg(context)); + TRACE("free extended memory block %04x\n",DX_reg(context)); GlobalFree16(DX_reg(context)); break; case 0x0b: /* Move Extended Memory Block */ @@ -78,7 +78,7 @@ void WINAPI XMS_Handler( CONTEXT86 *context ) MOVESTRUCT*move=CTX_SEG_OFF_TO_LIN(context, DS_reg(context),ESI_reg(context)); BYTE*src,*dst; - TRACE(int31, "move extended memory block\n"); + TRACE("move extended memory block\n"); src=XMS_Offset(&move->Source); dst=XMS_Offset(&move->Dest); memcpy(dst,src,move->Length);