July 2020 - Wine-commits - list.winehq.org

Piotr Caban : ntdll: Fix 64-bit values printing in relay.
by Alexandre Julliard 06 Jul '20

06 Jul '20

Module: wine Branch: master Commit: 1d093acc1fb17d2125076180578b2ab3b2fdef3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d093acc1fb17d2125076180… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 6 15:01:02 2020 +0200 ntdll: Fix 64-bit values printing in relay. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index ffc4a71925..e159631249 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -305,14 +305,14 @@ static const char *func_name( struct relay_private_data *data, unsigned int ordi static void trace_string_a( INT_PTR ptr ) { - if (!IS_INTARG( ptr )) TRACE( "%08lx %s", ptr, debugstr_a( (char *)ptr )); - else TRACE( "%08lx", ptr ); + if (!IS_INTARG( ptr )) TRACE( "%08Ix %s", ptr, debugstr_a( (char *)ptr )); + else TRACE( "%08Ix", ptr ); } static void trace_string_w( INT_PTR ptr ) { - if (!IS_INTARG( ptr )) TRACE( "%08lx %s", ptr, debugstr_w( (WCHAR *)ptr )); - else TRACE( "%08lx", ptr ); + if (!IS_INTARG( ptr )) TRACE( "%08Ix %s", ptr, debugstr_w( (WCHAR *)ptr )); + else TRACE( "%08Ix", ptr ); } #ifdef __i386__ @@ -635,13 +635,13 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi break; case 'i': /* long */ default: - TRACE( "%08lx", stack[i] ); + TRACE( "%08zx", stack[i] ); break; } if (!is_ret_val( arg_types[i + 1] )) TRACE( "," ); } *nb_args = i; - TRACE( ") ret=%08lx\n", stack[-1] ); + TRACE( ") ret=%08zx\n", stack[-1] ); return entry_point->orig_func; } @@ -651,7 +651,7 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi DECLSPEC_HIDDEN void WINAPI relay_trace_exit( struct relay_descr *descr, unsigned int idx, INT_PTR retaddr, INT_PTR retval ) { - TRACE( "\1Ret %s() retval=%08lx ret=%08lx\n", + TRACE( "\1Ret %s() retval=%08zx ret=%08zx\n", func_name( descr->private, LOWORD(idx) ), retval, retaddr ); } @@ -741,13 +741,13 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi break; case 'i': /* long */ default: - TRACE( "%08lx", stack[i] ); + TRACE( "%08zx", stack[i] ); break; } if (!is_ret_val( arg_types[i+1] )) TRACE( "," ); } *nb_args = i; - TRACE( ") ret=%08lx\n", stack[-1] ); + TRACE( ") ret=%08zx\n", stack[-1] ); return entry_point->orig_func; } @@ -757,7 +757,7 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi DECLSPEC_HIDDEN void WINAPI relay_trace_exit( struct relay_descr *descr, unsigned int idx, INT_PTR retaddr, INT_PTR retval ) { - TRACE( "\1Ret %s() retval=%08lx ret=%08lx\n", + TRACE( "\1Ret %s() retval=%08zx ret=%08zx\n", func_name( descr->private, LOWORD(idx) ), retval, retaddr ); }

1 0

Nikolay Sivov : mfplat: Implement sample tracking.
by Alexandre Julliard 06 Jul '20

06 Jul '20

Module: wine Branch: master Commit: 4cb8055298778ccfa03fc4f846a9339ca7a6bf6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cb8055298778ccfa03fc4f8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 18:08:25 2020 +0300 mfplat: Implement sample tracking. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 131 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 122 insertions(+), 9 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 67c60663b3..a3311bc10f 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -19,6 +19,7 @@ #define COBJMACROS #include "mfplat_private.h" +#include "rtworkq.h" #include "wine/debug.h" @@ -71,6 +72,10 @@ struct sample DWORD prop_flags; LONGLONG duration; LONGLONG timestamp; + + /* Tracked sample functionality. */ + IRtwqAsyncResult *tracked_result; + LONG tracked_refcount; }; static inline struct memory_buffer *impl_from_IMFMediaBuffer(IMFMediaBuffer *iface) @@ -752,22 +757,53 @@ static ULONG WINAPI sample_AddRef(IMFSample *iface) return refcount; } +static void release_sample_object(struct sample *sample) +{ + size_t i; + + for (i = 0; i < sample->buffer_count; ++i) + IMFMediaBuffer_Release(sample->buffers[i]); + clear_attributes_object(&sample->attributes); + heap_free(sample->buffers); + heap_free(sample); +} + static ULONG WINAPI sample_Release(IMFSample *iface) { struct sample *sample = impl_from_IMFSample(iface); ULONG refcount = InterlockedDecrement(&sample->attributes.ref); - size_t i; TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) + release_sample_object(sample); + + return refcount; +} + +static ULONG WINAPI sample_tracked_Release(IMFSample *iface) +{ + struct sample *sample = impl_from_IMFSample(iface); + ULONG refcount; + HRESULT hr; + + EnterCriticalSection(&sample->attributes.cs); + refcount = InterlockedDecrement(&sample->attributes.ref); + if (sample->tracked_result && sample->tracked_refcount == refcount) { - for (i = 0; i < sample->buffer_count; ++i) - IMFMediaBuffer_Release(sample->buffers[i]); - clear_attributes_object(&sample->attributes); - heap_free(sample->buffers); - heap_free(sample); + /* Call could fail if queue system is not initialized, it's not critical. */ + if (FAILED(hr = RtwqInvokeCallback(sample->tracked_result))) + WARN("Failed to invoke tracking callback, hr %#x.\n", hr); + IRtwqAsyncResult_Release(sample->tracked_result); + sample->tracked_result = NULL; + sample->tracked_refcount = 0; } + LeaveCriticalSection(&sample->attributes.cs); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + release_sample_object(sample); return refcount; } @@ -1484,9 +1520,34 @@ static ULONG WINAPI tracked_sample_Release(IMFTrackedSample *iface) static HRESULT WINAPI tracked_sample_SetAllocator(IMFTrackedSample *iface, IMFAsyncCallback *sample_allocator, IUnknown *state) { - FIXME("%p, %p, %p.\n", iface, sample_allocator, state); + struct sample *sample = impl_from_IMFTrackedSample(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, sample_allocator, state); + + EnterCriticalSection(&sample->attributes.cs); + + if (sample->tracked_result) + hr = MF_E_NOTACCEPTING; + else + { + if (SUCCEEDED(hr = RtwqCreateAsyncResult((IUnknown *)iface, (IRtwqAsyncCallback *)sample_allocator, + state, &sample->tracked_result))) + { + /* Account for additional refcount brought by 'state' object. This threshold is used + on Release() to invoke tracker callback. */ + sample->tracked_refcount = 1; + if (state == (IUnknown *)&sample->IMFTrackedSample_iface || + state == (IUnknown *)&sample->IMFSample_iface) + { + ++sample->tracked_refcount; + } + } + } + + LeaveCriticalSection(&sample->attributes.cs); + + return hr; } static const IMFTrackedSampleVtbl tracked_sample_vtbl = @@ -1497,6 +1558,58 @@ static const IMFTrackedSampleVtbl tracked_sample_vtbl = tracked_sample_SetAllocator, }; +static const IMFSampleVtbl sample_tracked_vtbl = +{ + sample_QueryInterface, + sample_AddRef, + sample_tracked_Release, + sample_GetItem, + sample_GetItemType, + sample_CompareItem, + sample_Compare, + sample_GetUINT32, + sample_GetUINT64, + sample_GetDouble, + sample_GetGUID, + sample_GetStringLength, + sample_GetString, + sample_GetAllocatedString, + sample_GetBlobSize, + sample_GetBlob, + sample_GetAllocatedBlob, + sample_GetUnknown, + sample_SetItem, + sample_DeleteItem, + sample_DeleteAllItems, + sample_SetUINT32, + sample_SetUINT64, + sample_SetDouble, + sample_SetGUID, + sample_SetString, + sample_SetBlob, + sample_SetUnknown, + sample_LockStore, + sample_UnlockStore, + sample_GetCount, + sample_GetItemByIndex, + sample_CopyAllItems, + sample_GetSampleFlags, + sample_SetSampleFlags, + sample_GetSampleTime, + sample_SetSampleTime, + sample_GetSampleDuration, + sample_SetSampleDuration, + sample_GetBufferCount, + sample_GetBufferByIndex, + sample_ConvertToContiguousBuffer, + sample_AddBuffer, + sample_RemoveBufferByIndex, + sample_RemoveAllBuffers, + sample_GetTotalLength, + sample_CopyToBuffer, +}; + + /*********************************************************************** * MFCreateSample (mfplat.@) */ @@ -1546,7 +1659,7 @@ HRESULT WINAPI MFCreateTrackedSample(IMFTrackedSample **sample) return hr; } - object->IMFSample_iface.lpVtbl = &samplevtbl; + object->IMFSample_iface.lpVtbl = &sample_tracked_vtbl; object->IMFTrackedSample_iface.lpVtbl = &tracked_sample_vtbl; *sample = &object->IMFTrackedSample_iface;

1 0

Nikolay Sivov : mf: Add a sink stub for EVR.
by Alexandre Julliard 06 Jul '20

06 Jul '20

Module: wine Branch: master Commit: 045a2ff4308d8fcf81dd2a239943a493c0d1fcf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=045a2ff4308d8fcf81dd2a23… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 18:08:26 2020 +0300 mf: Add a sink stub for EVR. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 1 + dlls/mf/evr.c | 218 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/main.c | 38 --------- dlls/mf/tests/mf.c | 9 ++- 4 files changed, 224 insertions(+), 42 deletions(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index fe156e43ab..1d2bfc8a78 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -5,6 +5,7 @@ IMPORTS = advapi32 mfplat ole32 uuid mfuuid EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + evr.c \ main.c \ samplegrabber.c \ sar.c \ diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c new file mode 100644 index 0000000000..2723833903 --- /dev/null +++ b/dlls/mf/evr.c @@ -0,0 +1,218 @@ +/* + * Copyright 2020 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "mf_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + +struct video_renderer +{ + IMFMediaSink IMFMediaSink_iface; + LONG refcount; +}; + +static struct video_renderer *impl_from_IMFMediaSink(IMFMediaSink *iface) +{ + return CONTAINING_RECORD(iface, struct video_renderer, IMFMediaSink_iface); +} + +static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFMediaSink) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + } + else + { + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*obj); + + return S_OK; +} + +static ULONG WINAPI video_renderer_sink_AddRef(IMFMediaSink *iface) +{ + struct video_renderer *renderer = impl_from_IMFMediaSink(iface); + ULONG refcount = InterlockedIncrement(&renderer->refcount); + TRACE("%p, refcount %u.\n", iface, refcount); + return refcount; +} + +static ULONG WINAPI video_renderer_sink_Release(IMFMediaSink *iface) +{ + struct video_renderer *renderer = impl_from_IMFMediaSink(iface); + ULONG refcount = InterlockedDecrement(&renderer->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + heap_free(renderer); + } + + return refcount; +} + +static HRESULT WINAPI video_renderer_sink_GetCharacteristics(IMFMediaSink *iface, DWORD *flags) +{ + FIXME("%p, %p.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_sink_AddStreamSink(IMFMediaSink *iface, DWORD stream_sink_id, + IMFMediaType *media_type, IMFStreamSink **stream_sink) +{ + FIXME("%p, %#x, %p, %p.\n", iface, stream_sink_id, media_type, stream_sink); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_sink_RemoveStreamSink(IMFMediaSink *iface, DWORD stream_sink_id) +{ + FIXME("%p, %#x.\n", iface, stream_sink_id); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_sink_GetStreamSinkCount(IMFMediaSink *iface, DWORD *count) +{ + FIXME("%p, %p.\n", iface, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_sink_GetStreamSinkByIndex(IMFMediaSink *iface, DWORD index, + IMFStreamSink **stream) +{ + FIXME("%p, %u, %p.\n", iface, index, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_sink_GetStreamSinkById(IMFMediaSink *iface, DWORD stream_sink_id, + IMFStreamSink **stream) +{ + FIXME("%p, %#x, %p.\n", iface, stream_sink_id, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_sink_SetPresentationClock(IMFMediaSink *iface, IMFPresentationClock *clock) +{ + FIXME("%p, %p.\n", iface, clock); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_sink_GetPresentationClock(IMFMediaSink *iface, IMFPresentationClock **clock) +{ + FIXME("%p, %p.\n", iface, clock); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_sink_Shutdown(IMFMediaSink *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static const IMFMediaSinkVtbl video_renderer_sink_vtbl = +{ + video_renderer_sink_QueryInterface, + video_renderer_sink_AddRef, + video_renderer_sink_Release, + video_renderer_sink_GetCharacteristics, + video_renderer_sink_AddStreamSink, + video_renderer_sink_RemoveStreamSink, + video_renderer_sink_GetStreamSinkCount, + video_renderer_sink_GetStreamSinkByIndex, + video_renderer_sink_GetStreamSinkById, + video_renderer_sink_SetPresentationClock, + video_renderer_sink_GetPresentationClock, + video_renderer_sink_Shutdown, +}; + +static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) +{ + struct video_renderer *object; + + TRACE("%p, %p, %p.\n", attributes, user_context, obj); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IMFMediaSink_iface.lpVtbl = &video_renderer_sink_vtbl; + object->refcount = 1; + + *obj = (IUnknown *)&object->IMFMediaSink_iface; + + return S_OK; +} + +static void evr_shutdown_object(void *user_context, IUnknown *obj) +{ + IMFMediaSink *sink; + + if (SUCCEEDED(IUnknown_QueryInterface(obj, &IID_IMFMediaSink, (void **)&sink))) + { + IMFMediaSink_Shutdown(sink); + IMFMediaSink_Release(sink); + } +} + +static void evr_free_private(void *user_context) +{ +} + +static const struct activate_funcs evr_activate_funcs = +{ + evr_create_object, + evr_shutdown_object, + evr_free_private, +}; + +/*********************************************************************** + * MFCreateVideoRendererActivate (mf.@) + */ +HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate) +{ + HRESULT hr; + + TRACE("%p, %p.\n", hwnd, activate); + + if (!activate) + return E_POINTER; + + hr = create_activation_object(hwnd, &evr_activate_funcs, activate); + if (SUCCEEDED(hr)) + IMFActivate_SetUINT64(*activate, &MF_ACTIVATE_VIDEO_WINDOW, (ULONG_PTR)hwnd); + + return hr; +} diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 3546caa691..4d9f5a7ea3 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1267,44 +1267,6 @@ HRESULT WINAPI MFEnumDeviceSources(IMFAttributes *attributes, IMFActivate ***sou return S_OK; } -static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) -{ - FIXME("%p, %p, %p.\n", attributes, user_context, obj); - - return E_NOTIMPL; -} - -static void evr_shutdown_object(void *user_context, IUnknown *obj) -{ -} - -static void evr_free_private(void *user_context) -{ -} - -static const struct activate_funcs evr_activate_funcs = -{ - evr_create_object, - evr_shutdown_object, - evr_free_private, -}; - -HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate) -{ - HRESULT hr; - - TRACE("%p, %p.\n", hwnd, activate); - - if (!activate) - return E_POINTER; - - hr = create_activation_object(hwnd, &evr_activate_funcs, activate); - if (SUCCEEDED(hr)) - IMFActivate_SetUINT64(*activate, &MF_ACTIVATE_VIDEO_WINDOW, (ULONG_PTR)hwnd); - - return hr; -} - struct simple_type_handler { IMFMediaTypeHandler IMFMediaTypeHandler_iface; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index d252bab9b3..72444dd248 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3250,23 +3250,23 @@ static void test_evr(void) ok(!value, "Unexpected value.\n"); hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); -todo_wine ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); -if (hr == S_OK) -{ hr = IMFMediaSink_GetCharacteristics(sink, &flags); +todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFActivate_ShutdownObject(activate); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); hr = IMFMediaSink_GetCharacteristics(sink, &flags); +todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); /* Activate again. */ hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink2); ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); +todo_wine ok(sink == sink2, "Unexpected instance.\n"); IMFMediaSink_Release(sink2); @@ -3274,6 +3274,7 @@ if (hr == S_OK) ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); hr = IMFMediaSink_GetCharacteristics(sink, &flags); +todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink2); @@ -3284,7 +3285,7 @@ if (hr == S_OK) IMFMediaSink_Release(sink2); IMFMediaSink_Release(sink); -} + IMFActivate_Release(activate); CoUninitialize();

