March 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : kernelbase: Use the ctype table from the sortkey file.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: c567af732b01231a0e4a653b994a89087b1642fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=c567af732b01231a0e4a653b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 17 11:27:28 2020 +0100 kernelbase: Use the ctype table from the sortkey file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 3 +- dlls/kernelbase/locale.c | 114 +++--- dlls/kernelbase/wctype.c | 822 -------------------------------------------- tools/make_unicode | 27 -- 4 files changed, 43 insertions(+), 923 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c567af732b01231a0e4a…

1 0

Nikolay Sivov : mfplat: Implement ConvertToContiguousBuffer() for multiple buffers.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 6601fb3ead59fc05f1b57da97a68b683d93b44f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6601fb3ead59fc05f1b57da9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 17 17:10:29 2020 +0300 mfplat: Implement ConvertToContiguousBuffer() for multiple buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 110 ++++++++++++++++++++++++++++++++++++--------- dlls/mfplat/tests/mfplat.c | 23 +++++++--- 2 files changed, 107 insertions(+), 26 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 69633134f5..1727ff1e90 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1136,9 +1136,78 @@ static HRESULT WINAPI sample_GetBufferByIndex(IMFSample *iface, DWORD index, IMF return hr; } +static unsigned int sample_get_total_length(struct sample *sample) +{ + DWORD total_length = 0, length; + size_t i; + + for (i = 0; i < sample->buffer_count; ++i) + { + length = 0; + if (SUCCEEDED(IMFMediaBuffer_GetCurrentLength(sample->buffers[i], &length))) + total_length += length; + } + + return total_length; +} + +static HRESULT sample_copy_to_buffer(struct sample *sample, IMFMediaBuffer *buffer) +{ + DWORD total_length, dst_length, dst_current_length, src_max_length, current_length; + BYTE *src_ptr, *dst_ptr; + BOOL locked; + HRESULT hr; + size_t i; + + total_length = sample_get_total_length(sample); + dst_current_length = 0; + + dst_ptr = NULL; + dst_length = current_length = 0; + locked = SUCCEEDED(hr = IMFMediaBuffer_Lock(buffer, &dst_ptr, &dst_length, &current_length)); + if (locked) + { + if (dst_length < total_length) + hr = MF_E_BUFFERTOOSMALL; + else if (dst_ptr) + { + for (i = 0; i < sample->buffer_count && SUCCEEDED(hr); ++i) + { + src_ptr = NULL; + src_max_length = current_length = 0; + if (SUCCEEDED(hr = IMFMediaBuffer_Lock(sample->buffers[i], &src_ptr, &src_max_length, &current_length))) + { + if (src_ptr) + { + if (current_length > dst_length) + hr = MF_E_BUFFERTOOSMALL; + else if (current_length) + { + memcpy(dst_ptr, src_ptr, current_length); + dst_length -= current_length; + dst_current_length += current_length; + dst_ptr += current_length; + } + } + IMFMediaBuffer_Unlock(sample->buffers[i]); + } + } + } + } + + IMFMediaBuffer_SetCurrentLength(buffer, dst_current_length); + + if (locked) + IMFMediaBuffer_Unlock(buffer); + + return hr; +} + static HRESULT WINAPI sample_ConvertToContiguousBuffer(IMFSample *iface, IMFMediaBuffer **buffer) { struct sample *sample = impl_from_IMFSample(iface); + unsigned int total_length, i; + IMFMediaBuffer *dest_buffer; HRESULT hr = S_OK; TRACE("%p, %p.\n", iface, buffer); @@ -1147,15 +1216,29 @@ static HRESULT WINAPI sample_ConvertToContiguousBuffer(IMFSample *iface, IMFMedi if (sample->buffer_count == 0) hr = E_UNEXPECTED; - else if (sample->buffer_count == 1) + else if (sample->buffer_count > 1) { - *buffer = sample->buffers[0]; - IMFMediaBuffer_AddRef(*buffer); + total_length = sample_get_total_length(sample); + if (SUCCEEDED(hr = MFCreateMemoryBuffer(total_length, &dest_buffer))) + { + if (SUCCEEDED(hr = sample_copy_to_buffer(sample, dest_buffer))) + { + for (i = 0; i < sample->buffer_count; ++i) + IMFMediaBuffer_Release(sample->buffers[i]); + + sample->buffers[0] = dest_buffer; + IMFMediaBuffer_AddRef(sample->buffers[0]); + + sample->buffer_count = 1; + } + IMFMediaBuffer_Release(dest_buffer); + } } - else + + if (SUCCEEDED(hr)) { - FIXME("Samples with multiple buffers are not supported.\n"); - hr = E_NOTIMPL; + *buffer = sample->buffers[0]; + IMFMediaBuffer_AddRef(*buffer); } LeaveCriticalSection(&sample->attributes.cs); @@ -1225,21 +1308,6 @@ static HRESULT WINAPI sample_RemoveAllBuffers(IMFSample *iface) return S_OK; } -static DWORD sample_get_total_length(struct sample *sample) -{ - DWORD total_length = 0, length; - size_t i; - - for (i = 0; i < sample->buffer_count; ++i) - { - length = 0; - if (SUCCEEDED(IMFMediaBuffer_GetCurrentLength(sample->buffers[i], &length))) - total_length += length; - } - - return total_length; -} - static HRESULT WINAPI sample_GetTotalLength(IMFSample *iface, DWORD *total_length) { struct sample *sample = impl_from_IMFSample(iface); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 008aa05c30..21105f5ce5 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1778,7 +1778,7 @@ static void test_system_memory_buffer(void) static void test_sample(void) { static const DWORD test_pattern = 0x22222222; - IMFMediaBuffer *buffer, *buffer2; + IMFMediaBuffer *buffer, *buffer2, *buffer3; DWORD count, flags, length; IMFAttributes *attributes; IMFSample *sample; @@ -1998,9 +1998,15 @@ static void test_sample(void) ok(buffer2 == buffer, "Unexpected buffer instance.\n"); IMFMediaBuffer_Release(buffer2); + hr = IMFMediaBuffer_SetCurrentLength(buffer, 3); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = MFCreateMemoryBuffer(16, &buffer2); ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + hr = IMFMediaBuffer_SetCurrentLength(buffer2, 4); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFSample_AddBuffer(sample, buffer2); ok(hr == S_OK, "Failed to add buffer, hr %#x.\n", hr); IMFMediaBuffer_Release(buffer2); @@ -2009,15 +2015,22 @@ static void test_sample(void) ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); ok(count == 2, "Unexpected buffer count %u.\n", count); - hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer2); -todo_wine + hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer3); ok(hr == S_OK, "Failed to convert, hr %#x.\n", hr); + + hr = IMFMediaBuffer_GetMaxLength(buffer3, &length); + ok(hr == S_OK, "Failed to get maximum length, hr %#x.\n", hr); + ok(length == 7, "Unexpected length %u.\n", length); + + hr = IMFMediaBuffer_GetCurrentLength(buffer3, &length); + ok(hr == S_OK, "Failed to get maximum length, hr %#x.\n", hr); + ok(length == 7, "Unexpected length %u.\n", length); + if (SUCCEEDED(hr)) - IMFMediaBuffer_Release(buffer2); + IMFMediaBuffer_Release(buffer3); hr = IMFSample_GetBufferCount(sample, &count); ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); -todo_wine ok(count == 1, "Unexpected buffer count %u.\n", count); IMFMediaBuffer_Release(buffer);

