September 2022 - Wine-commits

Alistair Leslie-Hughes : msdasql: Select statements return -1 for affected rows in ICommandText Execute.
by Alexandre Julliard 29 Sep '22

29 Sep '22

Module: wine Branch: master Commit: 3e0deb35968680bc07333a32a6fc64a642d6bf7f URL: https://gitlab.winehq.org/wine/wine/-/commit/3e0deb35968680bc07333a32a6fc64… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 28 16:23:31 2022 +1000 msdasql: Select statements return -1 for affected rows in ICommandText Execute. --- dlls/msdasql/session.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 50da5f30dbf..2c1f193107b 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -1244,13 +1244,6 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI return E_FAIL; } - ret = SQLRowCount(hstmt, &results); - if (ret != SQL_SUCCESS) - ERR("SQLRowCount failed (%d)\n", ret); - - if (affected) - *affected = results; - *rowset = NULL; if (!wcsnicmp( command->query, L"select ", 7 )) { @@ -1273,7 +1266,16 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI IRowset_Release(&msrowset->IRowset_iface); } else + { + ret = SQLRowCount(hstmt, &results); + if (ret != SQL_SUCCESS) + ERR("SQLRowCount failed (%d)\n", ret); + SQLFreeStmt(hstmt, SQL_CLOSE); + } + + if (affected) + *affected = results; return hr; }

1 0

Eric Pouech : dbghelp: SymFromName* should first look in local context.
by Alexandre Julliard 29 Sep '22

29 Sep '22

Module: wine Branch: master Commit: 50dc4ad0bfcd89d61d4ebfd0b98a84241acecbb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/50dc4ad0bfcd89d61d4ebfd0b98a84… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 28 10:48:05 2022 +0200 dbghelp: SymFromName* should first look in local context. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/symbol.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 4a5a971082e..adc36da4a49 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1653,6 +1653,7 @@ static BOOL find_name(struct process* pcs, struct module* module, const char* na BOOL WINAPI SymFromName(HANDLE hProcess, PCSTR Name, PSYMBOL_INFO Symbol) { struct process* pcs = process_find_by_handle(hProcess); + struct module_pair pair; struct module* module; const char* name; @@ -1669,6 +1670,45 @@ BOOL WINAPI SymFromName(HANDLE hProcess, PCSTR Name, PSYMBOL_INFO Symbol) module = module_find_by_nameA(pcs, tmp); return find_name(pcs, module, name + 1, Symbol); } + + /* search first in local context */ + pair.pcs = pcs; + pair.requested = module_find_by_addr(pair.pcs, pcs->localscope_pc, DMT_UNKNOWN); + if (module_get_debug(&pair) && + (symt_check_tag(pcs->localscope_symt, SymTagFunction) || + symt_check_tag(pcs->localscope_symt, SymTagInlineSite))) + { + struct symt_function* func = (struct symt_function*)pcs->localscope_symt; + struct vector* v = &func->vchildren; + unsigned i; + + for (i = 0; i < vector_length(v); i++) + { + struct symt* lsym = *(struct symt**)vector_at(v, i); + switch (lsym->tag) + { + case SymTagBlock: /* no recursion */ + break; + case SymTagData: + name = symt_get_name(lsym); + if (name && !strcmp(name, Name)) + { + symt_fill_sym_info(&pair, func, lsym, Symbol); + return TRUE; + } + break; + case SymTagLabel: /* not returned here */ + case SymTagFuncDebugStart: + case SymTagFuncDebugEnd: + case SymTagCustom: + case SymTagInlineSite: + break; + default: + WARN("Unsupported tag: %u (%x)\n", lsym->tag, lsym->tag); + } + } + } + /* lookup at global scope */ for (module = pcs->lmodules; module; module = module->next) { if (module->type == DMT_PE && find_name(pcs, module, Name, Symbol)) @@ -1686,6 +1726,7 @@ BOOL WINAPI SymFromName(HANDLE hProcess, PCSTR Name, PSYMBOL_INFO Symbol) return TRUE; } } + SetLastError(ERROR_MOD_NOT_FOUND); return FALSE; }

1 0

Rémi Bernon : winegstreamer: Implement H264 decoder GetStreamLimits / GetStreamCount.
by Alexandre Julliard 29 Sep '22

