February 2021 - Wine-Commits

Zebediah Figura : winegstreamer: Factor out free_stream().
by Alexandre Julliard Feb. 5, 2021

Feb. 5, 2021

Module: wine Branch: master Commit: 41e53a122dc036db084817f56bdd52d3d252eb16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41e53a122dc036db084817f5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 4 20:53:41 2021 -0600 winegstreamer: Factor out free_stream(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index fdc10f72802..7b3a4fd48bd 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2456,17 +2456,8 @@ static void source_disconnect(struct strmbase_source *iface) stream->enabled = false; } -static void free_source_pin(struct parser_source *pin) +static void free_stream(struct wg_parser_stream *stream) { - struct wg_parser_stream *stream = pin->wg_stream; - - if (pin->pin.pin.peer) - { - if (SUCCEEDED(IMemAllocator_Decommit(pin->pin.pAllocator))) - IPin_Disconnect(pin->pin.pin.peer); - IPin_Disconnect(&pin->pin.pin.IPin_iface); - } - if (stream->their_src) { if (stream->post_sink) @@ -2488,6 +2479,18 @@ static void free_source_pin(struct parser_source *pin) pthread_cond_destroy(&stream->event_empty_cond); free(stream); +} + +static void free_source_pin(struct parser_source *pin) +{ + if (pin->pin.pin.peer) + { + if (SUCCEEDED(IMemAllocator_Decommit(pin->pin.pAllocator))) + IPin_Disconnect(pin->pin.pin.peer); + IPin_Disconnect(&pin->pin.pin.IPin_iface); + } + + free_stream(pin->wg_stream); pin->flushing_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&pin->flushing_cs);

1 0

Zebediah Figura : winegstreamer: Store the wg_parser pointer as our source pad's private data.
by Alexandre Julliard Feb. 5, 2021

Feb. 5, 2021

Module: wine Branch: master Commit: a2ce39394e2f785b2ea89f5a9592014626e96ea1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2ce39394e2f785b2ea89f5a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 4 20:53:37 2021 -0600 winegstreamer: Store the wg_parser pointer as our source pad's private data. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 45bd2f9a4a9..31f0a07d93f 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -636,9 +636,8 @@ static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) } } -static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) +static gboolean gst_base_src_perform_seek(struct wg_parser *parser, GstEvent *event) { - struct wg_parser *parser = This->wg_parser; gboolean res = TRUE; gdouble rate; GstFormat seek_format; @@ -687,15 +686,15 @@ static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) { - struct parser *This = gst_pad_get_element_private(pad); + struct wg_parser *parser = gst_pad_get_element_private(pad); gboolean ret = TRUE; - GST_LOG("filter %p, type \"%s\".", This, GST_EVENT_TYPE_NAME(event)); + GST_LOG("parser %p, type \"%s\".", parser, GST_EVENT_TYPE_NAME(event)); switch (event->type) { case GST_EVENT_SEEK: - ret = gst_base_src_perform_seek(This, event); + ret = gst_base_src_perform_seek(parser, event); break; case GST_EVENT_FLUSH_START: @@ -848,10 +847,9 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 offset, guint size, GstBuffer **buffer); -static void *push_data(void *iface) +static void *push_data(void *arg) { - struct parser *This = iface; - struct wg_parser *parser = This->wg_parser; + struct wg_parser *parser = arg; GstBuffer *buffer; LONGLONG maxlen; @@ -1125,8 +1123,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; + struct wg_parser *parser = gst_pad_get_element_private(pad); GstBuffer *new_buffer = NULL; GstFlowReturn ret; @@ -1414,11 +1411,10 @@ static void existing_new_pad(GstElement *bin, GstPad *pad, gpointer user) static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) { - struct parser *This = gst_pad_get_element_private(pad); - struct wg_parser *parser = This->wg_parser; + struct wg_parser *parser = gst_pad_get_element_private(pad); GstFormat format; - GST_LOG("filter %p, type %s.", This, GST_QUERY_TYPE_NAME(query)); + GST_LOG("parser %p, type %s.", parser, GST_QUERY_TYPE_NAME(query)); switch (GST_QUERY_TYPE(query)) { case GST_QUERY_DURATION: @@ -1456,8 +1452,7 @@ static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) static gboolean activate_push(GstPad *pad, gboolean activate) { - struct parser *This = gst_pad_get_element_private(pad); - struct wg_parser *parser = This->wg_parser; + struct wg_parser *parser = gst_pad_get_element_private(pad); if (!activate) { if (parser->push_thread) { @@ -1467,7 +1462,7 @@ static gboolean activate_push(GstPad *pad, gboolean activate) } else if (!parser->push_thread) { int ret; - if ((ret = pthread_create(&parser->push_thread, NULL, push_data, This))) + if ((ret = pthread_create(&parser->push_thread, NULL, push_data, parser))) { GST_ERROR("Failed to create push thread: %s", strerror(errno)); parser->push_thread = 0; @@ -1479,10 +1474,10 @@ static gboolean activate_push(GstPad *pad, gboolean activate) static gboolean activate_mode(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) { - struct parser *filter = gst_pad_get_element_private(pad); + struct wg_parser *parser = gst_pad_get_element_private(pad); - GST_DEBUG("%s source pad for filter %p in %s mode.", - activate ? "Activating" : "Deactivating", filter, gst_pad_mode_get_name(mode)); + GST_DEBUG("%s source pad for parser %p in %s mode.", + activate ? "Activating" : "Deactivating", parser, gst_pad_mode_get_name(mode)); switch (mode) { case GST_PAD_MODE_PULL: @@ -1625,7 +1620,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) gst_pad_set_query_function(parser->my_src, query_function); gst_pad_set_activatemode_function(parser->my_src, activate_mode); gst_pad_set_event_function(parser->my_src, event_src); - gst_pad_set_element_private (parser->my_src, This); + gst_pad_set_element_private(parser->my_src, parser); parser->start_offset = parser->next_offset = parser->stop_offset = 0; This->next_pull_offset = 0;

1 0

Nikolay Sivov : oleaut32: Handle preformatted strings in VarFormatCurrency().
by Alexandre Julliard Feb. 5, 2021

Feb. 5, 2021

Module: wine Branch: master Commit: e26d6da8a944a45c0b7a38f1ef3ccc55355b8ad5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e26d6da8a944a45c0b7a38f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 5 10:30:47 2021 +0300 oleaut32: Handle preformatted strings in VarFormatCurrency(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46709 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/varformat.c | 35 +++++++++++++++++++++++++++++++++++ dlls/oleaut32/varformat.c | 15 +++++++++++++-- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 54fc8a1841f..d1951b85a61 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -625,6 +625,40 @@ static void test_GetAltMonthNames(void) ok(str != NULL, "Got %p\n", str); } +static void test_VarFormatCurrency(void) +{ + HRESULT hr; + VARIANT in; + BSTR str, str2; + + V_CY(&in).int64 = 0; + V_VT(&in) = VT_CY; + hr = VarFormatCurrency(&in, 3, -2, -2, -2, 0, &str); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + V_VT(&in) = VT_BSTR; + V_BSTR(&in) = str; + hr = VarFormatCurrency(&in, 1, -2, -2, -2, 0, &str2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(lstrcmpW(str, str2), "Expected different string.\n"); + SysFreeString(str2); + + V_VT(&in) = VT_BSTR | VT_BYREF; + V_BSTRREF(&in) = &str; + hr = VarFormatCurrency(&in, 1, -2, -2, -2, 0, &str2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(lstrcmpW(str, str2), "Expected different string.\n"); + + SysFreeString(str); + SysFreeString(str2); + + V_VT(&in) = VT_BSTR; + V_BSTR(&in) = SysAllocString(L"test"); + hr = VarFormatCurrency(&in, 1, -2, -2, -2, 0, &str2); + ok(hr == DISP_E_TYPEMISMATCH, "Unexpected hr %#x.\n", hr); + VariantClear(&in); +} + START_TEST(varformat) { test_VarFormatNumber(); @@ -632,4 +666,5 @@ START_TEST(varformat) test_VarWeekdayName(); test_VarFormatFromTokens(); test_GetAltMonthNames(); + test_VarFormatCurrency(); } diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index e88bf0bc365..8ed8f790d14 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -2401,6 +2401,7 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, { HRESULT hRet; VARIANT vStr; + CY cy; TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, nParens, nGrouping, dwFlags, pbstrOut); @@ -2410,8 +2411,18 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, *pbstrOut = NULL; - V_VT(&vStr) = VT_EMPTY; - hRet = VariantCopyInd(&vStr, pVarIn); + if (V_VT(pVarIn) == VT_BSTR || V_VT(pVarIn) == (VT_BSTR | VT_BYREF)) + { + hRet = VarCyFromStr(V_ISBYREF(pVarIn) ? *V_BSTRREF(pVarIn) : V_BSTR(pVarIn), LOCALE_USER_DEFAULT, 0, &cy); + if (FAILED(hRet)) return hRet; + V_VT(&vStr) = VT_CY; + V_CY(&vStr) = cy; + } + else + { + V_VT(&vStr) = VT_EMPTY; + hRet = VariantCopyInd(&vStr, pVarIn); + } if (SUCCEEDED(hRet)) hRet = VariantChangeTypeEx(&vStr, &vStr, LOCALE_USER_DEFAULT, 0, VT_BSTR);

1 0

Zebediah Figura : winegstreamer: Store the stream duration also in the wg_parser_stream structure.
by Alexandre Julliard Feb. 5, 2021

Feb. 5, 2021

Module: wine Branch: master Commit: 42dc1e93b214bb41e6524d49196e6413b5ffc735 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42dc1e93b214bb41e6524d49… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 4 20:53:39 2021 -0600 winegstreamer: Store the stream duration also in the wg_parser_stream structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index d9cc072a8c7..a63e91c9a65 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -110,6 +110,8 @@ struct wg_parser_stream struct wg_parser_event event; bool flushing, eos, enabled; + + uint64_t duration; }; struct parser @@ -1638,7 +1640,8 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) struct parser_source *pin = This->sources[i]; struct wg_parser_stream *stream = pin->wg_stream; - pin->seek.llDuration = pin->seek.llStop = query_duration(stream->their_src); + stream->duration = query_duration(stream->their_src); + pin->seek.llDuration = pin->seek.llStop = stream->duration; pin->seek.llCurrent = 0; while (!stream->caps && !parser->error) pthread_cond_wait(&parser->init_cond, &parser->mutex);

1 0

Zebediah Figura : winegstreamer: Use the "streams" array in wg_parser code.
by Alexandre Julliard Feb. 5, 2021

Feb. 5, 2021

Module: wine Branch: master Commit: 45ebc26dcf18aab4c8b56cd4e1d790bf69b0dc55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45ebc26dcf18aab4c8b56cd4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 4 20:53:40 2021 -0600 winegstreamer: Use the "streams" array in wg_parser code. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a63e91c9a65..fdc10f72802 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1228,14 +1228,15 @@ static DWORD CALLBACK read_thread(void *arg) static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) { struct parser *filter = user; + struct wg_parser *parser = filter->wg_parser; unsigned int i; char *name; GST_LOG("filter %p, bin %p, pad %p.", filter, bin, pad); - for (i = 0; i < filter->source_count; ++i) + for (i = 0; i < parser->stream_count; ++i) { - struct wg_parser_stream *stream = filter->sources[i]->wg_stream; + struct wg_parser_stream *stream = parser->streams[i]; if (stream->their_src == pad) { @@ -1785,14 +1786,12 @@ static HRESULT parser_cleanup_stream(struct strmbase_filter *iface) parser->flushing = true; pthread_mutex_unlock(&parser->mutex); - for (i = 0; i < filter->source_count; ++i) + for (i = 0; i < parser->stream_count; ++i) { - struct parser_source *pin = filter->sources[i]; + struct wg_parser_stream *stream = parser->streams[i]; - if (!pin->pin.pin.peer) - continue; - - pthread_cond_signal(&pin->wg_stream->event_cond); + if (stream->enabled) + pthread_cond_signal(&stream->event_cond); } for (i = 0; i < filter->source_count; ++i) @@ -2573,10 +2572,10 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) /* Unblock all of our streams. */ pthread_mutex_lock(&parser->mutex); - for (i = 0; i < This->source_count; ++i) + for (i = 0; i < parser->stream_count; ++i) { - This->sources[i]->wg_stream->flushing = true; - pthread_cond_signal(&This->sources[i]->wg_stream->event_empty_cond); + parser->streams[i]->flushing = true; + pthread_cond_signal(&parser->streams[i]->event_empty_cond); } pthread_mutex_unlock(&parser->mutex);

1 0

Alexandre Julliard : server: Use the object type information to implement access mapping.
by Alexandre Julliard Feb. 5, 2021

Feb. 5, 2021

Module: wine Branch: master Commit: d6ef9401b3ef05e87e0cadd31992a6809008331e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6ef9401b3ef05e87e0cadd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 5 12:10:44 2021 +0100 server: Use the object type information to implement access mapping. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 1 - server/async.c | 4 ++-- server/atom.c | 2 +- server/change.c | 2 +- server/clipboard.c | 2 +- server/completion.c | 12 +----------- server/console.c | 16 ++++++++-------- server/debugger.c | 14 ++------------ server/device.c | 8 ++++---- server/directory.c | 4 ++-- server/event.c | 24 ++---------------------- server/fd.c | 18 ++++-------------- server/file.c | 21 +++++---------------- server/file.h | 1 - server/handle.c | 2 +- server/hook.c | 2 +- server/mailslot.c | 12 ++++-------- server/mapping.c | 16 +++------------- server/mutex.c | 12 +----------- server/named_pipe.c | 8 ++++---- server/object.c | 8 ++------ server/object.h | 11 ++++++++++- server/process.c | 24 ++++-------------------- server/queue.c | 4 ++-- server/registry.c | 8 ++------ server/request.c | 2 +- server/semaphore.c | 12 +----------- server/serial.c | 2 +- server/signal.c | 2 +- server/sock.c | 6 +++--- server/symlink.c | 12 +----------- server/thread.c | 14 ++++---------- server/timer.c | 12 +----------- server/token.c | 28 +++------------------------- server/winstation.c | 28 ++-------------------------- 35 files changed, 85 insertions(+), 269 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d6ef9401b3ef05e87e0c…

1 0

Damjan Jovanovic : wldap32: Cyrus SASL's sasl_interact_t.result should be null-terminated.
by Alexandre Julliard Feb. 5, 2021

Feb. 5, 2021

Module: wine Branch: master Commit: a4199fa255119f3048a81fd1182ef60ea0be4d8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4199fa255119f3048a81fd1… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Feb 5 09:37:28 2021 +0200 wldap32: Cyrus SASL's sasl_interact_t.result should be null-terminated. Sometimes AD authentication fails as LDAP packets have garbage characters trailing the username. Reading its source code confirms that Cyrus SASL often completely ignores the sasl_interact_t.len field, and expects sasl_interact_t.result to be null-terminated. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/wldap32.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/wldap32.h b/dlls/wldap32/wldap32.h index 537de67a877..3059df8603e 100644 --- a/dlls/wldap32/wldap32.h +++ b/dlls/wldap32/wldap32.h @@ -100,9 +100,10 @@ static inline LPWSTR strnAtoW( LPCSTR str, DWORD inlen, DWORD *outlen ) if (str) { DWORD len = MultiByteToWideChar( CP_ACP, 0, str, inlen, NULL, 0 ); - if ((ret = heap_alloc( len * sizeof(WCHAR) ))) + if ((ret = heap_alloc( (len+1) * sizeof(WCHAR) ))) { MultiByteToWideChar( CP_ACP, 0, str, inlen, ret, len ); + ret[len] = 0; *outlen = len; } } @@ -116,9 +117,10 @@ static inline char *strnWtoU( LPCWSTR str, DWORD inlen, DWORD *outlen ) if (str) { DWORD len = WideCharToMultiByte( CP_UTF8, 0, str, inlen, NULL, 0, NULL, NULL ); - if ((ret = heap_alloc( len ))) + if ((ret = heap_alloc( len + 1 ))) { WideCharToMultiByte( CP_UTF8, 0, str, inlen, ret, len, NULL, NULL ); + ret[len] = 0; *outlen = len; } }

1 0

Zebediah Figura : winegstreamer: Store the wg_parser_stream pointers also in struct wg_parser.
by Alexandre Julliard Feb. 5, 2021

Feb. 5, 2021

Module: wine Branch: master Commit: a03f7350b309ca7025783be1d2478c305d20dbf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a03f7350b309ca7025783be1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 4 20:53:38 2021 -0600 winegstreamer: Store the wg_parser_stream pointers also in 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 | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 31f0a07d93f..d9cc072a8c7 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -48,6 +48,9 @@ static const GUID MEDIASUBTYPE_CVID = {mmioFOURCC('c','v','i','d'), 0x0000, 0x00 struct wg_parser { + struct wg_parser_stream **streams; + unsigned int stream_count; + GstElement *container; GstBus *bus; GstPad *my_src, *their_sink; @@ -2505,14 +2508,20 @@ static const struct strmbase_source_ops source_ops = static struct parser_source *create_pin(struct parser *filter, const WCHAR *name) { - struct parser_source *pin, **new_array; + struct wg_parser *parser = filter->wg_parser; struct wg_parser_stream *stream; + struct parser_source *pin; char pad_name[19]; + void *new_array; - if (!(new_array = heap_realloc(filter->sources, (filter->source_count + 1) * sizeof(*new_array)))) + if (!(new_array = heap_realloc(filter->sources, (filter->source_count + 1) * sizeof(*filter->sources)))) return NULL; filter->sources = new_array; + if (!(new_array = realloc(parser->streams, (parser->stream_count + 1) * sizeof(*parser->streams)))) + return NULL; + parser->streams = new_array; + if (!(pin = heap_alloc_zero(sizeof(*pin)))) return NULL; @@ -2544,6 +2553,7 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name gst_pad_set_query_function(stream->my_sink, query_sink_wrapper); filter->sources[filter->source_count++] = pin; + parser->streams[parser->stream_count++] = stream; return pin; } @@ -2589,6 +2599,9 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) This->source_count = 0; heap_free(This->sources); This->sources = NULL; + parser->stream_count = 0; + free(parser->streams); + parser->streams = NULL; gst_element_set_bus(parser->container, NULL); gst_object_unref(parser->container); parser->container = NULL;

1 0

Daniel Lehman : include: Fix [v]sprintf_s declarations.
by Alexandre Julliard Feb. 5, 2021

Feb. 5, 2021

Module: wine Branch: master Commit: 3746381e7e8cf2671567712f6d3f17a9823e8c5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3746381e7e8cf2671567712f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Feb 1 17:42:16 2021 -0800 include: Fix [v]sprintf_s declarations. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 7dd177e9052..f78e3b36f2b 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -218,19 +218,19 @@ static inline int __cdecl vsprintf(char *buffer, const char *format, __ms_va_lis return ret < 0 ? -1 : ret; } -static inline int __cdecl vsprintf_s(char *buffer, const char *format, __ms_va_list args) +static inline int __cdecl vsprintf_s(char *buffer, size_t size, const char *format, __ms_va_list args) { - int ret = __stdio_common_vsprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, -1, format, NULL, args); + int ret = __stdio_common_vsprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args); return ret < 0 ? -1 : ret; } -static inline int WINAPIV sprintf_s(char *buffer, size_t size, size_t count, const char *format, ...) +static inline int WINAPIV sprintf_s(char *buffer, size_t size, const char *format, ...) { int ret; __ms_va_list args; __ms_va_start(args, format); - ret = __stdio_common_vsprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, -1, format, NULL, args); + ret = __stdio_common_vsprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args); __ms_va_end(args); return ret; }

