From: Alex Henrie <alexhenrie24@gmail.com>
Subject: [PATCH 1/4] ddraw/tests: Drop ddraw1 test workarounds for Windows <= 2000
Message-Id: <20220117065809.442767-1-alexhenrie24@gmail.com>
Date: Sun, 16 Jan 2022 23:57:46 -0700

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
---
 dlls/ddraw/tests/ddraw1.c | 40 ++++++---------------------------------
 1 file changed, 6 insertions(+), 34 deletions(-)

diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index efbecf04c2d..9d3bd542b70 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -941,15 +941,6 @@ static void test_coop_level_create_device_window(void)
     device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd");
     ok(!device_window, "Unexpected device window found.\n");
 
-    /* Windows versions before 98 / NT5 don't support DDSCL_CREATEDEVICEWINDOW. */
-    if (broken(hr == DDERR_INVALIDPARAMS))
-    {
-        win_skip("DDSCL_CREATEDEVICEWINDOW not supported, skipping test.\n");
-        IDirectDraw_Release(ddraw);
-        DestroyWindow(focus_window);
-        return;
-    }
-
     hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL);
     ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
     device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd");
@@ -1179,7 +1170,7 @@ static void test_clipper_blt(void)
     }
 
     hr = IDirectDrawSurface_BltFast(dst_surface, 0, 0, src_surface, NULL, DDBLTFAST_WAIT);
-    ok(hr == DDERR_BLTFASTCANTCLIP || broken(hr == E_NOTIMPL /* NT4 */), "Got unexpected hr %#x.\n", hr);
+    ok(hr == DDERR_BLTFASTCANTCLIP, "Got unexpected hr %#x.\n", hr);
 
     hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
     ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr);
@@ -3152,13 +3143,6 @@ static void test_coop_level_mode_set(void)
     hr = IDirectDrawSurface_Restore(primary);
     ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr);
     hr = set_display_mode(ddraw, param.ddraw_width, param.ddraw_height);
-    if (hr == DDERR_NOEXCLUSIVEMODE /* NT4 testbot */)
-    {
-        win_skip("Broken SetDisplayMode(), skipping remaining tests.\n");
-        IDirectDrawSurface_Release(primary);
-        IDirectDraw_Release(ddraw);
-        goto done;
-    }
     ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr);
     hr = IDirectDrawSurface_Restore(primary);
     ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr);
@@ -3538,7 +3522,6 @@ static void test_coop_level_mode_set(void)
     ref = IDirectDraw_Release(ddraw);
     ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref);
 
-done:
     expect_messages = NULL;
     DestroyWindow(window);
     UnregisterClassA("ddraw_test_wndproc_wc", GetModuleHandleA(NULL));
@@ -3580,13 +3563,6 @@ static void test_coop_level_mode_set_multi(void)
     /* With just a single ddraw object, the display mode is restored on
      * release. */
     hr = set_display_mode(ddraw1, 800, 600);
-    if (hr == DDERR_NOEXCLUSIVEMODE /* NT4 testbot */)
-    {
-        win_skip("Broken SetDisplayMode(), skipping test.\n");
-        IDirectDraw_Release(ddraw1);
-        DestroyWindow(window);
-        return;
-    }
     ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr);
     w = GetSystemMetrics(SM_CXSCREEN);
     ok(w == 800, "Got unexpected screen width %u.\n", w);
@@ -3991,13 +3967,10 @@ static void test_initialize(void)
     IDirectDraw_Release(ddraw);
     CoUninitialize();
 
-    if (0) /* This crashes on the W2KPROSP4 testbot. */
-    {
-        CoInitialize(NULL);
-        hr = CoCreateInstance(&CLSID_DirectDraw, NULL, CLSCTX_INPROC_SERVER, &IID_IDirect3D, (void **)&d3d);
-        ok(hr == E_NOINTERFACE, "CoCreateInstance returned hr %#x, expected E_NOINTERFACE.\n", hr);
-        CoUninitialize();
-    }
+    CoInitialize(NULL);
+    hr = CoCreateInstance(&CLSID_DirectDraw, NULL, CLSCTX_INPROC_SERVER, &IID_IDirect3D, (void **)&d3d);
+    todo_wine ok(hr == E_NOINTERFACE, "CoCreateInstance returned hr %#x, expected E_NOINTERFACE.\n", hr);
+    CoUninitialize();
 }
 
 static void test_coop_level_surf_create(void)
@@ -7691,8 +7664,7 @@ static void test_palette_alpha(void)
             UINT retval;
 
             hr = IDirectDrawSurface_GetDC(surface, &dc);
-            ok(SUCCEEDED(hr) || broken(hr == DDERR_CANTCREATEDC) /* Win2k testbot */,
-                    "Failed to get DC, hr %#x, %s surface.\n", hr, test_data[i].name);
+            ok(SUCCEEDED(hr), "Failed to get DC, hr %#x, %s surface.\n", hr, test_data[i].name);
             if (SUCCEEDED(hr))
             {
                 retval = GetDIBColorTable(dc, 1, 1, &rgbquad);

-- 
2.34.1