From ad2d0fdc3a2ef55980bab65ccb33252f6bbd31cc Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 9 Jul 2017 22:04:24 +0200 Subject: [PATCH] Added patch to fix race condition in d3d11 state_init functions. --- ...ace-condition-when-creating-samplers.patch | 219 ++++++++++++++++++ patches/d3d11-State_Init/definition | 1 + patches/patchinstall.sh | 16 ++ 3 files changed, 236 insertions(+) create mode 100644 patches/d3d11-State_Init/0001-d3d11-Prevent-race-condition-when-creating-samplers.patch create mode 100644 patches/d3d11-State_Init/definition diff --git a/patches/d3d11-State_Init/0001-d3d11-Prevent-race-condition-when-creating-samplers.patch b/patches/d3d11-State_Init/0001-d3d11-Prevent-race-condition-when-creating-samplers.patch new file mode 100644 index 00000000..a72c3ebd --- /dev/null +++ b/patches/d3d11-State_Init/0001-d3d11-Prevent-race-condition-when-creating-samplers.patch @@ -0,0 +1,219 @@ +From 994798c0649cf8c66d5c97a2217e36f0d12ea96f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20M=C3=BCller?= +Date: Sun, 9 Jul 2017 18:30:26 +0200 +Subject: d3d11: Prevent race condition when creating samplers. + +--- + dlls/d3d11/device.c | 32 ++++++++++++++++++++++++-------- + dlls/d3d11/state.c | 18 ++++-------------- + 2 files changed, 28 insertions(+), 22 deletions(-) + +diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c +index cf45233dc82..66d566cfecb 100644 +--- a/dlls/d3d11/device.c ++++ b/dlls/d3d11/device.c +@@ -5451,12 +5451,16 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState(ID3D11Device *ifa + + return S_OK; + } +- wined3d_mutex_unlock(); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) ++ { ++ wined3d_mutex_unlock(); + return E_OUTOFMEMORY; ++ } + +- if (FAILED(hr = d3d_blend_state_init(object, device, &tmp_desc))) ++ hr = d3d_blend_state_init(object, device, &tmp_desc); ++ wined3d_mutex_unlock(); ++ if (FAILED(hr)) + { + WARN("Failed to initialize blend state, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); +@@ -5531,12 +5535,16 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilState(ID3D11Devi + + return S_OK; + } +- wined3d_mutex_unlock(); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) ++ { ++ wined3d_mutex_unlock(); + return E_OUTOFMEMORY; ++ } + +- if (FAILED(hr = d3d_depthstencil_state_init(object, device, &tmp_desc))) ++ hr = d3d_depthstencil_state_init(object, device, &tmp_desc); ++ wined3d_mutex_unlock(); ++ if (FAILED(hr)) + { + WARN("Failed to initialize depthstencil state, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); +@@ -5574,12 +5582,16 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState(ID3D11Device + + return S_OK; + } +- wined3d_mutex_unlock(); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) ++ { ++ wined3d_mutex_unlock(); + 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); + HeapFree(GetProcessHeap(), 0, object); +@@ -5628,12 +5640,16 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateSamplerState(ID3D11Device *i + + return S_OK; + } +- wined3d_mutex_unlock(); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) ++ { ++ wined3d_mutex_unlock(); + return E_OUTOFMEMORY; ++ } + +- if (FAILED(hr = d3d_sampler_state_init(object, device, &normalized_desc))) ++ hr = d3d_sampler_state_init(object, device, &normalized_desc); ++ wined3d_mutex_unlock(); ++ if (FAILED(hr)) + { + WARN("Failed to initialize sampler state, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); +diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c +index 43dd10ffa7f..9c377c1a27b 100644 +--- a/dlls/d3d11/state.c ++++ b/dlls/d3d11/state.c +@@ -283,13 +283,13 @@ static const struct ID3D10BlendState1Vtbl d3d10_blend_state_vtbl = + d3d10_blend_state_GetDesc1, + }; + ++/* requires wined3d lock */ + HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, + const D3D11_BLEND_DESC *desc) + { + state->ID3D11BlendState_iface.lpVtbl = &d3d11_blend_state_vtbl; + state->ID3D10BlendState1_iface.lpVtbl = &d3d10_blend_state_vtbl; + state->refcount = 1; +- wined3d_mutex_lock(); + wined3d_private_store_init(&state->private_store); + state->desc = *desc; + +@@ -297,10 +297,8 @@ HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *d + { + ERR("Failed to insert blend state entry.\n"); + wined3d_private_store_cleanup(&state->private_store); +- wined3d_mutex_unlock(); + return E_FAIL; + } +- wined3d_mutex_unlock(); + + state->device = &device->ID3D11Device_iface; + ID3D11Device_AddRef(state->device); +@@ -562,13 +560,13 @@ static const struct ID3D10DepthStencilStateVtbl d3d10_depthstencil_state_vtbl = + d3d10_depthstencil_state_GetDesc, + }; + ++/* requires wined3d lock */ + HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct d3d_device *device, + const D3D11_DEPTH_STENCIL_DESC *desc) + { + state->ID3D11DepthStencilState_iface.lpVtbl = &d3d11_depthstencil_state_vtbl; + state->ID3D10DepthStencilState_iface.lpVtbl = &d3d10_depthstencil_state_vtbl; + state->refcount = 1; +- wined3d_mutex_lock(); + wined3d_private_store_init(&state->private_store); + state->desc = *desc; + +@@ -576,10 +574,8 @@ HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct + { + ERR("Failed to insert depthstencil state entry.\n"); + wined3d_private_store_cleanup(&state->private_store); +- wined3d_mutex_unlock(); + return E_FAIL; + } +- wined3d_mutex_unlock(); + + state->device = &device->ID3D11Device_iface; + ID3D11Device_AddRef(state->device); +@@ -869,6 +865,7 @@ static const struct wined3d_parent_ops d3d_rasterizer_state_wined3d_parent_ops = + d3d_rasterizer_state_wined3d_object_destroyed, + }; + ++/* requires wined3d lock */ + HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, + const D3D11_RASTERIZER_DESC *desc) + { +@@ -878,7 +875,6 @@ HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d + state->ID3D11RasterizerState_iface.lpVtbl = &d3d11_rasterizer_state_vtbl; + state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl; + state->refcount = 1; +- wined3d_mutex_lock(); + wined3d_private_store_init(&state->private_store); + state->desc = *desc; + +@@ -886,7 +882,6 @@ HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d + { + ERR("Failed to insert rasterizer state entry.\n"); + wined3d_private_store_cleanup(&state->private_store); +- wined3d_mutex_unlock(); + return E_FAIL; + } + +@@ -900,10 +895,8 @@ HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d + WARN("Failed to create wined3d rasterizer state, hr %#x.\n", hr); + wined3d_private_store_cleanup(&state->private_store); + wine_rb_remove(&device->rasterizer_states, &state->entry); +- wined3d_mutex_unlock(); + return hr; + } +- wined3d_mutex_unlock(); + + ID3D11Device_AddRef(state->device = &device->ID3D11Device_iface); + +@@ -1228,6 +1221,7 @@ static enum wined3d_cmp_func wined3d_cmp_func_from_d3d11(D3D11_COMPARISON_FUNC f + return (enum wined3d_cmp_func)f; + } + ++/* requires wined3d lock */ + HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_device *device, + const D3D11_SAMPLER_DESC *desc) + { +@@ -1237,7 +1231,6 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic + state->ID3D11SamplerState_iface.lpVtbl = &d3d11_sampler_state_vtbl; + state->ID3D10SamplerState_iface.lpVtbl = &d3d10_sampler_state_vtbl; + state->refcount = 1; +- wined3d_mutex_lock(); + wined3d_private_store_init(&state->private_store); + state->desc = *desc; + +@@ -1261,7 +1254,6 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic + { + ERR("Failed to insert sampler state entry.\n"); + wined3d_private_store_cleanup(&state->private_store); +- wined3d_mutex_unlock(); + return E_FAIL; + } + +@@ -1273,10 +1265,8 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic + WARN("Failed to create wined3d sampler, hr %#x.\n", hr); + wined3d_private_store_cleanup(&state->private_store); + wine_rb_remove(&device->sampler_states, &state->entry); +- wined3d_mutex_unlock(); + return hr; + } +- wined3d_mutex_unlock(); + + state->device = &device->ID3D11Device_iface; + ID3D11Device_AddRef(state->device); +-- +2.13.1 + diff --git a/patches/d3d11-State_Init/definition b/patches/d3d11-State_Init/definition new file mode 100644 index 00000000..d7e55f5c --- /dev/null +++ b/patches/d3d11-State_Init/definition @@ -0,0 +1 @@ +Fixes: Fix race condition in d3d11 state_init functions diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 53c66324..6ef187ac 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -116,6 +116,7 @@ patch_enable_all () enable_d3d11_ID3D11Texture1D="$1" enable_d3d11_ResolveSubresource="$1" enable_d3d11_Silence_FIXMEs="$1" + enable_d3d11_State_Init="$1" enable_d3d8_ValidateShader="$1" enable_d3d9_DesktopWindow="$1" enable_d3d9_Tests="$1" @@ -597,6 +598,9 @@ patch_enable () d3d11-Silence_FIXMEs) enable_d3d11_Silence_FIXMEs="$2" ;; + d3d11-State_Init) + enable_d3d11_State_Init="$2" + ;; d3d8-ValidateShader) enable_d3d8_ValidateShader="$2" ;; @@ -3578,6 +3582,18 @@ if test "$enable_d3d11_Silence_FIXMEs" -eq 1; then ) >> "$patchlist" fi +# Patchset d3d11-State_Init +# | +# | Modified files: +# | * dlls/d3d11/device.c, dlls/d3d11/state.c +# | +if test "$enable_d3d11_State_Init" -eq 1; then + patch_apply d3d11-State_Init/0001-d3d11-Prevent-race-condition-when-creating-samplers.patch + ( + printf '%s\n' '+ { "Michael Müller", "d3d11: Prevent race condition when creating samplers.", 1 },'; + ) >> "$patchlist" +fi + # Patchset d3d8-ValidateShader # | # | This patchset fixes the following Wine bugs: