September 2022 - Wine-Commits

Rémi Bernon : wmvcore/tests: Test IWMReaderAllocatorEx usage and parameters.
by Alexandre Julliard Sept. 29, 2022

Sept. 29, 2022

Module: wine Branch: master Commit: 42e98094a33e908c8ecd39059eb230afc254465b URL: https://gitlab.winehq.org/wine/wine/-/commit/42e98094a33e908c8ecd39059eb230… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 23 16:38:32 2022 +0200 wmvcore/tests: Test IWMReaderAllocatorEx usage and parameters. --- dlls/wmvcore/tests/wmvcore.c | 133 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 129 insertions(+), 4 deletions(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 671b6602b47..46e15c922c3 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -2248,16 +2248,51 @@ static HRESULT WINAPI callback_allocator_AllocateForStreamEx(IWMReaderAllocatorE WORD stream_number, DWORD size, INSSBuffer **sample, DWORD flags, QWORD pts, QWORD duration, void *context) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + struct callback *callback = impl_from_IWMReaderAllocatorEx(iface); + struct buffer *object; + + ok(callback->allocated_samples, "Unexpected call.\n"); + ok(stream_number, "got stream_number %u.\n", stream_number); + ok(!flags, "got flags %#lx.\n", flags); + ok(!pts, "got pts %I64d.\n", pts); + ok(!duration, "got duration %I64d.\n", duration); + ok(!context, "got context %p.\n", context); + + if (!(object = malloc(offsetof(struct buffer, data[size])))) + return E_OUTOFMEMORY; + object->INSSBuffer_iface.lpVtbl = &buffer_vtbl; + object->refcount = 1; + object->capacity = size; + object->size = size; + + *sample = &object->INSSBuffer_iface; + InterlockedIncrement(&outstanding_buffers); + return S_OK; } static HRESULT WINAPI callback_allocator_AllocateForOutputEx(IWMReaderAllocatorEx *iface, DWORD output, DWORD size, INSSBuffer **sample, DWORD flags, QWORD pts, QWORD duration, void *context) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + struct callback *callback = impl_from_IWMReaderAllocatorEx(iface); + struct buffer *object; + + ok(callback->allocated_samples, "Unexpected call.\n"); + ok(!flags, "got flags %#lx.\n", flags); + ok(!pts, "got pts %I64d.\n", pts); + ok(!duration, "got duration %I64d.\n", duration); + ok(!context, "got context %p.\n", context); + + if (!(object = malloc(offsetof(struct buffer, data[size])))) + return E_OUTOFMEMORY; + object->INSSBuffer_iface.lpVtbl = &buffer_vtbl; + object->refcount = 1; + object->capacity = size; + object->size = size; + + *sample = &object->INSSBuffer_iface; + InterlockedIncrement(&outstanding_buffers); + return S_OK; } static const IWMReaderAllocatorExVtbl callback_allocator_vtbl = @@ -3419,7 +3454,11 @@ static void test_sync_reader_allocator(void) IWMReaderAllocatorEx *allocator; struct teststream stream; struct callback callback; + DWORD output_num, flags; IWMSyncReader2 *reader; + QWORD pts, duration; + INSSBuffer *sample; + WORD stream_num; HANDLE file; HRESULT hr; BOOL ret; @@ -3549,6 +3588,92 @@ static void test_sync_reader_allocator(void) ok(!allocator, "Got allocator %p.\n", allocator); + hr = IWMSyncReader2_GetStreamNumberForOutput(reader, 0, &stream_num); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IWMSyncReader2_SetAllocateForStream(reader, stream_num, &callback.IWMReaderAllocatorEx_iface); + todo_wine + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IWMSyncReader2_SetReadStreamSamples(reader, stream_num, TRUE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IWMSyncReader2_SetAllocateForOutput(reader, 1, &callback.IWMReaderAllocatorEx_iface); + todo_wine + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + callback.allocated_samples = true; + + hr = IWMSyncReader2_GetStreamNumberForOutput(reader, 0, &stream_num); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IWMSyncReader2_GetNextSample(reader, stream_num, &sample, &pts, &duration, &flags, + &output_num, &stream_num); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine + ok(sample->lpVtbl == &buffer_vtbl, "Buffer vtbl didn't match.\n"); + INSSBuffer_Release(sample); + + hr = IWMSyncReader2_GetStreamNumberForOutput(reader, 1, &stream_num); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IWMSyncReader2_GetNextSample(reader, stream_num, &sample, &pts, &duration, &flags, + &output_num, &stream_num); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine + ok(sample->lpVtbl == &buffer_vtbl, "Buffer vtbl didn't match.\n"); + INSSBuffer_Release(sample); + + callback.allocated_samples = false; + + + /* without compressed sample read, allocator isn't used */ + hr = IWMSyncReader2_GetStreamNumberForOutput(reader, 0, &stream_num); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IWMSyncReader2_SetReadStreamSamples(reader, stream_num, FALSE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IWMSyncReader2_GetNextSample(reader, stream_num, &sample, &pts, &duration, &flags, + &output_num, &stream_num); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(sample->lpVtbl != &buffer_vtbl, "Unexpected buffer vtbl.\n"); + INSSBuffer_Release(sample); + + + /* cannot change or remove allocators after they've been used */ + hr = IWMSyncReader2_GetStreamNumberForOutput(reader, 0, &stream_num); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IWMSyncReader2_SetAllocateForStream(reader, stream_num, NULL); + todo_wine + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#lx.\n", hr); + hr = IWMSyncReader2_SetAllocateForOutput(reader, 0, &callback.IWMReaderAllocatorEx_iface); + todo_wine + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#lx.\n", hr); + hr = IWMSyncReader2_SetAllocateForOutput(reader, 1, NULL); + todo_wine + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#lx.\n", hr); + hr = IWMSyncReader2_GetStreamNumberForOutput(reader, 0, &stream_num); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IWMSyncReader2_SetReadStreamSamples(reader, stream_num, TRUE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + callback.allocated_samples = true; + + hr = IWMSyncReader2_GetStreamNumberForOutput(reader, 1, &stream_num); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IWMSyncReader2_GetNextSample(reader, stream_num, &sample, &pts, &duration, &flags, + &output_num, &stream_num); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine + ok(sample->lpVtbl == &buffer_vtbl, "Buffer vtbl didn't match.\n"); + INSSBuffer_Release(sample); + + hr = IWMSyncReader2_GetStreamNumberForOutput(reader, 0, &stream_num); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IWMSyncReader2_GetNextSample(reader, stream_num, &sample, &pts, &duration, &flags, + &output_num, &stream_num); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine + ok(sample->lpVtbl == &buffer_vtbl, "Unexpected buffer vtbl.\n"); + INSSBuffer_Release(sample); + + callback.allocated_samples = false; + + IWMSyncReader2_Release(reader); ok(stream.refcount == 1, "Got outstanding refcount %ld.\n", stream.refcount);

