July 2017 - Wine-Commits - list.winehq.org

Zebediah Figura : dbghelp: Silence a noisy FIXME.
by Alexandre Julliard July 21, 2017

July 21, 2017

Module: wine Branch: master Commit: 00e27186ed436d1a32394fc2f233c72a4f747af5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00e27186ed436d1a32394fc2f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 21 10:26:17 2017 -0500 dbghelp: Silence a noisy FIXME. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index a7954fd..1a75a79 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1822,7 +1822,7 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, if (!dwarf2_read_range(subpgm->ctx, di, &low_pc, &high_pc)) { - FIXME("no range\n"); + WARN("no range\n"); return; }

1 0

Akihiro Sagawa : gdi32: Return non-zero VREFRESH value for display devices.
by Alexandre Julliard July 21, 2017

July 21, 2017

Module: wine Branch: master Commit: 22135ba583f2881d16b9370aa6de7513bbc59f10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22135ba583f2881d16b9370aa… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jul 21 22:58:04 2017 +0900 gdi32: Return non-zero VREFRESH value for display devices. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/driver.c | 2 +- dlls/gdi32/tests/dc.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index fe7812c..6a3975a 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -344,7 +344,7 @@ static INT nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) case PHYSICALOFFSETY: return 0; case SCALINGFACTORX: return 0; case SCALINGFACTORY: return 0; - case VREFRESH: return 0; + case VREFRESH: return GetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY ? 1 : 0; case DESKTOPVERTRES: return GetDeviceCaps( dev->hdc, VERTRES ); case DESKTOPHORZRES: return GetDeviceCaps( dev->hdc, HORZRES ); case BLTALIGNMENT: return 0; diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index add2c04..3c1fa60 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -400,6 +400,12 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale case LOGPIXELSY: hdc_caps *= scale; break; + case VREFRESH: + if (GetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASDISPLAY) + ok( hdc_caps > 0, "expected a positive value on %s, got %d\n", descr, hdc_caps ); + else + ok( hdc_caps == 0, "expected 0 on %s, got %d\n", descr, hdc_caps ); + break; } ok( abs(hdc_caps - GetDeviceCaps( ref_dc, caps[i] )) <= precision,

1 0

André Hentschel : wpcap: Fix build with newer pcap versions.
by Alexandre Julliard July 21, 2017

July 21, 2017

Module: wine Branch: master Commit: 28173f06932edd85a64a952120d29b9bb1e762ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=28173f06932edd85a64a95212… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jul 21 15:16:51 2017 +0200 wpcap: Fix build with newer pcap versions. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index b770067..fe46903 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -19,6 +19,11 @@ */ #include <pcap/pcap.h> + +/* pcap.h might define those: */ +#undef SOCKET +#undef INVALID_SOCKET + #include "winsock2.h" #include "windef.h" #include "winbase.h"

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode3::put_textContent implementation.
by Alexandre Julliard July 21, 2017

July 21, 2017

Module: wine Branch: master Commit: 281826ebd04d2ddaf56b69d129dddb6dca4307e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=281826ebd04d2ddaf56b69d12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 21 15:11:10 2017 +0200 mshtml: Added IHTMLDOMNode3::put_textContent implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlnode.c | 21 +++++++++++++++++++-- dlls/mshtml/tests/elements.js | 9 +++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index ec18648..80bf31d 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1241,8 +1241,25 @@ static HRESULT WINAPI HTMLDOMNode3_get_namespaceURI(IHTMLDOMNode3 *iface, VARIAN static HRESULT WINAPI HTMLDOMNode3_put_textContent(IHTMLDOMNode3 *iface, VARIANT v) { HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + if(V_VT(&v) != VT_BSTR) { + FIXME("unsupported argument %s\n", debugstr_variant(&v)); + return E_NOTIMPL; + } + + nsAString_Init(&nsstr, V_BSTR(&v)); + nsres = nsIDOMNode_SetTextContent(This->nsnode, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("SetTextContent failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLDOMNode3_get_textContent(IHTMLDOMNode3 *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 79eb68a..4167e32 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -68,6 +68,15 @@ function test_textContent() { div.innerHTML = "abc<script>/* */</script><div>text</div>"; ok(div.textContent === "abc/* */text", "div.textContent = " + div.textContent); + div.textContent = "test"; + ok(div.textContent === "test", "div.textContent = " + div.textContent); + ok(div.childNodes.length === 1, "div.childNodes.length = " + div.childNodes.length); + ok(div.firstChild.textContent === "test", "div.firstChild.textContent = " + div.firstChild.textContent); + + div.textContent = ""; + ok(div.textContent === "", "div.textContent = " + div.textContent); + ok(div.childNodes.length === 0, "div.childNodes.length = " + div.childNodes.length); + next_test(); }

1 0

Józef Kucia : d3d11: Fix race condition in d3d_sampler_state_create().
by Alexandre Julliard July 21, 2017

July 21, 2017

Module: wine Branch: master Commit: e1983836b7ce8f7e47d87d756c986e72f247e7e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1983836b7ce8f7e47d87d756… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 20 14:11:04 2017 +0200 d3d11: Fix race condition in d3d_sampler_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 64fae13..b7c9264 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1441,7 +1441,6 @@ static HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3 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; @@ -1465,7 +1464,6 @@ static HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3 { ERR("Failed to insert sampler state entry.\n"); wined3d_private_store_cleanup(&state->private_store); - wined3d_mutex_unlock(); return E_FAIL; } @@ -1477,10 +1475,8 @@ static HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3 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); @@ -1521,12 +1517,16 @@ HRESULT d3d_sampler_state_create(struct d3d_device *device, const D3D11_SAMPLER_ 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);

1 0

Józef Kucia : d3d11: Introduce d3d_sampler_state_create() helper function.
by Alexandre Julliard July 21, 2017

July 21, 2017

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 July 21, 2017

July 21, 2017

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 July 21, 2017

July 21, 2017

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: Introduce d3d_depthstencil_state_create() helper function.
by Alexandre Julliard July 21, 2017

July 21, 2017

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

Jacek Caban : server: Remove no loner needed fd NULL check (Coverity).
by Alexandre Julliard July 21, 2017

July 21, 2017

Module: wine Branch: master Commit: f706d9f08fcb463582850a848ffe8fbf7c2ad4a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f706d9f08fcb463582850a848… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 21 15:19:37 2017 +0200 server: Remove no loner needed fd NULL check (Coverity). Spotted by Marcus Meissner. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/async.c b/server/async.c index 1cb020f..cf7a434 100644 --- a/server/async.c +++ b/server/async.c @@ -208,7 +208,7 @@ void queue_async( struct async_queue *queue, struct async *async ) grab_object( async ); list_add_tail( &queue->queue, &async->queue_entry ); - if (async->fd) set_fd_signaled( async->fd, 0 ); + set_fd_signaled( async->fd, 0 ); } /* create an async on a given queue of a fd */

1 0