Make use of the DEFAULT_DEBUG_CHANNEL where appropriate.
Use the default version of FIXME, ERR, WARN, TRACE for the default
channel.
diff --git a/objects/bitmap.c b/objects/bitmap.c
index c658ca5..82c745f 100644
--- a/objects/bitmap.c
+++ b/objects/bitmap.c
@@ -19,7 +19,7 @@
#include "monitor.h"
#include "wine/winuser16.h"
-DECLARE_DEBUG_CHANNEL(bitmap)
+DEFAULT_DEBUG_CHANNEL(bitmap)
DECLARE_DEBUG_CHANNEL(resource)
BITMAP_DRIVER *BITMAP_Driver = NULL;
@@ -54,7 +54,7 @@
return 2 * ((bmWidth+3) >> 2);
default:
- WARN_(bitmap)("Unknown depth %d, please report.\n", bpp );
+ WARN("Unknown depth %d, please report.\n", bpp );
}
return -1;
}
@@ -115,7 +115,7 @@
/* Check parameters */
if (!height || !width) return 0;
if (planes != 1) {
- FIXME_(bitmap)("planes = %d\n", planes);
+ FIXME("planes = %d\n", planes);
return 0;
}
if (height < 0) height = -height;
@@ -125,7 +125,7 @@
hbitmap = GDI_AllocObject( sizeof(BITMAPOBJ), BITMAP_MAGIC );
if (!hbitmap) return 0;
- TRACE_(bitmap)("%dx%d, %d colors returning %08x\n", width, height,
+ TRACE("%dx%d, %d colors returning %08x\n", width, height,
1 << (planes*bpp), hbitmap);
bmp = (BITMAPOBJ *) GDI_HEAP_LOCK( hbitmap );
@@ -177,10 +177,10 @@
HBITMAP hbmpRet = 0;
DC *dc;
- TRACE_(bitmap)("(%04x,%d,%d) = \n", hdc, width, height );
+ TRACE("(%04x,%d,%d) = \n", hdc, width, height );
if (!(dc = DC_GetDCPtr( hdc ))) return 0;
if ((width >= 0x10000) || (height >= 0x10000)) {
- FIXME_(bitmap)("got bad width %d or height %d, please look for reason\n",
+ FIXME("got bad width %d or height %d, please look for reason\n",
width, height );
} else {
/* MS doc says if width or height is 0, return 1-by-1 pixel, monochrome bitmap */
@@ -191,7 +191,7 @@
if(dc->funcs->pCreateBitmap)
dc->funcs->pCreateBitmap( hbmpRet );
}
- TRACE_(bitmap)("\t\t%04x\n", hbmpRet);
+ TRACE("\t\t%04x\n", hbmpRet);
GDI_HEAP_UNLOCK(hdc);
return hbmpRet;
}
@@ -253,7 +253,7 @@
return bmp->bitmap.bmWidthBytes * bmp->bitmap.bmHeight;
if (count < 0) {
- WARN_(bitmap)("(%ld): Negative number of bytes passed???\n", count );
+ WARN("(%ld): Negative number of bytes passed???\n", count );
count = -count;
}
@@ -263,31 +263,31 @@
count = height * bmp->bitmap.bmWidthBytes;
if (count == 0)
{
- WARN_(bitmap)("Less then one entire line requested\n");
+ WARN("Less then one entire line requested\n");
GDI_HEAP_UNLOCK( hbitmap );
return 0;
}
- TRACE_(bitmap)("(%08x, %ld, %p) %dx%d %d colors fetched height: %ld\n",
- hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight,
- 1 << bmp->bitmap.bmBitsPixel, height );
+ TRACE("(%08x, %ld, %p) %dx%d %d colors fetched height: %ld\n",
+ hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight,
+ 1 << bmp->bitmap.bmBitsPixel, height );
if(bmp->DDBitmap) {
- TRACE_(bitmap)("Calling device specific BitmapBits\n");
+ TRACE("Calling device specific BitmapBits\n");
if(bmp->DDBitmap->funcs->pBitmapBits)
ret = bmp->DDBitmap->funcs->pBitmapBits(hbitmap, bits, count,
DDB_GET);
else {
- ERR_(bitmap)("BitmapBits == NULL??\n");
+ ERR("BitmapBits == NULL??\n");
ret = 0;
}
} else {
if(!bmp->bitmap.bmBits) {
- WARN_(bitmap)("Bitmap is empty\n");
+ WARN("Bitmap is empty\n");
ret = 0;
} else {
memcpy(bits, bmp->bitmap.bmBits, count);
@@ -329,7 +329,7 @@
return 0;
if (count < 0) {
- WARN_(bitmap)("(%ld): Negative number of bytes passed???\n", count );
+ WARN("(%ld): Negative number of bytes passed???\n", count );
count = -count;
}
@@ -338,18 +338,18 @@
if (height > bmp->bitmap.bmHeight) height = bmp->bitmap.bmHeight;
count = height * bmp->bitmap.bmWidthBytes;
- TRACE_(bitmap)("(%08x, %ld, %p) %dx%d %d colors fetched height: %ld\n",
- hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight,
- 1 << bmp->bitmap.bmBitsPixel, height );
+ TRACE("(%08x, %ld, %p) %dx%d %d colors fetched height: %ld\n",
+ hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight,
+ 1 << bmp->bitmap.bmBitsPixel, height );
if(bmp->DDBitmap) {
- TRACE_(bitmap)("Calling device specific BitmapBits\n");
+ TRACE("Calling device specific BitmapBits\n");
if(bmp->DDBitmap->funcs->pBitmapBits)
ret = bmp->DDBitmap->funcs->pBitmapBits(hbitmap, (void *) bits,
count, DDB_SET);
else {
- ERR_(bitmap)("BitmapBits == NULL??\n");
+ ERR("BitmapBits == NULL??\n");
ret = 0;
}
@@ -358,7 +358,7 @@
if(!bmp->bitmap.bmBits) /* Alloc enough for entire bitmap */
bmp->bitmap.bmBits = HeapAlloc( GetProcessHeap(), 0, count );
if(!bmp->bitmap.bmBits) {
- WARN_(bitmap)("Unable to allocate bit buffer\n");
+ WARN("Unable to allocate bit buffer\n");
ret = 0;
} else {
memcpy(bmp->bitmap.bmBits, bits, count);
@@ -684,7 +684,7 @@
}
else
{
- FIXME_(bitmap)("not implemented for DIBs: count %d\n", count);
+ FIXME("not implemented for DIBs: count %d\n", count);
return 0;
}
}
diff --git a/objects/clipping.c b/objects/clipping.c
index 72affae..e9f5605 100644
--- a/objects/clipping.c
+++ b/objects/clipping.c
@@ -10,7 +10,7 @@
#include "debugtools.h"
#include "wine/winuser16.h"
-DECLARE_DEBUG_CHANNEL(clipping)
+DEFAULT_DEBUG_CHANNEL(clipping)
DECLARE_DEBUG_CHANNEL(region)
#define UPDATE_DIRTY_DC(dc) \
@@ -84,7 +84,7 @@
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
if (!dc) return ERROR;
- TRACE_(clipping)("%04x %04x %d\n", hdc, hrgn, fnMode );
+ TRACE("%04x %04x %d\n", hdc, hrgn, fnMode );
if (!hrgn)
{
@@ -96,7 +96,7 @@
}
else
{
- FIXME_(clipping)("Unimplemented: hrgn NULL in mode: %d\n", fnMode);
+ FIXME("Unimplemented: hrgn NULL in mode: %d\n", fnMode);
return ERROR;
}
}
@@ -132,7 +132,7 @@
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
if (!dc || !hrgn) return ERROR;
- TRACE_(clipping)("%04x %04x\n", hdc, hrgn );
+ TRACE("%04x %04x\n", hdc, hrgn );
dc->w.flags &= ~DC_DIRTY;
@@ -161,7 +161,7 @@
DC *dc = DC_GetDCPtr( hdc );
if (!dc) return ERROR;
- TRACE_(clipping)("%04x %d,%d\n", hdc, x, y );
+ TRACE("%04x %d,%d\n", hdc, x, y );
if(dc->funcs->pOffsetClipRgn)
ret = dc->funcs->pOffsetClipRgn( dc, x, y );
@@ -182,7 +182,7 @@
INT16 retval;
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
if (!dc) return ERROR;
- TRACE_(clipping)("%04x %d,%d\n", hdc, x, y );
+ TRACE("%04x %d,%d\n", hdc, x, y );
retval = OffsetRgn( dc->w.hVisRgn, x, y );
CLIPPING_UpdateGCRegion( dc );
GDI_HEAP_UNLOCK( hdc );
@@ -222,7 +222,7 @@
dc->w.hClipRgn = CreateRectRgn( 0, 0, 0, 0 );
CombineRgn( dc->w.hClipRgn, dc->w.hVisRgn, 0, RGN_COPY );
}
- else WARN_(clipping)("No hClipRgn and flags are %x\n",flags);
+ else WARN("No hClipRgn and flags are %x\n",flags);
}
ret = CombineRgn( newRgn, dc->w.hClipRgn, newRgn,
@@ -258,8 +258,7 @@
DC *dc = DC_GetDCPtr( hdc );
if (!dc) return ERROR;
- TRACE_(clipping)("%04x %dx%d,%dx%d\n",
- hdc, left, top, right, bottom );
+ TRACE("%04x %dx%d,%dx%d\n", hdc, left, top, right, bottom );
if(dc->funcs->pExcludeClipRect)
ret = dc->funcs->pExcludeClipRect( dc, left, top, right, bottom );
@@ -296,8 +295,7 @@
DC *dc = DC_GetDCPtr( hdc );
if (!dc) return ERROR;
- TRACE_(clipping)("%04x %dx%d,%dx%d\n",
- hdc, left, top, right, bottom );
+ TRACE("%04x %dx%d,%dx%d\n", hdc, left, top, right, bottom );
if(dc->funcs->pIntersectClipRect)
ret = dc->funcs->pIntersectClipRect( dc, left, top, right, bottom );
@@ -372,8 +370,7 @@
top = YLPTODP( dc, top );
bottom = YLPTODP( dc, bottom );
- TRACE_(clipping)("%04x %dx%d,%dx%d\n",
- hdc, left, top, right, bottom );
+ TRACE("%04x %dx%d,%dx%d\n", hdc, left, top, right, bottom );
return CLIPPING_IntersectVisRect( dc, left, top, right, bottom, TRUE );
}
@@ -393,8 +390,7 @@
top = YLPTODP( dc, top );
bottom = YLPTODP( dc, bottom );
- TRACE_(clipping)("%04x %dx%d,%dx%d\n",
- hdc, left, top, right, bottom );
+ TRACE("%04x %dx%d,%dx%d\n", hdc, left, top, right, bottom );
return CLIPPING_IntersectVisRect( dc, left, top, right, bottom, FALSE );
}
@@ -417,7 +413,7 @@
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
if (!dc) return ERROR;
- TRACE_(clipping)("%04x %d,%d\n", hdc, x, y );
+ TRACE("%04x %d,%d\n", hdc, x, y );
if (!dc->w.hGCClipRgn) return FALSE;
if( dc->w.flags & DC_DIRTY ) UPDATE_DIRTY_DC(dc);
@@ -436,8 +432,8 @@
RECT16 tmpRect;
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
if (!dc) return FALSE;
- TRACE_(clipping)("%04x %d,%dx%d,%d\n",
- hdc, rect->left, rect->top, rect->right, rect->bottom );
+ TRACE("%04x %d,%dx%d,%d\n",
+ hdc, rect->left, rect->top, rect->right, rect->bottom );
if (!dc->w.hGCClipRgn) return FALSE;
/* copy rectangle to avoid overwriting by LPtoDP */
tmpRect = *rect;
@@ -469,8 +465,7 @@
ret = GetRgnBox16( dc->w.hGCClipRgn, rect );
OffsetRect16( rect, -dc->w.DCOrgX, -dc->w.DCOrgY );
DPtoLP16( hdc, (LPPOINT16)rect, 2 );
- TRACE_(clipping)("%d,%d-%d,%d\n",
- rect->left,rect->top,rect->right,rect->bottom );
+ TRACE("%d,%d-%d,%d\n", rect->left,rect->top,rect->right,rect->bottom );
return ret;
}
@@ -523,7 +518,7 @@
RGNOBJ *obj, *copyObj;
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
if (!dc) return 0;
- TRACE_(clipping)("%04x\n", hdc );
+ TRACE("%04x\n", hdc );
if (!dc->w.hVisRgn)
{
ERR_(region)("hVisRgn is zero. Please report this.\n" );
@@ -575,7 +570,7 @@
GDI_HEAP_UNLOCK( hdc );
return ERROR;
}
- TRACE_(clipping)("%04x\n", hdc );
+ TRACE("%04x\n", hdc );
if (!(obj = (RGNOBJ *) GDI_GetObjPtr( dc->w.hVisRgn, REGION_MAGIC )))
{
GDI_HEAP_UNLOCK( hdc );
diff --git a/objects/font.c b/objects/font.c
index d1933db..c00f607 100644
--- a/objects/font.c
+++ b/objects/font.c
@@ -16,7 +16,7 @@
#include "winerror.h"
#include "dc.h"
-DECLARE_DEBUG_CHANNEL(font)
+DEFAULT_DEBUG_CHANNEL(font)
DECLARE_DEBUG_CHANNEL(gdi)
#define ENUM_UNICODE 0x00000001
@@ -319,25 +319,24 @@
fontPtr = (FONTOBJ *) GDI_HEAP_LOCK( hFont );
memcpy( &fontPtr->logfont, font, sizeof(LOGFONT16) );
- TRACE_(font)("(%i %i %i %i) '%s' %s %s => %04x\n",
- font->lfHeight, font->lfWidth,
- font->lfEscapement, font->lfOrientation,
- font->lfFaceName ? font->lfFaceName : "NULL",
- font->lfWeight > 400 ? "Bold" : "",
- font->lfItalic ? "Italic" : "",
- hFont);
+ TRACE("(%i %i %i %i) '%s' %s %s => %04x\n",
+ font->lfHeight, font->lfWidth,
+ font->lfEscapement, font->lfOrientation,
+ font->lfFaceName ? font->lfFaceName : "NULL",
+ font->lfWeight > 400 ? "Bold" : "",
+ font->lfItalic ? "Italic" : "", hFont);
if (font->lfEscapement != font->lfOrientation) {
/* this should really depend on whether GM_ADVANCED is set */
fontPtr->logfont.lfOrientation = fontPtr->logfont.lfEscapement;
- WARN_(font)(
- "orientation angle %f set to escapement angle %f for new font %04x\n",
- font->lfOrientation/10., font->lfEscapement/10., hFont);
+ WARN("orientation angle %f set to "
+ "escapement angle %f for new font %04x\n",
+ font->lfOrientation/10., font->lfEscapement/10., hFont);
}
GDI_HEAP_UNLOCK( hFont );
}
}
- else WARN_(font)("(NULL) => NULL\n");
+ else WARN("(NULL) => NULL\n");
return hFont;
}
@@ -375,8 +374,7 @@
{
LOGFONT16 logfont;
- TRACE_(font)("('%s',%d,%d)\n",
- (name ? name : "(null)") , height, width);
+ TRACE("('%s',%d,%d)\n", (name ? name : "(null)") , height, width);
logfont.lfHeight = height;
logfont.lfWidth = width;
@@ -877,9 +875,8 @@
!dc->funcs->pGetTextExtentPoint( dc, str, count, size ))
return FALSE;
- TRACE_(font)("(%08x %s %d %p): returning %d,%d\n",
- hdc, debugstr_an (str, count), count,
- size, size->cx, size->cy );
+ TRACE("(%08x %s %d %p): returning %d,%d\n",
+ hdc, debugstr_an (str, count), count, size, size->cx, size->cy );
return TRUE;
}
@@ -922,7 +919,7 @@
BOOL WINAPI GetTextExtentPointA( HDC hdc, LPCSTR str, INT count,
LPSIZE size )
{
- TRACE_(font)("not bug compatible.\n");
+ TRACE("not bug compatible.\n");
return GetTextExtentPoint32A( hdc, str, count, size );
}
@@ -932,7 +929,7 @@
BOOL WINAPI GetTextExtentPointW( HDC hdc, LPCWSTR str, INT count,
LPSIZE size )
{
- TRACE_(font)("not bug compatible.\n");
+ TRACE("not bug compatible.\n");
return GetTextExtentPoint32W( hdc, str, count, size );
}
@@ -972,8 +969,8 @@
size->cx = extent;
*lpnFit = nFit;
- TRACE_(font)("(%08x '%.*s' %d) returning %d %d %d\n",
- hdc,count,str,maxExt,nFit, size->cx,size->cy);
+ TRACE("(%08x '%.*s' %d) returning %d %d %d\n",
+ hdc,count,str,maxExt,nFit, size->cx,size->cy);
return TRUE;
}
@@ -1049,26 +1046,26 @@
metrics->tmMaxCharWidth = WDPTOLP(metrics->tmMaxCharWidth);
metrics->tmOverhang = WDPTOLP(metrics->tmOverhang);
- TRACE_(font)("text metrics:\n"
- " Weight = %03li\t FirstChar = %03i\t AveCharWidth = %li\n"
- " Italic = % 3i\t LastChar = %03i\t\t MaxCharWidth = %li\n"
- " UnderLined = %01i\t DefaultChar = %03i\t Overhang = %li\n"
- " StruckOut = %01i\t BreakChar = %03i\t CharSet = %i\n"
- " PitchAndFamily = %02x\n"
- " --------------------\n"
- " InternalLeading = %li\n"
- " Ascent = %li\n"
- " Descent = %li\n"
- " Height = %li\n",
- metrics->tmWeight, metrics->tmFirstChar, metrics->tmAveCharWidth,
- metrics->tmItalic, metrics->tmLastChar, metrics->tmMaxCharWidth,
- metrics->tmUnderlined, metrics->tmDefaultChar, metrics->tmOverhang,
- metrics->tmStruckOut, metrics->tmBreakChar, metrics->tmCharSet,
- metrics->tmPitchAndFamily,
- metrics->tmInternalLeading,
- metrics->tmAscent,
- metrics->tmDescent,
- metrics->tmHeight );
+ TRACE("text metrics:\n"
+ " Weight = %03li\t FirstChar = %03i\t AveCharWidth = %li\n"
+ " Italic = % 3i\t LastChar = %03i\t\t MaxCharWidth = %li\n"
+ " UnderLined = %01i\t DefaultChar = %03i\t Overhang = %li\n"
+ " StruckOut = %01i\t BreakChar = %03i\t CharSet = %i\n"
+ " PitchAndFamily = %02x\n"
+ " --------------------\n"
+ " InternalLeading = %li\n"
+ " Ascent = %li\n"
+ " Descent = %li\n"
+ " Height = %li\n",
+ metrics->tmWeight, metrics->tmFirstChar, metrics->tmAveCharWidth,
+ metrics->tmItalic, metrics->tmLastChar, metrics->tmMaxCharWidth,
+ metrics->tmUnderlined, metrics->tmDefaultChar, metrics->tmOverhang,
+ metrics->tmStruckOut, metrics->tmBreakChar, metrics->tmCharSet,
+ metrics->tmPitchAndFamily,
+ metrics->tmInternalLeading,
+ metrics->tmAscent,
+ metrics->tmDescent,
+ metrics->tmHeight );
return TRUE;
}
@@ -1100,7 +1097,7 @@
UINT16 cbData, /* [in] Size of metric data array */
LPOUTLINETEXTMETRIC16 lpOTM) /* [out] Address of metric data array */
{
- FIXME_(font)("(%04x,%04x,%p): stub\n", hdc,cbData,lpOTM);
+ FIXME("(%04x,%04x,%p): stub\n", hdc,cbData,lpOTM);
return 0;
}
@@ -1183,7 +1180,7 @@
UINT cbData, /* [in] Size of metric data array */
LPOUTLINETEXTMETRICW lpOTM) /* [out] Address of metric data array */
{
- FIXME_(font)("(%d,%d,%p): stub\n", hdc, cbData, lpOTM);
+ FIXME("(%d,%d,%p): stub\n", hdc, cbData, lpOTM);
return 0;
}
@@ -1284,7 +1281,7 @@
if(dc->funcs->pSetMapperFlags)
ret = dc->funcs->pSetMapperFlags( dc, dwFlag );
else
- FIXME_(font)("(0x%04x, 0x%08lx): stub - harmless\n", hDC, dwFlag);
+ FIXME("(0x%04x, 0x%08lx): stub - harmless\n", hDC, dwFlag);
GDI_HEAP_UNLOCK( hDC );
return ret;
}
@@ -1294,8 +1291,7 @@
*/
BOOL16 WINAPI GetAspectRatioFilterEx16( HDC16 hdc, LPSIZE16 pAspectRatio )
{
- FIXME_(font)("(%04x, %p): -- Empty Stub !\n",
- hdc, pAspectRatio);
+ FIXME("(%04x, %p): -- Empty Stub !\n", hdc, pAspectRatio);
return FALSE;
}
@@ -1304,8 +1300,7 @@
*/
BOOL WINAPI GetAspectRatioFilterEx( HDC hdc, LPSIZE pAspectRatio )
{
- FIXME_(font)("(%04x, %p): -- Empty Stub !\n",
- hdc, pAspectRatio);
+ FIXME("(%04x, %p): -- Empty Stub !\n", hdc, pAspectRatio);
return FALSE;
}
@@ -1354,7 +1349,7 @@
LPABC abc )
{
/* No TrueType fonts in Wine so far */
- FIXME_(font)("(%04x,%04x,%04x,%p): stub\n", hdc, firstChar, lastChar, abc);
+ FIXME("(%04x,%04x,%04x,%p): stub\n", hdc, firstChar, lastChar, abc);
return FALSE;
}
@@ -1366,7 +1361,7 @@
LPGLYPHMETRICS16 lpgm, DWORD cbBuffer,
LPVOID lpBuffer, const MAT2 *lpmat2 )
{
- FIXME_(font)("(%04x, '%c', %04x, %p, %ld, %p, %p): stub\n",
+ FIXME("(%04x, '%c', %04x, %p, %ld, %p, %p): stub\n",
hdc, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, lpmat2 );
return (DWORD)-1; /* failure */
}
@@ -1379,7 +1374,7 @@
LPGLYPHMETRICS lpgm, DWORD cbBuffer,
LPVOID lpBuffer, const MAT2 *lpmat2 )
{
- FIXME_(font)("(%04x, '%c', %04x, %p, %ld, %p, %p): stub\n",
+ FIXME("(%04x, '%c', %04x, %p, %ld, %p, %p): stub\n",
hdc, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, lpmat2 );
return (DWORD)-1; /* failure */
}
@@ -1391,7 +1386,7 @@
LPGLYPHMETRICS lpgm, DWORD cbBuffer,
LPVOID lpBuffer, const MAT2 *lpmat2 )
{
- FIXME_(font)("(%04x, '%c', %04x, %p, %ld, %p, %p): stub\n",
+ FIXME("(%04x, '%c', %04x, %p, %ld, %p, %p): stub\n",
hdc, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, lpmat2 );
return (DWORD)-1; /* failure */
}
@@ -1419,7 +1414,7 @@
* enumbered with EnumFonts/EnumFontFamilies
* lpszCurrentPath can be NULL
*/
- FIXME_(font)("(%ld,%s,%s,%s): stub\n",
+ FIXME("(%ld,%s,%s,%s): stub\n",
fHidden, lpszResourceFile, lpszFontFile, lpszCurrentPath );
return FALSE; /* create failed */
}
@@ -1432,7 +1427,7 @@
LPCWSTR lpszFontFile,
LPCWSTR lpszCurrentPath )
{
- FIXME_(font)("(%ld,%p,%p,%p): stub\n",
+ FIXME("(%ld,%p,%p,%p): stub\n",
fHidden, lpszResourceFile, lpszFontFile, lpszCurrentPath );
return FALSE; /* create failed */
}
@@ -1467,8 +1462,7 @@
{
/* At this time kerning is ignored (set to 0) */
int i;
- FIXME_(font)("(%x,%d,%p): almost empty stub!\n",
- hDC, cPairs, lpKerningPairs);
+ FIXME("(%x,%d,%p): almost empty stub!\n", hDC, cPairs, lpKerningPairs);
for (i = 0; i < cPairs; i++)
lpKerningPairs[i].iKernAmount = 0;
return 0;
@@ -1483,8 +1477,7 @@
LPKERNINGPAIR lpKerningPairs )
{
int i;
- FIXME_(font)("(%x,%ld,%p): almost empty stub!\n",
- hDC, cPairs, lpKerningPairs);
+ FIXME("(%x,%ld,%p): almost empty stub!\n", hDC, cPairs, lpKerningPairs);
for (i = 0; i < cPairs; i++)
lpKerningPairs[i].iKernAmount = 0;
return 0;
@@ -1548,7 +1541,7 @@
*/
DWORD WINAPI GetFontLanguageInfo(HDC hdc) {
/* return value 0 is correct for most cases anyway */
- FIXME_(font)("(%x):stub!\n", hdc);
+ FIXME("(%x):stub!\n", hdc);
return 0;
}
@@ -1557,7 +1550,7 @@
*/
DWORD WINAPI GetFontLanguageInfo16(HDC16 hdc) {
/* return value 0 is correct for most cases anyway */
- FIXME_(font)("(%x):stub!\n",hdc);
+ FIXME("(%x):stub!\n",hdc);
return 0;
}
@@ -1580,8 +1573,7 @@
DWORD WINAPI GetFontData(HDC hdc, DWORD table, DWORD offset,
LPVOID buffer, DWORD length)
{
- FIXME_(font)("(%x,%ld,%ld,%p,%ld): stub\n",
- hdc, table, offset, buffer, length);
+ FIXME("(%x,%ld,%ld,%p,%ld): stub\n", hdc, table, offset, buffer, length);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return GDI_ERROR;
}
@@ -1610,18 +1602,19 @@
DWORD ret=0;
SIZE size;
- TRACE_(font)("%s 0x%08x 0x%08x 0x%08lx:stub!\n",
- debugstr_a(lpString), uCount, nMaxExtent, dwFlags);
+ TRACE("%s 0x%08x 0x%08x 0x%08lx:stub!\n",
+ debugstr_a(lpString), uCount, nMaxExtent, dwFlags);
- TRACE_(font)("lpOrder=%p lpDx=%p lpCaretPos=%p lpClass=%p lpOutString=%p lpGlyphs=%p\n",
- lpResults->lpOrder, lpResults->lpDx, lpResults->lpCaretPos, lpResults->lpClass,
- lpResults->lpOutString, lpResults->lpGlyphs);
+ TRACE("lpOrder=%p lpDx=%p lpCaretPos=%p lpClass=%p "
+ "lpOutString=%p lpGlyphs=%p\n",
+ lpResults->lpOrder, lpResults->lpDx, lpResults->lpCaretPos,
+ lpResults->lpClass, lpResults->lpOutString, lpResults->lpGlyphs);
- if(dwFlags) FIXME_(font)("flags 0x%08lx ignored\n", dwFlags);
- if(lpResults->lpOrder) FIXME_(font)("reordering not implemented\n");
- if(lpResults->lpCaretPos) FIXME_(font)("caret positions not implemented\n");
- if(lpResults->lpClass) FIXME_(font)("classes not implemented\n");
- if(lpResults->lpGlyphs) FIXME_(font)("glyphs not implemented\n");
+ if(dwFlags) FIXME("flags 0x%08lx ignored\n", dwFlags);
+ if(lpResults->lpOrder) FIXME("reordering not implemented\n");
+ if(lpResults->lpCaretPos) FIXME("caret positions not implemented\n");
+ if(lpResults->lpClass) FIXME("classes not implemented\n");
+ if(lpResults->lpGlyphs) FIXME("glyphs not implemented\n");
/* copy will do if the GCP_REORDER flag is not set */
if(lpResults->lpOutString)
@@ -1654,7 +1647,7 @@
DWORD dwFlags)
{
/* return value 0 is correct for most cases anyway */
- FIXME_(font)(":stub!\n");
+ FIXME(":stub!\n");
return 0;
}
