September 2022 - Wine-commits

Rémi Bernon : winegstreamer: Implement IWMSyncReader2_SetAllocateForOutput.
by Alexandre Julliard 29 Sep '22

29 Sep '22

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

Rémi Bernon : winegstreamer: Implement IWMSyncReader2_GetAllocateForOutput.
by Alexandre Julliard 29 Sep '22

29 Sep '22

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 : winegstreamer: Implement IWMSyncReader2_SetAllocateForStream.
by Alexandre Julliard 29 Sep '22

29 Sep '22

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

29 Sep '22

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

Paul Gofman : msi: Disable FS redirection for temporary file in cabinet_copy_file().
by Alexandre Julliard 28 Sep '22

28 Sep '22

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

Francois Gouget : tests: Print unhandled exception messages in colour.
by Alexandre Julliard 28 Sep '22

28 Sep '22

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

Zebediah Figura : widl: Generate "static inline" instead of "static FORCEINLINE" for COM inline wrappers.
by Alexandre Julliard 28 Sep '22

28 Sep '22

Module: wine Branch: master Commit: e654b631f285e9eeb5fa130b124572d5c0cc0d29 URL: https://gitlab.winehq.org/wine/wine/-/commit/e654b631f285e9eeb5fa130b124572… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jul 24 17:00:10 2022 -0500 widl: Generate "static inline" instead of "static FORCEINLINE" for COM inline wrappers. mingw-w64 defines __forceinline (and therefore FORCEINLINE) as "extern __inline__ __attribute__((__always_inline__,__gnu_inline__)). This means that COM inline wrappers specify multiple storage classes and hence cannot be compiled. Wine defines FORCEINLINE simply as "inline" (and uses "static" everywhere), so this is a non-issue for Wine. However, since Wine and mingw-w64 share the source code of widl and of most IDL headers, this patch changes the definition for both projects. There's no reason to force inlining here, especially since the wrappers need to be manually enabled, and we don't need to match PSDK semantics where these wrappers don't even exist. In practice, use "__inline__" instead of "inline" for GNU C targets, to preserve compatibility with C89 in mingw-w64 headers. --- tools/widl/header.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 8b9c64e1e38..35163bfa86b 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1315,7 +1315,7 @@ static void write_inline_wrappers(FILE *header, const type_t *iface, const type_ if (!is_callas(func->attrs)) { const var_t *arg; - fprintf(header, "static FORCEINLINE "); + fprintf(header, "static __WIDL_INLINE "); write_type_decl_left(header, type_function_get_ret(func->declspec.type)); fprintf(header, " %s_%s(", name, get_name(func)); write_args(header, type_function_get_args(func->declspec.type), name, 1, FALSE, NAME_C); @@ -2155,6 +2155,14 @@ void write_header(const statement_list_t *stmts) fprintf(header, "#ifndef __%s__\n", header_token); fprintf(header, "#define __%s__\n\n", header_token); + fprintf(header, "#ifndef __WIDL_INLINE\n"); + fprintf(header, "#if defined(__cplusplus) || defined(_MSC_VER)\n"); + fprintf(header, "#define __WIDL_INLINE inline\n"); + fprintf(header, "#elif defined(__GNUC__)\n"); + fprintf(header, "#define __WIDL_INLINE __inline__\n"); + fprintf(header, "#endif\n"); + fprintf(header, "#endif\n\n"); + fprintf(header, "/* Forward declarations */\n\n"); write_forward_decls(header, stmts);

1 0

Eric Pouech : dbghelp: Add support for static variables at function scope (PDB).
by Alexandre Julliard 28 Sep '22

28 Sep '22

