September 2020 - Wine-commits

Derek Lesho : winegstreamer: Add stub bytestream handler.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: a6be76bb9cd00614c565c2f1b69d6733e38414db URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6be76bb9cd00614c565c2f1… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Sep 2 15:05:02 2020 -0500 winegstreamer: Add stub bytestream handler. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 6 + dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/gst_private.h | 2 + dlls/winegstreamer/media_source.c | 474 +++++++++++++++++++++++++++ dlls/winegstreamer/mfplat.c | 3 + dlls/winegstreamer/winegstreamer_classes.idl | 7 + 6 files changed, 493 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6be76bb9cd00614c565…

1 0

Derek Lesho : winegstreamer: Add stub media source.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: 784ae1e9bd4129a4f0967c656c51e6c9cc3855f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=784ae1e9bd4129a4f0967c65… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Sep 2 14:26:00 2020 -0500 winegstreamer: Add stub media source. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 1 - dlls/winegstreamer/media_source.c | 197 +++++++++++++++++++++++++++++++++++++- 2 files changed, 195 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index fa90f1e4ba..94fdf9e6f3 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -382,7 +382,6 @@ static HRESULT WINAPI test_create_from_file_handler_callback_Invoke(IMFAsyncCall handler = (IMFSchemeHandler *)IMFAsyncResult_GetStateNoAddRef(result); hr = IMFSchemeHandler_EndCreateObject(handler, result, &obj_type, &object); -todo_wine ok(hr == S_OK, "Failed to create an object, hr %#x.\n", hr); if (SUCCEEDED(hr)) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 2bde4efea2..21245c718b 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -34,6 +34,180 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +struct media_source +{ + IMFMediaSource IMFMediaSource_iface; + LONG ref; +}; + +static inline struct media_source *impl_from_IMFMediaSource(IMFMediaSource *iface) +{ + return CONTAINING_RECORD(iface, struct media_source, IMFMediaSource_iface); +} + +static HRESULT WINAPI media_source_QueryInterface(IMFMediaSource *iface, REFIID riid, void **out) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + TRACE("(%p)->(%s %p)\n", source, debugstr_guid(riid), out); + + if (IsEqualIID(riid, &IID_IMFMediaSource) || + IsEqualIID(riid, &IID_IMFMediaEventGenerator) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = &source->IMFMediaSource_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI media_source_AddRef(IMFMediaSource *iface) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + ULONG ref = InterlockedIncrement(&source->ref); + + TRACE("(%p) ref=%u\n", source, ref); + + return ref; +} + +static ULONG WINAPI media_source_Release(IMFMediaSource *iface) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + ULONG ref = InterlockedDecrement(&source->ref); + + TRACE("(%p) ref=%u\n", source, ref); + + if (!ref) + { + heap_free(source); + } + + return ref; +} + +static HRESULT WINAPI media_source_GetEvent(IMFMediaSource *iface, DWORD flags, IMFMediaEvent **event) +{ + FIXME("(%p)->(%#x, %p)\n", iface, flags, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_source_BeginGetEvent(IMFMediaSource *iface, IMFAsyncCallback *callback, IUnknown *state) +{ + FIXME("(%p)->(%p, %p)\n", iface, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_source_EndGetEvent(IMFMediaSource *iface, IMFAsyncResult *result, IMFMediaEvent **event) +{ + FIXME("(%p)->(%p, %p)\n", iface, result, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_source_QueueEvent(IMFMediaSource *iface, MediaEventType event_type, REFGUID ext_type, + HRESULT hr, const PROPVARIANT *value) +{ + FIXME("(%p)->(%d, %s, %#x, %p)\n", iface, event_type, debugstr_guid(ext_type), hr, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_source_GetCharacteristics(IMFMediaSource *iface, DWORD *characteristics) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%p): stub\n", source, characteristics); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **descriptor) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%p): stub\n", source, descriptor); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationDescriptor *descriptor, + const GUID *time_format, const PROPVARIANT *start_position) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%p, %p, %p): stub\n", source, descriptor, time_format, start_position); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_source_Stop(IMFMediaSource *iface) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + FIXME("(%p): stub\n", source); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_source_Pause(IMFMediaSource *iface) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + FIXME("(%p): stub\n", source); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) +{ + struct media_source *source = impl_from_IMFMediaSource(iface); + + FIXME("(%p): stub\n", source); + + return E_NOTIMPL; +} + +static const IMFMediaSourceVtbl IMFMediaSource_vtbl = +{ + media_source_QueryInterface, + media_source_AddRef, + media_source_Release, + media_source_GetEvent, + media_source_BeginGetEvent, + media_source_EndGetEvent, + media_source_QueueEvent, + media_source_GetCharacteristics, + media_source_CreatePresentationDescriptor, + media_source_Start, + media_source_Stop, + media_source_Pause, + media_source_Shutdown, +}; + +static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_source **out_media_source) +{ + struct media_source *object = heap_alloc_zero(sizeof(*object)); + + if (!object) + return E_OUTOFMEMORY; + + object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl; + object->ref = 1; + + *out_media_source = object; + return S_OK; +} + struct winegstreamer_stream_handler_result { struct list entry; @@ -386,9 +560,28 @@ static HRESULT WINAPI winegstreamer_stream_handler_callback_GetParameters(IMFAsy static HRESULT winegstreamer_stream_handler_create_object(struct winegstreamer_stream_handler *This, WCHAR *url, IMFByteStream *stream, DWORD flags, IPropertyStore *props, IUnknown **out_object, MF_OBJECT_TYPE *out_obj_type) { - FIXME("(%p %s %p %u %p %p %p)\n", This, debugstr_w(url), stream, flags, props, out_object, out_obj_type); + TRACE("(%p %s %p %u %p %p %p)\n", This, debugstr_w(url), stream, flags, props, out_object, out_obj_type); - return E_NOTIMPL; + if (flags & MF_RESOLUTION_MEDIASOURCE) + { + HRESULT hr; + struct media_source *new_source; + + if (FAILED(hr = media_source_constructor(stream, &new_source))) + return hr; + + TRACE("->(%p)\n", new_source); + + *out_object = (IUnknown*)&new_source->IMFMediaSource_iface; + *out_obj_type = MF_OBJECT_MEDIASOURCE; + + return S_OK; + } + else + { + FIXME("flags = %08x\n", flags); + return E_NOTIMPL; + } } static HRESULT WINAPI winegstreamer_stream_handler_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result)

1 0

Derek Lesho : winegstreamer: Implement source event methods.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: d832ebf1b0a082a41f5c8e1169d934fefb41d0f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d832ebf1b0a082a41f5c8e11… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Sep 2 14:26:01 2020 -0500 winegstreamer: Implement source event methods. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 21245c718b..cbe51fa957 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -38,6 +38,7 @@ struct media_source { IMFMediaSource IMFMediaSource_iface; LONG ref; + IMFMediaEventQueue *event_queue; }; static inline struct media_source *impl_from_IMFMediaSource(IMFMediaSource *iface) @@ -87,6 +88,7 @@ static ULONG WINAPI media_source_Release(IMFMediaSource *iface) if (!ref) { + IMFMediaEventQueue_Release(source->event_queue); heap_free(source); } @@ -95,31 +97,39 @@ static ULONG WINAPI media_source_Release(IMFMediaSource *iface) static HRESULT WINAPI media_source_GetEvent(IMFMediaSource *iface, DWORD flags, IMFMediaEvent **event) { - FIXME("(%p)->(%#x, %p)\n", iface, flags, event); + struct media_source *source = impl_from_IMFMediaSource(iface); - return E_NOTIMPL; + TRACE("(%p)->(%#x, %p)\n", source, flags, event); + + return IMFMediaEventQueue_GetEvent(source->event_queue, flags, event); } static HRESULT WINAPI media_source_BeginGetEvent(IMFMediaSource *iface, IMFAsyncCallback *callback, IUnknown *state) { - FIXME("(%p)->(%p, %p)\n", iface, callback, state); + struct media_source *source = impl_from_IMFMediaSource(iface); - return E_NOTIMPL; + TRACE("(%p)->(%p, %p)\n", source, callback, state); + + return IMFMediaEventQueue_BeginGetEvent(source->event_queue, callback, state); } static HRESULT WINAPI media_source_EndGetEvent(IMFMediaSource *iface, IMFAsyncResult *result, IMFMediaEvent **event) { - FIXME("(%p)->(%p, %p)\n", iface, result, event); + struct media_source *source = impl_from_IMFMediaSource(iface); - return E_NOTIMPL; + TRACE("(%p)->(%p, %p)\n", source, result, event); + + return IMFMediaEventQueue_EndGetEvent(source->event_queue, result, event); } static HRESULT WINAPI media_source_QueueEvent(IMFMediaSource *iface, MediaEventType event_type, REFGUID ext_type, HRESULT hr, const PROPVARIANT *value) { - FIXME("(%p)->(%d, %s, %#x, %p)\n", iface, event_type, debugstr_guid(ext_type), hr, value); + struct media_source *source = impl_from_IMFMediaSource(iface); - return E_NOTIMPL; + TRACE("(%p)->(%d, %s, %#x, %p)\n", source, event_type, debugstr_guid(ext_type), hr, value); + + return IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, ext_type, hr, value); } static HRESULT WINAPI media_source_GetCharacteristics(IMFMediaSource *iface, DWORD *characteristics) @@ -197,15 +207,25 @@ static const IMFMediaSourceVtbl IMFMediaSource_vtbl = static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_source **out_media_source) { struct media_source *object = heap_alloc_zero(sizeof(*object)); + HRESULT hr; if (!object) return E_OUTOFMEMORY; + if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) + goto fail; + object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl; object->ref = 1; *out_media_source = object; return S_OK; + + fail: + WARN("Failed to construct MFMediaSource, hr %#x.\n", hr); + + IMFMediaSource_Release(&object->IMFMediaSource_iface); + return hr; } struct winegstreamer_stream_handler_result

1 0

Derek Lesho : winegstreamer: Implement IMFMediaSource::Shutdown.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: e7b8911695d42ddb826c941dcd9c26da5c3312b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7b8911695d42ddb826c941d… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Sep 2 14:26:02 2020 -0500 winegstreamer: Implement IMFMediaSource::Shutdown. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 4 ++-- dlls/winegstreamer/media_source.c | 36 ++++++++++++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 94fdf9e6f3..309f7b669a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -673,14 +673,14 @@ todo_wine IMFMediaTypeHandler_Release(handler); IMFPresentationDescriptor_Release(descriptor); +skip_source_tests: + hr = IMFMediaSource_Shutdown(mediasource); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, NULL); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); -skip_source_tests: - IMFMediaSource_Release(mediasource); IMFByteStream_Release(stream); diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index cbe51fa957..84ecf305d4 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -39,6 +39,12 @@ struct media_source IMFMediaSource IMFMediaSource_iface; LONG ref; IMFMediaEventQueue *event_queue; + enum + { + SOURCE_OPENING, + SOURCE_STOPPED, + SOURCE_SHUTDOWN, + } state; }; static inline struct media_source *impl_from_IMFMediaSource(IMFMediaSource *iface) @@ -88,6 +94,7 @@ static ULONG WINAPI media_source_Release(IMFMediaSource *iface) if (!ref) { + IMFMediaSource_Shutdown(&source->IMFMediaSource_iface); IMFMediaEventQueue_Release(source->event_queue); heap_free(source); } @@ -138,6 +145,9 @@ static HRESULT WINAPI media_source_GetCharacteristics(IMFMediaSource *iface, DWO FIXME("(%p)->(%p): stub\n", source, characteristics); + if (source->state == SOURCE_SHUTDOWN) + return MF_E_SHUTDOWN; + return E_NOTIMPL; } @@ -147,6 +157,9 @@ static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource * FIXME("(%p)->(%p): stub\n", source, descriptor); + if (source->state == SOURCE_SHUTDOWN) + return MF_E_SHUTDOWN; + return E_NOTIMPL; } @@ -157,6 +170,9 @@ static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationD FIXME("(%p)->(%p, %p, %p): stub\n", source, descriptor, time_format, start_position); + if (source->state == SOURCE_SHUTDOWN) + return MF_E_SHUTDOWN; + return E_NOTIMPL; } @@ -166,6 +182,9 @@ static HRESULT WINAPI media_source_Stop(IMFMediaSource *iface) FIXME("(%p): stub\n", source); + if (source->state == SOURCE_SHUTDOWN) + return MF_E_SHUTDOWN; + return E_NOTIMPL; } @@ -175,6 +194,9 @@ static HRESULT WINAPI media_source_Pause(IMFMediaSource *iface) FIXME("(%p): stub\n", source); + if (source->state == SOURCE_SHUTDOWN) + return MF_E_SHUTDOWN; + return E_NOTIMPL; } @@ -182,9 +204,17 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) { struct media_source *source = impl_from_IMFMediaSource(iface); - FIXME("(%p): stub\n", source); + TRACE("(%p)\n", source); - return E_NOTIMPL; + if (source->state == SOURCE_SHUTDOWN) + return MF_E_SHUTDOWN; + + source->state = SOURCE_SHUTDOWN; + + if (source->event_queue) + IMFMediaEventQueue_Shutdown(source->event_queue); + + return S_OK; } static const IMFMediaSourceVtbl IMFMediaSource_vtbl = @@ -215,6 +245,8 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) goto fail; + object->state = SOURCE_STOPPED; + object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl; object->ref = 1;

