ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

amstream: Create ddraw if no source object was specified in ddraw_IAMMediaStream_Initialize(). 

Signed-off-by: Gijs Vermeulen <gijsvrm@gmail.com>
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Gijs Vermeulen 2020-06-25 20:57:00 +02:00 committed by Alexandre Julliard
parent 51fce87c60
commit b2c74e0cca
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/amstream/ddrawstream.c
View File

@ -218,6 +218,13 @@ static HRESULT WINAPI ddraw_IAMMediaStream_Initialize(IAMMediaStream *iface, IUn
&& FAILED(hr = IUnknown_QueryInterface(source_object, &IID_IDirectDraw, (void **)&stream->ddraw)))
FIXME("Stream object doesn't implement IDirectDraw interface, hr %#x.\n", hr);
if (!source_object)
{
if (FAILED(hr = DirectDrawCreate(NULL, &stream->ddraw, NULL)))
return hr;
IDirectDraw_SetCooperativeLevel(stream->ddraw, NULL, DDSCL_NORMAL);
}
return S_OK;
}
@ -381,13 +388,10 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetDirectDraw(IDirectDrawMedi
if (!ddraw)
return E_POINTER;
*ddraw = NULL;
if (!stream->ddraw)
{
HRESULT hr = DirectDrawCreate(NULL, &stream->ddraw, NULL);
if (FAILED(hr))
return hr;
IDirectDraw_SetCooperativeLevel(stream->ddraw, NULL, DDSCL_NORMAL);
*ddraw = NULL;
return S_OK;
}
IDirectDraw_AddRef(stream->ddraw);

3
dlls/amstream/tests/amstream.c
View File

@ -4803,8 +4803,7 @@ static void test_ddrawstream_getsetdirectdraw(void)
hr = IDirectDrawMediaStream_GetDirectDraw(ddraw_stream, &ddraw3);
ok(hr == S_OK, "Got hr %#x.\n", hr);
todo_wine ok(ddraw3 == NULL, "Expected NULL, got %p.\n", ddraw3);
if (ddraw3) IDirectDraw_Release(ddraw3);
ok(ddraw3 == NULL, "Expected NULL, got %p.\n", ddraw3);
hr = IDirectDrawMediaStream_SetDirectDraw(ddraw_stream, ddraw2);
ok(hr == S_OK, "Got hr %#x.\n", hr);