December 2019 - Wine-commits

Nikolay Sivov : ntdll: Add support for querying thread suspend count.
by Alexandre Julliard 03 Dec '19

03 Dec '19

Module: wine Branch: master Commit: b0951ba86062a482d703fc9e77177fc784f62c78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0951ba86062a482d703fc9e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 3 12:05:22 2019 +0300 ntdll: Add support for querying thread suspend count. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 63 +++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/thread.c | 21 ++++++++++++++ include/wine/server_protocol.h | 4 ++- include/winternl.h | 1 + server/protocol.def | 1 + server/request.h | 5 ++-- server/thread.c | 1 + server/trace.c | 1 + 8 files changed, 93 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index fb58c0ee7a..44df47466b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -50,6 +50,7 @@ static ULONG (WINAPI *pRtlRemoveVectoredContinueHandler)(PVOID handler); static NTSTATUS (WINAPI *pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); +static NTSTATUS (WINAPI *pNtQueryInformationThread)(HANDLE, THREADINFOCLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI *pNtSetInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static NTSTATUS (WINAPI *pNtClose)(HANDLE); @@ -3163,11 +3164,34 @@ static DWORD WINAPI suspend_thread_test( void *arg ) return 0; } +static void test_suspend_count(HANDLE hthread, ULONG expected_count, int line) +{ + static BOOL supported = TRUE; + NTSTATUS status; + ULONG count; + + if (!supported) + return; + + count = ~0u; + status = pNtQueryInformationThread(hthread, ThreadSuspendCount, &count, sizeof(count), NULL); + if (status) + { + win_skip("ThreadSuspendCount is not supported.\n"); + supported = FALSE; + return; + } + + ok_(__FILE__, line)(!status, "Failed to get suspend count, status %#x.\n", status); + ok_(__FILE__, line)(count == expected_count, "Unexpected suspend count %u.\n", count); +} + static void test_suspend_thread(void) { +#define TEST_SUSPEND_COUNT(thread, count) test_suspend_count((thread), (count), __LINE__) HANDLE thread, event; + ULONG count, len; NTSTATUS status; - ULONG count; DWORD ret; status = NtSuspendThread(0, NULL); @@ -3184,6 +3208,31 @@ static void test_suspend_thread(void) ret = WaitForSingleObject(thread, 0); ok(ret == WAIT_TIMEOUT, "Unexpected status %d.\n", ret); + status = pNtQueryInformationThread(thread, ThreadSuspendCount, &count, sizeof(count), NULL); + if (!status) + { + status = pNtQueryInformationThread(thread, ThreadSuspendCount, NULL, sizeof(count), NULL); + ok(status == STATUS_ACCESS_VIOLATION, "Unexpected status %#x.\n", status); + + status = pNtQueryInformationThread(thread, ThreadSuspendCount, &count, sizeof(count) / 2, NULL); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Unexpected status %#x.\n", status); + + len = 123; + status = pNtQueryInformationThread(thread, ThreadSuspendCount, &count, sizeof(count) / 2, &len); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Unexpected status %#x.\n", status); + ok(len == 123, "Unexpected info length %u.\n", len); + + len = 123; + status = pNtQueryInformationThread(thread, ThreadSuspendCount, NULL, 0, &len); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Unexpected status %#x.\n", status); + ok(len == 123, "Unexpected info length %u.\n", len); + + count = 10; + status = pNtQueryInformationThread(0, ThreadSuspendCount, &count, sizeof(count), NULL); + ok(status, "Unexpected status %#x.\n", status); + ok(count == 10, "Unexpected suspend count %u.\n", count); + } + status = NtResumeThread(thread, NULL); ok(!status, "Unexpected status %#x.\n", status); @@ -3191,24 +3240,35 @@ static void test_suspend_thread(void) ok(!status, "Unexpected status %#x.\n", status); ok(count == 0, "Unexpected suspended count %u.\n", count); + TEST_SUSPEND_COUNT(thread, 0); + status = NtSuspendThread(thread, NULL); ok(!status, "Failed to suspend a thread, status %#x.\n", status); + TEST_SUSPEND_COUNT(thread, 1); + status = NtSuspendThread(thread, &count); ok(!status, "Failed to suspend a thread, status %#x.\n", status); ok(count == 1, "Unexpected suspended count %u.\n", count); + TEST_SUSPEND_COUNT(thread, 2); + status = NtResumeThread(thread, &count); ok(!status, "Failed to resume a thread, status %#x.\n", status); ok(count == 2, "Unexpected suspended count %u.\n", count); + TEST_SUSPEND_COUNT(thread, 1); + status = NtResumeThread(thread, NULL); ok(!status, "Failed to resume a thread, status %#x.\n", status); + TEST_SUSPEND_COUNT(thread, 0); + SetEvent(event); WaitForSingleObject(thread, INFINITE); CloseHandle(thread); +#undef TEST_SUSPEND_COUNT } static const char *suspend_process_event_name = "suspend_process_event"; @@ -3418,6 +3478,7 @@ START_TEST(exception) X(RtlAddVectoredContinueHandler); X(RtlRemoveVectoredContinueHandler); X(NtQueryInformationProcess); + X(NtQueryInformationThread); X(NtSetInformationProcess); X(NtSuspendProcess); X(NtResumeProcess); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index fd8d388403..f993dd314c 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1115,6 +1115,27 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, *(BOOL*)data = FALSE; if (ret_len) *ret_len = sizeof(BOOL); return STATUS_SUCCESS; + case ThreadSuspendCount: + { + ULONG count = 0; + + if (length != sizeof(ULONG)) return STATUS_INFO_LENGTH_MISMATCH; + if (!data) return STATUS_ACCESS_VIOLATION; + + SERVER_START_REQ( get_thread_info ) + { + req->handle = wine_server_obj_handle( handle ); + req->tid_in = 0; + if (!(status = wine_server_call( req ))) + count = reply->suspend_count; + } + SERVER_END_REQ; + + if (!status) + *(ULONG *)data = count; + + return status; + } case ThreadDescription: { THREAD_DESCRIPTION_INFORMATION *info = data; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 108701b2bc..aaa5fd2e33 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1006,8 +1006,10 @@ struct get_thread_info_reply int exit_code; int priority; int last; + int suspend_count; data_size_t desc_len; /* VARARG(desc,unicode_str); */ + char __pad_60[4]; }; @@ -6700,6 +6702,6 @@ union generic_reply struct resume_process_reply resume_process_reply; }; -#define SERVER_PROTOCOL_VERSION 592 +#define SERVER_PROTOCOL_VERSION 593 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/include/winternl.h b/include/winternl.h index 847e55e216..ea46087aac 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1008,6 +1008,7 @@ typedef enum _THREADINFOCLASS { ThreadUmsInformation, ThreadCounterProfiling, ThreadIdealProcessorEx, + ThreadSuspendCount = 35, ThreadDescription = 38, MaxThreadInfoClass } THREADINFOCLASS; diff --git a/server/protocol.def b/server/protocol.def index 566bc83bb2..1cb1fea602 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -944,6 +944,7 @@ struct rawinput_device int exit_code; /* thread exit code */ int priority; /* thread priority level */ int last; /* last thread in process */ + int suspend_count; /* thread suspend count */ data_size_t desc_len; /* description length in bytes */ VARARG(desc,unicode_str); /* description string */ @END diff --git a/server/request.h b/server/request.h index de7720ae68..2930b31d72 100644 --- a/server/request.h +++ b/server/request.h @@ -849,8 +849,9 @@ C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, affinity) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, exit_code) == 40 ); C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, priority) == 44 ); C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, last) == 48 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, desc_len) == 52 ); -C_ASSERT( sizeof(struct get_thread_info_reply) == 56 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, suspend_count) == 52 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, desc_len) == 56 ); +C_ASSERT( sizeof(struct get_thread_info_reply) == 64 ); C_ASSERT( FIELD_OFFSET(struct get_thread_times_request, handle) == 12 ); C_ASSERT( sizeof(struct get_thread_times_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_thread_times_reply, creation_time) == 8 ); diff --git a/server/thread.c b/server/thread.c index 4fc6abf0ef..80db41b48d 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1463,6 +1463,7 @@ DECL_HANDLER(get_thread_info) reply->priority = thread->priority; reply->affinity = thread->affinity; reply->last = thread->process->running_threads == 1; + reply->suspend_count = thread->suspend; reply->desc_len = thread->desc_len; if (thread->desc && get_reply_max_size()) diff --git a/server/trace.c b/server/trace.c index d44f67a021..411369a4f6 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1423,6 +1423,7 @@ static void dump_get_thread_info_reply( const struct get_thread_info_reply *req fprintf( stderr, ", exit_code=%d", req->exit_code ); fprintf( stderr, ", priority=%d", req->priority ); fprintf( stderr, ", last=%d", req->last ); + fprintf( stderr, ", suspend_count=%d", req->suspend_count ); fprintf( stderr, ", desc_len=%u", req->desc_len ); dump_varargs_unicode_str( ", desc=", cur_size ); }

1 0

Nikolay Sivov : mfplat: Use underlying stream access mode for bytestream capabilities.
by Alexandre Julliard 03 Dec '19

03 Dec '19

Module: wine Branch: master Commit: 4bfd42bafff113d8cd7976fcb66516c3b2500d2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bfd42bafff113d8cd7976fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 3 14:13:11 2019 +0300 mfplat: Use underlying stream access mode for bytestream capabilities. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e4ade7f202..fc656678ca 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2700,6 +2700,24 @@ static ULONG WINAPI bytestream_Release(IMFByteStream *iface) return refcount; } +static HRESULT WINAPI bytestream_stream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) +{ + struct bytestream *stream = impl_from_IMFByteStream(iface); + STATSTG stat; + HRESULT hr; + + TRACE("%p, %p.\n", iface, capabilities); + + if (FAILED(hr = IStream_Stat(stream->stream, &stat, STATFLAG_NONAME))) + return hr; + + *capabilities = MFBYTESTREAM_IS_READABLE | MFBYTESTREAM_IS_SEEKABLE; + if (stat.grfMode & (STGM_WRITE | STGM_READWRITE)) + *capabilities |= MFBYTESTREAM_IS_WRITABLE; + + return S_OK; +} + static HRESULT WINAPI bytestream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) { struct bytestream *stream = impl_from_IMFByteStream(iface); @@ -3060,7 +3078,7 @@ static const IMFByteStreamVtbl bytestream_stream_vtbl = bytestream_QueryInterface, bytestream_AddRef, bytestream_Release, - bytestream_GetCapabilities, + bytestream_stream_GetCapabilities, bytestream_stream_GetLength, bytestream_stream_SetLength, bytestream_stream_GetCurrentPosition, @@ -3252,7 +3270,6 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt IStream_AddRef(object->stream); position.QuadPart = 0; IStream_Seek(object->stream, position, STREAM_SEEK_SET, NULL); - object->capabilities = MFBYTESTREAM_IS_READABLE | MFBYTESTREAM_IS_SEEKABLE; *bytestream = &object->IMFByteStream_iface;

1 0

Nikolay Sivov : mfplat: Set origin name attribute for stream based bytestreams too.
by Alexandre Julliard 03 Dec '19

03 Dec '19

Module: wine Branch: master Commit: d03cf6ceaa908c8342f76dddb93a36da1e837faa URL: https://source.winehq.org/git/wine.git/?a=commit;h=d03cf6ceaa908c8342f76ddd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 3 14:13:12 2019 +0300 mfplat: Set origin name attribute for stream based bytestreams too. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index fc656678ca..910b923542 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -3245,6 +3245,7 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt { struct bytestream *object; LARGE_INTEGER position; + STATSTG stat; HRESULT hr; TRACE("%p, %p.\n", stream, bytestream); @@ -3271,6 +3272,16 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt position.QuadPart = 0; IStream_Seek(object->stream, position, STREAM_SEEK_SET, NULL); + if (SUCCEEDED(IStream_Stat(object->stream, &stat, 0))) + { + if (stat.pwcsName) + { + IMFAttributes_SetString(&object->attributes.IMFAttributes_iface, &MF_BYTESTREAM_ORIGIN_NAME, + stat.pwcsName); + CoTaskMemFree(stat.pwcsName); + } + } + *bytestream = &object->IMFByteStream_iface; return S_OK;

1 0

Andrey Gusev : ieframe/tests: Fix a typo in ok() message.
by Alexandre Julliard 03 Dec '19

03 Dec '19

Module: wine Branch: master Commit: a211eec6c7d6140c571fdccaa3b348d6b990e2cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=a211eec6c7d6140c571fdcca… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Dec 3 13:34:21 2019 +0200 ieframe/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index a99c68ac5e..f89b2c5b57 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -420,7 +420,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID CHECK_EXPECT2(Exec_SETDOWNLOADSTATE_1); break; default: - ok(0, "unexpevted V_I4(pvaIn)=%d\n", V_I4(pvaIn)); + ok(0, "unexpected V_I4(pvaIn)=%d\n", V_I4(pvaIn)); } return S_OK; case OLECMDID_UPDATECOMMANDS:

1 0

Andrey Gusev : mshtml/tests: Fix a typo in ok() message.
by Alexandre Julliard 03 Dec '19

03 Dec '19

Module: wine Branch: master Commit: 3b2a705b066efa4c24c61ed96f4a7881366e4ae1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b2a705b066efa4c24c61ed9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Dec 3 13:37:33 2019 +0200 mshtml/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 4b55fdd0c8..141d2378db 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2879,7 +2879,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID readystate_set_interactive = (load_state != LD_INTERACTIVE); break; default: - ok(0, "unexpevted V_I4(pvaIn)=%d\n", V_I4(pvaIn)); + ok(0, "unexpected V_I4(pvaIn)=%d\n", V_I4(pvaIn)); } return S_OK;

1 0

Zebediah Figura : strmbase: Use a separate critical section for the SourceSeeking structure.
by Alexandre Julliard 03 Dec '19

03 Dec '19

Module: wine Branch: master Commit: 4008aba45367d8dda05b5d4b2ad909668195e71e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4008aba45367d8dda05b5d4b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 3 10:14:49 2019 -0600 strmbase: Use a separate critical section for the SourceSeeking structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/seeking.c | 53 +++++++++++++++++++++++------------------ dlls/winegstreamer/gstdemux.c | 5 ++-- dlls/wineqtdecoder/qtsplitter.c | 3 ++- include/wine/strmbase.h | 7 ++++-- 4 files changed, 40 insertions(+), 28 deletions(-) diff --git a/dlls/strmbase/seeking.c b/dlls/strmbase/seeking.c index 8a773b51d5..d87e4f8516 100644 --- a/dlls/strmbase/seeking.c +++ b/dlls/strmbase/seeking.c @@ -18,7 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* FIXME: critical sections */ #include "strmbase_private.h" @@ -29,7 +28,9 @@ static inline SourceSeeking *impl_from_IMediaSeeking(IMediaSeeking *iface) return CONTAINING_RECORD(iface, SourceSeeking, IMediaSeeking_iface); } -HRESULT SourceSeeking_Init(SourceSeeking *pSeeking, const IMediaSeekingVtbl *Vtbl, SourceSeeking_ChangeStop fnChangeStop, SourceSeeking_ChangeStart fnChangeStart, SourceSeeking_ChangeRate fnChangeRate, PCRITICAL_SECTION crit_sect) +HRESULT strmbase_seeking_init(SourceSeeking *pSeeking, const IMediaSeekingVtbl *Vtbl, + SourceSeeking_ChangeStop fnChangeStop, SourceSeeking_ChangeStart fnChangeStart, + SourceSeeking_ChangeRate fnChangeRate) { assert(fnChangeStop && fnChangeStart && fnChangeRate); @@ -48,10 +49,16 @@ HRESULT SourceSeeking_Init(SourceSeeking *pSeeking, const IMediaSeekingVtbl *Vtb pSeeking->llDuration = pSeeking->llStop; pSeeking->dRate = 1.0; pSeeking->timeformat = TIME_FORMAT_MEDIA_TIME; - pSeeking->crst = crit_sect; + InitializeCriticalSection(&pSeeking->cs); + pSeeking->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SourceSeeking.cs"); return S_OK; } +void strmbase_seeking_cleanup(SourceSeeking *seeking) +{ + DeleteCriticalSection(&seeking->cs); +} + HRESULT WINAPI SourceSeekingImpl_GetCapabilities(IMediaSeeking * iface, DWORD * pCapabilities) { SourceSeeking *This = impl_from_IMediaSeeking(iface); @@ -104,9 +111,9 @@ HRESULT WINAPI SourceSeekingImpl_GetTimeFormat(IMediaSeeking * iface, GUID * pFo SourceSeeking *This = impl_from_IMediaSeeking(iface); TRACE("(%s)\n", debugstr_guid(pFormat)); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); *pFormat = This->timeformat; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return S_OK; } @@ -118,10 +125,10 @@ HRESULT WINAPI SourceSeekingImpl_IsUsingTimeFormat(IMediaSeeking * iface, const TRACE("(%s)\n", debugstr_guid(pFormat)); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); if (!IsEqualIID(pFormat, &This->timeformat)) hr = S_FALSE; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return hr; } @@ -140,9 +147,9 @@ HRESULT WINAPI SourceSeekingImpl_GetDuration(IMediaSeeking * iface, LONGLONG * p TRACE("(%p)\n", pDuration); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); *pDuration = This->llDuration; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return S_OK; } @@ -153,9 +160,9 @@ HRESULT WINAPI SourceSeekingImpl_GetStopPosition(IMediaSeeking * iface, LONGLONG TRACE("(%p)\n", pStop); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); *pStop = This->llStop; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return S_OK; } @@ -167,9 +174,9 @@ HRESULT WINAPI SourceSeekingImpl_GetCurrentPosition(IMediaSeeking * iface, LONGL TRACE("(%p)\n", pCurrent); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); *pCurrent = This->llCurrent; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return S_OK; } @@ -214,7 +221,7 @@ HRESULT WINAPI SourceSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * LONGLONG llNewCurrent, llNewStop; TRACE("(%p, %x, %p, %x)\n", pCurrent, dwCurrentFlags, pStop, dwStopFlags); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); llNewCurrent = Adjust(This->llCurrent, pCurrent, dwCurrentFlags); llNewStop = Adjust(This->llStop, pStop, dwStopFlags); @@ -233,7 +240,7 @@ HRESULT WINAPI SourceSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * *pCurrent = llNewCurrent; if (pStop && (dwStopFlags & AM_SEEKING_ReturnTime)) *pStop = llNewStop; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); if (bChangeCurrent) This->fnChangeStart(iface); @@ -249,10 +256,10 @@ HRESULT WINAPI SourceSeekingImpl_GetPositions(IMediaSeeking * iface, LONGLONG * TRACE("(%p, %p)\n", pCurrent, pStop); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); IMediaSeeking_GetCurrentPosition(iface, pCurrent); IMediaSeeking_GetStopPosition(iface, pStop); - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return S_OK; } @@ -263,10 +270,10 @@ HRESULT WINAPI SourceSeekingImpl_GetAvailable(IMediaSeeking * iface, LONGLONG * TRACE("(%p, %p)\n", pEarliest, pLatest); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); *pEarliest = 0; *pLatest = This->llDuration; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return S_OK; } @@ -285,11 +292,11 @@ HRESULT WINAPI SourceSeekingImpl_SetRate(IMediaSeeking * iface, double dRate) return VFW_E_UNSUPPORTED_AUDIO; } - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); This->dRate = dRate; if (bChangeRate) hr = This->fnChangeRate(iface); - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return hr; } @@ -300,10 +307,10 @@ HRESULT WINAPI SourceSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate) TRACE("(%p)\n", dRate); - EnterCriticalSection(This->crst); + EnterCriticalSection(&This->cs); /* Forward? */ *dRate = This->dRate; - LeaveCriticalSection(This->crst); + LeaveCriticalSection(&This->cs); return S_OK; } diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 96c174e48a..41e3a05418 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1869,6 +1869,7 @@ static void free_source_pin(struct gstdemux_source *pin) FreeMediaType(&pin->mt); gst_segment_free(pin->segment); + strmbase_seeking_cleanup(&pin->seek); strmbase_source_cleanup(&pin->pin); heap_free(pin); } @@ -1921,8 +1922,8 @@ static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR * pin->segment = gst_segment_new(); gst_segment_init(pin->segment, GST_FORMAT_TIME); pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; - SourceSeeking_Init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, - GST_ChangeCurrent, GST_ChangeRate, &filter->filter.csFilter); + strmbase_seeking_init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, + GST_ChangeCurrent, GST_ChangeRate); BaseFilterImpl_IncrementPinVersion(&filter->filter); sprintf(pad_name, "qz_sink_%u", filter->cStreams); diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index fbec10a912..81e18d3420 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -340,7 +340,8 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) This->pInputPin.pin.peer = NULL; This->pInputPin.pin.pFuncsTable = &sink_ops; - SourceSeeking_Init(&This->sourceSeeking, &QT_Seeking_Vtbl, QTSplitter_ChangeStop, QTSplitter_ChangeStart, QTSplitter_ChangeRate, &This->filter.csFilter); + strmbase_seeking_init(&This->sourceSeeking, &QT_Seeking_Vtbl, + QTSplitter_ChangeStop, QTSplitter_ChangeStart, QTSplitter_ChangeRate); *phr = S_OK; return &This->filter.IUnknown_inner; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index b08303f93d..7949e6670a 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -272,10 +272,13 @@ typedef struct SourceSeeking double dRate; LONGLONG llCurrent, llStop, llDuration; GUID timeformat; - PCRITICAL_SECTION crst; + CRITICAL_SECTION cs; } SourceSeeking; -HRESULT SourceSeeking_Init(SourceSeeking *pSeeking, const IMediaSeekingVtbl *Vtbl, SourceSeeking_ChangeStop fnChangeStop, SourceSeeking_ChangeStart fnChangeStart, SourceSeeking_ChangeRate fnChangeRate, PCRITICAL_SECTION crit_sect); +HRESULT strmbase_seeking_init(SourceSeeking *seeking, const IMediaSeekingVtbl *vtbl, + SourceSeeking_ChangeStop fnChangeStop, SourceSeeking_ChangeStart fnChangeStart, + SourceSeeking_ChangeRate fnChangeRate); +void strmbase_seeking_cleanup(SourceSeeking *seeking); HRESULT WINAPI SourceSeekingImpl_GetCapabilities(IMediaSeeking * iface, DWORD * pCapabilities); HRESULT WINAPI SourceSeekingImpl_CheckCapabilities(IMediaSeeking * iface, DWORD * pCapabilities);

1 0

Zebediah Figura : winegstreamer: Don't hold the filter lock from the pad-added or pad-removed callbacks.
by Alexandre Julliard 03 Dec '19

03 Dec '19

Module: wine Branch: master Commit: 7a0d963df34b68804214470c00a6eb7dd0d2d871 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a0d963df34b68804214470c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 3 10:14:50 2019 -0600 winegstreamer: Don't hold the filter lock from the pad-added or pad-removed callbacks. These may be called from the streaming thread, so it's not safe to do so. Nor does it seem necessary. We expect that no streaming thread should ever call methods on our pad or pin, and as long as we hold the filter lock and wait for the no-more-pads signal when connecting or starting the stream, we cannot race with application threads. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 41e3a05418..623974642d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -814,13 +814,17 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) TRACE("%p %p %p\n", This, bin, pad); - EnterCriticalSection(&This->filter.csFilter); for (x = 0; x < This->cStreams; ++x) { if (This->ppPins[x]->their_src == pad) break; } if (x == This->cStreams) - goto out; + { + char *name = gst_pad_get_name(pad); + WARN("No pin matching pad %s found.\n", debugstr_a(name)); + g_free(name); + return; + } pin = This->ppPins[x]; @@ -831,9 +835,6 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) gst_object_unref(pin->their_src); pin->their_src = NULL; -out: - TRACE("Removed %i/%i\n", x, This->cStreams); - LeaveCriticalSection(&This->filter.csFilter); } static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux *This) @@ -971,7 +972,6 @@ static void existing_new_pad(GstElement *bin, GstPad *pad, gpointer user) return; } - EnterCriticalSection(&This->filter.csFilter); for (x = 0; x < This->cStreams; ++x) { struct gstdemux_source *pin = This->ppPins[x]; if (!pin->their_src) { @@ -986,13 +986,11 @@ static void existing_new_pad(GstElement *bin, GstPad *pad, gpointer user) pin->their_src = pad; gst_object_ref(pin->their_src); TRACE("Relinked\n"); - LeaveCriticalSection(&This->filter.csFilter); return; } } } init_new_decoded_pad(bin, pad, This); - LeaveCriticalSection(&This->filter.csFilter); } static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query)

1 0

Zebediah Figura : winegstreamer: Also wait for the no-more-pads signal when pausing the filter.
by Alexandre Julliard 03 Dec '19

03 Dec '19

Module: wine Branch: master Commit: 078ac0f764e7a8b0a592595f25a5d53a447d64bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=078ac0f764e7a8b0a592595f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 3 10:14:51 2019 -0600 winegstreamer: Also wait for the no-more-pads signal when pausing the filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 623974642d..b44ef2b63b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1416,8 +1416,17 @@ static HRESULT WINAPI GST_Run(IBaseFilter *iface, REFERENCE_TIME tStart) } EnterCriticalSection(&This->filter.csFilter); + + if (This->no_more_pads_event) + ResetEvent(This->no_more_pads_event); + gst_element_set_state(This->container, GST_STATE_PLAYING); + /* Make sure that all of our pads are connected before returning, lest we + * e.g. try to seek and fail. */ + if (This->no_more_pads_event) + WaitForSingleObject(This->no_more_pads_event, INFINITE); + for (i = 0; i < This->cStreams; i++) { hr = BaseOutputPinImpl_Active(&This->ppPins[i]->pin); if (SUCCEEDED(hr)) {

1 0

Zebediah Figura : winegstreamer: Use strmbase state change methods.
by Alexandre Julliard 03 Dec '19

03 Dec '19

Module: wine Branch: master Commit: 90ebc7e33b464d12c6f12dde595037544f59331e URL: https://source.winehq.org/git/wine.git/?a=commit;h=90ebc7e33b464d12c6f12dde… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 3 10:14:52 2019 -0600 winegstreamer: Use strmbase state change methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 255 ++++++++++++++++++++---------------------- 1 file changed, 122 insertions(+), 133 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b44ef2b63b..753286a718 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -88,11 +88,6 @@ struct gstdemux_source SourceSeeking seek; }; -static inline struct gstdemux *impl_from_IBaseFilter(IBaseFilter *iface) -{ - return CONTAINING_RECORD(iface, struct gstdemux, filter.IBaseFilter_iface); -} - static inline struct gstdemux *impl_from_strmbase_filter(struct strmbase_filter *iface) { return CONTAINING_RECORD(iface, struct gstdemux, filter); @@ -1232,10 +1227,123 @@ static void gstdemux_destroy(struct strmbase_filter *iface) heap_free(filter); } +static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) +{ + struct gstdemux *filter = impl_from_strmbase_filter(iface); + HRESULT hr = VFW_E_NOT_CONNECTED, pin_hr; + GstStateChangeReturn ret; + unsigned int i; + + if (!filter->container) + return VFW_E_NOT_CONNECTED; + + if (filter->no_more_pads_event) + ResetEvent(filter->no_more_pads_event); + + if ((ret = gst_element_set_state(filter->container, GST_STATE_PAUSED)) == GST_STATE_CHANGE_FAILURE) + { + ERR("Failed to pause stream.\n"); + return E_FAIL; + } + + /* Make sure that all of our pads are connected before returning, lest we + * e.g. try to seek and fail. */ + if (filter->no_more_pads_event) + WaitForSingleObject(filter->no_more_pads_event, INFINITE); + + for (i = 0; i < filter->cStreams; ++i) + { + if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->ppPins[i]->pin))) + hr = pin_hr; + } + return hr; +} + +static HRESULT gstdemux_start_stream(struct strmbase_filter *iface, REFERENCE_TIME time) +{ + struct gstdemux *filter = impl_from_strmbase_filter(iface); + GstStateChangeReturn ret; + + if (!filter->container) + return VFW_E_NOT_CONNECTED; + + if ((ret = gst_element_set_state(filter->container, GST_STATE_PLAYING)) == GST_STATE_CHANGE_FAILURE) + { + ERR("Failed to play stream.\n"); + return E_FAIL; + } + else if (ret == GST_STATE_CHANGE_ASYNC) + return S_FALSE; + return S_OK; +} + +static HRESULT gstdemux_stop_stream(struct strmbase_filter *iface) +{ + struct gstdemux *filter = impl_from_strmbase_filter(iface); + GstStateChangeReturn ret; + + if (!filter->container) + return VFW_E_NOT_CONNECTED; + + if ((ret = gst_element_set_state(filter->container, GST_STATE_PAUSED)) == GST_STATE_CHANGE_FAILURE) + { + ERR("Failed to pause stream.\n"); + return E_FAIL; + } + else if (ret == GST_STATE_CHANGE_ASYNC) + return S_FALSE; + return S_OK; +} + +static HRESULT gstdemux_cleanup_stream(struct strmbase_filter *iface) +{ + struct gstdemux *filter = impl_from_strmbase_filter(iface); + GstStateChangeReturn ret; + + if (!filter->container) + return S_OK; + + filter->ignore_flush = TRUE; + if ((ret = gst_element_set_state(filter->container, GST_STATE_READY)) == GST_STATE_CHANGE_FAILURE) + { + ERR("Failed to pause stream.\n"); + return E_FAIL; + } + gst_element_get_state(filter->container, NULL, NULL, GST_CLOCK_TIME_NONE); + filter->ignore_flush = FALSE; + + return S_OK; +} + +static HRESULT gstdemux_wait_state(struct strmbase_filter *iface, DWORD timeout) +{ + struct gstdemux *filter = impl_from_strmbase_filter(iface); + GstStateChangeReturn ret; + + if (!filter->container) + return S_OK; + + ret = gst_element_get_state(filter->container, NULL, NULL, + timeout == INFINITE ? GST_CLOCK_TIME_NONE : timeout * 1000); + if (ret == GST_STATE_CHANGE_FAILURE) + { + ERR("Failed to get state.\n"); + return E_FAIL; + } + else if (ret == GST_STATE_CHANGE_ASYNC) + return VFW_S_STATE_INTERMEDIATE; + return S_OK; +} + static const struct strmbase_filter_ops filter_ops = { .filter_get_pin = gstdemux_get_pin, .filter_destroy = gstdemux_destroy, + .filter_init_stream = gstdemux_init_stream, + .filter_start_stream = gstdemux_start_stream, + .filter_stop_stream = gstdemux_stop_stream, + .filter_cleanup_stream = gstdemux_cleanup_stream, + .filter_wait_state = gstdemux_wait_state, }; static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) @@ -1345,139 +1453,15 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) return &object->filter.IUnknown_inner; } -static HRESULT WINAPI GST_Stop(IBaseFilter *iface) -{ - struct gstdemux *This = impl_from_IBaseFilter(iface); - - TRACE("(%p)\n", This); - - mark_wine_thread(); - - if (This->container) { - This->ignore_flush = TRUE; - gst_element_set_state(This->container, GST_STATE_READY); - gst_element_get_state(This->container, NULL, NULL, -1); - This->ignore_flush = FALSE; - } - return S_OK; -} - -static HRESULT WINAPI GST_Pause(IBaseFilter *iface) -{ - struct gstdemux *This = impl_from_IBaseFilter(iface); - HRESULT hr = S_OK; - GstState now; - GstStateChangeReturn ret; - - TRACE("(%p)\n", This); - - if (!This->container) - return VFW_E_NOT_CONNECTED; - - mark_wine_thread(); - - gst_element_get_state(This->container, &now, NULL, -1); - if (now == GST_STATE_PAUSED) - return S_OK; - if (now != GST_STATE_PLAYING) - hr = IBaseFilter_Run(iface, -1); - if (FAILED(hr)) - return hr; - ret = gst_element_set_state(This->container, GST_STATE_PAUSED); - if (ret == GST_STATE_CHANGE_ASYNC) - hr = S_FALSE; - return hr; -} - -static HRESULT WINAPI GST_Run(IBaseFilter *iface, REFERENCE_TIME tStart) -{ - struct gstdemux *This = impl_from_IBaseFilter(iface); - HRESULT hr = S_OK; - ULONG i; - GstState now; - HRESULT hr_any = VFW_E_NOT_CONNECTED; - - TRACE("(%p)->(%s)\n", This, wine_dbgstr_longlong(tStart)); - - mark_wine_thread(); - - if (!This->container) - return VFW_E_NOT_CONNECTED; - - gst_element_get_state(This->container, &now, NULL, -1); - if (now == GST_STATE_PLAYING) - return S_OK; - if (now == GST_STATE_PAUSED) { - GstStateChangeReturn ret; - ret = gst_element_set_state(This->container, GST_STATE_PLAYING); - if (ret == GST_STATE_CHANGE_ASYNC) - return S_FALSE; - return S_OK; - } - - EnterCriticalSection(&This->filter.csFilter); - - if (This->no_more_pads_event) - ResetEvent(This->no_more_pads_event); - - gst_element_set_state(This->container, GST_STATE_PLAYING); - - /* Make sure that all of our pads are connected before returning, lest we - * e.g. try to seek and fail. */ - if (This->no_more_pads_event) - WaitForSingleObject(This->no_more_pads_event, INFINITE); - - for (i = 0; i < This->cStreams; i++) { - hr = BaseOutputPinImpl_Active(&This->ppPins[i]->pin); - if (SUCCEEDED(hr)) { - hr_any = hr; - } - } - hr = hr_any; - LeaveCriticalSection(&This->filter.csFilter); - - return hr; -} - -static HRESULT WINAPI GST_GetState(IBaseFilter *iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState) -{ - struct gstdemux *This = impl_from_IBaseFilter(iface); - HRESULT hr = S_OK; - GstState now, pending; - GstStateChangeReturn ret; - - TRACE("(%p)->(%d, %p)\n", This, dwMilliSecsTimeout, pState); - - mark_wine_thread(); - - if (!This->container) { - *pState = State_Stopped; - return S_OK; - } - - ret = gst_element_get_state(This->container, &now, &pending, dwMilliSecsTimeout == INFINITE ? -1 : dwMilliSecsTimeout * 1000); - - if (ret == GST_STATE_CHANGE_ASYNC) - hr = VFW_S_STATE_INTERMEDIATE; - else - pending = now; - - switch (pending) { - case GST_STATE_PAUSED: *pState = State_Paused; return hr; - case GST_STATE_PLAYING: *pState = State_Running; return hr; - default: *pState = State_Stopped; return hr; - } -} - static const IBaseFilterVtbl GST_Vtbl = { BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID, - GST_Stop, - GST_Pause, - GST_Run, - GST_GetState, + BaseFilterImpl_Stop, + BaseFilterImpl_Pause, + BaseFilterImpl_Run, + BaseFilterImpl_GetState, BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, @@ -2617,6 +2601,11 @@ static const struct strmbase_filter_ops mpeg_splitter_ops = .filter_query_interface = mpeg_splitter_query_interface, .filter_get_pin = gstdemux_get_pin, .filter_destroy = gstdemux_destroy, + .filter_init_stream = gstdemux_init_stream, + .filter_start_stream = gstdemux_start_stream, + .filter_stop_stream = gstdemux_stop_stream, + .filter_cleanup_stream = gstdemux_cleanup_stream, + .filter_wait_state = gstdemux_wait_state, }; IUnknown * CALLBACK mpeg_splitter_create(IUnknown *outer, HRESULT *phr)

1 0

Henri Verbeet : wined3d: Finish the CS before removing the context in adapter_vk_uninit_3d().
by Alexandre Julliard 03 Dec '19

03 Dec '19

Module: wine Branch: master Commit: 82088bc6b339d3d5b20a18c2760bf315fa502519 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82088bc6b339d3d5b20a18c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 3 20:23:56 2019 +0330 wined3d: Finish the CS before removing the context in adapter_vk_uninit_3d(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 21163a2094..4a50129282 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -466,6 +466,7 @@ static void adapter_vk_uninit_3d(struct wined3d_device *device) device->blitter->ops->blitter_destroy(device->blitter, NULL); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); device_context_remove(device, &context_vk->c); device->shader_backend->shader_free_private(device, NULL); wined3d_context_vk_cleanup(context_vk);

1 0