[PATCH 18/27] dlls/gdi32: enable compilation with long types
Eric Pouech
eric.pouech at gmail.com
Thu Feb 10 01:43:01 CST 2022
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
---
dlls/gdi32/Makefile.in | 2 +-
dlls/gdi32/dc.c | 18 +++++++++---------
dlls/gdi32/emfdc.c | 6 +++---
dlls/gdi32/enhmetafile.c | 32 ++++++++++++++++----------------
dlls/gdi32/icm.c | 10 +++++-----
dlls/gdi32/metadc.c | 2 +-
dlls/gdi32/metafile.c | 12 ++++++------
dlls/gdi32/objects.c | 10 +++++-----
dlls/gdi32/text.c | 18 +++++++++---------
dlls/gdi32/uniscribe/opentype.c | 6 +++---
dlls/gdi32/uniscribe/usp10.c | 12 ++++++------
11 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in
index 381b2b9a87f..3e0495f877b 100644
--- a/dlls/gdi32/Makefile.in
+++ b/dlls/gdi32/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES -D_GDI32_
+EXTRADEFS = -D_GDI32_
MODULE = gdi32.dll
IMPORTLIB = gdi32
IMPORTS = advapi32 win32u
diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c
index d609185be76..b00fff167cb 100644
--- a/dlls/gdi32/dc.c
+++ b/dlls/gdi32/dc.c
@@ -1366,7 +1366,7 @@ BOOL WINAPI AngleArc( HDC hdc, INT x, INT y, DWORD radius, FLOAT start_angle, FL
{
DC_ATTR *dc_attr;
- TRACE( "%p, (%d, %d), %u, %f, %f\n", hdc, x, y, radius, start_angle, sweep_angle );
+ TRACE( "%p, (%d, %d), %lu, %f, %f\n", hdc, x, y, radius, start_angle, sweep_angle );
if (!(dc_attr = get_dc_attr( hdc ))) return FALSE;
if (dc_attr->emf && !EMFDC_AngleArc( dc_attr, x, y, radius, start_angle, sweep_angle ))
@@ -1478,7 +1478,7 @@ BOOL WINAPI PolyPolyline( HDC hdc, const POINT *points, const DWORD *counts, DWO
{
DC_ATTR *dc_attr;
- TRACE( "%p, %p, %p, %u\n", hdc, points, counts, polylines );
+ TRACE( "%p, %p, %p, %lu\n", hdc, points, counts, polylines );
if (!(dc_attr = get_dc_attr( hdc ))) return FALSE;
if (dc_attr->emf && !EMFDC_PolyPolyline( dc_attr, points, counts, polylines )) return FALSE;
@@ -1492,7 +1492,7 @@ BOOL WINAPI PolyBezier( HDC hdc, const POINT *points, DWORD count )
{
DC_ATTR *dc_attr;
- TRACE( "%p, %p, %u\n", hdc, points, count );
+ TRACE( "%p, %p, %lu\n", hdc, points, count );
if (!(dc_attr = get_dc_attr( hdc ))) return FALSE;
if (dc_attr->emf && !EMFDC_PolyBezier( dc_attr, points, count )) return FALSE;
@@ -1506,7 +1506,7 @@ BOOL WINAPI PolyBezierTo( HDC hdc, const POINT *points, DWORD count )
{
DC_ATTR *dc_attr;
- TRACE( "%p, %p, %u\n", hdc, points, count );
+ TRACE( "%p, %p, %lu\n", hdc, points, count );
if (!(dc_attr = get_dc_attr( hdc ))) return FALSE;
if (dc_attr->emf && !EMFDC_PolyBezierTo( dc_attr, points, count )) return FALSE;
@@ -1520,7 +1520,7 @@ BOOL WINAPI PolylineTo( HDC hdc, const POINT *points, DWORD count )
{
DC_ATTR *dc_attr;
- TRACE( "%p, %p, %u\n", hdc, points, count );
+ TRACE( "%p, %p, %lu\n", hdc, points, count );
if (!(dc_attr = get_dc_attr( hdc ))) return FALSE;
if (dc_attr->emf && !EMFDC_PolylineTo( dc_attr, points, count )) return FALSE;
@@ -1534,7 +1534,7 @@ BOOL WINAPI PolyDraw( HDC hdc, const POINT *points, const BYTE *types, DWORD cou
{
DC_ATTR *dc_attr;
- TRACE( "%p, %p, %p, %u\n", hdc, points, types, count );
+ TRACE( "%p, %p, %p, %lu\n", hdc, points, types, count );
if (!(dc_attr = get_dc_attr( hdc ))) return FALSE;
if (dc_attr->emf && !EMFDC_PolyDraw( dc_attr, points, types, count )) return FALSE;
@@ -1609,7 +1609,7 @@ BOOL WINAPI ExtFloodFill( HDC hdc, INT x, INT y, COLORREF color, UINT fill_type
{
DC_ATTR *dc_attr;
- TRACE( "%p, (%d, %d), %08x, %x\n", hdc, x, y, color, fill_type );
+ TRACE( "%p, (%d, %d), %08lx, %x\n", hdc, x, y, color, fill_type );
if (is_meta_dc( hdc )) return METADC_ExtFloodFill( hdc, x, y, color, fill_type );
if (!(dc_attr = get_dc_attr( hdc ))) return FALSE;
@@ -1633,7 +1633,7 @@ BOOL WINAPI GdiGradientFill( HDC hdc, TRIVERTEX *vert_array, ULONG nvert,
{
DC_ATTR *dc_attr;
- TRACE( "%p vert_array:%p nvert:%d grad_array:%p ngrad:%d\n", hdc, vert_array,
+ TRACE( "%p vert_array:%p nvert:%ld grad_array:%p ngrad:%ld\n", hdc, vert_array,
nvert, grad_array, ngrad );
if (!(dc_attr = get_dc_attr( hdc )))
@@ -2155,7 +2155,7 @@ INT WINAPI StartDocW( HDC hdc, const DOCINFOW *doc )
{
DC_ATTR *dc_attr;
- TRACE("DocName %s, Output %s, Datatype %s, fwType %#x\n",
+ TRACE("DocName %s, Output %s, Datatype %s, fwType %#lx\n",
debugstr_w(doc->lpszDocName), debugstr_w(doc->lpszOutput),
debugstr_w(doc->lpszDatatype), doc->fwType);
diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c
index d0b9033722c..eec700de327 100644
--- a/dlls/gdi32/emfdc.c
+++ b/dlls/gdi32/emfdc.c
@@ -51,7 +51,7 @@ static BOOL emfdc_record( struct emf *emf, EMR *emr )
DWORD len, size;
ENHMETAHEADER *emh;
- TRACE( "record %d, size %d\n", emr->iType, emr->nSize );
+ TRACE( "record %ld, size %ld\n", emr->iType, emr->nSize );
assert( !(emr->nSize & 3) );
@@ -252,7 +252,7 @@ static BOOL emf_parse_user_bitmapinfo( BITMAPINFOHEADER *dst, const BITMAPINFOHE
}
else
{
- WARN( "(%u): unknown/wrong size for header\n", info->biSize );
+ WARN( "(%lu): unknown/wrong size for header\n", info->biSize );
return FALSE;
}
@@ -1204,7 +1204,7 @@ BOOL EMFDC_ExtTextOut( DC_ATTR *dc_attr, INT x, INT y, UINT flags, const RECT *r
size = sizeof(*emr) + ((count+1) & ~1) * sizeof(WCHAR) + count * sizeof(INT);
- TRACE( "%s %s count %d size = %d\n", debugstr_wn(str, count),
+ TRACE( "%s %s count %d size = %ld\n", debugstr_wn(str, count),
wine_dbgstr_rect(rect), count, size );
emr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size );
diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c
index 4b1ccaa9206..336f2d389fd 100644
--- a/dlls/gdi32/enhmetafile.c
+++ b/dlls/gdi32/enhmetafile.c
@@ -201,7 +201,7 @@ static const char *get_emr_name(DWORD type)
unsigned int i;
for(i = 0; i < ARRAY_SIZE(emr_names); i++)
if(type == emr_names[i].type) return emr_names[i].name;
- TRACE("Unknown record type %d\n", type);
+ TRACE("Unknown record type %ld\n", type);
return NULL;
}
@@ -274,13 +274,13 @@ HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, DWORD filesize, BOOL on
if (emh->dSignature != ENHMETA_SIGNATURE ||
(emh->nBytes & 3)) /* refuse to load unaligned EMF as Windows does */
{
- WARN("Invalid emf header type 0x%08x sig 0x%08x.\n",
+ WARN("Invalid emf header type 0x%08lx sig 0x%08lx.\n",
emh->iType, emh->dSignature);
return 0;
}
if (filesize < emh->nBytes)
{
- WARN("File truncated (got %u bytes, header says %u)\n", emh->nBytes, filesize);
+ WARN("File truncated (got %lu bytes, header says %lu)\n", emh->nBytes, filesize);
return 0;
}
@@ -881,7 +881,7 @@ BOOL WINAPI PlayEnhMetaFileRecord(
case EMR_RESTOREDC:
{
const EMRRESTOREDC *pRestoreDC = (const EMRRESTOREDC *)mr;
- TRACE("EMR_RESTORE: %d\n", pRestoreDC->iRelative);
+ TRACE("EMR_RESTORE: %ld\n", pRestoreDC->iRelative);
if (RestoreDC( hdc, pRestoreDC->iRelative ))
EMF_RestoreDC( info, pRestoreDC->iRelative );
break;
@@ -889,7 +889,7 @@ BOOL WINAPI PlayEnhMetaFileRecord(
case EMR_INTERSECTCLIPRECT:
{
const EMRINTERSECTCLIPRECT *pClipRect = (const EMRINTERSECTCLIPRECT *)mr;
- TRACE("EMR_INTERSECTCLIPRECT: rect %d,%d - %d, %d\n",
+ TRACE("EMR_INTERSECTCLIPRECT: rect %ld,%ld - %ld, %ld\n",
pClipRect->rclClip.left, pClipRect->rclClip.top,
pClipRect->rclClip.right, pClipRect->rclClip.bottom);
IntersectClipRect(hdc, pClipRect->rclClip.left, pClipRect->rclClip.top,
@@ -1222,7 +1222,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 = %d, %d. rect = %s. flags %08x\n",
+ TRACE("EMR_EXTTEXTOUTA: x,y = %ld, %ld. rect = %s. flags %08lx\n",
pExtTextOutA->emrtext.ptlReference.x, pExtTextOutA->emrtext.ptlReference.y,
wine_dbgstr_rect(&rc), pExtTextOutA->emrtext.fOptions);
@@ -1258,7 +1258,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 = %d, %d. rect = %s. flags %08x\n",
+ TRACE("EMR_EXTTEXTOUTW: x,y = %ld, %ld. rect = %s. flags %08lx\n",
pExtTextOutW->emrtext.ptlReference.x, pExtTextOutW->emrtext.ptlReference.y,
wine_dbgstr_rect(&rc), pExtTextOutW->emrtext.fOptions);
@@ -1490,7 +1490,7 @@ BOOL WINAPI PlayEnhMetaFileRecord(
if (info->state.mode == MM_ISOTROPIC)
EMF_FixIsotropic(hdc, info);
- TRACE("EMRSCALEVIEWPORTEXTEX %d/%d %d/%d\n",
+ TRACE("EMRSCALEVIEWPORTEXTEX %ld/%ld %ld/%ld\n",
lpScaleViewportExtEx->xNum,lpScaleViewportExtEx->xDenom,
lpScaleViewportExtEx->yNum,lpScaleViewportExtEx->yDenom);
@@ -1518,7 +1518,7 @@ BOOL WINAPI PlayEnhMetaFileRecord(
if (info->state.mode == MM_ISOTROPIC)
EMF_FixIsotropic(hdc, info);
- TRACE("EMRSCALEWINDOWEXTEX %d/%d %d/%d\n",
+ TRACE("EMRSCALEWINDOWEXTEX %ld/%ld %ld/%ld\n",
lpScaleWindowExtEx->xNum,lpScaleWindowExtEx->xDenom,
lpScaleWindowExtEx->yNum,lpScaleWindowExtEx->yDenom);
@@ -1553,7 +1553,7 @@ BOOL WINAPI PlayEnhMetaFileRecord(
EMF_Update_MF_Xform(hdc, info);
break;
default:
- FIXME("Unknown imode %d\n", lpModifyWorldTrans->iMode);
+ FIXME("Unknown imode %ld\n", lpModifyWorldTrans->iMode);
break;
}
break;
@@ -1952,7 +1952,7 @@ BOOL WINAPI PlayEnhMetaFileRecord(
{
const EMRSTRETCHBLT *pStretchBlt = (const EMRSTRETCHBLT *)mr;
- TRACE("EMR_STRETCHBLT: %d, %d %dx%d -> %d, %d %dx%d. rop %08x offBitsSrc %d\n",
+ TRACE("EMR_STRETCHBLT: %ld, %ld %ldx%ld -> %ld, %ld %ldx%ld. rop %08lx offBitsSrc %ld\n",
pStretchBlt->xSrc, pStretchBlt->ySrc, pStretchBlt->cxSrc, pStretchBlt->cySrc,
pStretchBlt->xDest, pStretchBlt->yDest, pStretchBlt->cxDest, pStretchBlt->cyDest,
pStretchBlt->dwRop, pStretchBlt->offBitsSrc);
@@ -1996,7 +1996,7 @@ BOOL WINAPI PlayEnhMetaFileRecord(
{
const EMRALPHABLEND *pAlphaBlend = (const EMRALPHABLEND *)mr;
- TRACE("EMR_ALPHABLEND: %d, %d %dx%d -> %d, %d %dx%d. blendfn %08x offBitsSrc %d\n",
+ TRACE("EMR_ALPHABLEND: %ld, %ld %ldx%ld -> %ld, %ld %ldx%ld. blendfn %08lx offBitsSrc %ld\n",
pAlphaBlend->xSrc, pAlphaBlend->ySrc, pAlphaBlend->cxSrc, pAlphaBlend->cySrc,
pAlphaBlend->xDest, pAlphaBlend->yDest, pAlphaBlend->cxDest, pAlphaBlend->cyDest,
pAlphaBlend->dwRop, pAlphaBlend->offBitsSrc);
@@ -2475,7 +2475,7 @@ BOOL WINAPI EnumEnhMetaFile(
double xSrcPixSize, ySrcPixSize, xscale, yscale;
XFORM xform;
- TRACE("rect: %s. rclFrame: (%d,%d)-(%d,%d)\n", wine_dbgstr_rect(lpRect),
+ TRACE("rect: %s. rclFrame: (%ld,%ld)-(%ld,%ld)\n", wine_dbgstr_rect(lpRect),
emh->rclFrame.left, emh->rclFrame.top, emh->rclFrame.right,
emh->rclFrame.bottom);
@@ -2525,7 +2525,7 @@ BOOL WINAPI EnumEnhMetaFile(
if (hdc && IS_WIN9X() && emr_produces_output(emr->iType))
EMF_Update_MF_Xform(hdc, info);
- TRACE("Calling EnumFunc with record %s, size %d\n", get_emr_name(emr->iType), emr->nSize);
+ TRACE("Calling EnumFunc with record %s, size %ld\n", get_emr_name(emr->iType), emr->nSize);
ret = (*callback)(hdc, ht, emr, emh->nHandles, (LPARAM)data);
offset += emr->nSize;
}
@@ -2722,7 +2722,7 @@ static INT CALLBACK cbEnhPaletteCopy( HDC a,
EMF_PaletteCopy* info = (EMF_PaletteCopy*)lpData;
DWORD dwNumPalToCopy = min( lpEof->nPalEntries, info->cEntries );
- TRACE( "copying 0x%08x palettes\n", dwNumPalToCopy );
+ TRACE( "copying 0x%08lx palettes\n", dwNumPalToCopy );
memcpy( info->lpPe, (LPCSTR)lpEof + lpEof->offPalEntries,
sizeof( *(info->lpPe) ) * dwNumPalToCopy );
@@ -2877,7 +2877,7 @@ HENHMETAFILE WINAPI SetWinMetaFileBits(UINT cbBuffer, const BYTE *lpbBuffer, HDC
if (lpmfp)
{
- TRACE("mm = %d %dx%d\n", lpmfp->mm, lpmfp->xExt, lpmfp->yExt);
+ TRACE("mm = %ld %ldx%ld\n", lpmfp->mm, lpmfp->xExt, lpmfp->yExt);
mm = lpmfp->mm;
xExt = lpmfp->xExt;
diff --git a/dlls/gdi32/icm.c b/dlls/gdi32/icm.c
index d36c5135521..549c09c16b0 100644
--- a/dlls/gdi32/icm.c
+++ b/dlls/gdi32/icm.c
@@ -71,7 +71,7 @@ INT WINAPI EnumICMProfilesW(HDC hdc, ICMENUMPROCW func, LPARAM lparam)
WCHAR profile[MAX_PATH];
DWORD size = ARRAYSIZE(profile);
- TRACE( "%p, %p, 0x%08lx\n", hdc, func, lparam );
+ TRACE( "%p, %p, 0x%08Ix\n", hdc, func, lparam );
if (!func) return -1;
if (!__wine_get_icm_profile( hdc, FALSE, &size, profile )) return -1;
@@ -139,7 +139,7 @@ BOOL WINAPI GetICMProfileW(HDC hdc, LPDWORD size, LPWSTR filename)
*/
BOOL WINAPI GetLogColorSpaceA(HCOLORSPACE colorspace, LPLOGCOLORSPACEA buffer, DWORD size)
{
- FIXME("%p %p 0x%08x stub\n", colorspace, buffer, size);
+ FIXME("%p %p 0x%08lx stub\n", colorspace, buffer, size);
return FALSE;
}
@@ -148,7 +148,7 @@ BOOL WINAPI GetLogColorSpaceA(HCOLORSPACE colorspace, LPLOGCOLORSPACEA buffer, D
*/
BOOL WINAPI GetLogColorSpaceW(HCOLORSPACE colorspace, LPLOGCOLORSPACEW buffer, DWORD size)
{
- FIXME("%p %p 0x%08x stub\n", colorspace, buffer, size);
+ FIXME("%p %p 0x%08lx stub\n", colorspace, buffer, size);
return FALSE;
}
@@ -197,7 +197,7 @@ BOOL WINAPI SetICMProfileW(HDC hdc, LPWSTR filename)
*/
BOOL WINAPI UpdateICMRegKeyA(DWORD reserved, LPSTR cmid, LPSTR filename, UINT command)
{
- FIXME("0x%08x, %s, %s, 0x%08x stub\n", reserved, debugstr_a(cmid), debugstr_a(filename), command);
+ FIXME("0x%08lx, %s, %s, 0x%08x stub\n", reserved, debugstr_a(cmid), debugstr_a(filename), command);
return TRUE;
}
@@ -206,6 +206,6 @@ BOOL WINAPI UpdateICMRegKeyA(DWORD reserved, LPSTR cmid, LPSTR filename, UINT co
*/
BOOL WINAPI UpdateICMRegKeyW(DWORD reserved, LPWSTR cmid, LPWSTR filename, UINT command)
{
- FIXME("0x%08x, %s, %s, 0x%08x stub\n", reserved, debugstr_w(cmid), debugstr_w(filename), command);
+ FIXME("0x%08lx, %s, %s, 0x%08x stub\n", reserved, debugstr_w(cmid), debugstr_w(filename), command);
return TRUE;
}
diff --git a/dlls/gdi32/metadc.c b/dlls/gdi32/metadc.c
index d2260f6702e..2f5842ea90a 100644
--- a/dlls/gdi32/metadc.c
+++ b/dlls/gdi32/metadc.c
@@ -752,7 +752,7 @@ static BOOL metadc_stretchblt( HDC hdc, INT x_dst, INT y_dst, INT width_dst, INT
mr->rdFunction = type;
bmi = (BITMAPINFO *)&mr->rdParm[bitmap_offset];
bmi->bmiHeader = src_info.bmiHeader;
- TRACE( "size = %u rop=%x\n", size, rop );
+ TRACE( "size = %u rop=%lx\n", size, rop );
ret = GetDIBits( hdc_src, bitmap, 0, src_info.bmiHeader.biHeight, (BYTE *)bmi + bmi_size,
bmi, DIB_RGB_COLORS );
diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c
index 3a49ec6be3d..50910956e1d 100644
--- a/dlls/gdi32/metafile.c
+++ b/dlls/gdi32/metafile.c
@@ -398,10 +398,10 @@ BOOL WINAPI PlayMetaFile( HDC hdc, HMETAFILE hmf )
while (offset < mh->mtSize * 2)
{
mr = (METARECORD *)((char *)mh + offset);
- TRACE("offset=%04x,size=%08x\n",
+ TRACE("offset=%04x,size=%08lx\n",
offset, mr->rdSize);
if (mr->rdSize < 3) { /* catch illegal record sizes */
- TRACE("Entry got size %d at offset %d, total mf length is %d\n",
+ TRACE("Entry got size %ld at offset %d, total mf length is %ld\n",
mr->rdSize,offset,mh->mtSize*2);
break;
}
@@ -454,7 +454,7 @@ BOOL WINAPI EnumMetaFile(HDC hdc, HMETAFILE hmf, MFENUMPROC lpEnumFunc, LPARAM l
HBRUSH hBrush;
HFONT hFont;
- TRACE("(%p,%p,%p,%lx)\n", hdc, hmf, lpEnumFunc, lpData);
+ TRACE("(%p,%p,%p,%Ix)\n", hdc, hmf, lpEnumFunc, lpData);
if (!mh) return FALSE;
@@ -1386,8 +1386,8 @@ static BOOL MF_Play_MetaExtTextOut(HDC hdc, METARECORD *mr)
if (dx) for (i = 0; i < s1; i++) dx[i] = dxx[i];
}
else {
- TRACE("%s len: %d\n", sot, mr->rdSize);
- WARN("Please report: ExtTextOut len=%d slen=%d rdSize=%d opt=%04x\n",
+ 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; /* shouldn't happen -- but if, we continue with NULL */
}
@@ -1400,7 +1400,7 @@ static BOOL MF_Play_MetaExtTextOut(HDC hdc, METARECORD *mr)
s1, dx); /* length, dx array */
if (dx)
{
- TRACE("%s len: %d dx0: %d\n", sot, mr->rdSize, dx[0]);
+ TRACE("%s len: %ld dx0: %d\n", sot, mr->rdSize, dx[0]);
HeapFree( GetProcessHeap(), 0, dx );
}
return TRUE;
diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c
index 50240b7b29a..f578543b937 100644
--- a/dlls/gdi32/objects.c
+++ b/dlls/gdi32/objects.c
@@ -152,7 +152,7 @@ DWORD WINAPI GetObjectType( HGDIOBJ handle )
{
DWORD type = get_object_type( handle );
- TRACE( "%p -> %u\n", handle, type );
+ TRACE( "%p -> %lu\n", handle, type );
switch (type)
{
@@ -1044,7 +1044,7 @@ INT WINAPI EnumObjects( HDC hdc, INT type, GOBJENUMPROC enum_func, LPARAM param
LOGPEN pen;
LOGBRUSH brush;
- TRACE( "%p %d %p %08lx\n", hdc, type, enum_func, param );
+ TRACE( "%p %d %p %08Ix\n", hdc, type, enum_func, param );
switch(type)
{
@@ -1057,7 +1057,7 @@ INT WINAPI EnumObjects( HDC hdc, INT type, GOBJENUMPROC enum_func, LPARAM param
pen.lopnWidth.y = 0;
pen.lopnColor = solid_colors[i];
retval = enum_func( &pen, param );
- TRACE( "solid pen %08x, ret=%d\n", solid_colors[i], retval );
+ TRACE( "solid pen %08lx, ret=%d\n", solid_colors[i], retval );
if (!retval) break;
}
break;
@@ -1070,7 +1070,7 @@ INT WINAPI EnumObjects( HDC hdc, INT type, GOBJENUMPROC enum_func, LPARAM param
brush.lbColor = solid_colors[i];
brush.lbHatch = 0;
retval = enum_func( &brush, param );
- TRACE( "solid brush %08x, ret=%d\n", solid_colors[i], retval );
+ TRACE( "solid brush %08lx, ret=%d\n", solid_colors[i], retval );
if (!retval) break;
}
@@ -1130,7 +1130,7 @@ BOOL WINAPI LineDDA( INT x_start, INT y_start, INT x_end, INT y_end,
INT dx = x_end - x_start;
INT dy = y_end - y_start;
- TRACE( "(%d, %d), (%d, %d), %p, %lx\n", x_start, y_start,
+ TRACE( "(%d, %d), (%d, %d), %p, %Ix\n", x_start, y_start,
x_end, y_end, callback, lparam );
if (dx < 0)
diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c
index b6bec086d75..c0807276f42 100644
--- a/dlls/gdi32/text.c
+++ b/dlls/gdi32/text.c
@@ -371,7 +371,7 @@ static BOOL BIDI_Reorder( HDC hDC, /* [in] Display DC */
DWORD cMaxGlyphs = 0;
BOOL doGlyphs = TRUE;
- TRACE("%s, %d, 0x%08x lpOutString=%p, lpOrder=%p\n",
+ TRACE("%s, %d, 0x%08lx lpOutString=%p, lpOrder=%p\n",
debugstr_wn(lpString, uCount), uCount, dwFlags,
lpOutString, lpOrder);
@@ -622,7 +622,7 @@ static BOOL BIDI_Reorder( HDC hDC, /* [in] Display DC */
if (res == USP_E_SCRIPT_NOT_IN_FONT)
TRACE("Unable to shape with currently selected font\n");
else
- FIXME("Unable to shape string (%x)\n",res);
+ FIXME("Unable to shape string (%lx)\n",res);
j = nItems;
doGlyphs = FALSE;
HeapFree(GetProcessHeap(), 0, *lpGlyphs);
@@ -1135,7 +1135,7 @@ DWORD WINAPI GetCharacterPlacementW( HDC hdc, const WCHAR *str, INT count, INT m
SIZE size;
DWORD ret = 0;
- TRACE("%s, %d, %d, 0x%08x\n", debugstr_wn(str, count), count, max_extent, flags);
+ TRACE("%s, %d, %d, 0x%08lx\n", debugstr_wn(str, count), count, max_extent, flags);
if (!count)
return 0;
@@ -1143,14 +1143,14 @@ DWORD WINAPI GetCharacterPlacementW( HDC hdc, const WCHAR *str, INT count, INT m
if (!result)
return GetTextExtentPoint32W( hdc, str, count, &size ) ? MAKELONG(size.cx, size.cy) : 0;
- TRACE( "lStructSize=%d, lpOutString=%p, lpOrder=%p, lpDx=%p, lpCaretPos=%p\n"
+ TRACE( "lStructSize=%ld, lpOutString=%p, lpOrder=%p, lpDx=%p, lpCaretPos=%p\n"
"lpClass=%p, lpGlyphs=%p, nGlyphs=%u, nMaxFit=%d\n",
result->lStructSize, result->lpOutString, result->lpOrder,
result->lpDx, result->lpCaretPos, result->lpClass,
result->lpGlyphs, result->nGlyphs, result->nMaxFit );
if (flags & ~(GCP_REORDER | GCP_USEKERNING))
- FIXME( "flags 0x%08x ignored\n", flags );
+ FIXME( "flags 0x%08lx ignored\n", flags );
if (result->lpClass)
FIXME( "classes not implemented\n" );
if (result->lpCaretPos && (flags & GCP_REORDER))
@@ -1243,7 +1243,7 @@ DWORD WINAPI GetCharacterPlacementA( HDC hdc, const char *str, INT count, INT ma
DWORD ret;
UINT font_cp;
- TRACE( "%s, %d, %d, 0x%08x\n", debugstr_an(str, count), count, max_extent, flags );
+ TRACE( "%s, %d, %d, 0x%08lx\n", debugstr_an(str, count), count, max_extent, flags );
strW = text_mbtowc( hdc, str, count, &countW, &font_cp );
@@ -1942,7 +1942,7 @@ DWORD WINAPI GetGlyphIndicesA( HDC hdc, const char *str, INT count, WORD *indice
WCHAR *strW;
INT countW;
- TRACE( "(%p, %s, %d, %p, 0x%x)\n", hdc, debugstr_an(str, count), count, indices, flags );
+ TRACE( "(%p, %s, %d, %p, 0x%lx)\n", hdc, debugstr_an(str, count), count, indices, flags );
strW = text_mbtowc( hdc, str, count, &countW, NULL );
ret = NtGdiGetGlyphIndicesW( hdc, strW, countW, indices, flags );
@@ -2460,7 +2460,7 @@ BOOL WINAPI RemoveFontResourceExW( const WCHAR *str, DWORD flags, void *dv )
*/
BOOL WINAPI GetFontResourceInfoW( const WCHAR *str, DWORD *size, void *buffer, DWORD type )
{
- FIXME( "%s %p(%d) %p %d\n", debugstr_w(str), size, size ? *size : 0, buffer, type );
+ FIXME( "%s %p(%ld) %p %ld\n", debugstr_w(str), size, size ? *size : 0, buffer, type );
return FALSE;
}
@@ -2668,7 +2668,7 @@ BOOL WINAPI CreateScalableFontResourceW( DWORD hidden, const WCHAR *resource_fil
WCHAR path[MAX_PATH];
BOOL ret;
- TRACE("(%d, %s, %s, %s)\n", hidden, debugstr_w(resource_file),
+ TRACE("(%ld, %s, %s, %s)\n", hidden, debugstr_w(resource_file),
debugstr_w(font_file), debugstr_w(font_path) );
if (!font_file) goto done;
diff --git a/dlls/gdi32/uniscribe/opentype.c b/dlls/gdi32/uniscribe/opentype.c
index a7a81acbe61..c44639cb993 100644
--- a/dlls/gdi32/uniscribe/opentype.c
+++ b/dlls/gdi32/uniscribe/opentype.c
@@ -1638,7 +1638,7 @@ static void GPOS_convert_design_units_to_device(const OUTLINETEXTMETRICW *otm, c
{
int emHeight = otm->otmTextMetrics.tmAscent + otm->otmTextMetrics.tmDescent - otm->otmTextMetrics.tmInternalLeading;
- TRACE("emHeight %i lfWidth %i\n",emHeight, logfont->lfWidth);
+ TRACE("emHeight %i lfWidth %li\n",emHeight, logfont->lfWidth);
*devX = (desX * emHeight) / (double)otm->otmEMSquare;
*devY = (desY * emHeight) / (double)otm->otmEMSquare;
if (logfont->lfWidth)
@@ -2607,7 +2607,7 @@ static void usp10_script_cache_add_script_list(ScriptCache *script_cache,
if (!(count = GET_BE_WORD(list->ScriptCount)))
return;
- TRACE("Adding %lu scripts.\n", count);
+ TRACE("Adding %Iu scripts.\n", count);
initial_count = script_cache->script_count;
for (i = 0; i < count; ++i)
@@ -2725,7 +2725,7 @@ static void usp10_script_add_language_list(LoadedScript *script,
if (!(count = GET_BE_WORD(list->LangSysCount)))
return;
- TRACE("Adding %lu languages.\n", count);
+ TRACE("Adding %Iu languages.\n", count);
initial_count = script->language_count;
for (i = 0; i < count; ++i)
diff --git a/dlls/gdi32/uniscribe/usp10.c b/dlls/gdi32/uniscribe/usp10.c
index cceb9dcb48a..a5637dbf645 100644
--- a/dlls/gdi32/uniscribe/usp10.c
+++ b/dlls/gdi32/uniscribe/usp10.c
@@ -864,7 +864,7 @@ static DWORD decode_surrogate_pair(const WCHAR *str, unsigned int index, unsigne
if (index < end-1 && IS_SURROGATE_PAIR(str[index],str[index+1]))
{
DWORD ch = 0x10000 + ((str[index] - 0xd800) << 10) + (str[index+1] - 0xdc00);
- TRACE("Surrogate Pair %x %x => %x\n",str[index], str[index+1], ch);
+ TRACE("Surrogate Pair %x %x => %lx\n",str[index], str[index+1], ch);
return ch;
}
return 0;
@@ -1125,7 +1125,7 @@ HRESULT WINAPI ScriptRecordDigitSubstitution(LCID locale, SCRIPT_DIGITSUBSTITUTE
{
DWORD plgid, sub;
- TRACE("0x%x, %p\n", locale, sds);
+ TRACE("0x%lx, %p\n", locale, sds);
/* This implementation appears to be correct for all languages, but it's
* not clear if sds->DigitSubstitute is ever set to anything except
@@ -1908,7 +1908,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString,
BYTE *BidiLevel;
WCHAR *iString = NULL;
- TRACE("(%p,%p,%d,%d,%d,0x%x,%d,%p,%p,%p,%p,%p,%p)\n",
+ TRACE("(%p,%p,%d,%d,%d,0x%lx,%d,%p,%p,%p,%p,%p,%p)\n",
hdc, pString, cString, cGlyphs, iCharset, dwFlags, iReqWidth,
psControl, psState, piDx, pTabdef, pbInClass, pssa);
@@ -2251,7 +2251,7 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa,
&analysis->glyphs[iItem].piAdvance[iGlyph], NULL,
&analysis->glyphs[iItem].pGoffset[iGlyph]);
- TRACE("ScriptTextOut hr=%08x\n", hr);
+ TRACE("ScriptTextOut hr=%08lx\n", hr);
if (fSelected)
{
@@ -3000,7 +3000,7 @@ HRESULT WINAPI ScriptIsComplex(const WCHAR *chars, int len, DWORD flag)
enum usp10_script script;
unsigned int i, consumed;
- TRACE("(%s,%d,0x%x)\n", debugstr_wn(chars, len), len, flag);
+ TRACE("(%s,%d,0x%lx)\n", debugstr_wn(chars, len), len, flag);
if (!chars || len < 0)
return E_INVALIDARG;
@@ -3481,7 +3481,7 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars
HRESULT hr;
int i;
- TRACE("(%p,%p,%s,%d,0x%x,%p)\n", hdc, psc, debugstr_wn(pwcInChars, cChars),
+ TRACE("(%p,%p,%s,%d,0x%lx,%p)\n", hdc, psc, debugstr_wn(pwcInChars, cChars),
cChars, dwFlags, pwOutGlyphs);
if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr;
More information about the wine-devel
mailing list