gdi: Win64 printf format warning fixes.
Michael Stefaniuc
mstefani at redhat.de
Thu Oct 12 15:56:56 CDT 2006
---
dlls/gdi/Makefile.in | 2 +-
dlls/gdi/bidi.c | 2 +-
dlls/gdi/bitblt.c | 6 ++---
dlls/gdi/bitmap.c | 8 +++---
dlls/gdi/brush.c | 8 +++---
dlls/gdi/clipping.c | 6 ++---
dlls/gdi/dc.c | 16 ++++++------
dlls/gdi/dib.c | 12 +++++----
dlls/gdi/driver.c | 2 +-
dlls/gdi/enhmetafile.c | 32 ++++++++++++-------------
dlls/gdi/enhmfdrv/graphics.c | 2 +-
dlls/gdi/enhmfdrv/init.c | 2 +-
dlls/gdi/font.c | 50 +++++++++++++++++++--------------------
dlls/gdi/freetype.c | 54 +++++++++++++++++++++---------------------
dlls/gdi/gdi16.c | 4 ++-
dlls/gdi/gdiobj.c | 16 ++++++------
dlls/gdi/metafile.c | 10 ++++----
dlls/gdi/mfdrv/bitblt.c | 2 +-
dlls/gdi/mfdrv/init.c | 2 +-
dlls/gdi/opengl.c | 4 ++-
dlls/gdi/painting.c | 2 +-
dlls/gdi/palette.c | 16 ++++++------
dlls/gdi/path.c | 8 +++---
dlls/gdi/pen.c | 2 +-
dlls/gdi/printdrv.c | 4 ++-
dlls/gdi/region.c | 12 +++++----
dlls/gdi/wing.c | 4 ++-
27 files changed, 144 insertions(+), 144 deletions(-)
diff --git a/dlls/gdi/Makefile.in b/dlls/gdi/Makefile.in
index 5abe06c..df6f89b 100644
--- a/dlls/gdi/Makefile.in
+++ b/dlls/gdi/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -D_GDI32_ -DWINE_NO_LONG_AS_INT
+EXTRADEFS = -D_GDI32_
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
diff --git a/dlls/gdi/bidi.c b/dlls/gdi/bidi.c
index 8109cf4..7d2a264 100644
--- a/dlls/gdi/bidi.c
+++ b/dlls/gdi/bidi.c
@@ -55,7 +55,7 @@ BOOL BIDI_Reorder(
UINT *lpOrder /* [out] Logical -> Visual order map */
)
{
- TRACE("%s, %d, 0x%08lx lpOutString=%p, lpOrder=%p\n",
+ TRACE("%s, %d, 0x%08x lpOutString=%p, lpOrder=%p\n",
debugstr_wn(lpString, uCount), uCount, dwFlags,
lpOutString, lpOrder);
diff --git a/dlls/gdi/bitblt.c b/dlls/gdi/bitblt.c
index b38ef7b..bc75fb9 100644
--- a/dlls/gdi/bitblt.c
+++ b/dlls/gdi/bitblt.c
@@ -38,7 +38,7 @@ BOOL WINAPI PatBlt( HDC hdc, INT left, I
if (dc->funcs->pPatBlt)
{
- TRACE("%p %d,%d %dx%d %06lx\n", hdc, left, top, width, height, rop );
+ TRACE("%p %d,%d %dx%d %06x\n", hdc, left, top, width, height, rop );
bRet = dc->funcs->pPatBlt( dc->physDev, left, top, width, height, rop );
}
GDI_ReleaseObj( hdc );
@@ -61,7 +61,7 @@ BOOL WINAPI BitBlt( HDC hdcDst, INT xDst
/* FIXME: there is a race condition here */
dcSrc = DC_GetDCUpdate( hdcSrc );
dcDst = DC_GetDCPtr( hdcDst );
- TRACE("hdcSrc=%p %d,%d -> hdcDest=%p %d,%d %dx%d rop=%06lx\n",
+ TRACE("hdcSrc=%p %d,%d -> hdcDest=%p %d,%d %dx%d rop=%06x\n",
hdcSrc, xSrc, ySrc, hdcDst, xDst, yDst, width, height, rop);
ret = dcDst->funcs->pBitBlt( dcDst->physDev, xDst, yDst, width, height,
@@ -141,7 +141,7 @@ BOOL WINAPI StretchBlt( HDC hdcDst, INT
{
dcDst = DC_GetDCPtr( hdcDst );
- TRACE("%p %d,%d %dx%d -> %p %d,%d %dx%d rop=%06lx\n",
+ TRACE("%p %d,%d %dx%d -> %p %d,%d %dx%d rop=%06x\n",
hdcSrc, xSrc, ySrc, widthSrc, heightSrc,
hdcDst, xDst, yDst, widthDst, heightDst, rop );
diff --git a/dlls/gdi/bitmap.c b/dlls/gdi/bitmap.c
index 9581032..1a638c7 100644
--- a/dlls/gdi/bitmap.c
+++ b/dlls/gdi/bitmap.c
@@ -357,7 +357,7 @@ LONG WINAPI GetBitmapBits(
}
if (count < 0) {
- WARN("(%ld): Negative number of bytes passed???\n", count );
+ WARN("(%d): Negative number of bytes passed???\n", count );
count = -count;
}
@@ -373,7 +373,7 @@ LONG WINAPI GetBitmapBits(
}
- TRACE("(%p, %ld, %p) %dx%d %d colors fetched height: %ld\n",
+ TRACE("(%p, %d, %p) %dx%d %d colors fetched height: %d\n",
hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight,
1 << bmp->bitmap.bmBitsPixel, height );
@@ -420,7 +420,7 @@ LONG WINAPI SetBitmapBits(
return 0;
if (count < 0) {
- WARN("(%ld): Negative number of bytes passed???\n", count );
+ WARN("(%d): Negative number of bytes passed???\n", count );
count = -count;
}
@@ -454,7 +454,7 @@ LONG WINAPI SetBitmapBits(
if (height > bmp->bitmap.bmHeight) height = bmp->bitmap.bmHeight;
count = height * bmp->bitmap.bmWidthBytes;
- TRACE("(%p, %ld, %p) %dx%d %d colors fetched height: %ld\n",
+ TRACE("(%p, %d, %p) %dx%d %d colors fetched height: %d\n",
hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight,
1 << bmp->bitmap.bmBitsPixel, height );
diff --git a/dlls/gdi/brush.c b/dlls/gdi/brush.c
index 309ece5..3c4d1b8 100644
--- a/dlls/gdi/brush.c
+++ b/dlls/gdi/brush.c
@@ -181,7 +181,7 @@ HBRUSH WINAPI CreateHatchBrush( INT styl
{
LOGBRUSH logbrush;
- TRACE("%d %06lx\n", style, color );
+ TRACE("%d %06x\n", style, color );
logbrush.lbStyle = BS_HATCHED;
logbrush.lbColor = color;
@@ -279,7 +279,7 @@ HBRUSH WINAPI CreateDIBPatternBrushPt( c
if (!data)
return NULL;
- TRACE("%p %ldx%ld %dbpp\n", info, info->bmiHeader.biWidth,
+ TRACE("%p %dx%d %dbpp\n", info, info->bmiHeader.biWidth,
info->bmiHeader.biHeight, info->bmiHeader.biBitCount);
logbrush.lbStyle = BS_DIBPATTERNPT;
@@ -311,7 +311,7 @@ HBRUSH WINAPI CreateSolidBrush( COLORREF
{
LOGBRUSH logbrush;
- TRACE("%06lx\n", color );
+ TRACE("%06x\n", color );
logbrush.lbStyle = BS_SOLID;
logbrush.lbColor = color;
@@ -464,7 +464,7 @@ BOOL16 WINAPI SetSolidBrush16(HBRUSH16 h
BRUSHOBJ * brushPtr;
BOOL16 res = FALSE;
- TRACE("(hBrush %04x, newColor %08lx)\n", hBrush, (DWORD)newColor);
+ TRACE("(hBrush %04x, newColor %08x)\n", hBrush, (DWORD)newColor);
if (!(brushPtr = (BRUSHOBJ *) GDI_GetObjPtr( HBRUSH_32(hBrush), BRUSH_MAGIC )))
return FALSE;
diff --git a/dlls/gdi/clipping.c b/dlls/gdi/clipping.c
index 31ceb53..fca1db1 100644
--- a/dlls/gdi/clipping.c
+++ b/dlls/gdi/clipping.c
@@ -329,7 +329,7 @@ INT16 WINAPI ExcludeVisRect16( HDC16 hdc
LPtoDP( hdc, pt, 2 );
- TRACE("%p %ld,%ld - %ld,%ld\n", hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y);
+ TRACE("%p %d,%d - %d,%d\n", hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y);
if (!(tempRgn = CreateRectRgn( pt[0].x, pt[0].y, pt[1].x, pt[1].y ))) ret = ERROR;
else
@@ -362,7 +362,7 @@ INT16 WINAPI IntersectVisRect16( HDC16 h
LPtoDP( hdc, pt, 2 );
- TRACE("%p %ld,%ld - %ld,%ld\n", hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y);
+ TRACE("%p %d,%d - %d,%d\n", hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y);
if (!(tempRgn = CreateRectRgn( pt[0].x, pt[0].y, pt[1].x, pt[1].y ))) ret = ERROR;
@@ -410,7 +410,7 @@ BOOL WINAPI RectVisible( HDC hdc, const
HRGN clip;
DC *dc = DC_GetDCUpdate( hdc );
if (!dc) return FALSE;
- TRACE("%p %ld,%ldx%ld,%ld\n", hdc, rect->left, rect->top, rect->right, rect->bottom );
+ TRACE("%p %d,%dx%d,%d\n", hdc, rect->left, rect->top, rect->right, rect->bottom );
tmpRect = *rect;
LPtoDP( hdc, (POINT *)&tmpRect, 2 );
diff --git a/dlls/gdi/dc.c b/dlls/gdi/dc.c
index 2cb3537..3a39b8e 100644
--- a/dlls/gdi/dc.c
+++ b/dlls/gdi/dc.c
@@ -933,7 +933,7 @@ COLORREF WINAPI SetBkColor( HDC hdc, COL
COLORREF oldColor;
DC * dc = DC_GetDCPtr( hdc );
- TRACE("hdc=%p color=0x%08lx\n", hdc, color);
+ TRACE("hdc=%p color=0x%08x\n", hdc, color);
if (!dc) return CLR_INVALID;
oldColor = dc->backgroundColor;
@@ -976,7 +976,7 @@ COLORREF WINAPI SetTextColor( HDC hdc, C
COLORREF oldColor;
DC * dc = DC_GetDCPtr( hdc );
- TRACE(" hdc=%p color=0x%08lx\n", hdc, color);
+ TRACE(" hdc=%p color=0x%08x\n", hdc, color);
if (!dc) return CLR_INVALID;
oldColor = dc->textColor;
@@ -1168,7 +1168,7 @@ BOOL WINAPI GetWorldTransform( HDC hdc,
BOOL WINAPI GetTransform( HDC hdc, DWORD unknown, LPXFORM xform )
{
if (unknown == 0x0203) return GetWorldTransform( hdc, xform );
- FIXME("stub: don't know what to do for code %lx\n", unknown );
+ FIXME("stub: don't know what to do for code %x\n", unknown );
return FALSE;
}
@@ -1944,7 +1944,7 @@ DWORD WINAPI GetLayout(HDC hdc)
GDI_ReleaseObj( hdc );
}
- TRACE("hdc : %p, layout : %08lx\n", hdc, layout);
+ TRACE("hdc : %p, layout : %08x\n", hdc, layout);
return layout;
}
@@ -1967,7 +1967,7 @@ DWORD WINAPI SetLayout(HDC hdc, DWORD la
GDI_ReleaseObj( hdc );
}
- TRACE("hdc : %p, old layout : %08lx, new layout : %08lx\n", hdc, oldlayout, layout);
+ TRACE("hdc : %p, old layout : %08x, new layout : %08x\n", hdc, oldlayout, layout);
return oldlayout;
}
@@ -2009,7 +2009,7 @@ COLORREF WINAPI SetDCBrushColor(HDC hdc,
DC *dc;
COLORREF oldClr = CLR_INVALID;
- TRACE("hdc(%p) crColor(%08lx)\n", hdc, crColor);
+ TRACE("hdc(%p) crColor(%08x)\n", hdc, crColor);
dc = DC_GetDCPtr( hdc );
if (dc)
@@ -2073,7 +2073,7 @@ COLORREF WINAPI SetDCPenColor(HDC hdc, C
DC *dc;
COLORREF oldClr = CLR_INVALID;
- TRACE("hdc(%p) crColor(%08lx)\n", hdc, crColor);
+ TRACE("hdc(%p) crColor(%08x)\n", hdc, crColor);
dc = DC_GetDCPtr( hdc );
if (dc)
@@ -2108,7 +2108,7 @@ COLORREF WINAPI SetDCPenColor(HDC hdc, C
*/
DWORD WINAPI SetVirtualResolution(HDC hdc, DWORD dw2, DWORD dw3, DWORD dw4, DWORD dw5)
{
- FIXME("(%p %08lx %08lx %08lx %08lx): stub!\n", hdc, dw2, dw3, dw4, dw5);
+ FIXME("(%p %08x %08x %08x %08x): stub!\n", hdc, dw2, dw3, dw4, dw5);
return FALSE;
}
diff --git a/dlls/gdi/dib.c b/dlls/gdi/dib.c
index 724b755..07bd8ed 100644
--- a/dlls/gdi/dib.c
+++ b/dlls/gdi/dib.c
@@ -199,7 +199,7 @@ static int DIB_GetBitmapInfo( const BITM
*size = v5hdr->bV5SizeImage;
return 5;
}
- ERR("(%ld): unknown/wrong size for header\n", header->biSize );
+ ERR("(%d): unknown/wrong size for header\n", header->biSize );
return -1;
}
@@ -1013,9 +1013,9 @@ INT WINAPI GetDIBits(
if (!core_header)
{
- TRACE("biSizeImage = %ld, ", info->bmiHeader.biSizeImage);
+ TRACE("biSizeImage = %d, ", info->bmiHeader.biSizeImage);
}
- TRACE("biWidth = %ld, biHeight = %ld\n", width, height);
+ TRACE("biWidth = %d, biHeight = %d\n", width, height);
GDI_ReleaseObj( hdc );
GDI_ReleaseObj( hbitmap );
@@ -1052,7 +1052,7 @@ HBITMAP WINAPI CreateDIBitmap( HDC hdc,
/* Top-down DIBs have a negative height */
if (height < 0) height = -height;
- TRACE("hdc=%p, header=%p, init=%lu, bits=%p, data=%p, coloruse=%u (bitmap: width=%ld, height=%ld, bpp=%u, compr=%lu)\n",
+ TRACE("hdc=%p, header=%p, init=%u, bits=%p, data=%p, coloruse=%u (bitmap: width=%d, height=%d, bpp=%u, compr=%u)\n",
hdc, header, init, bits, data, coloruse, width, height, bpp, compr);
if (hdc == NULL)
@@ -1149,13 +1149,13 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc,
if (compression != BI_RGB && compression != BI_BITFIELDS)
{
- TRACE("can't create a compressed (%lu) dibsection\n", compression);
+ TRACE("can't create a compressed (%u) dibsection\n", compression);
return 0;
}
if (!(dib = HeapAlloc( GetProcessHeap(), 0, sizeof(*dib) ))) return 0;
- TRACE("format (%ld,%ld), planes %d, bpp %d, size %ld, %s\n",
+ TRACE("format (%d,%d), planes %d, bpp %d, size %d, %s\n",
width, height, planes, bpp, sizeImage, usage == DIB_PAL_COLORS? "PAL" : "RGB");
dib->dsBm.bmType = 0;
diff --git a/dlls/gdi/driver.c b/dlls/gdi/driver.c
index 16c48e5..db2086c 100644
--- a/dlls/gdi/driver.c
+++ b/dlls/gdi/driver.c
@@ -494,7 +494,7 @@ INT WINAPI GDI_CallExtDeviceMode16( HWND
INT ret = -1;
INT (*pExtDeviceMode)(LPSTR,HWND,LPDEVMODEA,LPSTR,LPSTR,LPDEVMODEA,LPSTR,DWORD);
- TRACE("(%p, %p, %s, %s, %p, %s, %ld)\n",
+ TRACE("(%p, %p, %s, %s, %p, %s, %d)\n",
hwnd, lpdmOutput, lpszDevice, lpszPort, lpdmInput, lpszProfile, fwMode );
if (!lpszDevice) return -1;
diff --git a/dlls/gdi/enhmetafile.c b/dlls/gdi/enhmetafile.c
index 5d5303b..7a761ef 100644
--- a/dlls/gdi/enhmetafile.c
+++ b/dlls/gdi/enhmetafile.c
@@ -193,7 +193,7 @@ static const char *get_emr_name(DWORD ty
unsigned int i;
for(i = 0; i < sizeof(emr_names) / sizeof(emr_names[0]); i++)
if(type == emr_names[i].type) return emr_names[i].name;
- TRACE("Unknown record type %ld\n", type);
+ TRACE("Unknown record type %d\n", type);
return NULL;
}
@@ -313,7 +313,7 @@ static HENHMETAFILE EMF_GetEnhMetaFile(
if (!emh) return 0;
if (emh->iType != EMR_HEADER || emh->dSignature != ENHMETA_SIGNATURE) {
- WARN("Invalid emf header type 0x%08lx sig 0x%08lx.\n",
+ WARN("Invalid emf header type 0x%08x sig 0x%08x.\n",
emh->iType, emh->dSignature);
goto err;
}
@@ -799,14 +799,14 @@ BOOL WINAPI PlayEnhMetaFileRecord(
case EMR_RESTOREDC:
{
const EMRRESTOREDC *pRestoreDC = (const EMRRESTOREDC *)mr;
- TRACE("EMR_RESTORE: %ld\n", pRestoreDC->iRelative);
+ TRACE("EMR_RESTORE: %d\n", pRestoreDC->iRelative);
RestoreDC(hdc, pRestoreDC->iRelative);
break;
}
case EMR_INTERSECTCLIPRECT:
{
const EMRINTERSECTCLIPRECT *pClipRect = (const EMRINTERSECTCLIPRECT *)mr;
- TRACE("EMR_INTERSECTCLIPRECT: rect %ld,%ld - %ld, %ld\n",
+ TRACE("EMR_INTERSECTCLIPRECT: rect %d,%d - %d, %d\n",
pClipRect->rclClip.left, pClipRect->rclClip.top,
pClipRect->rclClip.right, pClipRect->rclClip.bottom);
IntersectClipRect(hdc, pClipRect->rclClip.left, pClipRect->rclClip.top,
@@ -1099,7 +1099,7 @@ BOOL WINAPI PlayEnhMetaFileRecord(
rc.top = pExtTextOutA->emrtext.rcl.top;
rc.right = pExtTextOutA->emrtext.rcl.right;
rc.bottom = pExtTextOutA->emrtext.rcl.bottom;
- TRACE("EMR_EXTTEXTOUTA: x,y = %ld, %ld. rect = %ld, %ld - %ld, %ld. flags %08lx\n",
+ TRACE("EMR_EXTTEXTOUTA: x,y = %d, %d. rect = %d, %d - %d, %d. flags %08x\n",
pExtTextOutA->emrtext.ptlReference.x, pExtTextOutA->emrtext.ptlReference.y,
rc.left, rc.top, rc.right, rc.bottom, pExtTextOutA->emrtext.fOptions);
@@ -1127,7 +1127,7 @@ BOOL WINAPI PlayEnhMetaFileRecord(
rc.top = pExtTextOutW->emrtext.rcl.top;
rc.right = pExtTextOutW->emrtext.rcl.right;
rc.bottom = pExtTextOutW->emrtext.rcl.bottom;
- TRACE("EMR_EXTTEXTOUTW: x,y = %ld, %ld. rect = %ld, %ld - %ld, %ld. flags %08lx\n",
+ TRACE("EMR_EXTTEXTOUTW: x,y = %d, %d. rect = %d, %d - %d, %d. flags %08x\n",
pExtTextOutW->emrtext.ptlReference.x, pExtTextOutW->emrtext.ptlReference.y,
rc.left, rc.top, rc.right, rc.bottom, pExtTextOutW->emrtext.fOptions);
@@ -1348,7 +1348,7 @@ #endif
if (info->mode == MM_ISOTROPIC)
EMF_FixIsotropic(hdc, info);
- TRACE("EMRSCALEVIEWPORTEXTEX %ld/%ld %ld/%ld\n",
+ TRACE("EMRSCALEVIEWPORTEXTEX %d/%d %d/%d\n",
lpScaleViewportExtEx->xNum,lpScaleViewportExtEx->xDenom,
lpScaleViewportExtEx->yNum,lpScaleViewportExtEx->yDenom);
@@ -1373,7 +1373,7 @@ #endif
if (info->mode == MM_ISOTROPIC)
EMF_FixIsotropic(hdc, info);
- TRACE("EMRSCALEWINDOWEXTEX %ld/%ld %ld/%ld\n",
+ TRACE("EMRSCALEWINDOWEXTEX %d/%d %d/%d\n",
lpScaleWindowExtEx->xNum,lpScaleWindowExtEx->xDenom,
lpScaleWindowExtEx->yNum,lpScaleWindowExtEx->yDenom);
@@ -1399,7 +1399,7 @@ #endif
&lpModifyWorldTrans->xform);
break;
default:
- FIXME("Unknown imode %ld\n", lpModifyWorldTrans->iMode);
+ FIXME("Unknown imode %d\n", lpModifyWorldTrans->iMode);
break;
}
break;
@@ -1792,7 +1792,7 @@ #endif
{
const EMRSTRETCHBLT *pStretchBlt = (const EMRSTRETCHBLT *)mr;
- TRACE("EMR_STRETCHBLT: %ld, %ld %ldx%ld -> %ld, %ld %ldx%ld. rop %08lx offBitsSrc %ld\n",
+ TRACE("EMR_STRETCHBLT: %d, %d %dx%d -> %d, %d %dx%d. rop %08x offBitsSrc %d\n",
pStretchBlt->xSrc, pStretchBlt->ySrc, pStretchBlt->cxSrc, pStretchBlt->cySrc,
pStretchBlt->xDest, pStretchBlt->yDest, pStretchBlt->cxDest, pStretchBlt->cyDest,
pStretchBlt->dwRop, pStretchBlt->offBitsSrc);
@@ -1835,7 +1835,7 @@ #endif
{
const EMRALPHABLEND *pAlphaBlend = (const EMRALPHABLEND *)mr;
- TRACE("EMR_ALPHABLEND: %ld, %ld %ldx%ld -> %ld, %ld %ldx%ld. blendfn %08lx offBitsSrc %ld\n",
+ TRACE("EMR_ALPHABLEND: %d, %d %dx%d -> %d, %d %dx%d. blendfn %08x offBitsSrc %d\n",
pAlphaBlend->xSrc, pAlphaBlend->ySrc, pAlphaBlend->cxSrc, pAlphaBlend->cySrc,
pAlphaBlend->xDest, pAlphaBlend->yDest, pAlphaBlend->cxDest, pAlphaBlend->cyDest,
pAlphaBlend->dwRop, pAlphaBlend->offBitsSrc);
@@ -2152,7 +2152,7 @@ #endif
tmprc.left = tmprc.top = 0;
tmprc.right = tmprc.bottom = 1000;
LPtoDP(hdc, (POINT*)&tmprc, 2);
- TRACE("L:0,0 - 1000,1000 -> D:%ld,%ld - %ld,%ld\n", tmprc.left,
+ TRACE("L:0,0 - 1000,1000 -> D:%d,%d - %d,%d\n", tmprc.left,
tmprc.top, tmprc.right, tmprc.bottom);
if ( !IS_WIN9X() )
@@ -2316,7 +2316,7 @@ BOOL WINAPI EnumEnhMetaFile(
FLOAT xSrcPixSize, ySrcPixSize, xscale, yscale;
XFORM xform;
- TRACE("rect: %ld,%ld - %ld,%ld. rclFrame: %ld,%ld - %ld,%ld\n",
+ TRACE("rect: %d,%d - %d,%d. rclFrame: %d,%d - %d,%d\n",
lpRect->left, lpRect->top, lpRect->right, lpRect->bottom,
emh->rclFrame.left, emh->rclFrame.top, emh->rclFrame.right,
emh->rclFrame.bottom);
@@ -2353,7 +2353,7 @@ BOOL WINAPI EnumEnhMetaFile(
while(ret && offset < emh->nBytes)
{
emr = (ENHMETARECORD *)((char *)emh + offset);
- TRACE("Calling EnumFunc with record %s, size %ld\n", get_emr_name(emr->iType), emr->nSize);
+ TRACE("Calling EnumFunc with record %s, size %d\n", get_emr_name(emr->iType), emr->nSize);
ret = (*callback)(hdc, ht, emr, emh->nHandles, (LPARAM)data);
offset += emr->nSize;
}
@@ -2538,7 +2538,7 @@ static INT CALLBACK cbEnhPaletteCopy( HD
EMF_PaletteCopy* info = (EMF_PaletteCopy*)lpData;
DWORD dwNumPalToCopy = min( lpEof->nPalEntries, info->cEntries );
- TRACE( "copying 0x%08lx palettes\n", dwNumPalToCopy );
+ TRACE( "copying 0x%08x palettes\n", dwNumPalToCopy );
memcpy( (LPVOID)info->lpPe,
(LPCVOID)(((LPCSTR)lpEof) + lpEof->offPalEntries),
@@ -2643,7 +2643,7 @@ HENHMETAFILE WINAPI SetWinMetaFileBits(U
if (lpmfp)
{
- TRACE("mm = %ld %ldx%ld\n", lpmfp->mm, lpmfp->xExt, lpmfp->yExt);
+ TRACE("mm = %d %dx%d\n", lpmfp->mm, lpmfp->xExt, lpmfp->yExt);
mm = lpmfp->mm;
xExt = lpmfp->xExt;
diff --git a/dlls/gdi/enhmfdrv/graphics.c b/dlls/gdi/enhmfdrv/graphics.c
index 025e358..13b4a06 100644
--- a/dlls/gdi/enhmfdrv/graphics.c
+++ b/dlls/gdi/enhmfdrv/graphics.c
@@ -722,7 +722,7 @@ BOOL EMFDRV_ExtTextOut( PHYSDEV dev, INT
nSize = sizeof(*pemr) + ((count+1) & ~1) * sizeof(WCHAR) + count * sizeof(INT);
- TRACE("%s %s count %d nSize = %ld\n", debugstr_wn(str, count),
+ TRACE("%s %s count %d nSize = %d\n", debugstr_wn(str, count),
wine_dbgstr_rect(lprect), count, nSize);
pemr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nSize);
diff --git a/dlls/gdi/enhmfdrv/init.c b/dlls/gdi/enhmfdrv/init.c
index c3677b0..119bf76 100644
--- a/dlls/gdi/enhmfdrv/init.c
+++ b/dlls/gdi/enhmfdrv/init.c
@@ -188,7 +188,7 @@ BOOL EMFDRV_WriteRecord( PHYSDEV dev, EM
ENHMETAHEADER *emh;
EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE *)dev;
- TRACE("record %ld, size %ld %s\n",
+ TRACE("record %d, size %d %s\n",
emr->iType, emr->nSize, physDev->hFile ? "(to disk)" : "");
assert( !(emr->nSize & 3) );
diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c
index f895549..24f16dd 100644
--- a/dlls/gdi/font.c
+++ b/dlls/gdi/font.c
@@ -401,7 +401,7 @@ HFONT WINAPI CreateFontIndirectW( const
memcpy( &fontPtr->logfont, plf, sizeof(LOGFONTW) );
- TRACE("(%ld %ld %ld %ld %x %d %x %d %d) %s %s %s %s => %p\n",
+ TRACE("(%d %d %d %d %x %d %x %d %d) %s %s %s %s => %p\n",
plf->lfHeight, plf->lfWidth,
plf->lfEscapement, plf->lfOrientation,
plf->lfPitchAndFamily,
@@ -1030,7 +1030,7 @@ BOOL WINAPI GetTextExtentPoint32A( HDC h
HeapFree( GetProcessHeap(), 0, p );
}
- TRACE("(%p %s %d %p): returning %ld x %ld\n",
+ TRACE("(%p %s %d %p): returning %d x %d\n",
hdc, debugstr_an (str, count), count, size, size->cx, size->cy );
return ret;
}
@@ -1089,7 +1089,7 @@ BOOL WINAPI GetTextExtentPointI(
GDI_ReleaseObj( hdc );
- TRACE("(%p %p %d %p): returning %ld x %ld\n",
+ TRACE("(%p %p %d %p): returning %d x %d\n",
hdc, indices, count, size, size->cx, size->cy );
return ret;
}
@@ -1248,7 +1248,7 @@ BOOL WINAPI GetTextExtentExPointW( HDC h
GDI_ReleaseObj( hdc );
- TRACE("returning %d %ld x %ld\n",nFit,size->cx,size->cy);
+ TRACE("returning %d %d x %d\n",nFit,size->cx,size->cy);
return ret;
}
@@ -1302,16 +1302,16 @@ #define HDPTOLP(y) ((y<0)? \
#undef WDPTOLP
#undef HDPTOLP
TRACE("text metrics:\n"
- " Weight = %03li\t FirstChar = %i\t AveCharWidth = %li\n"
- " Italic = % 3i\t LastChar = %i\t\t MaxCharWidth = %li\n"
- " UnderLined = %01i\t DefaultChar = %i\t Overhang = %li\n"
+ " Weight = %03i\t FirstChar = %i\t AveCharWidth = %i\n"
+ " Italic = % 3i\t LastChar = %i\t\t MaxCharWidth = %i\n"
+ " UnderLined = %01i\t DefaultChar = %i\t Overhang = %i\n"
" StruckOut = %01i\t BreakChar = %i\t CharSet = %i\n"
" PitchAndFamily = %02x\n"
" --------------------\n"
- " InternalLeading = %li\n"
- " Ascent = %li\n"
- " Descent = %li\n"
- " Height = %li\n",
+ " InternalLeading = %i\n"
+ " Ascent = %i\n"
+ " Descent = %i\n"
+ " Height = %i\n",
metrics->tmWeight, metrics->tmFirstChar, metrics->tmAveCharWidth,
metrics->tmItalic, metrics->tmLastChar, metrics->tmMaxCharWidth,
metrics->tmUnderlined, metrics->tmDefaultChar, metrics->tmOverhang,
@@ -1799,7 +1799,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x,
glyphs = reordered_str;
if(lprect)
- TRACE("rect: %ld,%ld - %ld,%ld\n", lprect->left, lprect->top, lprect->right,
+ TRACE("rect: %d,%d - %d,%d\n", lprect->left, lprect->top, lprect->right,
lprect->bottom);
TRACE("align = %x bkmode = %x mapmode = %x\n", align, GetBkMode(hdc), GetMapMode(hdc));
@@ -2253,7 +2253,7 @@ DWORD WINAPI SetMapperFlags( HDC hDC, DW
/* FIXME: ret is just a success flag, we should return a proper value */
}
else
- FIXME("(%p, 0x%08lx): stub - harmless\n", hDC, dwFlag);
+ FIXME("(%p, 0x%08x): stub - harmless\n", hDC, dwFlag);
GDI_ReleaseObj( hDC );
return ret;
}
@@ -2454,7 +2454,7 @@ DWORD WINAPI GetGlyphOutlineW( HDC hdc,
DC *dc = DC_GetDCPtr(hdc);
DWORD ret;
- TRACE("(%p, %04x, %04x, %p, %ld, %p, %p)\n",
+ TRACE("(%p, %04x, %04x, %p, %d, %p, %p)\n",
hdc, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, lpmat2 );
if(!dc) return GDI_ERROR;
@@ -2484,7 +2484,7 @@ BOOL WINAPI CreateScalableFontResourceA(
* enumbered with EnumFonts/EnumFontFamilies
* lpszCurrentPath can be NULL
*/
- FIXME("(%ld,%s,%s,%s): stub\n",
+ FIXME("(%d,%s,%s,%s): stub\n",
fHidden, debugstr_a(lpszResourceFile), debugstr_a(lpszFontFile),
debugstr_a(lpszCurrentPath) );
@@ -2505,7 +2505,7 @@ BOOL WINAPI CreateScalableFontResourceW(
LPCWSTR lpszFontFile,
LPCWSTR lpszCurrentPath )
{
- FIXME("(%ld,%p,%p,%p): stub\n",
+ FIXME("(%d,%p,%p,%p): stub\n",
fHidden, lpszResourceFile, lpszFontFile, lpszCurrentPath );
return FALSE; /* create failed */
}
@@ -2586,7 +2586,7 @@ DWORD WINAPI GetKerningPairsW( HDC hDC,
DC *dc;
DWORD ret = 0;
- TRACE("(%p,%ld,%p)\n", hDC, cPairs, lpKerningPairs);
+ TRACE("(%p,%d,%p)\n", hDC, cPairs, lpKerningPairs);
if (!cPairs && lpKerningPairs)
{
@@ -2737,7 +2737,7 @@ DWORD WINAPI GetGlyphIndicesA(HDC hdc, L
WCHAR *lpstrW;
INT countW;
- TRACE("(%p, %s, %d, %p, 0x%lx)\n",
+ TRACE("(%p, %s, %d, %p, 0x%x)\n",
hdc, debugstr_an(lpstr, count), count, pgi, flags);
lpstrW = FONT_mbtowc(lpstr, count, &countW);
@@ -2756,7 +2756,7 @@ DWORD WINAPI GetGlyphIndicesW(HDC hdc, L
DC *dc = DC_GetDCPtr(hdc);
DWORD ret = GDI_ERROR;
- TRACE("(%p, %s, %d, %p, 0x%lx)\n",
+ TRACE("(%p, %s, %d, %p, 0x%x)\n",
hdc, debugstr_wn(lpstr, count), count, pgi, flags);
if(!dc) return GDI_ERROR;
@@ -2786,7 +2786,7 @@ GetCharacterPlacementA(HDC hdc, LPCSTR l
GCP_RESULTSW resultsW;
DWORD ret;
- TRACE("%s, %d, %d, 0x%08lx\n",
+ TRACE("%s, %d, %d, 0x%08x\n",
debugstr_an(lpString, uCount), uCount, nMaxExtent, dwFlags);
/* both structs are equal in size */
@@ -2844,16 +2844,16 @@ GetCharacterPlacementW(
SIZE size;
UINT i, nSet;
- TRACE("%s, %d, %d, 0x%08lx\n",
+ TRACE("%s, %d, %d, 0x%08x\n",
debugstr_wn(lpString, uCount), uCount, nMaxExtent, dwFlags);
- TRACE("lStructSize=%ld, lpOutString=%p, lpOrder=%p, lpDx=%p, lpCaretPos=%p\n"
- "lpClass=%p, lpGlyphs=%p, nGlyphs=%u, nMaxFit=%d\n",
+ TRACE("lStructSize=%d, lpOutString=%p, lpOrder=%p, lpDx=%p, lpCaretPos=%p\n"
+ "lpClass=%p, lpGlyphs=%p, nGlyphs=%u, nMaxFit=%d\n",
lpResults->lStructSize, lpResults->lpOutString, lpResults->lpOrder,
lpResults->lpDx, lpResults->lpCaretPos, lpResults->lpClass,
lpResults->lpGlyphs, lpResults->nGlyphs, lpResults->nMaxFit);
- if(dwFlags&(~GCP_REORDER)) FIXME("flags 0x%08lx ignored\n", dwFlags);
+ if(dwFlags&(~GCP_REORDER)) FIXME("flags 0x%08x ignored\n", dwFlags);
if(lpResults->lpClass) FIXME("classes not implemented\n");
if (lpResults->lpCaretPos && (dwFlags & GCP_REORDER))
FIXME("Caret positions for complex scripts not implemented\n");
@@ -3083,7 +3083,7 @@ BOOL WINAPI RemoveFontResourceW( LPCWSTR
*/
HANDLE WINAPI AddFontMemResourceEx( PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD *pcFonts)
{
- FIXME("(%p,%08lx,%p,%p): stub\n", pbFont, cbFont, pdv, pcFonts);
+ FIXME("(%p,%08x,%p,%p): stub\n", pbFont, cbFont, pdv, pcFonts);
return NULL;
}
diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c
index bf946fb..cbbe5fe 100644
--- a/dlls/gdi/freetype.c
+++ b/dlls/gdi/freetype.c
@@ -886,7 +886,7 @@ #endif
face->scalable = FALSE;
}
- TRACE("fsCsb = %08lx %08lx/%08lx %08lx %08lx %08lx\n",
+ TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n",
face->fs.fsCsb[0], face->fs.fsCsb[1],
face->fs.fsUsb[0], face->fs.fsUsb[1],
face->fs.fsUsb[2], face->fs.fsUsb[3]);
@@ -931,7 +931,7 @@ static void DumpFontList(void)
TRACE("Family: %s\n", debugstr_w(family->FamilyName));
LIST_FOR_EACH(face_elem_ptr, &family->faces) {
face = LIST_ENTRY(face_elem_ptr, Face, entry);
- TRACE("\t%s\t%08lx", debugstr_w(face->StyleName), face->fs.fsCsb[0]);
+ TRACE("\t%s\t%08x", debugstr_w(face->StyleName), face->fs.fsCsb[0]);
if(!face->scalable)
TRACE(" %d", face->size.height);
TRACE("\n");
@@ -1414,7 +1414,7 @@ INT WineEngAddFontResourceEx(LPCWSTR fil
char *unixname;
if(flags)
- FIXME("Ignoring flags %lx\n", flags);
+ FIXME("Ignoring flags %x\n", flags);
if((unixname = wine_get_unix_file_name(file)))
{
@@ -1558,11 +1558,11 @@ static void update_font_info(void)
RegCloseKey(hkey);
return;
}
- TRACE("updating registry, locale changed %s -> %08lx\n", debugstr_a(buf), lcid);
+ TRACE("updating registry, locale changed %s -> %08x\n", debugstr_a(buf), lcid);
}
- else TRACE("updating registry, locale changed none -> %08lx\n", lcid);
+ else TRACE("updating registry, locale changed none -> %08x\n", lcid);
- sprintf(buf, "%08lx", lcid);
+ sprintf(buf, "%08x", lcid);
RegSetValueExA(hkey, "Locale", 0, REG_SZ, (const BYTE *)buf, strlen(buf)+1);
RegCloseKey(hkey);
@@ -1595,7 +1595,7 @@ static void update_font_info(void)
return;
}
}
- FIXME("there is no font defaults for lcid %04lx/ansi_cp %u\n", lcid, ansi_cp);
+ FIXME("there is no font defaults for lcid %04x/ansi_cp %u\n", lcid, ansi_cp);
}
/*************************************************************
@@ -1874,7 +1874,7 @@ static FT_Face OpenFontFile(GdiFont *fon
FT_Error err;
FT_Face ft_face;
- TRACE("%s, %ld, %ld x %ld\n", debugstr_a(file), face_index, width, height);
+ TRACE("%s, %ld, %d x %d\n", debugstr_a(file), face_index, width, height);
err = pFT_New_Face(library, file, face_index, &ft_face);
if(err) {
ERR("FT_New_Face rets %d\n", err);
@@ -1891,11 +1891,11 @@ static FT_Face OpenFontFile(GdiFont *fon
font->ppem = calc_ppem_for_height(ft_face, height);
if((err = pFT_Set_Pixel_Sizes(ft_face, 0, font->ppem)) != 0)
- WARN("FT_Set_Pixel_Sizes %d, %ld rets %x\n", 0, font->ppem, err);
+ WARN("FT_Set_Pixel_Sizes %d, %d rets %x\n", 0, font->ppem, err);
} else {
font->ppem = height;
if((err = pFT_Set_Pixel_Sizes(ft_face, width, height)) != 0)
- WARN("FT_Set_Pixel_Sizes %ld, %ld rets %x\n", width, height, err);
+ WARN("FT_Set_Pixel_Sizes %d, %d rets %x\n", width, height, err);
}
return ft_face;
}
@@ -1925,11 +1925,11 @@ static int get_nearest_charset(Face *fac
return csi.ciCharset;
}
else
- FIXME("TCI failing on %lx\n", fs0);
+ FIXME("TCI failing on %x\n", fs0);
}
}
- FIXME("returning DEFAULT_CHARSET face->fs.fsCsb[0] = %08lx file = %s\n",
+ FIXME("returning DEFAULT_CHARSET face->fs.fsCsb[0] = %08x file = %s\n",
face->fs.fsCsb[0], face->file);
*cp = acp;
return DEFAULT_CHARSET;
@@ -2090,7 +2090,7 @@ static LONG load_VDMX(GdiFont *font, LON
if(yMax + -yMin == height) {
font->yMax = yMax;
font->yMin = yMin;
- TRACE("ppem %ld found; height=%ld yMax=%d yMin=%d\n", ppem, height, font->yMax, font->yMin);
+ TRACE("ppem %d found; height=%d yMax=%d yMin=%d\n", ppem, height, font->yMax, font->yMin);
break;
}
if(yMax + -yMin > height) {
@@ -2101,13 +2101,13 @@ static LONG load_VDMX(GdiFont *font, LON
font->yMax = GET_BE_WORD(vTable[(i * 3) + 1]);
font->yMin = GET_BE_WORD(vTable[(i * 3) + 2]);
ppem = GET_BE_WORD(vTable[i * 3]);
- TRACE("ppem %ld found; height=%ld yMax=%d yMin=%d\n", ppem, height, font->yMax, font->yMin);
+ TRACE("ppem %d found; height=%d yMax=%d yMin=%d\n", ppem, height, font->yMax, font->yMin);
break;
}
}
if(!font->yMax) {
ppem = 0;
- TRACE("ppem not found for height %ld\n", height);
+ TRACE("ppem not found for height %d\n", height);
}
} else {
ppem = -height;
@@ -2124,7 +2124,7 @@ static LONG load_VDMX(GdiFont *font, LON
if(yPelHeight == ppem) {
font->yMax = GET_BE_WORD(vTable[(i * 3) + 1]);
font->yMin = GET_BE_WORD(vTable[(i * 3) + 2]);
- TRACE("ppem %ld found; yMax=%d yMin=%d\n", ppem, font->yMax, font->yMin);
+ TRACE("ppem %d found; yMax=%d yMin=%d\n", ppem, font->yMax, font->yMin);
break;
}
}
@@ -2280,7 +2280,7 @@ GdiFont *WineEngCreateFontInstance(DC *d
if (!GetObjectW( hfont, sizeof(lf), &lf )) return NULL;
can_use_bitmap = GetDeviceCaps(dc->hSelf, TEXTCAPS) & TC_RA_ABLE;
- TRACE("%s, h=%ld, it=%d, weight=%ld, PandF=%02x, charset=%d orient %ld escapement %ld\n",
+ TRACE("%s, h=%d, it=%d, weight=%d, PandF=%02x, charset=%d orient %d escapement %d\n",
debugstr_w(lf.lfFaceName), lf.lfHeight, lf.lfItalic,
lf.lfWeight, lf.lfPitchAndFamily, lf.lfCharSet, lf.lfOrientation,
lf.lfEscapement);
@@ -2541,14 +2541,14 @@ static void dump_gdi_font_list(void)
TRACE("---------- gdiFont Cache ----------\n");
LIST_FOR_EACH(elem_ptr, &gdi_font_list) {
gdiFont = LIST_ENTRY(elem_ptr, struct tagGdiFont, entry);
- TRACE("gdiFont=%p %s %ld\n",
+ TRACE("gdiFont=%p %s %d\n",
gdiFont, debugstr_w(gdiFont->font_desc.lf.lfFaceName), gdiFont->font_desc.lf.lfHeight);
}
TRACE("---------- Unused gdiFont Cache ----------\n");
LIST_FOR_EACH(elem_ptr, &unused_gdi_font_list) {
gdiFont = LIST_ENTRY(elem_ptr, struct tagGdiFont, entry);
- TRACE("gdiFont=%p %s %ld\n",
+ TRACE("gdiFont=%p %s %d\n",
gdiFont, debugstr_w(gdiFont->font_desc.lf.lfFaceName), gdiFont->font_desc.lf.lfHeight);
}
}
@@ -2780,7 +2780,7 @@ DWORD WineEngEnumFonts(LPLOGFONTW plf, F
FIXME("Unknown elfscript for bit %d\n", i);
}
}
- TRACE("enuming face %s full %s style %s charset %d type %ld script %s it %d weight %ld ntmflags %08lx\n",
+ TRACE("enuming face %s full %s style %s charset %d type %d script %s it %d weight %d ntmflags %08x\n",
debugstr_w(elf.elfLogFont.lfFaceName),
debugstr_w(elf.elfFullName), debugstr_w(elf.elfStyle),
csi.ciCharset, type, debugstr_w(elf.elfScript),
@@ -2821,7 +2821,7 @@ DWORD WineEngEnumFonts(LPLOGFONTW plf, F
FIXME("Unknown elfscript for bit %d\n", i);
}
}
- TRACE("enuming face %s full %s style %s charset = %d type %ld script %s it %d weight %ld ntmflags %08lx\n",
+ TRACE("enuming face %s full %s style %s charset = %d type %d script %s it %d weight %d ntmflags %08x\n",
debugstr_w(elf.elfLogFont.lfFaceName),
debugstr_w(elf.elfFullName), debugstr_w(elf.elfStyle),
csi.ciCharset, type, debugstr_w(elf.elfScript),
@@ -2947,7 +2947,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *fo
BOOL needsTransform = FALSE;
- TRACE("%p, %04x, %08x, %p, %08lx, %p, %p\n", font, glyph, format, lpgm,
+ TRACE("%p, %04x, %08x, %p, %08x, %p, %p\n", font, glyph, format, lpgm,
buflen, buf, lpmat);
if(format & GGO_GLYPH_INDEX) {
@@ -3900,7 +3900,7 @@ BOOL WineEngGetTextExtentExPoint(GdiFont
if (pnfit)
*pnfit = nfit;
- TRACE("return %ld, %ld, %d\n", size->cx, size->cy, nfit);
+ TRACE("return %d, %d, %d\n", size->cx, size->cy, nfit);
return TRUE;
}
@@ -3927,7 +3927,7 @@ BOOL WineEngGetTextExtentPointI(GdiFont
NULL);
size->cx += font->gm[indices[idx]].adv;
}
- TRACE("return %ld,%ld\n", size->cx, size->cy);
+ TRACE("return %d,%d\n", size->cx, size->cy);
return TRUE;
}
@@ -3942,7 +3942,7 @@ DWORD WineEngGetFontData(GdiFont *font,
FT_ULong len;
FT_Error err;
- TRACE("font=%p, table=%08lx, offset=%08lx, buf=%p, cbData=%lx\n",
+ TRACE("font=%p, table=%08x, offset=%08x, buf=%p, cbData=%x\n",
font, table, offset, buf, cbData);
if(!FT_IS_SFNT(ft_face))
@@ -4003,7 +4003,7 @@ #else
}
#endif
if(err) {
- TRACE("Can't find table %08lx.\n", table);
+ TRACE("Can't find table %08x.\n", table);
return GDI_ERROR;
}
return len;
@@ -4157,7 +4157,7 @@ static DWORD parse_format0_kern_subtable
USHORT i, nPairs;
const struct TT_kern_pair *tt_kern_pair;
- TRACE("font height %ld, units_per_EM %d\n", font->ppem, font->ft_face->units_per_EM);
+ TRACE("font height %d, units_per_EM %d\n", font->ppem, font->ft_face->units_per_EM);
nPairs = GET_BE_WORD(tt_f0_ks->nPairs);
diff --git a/dlls/gdi/gdi16.c b/dlls/gdi/gdi16.c
index 1784120..0940f8b 100644
--- a/dlls/gdi/gdi16.c
+++ b/dlls/gdi/gdi16.c
@@ -1608,7 +1608,7 @@ UINT16 WINAPI GetBoundsRect16( HDC16 hdc
*/
WORD WINAPI EngineEnumerateFont16(LPSTR fontname, FARPROC16 proc, DWORD data )
{
- FIXME("(%s,%p,%lx),stub\n",fontname,proc,data);
+ FIXME("(%s,%p,%x),stub\n",fontname,proc,data);
return 0;
}
@@ -1655,7 +1655,7 @@ WORD WINAPI EngineRealizeFont16(LPLOGFON
*/
WORD WINAPI EngineRealizeFontExt16(LONG l1, LONG l2, LONG l3, LONG l4)
{
- FIXME("(%08lx,%08lx,%08lx,%08lx),stub\n",l1,l2,l3,l4);
+ FIXME("(%08x,%08x,%08x,%08x),stub\n",l1,l2,l3,l4);
return 0;
}
diff --git a/dlls/gdi/gdiobj.c b/dlls/gdi/gdiobj.c
index 3d5450d..6c57e9c 100644
--- a/dlls/gdi/gdiobj.c
+++ b/dlls/gdi/gdiobj.c
@@ -684,7 +684,7 @@ void *GDI_AllocObject( WORD size, WORD m
obj->funcs = funcs;
obj->hdcs = NULL;
- TRACE("(%p): enter %ld\n", *handle, GDI_level.crst.RecursionCount);
+ TRACE("(%p): enter %d\n", *handle, GDI_level.crst.RecursionCount);
return obj;
error:
@@ -714,7 +714,7 @@ void *GDI_ReallocObject( WORD size, HGDI
else ERR( "Invalid handle %p\n", handle );
if (!new_ptr)
{
- TRACE("(%p): leave %ld\n", handle, GDI_level.crst.RecursionCount);
+ TRACE("(%p): leave %d\n", handle, GDI_level.crst.RecursionCount);
_LeaveSysLevel( &GDI_level );
}
return new_ptr;
@@ -738,7 +738,7 @@ BOOL GDI_FreeObject( HGDIOBJ handle, voi
large_handles[i] = NULL;
}
else ERR( "Invalid handle %p\n", handle );
- TRACE("(%p): leave %ld\n", handle, GDI_level.crst.RecursionCount);
+ TRACE("(%p): leave %d\n", handle, GDI_level.crst.RecursionCount);
_LeaveSysLevel( &GDI_level );
return TRUE;
}
@@ -770,7 +770,7 @@ void *GDI_GetObjPtr( HGDIOBJ handle, WOR
_LeaveSysLevel( &GDI_level );
WARN( "Invalid handle %p\n", handle );
}
- else TRACE("(%p): enter %ld\n", handle, GDI_level.crst.RecursionCount);
+ else TRACE("(%p): enter %d\n", handle, GDI_level.crst.RecursionCount);
return ptr;
}
@@ -782,7 +782,7 @@ void *GDI_GetObjPtr( HGDIOBJ handle, WOR
*/
void GDI_ReleaseObj( HGDIOBJ handle )
{
- TRACE("(%p): leave %ld\n", handle, GDI_level.crst.RecursionCount);
+ TRACE("(%p): leave %d\n", handle, GDI_level.crst.RecursionCount);
_LeaveSysLevel( &GDI_level );
}
@@ -846,7 +846,7 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj )
if (header->dwCount)
{
- TRACE("delayed for %p because object in use, count %ld\n", obj, header->dwCount );
+ TRACE("delayed for %p because object in use, count %d\n", obj, header->dwCount );
header->dwCount |= 0x80000000; /* mark for delete */
GDI_ReleaseObj( obj );
return TRUE;
@@ -1237,7 +1237,7 @@ INT WINAPI EnumObjects( HDC hdc, INT nOb
pen.lopnWidth.y = 0;
pen.lopnColor = solid_colors[i];
retval = lpEnumFunc( &pen, lParam );
- TRACE("solid pen %08lx, ret=%d\n",
+ TRACE("solid pen %08x, ret=%d\n",
solid_colors[i], retval);
if (!retval) break;
}
@@ -1251,7 +1251,7 @@ INT WINAPI EnumObjects( HDC hdc, INT nOb
brush.lbColor = solid_colors[i];
brush.lbHatch = 0;
retval = lpEnumFunc( &brush, lParam );
- TRACE("solid brush %08lx, ret=%d\n",
+ TRACE("solid brush %08x, ret=%d\n",
solid_colors[i], retval);
if (!retval) break;
}
diff --git a/dlls/gdi/metafile.c b/dlls/gdi/metafile.c
index c2e7c9a..68a9b16 100644
--- a/dlls/gdi/metafile.c
+++ b/dlls/gdi/metafile.c
@@ -417,10 +417,10 @@ BOOL MF_PlayMetaFile( HDC hdc, METAHEADE
while (offset < mh->mtSize * 2)
{
mr = (METARECORD *)((char *)mh + offset);
- TRACE("offset=%04x,size=%08lx\n",
+ TRACE("offset=%04x,size=%08x\n",
offset, mr->rdSize);
if (mr->rdSize < 3) { /* catch illegal record sizes */
- TRACE("Entry got size %ld at offset %d, total mf length is %ld\n",
+ TRACE("Entry got size %d at offset %d, total mf length is %d\n",
mr->rdSize,offset,mh->mtSize*2);
break;
}
@@ -1270,8 +1270,8 @@ static BOOL MF_Play_MetaExtTextOut(HDC h
if (dx) for (i = 0; i < s1; i++) dx[i] = (SHORT)dxx[i];
}
else {
- TRACE("%s len: %ld\n", sot, mr->rdSize);
- WARN("Please report: ExtTextOut len=%ld slen=%d rdSize=%ld opt=%04x\n",
+ TRACE("%s len: %d\n", sot, mr->rdSize);
+ WARN("Please report: ExtTextOut len=%d slen=%d rdSize=%d opt=%04x\n",
len, s1, mr->rdSize, mr->rdParm[3]);
dxx = NULL; /* should't happen -- but if, we continue with NULL */
}
@@ -1284,7 +1284,7 @@ static BOOL MF_Play_MetaExtTextOut(HDC h
s1, dx); /* length, dx array */
if (dx)
{
- TRACE("%s len: %ld dx0: %d\n", sot, mr->rdSize, dx[0]);
+ TRACE("%s len: %d dx0: %d\n", sot, mr->rdSize, dx[0]);
HeapFree( GetProcessHeap(), 0, dx );
}
return TRUE;
diff --git a/dlls/gdi/mfdrv/bitblt.c b/dlls/gdi/mfdrv/bitblt.c
index 61cc481..1d7d0af 100644
--- a/dlls/gdi/mfdrv/bitblt.c
+++ b/dlls/gdi/mfdrv/bitblt.c
@@ -98,7 +98,7 @@ #ifdef STRETCH_VIA_DIB
lpBMI->biYPelsPerMeter = MulDiv(GetDeviceCaps(physDevSrc->hdc,LOGPIXELSY),3937,100);
lpBMI->biClrImportant = 0; /* 1 meter = 39.37 inch */
- TRACE("MF_StretchBltViaDIB->len = %ld rop=%lx PixYPM=%ld Caps=%d\n",
+ TRACE("MF_StretchBltViaDIB->len = %d rop=%x PixYPM=%d Caps=%d\n",
len,rop,lpBMI->biYPelsPerMeter,GetDeviceCaps(physDevSrc->hdc, LOGPIXELSY));
if (GetDIBits(physDevSrc->hdc, hBitmap, 0, (UINT)lpBMI->biHeight,
diff --git a/dlls/gdi/mfdrv/init.c b/dlls/gdi/mfdrv/init.c
index c85501a..82fe4ce 100644
--- a/dlls/gdi/mfdrv/init.c
+++ b/dlls/gdi/mfdrv/init.c
@@ -441,7 +441,7 @@ BOOL MFDRV_WriteRecord( PHYSDEV dev, MET
mh = HeapReAlloc( GetProcessHeap(), 0, physDev->mh, size);
if (!mh) return FALSE;
physDev->mh = mh;
- TRACE("Reallocated metafile: new size is %ld\n",size);
+ TRACE("Reallocated metafile: new size is %d\n",size);
}
memcpy((WORD *)physDev->mh + physDev->mh->mtSize, mr, rlen);
break;
diff --git a/dlls/gdi/opengl.c b/dlls/gdi/opengl.c
index 520d28b..75a8e6d 100644
--- a/dlls/gdi/opengl.c
+++ b/dlls/gdi/opengl.c
@@ -110,7 +110,7 @@ BOOL WINAPI wglUseFontBitmapsA(HDC hdc,
BOOL ret = FALSE;
DC * dc = DC_GetDCPtr( hdc );
- TRACE("(%p, %ld, %ld, %ld)\n", hdc, first, count, listBase);
+ TRACE("(%p, %d, %d, %d)\n", hdc, first, count, listBase);
if (!dc) return FALSE;
@@ -129,7 +129,7 @@ BOOL WINAPI wglUseFontBitmapsW(HDC hdc,
BOOL ret = FALSE;
DC * dc = DC_GetDCPtr( hdc );
- TRACE("(%p, %ld, %ld, %ld)\n", hdc, first, count, listBase);
+ TRACE("(%p, %d, %d, %d)\n", hdc, first, count, listBase);
if (!dc) return FALSE;
diff --git a/dlls/gdi/painting.c b/dlls/gdi/painting.c
index 9d54e6b..e10ea6e 100644
--- a/dlls/gdi/painting.c
+++ b/dlls/gdi/painting.c
@@ -1151,7 +1151,7 @@ BOOL WINAPI GdiGradientFill( HDC hdc, TR
{
unsigned int i;
- TRACE("vert_array:0x%08lx nvert:%ld grad_array:0x%08lx ngrad:%ld\n",
+ TRACE("vert_array:0x%08lx nvert:%d grad_array:0x%08lx ngrad:%d\n",
(long)vert_array, nvert, (long)grad_array, ngrad);
switch(mode)
diff --git a/dlls/gdi/palette.c b/dlls/gdi/palette.c
index a0fc7d0..52893a0 100644
--- a/dlls/gdi/palette.c
+++ b/dlls/gdi/palette.c
@@ -604,7 +604,7 @@ UINT WINAPI GetNearestPaletteIndex(
}
GDI_ReleaseObj( hpalette );
}
- TRACE("(%p,%06lx): returning %d\n", hpalette, color, index );
+ TRACE("(%p,%06x): returning %d\n", hpalette, color, index );
return index;
}
@@ -657,7 +657,7 @@ COLORREF WINAPI GetNearestColor(
if (!GetPaletteEntries( hpal, index, 1, &entry ))
{
- WARN("RGB(%lx) : idx %d is out of bounds, assuming NULL\n", color, index );
+ WARN("RGB(%x) : idx %d is out of bounds, assuming NULL\n", color, index );
if (!GetPaletteEntries( hpal, 0, 1, &entry ))
{
GDI_ReleaseObj( hdc );
@@ -669,7 +669,7 @@ COLORREF WINAPI GetNearestColor(
nearest = color & 0x00ffffff;
GDI_ReleaseObj( hdc );
- TRACE("(%06lx): returning %06lx\n", color, nearest );
+ TRACE("(%06x): returning %06x\n", color, nearest );
return nearest;
}
@@ -913,7 +913,7 @@ VOID WINAPI SetMagicColors16(HDC16 hDC,
*/
BOOL WINAPI SetMagicColors(HDC hdc, ULONG u1, ULONG u2)
{
- FIXME("(%p 0x%08lx 0x%08lx): stub\n", hdc, u1, u2);
+ FIXME("(%p 0x%08x 0x%08x): stub\n", hdc, u1, u2);
return TRUE;
}
@@ -1003,7 +1003,7 @@ BOOL WINAPI GetICMProfileW(HDC hDC, LPDW
*/
BOOL WINAPI GetLogColorSpaceA(HCOLORSPACE hColorSpace, LPLOGCOLORSPACEA lpBuffer, DWORD nSize)
{
- FIXME("%p %p 0x%08lx: stub!\n", hColorSpace, lpBuffer, nSize);
+ FIXME("%p %p 0x%08x: stub!\n", hColorSpace, lpBuffer, nSize);
return FALSE;
}
@@ -1013,7 +1013,7 @@ BOOL WINAPI GetLogColorSpaceA(HCOLORSPAC
*/
BOOL WINAPI GetLogColorSpaceW(HCOLORSPACE hColorSpace, LPLOGCOLORSPACEW lpBuffer, DWORD nSize)
{
- FIXME("%p %p 0x%08lx: stub!\n", hColorSpace, lpBuffer, nSize);
+ FIXME("%p %p 0x%08x: stub!\n", hColorSpace, lpBuffer, nSize);
return FALSE;
}
@@ -1043,7 +1043,7 @@ BOOL WINAPI SetICMProfileW(HDC hDC, LPWS
*/
BOOL WINAPI UpdateICMRegKeyA(DWORD dwReserved, LPSTR lpszCMID, LPSTR lpszFileName, UINT nCommand)
{
- FIXME("(0x%08lx, %s, %s, 0x%08x): stub!\n", dwReserved, debugstr_a(lpszCMID),
+ FIXME("(0x%08x, %s, %s, 0x%08x): stub!\n", dwReserved, debugstr_a(lpszCMID),
debugstr_a(lpszFileName), nCommand);
return TRUE; /* success */
}
@@ -1054,7 +1054,7 @@ BOOL WINAPI UpdateICMRegKeyA(DWORD dwRes
*/
BOOL WINAPI UpdateICMRegKeyW(DWORD dwReserved, LPWSTR lpszCMID, LPWSTR lpszFileName, UINT nCommand)
{
- FIXME("(0x%08lx, %s, %s, 0x%08x): stub!\n", dwReserved, debugstr_w(lpszCMID),
+ FIXME("(0x%08x, %s, %s, 0x%08x): stub!\n", dwReserved, debugstr_w(lpszCMID),
debugstr_w(lpszFileName), nCommand);
return TRUE; /* success */
}
diff --git a/dlls/gdi/path.c b/dlls/gdi/path.c
index b7d8f5d..8d2a76c 100644
--- a/dlls/gdi/path.c
+++ b/dlls/gdi/path.c
@@ -1278,7 +1278,7 @@ static BOOL PATH_add_outline(DC *dc, INT
if (header->dwType != TT_POLYGON_TYPE)
{
- FIXME("Unknown header type %ld\n", header->dwType);
+ FIXME("Unknown header type %d\n", header->dwType);
return FALSE;
}
@@ -1441,7 +1441,7 @@ BOOL PATH_AddEntry(GdiPath *pPath, const
/* FIXME: If newStroke is true, perhaps we want to check that we're
* getting a PT_MOVETO
*/
- TRACE("(%ld,%ld) - %d\n", pPoint->x, pPoint->y, flags);
+ TRACE("(%d,%d) - %d\n", pPoint->x, pPoint->y, flags);
/* Check that path is open */
if(pPath->state!=PATH_Open)
@@ -1696,7 +1696,7 @@ static BOOL PATH_StrokePath(DC *dc, GdiP
}
switch(pPath->pFlags[i]) {
case PT_MOVETO:
- TRACE("Got PT_MOVETO (%ld, %ld)\n",
+ TRACE("Got PT_MOVETO (%d, %d)\n",
pPath->pPoints[i].x, pPath->pPoints[i].y);
if(nLinePts >= 2)
Polyline(dc->hSelf, pLinePts, nLinePts);
@@ -1705,7 +1705,7 @@ static BOOL PATH_StrokePath(DC *dc, GdiP
break;
case PT_LINETO:
case (PT_LINETO | PT_CLOSEFIGURE):
- TRACE("Got PT_LINETO (%ld, %ld)\n",
+ TRACE("Got PT_LINETO (%d, %d)\n",
pPath->pPoints[i].x, pPath->pPoints[i].y);
pLinePts[nLinePts++] = pPath->pPoints[i];
break;
diff --git a/dlls/gdi/pen.c b/dlls/gdi/pen.c
index 982f2fd..fae9315 100644
--- a/dlls/gdi/pen.c
+++ b/dlls/gdi/pen.c
@@ -65,7 +65,7 @@ HPEN WINAPI CreatePen( INT style, INT wi
{
LOGPEN logpen;
- TRACE("%d %d %06lx\n", style, width, color );
+ TRACE("%d %d %06x\n", style, width, color );
logpen.lopnStyle = style;
logpen.lopnWidth.x = width;
diff --git a/dlls/gdi/printdrv.c b/dlls/gdi/printdrv.c
index 5be3370..412ccd2 100644
--- a/dlls/gdi/printdrv.c
+++ b/dlls/gdi/printdrv.c
@@ -734,7 +734,7 @@ INT16 WINAPI EndSpoolPage16(HPJOB16 hJob
DWORD WINAPI GetSpoolJob16(int nOption, LONG param)
{
DWORD retval = 0;
- TRACE("In GetSpoolJob param 0x%lx noption %d\n",param, nOption);
+ TRACE("In GetSpoolJob param 0x%x noption %d\n",param, nOption);
return retval;
}
@@ -888,7 +888,7 @@ DWORD WINAPI DrvSetPrinterData16(LPSTR l
TRACE("profile %s\n",lpProfile);
else
TRACE("profile %p\n",lpProfile);
- TRACE("lpType %08lx\n",lpType);
+ TRACE("lpType %08x\n",lpType);
if ((!lpPrinter) || (!lpProfile) ||
((DWORD)lpProfile == INT_PD_DEFAULT_MODEL) || (HIWORD(lpProfile) &&
diff --git a/dlls/gdi/region.c b/dlls/gdi/region.c
index 13f2016..94fd929 100644
--- a/dlls/gdi/region.c
+++ b/dlls/gdi/region.c
@@ -474,11 +474,11 @@ static void REGION_DumpRegion(WINEREGION
{
RECT *pRect, *pRectEnd = pReg->rects + pReg->numRects;
- TRACE("Region %p: %ld,%ld - %ld,%ld %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("\t%ld,%ld - %ld,%ld\n", pRect->left, pRect->top,
+ TRACE("\t%d,%d - %d,%d\n", pRect->left, pRect->top,
pRect->right, pRect->bottom);
return;
}
@@ -648,7 +648,7 @@ INT WINAPI GetRgnBox( HRGN hrgn, LPRECT
rect->top = obj->rgn->extents.top;
rect->right = obj->rgn->extents.right;
rect->bottom = obj->rgn->extents.bottom;
- TRACE("%p (%ld,%ld-%ld,%ld)\n", hrgn,
+ TRACE("%p (%d,%d-%d,%d)\n", hrgn,
rect->left, rect->top, rect->right, rect->bottom);
ret = get_region_type( obj );
GDI_ReleaseObj(hrgn);
@@ -957,7 +957,7 @@ DWORD WINAPI GetRegionData(HRGN hrgn, DW
DWORD size;
RGNOBJ *obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC );
- TRACE(" %p count = %ld, rgndata = %p\n", hrgn, count, rgndata);
+ TRACE(" %p count = %d, rgndata = %p\n", hrgn, count, rgndata);
if(!obj) return 0;
@@ -1008,7 +1008,7 @@ HRGN WINAPI ExtCreateRegion( const XFORM
{
HRGN hrgn;
- TRACE(" %p %ld %p\n", lpXform, dwCount, rgndata );
+ TRACE(" %p %d %p\n", lpXform, dwCount, rgndata );
if( lpXform )
WARN("(Xform not implemented - ignored)\n");
@@ -1018,7 +1018,7 @@ HRGN WINAPI ExtCreateRegion( const XFORM
/* FIXME: We can use CreatePolyPolygonRgn() here
* for trapezoidal data */
- WARN("(Unsupported region data type: %lu)\n", rgndata->rdh.iType);
+ WARN("(Unsupported region data type: %u)\n", rgndata->rdh.iType);
goto fail;
}
diff --git a/dlls/gdi/wing.c b/dlls/gdi/wing.c
index a4cdc1f..4a8c2ae 100644
--- a/dlls/gdi/wing.c
+++ b/dlls/gdi/wing.c
@@ -133,7 +133,7 @@ HBITMAP16 WINAPI WinGCreateBitmap16(HDC1
SEGPTR *bits)
{
TRACE("(%d,%p,%p)\n", hdc, bmpi, bits);
- TRACE(": create %ldx%ldx%d bitmap\n", bmpi->bmiHeader.biWidth,
+ TRACE(": create %dx%dx%d bitmap\n", bmpi->bmiHeader.biWidth,
bmpi->bmiHeader.biHeight, bmpi->bmiHeader.biPlanes);
return CreateDIBSection16(hdc, bmpi, 0, bits, 0, 0);
}
@@ -237,7 +237,7 @@ HPALETTE16 WINAPI WinGCreateHalfTonePale
HBRUSH16 WINAPI WinGCreateHalfToneBrush16(HDC16 winDC, COLORREF col,
WING_DITHER_TYPE type)
{
- TRACE("(%d,%ld,%d)\n", winDC, col, type);
+ TRACE("(%d,%d,%d)\n", winDC, col, type);
return CreateSolidBrush16(col);
}
--
1.4.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061012/84ff753d/attachment-0001.pgp
More information about the wine-patches
mailing list