From 2381d32400031ab08162f5bbca9685349cedf86c Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Fri, 4 Sep 2009 09:37:36 -0500 Subject: [PATCH] gdiplus: test for the lowest rejected startup version --- dlls/gdiplus/tests/pen.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 59b7cff..707bafc 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -33,21 +33,28 @@ static void test_startup(void) Status status; struct GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; + int gpversion; - gdiplusStartupInput.GdiplusVersion = 1; gdiplusStartupInput.DebugEventCallback = NULL; gdiplusStartupInput.SuppressBackgroundThread = 0; gdiplusStartupInput.SuppressExternalCodecs = 0; - status = GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); - expect(Ok, status); - GdiplusShutdown(gdiplusToken); - - gdiplusStartupInput.GdiplusVersion = 42; - - status = GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); - expect(UnsupportedGdiplusVersion, status); - GdiplusShutdown(gdiplusToken); + for (gpversion=1; gpversion<256; gpversion++) + { + gdiplusStartupInput.GdiplusVersion = gpversion; + status = GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + ok(status == Ok || status == UnsupportedGdiplusVersion, + "GdiplusStartup returned %x\n", status); + GdiplusShutdown(gdiplusToken); + if (status != Ok) + { + gpversion--; + break; + } + } + + ok(gpversion > 0 && gpversion < 42, "unexpected gdiplus version %i\n", gpversion); + trace("gdiplus version is %i\n", gpversion); status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); -- 1.5.4.3