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

Rémi Bernon : mfplat/tests: Create the test_callback event in the constructor.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: 848fe4a741ba194c50cc4517f23dc950104f62f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/848fe4a741ba194c50cc4517f23dc9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 8 15:42:20 2023 +0200 mfplat/tests: Create the test_callback event in the constructor. --- dlls/mfplat/tests/mfplat.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 39fdb665bbf..0f4ae026228 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -521,7 +521,10 @@ static ULONG WINAPI testcallback_Release(IMFAsyncCallback *iface) ULONG refcount = InterlockedDecrement(&callback->refcount); if (!refcount) + { + CloseHandle(callback->event); free(callback); + } return refcount; } @@ -804,6 +807,7 @@ static struct test_callback * create_test_callback(const IMFAsyncCallbackVtbl *v callback->IMFAsyncCallback_iface.lpVtbl = vtbl ? vtbl : &testcallbackvtbl; callback->refcount = 1; + callback->event = CreateEventA(NULL, FALSE, FALSE, NULL); return callback; } @@ -816,7 +820,6 @@ static BOOL get_event(IMFMediaEventGenerator *generator, MediaEventType expected HRESULT hr; callback = create_test_callback(&events_callback_vtbl); - callback->event = CreateEventA(NULL, FALSE, FALSE, NULL); for (;;) { @@ -847,7 +850,6 @@ static BOOL get_event(IMFMediaEventGenerator *generator, MediaEventType expected } } - CloseHandle(callback->event); if (callback->media_event) IMFMediaEvent_Release(callback->media_event); IMFAsyncCallback_Release(&callback->IMFAsyncCallback_iface); @@ -937,7 +939,6 @@ static void test_source_resolver(void) IMFByteStream_Release(stream); /* Create from URL. */ - callback->event = CreateEventA(NULL, FALSE, FALSE, NULL); hr = IMFSourceResolver_CreateObjectFromURL(resolver, L"nonexisting.mp4", MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, (IUnknown **)&stream); @@ -1234,7 +1235,6 @@ static void test_source_resolver(void) (void **)&scheme_handler); ok(hr == S_OK, "Failed to create handler object, hr %#lx.\n", hr); - callback2->event = callback->event; cancel_cookie = NULL; hr = IMFSchemeHandler_BeginCreateObject(scheme_handler, pathW, MF_RESOLUTION_MEDIASOURCE, NULL, &cancel_cookie, &callback2->IMFAsyncCallback_iface, (IUnknown *)scheme_handler); @@ -1249,8 +1249,6 @@ static void test_source_resolver(void) if (do_uninit) CoUninitialize(); - CloseHandle(callback->event); - IMFSourceResolver_Release(resolver); hr = MFShutdown(); @@ -3524,16 +3522,12 @@ static void test_event_queue(void) hr = IMFMediaEventQueue_BeginGetEvent(queue, &callback2->IMFAsyncCallback_iface, (IUnknown *)&callback->IMFAsyncCallback_iface); ok(hr == MF_E_MULTIPLE_SUBSCRIBERS, "Unexpected hr %#lx.\n", hr); - callback->event = CreateEventA(NULL, FALSE, FALSE, NULL); - hr = IMFMediaEventQueue_QueueEvent(queue, event); ok(hr == S_OK, "Failed to queue event, hr %#lx.\n", hr); ret = WaitForSingleObject(callback->event, 500); ok(ret == WAIT_OBJECT_0, "Unexpected return value %#lx.\n", ret); - CloseHandle(callback->event); - IMFMediaEvent_Release(event); hr = MFCreateAsyncResult(NULL, &callback->IMFAsyncCallback_iface, NULL, &result); @@ -4957,8 +4951,6 @@ static void test_async_create_file(void) hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "Fail to start up, hr %#lx.\n", hr); - callback->event = CreateEventA(NULL, FALSE, FALSE, NULL); - GetTempPathW(ARRAY_SIZE(pathW), pathW); GetTempFileNameW(pathW, NULL, 0, fileW); @@ -4971,8 +4963,6 @@ static void test_async_create_file(void) IUnknown_Release(cancel_cookie); - CloseHandle(callback->event); - hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); @@ -5856,7 +5846,6 @@ static void test_queue_com_state(const char *name) HRESULT hr; callback = create_test_callback(&test_queue_com_state_callback_vtbl); - callback->event = CreateEventA(NULL, FALSE, FALSE, NULL); hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr); @@ -5888,8 +5877,6 @@ static void test_queue_com_state(const char *name) } } - CloseHandle(callback->event); - hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr);

