November 2022 - Wine-commits

Rémi Bernon : mf: Handle MESourceSeeked and MEStreamSeeked state change events.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: c4ab65e146e0a3b30657358591c2c7c1fb7463ab URL: https://gitlab.winehq.org/wine/wine/-/commit/c4ab65e146e0a3b30657358591c2c7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 11 14:53:07 2022 +0100 mf: Handle MESourceSeeked and MEStreamSeeked state change events. If a session is paused then started again, or if a start position is provided we wait forever for the source to send a MESourceStarted event, when it sends a MESourceSeeked instead. This causes a deadlock in Bright Memory: Infinite as the game then waits for the Start command to complete, while the session is stuck in the SESSION_STATE_STARTING_SOURCES state. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 899ae42b206a8c2e462a789249e2c2f143d4a582) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mf/session.c | 8 ++++++++ dlls/mfplat/tests/mfplat.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index c8ec1b5c33f..1de40187eb2 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2321,6 +2321,8 @@ static enum object_state session_get_object_state_for_event(MediaEventType event { switch (event) { + case MESourceSeeked: + case MEStreamSeeked: case MESourceStarted: case MEStreamStarted: case MEStreamSinkStarted: @@ -2497,6 +2499,7 @@ static void session_set_source_object_state(struct media_session *session, IUnkn switch (event_type) { + case MESourceSeeked: case MESourceStarted: case MESourcePaused: case MESourceStopped: @@ -2511,6 +2514,7 @@ static void session_set_source_object_state(struct media_session *session, IUnkn } } break; + case MEStreamSeeked: case MEStreamStarted: case MEStreamPaused: case MEStreamStopped: @@ -3197,6 +3201,10 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM switch (event_type) { + case MESourceSeeked: + case MEStreamSeeked: + FIXME("Source/stream seeking, semi-stub!\n"); + /* fallthrough */ case MESourceStarted: case MESourcePaused: case MESourceStopped: diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 21eab6d1172..7030c9eebc4 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -896,6 +896,44 @@ todo_wine video_stream = (IMFMediaStream *)var.punkVal; } + hr = IMFMediaSource_Pause(mediasource); + ok(hr == S_OK, "Failed to pause media source, hr %#x.\n", hr); + if (get_event((IMFMediaEventGenerator *)mediasource, MESourcePaused, &var)) + ok(var.vt == VT_EMPTY, "Unexpected value type.\n"); + + var.vt = VT_EMPTY; + hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); + ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); + + if (get_event((IMFMediaEventGenerator *)mediasource, MESourceStarted, &var)) + ok(var.vt == VT_EMPTY, "Unexpected value type.\n"); + + hr = IMFMediaSource_Pause(mediasource); + ok(hr == S_OK, "Failed to pause media source, hr %#x.\n", hr); + if (get_event((IMFMediaEventGenerator *)mediasource, MESourcePaused, &var)) + ok(var.vt == VT_EMPTY, "Unexpected value type.\n"); + + var.vt = VT_I8; + var.uhVal.QuadPart = 0; + hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); + ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); + + if (get_event((IMFMediaEventGenerator *)mediasource, MESourceSeeked, &var)) + ok(var.vt == VT_I8, "Unexpected value type.\n"); + + hr = IMFMediaSource_Stop(mediasource); + ok(hr == S_OK, "Failed to pause media source, hr %#x.\n", hr); + if (get_event((IMFMediaEventGenerator *)mediasource, MESourceStopped, &var)) + ok(var.vt == VT_EMPTY, "Unexpected value type.\n"); + + var.vt = VT_I8; + var.uhVal.QuadPart = 0; + hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); + ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); + + if (get_event((IMFMediaEventGenerator *)mediasource, MESourceStarted, &var)) + ok(var.vt == VT_I8, "Unexpected value type.\n"); + sample_count = 10; for (i = 0; i < sample_count; ++i)

1 0

Giovanni Mascellani : winegstreamer: Do not block forever if EOS races with command queue.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 25ad84b2c9b0c6f87b7cb4906241017ec6a9fe33 URL: https://gitlab.winehq.org/wine/wine/-/commit/25ad84b2c9b0c6f87b7cb490624101… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Feb 9 09:40:52 2022 +0100 winegstreamer: Do not block forever if EOS races with command queue. Currently, the winegstreamer media source checks for EOS when RequestSample() is called, but doesn't handle the cases when EOS is detected between the RequestSample() call and the moment when the request is popped from the command queue and serviced. This can result in the media source waiting forever for a sample and get stuck. This commit fixes the bug by adding a check for EOS in wait_for_event(). This commit fixes Medieval Dynasty hanging on developer logos on the Steam Deck. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4853f65c844de8277b8b0420df1a2cdb1c5b17c8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winegstreamer/media_source.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 6ecd345cb73..5e36ef391da 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -534,6 +534,12 @@ static void wait_on_sample(struct media_stream *stream, IUnknown *token) TRACE("%p, %p\n", stream, token); + if (stream->eos) + { + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEError, &GUID_NULL, MF_E_END_OF_STREAM, &empty_var); + return; + } + for (;;) { if (!wg_parser_stream_get_event(stream->wg_stream, &event))

1 0

Giovanni Mascellani : mfplat: Avoid a race condition when releasing a tracked sample.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 967b3294fa25202823af16758a148844cbcab967 URL: https://gitlab.winehq.org/wine/wine/-/commit/967b3294fa25202823af16758a1488… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue May 3 15:06:43 2022 +0200 mfplat: Avoid a race condition when releasing a tracked sample. Right now, if the same tracked sample is released at the same time from two different threads it might happen that neither of them calls the callback, because they might go through the critical section at the same time (while neither has decremented the reference count yet). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b1807751219e256867eaac5cc4d8b97a5482978f) Conflicts: dlls/mfplat/sample.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mfplat/sample.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 04c68c87199..600e3bd929e 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -183,11 +183,11 @@ static ULONG WINAPI sample_Release(IMFSample *iface) static ULONG WINAPI sample_tracked_Release(IMFSample *iface) { struct sample *sample = impl_from_IMFSample(iface); - ULONG refcount; + ULONG refcount = InterlockedDecrement(&sample->attributes.ref); HRESULT hr; EnterCriticalSection(&sample->attributes.cs); - if (sample->tracked_result && sample->tracked_refcount == (sample->attributes.ref - 1)) + if (sample->tracked_result && sample->tracked_refcount == refcount) { IRtwqAsyncResult *tracked_result = sample->tracked_result; sample->tracked_result = NULL; @@ -200,8 +200,6 @@ static ULONG WINAPI sample_tracked_Release(IMFSample *iface) } LeaveCriticalSection(&sample->attributes.cs); - refcount = InterlockedDecrement(&sample->attributes.ref); - TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount)

1 0

Nikolay Sivov : evr/sample: Avoid a race condition when releasing a tracked sample.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 7d74dd91bfb3582cebb6c87e409edf6cb124b17e URL: https://gitlab.winehq.org/wine/wine/-/commit/7d74dd91bfb3582cebb6c87e409edf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 10 19:16:17 2022 +0300 evr/sample: Avoid a race condition when releasing a tracked sample. Same as b1807751219e256867eaac5cc4d8b97a5482978f. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ce71f5a05f226b3f68328d4632cd78ac9440d073) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/evr/sample.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index cbba384e181..7530cee07e2 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -920,19 +920,21 @@ static ULONG WINAPI video_sample_AddRef(IMFSample *iface) static ULONG WINAPI video_sample_Release(IMFSample *iface) { struct video_sample *sample = impl_from_IMFSample(iface); - ULONG refcount; + ULONG refcount = InterlockedDecrement(&sample->refcount); + IMFAsyncResult *tracked_result = NULL; IMFSample_LockStore(sample->sample); - if (sample->tracked_result && sample->tracked_refcount == (sample->refcount - 1)) + if (sample->tracked_result && sample->tracked_refcount == refcount) { - video_sample_tracking_thread_invoke(sample->tracked_result); - IMFAsyncResult_Release(sample->tracked_result); + tracked_result = sample->tracked_result; + video_sample_tracking_thread_invoke(tracked_result); sample->tracked_result = NULL; sample->tracked_refcount = 0; } IMFSample_UnlockStore(sample->sample); - refcount = InterlockedDecrement(&sample->refcount); + if (tracked_result) + IMFAsyncResult_Release(tracked_result); TRACE("%p, refcount %u.\n", iface, refcount);

1 0

Giovanni Mascellani : mfmediaengine: Fix a memory leak.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 0e99082d7b13137e582e4be0488c159c813eb154 URL: https://gitlab.winehq.org/wine/wine/-/commit/0e99082d7b13137e582e4be0488c15… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jan 18 15:16:03 2022 +0100 mfmediaengine: Fix a memory leak. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 792546f6122b0bbe55dd242ecfb975709b8c493e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mfmediaengine/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 98504c5e269..5b8d91d9632 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1094,6 +1094,8 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi IMFMediaTypeHandler_Release(type_handler); } + + IMFStreamDescriptor_Release(sd); } if (!sd_video && !sd_audio)

1 0

Gabriel Ivăncescu : mshtml: Fix leak on failure in return_nsstr.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 3b86a962ae4e02b1b41641fac36f780d6278d309 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b86a962ae4e02b1b41641fac36f78… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jan 7 17:43:44 2022 +0200 mshtml: Fix leak on failure in return_nsstr. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 89317f533b7c6d244301d0a83c20879a209b1409) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/nsembed.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 25ad92d5ddf..32ae792625c 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -917,6 +917,7 @@ HRESULT map_nsresult(nsresult nsres) HRESULT return_nsstr(nsresult nsres, nsAString *nsstr, BSTR *p) { const PRUnichar *str; + HRESULT hres = S_OK; if(NS_FAILED(nsres)) { WARN("failed: %08x\n", nsres); @@ -929,13 +930,13 @@ HRESULT return_nsstr(nsresult nsres, nsAString *nsstr, BSTR *p) if(*str) { *p = SysAllocString(str); if(!*p) - return E_OUTOFMEMORY; + hres = E_OUTOFMEMORY; }else { *p = NULL; } nsAString_Finish(nsstr); - return S_OK; + return hres; } HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, unsigned flags, VARIANT *p)

