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

Ziqing Hui : mfreadwrite/tests: Add tests for MP4 sink writer.
by Alexandre Julliard May 18, 2023

May 18, 2023

Module: wine Branch: master Commit: cfbcd014c67e440d5a6c239cdd8333823604c7da URL: https://gitlab.winehq.org/wine/wine/-/commit/cfbcd014c67e440d5a6c239cdd8333… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon May 15 11:41:15 2023 +0800 mfreadwrite/tests: Add tests for MP4 sink writer. --- dlls/mfreadwrite/tests/mfplat.c | 82 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 41b2a033a59..3b54aa4ff4c 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -1415,7 +1415,7 @@ done: DestroyWindow(window); } -static void test_sink_writer(void) +static void test_sink_writer_create(void) { IMFSinkWriter *writer; HRESULT hr; @@ -1437,6 +1437,83 @@ static void test_sink_writer(void) ok(!writer, "Unexpected pointer %p.\n", writer); } +static void test_sink_writer_mp4(void) +{ + WCHAR tmp_file[MAX_PATH]; + IMFSinkWriter *writer; + IMFByteStream *stream; + IMFAttributes *attr; + IMFMediaSink *sink; + HRESULT hr; + + GetTempPathW(ARRAY_SIZE(tmp_file), tmp_file); + wcscat(tmp_file, L"tmp.mp4"); + + hr = MFCreateAttributes(&attr, 1); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFAttributes_SetGUID(attr, &MF_TRANSCODE_CONTAINERTYPE, &MFTranscodeContainerType_MPEG4); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFCreateTempFile(MF_ACCESSMODE_READWRITE, MF_OPENMODE_DELETE_IF_EXIST, MF_FILEFLAGS_NONE, &stream); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + /* Test MFCreateSinkWriterFromURL. */ + writer = (void *)0xdeadbeef; + hr = MFCreateSinkWriterFromURL(NULL, NULL, attr, &writer); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(!writer, "Unexpected pointer %p.\n", writer); + + writer = (void *)0xdeadbeef; + hr = MFCreateSinkWriterFromURL(NULL, stream, NULL, &writer); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(!writer, "Unexpected pointer %p.\n", writer); + + hr = MFCreateSinkWriterFromURL(NULL, stream, attr, &writer); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr == S_OK) + IMFSinkWriter_Release(writer); + + hr = MFCreateSinkWriterFromURL(tmp_file, NULL, NULL, &writer); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr == S_OK) + IMFSinkWriter_Release(writer); + + hr = MFCreateSinkWriterFromURL(tmp_file, NULL, attr, &writer); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr == S_OK) + IMFSinkWriter_Release(writer); + + hr = MFCreateSinkWriterFromURL(tmp_file, stream, NULL, &writer); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr == S_OK) + IMFSinkWriter_Release(writer); + + hr = MFCreateSinkWriterFromURL(tmp_file, stream, attr, &writer); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr != S_OK) + { + IMFByteStream_Release(stream); + IMFAttributes_Release(attr); + return; + } + + /* Test GetServiceForStream. */ + sink = (void *)0xdeadbeef; + hr = IMFSinkWriter_GetServiceForStream(writer, MF_SINK_WRITER_MEDIASINK, + &GUID_NULL, &IID_IMFMediaSink, (void **)&sink); + ok(hr == MF_E_UNSUPPORTED_SERVICE, "Unexpected hr %#lx.\n", hr); + ok(!sink, "Unexpected pointer %p.\n", sink); + + DeleteFileW(tmp_file); + IMFSinkWriter_Release(writer); + IMFByteStream_Release(stream); + IMFAttributes_Release(attr); +} + START_TEST(mfplat) { HRESULT hr; @@ -1451,7 +1528,8 @@ START_TEST(mfplat) test_source_reader("test.mp4", true); test_source_reader_from_media_source(); test_reader_d3d9(); - test_sink_writer(); + test_sink_writer_create(); + test_sink_writer_mp4(); hr = MFShutdown(); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Rémi Bernon : quartz: Avoid reading past the end of a buffer (Valgrind).
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: fbfc724d69987aa8a5e529b1a935e2be3379198a URL: https://gitlab.winehq.org/wine/wine/-/commit/fbfc724d69987aa8a5e529b1a935e2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat May 13 13:03:33 2023 +0200 quartz: Avoid reading past the end of a buffer (Valgrind). --- dlls/quartz/filtermapper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 149bc8d1716..dd7c6c41872 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -425,7 +425,7 @@ static int add_data(struct Vector *v, const void *pData, int size) static int find_data(const struct Vector *v, const void *pData, int size) { int index; - for (index = 0; index < v->current; index++) + for (index = 0; index + size <= v->current; index++) if (!memcmp(v->pData + index, pData, size)) return index; /* not found */