1 0

Zebediah Figura : configure: Fail if --enable-archs is used and any cross-compiler is missing.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: cda2886fd3018c9e8c12791238db481b528f6a65 URL: https://gitlab.winehq.org/wine/wine/-/commit/cda2886fd3018c9e8c12791238db48… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Aug 12 17:43:08 2023 -0500 configure: Fail if --enable-archs is used and any cross-compiler is missing. For example, currently, if --enable-archs=i386,x86_64 is used, and there is an x86_64 cross compiler present but no i386 cross compiler, Wine will silently remove i386 from the list of cross-compiled architechtures, and only compile PE code for x86_64. This seems quite undesirable. I am not aware of any practical reason for this to happen. Debian does ship i686 and x86_64 MinGW compilers in separate packages, though, so it is possible in theory. --- configure | 33 ++++++++++++++++----------------- configure.ac | 18 ++++++++++-------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/configure b/configure index d5e699ca7d9..829741a5c0e 100755 --- a/configure +++ b/configure @@ -10512,11 +10512,6 @@ test -n "$x86_64_CC" || x86_64_CC="false" esac fi - if eval test \"x\$"${wine_arch}_CC"\" = x"false" -then : - continue -fi - saved_CC=$CC saved_CFLAGS=$CFLAGS saved_LDFLAGS=$LDFLAGS @@ -10531,7 +10526,11 @@ fi target="" as_wine_cv_crosscc=`printf "%s\n" "ac_cv_${wine_arch}_crosscc" | $as_tr_sh` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC works" >&5 + if eval test \"x\$"${wine_arch}_CC"\" = x"false" +then : + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC works" >&5 printf %s "checking whether $CC works... " >&6; } if eval test \${$as_wine_cv_crosscc+y} then : @@ -10559,6 +10558,7 @@ fi eval ac_res=\$$as_wine_cv_crosscc { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 printf "%s\n" "$ac_res" >&6; } +fi if eval test \"x\$"$as_wine_cv_crosscc"\" = x"yes" then : set x $CC @@ -10627,6 +10627,11 @@ fi if test -z "$target" then + if test ${enable_archs+y} +then : + as_fn_error $? "MinGW $wine_arch compiler not found. +This is an error since --enable-archs=$wine_arch was requested." "$LINENO" 5 +fi CC=$saved_CC CFLAGS=$saved_CFLAGS LDFLAGS=$saved_LDFLAGS @@ -10676,6 +10681,11 @@ printf "%s\n" "unsupported" >&6; } CC=$saved_CC CFLAGS=$saved_CFLAGS LDFLAGS=$saved_LDFLAGS + if test ${enable_archs+y} +then : + as_fn_error $? "MinGW $wine_arch compiler supporting C99 not found. +This is an error since --enable-archs=$wine_arch was requested." "$LINENO" 5 +fi continue ;; x*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $res" >&5 @@ -11648,17 +11658,6 @@ if test $HOST_ARCH = aarch64 then test "x$PE_ARCHS" != x || as_fn_error $? "PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw." "$LINENO" 5 DLLEXT="" -else - if test "x$PE_ARCHS" = "x" -then : - case "x$with_mingw" in - x) as_fn_append wine_notices "|MinGW compiler not found, cross-compiling PE files won't be supported." ;; - xno) ;; - *) as_fn_error $? "MinGW compiler not found, cross-compiling PE files won't be supported. -This is an error since --with-mingw was requested." "$LINENO" 5 ;; -esac - -fi fi diff --git a/configure.ac b/configure.ac index 0a683212866..90f4fd3809d 100644 --- a/configure.ac +++ b/configure.ac @@ -849,8 +849,6 @@ do ;; esac]) - AS_VAR_IF([${wine_arch}_CC],[false],[continue]) - saved_CC=$CC saved_CFLAGS=$CFLAGS saved_LDFLAGS=$LDFLAGS @@ -864,9 +862,10 @@ do target="" AS_VAR_PUSHDEF([wine_cv_crosscc],[ac_cv_${wine_arch}_crosscc]) - AC_CACHE_CHECK([whether $CC works],[wine_cv_crosscc], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], - [AS_VAR_SET([wine_cv_crosscc],[yes])],[AS_VAR_SET([wine_cv_crosscc],[no])])]) + AS_VAR_IF([${wine_arch}_CC],[false],[], + [AC_CACHE_CHECK([whether $CC works],[wine_cv_crosscc], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], + [AS_VAR_SET([wine_cv_crosscc],[yes])],[AS_VAR_SET([wine_cv_crosscc],[no])])])]) AS_VAR_IF([wine_cv_crosscc],[yes], [set x $CC shift @@ -903,6 +902,9 @@ do if test -z "$target" then + AS_VAR_SET_IF([enable_archs], + [AC_MSG_ERROR([MinGW $wine_arch compiler not found. +This is an error since --enable-archs=$wine_arch was requested.])]) CC=$saved_CC CFLAGS=$saved_CFLAGS LDFLAGS=$saved_LDFLAGS @@ -930,6 +932,9 @@ do CC=$saved_CC CFLAGS=$saved_CFLAGS LDFLAGS=$saved_LDFLAGS + AS_VAR_SET_IF([enable_archs], + [AC_MSG_ERROR([MinGW $wine_arch compiler supporting C99 not found. +This is an error since --enable-archs=$wine_arch was requested.])]) continue ;; x*) AC_MSG_RESULT([$res]) @@ -1009,9 +1014,6 @@ if test $HOST_ARCH = aarch64 then test "x$PE_ARCHS" != x || AC_MSG_ERROR([PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw.]) DLLEXT="" -else - WINE_NOTICE_WITH(mingw,[test "x$PE_ARCHS" = "x"], - [MinGW compiler not found, cross-compiling PE files won't be supported.]) fi dnl **** External libraries ****

1 0

Santino Mazza : evr: Remove process input handling from streaming thread.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: f8cf88dcf4e23e23b087e95eda746348aff24ad5 URL: https://gitlab.winehq.org/wine/wine/-/commit/f8cf88dcf4e23e23b087e95eda7463… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Thu Aug 3 12:23:17 2023 -0300 evr: Remove process input handling from streaming thread. --- dlls/evr/presenter.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 3ae9b24ad4a..2dc01608caf 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -55,7 +55,6 @@ enum streaming_thread_message { EVRM_STOP = WM_USER, EVRM_PRESENT = WM_USER + 1, - EVRM_PROCESS_INPUT = WM_USER + 2, }; struct sample_queue @@ -706,11 +705,6 @@ static DWORD CALLBACK video_presenter_streaming_thread(void *arg) } break; - case EVRM_PROCESS_INPUT: - EnterCriticalSection(&presenter->cs); - video_presenter_process_input(presenter); - LeaveCriticalSection(&presenter->cs); - break; default: ; } @@ -1811,9 +1805,9 @@ static HRESULT WINAPI video_presenter_allocator_cb_NotifyRelease(IMFVideoSampleA { struct video_presenter *presenter = impl_from_IMFVideoSampleAllocatorNotify(iface); - /* Release notification is executed under allocator lock, instead of processing samples here - notify streaming thread. */ - PostThreadMessageW(presenter->thread.tid, EVRM_PROCESS_INPUT, 0, 0); + EnterCriticalSection(&presenter->cs); + video_presenter_process_input(presenter); + LeaveCriticalSection(&presenter->cs); return S_OK; }

1 0

Torge Matthies : server: Don't consider non-pending poll requests when reselecting socket.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: 91f8926023572378bc056afebb7ca845a6c9ccfc URL: https://gitlab.winehq.org/wine/wine/-/commit/91f8926023572378bc056afebb7ca8… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Sat Aug 12 10:59:52 2023 +0200 server: Don't consider non-pending poll requests when reselecting socket. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- server/sock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/sock.c b/server/sock.c index ce95b7f2998..7e8192f82a6 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1470,6 +1470,8 @@ static int sock_get_poll_events( struct fd *fd ) { unsigned int i; + if (req->iosb->status != STATUS_PENDING) continue; + for (i = 0; i < req->count; ++i) { if (req->sockets[i].sock != sock) continue;

1 0

David McFarland : configure: Fix caching of PCSCLITE_LIBS on mac.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: d405a688ba6b5042775d733f57d00ba6318e1d0f URL: https://gitlab.winehq.org/wine/wine/-/commit/d405a688ba6b5042775d733f57d00b… Author: David McFarland <corngood(a)gmail.com> Date: Sun Aug 13 22:43:50 2023 -0300 configure: Fix caching of PCSCLITE_LIBS on mac. ac_cv_lib_pcsclite_SCardEstablishContext=yes would be cached, causing AC_CHECK_LIB to use -lpcsclite on the second run. Fixes: f74c4af257e0856e6607d2823e4f03109111a4b6 --- configure | 10 ++++++---- configure.ac | 8 +++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 97f92d0bc72..d5e699ca7d9 100755 --- a/configure +++ b/configure @@ -15853,12 +15853,14 @@ fi if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes && test "$ac_cv_header_PCSC_pcsclite_h" = "yes" then - PCSCLITE_LIBS="-framework PCSC" - - ac_cv_lib_pcsclite_SCardEstablishContext=yes + case $host_os in + darwin*|macosx*) + PCSCLITE_LIBS="-framework PCSC" + ;; + esac fi fi -if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes +if test "x$PCSCLITE_LIBS" = x || test "$ac_cv_header_PCSC_pcsclite_h" != "yes" then : case "x$with_pcsclite" in x) as_fn_append wine_notices "|libpcsclite not found, smart cards won't be supported." ;; diff --git a/configure.ac b/configure.ac index 38e61526a06..0a683212866 100644 --- a/configure.ac +++ b/configure.ac @@ -1396,11 +1396,13 @@ then AC_CHECK_LIB(pcsclite,SCardEstablishContext,[AC_SUBST(PCSCLITE_LIBS,["-lpcsclite"])]) if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes && test "$ac_cv_header_PCSC_pcsclite_h" = "yes" then - AC_SUBST(PCSCLITE_LIBS,"-framework PCSC") - ac_cv_lib_pcsclite_SCardEstablishContext=yes + case $host_os in + darwin*|macosx*) + AC_SUBST(PCSCLITE_LIBS,"-framework PCSC") ;; + esac fi fi -WINE_NOTICE_WITH(pcsclite,[test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes], +WINE_NOTICE_WITH(pcsclite,[test "x$PCSCLITE_LIBS" = x || test "$ac_cv_header_PCSC_pcsclite_h" != "yes"], [libpcsclite not found, smart cards won't be supported.], [enable_winscard])

1 0

Shaun Ren : sapi/tests: Increase timeout in tts test_spvoice.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: cff2e87e03ff045fbe1a3718a81574fe077ab189 URL: https://gitlab.winehq.org/wine/wine/-/commit/cff2e87e03ff045fbe1a3718a81574… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Aug 4 13:57:55 2023 -0400 sapi/tests: Increase timeout in tts test_spvoice. --- dlls/sapi/tests/tts.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index eb0258bbef3..6912dc08e0d 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -630,7 +630,7 @@ static void test_spvoice(void) ok(test_engine.rate == 0, "got %ld.\n", test_engine.rate); ok(test_engine.volume == 100, "got %d.\n", test_engine.volume); ok(stream_num == 1, "got %lu.\n", stream_num); - ok(duration > 800 && duration < 3000, "took %lu ms.\n", duration); + ok(duration > 800 && duration < 3500, "took %lu ms.\n", duration); check_apttype(); ok(test_apt_data.type == APTTYPE_MTA, "got apt type %d.\n", test_apt_data.type); @@ -658,7 +658,7 @@ static void test_spvoice(void) hr = ISpVoice_WaitUntilDone(voice, INFINITE); duration = GetTickCount() - start; ok(hr == S_OK, "got %#lx.\n", hr); - ok(duration > 800 && duration < 3000, "took %lu ms.\n", duration); + ok(duration > 800 && duration < 3500, "took %lu ms.\n", duration); ok(test_engine.speak_called, "ISpTTSEngine::Speak was not called.\n"); ok(test_engine.flags == SPF_NLP_SPEAK_PUNC, "got %#lx.\n", test_engine.flags);

1 0

Santino Mazza : evr: Create critical section for sample queue.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: 7c0731e1849ea2c007783145d7335f7b4fce7081 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c0731e1849ea2c007783145d7335f… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Mon Jul 31 11:44:35 2023 -0300 evr: Create critical section for sample queue. --- dlls/evr/presenter.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 97080717288..645a2461e4c 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -66,6 +66,7 @@ struct sample_queue unsigned int front; unsigned int back; IMFSample *last_presented; + CRITICAL_SECTION cs; }; struct streaming_thread @@ -425,6 +426,7 @@ static HRESULT video_presenter_sample_queue_init(struct video_presenter *present queue->size = presenter->allocator_capacity; queue->back = queue->size - 1; + InitializeCriticalSection(&queue->cs); return S_OK; } @@ -435,7 +437,7 @@ static void video_presenter_sample_queue_push(struct video_presenter *presenter, struct sample_queue *queue = &presenter->thread.queue; unsigned int idx; - EnterCriticalSection(&presenter->cs); + EnterCriticalSection(&queue->cs); if (queue->used != queue->size) { if (at_front) @@ -446,14 +448,14 @@ static void video_presenter_sample_queue_push(struct video_presenter *presenter, queue->used++; IMFSample_AddRef(sample); } - LeaveCriticalSection(&presenter->cs); + LeaveCriticalSection(&queue->cs); } static BOOL video_presenter_sample_queue_pop(struct video_presenter *presenter, IMFSample **sample) { struct sample_queue *queue = &presenter->thread.queue; - EnterCriticalSection(&presenter->cs); + EnterCriticalSection(&queue->cs); if (queue->used) { *sample = queue->samples[queue->front]; @@ -462,7 +464,7 @@ static BOOL video_presenter_sample_queue_pop(struct video_presenter *presenter, } else *sample = NULL; - LeaveCriticalSection(&presenter->cs); + LeaveCriticalSection(&queue->cs); return *sample != NULL; } @@ -477,6 +479,7 @@ static void video_presenter_sample_queue_free(struct video_presenter *presenter) IMFSample_Release(sample); free(queue->samples); + DeleteCriticalSection(&queue->cs); } static HRESULT video_presenter_get_sample_surface(IMFSample *sample, IDirect3DSurface9 **surface) @@ -502,6 +505,7 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM { IDirect3DSurface9 *surface, *backbuffer; IDirect3DDevice9 *device; + struct sample_queue *queue = &presenter->thread.queue; HRESULT hr; if (FAILED(hr = video_presenter_get_sample_surface(sample, &surface))) @@ -527,12 +531,12 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM WARN("Failed to get a backbuffer, hr %#lx.\n", hr); } - EnterCriticalSection(&presenter->cs); - if (presenter->thread.queue.last_presented) - IMFSample_Release(presenter->thread.queue.last_presented); - presenter->thread.queue.last_presented = sample; - IMFSample_AddRef(presenter->thread.queue.last_presented); - LeaveCriticalSection(&presenter->cs); + EnterCriticalSection(&queue->cs); + if (queue->last_presented) + IMFSample_Release(queue->last_presented); + queue->last_presented = sample; + IMFSample_AddRef(queue->last_presented); + LeaveCriticalSection(&queue->cs); IDirect3DSurface9_Release(surface); }

1 0

Santino Mazza : evr: Don't lock presenter allocator when calling NotifyRelease.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: fa3ebd5044d26e6364e0ea0068cb3c4716b50b4e URL: https://gitlab.winehq.org/wine/wine/-/commit/fa3ebd5044d26e6364e0ea0068cb3c… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Wed Aug 9 19:43:42 2023 -0300 evr: Don't lock presenter allocator when calling NotifyRelease. The changes in the video sample allocator are not part of the public api specification, it's only made for internal use in the evr presenter implementation. --- dlls/evr/evr_private.h | 2 ++ dlls/evr/presenter.c | 2 +- dlls/evr/sample.c | 30 ++++++++++++++++++++++++++---- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/evr/evr_private.h b/dlls/evr/evr_private.h index ef38b0f70cf..93047b50c94 100644 --- a/dlls/evr/evr_private.h +++ b/dlls/evr/evr_private.h @@ -55,4 +55,6 @@ HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; HRESULT evr_mixer_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; HRESULT evr_presenter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; +HRESULT create_video_sample_allocator(BOOL lock_notify_release, REFIID riid, void **obj); + #endif /* __EVR_PRIVATE_INCLUDED__ */ diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 645a2461e4c..3ae9b24ad4a 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -2149,7 +2149,7 @@ static HRESULT video_presenter_init_d3d(struct video_presenter *presenter) if (FAILED(hr)) WARN("Failed to set new device for the manager, hr %#lx.\n", hr); - if (SUCCEEDED(hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&presenter->allocator))) + if (SUCCEEDED(hr = create_video_sample_allocator(FALSE, &IID_IMFVideoSampleAllocator, (void **)&presenter->allocator))) { hr = IMFVideoSampleAllocator_SetDirectXManager(presenter->allocator, (IUnknown *)presenter->device_manager); } diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index 6a1bbf564f5..aa3f120b115 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -395,6 +395,7 @@ struct sample_allocator unsigned int free_sample_count; struct list free_samples; struct list used_samples; + BOOL lock_notify_release; CRITICAL_SECTION cs; }; @@ -809,6 +810,7 @@ static HRESULT WINAPI sample_allocator_tracking_callback_Invoke(IMFAsyncCallback struct queued_sample *iter; IUnknown *object = NULL; IMFSample *sample = NULL; + IMFVideoSampleAllocatorNotify *callback = NULL; HRESULT hr; if (FAILED(IMFAsyncResult_GetObject(result, &object))) @@ -836,10 +838,24 @@ static HRESULT WINAPI sample_allocator_tracking_callback_Invoke(IMFAsyncCallback IMFSample_Release(sample); if (allocator->callback) - IMFVideoSampleAllocatorNotify_NotifyRelease(allocator->callback); + { + if (allocator->lock_notify_release) + IMFVideoSampleAllocatorNotify_NotifyRelease(allocator->callback); + else + { + callback = allocator->callback; + IMFVideoSampleAllocatorNotify_AddRef(callback); + } + } LeaveCriticalSection(&allocator->cs); + if (callback) + { + IMFVideoSampleAllocatorNotify_NotifyRelease(callback); + IMFVideoSampleAllocatorNotify_Release(callback); + } + return S_OK; } @@ -852,13 +868,11 @@ static const IMFAsyncCallbackVtbl sample_allocator_tracking_callback_vtbl = sample_allocator_tracking_callback_Invoke, }; -HRESULT WINAPI MFCreateVideoSampleAllocator(REFIID riid, void **obj) +HRESULT create_video_sample_allocator(BOOL lock_notify_release, REFIID riid, void **obj) { struct sample_allocator *object; HRESULT hr; - TRACE("%s, %p.\n", debugstr_guid(riid), obj); - if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -868,6 +882,7 @@ HRESULT WINAPI MFCreateVideoSampleAllocator(REFIID riid, void **obj) object->refcount = 1; list_init(&object->used_samples); list_init(&object->free_samples); + object->lock_notify_release = lock_notify_release; InitializeCriticalSection(&object->cs); hr = IMFVideoSampleAllocator_QueryInterface(&object->IMFVideoSampleAllocator_iface, riid, obj); @@ -876,6 +891,13 @@ HRESULT WINAPI MFCreateVideoSampleAllocator(REFIID riid, void **obj) return hr; } +HRESULT WINAPI MFCreateVideoSampleAllocator(REFIID riid, void **obj) +{ + TRACE("%s, %p.\n", debugstr_guid(riid), obj); + + return create_video_sample_allocator(TRUE, riid, obj); +} + static HRESULT WINAPI video_sample_QueryInterface(IMFSample *iface, REFIID riid, void **out) { struct video_sample *sample = impl_from_IMFSample(iface);

1 0

Santino Mazza : evr: Release sample queue when streaming ends.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: 072fe5d62a63b9b46de030a5d3d437cf9ff481a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/072fe5d62a63b9b46de030a5d3d437… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Mon Jul 31 11:45:18 2023 -0300 evr: Release sample queue when streaming ends. --- dlls/evr/presenter.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 06592f8766e..97080717288 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -467,6 +467,18 @@ static BOOL video_presenter_sample_queue_pop(struct video_presenter *presenter, return *sample != NULL; } + +static void video_presenter_sample_queue_free(struct video_presenter *presenter) +{ + struct sample_queue *queue = &presenter->thread.queue; + IMFSample *sample; + + while (video_presenter_sample_queue_pop(presenter, &sample)) + IMFSample_Release(sample); + + free(queue->samples); +} + static HRESULT video_presenter_get_sample_surface(IMFSample *sample, IDirect3DSurface9 **surface) { IMFMediaBuffer *buffer; @@ -754,6 +766,7 @@ static HRESULT video_presenter_end_streaming(struct video_presenter *presenter) if (presenter->thread.queue.last_presented) IMFSample_Release(presenter->thread.queue.last_presented); + video_presenter_sample_queue_free(presenter); memset(&presenter->thread, 0, sizeof(presenter->thread)); video_presenter_set_allocator_callback(presenter, NULL);

1 0

Shaun Ren : sapi: Change ISpObjectToken::SetId FIXME to TRACE.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: b9dbe482eea774122d2293a3bb3bdb0f0e645a88 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9dbe482eea774122d2293a3bb3bdb… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Aug 4 13:51:17 2023 -0400 sapi: Change ISpObjectToken::SetId FIXME to TRACE. --- dlls/sapi/token.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index af98db02048..f599bdb6b14 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -1305,7 +1305,7 @@ static HRESULT WINAPI token_SetId( ISpObjectToken *iface, HKEY root, key; const WCHAR *subkey; - FIXME( "(%p)->(%s %s %d): semi-stub\n", This, debugstr_w( category_id ), + TRACE( "(%p)->(%s %s %d)\n", This, debugstr_w( category_id ), debugstr_w(token_id), create ); if (This->data_key) return SPERR_ALREADY_INITIALIZED;

1 0