Stefan Dösinger : ddraw: Remove crashing tests.

[Alexandre Julliard]

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

Author: Stefan Dösinger 
Date:   Wed Sep  7 00:12:35 2011 +0200

ddraw: Remove crashing tests.

---

dlls/ddraw/tests/ddrawmodes.c |   36 ------------------------------------
 1 files changed, 0 insertions(+), 36 deletions(-)

diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c
index 61f07fe..81ff43e 100644
--- a/dlls/ddraw/tests/ddrawmodes.c
+++ b/dlls/ddraw/tests/ddrawmodes.c
@@ -104,13 +104,6 @@ static void releasedirectdraw(void)
     }
 }

-static BOOL WINAPI crash_callbackA(GUID *lpGUID, LPSTR lpDriverDescription,
-                                  LPSTR lpDriverName, LPVOID lpContext)
-{
-    *(volatile char*)0 = 2;
-    return TRUE;
-}
-
 static BOOL WINAPI test_nullcontext_callbackA(GUID *lpGUID, LPSTR lpDriverDescription,
                                               LPSTR lpDriverName, LPVOID lpContext)
 {
@@ -147,19 +140,6 @@ static void test_DirectDrawEnumerateA(void)
     ret = pDirectDrawEnumerateA(NULL, NULL);
     ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret);

-    /* Test with invalid callback parameter. */
-    ret = pDirectDrawEnumerateA((LPDDENUMCALLBACKA)0xdeadbeef, NULL);
-    ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret);
-
-    if (pDirectDrawEnumerateExA)
-    {
-        /* Test with callback that crashes. */
-        ret = pDirectDrawEnumerateA(crash_callbackA, NULL);
-        ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret);
-    }
-    else
-        win_skip("Test would crash on older ddraw\n");
-
     /* Test with valid callback parameter and NULL context parameter. */
     trace("Calling DirectDrawEnumerateA with test_nullcontext_callbackA callback and NULL context.\n");
     ret = pDirectDrawEnumerateA(test_nullcontext_callbackA, NULL);
@@ -207,14 +187,6 @@ static void test_DirectDrawEnumerateW(void)
     ok(ret == DDERR_UNSUPPORTED, "Expected DDERR_UNSUPPORTED, got %d\n", ret);
 }

-static BOOL WINAPI crash_callbackExA(GUID *lpGUID, LPSTR lpDriverDescription,
-                                     LPSTR lpDriverName, LPVOID lpContext,
-                                     HMONITOR hm)
-{
-    *(volatile char*)0 = 2;
-    return TRUE;
-}
-
 static BOOL WINAPI test_nullcontext_callbackExA(GUID *lpGUID, LPSTR lpDriverDescription,
                                                 LPSTR lpDriverName, LPVOID lpContext,
                                                 HMONITOR hm)
@@ -253,14 +225,6 @@ static void test_DirectDrawEnumerateExA(void)
     ret = pDirectDrawEnumerateExA(NULL, NULL, 0);
     ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret);

-    /* Test with invalid callback parameter. */
-    ret = pDirectDrawEnumerateExA((LPDDENUMCALLBACKEXA)0xdeadbeef, NULL, 0);
-    ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret);
-
-    /* Test with callback that crashes. */
-    ret = pDirectDrawEnumerateExA(crash_callbackExA, NULL, 0);
-    ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret);
-
     /* Test with valid callback parameter and invalid flags */
     ret = pDirectDrawEnumerateExA(test_nullcontext_callbackExA, NULL, ~0);
     ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret);