September 2022 - Wine-Commits

Rémi Bernon : winegstreamer: Implement H264 decoder GetStreamLimits / GetStreamCount.
by Alexandre Julliard Sept. 29, 2022

Sept. 29, 2022

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 Sept. 29, 2022

Sept. 29, 2022

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 Sept. 29, 2022

Sept. 29, 2022

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

Eric Pouech : dbghelp: SymFromName* should first look in local context.
by Alexandre Julliard Sept. 29, 2022

Sept. 29, 2022

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

Alistair Leslie-Hughes : msdasql: Select statements return -1 for affected rows in ICommandText Execute.
by Alexandre Julliard Sept. 29, 2022

Sept. 29, 2022

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

Alistair Leslie-Hughes : msdasql: Implement IColumnsInfo GetColumnInfo.
by Alexandre Julliard Sept. 29, 2022

Sept. 29, 2022

Module: wine Branch: master Commit: d47201918c30245a2a392c5e759401837d49d3c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/d47201918c30245a2a392c5e759401… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 11 13:38:12 2021 +1100 msdasql: Implement IColumnsInfo GetColumnInfo. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 277 +++++++++++++++++++++++++++++++++++++++++- dlls/msdasql/tests/provider.c | 36 +++++- 2 files changed, 308 insertions(+), 5 deletions(-)

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.230.
by Alexandre Julliard Sept. 29, 2022

Sept. 29, 2022

Module: wine Branch: master Commit: 98f91b30ed76c00c4d3bdf7e01f12cd46b0bcd5a URL: https://gitlab.winehq.org/wine/wine/-/commit/98f91b30ed76c00c4d3bdf7e01f12c… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Thu Sep 29 11:48:36 2022 +0200 winevulkan: Update to VK spec version 1.3.230. --- dlls/winevulkan/loader_thunks.c | 512 +++++++++++ dlls/winevulkan/loader_thunks.h | 410 +++++++++ dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 1938 ++++++++++++++++++++++++++++++++++++--- dlls/winevulkan/vulkan_thunks.h | 242 ++++- dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 704 +++++++++++++- 7 files changed, 3701 insertions(+), 109 deletions(-)

1 0

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

Sept. 29, 2022

Module: wine Branch: master Commit: 5aa60f778a2ab88491d61a0dd267ad6bf897e8fe URL: https://gitlab.winehq.org/wine/wine/-/commit/5aa60f778a2ab88491d61a0dd267ad… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 23 16:54:42 2022 +0200 winegstreamer: Implement IWMSyncReader2_SetAllocateForStream. --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/wm_reader.c | 28 ++++++++++++++++++++++++---- dlls/wmvcore/tests/wmvcore.c | 5 ----- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 44b526c0044..fa93ce969c7 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -160,6 +160,7 @@ struct wm_stream bool read_compressed; IWMReaderAllocatorEx *output_allocator; + IWMReaderAllocatorEx *stream_allocator; }; struct wm_reader diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 01766397aa4..6c9c0514347 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1623,6 +1623,9 @@ HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, IWMReaderCallbackA if (!stream->read_compressed && stream->output_allocator) hr = IWMReaderAllocatorEx_AllocateForOutputEx(stream->output_allocator, stream->index, wg_buffer.size, &sample, 0, 0, 0, NULL); + else if (stream->read_compressed && stream->stream_allocator) + hr = IWMReaderAllocatorEx_AllocateForStreamEx(stream->stream_allocator, stream->index + 1, + wg_buffer.size, &sample, 0, 0, 0, NULL); else if (callback_advanced && stream->read_compressed && stream->allocate_stream) hr = IWMReaderCallbackAdvanced_AllocateForStream(callback_advanced, stream->index + 1, wg_buffer.size, &sample, NULL); @@ -2470,11 +2473,28 @@ static HRESULT WINAPI reader_GetAllocateForOutput(IWMSyncReader2 *iface, DWORD o return S_OK; } -static HRESULT WINAPI reader_SetAllocateForStream(IWMSyncReader2 *iface, DWORD stream_num, IWMReaderAllocatorEx *allocator) +static HRESULT WINAPI reader_SetAllocateForStream(IWMSyncReader2 *iface, DWORD stream_number, IWMReaderAllocatorEx *allocator) { - struct wm_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%lu %p): stub!\n", This, stream_num, allocator); - return E_NOTIMPL; + struct wm_reader *reader = impl_from_IWMSyncReader2(iface); + struct wm_stream *stream; + + TRACE("reader %p, stream_number %lu, allocator %p.\n", reader, stream_number, allocator); + + EnterCriticalSection(&reader->cs); + + if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_number))) + { + LeaveCriticalSection(&reader->cs); + return E_INVALIDARG; + } + + if (stream->stream_allocator) + IWMReaderAllocatorEx_Release(stream->stream_allocator); + if ((stream->stream_allocator = allocator)) + IWMReaderAllocatorEx_AddRef(stream->stream_allocator); + + LeaveCriticalSection(&reader->cs); + return S_OK; } static HRESULT WINAPI reader_GetAllocateForStream(IWMSyncReader2 *iface, DWORD stream_num, IWMReaderAllocatorEx **allocator) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index a7ebbb916b2..948d6b54340 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -3491,7 +3491,6 @@ static void test_sync_reader_allocator(void) hr = IWMSyncReader2_SetAllocateForOutput(reader, -1, &callback.IWMReaderAllocatorEx_iface); 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); @@ -3508,7 +3507,6 @@ static void test_sync_reader_allocator(void) 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); @@ -3527,7 +3525,6 @@ static void test_sync_reader_allocator(void) 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); @@ -3574,7 +3571,6 @@ static void test_sync_reader_allocator(void) 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); @@ -3588,7 +3584,6 @@ static void test_sync_reader_allocator(void) 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);

1 0

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

Sept. 29, 2022

Module: wine Branch: master Commit: 2ba08dc0ada8449c9312ca26d3df69740c38ac52 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ba08dc0ada8449c9312ca26d3df69… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 14:57:10 2022 +0200 winegstreamer: Implement IWMSyncReader2_GetAllocateForStream. --- dlls/winegstreamer/wm_reader.c | 26 ++++++++++++++++++++++---- dlls/wmvcore/tests/wmvcore.c | 14 -------------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 6c9c0514347..bd6d9064171 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -2497,11 +2497,29 @@ static HRESULT WINAPI reader_SetAllocateForStream(IWMSyncReader2 *iface, DWORD s return S_OK; } -static HRESULT WINAPI reader_GetAllocateForStream(IWMSyncReader2 *iface, DWORD stream_num, IWMReaderAllocatorEx **allocator) +static HRESULT WINAPI reader_GetAllocateForStream(IWMSyncReader2 *iface, DWORD stream_number, IWMReaderAllocatorEx **allocator) { - struct wm_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%lu %p): stub!\n", This, stream_num, allocator); - return E_NOTIMPL; + struct wm_reader *reader = impl_from_IWMSyncReader2(iface); + struct wm_stream *stream; + + TRACE("reader %p, stream_number %lu, allocator %p.\n", reader, stream_number, allocator); + + if (!allocator) + return E_INVALIDARG; + + EnterCriticalSection(&reader->cs); + + if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_number))) + { + LeaveCriticalSection(&reader->cs); + return E_INVALIDARG; + } + + if ((*allocator = stream->stream_allocator)) + IWMReaderAllocatorEx_AddRef(*allocator); + + LeaveCriticalSection(&reader->cs); + return S_OK; } static const IWMSyncReader2Vtbl reader_vtbl = diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 948d6b54340..5ba280c3222 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -3481,12 +3481,10 @@ static void test_sync_reader_allocator(void) hr = IWMSyncReader2_GetAllocateForOutput(reader, -1, &allocator); 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); 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); ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); @@ -3500,9 +3498,7 @@ static void test_sync_reader_allocator(void) 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); @@ -3514,14 +3510,10 @@ static void test_sync_reader_allocator(void) 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); @@ -3532,9 +3524,7 @@ static void test_sync_reader_allocator(void) 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); @@ -3546,9 +3536,7 @@ static void test_sync_reader_allocator(void) 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); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -3562,9 +3550,7 @@ static void test_sync_reader_allocator(void) 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);

1 0

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

Sept. 29, 2022

Module: wine Branch: master Commit: 7eb50d5e5703dc660945554da70cae37324bb39c URL: https://gitlab.winehq.org/wine/wine/-/commit/7eb50d5e5703dc660945554da70cae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 14:57:10 2022 +0200 winegstreamer: Implement IWMSyncReader2_SetAllocateForOutput. --- dlls/winegstreamer/gst_private.h | 2 ++ dlls/winegstreamer/wm_reader.c | 30 +++++++++++++++++++++++++----- dlls/wmvcore/tests/wmvcore.c | 5 ----- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 178679c38ee..44b526c0044 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -158,6 +158,8 @@ struct wm_stream * compressed samples. Rather, the behaviour of the reader objects differs * in nontrivial ways depending on this field. */ bool read_compressed; + + IWMReaderAllocatorEx *output_allocator; }; struct wm_reader diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 4839ddb8fa3..916bfb68ea8 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1620,7 +1620,10 @@ 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 (!stream->read_compressed && stream->output_allocator) + hr = IWMReaderAllocatorEx_AllocateForOutputEx(stream->output_allocator, stream->index, + wg_buffer.size, &sample, 0, 0, 0, NULL); + else if (callback_advanced && stream->read_compressed && stream->allocate_stream) hr = IWMReaderCallbackAdvanced_AllocateForStream(callback_advanced, stream->index + 1, wg_buffer.size, &sample, NULL); else if (callback_advanced && !stream->read_compressed && stream->allocate_output) @@ -2417,11 +2420,28 @@ static HRESULT WINAPI reader_SetRangeByFrameEx(IWMSyncReader2 *iface, WORD strea return E_NOTIMPL; } -static HRESULT WINAPI reader_SetAllocateForOutput(IWMSyncReader2 *iface, DWORD output_num, IWMReaderAllocatorEx *allocator) +static HRESULT WINAPI reader_SetAllocateForOutput(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); + + EnterCriticalSection(&reader->cs); + + if (!(stream = get_stream_by_output_number(reader, output))) + { + LeaveCriticalSection(&reader->cs); + return E_INVALIDARG; + } + + if (stream->output_allocator) + IWMReaderAllocatorEx_Release(stream->output_allocator); + if ((stream->output_allocator = allocator)) + IWMReaderAllocatorEx_AddRef(stream->output_allocator); + + LeaveCriticalSection(&reader->cs); + return S_OK; } static HRESULT WINAPI reader_GetAllocateForOutput(IWMSyncReader2 *iface, DWORD output_num, IWMReaderAllocatorEx **allocator) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 46e15c922c3..33f61889415 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -3491,7 +3491,6 @@ static void test_sync_reader_allocator(void) 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 @@ -3551,7 +3550,6 @@ static void test_sync_reader_allocator(void) 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); @@ -3572,7 +3570,6 @@ static void test_sync_reader_allocator(void) 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); @@ -3596,7 +3593,6 @@ static void test_sync_reader_allocator(void) 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; @@ -3615,7 +3611,6 @@ static void test_sync_reader_allocator(void) 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);

1 0