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

Józef Kucia : wined3d: Add ARB_clear_texture extension.
by Alexandre Julliard May 12, 2017

May 12, 2017

Module: wine Branch: master Commit: 68590a412d9bdfe21405e84ae378fb8d9748987d URL: http://source.winehq.org/git/wine.git/?a=commit;h=68590a412d9bdfe21405e84ae… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 12 15:09:18 2017 +0200 wined3d: Add ARB_clear_texture extension. 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/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 7 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1de85a6..dd3fa49 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -111,6 +111,7 @@ static const struct wined3d_extension_map gl_extension_map[] = /* ARB */ {"GL_ARB_blend_func_extended", ARB_BLEND_FUNC_EXTENDED }, + {"GL_ARB_clear_texture", ARB_CLEAR_TEXTURE }, {"GL_ARB_clip_control", ARB_CLIP_CONTROL }, {"GL_ARB_color_buffer_float", ARB_COLOR_BUFFER_FLOAT }, {"GL_ARB_compute_shader", ARB_COMPUTE_SHADER }, @@ -2680,6 +2681,9 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) /* GL_ARB_blend_func_extended */ USE_GL_FUNC(glBindFragDataLocationIndexed) USE_GL_FUNC(glGetFragDataIndex) + /* GL_ARB_clear_texture */ + USE_GL_FUNC(glClearTexImage) + USE_GL_FUNC(glClearTexSubImage) /* GL_ARB_clip_control */ USE_GL_FUNC(glClipControl) /* GL_ARB_color_buffer_float */ @@ -3882,6 +3886,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_TEXTURE_QUERY_LEVELS, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_VIEW, MAKEDWORD_VERSION(4, 3)}, + {ARB_CLEAR_TEXTURE, MAKEDWORD_VERSION(4, 4)}, + {ARB_CLIP_CONTROL, MAKEDWORD_VERSION(4, 5)}, {ARB_DERIVATIVE_CONTROL, MAKEDWORD_VERSION(4, 5)}, }; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 41cd74c..5a2307a 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -44,6 +44,7 @@ enum wined3d_gl_extension APPLE_YCBCR_422, /* ARB */ ARB_BLEND_FUNC_EXTENDED, + ARB_CLEAR_TEXTURE, ARB_CLIP_CONTROL, ARB_COLOR_BUFFER_FLOAT, ARB_COMPUTE_SHADER,

1 0

Dmitry Timoshkov : include: Fix typos in WICPersistOptions enumeration names.
by Alexandre Julliard May 12, 2017

May 12, 2017

Module: wine Branch: master Commit: 35483da628a4a376b51a9284439c84532060bf78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35483da628a4a376b51a92844… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 10 18:20:10 2017 +0200 include: Fix typos in WICPersistOptions enumeration names. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/gifformat.c | 4 ++-- dlls/windowscodecs/imgfactory.c | 4 ++-- dlls/windowscodecs/metadatahandler.c | 6 +++--- dlls/windowscodecs/tests/metadata.c | 28 ++++++++++++++-------------- dlls/windowscodecs/tiffformat.c | 6 +++--- include/wincodecsdk.idl | 12 ++++++------ 6 files changed, 30 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35483da628a4a376b51a9…

1 0

Tag wine-2.8 : Alexandre Julliard : Release 2.8
by Alexandre Julliard May 12, 2017

May 12, 2017

Module: wine Branch: refs/tags/wine-2.8 Tag: ca9ba8b667f3ec22d99473e3f390dc2ada1a6498 URL: http://source.winehq.org/git/wine.git/?a=tag;h=ca9ba8b667f3ec22d99473e3f390… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 12 18:45:16 2017 +0200 Release 2.8

1 0

Alexandre Julliard : Release 2.8.
by Alexandre Julliard May 12, 2017

May 12, 2017