1 0

Nikolay Sivov : mf/evr: Add IMFMediaSinkPreroll stub.
by Alexandre Julliard 06 Jul '20

06 Jul '20

Module: wine Branch: master Commit: 1cdcfaf6883916d9e6ea04feb1b2c18b89970cbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cdcfaf6883916d9e6ea04fe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 18:08:27 2020 +0300 mf/evr: Add IMFMediaSinkPreroll stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/mf/tests/mf.c | 9 ++++++++- 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 2723833903..2ac85fab79 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); struct video_renderer { IMFMediaSink IMFMediaSink_iface; + IMFMediaSinkPreroll IMFMediaSinkPreroll_iface; LONG refcount; }; @@ -33,14 +34,25 @@ static struct video_renderer *impl_from_IMFMediaSink(IMFMediaSink *iface) return CONTAINING_RECORD(iface, struct video_renderer, IMFMediaSink_iface); } +static struct video_renderer *impl_from_IMFMediaSinkPreroll(IMFMediaSinkPreroll *iface) +{ + return CONTAINING_RECORD(iface, struct video_renderer, IMFMediaSinkPreroll_iface); +} + static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) { + struct video_renderer *renderer = impl_from_IMFMediaSink(iface); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IMFMediaSink) || IsEqualIID(riid, &IID_IUnknown)) { - *obj = iface; + *obj = &renderer->IMFMediaSink_iface; + } + else if (IsEqualIID(riid, &IID_IMFMediaSinkPreroll)) + { + *obj = &renderer->IMFMediaSinkPreroll_iface; } else { @@ -159,6 +171,39 @@ static const IMFMediaSinkVtbl video_renderer_sink_vtbl = video_renderer_sink_Shutdown, }; +static HRESULT WINAPI video_renderer_preroll_QueryInterface(IMFMediaSinkPreroll *iface, REFIID riid, void **obj) +{ + struct video_renderer *renderer = impl_from_IMFMediaSinkPreroll(iface); + return IMFMediaSink_QueryInterface(&renderer->IMFMediaSink_iface, riid, obj); +} + +static ULONG WINAPI video_renderer_preroll_AddRef(IMFMediaSinkPreroll *iface) +{ + struct video_renderer *renderer = impl_from_IMFMediaSinkPreroll(iface); + return IMFMediaSink_AddRef(&renderer->IMFMediaSink_iface); +} + +static ULONG WINAPI video_renderer_preroll_Release(IMFMediaSinkPreroll *iface) +{ + struct video_renderer *renderer = impl_from_IMFMediaSinkPreroll(iface); + return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); +} + +static HRESULT WINAPI video_renderer_preroll_NotifyPreroll(IMFMediaSinkPreroll *iface, MFTIME start_time) +{ + FIXME("%p, %s.\n", iface, debugstr_time(start_time)); + + return E_NOTIMPL; +} + +static const IMFMediaSinkPrerollVtbl video_renderer_preroll_vtbl = +{ + video_renderer_preroll_QueryInterface, + video_renderer_preroll_AddRef, + video_renderer_preroll_Release, + video_renderer_preroll_NotifyPreroll, +}; + static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) { struct video_renderer *object; @@ -169,6 +214,7 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, return E_OUTOFMEMORY; object->IMFMediaSink_iface.lpVtbl = &video_renderer_sink_vtbl; + object->IMFMediaSinkPreroll_iface.lpVtbl = &video_renderer_preroll_vtbl; object->refcount = 1; *obj = (IUnknown *)&object->IMFMediaSink_iface; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 72444dd248..44d69a7a8c 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3226,6 +3226,7 @@ todo_wine static void test_evr(void) { + IMFMediaSinkPreroll *preroll; IMFMediaSink *sink, *sink2; IMFActivate *activate; DWORD flags, count; @@ -3252,9 +3253,15 @@ static void test_evr(void) hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); + flags = 0; hr = IMFMediaSink_GetCharacteristics(sink, &flags); -todo_wine +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(flags == (MEDIASINK_CAN_PREROLL | MEDIASINK_CLOCK_REQUIRED), "Unexpected flags %#x.\n", flags); +} + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFMediaSinkPreroll, (void **)&preroll); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFMediaSinkPreroll_Release(preroll); hr = IMFActivate_ShutdownObject(activate); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr);

