Sven Baars : gdi32/tests: Remove some Win9x workarounds from the clipping tests.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0e1720813c34534142c6871db49d90d6cef47a6b
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=0e1720813c34534142c6871db...

Author: Sven Baars 
Date:   Sun Nov 10 12:44:11 2019 +0100

gdi32/tests: Remove some Win9x workarounds from the clipping tests.

Signed-off-by: Sven Baars 
Signed-off-by: Huw Davies 
Signed-off-by: Alexandre Julliard

---

dlls/gdi32/tests/clipping.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c
index 8f3beb56b7..015157522d 100644
--- a/dlls/gdi32/tests/clipping.c
+++ b/dlls/gdi32/tests/clipping.c
@@ -182,13 +182,10 @@ static void test_ExtCreateRegion(void)
     HRGN hrgn;
     XFORM xform;

-    if (0) /* crashes under Win9x */
-    {
-        SetLastError(0xdeadbeef);
-        hrgn = ExtCreateRegion(NULL, 0, NULL);
-        ok(!hrgn, "ExtCreateRegion should fail\n");
-        ok(GetLastError() == ERROR_INVALID_PARAMETER, "ERROR_INVALID_PARAMETER, got %u\n", GetLastError());
-    }
+    SetLastError(0xdeadbeef);
+    hrgn = ExtCreateRegion(NULL, 0, NULL);
+    ok(!hrgn, "ExtCreateRegion should fail\n");
+    ok(GetLastError() == ERROR_INVALID_PARAMETER, "ERROR_INVALID_PARAMETER, got %u\n", GetLastError());

rgn.data.rdh.dwSize = 0;
     rgn.data.rdh.iType = 0;
@@ -286,9 +283,7 @@ static void test_GetClipRgn(void)

/* Test calling GetClipRgn with a valid device context and NULL region. */
     ret = GetClipRgn(hdc, NULL);
-    ok(ret == 0 ||
-       ret == -1 /* Win9x */,
-       "Expected GetClipRgn to return 0, got %d\n", ret);
+    ok(ret == 0, "Expected GetClipRgn to return 0, got %d\n", ret);

/* Initialize the test regions. */
     hrgn = CreateRectRgn(100, 100, 100, 100);
@@ -340,9 +335,7 @@ static void test_GetClipRgn(void)
        "Expected SelectClipRgn to return SIMPLEREGION, got %d\n", ret);

ret = GetClipRgn(hdc, NULL);
-    ok(ret == 0 ||
-       ret == -1 /* Win9x */,
-       "Expected GetClipRgn to return 0, got %d\n", ret);
+    ok(ret == 0, "Expected GetClipRgn to return 0, got %d\n", ret);

ret = GetClipRgn(hdc, hrgn3);
     ok(ret == 0, "Expected GetClipRgn to return 0, got %d\n", ret);