April 2021 - Wine-commits - list.winehq.org

Hans Leidekker : kerberos: Use CRT memory allocators.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 30e07109a74639d62c0b4500af1e057d822fbd49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30e07109a74639d62c0b4500… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 21 09:47:33 2021 +0200 kerberos: Use CRT memory allocators. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 239d6a1bded..581fcb4a789 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -22,6 +22,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -32,7 +33,7 @@ #include "ntsecapi.h" #include "ntsecpkg.h" #include "winternl.h" -#include "wine/heap.h" + #include "wine/debug.h" #include "unixlib.h" @@ -267,7 +268,7 @@ static char *get_str_unixcp( const UNICODE_STRING *str ) { char *ret; int len = WideCharToMultiByte( CP_UNIXCP, 0, str->Buffer, str->Length / sizeof(WCHAR), NULL, 0, NULL, NULL ); - if (!(ret = heap_alloc( len + 1 ))) return NULL; + if (!(ret = malloc( len + 1 ))) return NULL; WideCharToMultiByte( CP_UNIXCP, 0, str->Buffer, str->Length / sizeof(WCHAR), ret, len, NULL, NULL ); ret[len] = 0; return ret; @@ -280,7 +281,7 @@ static char *get_username_unixcp( const WCHAR *user, ULONG user_len, const WCHAR len_user = WideCharToMultiByte( CP_UNIXCP, 0, user, user_len, NULL, 0, NULL, NULL ); len_domain = WideCharToMultiByte( CP_UNIXCP, 0, domain, domain_len, NULL, 0, NULL, NULL ); - if (!(ret = heap_alloc( len_user + len_domain + 2 ))) return NULL; + if (!(ret = malloc( len_user + len_domain + 2 ))) return NULL; WideCharToMultiByte( CP_UNIXCP, 0, user, user_len, ret, len_user, NULL, NULL ); ret[len_user] = '@'; @@ -295,7 +296,7 @@ static char *get_password_unixcp( const WCHAR *passwd, ULONG passwd_len ) char *ret; len = WideCharToMultiByte( CP_UNIXCP, WC_NO_BEST_FIT_CHARS, passwd, passwd_len, NULL, 0, NULL, NULL ); - if (!(ret = heap_alloc( len + 1 ))) return NULL; + if (!(ret = malloc( len + 1 ))) return NULL; WideCharToMultiByte( CP_UNIXCP, 0, passwd, passwd_len, ret, len, NULL, NULL ); ret[len] = 0; return ret; @@ -328,9 +329,9 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( status = krb5_funcs->acquire_credentials_handle( principal, credential_use, username, password, credential, expiry ); done: - heap_free( principal ); - heap_free( username ); - heap_free( password ); + free( principal ); + free( username ); + free( password ); return status; } @@ -364,7 +365,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, context_attr, expiry ); if (!status) *mapped_context = TRUE; /* FIXME: initialize context_data */ - heap_free( target ); + free( target ); return status; } @@ -399,7 +400,7 @@ static SecPkgInfoW *build_package_info( const SecPkgInfoW *info ) DWORD size_name = (wcslen(info->Name) + 1) * sizeof(WCHAR); DWORD size_comment = (wcslen(info->Comment) + 1) * sizeof(WCHAR); - if (!(ret = heap_alloc( sizeof(*ret) + size_name + size_comment ))) return NULL; + if (!(ret = malloc( sizeof(*ret) + size_name + size_comment ))) return NULL; ret->fCapabilities = info->fCapabilities; ret->wVersion = info->wVersion; ret->wRPCID = info->wRPCID;

1 0

Hans Leidekker : secur32/tests: Add a Kerberos ticket cache test.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 121910171c95c1cd44b8733fc5afcd2b8e7594bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=121910171c95c1cd44b8733f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 21 10:19:42 2021 +0200 secur32/tests: Add a Kerberos ticket cache test. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/secur32.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 8fd421ca732..f6bca55561c 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -29,6 +29,8 @@ #include <schannel.h> #include <wincred.h> #include <winsock2.h> +#include <ntsecapi.h> +#include <winternl.h> #include "wine/test.h" @@ -464,6 +466,38 @@ static void test_kerberos(void) FreeCredentialHandle( &cred ); } +static void test_ticket_cache(void) +{ + KERB_QUERY_TKT_CACHE_REQUEST req = { KerbQueryTicketCacheMessage }; + KERB_QUERY_TKT_CACHE_RESPONSE *resp; + NTSTATUS status; + HANDLE lsa; + ULONG package, len, i; + LSA_STRING name; + + status = LsaConnectUntrusted( &lsa ); + ok( !status, "got %08x\n", status ); + + RtlInitAnsiString( &name, MICROSOFT_KERBEROS_NAME_A ); + status = LsaLookupAuthenticationPackage( lsa, &name, &package ); + ok( !status, "got %08x\n", status ); + + status = LsaCallAuthenticationPackage( lsa, package, &req, sizeof(req), (void **)&resp, &len, &status ); + ok( !status, "got %08x\n", status ); + ok( resp->MessageType == KerbQueryTicketCacheMessage, "got %u\n", resp->MessageType ); + + for (i = 0; i < resp->CountOfTickets; i++) + { + KERB_TICKET_CACHE_INFO *info = &resp->Tickets[i]; + trace( "ServerName %s\n", wine_dbgstr_wn(info->ServerName.Buffer, info->ServerName.Length/sizeof(WCHAR)) ); + trace( "RealmName %s\n", wine_dbgstr_wn(info->RealmName.Buffer, info->RealmName.Length/sizeof(WCHAR)) ); + trace( "EncryptionType %08x\n", info->EncryptionType ); + trace( "TicketFlags %08x\n", info->TicketFlags ); + } + LsaFreeReturnBuffer( resp ); + LsaDeregisterLogonProcess( lsa ); +} + START_TEST(secur32) { secdll = LoadLibraryA("secur32.dll"); @@ -514,4 +548,5 @@ START_TEST(secur32) } test_kerberos(); + test_ticket_cache(); }

1 0

Francois Gouget : winetest: Trace skipped dlls when in exclude (-n) mode.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 5549ad21b33c4471bd90c6eb26dd812f140bf680 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5549ad21b33c4471bd90c6eb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 21 09:32:37 2021 +0200 winetest: Trace skipped dlls when in exclude (-n) mode. When the command line specifies the list of tests to run, tracing all the skipped dlls unnecessarily spams the test output. But when the command line contains the list of (at most 64) excluded dlls, tracing them ensures tools analysing the report know why the corresponding dlls were skipped. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 107151c927f..cb2f23a161e 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -918,6 +918,7 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP if (test_filtered_out( lpszName, NULL )) { nr_of_skips++; + if (exclude_tests) xprintf (" %s=skipped\n", dllname); return TRUE; } extract_test (&wine_tests[nr_of_files], tempdir, lpszName);

1 0

Alexandre Julliard : ntdll: Fix buffer allocation size in get_env_var().
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: aaa501fe93fb7140b472850060d652613406307f URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaa501fe93fb7140b4728500… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 21 17:06:43 2021 +0200 ntdll: Fix buffer allocation size in get_env_var(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9f614db01c5..38dd276608b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2593,7 +2593,7 @@ static NTSTATUS get_env_var( const WCHAR *name, SIZE_T extra, UNICODE_STRING *re for (;;) { - ret->Buffer = RtlAllocateHeap( GetProcessHeap(), 0, size ); + ret->Buffer = RtlAllocateHeap( GetProcessHeap(), 0, size * sizeof(WCHAR) ); status = RtlQueryEnvironmentVariable( NULL, name, wcslen(name), ret->Buffer, size - extra - 1, &len ); if (!status)

1 0

Alexandre Julliard : kernelbase: Fix buffer size passed to read_nt_symlink().
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 00bd0518cab0f7808d6bef5d1cc27f0fddd82d98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00bd0518cab0f7808d6bef5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 21 20:54:00 2021 +0200 kernelbase: Fix buffer size passed to read_nt_symlink(). Spotted by David Torok. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/volume.c b/dlls/kernelbase/volume.c index 594c1b8e138..d513dda1f9d 100644 --- a/dlls/kernelbase/volume.c +++ b/dlls/kernelbase/volume.c @@ -308,7 +308,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWOR /* Take the mount point and get the "nonpersistent name" */ /* We will then take that and get the volume name */ nonpersist_name = (WCHAR *)(input + 1); - status = read_nt_symlink( symlink_name, nonpersist_name, i_size - sizeof(*input) ); + status = read_nt_symlink( symlink_name, nonpersist_name, (i_size - sizeof(*input)) / sizeof(WCHAR) ); TRACE("read_nt_symlink got stat=%x, for %s, got <%s>\n", status, debugstr_w(symlink_name), debugstr_w(nonpersist_name)); if (status != STATUS_SUCCESS)

1 0

Alexandre Julliard : ntdll: Support a full path name in the loadFrom dll redirection entry.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 1cf2ae1907e2e9cbaea2b1d92c9e72000bb76912 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cf2ae1907e2e9cbaea2b1d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 21 08:55:38 2021 +0200 ntdll: Support a full path name in the loadFrom dll redirection entry. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50978 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 4a5422b52ac..9f614db01c5 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2451,7 +2451,8 @@ static NTSTATUS build_dlldata_path( LPCWSTR libname, ACTCTX_SECTION_KEYED_DATA * memcpy( p, base + dlldata->paths[i].offset, dlldata->paths[i].len ); p += dlldata->paths[i].len / sizeof(WCHAR); } - wcscpy( p, libname ); + if (p == buffer || p[-1] == '\\') wcscpy( p, libname ); + else *p = 0; if (dlldata->flags & DLL_REDIRECT_PATH_EXPAND) {

1 0

Francois Gouget : winetest: Provide more detailed status information on index pages.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: tools Branch: master Commit: 6654181dcb5547849ec2f12f01d34d94a2322cad URL: https://source.winehq.org/git/tools.git/?a=commit;h=6654181dcb5547849ec2f12… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 21 16:26:43 2021 +0200 winetest: Provide more detailed status information on index pages. This requires dissect to store more detailed status information in the summary.txt file. Then gather can convert these into more specific cell labels and descriptions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 43 ++++++++++++++++++++++---- winetest/gather | 91 +++++++++++++++++++++++++++++++++++++------------------- 2 files changed, 98 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=6654181dcb5547849ec…

1 0

Francois Gouget : winetest/gather: Simplify the result status to cell label conversion.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: tools Branch: master Commit: d260ee7c3a64a10560b61744e2b4a8e96f6a86fb URL: https://source.winehq.org/git/tools.git/?a=commit;h=d260ee7c3a64a10560b6174… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 21 16:26:39 2021 +0200 winetest/gather: Simplify the result status to cell label conversion. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/winetest/gather b/winetest/gather index a3a0a65..456fa0b 100755 --- a/winetest/gather +++ b/winetest/gather @@ -735,30 +735,18 @@ sub singletest($$$) { !$result->{errors}->[1] ? $result->{todos}->[1] : "$result->{errors}->[1]+$result->{todos}->[1]"; } - elsif ($status eq "dll missing") - { - $msg = "n/a"; - } - elsif ($status eq "filelimit") - { - $msg = "truncated"; - } - elsif ($status eq "missing") - { - $msg = "not run"; - } - elsif ($status eq "skipped") - { - $msg = "skipped"; - } - elsif ($status eq "mixed") - { - $msg = "mixed"; - } else { - $msg = $status eq "crash" ? "crashed" : - $status eq "258" ? "timeout": "failed"; + my %status2label = ( + missing => "not run", + "dll missing" => "n/a", + skipped => "skipped", + crash => "crashed", + 258 => "timeout", + mixed => "mixed", + filelimit => "truncated", + ); + $msg = $status2label{$status} || "failed"; } $title = join(" | ", $prefix, $title); printf OUT " <td class=\"%s\"><a %s %s>%s</a></td>\n",

1 0

Anton Baskanov : amstream/tests: Test that streams call IMediaStreamFilter::EndOfStream.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 1296b0efb5c3f793c69b13f3e113944b32c97d5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1296b0efb5c3f793c69b13f3… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Apr 20 00:22:52 2021 +0700 amstream/tests: Test that streams call IMediaStreamFilter::EndOfStream. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 54 +++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 9cefec12442..e7fd731dd72 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2128,8 +2128,8 @@ static HRESULT WINAPI graph_FindFilterByName(IFilterGraph2 *iface, const WCHAR * static HRESULT WINAPI graph_ConnectDirect(IFilterGraph2 *iface, IPin *source, IPin *sink, const AM_MEDIA_TYPE *mt) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + struct graph *graph = impl_from_IFilterGraph2(iface); + return IFilterGraph2_ConnectDirect(graph->inner, source, sink, mt); } static HRESULT WINAPI graph_Reconnect(IFilterGraph2 *iface, IPin *pin) @@ -2140,8 +2140,8 @@ static HRESULT WINAPI graph_Reconnect(IFilterGraph2 *iface, IPin *pin) static HRESULT WINAPI graph_Disconnect(IFilterGraph2 *iface, IPin *pin) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + struct graph *graph = impl_from_IFilterGraph2(iface); + return IFilterGraph2_Disconnect(graph->inner, pin); } static HRESULT WINAPI graph_SetDefaultSyncSource(IFilterGraph2 *iface) @@ -6065,30 +6065,36 @@ static void test_ammediastream_set_state(void) check_ammediastream_set_state(&MSPID_PrimaryVideo); } -static void check_ammediastream_end_of_stream(const MSPID *id, const AM_MEDIA_TYPE *mt) +static void check_ammediastream_end_of_stream(const CLSID *clsid, const MSPID *id, const AM_MEDIA_TYPE *mt) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IMediaStreamFilter *filter; struct testfilter source; - IGraphBuilder *graph; IMediaStream *stream; + struct graph graph; HRESULT hr; ULONG ref; IPin *pin; - hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + graph_init(&graph); + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, (IGraphBuilder *)&graph.IFilterGraph2_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, id, 0, &stream); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!!graph, "Expected non-NULL graph.\n"); testfilter_init(&source); - hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); + source.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + hr = IFilterGraph2_AddFilter(&graph.IFilterGraph2_iface, &source.filter.IBaseFilter_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, mt); + hr = IFilterGraph2_ConnectDirect(&graph.IFilterGraph2_iface, &source.source.pin.IPin_iface, pin, mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_EndOfStream(pin); @@ -6112,12 +6118,28 @@ static void check_ammediastream_end_of_stream(const MSPID *id, const AM_MEDIA_TY hr = IPin_EndOfStream(pin); ok(hr == E_FAIL, "Got hr %#x.\n", hr); - IGraphBuilder_Disconnect(graph, pin); - IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + graph.got_notify = 0; + graph.event_code = 0xcc; + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + todo_wine ok(graph.event_code == EC_COMPLETE, "Got event code %d.\n", graph.event_code); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IFilterGraph2_Disconnect(&graph.IFilterGraph2_iface, pin); + IFilterGraph2_Disconnect(&graph.IFilterGraph2_iface, &source.source.pin.IPin_iface); ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %d.\n", ref); - ref = IGraphBuilder_Release(graph); + graph_destroy(&graph); + ref = IMediaStreamFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); IPin_Release(pin); ref = IMediaStream_Release(stream); @@ -6126,8 +6148,8 @@ static void check_ammediastream_end_of_stream(const MSPID *id, const AM_MEDIA_TY static void test_ammediastream_end_of_stream(void) { - check_ammediastream_end_of_stream(&MSPID_PrimaryAudio, &audio_mt); - check_ammediastream_end_of_stream(&MSPID_PrimaryVideo, &rgb32_mt); + check_ammediastream_end_of_stream(&CLSID_AMAudioStream, &MSPID_PrimaryAudio, &audio_mt); + check_ammediastream_end_of_stream(&CLSID_AMDirectDrawStream, &MSPID_PrimaryVideo, &rgb32_mt); } void test_mediastreamfilter_get_state(void)

1 0

Anton Baskanov : amstream: Call IMediaStreamFilter::EndOfStream when streams receive EOS.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 9a0027dbba44ad60b3035964cd2a2e8d42b975c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a0027dbba44ad60b3035964… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Apr 20 00:22:53 2021 +0700 amstream: Call IMediaStreamFilter::EndOfStream when streams receive EOS. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 5 +++++ dlls/amstream/ddrawstream.c | 5 +++++ dlls/amstream/tests/amstream.c | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index dc6c810d19a..a07e62a4672 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -1157,6 +1157,11 @@ static HRESULT WINAPI audio_sink_EndOfStream(IPin *iface) LeaveCriticalSection(&stream->cs); + /* Calling IMediaStreamFilter::EndOfStream() inside the critical section + * would invert the locking order, so we must leave it first to avoid + * the streaming thread deadlocking on the filter's critical section. */ + IMediaStreamFilter_EndOfStream(stream->filter); + return S_OK; } diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index d6f07e1b10a..e04e3a1c56f 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -1177,6 +1177,11 @@ static HRESULT WINAPI ddraw_sink_EndOfStream(IPin *iface) LeaveCriticalSection(&stream->cs); + /* Calling IMediaStreamFilter::EndOfStream() inside the critical section + * would invert the locking order, so we must leave it first to avoid + * the streaming thread deadlocking on the filter's critical section. */ + IMediaStreamFilter_EndOfStream(stream->filter); + return S_OK; } diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index e7fd731dd72..a6ec84fbdea 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -6127,8 +6127,8 @@ static void check_ammediastream_end_of_stream(const CLSID *clsid, const MSPID *i hr = IPin_EndOfStream(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); - todo_wine ok(graph.event_code == EC_COMPLETE, "Got event code %d.\n", graph.event_code); + ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + ok(graph.event_code == EC_COMPLETE, "Got event code %d.\n", graph.event_code); hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0