wine-devel September 2020

wine-devel@winehq.org

79 participants
771 discussions

[PATCH 1/3] d3dx10: Implement D3DX10GetImageInfoFromFileW().
by Ziqing Hui 10 Sep '20

10 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/d3dx10_43_main.c | 56 +++++++++++++++++++++++++++++++-- dlls/d3dx10_43/tests/d3dx10.c | 6 ++-- 2 files changed, 57 insertions(+), 5 deletions(-)

3 2

[PATCH] ntdll: Fix a memory leak (Valgrind).
by Jiangyi Chen 10 Sep '20

10 Sep '20

==15674== 82 bytes in 1 blocks are definitely lost in loss record 1,041 of 2,256 ==15674== at 0x7BC6F0DA: notify_alloc (heap.c:260) ==15674== by 0x7BC731BB: RtlAllocateHeap (heap.c:1725) ==15674== by 0x7BCA3BC2: RtlCreateUnicodeString (rtlstr.c:239) ==15674== by 0x7BC63CEA: get_image_path (env.c:720) ==15674== by 0x7BC6583E: init_user_process_params (env.c:1450)

2 1

[PATCH 3/3] d3dx10: Implement D3DX10GetImageInfoFromFileA().
by Ziqing Hui 10 Sep '20

10 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/d3dx10_43_main.c | 13 +++++++++++-- dlls/d3dx10_43/tests/d3dx10.c | 4 +--- 2 files changed, 12 insertions(+), 5 deletions(-)

2 1

[PATCH] comdlg32/tests: Add test for overwrite when IFileDialog set FOS_PICKFOLDERS option.
by Jiangyi Chen 10 Sep '20

10 Sep '20

2 1

[PATCH] ntdll: Fix a ImagePathName memory leak(Valgrind).
by Chao Long 10 Sep '20

10 Sep '20

Valgrind.log: ==15674== 82 bytes in 1 blocks are definitely lost in loss record 1,041 of 2,256 ==15674== at 0x7BC6F0DA: notify_alloc (heap.c:260) ==15674== by 0x7BC731BB: RtlAllocateHeap (heap.c:1725) ==15674== by 0x7BCA3BC2: RtlCreateUnicodeString (rtlstr.c:239) ==15674== by 0x7BC63CEA: get_image_path (env.c:720) ==15674== by 0x7BC6583E: init_user_process_params (env.c:1450)

1 0

[PATCH 2/3] d3dx10/tests: Add tests for D3DX10GetImageInfoFromFileA().
by Ziqing Hui 10 Sep '20

10 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 44 +++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 7 deletions(-)

1 0

[PATCH] comdlg32: Fix the wrong popup when saving the same file again in the same directory.
by Jiangyi Chen 10 Sep '20

10 Sep '20

1 0

[PATCH] winegstreamer: Dereference messages dropped from watch_bus().
by Zebediah Figura 09 Sep '20

09 Sep '20

>From GStreamer documentation: "If the handler returns GST_BUS_DROP, it should unref the message, else the message should not be unreffed by the sync handler." Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2c9aafd7a6b..724ac8fd25f 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1280,6 +1280,7 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) default: break; } + gst_message_unref(msg); return GST_BUS_DROP; } -- 2.28.0

1 0

[PATCH v3 1/5] amstream: Implement AMDirectDrawStream::GetFormat.
by Anton Baskanov 09 Sep '20

