Signed-off-by: Henri Verbeet hverbeet@codeweavers.com --- dlls/ddraw/ddraw.c | 8 ++------ dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e60c5f345af..e5f1e4f8c75 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4049,12 +4049,8 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd || fdr->dwSize != sizeof(D3DFINDDEVICERESULT)) return DDERR_INVALIDPARAMS;
- if ((fds->dwFlags & D3DFDS_COLORMODEL) - && fds->dcmColorModel != D3DCOLOR_RGB) - { - WARN("Trying to request a non-RGB D3D color model. Not supported.\n"); - return DDERR_INVALIDPARAMS; /* No real idea what to return here :-) */ - } + if (fds->dwFlags & D3DFDS_COLORMODEL) + WARN("Ignoring colour model %#x.\n", fds->dcmColorModel);
if (fds->dwFlags & D3DFDS_GUID) { diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 641847aa38d..b8dafdb6281 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -11812,7 +11812,7 @@ static void test_find_device(void) search.dcmColorModel = 0xdeadbeef; result.dwSize = sizeof(result); hr = IDirect3D_FindDevice(d3d, &search, &result); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
IDirect3D_Release(d3d); IDirectDraw_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 02f430afa1a..762b4d9aba3 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13094,7 +13094,7 @@ static void test_find_device(void) search.dcmColorModel = 0xdeadbeef; result.dwSize = sizeof(result); hr = IDirect3D2_FindDevice(d3d, &search, &result); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
IDirect3D2_Release(d3d); IDirectDraw2_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 942d0253c46..337ccb06e42 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15186,7 +15186,7 @@ static void test_find_device(void) search.dcmColorModel = 0xdeadbeef; result.dwSize = sizeof(result); hr = IDirect3D3_FindDevice(d3d, &search, &result); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
IDirect3D3_Release(d3d); IDirectDraw4_Release(ddraw);