February 2021 - Wine-commits

Austin English : ntoskrnl.exe: Add KdDisableDebugger/KdEnableDebugger stubs.
by Alexandre Julliard 02 Feb '21

02 Feb '21

Module: wine Branch: master Commit: e8cb99466b053e4fb2c720cb56bf7ba1d4e4a4d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8cb99466b053e4fb2c720cb… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 1 15:25:41 2021 -0600 ntoskrnl.exe: Add KdDisableDebugger/KdEnableDebugger stubs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50599 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2e6131c32c7..9dc5809614a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4256,6 +4256,18 @@ void WINAPI KeUnstackDetachProcess(KAPC_STATE *apc_state) FIXME("apc_state %p stub.\n", apc_state); } +NTSTATUS WINAPI KdDisableDebugger(void) +{ + FIXME(": stub.\n"); + return STATUS_DEBUGGER_INACTIVE; +} + +NTSTATUS WINAPI KdEnableDebugger(void) +{ + FIXME(": stub.\n"); + return STATUS_DEBUGGER_INACTIVE; +} + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d57a2f81df6..22968913300 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -515,8 +515,8 @@ @ stub IoWriteTransferCount @ extern KdDebuggerEnabled @ stub KdDebuggerNotPresent -@ stub KdDisableDebugger -@ stub KdEnableDebugger +@ stdcall KdDisableDebugger() +@ stdcall KdEnableDebugger() @ stub KdEnteredDebugger @ stub KdPollBreakIn @ stub KdPowerTransition

1 0

Zebediah Figura : winegstreamer: Move the "push_thread" field to struct wg_parser.
by Alexandre Julliard 02 Feb '21

02 Feb '21

