wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

Józef Kucia : d3d11: Introduce d3d_sampler_state_create() helper function.
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: b8f46ba21282d60f0c709776c9abd1bf1d08216a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f46ba21282d60f0c709776c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 20 14:11:03 2017 +0200 d3d11: Introduce d3d_sampler_state_create() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 50 ++++++------------------------------------- dlls/d3d11/state.c | 53 +++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 60 insertions(+), 47 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index b2cb29f..4d9f34e 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -465,8 +465,8 @@ struct d3d_sampler_state ID3D11Device *device; }; -HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_device *device, - const D3D11_SAMPLER_DESC *desc) DECLSPEC_HIDDEN; +HRESULT d3d_sampler_state_create(struct d3d_device *device, const D3D11_SAMPLER_DESC *desc, + struct d3d_sampler_state **state) DECLSPEC_HIDDEN; struct d3d_sampler_state *unsafe_impl_from_ID3D11SamplerState(ID3D11SamplerState *iface) DECLSPEC_HIDDEN; struct d3d_sampler_state *unsafe_impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b756517..14e21f9 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3051,51 +3051,14 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateSamplerState(ID3D11Device *i const D3D11_SAMPLER_DESC *desc, ID3D11SamplerState **sampler_state) { struct d3d_device *device = impl_from_ID3D11Device(iface); - D3D11_SAMPLER_DESC normalized_desc; struct d3d_sampler_state *object; - struct wine_rb_entry *entry; HRESULT hr; TRACE("iface %p, desc %p, sampler_state %p.\n", iface, desc, sampler_state); - if (!desc) - return E_INVALIDARG; - - normalized_desc = *desc; - if (!D3D11_DECODE_IS_ANISOTROPIC_FILTER(normalized_desc.Filter)) - normalized_desc.MaxAnisotropy = 0; - if (!D3D11_DECODE_IS_COMPARISON_FILTER(normalized_desc.Filter)) - normalized_desc.ComparisonFunc = D3D11_COMPARISON_NEVER; - if (normalized_desc.AddressU != D3D11_TEXTURE_ADDRESS_BORDER - && normalized_desc.AddressV != D3D11_TEXTURE_ADDRESS_BORDER - && normalized_desc.AddressW != D3D11_TEXTURE_ADDRESS_BORDER) - memset(&normalized_desc.BorderColor, 0, sizeof(normalized_desc.BorderColor)); - - wined3d_mutex_lock(); - if ((entry = wine_rb_get(&device->sampler_states, &normalized_desc))) - { - object = WINE_RB_ENTRY_VALUE(entry, struct d3d_sampler_state, entry); - - TRACE("Returning existing sampler state %p.\n", object); - *sampler_state = &object->ID3D11SamplerState_iface; - ID3D11SamplerState_AddRef(*sampler_state); - wined3d_mutex_unlock(); - - return S_OK; - } - wined3d_mutex_unlock(); - - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - return E_OUTOFMEMORY; - - if (FAILED(hr = d3d_sampler_state_init(object, device, &normalized_desc))) - { - WARN("Failed to initialize sampler state, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d_sampler_state_create(device, desc, &object))) return hr; - } - TRACE("Created sampler state %p.\n", object); *sampler_state = &object->ID3D11SamplerState_iface; return S_OK; @@ -5330,18 +5293,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device1 * const D3D10_SAMPLER_DESC *desc, ID3D10SamplerState **sampler_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); - ID3D11SamplerState *d3d11_sampler_state; + struct d3d_sampler_state *object; HRESULT hr; TRACE("iface %p, desc %p, sampler_state %p.\n", iface, desc, sampler_state); - if (FAILED(hr = d3d11_device_CreateSamplerState(&device->ID3D11Device_iface, - (const D3D11_SAMPLER_DESC *)desc, &d3d11_sampler_state))) + if (FAILED(hr = d3d_sampler_state_create(device, (const D3D11_SAMPLER_DESC *)desc, &object))) return hr; - hr = ID3D11SamplerState_QueryInterface(d3d11_sampler_state, &IID_ID3D10SamplerState, (void **)sampler_state); - ID3D11SamplerState_Release(d3d11_sampler_state); - return hr; + *sampler_state = &object->ID3D10SamplerState_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device1 *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 87fed6f..64fae13 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1432,7 +1432,7 @@ static enum wined3d_cmp_func wined3d_cmp_func_from_d3d11(D3D11_COMPARISON_FUNC f return (enum wined3d_cmp_func)f; } -HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_device *device, +static HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_device *device, const D3D11_SAMPLER_DESC *desc) { struct wined3d_sampler_desc wined3d_desc; @@ -1488,6 +1488,57 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic return S_OK; } +HRESULT d3d_sampler_state_create(struct d3d_device *device, const D3D11_SAMPLER_DESC *desc, + struct d3d_sampler_state **state) +{ + D3D11_SAMPLER_DESC normalized_desc; + struct d3d_sampler_state *object; + struct wine_rb_entry *entry; + HRESULT hr; + + if (!desc) + return E_INVALIDARG; + + normalized_desc = *desc; + if (!D3D11_DECODE_IS_ANISOTROPIC_FILTER(normalized_desc.Filter)) + normalized_desc.MaxAnisotropy = 0; + if (!D3D11_DECODE_IS_COMPARISON_FILTER(normalized_desc.Filter)) + normalized_desc.ComparisonFunc = D3D11_COMPARISON_NEVER; + if (normalized_desc.AddressU != D3D11_TEXTURE_ADDRESS_BORDER + && normalized_desc.AddressV != D3D11_TEXTURE_ADDRESS_BORDER + && normalized_desc.AddressW != D3D11_TEXTURE_ADDRESS_BORDER) + memset(&normalized_desc.BorderColor, 0, sizeof(normalized_desc.BorderColor)); + + wined3d_mutex_lock(); + if ((entry = wine_rb_get(&device->sampler_states, &normalized_desc))) + { + object = WINE_RB_ENTRY_VALUE(entry, struct d3d_sampler_state, entry); + + TRACE("Returning existing sampler state %p.\n", object); + ID3D11SamplerState_AddRef(&object->ID3D11SamplerState_iface); + *state = object; + wined3d_mutex_unlock(); + + return S_OK; + } + wined3d_mutex_unlock(); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_sampler_state_init(object, device, &normalized_desc))) + { + WARN("Failed to initialize sampler state, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created sampler state %p.\n", object); + *state = object; + + return S_OK; +} + struct d3d_sampler_state *unsafe_impl_from_ID3D11SamplerState(ID3D11SamplerState *iface) { if (!iface)

1 0

Józef Kucia : d3d11: Fix race condition in d3d_rasterizer_state_create().
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: 7c020facc3813381a59568d29f60f930366a4436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c020facc3813381a59568d29… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 20 14:11:02 2017 +0200 d3d11: Fix race condition in d3d_rasterizer_state_create(). Spotted by Kimmo Myllyvirta. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 110d04e..87fed6f 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -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->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl; state->refcount = 1; - wined3d_mutex_lock(); wined3d_private_store_init(&state->private_store); 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"); wined3d_private_store_cleanup(&state->private_store); - wined3d_mutex_unlock(); 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); 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); @@ -1096,12 +1092,16 @@ HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTE 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);

1 0

Józef Kucia : d3d11: Introduce d3d_rasterizer_state_create() helper function.
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: 8b2d71443e9257de8ba7dcd370e559ab68c055f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b2d71443e9257de8ba7dcd37… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 20 14:11:01 2017 +0200 d3d11: Introduce d3d_rasterizer_state_create() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 40 ++++++---------------------------------- dlls/d3d11/state.c | 42 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 49 insertions(+), 37 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 8b89e6d..b2cb29f 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -446,8 +446,8 @@ struct d3d_rasterizer_state ID3D11Device *device; }; -HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, - const D3D11_RASTERIZER_DESC *desc) DECLSPEC_HIDDEN; +HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTERIZER_DESC *desc, + struct d3d_rasterizer_state **state) DECLSPEC_HIDDEN; struct d3d_rasterizer_state *unsafe_impl_from_ID3D11RasterizerState(ID3D11RasterizerState *iface) DECLSPEC_HIDDEN; struct d3d_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e7a79e0..b756517 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3035,39 +3035,13 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState(ID3D11Device { struct d3d_device *device = impl_from_ID3D11Device(iface); struct d3d_rasterizer_state *object; - struct wine_rb_entry *entry; HRESULT hr; TRACE("iface %p, desc %p, rasterizer_state %p.\n", iface, desc, rasterizer_state); - if (!desc) - return E_INVALIDARG; - - wined3d_mutex_lock(); - if ((entry = wine_rb_get(&device->rasterizer_states, desc))) - { - object = WINE_RB_ENTRY_VALUE(entry, struct d3d_rasterizer_state, entry); - - TRACE("Returning existing rasterizer state %p.\n", object); - *rasterizer_state = &object->ID3D11RasterizerState_iface; - ID3D11RasterizerState_AddRef(*rasterizer_state); - wined3d_mutex_unlock(); - - return S_OK; - } - wined3d_mutex_unlock(); - - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - return E_OUTOFMEMORY; - - if (FAILED(hr = d3d_rasterizer_state_init(object, device, desc))) - { - WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d_rasterizer_state_create(device, desc, &object))) return hr; - } - TRACE("Created rasterizer state %p.\n", object); *rasterizer_state = &object->ID3D11RasterizerState_iface; return S_OK; @@ -5339,19 +5313,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device const D3D10_RASTERIZER_DESC *desc, ID3D10RasterizerState **rasterizer_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); - ID3D11RasterizerState *d3d11_rasterizer_state; + struct d3d_rasterizer_state *object; HRESULT hr; TRACE("iface %p, desc %p, rasterizer_state %p.\n", iface, desc, rasterizer_state); - if (FAILED(hr = d3d11_device_CreateRasterizerState(&device->ID3D11Device_iface, - (const D3D11_RASTERIZER_DESC *)desc, &d3d11_rasterizer_state))) + if (FAILED(hr = d3d_rasterizer_state_create(device, (const D3D11_RASTERIZER_DESC *)desc, &object))) return hr; - hr = ID3D11RasterizerState_QueryInterface(d3d11_rasterizer_state, - &IID_ID3D10RasterizerState, (void **)rasterizer_state); - ID3D11RasterizerState_Release(d3d11_rasterizer_state); - return hr; + *rasterizer_state = &object->ID3D10RasterizerState_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device1 *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 3048b9d..110d04e 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1033,7 +1033,7 @@ static const struct wined3d_parent_ops d3d_rasterizer_state_wined3d_parent_ops = d3d_rasterizer_state_wined3d_object_destroyed, }; -HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, +static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, const D3D11_RASTERIZER_DESC *desc) { struct wined3d_rasterizer_state_desc wined3d_desc; @@ -1074,6 +1074,46 @@ HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d return S_OK; } +HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTERIZER_DESC *desc, + struct d3d_rasterizer_state **state) +{ + struct d3d_rasterizer_state *object; + struct wine_rb_entry *entry; + HRESULT hr; + + if (!desc) + return E_INVALIDARG; + + wined3d_mutex_lock(); + if ((entry = wine_rb_get(&device->rasterizer_states, desc))) + { + object = WINE_RB_ENTRY_VALUE(entry, struct d3d_rasterizer_state, entry); + + TRACE("Returning existing rasterizer state %p.\n", object); + ID3D11RasterizerState_AddRef(&object->ID3D11RasterizerState_iface); + *state = object; + wined3d_mutex_unlock(); + + return S_OK; + } + wined3d_mutex_unlock(); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_rasterizer_state_init(object, device, desc))) + { + WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created rasterizer state %p.\n", object); + *state = object; + + return S_OK; +} + struct d3d_rasterizer_state *unsafe_impl_from_ID3D11RasterizerState(ID3D11RasterizerState *iface) { if (!iface)

1 0

Józef Kucia : d3d11: Fix race condition in d3d_depthstencil_state_create().
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: 10ae9eb3d9aecb71853b977d66cb775697e1a57f URL: http://source.winehq.org/git/wine.git/?a=commit;h=10ae9eb3d9aecb71853b977d6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 20 14:11:00 2017 +0200 d3d11: Fix race condition in d3d_depthstencil_state_create(). Spotted by Kimmo Myllyvirta. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 7cc35db..3048b9d 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -447,6 +447,12 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_AddRef(ID3D11DepthStenci return refcount; } +static void d3d_depthstencil_state_cleanup(struct d3d_depthstencil_state *state) +{ + wined3d_private_store_cleanup(&state->private_store); + ID3D11Device_Release(state->device); +} + static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_Release(ID3D11DepthStencilState *iface) { struct d3d_depthstencil_state *state = impl_from_ID3D11DepthStencilState(iface); @@ -459,8 +465,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_Release(ID3D11DepthStenc struct d3d_device *device = impl_from_ID3D11Device(state->device); wined3d_mutex_lock(); wine_rb_remove(&device->depthstencil_states, &state->entry); - ID3D11Device_Release(state->device); - wined3d_private_store_cleanup(&state->private_store); + d3d_depthstencil_state_cleanup(state); wined3d_mutex_unlock(); HeapFree(GetProcessHeap(), 0, state); } @@ -647,19 +652,9 @@ static HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, 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; - if (wine_rb_put(&device->depthstencil_states, desc, &state->entry) == -1) - { - 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); @@ -725,18 +720,31 @@ HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEP 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))) { WARN("Failed to initialize depthstencil state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); + wined3d_mutex_unlock(); return hr; } + if (wine_rb_put(&device->depthstencil_states, desc, &object->entry) == -1) + { + ERR("Failed to insert depthstencil state entry.\n"); + d3d_depthstencil_state_cleanup(object); + HeapFree(GetProcessHeap(), 0, object); + wined3d_mutex_unlock(); + return E_FAIL; + } + wined3d_mutex_unlock(); + TRACE("Created depthstencil state %p.\n", object); *state = object;

1 0

Józef Kucia : d3d11: Introduce d3d_depthstencil_state_create() helper function.
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: 95d5d84a0909753f87324b475e1e1fa6246f91ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d5d84a0909753f87324b475… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 20 14:10:59 2017 +0200 d3d11: Introduce d3d_depthstencil_state_create() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 4 +-- dlls/d3d11/device.c | 77 ++++---------------------------------------- dlls/d3d11/state.c | 79 +++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 86 insertions(+), 74 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index b887ac5..8b89e6d 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -425,8 +425,8 @@ static inline struct d3d_depthstencil_state *impl_from_ID3D11DepthStencilState(I return CONTAINING_RECORD(iface, struct d3d_depthstencil_state, ID3D11DepthStencilState_iface); } -HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct d3d_device *device, - const D3D11_DEPTH_STENCIL_DESC *desc) DECLSPEC_HIDDEN; +HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEPTH_STENCIL_DESC *desc, + struct d3d_depthstencil_state **state) DECLSPEC_HIDDEN; struct d3d_depthstencil_state *unsafe_impl_from_ID3D11DepthStencilState( ID3D11DepthStencilState *iface) DECLSPEC_HIDDEN; struct d3d_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState( diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 95783e9..e7a79e0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3018,76 +3018,13 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilState(ID3D11Devi { struct d3d_device *device = impl_from_ID3D11Device(iface); struct d3d_depthstencil_state *object; - D3D11_DEPTH_STENCIL_DESC tmp_desc; - struct wine_rb_entry *entry; HRESULT hr; TRACE("iface %p, desc %p, depth_stencil_state %p.\n", iface, desc, depth_stencil_state); - if (!desc) - return E_INVALIDARG; - - /* D3D11_DEPTH_STENCIL_DESC has a hole, which is a problem because we use - * it as a key in the rbtree. */ - memset(&tmp_desc, 0, sizeof(tmp_desc)); - tmp_desc.DepthEnable = desc->DepthEnable; - if (desc->DepthEnable) - { - tmp_desc.DepthWriteMask = desc->DepthWriteMask; - tmp_desc.DepthFunc = desc->DepthFunc; - } - else - { - tmp_desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL; - tmp_desc.DepthFunc = D3D11_COMPARISON_LESS; - } - tmp_desc.StencilEnable = desc->StencilEnable; - if (desc->StencilEnable) - { - tmp_desc.StencilReadMask = desc->StencilReadMask; - tmp_desc.StencilWriteMask = desc->StencilWriteMask; - tmp_desc.FrontFace = desc->FrontFace; - tmp_desc.BackFace = desc->BackFace; - } - else - { - tmp_desc.StencilReadMask = D3D11_DEFAULT_STENCIL_READ_MASK; - tmp_desc.StencilWriteMask = D3D11_DEFAULT_STENCIL_WRITE_MASK; - tmp_desc.FrontFace.StencilFailOp = D3D11_STENCIL_OP_KEEP; - tmp_desc.FrontFace.StencilDepthFailOp = D3D11_STENCIL_OP_KEEP; - tmp_desc.FrontFace.StencilPassOp = D3D11_STENCIL_OP_KEEP; - tmp_desc.FrontFace.StencilFunc = D3D11_COMPARISON_ALWAYS; - tmp_desc.BackFace.StencilFailOp = D3D11_STENCIL_OP_KEEP; - tmp_desc.BackFace.StencilDepthFailOp = D3D11_STENCIL_OP_KEEP; - tmp_desc.BackFace.StencilPassOp = D3D11_STENCIL_OP_KEEP; - tmp_desc.BackFace.StencilFunc = D3D11_COMPARISON_ALWAYS; - } - - wined3d_mutex_lock(); - if ((entry = wine_rb_get(&device->depthstencil_states, &tmp_desc))) - { - object = WINE_RB_ENTRY_VALUE(entry, struct d3d_depthstencil_state, entry); - - TRACE("Returning existing depthstencil state %p.\n", object); - *depth_stencil_state = &object->ID3D11DepthStencilState_iface; - ID3D11DepthStencilState_AddRef(*depth_stencil_state); - wined3d_mutex_unlock(); - - return S_OK; - } - wined3d_mutex_unlock(); - - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - return E_OUTOFMEMORY; - - if (FAILED(hr = d3d_depthstencil_state_init(object, device, &tmp_desc))) - { - WARN("Failed to initialize depthstencil state, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d_depthstencil_state_create(device, desc, &object))) return hr; - } - TRACE("Created depthstencil state %p.\n", object); *depth_stencil_state = &object->ID3D11DepthStencilState_iface; return S_OK; @@ -5385,19 +5322,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi const D3D10_DEPTH_STENCIL_DESC *desc, ID3D10DepthStencilState **depth_stencil_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); - ID3D11DepthStencilState *d3d11_depth_stencil_state; + struct d3d_depthstencil_state *object; HRESULT hr; TRACE("iface %p, desc %p, depth_stencil_state %p.\n", iface, desc, depth_stencil_state); - if (FAILED(hr = d3d11_device_CreateDepthStencilState(&device->ID3D11Device_iface, - (const D3D11_DEPTH_STENCIL_DESC *)desc, &d3d11_depth_stencil_state))) + if (FAILED(hr = d3d_depthstencil_state_create(device, (const D3D11_DEPTH_STENCIL_DESC *)desc, &object))) return hr; - hr = ID3D11DepthStencilState_QueryInterface(d3d11_depth_stencil_state, &IID_ID3D10DepthStencilState, - (void **)depth_stencil_state); - ID3D11DepthStencilState_Release(d3d11_depth_stencil_state); - return hr; + *depth_stencil_state = &object->ID3D10DepthStencilState_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device1 *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index be687f3..7cc35db 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -641,7 +641,7 @@ static const struct ID3D10DepthStencilStateVtbl d3d10_depthstencil_state_vtbl = d3d10_depthstencil_state_GetDesc, }; -HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct d3d_device *device, +static 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; @@ -666,6 +666,83 @@ HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct return S_OK; } +HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEPTH_STENCIL_DESC *desc, + struct d3d_depthstencil_state **state) +{ + struct d3d_depthstencil_state *object; + D3D11_DEPTH_STENCIL_DESC tmp_desc; + struct wine_rb_entry *entry; + HRESULT hr; + + if (!desc) + return E_INVALIDARG; + + /* D3D11_DEPTH_STENCIL_DESC has a hole, which is a problem because we use + * it as a key in the rbtree. */ + memset(&tmp_desc, 0, sizeof(tmp_desc)); + tmp_desc.DepthEnable = desc->DepthEnable; + if (desc->DepthEnable) + { + tmp_desc.DepthWriteMask = desc->DepthWriteMask; + tmp_desc.DepthFunc = desc->DepthFunc; + } + else + { + tmp_desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL; + tmp_desc.DepthFunc = D3D11_COMPARISON_LESS; + } + tmp_desc.StencilEnable = desc->StencilEnable; + if (desc->StencilEnable) + { + tmp_desc.StencilReadMask = desc->StencilReadMask; + tmp_desc.StencilWriteMask = desc->StencilWriteMask; + tmp_desc.FrontFace = desc->FrontFace; + tmp_desc.BackFace = desc->BackFace; + } + else + { + tmp_desc.StencilReadMask = D3D11_DEFAULT_STENCIL_READ_MASK; + tmp_desc.StencilWriteMask = D3D11_DEFAULT_STENCIL_WRITE_MASK; + tmp_desc.FrontFace.StencilFailOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.FrontFace.StencilDepthFailOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.FrontFace.StencilPassOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.FrontFace.StencilFunc = D3D11_COMPARISON_ALWAYS; + tmp_desc.BackFace.StencilFailOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.BackFace.StencilDepthFailOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.BackFace.StencilPassOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.BackFace.StencilFunc = D3D11_COMPARISON_ALWAYS; + } + + wined3d_mutex_lock(); + if ((entry = wine_rb_get(&device->depthstencil_states, &tmp_desc))) + { + object = WINE_RB_ENTRY_VALUE(entry, struct d3d_depthstencil_state, entry); + + TRACE("Returning existing depthstencil state %p.\n", object); + ID3D11DepthStencilState_AddRef(&object->ID3D11DepthStencilState_iface); + *state = object; + wined3d_mutex_unlock(); + + return S_OK; + } + wined3d_mutex_unlock(); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_depthstencil_state_init(object, device, &tmp_desc))) + { + WARN("Failed to initialize depthstencil state, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created depthstencil state %p.\n", object); + *state = object; + + return S_OK; +} + struct d3d_depthstencil_state *unsafe_impl_from_ID3D11DepthStencilState(ID3D11DepthStencilState *iface) { if (!iface)

1 0

Józef Kucia : d3d11: Fix race condition in d3d_blend_state_create().
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: f83159d90bda496ded992ecca9d479414bb46e16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f83159d90bda496ded992ecca… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 20 14:10:58 2017 +0200 d3d11: Fix race condition in d3d_blend_state_create(). Spotted by Kimmo Myllyvirta. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 39768c5..be687f3 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -67,6 +67,12 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState *iface) return refcount; } +static void d3d_blend_state_cleanup(struct d3d_blend_state *state) +{ + wined3d_private_store_cleanup(&state->private_store); + ID3D11Device_Release(state->device); +} + static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface) { struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); @@ -79,8 +85,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface struct d3d_device *device = impl_from_ID3D11Device(state->device); wined3d_mutex_lock(); wine_rb_remove(&device->blend_states, &state->entry); - ID3D11Device_Release(state->device); - wined3d_private_store_cleanup(&state->private_store); + d3d_blend_state_cleanup(state); wined3d_mutex_unlock(); HeapFree(GetProcessHeap(), 0, state); } @@ -289,19 +294,9 @@ static HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_de 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; - if (wine_rb_put(&device->blend_states, desc, &state->entry) == -1) - { - 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); @@ -361,18 +356,31 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC 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))) { WARN("Failed to initialize blend state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); + wined3d_mutex_unlock(); return hr; } + if (wine_rb_put(&device->blend_states, desc, &object->entry) == -1) + { + ERR("Failed to insert blend state entry.\n"); + d3d_blend_state_cleanup(object); + HeapFree(GetProcessHeap(), 0, object); + wined3d_mutex_unlock(); + return E_FAIL; + } + wined3d_mutex_unlock(); + TRACE("Created blend state %p.\n", object); *state = object;

1 0

Józef Kucia : d3d11: Introduce d3d_blend_state_create () helper function.
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: 7448012ecc56cc14c4b80a8d1607c703efa1b1a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7448012ecc56cc14c4b80a8d1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 20 14:10:57 2017 +0200 d3d11: Introduce d3d_blend_state_create() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 4 +-- dlls/d3d11/device.c | 70 ++++---------------------------------------- dlls/d3d11/state.c | 73 +++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 80 insertions(+), 67 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 479c84f..b887ac5 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -402,8 +402,8 @@ static inline struct d3d_blend_state *impl_from_ID3D11BlendState(ID3D11BlendStat return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D11BlendState_iface); } -HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, - const D3D11_BLEND_DESC *desc) DECLSPEC_HIDDEN; +HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC *desc, + struct d3d_blend_state **state) DECLSPEC_HIDDEN; struct d3d_blend_state *unsafe_impl_from_ID3D11BlendState(ID3D11BlendState *iface) DECLSPEC_HIDDEN; struct d3d_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e84c365..95783e9 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3001,70 +3001,13 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState(ID3D11Device *ifa { struct d3d_device *device = impl_from_ID3D11Device(iface); struct d3d_blend_state *object; - struct wine_rb_entry *entry; - D3D11_BLEND_DESC tmp_desc; - unsigned int i, j; HRESULT hr; TRACE("iface %p, desc %p, blend_state %p.\n", iface, desc, blend_state); - if (!desc) - return E_INVALIDARG; - - /* D3D11_RENDER_TARGET_BLEND_DESC has a hole, which is a problem because we use - * D3D11_BLEND_DESC as a key in the rbtree. */ - memset(&tmp_desc, 0, sizeof(tmp_desc)); - tmp_desc.AlphaToCoverageEnable = desc->AlphaToCoverageEnable; - tmp_desc.IndependentBlendEnable = desc->IndependentBlendEnable; - for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) - { - j = desc->IndependentBlendEnable ? i : 0; - tmp_desc.RenderTarget[i].BlendEnable = desc->RenderTarget[j].BlendEnable; - tmp_desc.RenderTarget[i].SrcBlend = desc->RenderTarget[j].SrcBlend; - tmp_desc.RenderTarget[i].DestBlend = desc->RenderTarget[j].DestBlend; - tmp_desc.RenderTarget[i].BlendOp = desc->RenderTarget[j].BlendOp; - tmp_desc.RenderTarget[i].SrcBlendAlpha = desc->RenderTarget[j].SrcBlendAlpha; - tmp_desc.RenderTarget[i].DestBlendAlpha = desc->RenderTarget[j].DestBlendAlpha; - tmp_desc.RenderTarget[i].BlendOpAlpha = desc->RenderTarget[j].BlendOpAlpha; - tmp_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTarget[j].RenderTargetWriteMask; - - if (i > 3 && tmp_desc.RenderTarget[i].RenderTargetWriteMask != D3D11_COLOR_WRITE_ENABLE_ALL) - FIXME("Color mask %#x not supported for render target %u.\n", - tmp_desc.RenderTarget[i].RenderTargetWriteMask, i); - } - - /* glSampleCoverage() */ - if (tmp_desc.AlphaToCoverageEnable) - FIXME("Ignoring AlphaToCoverageEnable %#x.\n", tmp_desc.AlphaToCoverageEnable); - /* glEnableIndexedEXT(GL_BLEND, ...) */ - if (tmp_desc.IndependentBlendEnable) - FIXME("Per-rendertarget blend not implemented.\n"); - - wined3d_mutex_lock(); - if ((entry = wine_rb_get(&device->blend_states, &tmp_desc))) - { - object = WINE_RB_ENTRY_VALUE(entry, struct d3d_blend_state, entry); - - TRACE("Returning existing blend state %p.\n", object); - *blend_state = &object->ID3D11BlendState_iface; - ID3D11BlendState_AddRef(*blend_state); - wined3d_mutex_unlock(); - - return S_OK; - } - wined3d_mutex_unlock(); - - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - return E_OUTOFMEMORY; - - if (FAILED(hr = d3d_blend_state_init(object, device, &tmp_desc))) - { - WARN("Failed to initialize blend state, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d_blend_state_create(device, desc, &object))) return hr; - } - TRACE("Created blend state %p.\n", object); *blend_state = &object->ID3D11BlendState_iface; return S_OK; @@ -5390,18 +5333,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState1(ID3D10Device1 *i const D3D10_BLEND_DESC1 *desc, ID3D10BlendState1 **blend_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); - ID3D11BlendState *d3d11_blend_state; + struct d3d_blend_state *object; HRESULT hr; TRACE("iface %p, desc %p, blend_state %p.\n", iface, desc, blend_state); - if (FAILED(hr = d3d11_device_CreateBlendState(&device->ID3D11Device_iface, (D3D11_BLEND_DESC *)desc, - &d3d11_blend_state))) + if (FAILED(hr = d3d_blend_state_create(device, (const D3D11_BLEND_DESC *)desc, &object))) return hr; - hr = ID3D11BlendState_QueryInterface(d3d11_blend_state, &IID_ID3D10BlendState1, (void **)blend_state); - ID3D11BlendState_Release(d3d11_blend_state); - return hr; + *blend_state = &object->ID3D10BlendState1_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device1 *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 43dd10f..39768c5 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -283,7 +283,7 @@ static const struct ID3D10BlendState1Vtbl d3d10_blend_state_vtbl = d3d10_blend_state_GetDesc1, }; -HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, +static 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; @@ -308,6 +308,77 @@ HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *d return S_OK; } +HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC *desc, + struct d3d_blend_state **state) +{ + struct d3d_blend_state *object; + struct wine_rb_entry *entry; + D3D11_BLEND_DESC tmp_desc; + unsigned int i, j; + HRESULT hr; + + if (!desc) + return E_INVALIDARG; + + /* D3D11_RENDER_TARGET_BLEND_DESC has a hole, which is a problem because we use + * D3D11_BLEND_DESC as a key in the rbtree. */ + memset(&tmp_desc, 0, sizeof(tmp_desc)); + tmp_desc.AlphaToCoverageEnable = desc->AlphaToCoverageEnable; + tmp_desc.IndependentBlendEnable = desc->IndependentBlendEnable; + for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) + { + j = desc->IndependentBlendEnable ? i : 0; + tmp_desc.RenderTarget[i].BlendEnable = desc->RenderTarget[j].BlendEnable; + tmp_desc.RenderTarget[i].SrcBlend = desc->RenderTarget[j].SrcBlend; + tmp_desc.RenderTarget[i].DestBlend = desc->RenderTarget[j].DestBlend; + tmp_desc.RenderTarget[i].BlendOp = desc->RenderTarget[j].BlendOp; + tmp_desc.RenderTarget[i].SrcBlendAlpha = desc->RenderTarget[j].SrcBlendAlpha; + tmp_desc.RenderTarget[i].DestBlendAlpha = desc->RenderTarget[j].DestBlendAlpha; + tmp_desc.RenderTarget[i].BlendOpAlpha = desc->RenderTarget[j].BlendOpAlpha; + tmp_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTarget[j].RenderTargetWriteMask; + + if (i > 3 && tmp_desc.RenderTarget[i].RenderTargetWriteMask != D3D11_COLOR_WRITE_ENABLE_ALL) + FIXME("Color mask %#x not supported for render target %u.\n", + tmp_desc.RenderTarget[i].RenderTargetWriteMask, i); + } + + /* glSampleCoverage() */ + if (tmp_desc.AlphaToCoverageEnable) + FIXME("Ignoring AlphaToCoverageEnable %#x.\n", tmp_desc.AlphaToCoverageEnable); + /* glEnableIndexedEXT(GL_BLEND, ...) */ + if (tmp_desc.IndependentBlendEnable) + FIXME("Per-rendertarget blend not implemented.\n"); + + wined3d_mutex_lock(); + if ((entry = wine_rb_get(&device->blend_states, &tmp_desc))) + { + object = WINE_RB_ENTRY_VALUE(entry, struct d3d_blend_state, entry); + + TRACE("Returning existing blend state %p.\n", object); + ID3D11BlendState_AddRef(&object->ID3D11BlendState_iface); + *state = object; + wined3d_mutex_unlock(); + + return S_OK; + } + wined3d_mutex_unlock(); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_blend_state_init(object, device, &tmp_desc))) + { + WARN("Failed to initialize blend state, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created blend state %p.\n", object); + *state = object; + + return S_OK; +} + struct d3d_blend_state *unsafe_impl_from_ID3D11BlendState(ID3D11BlendState *iface) { if (!iface)

1 0

Zebediah Figura : msi: Send the dialog created message in dialog_create().
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: 39c2ff0283204d6e714917a56f8538292ff62f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39c2ff0283204d6e714917a56… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 20 23:43:15 2017 -0500 msi: Send the dialog created message in dialog_create(). It should be sent before the message loop, and it should also be sent for dialogs spawned with control events. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index a5b839d..c4a94f1 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3918,6 +3918,8 @@ static BOOL dialog_register_class( void ) static msi_dialog *dialog_create( MSIPACKAGE *package, const WCHAR *name, msi_dialog *parent, control_event_handler event_handler ) { + static const WCHAR szDialogCreated[] = + {'D','i','a','l','o','g',' ','c','r','e','a','t','e','d',0}; MSIRECORD *rec = NULL; msi_dialog *dialog; @@ -3949,6 +3951,13 @@ static msi_dialog *dialog_create( MSIPACKAGE *package, const WCHAR *name, msi_di dialog->control_cancel = strdupW( MSI_RecordGetString( rec, 10 ) ); msiobj_release( &rec->hdr ); + rec = MSI_CreateRecord(2); + if (!rec) return NULL; + MSI_RecordSetStringW(rec, 1, name); + MSI_RecordSetStringW(rec, 2, szDialogCreated); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONSTART, rec); + msiobj_release(&rec->hdr); + return dialog; } @@ -4603,17 +4612,6 @@ UINT ACTION_DialogBox( MSIPACKAGE *package, const WCHAR *dialog ) msi_free( name ); } if (r == ERROR_IO_PENDING) r = ERROR_SUCCESS; - if (r == ERROR_SUCCESS) - { - static const WCHAR szDialogCreated[] = - {'D','i','a','l','o','g',' ','c','r','e','a','t','e','d',0}; - MSIRECORD *row = MSI_CreateRecord(2); - if (!row) return ERROR_OUTOFMEMORY; - MSI_RecordSetStringW(row, 1, dialog); - MSI_RecordSetStringW(row, 2, szDialogCreated); - MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONSTART, row); - msiobj_release(&row->hdr); - } return r; }