1 0

Nikolay Sivov : mfplat: Fix optional buffer argument handling in ConvertToContiguousBuffer().
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: eead400ba7235fa53f76d4bac6cfe2611318e1dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=eead400ba7235fa53f76d4ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 17 17:10:30 2020 +0300 mfplat: Fix optional buffer argument handling in ConvertToContiguousBuffer(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 2 +- dlls/mfplat/tests/mfplat.c | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 1727ff1e90..7c123e3e65 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1235,7 +1235,7 @@ static HRESULT WINAPI sample_ConvertToContiguousBuffer(IMFSample *iface, IMFMedi } } - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr) && buffer) { *buffer = sample->buffers[0]; IMFMediaBuffer_AddRef(*buffer); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 21105f5ce5..c5ed883dfa 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1993,6 +1993,9 @@ static void test_sample(void) ok(buffer2 == buffer, "Unexpected buffer instance.\n"); IMFMediaBuffer_Release(buffer2); + hr = IMFSample_ConvertToContiguousBuffer(sample, NULL); + ok(hr == S_OK, "Failed to convert, hr %#x.\n", hr); + hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer2); ok(hr == S_OK, "Failed to convert, hr %#x.\n", hr); ok(buffer2 == buffer, "Unexpected buffer instance.\n"); @@ -2026,8 +2029,21 @@ static void test_sample(void) ok(hr == S_OK, "Failed to get maximum length, hr %#x.\n", hr); ok(length == 7, "Unexpected length %u.\n", length); - if (SUCCEEDED(hr)) - IMFMediaBuffer_Release(buffer3); + IMFMediaBuffer_Release(buffer3); + + hr = IMFSample_GetBufferCount(sample, &count); + ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); + ok(count == 1, "Unexpected buffer count %u.\n", count); + + hr = IMFSample_AddBuffer(sample, buffer); + ok(hr == S_OK, "Failed to add buffer, hr %#x.\n", hr); + + hr = IMFSample_GetBufferCount(sample, &count); + ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); + ok(count == 2, "Unexpected buffer count %u.\n", count); + + hr = IMFSample_ConvertToContiguousBuffer(sample, NULL); + ok(hr == S_OK, "Failed to convert, hr %#x.\n", hr); hr = IMFSample_GetBufferCount(sample, &count); ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr);