Module: wine Branch: master Commit: 4eaaf06ce4e5d7424eec2cf303c8256610544b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eaaf06ce4e5d7424eec2cf30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 12 18:45:16 2017 +0200 Release 2.8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 767 ++++++++++++++++++++++++++------------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 337 insertions(+), 451 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4eaaf06ce4e5d7424eec2…

1 0

Michael Stefaniuc : dmusic: Fail in CreatePort() if SetDirectSound() wasn' t called.
by Alexandre Julliard May 12, 2017

May 12, 2017

Module: wine Branch: master Commit: 40a4a5c7bfbd685cbeacc64d4142c5e39e0dbe23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40a4a5c7bfbd685cbeacc64d4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 12 16:11:25 2017 +0200 dmusic: Fail in CreatePort() if SetDirectSound() wasn't called. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/dmusic.c | 6 +++--- dlls/dmusic/tests/dmusic.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 4199da4..58dcd9d 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -129,14 +129,14 @@ static HRESULT WINAPI IDirectMusic8Impl_CreatePort(LPDIRECTMUSIC8 iface, REFCLSI TRACE("(%p)->(%s, %p, %p, %p)\n", This, debugstr_dmguid(rclsid_port), port_params, port, unkouter); - if (!rclsid_port) + if (!rclsid_port || !port) return E_POINTER; if (!port_params) return E_INVALIDARG; - if (!port) - return E_POINTER; if (unkouter) return CLASS_E_NOAGGREGATION; + if (!This->dsound) + return DMUS_E_DSOUND_NOT_SET; if (TRACE_ON(dmusic)) dump_DMUS_PORTPARAMS(port_params); diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 288a741..7da8aab 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -68,7 +68,7 @@ static void test_dmusic(void) /* No port can be created before SetDirectSound is called */ hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, &port_params, &port, NULL); - todo_wine ok(hr == DMUS_E_DSOUND_NOT_SET, "IDirectMusic_CreatePort returned: %x\n", hr); + ok(hr == DMUS_E_DSOUND_NOT_SET, "IDirectMusic_CreatePort returned: %x\n", hr); hr = IDirectMusic_SetDirectSound(dmusic, NULL, NULL); ok(hr == S_OK, "IDirectMusic_SetDirectSound returned: %x\n", hr);

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_ClearUnorderedAccessViewUint().
by Alexandre Julliard May 12, 2017

May 12, 2017

