February 2021 - Wine-commits

Nikolay Sivov : mfreadwrite/reader: Subscribe to allocator's release notifications.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: a0a6fad695d2f9d1eb2601725ac27c9a9949026b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0a6fad695d2f9d1eb260172… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 17 16:14:04 2021 +0300 mfreadwrite/reader: Subscribe to allocator's release notifications. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 6a69196054a..ec7d3fd62e6 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -112,12 +112,14 @@ struct media_stream IMFMediaType *current; IMFTransform *decoder; IMFVideoSampleAllocatorEx *allocator; + IMFVideoSampleAllocatorNotify notify_cb; unsigned int id; unsigned int index; enum media_stream_state state; unsigned int flags; unsigned int requests; unsigned int responses; + struct source_reader *reader; }; enum source_reader_async_op @@ -126,6 +128,7 @@ enum source_reader_async_op SOURCE_READER_ASYNC_SEEK, SOURCE_READER_ASYNC_FLUSH, SOURCE_READER_ASYNC_SAMPLE_READY, + SOURCE_READER_ASYNC_SA_READY, }; struct source_reader_async_command @@ -153,6 +156,10 @@ struct source_reader_async_command { unsigned int stream_index; } sample; + struct + { + unsigned int stream_index; + } sa; } u; }; @@ -216,6 +223,11 @@ static struct source_reader_async_command *impl_from_async_command_IUnknown(IUnk return CONTAINING_RECORD(iface, struct source_reader_async_command, IUnknown_iface); } +static struct media_stream *impl_stream_from_IMFVideoSampleAllocatorNotify(IMFVideoSampleAllocatorNotify *iface) +{ + return CONTAINING_RECORD(iface, struct media_stream, notify_cb); +} + static HRESULT WINAPI source_reader_async_command_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -1533,6 +1545,7 @@ static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader IMFMediaType *media_type) { struct media_stream *stream = &reader->streams[index]; + IMFVideoSampleAllocatorCallback *callback; GUID major = { 0 }; HRESULT hr; @@ -1568,6 +1581,13 @@ static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader if (FAILED(hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(stream->allocator, 2, 8, NULL, media_type))) WARN("Failed to initialize sample allocator, hr %#x.\n", hr); + if (SUCCEEDED(IMFVideoSampleAllocatorEx_QueryInterface(stream->allocator, &IID_IMFVideoSampleAllocatorCallback, (void **)&callback))) + { + if (FAILED(hr = IMFVideoSampleAllocatorCallback_SetCallback(callback, &stream->notify_cb))) + WARN("Failed to set allocator callback, hr %#x.\n", hr); + IMFVideoSampleAllocatorCallback_Release(callback); + } + return hr; } @@ -2126,6 +2146,54 @@ static DWORD reader_get_first_stream_index(IMFPresentationDescriptor *descriptor return MF_SOURCE_READER_INVALID_STREAM_INDEX; } +static HRESULT WINAPI stream_sample_allocator_cb_QueryInterface(IMFVideoSampleAllocatorNotify *iface, + REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFVideoSampleAllocatorNotify) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFVideoSampleAllocatorNotify_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI stream_sample_allocator_cb_AddRef(IMFVideoSampleAllocatorNotify *iface) +{ + return 2; +} + +static ULONG WINAPI stream_sample_allocator_cb_Release(IMFVideoSampleAllocatorNotify *iface) +{ + return 1; +} + +static HRESULT WINAPI stream_sample_allocator_cb_NotifyRelease(IMFVideoSampleAllocatorNotify *iface) +{ + struct media_stream *stream = impl_stream_from_IMFVideoSampleAllocatorNotify(iface); + struct source_reader_async_command *command; + + if (SUCCEEDED(source_reader_create_async_op(SOURCE_READER_ASYNC_SA_READY, &command))) + { + command->u.sa.stream_index = stream->index; + MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &stream->reader->async_commands_callback, &command->IUnknown_iface); + IUnknown_Release(&command->IUnknown_iface); + } + + return S_OK; +} + +static const IMFVideoSampleAllocatorNotifyVtbl stream_sample_allocator_cb_vtbl = +{ + stream_sample_allocator_cb_QueryInterface, + stream_sample_allocator_cb_AddRef, + stream_sample_allocator_cb_Release, + stream_sample_allocator_cb_NotifyRelease, +}; + static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttributes *attributes, BOOL shutdown_on_release, REFIID riid, void **out) { @@ -2195,6 +2263,8 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri if (FAILED(hr)) break; + object->streams[i].notify_cb.lpVtbl = &stream_sample_allocator_cb_vtbl; + object->streams[i].reader = object; object->streams[i].index = i; }

