[PATCH 07/27] dlls/gdiplus/tests: enable compilation with long types
Eric Pouech
eric.pouech at gmail.com
Mon Feb 28 01:25:56 CST 2022
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
---
dlls/gdiplus/tests/Makefile.in | 1
dlls/gdiplus/tests/brush.c | 2 -
dlls/gdiplus/tests/font.c | 30 ++++----
dlls/gdiplus/tests/graphics.c | 14 ++--
dlls/gdiplus/tests/image.c | 160 ++++++++++++++++++++--------------------
dlls/gdiplus/tests/metafile.c | 14 ++--
dlls/gdiplus/tests/pen.c | 2 -
dlls/gdiplus/tests/region.c | 78 ++++++++++----------
8 files changed, 150 insertions(+), 151 deletions(-)
diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in
index 6b6033d8676..ef3f26d9082 100644
--- a/dlls/gdiplus/tests/Makefile.in
+++ b/dlls/gdiplus/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = gdiplus.dll
IMPORTS = gdiplus ole32 user32 gdi32
diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c
index fd4116240d4..2634b5cd67b 100644
--- a/dlls/gdiplus/tests/brush.c
+++ b/dlls/gdiplus/tests/brush.c
@@ -28,7 +28,7 @@
#define expect(expected,got) expect_(__LINE__, expected, got)
static inline void expect_(unsigned line, DWORD expected, DWORD got)
{
- ok_(__FILE__, line)(expected == got, "Expected %.8d, got %.8d\n", expected, got);
+ ok_(__FILE__, line)(expected == got, "Expected %.8ld, got %.8ld\n", expected, got);
}
#define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got)
diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index 3fe123e25c4..ccdb7a2ef96 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -28,10 +28,10 @@
#define expect(expected,got) expect_inline(__LINE__, expected, got)
static inline void expect_inline(unsigned line, DWORD expected, DWORD got)
{
- ok_(__FILE__, line)(expected == got, "Expected %d, got %d\n", expected, got);
+ ok_(__FILE__, line)(expected == got, "Expected %ld, got %ld\n", expected, got);
}
-#define expect_(expected, got, precision) ok(abs((expected) - (got)) <= (precision), "Expected %d, got %d\n", (expected), (got))
+#define expect_(expected, got, precision) ok(abs((expected) - (got)) <= (precision), "Expected %d, got %ld\n", (expected), (got))
#define expectf_(expected, got, precision) ok(fabs((expected) - (got)) <= (precision), "Expected %f, got %f\n", (expected), (got))
#define expectf(expected, got) expectf_((expected), (got), 0.001)
@@ -54,7 +54,7 @@ static void create_testfontfile(const WCHAR *filename, int resource, WCHAR pathW
lstrcatW(pathW, filename);
file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);
- ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", wine_dbgstr_w(pathW), GetLastError());
+ ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %ld\n", wine_dbgstr_w(pathW), GetLastError());
res = FindResourceA(GetModuleHandleA(NULL), MAKEINTRESOURCEA(resource), (LPCSTR)RT_RCDATA);
ok(res != 0, "couldn't find resource\n");
@@ -68,7 +68,7 @@ static void create_testfontfile(const WCHAR *filename, int resource, WCHAR pathW
static void _delete_testfontfile(const WCHAR *filename, int line)
{
BOOL ret = DeleteFileW(filename);
- ok_(__FILE__,line)(ret, "failed to delete file %s, error %d\n", wine_dbgstr_w(filename), GetLastError());
+ ok_(__FILE__,line)(ret, "failed to delete file %s, error %ld\n", wine_dbgstr_w(filename), GetLastError());
}
static void test_long_name(void)
@@ -752,14 +752,14 @@ static void test_font_metrics(void)
gdip_get_font_metrics(font, &fm_gdip);
trace("gdiplus:\n");
- trace("%s,%d: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n",
+ trace("%s,%ld: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n",
wine_dbgstr_w(lf.lfFaceName), lf.lfHeight,
fm_gdip.em_height, fm_gdip.line_spacing, fm_gdip.ascent, fm_gdip.descent,
fm_gdip.font_height, fm_gdip.font_size);
gdi_get_font_metrics(&lf, &fm_gdi);
trace("gdi:\n");
- trace("%s,%d: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n",
+ trace("%s,%ld: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n",
wine_dbgstr_w(lf.lfFaceName), lf.lfHeight,
fm_gdi.em_height, fm_gdi.line_spacing, fm_gdi.ascent, fm_gdi.descent,
fm_gdi.font_height, fm_gdi.font_size);
@@ -768,10 +768,10 @@ static void test_font_metrics(void)
stat = GdipGetLogFontW(font, graphics, &lf);
expect(Ok, stat);
- ok(lf.lfHeight < 0, "lf.lfHeight should be negative, got %d\n", lf.lfHeight);
+ ok(lf.lfHeight < 0, "lf.lfHeight should be negative, got %ld\n", lf.lfHeight);
gdi_get_font_metrics(&lf, &fm_gdi);
trace("gdi:\n");
- trace("%s,%d: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n",
+ trace("%s,%ld: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n",
wine_dbgstr_w(lf.lfFaceName), lf.lfHeight,
fm_gdi.em_height, fm_gdi.line_spacing, fm_gdi.ascent, fm_gdi.descent,
fm_gdi.font_height, fm_gdi.font_size);
@@ -793,14 +793,14 @@ static void test_font_metrics(void)
gdip_get_font_metrics(font, &fm_gdip);
trace("gdiplus:\n");
- trace("%s,%d: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n",
+ trace("%s,%ld: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n",
wine_dbgstr_w(lf.lfFaceName), lf.lfHeight,
fm_gdip.em_height, fm_gdip.line_spacing, fm_gdip.ascent, fm_gdip.descent,
fm_gdip.font_height, fm_gdip.font_size);
gdi_get_font_metrics(&lf, &fm_gdi);
trace("gdi:\n");
- trace("%s,%d: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n",
+ trace("%s,%ld: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n",
wine_dbgstr_w(lf.lfFaceName), lf.lfHeight,
fm_gdi.em_height, fm_gdi.line_spacing, fm_gdi.ascent, fm_gdi.descent,
fm_gdi.font_height, fm_gdi.font_size);
@@ -809,10 +809,10 @@ static void test_font_metrics(void)
stat = GdipGetLogFontW(font, graphics, &lf);
expect(Ok, stat);
- ok(lf.lfHeight < 0, "lf.lfHeight should be negative, got %d\n", lf.lfHeight);
+ ok(lf.lfHeight < 0, "lf.lfHeight should be negative, got %ld\n", lf.lfHeight);
gdi_get_font_metrics(&lf, &fm_gdi);
trace("gdi:\n");
- trace("%s,%d: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n",
+ trace("%s,%ld: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n",
wine_dbgstr_w(lf.lfFaceName), lf.lfHeight,
fm_gdi.em_height, fm_gdi.line_spacing, fm_gdi.ascent, fm_gdi.descent,
fm_gdi.font_height, fm_gdi.font_size);
@@ -831,17 +831,17 @@ static void test_font_metrics(void)
gdip_get_font_metrics(font, &fm_gdip);
trace("gdiplus:\n");
- trace("%s,%d: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n",
+ trace("%s,%ld: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n",
wine_dbgstr_w(lf.lfFaceName), lf.lfHeight,
fm_gdip.em_height, fm_gdip.line_spacing, fm_gdip.ascent, fm_gdip.descent,
fm_gdip.font_height, fm_gdip.font_size);
stat = GdipGetLogFontW(font, graphics, &lf);
expect(Ok, stat);
- ok(lf.lfHeight < 0, "lf.lfHeight should be negative, got %d\n", lf.lfHeight);
+ ok(lf.lfHeight < 0, "lf.lfHeight should be negative, got %ld\n", lf.lfHeight);
gdi_get_font_metrics(&lf, &fm_gdi);
trace("gdi:\n");
- trace("%s,%d: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n",
+ trace("%s,%ld: EmHeight %u, LineSpacing %u, CellAscent %u, CellDescent %u, FontHeight %f, FontSize %f\n",
wine_dbgstr_w(lf.lfFaceName), lf.lfHeight,
fm_gdi.em_height, fm_gdi.line_spacing, fm_gdi.ascent, fm_gdi.descent,
fm_gdi.font_height, fm_gdi.font_size);
diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c
index c8c31ce258b..0ee2b73c413 100644
--- a/dlls/gdiplus/tests/graphics.c
+++ b/dlls/gdiplus/tests/graphics.c
@@ -3178,7 +3178,7 @@ static void test_GdipGetNearestColor(void)
todo_wine
ok(color == 0xffa8b8e8 ||
broken(color == 0xffa0b8e0), /* Win98/WinMe */
- "Expected ffa8b8e8, got %.8x\n", color);
+ "Expected ffa8b8e8, got %.8lx\n", color);
GdipDeleteGraphics(graphics);
GdipDisposeImage((GpImage*)bitmap);
@@ -3784,7 +3784,7 @@ static void test_GdipMeasureString(void)
height = units_to_pixels(font_size, td[i].unit, td[i].res_y);
if (td[i].unit != UnitDisplay)
height *= td[i].page_scale;
- ok(-lf.lfHeight == (LONG)(height + 0.5), "%u: expected %d (%f), got %d\n",
+ ok(-lf.lfHeight == (LONG)(height + 0.5), "%u: expected %ld (%f), got %ld\n",
i, (LONG)(height + 0.5), height, lf.lfHeight);
height = font_size + 2.0 * font_size / 6.0;
@@ -3865,7 +3865,7 @@ static void test_GdipMeasureString(void)
else
height = units_to_pixels(font_size, font_unit, td[i].res_y);
/*trace("%.1f font units = %f pixels with %.1f dpi, page_scale %.1f\n", font_size, height, td[i].res_y, td[i].page_scale);*/
- ok(-lf.lfHeight == (LONG)(height + 0.5), "%u: expected %d (%f), got %d\n",
+ ok(-lf.lfHeight == (LONG)(height + 0.5), "%u: expected %ld (%f), got %ld\n",
i, (LONG)(height + 0.5), height, lf.lfHeight);
if (td[i].unit == UnitDisplay || td[i].unit == UnitPixel)
@@ -3955,7 +3955,7 @@ static void test_GdipMeasureString(void)
lf.lfHeight = 0xdeadbeef;
status = GdipGetLogFontW(font, graphics, &lf);
expect(Ok, status);
- ok(lf.lfHeight == -100, "%u: expected -100, got %d\n", i, lf.lfHeight);
+ ok(lf.lfHeight == -100, "%u: expected -100, got %ld\n", i, lf.lfHeight);
set_rect_empty(&rc);
set_rect_empty(&bounds);
@@ -6421,7 +6421,7 @@ static DWORD* GetBitmapPixelBuffer(HDC hdc, HBITMAP hbmp, int width, int height)
bi.biClrImportant = 0;
lines = GetDIBits(hdc, hbmp, 0, height, buffer, (BITMAPINFO *)&bi, DIB_RGB_COLORS);
- ok(lines == height, "Expected GetDIBits:%p,%d->%d,%d\n", buffer, height, lines, GetLastError());
+ ok(lines == height, "Expected GetDIBits:%p,%d->%d,%ld\n", buffer, height, lines, GetLastError());
return buffer;
}
@@ -7204,7 +7204,7 @@ static void test_printer_dc(void)
rect.Width = pixel_per_unit_x;
rect.Height = pixel_per_unit_y;
match = check_rect_pixels(pixel, &rect, width, 0, &pt);
- ok(match, "Expected pixel (%u, %u) to be %08x, got %08x\n",
+ ok(match, "Expected pixel (%u, %u) to be %08x, got %08lx\n",
pt.X, pt.Y, 0, pixel[pt.X + pt.Y * width]);
/* pixels at (1, 1) should all be 0x00ffffff */
@@ -7213,7 +7213,7 @@ static void test_printer_dc(void)
rect.Width = pixel_per_unit_x;
rect.Height = pixel_per_unit_y;
match = check_rect_pixels(pixel, &rect, width, 0x00ffffff, &pt);
- ok(match, "Expected pixel (%u, %u) to be %08x, got %08x\n",
+ ok(match, "Expected pixel (%u, %u) to be %08x, got %08lx\n",
pt.X, pt.Y, 0x00ffffff, pixel[pt.X + pt.Y * width]);
GdipFree(pixel);
diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
index c52c90f6799..9e35cf33eb4 100644
--- a/dlls/gdiplus/tests/image.c
+++ b/dlls/gdiplus/tests/image.c
@@ -1234,7 +1234,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void)
{
BYTE clr = 255 - i;
ARGB argb = 0xff000000 | (clr << 16) | (clr << 8) | clr;
- ok(palette->Entries[i] == argb, "got %08x, expected %08x\n", palette->Entries[i], argb);
+ ok(palette->Entries[i] == argb, "got %08lx, expected %08lx\n", palette->Entries[i], argb);
}
GdipDisposeImage((GpImage*)gpbm);
@@ -1252,7 +1252,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void)
{
BYTE clr = 255 - i;
ARGB argb = 0xff000000 | (clr << 16) | (clr << 8) | clr;
- ok(palette->Entries[i] == argb, "got %08x, expected %08x\n", palette->Entries[i], argb);
+ ok(palette->Entries[i] == argb, "got %08lx, expected %08lx\n", palette->Entries[i], argb);
}
GdipDisposeImage((GpImage*)gpbm);
@@ -1513,7 +1513,7 @@ static void test_testcontrol(void)
param = 0;
stat = GdipTestControl(TestControlGetBuildNumber, ¶m);
expect(Ok, stat);
- ok(param != 0, "Build number expected, got %u\n", param);
+ ok(param != 0, "Build number expected, got %lu\n", param);
}
static void test_fromhicon(void)
@@ -1991,7 +1991,7 @@ static void test_createhbitmap(void)
if (bm.bmBits)
{
DWORD val = *(DWORD*)bm.bmBits;
- ok(val == 0xff686868, "got %x, expected 0xff686868\n", val);
+ ok(val == 0xff686868, "got %lx, expected 0xff686868\n", val);
}
hdc = CreateCompatibleDC(NULL);
@@ -2038,9 +2038,9 @@ static void test_createhbitmap(void)
if (bm.bmBits)
{
DWORD val = *(DWORD*)bm.bmBits;
- ok(val == 0x682a2a2a, "got %x, expected 0x682a2a2a\n", val);
+ ok(val == 0x682a2a2a, "got %lx, expected 0x682a2a2a\n", val);
val = *((DWORD*)bm.bmBits + (bm.bmHeight-1) * bm.bmWidthBytes/4 + 1);
- ok(val == 0x0, "got %x, expected 0x682a2a2a\n", val);
+ ok(val == 0x0, "got %lx, expected 0x682a2a2a\n", val);
}
hdc = CreateCompatibleDC(NULL);
@@ -2080,20 +2080,20 @@ static void test_createhbitmap(void)
if (bm.bmBits)
{
DWORD val = *(DWORD*)bm.bmBits;
- ok(val == 0x68c12ac1 || broken(val == 0x682a2ac1), "got %x, expected 0x68c12ac1\n", val);
+ ok(val == 0x68c12ac1 || broken(val == 0x682a2ac1), "got %lx, expected 0x68c12ac1\n", val);
val = *((DWORD*)bm.bmBits + (bm.bmHeight-1) * bm.bmWidthBytes/4 + 1);
- ok(val == 0xff00ff || broken(val == 0xff), "got %x, expected 0xff00ff\n", val);
+ ok(val == 0xff00ff || broken(val == 0xff), "got %lx, expected 0xff00ff\n", val);
}
hdc = CreateCompatibleDC(NULL);
oldhbitmap = SelectObject(hdc, hbitmap);
pixel = GetPixel(hdc, 5, 5);
- ok(pixel == 0xc12ac1 || broken(pixel == 0xc12a2a), "got %x, expected 0xc12ac1\n", pixel);
+ ok(pixel == 0xc12ac1 || broken(pixel == 0xc12a2a), "got %lx, expected 0xc12ac1\n", pixel);
pixel = GetPixel(hdc, 1, 0);
- ok(pixel == 0xff00ff || broken(pixel == 0xff0000), "got %x, expected 0xff00ff\n", pixel);
+ ok(pixel == 0xff00ff || broken(pixel == 0xff0000), "got %lx, expected 0xff00ff\n", pixel);
pixel = GetPixel(hdc, 2, 0);
- ok(pixel == 0xb12ac1 || broken(pixel == 0xb12a2a), "got %x, expected 0xb12ac1\n", pixel);
+ ok(pixel == 0xb12ac1 || broken(pixel == 0xb12a2a), "got %lx, expected 0xb12ac1\n", pixel);
SelectObject(hdc, oldhbitmap);
DeleteDC(hdc);
@@ -2120,20 +2120,20 @@ static void test_createhbitmap(void)
if (bm.bmBits)
{
DWORD val = *(DWORD*)bm.bmBits;
- ok(val == 0x68c12ac1 || broken(val == 0x682a2ac1), "got %x, expected 0x68c12ac1\n", val);
+ ok(val == 0x68c12ac1 || broken(val == 0x682a2ac1), "got %lx, expected 0x68c12ac1\n", val);
val = *((DWORD*)bm.bmBits + (bm.bmHeight-1) * bm.bmWidthBytes/4 + 1);
- ok(val == 0xff00ff || broken(val == 0xff), "got %x, expected 0xff00ff\n", val);
+ ok(val == 0xff00ff || broken(val == 0xff), "got %lx, expected 0xff00ff\n", val);
}
hdc = CreateCompatibleDC(NULL);
oldhbitmap = SelectObject(hdc, hbitmap);
pixel = GetPixel(hdc, 5, 5);
- ok(pixel == 0xc12ac1 || broken(pixel == 0xc12a2a), "got %x, expected 0xc12ac1\n", pixel);
+ ok(pixel == 0xc12ac1 || broken(pixel == 0xc12a2a), "got %lx, expected 0xc12ac1\n", pixel);
pixel = GetPixel(hdc, 1, 0);
- ok(pixel == 0xff00ff || broken(pixel == 0xff0000), "got %x, expected 0xff00ff\n", pixel);
+ ok(pixel == 0xff00ff || broken(pixel == 0xff0000), "got %lx, expected 0xff00ff\n", pixel);
pixel = GetPixel(hdc, 2, 0);
- ok(pixel == 0xb12ac1 || broken(pixel == 0xb12a2a), "got %x, expected 0xb12ac1\n", pixel);
+ ok(pixel == 0xb12ac1 || broken(pixel == 0xb12a2a), "got %lx, expected 0xb12ac1\n", pixel);
SelectObject(hdc, oldhbitmap);
DeleteDC(hdc);
@@ -2354,7 +2354,7 @@ static void check_halftone_palette(ColorPalette *palette)
expected |= halftone_values[((i-40)/6)%6] << 8;
expected |= halftone_values[((i-40)/36)%6] << 16;
}
- ok(expected == palette->Entries[i], "Expected %.8x, got %.8x, i=%u/%u\n",
+ ok(expected == palette->Entries[i], "Expected %.8lx, got %.8lx, i=%u/%u\n",
expected, palette->Entries[i], i, palette->Count);
}
}
@@ -2662,7 +2662,7 @@ static void test_colormatrix(void)
stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color);
expect(Ok, stat);
- ok(color_match(0xeeff40cc, color, 3), "expected 0xeeff40cc, got 0x%08x\n", color);
+ ok(color_match(0xeeff40cc, color, 3), "expected 0xeeff40cc, got 0x%08lx\n", color);
/* Toggle NoOp */
stat = GdipSetImageAttributesNoOp(imageattr, ColorAdjustTypeDefault, FALSE);
@@ -2674,7 +2674,7 @@ static void test_colormatrix(void)
stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color);
expect(Ok, stat);
- ok(color_match(0xfefe40cc, color, 3), "expected 0xfefe40cc, got 0x%08x\n", color);
+ ok(color_match(0xfefe40cc, color, 3), "expected 0xfefe40cc, got 0x%08lx\n", color);
stat = GdipSetImageAttributesNoOp(imageattr, ColorAdjustTypeDefault, TRUE);
expect(Ok, stat);
@@ -2685,7 +2685,7 @@ static void test_colormatrix(void)
stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color);
expect(Ok, stat);
- ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08x\n", color);
+ ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08lx\n", color);
stat = GdipResetImageAttributes(imageattr, ColorAdjustTypeDefault);
expect(Ok, stat);
@@ -2699,7 +2699,7 @@ static void test_colormatrix(void)
stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color);
expect(Ok, stat);
- ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08x\n", color);
+ ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08lx\n", color);
stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1,
UnitPixel, imageattr, NULL, NULL);
@@ -2707,7 +2707,7 @@ static void test_colormatrix(void)
stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color);
expect(Ok, stat);
- ok(color_match(0xff40ccee, color, 1), "Expected ff40ccee, got %.8x\n", color);
+ ok(color_match(0xff40ccee, color, 1), "Expected ff40ccee, got %.8lx\n", color);
/* Disable adjustment, toggle NoOp */
stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault,
@@ -2723,7 +2723,7 @@ static void test_colormatrix(void)
stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color);
expect(Ok, stat);
- ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08x\n", color);
+ ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08lx\n", color);
stat = GdipSetImageAttributesNoOp(imageattr, ColorAdjustTypeDefault, TRUE);
expect(Ok, stat);
@@ -2734,7 +2734,7 @@ static void test_colormatrix(void)
stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color);
expect(Ok, stat);
- ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08x\n", color);
+ ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08lx\n", color);
/* Reset with NoOp on, enable adjustment. */
stat = GdipResetImageAttributes(imageattr, ColorAdjustTypeDefault);
@@ -2750,7 +2750,7 @@ static void test_colormatrix(void)
stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color);
expect(Ok, stat);
- ok(color_match(0xfff24ace, color, 3), "expected 0xfff24ace, got 0x%08x\n", color);
+ ok(color_match(0xfff24ace, color, 3), "expected 0xfff24ace, got 0x%08lx\n", color);
/* Now inhibit specific category. */
stat = GdipResetImageAttributes(imageattr, ColorAdjustTypeDefault);
@@ -2766,7 +2766,7 @@ static void test_colormatrix(void)
stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color);
expect(Ok, stat);
- ok(color_match(0xfffe41cc, color, 3), "expected 0xfffe41cc, got 0x%08x\n", color);
+ ok(color_match(0xfffe41cc, color, 3), "expected 0xfffe41cc, got 0x%08lx\n", color);
stat = GdipSetImageAttributesNoOp(imageattr, ColorAdjustTypeBitmap, TRUE);
expect(Ok, stat);
@@ -2777,7 +2777,7 @@ static void test_colormatrix(void)
stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color);
expect(Ok, stat);
- ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08x\n", color);
+ ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08lx\n", color);
stat = GdipSetImageAttributesNoOp(imageattr, ColorAdjustTypeBitmap, FALSE);
expect(Ok, stat);
@@ -2791,7 +2791,7 @@ static void test_colormatrix(void)
stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color);
expect(Ok, stat);
- ok(color_match(0xfff24ace, color, 3), "expected 0xfff24ace, got 0x%08x\n", color);
+ ok(color_match(0xfff24ace, color, 3), "expected 0xfff24ace, got 0x%08lx\n", color);
stat = GdipResetImageAttributes(imageattr, ColorAdjustTypeBitmap);
expect(Ok, stat);
@@ -2802,7 +2802,7 @@ static void test_colormatrix(void)
stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color);
expect(Ok, stat);
- ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08x\n", color);
+ ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08lx\n", color);
GdipDeleteGraphics(graphics);
GdipDisposeImage((GpImage*)bitmap1);
@@ -2864,7 +2864,7 @@ static void test_gamma(void)
stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color);
expect(Ok, stat);
- ok(color_match(0xff20ffff, color, 1), "Expected ff20ffff, got %.8x\n", color);
+ ok(color_match(0xff20ffff, color, 1), "Expected ff20ffff, got %.8lx\n", color);
stat = GdipResetImageAttributes(imageattr, ColorAdjustTypeDefault);
expect(Ok, stat);
@@ -2875,7 +2875,7 @@ static void test_gamma(void)
stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color);
expect(Ok, stat);
- ok(color_match(0xff80ffff, color, 1), "Expected ff80ffff, got %.8x\n", color);
+ ok(color_match(0xff80ffff, color, 1), "Expected ff80ffff, got %.8lx\n", color);
GdipDeleteGraphics(graphics);
GdipDisposeImage((GpImage*)bitmap1);
@@ -3166,7 +3166,7 @@ static void test_multiframegif(void)
expect(Ok, stat);
stat = GdipBitmapGetPixel(bmp, 2, 0, &color);
expect(Ok, stat);
- ok(color==0 || broken(color==0xff0000ff), "color = %x\n", color);
+ ok(color==0 || broken(color==0xff0000ff), "color = %lx\n", color);
if(color != 0) {
win_skip("broken animated gif support\n");
GdipDisposeImage((GpImage*)bmp);
@@ -3180,7 +3180,7 @@ static void test_multiframegif(void)
for(j=0; j<4; j++) {
stat = GdipBitmapGetPixel(bmp, j*2, 0, &color);
expect(Ok, stat);
- ok(gifanimation2_pixels[i%5][j] == color, "at %d,%d got %x, expected %x\n", i, j, color, gifanimation2_pixels[i%5][j]);
+ ok(gifanimation2_pixels[i%5][j] == color, "at %d,%d got %lx, expected %lx\n", i, j, color, gifanimation2_pixels[i%5][j]);
}
}
@@ -3363,7 +3363,7 @@ static void test_remaptable(void)
stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color);
expect(Ok, stat);
- ok(color_match(0xffff00ff, color, 1), "Expected ffff00ff, got %.8x\n", color);
+ ok(color_match(0xffff00ff, color, 1), "Expected ffff00ff, got %.8lx\n", color);
stat = GdipResetImageAttributes(imageattr, ColorAdjustTypeDefault);
expect(Ok, stat);
@@ -3374,7 +3374,7 @@ static void test_remaptable(void)
stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color);
expect(Ok, stat);
- ok(color_match(0xff00ff00, color, 1), "Expected ff00ff00, got %.8x\n", color);
+ ok(color_match(0xff00ff00, color, 1), "Expected ff00ff00, got %.8lx\n", color);
GdipDeleteGraphics(graphics);
GdipDisposeImage((GpImage*)bitmap1);
@@ -3433,19 +3433,19 @@ static void test_colorkey(void)
stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color);
expect(Ok, stat);
- ok(color_match(0x00000000, color, 1), "Expected 00000000, got %.8x\n", color);
+ ok(color_match(0x00000000, color, 1), "Expected 00000000, got %.8lx\n", color);
stat = GdipBitmapGetPixel(bitmap2, 0, 1, &color);
expect(Ok, stat);
- ok(color_match(0x00000000, color, 1), "Expected 00000000, got %.8x\n", color);
+ ok(color_match(0x00000000, color, 1), "Expected 00000000, got %.8lx\n", color);
stat = GdipBitmapGetPixel(bitmap2, 1, 0, &color);
expect(Ok, stat);
- ok(color_match(0x00000000, color, 1), "Expected 00000000, got %.8x\n", color);
+ ok(color_match(0x00000000, color, 1), "Expected 00000000, got %.8lx\n", color);
stat = GdipBitmapGetPixel(bitmap2, 1, 1, &color);
expect(Ok, stat);
- ok(color_match(0xffffffff, color, 1), "Expected ffffffff, got %.8x\n", color);
+ ok(color_match(0xffffffff, color, 1), "Expected ffffffff, got %.8lx\n", color);
stat = GdipResetImageAttributes(imageattr, ColorAdjustTypeDefault);
expect(Ok, stat);
@@ -3456,19 +3456,19 @@ static void test_colorkey(void)
stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color);
expect(Ok, stat);
- ok(color_match(0x20405060, color, 1), "Expected 20405060, got %.8x\n", color);
+ ok(color_match(0x20405060, color, 1), "Expected 20405060, got %.8lx\n", color);
stat = GdipBitmapGetPixel(bitmap2, 0, 1, &color);
expect(Ok, stat);
- ok(color_match(0x40506070, color, 1), "Expected 40506070, got %.8x\n", color);
+ ok(color_match(0x40506070, color, 1), "Expected 40506070, got %.8lx\n", color);
stat = GdipBitmapGetPixel(bitmap2, 1, 0, &color);
expect(Ok, stat);
- ok(color_match(0x60708090, color, 1), "Expected 60708090, got %.8x\n", color);
+ ok(color_match(0x60708090, color, 1), "Expected 60708090, got %.8lx\n", color);
stat = GdipBitmapGetPixel(bitmap2, 1, 1, &color);
expect(Ok, stat);
- ok(color_match(0xffffffff, color, 1), "Expected ffffffff, got %.8x\n", color);
+ ok(color_match(0xffffffff, color, 1), "Expected ffffffff, got %.8lx\n", color);
GdipDeleteGraphics(graphics);
@@ -3526,11 +3526,11 @@ static GpImage *load_image(const BYTE *image_data, UINT image_size, BOOL valid_d
GlobalUnlock(hmem);
hr = CreateStreamOnHGlobal(hmem, TRUE, &stream);
- ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr);
+ ok(hr == S_OK, "CreateStreamOnHGlobal error %#lx\n", hr);
if (hr != S_OK) return NULL;
refcount = obj_refcount(stream);
- ok(refcount == 1, "expected stream refcount 1, got %d\n", refcount);
+ ok(refcount == 1, "expected stream refcount 1, got %ld\n", refcount);
status = GdipLoadImageFromStream(stream, &image);
todo_wine_if(todo_load)
@@ -3550,25 +3550,25 @@ static GpImage *load_image(const BYTE *image_data, UINT image_size, BOOL valid_d
refcount = obj_refcount(stream);
if (image_type == ImageTypeBitmap)
- ok(refcount > 1, "expected stream refcount > 1, got %d\n", refcount);
+ ok(refcount > 1, "expected stream refcount > 1, got %ld\n", refcount);
else
- ok(refcount == 1, "expected stream refcount 1, got %d\n", refcount);
+ ok(refcount == 1, "expected stream refcount 1, got %ld\n", refcount);
old_refcount = refcount;
status = GdipCloneImage(image, &clone);
ok(status == Ok, "GdipCloneImage error %d\n", status);
refcount = obj_refcount(stream);
- ok(refcount == old_refcount, "expected stream refcount %d, got %d\n", old_refcount, refcount);
+ ok(refcount == old_refcount, "expected stream refcount %ld, got %ld\n", old_refcount, refcount);
status = GdipDisposeImage(clone);
ok(status == Ok, "GdipDisposeImage error %d\n", status);
refcount = obj_refcount(stream);
- ok(refcount == old_refcount, "expected stream refcount %d, got %d\n", old_refcount, refcount);
+ ok(refcount == old_refcount, "expected stream refcount %ld, got %ld\n", old_refcount, refcount);
refcount = IStream_Release(stream);
if (image_type == ImageTypeBitmap)
ok(refcount >= 1, "expected stream refcount != 0\n");
else
- ok(refcount == 0, "expected stream refcount 0, got %d\n", refcount);
+ ok(refcount == 0, "expected stream refcount 0, got %ld\n", refcount);
return image;
}
@@ -3701,7 +3701,7 @@ static void test_image_properties(void)
expect(Ok, status);
if (prop_count != 0)
ok(td[i].prop_id == prop_id[0] || td[i].prop_id2 == prop_id[0],
- " %u: expected property id %#x or %#x, got %#x\n",
+ " %u: expected property id %#x or %#x, got %#lx\n",
i, td[i].prop_id, td[i].prop_id2, prop_id[0]);
}
@@ -3734,7 +3734,7 @@ static void test_image_properties(void)
status = GdipGetPropertyItem(image, prop_id[0], prop_size, &item.data);
expect(Ok, status);
ok(prop_id[0] == item.data.id,
- "%u: expected property id %#x, got %#x\n", i, prop_id[0], item.data.id);
+ "%u: expected property id %#lx, got %#lx\n", i, prop_id[0], item.data.id);
}
}
@@ -3967,14 +3967,14 @@ static void test_tiff_properties(void)
looks broken since TypeFloat and TypeDouble now reported as
TypeUndefined, and signed types reported as unsigned. */
broken(prop_item->type == documented_type(td[i].type)),
- "%u: expected type %u, got %u\n", i, td[i].type, prop_item->type);
- ok(td[i].id == prop_item->id, "%u: expected id %#x, got %#x\n", i, td[i].id, prop_item->id);
+ "%u: expected type %lu, got %u\n", i, td[i].type, prop_item->type);
+ ok(td[i].id == prop_item->id, "%u: expected id %#lx, got %#lx\n", i, td[i].id, prop_item->id);
prop_size -= sizeof(*prop_item);
- ok(prop_item->length == prop_size, "%u: expected length %u, got %u\n", i, prop_size, prop_item->length);
+ ok(prop_item->length == prop_size, "%u: expected length %u, got %lu\n", i, prop_size, prop_item->length);
ok(td[i].length == prop_item->length || broken(td[i].id == 0xf00f && td[i].length == prop_item->length+1) /* XP */,
- "%u: expected length %u, got %u\n", i, td[i].length, prop_item->length);
+ "%u: expected length %lu, got %lu\n", i, td[i].length, prop_item->length);
ok(td[i].length == prop_size || broken(td[i].id == 0xf00f && td[i].length == prop_size+1) /* XP */,
- "%u: expected length %u, got %u\n", i, td[i].length, prop_size);
+ "%u: expected length %lu, got %u\n", i, td[i].length, prop_size);
if (td[i].length == prop_item->length)
{
int match = memcmp(td[i].value, prop_item->value, td[i].length) == 0;
@@ -3983,7 +3983,7 @@ static void test_tiff_properties(void)
{
UINT j;
BYTE *data = prop_item->value;
- trace("id %#x:", prop_item->id);
+ trace("id %#lx:", prop_item->id);
for (j = 0; j < prop_item->length; j++)
trace(" %02x", data[j]);
trace("\n");
@@ -4076,11 +4076,11 @@ static void test_GdipGetAllPropertyItems(void)
expect(Ok, status);
ok(prop_item->value == prop_item + 1, "expected item->value %p, got %p\n", prop_item + 1, prop_item->value);
ok(td[i].type == prop_item->type,
- "%u: expected type %u, got %u\n", i, td[i].type, prop_item->type);
- ok(td[i].id == prop_item->id, "%u: expected id %#x, got %#x\n", i, td[i].id, prop_item->id);
+ "%u: expected type %lu, got %u\n", i, td[i].type, prop_item->type);
+ ok(td[i].id == prop_item->id, "%u: expected id %#lx, got %#lx\n", i, td[i].id, prop_item->id);
size -= sizeof(*prop_item);
- ok(prop_item->length == size, "%u: expected length %u, got %u\n", i, size, prop_item->length);
- ok(td[i].length == prop_item->length, "%u: expected length %u, got %u\n", i, td[i].length, prop_item->length);
+ ok(prop_item->length == size, "%u: expected length %u, got %lu\n", i, size, prop_item->length);
+ ok(td[i].length == prop_item->length, "%u: expected length %lu, got %lu\n", i, td[i].length, prop_item->length);
if (td[i].length == prop_item->length)
{
int match = memcmp(td[i].value, prop_item->value, td[i].length) == 0;
@@ -4089,7 +4089,7 @@ static void test_GdipGetAllPropertyItems(void)
{
UINT j;
BYTE *data = prop_item->value;
- trace("id %#x:", prop_item->id);
+ trace("id %#lx:", prop_item->id);
for (j = 0; j < prop_item->length; j++)
trace(" %02x", data[j]);
trace("\n");
@@ -4140,9 +4140,9 @@ static void test_GdipGetAllPropertyItems(void)
ok(prop_item[i].value == item_data, "%u: expected value %p, got %p\n",
i, item_data, prop_item[i].value);
ok(td[i].type == prop_item[i].type,
- "%u: expected type %u, got %u\n", i, td[i].type, prop_item[i].type);
- ok(td[i].id == prop_item[i].id, "%u: expected id %#x, got %#x\n", i, td[i].id, prop_item[i].id);
- ok(td[i].length == prop_item[i].length, "%u: expected length %u, got %u\n", i, td[i].length, prop_item[i].length);
+ "%u: expected type %lu, got %u\n", i, td[i].type, prop_item[i].type);
+ ok(td[i].id == prop_item[i].id, "%u: expected id %#lx, got %#lx\n", i, td[i].id, prop_item[i].id);
+ ok(td[i].length == prop_item[i].length, "%u: expected length %lu, got %lu\n", i, td[i].length, prop_item[i].length);
if (td[i].length == prop_item[i].length)
{
int match = memcmp(td[i].value, prop_item[i].value, td[i].length) == 0;
@@ -4151,7 +4151,7 @@ static void test_GdipGetAllPropertyItems(void)
{
UINT j;
BYTE *data = prop_item[i].value;
- trace("id %#x:", prop_item[i].id);
+ trace("id %#lx:", prop_item[i].id);
for (j = 0; j < prop_item[i].length; j++)
trace(" %02x", data[j]);
trace("\n");
@@ -4206,8 +4206,8 @@ static void test_tiff_palette(void)
expect(2, palette.pal.Count);
if (palette.pal.Count == 2)
{
- ok(entries[0] == 0xff000000, "expected 0xff000000, got %#x\n", entries[0]);
- ok(entries[1] == 0xffffffff, "expected 0xffffffff, got %#x\n", entries[1]);
+ ok(entries[0] == 0xff000000, "expected 0xff000000, got %#lx\n", entries[0]);
+ ok(entries[1] == 0xffffffff, "expected 0xffffffff, got %#lx\n", entries[1]);
}
GdipDisposeImage(image);
@@ -4884,11 +4884,11 @@ static void test_gif_properties(void)
expect(Ok, status);
ok(prop_item->value == prop_item + 1, "expected item->value %p, got %p\n", prop_item + 1, prop_item->value);
ok(td[i].type == prop_item->type,
- "%u: expected type %u, got %u\n", i, td[i].type, prop_item->type);
- ok(td[i].id == prop_item->id, "%u: expected id %#x, got %#x\n", i, td[i].id, prop_item->id);
+ "%u: expected type %lu, got %u\n", i, td[i].type, prop_item->type);
+ ok(td[i].id == prop_item->id, "%u: expected id %#lx, got %#lx\n", i, td[i].id, prop_item->id);
size -= sizeof(*prop_item);
- ok(prop_item->length == size, "%u: expected length %u, got %u\n", i, size, prop_item->length);
- ok(td[i].length == prop_item->length, "%u: expected length %u, got %u\n", i, td[i].length, prop_item->length);
+ ok(prop_item->length == size, "%u: expected length %u, got %lu\n", i, size, prop_item->length);
+ ok(td[i].length == prop_item->length, "%u: expected length %lu, got %lu\n", i, td[i].length, prop_item->length);
if (td[i].length == prop_item->length)
{
int match = memcmp(td[i].value, prop_item->value, td[i].length) == 0;
@@ -4897,7 +4897,7 @@ static void test_gif_properties(void)
{
UINT j;
BYTE *data = prop_item->value;
- trace("id %#x:", prop_item->id);
+ trace("id %#lx:", prop_item->id);
for (j = 0; j < prop_item->length; j++)
trace(" %02x", data[j]);
trace("\n");
@@ -4948,9 +4948,9 @@ static void test_gif_properties(void)
ok(prop_item[i].value == item_data, "%u: expected value %p, got %p\n",
i, item_data, prop_item[i].value);
ok(td[i].type == prop_item[i].type,
- "%u: expected type %u, got %u\n", i, td[i].type, prop_item[i].type);
- ok(td[i].id == prop_item[i].id, "%u: expected id %#x, got %#x\n", i, td[i].id, prop_item[i].id);
- ok(td[i].length == prop_item[i].length, "%u: expected length %u, got %u\n", i, td[i].length, prop_item[i].length);
+ "%u: expected type %lu, got %u\n", i, td[i].type, prop_item[i].type);
+ ok(td[i].id == prop_item[i].id, "%u: expected id %#lx, got %#lx\n", i, td[i].id, prop_item[i].id);
+ ok(td[i].length == prop_item[i].length, "%u: expected length %lu, got %lu\n", i, td[i].length, prop_item[i].length);
if (td[i].length == prop_item[i].length)
{
int match = memcmp(td[i].value, prop_item[i].value, td[i].length) == 0;
@@ -4959,7 +4959,7 @@ static void test_gif_properties(void)
{
UINT j;
BYTE *data = prop_item[i].value;
- trace("id %#x:", prop_item[i].id);
+ trace("id %#lx:", prop_item[i].id);
for (j = 0; j < prop_item[i].length; j++)
trace(" %02x", data[j]);
trace("\n");
@@ -5185,7 +5185,7 @@ static void test_CloneBitmapArea(void)
> 0x17d ? 0xffffffff : 0xff000000;
match = color_match(color_orig, color_copy, 0x00);
- ok(match == TRUE, "Colors 0x%08x and 0x%08x do not match! (Conversion from %x to %x)\n",
+ ok(match == TRUE, "Colors 0x%08lx and 0x%08lx do not match! (Conversion from %x to %x)\n",
color_orig, color_copy, td[i].src_format, td[i].dst_format);
}
@@ -5229,7 +5229,7 @@ static void test_supported_encoders(void)
hmem = GlobalAlloc(GMEM_MOVEABLE | GMEM_NODISCARD, 16);
hr = CreateStreamOnHGlobal(hmem, TRUE, &stream);
- ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr);
+ ok(hr == S_OK, "CreateStreamOnHGlobal error %#lx\n", hr);
status = GdipSaveImageToStream((GpImage *)bm, stream, &clsid, NULL);
ok(status == Ok, "%s encoder, GdipSaveImageToStream error %d\n", wine_dbgstr_w(td[i].mime), status);
diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c
index 51193f76b6a..aa844a62ff9 100644
--- a/dlls/gdiplus/tests/metafile.c
+++ b/dlls/gdiplus/tests/metafile.c
@@ -28,7 +28,7 @@
#define expect(expected,got) expect_(__LINE__, expected, got)
static inline void expect_(unsigned line, DWORD expected, DWORD got)
{
- ok_(__FILE__, line)(expected == got, "Expected %.8d, got %.8d\n", expected, got);
+ ok_(__FILE__, line)(expected == got, "Expected %.8ld, got %.8ld\n", expected, got);
}
#define expectf_(expected, got, precision) ok(fabs((expected) - (got)) <= (precision), "Expected %f, got %f\n", (expected), (got))
#define expectf(expected, got) expectf_((expected), (got), 0.001)
@@ -64,14 +64,14 @@ static void check_record(int count, const char *desc, const struct emfplus_recor
todo_wine_if (expected->todo)
ok(expected->record_type == actual->record_type && (expected->flags == actual->flags ||
broken(expected->broken_flags == actual->flags)),
- "%s.%i: Expected record type 0x%x, got 0x%x. Expected flags %#x, got %#x.\n", desc, count,
+ "%s.%i: Expected record type 0x%lx, got 0x%lx. Expected flags %#lx, got %#lx.\n", desc, count,
expected->record_type, actual->record_type, expected->flags, actual->flags);
}
else
{
todo_wine_if (expected->todo)
ok(expected->record_type == actual->record_type,
- "%s.%i: Expected record type 0x%x, got 0x%x.\n", desc, count,
+ "%s.%i: Expected record type 0x%lx, got 0x%lx.\n", desc, count,
expected->record_type, actual->record_type);
}
}
@@ -136,7 +136,7 @@ static int CALLBACK enum_emf_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETAR
const EmfPlusRecordHeader *record = (const EmfPlusRecordHeader*)&comment->Data[offset];
ok(record->Size == record->DataSize + sizeof(EmfPlusRecordHeader),
- "%s: EMF+ record datasize %u and size %u mismatch\n", state->desc, record->DataSize, record->Size);
+ "%s: EMF+ record datasize %lu and size %lu mismatch\n", state->desc, record->DataSize, record->Size);
ok(offset + record->DataSize <= comment->cbData,
"%s: EMF+ record truncated\n", state->desc);
@@ -196,7 +196,7 @@ static int CALLBACK enum_emf_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETAR
}
else
{
- ok(0, "%s: Unexpected EMF 0x%x record\n", state->desc, lpEMFR->iType);
+ ok(0, "%s: Unexpected EMF 0x%lx record\n", state->desc, lpEMFR->iType);
}
return 1;
@@ -294,7 +294,7 @@ static BOOL CALLBACK play_metafile_proc(EmfPlusRecordType record_type, unsigned
todo_wine_if (state->expected[state->count].todo)
ok(state->expected[state->count].record_type == record_type,
- "%s.%i: expected record type 0x%x, got 0x%x\n", state->desc, state->count,
+ "%s.%i: expected record type 0x%lx, got 0x%x\n", state->desc, state->count,
state->expected[state->count].record_type, record_type);
state->count++;
}
@@ -3154,7 +3154,7 @@ static void test_unknownfontdecode(void)
lstrcatW(path, L"wine_testfont0.ttf");
file = CreateFileW(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);
- ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n",
+ ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %ld\n",
wine_dbgstr_w(path), GetLastError());
res = FindResourceA(GetModuleHandleA(NULL), MAKEINTRESOURCEA(testfont0_resnum),
diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c
index bfd4b233081..cd3e45f9b41 100644
--- a/dlls/gdiplus/tests/pen.c
+++ b/dlls/gdiplus/tests/pen.c
@@ -27,7 +27,7 @@
#define expect(expected,got) expect_(__LINE__, expected, got)
static inline void expect_(unsigned line, DWORD expected, DWORD got)
{
- ok_(__FILE__, line)(expected == got, "Expected %.8d, got %.8d\n", expected, got);
+ ok_(__FILE__, line)(expected == got, "Expected %.8ld, got %.8ld\n", expected, got);
}
#define expectf(expected, got) ok(fabs(got - expected) < 0.1, "Expected %.2f, got %.2f\n", expected, got)
diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c
index 04db033a7e0..7920afd8ef4 100644
--- a/dlls/gdiplus/tests/region.c
+++ b/dlls/gdiplus/tests/region.c
@@ -36,12 +36,12 @@
#define expect(expected,got) expect_(__LINE__, expected, got)
static inline void expect_(unsigned line, DWORD expected, DWORD got)
{
- ok_(__FILE__, line)(expected == got, "Expected %d, got %d\n", expected, got);
+ ok_(__FILE__, line)(expected == got, "Expected %ld, got %ld\n", expected, got);
}
#define expectf_(expected, got, precision) ok(fabs((expected) - (got)) < (precision), "Expected %f, got %f\n", (expected), (got))
#define expectf(expected, got) expectf_((expected), (got), 0.001)
-#define expect_magic(value) ok(broken(*(value) == RGNDATA_MAGIC) || *(value) == RGNDATA_MAGIC2, "Expected a known magic value, got %8x\n", *(value))
+#define expect_magic(value) ok(broken(*(value) == RGNDATA_MAGIC) || *(value) == RGNDATA_MAGIC2, "Expected a known magic value, got %8lx\n", *(value))
#define expect_dword(value, expected) expect((expected), *(value))
#define expect_float(value, expected) expectf((expected), *(FLOAT *)(value))
@@ -63,19 +63,19 @@ static void verify_region(HRGN hrgn, const RECT *rc)
ret = GetRegionData(hrgn, 0, NULL);
if (IsRectEmpty(rc))
- ok(ret == sizeof(rgn.data.rdh), "expected sizeof(rdh), got %u\n", ret);
+ ok(ret == sizeof(rgn.data.rdh), "expected sizeof(rdh), got %lu\n", ret);
else
- ok(ret == sizeof(rgn.data.rdh) + sizeof(RECT), "expected sizeof(rgn), got %u\n", ret);
+ ok(ret == sizeof(rgn.data.rdh) + sizeof(RECT), "expected sizeof(rgn), got %lu\n", ret);
if (!ret) return;
ret = GetRegionData(hrgn, sizeof(rgn), &rgn.data);
if (IsRectEmpty(rc))
- ok(ret == sizeof(rgn.data.rdh), "expected sizeof(rdh), got %u\n", ret);
+ ok(ret == sizeof(rgn.data.rdh), "expected sizeof(rdh), got %lu\n", ret);
else
- ok(ret == sizeof(rgn.data.rdh) + sizeof(RECT), "expected sizeof(rgn), got %u\n", ret);
+ ok(ret == sizeof(rgn.data.rdh) + sizeof(RECT), "expected sizeof(rgn), got %lu\n", ret);
- trace("size %u, type %u, count %u, rgn size %u, bound %s\n",
+ trace("size %lu, type %lu, count %lu, rgn size %lu, bound %s\n",
rgn.data.rdh.dwSize, rgn.data.rdh.iType,
rgn.data.rdh.nCount, rgn.data.rdh.nRgnSize,
wine_dbgstr_rect(&rgn.data.rdh.rcBound));
@@ -87,17 +87,17 @@ static void verify_region(HRGN hrgn, const RECT *rc)
wine_dbgstr_rect(rc), wine_dbgstr_rect(rect));
}
- ok(rgn.data.rdh.dwSize == sizeof(rgn.data.rdh), "expected sizeof(rdh), got %u\n", rgn.data.rdh.dwSize);
- ok(rgn.data.rdh.iType == RDH_RECTANGLES, "expected RDH_RECTANGLES, got %u\n", rgn.data.rdh.iType);
+ ok(rgn.data.rdh.dwSize == sizeof(rgn.data.rdh), "expected sizeof(rdh), got %lu\n", rgn.data.rdh.dwSize);
+ ok(rgn.data.rdh.iType == RDH_RECTANGLES, "expected RDH_RECTANGLES, got %lu\n", rgn.data.rdh.iType);
if (IsRectEmpty(rc))
{
- ok(rgn.data.rdh.nCount == 0, "expected 0, got %u\n", rgn.data.rdh.nCount);
- ok(rgn.data.rdh.nRgnSize == 0, "expected 0, got %u\n", rgn.data.rdh.nRgnSize);
+ ok(rgn.data.rdh.nCount == 0, "expected 0, got %lu\n", rgn.data.rdh.nCount);
+ ok(rgn.data.rdh.nRgnSize == 0, "expected 0, got %lu\n", rgn.data.rdh.nRgnSize);
}
else
{
- ok(rgn.data.rdh.nCount == 1, "expected 1, got %u\n", rgn.data.rdh.nCount);
- ok(rgn.data.rdh.nRgnSize == sizeof(RECT), "expected sizeof(RECT), got %u\n", rgn.data.rdh.nRgnSize);
+ ok(rgn.data.rdh.nCount == 1, "expected 1, got %lu\n", rgn.data.rdh.nCount);
+ ok(rgn.data.rdh.nRgnSize == sizeof(RECT), "expected sizeof(RECT), got %lu\n", rgn.data.rdh.nRgnSize);
}
ok(EqualRect(&rgn.data.rdh.rcBound, rc), "expected %s, got %s\n",
wine_dbgstr_rect(rc), wine_dbgstr_rect(&rgn.data.rdh.rcBound));
@@ -146,11 +146,11 @@ static void test_region_data(DWORD *data, UINT size, INT line)
for (i = 0; i < size - 1; i++)
{
if (i == 1) continue; /* data[1] never matches */
- ok_(__FILE__, line)(data[i] == buf[i], "off %u: %#x != %#x\n", i, data[i], buf[i]);
+ ok_(__FILE__, line)(data[i] == buf[i], "off %u: %#lx != %#lx\n", i, data[i], buf[i]);
}
/* some Windows versions fail to properly clear the aligned DWORD */
ok_(__FILE__, line)(data[size - 1] == buf[size - 1] || broken(data[size - 1] != buf[size - 1]),
- "off %u: %#x != %#x\n", size - 1, data[size - 1], buf[size - 1]);
+ "off %u: %#lx != %#lx\n", size - 1, data[size - 1], buf[size - 1]);
GdipDeleteRegion(region);
}
@@ -191,7 +191,7 @@ static void test_getregiondata(void)
ok(status == Ok, "status %08x\n", status);
expect(20, needed);
expect_dword(buf, 12);
- trace("buf[1] = %08x\n", buf[1]);
+ trace("buf[1] = %08lx\n", buf[1]);
expect_magic(buf + 2);
expect_dword(buf + 3, 0);
expect_dword(buf + 4, RGNDATA_INFINITE_RECT);
@@ -209,7 +209,7 @@ static void test_getregiondata(void)
ok(status == Ok, "status %08x\n", status);
expect(20, needed);
expect_dword(buf, 12);
- trace("buf[1] = %08x\n", buf[1]);
+ trace("buf[1] = %08lx\n", buf[1]);
expect_magic(buf + 2);
expect_dword(buf + 3, 0);
expect_dword(buf + 4, RGNDATA_EMPTY_RECT);
@@ -227,7 +227,7 @@ static void test_getregiondata(void)
ok(status == Ok, "status %08x\n", status);
expect(20, needed);
expect_dword(buf, 12);
- trace("buf[1] = %08x\n", buf[1]);
+ trace("buf[1] = %08lx\n", buf[1]);
expect_magic(buf + 2);
expect_dword(buf + 3, 0);
expect_dword(buf + 4, RGNDATA_INFINITE_RECT);
@@ -252,7 +252,7 @@ static void test_getregiondata(void)
ok(status == Ok, "status %08x\n", status);
expect(36, needed);
expect_dword(buf, 28);
- trace("buf[1] = %08x\n", buf[1]);
+ trace("buf[1] = %08lx\n", buf[1]);
expect_magic(buf + 2);
expect_dword(buf + 3, 0);
expect_dword(buf + 4, RGNDATA_RECT);
@@ -308,7 +308,7 @@ static void test_getregiondata(void)
ok(status == Ok, "status %08x\n", status);
expect(156, needed);
expect_dword(buf, 148);
- trace("buf[1] = %08x\n", buf[1]);
+ trace("buf[1] = %08lx\n", buf[1]);
expect_magic(buf + 2);
expect_dword(buf + 3, 10);
expect_dword(buf + 4, CombineModeExclude);
@@ -371,7 +371,7 @@ static void test_getregiondata(void)
ok(status == Ok, "status %08x\n", status);
expect(72, needed);
expect_dword(buf, 64);
- trace("buf[1] = %08x\n", buf[1]);
+ trace("buf[1] = %08lx\n", buf[1]);
expect_magic(buf + 2);
expect_dword(buf + 3, 0);
expect_dword(buf + 4, RGNDATA_PATH);
@@ -406,7 +406,7 @@ static void test_getregiondata(void)
ok(status == Ok, "status %08x\n", status);
expect(96, needed);
expect_dword(buf, 88);
- trace("buf[1] = %08x\n", buf[1]);
+ trace("buf[1] = %08lx\n", buf[1]);
expect_magic(buf + 2);
expect_dword(buf + 3, 2);
expect_dword(buf + 4, CombineModeIntersect);
@@ -451,7 +451,7 @@ static void test_getregiondata(void)
expect(Ok, status);
expect(36, needed);
expect_dword(buf, 28);
- trace("buf[1] = %08x\n", buf[1]);
+ trace("buf[1] = %08lx\n", buf[1]);
expect_magic(buf + 2);
expect_dword(buf + 3, 0);
expect_dword(buf + 4, RGNDATA_PATH);
@@ -461,7 +461,7 @@ static void test_getregiondata(void)
expect_dword(buf + 7, 0);
/* flags 0 means that a path is an array of FLOATs */
ok(*(buf + 8) == 0x4000 /* before win7 */ || *(buf + 8) == 0,
- "expected 0x4000 or 0, got %08x\n", *(buf + 8));
+ "expected 0x4000 or 0, got %08lx\n", *(buf + 8));
expect_dword(buf + 10, 0xeeeeeeee);
test_region_data(buf, needed, __LINE__);
@@ -493,7 +493,7 @@ static void test_getregiondata(void)
expect(Ok, status);
expect(56, needed);
expect_dword(buf, 48);
- trace("buf[1] = %08x\n", buf[1]);
+ trace("buf[1] = %08lx\n", buf[1]);
expect_magic(buf + 2);
expect_dword(buf + 3 , 0);
expect_dword(buf + 4 , RGNDATA_PATH);
@@ -567,7 +567,7 @@ static void test_getregiondata(void)
expect(Ok, status);
expect(72, needed);
expect_dword(buf, 64);
- trace("buf[1] = %08x\n", buf[1]);
+ trace("buf[1] = %08lx\n", buf[1]);
expect_magic(buf + 2);
expect_dword(buf + 3, 0);
expect_dword(buf + 4, RGNDATA_PATH);
@@ -618,7 +618,7 @@ static void test_getregiondata(void)
expect(Ok, status);
expect(116, needed);
expect_dword(buf, 108);
- trace("buf[1] = %08x\n", buf[1]);
+ trace("buf[1] = %08lx\n", buf[1]);
expect_magic(buf + 2);
expect_dword(buf + 3, 2);
expect_dword(buf + 4, CombineModeUnion);
@@ -646,7 +646,7 @@ static void test_getregiondata(void)
expect_float(buf + 26, 70.2);
expect_dword(buf + 27, 0x01010100);
ok((*(buf + 28) & 0xffff) == 0x0101,
- "expected ????0101 got %08x\n", *(buf + 28));
+ "expected ????0101 got %08lx\n", *(buf + 28));
expect_dword(buf + 29, 0xeeeeeeee);
test_region_data(buf, needed, __LINE__);
@@ -672,7 +672,7 @@ static void test_getregiondata(void)
ok(status == Ok, "status %08x\n", status);
expect(56, needed);
expect_dword(buf, 48);
- trace("buf[1] = %08x\n", buf[1]);
+ trace("buf[1] = %08lx\n", buf[1]);
expect_magic(buf + 2);
expect_dword(buf + 3, 0);
expect_dword(buf + 4, RGNDATA_PATH);
@@ -716,7 +716,7 @@ static void test_getregiondata(void)
ok(status == Ok, "status %08x\n", status);
expect(72, needed);
expect_dword(buf, 64);
- trace("buf[1] = %08x\n", buf[1]);
+ trace("buf[1] = %08lx\n", buf[1]);
expect_magic(buf + 2);
expect_dword(buf + 3, 0);
expect_dword(buf + 4, RGNDATA_PATH);
@@ -762,7 +762,7 @@ static void test_getregiondata(void)
ok(status == Ok, "status %08x\n", status);
expect(136, needed);
expect_dword(buf, 128);
- trace("buf[1] = %08x\n", buf[1]);
+ trace("buf[1] = %08lx\n", buf[1]);
expect_magic(buf + 2);
expect_dword(buf + 3, 0);
expect_dword(buf + 4, RGNDATA_PATH);
@@ -796,7 +796,7 @@ static void test_getregiondata(void)
expect_dword(buf + 31, 0x03030300);
expect_dword(buf + 32, 0x03030301);
ok((*(buf + 33) & 0xffffff) == 0x030303,
- "expected 0x??030303 got %08x\n", *(buf + 33));
+ "expected 0x??030303 got %08lx\n", *(buf + 33));
expect_dword(buf + 34, 0xeeeeeeee);
test_region_data(buf, needed, __LINE__);
@@ -924,7 +924,7 @@ static void test_combinereplace(void)
expect(Ok, status);
expect(36, needed);
expect_dword(buf, 28);
- trace("buf[1] = %08x\n", buf[1]);
+ trace("buf[1] = %08lx\n", buf[1]);
expect_magic(buf + 2);
expect_dword(buf + 3, 0);
expect_dword(buf + 4, RGNDATA_RECT);
@@ -944,7 +944,7 @@ static void test_combinereplace(void)
expect(Ok, status);
expect(156, needed);
expect_dword(buf, 148);
- trace("buf[1] = %08x\n", buf[1]);
+ trace("buf[1] = %08lx\n", buf[1]);
expect_magic(buf + 2);
expect_dword(buf + 3, 0);
expect_dword(buf + 4, RGNDATA_PATH);
@@ -963,7 +963,7 @@ static void test_combinereplace(void)
expect(Ok, status);
expect(20, needed);
expect_dword(buf, 12);
- trace("buf[1] = %08x\n", buf[1]);
+ trace("buf[1] = %08lx\n", buf[1]);
expect_magic(buf + 2);
expect_dword(buf + 3, 0);
expect_dword(buf + 4, RGNDATA_INFINITE_RECT);
@@ -990,7 +990,7 @@ static void test_combinereplace(void)
expect(Ok, status);
expect(180, needed);
expect_dword(buf, 172);
- trace("buf[1] = %08x\n", buf[1]);
+ trace("buf[1] = %08lx\n", buf[1]);
expect_magic(buf + 2);
expect_dword(buf + 3, 2);
expect_dword(buf + 4, CombineModeUnion);
@@ -1449,14 +1449,14 @@ static void test_translate(void)
static DWORD get_region_type(GpRegion *region)
{
DWORD *data;
- DWORD size;
+ UINT size;
DWORD result;
DWORD status;
status = GdipGetRegionDataSize(region, &size);
expect(Ok, status);
data = GdipAlloc(size);
status = GdipGetRegionData(region, (BYTE*)data, size, NULL);
- ok(status == Ok || status == InsufficientBuffer, "unexpected status 0x%x\n", status);
+ ok(status == Ok || status == InsufficientBuffer, "unexpected status 0x%lx\n", status);
result = data[4];
GdipFree(data);
return result;
@@ -1597,7 +1597,7 @@ static void test_scans(void)
GpMatrix *matrix;
GpRectF rectf;
GpStatus status;
- ULONG count=80085;
+ UINT count=80085;
INT icount;
GpRectF scans[2];
GpRect scansi[2];
More information about the wine-devel
mailing list