Commit d4f504c6 authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard

ddraw/tests: Add a IDirect3DDevice7 GetCaps test.

parent cc06d182
......@@ -459,6 +459,12 @@ IDirect3DDeviceImpl_7_GetCaps(IDirect3DDevice7 *iface,
TRACE("iface %p, device_desc %p.\n", iface, Desc);
if (!Desc)
{
WARN("Desc is NULL, returning DDERR_INVALIDPARAMS.\n");
return DDERR_INVALIDPARAMS;
}
/* Call the same function used by IDirect3D, this saves code */
return IDirect3DImpl_GetCaps(This->ddraw->wined3d, &OldDesc, Desc);
}
......
......@@ -4980,6 +4980,21 @@ static void test_get_caps1(void)
ok(hr == D3D_OK, "GetCaps with different sizes returned hr %#x, expected D3D_OK.\n", hr);
}
static void test_get_caps7(void)
{
HRESULT hr;
D3DDEVICEDESC7 desc;
hr = IDirect3DDevice7_GetCaps(lpD3DDevice, NULL);
ok(hr == DDERR_INVALIDPARAMS, "IDirect3DDevice7::GetCaps(NULL) returned hr %#x, expected INVALIDPARAMS.\n", hr);
memset(&desc, 0, sizeof(desc));
hr = IDirect3DDevice7_GetCaps(lpD3DDevice, &desc);
ok(hr == D3D_OK, "IDirect3DDevice7::GetCaps(non-NULL) returned hr %#x, expected D3D_OK.\n", hr);
/* There's no dwSize in D3DDEVICEDESC7 */
}
START_TEST(d3d)
{
init_function_pointers();
......@@ -5007,6 +5022,7 @@ START_TEST(d3d)
SetRenderTargetTest();
VertexBufferLockRest();
z_format_test();
test_get_caps7();
ReleaseDirect3D();
}
......
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