1 0

Arkadiusz Hiler : msvcirt: Implement _mtlock() and _mtunlock().
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: d25e7429ccd7ddd30cdfc29cd565b9160e90101d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d25e7429ccd7ddd30cdfc29c… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Fri Sep 4 17:16:19 2020 +0300 msvcirt: Implement _mtlock() and _mtunlock(). Looks like they are just cdecl wrappers around stdcall EnterCriticalSection() and LeaveCriticalSection(). The game TRON 2.0 was crashing on the stubs. Now it makes it a bit further. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 12 +++++++++++ dlls/msvcirt/msvcirt.spec | 4 ++-- dlls/msvcirt/tests/msvcirt.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 4 ++-- dlls/msvcrt40/msvcrt40.spec | 4 ++-- 5 files changed, 67 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 6bd910e9a8..b5fd19c39e 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -4723,6 +4723,18 @@ DEFINE_VTBL_WRAPPER(56); void* (__cdecl *MSVCRT_operator_new)(SIZE_T); void (__cdecl *MSVCRT_operator_delete)(void*); +void __cdecl _mtlock(CRITICAL_SECTION *crit) +{ + TRACE("(%p)\n", crit); + EnterCriticalSection(crit); +} + +void __cdecl _mtunlock(CRITICAL_SECTION *crit) +{ + TRACE("(%p)\n", crit); + LeaveCriticalSection(crit); +} + static void init_cxx_funcs(void) { HMODULE hmod = GetModuleHandleA("msvcrt.dll"); diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index c2b4b9d30e..4e8f221b2c 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -786,5 +786,5 @@ @ thiscall -arch=win32 ?xsputn(a)streambuf@@UAEHPBDH(a)Z(ptr ptr long) streambuf_xsputn @ cdecl -arch=win64 ?xsputn(a)streambuf@@UEAAHPEBDH(a)Z(ptr ptr long) streambuf_xsputn @ stub __dummy_export -@ stub _mtlock -@ stub _mtunlock +@ cdecl _mtlock(ptr) +@ cdecl _mtunlock(ptr) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index e1a6296783..b87bd42266 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -447,6 +447,10 @@ static const char* (*__thiscall p_exception_what)(exception*); static logic_error* (*__thiscall p_logic_error_ctor)(logic_error*, const char**); static void (*__thiscall p_logic_error_dtor)(logic_error*); +/* locking */ +static void (*__cdecl p__mtlock)(CRITICAL_SECTION *); +static void (*__cdecl p__mtunlock)(CRITICAL_SECTION *); + /* Predefined streams */ static istream *p_cin; static ostream *p_cout, *p_cerr, *p_clog; @@ -1005,6 +1009,9 @@ static BOOL init(void) SET(p_cerr, "?cerr@@3Vostream_withassign@@A"); SET(p_clog, "?clog@@3Vostream_withassign@@A"); + SET(p__mtlock, "_mtlock"); + SET(p__mtunlock, "_mtunlock"); + init_thiscall_thunk(); return TRUE; } @@ -7957,6 +7964,47 @@ static void test_exception(void) call_func1(p_logic_error_dtor, (void*) &le); } +static DWORD WINAPI _try_enter_critical(void *crit) +{ + BOOL ret = TryEnterCriticalSection(crit); + + if (ret) + LeaveCriticalSection(crit); + + return ret; +} + +static void test_mtlock_mtunlock(void) +{ + CRITICAL_SECTION crit; + HANDLE thread; + DWORD exit_code, ret; + + InitializeCriticalSection(&crit); + + p__mtlock(&crit); + + thread = CreateThread(NULL, 0, _try_enter_critical, &crit, 0, NULL); + ok(thread != NULL, "failed to create a thread, error: %x\n", GetLastError()); + ret = WaitForSingleObject(thread, 1000); + ok(ret == WAIT_OBJECT_0, "failed to wait for the thread, ret: %d, error: %x\n", ret, GetLastError()); + ok(GetExitCodeThread(thread, &exit_code), "failed to get exit code of the thread\n"); + ok(exit_code == FALSE, "the thread entered critical section\n"); + ret = CloseHandle(thread); + ok(ret, "failed to close thread's handle, error: %x\n", GetLastError()); + + p__mtunlock(&crit); + + thread = CreateThread(NULL, 0, _try_enter_critical, &crit, 0, NULL); + ok(thread != NULL, "failed to create a thread, error: %x\n", GetLastError()); + ret = WaitForSingleObject(thread, 1000); + ok(ret == WAIT_OBJECT_0, "failed to wait for the thread, ret: %d, error: %x\n", ret, GetLastError()); + ok(GetExitCodeThread(thread, &exit_code), "failed to get exit code of the thread\n"); + ok(exit_code == TRUE, "the thread was not able to enter critical section\n"); + ret = CloseHandle(thread); + ok(ret, "failed to close thread's handle, error: %x\n", GetLastError()); +} + START_TEST(msvcirt) { if(!init()) @@ -7984,6 +8032,7 @@ START_TEST(msvcirt) test_Iostream_init(); test_std_streams(); test_exception(); + test_mtlock_mtunlock(); FreeLibrary(msvcrt); FreeLibrary(msvcirt); diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 2ce72c6b13..b791202470 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -1072,8 +1072,8 @@ @ cdecl _mkdir(str) msvcrt._mkdir @ cdecl _mktemp(str) msvcrt._mktemp @ cdecl _msize(ptr) msvcrt._msize -@ stub _mtlock -@ stub _mtunlock +@ cdecl _mtlock(ptr) msvcirt._mtlock +@ cdecl _mtunlock(ptr) msvcirt._mtunlock @ cdecl _nextafter(double double) msvcrt._nextafter @ cdecl _onexit(ptr) msvcrt._onexit @ varargs _open(str long) msvcrt._open diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index efa3e3251d..3f4f2f90e1 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -1163,8 +1163,8 @@ @ cdecl _mkdir(str) msvcrt._mkdir @ cdecl _mktemp(str) msvcrt._mktemp @ cdecl _msize(ptr) msvcrt._msize -@ stub _mtlock -@ stub _mtunlock +@ cdecl _mtlock(ptr) msvcirt._mtlock +@ cdecl _mtunlock(ptr) msvcirt._mtunlock @ cdecl _nextafter(double double) msvcrt._nextafter @ cdecl _onexit(ptr) msvcrt._onexit @ varargs _open(str long) msvcrt._open

1 0

Arkadiusz Hiler : msvcirt: Include iostream in strstream's and stdiostream's rtti hierarchy.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: b3428ac9d03a37b0309a6ae1396e49014f901ec4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3428ac9d03a37b0309a6ae1… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Sep 7 19:22:02 2020 +0300 msvcirt: Include iostream in strstream's and stdiostream's rtti hierarchy. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 4 ++-- dlls/msvcp90/cxx.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index b5fd19c39e..170dcee462 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -315,10 +315,10 @@ DEFINE_RTTI_DATA2(ifstream, sizeof(istream), DEFINE_RTTI_DATA4(iostream, sizeof(iostream), &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, &ostream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AViostream@@") -DEFINE_RTTI_DATA4(strstream, sizeof(iostream), +DEFINE_RTTI_DATA5(strstream, sizeof(iostream), &iostream_rtti_base_descriptor, &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, &ostream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVstrstream@@") -DEFINE_RTTI_DATA4(stdiostream, sizeof(iostream), +DEFINE_RTTI_DATA5(stdiostream, sizeof(iostream), &iostream_rtti_base_descriptor, &istream_rtti_base_descriptor, &ios_rtti_base_descriptor, &ostream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVstdiostream@@") diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 721d02c548..02735a3c16 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -247,6 +247,8 @@ static void init_ ## type ## _cxx(char *base) \ DEFINE_RTTI_DATA(name, off, 3, cl1, cl2, cl3, NULL, NULL, NULL, NULL, NULL, NULL, mangled_name) #define DEFINE_RTTI_DATA4(name, off, cl1, cl2, cl3, cl4, mangled_name) \ DEFINE_RTTI_DATA(name, off, 4, cl1, cl2, cl3, cl4, NULL, NULL, NULL, NULL, NULL, mangled_name) +#define DEFINE_RTTI_DATA5(name, off, cl1, cl2, cl3, cl4, cl5, mangled_name) \ + DEFINE_RTTI_DATA(name, off, 5, cl1, cl2, cl3, cl4, cl5, NULL, NULL, NULL, NULL, mangled_name) #define DEFINE_RTTI_DATA8(name, off, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, mangled_name) \ DEFINE_RTTI_DATA(name, off, 8, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, NULL, mangled_name) #define DEFINE_RTTI_DATA9(name, off, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \

1 0

Nikolay Sivov : evr/mixer: Use same max input count symbol for GetStreamLimits().
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: cc66d5de6ad78fff756dd254c0482773f5f005bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc66d5de6ad78fff756dd254… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 7 12:43:33 2020 +0300 evr/mixer: Use same max input count symbol for GetStreamLimits(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index d9f86a7fc9..7e08beae35 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -284,7 +284,7 @@ static HRESULT WINAPI video_mixer_transform_GetStreamLimits(IMFTransform *iface, TRACE("%p, %p, %p, %p, %p.\n", iface, input_minimum, input_maximum, output_minimum, output_maximum); *input_minimum = 1; - *input_maximum = 16; + *input_maximum = MAX_MIXER_INPUT_STREAMS; *output_minimum = 1; *output_maximum = 1;

1 0

Nikolay Sivov : mf/evr: Actually use custom mixer when available.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: c1c4856205c78a9c8c153cbec2907e8b392b9838 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1c4856205c78a9c8c153cbe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 7 12:43:34 2020 +0300 mf/evr: Actually use custom mixer when available. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 8a4aa3c350..fe73f6a4a0 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -734,7 +734,7 @@ static HRESULT video_renderer_create_mixer(struct video_renderer *renderer, IMFA CLSID clsid; HRESULT hr; - if (SUCCEEDED(IMFAttributes_GetUnknown(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_ACTIVATE, + if (SUCCEEDED(hr = IMFAttributes_GetUnknown(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_ACTIVATE, &IID_IMFActivate, (void **)&activate))) { IMFAttributes_GetUINT32(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_FLAGS, &flags); @@ -744,23 +744,31 @@ static HRESULT video_renderer_create_mixer(struct video_renderer *renderer, IMFA return hr; } - if (FAILED(IMFAttributes_GetGUID(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID, &clsid))) - memcpy(&clsid, &CLSID_MFVideoMixer9, sizeof(clsid)); + /* Activation object failed, use class activation. */ + if (FAILED(hr)) + { + if (FAILED(IMFAttributes_GetGUID(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID, &clsid))) + memcpy(&clsid, &CLSID_MFVideoMixer9, sizeof(clsid)); + hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)out); + } - if (SUCCEEDED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)out))) + if (FAILED(hr)) { - if (SUCCEEDED(hr = IMFTransform_QueryInterface(*out, &IID_IMFTopologyServiceLookupClient, - (void **)&lookup_client))) + WARN("Failed to create a mixer object, hr %#x.\n", hr); + return hr; + } + + if (SUCCEEDED(hr = IMFTransform_QueryInterface(*out, &IID_IMFTopologyServiceLookupClient, + (void **)&lookup_client))) + { + renderer->flags |= EVR_INIT_SERVICES; + if (SUCCEEDED(hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, + &renderer->IMFTopologyServiceLookup_iface))) { - renderer->flags |= EVR_INIT_SERVICES; - if (SUCCEEDED(hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, - &renderer->IMFTopologyServiceLookup_iface))) - { - renderer->flags |= EVR_MIXER_INITED_SERVICES; - } - renderer->flags &= ~EVR_INIT_SERVICES; - IMFTopologyServiceLookupClient_Release(lookup_client); + renderer->flags |= EVR_MIXER_INITED_SERVICES; } + renderer->flags &= ~EVR_INIT_SERVICES; + IMFTopologyServiceLookupClient_Release(lookup_client); } return hr;

1 0

Nikolay Sivov : mf/evr: Implement stream sinks management functionality.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: 629882e161846b8a8fa59a7f76b18186ac44e56d URL: https://source.winehq.org/git/wine.git/?a=commit;h=629882e161846b8a8fa59a7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 7 12:43:35 2020 +0300 mf/evr: Implement stream sinks management functionality. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 347 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 334 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=629882e161846b8a8fa5…

1 0

Nikolay Sivov : mf/evr: Add events support for video stream sinks.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: wine Branch: master Commit: 951240cb138af421610fc96a349ed89713368677 URL: https://source.winehq.org/git/wine.git/?a=commit;h=951240cb138af421610fc96a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 7 12:43:36 2020 +0300 mf/evr: Add events support for video stream sinks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 86242611a4..93ad06b949 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -40,6 +40,7 @@ struct video_stream LONG refcount; unsigned int id; struct video_renderer *parent; + IMFMediaEventQueue *event_queue; }; struct video_renderer @@ -167,6 +168,8 @@ static ULONG WINAPI video_stream_sink_Release(IMFStreamSink *iface) if (!refcount) { + if (stream->event_queue) + IMFMediaEventQueue_Release(stream->event_queue); heap_free(stream); } @@ -175,32 +178,40 @@ static ULONG WINAPI video_stream_sink_Release(IMFStreamSink *iface) static HRESULT WINAPI video_stream_sink_GetEvent(IMFStreamSink *iface, DWORD flags, IMFMediaEvent **event) { - FIXME("%p, %#x, %p.\n", iface, flags, event); + struct video_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %#x, %p.\n", iface, flags, event); + + return IMFMediaEventQueue_GetEvent(stream->event_queue, flags, event); } static HRESULT WINAPI video_stream_sink_BeginGetEvent(IMFStreamSink *iface, IMFAsyncCallback *callback, IUnknown *state) { - FIXME("%p, %p, %p.\n", iface, callback, state); + struct video_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, callback, state); + + return IMFMediaEventQueue_BeginGetEvent(stream->event_queue, callback, state); } static HRESULT WINAPI video_stream_sink_EndGetEvent(IMFStreamSink *iface, IMFAsyncResult *result, IMFMediaEvent **event) { - FIXME("%p, %p, %p.\n", iface, result, event); + struct video_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, result, event); + + return IMFMediaEventQueue_EndGetEvent(stream->event_queue, result, event); } static HRESULT WINAPI video_stream_sink_QueueEvent(IMFStreamSink *iface, MediaEventType event_type, - REFGUID exttype, HRESULT hr_status, const PROPVARIANT *value) + REFGUID ext_type, HRESULT hr, const PROPVARIANT *value) { - FIXME("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(exttype), hr_status, value); + struct video_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + + return IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, event_type, ext_type, hr, value); } static HRESULT WINAPI video_stream_sink_GetMediaSink(IMFStreamSink *iface, IMFMediaSink **sink) @@ -289,12 +300,17 @@ static HRESULT video_renderer_stream_create(struct video_renderer *renderer, uns struct video_stream **ret) { struct video_stream *stream; + HRESULT hr; if (!(stream = heap_alloc_zero(sizeof(*stream)))) return E_OUTOFMEMORY; stream->IMFStreamSink_iface.lpVtbl = &video_stream_sink_vtbl; stream->refcount = 1; + + if (FAILED(hr = MFCreateEventQueue(&stream->event_queue))) + return hr; + stream->parent = renderer; IMFMediaSink_AddRef(&stream->parent->IMFMediaSink_iface); stream->id = id; @@ -628,6 +644,7 @@ static HRESULT WINAPI video_renderer_sink_Shutdown(IMFMediaSink *iface) { IMFMediaSink_Release(&renderer->streams[i]->parent->IMFMediaSink_iface); renderer->streams[i]->parent = NULL; + IMFMediaEventQueue_Shutdown(renderer->streams[i]->event_queue); IMFStreamSink_Release(&renderer->streams[i]->IMFStreamSink_iface); renderer->streams[i] = NULL; }

1 0