1 0

Rémi Bernon : winegstreamer: Remove unnecessary wg_parser their_sink pad.
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: f595a3f904dd3f86ff07d1428bac50b3b0d5879b URL: https://gitlab.winehq.org/wine/wine/-/commit/f595a3f904dd3f86ff07d1428bac50… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 12 12:10:39 2023 +0200 winegstreamer: Remove unnecessary wg_parser their_sink pad. --- dlls/winegstreamer/wg_parser.c | 40 ++++++++-------------------------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 7776f7287df..42e8f7e9e11 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -66,7 +66,7 @@ struct wg_parser GstElement *container, *decodebin; GstBus *bus; - GstPad *my_src, *their_sink; + GstPad *my_src; guint64 file_size, start_offset, next_offset, stop_offset; guint64 next_pull_offset; @@ -1679,11 +1679,8 @@ static NTSTATUS wg_parser_connect(void *args) out: if (parser->container) gst_element_set_state(parser->container, GST_STATE_NULL); - if (parser->their_sink) - { - gst_object_unref(parser->their_sink); - parser->my_src = parser->their_sink = NULL; - } + if (parser->my_src) + gst_object_unref(parser->my_src); for (i = 0; i < parser->stream_count; ++i) free_stream(parser->streams[i]); @@ -1725,8 +1722,7 @@ static NTSTATUS wg_parser_disconnect(void *args) gst_element_set_state(parser->container, GST_STATE_NULL); gst_object_unref(parser->my_src); - gst_object_unref(parser->their_sink); - parser->my_src = parser->their_sink = NULL; + parser->my_src = NULL; pthread_mutex_lock(&parser->mutex); parser->sink_connected = false; @@ -1762,7 +1758,6 @@ static NTSTATUS wg_parser_disconnect(void *args) static BOOL decodebin_parser_init_gst(struct wg_parser *parser) { GstElement *element; - int ret; if (!(element = create_element("decodebin", "base"))) return FALSE; @@ -1783,17 +1778,12 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_select_cb), parser); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads_cb), parser); - parser->their_sink = gst_element_get_static_pad(element, "sink"); - pthread_mutex_lock(&parser->mutex); parser->no_more_pads = false; pthread_mutex_unlock(&parser->mutex); - if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) - { - GST_ERROR("Failed to link pads, error %d.", ret); + if (!link_src_to_element(parser->my_src, element)) return FALSE; - } return TRUE; } @@ -1801,7 +1791,6 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) static BOOL avi_parser_init_gst(struct wg_parser *parser) { GstElement *element; - int ret; if (!(element = create_element("avidemux", "good"))) return FALSE; @@ -1812,17 +1801,12 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser) g_signal_connect(element, "pad-removed", G_CALLBACK(pad_removed_cb), parser); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads_cb), parser); - parser->their_sink = gst_element_get_static_pad(element, "sink"); - pthread_mutex_lock(&parser->mutex); parser->no_more_pads = false; pthread_mutex_unlock(&parser->mutex); - if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) - { - GST_ERROR("Failed to link pads, error %d.", ret); + if (!link_src_to_element(parser->my_src, element)) return FALSE; - } return TRUE; } @@ -1838,12 +1822,8 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) gst_bin_add(GST_BIN(parser->container), element); - parser->their_sink = gst_element_get_static_pad(element, "sink"); - if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) - { - GST_ERROR("Failed to link sink pads, error %d.", ret); + if (!link_src_to_element(parser->my_src, element)) return FALSE; - } if (!(stream = create_stream(parser))) return FALSE; @@ -1872,12 +1852,8 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) gst_bin_add(GST_BIN(parser->container), element); - parser->their_sink = gst_element_get_static_pad(element, "sink"); - if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) - { - GST_ERROR("Failed to link sink pads, error %d.", ret); + if (!link_src_to_element(parser->my_src, element)) return FALSE; - } if (!(stream = create_stream(parser))) return FALSE;

1 0