Module: wine Branch: master Commit: 8a15c811ba8aac2e28e60a15d02f73001bf0f5de URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a15c811ba8aac2e28e60a15… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 1 18:36:56 2021 -0600 winegstreamer: Move the "push_thread" field to struct wg_parser. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 734984d7fed..21d6e324add 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -53,6 +53,8 @@ struct wg_parser GstPad *my_src, *their_sink; guint64 file_size, start_offset, next_offset, stop_offset; + + pthread_t push_thread; }; struct parser @@ -82,8 +84,6 @@ struct parser pthread_cond_t init_cond; bool no_more_pads, has_duration, error; - pthread_t push_thread; - HANDLE read_thread; pthread_cond_t read_cond, read_done_cond; struct @@ -635,7 +635,7 @@ static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) gboolean flush; guint32 seqnum; GstEvent *tevent; - BOOL thread = !!This->push_thread; + BOOL thread = !!parser->push_thread; gst_event_parse_seek(event, &rate, &seek_format, &flags, &cur_type, &cur, &stop_type, &stop); @@ -1436,19 +1436,19 @@ static gboolean activate_push(GstPad *pad, gboolean activate) struct wg_parser *parser = This->wg_parser; if (!activate) { - if (This->push_thread) { - pthread_join(This->push_thread, NULL); - This->push_thread = 0; + if (parser->push_thread) { + pthread_join(parser->push_thread, NULL); + parser->push_thread = 0; } if (This->filter.state == State_Stopped) parser->next_offset = parser->start_offset; - } else if (!This->push_thread) { + } else if (!parser->push_thread) { int ret; - if ((ret = pthread_create(&This->push_thread, NULL, push_data, This))) + if ((ret = pthread_create(&parser->push_thread, NULL, push_data, This))) { GST_ERROR("Failed to create push thread: %s", strerror(errno)); - This->push_thread = 0; + parser->push_thread = 0; return FALSE; } }

1 0

Zebediah Figura : winegstreamer: Move the playback initialization fields to struct wg_parser.
by Alexandre Julliard 02 Feb '21

02 Feb '21

Module: wine Branch: master Commit: eb37e5ba6b61dbf8de4341985b0a883524df3981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb37e5ba6b61dbf8de434198… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 1 18:36:57 2021 -0600 winegstreamer: Move the playback initialization fields to struct wg_parser. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 58 ++++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 21d6e324add..2c838643554 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -55,6 +55,9 @@ struct wg_parser guint64 file_size, start_offset, next_offset, stop_offset; pthread_t push_thread; + + pthread_cond_t init_cond; + bool no_more_pads, has_duration, error; }; struct parser @@ -81,8 +84,6 @@ struct parser uint64_t next_pull_offset; pthread_mutex_t mutex; - pthread_cond_t init_cond; - bool no_more_pads, has_duration, error; HANDLE read_thread; pthread_cond_t read_cond, read_done_cond; @@ -730,6 +731,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) { struct parser_source *pin = gst_pad_get_element_private(pad); struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); + struct wg_parser *parser = filter->wg_parser; GST_LOG("pin %p, type \"%s\".", pin, GST_EVENT_TYPE_NAME(event)); @@ -772,7 +774,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) pthread_mutex_lock(&filter->mutex); pin->eos = true; pthread_mutex_unlock(&filter->mutex); - pthread_cond_signal(&filter->init_cond); + pthread_cond_signal(&parser->init_cond); } break; @@ -819,7 +821,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) pthread_mutex_lock(&filter->mutex); gst_caps_replace(&pin->caps, caps); pthread_mutex_unlock(&filter->mutex); - pthread_cond_signal(&filter->init_cond); + pthread_cond_signal(&parser->init_cond); break; } @@ -1476,13 +1478,14 @@ static gboolean activate_mode(GstPad *pad, GstObject *parent, GstPadMode mode, g static void no_more_pads(GstElement *decodebin, gpointer user) { struct parser *filter = user; + struct wg_parser *parser = filter->wg_parser; GST_DEBUG("filter %p.", filter); pthread_mutex_lock(&filter->mutex); - filter->no_more_pads = true; + parser->no_more_pads = true; pthread_mutex_unlock(&filter->mutex); - pthread_cond_signal(&filter->init_cond); + pthread_cond_signal(&parser->init_cond); } static GstAutoplugSelectResult autoplug_blacklist(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) @@ -1507,6 +1510,7 @@ static GstAutoplugSelectResult autoplug_blacklist(GstElement *bin, GstPad *pad, static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) { struct parser *filter = data; + struct wg_parser *parser = filter->wg_parser; GError *err = NULL; gchar *dbg_info = NULL; @@ -1521,9 +1525,9 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) g_error_free(err); g_free(dbg_info); pthread_mutex_lock(&filter->mutex); - filter->error = true; + parser->error = true; pthread_mutex_unlock(&filter->mutex); - pthread_cond_signal(&filter->init_cond); + pthread_cond_signal(&parser->init_cond); break; case GST_MESSAGE_WARNING: @@ -1536,9 +1540,9 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) case GST_MESSAGE_DURATION_CHANGED: pthread_mutex_lock(&filter->mutex); - filter->has_duration = true; + parser->has_duration = true; pthread_mutex_unlock(&filter->mutex); - pthread_cond_signal(&filter->init_cond); + pthread_cond_signal(&parser->init_cond); break; default: @@ -1616,9 +1620,9 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) pin->seek.llDuration = pin->seek.llStop = query_duration(pin->their_src); pin->seek.llCurrent = 0; - while (!pin->caps && !This->error) - pthread_cond_wait(&This->init_cond, &This->mutex); - if (This->error) + while (!pin->caps && !parser->error) + pthread_cond_wait(&parser->init_cond, &This->mutex); + if (parser->error) { pthread_mutex_unlock(&This->mutex); return E_FAIL; @@ -1666,6 +1670,8 @@ static void wg_parser_destroy(struct wg_parser *parser) gst_object_unref(parser->bus); } + pthread_cond_destroy(&parser->init_cond); + free(parser); } @@ -1691,7 +1697,6 @@ static void parser_destroy(struct strmbase_filter *iface) pthread_cond_destroy(&filter->read_cond); pthread_cond_destroy(&filter->read_done_cond); - pthread_cond_destroy(&filter->init_cond); pthread_mutex_destroy(&filter->mutex); strmbase_sink_cleanup(&filter->sink); @@ -1867,7 +1872,7 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) parser->their_sink = gst_element_get_static_pad(element, "sink"); pthread_mutex_lock(&filter->mutex); - filter->no_more_pads = filter->error = false; + parser->no_more_pads = parser->error = false; pthread_mutex_unlock(&filter->mutex); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) @@ -1885,9 +1890,9 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) } pthread_mutex_lock(&filter->mutex); - while (!filter->no_more_pads && !filter->error) - pthread_cond_wait(&filter->init_cond, &filter->mutex); - if (filter->error) + while (!parser->no_more_pads && !parser->error) + pthread_cond_wait(&parser->init_cond, &filter->mutex); + if (parser->error) { pthread_mutex_unlock(&filter->mutex); return FALSE; @@ -1989,7 +1994,6 @@ static BOOL parser_init_gstreamer(void) static void parser_init_common(struct parser *object) { pthread_mutex_init(&object->mutex, NULL); - pthread_cond_init(&object->init_cond, NULL); pthread_cond_init(&object->read_cond, NULL); pthread_cond_init(&object->read_done_cond, NULL); object->flushing = true; @@ -2002,6 +2006,8 @@ static struct wg_parser *wg_parser_create(void) if (!(parser = calloc(1, sizeof(*parser)))) return NULL; + pthread_cond_init(&parser->init_cond, NULL); + TRACE("Created winegstreamer parser %p.\n", parser); return parser; } @@ -2736,7 +2742,7 @@ static BOOL avi_splitter_init_gst(struct parser *filter) parser->their_sink = gst_element_get_static_pad(element, "sink"); pthread_mutex_lock(&filter->mutex); - filter->no_more_pads = filter->error = false; + parser->no_more_pads = parser->error = false; pthread_mutex_unlock(&filter->mutex); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) @@ -2754,9 +2760,9 @@ static BOOL avi_splitter_init_gst(struct parser *filter) } pthread_mutex_lock(&filter->mutex); - while (!filter->no_more_pads && !filter->error) - pthread_cond_wait(&filter->init_cond, &filter->mutex); - if (filter->error) + while (!parser->no_more_pads && !parser->error) + pthread_cond_wait(&parser->init_cond, &filter->mutex); + if (parser->error) { pthread_mutex_unlock(&filter->mutex); return FALSE; @@ -2882,9 +2888,9 @@ static BOOL mpeg_splitter_init_gst(struct parser *filter) } pthread_mutex_lock(&filter->mutex); - while (!filter->has_duration && !filter->error && !pin->eos) - pthread_cond_wait(&filter->init_cond, &filter->mutex); - if (filter->error) + while (!parser->has_duration && !parser->error && !pin->eos) + pthread_cond_wait(&parser->init_cond, &filter->mutex); + if (parser->error) { pthread_mutex_unlock(&filter->mutex); return FALSE;

1 0

Zebediah Figura : winegstreamer: Move the read request fields to struct wg_parser.
by Alexandre Julliard 02 Feb '21

02 Feb '21

Module: wine Branch: master Commit: 6e5af4fc7d035de2bb09402103f4923d305589c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e5af4fc7d035de2bb094021… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 1 18:36:58 2021 -0600 winegstreamer: Move the read request fields to struct wg_parser. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 63 ++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2c838643554..ea5d84e4105 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -58,6 +58,16 @@ struct wg_parser pthread_cond_t init_cond; bool no_more_pads, has_duration, error; + + pthread_cond_t read_cond, read_done_cond; + struct + { + GstBuffer *buffer; + uint64_t offset; + uint32_t size; + bool done; + GstFlowReturn ret; + } read_request; }; struct parser @@ -86,15 +96,6 @@ struct parser pthread_mutex_t mutex; HANDLE read_thread; - pthread_cond_t read_cond, read_done_cond; - struct - { - GstBuffer *buffer; - uint64_t offset; - uint32_t size; - bool done; - GstFlowReturn ret; - } read_request; BOOL (*init_gst)(struct parser *filter); HRESULT (*source_query_accept)(struct parser_source *pin, const AM_MEDIA_TYPE *mt); @@ -1108,6 +1109,7 @@ static DWORD CALLBACK stream_thread(void *arg) static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 offset, guint size, GstBuffer **buffer) { struct parser *filter = gst_pad_get_element_private(pad); + struct wg_parser *parser = filter->wg_parser; GstBuffer *new_buffer = NULL; GstFlowReturn ret; @@ -1118,21 +1120,21 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 pthread_mutex_lock(&filter->mutex); - assert(!filter->read_request.buffer); - filter->read_request.buffer = *buffer; - filter->read_request.offset = offset; - filter->read_request.size = size; - filter->read_request.done = false; - pthread_cond_signal(&filter->read_cond); + assert(!parser->read_request.buffer); + parser->read_request.buffer = *buffer; + parser->read_request.offset = offset; + parser->read_request.size = size; + parser->read_request.done = false; + pthread_cond_signal(&parser->read_cond); /* Note that we don't unblock this wait on GST_EVENT_FLUSH_START. We expect * the upstream pin to flush if necessary. We should never be blocked on * read_thread() not running. */ - while (!filter->read_request.done) - pthread_cond_wait(&filter->read_done_cond, &filter->mutex); + while (!parser->read_request.done) + pthread_cond_wait(&parser->read_done_cond, &filter->mutex); - ret = filter->read_request.ret; + ret = parser->read_request.ret; pthread_mutex_unlock(&filter->mutex); @@ -1177,6 +1179,7 @@ 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); @@ -1184,17 +1187,17 @@ static DWORD CALLBACK read_thread(void *arg) for (;;) { - while (filter->sink_connected && !filter->read_request.buffer) - pthread_cond_wait(&filter->read_cond, &filter->mutex); + while (filter->sink_connected && !parser->read_request.buffer) + pthread_cond_wait(&parser->read_cond, &filter->mutex); if (!filter->sink_connected) break; - filter->read_request.done = true; - filter->read_request.ret = read_buffer(filter, filter->read_request.offset, - filter->read_request.size, filter->read_request.buffer); - filter->read_request.buffer = NULL; - pthread_cond_signal(&filter->read_done_cond); + 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); } pthread_mutex_unlock(&filter->mutex); @@ -1671,6 +1674,8 @@ static void wg_parser_destroy(struct wg_parser *parser) } pthread_cond_destroy(&parser->init_cond); + pthread_cond_destroy(&parser->read_cond); + pthread_cond_destroy(&parser->read_done_cond); free(parser); } @@ -1695,8 +1700,6 @@ static void parser_destroy(struct strmbase_filter *iface) wg_parser_destroy(filter->wg_parser); - pthread_cond_destroy(&filter->read_cond); - pthread_cond_destroy(&filter->read_done_cond); pthread_mutex_destroy(&filter->mutex); strmbase_sink_cleanup(&filter->sink); @@ -1994,8 +1997,6 @@ static BOOL parser_init_gstreamer(void) static void parser_init_common(struct parser *object) { pthread_mutex_init(&object->mutex, NULL); - pthread_cond_init(&object->read_cond, NULL); - pthread_cond_init(&object->read_done_cond, NULL); object->flushing = true; } @@ -2007,6 +2008,8 @@ static struct wg_parser *wg_parser_create(void) return NULL; pthread_cond_init(&parser->init_cond, NULL); + pthread_cond_init(&parser->read_cond, NULL); + pthread_cond_init(&parser->read_done_cond, NULL); TRACE("Created winegstreamer parser %p.\n", parser); return parser; @@ -2537,7 +2540,7 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) pthread_mutex_lock(&This->mutex); This->sink_connected = false; pthread_mutex_unlock(&This->mutex); - pthread_cond_signal(&This->read_cond); + pthread_cond_signal(&parser->read_cond); WaitForSingleObject(This->read_thread, INFINITE); CloseHandle(This->read_thread);

