Skip to content

W
wine-winehq
Commit c3ac646a authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard
Browse files
Options

d3d9/tests: Use correct index variable in test_resource_access() (Coverity).

Signed-off-by: 's avatarJózef Kucia <jkucia@codeweavers.com> Signed-off-by: 's avatarMatteo Bruni <mbruni@codeweavers.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 61a5b6c6
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 11 deletions
dlls/d3d9/tests/d3d9ex.c
View file @ c3ac646a
......@@ -4115,6 +4115,7 @@ static void test_resource_access(void)
IDirect3DSurface9 *backbuffer, *depth_stencil;
D3DFORMAT colour_format, depth_format, format;
BOOL depth_2d, depth_cube, depth_plain;
D3DADAPTER_IDENTIFIER9 identifier;
struct device_desc device_desc;
D3DSURFACE_DESC surface_desc;
IDirect3DDevice9Ex *device;
......@@ -4123,6 +4124,7 @@ static void test_resource_access(void)
ULONG refcount;
HWND window;
HRESULT hr;
BOOL warp;
enum surface_type
{
......@@ -4223,6 +4225,9 @@ static void test_resource_access(void)
}
hr = IDirect3DDevice9Ex_GetDirect3D(device, &d3d);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier);
ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr);
warp = adapter_is_warp(&identifier);
hr = IDirect3DDevice9Ex_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
......@@ -4452,18 +4457,20 @@ static void test_resource_access(void)
HRESULT expected_hr;
D3DLOCKED_BOX lb;
if (tests[j].format == FORMAT_DEPTH)
if (tests[i].format == FORMAT_DEPTH)
continue;
if (tests[j].format == FORMAT_ATI2)
if (tests[i].format == FORMAT_ATI2)
format = MAKEFOURCC('A','T','I','2');
else
format = colour_format;
hr = IDirect3DDevice9Ex_CreateVolumeTexture(device, 16, 16, 1, 1,
tests[i].usage, format, tests[i].pool, &texture, NULL);
ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) && tests[i].pool != D3DPOOL_MANAGED
? D3D_OK : D3DERR_INVALIDCALL),
ok((hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC)
&& (tests[i].format != FORMAT_ATI2 || tests[i].pool == D3DPOOL_SCRATCH)
&& tests[i].pool != D3DPOOL_MANAGED ? D3D_OK : D3DERR_INVALIDCALL))
|| (tests[i].format == FORMAT_ATI2 && (hr == D3D_OK || warp)),
"Test %u: Got unexpected hr %#x.\n", i, hr);
if (FAILED(hr))
continue;
......@@ -4481,9 +4488,11 @@ static void test_resource_access(void)
expected_hr = D3D_OK;
else
expected_hr = D3DERR_INVALIDCALL;
ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr);
ok(hr == expected_hr || (volume_desc.Pool == D3DPOOL_DEFAULT && hr == D3D_OK),
"Test %u: Got unexpected hr %#x.\n", i, hr);
hr = IDirect3DVolume9_UnlockBox(volume);
ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr);
ok(hr == expected_hr || (volume_desc.Pool == D3DPOOL_DEFAULT && hr == D3D_OK),
"Test %u: Got unexpected hr %#x.\n", i, hr);
hr = IDirect3DDevice9Ex_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture);
ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
......
dlls/d3d9/tests/device.c
View file @ c3ac646a
......@@ -143,6 +143,11 @@ static void flush_events(void)
}
}
static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER9 *identifier)
{
return !strcmp(identifier->Driver, "d3d10warp.dll");
}
static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, const struct device_desc *desc)
{
D3DPRESENT_PARAMETERS present_parameters = {0};
......@@ -12650,6 +12655,7 @@ static void test_resource_access(void)
IDirect3DSurface9 *backbuffer, *depth_stencil;
D3DFORMAT colour_format, depth_format, format;
BOOL depth_2d, depth_cube, depth_plain;
D3DADAPTER_IDENTIFIER9 identifier;
struct device_desc device_desc;
D3DSURFACE_DESC surface_desc;
IDirect3DDevice9 *device;
......@@ -12658,6 +12664,7 @@ static void test_resource_access(void)
ULONG refcount;
HWND window;
HRESULT hr;
BOOL warp;
enum surface_type
{
......@@ -12754,6 +12761,9 @@ static void test_resource_access(void)
DestroyWindow(window);
return;
}
hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier);
ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr);
warp = adapter_is_warp(&identifier);
hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
......@@ -12948,17 +12958,20 @@ static void test_resource_access(void)
HRESULT expected_hr;
D3DLOCKED_BOX lb;
if (tests[j].format == FORMAT_DEPTH)
if (tests[i].format == FORMAT_DEPTH)
continue;
if (tests[j].format == FORMAT_ATI2)
if (tests[i].format == FORMAT_ATI2)
format = MAKEFOURCC('A','T','I','2');
else
format = colour_format;
hr = IDirect3DDevice9_CreateVolumeTexture(device, 16, 16, 1, 1,
tests[i].usage, format, tests[i].pool, &texture, NULL);
ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3D_OK : D3DERR_INVALIDCALL),
ok((hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC)
&& (tests[i].format != FORMAT_ATI2 || tests[i].pool == D3DPOOL_SCRATCH)
? D3D_OK : D3DERR_INVALIDCALL))
|| (tests[i].format == FORMAT_ATI2 && (hr == D3D_OK || warp)),
"Test %u: Got unexpected hr %#x.\n", i, hr);
if (FAILED(hr))
continue;
......@@ -12976,9 +12989,11 @@ static void test_resource_access(void)
expected_hr = D3D_OK;
else
expected_hr = D3DERR_INVALIDCALL;
ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr);
ok(hr == expected_hr || (volume_desc.Pool == D3DPOOL_DEFAULT && hr == D3D_OK),
"Test %u: Got unexpected hr %#x.\n", i, hr);
hr = IDirect3DVolume9_UnlockBox(volume);
ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr);
ok(hr == expected_hr || (volume_desc.Pool == D3DPOOL_DEFAULT && hr == D3D_OK),
"Test %u: Got unexpected hr %#x.\n", i, hr);
hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture);
ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment