November 2023 - Wine-Commits

Torge Matthies : winemac.drv: Set PFD_SUPPORT_COMPOSITION for hardware-accelerated pixel formats.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 7eb0c463faf683968da840a2e6d627d3f018f7aa URL: https://gitlab.winehq.org/wine/wine/-/commit/7eb0c463faf683968da840a2e6d627… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Sat Nov 25 15:13:31 2023 +0100 winemac.drv: Set PFD_SUPPORT_COMPOSITION for hardware-accelerated pixel formats. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53500 --- dlls/winemac.drv/opengl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 55e5704724b..f78454ed149 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -4326,6 +4326,7 @@ static int macdrv_wglDescribePixelFormat(HDC hdc, int fmt, UINT size, PIXELFORMA descr->dwFlags = PFD_SUPPORT_OPENGL; if (pf->window) descr->dwFlags |= PFD_DRAW_TO_WINDOW; if (!pf->accelerated) descr->dwFlags |= PFD_GENERIC_FORMAT; + else descr->dwFlags |= PFD_SUPPORT_COMPOSITION; if (pf->double_buffer) descr->dwFlags |= PFD_DOUBLEBUFFER; if (pf->stereo) descr->dwFlags |= PFD_STEREO; if (pf->backing_store) descr->dwFlags |= PFD_SWAP_COPY;

1 0

Fabian Maurer : user32: Add stub for GetThreadDpiHostingBehavior.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 85e355ddf3119763106b2f5b99d3b1fa2495fd56 URL: https://gitlab.winehq.org/wine/wine/-/commit/85e355ddf3119763106b2f5b99d3b1… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Nov 25 22:50:15 2023 +0100 user32: Add stub for GetThreadDpiHostingBehavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55892 --- dlls/user32/sysparams.c | 9 +++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index bc78c1fef88..8f0afe51be3 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -746,6 +746,15 @@ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT return ULongToHandle( prev ); } +/********************************************************************** + * GetThreadDpiHostingBehavior (USER32.@) + */ +DPI_HOSTING_BEHAVIOR WINAPI GetThreadDpiHostingBehavior( void ) +{ + FIXME("(): stub\n"); + return DPI_HOSTING_BEHAVIOR_DEFAULT; +} + /********************************************************************** * SetThreadDpiHostingBehavior (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 9f9f03041b4..e1f6ff93c1a 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -395,6 +395,7 @@ @ stdcall GetTaskmanWindow () @ stdcall GetThreadDesktop(long) NtUserGetThreadDesktop @ stdcall GetThreadDpiAwarenessContext() +@ stdcall GetThreadDpiHostingBehavior() @ stdcall GetTitleBarInfo(long ptr) NtUserGetTitleBarInfo @ stdcall GetTopWindow(long) @ stdcall GetTouchInputInfo(long long ptr long) diff --git a/include/winuser.h b/include/winuser.h index ee0f05e1cb8..ca7176e9f15 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4282,6 +4282,7 @@ WINUSERAPI DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,INT,INT,const INT WINUSERAPI BOOL WINAPI GetTitleBarInfo(HWND,PTITLEBARINFO); WINUSERAPI HDESK WINAPI GetThreadDesktop(DWORD); WINUSERAPI DPI_AWARENESS_CONTEXT WINAPI GetThreadDpiAwarenessContext(void); +WINUSERAPI DPI_HOSTING_BEHAVIOR WINAPI GetThreadDpiHostingBehavior(void); WINUSERAPI HWND WINAPI GetTopWindow(HWND); WINUSERAPI BOOL WINAPI GetTouchInputInfo(HTOUCHINPUT,UINT,TOUCHINPUT*,int); WINUSERAPI BOOL WINAPI GetUpdateRect(HWND,LPRECT,BOOL);

1 0

Fabian Maurer : user32: Fix spec entry for SetThreadDpiHostingBehavior.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: a5754a4f2faf2c3226e5b3f9a9ff341d66cf1a0a URL: https://gitlab.winehq.org/wine/wine/-/commit/a5754a4f2faf2c3226e5b3f9a9ff34… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Nov 25 22:51:42 2023 +0100 user32: Fix spec entry for SetThreadDpiHostingBehavior. --- dlls/user32/user32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index e1f6ff93c1a..f6651c6c9e6 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -721,7 +721,7 @@ @ stdcall SetTaskmanWindow (long) @ stdcall SetThreadDesktop(long) NtUserSetThreadDesktop @ stdcall SetThreadDpiAwarenessContext(ptr) -@ stdcall SetThreadDpiHostingBehavior(ptr) +@ stdcall SetThreadDpiHostingBehavior(long) @ stdcall SetTimer(long long long ptr) @ stdcall SetUserObjectInformationA(long long ptr long) @ stdcall SetUserObjectInformationW(long long ptr long) NtUserSetObjectInformation

1 0

Ziqing Hui : winestreamer: Implement {Begin,End}Finalize for media sink.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: e36547d26d5c67df55d3797d32ca7a39d91ee802 URL: https://gitlab.winehq.org/wine/wine/-/commit/e36547d26d5c67df55d3797d32ca7a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Aug 18 09:42:57 2023 +0800 winestreamer: Implement {Begin,End}Finalize for media sink. --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/main.c | 15 ++++++++ dlls/winegstreamer/media_sink.c | 72 ++++++++++++++++++++++++++++++++++++--- dlls/winegstreamer/unix_private.h | 1 + dlls/winegstreamer/unixlib.h | 1 + dlls/winegstreamer/wg_muxer.c | 6 ++++ dlls/winegstreamer/wg_parser.c | 2 ++ 7 files changed, 94 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 26873edb74b..a7f2b8b1e6b 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -116,6 +116,7 @@ HRESULT wg_muxer_add_stream(wg_muxer_t muxer, UINT32 stream_id, const struct wg_ HRESULT wg_muxer_start(wg_muxer_t muxer); HRESULT wg_muxer_push_sample(wg_muxer_t muxer, struct wg_sample *sample, UINT32 stream_id); HRESULT wg_muxer_read_data(wg_muxer_t muxer, void *buffer, UINT32 *size, UINT64 *offset); +HRESULT wg_muxer_finalize(wg_muxer_t muxer); unsigned int wg_format_get_bytes_for_uncompressed(wg_video_format format, unsigned int width, unsigned int height); unsigned int wg_format_get_max_size(const struct wg_format *format); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 900905be0d9..d264b9a77e0 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -567,6 +567,21 @@ HRESULT wg_muxer_read_data(wg_muxer_t muxer, void *buffer, UINT32 *size, UINT64 return HRESULT_FROM_NT(status); } +HRESULT wg_muxer_finalize(wg_muxer_t muxer) +{ + NTSTATUS status; + + TRACE("muxer %#I64x.\n", muxer); + + if ((status = WINE_UNIX_CALL(unix_wg_muxer_finalize, &muxer))) + { + WARN("Failed to finalize, status %#lx.\n", status); + return HRESULT_FROM_NT(status); + } + + return S_OK; +} + #define ALIGN(n, alignment) (((n) + (alignment) - 1) & ~((alignment) - 1)) unsigned int wg_format_get_stride(const struct wg_format *format) diff --git a/dlls/winegstreamer/media_sink.c b/dlls/winegstreamer/media_sink.c index c24e9b9a13f..6c8d69f73df 100644 --- a/dlls/winegstreamer/media_sink.c +++ b/dlls/winegstreamer/media_sink.c @@ -32,6 +32,7 @@ enum async_op ASYNC_STOP, ASYNC_PAUSE, ASYNC_PROCESS, + ASYNC_FINALIZE, }; struct async_command @@ -48,6 +49,10 @@ struct async_command IMFSample *sample; UINT32 stream_id; } process; + struct + { + IMFAsyncResult *result; + } finalize; } u; }; @@ -80,6 +85,7 @@ struct media_sink STATE_STARTED, STATE_STOPPED, STATE_PAUSED, + STATE_FINALIZED, STATE_SHUTDOWN, } state; @@ -155,6 +161,8 @@ static ULONG WINAPI async_command_Release(IUnknown *iface) { if (command->op == ASYNC_PROCESS && command->u.process.sample) IMFSample_Release(command->u.process.sample); + else if (command->op == ASYNC_FINALIZE && command->u.finalize.result) + IMFAsyncResult_Release(command->u.finalize.result); free(command); } @@ -631,6 +639,51 @@ static HRESULT media_sink_process(struct media_sink *media_sink, IMFSample *samp return hr; } +static HRESULT media_sink_begin_finalize(struct media_sink *media_sink, IMFAsyncCallback *callback, IUnknown *state) +{ + struct async_command *command; + IMFAsyncResult *result; + HRESULT hr; + + if (media_sink->state == STATE_SHUTDOWN) + return MF_E_SHUTDOWN; + if (!callback) + return S_OK; + + if (FAILED(hr = async_command_create(ASYNC_FINALIZE, &command))) + return hr; + + if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) + { + IUnknown_Release(&command->IUnknown_iface); + return hr; + } + IMFAsyncResult_AddRef((command->u.finalize.result = result)); + + hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, + &media_sink->async_callback, &command->IUnknown_iface); + IUnknown_Release(&command->IUnknown_iface); + + return hr; +} + +static HRESULT media_sink_finalize(struct media_sink *media_sink, IMFAsyncResult *result) +{ + HRESULT hr; + + media_sink->state = STATE_FINALIZED; + + hr = wg_muxer_finalize(media_sink->muxer); + + if (SUCCEEDED(hr)) + hr = media_sink_write_stream(media_sink); + + IMFAsyncResult_SetStatus(result, hr); + MFInvokeCallback(result); + + return hr; +} + static HRESULT WINAPI media_sink_QueryInterface(IMFFinalizableMediaSink *iface, REFIID riid, void **obj) { struct media_sink *media_sink = impl_from_IMFFinalizableMediaSink(iface); @@ -870,16 +923,23 @@ static HRESULT WINAPI media_sink_Shutdown(IMFFinalizableMediaSink *iface) static HRESULT WINAPI media_sink_BeginFinalize(IMFFinalizableMediaSink *iface, IMFAsyncCallback *callback, IUnknown *state) { - FIXME("iface %p, callback %p, state %p stub!\n", iface, callback, state); + struct media_sink *media_sink = impl_from_IMFFinalizableMediaSink(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, callback %p, state %p.\n", iface, callback, state); + + EnterCriticalSection(&media_sink->cs); + hr = media_sink_begin_finalize(media_sink, callback, state); + LeaveCriticalSection(&media_sink->cs); + + return hr; } static HRESULT WINAPI media_sink_EndFinalize(IMFFinalizableMediaSink *iface, IMFAsyncResult *result) { - FIXME("iface %p, result %p stub!\n", iface, result); + TRACE("iface %p, result %p.\n", iface, result); - return E_NOTIMPL; + return result ? IMFAsyncResult_GetStatus(result) : E_INVALIDARG; } static const IMFFinalizableMediaSinkVtbl media_sink_vtbl = @@ -1136,6 +1196,10 @@ static HRESULT WINAPI media_sink_callback_Invoke(IMFAsyncCallback *iface, IMFAsy if (FAILED(hr = media_sink_process(media_sink, command->u.process.sample, command->u.process.stream_id))) WARN("Failed to process sample, hr %#lx.\n", hr); break; + case ASYNC_FINALIZE: + if (FAILED(hr = media_sink_finalize(media_sink, command->u.finalize.result))) + WARN("Failed to finalize, hr %#lx.\n", hr); + break; default: WARN("Unsupported op %u.\n", command->op); break; diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h index 070e1285b38..5162c8d5863 100644 --- a/dlls/winegstreamer/unix_private.h +++ b/dlls/winegstreamer/unix_private.h @@ -71,6 +71,7 @@ extern NTSTATUS wg_muxer_add_stream(void *args) DECLSPEC_HIDDEN; extern NTSTATUS wg_muxer_start(void *args) DECLSPEC_HIDDEN; extern NTSTATUS wg_muxer_push_sample(void *args) DECLSPEC_HIDDEN; extern NTSTATUS wg_muxer_read_data(void *args) DECLSPEC_HIDDEN; +extern NTSTATUS wg_muxer_finalize(void *args) DECLSPEC_HIDDEN; /* wg_allocator.c */ diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 7a2a4a8da2f..86bd380c351 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -446,6 +446,7 @@ enum unix_funcs unix_wg_muxer_start, unix_wg_muxer_push_sample, unix_wg_muxer_read_data, + unix_wg_muxer_finalize, unix_wg_funcs_count, }; diff --git a/dlls/winegstreamer/wg_muxer.c b/dlls/winegstreamer/wg_muxer.c index c0614807459..bbe4d4d1f9d 100644 --- a/dlls/winegstreamer/wg_muxer.c +++ b/dlls/winegstreamer/wg_muxer.c @@ -523,3 +523,9 @@ NTSTATUS wg_muxer_read_data(void *args) return STATUS_SUCCESS; } + +NTSTATUS wg_muxer_finalize(void *args) +{ + GST_FIXME("Not implemented."); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 84bb65dbccd..b73dde18d55 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1922,6 +1922,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = X(wg_muxer_start), X(wg_muxer_push_sample), X(wg_muxer_read_data), + X(wg_muxer_finalize), }; C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_wg_funcs_count); @@ -2253,6 +2254,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = X(wg_muxer_start), X64(wg_muxer_push_sample), X64(wg_muxer_read_data), + X(wg_muxer_finalize), }; C_ASSERT(ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_wg_funcs_count);

1 0

Ziqing Hui : winegstreamer: Implement wg_muxer_finalize.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: b496a354fab1d662267241e6237854aa2153fb5a URL: https://gitlab.winehq.org/wine/wine/-/commit/b496a354fab1d662267241e6237854… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 9 11:18:41 2023 +0800 winegstreamer: Implement wg_muxer_finalize. --- dlls/winegstreamer/wg_muxer.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/wg_muxer.c b/dlls/winegstreamer/wg_muxer.c index bbe4d4d1f9d..0055d9ef16c 100644 --- a/dlls/winegstreamer/wg_muxer.c +++ b/dlls/winegstreamer/wg_muxer.c @@ -63,6 +63,9 @@ struct wg_muxer GstBuffer *buffer; pthread_mutex_t mutex; + pthread_cond_t cond; + + bool eos; guint64 offset; /* Write offset of the output buffer generated by muxer. */ struct list streams; @@ -175,6 +178,13 @@ static gboolean muxer_sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *ev switch (event->type) { + case GST_EVENT_EOS: + pthread_mutex_lock(&muxer->mutex); + muxer->eos = true; + pthread_mutex_unlock(&muxer->mutex); + pthread_cond_signal(&muxer->cond); + break; + case GST_EVENT_SEGMENT: pthread_mutex_lock(&muxer->mutex); @@ -248,6 +258,7 @@ NTSTATUS wg_muxer_create(void *args) list_init(&muxer->streams); muxer->offset = GST_BUFFER_OFFSET_NONE; pthread_mutex_init(&muxer->mutex, NULL); + pthread_cond_init(&muxer->cond, NULL); if (!(muxer->container = gst_bin_new("wg_muxer"))) goto out; if (!(muxer->output_queue = gst_atomic_queue_new(8))) @@ -287,6 +298,7 @@ out: gst_atomic_queue_unref(muxer->output_queue); if (muxer->container) gst_object_unref(muxer->container); + pthread_cond_destroy(&muxer->cond); pthread_mutex_destroy(&muxer->mutex); free(muxer); @@ -317,6 +329,7 @@ NTSTATUS wg_muxer_destroy(void *args) gst_element_set_state(muxer->container, GST_STATE_NULL); gst_object_unref(muxer->container); + pthread_cond_destroy(&muxer->cond); pthread_mutex_destroy(&muxer->mutex); free(muxer); @@ -526,6 +539,22 @@ NTSTATUS wg_muxer_read_data(void *args) NTSTATUS wg_muxer_finalize(void *args) { - GST_FIXME("Not implemented."); - return STATUS_NOT_IMPLEMENTED; + struct wg_muxer *muxer = get_muxer(*(wg_muxer_t *)args); + struct wg_muxer_stream *stream; + + /* Notify each stream of EOS. */ + LIST_FOR_EACH_ENTRY(stream, &muxer->streams, struct wg_muxer_stream, entry) + { + if (!push_event(stream->my_src, gst_event_new_segment_done(GST_FORMAT_BYTES, -1)) + || !push_event(stream->my_src, gst_event_new_eos())) + return STATUS_UNSUCCESSFUL; + } + + /* Wait for muxer EOS. */ + pthread_mutex_lock(&muxer->mutex); + while (!muxer->eos) + pthread_cond_wait(&muxer->cond, &muxer->mutex); + pthread_mutex_unlock(&muxer->mutex); + + return STATUS_SUCCESS; }

1 0

Ziqing Hui : winegstreamer: Avoid media sink command leaking.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 7e575d681d8586b50c218bc6dd25c5260221234d URL: https://gitlab.winehq.org/wine/wine/-/commit/7e575d681d8586b50c218bc6dd25c5… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Nov 24 09:13:01 2023 +0800 winegstreamer: Avoid media sink command leaking. --- dlls/winegstreamer/media_sink.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/media_sink.c b/dlls/winegstreamer/media_sink.c index 6996d689e83..c24e9b9a13f 100644 --- a/dlls/winegstreamer/media_sink.c +++ b/dlls/winegstreamer/media_sink.c @@ -344,8 +344,9 @@ static HRESULT WINAPI stream_sink_ProcessSample(IMFStreamSink *iface, IMFSample IMFSample_AddRef((command->u.process.sample = sample)); command->u.process.stream_id = stream_sink->id; - if (FAILED(hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &media_sink->async_callback, &command->IUnknown_iface))) - IUnknown_Release(&command->IUnknown_iface); + hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, + &media_sink->async_callback, &command->IUnknown_iface); + IUnknown_Release(&command->IUnknown_iface); LeaveCriticalSection(&media_sink->cs); @@ -525,7 +526,11 @@ static HRESULT media_sink_queue_command(struct media_sink *media_sink, enum asyn if (FAILED(hr = async_command_create(op, &command))) return hr; - return MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &media_sink->async_callback, &command->IUnknown_iface); + hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, + &media_sink->async_callback, &command->IUnknown_iface); + IUnknown_Release(&command->IUnknown_iface); + + return hr; } static HRESULT media_sink_queue_stream_event(struct media_sink *media_sink, MediaEventType type)

