[PATCH 03/11] ddraw/tests: Don't use special value to skip the check in test_rt_caps().

[Henri Verbeet]

On Wed, 3 Mar 2021 at 23:36, Paul Gofman <pgofman at codeweavers.com> wrote:
> @@ -4563,18 +4564,15 @@ static void test_rt_caps(const GUID *device_guid)
>          ok(hr == DD_OK, "Got unexpected hr %#x, test %u, software_device %u.\n", hr, i, software_device);
>          if (software_device)
>          {
> -            expected_caps = test_data[i].caps_out[1]
> -                    ? test_data[i].caps_out[1] : test_data[i].caps_out[0];
> -
> -            todo_wine_if(test_data[i].caps_out[0] == ~0u && surface_desc.ddsCaps.dwCaps != expected_caps)
> -            ok(surface_desc.ddsCaps.dwCaps == expected_caps
> -                    || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out[0],
> +            ok(surface_desc.ddsCaps.dwCaps == test_data[i].caps_out[0]
> +                    || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out[1],
>                      "Got unexpected caps %#x, test %u, software_device %u.\n",
>                      surface_desc.ddsCaps.dwCaps, i, software_device);
>          }
>          else
>          {
> -            ok(test_data[i].caps_out[0] == ~0u || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out[0],
> +            ok(surface_desc.ddsCaps.dwCaps == test_data[i].caps_out[0] || (test_data[i].pf == &p8_fmt
> +                    && surface_desc.ddsCaps.dwCaps == (test_data[i].caps_in | DDSCAPS_SYSTEMMEMORY)),
>                      "Got unexpected caps %#x, expected %#x, test %u, software_device %u.\n",
>                      surface_desc.ddsCaps.dwCaps, test_data[i].caps_out[0], i, software_device);
>          }
Somewhat similar to 02/11, I'd expect the video memory variants if the
ddraw implementation supports video memory surfaces, and the system
memory variants if not.