wineps.drv: Win64 printf format warning fixes.
diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in
index 063d91d..998c47e 100644
--- a/dlls/wineps.drv/Makefile.in
+++ b/dlls/wineps.drv/Makefile.in
@@ -5,7 +5,6 @@
MODULE = wineps.drv
IMPORTS = user32 gdi32 winspool advapi32 kernel32
EXTRAINCL = @FREETYPEINCL@
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
SPEC_SRCS16 = wineps16.drv.spec
diff --git a/dlls/wineps.drv/bitblt.c b/dlls/wineps.drv/bitblt.c
index 0939688..375dc89 100644
--- a/dlls/wineps.drv/bitblt.c
+++ b/dlls/wineps.drv/bitblt.c
@@ -66,7 +66,7 @@
return TRUE;
}
default:
- FIXME("Unsupported rop %ld\n", dwRop);
+ FIXME("Unsupported rop %d\n", dwRop);
return FALSE;
}
}
diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c
index 6716d65..8307891 100644
--- a/dlls/wineps.drv/bitmap.c
+++ b/dlls/wineps.drv/bitmap.c
@@ -75,7 +75,7 @@
*compr = header->biCompression;
return TRUE;
default:
- ERR("(%ld): unknown/wrong size for header\n", header->biSize );
+ ERR("(%d): unknown/wrong size for header\n", header->biSize );
return FALSE;
}
}
@@ -243,7 +243,7 @@
widthbytes = get_dib_width_bytes(fullSrcWidth, bpp);
- TRACE("full size=%ldx%ld bpp=%d compression=%d rop=%08lx\n", fullSrcWidth,
+ TRACE("full size=%dx%d bpp=%d compression=%d rop=%08x\n", fullSrcWidth,
fullSrcHeight, bpp, compression, dwRop);
diff --git a/dlls/wineps.drv/brush.c b/dlls/wineps.drv/brush.c
index a149751..690e913 100644
--- a/dlls/wineps.drv/brush.c
+++ b/dlls/wineps.drv/brush.c
@@ -235,7 +235,7 @@
{
BITMAPINFO *bmi = GlobalLock16(logbrush.lbHatch);
UINT usage = logbrush.lbColor;
- TRACE("size %ldx%ldx%d\n", bmi->bmiHeader.biWidth,
+ TRACE("size %dx%dx%d\n", bmi->bmiHeader.biWidth,
bmi->bmiHeader.biHeight, bmi->bmiHeader.biBitCount);
if(physDev->pi->ppd->LanguageLevel > 1) {
PSDRV_WriteGSave(physDev);
diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c
index fe436da..cc36f84 100644
--- a/dlls/wineps.drv/builtin.c
+++ b/dlls/wineps.drv/builtin.c
@@ -67,7 +67,7 @@
USHORT usUnitsPerEm, usWinAscent, usWinDescent;
SHORT sAscender, sDescender, sLineGap, sAvgCharWidth;
- TRACE("'%s' %li\n", afm->FontName, lfHeight);
+ TRACE("'%s' %i\n", afm->FontName, lfHeight);
if (lfHeight < 0) /* match em height */
{
@@ -139,9 +139,9 @@
font->strikeoutPosition = tm->tmAscent / 2;
font->strikeoutThickness = font->underlineThickness;
- TRACE("Selected PS font '%s' size %d weight %ld.\n", afm->FontName,
+ TRACE("Selected PS font '%s' size %d weight %d.\n", afm->FontName,
font->size, tm->tmWeight );
- TRACE("H = %ld As = %ld Des = %ld IL = %ld EL = %ld\n", tm->tmHeight,
+ TRACE("H = %d As = %d Des = %d IL = %d EL = %d\n", tm->tmHeight,
tm->tmAscent, tm->tmDescent, tm->tmInternalLeading,
tm->tmExternalLeading);
}
@@ -296,7 +296,7 @@
if (needle == NULL)
{
- WARN("No glyph for U+%.4lX in %s\n", UV, afm->FontName);
+ WARN("No glyph for U+%.4X in %s\n", UV, afm->FontName);
needle = afm->Metrics;
}
@@ -336,7 +336,7 @@
if (lpnFit)
*lpnFit = nfit;
- TRACE("cx=%li cy=%li\n", size->cx, size->cy);
+ TRACE("cx=%i cy=%i\n", size->cx, size->cy);
return TRUE;
}
diff --git a/dlls/wineps.drv/color.c b/dlls/wineps.drv/color.c
index 983392a..9a7cdb7 100644
--- a/dlls/wineps.drv/color.c
+++ b/dlls/wineps.drv/color.c
@@ -94,7 +94,7 @@
float r, g, b;
if(ctype != 0 && ctype != 2)
- FIXME("Colour is %08lx\n", wincolor);
+ FIXME("Colour is %08x\n", wincolor);
r = (wincolor & 0xff) / 256.0;
g = ((wincolor >> 8) & 0xff) / 256.0;
@@ -133,4 +133,3 @@
physDev->font.set = FALSE;
return color;
}
-
diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c
index 6636065..e096bf6 100644
--- a/dlls/wineps.drv/driver.c
+++ b/dlls/wineps.drv/driver.c
@@ -334,7 +334,7 @@
PRINTERINFO *pi = PSDRV_FindPrinterInfo(lpszDevice);
if(!pi) return -1;
- TRACE("(Driver=%s, hwnd=%p, devOut=%p, Device='%s', Port='%s', devIn=%p, Profile='%s', Mode=%04lx)\n",
+ TRACE("(Driver=%s, hwnd=%p, devOut=%p, Device='%s', Port='%s', devIn=%p, Profile='%s', Mode=%04x)\n",
lpszDriver, hwnd, lpdmOutput, lpszDevice, lpszPort, lpdmInput, lpszProfile, dwMode);
/* If dwMode == 0, return size of DEVMODE structure */
@@ -343,7 +343,7 @@
/* If DM_MODIFY is set, change settings in accordance with lpdmInput */
if((dwMode & DM_MODIFY) && lpdmInput) {
- TRACE("DM_MODIFY set. devIn->dmFields = %08lx\n", lpdmInput->dmFields);
+ TRACE("DM_MODIFY set. devIn->dmFields = %08x\n", lpdmInput->dmFields);
PSDRV_MergeDevmodes(pi->Devmode, (PSDRV_DEVMODEA *)lpdmInput, pi);
}
@@ -556,7 +556,7 @@
ret = 0;
if(pi->ppd->DefaultDuplex && pi->ppd->DefaultDuplex->WinDuplex != 0)
ret = 1;
- TRACE("DC_DUPLEX: returning %ld\n", ret);
+ TRACE("DC_DUPLEX: returning %d\n", ret);
return ret;
case DC_EMF_COMPLIANT:
diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c
index ec4300d..3572084 100644
--- a/dlls/wineps.drv/escape.c
+++ b/dlls/wineps.drv/escape.c
@@ -89,7 +89,7 @@
{
DRAWPATRECT *dpr = (DRAWPATRECT*)in_data;
- FIXME("DRAWPATTERNRECT(pos (%ld,%ld), size %ldx%ld, style %d, pattern %x), stub!\n",
+ FIXME("DRAWPATTERNRECT(pos (%d,%d), size %dx%d, style %d, pattern %x), stub!\n",
dpr->ptPosition.x, dpr->ptPosition.y,
dpr->ptSize.x, dpr->ptSize.y,
dpr->wStyle, dpr->wPattern
@@ -101,7 +101,7 @@
BANDINFOSTRUCT *ibi = (BANDINFOSTRUCT*)in_data;
BANDINFOSTRUCT *obi = (BANDINFOSTRUCT*)out_data;
- FIXME("BANDINFO(graphics %d, text %d, rect [%ldx%ld-%ldx%ld]), stub!\n",
+ FIXME("BANDINFO(graphics %d, text %d, rect [%dx%d-%dx%d]), stub!\n",
ibi->GraphicsFlag,
ibi->TextFlag,
ibi->GraphicsRect.top,
@@ -121,7 +121,7 @@
r->top = 0;
r->right = physDev->horzRes;
r->bottom = physDev->vertRes;
- TRACE("NEXTBAND returning %ld,%ld - %ld,%ld\n", r->left, r->top, r->right, r->bottom );
+ TRACE("NEXTBAND returning %d,%d - %d,%d\n", r->left, r->top, r->right, r->bottom );
return 1;
}
r->left = 0;
@@ -224,7 +224,7 @@
WARN("cbInput != sizeof(RECT) (=%d) for SET_BOUNDS\n", cbInput);
return 0;
}
- TRACE("SET_BOUNDS (%ld,%ld) - (%ld,%ld)\n", r->left, r->top,
+ TRACE("SET_BOUNDS (%d,%d) - (%d,%d)\n", r->left, r->top,
r->right, r->bottom);
return 0;
}
diff --git a/dlls/wineps.drv/font.c b/dlls/wineps.drv/font.c
index dccbc85..9e0ae39 100644
--- a/dlls/wineps.drv/font.c
+++ b/dlls/wineps.drv/font.c
@@ -43,7 +43,7 @@
if (!GetObjectW( hfont, sizeof(lf), &lf )) return HGDI_ERROR;
- TRACE("FaceName = %s Height = %ld Italic = %d Weight = %ld\n",
+ TRACE("FaceName = %s Height = %d Italic = %d Weight = %d\n",
debugstr_w(lf.lfFaceName), lf.lfHeight, lf.lfItalic,
lf.lfWeight);
diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c
index 100400f..3fde02e 100644
--- a/dlls/wineps.drv/graphics.c
+++ b/dlls/wineps.drv/graphics.c
@@ -129,7 +129,7 @@
Office 2k when inserting eps files */
if(physDev->job.in_passthrough && !physDev->job.had_passthrough_rect && GetROP2(physDev->hdc) == R2_NOP) {
char buf[256];
- sprintf(buf, "N %ld %ld %ld %ld B\n", rect.right - rect.left, rect.bottom - rect.top, rect.left, rect.top);
+ sprintf(buf, "N %d %d %d %d B\n", rect.right - rect.left, rect.bottom - rect.top, rect.left, rect.top);
WriteSpool16(physDev->job.hJob, buf, strlen(buf));
physDev->job.had_passthrough_rect = TRUE;
return TRUE;
diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c
index 0ec109a..0868e22 100644
--- a/dlls/wineps.drv/init.c
+++ b/dlls/wineps.drv/init.c
@@ -120,7 +120,7 @@
*/
BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
{
- TRACE("(%p, %ld, %p)\n", hinst, reason, reserved);
+ TRACE("(%p, %d, %p)\n", hinst, reason, reserved);
switch(reason) {
@@ -219,7 +219,7 @@
physDev->Devmode->dmPublic.u1.s1.dmPaperLength *
physDev->logPixelsY / 254;
} else {
- FIXME("Odd dmFields %lx\n", physDev->Devmode->dmPublic.dmFields);
+ FIXME("Odd dmFields %x\n", physDev->Devmode->dmPublic.dmFields);
physDev->ImageableArea.left = 0;
physDev->ImageableArea.right = 0;
physDev->ImageableArea.bottom = 0;
@@ -228,7 +228,7 @@
physDev->PageSize.cy = 0;
}
- TRACE("ImageableArea = %ld,%ld - %ld,%ld: PageSize = %ldx%ld\n",
+ TRACE("ImageableArea = %d,%d - %d,%d: PageSize = %dx%d\n",
physDev->ImageableArea.left, physDev->ImageableArea.bottom,
physDev->ImageableArea.right, physDev->ImageableArea.top,
physDev->PageSize.cx, physDev->PageSize.cy);
@@ -572,7 +572,7 @@
}
if (OpenPrinterA (pi->FriendlyName, &hPrinter, NULL) == 0) {
- ERR ("OpenPrinterA failed with code %li\n", GetLastError ());
+ ERR ("OpenPrinterA failed with code %i\n", GetLastError ());
goto cleanup;
}
@@ -638,7 +638,7 @@
else
{
res = ERROR_FILE_NOT_FOUND;
- ERR ("Error %li getting PPD file name for printer '%s'\n", res, name);
+ ERR ("Error %i getting PPD file name for printer '%s'\n", res, name);
goto closeprinter;
}
ppdFileName = HeapAlloc( PSDRV_Heap, 0, strlen(data_dir) + strlen(filename) + 1 );
@@ -705,7 +705,7 @@
else if (res == ERROR_FILE_NOT_FOUND)
TRACE ("No 'Paper Size' for printer '%s'\n", name);
else {
- ERR ("GetPrinterDataA returned %li\n", res);
+ ERR ("GetPrinterDataA returned %i\n", res);
goto closeprinter;
}
@@ -731,7 +731,7 @@
else if (res == ERROR_MORE_DATA) {
pi->FontSubTable = HeapAlloc (PSDRV_Heap, 0, needed);
if (pi->FontSubTable == NULL) {
- ERR ("Failed to allocate %li bytes from heap\n", needed);
+ ERR ("Failed to allocate %i bytes from heap\n", needed);
goto closeprinter;
}
@@ -739,17 +739,17 @@
(LPBYTE) pi->FontSubTable, needed, &needed,
&pi->FontSubTableSize);
if (res != ERROR_SUCCESS) {
- ERR ("EnumPrinterDataExA returned %li\n", res);
+ ERR ("EnumPrinterDataExA returned %i\n", res);
goto closeprinter;
}
}
else {
- ERR("EnumPrinterDataExA returned %li\n", res);
+ ERR("EnumPrinterDataExA returned %i\n", res);
goto closeprinter;
}
if (ClosePrinter (hPrinter) == 0) {
- ERR ("ClosePrinter failed with code %li\n", GetLastError ());
+ ERR ("ClosePrinter failed with code %i\n", GetLastError ());
goto cleanup;
}
diff --git a/dlls/wineps.drv/pen.c b/dlls/wineps.drv/pen.c
index 5adcb27..ffe6d1f 100644
--- a/dlls/wineps.drv/pen.c
+++ b/dlls/wineps.drv/pen.c
@@ -61,7 +61,7 @@
HeapFree( GetProcessHeap(), 0, elp );
}
- TRACE("hpen = %p colour = %08lx\n", hpen, logpen.lopnColor);
+ TRACE("hpen = %p colour = %08x\n", hpen, logpen.lopnColor);
physDev->pen.width = logpen.lopnWidth.x;
if ((logpen.lopnStyle & PS_GEOMETRIC) || (physDev->pen.width > 1))
diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c
index 7d6fb7a..92ea9cc 100644
--- a/dlls/wineps.drv/ps.c
+++ b/dlls/wineps.drv/ps.c
@@ -192,7 +192,7 @@
"%s %d get\n";
static const char psarrayput[] =
-"%s %d %ld put\n";
+"%s %d %d put\n";
static const char psarraydef[] =
"/%s %d array def\n";
diff --git a/dlls/wineps.drv/type1.c b/dlls/wineps.drv/type1.c
index 06c71cc..bc161f1 100644
--- a/dlls/wineps.drv/type1.c
+++ b/dlls/wineps.drv/type1.c
@@ -204,7 +204,7 @@
"ND\n"
"end end\n";
- TRACE("%ld %s\n", index, glyph_name);
+ TRACE("%d %s\n", index, glyph_name);
assert(pdl->type == Type1);
t1 = pdl->typeinfo.Type1;
@@ -247,7 +247,7 @@
pph = (TTPOLYGONHEADER*)glyph_buf;
while((char*)pph < glyph_buf + len) {
- TRACE("contour len %ld\n", pph->cb);
+ TRACE("contour len %d\n", pph->cb);
ppc = (TTPOLYCURVE*)((char*)pph + sizeof(*pph));
str_add_point(charstring, &pph->pfxStart, &curpos);
@@ -285,7 +285,7 @@
buf = HeapAlloc(GetProcessHeap(), 0, sizeof(glyph_def_begin) +
strlen(pdl->ps_name) + strlen(glyph_name) + 100);
- sprintf(buf, "%%%%glyph %04lx\n", index);
+ sprintf(buf, "%%%%glyph %04x\n", index);
PSDRV_WriteSpool(physDev, buf, strlen(buf));
len = str_get_bytes(charstring, &bytes);
diff --git a/dlls/wineps.drv/type42.c b/dlls/wineps.drv/type42.c
index b4cbca9..27b4174 100644
--- a/dlls/wineps.drv/type42.c
+++ b/dlls/wineps.drv/type42.c
@@ -157,11 +157,11 @@
" currentdict end def\n"
" /sfnts [\n";
static const char TT_offset_table[] = "<00010000%04x%04x%04x%04x\n";
- static const char TT_table_dir_entry[] = "%08lx%08lx%08lx%08lx\n";
+ static const char TT_table_dir_entry[] = "%08x%08x%08x%08x\n";
static const char storage[] ="]\nhavetype42gdir{pop}{{string} forall}ifelse\n";
static const char end[] = "] def\n"
"havetype42gdir{/GlyphDirectory 256 dict def\n"
- " sfnts 0 get dup %ld (locx) putinterval %ld (glfx) putinterval}if\n"
+ " sfnts 0 get dup %d (locx) putinterval %d (glfx) putinterval}if\n"
"currentdict end dup /FontName get exch definefont pop\n";
@@ -187,7 +187,7 @@
t42->maxp_tab = i;
}
if(i < num_of_tables) {
- TRACE("Table %ld has length %ld. Will use Type 1 font instead.\n", i, t42->tables[i].len);
+ TRACE("Table %d has length %d. Will use Type 1 font instead.\n", i, t42->tables[i].len);
T42_free(t42);
return NULL;
}
@@ -262,7 +262,7 @@
PSDRV_WriteSpool(physDev, "[ ", 2);
for(i = 1; t42->glyf_blocks[i]; i++) {
- sprintf(buf,"%ld ", t42->glyf_blocks[i] - t42->glyf_blocks[i-1] + 1);
+ sprintf(buf,"%d ", t42->glyf_blocks[i] - t42->glyf_blocks[i-1] + 1);
/* again add one byte for old PostScript rips */
PSDRV_WriteSpool(physDev, buf, strlen(buf));
if(i % 8 == 0)
@@ -290,16 +290,16 @@
const char glyph_def[] =
"/%s findfont exch 1 index\n"
"havetype42gdir\n"
- "{/GlyphDirectory get begin %ld exch def end}\n"
+ "{/GlyphDirectory get begin %d exch def end}\n"
"{/sfnts get 4 index get 3 index 2 index putinterval pop}\n"
"ifelse\n"
"/CharStrings get\n"
"begin\n"
- " /%s %ld def\n"
+ " /%s %d def\n"
"end\n"
"pop pop\n";
- TRACE("%ld %s\n", index, glyph_name);
+ TRACE("%d %s\n", index, glyph_name);
assert(pdl->type == Type42);
t42 = pdl->typeinfo.Type42;
@@ -317,7 +317,7 @@
strlen(pdl->ps_name) + 100);
if(!get_glyf_pos(t42, index, &start, &end)) return FALSE;
- TRACE("start = %lx end = %lx\n", start, end);
+ TRACE("start = %x end = %x\n", start, end);
awidth = GET_BE_WORD(t42->tables[t42->hmtx_tab].data + index * 4);
lsb = GET_BE_WORD(t42->tables[t42->hmtx_tab].data + index * 4 + 2);
@@ -332,7 +332,7 @@
sg_flags = GET_BE_WORD(sg_start);
sg_index = GET_BE_WORD(sg_start + 2);
- TRACE("Sending subglyph %04lx for glyph %04lx\n", sg_index, index);
+ TRACE("Sending subglyph %04x for glyph %04x\n", sg_index, index);
get_glyph_name(physDev->hdc, sg_index, sg_name);
T42_download_glyph(physDev, pdl, sg_index, sg_name);
sg_start += 4;
@@ -353,7 +353,7 @@
if(start < t42->glyf_blocks[i]) break;
/* we don't have a string for the gdir and glyf tables, but we do have a
string for the TT header. So the offset we need is tables - 2 */
- sprintf(buf, "%ld %ld\n", t42->num_of_written_tables - 2 + i, start - t42->glyf_blocks[i-1]);
+ sprintf(buf, "%d %d\n", t42->num_of_written_tables - 2 + i, start - t42->glyf_blocks[i-1]);
PSDRV_WriteSpool(physDev, buf, strlen(buf));
PSDRV_WriteSpool(physDev, "<", 1);
