mirror of
https://github.com/wine-mirror/wine
synced 2024-07-03 08:19:41 +00:00
d3dx10/tests: Remove todo's from now passing tests.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
parent
866cb1ca63
commit
e91243a94e
|
@ -4375,10 +4375,9 @@ static void test_create_effect_from_memory(void)
|
||||||
effect = (ID3D10Effect *)0xdeadbeef;
|
effect = (ID3D10Effect *)0xdeadbeef;
|
||||||
hr = D3DX10CreateEffectFromMemory(test_fx_source, strlen(test_fx_source) + 1, NULL, NULL, NULL, "fx_4_0",
|
hr = D3DX10CreateEffectFromMemory(test_fx_source, strlen(test_fx_source) + 1, NULL, NULL, NULL, "fx_4_0",
|
||||||
0x0, 0x0, device, NULL, NULL, &effect, &errors, NULL);
|
0x0, 0x0, device, NULL, NULL, &effect, &errors, NULL);
|
||||||
todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
|
ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
|
||||||
todo_wine ok(!errors, "Got unexpected errors %p.\n", errors);
|
ok(!errors, "Got unexpected errors %p.\n", errors);
|
||||||
todo_wine ok(!!effect && effect != (ID3D10Effect *)0xdeadbeef, "Got unexpected effect %p.\n", effect);
|
ok(!!effect && effect != (ID3D10Effect *)0xdeadbeef, "Got unexpected effect %p.\n", effect);
|
||||||
if (hr == S_OK)
|
|
||||||
effect->lpVtbl->Release(effect);
|
effect->lpVtbl->Release(effect);
|
||||||
|
|
||||||
refcount = ID3D10Device_Release(device);
|
refcount = ID3D10Device_Release(device);
|
||||||
|
@ -4465,20 +4464,18 @@ static void test_create_effect_from_file(void)
|
||||||
effect = (ID3D10Effect *)0xdeadbeef;
|
effect = (ID3D10Effect *)0xdeadbeef;
|
||||||
hr = D3DX10CreateEffectFromFileW(path, NULL, NULL, "fx_4_0", 0x0, 0x0,
|
hr = D3DX10CreateEffectFromFileW(path, NULL, NULL, "fx_4_0", 0x0, 0x0,
|
||||||
device, NULL, NULL, &effect, &errors, NULL);
|
device, NULL, NULL, &effect, &errors, NULL);
|
||||||
todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
|
ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
|
||||||
todo_wine ok(!errors, "Got unexpected errors %p.\n", errors);
|
ok(!errors, "Got unexpected errors %p.\n", errors);
|
||||||
todo_wine ok(effect && effect != (ID3D10Effect *)0xdeadbeef, "Got unexpected effect %p.\n", effect);
|
ok(effect && effect != (ID3D10Effect *)0xdeadbeef, "Got unexpected effect %p.\n", effect);
|
||||||
if (hr == S_OK)
|
|
||||||
effect->lpVtbl->Release(effect);
|
effect->lpVtbl->Release(effect);
|
||||||
|
|
||||||
errors = (ID3D10Blob *)0xdeadbeef;
|
errors = (ID3D10Blob *)0xdeadbeef;
|
||||||
effect = (ID3D10Effect *)0xdeadbeef;
|
effect = (ID3D10Effect *)0xdeadbeef;
|
||||||
hr = D3DX10CreateEffectFromFileA(get_str_a(path), NULL, NULL, "fx_4_0", 0x0, 0x0,
|
hr = D3DX10CreateEffectFromFileA(get_str_a(path), NULL, NULL, "fx_4_0", 0x0, 0x0,
|
||||||
device, NULL, NULL, &effect, &errors, NULL);
|
device, NULL, NULL, &effect, &errors, NULL);
|
||||||
todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
|
ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
|
||||||
todo_wine ok(!errors, "Got unexpected errors %p.\n", errors);
|
ok(!errors, "Got unexpected errors %p.\n", errors);
|
||||||
todo_wine ok(effect && effect != (ID3D10Effect *)0xdeadbeef, "Got unexpected effect %p.\n", effect);
|
ok(effect && effect != (ID3D10Effect *)0xdeadbeef, "Got unexpected effect %p.\n", effect);
|
||||||
if (hr == S_OK)
|
|
||||||
effect->lpVtbl->Release(effect);
|
effect->lpVtbl->Release(effect);
|
||||||
|
|
||||||
delete_file(test_file_name);
|
delete_file(test_file_name);
|
||||||
|
@ -4584,20 +4581,18 @@ static void test_create_effect_from_resource(void)
|
||||||
effect = (ID3D10Effect *)0xdeadbeef;
|
effect = (ID3D10Effect *)0xdeadbeef;
|
||||||
hr = D3DX10CreateEffectFromResourceW(resource_module, test_resource_name, NULL, NULL, NULL, "fx_4_0",
|
hr = D3DX10CreateEffectFromResourceW(resource_module, test_resource_name, NULL, NULL, NULL, "fx_4_0",
|
||||||
0, 0, device, NULL, NULL, &effect, &errors, NULL);
|
0, 0, device, NULL, NULL, &effect, &errors, NULL);
|
||||||
todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
|
ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
|
||||||
todo_wine ok(!errors, "Got unexpected errors %p.\n", errors);
|
ok(!errors, "Got unexpected errors %p.\n", errors);
|
||||||
todo_wine ok(effect && effect != (ID3D10Effect *)0xdeadbeef, "Got unexpected effect %p.\n", effect);
|
ok(effect && effect != (ID3D10Effect *)0xdeadbeef, "Got unexpected effect %p.\n", effect);
|
||||||
if (hr == S_OK)
|
|
||||||
effect->lpVtbl->Release(effect);
|
effect->lpVtbl->Release(effect);
|
||||||
|
|
||||||
errors = (ID3D10Blob *)0xdeadbeef;
|
errors = (ID3D10Blob *)0xdeadbeef;
|
||||||
effect = (ID3D10Effect *)0xdeadbeef;
|
effect = (ID3D10Effect *)0xdeadbeef;
|
||||||
hr = D3DX10CreateEffectFromResourceA(resource_module, get_str_a(test_resource_name), NULL, NULL, NULL, "fx_4_0",
|
hr = D3DX10CreateEffectFromResourceA(resource_module, get_str_a(test_resource_name), NULL, NULL, NULL, "fx_4_0",
|
||||||
0, 0, device, NULL, NULL, &effect, &errors, NULL);
|
0, 0, device, NULL, NULL, &effect, &errors, NULL);
|
||||||
todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
|
ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
|
||||||
todo_wine ok(!errors, "Got unexpected errors %p.\n", errors);
|
ok(!errors, "Got unexpected errors %p.\n", errors);
|
||||||
todo_wine ok(effect && effect != (ID3D10Effect *)0xdeadbeef, "Got unexpected effect %p.\n", effect);
|
ok(effect && effect != (ID3D10Effect *)0xdeadbeef, "Got unexpected effect %p.\n", effect);
|
||||||
if (hr == S_OK)
|
|
||||||
effect->lpVtbl->Release(effect);
|
effect->lpVtbl->Release(effect);
|
||||||
|
|
||||||
delete_resource_module(test_resource_name, resource_module);
|
delete_resource_module(test_resource_name, resource_module);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user