29 Sep '22

Module: wine Branch: master Commit: a42af15cfe506a4cddeecf4ec1de5dfe0aafaeda URL: https://gitlab.winehq.org/wine/wine/-/commit/a42af15cfe506a4cddeecf4ec1de5d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 22 13:59:10 2022 +0200 winegstreamer: Implement H264 decoder GetStreamLimits / GetStreamCount. --- dlls/mf/tests/transform.c | 3 --- dlls/winegstreamer/h264_decoder.c | 10 ++++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 9b30b9cafda..23d1c5b9a3a 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -2830,11 +2830,8 @@ static void test_h264_decoder(void) input_count = output_count = 0xdeadbeef; hr = IMFTransform_GetStreamCount(transform, &input_count, &output_count); - todo_wine ok(hr == S_OK, "GetStreamCount returned %#lx\n", hr); - todo_wine ok(input_count == 1, "got input_count %lu\n", input_count); - todo_wine ok(output_count == 1, "got output_count %lu\n", output_count); hr = IMFTransform_GetStreamIDs(transform, 1, &input_id, 1, &output_id); ok(hr == E_NOTIMPL, "GetStreamIDs returned %#lx\n", hr); diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 44c6d992b55..161497b0cba 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -256,15 +256,17 @@ static ULONG WINAPI transform_Release(IMFTransform *iface) static HRESULT WINAPI transform_GetStreamLimits(IMFTransform *iface, DWORD *input_minimum, DWORD *input_maximum, DWORD *output_minimum, DWORD *output_maximum) { - FIXME("iface %p, input_minimum %p, input_maximum %p, output_minimum %p, output_maximum %p stub!\n", + TRACE("iface %p, input_minimum %p, input_maximum %p, output_minimum %p, output_maximum %p.\n", iface, input_minimum, input_maximum, output_minimum, output_maximum); - return E_NOTIMPL; + *input_minimum = *input_maximum = *output_minimum = *output_maximum = 1; + return S_OK; } static HRESULT WINAPI transform_GetStreamCount(IMFTransform *iface, DWORD *inputs, DWORD *outputs) { - FIXME("iface %p, inputs %p, outputs %p stub!\n", iface, inputs, outputs); - return E_NOTIMPL; + TRACE("iface %p, inputs %p, outputs %p.\n", iface, inputs, outputs); + *inputs = *outputs = 1; + return S_OK; } static HRESULT WINAPI transform_GetStreamIDs(IMFTransform *iface, DWORD input_size,

1 0

Rémi Bernon : winegstreamer: Implement WMA decoder GetStreamLimits / GetStreamCount.
by Alexandre Julliard 29 Sep '22

29 Sep '22

Module: wine Branch: master Commit: c0d9139d3cf4a7f0f1d2296f29dea025f8a99973 URL: https://gitlab.winehq.org/wine/wine/-/commit/c0d9139d3cf4a7f0f1d2296f29dea0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 22 13:59:33 2022 +0200 winegstreamer: Implement WMA decoder GetStreamLimits / GetStreamCount. --- dlls/winegstreamer/wma_decoder.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 6d8917c9c07..9ddeeb01e90 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -177,15 +177,17 @@ static ULONG WINAPI transform_Release(IMFTransform *iface) static HRESULT WINAPI transform_GetStreamLimits(IMFTransform *iface, DWORD *input_minimum, DWORD *input_maximum, DWORD *output_minimum, DWORD *output_maximum) { - FIXME("iface %p, input_minimum %p, input_maximum %p, output_minimum %p, output_maximum %p stub!\n", + TRACE("iface %p, input_minimum %p, input_maximum %p, output_minimum %p, output_maximum %p.\n", iface, input_minimum, input_maximum, output_minimum, output_maximum); - return E_NOTIMPL; + *input_minimum = *input_maximum = *output_minimum = *output_maximum = 1; + return S_OK; } static HRESULT WINAPI transform_GetStreamCount(IMFTransform *iface, DWORD *inputs, DWORD *outputs) { - FIXME("iface %p, inputs %p, outputs %p stub!\n", iface, inputs, outputs); - return E_NOTIMPL; + TRACE("iface %p, inputs %p, outputs %p.\n", iface, inputs, outputs); + *inputs = *outputs = 1; + return S_OK; } static HRESULT WINAPI transform_GetStreamIDs(IMFTransform *iface, DWORD input_size, DWORD *inputs,