1 0

Nikolay Sivov : mf/evr: Return sink flags.
by Alexandre Julliard 06 Jul '20

06 Jul '20

Module: wine Branch: master Commit: 1f2cf87def23b2298df2531f9842c5fba3723596 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f2cf87def23b2298df2531f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 18:08:28 2020 +0300 mf/evr: Return sink flags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 6 ++++-- dlls/mf/tests/mf.c | 4 +--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 2ac85fab79..a5a39fe778 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -91,9 +91,11 @@ static ULONG WINAPI video_renderer_sink_Release(IMFMediaSink *iface) static HRESULT WINAPI video_renderer_sink_GetCharacteristics(IMFMediaSink *iface, DWORD *flags) { - FIXME("%p, %p.\n", iface, flags); + TRACE("%p, %p.\n", iface, flags); - return E_NOTIMPL; + *flags = MEDIASINK_CLOCK_REQUIRED | MEDIASINK_CAN_PREROLL; + + return S_OK; } static HRESULT WINAPI video_renderer_sink_AddStreamSink(IMFMediaSink *iface, DWORD stream_sink_id, diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 44d69a7a8c..c274c3263d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3253,12 +3253,10 @@ static void test_evr(void) hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); - flags = 0; hr = IMFMediaSink_GetCharacteristics(sink, &flags); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(flags == (MEDIASINK_CAN_PREROLL | MEDIASINK_CLOCK_REQUIRED), "Unexpected flags %#x.\n", flags); -} + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFMediaSinkPreroll, (void **)&preroll); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFMediaSinkPreroll_Release(preroll);

1 0

Nikolay Sivov : mf/evr: Track shutdown state.
by Alexandre Julliard 06 Jul '20

06 Jul '20

Module: wine Branch: master Commit: ca27d5b4ec99a00103f110ebe85774f569f3a468 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca27d5b4ec99a00103f110eb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 18:08:29 2020 +0300 mf/evr: Track shutdown state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 27 +++++++++++++++++++++++++-- dlls/mf/main.c | 1 - dlls/mf/mf_private.h | 1 + dlls/mf/samplegrabber.c | 1 - dlls/mf/sar.c | 1 - dlls/mf/session.c | 1 - dlls/mf/tests/mf.c | 2 -- dlls/mf/topology.c | 1 - 8 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index a5a39fe778..64944673d5 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -22,11 +22,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +enum video_renderer_flags +{ + EVR_SHUT_DOWN = 0x1, +}; + struct video_renderer { IMFMediaSink IMFMediaSink_iface; IMFMediaSinkPreroll IMFMediaSinkPreroll_iface; LONG refcount; + unsigned int flags; + CRITICAL_SECTION cs; }; static struct video_renderer *impl_from_IMFMediaSink(IMFMediaSink *iface) @@ -83,6 +90,7 @@ static ULONG WINAPI video_renderer_sink_Release(IMFMediaSink *iface) if (!refcount) { + DeleteCriticalSection(&renderer->cs); heap_free(renderer); } @@ -91,8 +99,13 @@ static ULONG WINAPI video_renderer_sink_Release(IMFMediaSink *iface) static HRESULT WINAPI video_renderer_sink_GetCharacteristics(IMFMediaSink *iface, DWORD *flags) { + struct video_renderer *renderer = impl_from_IMFMediaSink(iface); + TRACE("%p, %p.\n", iface, flags); + if (renderer->flags & EVR_SHUT_DOWN) + return MF_E_SHUTDOWN; + *flags = MEDIASINK_CLOCK_REQUIRED | MEDIASINK_CAN_PREROLL; return S_OK; @@ -152,9 +165,18 @@ static HRESULT WINAPI video_renderer_sink_GetPresentationClock(IMFMediaSink *ifa static HRESULT WINAPI video_renderer_sink_Shutdown(IMFMediaSink *iface) { - FIXME("%p.\n", iface); + struct video_renderer *renderer = impl_from_IMFMediaSink(iface); - return E_NOTIMPL; + TRACE("%p.\n", iface); + + if (renderer->flags & EVR_SHUT_DOWN) + return MF_E_SHUTDOWN; + + EnterCriticalSection(&renderer->cs); + renderer->flags |= EVR_SHUT_DOWN; + LeaveCriticalSection(&renderer->cs); + + return S_OK; } static const IMFMediaSinkVtbl video_renderer_sink_vtbl = @@ -218,6 +240,7 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, object->IMFMediaSink_iface.lpVtbl = &video_renderer_sink_vtbl; object->IMFMediaSinkPreroll_iface.lpVtbl = &video_renderer_preroll_vtbl; object->refcount = 1; + InitializeCriticalSection(&object->cs); *obj = (IUnknown *)&object->IMFMediaSink_iface; diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 4d9f5a7ea3..8656c6cddf 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -27,7 +27,6 @@ #include "rpcproxy.h" #include "mfapi.h" -#include "mferror.h" #include "mf_private.h" diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index 14f7288c9b..f435621973 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mferror.h" #include "mfidl.h" #include "wine/heap.h" diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 92330abc9f..cbf7453d04 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -20,7 +20,6 @@ #include "mfapi.h" #include "mfidl.h" -#include "mferror.h" #include "mf_private.h" #include "wine/debug.h" diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 89a517b135..8a27c0658c 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -20,7 +20,6 @@ #include "mfapi.h" #include "mfidl.h" -#include "mferror.h" #include "mf_private.h" #include "initguid.h" #include "mmdeviceapi.h" diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 39b5e1a537..d0365ea856 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -25,7 +25,6 @@ #include "winbase.h" #include "mfidl.h" #include "mfapi.h" -#include "mferror.h" #include "wine/debug.h" #include "wine/heap.h" diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c274c3263d..691734aa9a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3265,7 +3265,6 @@ static void test_evr(void) ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); hr = IMFMediaSink_GetCharacteristics(sink, &flags); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); /* Activate again. */ @@ -3279,7 +3278,6 @@ todo_wine ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); hr = IMFMediaSink_GetCharacteristics(sink, &flags); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink2); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 432979206b..f4cc30a9fc 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -27,7 +27,6 @@ #undef INITGUID #include <guiddef.h> #include "mfapi.h" -#include "mferror.h" #include "mfidl.h" #include "wine/debug.h"

1 0

Zebediah Figura : ntdll: Correct a comment referring to fd_cache_section.
by Alexandre Julliard 06 Jul '20

06 Jul '20

Module: wine Branch: master Commit: 5376bc5ee48f4ec3485dd404b32bd2530c24d3f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5376bc5ee48f4ec3485dd404… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 6 10:58:13 2020 -0500 ntdll: Correct a comment referring to fd_cache_section. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index d3145a84e2..813c926cf4 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -893,7 +893,7 @@ static inline unsigned int handle_to_index( HANDLE handle, unsigned int *entry ) /*********************************************************************** * add_fd_to_cache * - * Caller must hold fd_cache_section. + * Caller must hold fd_cache_mutex. */ static BOOL add_fd_to_cache( HANDLE handle, int fd, enum server_fd_type type, unsigned int access, unsigned int options )

1 0

Jacek Caban : server: Always create fd for console_input object.
by Alexandre Julliard 06 Jul '20

06 Jul '20

Module: wine Branch: master Commit: e5493e34e4a0c21771200b0ecb72b7c24c484f39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5493e34e4a0c21771200b0e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 6 19:25:50 2020 +0200 server: Always create fd for console_input object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/server/console.c b/server/console.c index 729cfa4061..fc12a3a8f3 100644 --- a/server/console.c +++ b/server/console.c @@ -258,10 +258,7 @@ static struct fd *console_input_get_fd( struct object* obj ) { struct console_input *console_input = (struct console_input*)obj; assert( obj->ops == &console_input_ops ); - if (console_input->fd) - return (struct fd*)grab_object( console_input->fd ); - set_error( STATUS_OBJECT_TYPE_MISMATCH ); - return NULL; + return (struct fd *)grab_object( console_input->fd ); } static enum server_fd_type console_get_fd_type( struct fd *fd ) @@ -400,15 +397,20 @@ static struct object *create_console_input( struct thread* renderer, int fd ) } if (fd != -1) /* bare console */ { - if (!(console_input->fd = create_anonymous_fd( &console_fd_ops, fd, &console_input->obj, - FILE_SYNCHRONOUS_IO_NONALERT ))) - { - release_object( console_input ); - return NULL; - } - allow_fd_caching( console_input->fd ); + console_input->fd = create_anonymous_fd( &console_fd_ops, fd, &console_input->obj, + FILE_SYNCHRONOUS_IO_NONALERT ); } - + else + { + console_input->fd = alloc_pseudo_fd( &console_fd_ops, &console_input->obj, + FILE_SYNCHRONOUS_IO_NONALERT ); + } + if (!console_input->fd) + { + release_object( console_input ); + return NULL; + } + allow_fd_caching( console_input->fd ); return &console_input->obj; }

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_GET_INPUT_INFO ioctl.
by Alexandre Julliard 06 Jul '20