1 0

Rémi Bernon : winegstreamer: Factor wm reader sample allocator error checks.
by Alexandre Julliard Sept. 29, 2022

Sept. 29, 2022

Module: wine Branch: master Commit: 45598d76e49dc3b651db6c8da1737c5e7e5eb692 URL: https://gitlab.winehq.org/wine/wine/-/commit/45598d76e49dc3b651db6c8da1737c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 15:53:53 2022 +0200 winegstreamer: Factor wm reader sample allocator error checks. --- dlls/winegstreamer/wm_reader.c | 44 +++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 95d6d8e0180..4839ddb8fa3 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1573,9 +1573,10 @@ HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, IWMReaderCallbackA struct wg_parser_stream *wg_stream; struct wg_parser_buffer wg_buffer; struct wm_stream *stream; + struct buffer *object; DWORD size, capacity; INSSBuffer *sample; - HRESULT hr; + HRESULT hr = S_OK; BYTE *data; for (;;) @@ -1620,36 +1621,16 @@ HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, IWMReaderCallbackA TRACE("Got buffer for '%s' stream %p.\n", get_major_type_string(stream->format.major_type), stream); if (callback_advanced && stream->read_compressed && stream->allocate_stream) - { - if (FAILED(hr = IWMReaderCallbackAdvanced_AllocateForStream(callback_advanced, - stream->index + 1, wg_buffer.size, &sample, NULL))) - { - ERR("Failed to allocate stream sample of %u bytes, hr %#lx.\n", wg_buffer.size, hr); - wg_parser_stream_release_buffer(wg_stream); - return hr; - } - } + hr = IWMReaderCallbackAdvanced_AllocateForStream(callback_advanced, + stream->index + 1, wg_buffer.size, &sample, NULL); else if (callback_advanced && !stream->read_compressed && stream->allocate_output) - { - if (FAILED(hr = IWMReaderCallbackAdvanced_AllocateForOutput(callback_advanced, - stream->index, wg_buffer.size, &sample, NULL))) - { - ERR("Failed to allocate output sample of %u bytes, hr %#lx.\n", wg_buffer.size, hr); - wg_parser_stream_release_buffer(wg_stream); - return hr; - } - } + hr = IWMReaderCallbackAdvanced_AllocateForOutput(callback_advanced, + stream->index, wg_buffer.size, &sample, NULL); + /* FIXME: Should these be pooled? */ + else if (!(object = calloc(1, offsetof(struct buffer, data[wg_buffer.size])))) + hr = E_OUTOFMEMORY; else { - struct buffer *object; - - /* FIXME: Should these be pooled? */ - if (!(object = calloc(1, offsetof(struct buffer, data[wg_buffer.size])))) - { - wg_parser_stream_release_buffer(wg_stream); - return E_OUTOFMEMORY; - } - object->INSSBuffer_iface.lpVtbl = &buffer_vtbl; object->refcount = 1; object->capacity = wg_buffer.size; @@ -1658,6 +1639,13 @@ HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, IWMReaderCallbackA sample = &object->INSSBuffer_iface; } + if (FAILED(hr)) + { + ERR("Failed to allocate sample of %u bytes, hr %#lx.\n", wg_buffer.size, hr); + wg_parser_stream_release_buffer(wg_stream); + return hr; + } + if (FAILED(hr = INSSBuffer_GetBufferAndLength(sample, &data, &size))) ERR("Failed to get data pointer, hr %#lx.\n", hr); if (FAILED(hr = INSSBuffer_GetMaxLength(sample, &capacity)))