1 0

Alex Henrie : msi: Fix memory leak in get_fusion_filename (Coverity).
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 0602943f849a8b4d905e54d1e6cd7de3162ab3db URL: https://gitlab.winehq.org/wine/wine/-/commit/0602943f849a8b4d905e54d1e6cd7d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 00:23:14 2022 -0700 msi: Fix memory leak in get_fusion_filename (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ad90181e1407bc4ffe81e55f07f83b23c09cccb8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/package.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 7488c095080..596affbaae4 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -553,6 +553,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) GetWindowsDirectoryW(windir, MAX_PATH); len = lstrlenW(windir) + lstrlenW(L"Microsoft.NET\\Framework\\") + lstrlenW(L"v2.0.50727") + lstrlenW(L"fusion.dll") + 3; + msi_free(filename); if (!(filename = msi_alloc(len * sizeof(WCHAR)))) return NULL; lstrcpyW(filename, windir);

1 0

Alex Henrie : winhttp: Fix memory leak on error path in WinHttpCrackUrl (Coverity).
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: e74125c4bac1ae60a916cd3dd48e66042dae721e URL: https://gitlab.winehq.org/wine/wine/-/commit/e74125c4bac1ae60a916cd3dd48e66… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 00:23:17 2022 -0700 winhttp: Fix memory leak on error path in WinHttpCrackUrl (Coverity). And use a single variable for the encoded or decoded URL so that free only has to be called once. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2b63fdd9a5fb58951e90af877f79c0a65bd445ec) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winhttp/url.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 0d9dfb76de6..8efd5ed0c49 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -172,7 +172,7 @@ static DWORD parse_port( const WCHAR *str, DWORD len, INTERNET_PORT *ret ) */ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONENTSW uc ) { - WCHAR *p, *q, *r, *url_decoded = NULL, *url_escaped = NULL; + WCHAR *p, *q, *r, *url_transformed = NULL; INTERNET_SCHEME scheme_number = 0; struct url_component scheme, username, password, hostname, path, extra; BOOL overflow = FALSE; @@ -189,25 +189,26 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN if (flags & ICU_ESCAPE) { - if ((err = escape_url( url, &len, &url_escaped ))) + if ((err = escape_url( url, &len, &url_transformed ))) { SetLastError( err ); return FALSE; } - url = url_escaped; + url = url_transformed; } else if (flags & ICU_DECODE) { - if (!(url_decoded = decode_url( url, &len ))) + if (!(url_transformed = decode_url( url, &len ))) { SetLastError( ERROR_OUTOFMEMORY ); return FALSE; } - url = url_decoded; + url = url_transformed; } if (!(p = wcschr( url, ':' ))) { SetLastError( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ); + free( url_transformed ); return FALSE; } if (p - url == 4 && !wcsnicmp( url, L"http", 4 )) scheme_number = INTERNET_SCHEME_HTTP; @@ -331,8 +332,7 @@ exit: if (overflow) err = ERROR_INSUFFICIENT_BUFFER; uc->nScheme = scheme_number; } - free( url_decoded ); - free( url_escaped ); + free( url_transformed ); SetLastError( err ); return !err; }

1 0

Alex Henrie : adsldp: Fix memory leak on error path in search_ExecuteSearch (Coverity).
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 0344482cf4570088f103bf0c7a375491dd475f4d URL: https://gitlab.winehq.org/wine/wine/-/commit/0344482cf4570088f103bf0c7a3754… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 00:23:11 2022 -0700 adsldp: Fix memory leak on error path in search_ExecuteSearch (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 36af68289546d942759539acf65b35a9acf43b85) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/adsldp/adsldp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 3d5ea29882c..c8f63a25e0c 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1302,7 +1302,11 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte props = NULL; else { - if (count && !names) return E_ADS_BAD_PARAMETER; + if (count && !names) + { + heap_free(ldap_ctx); + return E_ADS_BAD_PARAMETER; + } props = heap_alloc((count + 1) * sizeof(props[0])); if (!props)

1 0

Alex Henrie : conhost: Fix memory leak on error path in create_screen_buffer (cppcheck).
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 67d961acfd16421be7eba4bc7a006bf8004f8d10 URL: https://gitlab.winehq.org/wine/wine/-/commit/67d961acfd16421be7eba4bc7a006b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 00:23:12 2022 -0700 conhost: Fix memory leak on error path in create_screen_buffer (cppcheck). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 78df9cb96ccf7d5f2e7919a003209c0b6f6fe021) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/conhost/conhost.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 78f6e345170..3c8d165cbbe 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -100,7 +100,11 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int if (screen_buffer->font.face_len) { screen_buffer->font.face_name = malloc( screen_buffer->font.face_len * sizeof(WCHAR) ); - if (!screen_buffer->font.face_name) return NULL; + if (!screen_buffer->font.face_name) + { + free( screen_buffer ); + return NULL; + } memcpy( screen_buffer->font.face_name, console->active->font.face_name, screen_buffer->font.face_len * sizeof(WCHAR) );

1 0