06 Jul '20

Module: wine Branch: master Commit: dc672b49ca887c78a3e20854d96e7a56e967c072 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc672b49ca887c78a3e20854… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 6 19:26:56 2020 +0200 server: Introduce IOCTL_CONDRV_GET_INPUT_INFO ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 35 +++++++++++++++++++++++++++++++++++ server/console.c | 28 +++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h new file mode 100644 index 0000000000..dc1250a43f --- /dev/null +++ b/include/wine/condrv.h @@ -0,0 +1,35 @@ +/* + * Console driver ioctls + * + * Copyright 2020 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _INC_CONDRV +#define _INC_CONDRV + +#include "winioctl.h" + +/* console input ioctls */ +#define IOCTL_CONDRV_GET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 13, METHOD_BUFFERED, FILE_READ_PROPERTIES) + +/* IOCTL_CONDRV_GET_INPUT_INFO result */ +struct condrv_input_info +{ + unsigned int input_count; /* number of available input records */ +}; + +#endif /* _INC_CONDRV */ diff --git a/server/console.c b/server/console.c index fc12a3a8f3..8902943776 100644 --- a/server/console.c +++ b/server/console.c @@ -38,6 +38,7 @@ #include "unicode.h" #include "wincon.h" #include "winternl.h" +#include "wine/condrv.h" struct screen_buffer; struct console_input_events; @@ -200,6 +201,7 @@ static const struct object_ops screen_buffer_ops = }; static enum server_fd_type console_get_fd_type( struct fd *fd ); +static int console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct fd_ops console_fd_ops = { @@ -211,7 +213,7 @@ static const struct fd_ops console_fd_ops = no_fd_flush, /* flush */ no_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ - default_fd_ioctl, /* ioctl */ + console_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -1487,6 +1489,30 @@ static void scroll_console_output( struct screen_buffer *screen_buffer, int xsrc console_input_events_append( screen_buffer->input, &evt ); } +static int console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) +{ + struct console_input *console = get_fd_user( fd ); + + switch (code) + { + case IOCTL_CONDRV_GET_INPUT_INFO: + { + struct condrv_input_info info; + if (get_reply_max_size() != sizeof(info)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + info.input_count = console->recnum; + return set_reply_data( &info, sizeof(info) ) != NULL; + } + + default: + set_error( STATUS_INVALID_HANDLE ); + return 0; + } +} + static struct object_type *console_device_get_type( struct object *obj ) { static const WCHAR name[] = {'D','e','v','i','c','e'};