1 0

Zebediah Figura : msi: Don' t queue a parent dialog to be shown in EndDialog.
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: 14f865e14fc6f290d392c6c847d2841dcc6ba96e URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f865e14fc6f290d392c6c84… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 20 23:43:14 2017 -0500 msi: Don't queue a parent dialog to be shown in EndDialog. When using "Return", the parent dialog already exists, so there is no need to do this. Moreover, if the parent dialog is queued, a subsequent "Exit" would not properly exit the parent dialog. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 6b57606..a5b839d 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -4381,12 +4381,7 @@ static UINT event_end_dialog( msi_dialog *dialog, const WCHAR *argument ) else if (!strcmpW( argument, ignoreW )) dialog->package->CurrentInstallState = ERROR_SUCCESS; else if (!strcmpW( argument, returnW )) - { - msi_dialog *parent = dialog->parent; - msi_free( dialog->package->next_dialog ); - dialog->package->next_dialog = (parent) ? strdupW( parent->name ) : NULL; dialog->package->CurrentInstallState = ERROR_SUCCESS; - } else { ERR("Unknown argument string %s\n", debugstr_w(argument));

1 0

Zebediah Figura : msi: Process ShowDialog/ EndDialog after all other control events.
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: 8826584b1d728e1f43dab67f9d6aaa7940f18ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8826584b1d728e1f43dab67f9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 20 23:43:13 2017 -0500 msi: Process ShowDialog/EndDialog after all other control events. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 45 +++++++++++-- dlls/msi/tests/package.c | 165 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 199 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8826584b1d728e1f43dab…

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2017