Paul Vriens : gdi32/tests: Skip several tests on Win9x.

Alexandre Julliard julliard at winehq.org
Mon Apr 20 11:33:06 CDT 2009


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

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Fri Apr 17 15:43:24 2009 +0200

gdi32/tests: Skip several tests on Win9x.

---

 dlls/gdi32/tests/pen.c |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c
index f53dac4..460288d 100644
--- a/dlls/gdi32/tests/pen.c
+++ b/dlls/gdi32/tests/pen.c
@@ -91,6 +91,14 @@ static void test_logpen(void)
         size = GetObject(hpen, sizeof(lp), &lp);
         ok(size == sizeof(lp), "GetObject returned %d, error %d\n", size, GetLastError());
 
+        if (pen[i].style == PS_USERSTYLE || pen[i].style == PS_ALTERNATE)
+        {
+           if (lp.lopnStyle == pen[i].style)
+           {
+               win_skip("Skipping PS_USERSTYLE and PS_ALTERNATE tests on Win9x\n");
+               continue;
+           }
+        }
         ok(lp.lopnStyle == pen[i].ret_style, "expected %u, got %u\n", pen[i].ret_style, lp.lopnStyle);
         ok(lp.lopnWidth.x == pen[i].ret_width, "expected %u, got %d\n", pen[i].ret_width, lp.lopnWidth.x);
         ok(lp.lopnWidth.y == 0 ||
@@ -521,6 +529,11 @@ static void test_ps_userstyle(void)
 
     pen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 50, &lb, 3, NULL);
     ok(pen == 0, "ExtCreatePen should fail\n");
+    if (pen == 0 && GetLastError() == 0xdeadbeef)
+    {
+        win_skip("Looks like 9x, skipping PS_USERSTYLE tests\n");
+        return;
+    }
     expect(ERROR_INVALID_PARAMETER, GetLastError());
     DeleteObject(pen);
     SetLastError(0xdeadbeef);




More information about the wine-cvs mailing list