1 0

Nikolay Sivov : mfplat: Fix buffer alignment calculation.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 6450fb3bda5fcd6e38e5270fe1a6227b74fb49a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6450fb3bda5fcd6e38e5270f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 17 17:10:31 2020 +0300 mfplat: Fix buffer alignment calculation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 7c123e3e65..323603cf21 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); -#define ALIGN_SIZE(size, alignment) (((size) + (alignment - 1)) & ~((alignment - 1))) +#define ALIGN_SIZE(size, alignment) (((size) + (alignment)) & ~((alignment))) struct memory_buffer { @@ -262,7 +262,7 @@ static HRESULT WINAPI memory_1d_2d_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat hr = MF_E_INVALIDREQUEST; else if (!buffer->_2d.linear_buffer) { - if (!(buffer->_2d.linear_buffer = heap_alloc(ALIGN_SIZE(buffer->_2d.plane_size, 64)))) + if (!(buffer->_2d.linear_buffer = heap_alloc(ALIGN_SIZE(buffer->_2d.plane_size, MF_64_BYTE_ALIGNMENT)))) hr = E_OUTOFMEMORY; } @@ -575,7 +575,7 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo if (!object) return E_OUTOFMEMORY; - pitch = ALIGN_SIZE(width * bpp, 64); + pitch = ALIGN_SIZE(width * bpp, MF_64_BYTE_ALIGNMENT); switch (fourcc) {

1 0

