Module: wine Branch: master Commit: 5d5102f8498413f4b7e11f7da0509e7717fb3735 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d5102f8498413f4b7e11f7da...
Author: Anton Baskanov baskanov@gmail.com Date: Wed Oct 7 23:08:16 2020 +0700
amstream: Reference the multimedia stream in ddraw stream sample.
Signed-off-by: Anton Baskanov baskanov@gmail.com Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/amstream/ddrawstream.c | 6 ++++++ dlls/amstream/tests/amstream.c | 2 ++ 2 files changed, 8 insertions(+)
diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 6ea99d4915..5e6e1555d7 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -70,6 +70,7 @@ struct ddraw_sample IDirectDrawStreamSample IDirectDrawStreamSample_iface; LONG ref; struct ddraw_stream *parent; + IMultiMediaStream *mmstream; IDirectDrawSurface *surface; RECT rect; STREAM_TIME start_time; @@ -1462,6 +1463,8 @@ static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) --sample->parent->sample_refs; LeaveCriticalSection(&sample->parent->cs);
+ if (sample->mmstream) + IMultiMediaStream_Release(sample->mmstream); IAMMediaStream_Release(&sample->parent->IAMMediaStream_iface);
if (sample->surface) @@ -1678,8 +1681,11 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw object->IDirectDrawStreamSample_iface.lpVtbl = &DirectDrawStreamSample_Vtbl; object->ref = 1; object->parent = parent; + object->mmstream = parent->parent; InitializeConditionVariable(&object->update_cv); IAMMediaStream_AddRef(&parent->IAMMediaStream_iface); + if (object->mmstream) + IMultiMediaStream_AddRef(object->mmstream); ++parent->sample_refs;
if (surface) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 285dc0f054..9dda5882a4 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -6904,9 +6904,11 @@ static void test_ddrawstream_create_sample(void) hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, &rect, 0, &sample); ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);
+ EXPECT_REF(mmstream, 1); EXPECT_REF(stream, 3); hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(mmstream, 2); EXPECT_REF(stream, 4);
hr = IDirectDrawStreamSample_GetSurface(sample, NULL, NULL);