Mohamad Al-Jaf : msauddecmft: Add DllGetClassObject() stub.
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: 6243093fba2feb0f1fcbb2e6ab3a39bcd757a79c URL: https://gitlab.winehq.org/wine/wine/-/commit/6243093fba2feb0f1fcbb2e6ab3a39… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat May 13 06:40:00 2023 -0400 msauddecmft: Add DllGetClassObject() stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54934 --- dlls/msauddecmft/Makefile.in | 3 +++ dlls/msauddecmft/main.c | 27 +++++++++++++++++++++++++++ dlls/msauddecmft/msauddecmft.spec | 2 +- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/msauddecmft/Makefile.in b/dlls/msauddecmft/Makefile.in index abce4d1cfe4..832f203d6ba 100644 --- a/dlls/msauddecmft/Makefile.in +++ b/dlls/msauddecmft/Makefile.in @@ -1 +1,4 @@ MODULE = msauddecmft.dll + +C_SRCS = \ + main.c diff --git a/dlls/msauddecmft/main.c b/dlls/msauddecmft/main.c new file mode 100644 index 00000000000..ae3ebf162c1 --- /dev/null +++ b/dlls/msauddecmft/main.c @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msauddecmft); + +HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID riid, void **out ) +{ + FIXME( "clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out ); + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/msauddecmft/msauddecmft.spec b/dlls/msauddecmft/msauddecmft.spec index a9b7505d360..b16365d0c9f 100644 --- a/dlls/msauddecmft/msauddecmft.spec +++ b/dlls/msauddecmft/msauddecmft.spec @@ -1,4 +1,4 @@ @ stdcall -private DllCanUnloadNow() -@ stub DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer()

1 0

Rémi Bernon : winegstreamer: Remove unnecessary wg_parser_stream their_src pad.
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: ff60152ff05c6fa688078c0782efff9dddda62ca URL: https://gitlab.winehq.org/wine/wine/-/commit/ff60152ff05c6fa688078c0782efff… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 12 14:59:38 2023 +0200 winegstreamer: Remove unnecessary wg_parser_stream their_src pad. --- dlls/winegstreamer/wg_parser.c | 43 ++++++++++++------------------------------ 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 42e8f7e9e11..ef274b1dc27 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -104,7 +104,7 @@ struct wg_parser_stream struct wg_parser *parser; uint32_t number; - GstPad *their_src, *my_sink; + GstPad *my_sink; GstElement *flip, *decodebin; GstSegment segment; struct wg_format preferred_format, current_format, codec_format; @@ -811,8 +811,6 @@ static void free_stream(struct wg_parser_stream *stream) { unsigned int i; - if (stream->their_src) - gst_object_unref(stream->their_src); gst_object_unref(stream->my_sink); if (stream->buffer) @@ -833,11 +831,10 @@ static void free_stream(struct wg_parser_stream *stream) free(stream); } -static bool stream_create_post_processing_elements(struct wg_parser_stream *stream) +static bool stream_create_post_processing_elements(GstPad *pad, struct wg_parser_stream *stream) { GstElement *element = NULL, *first = NULL, *last = NULL; struct wg_parser *parser = stream->parser; - GstPad *pad = stream->their_src; const char *name; GstCaps *caps; int ret; @@ -922,8 +919,7 @@ static void stream_decodebin_pad_added_cb(GstElement *element, GstPad *pad, gpoi if (gst_pad_is_linked(pad)) return; - gst_object_ref(stream->their_src = pad); - if (!stream_create_post_processing_elements(stream)) + if (!stream_create_post_processing_elements(pad, stream)) return; gst_pad_set_active(stream->my_sink, 1); } @@ -986,8 +982,7 @@ static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user) return; } - gst_object_ref(stream->their_src = pad); - if (!stream_create_post_processing_elements(stream)) + if (!stream_create_post_processing_elements(pad, stream)) return; gst_pad_set_active(stream->my_sink, 1); } @@ -1013,14 +1008,9 @@ static void pad_removed_cb(GstElement *element, GstPad *pad, gpointer user) stream_decodebin_sink_peer = gst_pad_get_peer(stream_decodebin_sink); } - if (stream->their_src == pad || stream_decodebin_sink_peer == pad) + if (stream_decodebin_sink_peer == pad) { - gst_object_unref(stream->their_src); - stream->their_src = NULL; - - if (stream_decodebin_sink_peer == pad) - gst_pad_unlink(pad, stream_decodebin_sink); - + gst_pad_unlink(pad, stream_decodebin_sink); done = true; } @@ -1469,6 +1459,7 @@ static gboolean src_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) static void query_tags(struct wg_parser_stream *stream) { + GstPad *peer = gst_pad_get_peer(stream->my_sink); const gchar *struct_name; GstEvent *tag_event; guint i, j; @@ -1477,7 +1468,7 @@ static void query_tags(struct wg_parser_stream *stream) stream->tags[WG_PARSER_TAG_LANGUAGE] = NULL; i = 0; - while ((tag_event = gst_pad_get_sticky_event(stream->their_src, GST_EVENT_TAG, i++))) + while ((tag_event = gst_pad_get_sticky_event(peer, GST_EVENT_TAG, i++))) { GstTagList *tag_list; @@ -1536,6 +1527,7 @@ static void query_tags(struct wg_parser_stream *stream) gst_event_unref(tag_event); } + gst_object_unref(peer); } static NTSTATUS wg_parser_connect(void *args) @@ -1631,7 +1623,7 @@ static NTSTATUS wg_parser_connect(void *args) pthread_mutex_unlock(&parser->mutex); goto out; } - if (gst_pad_query_duration(stream->their_src, GST_FORMAT_TIME, &duration)) + if (gst_pad_peer_query_duration(stream->my_sink, GST_FORMAT_TIME, &duration)) { stream->duration = duration / 100; break; @@ -1815,7 +1807,6 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) { struct wg_parser_stream *stream; GstElement *element; - int ret; if (!(element = create_element("mpegaudioparse", "good"))) return FALSE; @@ -1828,12 +1819,8 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) if (!(stream = create_stream(parser))) return FALSE; - gst_object_ref(stream->their_src = gst_element_get_static_pad(element, "src")); - if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) - { - GST_ERROR("Failed to link source pads, error %d.", ret); + if (!link_element_to_sink(element, stream->my_sink)) return FALSE; - } gst_pad_set_active(stream->my_sink, 1); parser->no_more_pads = true; @@ -1845,7 +1832,6 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) { struct wg_parser_stream *stream; GstElement *element; - int ret; if (!(element = create_element("wavparse", "good"))) return FALSE; @@ -1858,13 +1844,8 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) if (!(stream = create_stream(parser))) return FALSE; - stream->their_src = gst_element_get_static_pad(element, "src"); - gst_object_ref(stream->their_src); - if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) - { - GST_ERROR("Failed to link source pads, error %d.", ret); + if (!link_element_to_sink(element, stream->my_sink)) return FALSE; - } gst_pad_set_active(stream->my_sink, 1); parser->no_more_pads = true;

