- Wine-Devel - list.winehq.org

[PATCH 7/7] server: Get rid of no longer needed read_console_input request.
by Jacek Caban July 6, 2020

July 6, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 49 --------------------------------------------- server/protocol.def | 10 --------- 2 files changed, 59 deletions(-)

2 1

[PATCH 6/7] kernelbase: Reimplement PeekConsoleInputW using IOCTL_CONDRV_PEEK.
by Jacek Caban July 6, 2020

July 6, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)

2 1

[PATCH 5/7] kernel32: Use IOCTL_CONDRV_READ_INPUT in read_console_input.
by Jacek Caban July 6, 2020

July 6, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-)

2 1

[PATCH 4/7] server: Introduce IOCTL_CONDRV_READ_INPUT and IOCTL_CONDRV_PEEK ioctls.
by Jacek Caban July 6, 2020

July 6, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- We should be able to eventually get rid of non-blocking read once bare console handling is moved out of kernel32. include/wine/condrv.h | 2 + server/console.c | 99 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 98 insertions(+), 3 deletions(-)

1 0

[PATCH 3/7] kernelbase: Reimplement GetNumberOfConsoleInputEvents using IOCTL_CONDRV_GET_INPUT_INFO.
by Jacek Caban July 6, 2020

July 6, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-)

1 0

[PATCH 2/7] server: Introduce IOCTL_CONDRV_GET_INPUT_INFO ioctl.
by Jacek Caban July 6, 2020

July 6, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 35 +++++++++++++++++++++++++++++++++++ server/console.c | 28 +++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 include/wine/condrv.h

1 0

[PATCH 1/7] server: Always create fd for console_input object.
by Jacek Caban July 6, 2020

July 6, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)

1 0

[PATCH] ntdll: Correct a comment referring to fd_cache_section.
by Zebediah Figura July 6, 2020

July 6, 2020

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- 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 d3145a84e21..813c926cf46 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 ) -- 2.27.0

1 0

[PATCH 1/5] mfplat: Implement sample tracking.
by Nikolay Sivov July 6, 2020

July 6, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- 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 67c60663b33..a3311bc10f1 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; -- 2.27.0

2 5

[PATCH 1/2] amstream: Increment/decrement IMediaStreamFilter refcount twice in multimedia_stream_create/release().
by Gijs Vermeulen July 6, 2020

July 6, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/multimedia.c | 7 ++++++- dlls/amstream/tests/amstream.c | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index e058e639dd..56512d19da 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -91,7 +91,11 @@ static ULONG WINAPI multimedia_stream_Release(IAMMultiMediaStream *iface) { if (This->ipin) IPin_Release(This->ipin); - IMediaStreamFilter_Release(This->filter); + if (This->filter) + { + IMediaStreamFilter_Release(This->filter); + IMediaStreamFilter_Release(This->filter); + } if (This->media_seeking) IMediaSeeking_Release(This->media_seeking); if (This->media_control) @@ -519,6 +523,7 @@ HRESULT multimedia_stream_create(IUnknown *outer, void **out) } TRACE("Created multimedia stream %p.\n", object); + IMediaStreamFilter_AddRef(object->filter); *out = &object->IAMMultiMediaStream_iface; return S_OK; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 3fb77f277a..7ebd54f6da 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1140,7 +1140,7 @@ static void test_enum_pins(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); hr = IMediaStreamFilter_EnumPins(filter, NULL); ok(hr == E_POINTER, "Got hr %#x.\n", hr); @@ -1148,7 +1148,7 @@ static void test_enum_pins(void) hr = IMediaStreamFilter_EnumPins(filter, &enum1); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -1186,7 +1186,7 @@ static void test_enum_pins(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 4, "Got unexpected refcount %d.\n", ref); + ok(ref == 4, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); @@ -1196,7 +1196,7 @@ static void test_enum_pins(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(pins[0] == pin, "Expected pin %p, got %p.\n", pin, pins[0]); ref = get_refcount(filter); - todo_wine ok(ref == 4, "Got unexpected refcount %d.\n", ref); + ok(ref == 4, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); -- 2.27.0

2 2