wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Nikolay Sivov : mf: Shutdown samplegrabber event queue on sink shutdown.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 97f949b9c6415936cc3c184c63a8803cfca1f9a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97f949b9c6415936cc3c184c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 11 14:19:39 2020 +0300 mf: Shutdown samplegrabber event queue on sink shutdown. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 6 +++--- dlls/mf/tests/mf.c | 20 +++++++++++++++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index f44df9f32b..f4dbe4f283 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -849,10 +849,7 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) IMFSampleGrabberSinkCallback2_Release(grabber->callback2); IMFMediaType_Release(grabber->media_type); if (grabber->event_queue) - { - IMFMediaEventQueue_Shutdown(grabber->event_queue); IMFMediaEventQueue_Release(grabber->event_queue); - } if (grabber->clock) IMFPresentationClock_Release(grabber->clock); if (grabber->timer) @@ -1045,12 +1042,15 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) grabber->is_shut_down = TRUE; if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber)))) { + /* Detach stream. */ IMFMediaSink_Release(&grabber->stream->sink->IMFMediaSink_iface); EnterCriticalSection(&grabber->stream->cs); grabber->stream->sink = NULL; LeaveCriticalSection(&grabber->stream->cs); IMFStreamSink_Release(&grabber->stream->IMFStreamSink_iface); grabber->stream = NULL; + + IMFMediaEventQueue_Shutdown(grabber->event_queue); } LeaveCriticalSection(&grabber->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index da533d05d3..ebab86aab6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1925,6 +1925,7 @@ static void test_sample_grabber(void) IMFMediaSink *sink, *sink2; DWORD flags, count, id; IMFActivate *activate; + IMFMediaEvent *event; ULONG refcount; IUnknown *unk; HRESULT hr; @@ -1995,9 +1996,12 @@ static void test_sample_grabber(void) ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); IMFClockStateSink_Release(clocksink); + /* Event generator. */ hr = IMFMediaSink_QueryInterface(sink, &IID_IMFMediaEventGenerator, (void **)&eg); ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - IMFMediaEventGenerator_Release(eg); + + hr = IMFMediaEventGenerator_GetEvent(eg, MF_EVENT_FLAG_NO_WAIT, &event); + ok(hr == MF_E_NO_EVENTS_AVAILABLE, "Unexpected hr %#x.\n", hr); hr = IMFMediaSink_QueryInterface(sink, &IID_IMFPresentationTimeSource, (void **)&unk); ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); @@ -2130,9 +2134,18 @@ todo_wine hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, NULL, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hr = IMFMediaEventGenerator_GetEvent(eg, MF_EVENT_FLAG_NO_WAIT, &event); + ok(hr == MF_E_NO_EVENTS_AVAILABLE, "Unexpected hr %#x.\n", hr); + + hr = IMFStreamSink_GetEvent(stream, MF_EVENT_FLAG_NO_WAIT, &event); + ok(hr == MF_E_NO_EVENTS_AVAILABLE, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSink_Shutdown(sink); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + hr = IMFMediaEventGenerator_GetEvent(eg, MF_EVENT_FLAG_NO_WAIT, &event); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSink_Shutdown(sink); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); @@ -2148,6 +2161,10 @@ todo_wine hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream2); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFStreamSink_GetEvent(stream, MF_EVENT_FLAG_NO_WAIT, &event); +todo_wine + ok(hr == MF_E_STREAMSINK_REMOVED, "Unexpected hr %#x.\n", hr); + hr = IMFStreamSink_GetMediaSink(stream, &sink2); ok(hr == MF_E_STREAMSINK_REMOVED, "Unexpected hr %#x.\n", hr); @@ -2195,6 +2212,7 @@ todo_wine hr = IMFStreamSink_GetMediaTypeHandler(stream, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + IMFMediaEventGenerator_Release(eg); IMFMediaSink_Release(sink); IMFStreamSink_Release(stream);

1 0

Zebediah Figura : strmbase: Get rid of the base transform.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 421e6b2b938b785755979b99a5cbcd0edb2eda0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=421e6b2b938b785755979b99… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 22:03:31 2020 -0500 strmbase: Get rid of the base transform. This is providing very little of value. The code in Receive() and in the state management methods should probably be moved to the base pin and filter respectively; the media type management is just wrong (and our two extant transforms should not handle it the same way anyway), and most of the rest just passes through to the transform's own callback table. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/Makefile.in | 1 - dlls/strmbase/transform.c | 437 ---------------------------------------------- include/wine/strmbase.h | 50 ------ 3 files changed, 488 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=421e6b2b938b78575597…

1 0

Zebediah Figura : wineqtdecoder: Reimplement the video decoder directly on top of strmbase_filter.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: b0b2f48ceb4b30e870870d04abf24445fe95102d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0b2f48ceb4b30e870870d04… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 22:03:30 2020 -0500 wineqtdecoder: Reimplement the video decoder directly on top of strmbase_filter. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/Makefile.in | 3 +- dlls/wineqtdecoder/qtvdecoder.c | 261 +++++++++++++++++++++++++++++----------- 2 files changed, 193 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0b2f48ceb4b30e87087…

1 0

Zebediah Figura : quartz/avidec: Reimplement the AVI decoder directly on top of strmbase_filter.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: ad13ce161a8c60ecf9bd95b6604c7578a1160d06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad13ce161a8c60ecf9bd95b6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 22:03:29 2020 -0500 quartz/avidec: Reimplement the AVI decoder directly on top of strmbase_filter. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avidec.c | 378 ++++++++++++++++++++++++++++++++++----------- dlls/quartz/tests/avidec.c | 4 +- 2 files changed, 289 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ad13ce161a8c60ecf9bd…

1 0

Zebediah Figura : quartz/acmwrapper: Reimplement the ACM wrapper directly on top of strmbase_filter.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 1ac3fe36c20bb73d678b8811e34f26029dfaa3de URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ac3fe36c20bb73d678b8811… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 22:03:28 2020 -0500 quartz/acmwrapper: Reimplement the ACM wrapper directly on top of strmbase_filter. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 318 +++++++++++++++++++++++++++++++++++------ dlls/quartz/tests/acmwrapper.c | 20 +-- 2 files changed, 288 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1ac3fe36c20bb73d678b…

1 0

Zebediah Figura : wineqtdecoder: Fix compilation.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: b5448ca6ab4be369d4f38026398e5314d29c9fc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5448ca6ab4be369d4f38026… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 22:03:27 2020 -0500 wineqtdecoder: Fix compilation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wineqtdecoder/main.c b/dlls/wineqtdecoder/main.c index 6e0dd8c46b..435951ba93 100644 --- a/dlls/wineqtdecoder/main.c +++ b/dlls/wineqtdecoder/main.c @@ -146,7 +146,6 @@ static struct class_factory video_decoder_cf = {{&class_factory_vtbl}, video_dec HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) { struct class_factory *factory; - HRESULT hr; TRACE("clsid %s, iid %s, out %p.\n", debugstr_guid(clsid), debugstr_guid(iid), out); @@ -193,7 +192,7 @@ static const REGFILTER2 reg_qt_splitter = .u.s2.rgPins2 = reg_qt_splitter_pins, }; -static const REGFILTERPINS2 reg_qt_splitter_pins[2] = +static const REGFILTERPINS2 reg_video_decoder_pins[2] = { { .nMediaTypes = 1,

1 0

Zebediah Figura : winegstreamer: Read into an existing buffer if requested.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: d61504f16b2751d754ea562f8d49fa86330cda43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d61504f16b2751d754ea562f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 10 15:06:20 2020 -0500 winegstreamer: Read into an existing buffer if requested. oggdemux needs this. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a51354b13c..e9548e80e4 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -896,9 +896,8 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 HRESULT hr; GstMapInfo info; - TRACE("%p %s %i %p\n", pad, wine_dbgstr_longlong(ofs), len, buf); + TRACE("pad %p, offset %s, length %u, buffer %p.\n", pad, wine_dbgstr_longlong(ofs), len, *buf); - *buf = NULL; if (ofs == GST_BUFFER_OFFSET_NONE) ofs = This->nextpullofs; if (ofs >= This->filesize) { @@ -909,7 +908,8 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 len = This->filesize - ofs; This->nextpullofs = ofs + len; - *buf = gst_buffer_new_and_alloc(len); + if (!*buf) + *buf = gst_buffer_new_and_alloc(len); gst_buffer_map(*buf, &info, GST_MAP_WRITE); hr = IAsyncReader_SyncRead(This->reader, ofs, len, info.data); gst_buffer_unmap(*buf, &info);

1 0

Zhiyi Zhang : wined3d: Pass a struct wined3d_adapter pointer to wined3d_calculate_format_pitch().
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: c9f0d862b55be91f416a0114e9a52226bb2658d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9f0d862b55be91f416a0114… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 10 17:35:46 2020 +0800 wined3d: Pass a struct wined3d_adapter pointer to wined3d_calculate_format_pitch(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/surface.c | 4 ++-- dlls/wined3d/directx.c | 12 +++--------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7c13d4abd4..e82f9644e3 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1913,7 +1913,7 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *c wined3d_mutex_unlock(); return hr; } - framebuffer_size = wined3d_calculate_format_pitch(ddraw->wined3d, WINED3DADAPTER_DEFAULT, + framebuffer_size = wined3d_calculate_format_pitch(ddraw->wined3d_adapter, mode.format_id, mode.width); framebuffer_size *= mode.height; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 627963232e..85c1ef4966 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6265,7 +6265,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ } if ((desc->dwFlags & DDSD_LINEARSIZE) - && desc->u1.dwLinearSize < wined3d_calculate_format_pitch(ddraw->wined3d, WINED3DADAPTER_DEFAULT, + && desc->u1.dwLinearSize < wined3d_calculate_format_pitch(ddraw->wined3d_adapter, wined3d_desc.format, wined3d_desc.width) * ((desc->dwHeight + 3) / 4)) { WARN("Invalid linear size %u specified.\n", desc->u1.dwLinearSize); @@ -6282,7 +6282,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_INVALIDPARAMS; } - if (desc->u1.lPitch < wined3d_calculate_format_pitch(ddraw->wined3d, WINED3DADAPTER_DEFAULT, + if (desc->u1.lPitch < wined3d_calculate_format_pitch(ddraw->wined3d_adapter, wined3d_desc.format, wined3d_desc.width) || desc->u1.lPitch & 3) { WARN("Invalid pitch %u specified.\n", desc->u1.lPitch); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d026c6a49e..8f8933801a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1738,19 +1738,13 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, return WINED3D_OK; } -UINT CDECL wined3d_calculate_format_pitch(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_format_id format_id, UINT width) +unsigned int CDECL wined3d_calculate_format_pitch(const struct wined3d_adapter *adapter, + enum wined3d_format_id format_id, unsigned int width) { - const struct wined3d_adapter *adapter; unsigned int row_pitch, slice_pitch; - TRACE("wined3d %p, adapter_idx %u, format_id %s, width %u.\n", - wined3d, adapter_idx, debug_d3dformat(format_id), width); - - if (adapter_idx >= wined3d->adapter_count) - return ~0u; + TRACE("adapter %p, format_id %s, width %u.\n", adapter, debug_d3dformat(format_id), width); - adapter = wined3d->adapters[adapter_idx]; wined3d_format_calculate_pitch(wined3d_get_format(adapter, format_id, 0), 1, width, 1, &row_pitch, &slice_pitch); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3e511c6c2e..a25accc237 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -1,7 +1,7 @@ @ stdcall wined3d_mutex_lock() @ stdcall wined3d_mutex_unlock() -@ cdecl wined3d_calculate_format_pitch(ptr long long long) +@ cdecl wined3d_calculate_format_pitch(ptr long long) @ cdecl wined3d_check_depth_stencil_match(ptr long long long long) @ cdecl wined3d_check_device_format(ptr ptr long long long long long long) @ cdecl wined3d_check_device_format_conversion(ptr long long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 035268be7a..d6a9a079d7 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2247,8 +2247,8 @@ typedef HRESULT (CDECL *wined3d_device_reset_cb)(struct wined3d_resource *resour void __stdcall wined3d_mutex_lock(void); void __stdcall wined3d_mutex_unlock(void); -UINT __cdecl wined3d_calculate_format_pitch(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_format_id format_id, UINT width); +unsigned int __cdecl wined3d_calculate_format_pitch(const struct wined3d_adapter *adapter, + enum wined3d_format_id format_id, unsigned int width); HRESULT __cdecl wined3d_check_depth_stencil_match(const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, enum wined3d_format_id adapter_format_id, enum wined3d_format_id render_target_format_id, enum wined3d_format_id depth_stencil_format_id);

1 0

Zhiyi Zhang : wined3d: Pass a struct wined3d_adapter pointer to wined3d_check_device_format().
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: f2a850c8442fb174f91e1988c04855a4b7ea7720 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2a850c8442fb174f91e1988… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 10 17:35:35 2020 +0800 wined3d: Pass a struct wined3d_adapter pointer to wined3d_check_device_format(). Signed-off-by: Zhiyi Zhang <zzhang(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 | 4 +++- dlls/d3d8/directx.c | 7 ++++--- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 1 + dlls/d3d9/directx.c | 4 ++-- dlls/d3d9/texture.c | 6 +++++- dlls/ddraw/ddraw.c | 6 +++--- dlls/ddraw/device.c | 12 +++++++----- dlls/ddraw/surface.c | 2 +- dlls/wined3d/directx.c | 18 +++++++----------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 7 ++++--- 12 files changed, 39 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2a850c8442fb174f91e…

1 0

Zhiyi Zhang : wined3d: Pass a struct wined3d_adapter pointer to wined3d_check_device_multisample_type().
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: beb4668d58337c52d58b7cefada740695cc0614d URL: https://source.winehq.org/git/wine.git/?a=commit;h=beb4668d58337c52d58b7cef… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 10 17:35:20 2020 +0800 wined3d: Pass a struct wined3d_adapter pointer to wined3d_check_device_multisample_type(). Signed-off-by: Zhiyi Zhang <zzhang(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 | 4 +++- dlls/d3d8/directx.c | 19 +++++++++++++++++-- dlls/d3d9/directx.c | 19 +++++++++++++++++-- dlls/wined3d/directx.c | 10 +++------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 6 files changed, 42 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=beb4668d58337c52d58b…

1 0

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 March 2020