09 Sep '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/ddrawstream.c | 111 ++++++++++++- dlls/amstream/tests/amstream.c | 279 +++++++++++++++++++++++++++++++++ 2 files changed, 382 insertions(+), 8 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 0d3f2d0d4b8..e33dac58d94 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -28,6 +28,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); static const WCHAR sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}"; +struct format +{ + DWORD flags; + DWORD width; + DWORD height; + DDPIXELFORMAT pf; +}; + struct ddraw_stream { IAMMediaStream IAMMediaStream_iface; @@ -47,6 +55,7 @@ struct ddraw_stream IPin *peer; IMemAllocator *allocator; AM_MEDIA_TYPE mt; + struct format format; }; static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDrawSurface *surface, @@ -363,11 +372,46 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetFormat(IDirectDrawMediaStr DDSURFACEDESC *current_format, IDirectDrawPalette **palette, DDSURFACEDESC *desired_format, DWORD *flags) { - FIXME("(%p)->(%p,%p,%p,%p) stub!\n", iface, current_format, palette, desired_format, - flags); + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + + TRACE("stream %p, current_format %p, palette %p, desired_format %p, flags %p.\n", stream, current_format, palette, + desired_format, flags); - return MS_E_NOSTREAM; + EnterCriticalSection(&stream->cs); + + if (!stream->peer) + { + LeaveCriticalSection(&stream->cs); + return MS_E_NOSTREAM; + } + + if (current_format) + { + current_format->dwFlags = stream->format.flags | DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + current_format->dwWidth = stream->format.width; + current_format->dwHeight = stream->format.height; + current_format->ddpfPixelFormat = stream->format.pf; + current_format->ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; + } + + if (palette) + *palette = NULL; + + if (desired_format) + { + desired_format->dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + desired_format->dwWidth = stream->format.width; + desired_format->dwHeight = stream->format.height; + desired_format->ddpfPixelFormat = stream->format.pf; + desired_format->ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; + } + + if (flags) + *flags = 0; + + LeaveCriticalSection(&stream->cs); + return S_OK; } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetFormat(IDirectDrawMediaStream *iface, @@ -638,7 +682,11 @@ static HRESULT WINAPI ddraw_sink_Connect(IPin *iface, IPin *peer, const AM_MEDIA static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) { struct ddraw_stream *stream = impl_from_IPin(iface); + const VIDEOINFOHEADER *video_info; PIN_DIRECTION dir; + DWORD width; + DWORD height; + DDPIXELFORMAT pf = {sizeof(DDPIXELFORMAT)}; TRACE("stream %p, peer %p, mt %p.\n", stream, peer, mt); @@ -651,17 +699,56 @@ static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, cons } if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Video) - || (!IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8) - && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24) - && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB32) - && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB555) - && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB565)) || !IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) { LeaveCriticalSection(&stream->cs); return VFW_E_TYPE_NOT_ACCEPTED; } + video_info = (const VIDEOINFOHEADER *)mt->pbFormat; + + width = video_info->bmiHeader.biWidth; + height = abs(video_info->bmiHeader.biHeight); + pf.dwFlags = DDPF_RGB; + if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8)) + { + pf.dwFlags |= DDPF_PALETTEINDEXED8; + pf.u1.dwRGBBitCount = 8; + } + else if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB555)) + { + pf.u1.dwRGBBitCount = 16; + pf.u2.dwRBitMask = 0x7c00; + pf.u3.dwGBitMask = 0x03e0; + pf.u4.dwBBitMask = 0x001f; + } + else if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB565)) + { + pf.u1.dwRGBBitCount = 16; + pf.u2.dwRBitMask = 0xf800; + pf.u3.dwGBitMask = 0x07e0; + pf.u4.dwBBitMask = 0x001f; + } + else if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24)) + { + pf.u1.dwRGBBitCount = 24; + pf.u2.dwRBitMask = 0xff0000; + pf.u3.dwGBitMask = 0x00ff00; + pf.u4.dwBBitMask = 0x0000ff; + } + else if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB32)) + { + pf.u1.dwRGBBitCount = 32; + pf.u2.dwRBitMask = 0xff0000; + pf.u3.dwGBitMask = 0x00ff00; + pf.u4.dwBBitMask = 0x0000ff; + } + else + { + LeaveCriticalSection(&stream->cs); + return VFW_E_TYPE_NOT_ACCEPTED; + } + IPin_QueryDirection(peer, &dir); if (dir != PINDIR_OUTPUT) { @@ -673,6 +760,11 @@ static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, cons CopyMediaType(&stream->mt, mt); IPin_AddRef(stream->peer = peer); + stream->format.width = width; + stream->format.height = height; + if (!(stream->format.flags & DDSD_PIXELFORMAT)) + stream->format.pf = pf; + LeaveCriticalSection(&stream->cs); return S_OK; @@ -981,6 +1073,9 @@ HRESULT ddraw_stream_create(IUnknown *outer, void **out) object->IPin_iface.lpVtbl = &ddraw_sink_vtbl; object->ref = 1; + object->format.width = 100; + object->format.height = 100; + InitializeCriticalSection(&object->cs); TRACE("Created ddraw stream %p.\n", object); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index f4c033a1807..eff0893c8f4 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -51,6 +51,164 @@ static const AM_MEDIA_TYPE audio_mt = .pbFormat = (BYTE *)&audio_format, }; +static const VIDEOINFO rgb8_video_info = +{ + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 8, + .bmiHeader.biCompression = BI_RGB, +}; + +static const VIDEOINFO rgb555_video_info = +{ + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 16, + .bmiHeader.biCompression = BI_RGB, +}; + +static const VIDEOINFO rgb565_video_info = +{ + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 16, + .bmiHeader.biCompression = BI_BITFIELDS, + .dwBitMasks = {0xf800, 0x07e0, 0x001f}, +}; + +static const VIDEOINFO rgb24_video_info = +{ + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 24, + .bmiHeader.biCompression = BI_RGB, +}; + +static const VIDEOINFO rgb32_video_info = +{ + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 32, + .bmiHeader.biCompression = BI_RGB, +}; + +static const AM_MEDIA_TYPE rgb8_mt = +{ + /* MEDIATYPE_Video, MEDIASUBTYPE_RGB8, FORMAT_VideoInfo */ + .majortype = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0xe436eb7a, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}, + .formattype = {0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(VIDEOINFO), + .pbFormat = (BYTE *)&rgb8_video_info, +}; + +static const AM_MEDIA_TYPE rgb555_mt = +{ + /* MEDIATYPE_Video, MEDIASUBTYPE_RGB555, FORMAT_VideoInfo */ + .majortype = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0xe436eb7c, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}, + .formattype = {0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(VIDEOINFO), + .pbFormat = (BYTE *)&rgb555_video_info, +}; + +static const AM_MEDIA_TYPE rgb565_mt = +{ + /* MEDIATYPE_Video, MEDIASUBTYPE_RGB565, FORMAT_VideoInfo */ + .majortype = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0xe436eb7b, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}, + .formattype = {0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(VIDEOINFO), + .pbFormat = (BYTE *)&rgb565_video_info, +}; + +static const AM_MEDIA_TYPE rgb24_mt = +{ + /* MEDIATYPE_Video, MEDIASUBTYPE_RGB24, FORMAT_VideoInfo */ + .majortype = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0xe436eb7d, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}, + .formattype = {0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(VIDEOINFO), + .pbFormat = (BYTE *)&rgb24_video_info, +}; + +static const AM_MEDIA_TYPE rgb32_mt = +{ + /* MEDIATYPE_Video, MEDIASUBTYPE_RGB32, FORMAT_VideoInfo */ + .majortype = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0xe436eb7e, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}, + .formattype = {0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(VIDEOINFO), + .pbFormat = (BYTE *)&rgb32_video_info, +}; + +static const DDSURFACEDESC rgb8_format = +{ + .dwSize = sizeof(DDSURFACEDESC), + .dwFlags = DDSD_PIXELFORMAT, + .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), + .ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED8, + .ddpfPixelFormat.dwRGBBitCount = 8, +}; + +static const DDSURFACEDESC rgb555_format = +{ + .dwSize = sizeof(DDSURFACEDESC), + .dwFlags = DDSD_PIXELFORMAT, + .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), + .ddpfPixelFormat.dwFlags = DDPF_RGB, + .ddpfPixelFormat.dwRGBBitCount = 16, + .ddpfPixelFormat.dwRBitMask = 0x7c00, + .ddpfPixelFormat.dwGBitMask = 0x03e0, + .ddpfPixelFormat.dwBBitMask = 0x001f, +}; + +static const DDSURFACEDESC rgb565_format = +{ + .dwSize = sizeof(DDSURFACEDESC), + .dwFlags = DDSD_PIXELFORMAT, + .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), + .ddpfPixelFormat.dwFlags = DDPF_RGB, + .ddpfPixelFormat.dwRGBBitCount = 16, + .ddpfPixelFormat.dwRBitMask = 0xf800, + .ddpfPixelFormat.dwGBitMask = 0x07e0, + .ddpfPixelFormat.dwBBitMask = 0x001f, +}; + +static const DDSURFACEDESC rgb24_format = +{ + .dwSize = sizeof(DDSURFACEDESC), + .dwFlags = DDSD_PIXELFORMAT, + .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), + .ddpfPixelFormat.dwFlags = DDPF_RGB, + .ddpfPixelFormat.dwRGBBitCount = 24, + .ddpfPixelFormat.dwRBitMask = 0xff0000, + .ddpfPixelFormat.dwGBitMask = 0x00ff00, + .ddpfPixelFormat.dwBBitMask = 0x0000ff, +}; + +static const DDSURFACEDESC rgb32_format = +{ + .dwSize = sizeof(DDSURFACEDESC), + .dwFlags = DDSD_PIXELFORMAT, + .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), + .ddpfPixelFormat.dwFlags = DDPF_RGB, + .ddpfPixelFormat.dwRGBBitCount = 32, + .ddpfPixelFormat.dwRBitMask = 0xff0000, + .ddpfPixelFormat.dwGBitMask = 0x00ff00, + .ddpfPixelFormat.dwBBitMask = 0x0000ff, +}; + static const WCHAR primary_video_sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}"; static const WCHAR primary_audio_sink_id[] = L"I{A35FF56B-9FDA-11D0-8FDF-00C04FD9189D}"; @@ -4474,6 +4632,126 @@ static void test_ddrawstream_initialize(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +#define check_ddrawstream_get_format(a,b,c) check_ddrawstream_get_format_(__LINE__,a,b,c) +static void check_ddrawstream_get_format_(int line, IDirectDrawMediaStream *stream, + const AM_MEDIA_TYPE *mt, const DDSURFACEDESC *expected_format) +{ + DDSURFACEDESC current_format; + DDSURFACEDESC desired_format; + struct testfilter source; + FILTER_INFO filter_info; + DDSURFACEDESC format; + PIN_INFO pin_info; + DWORD flags; + HRESULT hr; + IPin *pin; + + hr = IDirectDrawMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_QueryPinInfo(pin, &pin_info); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + hr = IBaseFilter_QueryFilterInfo(pin_info.pFilter, &filter_info); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + testfilter_init(&source); + + hr = IFilterGraph_AddFilter(filter_info.pGraph, &source.filter.IBaseFilter_iface, L"source"); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph_ConnectDirect(filter_info.pGraph, &source.source.pin.IPin_iface, pin, mt); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_GetFormat(stream, NULL, NULL, NULL, NULL); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + memset(&current_format, 0xcc, sizeof(current_format)); + current_format.dwSize = sizeof(current_format); + memset(&desired_format, 0xcc, sizeof(desired_format)); + desired_format.dwSize = sizeof(desired_format); + flags = 0xdeadbeef; + hr = IDirectDrawMediaStream_GetFormat(stream, &current_format, NULL, &desired_format, &flags); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + memset(&format, 0xcc, sizeof(format)); + format.dwSize = sizeof(format); + format.ddpfPixelFormat = expected_format->ddpfPixelFormat; + format.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + format.dwWidth = 333; + format.dwHeight = 444; + format.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; + ok_(__FILE__, line)(memcmp(&current_format, &format, sizeof(DDSURFACEDESC)) == 0, "Current format didn't match.\n"); + format.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + ok_(__FILE__, line)(memcmp(&desired_format, &format, sizeof(DDSURFACEDESC)) == 0, "Desired format didn't match.\n"); + + hr = IFilterGraph_Disconnect(filter_info.pGraph, &source.source.pin.IPin_iface); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph_Disconnect(filter_info.pGraph, pin); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph_RemoveFilter(filter_info.pGraph, &source.filter.IBaseFilter_iface); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + IFilterGraph_Release(filter_info.pGraph); + IBaseFilter_Release(pin_info.pFilter); + IPin_Release(pin); +} + +static void test_ddrawstream_get_format(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IDirectDrawMediaStream *ddraw_stream; + DDSURFACEDESC current_format; + DDSURFACEDESC desired_format; + IDirectDrawPalette *palette; + IMediaStream *stream; + VIDEOINFO video_info; + AM_MEDIA_TYPE mt; + DWORD flags; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + current_format.dwSize = sizeof(current_format); + desired_format.dwSize = sizeof(desired_format); + hr = IDirectDrawMediaStream_GetFormat(ddraw_stream, &current_format, &palette, &desired_format, &flags); + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); + + video_info = rgb32_video_info; + video_info.rcSource.right = 222; + video_info.rcSource.bottom = 333; + video_info.rcTarget.right = 444; + video_info.rcTarget.bottom = 666; + mt = rgb32_mt; + mt.pbFormat = (BYTE *)&video_info; + check_ddrawstream_get_format(ddraw_stream, &mt, &rgb32_format); + + video_info = rgb32_video_info; + video_info.bmiHeader.biHeight = 444; + mt = rgb32_mt; + mt.pbFormat = (BYTE *)&video_info; + check_ddrawstream_get_format(ddraw_stream, &mt, &rgb32_format); + + check_ddrawstream_get_format(ddraw_stream, &rgb8_mt, &rgb8_format); + check_ddrawstream_get_format(ddraw_stream, &rgb555_mt, &rgb555_format); + check_ddrawstream_get_format(ddraw_stream, &rgb565_mt, &rgb565_format); + check_ddrawstream_get_format(ddraw_stream, &rgb24_mt, &rgb24_format); + check_ddrawstream_get_format(ddraw_stream, &rgb32_mt, &rgb32_format); + + current_format.dwSize = sizeof(current_format); + desired_format.dwSize = sizeof(desired_format); + hr = IDirectDrawMediaStream_GetFormat(ddraw_stream, &current_format, &palette, &desired_format, &flags); + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void check_ammediastream_join_am_multi_media_stream(const CLSID *clsid) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -5936,6 +6214,7 @@ START_TEST(amstream) test_ddrawstream_getsetdirectdraw(); test_ddrawstream_receive_connection(); test_ddrawstream_create_sample(); + test_ddrawstream_get_format(); test_ddrawstreamsample_get_media_stream(); -- 2.17.1