1 0

Francois Gouget : testbot/TestWTBS: Fix the patch range when --jobs points to a non-patch job.
by Alexandre Julliard Feb. 5, 2021

Feb. 5, 2021

Module: tools Branch: master Commit: 1a7d958bfb7fb46696bb29abcfa43da674ecb9cd URL: https://source.winehq.org/git/tools.git/?a=commit;h=1a7d958bfb7fb46696bb29a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 5 16:03:35 2021 +0100 testbot/TestWTBS: Fix the patch range when --jobs points to a non-patch job. This resulted in an empty set of patch ranges which meant to check every patch. TestWTBS now distinguishes an undef $PatchRanges, which means to check all patches, from an empty @$PatchRanges, which means to ignore all patches. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 87b53fe..1cbec2e 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -131,11 +131,12 @@ while (@ARGV) } } -my $JobRanges = []; +my $JobRanges; if (!defined $Usage) { if (defined $OptJobs) { + $JobRanges = []; foreach my $Range (split /,+/, $OptJobs) { if ($Range =~ /^([0-9]+)$/) @@ -988,7 +989,11 @@ sub IsInRange($$) my ($Ranges, $Id) = @_; return 0 if (!$Id); - return 1 if (!$Ranges or !@$Ranges); + + # No range means to allow everything... + return 1 if (!$Ranges); + + # ...while an empty range means to reject everything foreach my $Range (@$Ranges) { return 1 if (($Range->[0] == 0 or $Range->[0] <= $Id) and @@ -1304,12 +1309,13 @@ sub CheckPatches() my $Jobs = CreateJobs(); my $Patches = CreatePatches(); - my $PatchRanges = []; + my $PatchRanges; if (@$JobRanges) { # Convert the job ranges into a list of patch ranges so that these patches: # 1. either have a job in the allowed job ranges, # 2. or have no job but are contiguous to a patch satisfying 1 or 2. + $PatchRanges = []; my ($First, $Last, $AddRange); foreach my $Patch (sort { $a->Id <=> $b->Id } @{$Patches->GetItems()}) {

1 0