Signed-off-by: Fabian Maurer dark.shadow4@web.de --- dlls/gdiplus/tests/customlinecap.c | 4 +-- dlls/gdiplus/tests/font.c | 40 ++++++++++----------- dlls/gdiplus/tests/graphics.c | 58 +++++++++++++++--------------- dlls/gdiplus/tests/image.c | 8 ++--- 4 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index e4ec329b935..26175ca8f66 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -283,12 +283,12 @@ static void test_create_adjustable_cap(void) ok(base == LineCapTriangle, "Unexpected base cap %d\n", base);
stat = GdipSetCustomLineCapBaseCap((GpCustomLineCap*)cap, LineCapSquare); -todo_wine + todo_wine ok(stat == Ok, "Unexpected return code, %d\n", stat);
stat = GdipGetCustomLineCapBaseCap((GpCustomLineCap*)cap, &base); ok(stat == Ok, "Unexpected return code, %d\n", stat); -todo_wine + todo_wine ok(base == LineCapSquare, "Unexpected base cap %d\n", base);
/* Base inset */ diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 031e4688c6c..d8f8a474742 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -934,7 +934,7 @@ static void test_font_substitution(void) lstrcpyA(lf.lfFaceName, "ThisFontShouldNotExist"); font = NULL; status = GdipCreateFontFromLogfontA(hdc, &lf, &font); -todo_wine + todo_wine ok(status == NotTrueTypeFont || broken(status == FileNotFound), /* before XP */ "expected NotTrueTypeFont, got %d\n", status); /* FIXME: remove when wine is fixed */ @@ -944,7 +944,7 @@ todo_wine lf.lfFaceName[0] = 0; font = NULL; status = GdipCreateFontFromLogfontA(hdc, &lf, &font); -todo_wine + todo_wine ok(status == NotTrueTypeFont || broken(status == FileNotFound), /* before XP */ "expected NotTrueTypeFont, got %d\n", status); /* FIXME: remove when wine is fixed */ @@ -1009,7 +1009,7 @@ static void test_font_transform(void) expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine + todo_wine expectf(height + margin_y, bounds.Height); set_rect_empty(&rect); set_rect_empty(&bounds); @@ -1053,7 +1053,7 @@ todo_wine expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine + todo_wine expectf(height + margin_y, bounds.Height); set_rect_empty(&rect); set_rect_empty(&bounds); @@ -1074,9 +1074,9 @@ todo_wine DriverStringOptionsCmapLookup, matrix, &bounds); expect(Ok, status); expectf(0.0, bounds.X); -todo_wine + todo_wine expectf_(-300.0, bounds.Y, 0.15); -todo_wine + todo_wine expectf(height * 3.0, bounds.Height);
/* scale + ratate matrix */ @@ -1099,7 +1099,7 @@ todo_wine expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine + todo_wine expectf(height + margin_y, bounds.Height); set_rect_empty(&rect); set_rect_empty(&bounds); @@ -1119,11 +1119,11 @@ todo_wine status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, matrix, &bounds); expect(Ok, status); -todo_wine + todo_wine expectf_(-43.814377, bounds.X, 0.05); -todo_wine + todo_wine expectf_(-212.235611, bounds.Y, 0.05); -todo_wine + todo_wine expectf_(340.847534, bounds.Height, 0.05);
/* scale + ratate + shear matrix */ @@ -1133,7 +1133,7 @@ todo_wine expect(Ok, status); status = GdipGetLogFontA(font, graphics, &lf); expect(Ok, status); -todo_wine + todo_wine expect(1032, lf.lfHeight); expect(0, lf.lfWidth); expect_(3099, lf.lfEscapement, 1); @@ -1147,7 +1147,7 @@ todo_wine expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine + todo_wine expectf(height + margin_y, bounds.Height); set_rect_empty(&rect); set_rect_empty(&bounds); @@ -1167,11 +1167,11 @@ todo_wine status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, matrix, &bounds); expect(Ok, status); -todo_wine + todo_wine expectf_(-636.706848, bounds.X, 0.05); -todo_wine + todo_wine expectf_(-175.257523, bounds.Y, 0.05); -todo_wine + todo_wine expectf_(1532.984985, bounds.Height, 0.05);
/* scale + ratate + shear + translate matrix */ @@ -1181,7 +1181,7 @@ todo_wine expect(Ok, status); status = GdipGetLogFontA(font, graphics, &lf); expect(Ok, status); -todo_wine + todo_wine expect(1032, lf.lfHeight); expect(0, lf.lfWidth); expect_(3099, lf.lfEscapement, 1); @@ -1195,7 +1195,7 @@ todo_wine expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine + todo_wine expectf(height + margin_y, bounds.Height); set_rect_empty(&rect); set_rect_empty(&bounds); @@ -1215,11 +1215,11 @@ todo_wine status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, matrix, &bounds); expect(Ok, status); -todo_wine + todo_wine expectf_(-626.706848, bounds.X, 0.05); -todo_wine + todo_wine expectf_(-155.257523, bounds.Y, 0.05); -todo_wine + todo_wine expectf_(1532.984985, bounds.Height, 0.05);
GdipDeleteMatrix(matrix); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index d0454edb4a4..690efa8ac1e 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3803,7 +3803,7 @@ static void test_GdipMeasureString(void)
expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine + todo_wine expectf_(height, bounds.Height, height / 100.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.1); expect(7, chars); @@ -3820,7 +3820,7 @@ todo_wine expect(Ok, status); expectf(50.0, bounds.X); expectf(50.0, bounds.Y); -todo_wine + todo_wine expectf_(height, bounds.Height, height / 100.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.1); expect(7, chars); @@ -3892,7 +3892,7 @@ todo_wine
expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine + todo_wine expectf_(height, bounds.Height, height / 85.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.1); expect(7, chars); @@ -3909,7 +3909,7 @@ todo_wine expect(Ok, status); expectf(50.0, bounds.X); expectf(50.0, bounds.Y); -todo_wine + todo_wine expectf_(height, bounds.Height, height / 85.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.1); expect(7, chars); @@ -3921,7 +3921,7 @@ todo_wine height *= td[i].page_scale; /*trace("%u: unit %u, %.1fx%.1f dpi, scale %.1f, height %f, pixels %f\n", i, td[i].unit, td[i].res_x, td[i].res_y, td[i].page_scale, bounds.Height, height);*/ -todo_wine + todo_wine expectf_(100.0, height, 1.1);
status = GdipDeleteGraphics(graphics); @@ -4376,7 +4376,7 @@ static void test_font_height_scaling(void) status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, NULL, NULL); expect(Ok, status); /*trace("bounds: %f,%f,%f,%f\n", bounds.X, bounds.Y, bounds.Width, bounds.Height);*/ -todo_wine + todo_wine expectf_(font_height + margin_y, bounds.Height, 0.005);
ptf.X = 0; @@ -4384,14 +4384,14 @@ todo_wine status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, &ptf, 1); expect(Ok, status); match = fabs(100.0 - ptf.Y) <= 1.0; -todo_wine + todo_wine ok(match, "Expected 100.0, got %f\n", ptf.Y);
/* verify the result */ ptf.Y = units_to_pixels(bounds.Height, gfx_unit, dpi); ptf.Y /= 100.0; match = fabs(100.0 - ptf.Y) <= 1.0; -todo_wine + todo_wine ok(match, "Expected 100.0, got %f\n", ptf.Y);
/* bounds.width of 1 glyph: [margin]+[width]+[margin] */ @@ -4499,7 +4499,7 @@ static void test_measure_string(void) expectf(0.0, bounds.X); expectf(0.0, bounds.Y); expectf(width, bounds.Width); -todo_wine + todo_wine expectf(height / 2.0, bounds.Height);
range.First = 0; @@ -4519,7 +4519,7 @@ todo_wine expectf_(5.0 + margin_x, bounds.X, 1.0); expectf(5.0, bounds.Y); expectf_(width - margin_x*2.0, bounds.Width, 1.0); -todo_wine + todo_wine expectf_(height - margin_y, bounds.Height, 1.0);
width_rgn = bounds.Width; @@ -4575,7 +4575,7 @@ todo_wine expectf_(5.0 + margin_x, bounds.X, 1.0); expectf(5.0, bounds.Y); expectf_(width_1, bounds.Width, 1.0); -todo_wine + todo_wine expectf_(height - margin_y, bounds.Height, 1.0);
status = GdipSetStringFormatFlags(format, StringFormatFlagsNoWrap | StringFormatFlagsNoClip); @@ -4618,7 +4618,7 @@ todo_wine expectf(0.0, bounds.X); expectf(0.0, bounds.Y); expectf_(width, bounds.Width, 0.01); -todo_wine + todo_wine expectf(height, bounds.Height);
set_rect_empty(&rect); @@ -4711,7 +4711,7 @@ todo_wine expectf_(5.0 + margin_x, bounds.X, 1.0); expectf(5.0, bounds.Y); expectf_(width - margin_x*2.0, bounds.Width, 1.0); -todo_wine + todo_wine expectf_(height - margin_y, bounds.Height, 1.0);
width_rgn = bounds.Width; @@ -4730,9 +4730,9 @@ todo_wine expect(Ok, status); expect(3, glyphs); expect(1, lines); -todo_wine + todo_wine expectf_(5.0 + width/2.0, bounds.X, 0.01); -todo_wine + todo_wine expectf(5.0 + height/2.0, bounds.Y); expectf_(width, bounds.Width, 0.01); expectf(height, bounds.Height); @@ -4746,9 +4746,9 @@ todo_wine expect(Ok, status); expect(3, glyphs); expect(1, lines); -todo_wine + todo_wine expectf_(5.0 - width/2.0, bounds.X, 0.01); -todo_wine + todo_wine expectf(5.0 - height/2.0, bounds.Y); expectf_(width, bounds.Width, 0.01); expectf(height, bounds.Height); @@ -4762,9 +4762,9 @@ todo_wine set_rect_empty(&bounds); status = GdipGetRegionBounds(region, graphics, &bounds); expect(Ok, status); -todo_wine + todo_wine expectf_(5.0 + width_rgn/2.0, bounds.X, 1.0); -todo_wine + todo_wine expectf_(5.0 + height_rgn/2.0, bounds.Y, 1.0); expectf_(width_rgn, bounds.Width, 1.0); expectf_(height_rgn, bounds.Height, 1.0); @@ -4778,9 +4778,9 @@ todo_wine set_rect_empty(&bounds); status = GdipGetRegionBounds(region, graphics, &bounds); expect(Ok, status); -todo_wine + todo_wine expectf_(5.0 - width_rgn/2.0, bounds.X, 1.0); -todo_wine + todo_wine expectf_(5.0 - height_rgn/2.0, bounds.Y, 1.0); expectf_(width_rgn, bounds.Width, 1.0); expectf_(height_rgn, bounds.Height, 1.0); @@ -4798,9 +4798,9 @@ todo_wine expect(Ok, status); expect(3, glyphs); expect(1, lines); -todo_wine + todo_wine expectf_(5.0 + width, bounds.X, 0.01); -todo_wine + todo_wine expectf(5.0 + height, bounds.Y); expectf_(width, bounds.Width, 0.01); expectf(height, bounds.Height); @@ -4814,9 +4814,9 @@ todo_wine expect(Ok, status); expect(3, glyphs); expect(1, lines); -todo_wine + todo_wine expectf_(5.0 - width, bounds.X, 0.01); -todo_wine + todo_wine expectf(5.0 - height, bounds.Y); expectf_(width, bounds.Width, 0.01); expectf(height, bounds.Height); @@ -4830,9 +4830,9 @@ todo_wine set_rect_empty(&bounds); status = GdipGetRegionBounds(region, graphics, &bounds); expect(Ok, status); -todo_wine + todo_wine expectf_(5.0 + width_rgn, bounds.X, 2.0); -todo_wine + todo_wine expectf_(5.0 + height_rgn, bounds.Y, 1.0); expectf_(width_rgn, bounds.Width, 1.0); expectf_(height_rgn, bounds.Height, 1.0); @@ -4846,9 +4846,9 @@ todo_wine set_rect_empty(&bounds); status = GdipGetRegionBounds(region, graphics, &bounds); expect(Ok, status); -todo_wine + todo_wine expectf_(5.0 - width_rgn, bounds.X, 2.0); -todo_wine + todo_wine expectf_(5.0 - height_rgn, bounds.Y, 1.0); expectf_(width_rgn, bounds.Width, 1.0); expectf_(height_rgn, bounds.Height, 1.0); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index ca08ae49ad7..c52c90f6799 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5881,7 +5881,7 @@ static void test_GdipInitializePalette(void) palette->Count = 256; status = pGdipInitializePalette(palette, PaletteTypeFixedBW, 0, FALSE, bitmap); expect(Ok, status); -todo_wine + todo_wine expect(0x200, palette->Flags); expect(2, palette->Count); expect(0xff000000, palette->Entries[0]); @@ -5892,7 +5892,7 @@ todo_wine palette->Count = 256; status = pGdipInitializePalette(palette, PaletteTypeFixedHalftone8, 1, FALSE, NULL); expect(Ok, status); -todo_wine + todo_wine expect(0x300, palette->Flags); expect(16, palette->Count); expect(0xff000000, palette->Entries[0]); @@ -5904,7 +5904,7 @@ todo_wine palette->Count = 256; status = pGdipInitializePalette(palette, PaletteTypeFixedHalftone8, 1, FALSE, bitmap); expect(Ok, status); -todo_wine + todo_wine expect(0x300, palette->Flags); expect(16, palette->Count); expect(0xff000000, palette->Entries[0]); @@ -5916,7 +5916,7 @@ todo_wine palette->Count = 256; status = pGdipInitializePalette(palette, PaletteTypeFixedHalftone252, 1, FALSE, bitmap); expect(Ok, status); -todo_wine + todo_wine expect(0x800, palette->Flags); expect(252, palette->Count); expect(0xff000000, palette->Entries[0]); -- 2.35.0