1 0

Rémi Bernon : winegstreamer: Implement IWMSyncReader2_GetAllocateForOutput.
by Alexandre Julliard Sept. 29, 2022

Sept. 29, 2022

Module: wine Branch: master Commit: 57afb52dfc11fa01426ef9bf88c3eebfc5a7e53e URL: https://gitlab.winehq.org/wine/wine/-/commit/57afb52dfc11fa01426ef9bf88c3ee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 16:00:32 2022 +0200 winegstreamer: Implement IWMSyncReader2_GetAllocateForOutput. --- dlls/winegstreamer/wm_reader.c | 27 +++++++++++++++++++++++---- dlls/wmvcore/tests/wmvcore.c | 14 -------------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 916bfb68ea8..01766397aa4 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -2444,11 +2444,30 @@ static HRESULT WINAPI reader_SetAllocateForOutput(IWMSyncReader2 *iface, DWORD o return S_OK; } -static HRESULT WINAPI reader_GetAllocateForOutput(IWMSyncReader2 *iface, DWORD output_num, IWMReaderAllocatorEx **allocator) +static HRESULT WINAPI reader_GetAllocateForOutput(IWMSyncReader2 *iface, DWORD output, IWMReaderAllocatorEx **allocator) { - struct wm_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%lu %p): stub!\n", This, output_num, allocator); - return E_NOTIMPL; + struct wm_reader *reader = impl_from_IWMSyncReader2(iface); + struct wm_stream *stream; + + TRACE("reader %p, output %lu, allocator %p.\n", reader, output, allocator); + + if (!allocator) + return E_INVALIDARG; + + EnterCriticalSection(&reader->cs); + + if (!(stream = get_stream_by_output_number(reader, output))) + { + LeaveCriticalSection(&reader->cs); + return E_INVALIDARG; + } + + stream = reader->streams + output; + if ((*allocator = stream->output_allocator)) + IWMReaderAllocatorEx_AddRef(*allocator); + + LeaveCriticalSection(&reader->cs); + return S_OK; } static HRESULT WINAPI reader_SetAllocateForStream(IWMSyncReader2 *iface, DWORD stream_num, IWMReaderAllocatorEx *allocator) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 33f61889415..a7ebbb916b2 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -3479,13 +3479,11 @@ static void test_sync_reader_allocator(void) hr = IWMSyncReader2_GetAllocateForOutput(reader, -1, &allocator); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMSyncReader2_GetAllocateForStream(reader, 0, &allocator); todo_wine ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMSyncReader2_GetAllocateForOutput(reader, 0, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMSyncReader2_GetAllocateForStream(reader, 1, NULL); todo_wine @@ -3499,9 +3497,7 @@ static void test_sync_reader_allocator(void) allocator = (void *)0xdeadbeef; hr = IWMSyncReader2_GetAllocateForOutput(reader, 0, &allocator); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(!allocator, "Got allocator %p.\n", allocator); allocator = (void *)0xdeadbeef; hr = IWMSyncReader2_GetAllocateForStream(reader, 1, &allocator); @@ -3516,9 +3512,7 @@ static void test_sync_reader_allocator(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); allocator = (void *)0xdeadbeef; hr = IWMSyncReader2_GetAllocateForOutput(reader, 0, &allocator); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(!allocator, "Got allocator %p.\n", allocator); allocator = (void *)0xdeadbeef; hr = IWMSyncReader2_GetAllocateForStream(reader, 2, &allocator); @@ -3537,9 +3531,7 @@ static void test_sync_reader_allocator(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); allocator = (void *)0xdeadbeef; hr = IWMSyncReader2_GetAllocateForOutput(reader, 0, &allocator); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(!allocator, "Got allocator %p.\n", allocator); allocator = (void *)0xdeadbeef; hr = IWMSyncReader2_GetAllocateForStream(reader, 1, &allocator); @@ -3553,9 +3545,7 @@ static void test_sync_reader_allocator(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); allocator = (void *)0xdeadbeef; hr = IWMSyncReader2_GetAllocateForOutput(reader, 1, &allocator); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(!allocator, "Got allocator %p.\n", allocator); allocator = (void *)0xdeadbeef; hr = IWMSyncReader2_GetAllocateForStream(reader, 1, &allocator); @@ -3564,18 +3554,14 @@ static void test_sync_reader_allocator(void) todo_wine ok(!allocator, "Got allocator %p.\n", allocator); hr = IWMSyncReader2_GetAllocateForOutput(reader, 0, &allocator); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(allocator == &callback.IWMReaderAllocatorEx_iface, "Got allocator %p.\n", allocator); hr = IWMSyncReader2_SetAllocateForOutput(reader, 0, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); allocator = (void *)0xdeadbeef; hr = IWMSyncReader2_GetAllocateForOutput(reader, 0, &allocator); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(!allocator, "Got allocator %p.\n", allocator); allocator = (void *)0xdeadbeef; hr = IWMSyncReader2_GetAllocateForStream(reader, 1, &allocator);