1 0

Alistair Leslie-Hughes : msado15: Semi-implement _Connection Execute.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: b90cb3cf95f77a3f70c5475b52e644985f98eac3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b90cb3cf95f77a3f70c5475b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 17 20:17:17 2021 +1100 msado15: Semi-implement _Connection Execute. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 72 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 70 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 63014d7e37e..500be033199 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -20,6 +20,7 @@ #include "windef.h" #include "winbase.h" #define COBJMACROS +#define DBINITCONSTANTS #include "initguid.h" #include "ocidl.h" #include "objbase.h" @@ -266,8 +267,75 @@ static HRESULT WINAPI connection_Close( _Connection *iface ) static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARIANT *records_affected, LONG options, _Recordset **record_set ) { - FIXME( "%p, %s, %p, %08x, %p\n", iface, debugstr_w(command), records_affected, options, record_set ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + HRESULT hr; + IOpenRowset *openrowset; + IDBCreateCommand *create_command = NULL; + ICommand *cmd = NULL; + ICommandText *comand_text = NULL; + DBROWCOUNT affected; + IUnknown *rowset = NULL; + _Recordset *recordset = NULL; + ADORecordsetConstruction *construct; + + FIXME( "%p, %s, %p, 0x%08x, %p Semi-stub\n", iface, debugstr_w(command), records_affected, options, record_set ); + + if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + hr = IUnknown_QueryInterface(connection->session, &IID_IOpenRowset, (void**)&openrowset); + if (FAILED(hr)) + return hr; + + hr = IOpenRowset_QueryInterface(openrowset, &IID_IDBCreateCommand, (void**)&create_command); + if (FAILED(hr)) + goto done; + + hr = IDBCreateCommand_CreateCommand(create_command, NULL, &IID_IUnknown, (IUnknown **)&cmd); + if (FAILED(hr)) + goto done; + + hr = ICommand_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + if (FAILED(hr)) + { + FIXME("Currently only ICommandText interface is support\n"); + goto done; + } + + hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, command); + if (FAILED(hr)) + goto done; + + hr = ICommandText_Execute(comand_text, NULL, &IID_IUnknown, NULL, &affected, &rowset); + if (FAILED(hr)) + goto done; + + hr = Recordset_create( (void**)&recordset); + if (FAILED(hr)) + goto done; + + hr = _Recordset_QueryInterface(recordset, &IID_ADORecordsetConstruction, (void**)&construct); + if (FAILED(hr)) + goto done; + + ADORecordsetConstruction_put_Rowset(construct, rowset); + ADORecordsetConstruction_Release(construct); + + if (records_affected) + { + V_VT(records_affected) = VT_I4; + V_I4(records_affected) = affected; + } + + _Recordset_put_CursorLocation(recordset, connection->location); + *record_set = recordset; + +done: + if (rowset) IUnknown_Release(rowset); + if (comand_text) ICommandText_Release(comand_text); + if (cmd) ICommand_Release(cmd); + if (create_command) IDBCreateCommand_Release(create_command); + if (openrowset) IOpenRowset_Release(openrowset); + return hr; } static HRESULT WINAPI connection_BeginTrans( _Connection *iface, LONG *transaction_level )

1 0

