[PATCH 1/4] ddraw/tests: Also test RT caps for software device for ddraw1.
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 136 +++++++++++++++++++++----------------- 1 file changed, 77 insertions(+), 59 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index d3e9fe0e1ff..77513d92a94 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -4320,10 +4320,10 @@ static void test_rt_caps(void) { PALETTEENTRY palette_entries[256]; IDirectDrawPalette *palette; + unsigned int i, device_type; IDirect3DDevice *device; IDirectDraw *ddraw; DWORD z_depth = 0; - unsigned int i; ULONG refcount; HWND window; HRESULT hr; @@ -4334,6 +4334,12 @@ static void test_rt_caps(void) {8}, {0x00000000}, {0x00000000}, {0x00000000}, {0x00000000}, }; + static const REFCLSID test_devices[] = + { + &IID_IDirect3DHALDevice, + &IID_IDirect3DRGBDevice, + }; + static const struct { const DDPIXELFORMAT *pf; @@ -4348,14 +4354,14 @@ static void test_rt_caps(void) NULL, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, - D3D_OK, + DD_OK, FALSE, }, { NULL, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, - D3D_OK, + DD_OK, FALSE, }, { @@ -4383,14 +4389,14 @@ static void test_rt_caps(void) NULL, DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY, DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, - D3D_OK, + DD_OK, FALSE, }, { NULL, DDSCAPS_3DDEVICE, DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, - D3D_OK, + DD_OK, FALSE, }, { @@ -4502,66 +4508,78 @@ static void test_rt_caps(void) memset(palette_entries, 0, sizeof(palette_entries)); hr = IDirectDraw_CreatePalette(ddraw, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, palette_entries, &palette, NULL); - ok(SUCCEEDED(hr), "Failed to create palette, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - for (i = 0; i < ARRAY_SIZE(test_data); ++i) + for (device_type = 0; device_type < ARRAY_SIZE(test_devices); ++device_type) { - IDirectDrawSurface *surface; - DDSURFACEDESC surface_desc; - IDirect3DDevice *device; - - memset(&surface_desc, 0, sizeof(surface_desc)); - surface_desc.dwSize = sizeof(surface_desc); - surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - surface_desc.ddsCaps.dwCaps = test_data[i].caps_in; - if (test_data[i].pf) - { - surface_desc.dwFlags |= DDSD_PIXELFORMAT; - surface_desc.ddpfPixelFormat = *test_data[i].pf; - } - if (test_data[i].caps_in & DDSCAPS_ZBUFFER) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { - surface_desc.dwFlags |= DDSD_ZBUFFERBITDEPTH; - U2(surface_desc).dwZBufferBitDepth = z_depth; - } - surface_desc.dwWidth = 640; - surface_desc.dwHeight = 480; - hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(SUCCEEDED(hr) || broken(test_data[i].create_may_fail), - "Test %u: Failed to create surface with caps %#x, hr %#x.\n", - i, test_data[i].caps_in, hr); - if (FAILED(hr)) - continue; + IDirectDrawSurface *surface; + DDSURFACEDESC surface_desc; + IDirect3DDevice *device; - memset(&surface_desc, 0, sizeof(surface_desc)); - surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Test %u: Failed to get surface desc, hr %#x.\n", i, hr); - ok(test_data[i].caps_out == ~0U || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, - "Test %u: Got unexpected caps %#x, expected %#x.\n", - i, surface_desc.ddsCaps.dwCaps, test_data[i].caps_out); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = test_data[i].caps_in; + if (test_data[i].pf) + { + surface_desc.dwFlags |= DDSD_PIXELFORMAT; + surface_desc.ddpfPixelFormat = *test_data[i].pf; + } + if (test_data[i].caps_in & DDSCAPS_ZBUFFER) + { + surface_desc.dwFlags |= DDSD_ZBUFFERBITDEPTH; + U2(surface_desc).dwZBufferBitDepth = z_depth; + } + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(hr == DD_OK || broken(test_data[i].create_may_fail), + "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); - hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirect3DHALDevice, (void **)&device); - ok(hr == test_data[i].create_device_hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", - i, hr, test_data[i].create_device_hr); - if (hr == DDERR_NOPALETTEATTACHED) - { - hr = IDirectDrawSurface_SetPalette(surface, palette); - ok(SUCCEEDED(hr), "Test %u: Failed to set palette, hr %#x.\n", i, hr); - hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirect3DHALDevice, (void **)&device); - if (surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) - ok(hr == DDERR_INVALIDPIXELFORMAT, "Test %u: Got unexpected hr %#x.\n", i, hr); - else - ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); - } - if (SUCCEEDED(hr)) - { - refcount = IDirect3DDevice_Release(device); - ok(refcount == 1, "Test %u: Got unexpected refcount %u.\n", i, refcount); - } + if (FAILED(hr)) + continue; - refcount = IDirectDrawSurface_Release(surface); - ok(refcount == 0, "Test %u: The surface was not properly freed, refcount %u.\n", i, refcount); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); + ok(hr == DD_OK, "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); + ok(test_data[i].caps_out == ~0u || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, + "Got unexpected caps %#x, expected %#x, test %u, device_type %u.\n", + surface_desc.ddsCaps.dwCaps, test_data[i].caps_out, i, device_type); + + hr = IDirectDrawSurface_QueryInterface(surface, test_devices[device_type], (void **)&device); + todo_wine_if(device_type && test_data[i].create_device_hr == D3DERR_SURFACENOTINVIDMEM) + ok((!device_type && hr == test_data[i].create_device_hr) + || (device_type && (hr == (test_data[i].create_device_hr == D3DERR_SURFACENOTINVIDMEM + ? DD_OK : test_data[i].create_device_hr))), + "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); + if (hr == DDERR_NOPALETTEATTACHED) + { + hr = IDirectDrawSurface_SetPalette(surface, palette); + ok(SUCCEEDED(hr), "Test %u: Failed to set palette, hr %#x.\n", i, hr); + hr = IDirectDrawSurface_QueryInterface(surface, test_devices[device_type], (void **)&device); + if (device_type == 1) + todo_wine + ok(hr == DD_OK, "Got unexpected hr %#x, test %u, device_type %u.\n", + hr, i, device_type); + else if (surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) + ok(hr == DDERR_INVALIDPIXELFORMAT, "Got unexpected hr %#x, test %u, device_type %u.\n", + hr, i, device_type); + else + ok(hr == D3DERR_SURFACENOTINVIDMEM, "Got unexpected hr %#x, test %u, device_type %u.\n", + hr, i, device_type); + } + if (SUCCEEDED(hr)) + { + refcount = IDirect3DDevice_Release(device); + ok(refcount == 1, "Test %u: Got unexpected refcount %u.\n", i, refcount); + } + + refcount = IDirectDrawSurface_Release(surface); + ok(refcount == 0, "Test %u: The surface was not properly freed, refcount %u.\n", i, refcount); + } } IDirectDrawPalette_Release(palette); -- 2.29.2
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ddraw/tests/ddraw2.c | 224 +++++++++++++++++++++----------------- 1 file changed, 125 insertions(+), 99 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index bc915c97864..e61bb460220 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4743,15 +4743,21 @@ static void test_rt_caps(void) { PALETTEENTRY palette_entries[256]; IDirectDrawPalette *palette; + unsigned int i, device_type; IDirect3DDevice2 *device; IDirectDraw2 *ddraw; DWORD z_depth = 0; IDirect3D2 *d3d; - unsigned int i; ULONG refcount; HWND window; HRESULT hr; + static const REFCLSID test_devices[] = + { + &IID_IDirect3DHALDevice, + &IID_IDirect3DRGBDevice, + }; + static const DDPIXELFORMAT p8_fmt = { sizeof(DDPIXELFORMAT), DDPF_PALETTEINDEXED8 | DDPF_RGB, 0, @@ -4974,122 +4980,142 @@ static void test_rt_caps(void) memset(palette_entries, 0, sizeof(palette_entries)); hr = IDirectDraw2_CreatePalette(ddraw, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, palette_entries, &palette, NULL); - ok(SUCCEEDED(hr), "Failed to create palette, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - for (i = 0; i < ARRAY_SIZE(test_data); ++i) + for (device_type = 0; device_type < ARRAY_SIZE(test_devices); ++device_type) { - IDirectDrawSurface *surface, *rt, *expected_rt, *tmp; - DDSURFACEDESC surface_desc; - IDirect3DDevice2 *device; - - memset(&surface_desc, 0, sizeof(surface_desc)); - surface_desc.dwSize = sizeof(surface_desc); - surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - surface_desc.ddsCaps.dwCaps = test_data[i].caps_in; - if (test_data[i].pf) - { - surface_desc.dwFlags |= DDSD_PIXELFORMAT; - surface_desc.ddpfPixelFormat = *test_data[i].pf; - } - if (test_data[i].caps_in & DDSCAPS_ZBUFFER) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { - surface_desc.dwFlags |= DDSD_ZBUFFERBITDEPTH; - U2(surface_desc).dwZBufferBitDepth = z_depth; - } - surface_desc.dwWidth = 640; - surface_desc.dwHeight = 480; - hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(SUCCEEDED(hr) || broken(test_data[i].create_may_fail), - "Test %u: Failed to create surface with caps %#x, hr %#x.\n", - i, test_data[i].caps_in, hr); - if (FAILED(hr)) - continue; + IDirectDrawSurface *surface, *rt, *expected_rt, *tmp; + DDSURFACEDESC surface_desc; + IDirect3DDevice2 *device; - memset(&surface_desc, 0, sizeof(surface_desc)); - surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Test %u: Failed to get surface desc, hr %#x.\n", i, hr); - ok(test_data[i].caps_out == ~0U || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, - "Test %u: Got unexpected caps %#x, expected %#x.\n", - i, surface_desc.ddsCaps.dwCaps, test_data[i].caps_out); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = test_data[i].caps_in; + if (test_data[i].pf) + { + surface_desc.dwFlags |= DDSD_PIXELFORMAT; + surface_desc.ddpfPixelFormat = *test_data[i].pf; + } + if (test_data[i].caps_in & DDSCAPS_ZBUFFER) + { + surface_desc.dwFlags |= DDSD_ZBUFFERBITDEPTH; + U2(surface_desc).dwZBufferBitDepth = z_depth; + } + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(hr == DD_OK || broken(test_data[i].create_may_fail), + "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); + if (FAILED(hr)) + continue; - hr = IDirect3D2_CreateDevice(d3d, &IID_IDirect3DHALDevice, surface, &device); - ok(hr == test_data[i].create_device_hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", - i, hr, test_data[i].create_device_hr); - if (FAILED(hr)) - { - if (hr == DDERR_NOPALETTEATTACHED) + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); + ok(hr == DD_OK, "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); + ok(test_data[i].caps_out == ~0u || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, + "Got unexpected caps %#x, expected %#x, test %u, device_type %u.\n", + surface_desc.ddsCaps.dwCaps, test_data[i].caps_out, i, device_type); + + hr = IDirect3D2_CreateDevice(d3d, test_devices[device_type], surface, &device); + + todo_wine_if(device_type && test_data[i].create_device_hr == D3DERR_SURFACENOTINVIDMEM) + ok((!device_type && hr == test_data[i].create_device_hr) + || (device_type && (hr == (test_data[i].create_device_hr == D3DERR_SURFACENOTINVIDMEM + ? DD_OK : test_data[i].create_device_hr))), + "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); + + if (FAILED(hr)) { - hr = IDirectDrawSurface_SetPalette(surface, palette); - ok(SUCCEEDED(hr), "Test %u: Failed to set palette, hr %#x.\n", i, hr); - hr = IDirect3D2_CreateDevice(d3d, &IID_IDirect3DHALDevice, surface, &device); - if (surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) - ok(hr == DDERR_INVALIDPIXELFORMAT, "Test %u: Got unexpected hr %#x.\n", i, hr); - else - ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (hr == DDERR_NOPALETTEATTACHED) + { + hr = IDirectDrawSurface_SetPalette(surface, palette); + ok(hr == DD_OK, "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); + hr = IDirect3D2_CreateDevice(d3d, test_devices[device_type], surface, &device); + if (device_type == 1) + todo_wine + ok(hr == DD_OK, "Got unexpected hr %#x, test %u, device_type %u.\n", + hr, i, device_type); + else if (surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) + ok(hr == DDERR_INVALIDPIXELFORMAT, "Got unexpected hr %#x, test %u, device_type %u.\n", + hr, i, device_type); + else + ok(hr == D3DERR_SURFACENOTINVIDMEM, "Got unexpected hr %#x, test %u, device_type %u.\n", + hr, i, device_type); + + if (hr == DD_OK) + { + refcount = IDirect3DDevice2_Release(device); + ok(!refcount, "Test %u: The device was not properly freed, refcount %u.\n", i, refcount); + } + } + IDirectDrawSurface_Release(surface); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); + + hr = IDirect3D2_CreateDevice(d3d, test_devices[device_type], surface, &device); + ok(hr == DD_OK, "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); } - IDirectDrawSurface_Release(surface); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + surface_desc.ddsCaps.dwCaps = test_data[i].caps_in; + if (test_data[i].pf) + { + surface_desc.dwFlags |= DDSD_PIXELFORMAT; + surface_desc.ddpfPixelFormat = *test_data[i].pf; + } + if (test_data[i].caps_in & DDSCAPS_ZBUFFER) + { + surface_desc.dwFlags |= DDSD_ZBUFFERBITDEPTH; + U2(surface_desc).dwZBufferBitDepth = z_depth; + } surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; - hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to create surface, hr %#x.\n", i, hr); - - hr = IDirect3D2_CreateDevice(d3d, &IID_IDirect3DHALDevice, surface, &device); - ok(SUCCEEDED(hr), "Test %u: Failed to create device, hr %#x.\n", i, hr); - } + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &rt, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); - memset(&surface_desc, 0, sizeof(surface_desc)); - surface_desc.dwSize = sizeof(surface_desc); - surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - surface_desc.ddsCaps.dwCaps = test_data[i].caps_in; - if (test_data[i].pf) - { - surface_desc.dwFlags |= DDSD_PIXELFORMAT; - surface_desc.ddpfPixelFormat = *test_data[i].pf; - } - if (test_data[i].caps_in & DDSCAPS_ZBUFFER) - { - surface_desc.dwFlags |= DDSD_ZBUFFERBITDEPTH; - U2(surface_desc).dwZBufferBitDepth = z_depth; - } - surface_desc.dwWidth = 640; - surface_desc.dwHeight = 480; - hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &rt, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to create surface with caps %#x, hr %#x.\n", - i, test_data[i].caps_in, hr); + hr = IDirect3DDevice2_SetRenderTarget(device, rt, 0); + ok(hr == test_data[i].set_rt_hr || (device_type && hr == DDERR_NOPALETTEATTACHED) + || broken(hr == test_data[i].alternative_set_rt_hr), + "Got unexpected hr %#x, test %u, device_type %u.\n", + hr, i, device_type); - hr = IDirect3DDevice2_SetRenderTarget(device, rt, 0); - ok(hr == test_data[i].set_rt_hr || broken(hr == test_data[i].alternative_set_rt_hr), - "Test %u: Got unexpected hr %#x, expected %#x.\n", - i, hr, test_data[i].set_rt_hr); - if (SUCCEEDED(hr) || hr == DDERR_INVALIDPIXELFORMAT) - expected_rt = rt; - else - expected_rt = surface; + if (SUCCEEDED(hr) || hr == DDERR_INVALIDPIXELFORMAT) + expected_rt = rt; + else + expected_rt = surface; - /* It appears the surface is set as render target in this case, but no - * reference is taken. */ - if (hr == DDERR_INVALIDPIXELFORMAT) - { - refcount = IDirectDrawSurface_AddRef(rt); - ok(refcount == 2, "Test %u: Got unexpected refcount %u.\n", i, refcount); - } + /* It appears the surface is set as render target in this case, but no + * reference is taken. */ + if (hr == DDERR_INVALIDPIXELFORMAT) + { + refcount = IDirectDrawSurface_AddRef(rt); + ok(refcount == 2, "Test %u: Got unexpected refcount %u.\n", i, refcount); + } - hr = IDirect3DDevice2_GetRenderTarget(device, &tmp); - ok(SUCCEEDED(hr), "Test %u: Failed to get render target, hr %#x.\n", i, hr); - ok(tmp == expected_rt, "Test %u: Got unexpected rt %p.\n", i, tmp); + hr = IDirect3DDevice2_GetRenderTarget(device, &tmp); + ok(hr == DD_OK, "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); + ok(tmp == expected_rt, "Got unexpected rt %p, test %u, device_type %u.\n", tmp, i, device_type); - IDirectDrawSurface_Release(tmp); - IDirectDrawSurface_Release(rt); - refcount = IDirect3DDevice2_Release(device); - ok(refcount == 0, "Test %u: The device was not properly freed, refcount %u.\n", i, refcount); - refcount = IDirectDrawSurface_Release(surface); - ok(refcount == 0, "Test %u: The surface was not properly freed, refcount %u.\n", i, refcount); + IDirectDrawSurface_Release(tmp); + IDirectDrawSurface_Release(rt); + refcount = IDirect3DDevice2_Release(device); + ok(refcount == 0, "Test %u: The device was not properly freed, refcount %u.\n", i, refcount); + refcount = IDirectDrawSurface_Release(surface); + ok(refcount == 0, "Test %u: The surface was not properly freed, refcount %u.\n", i, refcount); + } } IDirectDrawPalette_Release(palette); -- 2.29.2
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=85655 Your paranoid android. === debiant2 (32 bit Chinese:China report) === ddraw: ddraw2.c:15090: Test failed: Expect window rect (0,0)-(1024,768), got (7,26)-(1031,794). ddraw2.c:15108: Test failed: Expect window rect (0,0)-(1024,768), got (1024,-8)-(2048,760). ddraw2.c:15115: Test failed: Expect window rect (0,0)-(1024,768), got (1024,-8)-(2048,760).
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ddraw/tests/ddraw4.c | 299 ++++++++++++++++++++++---------------- 1 file changed, 172 insertions(+), 127 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index f009b4583f4..a4feb758449 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6359,10 +6359,11 @@ static void test_rt_caps(void) { PALETTEENTRY palette_entries[256]; IDirectDrawPalette *palette; + unsigned int i, device_type; + DWORD expected_caps; IDirectDraw4 *ddraw; DDPIXELFORMAT z_fmt; IDirect3D3 *d3d; - unsigned int i; ULONG refcount; HWND window; HRESULT hr; @@ -6373,11 +6374,17 @@ static void test_rt_caps(void) {8}, {0x00000000}, {0x00000000}, {0x00000000}, {0x00000000}, }; + static const REFCLSID test_devices[] = + { + &IID_IDirect3DHALDevice, + &IID_IDirect3DRGBDevice, + }; + const struct { const DDPIXELFORMAT *pf; DWORD caps_in; - DWORD caps_out; + DWORD caps_out[ARRAY_SIZE(test_devices)]; DWORD caps2_in; DWORD caps2_out; HRESULT create_device_hr; @@ -6388,27 +6395,27 @@ static void test_rt_caps(void) { NULL, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, + {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM,}, 0, 0, - D3D_OK, + DD_OK, D3D_OK, D3D_OK, }, { NULL, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, + {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM}, 0, 0, - D3D_OK, - D3D_OK, - D3D_OK, + DD_OK, + DD_OK, + DD_OK, }, { NULL, DDSCAPS_OFFSCREENPLAIN, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, + {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM,}, 0, 0, DDERR_INVALIDCAPS, @@ -6418,7 +6425,7 @@ static void test_rt_caps(void) { NULL, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, + {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE}, 0, 0, D3DERR_SURFACENOTINVIDMEM, @@ -6428,7 +6435,7 @@ static void test_rt_caps(void) { NULL, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, + {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY}, 0, 0, DDERR_INVALIDCAPS, @@ -6438,27 +6445,27 @@ static void test_rt_caps(void) { NULL, DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY, - DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, + {DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM}, 0, 0, - D3D_OK, - D3D_OK, - D3D_OK, + DD_OK, + DD_OK, + DD_OK, }, { NULL, DDSCAPS_3DDEVICE, - DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, + {DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM}, 0, 0, - D3D_OK, - D3D_OK, - D3D_OK, + DD_OK, + DD_OK, + DD_OK, }, { NULL, 0, - DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM}, 0, 0, DDERR_INVALIDCAPS, @@ -6468,7 +6475,7 @@ static void test_rt_caps(void) { NULL, DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, - DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE}, 0, 0, D3DERR_SURFACENOTINVIDMEM, @@ -6478,7 +6485,7 @@ static void test_rt_caps(void) { NULL, DDSCAPS_SYSTEMMEMORY, - DDSCAPS_SYSTEMMEMORY, + {DDSCAPS_SYSTEMMEMORY}, 0, 0, DDERR_INVALIDCAPS, @@ -6488,7 +6495,7 @@ static void test_rt_caps(void) { NULL, DDSCAPS_TEXTURE | DDSCAPS_3DDEVICE, - DDSCAPS_TEXTURE | DDSCAPS_3DDEVICE | DDSCAPS_SYSTEMMEMORY, + {DDSCAPS_TEXTURE | DDSCAPS_3DDEVICE | DDSCAPS_SYSTEMMEMORY}, DDSCAPS2_TEXTUREMANAGE, DDSCAPS2_TEXTUREMANAGE, D3DERR_SURFACENOTINVIDMEM, @@ -6498,7 +6505,7 @@ static void test_rt_caps(void) { NULL, DDSCAPS_TEXTURE | DDSCAPS_3DDEVICE, - DDSCAPS_TEXTURE | DDSCAPS_3DDEVICE | DDSCAPS_SYSTEMMEMORY, + {DDSCAPS_TEXTURE | DDSCAPS_3DDEVICE | DDSCAPS_SYSTEMMEMORY}, DDSCAPS2_D3DTEXTUREMANAGE, DDSCAPS2_D3DTEXTUREMANAGE, D3DERR_SURFACENOTINVIDMEM, @@ -6508,7 +6515,7 @@ static void test_rt_caps(void) { &p8_fmt, 0, - DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM}, 0, 0, DDERR_INVALIDCAPS, @@ -6518,7 +6525,7 @@ static void test_rt_caps(void) { &p8_fmt, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, - ~0U /* AMD r200 */, + {~0u /* AMD r200 */, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_SYSTEMMEMORY}, 0, 0, DDERR_NOPALETTEATTACHED, @@ -6528,7 +6535,7 @@ static void test_rt_caps(void) { &p8_fmt, DDSCAPS_OFFSCREENPLAIN, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, + {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM}, 0, 0, DDERR_INVALIDCAPS, @@ -6538,7 +6545,7 @@ static void test_rt_caps(void) { &p8_fmt, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, + {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE}, 0, 0, DDERR_NOPALETTEATTACHED, @@ -6548,7 +6555,7 @@ static void test_rt_caps(void) { &p8_fmt, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, + {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY}, 0, 0, DDERR_INVALIDCAPS, @@ -6558,7 +6565,7 @@ static void test_rt_caps(void) { &z_fmt, DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER, - DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, + {DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM}, 0, 0, DDERR_INVALIDCAPS, @@ -6568,7 +6575,8 @@ static void test_rt_caps(void) { &z_fmt, DDSCAPS_3DDEVICE | DDSCAPS_ZBUFFER, - DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, + {DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, + DDSCAPS_3DDEVICE | DDSCAPS_SYSTEMMEMORY | DDSCAPS_ZBUFFER}, 0, 0, DDERR_INVALIDCAPS, @@ -6578,7 +6586,8 @@ static void test_rt_caps(void) { &z_fmt, DDSCAPS_ZBUFFER, - DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, + DDSCAPS_SYSTEMMEMORY | DDSCAPS_ZBUFFER}, 0, 0, DDERR_INVALIDCAPS, @@ -6588,7 +6597,7 @@ static void test_rt_caps(void) { &z_fmt, DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE | DDSCAPS_ZBUFFER, - DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE | DDSCAPS_ZBUFFER, + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE | DDSCAPS_ZBUFFER}, 0, 0, DDERR_INVALIDCAPS, @@ -6598,7 +6607,7 @@ static void test_rt_caps(void) { &z_fmt, DDSCAPS_SYSTEMMEMORY | DDSCAPS_ZBUFFER, - DDSCAPS_SYSTEMMEMORY | DDSCAPS_ZBUFFER, + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_ZBUFFER}, 0, 0, DDERR_INVALIDCAPS, @@ -6611,7 +6620,7 @@ static void test_rt_caps(void) ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); if (FAILED(IDirectDraw4_QueryInterface(ddraw, &IID_IDirect3D3, (void **)&d3d))) { @@ -6619,120 +6628,156 @@ static void test_rt_caps(void) goto done; } - memset(&z_fmt, 0, sizeof(z_fmt)); - hr = IDirect3D3_EnumZBufferFormats(d3d, &IID_IDirect3DHALDevice, enum_z_fmt, &z_fmt); - if (FAILED(hr) || !z_fmt.dwSize) - { - skip("No depth buffer formats available, skipping test.\n"); - IDirect3D3_Release(d3d); - goto done; - } - memset(palette_entries, 0, sizeof(palette_entries)); hr = IDirectDraw4_CreatePalette(ddraw, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, palette_entries, &palette, NULL); - ok(SUCCEEDED(hr), "Failed to create palette, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - for (i = 0; i < ARRAY_SIZE(test_data); ++i) + for (device_type = 0; device_type < ARRAY_SIZE(test_devices); ++device_type) { - IDirectDrawSurface4 *surface, *rt, *expected_rt, *tmp; - DDSURFACEDESC2 surface_desc; - IDirect3DDevice3 *device; - - memset(&surface_desc, 0, sizeof(surface_desc)); - surface_desc.dwSize = sizeof(surface_desc); - surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - surface_desc.ddsCaps.dwCaps = test_data[i].caps_in; - surface_desc.ddsCaps.dwCaps2 = test_data[i].caps2_in; - if (test_data[i].pf) + memset(&z_fmt, 0, sizeof(z_fmt)); + hr = IDirect3D3_EnumZBufferFormats(d3d, test_devices[device_type], enum_z_fmt, &z_fmt); + if (FAILED(hr) || !z_fmt.dwSize) { - surface_desc.dwFlags |= DDSD_PIXELFORMAT; - U4(surface_desc).ddpfPixelFormat = *test_data[i].pf; + skip("No depth buffer formats available, device_type %u, skipping test.\n", device_type); + continue; } - surface_desc.dwWidth = 640; - surface_desc.dwHeight = 480; - hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to create surface with caps %#x and caps2 %#x, hr %#x.\n", - i, test_data[i].caps_in, test_data[i].caps2_in, hr); - memset(&surface_desc, 0, sizeof(surface_desc)); - surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Test %u: Failed to get surface desc, hr %#x.\n", i, hr); - ok(test_data[i].caps_out == ~0U || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, - "Test %u: Got unexpected caps %#x, expected %#x.\n", - i, surface_desc.ddsCaps.dwCaps, test_data[i].caps_out); - ok(surface_desc.ddsCaps.dwCaps2 == test_data[i].caps2_out, - "Test %u: Got unexpected caps2 %#x, expected %#x.\n", - i, surface_desc.ddsCaps.dwCaps2, test_data[i].caps2_out); - - hr = IDirect3D3_CreateDevice(d3d, &IID_IDirect3DHALDevice, surface, &device, NULL); - ok(hr == test_data[i].create_device_hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", - i, hr, test_data[i].create_device_hr); - if (FAILED(hr)) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { - if (hr == DDERR_NOPALETTEATTACHED) - { - hr = IDirectDrawSurface4_SetPalette(surface, palette); - ok(SUCCEEDED(hr), "Test %u: Failed to set palette, hr %#x.\n", i, hr); - hr = IDirect3D3_CreateDevice(d3d, &IID_IDirect3DHALDevice, surface, &device, NULL); - if (surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) - ok(hr == DDERR_INVALIDPIXELFORMAT, "Test %u: Got unexpected hr %#x.\n", i, hr); - else - ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); - } - IDirectDrawSurface4_Release(surface); + IDirectDrawSurface4 *surface, *rt, *expected_rt, *tmp; + DDSURFACEDESC2 surface_desc; + IDirect3DDevice3 *device; memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + surface_desc.ddsCaps.dwCaps = test_data[i].caps_in; + surface_desc.ddsCaps.dwCaps2 = test_data[i].caps2_in; + if (test_data[i].pf) + { + surface_desc.dwFlags |= DDSD_PIXELFORMAT; + U4(surface_desc).ddpfPixelFormat = *test_data[i].pf; + } surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to create surface, hr %#x.\n", i, hr); + ok(hr == DD_OK || (device_type && (surface_desc.ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER)) + == (DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER) && hr == E_NOTIMPL), + "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); + if (FAILED(hr)) + continue; - hr = IDirect3D3_CreateDevice(d3d, &IID_IDirect3DHALDevice, surface, &device, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to create device, hr %#x.\n", i, hr); - } + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &surface_desc); + ok(hr == DD_OK, "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); - memset(&surface_desc, 0, sizeof(surface_desc)); - surface_desc.dwSize = sizeof(surface_desc); - surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - surface_desc.ddsCaps.dwCaps = test_data[i].caps_in; - surface_desc.ddsCaps.dwCaps2 = test_data[i].caps2_in; - if (test_data[i].pf) - { - surface_desc.dwFlags |= DDSD_PIXELFORMAT; - U4(surface_desc).ddpfPixelFormat = *test_data[i].pf; - } - surface_desc.dwWidth = 640; - surface_desc.dwHeight = 480; - hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &rt, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to create surface with caps %#x, hr %#x.\n", - i, test_data[i].caps_in, hr); + if (device_type) + { + expected_caps = test_data[i].caps_out[device_type] + ? test_data[i].caps_out[device_type] : test_data[i].caps_out[0]; + + todo_wine_if(test_data[i].caps_out[device_type] + && surface_desc.ddsCaps.dwCaps == test_data[i].caps_out[0]) + ok(surface_desc.ddsCaps.dwCaps == expected_caps + || broken(surface_desc.ddsCaps.dwCaps == test_data[i].caps_out[0]), + "Got unexpected caps %#x, test %u, device_type %u.\n", + surface_desc.ddsCaps.dwCaps, i, device_type); + } + else + { + ok(test_data[i].caps_out[0] == ~0u || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out[0], + "Got unexpected caps %#x, expected %#x, test %u, device_type %u.\n", + surface_desc.ddsCaps.dwCaps, test_data[i].caps_out[0], i, device_type); + } + ok(surface_desc.ddsCaps.dwCaps2 == test_data[i].caps2_out, + "Got unexpected caps2 %#x, expected %#x, test %u, device_type %u.\n", + surface_desc.ddsCaps.dwCaps2, test_data[i].caps2_out, i, device_type); - hr = IDirect3DDevice3_SetRenderTarget(device, rt, 0); - ok(hr == test_data[i].set_rt_hr || broken(hr == test_data[i].alternative_set_rt_hr), - "Test %u: Got unexpected hr %#x, expected %#x.\n", - i, hr, test_data[i].set_rt_hr); - if (SUCCEEDED(hr) || hr == DDERR_INVALIDPIXELFORMAT) - expected_rt = rt; - else - expected_rt = surface; + hr = IDirect3D3_CreateDevice(d3d, test_devices[device_type], surface, &device, NULL); - hr = IDirect3DDevice3_GetRenderTarget(device, &tmp); - ok(SUCCEEDED(hr), "Test %u: Failed to get render target, hr %#x.\n", i, hr); - ok(tmp == expected_rt, "Test %u: Got unexpected rt %p.\n", i, tmp); + todo_wine_if(device_type && test_data[i].create_device_hr == D3DERR_SURFACENOTINVIDMEM) + ok((!device_type && hr == test_data[i].create_device_hr) + || (device_type && (hr == (test_data[i].create_device_hr == D3DERR_SURFACENOTINVIDMEM + ? DD_OK : test_data[i].create_device_hr))), + "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); + if (FAILED(hr)) + { + if (hr == DDERR_NOPALETTEATTACHED) + { + hr = IDirectDrawSurface4_SetPalette(surface, palette); + ok(hr == DD_OK, "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); + if (device_type) + { + /* _CreateDevice succeeds with software device, but the palette gets extra reference + * on Windows (probably due to a bug) which doesn't go away on the device and surface + * destruction and ddraw is not destroyed cleanly, so skipping this test. */ + IDirectDrawSurface4_Release(surface); + continue; + } + hr = IDirect3D3_CreateDevice(d3d, test_devices[device_type], surface, &device, NULL); + if (surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) + ok(hr == DDERR_INVALIDPIXELFORMAT, "Got unexpected hr %#x, test %u, device_type %u.\n", + hr, i, device_type); + else + ok(hr == D3DERR_SURFACENOTINVIDMEM, "Got unexpected hr %#x, test %u, device_type %u.\n", + hr, i, device_type); + } + IDirectDrawSurface4_Release(surface); - IDirectDrawSurface4_Release(tmp); - IDirectDrawSurface4_Release(rt); - refcount = IDirect3DDevice3_Release(device); - ok(refcount == 0, "Test %u: The device was not properly freed, refcount %u.\n", i, refcount); - refcount = IDirectDrawSurface4_Release(surface); - ok(refcount == 0, "Test %u: The surface was not properly freed, refcount %u.\n", i, refcount); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); + + hr = IDirect3D3_CreateDevice(d3d, test_devices[device_type], surface, &device, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); + } + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = test_data[i].caps_in; + surface_desc.ddsCaps.dwCaps2 = test_data[i].caps2_in; + if (test_data[i].pf) + { + surface_desc.dwFlags |= DDSD_PIXELFORMAT; + U4(surface_desc).ddpfPixelFormat = *test_data[i].pf; + } + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &rt, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); + + hr = IDirect3DDevice3_SetRenderTarget(device, rt, 0); + ok(hr == test_data[i].set_rt_hr || (device_type && hr == DDERR_NOPALETTEATTACHED) + || broken(hr == test_data[i].alternative_set_rt_hr), + "Got unexpected hr %#x, test %u, device_type %u.\n", + hr, i, device_type); + if (SUCCEEDED(hr) || hr == DDERR_INVALIDPIXELFORMAT) + expected_rt = rt; + else + expected_rt = surface; + + hr = IDirect3DDevice3_GetRenderTarget(device, &tmp); + ok(hr == DD_OK, "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); + ok(tmp == expected_rt, "Got unexpected rt %p, test %u, device_type %u.\n", tmp, i, device_type); + + IDirectDrawSurface4_Release(tmp); + IDirectDrawSurface4_Release(rt); + refcount = IDirect3DDevice3_Release(device); + ok(refcount == 0, "Test %u: The device was not properly freed, refcount %u.\n", i, refcount); + refcount = IDirectDrawSurface4_Release(surface); + ok(refcount == 0, "Test %u: The surface was not properly freed, refcount %u.\n", i, refcount); + } } - IDirectDrawPalette_Release(palette); + refcount = IDirectDrawPalette_Release(palette); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); IDirect3D3_Release(d3d); done: -- 2.29.2
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=85656 Your paranoid android. === w2008s64 (32 bit report) === ddraw: ddraw4.c:6664: Test failed: Got unexpected hr 0x88760233, test 0, device_type 1. ddraw4.c:6682: Test failed: Got unexpected caps 0x2840, test 1, device_type 1. ddraw4.c:6682: Test failed: Got unexpected caps 0x840, test 2, device_type 1. ddraw4.c:6664: Test failed: Got unexpected hr 0x88760233, test 5, device_type 1. ddraw4.c:6682: Test failed: Got unexpected caps 0x2800, test 6, device_type 1. ddraw4.c:6682: Test failed: Got unexpected caps 0x800, test 7, device_type 1. ddraw4.c:6664: Test failed: Got unexpected hr 0x88760091, test 12, device_type 1. ddraw4.c:6682: Test failed: Got unexpected caps 0x840, test 14, device_type 1. ddraw4.c:6664: Test failed: Got unexpected hr 0x88760233, test 17, device_type 1. === w7u_2qxl (32 bit report) === ddraw: ddraw4.c:6664: Test failed: Got unexpected hr 0x88760233, test 0, device_type 1. ddraw4.c:6682: Test failed: Got unexpected caps 0x2840, test 1, device_type 1. ddraw4.c:6682: Test failed: Got unexpected caps 0x840, test 2, device_type 1. ddraw4.c:6664: Test failed: Got unexpected hr 0x88760233, test 5, device_type 1. ddraw4.c:6682: Test failed: Got unexpected caps 0x2800, test 6, device_type 1. ddraw4.c:6682: Test failed: Got unexpected caps 0x800, test 7, device_type 1. ddraw4.c:6664: Test failed: Got unexpected hr 0x88760091, test 12, device_type 1. ddraw4.c:6682: Test failed: Got unexpected caps 0x840, test 14, device_type 1. ddraw4.c:6664: Test failed: Got unexpected hr 0x88760233, test 17, device_type 1. === w7u_adm (32 bit report) === ddraw: ddraw4.c:6664: Test failed: Got unexpected hr 0x88760233, test 0, device_type 1. ddraw4.c:6682: Test failed: Got unexpected caps 0x2840, test 1, device_type 1. ddraw4.c:6682: Test failed: Got unexpected caps 0x840, test 2, device_type 1. ddraw4.c:6664: Test failed: Got unexpected hr 0x88760233, test 5, device_type 1. ddraw4.c:6682: Test failed: Got unexpected caps 0x2800, test 6, device_type 1. ddraw4.c:6682: Test failed: Got unexpected caps 0x800, test 7, device_type 1. ddraw4.c:6664: Test failed: Got unexpected hr 0x88760091, test 12, device_type 1. ddraw4.c:6682: Test failed: Got unexpected caps 0x840, test 14, device_type 1. ddraw4.c:6664: Test failed: Got unexpected hr 0x88760233, test 17, device_type 1. === w7u_el (32 bit report) === ddraw: ddraw4.c:6664: Test failed: Got unexpected hr 0x88760233, test 0, device_type 1. ddraw4.c:6682: Test failed: Got unexpected caps 0x2840, test 1, device_type 1. ddraw4.c:6682: Test failed: Got unexpected caps 0x840, test 2, device_type 1. ddraw4.c:6664: Test failed: Got unexpected hr 0x88760233, test 5, device_type 1. ddraw4.c:6682: Test failed: Got unexpected caps 0x2800, test 6, device_type 1. ddraw4.c:6682: Test failed: Got unexpected caps 0x800, test 7, device_type 1. ddraw4.c:6664: Test failed: Got unexpected hr 0x88760091, test 12, device_type 1. ddraw4.c:6682: Test failed: Got unexpected caps 0x840, test 14, device_type 1. ddraw4.c:6664: Test failed: Got unexpected hr 0x88760233, test 17, device_type 1. === debiant2 (32 bit report) === ddraw: ddraw4.c:18169: Test failed: Expect window rect (0,0)-(1024,768), got (0,0)-(1010,735).
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ddraw/tests/ddraw7.c | 303 +++++++++++++++++++++----------------- 1 file changed, 171 insertions(+), 132 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 628360630dc..48574b7018d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6087,14 +6087,14 @@ static void test_unsupported_formats(void) static void test_rt_caps(void) { - const GUID *devtype = &IID_IDirect3DHALDevice; PALETTEENTRY palette_entries[256]; IDirectDrawPalette *palette; + unsigned int i, device_type; + DWORD expected_caps; IDirectDraw7 *ddraw; BOOL hal_ok = FALSE; DDPIXELFORMAT z_fmt; IDirect3D7 *d3d; - unsigned int i; ULONG refcount; HWND window; HRESULT hr; @@ -6105,11 +6105,17 @@ static void test_rt_caps(void) {8}, {0x00000000}, {0x00000000}, {0x00000000}, {0x00000000}, }; + static const GUID *test_devices[] = + { + &IID_IDirect3DHALDevice, + &IID_IDirect3DRGBDevice, + }; + const struct { const DDPIXELFORMAT *pf; DWORD caps_in; - DWORD caps_out; + DWORD caps_out[ARRAY_SIZE(test_devices)]; DWORD caps2_in; DWORD caps2_out; HRESULT create_device_hr; @@ -6120,27 +6126,27 @@ static void test_rt_caps(void) { NULL, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, + {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM,}, 0, 0, - D3D_OK, - D3D_OK, - D3D_OK, + DD_OK, + DD_OK, + DD_OK, }, { NULL, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, + {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM}, 0, 0, - D3D_OK, - D3D_OK, - D3D_OK, + DD_OK, + DD_OK, + DD_OK, }, { NULL, DDSCAPS_OFFSCREENPLAIN, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, + {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM,}, 0, 0, DDERR_INVALIDCAPS, @@ -6150,17 +6156,17 @@ static void test_rt_caps(void) { NULL, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, + {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE}, 0, 0, D3DERR_SURFACENOTINVIDMEM, DDERR_INVALIDPARAMS, - D3D_OK, + DD_OK, }, { NULL, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, + {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY}, 0, 0, DDERR_INVALIDCAPS, @@ -6170,27 +6176,27 @@ static void test_rt_caps(void) { NULL, DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY, - DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, + {DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM}, 0, 0, - D3D_OK, - D3D_OK, - D3D_OK, + DD_OK, + DD_OK, + DD_OK, }, { NULL, DDSCAPS_3DDEVICE, - DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, + {DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM}, 0, 0, - D3D_OK, - D3D_OK, - D3D_OK, + DD_OK, + DD_OK, + DD_OK, }, { NULL, 0, - DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM}, 0, 0, DDERR_INVALIDCAPS, @@ -6200,7 +6206,7 @@ static void test_rt_caps(void) { NULL, DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, - DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE}, 0, 0, D3DERR_SURFACENOTINVIDMEM, @@ -6210,7 +6216,7 @@ static void test_rt_caps(void) { NULL, DDSCAPS_SYSTEMMEMORY, - DDSCAPS_SYSTEMMEMORY, + {DDSCAPS_SYSTEMMEMORY}, 0, 0, DDERR_INVALIDCAPS, @@ -6220,7 +6226,7 @@ static void test_rt_caps(void) { NULL, DDSCAPS_TEXTURE | DDSCAPS_3DDEVICE, - DDSCAPS_TEXTURE | DDSCAPS_3DDEVICE | DDSCAPS_SYSTEMMEMORY, + {DDSCAPS_TEXTURE | DDSCAPS_3DDEVICE | DDSCAPS_SYSTEMMEMORY}, DDSCAPS2_TEXTUREMANAGE, DDSCAPS2_TEXTUREMANAGE, D3DERR_SURFACENOTINVIDMEM, @@ -6230,7 +6236,7 @@ static void test_rt_caps(void) { NULL, DDSCAPS_TEXTURE | DDSCAPS_3DDEVICE, - DDSCAPS_TEXTURE | DDSCAPS_3DDEVICE | DDSCAPS_SYSTEMMEMORY, + {DDSCAPS_TEXTURE | DDSCAPS_3DDEVICE | DDSCAPS_SYSTEMMEMORY}, DDSCAPS2_D3DTEXTUREMANAGE, DDSCAPS2_D3DTEXTUREMANAGE, D3DERR_SURFACENOTINVIDMEM, @@ -6240,7 +6246,7 @@ static void test_rt_caps(void) { &p8_fmt, 0, - DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM}, 0, 0, DDERR_INVALIDCAPS, @@ -6250,7 +6256,7 @@ static void test_rt_caps(void) { &p8_fmt, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, - ~0U /* AMD r200 */, + {~0u /* AMD r200 */, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_SYSTEMMEMORY}, 0, 0, DDERR_NOPALETTEATTACHED, @@ -6260,7 +6266,7 @@ static void test_rt_caps(void) { &p8_fmt, DDSCAPS_OFFSCREENPLAIN, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, + {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM}, 0, 0, DDERR_INVALIDCAPS, @@ -6270,7 +6276,7 @@ static void test_rt_caps(void) { &p8_fmt, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE, + {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE}, 0, 0, DDERR_NOPALETTEATTACHED, @@ -6280,7 +6286,7 @@ static void test_rt_caps(void) { &p8_fmt, DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, - DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, + {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY}, 0, 0, DDERR_INVALIDCAPS, @@ -6290,7 +6296,7 @@ static void test_rt_caps(void) { &z_fmt, DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER, - DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, + {DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM}, 0, 0, DDERR_INVALIDCAPS, @@ -6300,7 +6306,8 @@ static void test_rt_caps(void) { &z_fmt, DDSCAPS_3DDEVICE | DDSCAPS_ZBUFFER, - DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, + {DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, + DDSCAPS_3DDEVICE | DDSCAPS_SYSTEMMEMORY | DDSCAPS_ZBUFFER}, 0, 0, DDERR_INVALIDCAPS, @@ -6310,7 +6317,8 @@ static void test_rt_caps(void) { &z_fmt, DDSCAPS_ZBUFFER, - DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM, + DDSCAPS_SYSTEMMEMORY | DDSCAPS_ZBUFFER}, 0, 0, DDERR_INVALIDCAPS, @@ -6320,7 +6328,7 @@ static void test_rt_caps(void) { &z_fmt, DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE | DDSCAPS_ZBUFFER, - DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE | DDSCAPS_ZBUFFER, + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_3DDEVICE | DDSCAPS_ZBUFFER}, 0, 0, DDERR_INVALIDCAPS, @@ -6330,7 +6338,7 @@ static void test_rt_caps(void) { &z_fmt, DDSCAPS_SYSTEMMEMORY | DDSCAPS_ZBUFFER, - DDSCAPS_SYSTEMMEMORY | DDSCAPS_ZBUFFER, + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_ZBUFFER}, 0, 0, DDERR_INVALIDCAPS, @@ -6352,124 +6360,155 @@ static void test_rt_caps(void) } hr = IDirect3D7_EnumDevices(d3d, enum_devtype_cb, &hal_ok); - ok(SUCCEEDED(hr), "Failed to enumerate devices, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); if (hal_ok) - devtype = &IID_IDirect3DTnLHalDevice; - - memset(&z_fmt, 0, sizeof(z_fmt)); - hr = IDirect3D7_EnumZBufferFormats(d3d, devtype, enum_z_fmt, &z_fmt); - if (FAILED(hr) || !z_fmt.dwSize) - { - skip("No depth buffer formats available, skipping test.\n"); - IDirect3D7_Release(d3d); - goto done; - } + test_devices[0] = &IID_IDirect3DTnLHalDevice; memset(palette_entries, 0, sizeof(palette_entries)); hr = IDirectDraw7_CreatePalette(ddraw, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, palette_entries, &palette, NULL); - ok(SUCCEEDED(hr), "Failed to create palette, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - for (i = 0; i < ARRAY_SIZE(test_data); ++i) + for (device_type = 0; device_type < ARRAY_SIZE(test_devices); ++device_type) { - IDirectDrawSurface7 *surface, *rt, *expected_rt, *tmp; - DDSURFACEDESC2 surface_desc; - IDirect3DDevice7 *device; - - memset(&surface_desc, 0, sizeof(surface_desc)); - surface_desc.dwSize = sizeof(surface_desc); - surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - surface_desc.ddsCaps.dwCaps = test_data[i].caps_in; - surface_desc.ddsCaps.dwCaps2 = test_data[i].caps2_in; - if (test_data[i].pf) + memset(&z_fmt, 0, sizeof(z_fmt)); + hr = IDirect3D7_EnumZBufferFormats(d3d, test_devices[device_type], enum_z_fmt, &z_fmt); + if (FAILED(hr) || !z_fmt.dwSize) { - surface_desc.dwFlags |= DDSD_PIXELFORMAT; - U4(surface_desc).ddpfPixelFormat = *test_data[i].pf; + skip("No depth buffer formats available, device_type %u, skipping test.\n", device_type); + continue; } - surface_desc.dwWidth = 640; - surface_desc.dwHeight = 480; - hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to create surface with caps %#x and caps2 %#x, hr %#x.\n", - i, test_data[i].caps_in, test_data[i].caps2_in, hr); - - memset(&surface_desc, 0, sizeof(surface_desc)); - surface_desc.dwSize = sizeof(surface_desc); - hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Test %u: Failed to get surface desc, hr %#x.\n", i, hr); - ok(test_data[i].caps_out == ~0U || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out, - "Test %u: Got unexpected caps %#x, expected %#x.\n", - i, surface_desc.ddsCaps.dwCaps, test_data[i].caps_out); - ok(surface_desc.ddsCaps.dwCaps2 == test_data[i].caps2_out, - "Test %u: Got unexpected caps2 %#x, expected %#x.\n", - i, surface_desc.ddsCaps.dwCaps2, test_data[i].caps2_out); - hr = IDirect3D7_CreateDevice(d3d, devtype, surface, &device); - ok(hr == test_data[i].create_device_hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", - i, hr, test_data[i].create_device_hr); - if (FAILED(hr)) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { - if (hr == DDERR_NOPALETTEATTACHED) - { - hr = IDirectDrawSurface7_SetPalette(surface, palette); - ok(SUCCEEDED(hr), "Test %u: Failed to set palette, hr %#x.\n", i, hr); - hr = IDirect3D7_CreateDevice(d3d, devtype, surface, &device); - if (surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) - ok(hr == DDERR_INVALIDPIXELFORMAT, "Test %u: Got unexpected hr %#x.\n", i, hr); - else - ok(hr == D3DERR_SURFACENOTINVIDMEM, "Test %u: Got unexpected hr %#x.\n", i, hr); - } - IDirectDrawSurface7_Release(surface); + IDirectDrawSurface7 *surface, *rt, *expected_rt, *tmp; + DDSURFACEDESC2 surface_desc; + IDirect3DDevice7 *device; memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + surface_desc.ddsCaps.dwCaps = test_data[i].caps_in; + surface_desc.ddsCaps.dwCaps2 = test_data[i].caps2_in; + if (test_data[i].pf) + { + surface_desc.dwFlags |= DDSD_PIXELFORMAT; + U4(surface_desc).ddpfPixelFormat = *test_data[i].pf; + } surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to create surface, hr %#x.\n", i, hr); + ok(hr == DD_OK || (device_type && (surface_desc.ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER)) + == (DDSCAPS_VIDEOMEMORY | DDSCAPS_ZBUFFER) && hr == E_NOTIMPL), + "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); + if (FAILED(hr)) + continue; - hr = IDirect3D7_CreateDevice(d3d, devtype, surface, &device); - ok(SUCCEEDED(hr), "Test %u: Failed to create device, hr %#x.\n", i, hr); - } + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); + ok(hr == DD_OK, "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); - memset(&surface_desc, 0, sizeof(surface_desc)); - surface_desc.dwSize = sizeof(surface_desc); - surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - surface_desc.ddsCaps.dwCaps = test_data[i].caps_in; - surface_desc.ddsCaps.dwCaps2 = test_data[i].caps2_in; - if (test_data[i].pf) - { - surface_desc.dwFlags |= DDSD_PIXELFORMAT; - U4(surface_desc).ddpfPixelFormat = *test_data[i].pf; - } - surface_desc.dwWidth = 640; - surface_desc.dwHeight = 480; - hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &rt, NULL); - ok(SUCCEEDED(hr), "Test %u: Failed to create surface with caps %#x, hr %#x.\n", - i, test_data[i].caps_in, hr); + if (device_type) + { + expected_caps = test_data[i].caps_out[device_type] + ? test_data[i].caps_out[device_type] : test_data[i].caps_out[0]; + + todo_wine_if(test_data[i].caps_out[device_type] + && surface_desc.ddsCaps.dwCaps == test_data[i].caps_out[0]) + ok(surface_desc.ddsCaps.dwCaps == expected_caps + || broken(surface_desc.ddsCaps.dwCaps == test_data[i].caps_out[0]), + "Got unexpected caps %#x, test %u, device_type %u.\n", + surface_desc.ddsCaps.dwCaps, i, device_type); + } + else + { + ok(test_data[i].caps_out[0] == ~0u || surface_desc.ddsCaps.dwCaps == test_data[i].caps_out[0], + "Got unexpected caps %#x, expected %#x, test %u, device_type %u.\n", + surface_desc.ddsCaps.dwCaps, test_data[i].caps_out[0], i, device_type); + } + ok(surface_desc.ddsCaps.dwCaps2 == test_data[i].caps2_out, + "Got unexpected caps2 %#x, expected %#x, test %u, device_type %u.\n", + surface_desc.ddsCaps.dwCaps2, test_data[i].caps2_out, i, device_type); + + hr = IDirect3D7_CreateDevice(d3d, test_devices[device_type], surface, &device); + todo_wine_if(device_type && test_data[i].create_device_hr == D3DERR_SURFACENOTINVIDMEM) + ok((!device_type && hr == test_data[i].create_device_hr) + || (device_type && (hr == (test_data[i].create_device_hr == D3DERR_SURFACENOTINVIDMEM + ? DD_OK : test_data[i].create_device_hr))), + "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); + if (FAILED(hr)) + { + if (hr == DDERR_NOPALETTEATTACHED) + { + hr = IDirectDrawSurface7_SetPalette(surface, palette); + ok(hr == DD_OK, "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); + hr = IDirect3D7_CreateDevice(d3d, test_devices[device_type], surface, &device); + if (surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) + ok(hr == DDERR_INVALIDPIXELFORMAT, "Got unexpected hr %#x, test %u, device_type %u.\n", + hr, i, device_type); + else if (device_type) + todo_wine + ok(hr == E_FAIL, "Got unexpected hr %#x, test %u, device_type %u.\n", + hr, i, device_type); + else + ok(hr == D3DERR_SURFACENOTINVIDMEM, "Got unexpected hr %#x, test %u, device_type %u.\n", + hr, i, device_type); + } + IDirectDrawSurface7_Release(surface); - hr = IDirect3DDevice7_SetRenderTarget(device, rt, 0); - ok(hr == test_data[i].set_rt_hr || broken(hr == test_data[i].alternative_set_rt_hr), - "Test %u: Got unexpected hr %#x, expected %#x.\n", - i, hr, test_data[i].set_rt_hr); - if (SUCCEEDED(hr) || hr == DDERR_INVALIDPIXELFORMAT) - expected_rt = rt; - else - expected_rt = surface; + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); + + hr = IDirect3D7_CreateDevice(d3d, test_devices[device_type], surface, &device); + ok(hr == DD_OK, "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); + } - hr = IDirect3DDevice7_GetRenderTarget(device, &tmp); - ok(SUCCEEDED(hr), "Test %u: Failed to get render target, hr %#x.\n", i, hr); - ok(tmp == expected_rt, "Test %u: Got unexpected rt %p.\n", i, tmp); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = test_data[i].caps_in; + surface_desc.ddsCaps.dwCaps2 = test_data[i].caps2_in; + if (test_data[i].pf) + { + surface_desc.dwFlags |= DDSD_PIXELFORMAT; + U4(surface_desc).ddpfPixelFormat = *test_data[i].pf; + } + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &rt, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); - IDirectDrawSurface7_Release(tmp); - IDirectDrawSurface7_Release(rt); - refcount = IDirect3DDevice7_Release(device); - ok(refcount == 0, "Test %u: The device was not properly freed, refcount %u.\n", i, refcount); - refcount = IDirectDrawSurface7_Release(surface); - ok(refcount == 0, "Test %u: The surface was not properly freed, refcount %u.\n", i, refcount); + hr = IDirect3DDevice7_SetRenderTarget(device, rt, 0); + ok(hr == test_data[i].set_rt_hr || (device_type && hr == DDERR_NOPALETTEATTACHED) + || broken(hr == test_data[i].alternative_set_rt_hr), + "Got unexpected hr %#x, test %u, device_type %u.\n", + hr, i, device_type); + if (SUCCEEDED(hr) || hr == DDERR_INVALIDPIXELFORMAT) + expected_rt = rt; + else + expected_rt = surface; + + hr = IDirect3DDevice7_GetRenderTarget(device, &tmp); + ok(hr == DD_OK, "Got unexpected hr %#x, test %u, device_type %u.\n", hr, i, device_type); + ok(tmp == expected_rt, "Got unexpected rt %p, test %u, device_type %u.\n", tmp, i, device_type); + + IDirectDrawSurface7_Release(tmp); + IDirectDrawSurface7_Release(rt); + refcount = IDirect3DDevice7_Release(device); + ok(refcount == 0, "Test %u: The device was not properly freed, refcount %u.\n", i, refcount); + refcount = IDirectDrawSurface7_Release(surface); + ok(refcount == 0, "Test %u: The surface was not properly freed, refcount %u.\n", i, refcount); + } } - IDirectDrawPalette_Release(palette); + refcount = IDirectDrawPalette_Release(palette); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); IDirect3D7_Release(d3d); done: -- 2.29.2
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=85657 Your paranoid android. === w2008s64 (32 bit report) === ddraw: ddraw7.c:6400: Test failed: Got unexpected hr 0x88760233, test 0, device_type 1. ddraw7.c:6418: Test failed: Got unexpected caps 0x2840, test 1, device_type 1. ddraw7.c:6418: Test failed: Got unexpected caps 0x840, test 2, device_type 1. ddraw7.c:6400: Test failed: Got unexpected hr 0x88760233, test 5, device_type 1. ddraw7.c:6418: Test failed: Got unexpected caps 0x2800, test 6, device_type 1. ddraw7.c:6418: Test failed: Got unexpected caps 0x800, test 7, device_type 1. ddraw7.c:6400: Test failed: Got unexpected hr 0x88760091, test 12, device_type 1. ddraw7.c:6418: Test failed: Got unexpected caps 0x840, test 14, device_type 1. ddraw7.c:6400: Test failed: Got unexpected hr 0x88760233, test 17, device_type 1. === w7u_2qxl (32 bit report) === ddraw: ddraw7.c:6400: Test failed: Got unexpected hr 0x88760233, test 0, device_type 1. ddraw7.c:6418: Test failed: Got unexpected caps 0x2840, test 1, device_type 1. ddraw7.c:6418: Test failed: Got unexpected caps 0x840, test 2, device_type 1. ddraw7.c:6400: Test failed: Got unexpected hr 0x88760233, test 5, device_type 1. ddraw7.c:6418: Test failed: Got unexpected caps 0x2800, test 6, device_type 1. ddraw7.c:6418: Test failed: Got unexpected caps 0x800, test 7, device_type 1. ddraw7.c:6400: Test failed: Got unexpected hr 0x88760091, test 12, device_type 1. ddraw7.c:6418: Test failed: Got unexpected caps 0x840, test 14, device_type 1. ddraw7.c:6400: Test failed: Got unexpected hr 0x88760233, test 17, device_type 1. === w7u_adm (32 bit report) === ddraw: ddraw7.c:6400: Test failed: Got unexpected hr 0x88760233, test 0, device_type 1. ddraw7.c:6418: Test failed: Got unexpected caps 0x2840, test 1, device_type 1. ddraw7.c:6418: Test failed: Got unexpected caps 0x840, test 2, device_type 1. ddraw7.c:6400: Test failed: Got unexpected hr 0x88760233, test 5, device_type 1. ddraw7.c:6418: Test failed: Got unexpected caps 0x2800, test 6, device_type 1. ddraw7.c:6418: Test failed: Got unexpected caps 0x800, test 7, device_type 1. ddraw7.c:6400: Test failed: Got unexpected hr 0x88760091, test 12, device_type 1. ddraw7.c:6418: Test failed: Got unexpected caps 0x840, test 14, device_type 1. ddraw7.c:6400: Test failed: Got unexpected hr 0x88760233, test 17, device_type 1. === w7u_el (32 bit report) === ddraw: ddraw7.c:6400: Test failed: Got unexpected hr 0x88760233, test 0, device_type 1. ddraw7.c:6418: Test failed: Got unexpected caps 0x2840, test 1, device_type 1. ddraw7.c:6418: Test failed: Got unexpected caps 0x840, test 2, device_type 1. ddraw7.c:6400: Test failed: Got unexpected hr 0x88760233, test 5, device_type 1. ddraw7.c:6418: Test failed: Got unexpected caps 0x2800, test 6, device_type 1. ddraw7.c:6418: Test failed: Got unexpected caps 0x800, test 7, device_type 1. ddraw7.c:6400: Test failed: Got unexpected hr 0x88760091, test 12, device_type 1. ddraw7.c:6418: Test failed: Got unexpected caps 0x840, test 14, device_type 1. ddraw7.c:6400: Test failed: Got unexpected hr 0x88760233, test 17, device_type 1. === debiant2 (32 bit Japanese:Japan report) === ddraw: ddraw7.c:18425: Test failed: Expect window rect (0,0)-(1024,768), got (7,26)-(1017,761).
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=85654 Your paranoid android. === debiant2 (32 bit WoW report) === ddraw: ddraw1.c:14190: Test failed: Expect window rect (0,0)-(1024,768), got (7,26)-(1017,761). === debiant2 (64 bit WoW report) === ddraw: ddraw1.c:14208: Test failed: Expect window rect (0,0)-(1024,768), got (0,-8)-(1024,760). ddraw1.c:14215: Test failed: Expect window rect (0,0)-(1024,768), got (0,-8)-(1024,760). ddraw1.c:14190: Test failed: Expect window rect (0,0)-(1024,768), got (7,26)-(1031,794).
participants (2)
-
Marvin -
Paul Gofman