1 0

Rémi Bernon : wmvcore/tests: Test IWMSyncReader2_(Get|Set)AllocateFor(Output|Stream).
by Alexandre Julliard Sept. 29, 2022

Sept. 29, 2022

Module: wine Branch: master Commit: 0c51f462a7316fbe64a60b5b92890b0d0945c638 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c51f462a7316fbe64a60b5b92890b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 15:14:20 2022 +0200 wmvcore/tests: Test IWMSyncReader2_(Get|Set)AllocateFor(Output|Stream). --- dlls/wmvcore/tests/wmvcore.c | 147 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 147 insertions(+) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index aacff6f7bda..671b6602b47 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -3413,6 +3413,152 @@ static void test_async_reader_file(void) ok(ret, "Failed to delete %s, error %lu.\n", debugstr_w(filename), GetLastError()); } +static void test_sync_reader_allocator(void) +{ + const WCHAR *filename = load_resource(L"test.wmv"); + IWMReaderAllocatorEx *allocator; + struct teststream stream; + struct callback callback; + IWMSyncReader2 *reader; + HANDLE file; + HRESULT hr; + BOOL ret; + + callback_init(&callback); + + hr = WMCreateSyncReader(NULL, 0, (IWMSyncReader **)&reader); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %lu.\n", debugstr_w(file), GetLastError()); + + teststream_init(&stream, file); + + hr = IWMSyncReader2_OpenStream(reader, &stream.IStream_iface); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(stream.refcount > 1, "Got refcount %ld.\n", stream.refcount); + + + hr = IWMSyncReader2_GetAllocateForOutput(reader, -1, &allocator); + todo_wine + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + hr = IWMSyncReader2_GetAllocateForStream(reader, 0, &allocator); + todo_wine + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + hr = IWMSyncReader2_GetAllocateForOutput(reader, 0, NULL); + todo_wine + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + hr = IWMSyncReader2_GetAllocateForStream(reader, 1, NULL); + todo_wine + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + hr = IWMSyncReader2_SetAllocateForOutput(reader, -1, &callback.IWMReaderAllocatorEx_iface); + todo_wine + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + hr = IWMSyncReader2_SetAllocateForStream(reader, 0, &callback.IWMReaderAllocatorEx_iface); + todo_wine + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + + + allocator = (void *)0xdeadbeef; + hr = IWMSyncReader2_GetAllocateForOutput(reader, 0, &allocator); + todo_wine + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine + ok(!allocator, "Got allocator %p.\n", allocator); + allocator = (void *)0xdeadbeef; + hr = IWMSyncReader2_GetAllocateForStream(reader, 1, &allocator); + todo_wine + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine + ok(!allocator, "Got allocator %p.\n", allocator); + + + hr = IWMSyncReader2_SetAllocateForStream(reader, 1, &callback.IWMReaderAllocatorEx_iface); + todo_wine + ok(hr == S_OK, "Got hr %#lx.\n", hr); + allocator = (void *)0xdeadbeef; + hr = IWMSyncReader2_GetAllocateForOutput(reader, 0, &allocator); + todo_wine + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine + ok(!allocator, "Got allocator %p.\n", allocator); + allocator = (void *)0xdeadbeef; + hr = IWMSyncReader2_GetAllocateForStream(reader, 2, &allocator); + todo_wine + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine + ok(!allocator, "Got allocator %p.\n", allocator); + hr = IWMSyncReader2_GetAllocateForStream(reader, 1, &allocator); + todo_wine + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine + ok(allocator == &callback.IWMReaderAllocatorEx_iface, "Got allocator %p.\n", allocator); + + hr = IWMSyncReader2_SetAllocateForStream(reader, 1, NULL); + todo_wine + ok(hr == S_OK, "Got hr %#lx.\n", hr); + allocator = (void *)0xdeadbeef; + hr = IWMSyncReader2_GetAllocateForOutput(reader, 0, &allocator); + todo_wine + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine + ok(!allocator, "Got allocator %p.\n", allocator); + allocator = (void *)0xdeadbeef; + hr = IWMSyncReader2_GetAllocateForStream(reader, 1, &allocator); + todo_wine + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine + ok(!allocator, "Got allocator %p.\n", allocator); + + + hr = IWMSyncReader2_SetAllocateForOutput(reader, 0, &callback.IWMReaderAllocatorEx_iface); + todo_wine + ok(hr == S_OK, "Got hr %#lx.\n", hr); + allocator = (void *)0xdeadbeef; + hr = IWMSyncReader2_GetAllocateForOutput(reader, 1, &allocator); + todo_wine + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine + ok(!allocator, "Got allocator %p.\n", allocator); + allocator = (void *)0xdeadbeef; + hr = IWMSyncReader2_GetAllocateForStream(reader, 1, &allocator); + todo_wine + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine + ok(!allocator, "Got allocator %p.\n", allocator); + hr = IWMSyncReader2_GetAllocateForOutput(reader, 0, &allocator); + todo_wine + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine + ok(allocator == &callback.IWMReaderAllocatorEx_iface, "Got allocator %p.\n", allocator); + + hr = IWMSyncReader2_SetAllocateForOutput(reader, 0, NULL); + todo_wine + ok(hr == S_OK, "Got hr %#lx.\n", hr); + allocator = (void *)0xdeadbeef; + hr = IWMSyncReader2_GetAllocateForOutput(reader, 0, &allocator); + todo_wine + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine + ok(!allocator, "Got allocator %p.\n", allocator); + allocator = (void *)0xdeadbeef; + hr = IWMSyncReader2_GetAllocateForStream(reader, 1, &allocator); + todo_wine + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine + ok(!allocator, "Got allocator %p.\n", allocator); + + + IWMSyncReader2_Release(reader); + + ok(stream.refcount == 1, "Got outstanding refcount %ld.\n", stream.refcount); + CloseHandle(stream.file); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete %s, error %lu.\n", debugstr_w(filename), GetLastError()); + + callback_cleanup(&callback); +} + START_TEST(wmvcore) { HRESULT hr; @@ -3431,6 +3577,7 @@ START_TEST(wmvcore) test_WMCreateWriterPriv(); test_urlextension(); test_iscontentprotected(); + test_sync_reader_allocator(); test_sync_reader_settings(); test_sync_reader_streaming(); test_sync_reader_types();

1 0

Francois Gouget : tests: Print unhandled exception messages in colour.
by Alexandre Julliard Sept. 28, 2022

Sept. 28, 2022

Module: wine Branch: master Commit: 8bfb1ecf2582345c2380c0efdd4fa0c35373c911 URL: https://gitlab.winehq.org/wine/wine/-/commit/8bfb1ecf2582345c2380c0efdd4fa0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 28 18:52:39 2022 +0200 tests: Print unhandled exception messages in colour. Note that quite often the unhandled exception messages actually come from Windows or Wine and these cannot be colorized. --- include/wine/test.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index 94d92e19c57..c28128d9f0c 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -654,7 +654,9 @@ void winetest_wait_child_process( HANDLE process ) { DWORD pid = GetProcessId( process ); winetest_print_lock(); + if (winetest_color) printf( color_bright_red ); winetest_printf( "unhandled exception %08x in child process %04x\n", (UINT)exit_code, (UINT)pid ); + if (winetest_color) printf( color_reset ); winetest_print_unlock(); InterlockedIncrement( &failures ); } @@ -754,9 +756,11 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) if (data->current_file) printf( "%s:%d: this is the last test seen before the exception\n", data->current_file, data->current_line ); + if (winetest_color) printf( color_bright_red ); printf( "%04x:%s:%s unhandled exception %08x at %p\n", (UINT)GetCurrentProcessId(), current_test->name, winetest_elapsed(), (UINT)ptrs->ExceptionRecord->ExceptionCode, ptrs->ExceptionRecord->ExceptionAddress ); + if (winetest_color) printf( color_reset ); fflush( stdout ); winetest_print_unlock(); return EXCEPTION_EXECUTE_HANDLER;

1 0

Paul Gofman : msi: Disable FS redirection for temporary file in cabinet_copy_file().
by Alexandre Julliard Sept. 28, 2022

Sept. 28, 2022

Module: wine Branch: master Commit: a58c6251870dfb7d214464e709bbbc9ca649b900 URL: https://gitlab.winehq.org/wine/wine/-/commit/a58c6251870dfb7d214464e709bbbc… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 27 13:36:49 2022 -0500 msi: Disable FS redirection for temporary file in cabinet_copy_file(). --- dlls/msi/files.c | 9 +++++++++ dlls/msi/media.c | 6 +++--- dlls/msi/msipriv.h | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 1b8e4fd7d90..94c733fca8f 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -48,6 +48,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); +BOOL msi_get_temp_file_name( MSIPACKAGE *package, const WCHAR *tmp_path, const WCHAR *prefix, WCHAR *tmp_filename ) +{ + BOOL ret; + msi_disable_fs_redirection( package ); + ret = GetTempFileNameW( tmp_path, prefix, 0, tmp_filename ); + msi_revert_fs_redirection( package ); + return ret; +} + HANDLE msi_create_file( MSIPACKAGE *package, const WCHAR *filename, DWORD access, DWORD sharing, DWORD creation, DWORD flags ) { diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 6aeb948de51..db65a282b93 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -468,10 +468,10 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint, msi_free( tmppathW ); return ERROR_OUTOFMEMORY; } - if (!GetTempFileNameW(tmppathW, L"msi", 0, tmpfileW)) tmpfileW[0] = 0; + if (!msi_get_temp_file_name( data->package, tmppathW, L"msi", tmpfileW )) tmpfileW[0] = 0; msi_free( tmppathW ); - handle = CreateFileW(tmpfileW, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, attrs, NULL); + handle = msi_create_file( data->package, tmpfileW, GENERIC_READ | GENERIC_WRITE, 0, CREATE_ALWAYS, attrs ); if (handle != INVALID_HANDLE_VALUE && msi_move_file( data->package, path, NULL, MOVEFILE_DELAY_UNTIL_REBOOT ) && @@ -482,7 +482,7 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint, else { WARN( "failed to schedule rename operation %s (error %lu)\n", debugstr_w(path), GetLastError() ); - DeleteFileW( tmpfileW ); + msi_delete_file( data->package, tmpfileW ); } msi_free(tmpfileW); } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index b5838bad6fe..d63c6f244ff 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1073,6 +1073,7 @@ static inline void msi_revert_fs_redirection( MSIPACKAGE *package ) { if (is_wow64 && package->platform == PLATFORM_X64) Wow64RevertWow64FsRedirection( package->cookie ); } +extern BOOL msi_get_temp_file_name( MSIPACKAGE *, const WCHAR *, const WCHAR *, WCHAR * ) DECLSPEC_HIDDEN; extern HANDLE msi_create_file( MSIPACKAGE *, const WCHAR *, DWORD, DWORD, DWORD, DWORD ) DECLSPEC_HIDDEN; extern BOOL msi_delete_file( MSIPACKAGE *, const WCHAR * ) DECLSPEC_HIDDEN; extern BOOL msi_remove_directory( MSIPACKAGE *, const WCHAR * ) DECLSPEC_HIDDEN;

1 0

Alex Henrie : winegstreamer: Fix memory leak in get_available_media_type (Coverity).
by Alexandre Julliard Sept. 28, 2022

Sept. 28, 2022

Module: wine Branch: master Commit: 1be02b2b60faf41d3fd9a8fbcf386cb21b6db4e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/1be02b2b60faf41d3fd9a8fbcf386c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 28 10:19:02 2022 -0600 winegstreamer: Fix memory leak in get_available_media_type (Coverity). --- dlls/winegstreamer/resampler.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/resampler.c b/dlls/winegstreamer/resampler.c index a9c9ae32e8a..87c76274085 100644 --- a/dlls/winegstreamer/resampler.c +++ b/dlls/winegstreamer/resampler.c @@ -269,15 +269,15 @@ static HRESULT get_available_media_type(DWORD index, IMFMediaType **type, BOOL o const GUID *subtype; HRESULT hr; - if (FAILED(hr = MFCreateMediaType(&media_type))) - return hr; - *type = NULL; if (index >= (output ? 2 : 1) * ARRAY_SIZE(audio_formats)) return MF_E_NO_MORE_TYPES; subtype = audio_formats[index % ARRAY_SIZE(audio_formats)]; + if (FAILED(hr = MFCreateMediaType(&media_type))) + return hr; + if (FAILED(hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio))) goto done; if (FAILED(hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, subtype)))