Zebediah Figura : winegstreamer: Move seeking to the Unix library.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: ccc6c98075761e8d8876c3d0e30215e98bb22024 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccc6c98075761e8d8876c3d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 16 19:28:26 2021 -0600 winegstreamer: Move seeking to the Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 4 ++++ dlls/winegstreamer/gstdemux.c | 31 ++++++------------------------- dlls/winegstreamer/wg_parser.c | 24 ++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 25 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 3c6d1147477..c77c5c14665 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -228,6 +228,10 @@ struct unix_funcs bool (CDECL *wg_parser_stream_get_event)(struct wg_parser_stream *stream, struct wg_parser_event *event); void (CDECL *wg_parser_stream_notify_qos)(struct wg_parser_stream *stream, bool underflow, double proportion, int64_t diff, uint64_t timestamp); + + /* start_pos and stop_pos are in 100-nanosecond units. */ + bool (CDECL *wg_parser_stream_seek)(struct wg_parser_stream *stream, double rate, + uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags); }; extern const struct unix_funcs *unix_funcs; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index da294c31e01..1af34441984 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -848,7 +848,7 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) { struct parser *filter = impl_from_strmbase_filter(iface); struct wg_parser *parser = filter->wg_parser; - GstSeekType stop_type = GST_SEEK_TYPE_NONE; + DWORD stop_flags = AM_SEEKING_NoPositioning; const SourceSeeking *seeking; unsigned int i; @@ -861,15 +861,11 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) /* DirectShow retains the old seek positions, but resets to them every time * it transitions from stopped -> paused. */ - parser->next_offset = parser->start_offset; - seeking = &filter->sources[0]->seek; if (seeking->llStop && seeking->llStop != seeking->llDuration) - stop_type = GST_SEEK_TYPE_SET; - gst_pad_push_event(filter->sources[0]->wg_stream->my_sink, gst_event_new_seek( - seeking->dRate, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, - GST_SEEK_TYPE_SET, seeking->llCurrent * 100, - stop_type, seeking->llStop * 100)); + stop_flags = AM_SEEKING_AbsolutePositioning; + unix_funcs->wg_parser_stream_seek(filter->sources[0]->wg_stream, seeking->dRate, + seeking->llCurrent, seeking->llStop, AM_SEEKING_AbsolutePositioning, stop_flags); for (i = 0; i < filter->source_count; ++i) { @@ -1212,11 +1208,8 @@ static ULONG WINAPI GST_Seeking_Release(IMediaSeeking *iface) static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, LONGLONG *current, DWORD current_flags, LONGLONG *stop, DWORD stop_flags) { - GstSeekType current_type = GST_SEEK_TYPE_SET, stop_type = GST_SEEK_TYPE_SET; struct parser_source *pin = impl_from_IMediaSeeking(iface); - struct wg_parser_stream *stream = pin->wg_stream; struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); - GstSeekFlags flags = 0; HRESULT hr = S_OK; int i; @@ -1256,20 +1249,8 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, SourceSeekingImpl_SetPositions(iface, current, current_flags, stop, stop_flags); - if (current_flags & AM_SEEKING_SeekToKeyFrame) - flags |= GST_SEEK_FLAG_KEY_UNIT; - if (current_flags & AM_SEEKING_Segment) - flags |= GST_SEEK_FLAG_SEGMENT; - if (!(current_flags & AM_SEEKING_NoFlush)) - flags |= GST_SEEK_FLAG_FLUSH; - - if ((current_flags & AM_SEEKING_PositioningBitsMask) == AM_SEEKING_NoPositioning) - current_type = GST_SEEK_TYPE_NONE; - if ((stop_flags & AM_SEEKING_PositioningBitsMask) == AM_SEEKING_NoPositioning) - stop_type = GST_SEEK_TYPE_NONE; - - if (!gst_pad_push_event(stream->my_sink, gst_event_new_seek(pin->seek.dRate, GST_FORMAT_TIME, flags, - current_type, pin->seek.llCurrent * 100, stop_type, pin->seek.llStop * 100))) + if (!unix_funcs->wg_parser_stream_seek(pin->wg_stream, pin->seek.dRate, + pin->seek.llCurrent, pin->seek.llStop, current_flags, stop_flags)) { ERR("Failed to seek (current %s, stop %s).\n", debugstr_time(pin->seek.llCurrent), debugstr_time(pin->seek.llStop)); diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 79fa45eadca..0738df150b2 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -391,6 +391,28 @@ static bool CDECL wg_parser_stream_get_event(struct wg_parser_stream *stream, st return true; } +static bool CDECL wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, + uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags) +{ + GstSeekType start_type = GST_SEEK_TYPE_SET, stop_type = GST_SEEK_TYPE_SET; + GstSeekFlags flags = 0; + + if (start_flags & AM_SEEKING_SeekToKeyFrame) + flags |= GST_SEEK_FLAG_KEY_UNIT; + if (start_flags & AM_SEEKING_Segment) + flags |= GST_SEEK_FLAG_SEGMENT; + if (!(start_flags & AM_SEEKING_NoFlush)) + flags |= GST_SEEK_FLAG_FLUSH; + + if ((start_flags & AM_SEEKING_PositioningBitsMask) == AM_SEEKING_NoPositioning) + start_type = GST_SEEK_TYPE_NONE; + if ((stop_flags & AM_SEEKING_PositioningBitsMask) == AM_SEEKING_NoPositioning) + stop_type = GST_SEEK_TYPE_NONE; + + return gst_pad_push_event(stream->my_sink, gst_event_new_seek(rate, + GST_FORMAT_TIME, flags, start_type, start_pos * 100, stop_type, stop_pos * 100)); +} + static void CDECL wg_parser_stream_notify_qos(struct wg_parser_stream *stream, bool underflow, double proportion, int64_t diff, uint64_t timestamp) { @@ -1565,6 +1587,8 @@ static const struct unix_funcs funcs = wg_parser_stream_get_event, wg_parser_stream_notify_qos, + + wg_parser_stream_seek, }; NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out)