Nikolay Sivov : mf: Copy sample data to copier transform output.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: bdd9af2c8747670d5f10530bdf6316b33222904a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdd9af2c8747670d5f10530b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 17 17:10:32 2020 +0300 mf: Copy sample data to copier transform output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index ecf7de23b6..20b587e413 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1957,6 +1957,7 @@ static HRESULT WINAPI sample_copier_transform_ProcessOutput(IMFTransform *iface, MFT_OUTPUT_DATA_BUFFER *buffers, DWORD *status) { struct sample_copier *transform = impl_copier_from_IMFTransform(iface); + IMFMediaBuffer *buffer; DWORD sample_flags; HRESULT hr = S_OK; LONGLONG time; @@ -1981,7 +1982,15 @@ static HRESULT WINAPI sample_copier_transform_ProcessOutput(IMFTransform *iface, if (SUCCEEDED(IMFSample_GetSampleFlags(transform->sample, &sample_flags))) IMFSample_SetSampleFlags(buffers->pSample, sample_flags); - FIXME("Copy buffers.\n"); + if (SUCCEEDED(IMFSample_ConvertToContiguousBuffer(transform->sample, NULL))) + { + if (SUCCEEDED(IMFSample_GetBufferByIndex(buffers->pSample, 0, &buffer))) + { + if (FAILED(IMFSample_CopyToBuffer(transform->sample, buffer))) + hr = MF_E_UNEXPECTED; + IMFMediaBuffer_Release(buffer); + } + } IMFSample_Release(transform->sample); transform->sample = NULL;

1 0

Nikolay Sivov : mf: Forward sink invalidation events to application.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 43a88a7317bc989624bf97dfc199943544f8e9da URL: https://source.winehq.org/git/wine.git/?a=commit;h=43a88a7317bc989624bf97df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 17 17:10:33 2020 +0300 mf: Forward sink invalidation events to application. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 07cfc4ee8c..69d1fdf569 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2492,6 +2492,38 @@ static void session_deliver_sample(struct media_session *session, IMFMediaStream IMFTopologyNode_Release(downstream_node); } +static void session_sink_invalidated(struct media_session *session, IMFMediaEvent *event, IMFStreamSink *sink) +{ + struct topo_node *node, *sink_node = NULL; + HRESULT hr; + + LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry) + { + if (node->type == MF_TOPOLOGY_OUTPUT_NODE && node->object.sink_stream == sink) + { + sink_node = node; + break; + } + } + + if (!sink_node) + return; + + if (!event) + { + if (FAILED(hr = MFCreateMediaEvent(MESinkInvalidated, &GUID_NULL, S_OK, NULL, &event))) + WARN("Failed to create event, hr %#x.\n", hr); + } + + if (!event) + return; + + IMFMediaEvent_SetUINT64(event, &MF_EVENT_OUTPUT_NODE, sink_node->node_id); + IMFMediaEventQueue_QueueEvent(session->event_queue, event); + + session_set_topo_status(session, S_OK, MF_TOPOSTATUS_ENDED); +} + static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct media_session *session = impl_from_events_callback_IMFAsyncCallback(iface); @@ -2573,13 +2605,31 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM EnterCriticalSection(&session->cs); session_request_sample(session, (IMFStreamSink *)event_source); LeaveCriticalSection(&session->cs); - break; + break; case MEMediaSample: EnterCriticalSection(&session->cs); session_deliver_sample(session, (IMFMediaStream *)event_source, &value); LeaveCriticalSection(&session->cs); + + break; + case MEAudioSessionDeviceRemoved: + case MEAudioSessionDisconnected: + case MEAudioSessionExclusiveModeOverride: + case MEAudioSessionFormatChanged: + case MEAudioSessionServerShutdown: + + IMFMediaEventQueue_QueueEvent(session->event_queue, event); + /* fallthrough */ + case MESinkInvalidated: + + EnterCriticalSection(&session->cs); + session_sink_invalidated(session, event_type == MESinkInvalidated ? event : NULL, + (IMFStreamSink *)event_source); + LeaveCriticalSection(&session->cs); + + break; default: ; }

1 0

Nikolay Sivov : mfplat: Get rid of unsupported interface trace for 1D buffers.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: f056355071dea0549bee41399bcea5a9136ea54a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f056355071dea0549bee4139… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 17 17:10:34 2020 +0300 mfplat: Get rid of unsupported interface trace for 1D buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 323603cf21..05e1ce5fd6 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -97,16 +97,13 @@ static HRESULT WINAPI memory_buffer_QueryInterface(IMFMediaBuffer *iface, REFIID IsEqualIID(riid, &IID_IUnknown)) { *out = &buffer->IMFMediaBuffer_iface; - } - else - { - FIXME("(%s, %p)\n", debugstr_guid(riid), out); - *out = NULL; - return E_NOINTERFACE; + IMFMediaBuffer_AddRef(iface); + return S_OK; } - IUnknown_AddRef((IUnknown*)*out); - return S_OK; + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; } static ULONG WINAPI memory_buffer_AddRef(IMFMediaBuffer *iface)

1 0

Alistair Leslie-Hughes : dmime: IDirectMusicGraph GetTool isn't a stub.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 04fe670aa6d58d44dbb760f6aafd86b9aa02117a URL: https://source.winehq.org/git/wine.git/?a=commit;h=04fe670aa6d58d44dbb760f6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 16 05:33:43 2020 +0000 dmime: IDirectMusicGraph GetTool isn't a stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/graph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index eebebef4d1..85eef9c091 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -149,8 +149,8 @@ static HRESULT WINAPI DirectMusicGraph_GetTool(IDirectMusicGraph *iface, DWORD d IDirectMusicGraphImpl *This = impl_from_IDirectMusicGraph(iface); struct list* pEntry = NULL; LPDMUS_PRIVATE_GRAPH_TOOL pIt = NULL; - - FIXME("(%p, %d, %p): stub\n", This, dwIndex, ppTool); + + TRACE("(%p, %d, %p)\n", This, dwIndex, ppTool); LIST_FOR_EACH (pEntry, &This->Tools) {

1 0

Alistair Leslie-Hughes : dmime: Free more interfaces in IDirectMusicPerformance FreePMsg.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: b28512f6c7ac325fce63003a1c6cdbfed34a589e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b28512f6c7ac325fce63003a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 16 06:59:22 2020 +0000 dmime: Free more interfaces in IDirectMusicPerformance FreePMsg. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index b7b71637a1..f535fe888f 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -535,6 +535,12 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_FreePMsg(IDirectMusicPerforma DMUS_ItemRemoveFromQueue( This, pItem ); LeaveCriticalSection(&This->safe); + if (pPMSG->pTool) + IDirectMusicTool_Release(pPMSG->pTool); + + if (pPMSG->pGraph) + IDirectMusicGraph_Release(pPMSG->pGraph); + if (pPMSG->punkUser) IUnknown_Release(pPMSG->punkUser);

1 0

Francois Gouget : gameux/tests: Avoid an ever changing value in a gamestatistics failure message.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 142c8df4041c5ea2329a6328f1b1acaf495ce9fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=142c8df4041c5ea2329a6328… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 15 23:56:34 2020 +0100 gameux/tests: Avoid an ever changing value in a gamestatistics failure message. The whole point of printing the IGameStatisticsMgr::GetGameStatistics() return value was to check whether the pointer had been modified. So provide this information without including an ever changing value in the failure message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/tests/gamestatistics.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index d823af1aab..8d4da4a0f4 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -181,7 +181,8 @@ static void test_gamestatisticsmgr( void ) gs = (void *)0xdeadbeef; hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENONLY, &dwOpenResult, &gs); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "GetGameStatistics returned unexpected value: 0x%08x\n", hr); - ok(gs == NULL, "Expected output pointer to be NULL, got %p\n", gs); + ok(gs == NULL, "Expected output pointer to be NULL, got %s\n", + (gs == (void *)0xdeadbeef ? "deadbeef" : "neither NULL nor deadbeef")); /* now, allow them to be created */ hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENORCREATE, &dwOpenResult, &gs);

1 0