1 0

Jacek Caban : winevulkan: Separate 32-bit and 64-bit conversion functions.
by Alexandre Julliard Sept. 28, 2022

Sept. 28, 2022

Module: wine Branch: master Commit: 1f1713b07ef4da66c39816a872fa102cddb37151 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f1713b07ef4da66c39816a872fa10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 27 22:47:18 2022 +0200 winevulkan: Separate 32-bit and 64-bit conversion functions. --- dlls/winevulkan/make_vulkan | 210 ++++----- dlls/winevulkan/vulkan_thunks.c | 996 ++++++++++++++++++++++++---------------- 2 files changed, 697 insertions(+), 509 deletions(-)

1 0

Jacek Caban : winevulkan: Pass VkVariable to ConversionFunction constructor.
by Alexandre Julliard Sept. 28, 2022

Sept. 28, 2022

Module: wine Branch: master Commit: c39a71e3cded3c927bfa83882562e2683e12074e URL: https://gitlab.winehq.org/wine/wine/-/commit/c39a71e3cded3c927bfa83882562e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 20 18:18:12 2022 +0200 winevulkan: Pass VkVariable to ConversionFunction constructor. --- dlls/winevulkan/make_vulkan | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index c0377ca9f17..87985f4296c 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1395,16 +1395,10 @@ class VkMember(VkVariable): elif self.is_handle() or self.is_generic_handle(): direction = Direction.INPUT - operand = self.type_info["data"] - if self.is_dynamic_array(): - conversions.append(ConversionFunction(False, True, direction, operand)) - elif self.is_static_array(): - conversions.append(ConversionFunction(True, False, direction, operand)) - else: - conversions.append(ConversionFunction(False, False, direction, operand)) + conversions.append(ConversionFunction(self, direction)) if self.needs_free(): - conversions.append(FreeFunction(self.is_dynamic_array(), operand)) + conversions.append(FreeFunction(self.is_dynamic_array(), self.type_info["data"])) return conversions @@ -1526,20 +1520,20 @@ class VkParam(VkVariable): if not self.needs_conversion() and not self.needs_unwrapping(): return - operand = self.struct if self.is_struct() else self.handle - # Input functions require win to host conversion. if self._direction in [Direction.INPUT, Direction.INPUT_OUTPUT]: - self.input_conv = ConversionFunction(False, self.is_dynamic_array(), Direction.INPUT, operand) + self.input_conv = ConversionFunction(self, Direction.INPUT) # Output functions require host to win conversion. if self._direction in [Direction.INPUT_OUTPUT, Direction.OUTPUT]: - self.output_conv = ConversionFunction(False, self.is_dynamic_array(), Direction.OUTPUT, operand) + self.output_conv = ConversionFunction(self, Direction.OUTPUT) + # Dynamic arrays, but also some normal structs (e.g. VkCommandBufferBeginInfo) need memory # allocation and thus some cleanup. if self.is_dynamic_array() or self.struct.needs_free(): - self.free_func = FreeFunction(self.is_dynamic_array(), operand) + self.free_func = FreeFunction(self.is_dynamic_array(), + self.struct if self.is_struct() else self.handle) def _set_direction(self): """ Internal helper function to set parameter direction (input/output/input_output). """ @@ -2068,12 +2062,12 @@ class VkStruct(Sequence): class ConversionFunction(object): - def __init__(self, array, dyn_array, direction, operand): - self.array = array + def __init__(self, variable, direction): self.direction = direction - self.dyn_array = dyn_array - self.operand = operand - self.type = operand.name + self.array = variable.is_static_array() + self.dyn_array = variable.is_dynamic_array() + self.operand = variable.struct if variable.is_struct() else variable.handle + self.type = variable.type self._set_name()

1 0

Alexandre Julliard : gdiplus: Get the compositing mode directly from the graphics object.
by Alexandre Julliard Sept. 28, 2022

Sept. 28, 2022

Module: wine Branch: master Commit: fe7df461189e59e0e6d54a83ad3903f1fd93aa01 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe7df461189e59e0e6d54a83ad3903… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 28 14:44:35 2022 +0200 gdiplus: Get the compositing mode directly from the graphics object. GdipGetCompositingMode() fails when the object is busy, which happens when flushing changes in GdipReleaseDC(). Fixes a test crash on Gitlab CI. --- dlls/gdiplus/graphics.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a9f7a464ce3..fca66c8654b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -418,9 +418,7 @@ static GpStatus alpha_blend_bmp_pixels(GpGraphics *graphics, INT dst_x, INT dst_ { GpBitmap *dst_bitmap = (GpBitmap*)graphics->image; INT x, y; - CompositingMode comp_mode; - - GdipGetCompositingMode(graphics, &comp_mode); + CompositingMode comp_mode = graphics->compmode; for (y=0; y<src_height; y++) {

1 0