[PATCH] wined3d: Check for failure from wined3d_device_context_require_space() in wined3d_device_context_emit_unmap().
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51485 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 14 ++++++++++++++ dlls/wined3d/cs.c | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f85646050e7..50801064694 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -33104,6 +33104,20 @@ static void test_deferred_context_map(void) ID3D11CommandList_Release(list); + /* Dead Rising unmaps a resource on the wrong context. */ + + hr = ID3D11DeviceContext_Map(immediate, (ID3D11Resource *)buffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D11DeviceContext_Unmap(deferred, (ID3D11Resource *)buffer, 0); + + hr = ID3D11DeviceContext_Map(immediate, (ID3D11Resource *)buffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); + todo_wine ok(hr == E_OUTOFMEMORY, "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + ID3D11DeviceContext_Unmap(immediate, (ID3D11Resource *)buffer, 0); + + ID3D11DeviceContext_Unmap(immediate, (ID3D11Resource *)buffer, 0); + /* Test WRITE_NO_OVERWRITE. */ hr = ID3D11DeviceContext_Map(immediate, (ID3D11Resource *)buffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 13c0fce5bb1..51e5055c4ab 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2520,7 +2520,8 @@ HRESULT wined3d_device_context_emit_unmap(struct wined3d_device_context *context wined3d_not_from_cs(context->device->cs); - op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP); + if (!(op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP))) + return E_OUTOFMEMORY; op->opcode = WINED3D_CS_OP_UNMAP; op->resource = resource; op->sub_resource_idx = sub_resource_idx; -- 2.30.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=94544 Your paranoid android. === w2008s64 (32 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === w7u_2qxl (32 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === w7u_adm (32 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === w7u_el (32 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === w8 (32 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === w8adm (32 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === w864 (32 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === w1064v1507 (32 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === w1064v1809 (32 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === w1064 (32 bit report) === d3d11: d3d11.c:5916: Test failed: Got unexpected IAVertices count: 0. d3d11.c:5917: Test failed: Got unexpected IAPrimitives count: 0. d3d11.c:5918: Test failed: Got unexpected VSInvocations count: 0. d3d11.c:5921: Test failed: Got unexpected CInvocations count: 0. d3d11.c:5922: Test failed: Got unexpected CPrimitives count: 0. d3d11.c:5763: Test failed: Got unexpected query result 0x0000000000000000. d3d11.c:33102: Test failed: Got unexpected hr 0. === w1064_tsign (32 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === w10pro64 (32 bit report) === d3d11: d3d11.c:5916: Test failed: Got unexpected IAVertices count: 0. d3d11.c:5917: Test failed: Got unexpected IAPrimitives count: 0. d3d11.c:5918: Test failed: Got unexpected VSInvocations count: 0. d3d11.c:5921: Test failed: Got unexpected CInvocations count: 0. d3d11.c:5922: Test failed: Got unexpected CPrimitives count: 0. d3d11.c:33102: Test failed: Got unexpected hr 0. === wvistau64 (64 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === w2008s64 (64 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === w864 (64 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === w1064v1507 (64 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === w1064v1809 (64 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === w1064 (64 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === w1064_2qxl (64 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === w1064_tsign (64 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === w10pro64 (64 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === w10pro64_ar (64 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === w10pro64_he (64 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === w10pro64_ja (64 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === w10pro64_zh_CN (64 bit report) === d3d11: d3d11.c:33102: Test failed: Got unexpected hr 0. === debiant2 (32 bit Arabic:Morocco report) === d3d11: d3d11.c:9766: Test failed: d3d11.c:15218: Test marked todo: Got hr 0 for WRITE_DISCARD.
participants (2)
-
Marvin -
Zebediah Figura