Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/gdiplus/tests/image.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 0b444effb1..9aed7919a7 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4397,7 +4397,7 @@ static void test_DrawImage_scale(void) { 1.2, PixelOffsetModeHalf, image_120_half, TRUE }, { 1.5, PixelOffsetModeHalf, image_150_half, TRUE }, { 1.8, PixelOffsetModeHalf, image_180 }, - { 2.0, PixelOffsetModeHalf, image_200_half, TRUE }, + { 2.0, PixelOffsetModeHalf, image_200_half }, { 2.5, PixelOffsetModeHalf, image_250_half, TRUE },
{ 0.8, PixelOffsetModeHighQuality, image_080 }, /* 21 */ @@ -4405,7 +4405,7 @@ static void test_DrawImage_scale(void) { 1.2, PixelOffsetModeHighQuality, image_120_half, TRUE }, { 1.5, PixelOffsetModeHighQuality, image_150_half, TRUE }, { 1.8, PixelOffsetModeHighQuality, image_180 }, - { 2.0, PixelOffsetModeHighQuality, image_200_half, TRUE }, + { 2.0, PixelOffsetModeHighQuality, image_200_half }, { 2.5, PixelOffsetModeHighQuality, image_250_half, TRUE }, }; BYTE src_2x1[6] = { 0x80,0x80,0x80,0x80,0x80,0x80 }; @@ -4450,15 +4450,15 @@ static void test_DrawImage_scale(void) expect(Ok, status);
match = memcmp(dst_8x1, td[i].image, sizeof(dst_8x1)) == 0; - todo_wine_if (!match && td[i].todo) - ok(match, "%d: data should match\n", i); + todo_wine_if (td[i].todo) + ok(match, "%d: data didn't match:", i); if (!match) { UINT i, size = sizeof(dst_8x1); const BYTE *bits = dst_8x1; for (i = 0; i < size; i++) - trace(" %02x", bits[i]); - trace("\n"); + printf(" %02x", bits[i]); + printf("\n"); } }
{ UINT i, size = sizeof(dst_8x1); const BYTE *bits = dst_8x1; for (i = 0; i < size; i++)
trace(" %02x", bits[i]);
trace("\n");
printf(" %02x", bits[i]);
}printf("\n"); }
Did you mean to include this part?
On 11/20/2017 01:21 PM, Vincent Povirk wrote:
{ UINT i, size = sizeof(dst_8x1); const BYTE *bits = dst_8x1; for (i = 0; i < size; i++)
trace(" %02x", bits[i]);
trace("\n");
printf(" %02x", bits[i]);
printf("\n"); } }
Did you mean to include this part?
Yes, to avoid the trace() prefix being printed before every number. I can submit this in a separate patch if that would be preferable.
Signed-off-by: Vincent Povirk vincent@codeweavers.com
Looks like we do that in some other tests, so I guess it's fine.
Zebediah Figura z.figura12@gmail.com writes:
On 11/20/2017 01:21 PM, Vincent Povirk wrote:
{ UINT i, size = sizeof(dst_8x1); const BYTE *bits = dst_8x1; for (i = 0; i < size; i++)
trace(" %02x", bits[i]);
trace("\n");
printf(" %02x", bits[i]);
printf("\n"); } }
Did you mean to include this part?
Yes, to avoid the trace() prefix being printed before every number. I can submit this in a separate patch if that would be preferable.
The problem is that this prints the data even in silent mode, and when there's no reported failure (because of the todo_wine). Printing into a buffer and then trace()ing it would be better.