1 0

Rémi Bernon : winegstreamer: Free the params structure after setting the pool meta (Valgrind).
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: f3b9ea7aefee4f91c82091e36f01bc7fe21fe213 URL: https://gitlab.winehq.org/wine/wine/-/commit/f3b9ea7aefee4f91c82091e36f01bc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 11 21:02:52 2023 +0200 winegstreamer: Free the params structure after setting the pool meta (Valgrind). --- dlls/winegstreamer/wg_transform.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 2f21e601e0b..bddd1f5fd74 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -134,7 +134,10 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery "padding-left", G_TYPE_UINT, align.padding_left, "padding-right", G_TYPE_UINT, align.padding_right, NULL))) + { gst_query_add_allocation_meta(query, GST_VIDEO_META_API_TYPE, params); + gst_structure_free(params); + } if (!(config = gst_buffer_pool_get_config(pool))) GST_ERROR("Failed to get pool %p config.", pool);

1 0

Rémi Bernon : winegstreamer: Fix the CS cleanup in wg_sample_queue_destroy (Valgrind).
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: 25cb216546d6bcf6cee7b1c89eafab826d89fdb5 URL: https://gitlab.winehq.org/wine/wine/-/commit/25cb216546d6bcf6cee7b1c89eafab… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 11 21:02:30 2023 +0200 winegstreamer: Fix the CS cleanup in wg_sample_queue_destroy (Valgrind). --- dlls/winegstreamer/wg_sample.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_sample.c b/dlls/winegstreamer/wg_sample.c index d4bb7a8b954..ea83440d9ad 100644 --- a/dlls/winegstreamer/wg_sample.c +++ b/dlls/winegstreamer/wg_sample.c @@ -298,7 +298,7 @@ void wg_sample_queue_destroy(struct wg_sample_queue *queue) wg_sample_queue_flush(queue, true); queue->cs.DebugInfo->Spare[0] = 0; - InitializeCriticalSection(&queue->cs); + DeleteCriticalSection(&queue->cs); free(queue); }

