Misha Koshelev : gdi32/tests: Fix test_widenpath to succeed on Win98.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Jun 22 07:35:47 CDT 2007


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

Author: Misha Koshelev <mk144210 at bcm.edu>
Date:   Thu Jun 21 23:39:20 2007 -0500

gdi32/tests: Fix test_widenpath to succeed on Win98.

---

 dlls/gdi32/tests/path.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c
index 492673a..e9b8e2f 100644
--- a/dlls/gdi32/tests/path.c
+++ b/dlls/gdi32/tests/path.c
@@ -38,7 +38,6 @@ static void test_widenpath(void)
     HPEN oldPen;
     POINT pnt[6];
     INT nSize, ret;
-    DWORD error;
 
     /* Create a pen to be used in WidenPath */
     greenPen = CreatePen(PS_SOLID, 10, RGB(0,0,0));
@@ -73,12 +72,12 @@ static void test_widenpath(void)
 
     AbortPath(hdc);
 
-    /* Test WidenPath with an open path */
+    /* Test WidenPath with an open path (last error only set on Win2k and later) */
     SetLastError(0xdeadbeef);
     BeginPath(hdc);
     ret = WidenPath(hdc);
-    error = GetLastError();
-    ok(ret == FALSE && GetLastError() == ERROR_CAN_NOT_COMPLETE, "WidenPath fails while widening an open path. Return value is %d, should be %d. Error is %08x, should be %08x\n", ret, FALSE, GetLastError(), ERROR_CAN_NOT_COMPLETE);
+    ok(ret == FALSE && (GetLastError() == ERROR_CAN_NOT_COMPLETE || GetLastError() == 0xdeadbeef),
+       "WidenPath fails while widening an open path. Return value is %d, should be %d. Error is %u\n", ret, FALSE, GetLastError());
 
     AbortPath(hdc);
 




More information about the wine-cvs mailing list