1 0

Nikolay Sivov : d3dx9/tests: Fix a crash when d3d9 object can't be created.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: c944db5fc049bc6284b9619e487bc2ccd06f49bd URL: https://gitlab.winehq.org/wine/wine/-/commit/c944db5fc049bc6284b9619e487bc2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 24 21:52:49 2023 +0100 d3dx9/tests: Fix a crash when d3d9 object can't be created. --- dlls/d3dx9_36/tests/math.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 409fa2c7dcb..3345c412481 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -4480,9 +4480,14 @@ static void test_D3DXSHProjectCubeMap(void) {-1.10743945e+3f, -9.43649292e+2f, 5.48424316e+2f, 1.65352710e+3f}}, }; - window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d, "Failed to create a D3D object.\n"); + if (!d3d) + { + skip("Failed to create a D3D object.\n"); + return; + } + + window = create_window(); if (!(device = create_device(d3d, window))) { skip("Failed to create a D3D device, skipping tests.\n");

1 0

Anton Baskanov : amstream/tests: Test IEnumPins with two streams.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 150463b39b5b06312d8a6f06a41a6131dc61ce98 URL: https://gitlab.winehq.org/wine/wine/-/commit/150463b39b5b06312d8a6f06a41a61… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Nov 27 17:50:54 2023 +0700 amstream/tests: Test IEnumPins with two streams. --- dlls/amstream/tests/amstream.c | 65 +++++++++++++++++++++++++++++++----------- 1 file changed, 49 insertions(+), 16 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a2f27c1b557..e75bddfc7d1 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1839,10 +1839,10 @@ static void test_media_streams(void) static void test_enum_pins(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IMediaStream *stream0, *stream1; + IPin *pins[3], *pin0, *pin1; IMediaStreamFilter *filter; IEnumPins *enum1, *enum2; - IMediaStream *stream; - IPin *pins[3], *pin; ULONG ref, count; HRESULT hr; @@ -1877,9 +1877,13 @@ static void test_enum_pins(void) hr = IEnumPins_Skip(enum1, 1); ok(hr == S_FALSE, "Got hr %#lx.\n", hr); - hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream0); ok(hr == S_OK, "Got hr %#lx.\n", hr); - hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMediaStream_QueryInterface(stream0, &IID_IPin, (void **)&pin0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMediaStream_QueryInterface(stream1, &IID_IPin, (void **)&pin1); ok(hr == S_OK, "Got hr %#lx.\n", hr); /* Reset() isn't enough; we have to call EnumPins() again to see the updated @@ -1899,20 +1903,33 @@ static void test_enum_pins(void) ok(ref == 4, "Got unexpected refcount %ld.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %ld.\n", ref); - ref = get_refcount(pin); + ref = get_refcount(pin0); + ok(ref == 4, "Got unexpected refcount %ld.\n", ref); + ref = get_refcount(pin1); ok(ref == 4, "Got unexpected refcount %ld.\n", ref); hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); - ok(pins[0] == pin, "Expected pin %p, got %p.\n", pin, pins[0]); + ok(pins[0] == pin0, "Expected pin %p, got %p.\n", pin0, pins[0]); ref = get_refcount(filter); ok(ref == 4, "Got unexpected refcount %ld.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %ld.\n", ref); - ref = get_refcount(pin); + ref = get_refcount(pin0); ok(ref == 5, "Got unexpected refcount %ld.\n", ref); IPin_Release(pins[0]); + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine ok(pins[0] == pin1, "Expected pin %p, got %p.\n", pin1, pins[0]); + ref = get_refcount(filter); + ok(ref == 4, "Got unexpected refcount %ld.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %ld.\n", ref); + ref = get_refcount(pin1); + todo_wine ok(ref == 5, "Got unexpected refcount %ld.\n", ref); + IPin_Release(pins[0]); + hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_FALSE, "Got hr %#lx.\n", hr); @@ -1922,20 +1939,28 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, &count); ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(count == 1, "Got count %lu.\n", count); - ok(pins[0] == pin, "Expected pin %p, got %p.\n", pin, pins[0]); + ok(pins[0] == pin0, "Expected pin %p, got %p.\n", pin0, pins[0]); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count == 1, "Got count %lu.\n", count); + todo_wine ok(pins[0] == pin1, "Expected pin %p, got %p.\n", pin1, pins[0]); IPin_Release(pins[0]); hr = IEnumPins_Reset(enum1); ok(hr == S_OK, "Got hr %#lx.\n", hr); - hr = IEnumPins_Next(enum1, 2, pins, NULL); + hr = IEnumPins_Next(enum1, 3, pins, NULL); ok(hr == E_POINTER, "Got hr %#lx.\n", hr); - hr = IEnumPins_Next(enum1, 2, pins, &count); + hr = IEnumPins_Next(enum1, 3, pins, &count); ok(hr == S_FALSE, "Got hr %#lx.\n", hr); - ok(count == 1, "Got count %lu.\n", count); - ok(pins[0] == pin, "Expected pin %p, got %p.\n", pin, pins[0]); + ok(count == 2, "Got count %lu.\n", count); + ok(pins[0] == pin0, "Expected pin %p, got %p.\n", pin0, pins[0]); + ok(pins[1] == pin1, "Expected pin %p, got %p.\n", pin1, pins[1]); IPin_Release(pins[0]); + IPin_Release(pins[1]); hr = IEnumPins_Reset(enum1); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -1946,7 +1971,7 @@ static void test_enum_pins(void) hr = IEnumPins_Skip(enum1, 0); ok(hr == S_OK, "Got hr %#lx.\n", hr); - hr = IEnumPins_Skip(enum1, 1); + hr = IEnumPins_Skip(enum1, 2); ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IEnumPins_Next(enum1, 1, pins, NULL); @@ -1954,7 +1979,12 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum2, 1, pins, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); - ok(pins[0] == pin, "Expected pin %p, got %p.\n", pin, pins[0]); + ok(pins[0] == pin0, "Expected pin %p, got %p.\n", pin0, pins[0]); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine ok(pins[0] == pin1, "Expected pin %p, got %p.\n", pin1, pins[0]); IPin_Release(pins[0]); IEnumPins_Release(enum2); @@ -1963,8 +1993,11 @@ static void test_enum_pins(void) IMediaStreamFilter_Release(filter); ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %ld.\n", ref); - IMediaStream_Release(stream); - ref = IPin_Release(pin); + IMediaStream_Release(stream1); + IMediaStream_Release(stream0); + ref = IPin_Release(pin1); + ok(!ref, "Got outstanding refcount %ld.\n", ref); + ref = IPin_Release(pin0); ok(!ref, "Got outstanding refcount %ld.\n", ref); }

1 0

Matteo Bruni : tools: Print the correct option in error messages.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 5d1995500792eaece879fcc84a952ed1a7eeab87 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d1995500792eaece879fcc84a952e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 24 21:48:06 2023 +0100 tools: Print the correct option in error messages. --- tools/tools.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools.h b/tools/tools.h index 67b13a0ed55..5372b5bd303 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -773,7 +773,7 @@ static inline struct strarray parse_options( int argc, char **argv, const char * char *start, *end; int i; -#define OPT_ERR(fmt) { callback( '?', strmake( fmt, argv[1] )); continue; } +#define OPT_ERR(fmt) { callback( '?', strmake( fmt, argv[i] )); continue; } for (i = 1; i < argc; i++) {

1 0

Anton Baskanov : winegstreamer: Wake all streaming threads after seeking.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 54aef5993141e415aa8858865a797543fc09dfdd URL: https://gitlab.winehq.org/wine/wine/-/commit/54aef5993141e415aa8858865a7975… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sun Nov 26 18:53:25 2023 +0700 winegstreamer: Wake all streaming threads after seeking. --- dlls/winegstreamer/quartz_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 596f7a5011a..e402e1aab52 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1895,7 +1895,7 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, EnterCriticalSection(&filter->streaming_cs); filter->flushing = false; LeaveCriticalSection(&filter->streaming_cs); - WakeConditionVariable(&filter->flushing_cv); + WakeAllConditionVariable(&filter->flushing_cv); return S_OK; }

1 0