1 0

Giovanni Mascellani : winegstreamer: Free the GStreamer buffer when freeing a WG parser stream.
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: 059f79be5dcf0ab55627cfd9a0a9f07bebc55790 URL: https://gitlab.winehq.org/wine/wine/-/commit/059f79be5dcf0ab55627cfd9a0a9f0… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Nov 10 14:42:53 2022 +0100 winegstreamer: Free the GStreamer buffer when freeing a WG parser stream. --- dlls/winegstreamer/wg_parser.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index e80d7501f2c..7776f7287df 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -815,6 +815,13 @@ static void free_stream(struct wg_parser_stream *stream) gst_object_unref(stream->their_src); gst_object_unref(stream->my_sink); + if (stream->buffer) + { + gst_buffer_unmap(stream->buffer, &stream->map_info); + gst_buffer_unref(stream->buffer); + stream->buffer = NULL; + } + pthread_cond_destroy(&stream->event_cond); pthread_cond_destroy(&stream->event_empty_cond);

1 0

Francois Gouget : uiautomationcore/tests: Fix the spelling of a win_skip() message.
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: 4c9e3051328ddb7ca6801e02612e0d0e5206cd1c URL: https://gitlab.winehq.org/wine/wine/-/commit/4c9e3051328ddb7ca6801e02612e0d… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 15 20:57:18 2023 +0200 uiautomationcore/tests: Fix the spelling of a win_skip() message. --- dlls/uiautomationcore/tests/uiautomation.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 35f2f18ffcf..8494f29212c 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -2975,7 +2975,7 @@ static void test_uia_prov_from_acc_ia2(void) CHECK_CALLED(Accessible2_get_accRole); CHECK_CALLED(Accessible2_QI_IAccIdentity); CHECK_CALLED(Accessible2_get_accParent); - win_skip("Win10v1909 doesn't support IAccessible2 interface comparsion, skipping tests.\n"); + win_skip("Win10v1909 doesn't support IAccessible2 interface comparison, skipping tests.\n"); return; } called_Accessible_get_accRole = expect_Accessible_get_accRole = 0; @@ -13188,7 +13188,7 @@ static void test_default_clientside_providers(void) UiaNodeRelease(node); /* - * Create a node repesenting an HWND that is a top-level window, but is + * Create a node representing an HWND that is a top-level window, but is * owned by another window. For top-level HWNDs, parent navigation will go * to the owner instead of the parent. */

1 0

Francois Gouget : dnsapi/tests: Ignore OPT records in the CNAME tests.
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: 477df6231a6175f10c0f37145f609932ed35ea2d URL: https://gitlab.winehq.org/wine/wine/-/commit/477df6231a6175f10c0f37145f6099… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 16 03:08:33 2023 +0200 dnsapi/tests: Ignore OPT records in the CNAME tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54848 --- dlls/dnsapi/tests/query.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index e4a821e1ce8..61b7ef093c3 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -110,7 +110,7 @@ static void test_DnsQuery(void) { ok(wcscmp(domain, ptr->pName), "did not expect a record for %s\n", wine_dbgstr_w(ptr->pName)); - ok(ptr->wType == DNS_TYPE_A || ptr->wType == DNS_TYPE_AAAA, + ok(ptr->wType == DNS_TYPE_A || ptr->wType == DNS_TYPE_AAAA || ptr->wType == DNS_TYPE_OPT, "unexpected record type %d\n", ptr->wType); ptr = ptr->pNext; } @@ -145,10 +145,13 @@ static void test_DnsQuery(void) while (ptr) { - ok(wcscmp(domain, ptr->pName), "did not expect a record for %s\n", - wine_dbgstr_w(ptr->pName)); - ok(ptr->wType == DNS_TYPE_A || ptr->wType == DNS_TYPE_AAAA, - "unexpected record type %d\n", ptr->wType); + if (ptr->wType != DNS_TYPE_OPT) + { + ok(wcscmp(domain, ptr->pName), "did not expect a record for %s\n", + wine_dbgstr_w(ptr->pName)); + ok(ptr->wType == DNS_TYPE_A || ptr->wType == DNS_TYPE_AAAA, + "unexpected record type %d\n", ptr->wType); + } ptr = ptr->pNext; } DnsRecordListFree(rec, DnsFreeRecordList);

1 0