ddraw/tests: Skip some cooperative level tests on NT4/Win95.

The DirectX SDK reports that cooperative level flags DDSCL_SETDEVICEWINDOW and DDSCL_SETFOCUSWINDOW are only available on Windows 98 and higher.

ddraw/tests: Skip some cooperative level tests on NT4/Win95.
e1a1ae5e · Andrew Nguyen · Alexandre Julliard · 61d44a30 · e1a1ae5e
Commit e1a1ae5e authored Mar 23, 2009 by Andrew Nguyen Committed by Alexandre Julliard Mar 23, 2009
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

ddrawmodes.c dlls/ddraw/tests/ddrawmodes.c +9 -1

No files found.
--- a/dlls/ddraw/tests/ddrawmodes.c
+++ b/dlls/ddraw/tests/ddrawmodes.c
@@ -296,6 +296,13 @@ static void testcooperativelevels_normal(void)
    /* Set the focus window */
    rc = IDirectDraw_SetCooperativeLevel(lpDD,
        hwnd, DDSCL_SETFOCUSWINDOW);
+
+    if (rc == DDERR_INVALIDPARAMS)
+    {
+        win_skip("NT4/Win95 do not support cooperative levels DDSCL_SETDEVICEWINDOW and DDSCL_SETFOCUSWINDOW\n");
+        return;
+    }
+
    ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_SETFOCUSWINDOW) returned: %x\n",rc);

    /* Set the focus window a second time*/
@@ -379,7 +386,8 @@ static void testcooperativelevels_exclusive(void)
    /* Set the focus window. Should fail */
    rc = IDirectDraw_SetCooperativeLevel(lpDD,
        hwnd, DDSCL_SETFOCUSWINDOW);
-    ok(rc==DDERR_HWNDALREADYSET,"SetCooperativeLevel(DDSCL_SETFOCUSWINDOW) returned: %x\n",rc);
+    ok(rc==DDERR_HWNDALREADYSET ||
+       broken(rc==DDERR_INVALIDPARAMS) /* NT4/Win95 */,"SetCooperativeLevel(DDSCL_SETFOCUSWINDOW) returned: %x\n",rc);


    /* All done */