2 9

[PATCH v2 1/5] amstream: Implement AMDirectDrawStream::GetFormat.
by Anton Baskanov 09 Sep '20

09 Sep '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/ddrawstream.c | 98 ++++++++++- dlls/amstream/tests/amstream.c | 306 +++++++++++++++++++++++++++++++++ 2 files changed, 396 insertions(+), 8 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 0d3f2d0d4b8..eb8e35b5ac4 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -47,6 +47,7 @@ struct ddraw_stream IPin *peer; IMemAllocator *allocator; AM_MEDIA_TYPE mt; + DDSURFACEDESC format; }; static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDrawSurface *surface, @@ -363,11 +364,40 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetFormat(IDirectDrawMediaStr DDSURFACEDESC *current_format, IDirectDrawPalette **palette, DDSURFACEDESC *desired_format, DWORD *flags) { - FIXME("(%p)->(%p,%p,%p,%p) stub!\n", iface, current_format, palette, desired_format, - flags); + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + + TRACE("stream %p, current_format %p, palette %p, desired_format %p, flags %p.\n", stream, current_format, palette, + desired_format, flags); - return MS_E_NOSTREAM; + EnterCriticalSection(&stream->cs); + + if (!stream->peer) + { + LeaveCriticalSection(&stream->cs); + return MS_E_NOSTREAM; + } + if (current_format) + { + *current_format = stream->format; + current_format->dwFlags |= DDSD_WIDTH | DDSD_HEIGHT; + } + + if (palette) + *palette = NULL; + + if (desired_format) + { + *desired_format = stream->format; + desired_format->dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + } + + if (flags) + *flags = 0; + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetFormat(IDirectDrawMediaStream *iface, @@ -637,8 +667,12 @@ static HRESULT WINAPI ddraw_sink_Connect(IPin *iface, IPin *peer, const AM_MEDIA static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) { + const VIDEOINFOHEADER *video_info = (const VIDEOINFOHEADER *)mt->pbFormat; + DDPIXELFORMAT pixel_format = {sizeof(DDPIXELFORMAT)}; struct ddraw_stream *stream = impl_from_IPin(iface); PIN_DIRECTION dir; + DWORD width; + DWORD height; TRACE("stream %p, peer %p, mt %p.\n", stream, peer, mt); @@ -651,17 +685,54 @@ static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, cons } if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Video) - || (!IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8) - && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24) - && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB32) - && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB555) - && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB565)) || !IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) { LeaveCriticalSection(&stream->cs); return VFW_E_TYPE_NOT_ACCEPTED; } + width = video_info->bmiHeader.biWidth; + height = abs(video_info->bmiHeader.biHeight); + pixel_format.dwFlags = DDPF_RGB; + if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8)) + { + pixel_format.dwFlags |= DDPF_PALETTEINDEXED8; + pixel_format.u1.dwRGBBitCount = 8; + } + else if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB555)) + { + pixel_format.u1.dwRGBBitCount = 16; + pixel_format.u2.dwRBitMask = 0x7c00; + pixel_format.u3.dwGBitMask = 0x03e0; + pixel_format.u4.dwBBitMask = 0x001f; + } + else if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB565)) + { + pixel_format.u1.dwRGBBitCount = 16; + pixel_format.u2.dwRBitMask = 0xf800; + pixel_format.u3.dwGBitMask = 0x07e0; + pixel_format.u4.dwBBitMask = 0x001f; + } + else if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24)) + { + pixel_format.u1.dwRGBBitCount = 24; + pixel_format.u2.dwRBitMask = 0xff0000; + pixel_format.u3.dwGBitMask = 0x00ff00; + pixel_format.u4.dwBBitMask = 0x0000ff; + } + else if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB32)) + { + pixel_format.u1.dwRGBBitCount = 32; + pixel_format.u2.dwRBitMask = 0xff0000; + pixel_format.u3.dwGBitMask = 0x00ff00; + pixel_format.u4.dwBBitMask = 0x0000ff; + } + else + { + LeaveCriticalSection(&stream->cs); + return VFW_E_TYPE_NOT_ACCEPTED; + } + IPin_QueryDirection(peer, &dir); if (dir != PINDIR_OUTPUT) { @@ -673,6 +744,11 @@ static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, cons CopyMediaType(&stream->mt, mt); IPin_AddRef(stream->peer = peer); + stream->format.dwWidth = width; + stream->format.dwHeight = height; + if (!(stream->format.dwFlags & DDSD_PIXELFORMAT)) + stream->format.ddpfPixelFormat = pixel_format; + LeaveCriticalSection(&stream->cs); return S_OK; @@ -981,6 +1057,12 @@ HRESULT ddraw_stream_create(IUnknown *outer, void **out) object->IPin_iface.lpVtbl = &ddraw_sink_vtbl; object->ref = 1; + object->format.dwSize = sizeof(DDSURFACEDESC); + object->format.dwFlags = DDSD_CAPS; + object->format.dwWidth = 100; + object->format.dwHeight = 100; + object->format.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; + InitializeCriticalSection(&object->cs); TRACE("Created ddraw stream %p.\n", object); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index f4c033a1807..2a69ff60fc3 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -51,6 +51,164 @@ static const AM_MEDIA_TYPE audio_mt = .pbFormat = (BYTE *)&audio_format, }; +static const VIDEOINFO rgb8_video_info = +{ + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 8, + .bmiHeader.biCompression = BI_RGB, +}; + +static const VIDEOINFO rgb555_video_info = +{ + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 16, + .bmiHeader.biCompression = BI_RGB, +}; + +static const VIDEOINFO rgb565_video_info = +{ + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 16, + .bmiHeader.biCompression = BI_BITFIELDS, + .dwBitMasks = {0xff0000, 0x00ff00, 0x0000ff}, +}; + +static const VIDEOINFO rgb24_video_info = +{ + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 24, + .bmiHeader.biCompression = BI_RGB, +}; + +static const VIDEOINFO rgb32_video_info = +{ + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 333, + .bmiHeader.biHeight = -444, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 32, + .bmiHeader.biCompression = BI_RGB, +}; + +static const AM_MEDIA_TYPE rgb8_mt = +{ + /* MEDIATYPE_Video, MEDIASUBTYPE_RGB8, FORMAT_VideoInfo */ + .majortype = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0xe436eb7a, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}, + .formattype = {0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(VIDEOINFO), + .pbFormat = (BYTE *)&rgb8_video_info, +}; + +static const AM_MEDIA_TYPE rgb555_mt = +{ + /* MEDIATYPE_Video, MEDIASUBTYPE_RGB555, FORMAT_VideoInfo */ + .majortype = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0xe436eb7c, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}, + .formattype = {0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(VIDEOINFO), + .pbFormat = (BYTE *)&rgb555_video_info, +}; + +static const AM_MEDIA_TYPE rgb565_mt = +{ + /* MEDIATYPE_Video, MEDIASUBTYPE_RGB565, FORMAT_VideoInfo */ + .majortype = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0xe436eb7b, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}, + .formattype = {0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(VIDEOINFO), + .pbFormat = (BYTE *)&rgb565_video_info, +}; + +static const AM_MEDIA_TYPE rgb24_mt = +{ + /* MEDIATYPE_Video, MEDIASUBTYPE_RGB24, FORMAT_VideoInfo */ + .majortype = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0xe436eb7d, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}, + .formattype = {0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(VIDEOINFO), + .pbFormat = (BYTE *)&rgb24_video_info, +}; + +static const AM_MEDIA_TYPE rgb32_mt = +{ + /* MEDIATYPE_Video, MEDIASUBTYPE_RGB32, FORMAT_VideoInfo */ + .majortype = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0xe436eb7e, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}, + .formattype = {0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(VIDEOINFO), + .pbFormat = (BYTE *)&rgb32_video_info, +}; + +static const DDSURFACEDESC rgb8_format = +{ + .dwSize = sizeof(DDSURFACEDESC), + .dwFlags = DDSD_PIXELFORMAT, + .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), + .ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED8, + .ddpfPixelFormat.dwRGBBitCount = 8, +}; + +static const DDSURFACEDESC rgb555_format = +{ + .dwSize = sizeof(DDSURFACEDESC), + .dwFlags = DDSD_PIXELFORMAT, + .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), + .ddpfPixelFormat.dwFlags = DDPF_RGB, + .ddpfPixelFormat.dwRGBBitCount = 16, + .ddpfPixelFormat.dwRBitMask = 0x7c00, + .ddpfPixelFormat.dwGBitMask = 0x03e0, + .ddpfPixelFormat.dwBBitMask = 0x001f, +}; + +static const DDSURFACEDESC rgb565_format = +{ + .dwSize = sizeof(DDSURFACEDESC), + .dwFlags = DDSD_PIXELFORMAT, + .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), + .ddpfPixelFormat.dwFlags = DDPF_RGB, + .ddpfPixelFormat.dwRGBBitCount = 16, + .ddpfPixelFormat.dwRBitMask = 0xf800, + .ddpfPixelFormat.dwGBitMask = 0x07e0, + .ddpfPixelFormat.dwBBitMask = 0x001f, +}; + +static const DDSURFACEDESC rgb24_format = +{ + .dwSize = sizeof(DDSURFACEDESC), + .dwFlags = DDSD_PIXELFORMAT, + .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), + .ddpfPixelFormat.dwFlags = DDPF_RGB, + .ddpfPixelFormat.dwRGBBitCount = 24, + .ddpfPixelFormat.dwRBitMask = 0xff0000, + .ddpfPixelFormat.dwGBitMask = 0x00ff00, + .ddpfPixelFormat.dwBBitMask = 0x0000ff, +}; + +static const DDSURFACEDESC rgb32_format = +{ + .dwSize = sizeof(DDSURFACEDESC), + .dwFlags = DDSD_PIXELFORMAT, + .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), + .ddpfPixelFormat.dwFlags = DDPF_RGB, + .ddpfPixelFormat.dwRGBBitCount = 32, + .ddpfPixelFormat.dwRBitMask = 0xff0000, + .ddpfPixelFormat.dwGBitMask = 0x00ff00, + .ddpfPixelFormat.dwBBitMask = 0x0000ff, +}; + static const WCHAR primary_video_sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}"; static const WCHAR primary_audio_sink_id[] = L"I{A35FF56B-9FDA-11D0-8FDF-00C04FD9189D}"; @@ -4474,6 +4632,153 @@ static void test_ddrawstream_initialize(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +#define check_ddrawstream_get_format(a,b,c) check_ddrawstream_get_format_(__LINE__,a,b,c) +static void check_ddrawstream_get_format_(int line, IDirectDrawMediaStream *stream, + const AM_MEDIA_TYPE *mt, const DDSURFACEDESC *expected_format) +{ + const DDPIXELFORMAT *expected_pf = &expected_format->ddpfPixelFormat; + DDSURFACEDESC current_format; + DDSURFACEDESC desired_format; + struct testfilter source; + FILTER_INFO filter_info; + PIN_INFO pin_info; + DWORD flags; + HRESULT hr; + IPin *pin; + + hr = IDirectDrawMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_QueryPinInfo(pin, &pin_info); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + hr = IBaseFilter_QueryFilterInfo(pin_info.pFilter, &filter_info); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + testfilter_init(&source); + + hr = IFilterGraph_AddFilter(filter_info.pGraph, &source.filter.IBaseFilter_iface, L"source"); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph_ConnectDirect(filter_info.pGraph, &source.source.pin.IPin_iface, pin, mt); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_GetFormat(stream, NULL, NULL, NULL, NULL); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + memset(&current_format, 0xcc, sizeof(current_format)); + current_format.dwSize = sizeof(current_format); + memset(&desired_format, 0xcc, sizeof(desired_format)); + desired_format.dwSize = sizeof(desired_format); + flags = 0xdeadbeef; + hr = IDirectDrawMediaStream_GetFormat(stream, &current_format, NULL, &desired_format, &flags); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + ok_(__FILE__, line)(current_format.dwFlags == (DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS), + "Got current format flags %#x.\n", current_format.dwFlags); + ok_(__FILE__, line)(current_format.dwWidth == 333, "Got current format width %u.\n", current_format.dwWidth); + ok_(__FILE__, line)(current_format.dwHeight == 444, "Got current format height %u.\n", current_format.dwHeight); + ok_(__FILE__, line)(current_format.ddpfPixelFormat.dwSize == sizeof(DDPIXELFORMAT), + "Got current format size %u.\n", current_format.ddpfPixelFormat.dwSize); + ok_(__FILE__, line)(current_format.ddpfPixelFormat.dwFlags == expected_pf->dwFlags, + "Got current format flags %#x.\n", current_format.ddpfPixelFormat.dwFlags); + ok_(__FILE__, line)(current_format.ddpfPixelFormat.dwRGBBitCount == expected_pf->dwRGBBitCount, + "Got current format rgb bit count %u.\n", current_format.ddpfPixelFormat.dwRGBBitCount); + ok_(__FILE__, line)(current_format.ddpfPixelFormat.dwRBitMask == expected_pf->dwRBitMask, + "Got current format r bit mask %#x.\n", current_format.ddpfPixelFormat.dwRBitMask); + ok_(__FILE__, line)(current_format.ddpfPixelFormat.dwGBitMask == expected_pf->dwGBitMask, + "Got current format g bit mask %#x.\n", current_format.ddpfPixelFormat.dwGBitMask); + ok_(__FILE__, line)(current_format.ddpfPixelFormat.dwBBitMask == expected_pf->dwBBitMask, + "Got current format b bit mask %#x.\n", current_format.ddpfPixelFormat.dwBBitMask); + ok_(__FILE__, line)(current_format.ddsCaps.dwCaps == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY), + "Got current format caps %#x.\n", current_format.ddsCaps.dwCaps); + ok_(__FILE__, line)(desired_format.dwFlags == (DDSD_WIDTH | DDSD_HEIGHT), + "Got desired format flags %#x.\n", desired_format.dwFlags); + ok_(__FILE__, line)(desired_format.dwWidth == 333, "Got desired format width %u.\n", desired_format.dwWidth); + ok_(__FILE__, line)(desired_format.dwHeight == 444, "Got desired format height %u.\n", desired_format.dwHeight); + ok_(__FILE__, line)(desired_format.ddpfPixelFormat.dwSize == sizeof(DDPIXELFORMAT), + "Got desired format size %u.\n", desired_format.ddpfPixelFormat.dwSize); + ok_(__FILE__, line)(desired_format.ddpfPixelFormat.dwFlags == expected_pf->dwFlags, + "Got desired format flags %#x.\n", desired_format.ddpfPixelFormat.dwFlags); + ok_(__FILE__, line)(desired_format.ddpfPixelFormat.dwRGBBitCount == expected_pf->dwRGBBitCount, + "Got desired format rgb bit count %u.\n", desired_format.ddpfPixelFormat.dwRGBBitCount); + ok_(__FILE__, line)(desired_format.ddpfPixelFormat.dwRBitMask == expected_pf->dwRBitMask, + "Got desired format r bit mask %#x.\n", desired_format.ddpfPixelFormat.dwRBitMask); + ok_(__FILE__, line)(desired_format.ddpfPixelFormat.dwGBitMask == expected_pf->dwGBitMask, + "Got desired format g bit mask %#x.\n", desired_format.ddpfPixelFormat.dwGBitMask); + ok_(__FILE__, line)(desired_format.ddpfPixelFormat.dwBBitMask == expected_pf->dwBBitMask, + "Got desired format b bit mask %#x.\n", desired_format.ddpfPixelFormat.dwBBitMask); + ok_(__FILE__, line)(desired_format.ddsCaps.dwCaps == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY), + "Got desired format caps %#x.\n", desired_format.ddsCaps.dwCaps); + ok_(__FILE__, line)(flags == 0, "Got flags %#x.\n", flags); + + hr = IFilterGraph_Disconnect(filter_info.pGraph, &source.source.pin.IPin_iface); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph_Disconnect(filter_info.pGraph, pin); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph_RemoveFilter(filter_info.pGraph, &source.filter.IBaseFilter_iface); + ok_(__FILE__, line)(hr == S_OK, "Got hr %#x.\n", hr); + + IFilterGraph_Release(filter_info.pGraph); + IBaseFilter_Release(pin_info.pFilter); + IPin_Release(pin); +} + +static void test_ddrawstream_get_format(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IDirectDrawMediaStream *ddraw_stream; + DDSURFACEDESC current_format; + DDSURFACEDESC desired_format; + IDirectDrawPalette *palette; + IMediaStream *stream; + VIDEOINFO video_info; + AM_MEDIA_TYPE mt; + DWORD flags; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + current_format.dwSize = sizeof(current_format); + desired_format.dwSize = sizeof(desired_format); + hr = IDirectDrawMediaStream_GetFormat(ddraw_stream, &current_format, &palette, &desired_format, &flags); + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); + + video_info = rgb32_video_info; + video_info.rcSource.right = 222; + video_info.rcSource.bottom = 333; + video_info.rcTarget.right = 444; + video_info.rcTarget.bottom = 666; + mt = rgb32_mt; + mt.pbFormat = (BYTE *)&video_info; + check_ddrawstream_get_format(ddraw_stream, &mt, &rgb32_format); + + video_info = rgb32_video_info; + video_info.bmiHeader.biHeight = 444; + mt = rgb32_mt; + mt.pbFormat = (BYTE *)&video_info; + check_ddrawstream_get_format(ddraw_stream, &mt, &rgb32_format); + + check_ddrawstream_get_format(ddraw_stream, &rgb8_mt, &rgb8_format); + check_ddrawstream_get_format(ddraw_stream, &rgb555_mt, &rgb555_format); + check_ddrawstream_get_format(ddraw_stream, &rgb565_mt, &rgb565_format); + check_ddrawstream_get_format(ddraw_stream, &rgb24_mt, &rgb24_format); + check_ddrawstream_get_format(ddraw_stream, &rgb32_mt, &rgb32_format); + + current_format.dwSize = sizeof(current_format); + desired_format.dwSize = sizeof(desired_format); + hr = IDirectDrawMediaStream_GetFormat(ddraw_stream, &current_format, &palette, &desired_format, &flags); + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void check_ammediastream_join_am_multi_media_stream(const CLSID *clsid) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -5936,6 +6241,7 @@ START_TEST(amstream) test_ddrawstream_getsetdirectdraw(); test_ddrawstream_receive_connection(); test_ddrawstream_create_sample(); + test_ddrawstream_get_format(); test_ddrawstreamsample_get_media_stream(); -- 2.17.1

2 7

← Newer
1
...
52
53
54
55
56
57
58
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel September 2020