1 0

Zebediah Figura : winegstreamer: Move the "flushing" field to struct wg_parser.
by Alexandre Julliard 02 Feb '21

02 Feb '21

Module: wine Branch: master Commit: 5736cb23ac7aa5b84bedc4145516787a1611f20e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5736cb23ac7aa5b84bedc414… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 1 18:36:59 2021 -0600 winegstreamer: Move the "flushing" field to struct wg_parser. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index ea5d84e4105..ab7efc24018 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -68,6 +68,8 @@ struct wg_parser bool done; GstFlowReturn ret; } read_request; + + bool flushing; }; struct parser @@ -89,7 +91,7 @@ struct parser /* FIXME: It would be nice to avoid duplicating these with strmbase. * However, synchronization is tricky; we need access to be protected by a * separate lock. */ - bool streaming, flushing, sink_connected; + bool streaming, sink_connected; uint64_t next_pull_offset; @@ -1037,13 +1039,14 @@ static void send_buffer(struct parser_source *pin, GstBuffer *buf) static bool get_stream_event(struct parser_source *pin, struct parser_event *event) { struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); + struct wg_parser *parser = filter->wg_parser; pthread_mutex_lock(&filter->mutex); - while (!filter->flushing && pin->event.type == PARSER_EVENT_NONE) + while (!parser->flushing && pin->event.type == PARSER_EVENT_NONE) pthread_cond_wait(&pin->event_cond, &filter->mutex); - if (filter->flushing) + if (parser->flushing) { pthread_mutex_unlock(&filter->mutex); TRACE("Filter is flushing.\n"); @@ -1720,7 +1723,7 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) filter->streaming = true; pthread_mutex_lock(&filter->mutex); - filter->flushing = false; + parser->flushing = false; pthread_mutex_unlock(&filter->mutex); /* DirectShow retains the old seek positions, but resets to them every time @@ -1761,7 +1764,7 @@ static HRESULT parser_cleanup_stream(struct strmbase_filter *iface) filter->streaming = false; pthread_mutex_lock(&filter->mutex); - filter->flushing = true; + parser->flushing = true; pthread_mutex_unlock(&filter->mutex); for (i = 0; i < filter->source_count; ++i) @@ -1997,7 +2000,6 @@ static BOOL parser_init_gstreamer(void) static void parser_init_common(struct parser *object) { pthread_mutex_init(&object->mutex, NULL); - object->flushing = true; } static struct wg_parser *wg_parser_create(void) @@ -2010,6 +2012,7 @@ static struct wg_parser *wg_parser_create(void) pthread_cond_init(&parser->init_cond, NULL); pthread_cond_init(&parser->read_cond, NULL); pthread_cond_init(&parser->read_done_cond, NULL); + parser->flushing = true; TRACE("Created winegstreamer parser %p.\n", parser); return parser; @@ -2149,6 +2152,7 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, GstSeekType current_type = GST_SEEK_TYPE_SET, stop_type = GST_SEEK_TYPE_SET; struct parser_source *pin = impl_from_IMediaSeeking(iface); struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); + struct wg_parser *parser = filter->wg_parser; GstSeekFlags flags = 0; HRESULT hr = S_OK; int i; @@ -2168,7 +2172,7 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, if (!(current_flags & AM_SEEKING_NoFlush)) { pthread_mutex_lock(&filter->mutex); - filter->flushing = true; + parser->flushing = true; pthread_mutex_unlock(&filter->mutex); for (i = 0; i < filter->source_count; ++i) @@ -2217,7 +2221,7 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, if (!(current_flags & AM_SEEKING_NoFlush)) { pthread_mutex_lock(&filter->mutex); - filter->flushing = false; + parser->flushing = false; pthread_mutex_unlock(&filter->mutex); for (i = 0; i < filter->source_count; ++i)

1 0

Zebediah Figura : vkd3d-shader: Move instruction allocation functions to hlsl.c.
by Alexandre Julliard 02 Feb '21

02 Feb '21

Module: vkd3d Branch: master Commit: 9b2e8fb1dbb318832f6c5225f63e0069daaaee20 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9b2e8fb1dbb318832f6c522… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jan 30 13:51:32 2021 -0600 vkd3d-shader: Move instruction allocation functions to hlsl.c. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 205 +++++++++++++++++++++++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl.h | 22 ++++- libs/vkd3d-shader/hlsl.y | 205 ----------------------------------------------- 3 files changed, 224 insertions(+), 208 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=9b2e8fb1dbb318832f6…

1 0

Zebediah Figura : vkd3d-shader: Move add_assignment() to hlsl.y.
by Alexandre Julliard 02 Feb '21

02 Feb '21

Module: vkd3d Branch: master Commit: 60cde237c55ada90ae42eb350477a567e163b544 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=60cde237c55ada90ae42eb3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jan 30 13:51:33 2021 -0600 vkd3d-shader: Move add_assignment() to hlsl.y. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 141 ----------------------------------------------- libs/vkd3d-shader/hlsl.h | 2 - libs/vkd3d-shader/hlsl.y | 141 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 141 insertions(+), 143 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=60cde237c55ada90ae4…

1 0

Zebediah Figura : vkd3d-shader: Move add_implicit_conversion() to hlsl.y.
by Alexandre Julliard 02 Feb '21

02 Feb '21

Module: vkd3d Branch: master Commit: 768eb8610160c189420fb387aec4c5222b20930b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=768eb8610160c189420fb38… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jan 30 13:51:34 2021 -0600 vkd3d-shader: Move add_implicit_conversion() to hlsl.y. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 84 --------------------------------------------- libs/vkd3d-shader/hlsl.h | 2 -- libs/vkd3d-shader/hlsl.y | 89 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 86 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index b919a53..9c1b6d1 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -371,63 +371,6 @@ BOOL compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) return FALSE; } -static BOOL implicit_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) -{ - if (!convertible_data_type(t1) || !convertible_data_type(t2)) - return FALSE; - - if (t1->type <= HLSL_CLASS_LAST_NUMERIC) - { - /* Scalar vars can be converted to any other numeric data type */ - if (t1->dimx == 1 && t1->dimy == 1 && t2->type <= HLSL_CLASS_LAST_NUMERIC) - return TRUE; - /* The other way around is true too */ - if (t2->dimx == 1 && t2->dimy == 1 && t2->type <= HLSL_CLASS_LAST_NUMERIC) - return TRUE; - } - - if (t1->type == HLSL_CLASS_ARRAY && t2->type == HLSL_CLASS_ARRAY) - { - return components_count_type(t1) == components_count_type(t2); - } - - if ((t1->type == HLSL_CLASS_ARRAY && t2->type <= HLSL_CLASS_LAST_NUMERIC) - || (t1->type <= HLSL_CLASS_LAST_NUMERIC && t2->type == HLSL_CLASS_ARRAY)) - { - /* e.g. float4[3] to float4 is allowed */ - if (t1->type == HLSL_CLASS_ARRAY && compare_hlsl_types(t1->e.array.type, t2)) - return TRUE; - if (components_count_type(t1) == components_count_type(t2)) - return TRUE; - return FALSE; - } - - if (t1->type <= HLSL_CLASS_VECTOR && t2->type <= HLSL_CLASS_VECTOR) - { - if (t1->dimx >= t2->dimx) - return TRUE; - return FALSE; - } - - if (t1->type == HLSL_CLASS_MATRIX || t2->type == HLSL_CLASS_MATRIX) - { - if (t1->type == HLSL_CLASS_MATRIX && t2->type == HLSL_CLASS_MATRIX - && t1->dimx >= t2->dimx && t1->dimy >= t2->dimy) - return TRUE; - - /* Matrix-vector conversion is apparently allowed if they have the same components count */ - if ((t1->type == HLSL_CLASS_VECTOR || t2->type == HLSL_CLASS_VECTOR) - && components_count_type(t1) == components_count_type(t2)) - return TRUE; - return FALSE; - } - - if (t1->type == HLSL_CLASS_STRUCT && t2->type == HLSL_CLASS_STRUCT) - return compare_hlsl_types(t1, t2); - - return FALSE; -} - static BOOL expr_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) { if (t1->base_type > HLSL_TYPE_LAST_SCALAR || t2->base_type > HLSL_TYPE_LAST_SCALAR) @@ -589,33 +532,6 @@ static struct hlsl_type *expr_common_type(struct hlsl_type *t1, struct hlsl_type return new_hlsl_type(NULL, type, base, dimx, dimy); } -struct hlsl_ir_node *add_implicit_conversion(struct list *instrs, struct hlsl_ir_node *node, - struct hlsl_type *dst_type, struct source_location *loc) -{ - struct hlsl_type *src_type = node->data_type; - struct hlsl_ir_expr *cast; - - if (compare_hlsl_types(src_type, dst_type)) - return node; - - if (!implicit_compatible_data_types(src_type, dst_type)) - { - hlsl_report_message(*loc, HLSL_LEVEL_ERROR, "can't implicitly convert %s to %s", - debug_hlsl_type(src_type), debug_hlsl_type(dst_type)); - return NULL; - } - - if (dst_type->dimx * dst_type->dimy < src_type->dimx * src_type->dimy) - hlsl_report_message(*loc, HLSL_LEVEL_WARNING, "implicit truncation of vector type"); - - TRACE("Implicit conversion from %s to %s.\n", debug_hlsl_type(src_type), debug_hlsl_type(dst_type)); - - if (!(cast = new_cast(node, dst_type, loc))) - return NULL; - list_add_tail(instrs, &cast->node.entry); - return &cast->node; -} - struct hlsl_ir_expr *add_expr(struct list *instrs, enum hlsl_ir_expr_op op, struct hlsl_ir_node *operands[3], struct source_location *loc) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 6efdfbb..ab7b99c 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -594,8 +594,6 @@ static inline void set_parse_status(enum parse_status *current, enum parse_statu struct hlsl_ir_expr *add_expr(struct list *instrs, enum hlsl_ir_expr_op op, struct hlsl_ir_node *operands[3], struct source_location *loc) DECLSPEC_HIDDEN; -struct hlsl_ir_node *add_implicit_conversion(struct list *instrs, struct hlsl_ir_node *node, struct hlsl_type *type, - struct source_location *loc) DECLSPEC_HIDDEN; struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int array_size) DECLSPEC_HIDDEN; struct hlsl_ir_assignment *new_assignment(struct hlsl_ir_var *var, struct hlsl_ir_node *offset, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1502301..5d200e4 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -77,6 +77,95 @@ static void check_invalid_matrix_modifiers(DWORD modifiers, struct source_locati "'row_major' or 'column_major' modifiers are only allowed for matrices."); } +static BOOL convertible_data_type(struct hlsl_type *type) +{ + return type->type != HLSL_CLASS_OBJECT; +} + +static BOOL implicit_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) +{ + if (!convertible_data_type(t1) || !convertible_data_type(t2)) + return FALSE; + + if (t1->type <= HLSL_CLASS_LAST_NUMERIC) + { + /* Scalar vars can be converted to any other numeric data type */ + if (t1->dimx == 1 && t1->dimy == 1 && t2->type <= HLSL_CLASS_LAST_NUMERIC) + return TRUE; + /* The other way around is true too */ + if (t2->dimx == 1 && t2->dimy == 1 && t2->type <= HLSL_CLASS_LAST_NUMERIC) + return TRUE; + } + + if (t1->type == HLSL_CLASS_ARRAY && t2->type == HLSL_CLASS_ARRAY) + { + return components_count_type(t1) == components_count_type(t2); + } + + if ((t1->type == HLSL_CLASS_ARRAY && t2->type <= HLSL_CLASS_LAST_NUMERIC) + || (t1->type <= HLSL_CLASS_LAST_NUMERIC && t2->type == HLSL_CLASS_ARRAY)) + { + /* e.g. float4[3] to float4 is allowed */ + if (t1->type == HLSL_CLASS_ARRAY && compare_hlsl_types(t1->e.array.type, t2)) + return TRUE; + if (components_count_type(t1) == components_count_type(t2)) + return TRUE; + return FALSE; + } + + if (t1->type <= HLSL_CLASS_VECTOR && t2->type <= HLSL_CLASS_VECTOR) + { + if (t1->dimx >= t2->dimx) + return TRUE; + return FALSE; + } + + if (t1->type == HLSL_CLASS_MATRIX || t2->type == HLSL_CLASS_MATRIX) + { + if (t1->type == HLSL_CLASS_MATRIX && t2->type == HLSL_CLASS_MATRIX + && t1->dimx >= t2->dimx && t1->dimy >= t2->dimy) + return TRUE; + + /* Matrix-vector conversion is apparently allowed if they have the same components count */ + if ((t1->type == HLSL_CLASS_VECTOR || t2->type == HLSL_CLASS_VECTOR) + && components_count_type(t1) == components_count_type(t2)) + return TRUE; + return FALSE; + } + + if (t1->type == HLSL_CLASS_STRUCT && t2->type == HLSL_CLASS_STRUCT) + return compare_hlsl_types(t1, t2); + + return FALSE; +} + +static struct hlsl_ir_node *add_implicit_conversion(struct list *instrs, struct hlsl_ir_node *node, + struct hlsl_type *dst_type, struct source_location *loc) +{ + struct hlsl_type *src_type = node->data_type; + struct hlsl_ir_expr *cast; + + if (compare_hlsl_types(src_type, dst_type)) + return node; + + if (!implicit_compatible_data_types(src_type, dst_type)) + { + hlsl_report_message(*loc, HLSL_LEVEL_ERROR, "can't implicitly convert %s to %s", + debug_hlsl_type(src_type), debug_hlsl_type(dst_type)); + return NULL; + } + + if (dst_type->dimx * dst_type->dimy < src_type->dimx * src_type->dimy) + hlsl_report_message(*loc, HLSL_LEVEL_WARNING, "implicit truncation of vector type"); + + TRACE("Implicit conversion from %s to %s.\n", debug_hlsl_type(src_type), debug_hlsl_type(dst_type)); + + if (!(cast = new_cast(node, dst_type, loc))) + return NULL; + list_add_tail(instrs, &cast->node.entry); + return &cast->node; +} + static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) { BOOL ret;

1 0

Zebediah Figura : vkd3d-shader: Move add_expr() to hlsl.y.
by Alexandre Julliard 02 Feb '21

02 Feb '21

Module: vkd3d Branch: master Commit: d8dd91e84026038f0e278278ecb40711fddb49d3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d8dd91e84026038f0e27827… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jan 30 13:51:35 2021 -0600 vkd3d-shader: Move add_expr() to hlsl.y. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 209 ----------------------------------------------- libs/vkd3d-shader/hlsl.h | 3 - libs/vkd3d-shader/hlsl.y | 209 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 209 insertions(+), 212 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=d8dd91e84026038f0e2…

1 0

Zebediah Figura : vkd3d-shader: Move compatible_data_types() to hlsl.y.
by Alexandre Julliard 02 Feb '21

02 Feb '21

Module: vkd3d Branch: master Commit: ab2e95a78c4f65a33811874edbba423f7128c00e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ab2e95a78c4f65a33811874… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jan 30 13:51:36 2021 -0600 vkd3d-shader: Move compatible_data_types() to hlsl.y. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 59 ------------------------------------------------ libs/vkd3d-shader/hlsl.h | 1 - libs/vkd3d-shader/hlsl.y | 54 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 60 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 9b76fb4..ebd74e6 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -312,65 +312,6 @@ struct hlsl_type *clone_hlsl_type(struct hlsl_type *old, unsigned int default_ma return type; } -static BOOL convertible_data_type(struct hlsl_type *type) -{ - return type->type != HLSL_CLASS_OBJECT; -} - -BOOL compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) -{ - if (!convertible_data_type(t1) || !convertible_data_type(t2)) - return FALSE; - - if (t1->type <= HLSL_CLASS_LAST_NUMERIC) - { - /* Scalar vars can be cast to pretty much everything */ - if (t1->dimx == 1 && t1->dimy == 1) - return TRUE; - - if (t1->type == HLSL_CLASS_VECTOR && t2->type == HLSL_CLASS_VECTOR) - return t1->dimx >= t2->dimx; - } - - /* The other way around is true too i.e. whatever to scalar */ - if (t2->type <= HLSL_CLASS_LAST_NUMERIC && t2->dimx == 1 && t2->dimy == 1) - return TRUE; - - if (t1->type == HLSL_CLASS_ARRAY) - { - if (compare_hlsl_types(t1->e.array.type, t2)) - /* e.g. float4[3] to float4 is allowed */ - return TRUE; - - if (t2->type == HLSL_CLASS_ARRAY || t2->type == HLSL_CLASS_STRUCT) - return components_count_type(t1) >= components_count_type(t2); - else - return components_count_type(t1) == components_count_type(t2); - } - - if (t1->type == HLSL_CLASS_STRUCT) - return components_count_type(t1) >= components_count_type(t2); - - if (t2->type == HLSL_CLASS_ARRAY || t2->type == HLSL_CLASS_STRUCT) - return components_count_type(t1) == components_count_type(t2); - - if (t1->type == HLSL_CLASS_MATRIX || t2->type == HLSL_CLASS_MATRIX) - { - if (t1->type == HLSL_CLASS_MATRIX && t2->type == HLSL_CLASS_MATRIX && t1->dimx >= t2->dimx && t1->dimy >= t2->dimy) - return TRUE; - - /* Matrix-vector conversion is apparently allowed if they have the same components count */ - if ((t1->type == HLSL_CLASS_VECTOR || t2->type == HLSL_CLASS_VECTOR) - && components_count_type(t1) == components_count_type(t2)) - return TRUE; - return FALSE; - } - - if (components_count_type(t1) >= components_count_type(t2)) - return TRUE; - return FALSE; -} - struct hlsl_ir_expr *new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, struct source_location *loc) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 492b6d6..88ed6de 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -626,7 +626,6 @@ BOOL is_row_major(const struct hlsl_type *type) DECLSPEC_HIDDEN; BOOL find_function(const char *name) DECLSPEC_HIDDEN; unsigned int components_count_type(struct hlsl_type *type) DECLSPEC_HIDDEN; BOOL compare_hlsl_types(const struct hlsl_type *t1, const struct hlsl_type *t2) DECLSPEC_HIDDEN; -BOOL compatible_data_types(struct hlsl_type *s1, struct hlsl_type *s2) DECLSPEC_HIDDEN; void push_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; BOOL pop_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; void init_functions_tree(struct rb_tree *funcs) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 339a30d..ed83207 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -82,6 +82,60 @@ static BOOL convertible_data_type(struct hlsl_type *type) return type->type != HLSL_CLASS_OBJECT; } +static BOOL compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) +{ + if (!convertible_data_type(t1) || !convertible_data_type(t2)) + return FALSE; + + if (t1->type <= HLSL_CLASS_LAST_NUMERIC) + { + /* Scalar vars can be cast to pretty much everything */ + if (t1->dimx == 1 && t1->dimy == 1) + return TRUE; + + if (t1->type == HLSL_CLASS_VECTOR && t2->type == HLSL_CLASS_VECTOR) + return t1->dimx >= t2->dimx; + } + + /* The other way around is true too i.e. whatever to scalar */ + if (t2->type <= HLSL_CLASS_LAST_NUMERIC && t2->dimx == 1 && t2->dimy == 1) + return TRUE; + + if (t1->type == HLSL_CLASS_ARRAY) + { + if (compare_hlsl_types(t1->e.array.type, t2)) + /* e.g. float4[3] to float4 is allowed */ + return TRUE; + + if (t2->type == HLSL_CLASS_ARRAY || t2->type == HLSL_CLASS_STRUCT) + return components_count_type(t1) >= components_count_type(t2); + else + return components_count_type(t1) == components_count_type(t2); + } + + if (t1->type == HLSL_CLASS_STRUCT) + return components_count_type(t1) >= components_count_type(t2); + + if (t2->type == HLSL_CLASS_ARRAY || t2->type == HLSL_CLASS_STRUCT) + return components_count_type(t1) == components_count_type(t2); + + if (t1->type == HLSL_CLASS_MATRIX || t2->type == HLSL_CLASS_MATRIX) + { + if (t1->type == HLSL_CLASS_MATRIX && t2->type == HLSL_CLASS_MATRIX && t1->dimx >= t2->dimx && t1->dimy >= t2->dimy) + return TRUE; + + /* Matrix-vector conversion is apparently allowed if they have the same components count */ + if ((t1->type == HLSL_CLASS_VECTOR || t2->type == HLSL_CLASS_VECTOR) + && components_count_type(t1) == components_count_type(t2)) + return TRUE; + return FALSE; + } + + if (components_count_type(t1) >= components_count_type(t2)) + return TRUE; + return FALSE; +} + static BOOL implicit_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) { if (!convertible_data_type(t1) || !convertible_data_type(t2))

1 0