1 0

Jacek Caban : kernelbase: Reimplement GetNumberOfConsoleInputEvents using IOCTL_CONDRV_GET_INPUT_INFO.
by Alexandre Julliard 06 Jul '20

06 Jul '20

Module: wine Branch: master Commit: 4448715cfbd70b214c332ab9fdfdfe3f28508177 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4448715cfbd70b214c332ab9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 6 19:27:08 2020 +0200 kernelbase: Reimplement GetNumberOfConsoleInputEvents using IOCTL_CONDRV_GET_INPUT_INFO. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 2e90a905cb..f4af228436 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -36,6 +36,7 @@ #include "winnls.h" #include "winerror.h" #include "wincon.h" +#include "wine/condrv.h" #include "wine/server.h" #include "wine/exception.h" #include "wine/debug.h" @@ -760,24 +761,11 @@ COORD WINAPI DECLSPEC_HOTPATCH GetLargestConsoleWindowSize( HANDLE handle ) */ BOOL WINAPI DECLSPEC_HOTPATCH GetNumberOfConsoleInputEvents( HANDLE handle, DWORD *count ) { - BOOL ret; - - SERVER_START_REQ( read_console_input ) - { - req->handle = console_handle_unmap( handle ); - req->flush = FALSE; - if ((ret = !wine_server_call_err( req ))) - { - if (count) *count = reply->read; - else - { - SetLastError( ERROR_INVALID_ACCESS ); - ret = FALSE; - } - } - } - SERVER_END_REQ; - return ret; + struct condrv_input_info info; + if (!DeviceIoControl( handle, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL )) + return FALSE; + *count = info.input_count; + return TRUE; }

1 0