Ge van Geldorp : gdiplus/tests: Fix test on Win7.

Alexandre Julliard julliard at winehq.org
Wed Sep 2 09:30:49 CDT 2009


Module: wine
Branch: master
Commit: 3b336da9908665be4dc712b98ba959b204d30116
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3b336da9908665be4dc712b98ba959b204d30116

Author: Ge van Geldorp <ggeldorp at vmware.com>
Date:   Wed Sep  2 12:16:54 2009 +0200

gdiplus/tests: Fix test on Win7.

---

 dlls/gdiplus/tests/pen.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c
index d2f33f0..59b7cff 100644
--- a/dlls/gdiplus/tests/pen.c
+++ b/dlls/gdiplus/tests/pen.c
@@ -43,7 +43,7 @@ static void test_startup(void)
     expect(Ok, status);
     GdiplusShutdown(gdiplusToken);
 
-    gdiplusStartupInput.GdiplusVersion = 2;
+    gdiplusStartupInput.GdiplusVersion = 42;
 
     status = GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
     expect(UnsupportedGdiplusVersion, status);
@@ -219,7 +219,8 @@ static void test_dasharray(void)
     /* Try to set with count = 0. */
     GdipSetPenDashStyle(pen, DashStyleDot);
     status = GdipSetPenDashArray(pen, dashes, 0);
-    expect(OutOfMemory, status);
+    ok(status == OutOfMemory || status == InvalidParameter,
+       "Expected OutOfMemory or InvalidParameter, got %.8x\n", status);
     GdipGetPenDashStyle(pen, &style);
     expect(DashStyleDot, style);
 




More information about the wine-cvs mailing list