1 0

Rémi Bernon : winegstreamer: Check Video Processor Get(OutputStream)Attributes pointers.
by Alexandre Julliard 29 Sep '22

29 Sep '22

Module: wine Branch: master Commit: 899b26484628108befbaa90321d8433c06a0657c URL: https://gitlab.winehq.org/wine/wine/-/commit/899b26484628108befbaa90321d843… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 22 13:59:40 2022 +0200 winegstreamer: Check Video Processor Get(OutputStream)Attributes pointers. --- dlls/winegstreamer/video_processor.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winegstreamer/video_processor.c b/dlls/winegstreamer/video_processor.c index fcbccb3c3ef..74065103c87 100644 --- a/dlls/winegstreamer/video_processor.c +++ b/dlls/winegstreamer/video_processor.c @@ -249,6 +249,9 @@ static HRESULT WINAPI video_processor_GetAttributes(IMFTransform *iface, IMFAttr FIXME("iface %p, attributes %p stub!\n", iface, attributes); + if (!attributes) + return E_POINTER; + IMFAttributes_AddRef((*attributes = impl->attributes)); return S_OK; } @@ -265,6 +268,11 @@ static HRESULT WINAPI video_processor_GetOutputStreamAttributes(IMFTransform *if FIXME("iface %p, id %#lx, attributes %p stub!\n", iface, id, attributes); + if (!attributes) + return E_POINTER; + if (id) + return MF_E_INVALIDSTREAMNUMBER; + IMFAttributes_AddRef((*attributes = impl->output_attributes)); return S_OK; }

1 0

Rémi Bernon : winegstreamer: Return E_NOTIMPL from color_convert GetInputStreamAttributes.
by Alexandre Julliard 29 Sep '22

29 Sep '22

Module: wine Branch: master Commit: 53dedf69d7cb580317708476a6fdd78e6e25a497 URL: https://gitlab.winehq.org/wine/wine/-/commit/53dedf69d7cb580317708476a6fdd7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 26 13:24:49 2022 +0200 winegstreamer: Return E_NOTIMPL from color_convert GetInputStreamAttributes. --- dlls/winegstreamer/color_convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/color_convert.c b/dlls/winegstreamer/color_convert.c index e4fb78752b0..9be68d5cb11 100644 --- a/dlls/winegstreamer/color_convert.c +++ b/dlls/winegstreamer/color_convert.c @@ -288,7 +288,7 @@ static HRESULT WINAPI transform_GetAttributes(IMFTransform *iface, IMFAttributes static HRESULT WINAPI transform_GetInputStreamAttributes(IMFTransform *iface, DWORD id, IMFAttributes **attributes) { FIXME("iface %p, id %#lx, attributes %p stub!\n", iface, id, attributes); - return MFCreateAttributes(attributes, 0); + return E_NOTIMPL; } static HRESULT WINAPI transform_GetOutputStreamAttributes(IMFTransform *iface, DWORD id, IMFAttributes **attributes)

1 0

Rémi Bernon : mf/tests: Test miscellaneous and optional IMFTransform methods.
by Alexandre Julliard 29 Sep '22

29 Sep '22

Module: wine Branch: master Commit: 41d9806677ff1070d025761081d189f5e0d9f37e URL: https://gitlab.winehq.org/wine/wine/-/commit/41d9806677ff1070d025761081d189… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Sep 18 15:00:11 2022 +0200 mf/tests: Test miscellaneous and optional IMFTransform methods. --- dlls/mf/tests/transform.c | 318 +++++++++++++++++++++++++++------------------- 1 file changed, 184 insertions(+), 134 deletions(-)

1 0

Rémi Bernon : wmvcore/tests: Test IWMSyncReader2_(Get|Set)AllocateFor(Output|Stream).
by Alexandre Julliard 29 Sep '22

29 Sep '22

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

Rémi Bernon : wmvcore/tests: Test IWMReaderAllocatorEx usage and parameters.
by Alexandre Julliard 29 Sep '22

29 Sep '22

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 29 Sep '22

29 Sep '22

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