Module: wine Branch: master Commit: b328ffcbb4c7b0210503c12468e6e9d2460809c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b328ffcbb4c7b0210503c1246… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 12 15:09:21 2017 +0200 d3d11: Implement d3d11_immediate_context_ClearUnorderedAccessViewUint(). 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/device.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index df18375..81da77b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1049,8 +1049,17 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearRenderTargetView(ID3D static void STDMETHODCALLTYPE d3d11_immediate_context_ClearUnorderedAccessViewUint(ID3D11DeviceContext *iface, ID3D11UnorderedAccessView *unordered_access_view, const UINT values[4]) { - FIXME("iface %p, unordered_access_view %p, values {%u %u %u %u} stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d11_unordered_access_view *view; + + TRACE("iface %p, unordered_access_view %p, values {%u, %u, %u, %u}.\n", iface, unordered_access_view, values[0], values[1], values[2], values[3]); + + view = unsafe_impl_from_ID3D11UnorderedAccessView(unordered_access_view); + wined3d_mutex_lock(); + wined3d_device_clear_unordered_access_view_uint(device->wined3d_device, + view->wined3d_view, (const struct wined3d_uvec4 *)values); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_ClearUnorderedAccessViewFloat(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Implement clearing buffer unordered access views.
by Alexandre Julliard May 12, 2017

May 12, 2017

Module: wine Branch: master Commit: f4a34acf1773ffe4cfaab78af3c9f595fa033fb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4a34acf1773ffe4cfaab78af… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 12 15:09:20 2017 +0200 wined3d: Implement clearing buffer unordered access views. 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/wined3d/cs.c | 123 +++++++++++++++++++++++++++-------------- dlls/wined3d/device.c | 8 +++ dlls/wined3d/utils.c | 8 +++ dlls/wined3d/view.c | 65 +++++++++++++++++++--- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 5 ++ include/wine/wined3d.h | 2 + 7 files changed, 160 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4a34acf1773ffe4cfaab…

1 0

Michael Stefaniuc : dmusic: Remove the port from the ports list on the port destruction.
by Alexandre Julliard May 12, 2017

May 12, 2017

Module: wine Branch: master Commit: 62bf20783cf760fd09a0c9a2562819aacb7c9a53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62bf20783cf760fd09a0c9a25… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 12 16:11:22 2017 +0200 dmusic: Remove the port from the ports list on the port destruction. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/dmusic.c | 39 +++++++++++++++++++++++++++++++++++++-- dlls/dmusic/dmusic_private.h | 2 ++ dlls/dmusic/port.c | 1 + dlls/dmusic/tests/dmusic.c | 6 ++++++ 4 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 105e6f7..4199da4 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -160,9 +160,11 @@ static HRESULT WINAPI IDirectMusic8Impl_CreatePort(LPDIRECTMUSIC8 iface, REFCLSI } This->num_ports++; if (!This->ports) - This->ports = HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectMusicPort *) * This->num_ports); + This->ports = HeapAlloc(GetProcessHeap(), 0, + sizeof(*This->ports) * This->num_ports); else - This->ports = HeapReAlloc(GetProcessHeap(), 0, This->ports, sizeof(IDirectMusicPort *) * This->num_ports); + This->ports = HeapReAlloc(GetProcessHeap(), 0, This->ports, + sizeof(*This->ports) * This->num_ports); This->ports[This->num_ports - 1] = new_port; *port = new_port; return S_OK; @@ -172,6 +174,39 @@ static HRESULT WINAPI IDirectMusic8Impl_CreatePort(LPDIRECTMUSIC8 iface, REFCLSI return E_NOINTERFACE; } +void dmusic_remove_port(IDirectMusic8Impl *dmusic, IDirectMusicPort *port) +{ + BOOL found = FALSE; + int i; + + TRACE("Removing port %p.\n", port); + + for (i = 0; i < dmusic->num_ports; i++) + { + if (dmusic->ports[i] == port) { + found = TRUE; + break; + } + } + + if (!found) + { + ERR("Port %p not found in ports array.\n", port); + return; + } + + if (!--dmusic->num_ports) { + HeapFree(GetProcessHeap(), 0, dmusic->ports); + dmusic->ports = NULL; + return; + } + + memmove(&dmusic->ports[i], &dmusic->ports[i + 1], + (dmusic->num_ports - i) * sizeof(*dmusic->ports)); + dmusic->ports = HeapReAlloc(GetProcessHeap(), 0, dmusic->ports, + sizeof(*dmusic->ports) * dmusic->num_ports); +} + static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DWORD index, LPDMUS_CLOCKINFO clock_info) { TRACE("(%p)->(%d, %p)\n", iface, index, clock_info); diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 8c77715..f9839ed 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -229,6 +229,8 @@ static inline void DMUSIC_UnlockModule(void) { InterlockedDecrement( &DMUSIC_ref /***************************************************************************** * Misc. */ +void dmusic_remove_port(IDirectMusic8Impl *dmusic, IDirectMusicPort *port) DECLSPEC_HIDDEN; + /* for simpler reading */ typedef struct _DMUS_PRIVATE_CHUNK { FOURCC fccID; /* FOURCC ID of the chunk */ diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index f2f7599..5064615 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -194,6 +194,7 @@ static ULONG WINAPI SynthPortImpl_IDirectMusicPort_Release(LPDIRECTMUSICPORT ifa if (!ref) { + dmusic_remove_port(This->parent, iface); IDirectMusicSynth_Activate(This->synth, FALSE); IDirectMusicSynth_Close(This->synth); IDirectMusicSynth_Release(This->synth); diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index f65dc7e..288a741 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -176,10 +176,16 @@ static void test_setdsound(void) ok(hr == S_OK, "CreatePort returned: %x\n", hr); ref = get_refcount(dsound); ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + IDirectMusicPort_AddRef(port); + ref = IDirectMusicPort_Release(port); + ok(ref == 1, "port ref count got %d expected 1\n", ref); hr = IDirectMusicPort_Activate(port, TRUE); ok(hr == S_OK, "Port Activate returned: %x\n", hr); ref = get_refcount(dsound); ok(ref == 4, "dsound ref count got %d expected 4\n", ref); + IDirectMusicPort_AddRef(port); + ref = IDirectMusicPort_Release(port); + ok(ref == 1, "port ref count got %d expected 1\n", ref); /* Releasing dsound from dmusic */ hr = IDirectMusic_SetDirectSound(dmusic, NULL, NULL);

1 0

Józef Kucia : d3d11/tests: Add test for clearing buffer unordered access views.
by Alexandre Julliard May 12, 2017

May 12, 2017

Module: wine Branch: master Commit: bf10c558edb630c29aa6943fe44ff78814241cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf10c558edb630c29aa6943fe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 12 15:09:22 2017 +0200 d3d11/tests: Add test for clearing buffer unordered access views. 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/tests/d3d11.c | 349 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 349 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf10c558edb630c29aa69…

1 0

Józef Kucia : wined3d: Add ARB_clear_buffer_object extension.
by Alexandre Julliard May 12, 2017

May 12, 2017

Module: wine Branch: master Commit: cc8fbe7887e40965b5d09b777c69a360f80598f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc8fbe7887e40965b5d09b777… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 12 15:09:19 2017 +0200 wined3d: Add ARB_clear_buffer_object extension. 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/wined3d/directx.c | 5 +++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 6 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index dd3fa49..535ea7d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -111,6 +111,7 @@ static const struct wined3d_extension_map gl_extension_map[] = /* ARB */ {"GL_ARB_blend_func_extended", ARB_BLEND_FUNC_EXTENDED }, + {"GL_ARB_clear_buffer_object", ARB_CLEAR_BUFFER_OBJECT }, {"GL_ARB_clear_texture", ARB_CLEAR_TEXTURE }, {"GL_ARB_clip_control", ARB_CLIP_CONTROL }, {"GL_ARB_color_buffer_float", ARB_COLOR_BUFFER_FLOAT }, @@ -2681,6 +2682,9 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) /* GL_ARB_blend_func_extended */ USE_GL_FUNC(glBindFragDataLocationIndexed) USE_GL_FUNC(glGetFragDataIndex) + /* GL_ARB_clear_buffer_object */ + USE_GL_FUNC(glClearBufferData) + USE_GL_FUNC(glClearBufferSubData) /* GL_ARB_clear_texture */ USE_GL_FUNC(glClearTexImage) USE_GL_FUNC(glClearTexSubImage) @@ -3874,6 +3878,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_TEXTURE_COMPRESSION_BPTC, MAKEDWORD_VERSION(4, 2)}, {ARB_TEXTURE_STORAGE, MAKEDWORD_VERSION(4, 2)}, + {ARB_CLEAR_BUFFER_OBJECT, MAKEDWORD_VERSION(4, 3)}, {ARB_COMPUTE_SHADER, MAKEDWORD_VERSION(4, 3)}, {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, {ARB_ES3_COMPATIBILITY, MAKEDWORD_VERSION(4, 3)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 5a2307a..52fb5fd 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -44,6 +44,7 @@ enum wined3d_gl_extension APPLE_YCBCR_422, /* ARB */ ARB_BLEND_FUNC_EXTENDED, + ARB_CLEAR_BUFFER_OBJECT, ARB_CLEAR_TEXTURE, ARB_CLIP_CONTROL, ARB_COLOR_BUFFER_FLOAT,

1 0