Module: wine Branch: master Commit: a523361b109bf99353c3d0d462a27407bd6e2f3e URL: https://gitlab.winehq.org/wine/wine/-/commit/a523361b109bf99353c3d0d462a274… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 28 12:13:55 2022 +0200 dbghelp: Add support for static variables at function scope (PDB). These should be stored in function's children vector. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 33 +++++++++++++++++++++------------ dlls/dbghelp/symbol.c | 4 +++- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 8714e756462..c1cfc4f4ca1 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1764,6 +1764,8 @@ static const union codeview_symbol* get_next_sym(const union codeview_symbol* sy static inline void codeview_add_variable(const struct msc_debug_info* msc_dbg, struct symt_compiland* compiland, + struct symt_function* func, + struct symt_block* block, const char* name, unsigned segment, unsigned offset, unsigned symtype, BOOL is_local, BOOL in_tls, BOOL force) @@ -1775,6 +1777,13 @@ static inline void codeview_add_variable(const struct msc_debug_info* msc_dbg, loc.kind = in_tls ? loc_tlsrel : loc_absolute; loc.reg = 0; loc.offset = in_tls ? offset : codeview_get_address(msc_dbg, segment, offset); + if (func) + { + if (!is_local || in_tls) WARN("Unsupported construct\n"); + symt_add_func_local(msc_dbg->module, func, DataIsStaticLocal, &loc, block, + codeview_get_type(symtype, FALSE), name); + return; + } if (force || in_tls || !symt_find_symbol_at(msc_dbg->module, loc.offset)) { symt_new_global_variable(msc_dbg->module, compiland, @@ -2232,21 +2241,21 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, case S_GDATA32_16t: case S_LDATA32_16t: if (do_globals) - codeview_add_variable(msc_dbg, compiland, terminate_string(&sym->data_v1.p_name), + codeview_add_variable(msc_dbg, compiland, curr_func, block, terminate_string(&sym->data_v1.p_name), sym->data_v1.segment, sym->data_v1.offset, sym->data_v1.symtype, sym->generic.id == S_LDATA32_16t, FALSE, TRUE); break; case S_GDATA32_ST: case S_LDATA32_ST: if (do_globals) - codeview_add_variable(msc_dbg, compiland, terminate_string(&sym->data_v2.p_name), + codeview_add_variable(msc_dbg, compiland, curr_func, block, terminate_string(&sym->data_v2.p_name), sym->data_v2.segment, sym->data_v2.offset, sym->data_v2.symtype, sym->generic.id == S_LDATA32_ST, FALSE, TRUE); break; case S_GDATA32: case S_LDATA32: if (do_globals) - codeview_add_variable(msc_dbg, compiland, sym->data_v3.name, + codeview_add_variable(msc_dbg, compiland, curr_func, block, sym->data_v3.name, sym->data_v3.segment, sym->data_v3.offset, sym->data_v3.symtype, sym->generic.id == S_LDATA32, FALSE, TRUE); break; @@ -2255,21 +2264,21 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, case S_GTHREAD32_16t: case S_LTHREAD32_16t: if (do_globals) - codeview_add_variable(msc_dbg, compiland, terminate_string(&sym->thread_v1.p_name), + codeview_add_variable(msc_dbg, compiland, curr_func, block, terminate_string(&sym->thread_v1.p_name), sym->thread_v1.segment, sym->thread_v1.offset, sym->thread_v1.symtype, sym->generic.id == S_LTHREAD32_16t, TRUE, TRUE); break; case S_GTHREAD32_ST: case S_LTHREAD32_ST: if (do_globals) - codeview_add_variable(msc_dbg, compiland, terminate_string(&sym->thread_v2.p_name), + codeview_add_variable(msc_dbg, compiland, curr_func, block, terminate_string(&sym->thread_v2.p_name), sym->thread_v2.segment, sym->thread_v2.offset, sym->thread_v2.symtype, sym->generic.id == S_LTHREAD32_ST, TRUE, TRUE); break; case S_GTHREAD32: case S_LTHREAD32: if (do_globals) - codeview_add_variable(msc_dbg, compiland, sym->thread_v3.name, + codeview_add_variable(msc_dbg, compiland, curr_func, block, sym->thread_v3.name, sym->thread_v3.segment, sym->thread_v3.offset, sym->thread_v3.symtype, sym->generic.id == S_LTHREAD32, TRUE, TRUE); break; @@ -2881,19 +2890,19 @@ static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BY */ case S_GDATA32_16t: case S_LDATA32_16t: - codeview_add_variable(msc_dbg, compiland, terminate_string(&sym->data_v1.p_name), + codeview_add_variable(msc_dbg, compiland, NULL, NULL, terminate_string(&sym->data_v1.p_name), sym->data_v1.segment, sym->data_v1.offset, sym->data_v1.symtype, sym->generic.id == S_LDATA32_16t, FALSE, FALSE); break; case S_GDATA32_ST: case S_LDATA32_ST: - codeview_add_variable(msc_dbg, compiland, terminate_string(&sym->data_v2.p_name), + codeview_add_variable(msc_dbg, compiland, NULL, NULL, terminate_string(&sym->data_v2.p_name), sym->data_v2.segment, sym->data_v2.offset, sym->data_v2.symtype, sym->generic.id == S_LDATA32_ST, FALSE, FALSE); break; case S_GDATA32: case S_LDATA32: - codeview_add_variable(msc_dbg, compiland, sym->data_v3.name, + codeview_add_variable(msc_dbg, compiland, NULL, NULL, sym->data_v3.name, sym->data_v3.segment, sym->data_v3.offset, sym->data_v3.symtype, sym->generic.id == S_LDATA32, FALSE, FALSE); break; @@ -2901,19 +2910,19 @@ static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BY /* variables with thread storage */ case S_GTHREAD32_16t: case S_LTHREAD32_16t: - codeview_add_variable(msc_dbg, compiland, terminate_string(&sym->thread_v1.p_name), + codeview_add_variable(msc_dbg, compiland, NULL, NULL, terminate_string(&sym->thread_v1.p_name), sym->thread_v1.segment, sym->thread_v1.offset, sym->thread_v1.symtype, sym->generic.id == S_LTHREAD32_16t, TRUE, FALSE); break; case S_GTHREAD32_ST: case S_LTHREAD32_ST: - codeview_add_variable(msc_dbg, compiland, terminate_string(&sym->thread_v2.p_name), + codeview_add_variable(msc_dbg, compiland, NULL, NULL, terminate_string(&sym->thread_v2.p_name), sym->thread_v2.segment, sym->thread_v2.offset, sym->thread_v2.symtype, sym->generic.id == S_LTHREAD32_ST, TRUE, FALSE); break; case S_GTHREAD32: case S_LTHREAD32: - codeview_add_variable(msc_dbg, compiland, sym->thread_v3.name, + codeview_add_variable(msc_dbg, compiland, NULL, NULL, sym->thread_v3.name, sym->thread_v3.segment, sym->thread_v3.offset, sym->thread_v3.symtype, sym->generic.id == S_LTHREAD32, TRUE, FALSE); break; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 7b0324f5013..4a5a971082e 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -449,6 +449,7 @@ void symt_add_func_line(struct module* module, struct symt_function* func, * * Adds a new local/parameter to a given function: * In any cases, dt tells whether it's a local variable or a parameter + * or a static variable inside the function. * If regno it's not 0: * - then variable is stored in a register * - otherwise, value is referenced by register + offset @@ -470,7 +471,7 @@ struct symt_data* symt_add_func_local(struct module* module, name, type); assert(symt_check_tag(&func->symt, SymTagFunction) || symt_check_tag(&func->symt, SymTagInlineSite)); - assert(dt == DataIsParam || dt == DataIsLocal); + assert(dt == DataIsParam || dt == DataIsLocal || dt == DataIsStaticLocal); locsym = pool_alloc(&module->pool, sizeof(*locsym)); locsym->symt.tag = SymTagData; @@ -804,6 +805,7 @@ static void symt_fill_sym_info(struct module_pair* pair, break; case DataIsGlobal: case DataIsFileStatic: + case DataIsStaticLocal: switch (data->u.var.kind) { case loc_tlsrel:

1 0

Eric Pouech : dbghelp: Fix container for global variables (Dwarf).
by Alexandre Julliard 28 Sep '22

28 Sep '22

Module: wine Branch: master Commit: 0e345d6c43db96332ed1c9188f2a02004e8dac0b URL: https://gitlab.winehq.org/wine/wine/-/commit/0e345d6c43db96332ed1c9188f2a02… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 28 12:13:57 2022 +0200 dbghelp: Fix container for global variables (Dwarf). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dwarf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 5c0f34d4bf5..13931c45d8b 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1997,7 +1997,8 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, if (!dwarf2_find_attribute(di, DW_AT_external, &ext)) ext.u.uvalue = 0; loc.offset += subpgm->ctx->module_ctx->load_offset; - symt_new_global_variable(subpgm->ctx->module_ctx->module, subpgm->ctx->compiland, + symt_new_global_variable(subpgm->ctx->module_ctx->module, + ext.u.uvalue ? NULL : subpgm->ctx->compiland, dwarf2_get_cpp_name(di, name.u.string), !ext.u.uvalue, loc, 0, param_type); break;

1 0

Eric Pouech : dbghelp: Fix variable storage information (Dwarf).
by Alexandre Julliard 28 Sep '22

28 Sep '22

Module: wine Branch: master Commit: 108cd669330cd2cf77a976a4554d4df59007ee75 URL: https://gitlab.winehq.org/wine/wine/-/commit/108cd669330cd2cf77a976a4554d4d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 28 12:13:58 2022 +0200 dbghelp: Fix variable storage information (Dwarf). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dwarf.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 13931c45d8b..71163ced733 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1993,14 +1993,23 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, break; case loc_absolute: /* it's a global variable */ - /* FIXME: we don't handle its scope yet */ if (!dwarf2_find_attribute(di, DW_AT_external, &ext)) ext.u.uvalue = 0; loc.offset += subpgm->ctx->module_ctx->load_offset; - symt_new_global_variable(subpgm->ctx->module_ctx->module, - ext.u.uvalue ? NULL : subpgm->ctx->compiland, - dwarf2_get_cpp_name(di, name.u.string), !ext.u.uvalue, - loc, 0, param_type); + if (subpgm->top_func) + { + if (ext.u.uvalue) WARN("unexpected global inside a functionn"); + symt_add_func_local(subpgm->ctx->module_ctx->module, subpgm->current_func, + DataIsStaticLocal, &loc, subpgm->current_block, + param_type, dwarf2_get_cpp_name(di, name.u.string)); + } + else + { + symt_new_global_variable(subpgm->ctx->module_ctx->module, + ext.u.uvalue ? NULL : subpgm->ctx->compiland, + dwarf2_get_cpp_name(di, name.u.string), !ext.u.uvalue, + loc, 0, param_type); + } break; default: subpgm->non_computed_variable = TRUE;

1 0