Converted to the new debug interface, using script written by Patrik Stridvall.
diff --git a/objects/brush.c b/objects/brush.c index fd8c75e..3e30715 100644 --- a/objects/brush.c +++ b/objects/brush.c
@@ -8,7 +8,7 @@ #include "winbase.h" #include "brush.h" #include "bitmap.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(gdi) @@ -26,7 +26,7 @@ brushPtr->logbrush.lbColor = brush->lbColor; brushPtr->logbrush.lbHatch = brush->lbHatch; GDI_HEAP_UNLOCK( hbrush ); - TRACE(gdi, "%04x\n", hbrush); + TRACE("%04x\n", hbrush); return hbrush; } @@ -44,7 +44,7 @@ brushPtr->logbrush.lbColor = brush->lbColor; brushPtr->logbrush.lbHatch = brush->lbHatch; GDI_HEAP_UNLOCK( hbrush ); - TRACE(gdi, "%08x\n", hbrush); + TRACE("%08x\n", hbrush); return hbrush; } @@ -56,7 +56,7 @@ { LOGBRUSH logbrush; - TRACE(gdi, "%d %06lx\n", style, color ); + TRACE("%d %06lx\n", style, color ); logbrush.lbStyle = BS_HATCHED; logbrush.lbColor = color; @@ -74,7 +74,7 @@ { LOGBRUSH logbrush; - TRACE(gdi, "%d %06lx\n", style, color ); + TRACE("%d %06lx\n", style, color ); logbrush.lbStyle = BS_HATCHED; logbrush.lbColor = color; @@ -100,7 +100,7 @@ HBRUSH WINAPI CreatePatternBrush( HBITMAP hbitmap ) { LOGBRUSH logbrush = { BS_PATTERN, 0, 0 }; - TRACE(gdi, "%04x\n", hbitmap ); + TRACE("%04x\n", hbitmap ); logbrush.lbHatch = (INT)BITMAP_CopyBitmap( hbitmap ); if(!logbrush.lbHatch) @@ -119,7 +119,7 @@ BITMAPINFO *info, *newInfo; INT size; - TRACE(gdi, "%04x\n", hbitmap ); + TRACE("%04x\n", hbitmap ); logbrush.lbStyle = BS_DIBPATTERN; logbrush.lbColor = coloruse; @@ -173,7 +173,7 @@ BITMAPINFO *info, *newInfo; INT size; - TRACE(gdi, "%04x\n", hbitmap ); + TRACE("%04x\n", hbitmap ); logbrush.lbStyle = BS_DIBPATTERN; logbrush.lbColor = coloruse; @@ -226,7 +226,7 @@ BITMAPINFO *newInfo; INT size; - TRACE(gdi, "%p %ldx%ld %dbpp\n", info, info->bmiHeader.biWidth, + TRACE("%p %ldx%ld %dbpp\n", info, info->bmiHeader.biWidth, info->bmiHeader.biHeight, info->bmiHeader.biBitCount); logbrush.lbStyle = BS_DIBPATTERN; @@ -262,7 +262,7 @@ { LOGBRUSH logbrush; - TRACE(gdi, "%06lx\n", color ); + TRACE("%06lx\n", color ); logbrush.lbStyle = BS_SOLID; logbrush.lbColor = color; @@ -279,7 +279,7 @@ { LOGBRUSH logbrush; - TRACE(gdi, "%06lx\n", color ); + TRACE("%06lx\n", color ); logbrush.lbStyle = BS_SOLID; logbrush.lbColor = color; @@ -388,7 +388,7 @@ */ BOOL16 WINAPI SetSolidBrush16(HBRUSH16 hBrush, COLORREF newColor ) { - FIXME(gdi, "(hBrush %04x, newColor %04x): stub!\n", hBrush, (int)newColor); + FIXME("(hBrush %04x, newColor %04x): stub!\n", hBrush, (int)newColor); return(FALSE); }
diff --git a/objects/color.c b/objects/color.c index bb9633a..d0663db 100644 --- a/objects/color.c +++ b/objects/color.c
@@ -6,7 +6,7 @@ */ #include "color.h" -#include "debug.h" +#include "debugtools.h" #include "palette.h" #include "windef.h" @@ -165,7 +165,7 @@ { if( (i = color & 0x0000ffff) >= size ) { - WARN(palette, "RGB(%lx) : idx %d is out of bounds, assuming NULL\n", color, i); + WARN("RGB(%lx) : idx %d is out of bounds, assuming NULL\n", color, i); color = *(COLORREF*)palPalEntry; } else color = *(COLORREF*)(palPalEntry + i);
diff --git a/objects/dc.c b/objects/dc.c index b8a8ed5..93de7cc 100644 --- a/objects/dc.c +++ b/objects/dc.c
@@ -15,7 +15,7 @@ #include "dc.h" #include "gdi.h" #include "heap.h" -#include "debug.h" +#include "debugtools.h" #include "font.h" #include "winerror.h" #include "wine/winuser16.h" @@ -226,7 +226,7 @@ } newdc = (DC *) GDI_HEAP_LOCK( handle ); - TRACE(dc, "(%04x): returning %04x\n", hdc, handle ); + TRACE("(%04x): returning %04x\n", hdc, handle ); newdc->w.flags = dc->w.flags | DC_SAVED; newdc->w.devCaps = dc->w.devCaps; @@ -317,7 +317,7 @@ GDI_HEAP_UNLOCK( hdcs ); return; } - TRACE(dc, "%04x %04x\n", hdc, hdcs ); + TRACE("%04x %04x\n", hdc, hdcs ); dc->w.flags = dcs->w.flags & ~DC_SAVED; dc->w.devCaps = dcs->w.devCaps; @@ -436,7 +436,7 @@ dcs->header.hNext = dc->header.hNext; dc->header.hNext = hdcs; - TRACE(dc, "(%04x): returning %d\n", hdc, dc->saveLevel+1 ); + TRACE("(%04x): returning %d\n", hdc, dc->saveLevel+1 ); ret = ++dc->saveLevel; GDI_HEAP_UNLOCK( hdcs ); GDI_HEAP_UNLOCK( hdc ); @@ -461,7 +461,7 @@ DC * dc, * dcs; BOOL success; - TRACE(dc, "%04x %d\n", hdc, level ); + TRACE("%04x %d\n", hdc, level ); dc = DC_GetDCPtr( hdc ); if(!dc) return FALSE; if(dc->funcs->pRestoreDC) @@ -518,13 +518,13 @@ if (!(dc = DC_AllocDC( funcs ))) return 0; dc->w.flags = 0; - TRACE(dc, "(driver=%s, device=%s, output=%s): returning %04x\n", + TRACE("(driver=%s, device=%s, output=%s): returning %04x\n", debugstr_a(driver), debugstr_a(device), debugstr_a(output), dc->hSelf ); if (dc->funcs->pCreateDC && !dc->funcs->pCreateDC( dc, driver, device, output, initData )) { - WARN(dc, "creation aborted by device\n" ); + WARN("creation aborted by device\n" ); GDI_HEAP_FREE( dc->hSelf ); return 0; } @@ -620,7 +620,7 @@ if (!(dc = DC_AllocDC( funcs ))) return 0; - TRACE(dc, "(%04x): returning %04x\n", + TRACE("(%04x): returning %04x\n", hdc, dc->hSelf ); /* Create default bitmap */ @@ -637,7 +637,7 @@ if (dc->funcs->pCreateDC && !dc->funcs->pCreateDC( dc, NULL, NULL, NULL, NULL )) { - WARN(dc, "creation aborted by device\n"); + WARN("creation aborted by device\n"); DeleteObject( hbitmap ); GDI_HEAP_FREE( dc->hSelf ); return 0; @@ -666,7 +666,7 @@ DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC ); if (!dc) return FALSE; - TRACE(dc, "%04x\n", hdc ); + TRACE("%04x\n", hdc ); /* Call hook procedure to check whether is it OK to delete this DC */ if ( dc->hookProc && !(dc->w.flags & (DC_SAVED | DC_MEMORY)) @@ -710,7 +710,7 @@ */ HDC16 WINAPI ResetDC16( HDC16 hdc, const DEVMODEA *devmode ) { - FIXME(dc, "stub\n" ); + FIXME("stub\n" ); return hdc; } @@ -720,7 +720,7 @@ */ HDC WINAPI ResetDCA( HDC hdc, const DEVMODEA *devmode ) { - FIXME(dc, "stub\n" ); + FIXME("stub\n" ); return hdc; } @@ -730,7 +730,7 @@ */ HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode ) { - FIXME(dc, "stub\n" ); + FIXME("stub\n" ); return hdc; } @@ -784,7 +784,7 @@ return 0; } - TRACE(dc, "(%04x,%d): returning %d\n", + TRACE("(%04x,%d): returning %d\n", hdc, cap, *(WORD *)(((char *)dc->w.devCaps) + cap) ); ret = *(WORD *)(((char *)dc->w.devCaps) + cap); GDI_HEAP_UNLOCK( hdc ); @@ -1194,7 +1194,7 @@ { DC *dc = (DC *)GDI_GetObjPtr( hdc, DC_MAGIC ); - TRACE(dc, "hookProc %08x, default is %08x\n", + TRACE("hookProc %08x, default is %08x\n", (UINT)hookProc, (UINT)DCHook16 ); if (!dc) return FALSE; @@ -1232,7 +1232,7 @@ /* "Undocumented Windows" info is slightly confusing. */ - TRACE(dc,"hDC %04x, flags %04x\n",hDC,flags); + TRACE("hDC %04x, flags %04x\n",hDC,flags); if( flags & DCHF_INVALIDATEVISRGN ) dc->w.flags |= DC_DIRTY; @@ -1279,7 +1279,7 @@ */ UINT WINAPI GetBoundsRect(HDC hdc, LPRECT rect, UINT flags) { - FIXME(dc, "(): stub\n"); + FIXME("(): stub\n"); return DCB_RESET; /* bounding rectangle always empty */ } @@ -1289,7 +1289,7 @@ UINT16 WINAPI SetBoundsRect16(HDC16 hdc, const RECT16* rect, UINT16 flags) { if ( (flags & DCB_ACCUMULATE) || (flags & DCB_ENABLE) ) - FIXME( dc, "(%04x, %p, %04x): stub\n", hdc, rect, flags ); + FIXME("(%04x, %p, %04x): stub\n", hdc, rect, flags ); return DCB_RESET | DCB_DISABLE; /* bounding rectangle always empty and disabled*/ } @@ -1299,7 +1299,7 @@ */ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) { - FIXME(dc, "(): stub\n"); + FIXME("(): stub\n"); return DCB_DISABLE; /* bounding rectangle always empty */ } @@ -1312,7 +1312,7 @@ */ void WINAPI Death16(HDC16 hDC) { - MSG("Death(%04x) called. Application enters text mode...\n", hDC); + MESSAGE("Death(%04x) called. Application enters text mode...\n", hDC); } /*********************************************************************** @@ -1323,5 +1323,5 @@ void WINAPI Resurrection16(HDC16 hDC, WORD w1, WORD w2, WORD w3, WORD w4, WORD w5, WORD w6) { - MSG("Resurrection(%04x, %04x, %04x, %04x, %04x, %04x, %04x) called. Application left text mode.\n", hDC, w1, w2, w3, w4, w5, w6); + MESSAGE("Resurrection(%04x, %04x, %04x, %04x, %04x, %04x, %04x) called. Application left text mode.\n", hDC, w1, w2, w3, w4, w5, w6); }
diff --git a/objects/dib.c b/objects/dib.c index 017ac72..1d480d4 100644 --- a/objects/dib.c +++ b/objects/dib.c
@@ -9,7 +9,7 @@ #include "bitmap.h" #include "callback.h" #include "dc.h" -#include "debug.h" +#include "debugtools.h" #include "monitor.h" #include "palette.h" @@ -35,7 +35,7 @@ case 24: words = (width * 3 + 3)/4; break; default: - WARN(bitmap, "(%d): Unsupported depth\n", depth ); + WARN("(%d): Unsupported depth\n", depth ); /* fall through */ case 32: words = width; @@ -107,7 +107,7 @@ *compr = 0; return 0; } - WARN(bitmap, "(%ld): wrong size for header\n", header->biSize ); + WARN("(%ld): wrong size for header\n", header->biSize ); return -1; } @@ -253,7 +253,7 @@ ySrc, startscan, lines, bits, info, coloruse ); else { - FIXME(bitmap, "unimplemented on hdc %08x\n", hdc); + FIXME("unimplemented on hdc %08x\n", hdc); ret = 0; } @@ -565,7 +565,7 @@ } } - TRACE(bitmap, "biSizeImage = %ld, biWidth = %ld, biHeight = %ld\n", + TRACE("biSizeImage = %ld, biWidth = %ld, biHeight = %ld\n", info->bmiHeader.biSizeImage, info->bmiHeader.biWidth, info->bmiHeader.biHeight); @@ -640,7 +640,7 @@ } else { - WARN(bitmap, "(%ld): wrong size for data\n", + WARN("(%ld): wrong size for data\n", data->bmiHeader.biSize ); return 0; } @@ -736,7 +736,7 @@ if (bmi->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) incr = 4; else if (bmi->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) incr = 3; else { - WARN(bitmap, "Wrong bitmap header size!\n"); + WARN("Wrong bitmap header size!\n"); return; } colors = bmi->bmiHeader.biClrUsed; @@ -752,11 +752,11 @@ case 4: pix = pix >> 4; break; case 8: break; default: - WARN(bitmap, "(%d): Unsupported depth\n", bmi->bmiHeader.biBitCount); + WARN("(%d): Unsupported depth\n", bmi->bmiHeader.biBitCount); return; } if (pix >= colors) { - WARN(bitmap, "pixel has color index greater than biClrUsed!\n"); + WARN("pixel has color index greater than biClrUsed!\n"); return; } if (loadflags & LR_LOADMAP3DCOLORS) c_W = c_F;
diff --git a/objects/enhmetafile.c b/objects/enhmetafile.c index 3c6ceb3..b275c08 100644 --- a/objects/enhmetafile.c +++ b/objects/enhmetafile.c
@@ -11,7 +11,7 @@ #include "wine/winestring.h" #include "winerror.h" #include "enhmetafile.h" -#include "debug.h" +#include "debugtools.h" #include "heap.h" DEFAULT_DEBUG_CHANNEL(enhmetafile) @@ -59,7 +59,7 @@ { ENHMETAFILEOBJ *metaObj = (ENHMETAFILEOBJ *)GDI_GetObjPtr( hmf, ENHMETAFILE_MAGIC ); - TRACE(enhmetafile, "hmf %04x -> enhmetaObj %p\n", hmf, metaObj); + TRACE("hmf %04x -> enhmetaObj %p\n", hmf, metaObj); return metaObj->emh; } @@ -86,7 +86,7 @@ emh = MapViewOfFile( hMapping, FILE_MAP_READ, 0, 0, 0 ); if (emh->iType != EMR_HEADER || emh->dSignature != ENHMETA_SIGNATURE) { - WARN(enhmetafile, "Invalid emf header type 0x%08lx sig 0x%08lx.\n", + WARN("Invalid emf header type 0x%08lx sig 0x%08lx.\n", emh->iType, emh->dSignature); UnmapViewOfFile( emh ); CloseHandle( hMapping ); @@ -110,7 +110,7 @@ hFile = CreateFileA(lpszMetaFile, GENERIC_READ, 0, 0, OPEN_EXISTING, 0, 0); if (hFile == INVALID_HANDLE_VALUE) { - WARN(enhmetafile,"could not open %s\n", lpszMetaFile); + WARN("could not open %s\n", lpszMetaFile); return 0; } hmf = EMF_GetEnhMetaFile( hFile ); @@ -130,7 +130,7 @@ hFile = CreateFileW(lpszMetaFile, GENERIC_READ, 0, 0, OPEN_EXISTING, 0, 0); if (hFile == INVALID_HANDLE_VALUE) { - WARN(enhmetafile,"could not open %s\n", debugstr_w(lpszMetaFile)); + WARN("could not open %s\n", debugstr_w(lpszMetaFile)); return 0; } hmf = EMF_GetEnhMetaFile( hFile ); @@ -268,14 +268,14 @@ ) { int type; - TRACE(enhmetafile, + TRACE( "hdc = %08x, handletable = %p, record = %p, numHandles = %d\n", hdc, handletable, mr, handles); if (!mr) return FALSE; type = mr->iType; - TRACE(enhmetafile, " type=%d\n", type); + TRACE(" type=%d\n", type); switch(type) { case EMR_HEADER: @@ -402,7 +402,7 @@ DWORD obj = mr->dParm[0]; DWORD style = mr->dParm[1], brush = mr->dParm[2]; LOGBRUSH *b = (LOGBRUSH *) &mr->dParm[3]; - FIXME(enhmetafile, "Some ExtCreatePen args not handled\n"); + FIXME("Some ExtCreatePen args not handled\n"); (handletable->objectHandle)[obj] = ExtCreatePen(style, brush, b, 0, NULL); break; @@ -451,7 +451,7 @@ { /* 0-3 : a bounding rectangle? */ INT count = mr->dParm[4]; - FIXME(enhmetafile, "Some Polygon16 args not handled\n"); + FIXME("Some Polygon16 args not handled\n"); Polygon16(hdc, (POINT16 *)&mr->dParm[5], count); break; } @@ -459,7 +459,7 @@ { /* 0-3 : a bounding rectangle? */ INT count = mr->dParm[4]; - FIXME(enhmetafile, "Some Polyline16 args not handled\n"); + FIXME("Some Polyline16 args not handled\n"); Polyline16(hdc, (POINT16 *)&mr->dParm[5], count); break; } @@ -506,14 +506,14 @@ /* 10-16: ??? */ LPWSTR str = (LPWSTR)& mr->dParm[17]; /* trailing info: dx array? */ - FIXME(enhmetafile, "Many ExtTextOut args not handled\n"); + FIXME("Many ExtTextOut args not handled\n"); ExtTextOutW(hdc, x, y, flags, /* lpRect */ NULL, str, count, /* lpDx */ NULL); break; } default: - FIXME(enhmetafile, "type %d is unimplemented\n", type); + FIXME("type %d is unimplemented\n", type); /* SetLastError(E_NOTIMPL); */ break; } @@ -598,10 +598,10 @@ xform.eM22 = yscale; xform.eDx = lpRect->left; xform.eDy = lpRect->top; - FIXME(enhmetafile, "play into rect doesn't work\n"); + FIXME("play into rect doesn't work\n"); savedMode = SetGraphicsMode(hdc, GM_ADVANCED); if (!SetWorldTransform(hdc, &xform)) { - WARN(enhmetafile, "World transform failed!\n"); + WARN("World transform failed!\n"); } } @@ -682,7 +682,7 @@ CONST METAFILEPICT *lpmfp ) { - FIXME(enhmetafile,"Stub\n"); + FIXME("Stub\n"); return 0; }
diff --git a/objects/gdiobj.c b/objects/gdiobj.c index a2bad97..743f6a6 100644 --- a/objects/gdiobj.c +++ b/objects/gdiobj.c
@@ -21,7 +21,7 @@ #include "palette.h" #include "pen.h" #include "region.h" -#include "debug.h" +#include "debugtools.h" #include "gdi.h" DEFAULT_DEBUG_CHANNEL(gdi) @@ -368,7 +368,7 @@ return TRUE; if (!(header = (GDIOBJHDR *) GDI_HEAP_LOCK( obj ))) return FALSE; - TRACE(gdi, "%04x\n", obj ); + TRACE("%04x\n", obj ); /* Delete object */ @@ -382,10 +382,10 @@ case REGION_MAGIC: return REGION_DeleteObject( obj, (RGNOBJ*)header ); case DC_MAGIC: return DeleteDC(obj); case 0 : - WARN(gdi, "Already deleted\n"); + WARN("Already deleted\n"); break; default: - WARN(gdi, "Unknown magic number (%d)\n",header->wMagic); + WARN("Unknown magic number (%d)\n",header->wMagic); } return FALSE; } @@ -406,7 +406,7 @@ { if ((obj < 0) || (obj >= NB_STOCK_OBJECTS)) return 0; if (!StockObjects[obj]) return 0; - TRACE(gdi, "returning %d\n", + TRACE("returning %d\n", FIRST_STOCK_HANDLE + obj ); return (HGDIOBJ16)(FIRST_STOCK_HANDLE + obj); } @@ -419,7 +419,7 @@ { GDIOBJHDR * ptr = NULL; INT16 result = 0; - TRACE(gdi, "%04x %d %p\n", handle, count, buffer ); + TRACE("%04x %d %p\n", handle, count, buffer ); if (!count) return 0; if ((handle >= FIRST_STOCK_HANDLE) && (handle <= LAST_STOCK_HANDLE)) @@ -458,7 +458,7 @@ { GDIOBJHDR * ptr = NULL; INT result = 0; - TRACE(gdi, "%08x %d %p\n", handle, count, buffer ); + TRACE("%08x %d %p\n", handle, count, buffer ); if (!count) return 0; if ((handle >= FIRST_STOCK_HANDLE) && (handle <= LAST_STOCK_HANDLE)) @@ -485,7 +485,7 @@ result = PALETTE_GetObject( (PALETTEOBJ *)ptr, count, buffer ); break; default: - FIXME(gdi, "Magic %04x not implemented\n", + FIXME("Magic %04x not implemented\n", ptr->wMagic ); break; } @@ -499,7 +499,7 @@ { GDIOBJHDR * ptr = NULL; INT result = 0; - TRACE(gdi, "%08x %d %p\n", handle, count, buffer ); + TRACE("%08x %d %p\n", handle, count, buffer ); if (!count) return 0; if ((handle >= FIRST_STOCK_HANDLE) && (handle <= LAST_STOCK_HANDLE)) @@ -526,7 +526,7 @@ result = PALETTE_GetObject( (PALETTEOBJ *)ptr, count, buffer ); break; default: - FIXME(gdi, "Magic %04x not implemented\n", + FIXME("Magic %04x not implemented\n", ptr->wMagic ); break; } @@ -541,7 +541,7 @@ { GDIOBJHDR * ptr = NULL; INT result = 0; - TRACE(gdi, "%08x\n", handle ); + TRACE("%08x\n", handle ); if ((handle >= FIRST_STOCK_HANDLE) && (handle <= LAST_STOCK_HANDLE)) ptr = StockObjects[handle - FIRST_STOCK_HANDLE]; @@ -588,7 +588,7 @@ result = OBJ_ENHMETADC; break; default: - FIXME(gdi, "Magic %04x not implemented\n", + FIXME("Magic %04x not implemented\n", ptr->wMagic ); break; } @@ -613,7 +613,7 @@ case OBJ_BITMAP: return dc->w.hBitmap; default: /* the SDK only mentions those above */ - WARN(gdi,"(%08x,%d): unknown type.\n",hdc,type); + WARN("(%08x,%d): unknown type.\n",hdc,type); return 0; } } @@ -635,7 +635,7 @@ { DC * dc = DC_GetDCPtr( hdc ); if (!dc || !dc->funcs->pSelectObject) return 0; - TRACE(gdi, "hdc=%04x %04x\n", hdc, handle ); + TRACE("hdc=%04x %04x\n", hdc, handle ); return dc->funcs->pSelectObject( dc, handle ); } @@ -660,7 +660,7 @@ GDIOBJHDR * header = (GDIOBJHDR *) GDI_HEAP_LOCK( obj ); if (!header) return FALSE; - TRACE(gdi, "%04x\n", obj ); + TRACE("%04x\n", obj ); /* Unrealize object */ @@ -701,7 +701,7 @@ LOGPEN16 *pen; LOGBRUSH16 *brush = NULL; - TRACE(gdi, "%04x %d %08lx %08lx\n", + TRACE("%04x %d %08lx %08lx\n", hdc, nObjType, (DWORD)lpEnumFunc, lParam ); switch(nObjType) { @@ -715,7 +715,7 @@ pen->lopnWidth.y = 0; pen->lopnColor = solid_colors[i]; retval = lpEnumFunc( SEGPTR_GET(pen), lParam ); - TRACE(gdi, "solid pen %08lx, ret=%d\n", + TRACE("solid pen %08lx, ret=%d\n", solid_colors[i], retval); if (!retval) break; } @@ -731,7 +731,7 @@ brush->lbColor = solid_colors[i]; brush->lbHatch = 0; retval = lpEnumFunc( SEGPTR_GET(brush), lParam ); - TRACE(gdi, "solid brush %08lx, ret=%d\n", + TRACE("solid brush %08lx, ret=%d\n", solid_colors[i], retval); if (!retval) break; } @@ -743,7 +743,7 @@ brush->lbColor = RGB(0,0,0); brush->lbHatch = i; retval = lpEnumFunc( SEGPTR_GET(brush), lParam ); - TRACE(gdi, "hatched brush %d, ret=%d\n", + TRACE("hatched brush %d, ret=%d\n", i, retval); if (!retval) break; } @@ -751,7 +751,7 @@ break; default: - WARN(gdi, "(%d): Invalid type\n", nObjType ); + WARN("(%d): Invalid type\n", nObjType ); break; } return retval; @@ -780,7 +780,7 @@ LOGPEN pen; LOGBRUSH brush; - TRACE(gdi, "%04x %d %08lx %08lx\n", + TRACE("%04x %d %08lx %08lx\n", hdc, nObjType, (DWORD)lpEnumFunc, lParam ); switch(nObjType) { @@ -793,7 +793,7 @@ pen.lopnWidth.y = 0; pen.lopnColor = solid_colors[i]; retval = lpEnumFunc( &pen, lParam ); - TRACE(gdi, "solid pen %08lx, ret=%d\n", + TRACE("solid pen %08lx, ret=%d\n", solid_colors[i], retval); if (!retval) break; } @@ -807,7 +807,7 @@ brush.lbColor = solid_colors[i]; brush.lbHatch = 0; retval = lpEnumFunc( &brush, lParam ); - TRACE(gdi, "solid brush %08lx, ret=%d\n", + TRACE("solid brush %08lx, ret=%d\n", solid_colors[i], retval); if (!retval) break; } @@ -819,7 +819,7 @@ brush.lbColor = RGB(0,0,0); brush.lbHatch = i; retval = lpEnumFunc( &brush, lParam ); - TRACE(gdi, "hatched brush %d, ret=%d\n", + TRACE("hatched brush %d, ret=%d\n", i, retval); if (!retval) break; } @@ -827,7 +827,7 @@ default: /* FIXME: implement Win32 types */ - WARN( gdi, "(%d): Invalid type\n", nObjType ); + WARN("(%d): Invalid type\n", nObjType ); break; } return retval; @@ -964,7 +964,7 @@ case 0x0103: /* LocalHeap */ return GDI_HeapSel; default: - WARN(gdi, "(wReqType=%04x): Unknown\n", wReqType); + WARN("(wReqType=%04x): Unknown\n", wReqType); return (DWORD)-1; } } @@ -1030,7 +1030,7 @@ */ BOOL WINAPI GetColorAdjustment(HDC hdc, LPCOLORADJUSTMENT lpca) { - FIXME(gdi, "GetColorAdjustment, stub\n"); + FIXME("GetColorAdjustment, stub\n"); return 0; } @@ -1041,7 +1041,7 @@ */ BOOL WINAPI GetMiterLimit(HDC hdc, PFLOAT peLimit) { - FIXME(gdi, "GetMiterLimit, stub\n"); + FIXME("GetMiterLimit, stub\n"); return 0; } @@ -1052,7 +1052,7 @@ */ BOOL WINAPI SetMiterLimit(HDC hdc, FLOAT eNewLimit, PFLOAT peOldLimit) { - FIXME(gdi, "SetMiterLimit, stub\n"); + FIXME("SetMiterLimit, stub\n"); return 0; } @@ -1063,7 +1063,7 @@ */ BOOL WINAPI GdiComment(HDC hdc, UINT cbSize, const BYTE *lpData) { - FIXME(gdi, "GdiComment, stub\n"); + FIXME("GdiComment, stub\n"); return 0; } /******************************************************************* @@ -1073,7 +1073,7 @@ */ BOOL WINAPI SetColorAdjustment(HDC hdc, const COLORADJUSTMENT* lpca) { - FIXME(gdi, "SetColorAdjustment, stub\n"); + FIXME("SetColorAdjustment, stub\n"); return 0; }
diff --git a/objects/metafile.c b/objects/metafile.c index 77cd2e9..8b24bf4 100644 --- a/objects/metafile.c +++ b/objects/metafile.c
@@ -38,7 +38,7 @@ #include "bitmap.h" #include "heap.h" #include "toolhelp.h" -#include "debug.h" +#include "debugtools.h" #include "global.h" DEFAULT_DEBUG_CHANNEL(metafile) @@ -201,7 +201,7 @@ } if (mh->mtType != METAFILE_MEMORY) { - WARN(metafile, "Disk metafile had mtType = %04x\n", mh->mtType); + WARN("Disk metafile had mtType = %04x\n", mh->mtType); mh->mtType = METAFILE_MEMORY; } return mh; @@ -215,7 +215,7 @@ METAHEADER *mh; HFILE hFile; - TRACE(metafile,"%s\n", lpFilename); + TRACE("%s\n", lpFilename); if(!lpFilename) return 0; @@ -240,7 +240,7 @@ METAHEADER *mh; HFILE hFile; - TRACE(metafile,"%s\n", lpFilename); + TRACE("%s\n", lpFilename); if(!lpFilename) return 0; @@ -265,7 +265,7 @@ METAHEADER *mh; HFILE hFile; - TRACE(metafile,"%s\n", debugstr_w(lpFilename)); + TRACE("%s\n", debugstr_w(lpFilename)); if(!lpFilename) return 0; @@ -293,14 +293,14 @@ METAHEADER *mh2; if(mh->mtType != METAFILE_DISK) { - ERR(metafile, "Not a disk based metafile\n"); + ERR("Not a disk based metafile\n"); return NULL; } mhd = (METAHEADERDISK *)((char *)mh + sizeof(METAHEADER)); if((hfile = CreateFileA(mhd->filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, -1)) == HFILE_ERROR) { - WARN(metafile, "Can't open file of disk based metafile\n"); + WARN("Can't open file of disk based metafile\n"); return NULL; } mh2 = MF_ReadMetaFile(hfile); @@ -337,7 +337,7 @@ METAHEADER *mh2 = NULL; HFILE hFile; - TRACE(metafile,"(%08x,%s)\n", hSrcMetaFile, lpFilename); + TRACE("(%08x,%s)\n", hSrcMetaFile, lpFilename); if(!mh) return 0; @@ -387,7 +387,7 @@ METAHEADER *mh2 = NULL; HFILE hFile; - TRACE(metafile,"(%08x,%s)\n", hSrcMetaFile, lpFilename); + TRACE("(%08x,%s)\n", hSrcMetaFile, lpFilename); if(!mh) return 0; @@ -452,7 +452,7 @@ res=TRUE; MF_ReleaseMetaHeader16(hmf); } - TRACE(metafile,"IsValidMetaFile %x => %d\n",hmf,res); + TRACE("IsValidMetaFile %x => %d\n",hmf,res); return res; } @@ -498,10 +498,10 @@ while (offset < mh->mtSize * 2) { mr = (METARECORD *)((char *)mh + offset); - TRACE(metafile,"offset=%04x,size=%08lx\n", + TRACE("offset=%04x,size=%08lx\n", offset, mr->rdSize); if (!mr->rdSize) { - TRACE(metafile, + TRACE( "Entry got size 0 at offset %d, total mf length is %ld\n", offset,mh->mtSize*2); break; /* would loop endlessly otherwise */ @@ -578,7 +578,7 @@ DC *dc; BOOL16 result = TRUE, loaded = FALSE; - TRACE(metafile,"(%04x, %04x, %08lx, %08lx)\n", + TRACE("(%04x, %04x, %08lx, %08lx)\n", hdc, hmf, (DWORD)lpEnumFunc, lpData); @@ -670,7 +670,7 @@ HBRUSH hBrush; HFONT hFont; - TRACE(metafile,"(%08x,%08x,%p,%p)\n", + TRACE("(%08x,%08x,%p,%p)\n", hdc, hmf, lpEnumFunc, (void*)lpData); if (!mh) return 0; if(mh->mtType == METAFILE_DISK) { /* Create a memoery-based copy */ @@ -696,7 +696,7 @@ while (offset < (mh->mtSize * 2)) { mr = (METARECORD *)((char *)mh + offset); - TRACE(metafile, "Calling EnumFunc with record type %x\n", + TRACE("Calling EnumFunc with record type %x\n", mr->rdFunction); if (!lpEnumFunc( hdc, ht, mr, mh->mtNoObjects, (LONG)lpData )) { @@ -753,7 +753,7 @@ char *ptr; BITMAPINFOHEADER *infohdr; - TRACE(metafile,"(%04x %08lx %08lx %04x) function %04x\n", + TRACE("(%04x %08lx %08lx %04x) function %04x\n", hdc,(LONG)ht, (LONG)mr, nHandles, mr->rdFunction); switch (mr->rdFunction) @@ -965,7 +965,7 @@ break; default: - ERR(metafile, "META_CREATEPATTERNBRUSH: Unknown pattern type %d\n", + ERR("META_CREATEPATTERNBRUSH: Unknown pattern type %d\n", mr->rdParm[0]); break; } @@ -1009,7 +1009,7 @@ break; case META_ESCAPE: - FIXME(metafile, "META_ESCAPE unimplemented.\n"); + FIXME("META_ESCAPE unimplemented.\n"); break; case META_EXTTEXTOUT: @@ -1109,7 +1109,7 @@ /* *(mr->rdParm) may be BS_PATTERN or BS_DIBPATTERN: but there's no difference */ - TRACE(metafile,"%d\n",*(mr->rdParm)); + TRACE("%d\n",*(mr->rdParm)); s1 = mr->rdSize * 2 - sizeof(METARECORD) - 2; hndl = GlobalAlloc16(GMEM_MOVEABLE, s1); ptr = GlobalLock16(hndl); @@ -1172,7 +1172,7 @@ } #define META_UNIMP(x) case x: \ -FIXME(metafile, "PlayMetaFileRecord:record type "#x" not implemented.\n"); \ +FIXME("PlayMetaFileRecord:record type "#x" not implemented.\n"); \ break; META_UNIMP(META_DRAWTEXT) META_UNIMP(META_ANIMATEPALETTE) @@ -1190,7 +1190,7 @@ #undef META_UNIMP default: - WARN(metafile, "PlayMetaFileRecord: Unknown record type %x\n", + WARN("PlayMetaFileRecord: Unknown record type %x\n", mr->rdFunction); } } @@ -1204,7 +1204,7 @@ HANDLETABLE16 * ht = (void *)GlobalAlloc(GPTR, handles*sizeof(HANDLETABLE16)); int i = 0; - TRACE(metafile, "(%08x,%p,%p,%d)\n", hdc, handletable, metarecord, + TRACE("(%08x,%p,%p,%d)\n", hdc, handletable, metarecord, handles); for (i=0; i<handles; i++) ht->objectHandle[i] = handletable->objectHandle[i]; @@ -1226,7 +1226,7 @@ HMETAFILE16 hmf /* metafile handle */ ) { - TRACE(metafile,"hMem out: %04x\n", hmf); + TRACE("hMem out: %04x\n", hmf); return hmf; } @@ -1243,7 +1243,7 @@ /* handle to a memory region holding a metafile */ ) { - TRACE(metafile,"hmf out: %04x\n", hMem); + TRACE("hmf out: %04x\n", hMem); return hMem; } @@ -1298,14 +1298,14 @@ METAHEADER *mh = MF_GetMetaHeader(hmf); UINT mfSize; - TRACE(metafile, "(%08x,%d,%p)\n", hmf, nSize, buf); + TRACE("(%08x,%d,%p)\n", hmf, nSize, buf); if (!mh) return 0; /* FIXME: error code */ if(mh->mtType == METAFILE_DISK) - FIXME(metafile, "Disk-based metafile?\n"); + FIXME("Disk-based metafile?\n"); mfSize = mh->mtSize * 2; if (!buf) { MF_ReleaseMetaHeader(hmf); - TRACE(metafile,"returning size %d\n", mfSize); + TRACE("returning size %d\n", mfSize); return mfSize; } if(mfSize > nSize) mfSize = nSize; @@ -1321,7 +1321,7 @@ UINT cbBuffer, LPBYTE lpbBuffer, INT fnMapMode, HDC hdcRef) { - FIXME(metafile, "(%d,%d,%p,%d,%d): stub\n", + FIXME("(%d,%d,%p,%d,%d): stub\n", hemf, cbBuffer, lpbBuffer, fnMapMode, hdcRef); return 0; } @@ -1368,20 +1368,20 @@ for(band = 0, start = &(mr->rdParm[11]); band < mr->rdParm[5]; band++, start = end + 1) { if(*start / 2 != (*start + 1) / 2) { - WARN(metafile, "Delimiter not even.\n"); + WARN("Delimiter not even.\n"); DeleteObject( hrgn2 ); return FALSE; } end = start + *start + 3; if(end > (WORD *)mr + mr->rdSize) { - WARN(metafile, "End points outside record.\n"); + WARN("End points outside record.\n"); DeleteObject( hrgn2 ); return FALSE; } if(*start != *end) { - WARN(metafile, "Mismatched delimiters.\n"); + WARN("Mismatched delimiters.\n"); DeleteObject( hrgn2 ); return FALSE; } @@ -1427,8 +1427,8 @@ if (mr->rdSize == (len + s1 * sizeof(INT16)) / 2) dxx = (LPINT16)(sot+(((s1+1)>>1)*2)); else { - TRACE(metafile,"%s len: %ld\n", sot, mr->rdSize); - WARN(metafile, + TRACE("%s len: %ld\n", sot, mr->rdSize); + WARN( "Please report: ExtTextOut len=%ld slen=%d rdSize=%ld opt=%04x\n", len, s1, mr->rdSize, mr->rdParm[3]); dxx = NULL; /* should't happen -- but if, we continue with NULL */ @@ -1441,6 +1441,6 @@ sot, /* string */ s1, dxx); /* length, dx array */ if (dxx) - TRACE(metafile,"%s len: %ld dx0: %d\n", sot, mr->rdSize, dxx[0]); + TRACE("%s len: %ld dx0: %d\n", sot, mr->rdSize, dxx[0]); return TRUE; }
diff --git a/objects/palette.c b/objects/palette.c index 988f173..1fbdc5c 100644 --- a/objects/palette.c +++ b/objects/palette.c
@@ -17,7 +17,7 @@ #include "color.h" #include "palette.h" #include "xmalloc.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(palette) @@ -110,7 +110,7 @@ int size; if (!palette) return 0; - TRACE(palette,"entries=%i\n", palette->palNumEntries); + TRACE("entries=%i\n", palette->palNumEntries); size = sizeof(LOGPALETTE) + (palette->palNumEntries - 1) * sizeof(PALETTEENTRY); @@ -124,7 +124,7 @@ palettePtr->mapping = NULL; GDI_HEAP_UNLOCK( hpalette ); - TRACE(palette," returning %04x\n", hpalette); + TRACE(" returning %04x\n", hpalette); return hpalette; } @@ -215,7 +215,7 @@ PALETTEOBJ * palPtr; INT numEntries; - TRACE(palette,"hpal = %04x, count=%i\n", hpalette, count ); + TRACE("hpal = %04x, count=%i\n", hpalette, count ); palPtr = (PALETTEOBJ *) GDI_GetObjPtr( hpalette, PALETTE_MAGIC ); if (!palPtr) return 0; @@ -267,7 +267,7 @@ PALETTEOBJ * palPtr; INT numEntries; - TRACE(palette,"hpal=%04x,start=%i,count=%i\n",hpalette,start,count ); + TRACE("hpal=%04x,start=%i,count=%i\n",hpalette,start,count ); palPtr = (PALETTEOBJ *) GDI_GetObjPtr( hpalette, PALETTE_MAGIC ); if (!palPtr) return 0; @@ -315,7 +315,7 @@ int prevsize, size = sizeof(LOGPALETTE) + (cEntries - 1) * sizeof(PALETTEENTRY); int* mapping = NULL; - TRACE(palette,"hpal = %04x, prev = %i, new = %i\n", + TRACE("hpal = %04x, prev = %i, new = %i\n", hPal, palPtr ? palPtr->logpalette.palNumEntries : -1, cEntries ); if( !palPtr ) return FALSE; @@ -375,7 +375,7 @@ UINT NumEntries, /* [in] Count of entries in palette */ const PALETTEENTRY* PaletteColors) /* [in] Pointer to first replacement */ { - TRACE(palette, "%04x (%i - %i)\n", hPal, StartIndex,StartIndex+NumEntries); + TRACE("%04x (%i - %i)\n", hPal, StartIndex,StartIndex+NumEntries); if( hPal != STOCK_DEFAULT_PALETTE ) { @@ -419,7 +419,7 @@ UINT use) /* [in] Palette-usage flag */ { UINT old = SystemPaletteUse; - FIXME(palette,"(%04x,%04x): stub\n", hdc, use ); + FIXME("(%04x,%04x): stub\n", hdc, use ); SystemPaletteUse = use; return old; } @@ -473,7 +473,7 @@ UINT i; DC *dc; - TRACE(palette, "hdc=%04x,start=%i,count=%i\n", hdc,start,count); + TRACE("hdc=%04x,start=%i,count=%i\n", hdc,start,count); if (!(dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC ))) return 0; if (!entries) return dc->w.devCaps->sizePalette; @@ -488,7 +488,7 @@ { *(COLORREF*)(entries + i) = COLOR_GetSystemPaletteEntry( start + i ); - TRACE(palette,"\tidx(%02x) -> RGB(%08lx)\n", + TRACE("\tidx(%02x) -> RGB(%08lx)\n", start + i, *(COLORREF*)(entries + i) ); } GDI_HEAP_UNLOCK( hdc ); @@ -527,7 +527,7 @@ palObj->logpalette.palNumEntries, NULL, color, FALSE ); - TRACE(palette,"(%04x,%06lx): returning %d\n", hpalette, color, index ); + TRACE("(%04x,%06lx): returning %d\n", hpalette, color, index ); GDI_HEAP_UNLOCK( hpalette ); return index; } @@ -572,7 +572,7 @@ GDI_HEAP_UNLOCK( dc->w.hPalette ); } - TRACE(palette,"(%06lx): returning %06lx\n", color, nearest ); + TRACE("(%06lx): returning %06lx\n", color, nearest ); GDI_HEAP_UNLOCK( hdc ); return nearest; } @@ -623,7 +623,7 @@ HPALETTE16 prev; DC *dc; - TRACE(palette, "%04x %04x\n", hdc, hpal ); + TRACE("%04x %04x\n", hdc, hpal ); dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC ); if (!dc) @@ -653,7 +653,7 @@ if (!dc) return 0; } - TRACE(palette, "%04x...\n", hdc ); + TRACE("%04x...\n", hdc ); if( dc && dc->w.hPalette != hLastRealizedPalette ) { @@ -663,7 +663,7 @@ palPtr = (PALETTEOBJ *) GDI_GetObjPtr( dc->w.hPalette, PALETTE_MAGIC ); if (!palPtr) { - FIXME(palette,"invalid selected palette %04x\n",dc->w.hPalette); + FIXME("invalid selected palette %04x\n",dc->w.hPalette); return 0; } @@ -674,11 +674,11 @@ GDI_HEAP_UNLOCK( dc->w.hPalette ); hLastRealizedPalette = dc->w.hPalette; } - else TRACE(palette, " skipping (hLastRealizedPalette = %04x)\n", + else TRACE(" skipping (hLastRealizedPalette = %04x)\n", hLastRealizedPalette); GDI_HEAP_UNLOCK( hdc ); - TRACE(palette, " realized %i colors.\n", realized ); + TRACE(" realized %i colors.\n", realized ); return (UINT16)realized; } @@ -691,7 +691,7 @@ DC *dc; PALETTEOBJ* palPtr; - TRACE(palette,"%04x\n", hdc ); + TRACE("%04x\n", hdc ); dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC ); if (!dc) @@ -757,10 +757,10 @@ WORD wBkgPalette = 1; PALETTEOBJ* lpt = (PALETTEOBJ*) GDI_GetObjPtr( hPal, PALETTE_MAGIC ); - TRACE(palette,"dc=%04x,pal=%04x,force=%i\n", hDC, hPal, bForceBackground); + TRACE("dc=%04x,pal=%04x,force=%i\n", hDC, hPal, bForceBackground); if( !lpt ) return 0; - TRACE(palette," entries = %d\n", lpt->logpalette.palNumEntries); + TRACE(" entries = %d\n", lpt->logpalette.palNumEntries); GDI_HEAP_UNLOCK( hPal ); if( hPal != STOCK_DEFAULT_PALETTE ) @@ -865,6 +865,6 @@ */ VOID WINAPI SetMagicColors16(HDC16 hDC, COLORREF color, UINT16 index) { - FIXME(palette,"(hDC %04x, color %04x, index %04x): stub\n", hDC, (int)color, index); + FIXME("(hDC %04x, color %04x, index %04x): stub\n", hDC, (int)color, index); }
diff --git a/objects/pen.c b/objects/pen.c index 18e722f..5960630 100644 --- a/objects/pen.c +++ b/objects/pen.c
@@ -6,7 +6,7 @@ #include <string.h> #include "pen.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(gdi) @@ -19,7 +19,7 @@ { LOGPEN logpen; - TRACE(gdi, "%d %d %06lx\n", style, width, color ); + TRACE("%d %d %06lx\n", style, width, color ); logpen.lopnStyle = style; logpen.lopnWidth.x = width; @@ -37,7 +37,7 @@ { LOGPEN logpen; - TRACE(gdi, "%d %d %06lx\n", style, width, color ); + TRACE("%d %d %06lx\n", style, width, color ); logpen.lopnStyle = style; logpen.lopnWidth.x = width; @@ -100,10 +100,10 @@ LOGPEN logpen; if ((style & PS_STYLE_MASK) == PS_USERSTYLE) - FIXME(gdi, "PS_USERSTYLE not handled\n"); + FIXME("PS_USERSTYLE not handled\n"); if ((style & PS_TYPE_MASK) == PS_GEOMETRIC) if (brush->lbHatch) - FIXME(gdi, "Hatches not implemented\n"); + FIXME("Hatches not implemented\n"); logpen.lopnStyle = style & ~PS_TYPE_MASK; logpen.lopnWidth.x = (style & PS_GEOMETRIC) ? width : 1;
diff --git a/objects/region.c b/objects/region.c index f945a3e..0dc7f75 100644 --- a/objects/region.c +++ b/objects/region.c
@@ -85,7 +85,7 @@ #include <string.h> #include "region.h" #include "winuser.h" -#include "debug.h" +#include "debugtools.h" #include "heap.h" #include "dc.h" @@ -112,11 +112,11 @@ { RECT *pRect, *pRectEnd = pReg->rects + pReg->numRects; - TRACE(region, "Region %p: %d,%d - %d,%d %d rects\n", pReg, + TRACE("Region %p: %d,%d - %d,%d %d rects\n", pReg, pReg->extents.left, pReg->extents.top, pReg->extents.right, pReg->extents.bottom, pReg->numRects); for(pRect = pReg->rects; pRect < pRectEnd; pRect++) - TRACE(region, "\t%d,%d - %d,%d\n", pRect->left, pRect->top, + TRACE("\t%d,%d - %d,%d\n", pRect->left, pRect->top, pRect->right, pRect->bottom); return; } @@ -180,7 +180,7 @@ */ BOOL REGION_DeleteObject( HRGN hrgn, RGNOBJ * obj ) { - TRACE(region, " %04x\n", hrgn ); + TRACE(" %04x\n", hrgn ); REGION_DestroyWineRegion( obj->rgn ); return GDI_FreeObject( hrgn ); @@ -207,7 +207,7 @@ int nbox = obj->rgn->numRects; RECT *pbox = obj->rgn->rects; - TRACE(region, " %04x %d,%d\n", hrgn, x, y ); + TRACE(" %04x %d,%d\n", hrgn, x, y ); if(nbox) { while(nbox--) { pbox->left += x; @@ -249,7 +249,7 @@ if (obj) { INT ret; - TRACE(region, " %04x\n", hrgn ); + TRACE(" %04x\n", hrgn ); rect->left = obj->rgn->extents.left; rect->top = obj->rgn->extents.top; rect->right = obj->rgn->extents.right; @@ -273,7 +273,7 @@ if (!(hrgn = (HRGN16)REGION_CreateRegion(RGN_DEFAULT_RECTS))) return 0; - TRACE(region, "\n"); + TRACE("\n"); SetRectRgn16(hrgn, left, top, right, bottom); return hrgn; } @@ -290,7 +290,7 @@ if (!(hrgn = REGION_CreateRegion(RGN_DEFAULT_RECTS))) return 0; - TRACE(region, "\n"); + TRACE("\n"); SetRectRgn(hrgn, left, top, right, bottom); return hrgn; } @@ -338,7 +338,7 @@ { RGNOBJ * obj; - TRACE(region, " %04x %d,%d-%d,%d\n", + TRACE(" %04x %d,%d-%d,%d\n", hrgn, left, top, right, bottom ); if (!(obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC ))) return FALSE; @@ -412,7 +412,7 @@ d = (ellipse_height < 128) ? ((3 * ellipse_height) >> 2) : 64; if (!(hrgn = REGION_CreateRegion(d))) return 0; obj = (RGNOBJ *) GDI_HEAP_LOCK( hrgn ); - TRACE(region,"(%d,%d-%d,%d %dx%d): ret=%04x\n", + TRACE("(%d,%d-%d,%d %dx%d): ret=%04x\n", left, top, right, bottom, ellipse_width, ellipse_height, hrgn ); /* Check parameters */ @@ -543,7 +543,7 @@ DWORD size; RGNOBJ *obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC ); - TRACE(region, " %04x count = %ld, rgndata = %p\n", + TRACE(" %04x count = %ld, rgndata = %p\n", hrgn, count, rgndata); if(!obj) return 0; @@ -587,17 +587,17 @@ { HRGN hrgn; - TRACE(region, " %p %ld %p = ", lpXform, dwCount, rgndata ); + TRACE(" %p %ld %p = ", lpXform, dwCount, rgndata ); if( lpXform ) - WARN(region, "(Xform not implemented - ignored) "); + WARN("(Xform not implemented - ignored) "); if( rgndata->rdh.iType != RDH_RECTANGLES ) { /* FIXME: We can use CreatePolyPolygonRgn() here * for trapezoidal data */ - WARN(region, "(Unsupported region data) "); + WARN("(Unsupported region data) "); goto fail; } @@ -611,11 +611,11 @@ REGION_UnionRectWithRegion( pCurRect, obj->rgn ); GDI_HEAP_UNLOCK( hrgn ); - TRACE(region,"%04x\n", hrgn ); + TRACE("%04x\n", hrgn ); return hrgn; } fail: - WARN(region, "Failed\n"); + WARN("Failed\n"); return 0; } @@ -832,7 +832,7 @@ DC * dc = DC_GetDCPtr( hdc ); RECT tmpRect; - TRACE(region, " hdc=%04x dest=%04x src=%04x\n", + TRACE(" hdc=%04x dest=%04x src=%04x\n", hdc, hDest, hSrc) ; if (dc->w.MapMode == MM_TEXT) /* Requires only a translation */ @@ -887,7 +887,7 @@ RGNOBJ *destObj = (RGNOBJ *) GDI_GetObjPtr( hDest, REGION_MAGIC); INT result = ERROR; - TRACE(region, " %04x,%04x -> %04x mode=%x\n", + TRACE(" %04x,%04x -> %04x mode=%x\n", hSrc1, hSrc2, hDest, mode ); if (destObj) { @@ -895,7 +895,7 @@ if (src1Obj) { - TRACE(region, "dump:\n"); + TRACE("dump:\n"); if(TRACE_ON(region)) REGION_DumpRegion(src1Obj->rgn); if (mode == RGN_COPY) @@ -909,7 +909,7 @@ if (src2Obj) { - TRACE(region, "dump:\n"); + TRACE("dump:\n"); if(TRACE_ON(region)) REGION_DumpRegion(src2Obj->rgn); switch (mode) @@ -933,7 +933,7 @@ } GDI_HEAP_UNLOCK( hSrc1 ); } - TRACE(region, "dump:\n"); + TRACE("dump:\n"); if(TRACE_ON(region)) REGION_DumpRegion(destObj->rgn); @@ -1988,7 +1988,7 @@ tmpSLLBlock = HeapAlloc( SystemHeap, 0, sizeof(ScanLineListBlock)); if(!tmpSLLBlock) { - WARN(region, "Can't alloc SLLB\n"); + WARN("Can't alloc SLLB\n"); return; } (*SLLBlock)->next = tmpSLLBlock; @@ -2436,7 +2436,7 @@ if (iPts == NUMPTSTOBUFFER) { tmpPtBlock = HeapAlloc( SystemHeap, 0, sizeof(POINTBLOCK)); if(!tmpPtBlock) { - WARN(region, "Can't alloc tPB\n"); + WARN("Can't alloc tPB\n"); return 0; } curPtBlock->next = tmpPtBlock; @@ -2487,7 +2487,7 @@ tmpPtBlock = HeapAlloc( SystemHeap, 0, sizeof(POINTBLOCK) ); if(!tmpPtBlock) { - WARN(region, "Can't alloc tPB\n"); + WARN("Can't alloc tPB\n"); return 0; } curPtBlock->next = tmpPtBlock; @@ -2577,7 +2577,7 @@ */ HRGN WINAPI GetRandomRgn(DWORD dwArg1, DWORD dwArg2, DWORD dwArg3) { - FIXME (region, "(0x%08lx 0x%08lx 0x%08lx): empty stub!\n", + FIXME("(0x%08lx 0x%08lx 0x%08lx): empty stub!\n", dwArg1, dwArg2, dwArg3); return 0; @@ -2637,7 +2637,7 @@ return FALSE; } - TRACE(region,"cropped to empty!\n"); + TRACE("cropped to empty!\n"); EMPTY_REGION(rgnDst); } else /* region box and clipping rect appear to intersect */ @@ -2669,7 +2669,7 @@ if( TRACE_ON(region) ) { REGION_DumpRegion( rgnSrc ); - TRACE(region,"\tclipa = %i, clipb = %i\n", clipa, clipb ); + TRACE("\tclipa = %i, clipb = %i\n", clipa, clipb ); } for( i = clipa, j = 0; i < clipb ; i++ ) @@ -2719,7 +2719,7 @@ if( TRACE_ON(region) ) { - TRACE(region,"result:\n"); + TRACE("result:\n"); REGION_DumpRegion( rgnDst ); } } @@ -2793,10 +2793,10 @@ if( !lpPt ) lpPt = &pt; if( lpRect ) - TRACE(region, "src %p -> dst %p (%i,%i)-(%i,%i) by (%li,%li)\n", objSrc->rgn, rgnDst, + TRACE("src %p -> dst %p (%i,%i)-(%i,%i) by (%li,%li)\n", objSrc->rgn, rgnDst, lpRect->left, lpRect->top, lpRect->right, lpRect->bottom, lpPt->x, lpPt->y ); else - TRACE(region, "src %p -> dst %p by (%li,%li)\n", objSrc->rgn, rgnDst, lpPt->x, lpPt->y ); + TRACE("src %p -> dst %p by (%li,%li)\n", objSrc->rgn, rgnDst, lpPt->x, lpPt->y ); if( REGION_CropAndOffsetRegion( lpPt, lpRect, objSrc->rgn, rgnDst ) == FALSE ) {
diff --git a/objects/text.c b/objects/text.c index 00a0923..37b6b9f 100644 --- a/objects/text.c +++ b/objects/text.c
@@ -11,7 +11,7 @@ #include "dc.h" #include "gdi.h" #include "heap.h" -#include "debug.h" +#include "debugtools.h" #include "cache.h" #include "debugstr.h" @@ -202,7 +202,7 @@ int width = rect->right - rect->left; int max_width = 0; - TRACE(text,"%s, %d , [(%d,%d),(%d,%d)]\n", + TRACE("%s, %d , [(%d,%d),(%d,%d)]\n", debugstr_an (str, count), count, rect->left, rect->top, rect->right, rect->bottom); @@ -325,9 +325,9 @@ INT WINAPI DrawTextExA( HDC hdc, LPCSTR str, INT count, LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp ) { - TRACE(text,"(%d,'%s',%d,%p,0x%08x,%p)\n",hdc,str,count,rect,flags,dtp); + TRACE("(%d,'%s',%d,%p,0x%08x,%p)\n",hdc,str,count,rect,flags,dtp); if(dtp) { - FIXME(text,"Ignores params:%d,%d,%d,%d,%d\n",dtp->cbSize, + FIXME("Ignores params:%d,%d,%d,%d,%d\n",dtp->cbSize, dtp->iTabLength,dtp->iLeftMargin,dtp->iRightMargin, dtp->uiLengthDrawn); } @@ -340,8 +340,8 @@ INT WINAPI DrawTextExW( HDC hdc, LPCWSTR str, INT count, LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp ) { - TRACE(text,"(%d,%p,%d,%p,0x%08x,%p)\n",hdc,str,count,rect,flags,dtp); - FIXME(text,"ignores extended functionality\n"); + TRACE("(%d,%p,%d,%p,0x%08x,%p)\n",hdc,str,count,rect,flags,dtp); + FIXME("ignores extended functionality\n"); return DrawTextW(hdc,str,count,rect,flags); } @@ -641,7 +641,7 @@ INT16 count, INT16 cTabStops, const INT16 *lpTabPos, INT16 nTabOrg ) { - TRACE(text, "%04x %d,%d '%.*s' %d\n", + TRACE("%04x %d,%d '%.*s' %d\n", hdc, x, y, count, lpstr, count ); return TEXT_TabbedTextOut( hdc, x, y, lpstr, count, cTabStops, lpTabPos, NULL, nTabOrg, TRUE ); @@ -655,7 +655,7 @@ INT count, INT cTabStops, const INT *lpTabPos, INT nTabOrg ) { - TRACE(text, "%04x %d,%d '%.*s' %d\n", + TRACE("%04x %d,%d '%.*s' %d\n", hdc, x, y, count, lpstr, count ); return TEXT_TabbedTextOut( hdc, x, y, lpstr, count, cTabStops, NULL, lpTabPos, nTabOrg, TRUE ); @@ -685,7 +685,7 @@ DWORD WINAPI GetTabbedTextExtent16( HDC16 hdc, LPCSTR lpstr, INT16 count, INT16 cTabStops, const INT16 *lpTabPos ) { - TRACE(text, "%04x '%.*s' %d\n", + TRACE("%04x '%.*s' %d\n", hdc, count, lpstr, count ); return TEXT_TabbedTextOut( hdc, 0, 0, lpstr, count, cTabStops, lpTabPos, NULL, 0, FALSE ); @@ -698,7 +698,7 @@ DWORD WINAPI GetTabbedTextExtentA( HDC hdc, LPCSTR lpstr, INT count, INT cTabStops, const INT *lpTabPos ) { - TRACE(text, "%04x '%.*s' %d\n", + TRACE("%04x '%.*s' %d\n", hdc, count, lpstr, count ); return TEXT_TabbedTextOut( hdc, 0, 0, lpstr, count, cTabStops, NULL, lpTabPos, 0, FALSE );