ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d11: Fix race condition in d3d_rasterizer_state_create(). 

Spotted by Kimmo Myllyvirta.

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2017-07-20 14:11:02 +02:00 committed by Alexandre Julliard
parent 8b2d71443e
commit 7c020facc3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/d3d11/state.c
View File

@ -1042,7 +1042,6 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str
state->ID3D11RasterizerState_iface.lpVtbl = &d3d11_rasterizer_state_vtbl; state->ID3D11RasterizerState_iface.lpVtbl = &d3d11_rasterizer_state_vtbl;
state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl; state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl;
state->refcount = 1; state->refcount = 1;
wined3d_mutex_lock();
wined3d_private_store_init(&state->private_store); wined3d_private_store_init(&state->private_store);
state->desc = *desc; state->desc = *desc;
@ -1050,7 +1049,6 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str
{ {
ERR("Failed to insert rasterizer state entry.\n"); ERR("Failed to insert rasterizer state entry.\n");
wined3d_private_store_cleanup(&state->private_store); wined3d_private_store_cleanup(&state->private_store);
wined3d_mutex_unlock();
return E_FAIL; return E_FAIL;
} }
@ -1064,10 +1062,8 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str
WARN("Failed to create wined3d rasterizer state, hr %#x.\n", hr); WARN("Failed to create wined3d rasterizer state, hr %#x.\n", hr);
wined3d_private_store_cleanup(&state->private_store); wined3d_private_store_cleanup(&state->private_store);
wine_rb_remove(&device->rasterizer_states, &state->entry); wine_rb_remove(&device->rasterizer_states, &state->entry);
wined3d_mutex_unlock();
return hr; return hr;
} }
wined3d_mutex_unlock();
ID3D11Device_AddRef(state->device = &device->ID3D11Device_iface); ID3D11Device_AddRef(state->device = &device->ID3D11Device_iface);
@ -1096,12 +1092,16 @@ HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTE
return S_OK; return S_OK;
} }
wined3d_mutex_unlock();
if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
{
wined3d_mutex_unlock();
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
}
if (FAILED(hr = d3d_rasterizer_state_init(object, device, desc))) hr = d3d_rasterizer_state_init(object, device, desc);
wined3d_mutex_unlock();
if (FAILED(hr))
{ {
WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); WARN("Failed to initialize rasterizer state, hr %#x.\n", hr);
HeapFree(GetProcessHeap(), 0, object); HeapFree(GetProcessHeap(), 0, object);