Signed-off-by: Józef Kucia jkucia@codeweavers.com --- dlls/d3d9/tests/d3d9ex.c | 9 +++++---- dlls/d3d9/tests/device.c | 8 +++++--- 2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 82acaf4d6a8e..eb6856f0ff76 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4449,18 +4449,19 @@ 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), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 6edf2b35b30d..79e2ca5a651c 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12915,17 +12915,19 @@ 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), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue;
Hi,
While running your changed tests on Windows, 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=45270
Your paranoid android.
=== w8 (32 bit report) ===
d3d9: d3d9ex.c:4462: Test failed: Test 29: Got unexpected hr 0x8876086c.
=== w8adm (32 bit report) ===
d3d9: d3d9ex.c:4462: Test failed: Test 29: Got unexpected hr 0x8876086c.
=== w864 (32 bit report) ===
d3d9: d3d9ex.c:4462: Test failed: Test 29: Got unexpected hr 0x8876086c.
=== w1064 (32 bit report) ===
d3d9: d3d9ex.c:4462: Test failed: Test 29: Got unexpected hr 0x8876086c.
=== w864 (64 bit report) ===
d3d9: d3d9ex.c:4462: Test failed: Test 29: Got unexpected hr 0x8876086c.
=== w1064 (64 bit report) ===
d3d9: d3d9ex.c:4462: Test failed: Test 29: Got unexpected hr 0x8876086c.
=== w8 (32 bit report) ===
d3d9: device.c:12928: Test failed: Test 29: Got unexpected hr 0x8876086c.
=== w8adm (32 bit report) ===
d3d9: device.c:12928: Test failed: Test 29: Got unexpected hr 0x8876086c.
=== w864 (32 bit report) ===
d3d9: device.c:12928: Test failed: Test 29: Got unexpected hr 0x8876086c.
=== w1064 (32 bit report) ===
d3d9: device.c:12928: Test failed: Test 29: Got unexpected hr 0x8876086c.
=== w864 (64 bit report) ===
d3d9: device.c:12928: Test failed: Test 29: Got unexpected hr 0x8876086c.
=== w1064 (64 bit report) ===
d3d9: device.c:12928: Test failed: Test 29: Got unexpected hr 0x8876086c.
=== debian9 (build log) ===
X Error of failed request: BadValue (integer parameter out of range for operation) Major opcode of failed request: 140 (RANDR) Minor opcode of failed request: 21 (RRSetCrtcConfig) X Error of failed request: BadValue (integer parameter out of range for operation) Major opcode of failed request: 140 (RANDR) Minor opcode of failed request: 21 (RRSetCrtcConfig) X Error of failed request: BadValue (integer parameter out of range for operation) Major opcode of failed request: 140 (RANDR) Minor opcode of failed request: 21 (RRSetCrtcConfig) X Error of failed request: BadValue (integer parameter out of range for operation) Major opcode of failed request: 140 (RANDR) Minor opcode of failed request: 21 (RRSetCrtcConfig) X Error of failed request: BadValue (integer parameter out of range for operation) Major opcode of failed request: 140 (RANDR) Minor opcode of failed request: 21 (RRSetCrtcConfig) X Error of failed request: BadValue (integer parameter out of range for operation) Major opcode of failed request: 140 (RANDR) Minor opcode of failed request: 21 (RRSetCrtcConfig) X Error of failed request: BadValue (integer parameter out of range for operation) Major opcode of failed request: 140 (RANDR) Minor opcode of failed request: 21 (RRSetCrtcConfig) X Error of failed request: BadValue (integer parameter out of range for operation) Major opcode of failed request: 140 (RANDR) Minor opcode of failed request: 21 (RRSetCrtcConfig)
=== debian9 (build log) ===
X Error of failed request: BadValue (integer parameter out of range for operation) Major opcode of failed request: 140 (RANDR) Minor opcode of failed request: 21 (RRSetCrtcConfig) X Error of failed request: BadValue (integer parameter out of range for operation) Major opcode of failed request: 140 (RANDR) Minor opcode of failed request: 21 (RRSetCrtcConfig) X Error of failed request: BadValue (integer parameter out of range for operation) Major opcode of failed request: 140 (RANDR) Minor opcode of failed request: 21 (RRSetCrtcConfig) X Error of failed request: BadValue (integer parameter out of range for operation) Major opcode of failed request: 140 (RANDR) Minor opcode of failed request: 21 (RRSetCrtcConfig)