1 0

Zebediah Figura : winegstreamer: Move videoflip configuration to wg_parser_stream_set_current_format().
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 5167b8c39af12d14b14f6dcab14cc97d82a1a4c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5167b8c39af12d14b14f6dca… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 16 19:28:27 2021 -0600 winegstreamer: Move videoflip configuration to wg_parser_stream_set_current_format(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 5 ----- dlls/winegstreamer/wg_parser.c | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1af34441984..f4573c75f86 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1430,7 +1430,6 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, IMemAllocator *allocator, ALLOCATOR_PROPERTIES *props) { struct parser_source *pin = impl_source_from_IPin(&iface->pin.IPin_iface); - struct wg_parser_stream *stream = pin->wg_stream; unsigned int buffer_size = 16384; ALLOCATOR_PROPERTIES ret_props; struct wg_format format; @@ -1440,10 +1439,6 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, { VIDEOINFOHEADER *format = (VIDEOINFOHEADER *)pin->pin.pin.mt.pbFormat; buffer_size = format->bmiHeader.biSizeImage; - - gst_util_set_object_arg(G_OBJECT(stream->flip), "method", - (format->bmiHeader.biCompression == BI_RGB - || format->bmiHeader.biCompression == BI_BITFIELDS) ? "vertical-flip" : "none"); } else if (IsEqualGUID(&pin->pin.pin.mt.formattype, &FORMAT_WaveFormatEx) && (IsEqualGUID(&pin->pin.pin.mt.subtype, &MEDIASUBTYPE_PCM) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 0738df150b2..8437dc1897d 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -358,6 +358,33 @@ static void CDECL wg_parser_stream_enable(struct wg_parser_stream *stream, const { stream->current_format = *format; stream->enabled = true; + + if (format->major_type == WG_MAJOR_TYPE_VIDEO) + { + switch (format->u.video.format) + { + case WG_VIDEO_FORMAT_BGRA: + case WG_VIDEO_FORMAT_BGRx: + case WG_VIDEO_FORMAT_BGR: + case WG_VIDEO_FORMAT_RGB15: + case WG_VIDEO_FORMAT_RGB16: + gst_util_set_object_arg(G_OBJECT(stream->flip), "method", "vertical-flip"); + break; + + case WG_VIDEO_FORMAT_AYUV: + case WG_VIDEO_FORMAT_I420: + case WG_VIDEO_FORMAT_NV12: + case WG_VIDEO_FORMAT_UYVY: + case WG_VIDEO_FORMAT_YUY2: + case WG_VIDEO_FORMAT_YV12: + case WG_VIDEO_FORMAT_YVYU: + case WG_VIDEO_FORMAT_UNKNOWN: + case WG_VIDEO_FORMAT_CINEPAK: + gst_util_set_object_arg(G_OBJECT(stream->flip), "method", "none"); + break; + } + } + gst_pad_push_event(stream->my_sink, gst_event_new_reconfigure()); }

1 0

Zebediah Figura : winegstreamer: Use wg_parser_stream_seek() in GST_ChangeRate().
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: e103c75ab3d1f6b3a21908003b011f03e1b4862e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e103c75ab3d1f6b3a2190800… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 16 19:28:28 2021 -0600 winegstreamer: Use wg_parser_stream_seek() in GST_ChangeRate(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index f4573c75f86..cc55b4fa60a 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1178,12 +1178,11 @@ static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface) static HRESULT WINAPI GST_ChangeRate(IMediaSeeking *iface) { - struct parser_source *This = impl_from_IMediaSeeking(iface); - struct wg_parser_stream *stream = This->wg_stream; - GstEvent *ev = gst_event_new_seek(This->seek.dRate, GST_FORMAT_TIME, 0, GST_SEEK_TYPE_NONE, -1, GST_SEEK_TYPE_NONE, -1); - TRACE("(%p) New rate %g\n", This, This->seek.dRate); + struct parser_source *pin = impl_from_IMediaSeeking(iface); + mark_wine_thread(); - gst_pad_push_event(stream->my_sink, ev); + unix_funcs->wg_parser_stream_seek(pin->wg_stream, pin->seek.dRate, 0, 0, + AM_SEEKING_NoPositioning, AM_SEEKING_NoPositioning); return S_OK; }

1 0

Zebediah Figura : winegstreamer: Map the output sample buffer in the Unix library.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: e848a00d26c6c4c4fdfe47cac93e3d3736e6137a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e848a00d26c6c4c4fdfe47ca… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 16 19:28:29 2021 -0600 winegstreamer: Map the output sample buffer in the Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 13 +++++- dlls/winegstreamer/gstdemux.c | 89 ++++++++++++++++++++----------------- dlls/winegstreamer/wg_parser.c | 94 ++++++++++++++++++++++++++++++++-------- 3 files changed, 138 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e848a00d26c6c4c4fdfe…

1 0

Zebediah Figura : winegstreamer: Avoid using gst_util_uint64_scale() in send_sample().
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 1babfe7d49175260b1aeee8c3607f1e63e7a1e1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1babfe7d49175260b1aeee8c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 16 19:28:30 2021 -0600 winegstreamer: Avoid using gst_util_uint64_scale() in send_sample(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 51 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index c256d963273..2a7383111b1 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -566,6 +566,53 @@ static bool amt_to_wg_format(const AM_MEDIA_TYPE *mt, struct wg_format *format) return false; } +/* + * scale_uint64() is based on gst_util_scale_int() from GStreamer, which is + * covered by the following license: + * + * GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega(a)cse.ogi.edu> + * 2000 Wim Taymans <wtay(a)chello.be> + * 2002 Thomas Vander Stichele <thomas(a)apestaart.org> + * 2004 Wim Taymans <wim(a)fluendo.com> + * 2015 Jan Schmidt <jan(a)centricular.com> + * + * gstutils.c: Utility functions + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ +static uint64_t scale_uint64(uint64_t value, uint32_t numerator, uint32_t denominator) +{ + ULARGE_INTEGER i, high, low; + + if (!value) + return 0; + + i.QuadPart = value; + low.QuadPart = i.u.LowPart * numerator; + high.QuadPart = i.u.HighPart * numerator + low.u.HighPart; + low.u.HighPart = 0; + + if (high.u.HighPart >= denominator) + return ULLONG_MAX; + + low.QuadPart += (high.QuadPart % denominator) << 32; + return ((high.QuadPart / denominator) << 32) + (low.QuadPart / denominator); +} + /* Fill and send a single IMediaSample. */ static HRESULT send_sample(struct parser_source *pin, IMediaSample *sample, const struct wg_parser_event *event, uint32_t offset, uint32_t size, DWORD bytes_per_second) @@ -594,7 +641,7 @@ static HRESULT send_sample(struct parser_source *pin, IMediaSample *sample, REFERENCE_TIME start_pts = event->u.buffer.pts; if (offset) - start_pts += gst_util_uint64_scale(offset, 10000000, bytes_per_second); + start_pts += scale_uint64(offset, 10000000, bytes_per_second); start_pts -= pin->seek.llCurrent; start_pts *= pin->seek.dRate; @@ -603,7 +650,7 @@ static HRESULT send_sample(struct parser_source *pin, IMediaSample *sample, REFERENCE_TIME end_pts = event->u.buffer.pts + event->u.buffer.duration; if (offset + size < event->u.buffer.size) - end_pts = event->u.buffer.pts + gst_util_uint64_scale(offset + size, 10000000, bytes_per_second); + end_pts = event->u.buffer.pts + scale_uint64(offset + size, 10000000, bytes_per_second); end_pts -= pin->seek.llCurrent; end_pts *= pin->seek.dRate;

1 0

Zebediah Figura : winegstreamer: Retrieve and complete read requests through Unix library functions.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 86333a20c87d35825da30f9208777f3b556ee7fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=86333a20c87d35825da30f92… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 16 19:28:31 2021 -0600 winegstreamer: Retrieve and complete read requests through Unix library functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 4 ++++ dlls/winegstreamer/gstdemux.c | 21 +++++++-------------- dlls/winegstreamer/wg_parser.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 14 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 068cb47adc2..33c87f2c1ec 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -226,6 +226,10 @@ struct unix_funcs void (CDECL *wg_parser_begin_flush)(struct wg_parser *parser); void (CDECL *wg_parser_end_flush)(struct wg_parser *parser); + bool (CDECL *wg_parser_get_read_request)(struct wg_parser *parser, + GstBuffer **buffer, uint64_t *offset, uint32_t *size); + void (CDECL *wg_parser_complete_read_request)(struct wg_parser *parser, GstFlowReturn ret); + uint32_t (CDECL *wg_parser_get_stream_count)(struct wg_parser *parser); struct wg_parser_stream *(CDECL *wg_parser_get_stream)(struct wg_parser *parser, uint32_t index); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2a7383111b1..4e476c78e9e 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -822,29 +822,22 @@ static GstFlowReturn read_buffer(struct parser *This, guint64 ofs, guint len, Gs static DWORD CALLBACK read_thread(void *arg) { struct parser *filter = arg; - struct wg_parser *parser = filter->wg_parser; TRACE("Starting read thread for filter %p.\n", filter); - pthread_mutex_lock(&parser->mutex); - while (filter->sink_connected) { - while (parser->sink_connected && !parser->read_request.buffer) - pthread_cond_wait(&parser->read_cond, &parser->mutex); + GstBuffer *buffer; + uint64_t offset; + uint32_t size; - if (!parser->sink_connected) - break; + if (!unix_funcs->wg_parser_get_read_request(filter->wg_parser, &buffer, &offset, &size)) + continue; - parser->read_request.done = true; - parser->read_request.ret = read_buffer(filter, parser->read_request.offset, - parser->read_request.size, parser->read_request.buffer); - parser->read_request.buffer = NULL; - pthread_cond_signal(&parser->read_done_cond); + unix_funcs->wg_parser_complete_read_request(filter->wg_parser, + read_buffer(filter, offset, size, buffer)); } - pthread_mutex_unlock(&parser->mutex); - TRACE("Streaming stopped; exiting.\n"); return 0; } diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index de066f83881..96c6fc1e715 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -349,6 +349,38 @@ static void CDECL wg_parser_end_flush(struct wg_parser *parser) pthread_mutex_unlock(&parser->mutex); } +static bool CDECL wg_parser_get_read_request(struct wg_parser *parser, + GstBuffer **buffer, uint64_t *offset, uint32_t *size) +{ + pthread_mutex_lock(&parser->mutex); + + while (parser->sink_connected && !parser->read_request.buffer) + pthread_cond_wait(&parser->read_cond, &parser->mutex); + + if (!parser->sink_connected) + { + pthread_mutex_unlock(&parser->mutex); + return false; + } + + *buffer = parser->read_request.buffer; + *offset = parser->read_request.offset; + *size = parser->read_request.size; + + pthread_mutex_unlock(&parser->mutex); + return true; +} + +static void CDECL wg_parser_complete_read_request(struct wg_parser *parser, GstFlowReturn ret) +{ + pthread_mutex_lock(&parser->mutex); + parser->read_request.done = true; + parser->read_request.ret = ret; + parser->read_request.buffer = NULL; + pthread_mutex_unlock(&parser->mutex); + pthread_cond_signal(&parser->read_done_cond); +} + static void CDECL wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, struct wg_format *format) { *format = stream->preferred_format; @@ -1663,6 +1695,9 @@ static const struct unix_funcs funcs = wg_parser_begin_flush, wg_parser_end_flush, + wg_parser_get_read_request, + wg_parser_complete_read_request, + wg_parser_get_stream_count, wg_parser_get_stream,

1 0

Erich E. Hoover : kernelbase: Reimplement GetVolumeInformation on top of GetVolumeInformationByHandle.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 50903a15046354e405564aff6430ee505c01100a URL: https://source.winehq.org/git/wine.git/?a=commit;h=50903a15046354e405564aff… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri May 15 22:07:10 2020 -0600 kernelbase: Reimplement GetVolumeInformation on top of GetVolumeInformationByHandle. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 39 +++ dlls/kernelbase/volume.c | 584 +------------------------------------------ 2 files changed, 45 insertions(+), 578 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=50903a15046354e40556…

1 0

Jacek Caban : ntdll: Store entire XMM context in x86_64 syscall frame.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 8f50dde9cd3f4ea7856106f5b1691827d4cf8713 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f50dde9cd3f4ea7856106f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 21:57:42 2021 +0100 ntdll: Store entire XMM context in x86_64 syscall frame. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 58 ++++++++++++++++++----------------------- tools/winebuild/import.c | 18 ++++--------- 2 files changed, 30 insertions(+), 46 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 12e40853397..5da1a467b71 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -266,10 +266,15 @@ struct apc_stack_layout C_ASSERT( offsetof(struct apc_stack_layout, context) == 0x30 ); C_ASSERT( sizeof(struct apc_stack_layout) == 0x510 ); +struct syscall_xsave +{ + XMM_SAVE_AREA32 xsave; +}; + +C_ASSERT( sizeof(struct syscall_xsave) == 0x200 ); + struct syscall_frame { - ULONG64 xmm[10 * 2]; /* xmm6-xmm15 */ - ULONG64 mxcsr; ULONG64 r12; ULONG64 r13; ULONG64 r14; @@ -283,7 +288,7 @@ struct syscall_frame }; /* Should match the offset in call_user_apc_dispatcher(). */ -C_ASSERT( offsetof( struct syscall_frame, ret_addr ) == 0xf0); +C_ASSERT( offsetof( struct syscall_frame, ret_addr ) == 0x48); struct amd64_thread_data { @@ -316,6 +321,11 @@ void set_syscall_frame(void *frame) amd64_thread_data()->syscall_frame = frame; } +static struct syscall_xsave *get_syscall_xsave( struct syscall_frame *frame ) +{ + return (struct syscall_xsave *)((ULONG_PTR)((struct syscall_xsave *)frame - 1) & ~63); +} + /*********************************************************************** * Definitions for Dwarf unwind tables */ @@ -1935,10 +1945,8 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) } if (needed_flags & CONTEXT_FLOATING_POINT) { - __asm__( "fxsave %0" : "=m" (context->u.FltSave) ); - context->MxCsr = frame->mxcsr; - memset( &context->u.s.Xmm0, 0, 6 * sizeof(context->u.s.Xmm0) ); - memcpy( &context->u.s.Xmm6, frame->xmm, 10 * sizeof(context->u.s.Xmm0) ); + context->u.FltSave = get_syscall_xsave(frame)->xsave; + context->MxCsr = context->u.FltSave.MxCsr; context->ContextFlags |= CONTEXT_FLOATING_POINT; } /* update the cached version of the debug registers */ @@ -2079,7 +2087,7 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "movq 0x98(%rcx),%rdx\n\t" /* context->Rsp */ "jmp 2f\n\t" "1:\tmovq 0x328(%rbx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ - "leaq 0xf0(%rax),%rdx\n\t" /* &amd64_thread_data()->syscall_frame->ret_addr */ + "leaq 0x48(%rax),%rdx\n\t" /* &amd64_thread_data()->syscall_frame->ret_addr */ "2:\tsubq $0x510,%rdx\n\t" /* sizeof(struct apc_stack_layout) */ "andq $~0xf,%rdx\n\t" "addq $8,%rsp\n\t" /* pop return address */ @@ -2124,27 +2132,15 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, __ASM_GLOBAL_FUNC( call_raise_user_exception_dispatcher, "movq %gs:0x30,%rdx\n\t" "movq 0x328(%rdx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ - "movdqu 0x0(%rax),%xmm6\n\t" /* frame->xmm[0..19] */ - "movdqu 0x10(%rax),%xmm7\n\t" - "movdqu 0x20(%rax),%xmm8\n\t" - "movdqu 0x30(%rax),%xmm9\n\t" - "movdqu 0x40(%rax),%xmm10\n\t" - "movdqu 0x50(%rax),%xmm11\n\t" - "movdqu 0x60(%rax),%xmm12\n\t" - "movdqu 0x70(%rax),%xmm13\n\t" - "movdqu 0x80(%rax),%xmm14\n\t" - "movdqu 0x90(%rax),%xmm15\n\t" - "ldmxcsr 0xa0(%rax)\n\t" /* frame->mxcsr */ - "movq 0xa8(%rax),%r12\n\t" /* frame->r12 */ - "movq 0xb0(%rax),%r13\n\t" /* frame->r13 */ - "movq 0xb8(%rax),%r14\n\t" /* frame->r14 */ - "movq 0xc0(%rax),%r15\n\t" /* frame->r15 */ - "movq 0xc8(%rax),%rdi\n\t" /* frame->rdi */ - "movq 0xd0(%rax),%rsi\n\t" /* frame->rsi */ - "movq 0xd8(%rax),%rbx\n\t" /* frame->rbx */ - "movq 0xe0(%rax),%rbp\n\t" /* frame->rbp */ + "leaq -0x200(%rax),%r8\n\t" + "andq $~63,%r8\n\t" + "fxrstor64 (%r8)\n\t" + "movq 0x20(%rax),%rdi\n\t" /* frame->rdi */ + "movq 0x28(%rax),%rsi\n\t" /* frame->rsi */ + "movq 0x30(%rax),%rbx\n\t" /* frame->rbx */ + "movq 0x38(%rax),%rbp\n\t" /* frame->rbp */ "movq $0,0x328(%rdx)\n\t" - "leaq 0xf0(%rax),%rsp\n\t" + "leaq 0x48(%rax),%rsp\n\t" "jmpq *%rcx" ) @@ -2398,11 +2394,7 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, R15_sig(sigcontext) = frame->r15; RSP_sig(sigcontext) = (ULONG_PTR)&frame->ret_addr; RIP_sig(sigcontext) = frame->thunk_addr; - if (fpu) - { - fpu->MxCsr =frame->mxcsr; - memcpy( fpu->XmmRegisters + 6, frame->xmm, sizeof(frame->xmm) ); - } + if (fpu) *fpu = get_syscall_xsave( frame )->xsave; amd64_thread_data()->syscall_frame = NULL; } return TRUE; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index bc2d8497a47..fda1fe90541 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1508,19 +1508,9 @@ void output_syscalls( DLLSPEC *spec ) output_cfi( ".cfi_rel_offset %%rbp,0" ); output( "\tmovq %%rsp,%%rbp\n" ); output_cfi( ".cfi_def_cfa_register %%rbp" ); - output( "\tleaq -0xe0(%%rbp),%%rsp\n" ); + output( "\tleaq -0x238(%%rbp),%%rsp\n" ); + output( "\tandq $~63,%%rsp\n" ); output( "\tmovq %%gs:0x30,%%rcx\n" ); - output( "\tmovdqu %%xmm6,-0xe0(%%rbp)\n" ); - output( "\tmovdqu %%xmm7,-0xd0(%%rbp)\n" ); - output( "\tmovdqu %%xmm8,-0xc0(%%rbp)\n" ); - output( "\tmovdqu %%xmm9,-0xb0(%%rbp)\n" ); - output( "\tmovdqu %%xmm10,-0xa0(%%rbp)\n" ); - output( "\tmovdqu %%xmm11,-0x90(%%rbp)\n" ); - output( "\tmovdqu %%xmm12,-0x80(%%rbp)\n" ); - output( "\tmovdqu %%xmm13,-0x70(%%rbp)\n" ); - output( "\tmovdqu %%xmm14,-0x60(%%rbp)\n" ); - output( "\tmovdqu %%xmm15,-0x50(%%rbp)\n" ); - output( "\tstmxcsr -0x40(%%rbp)\n" ); output( "\tmovq %%r12,-0x38(%%rbp)\n" ); output( "\tmovq %%r13,-0x30(%%rbp)\n" ); output( "\tmovq %%r14,-0x28(%%rbp)\n" ); @@ -1531,10 +1521,12 @@ void output_syscalls( DLLSPEC *spec ) output_cfi( ".cfi_rel_offset %%rsi,-16" ); output( "\tmovq %%rbx,-0x08(%%rbp)\n" ); output_cfi( ".cfi_rel_offset %%rbx,-8" ); + output( "\tfxsave64 (%%rsp)\n" ); /* Legends of Runeterra hooks the first system call return instruction, and * depends on us returning to it. Adjust the return address accordingly. */ output( "\tsubq $0xb,0x8(%%rbp)\n" ); - output( "\tmovq %%rsp,0x328(%%rcx)\n" ); /* amd64_thread_data()->syscall_frame */ + output( "\tleaq -0x38(%%rbp),%%rbx\n" ); + output( "\tmovq %%rbx,0x328(%%rcx)\n" ); /* amd64_thread_data()->syscall_frame */ output( "\tcmpq $%u,%%rax\n", count ); output( "\tjae 4f\n" ); output( "\tleaq .Lsyscall_args(%%rip),%%rcx\n" );

1 0