mirror of
https://github.com/reactos/reactos.git
synced 2024-06-28 08:51:29 +00:00
[GDIPLUS_WINETEST] Make tests pass on Windows 2003
This commit is contained in:
parent
49246541de
commit
78a31ce423
|
@ -5659,7 +5659,12 @@ static void test_tiff_color_formats(void)
|
||||||
|
|
||||||
image = load_image(buf, sizeof(buf), TRUE, FALSE);
|
image = load_image(buf, sizeof(buf), TRUE, FALSE);
|
||||||
if (!td[i].format)
|
if (!td[i].format)
|
||||||
|
#ifdef __REACTOS__
|
||||||
|
ok(!image || (((GetVersion() & 0xFF) < 6) &&
|
||||||
|
(i == 19 || i == 20)),
|
||||||
|
#else
|
||||||
ok(!image,
|
ok(!image,
|
||||||
|
#endif
|
||||||
"%u: (%d,%d,%d) TIFF image loading should have failed\n", i, td[i].photometric, td[i].samples, td[i].bps);
|
"%u: (%d,%d,%d) TIFF image loading should have failed\n", i, td[i].photometric, td[i].samples, td[i].bps);
|
||||||
else
|
else
|
||||||
ok(image != NULL || broken(!image) /* XP */, "%u: failed to load TIFF image data (%d,%d,%d)\n",
|
ok(image != NULL || broken(!image) /* XP */, "%u: failed to load TIFF image data (%d,%d,%d)\n",
|
||||||
|
@ -5672,7 +5677,20 @@ static void test_tiff_color_formats(void)
|
||||||
|
|
||||||
status = GdipGetImagePixelFormat(image, &format);
|
status = GdipGetImagePixelFormat(image, &format);
|
||||||
expect(Ok, status);
|
expect(Ok, status);
|
||||||
|
#ifdef __REACTOS__
|
||||||
|
ok(format == td[i].format || (((GetVersion() & 0xFF) < 6) &&
|
||||||
|
((i == 0 && format == 0) ||
|
||||||
|
(i == 1 && format == 0) ||
|
||||||
|
(i == 5 && format == 0) ||
|
||||||
|
(i == 6 && format == 0) ||
|
||||||
|
(i == 13 && format == 0) ||
|
||||||
|
(i == 19 && format == PixelFormat32bppARGB) ||
|
||||||
|
(i == 20 && format == PixelFormat32bppARGB) ||
|
||||||
|
(i == 21 && format == PixelFormat32bppARGB) ||
|
||||||
|
(i == 22 && format == PixelFormat32bppARGB))),
|
||||||
|
#else
|
||||||
ok(format == td[i].format,
|
ok(format == td[i].format,
|
||||||
|
#endif
|
||||||
"%u: expected %#x, got %#x\n", i, td[i].format, format);
|
"%u: expected %#x, got %#x\n", i, td[i].format, format);
|
||||||
|
|
||||||
GdipDisposeImage(image);
|
GdipDisposeImage(image);
|
||||||
|
|
Loading…
Reference in a new issue