December 2022 - Wine-commits

Piotr Caban : localspl: Fix error handling in ScheduleJob.
by Alexandre Julliard 01 Dec '22

01 Dec '22

Module: wine Branch: master Commit: a04bf6e8a85916ab1546a9dedff634362ef2fdcd URL: https://gitlab.winehq.org/wine/wine/-/commit/a04bf6e8a85916ab1546a9dedff634… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 1 10:21:34 2022 +0100 localspl: Fix error handling in ScheduleJob. --- dlls/localspl/provider.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index fd7827e1f28..68ff0c23dff 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -3281,9 +3281,11 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) NULL, OPEN_EXISTING, 0, NULL); if (hf == INVALID_HANDLE_VALUE) { + WARN("can't open spool file: %s\n", debugstr_w(job->filename)); DeleteFileW(job->filename); free_job(job); LeaveCriticalSection(&printer->info->jobs_cs); + return FALSE; } /* TODO: use print processor */

1 0

Piotr Caban : winspool: Use providor for print jobs implementation.
by Alexandre Julliard 01 Dec '22

01 Dec '22

Module: wine Branch: master Commit: e164b8cefb9dfbf0af5b83e176a386eb2c490d6b URL: https://gitlab.winehq.org/wine/wine/-/commit/e164b8cefb9dfbf0af5b83e176a386… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 23 19:28:39 2022 +0100 winspool: Use providor for print jobs implementation. --- dlls/winspool.drv/cups.c | 281 +----------------- dlls/winspool.drv/info.c | 699 +++++++-------------------------------------- dlls/winspool.drv/wspool.h | 9 - 3 files changed, 99 insertions(+), 890 deletions(-)

1 0

Piotr Caban : winspool: Use providor for WritePrinter implementation.
by Alexandre Julliard 01 Dec '22

01 Dec '22

Module: wine Branch: master Commit: 9c939184f3891fabb9b1fc45fe4462d654357e77 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c939184f3891fabb9b1fc45fe4462… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 30 18:01:48 2022 +0100 winspool: Use providor for WritePrinter implementation. --- dlls/localspl/provider.c | 102 +++++++++++++++++++++++++++++++------------- dlls/winspool.drv/info.c | 108 +++++++---------------------------------------- 2 files changed, 87 insertions(+), 123 deletions(-)

1 0

Alex Henrie : include: Annotate WlanAllocateMemory with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC).
by Alexandre Julliard 01 Dec '22

01 Dec '22

Module: wine Branch: master Commit: 57ce3b9190615e5380fc25783a5652650fbd083f URL: https://gitlab.winehq.org/wine/wine/-/commit/57ce3b9190615e5380fc25783a5652… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 30 19:28:22 2022 -0700 include: Annotate WlanAllocateMemory with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC). --- include/wlanapi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wlanapi.h b/include/wlanapi.h index 13118cbf303..5150ff09f47 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -247,8 +247,8 @@ typedef struct _WLAN_HOSTED_NETWORK_STATUS DWORD WINAPI WlanCloseHandle(HANDLE, void *); DWORD WINAPI WlanEnumInterfaces(HANDLE, void *, WLAN_INTERFACE_INFO_LIST **); DWORD WINAPI WlanOpenHandle(DWORD, void *, DWORD *, HANDLE *); -void *WINAPI WlanAllocateMemory(DWORD); void WINAPI WlanFreeMemory(void *); +void *WINAPI WlanAllocateMemory(DWORD) __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(WlanFreeMemory) __WINE_MALLOC; DWORD WINAPI WlanScan(HANDLE, const GUID *, const DOT11_SSID *, const WLAN_RAW_DATA *, void *); DWORD WINAPI WlanRegisterNotification(HANDLE, DWORD, BOOL, WLAN_NOTIFICATION_CALLBACK, void *, void *, DWORD *); DWORD WINAPI WlanGetAvailableNetworkList(HANDLE, const GUID *, DWORD, void *, WLAN_AVAILABLE_NETWORK_LIST **);

1 0

Anton Baskanov : winegstreamer: Register MPEG layer-3 decoder.
by Alexandre Julliard 01 Dec '22

01 Dec '22

Module: wine Branch: master Commit: 4192ee265715415682a2d050c0215d36db4b7a07 URL: https://gitlab.winehq.org/wine/wine/-/commit/4192ee265715415682a2d050c0215d… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Oct 5 12:23:24 2022 +0700 winegstreamer: Register MPEG layer-3 decoder. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/winegstreamer/main.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index fc7344df50c..9e54780ac4e 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -34,6 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); DEFINE_GUID(MEDIASUBTYPE_VC1S,MAKEFOURCC('V','C','1','S'),0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71); +static const GUID MEDIASUBTYPE_MP3 = {0x00000055, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; + bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { unsigned int new_capacity, max_capacity; @@ -582,6 +584,37 @@ static const REGFILTER2 reg_mpeg_audio_codec = .u.s2.rgPins2 = reg_mpeg_audio_codec_pins, }; +static const REGPINTYPES reg_mpeg_layer3_decoder_sink_mts[1] = +{ + {&MEDIATYPE_Audio, &MEDIASUBTYPE_MP3}, +}; + +static const REGPINTYPES reg_mpeg_layer3_decoder_source_mts[1] = +{ + {&MEDIATYPE_Audio, &MEDIASUBTYPE_PCM}, +}; + +static const REGFILTERPINS2 reg_mpeg_layer3_decoder_pins[2] = +{ + { + .nMediaTypes = 1, + .lpMediaType = reg_mpeg_layer3_decoder_sink_mts, + }, + { + .dwFlags = REG_PINFLAG_B_OUTPUT, + .nMediaTypes = 1, + .lpMediaType = reg_mpeg_layer3_decoder_source_mts, + }, +}; + +static const REGFILTER2 reg_mpeg_layer3_decoder = +{ + .dwVersion = 2, + .dwMerit = 0x00810000, + .u.s2.cPins2 = 2, + .u.s2.rgPins2 = reg_mpeg_layer3_decoder_pins, +}; + static const REGPINTYPES reg_mpeg_splitter_sink_mts[4] = { {&MEDIATYPE_Stream, &MEDIASUBTYPE_MPEG1Audio}, @@ -786,6 +819,8 @@ HRESULT WINAPI DllRegisterServer(void) L"GStreamer splitter filter", NULL, NULL, NULL, &reg_decodebin_parser); IFilterMapper2_RegisterFilter(mapper, &CLSID_CMpegAudioCodec, L"MPEG Audio Decoder", NULL, NULL, NULL, &reg_mpeg_audio_codec); + IFilterMapper2_RegisterFilter(mapper, &CLSID_mpeg_layer3_decoder, + L"MPEG Layer-3 Decoder", NULL, NULL, NULL, &reg_mpeg_layer3_decoder); IFilterMapper2_RegisterFilter(mapper, &CLSID_MPEG1Splitter, L"MPEG-I Stream Splitter", NULL, NULL, NULL, &reg_mpeg_splitter); IFilterMapper2_RegisterFilter(mapper, &CLSID_WAVEParser, L"Wave Parser", NULL, NULL, NULL, &reg_wave_parser); @@ -825,6 +860,7 @@ HRESULT WINAPI DllUnregisterServer(void) IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_AviSplitter); IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_decodebin_parser); IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_CMpegAudioCodec); + IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_mpeg_layer3_decoder); IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_MPEG1Splitter); IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_WAVEParser);

1 0

Alex Henrie : services: Use standard C functions for memory allocation.
by Alexandre Julliard 01 Dec '22

01 Dec '22

Module: wine Branch: master Commit: 6136b547570d4edff37d5ce4efc5dd9270b8d231 URL: https://gitlab.winehq.org/wine/wine/-/commit/6136b547570d4edff37d5ce4efc5dd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 30 19:21:15 2022 -0700 services: Use standard C functions for memory allocation. --- programs/services/rpc.c | 71 +++++++++++++++--------------- programs/services/services.c | 101 +++++++++++++++++++++---------------------- programs/services/services.h | 1 - programs/services/utils.c | 30 ++++--------- 4 files changed, 93 insertions(+), 110 deletions(-)

1 0

Ziqing Hui : wmvcore/tests: Test subtype and formattype for IWMMediaProps.
by Alexandre Julliard 01 Dec '22

01 Dec '22

Module: wine Branch: master Commit: 23b72ad133a93571129505e7e829b33608dfac3a URL: https://gitlab.winehq.org/wine/wine/-/commit/23b72ad133a93571129505e7e829b3… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sun Nov 20 09:25:46 2022 +0800 wmvcore/tests: Test subtype and formattype for IWMMediaProps. We can see that subtype returned by IWMMediaProps is different from the one returned by IWMOutputMediaProps. --- dlls/wmvcore/tests/wmvcore.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 2bb3fefaa76..ae6071159f6 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1452,7 +1452,8 @@ static void check_audio_type(const WM_MEDIA_TYPE *mt) ok(wave_format->wFormatTag == WAVE_FORMAT_PCM, "Got tag %#x.\n", wave_format->wFormatTag); } -static void test_stream_media_props(IWMStreamConfig *config, const GUID *majortype) +static void test_stream_media_props(IWMStreamConfig *config, + const GUID *majortype, const GUID *subtype, const GUID *formattype, BOOL todo_subtype) { char mt_buffer[2000]; WM_MEDIA_TYPE *mt = (WM_MEDIA_TYPE *)mt_buffer; @@ -1482,6 +1483,11 @@ static void test_stream_media_props(IWMStreamConfig *config, const GUID *majorty sizeof(WM_MEDIA_TYPE) + mt->cbFormat, size); ok(IsEqualGUID(&mt->majortype, majortype), "Expected major type %s, got %s.\n", debugstr_guid(majortype), debugstr_guid(&mt->majortype)); + todo_wine_if(todo_subtype) + ok(IsEqualGUID(&mt->subtype, subtype), "Expected sub type %s, got %s.\n", + debugstr_guid(subtype), debugstr_guid(&mt->subtype)); + ok(IsEqualGUID(&mt->formattype, formattype), "Expected format type %s, got %s.\n", + debugstr_guid(formattype), debugstr_guid(&mt->formattype)); IWMMediaProps_Release(props); } @@ -1538,7 +1544,10 @@ static void test_sync_reader_types(void) else ok(IsEqualGUID(&majortype, &MEDIATYPE_Audio), "Got major type %s.\n", debugstr_guid(&majortype)); - test_stream_media_props(config, &majortype); + if (IsEqualGUID(&majortype, &MEDIATYPE_Audio)) + test_stream_media_props(config, &MEDIATYPE_Audio, &MEDIASUBTYPE_MSAUDIO1, &FORMAT_WaveFormatEx, TRUE); + else + test_stream_media_props(config, &MEDIATYPE_Video, &MEDIASUBTYPE_WMV1, &FORMAT_VideoInfo, TRUE); ref = IWMStreamConfig_Release(config); ok(!ref, "Got outstanding refcount %ld.\n", ref); @@ -1638,6 +1647,7 @@ static void test_sync_reader_types(void) else { ok(IsEqualGUID(&majortype, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&majortype)); + ok(IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24), "Got subtype %s.\n", debugstr_guid(&mt->subtype)); got_video = true; check_video_type(mt); } @@ -3414,7 +3424,10 @@ static void test_async_reader_types(void) else ok(IsEqualGUID(&majortype, &MEDIATYPE_Audio), "Got major type %s.\n", debugstr_guid(&majortype)); - test_stream_media_props(config, &majortype); + if (IsEqualGUID(&majortype, &MEDIATYPE_Audio)) + test_stream_media_props(config, &MEDIATYPE_Audio, &MEDIASUBTYPE_MSAUDIO1, &FORMAT_WaveFormatEx, TRUE); + else + test_stream_media_props(config, &MEDIATYPE_Video, &MEDIASUBTYPE_WMV1, &FORMAT_VideoInfo, TRUE); ref = IWMStreamConfig_Release(config); ok(!ref, "Got outstanding refcount %ld.\n", ref);

1 0

Anton Baskanov : quartz/tests: Add tests for MPEG layer-3 decoder source connection.
by Alexandre Julliard 01 Dec '22

01 Dec '22

Module: wine Branch: master Commit: 64359796e9b8ba4b877040a24c0c82c6fa6e377c URL: https://gitlab.winehq.org/wine/wine/-/commit/64359796e9b8ba4b877040a24c0c82… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Oct 3 13:43:41 2022 +0700 quartz/tests: Add tests for MPEG layer-3 decoder source connection. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/quartz/tests/mpeglayer3.c | 172 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 171 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/mpeglayer3.c b/dlls/quartz/tests/mpeglayer3.c index bb55d18c918..96307331431 100644 --- a/dlls/quartz/tests/mpeglayer3.c +++ b/dlls/quartz/tests/mpeglayer3.c @@ -780,6 +780,7 @@ struct testfilter struct strmbase_filter filter; struct strmbase_source source; struct strmbase_sink sink; + const AM_MEDIA_TYPE *mt; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -834,9 +835,30 @@ static HRESULT testsink_query_interface(struct strmbase_pin *iface, REFIID iid, return S_OK; } +static HRESULT testsink_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->filter); + if (!index && filter->mt) + { + CopyMediaType(mt, filter->mt); + return S_OK; + } + return VFW_S_NO_MORE_ITEMS; +} + +static HRESULT testsink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *mt) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + if (filter->mt && !IsEqualGUID(&mt->majortype, &filter->mt->majortype)) + return VFW_E_TYPE_NOT_ACCEPTED; + return S_OK; +} + static const struct strmbase_sink_ops testsink_ops = { .base.pin_query_interface = testsink_query_interface, + .base.pin_get_media_type = testsink_get_media_type, + .sink_connect = testsink_connect, }; static void testfilter_init(struct testfilter *filter) @@ -979,13 +1001,14 @@ static void test_connect_pin(void) { IBaseFilter *filter = create_mpeg_layer3_decoder(); struct testfilter testsource, testsink; + AM_MEDIA_TYPE mt, source_mt, *pmt; + WAVEFORMATEX source_format; WAVEFORMATEX expect_format; IPin *sink, *source, *peer; IEnumMediaTypes *enummt; AM_MEDIA_TYPE expect_mt; WAVEFORMATEX req_format; IMediaControl *control; - AM_MEDIA_TYPE mt, *pmt; IMemInputPin *meminput; AM_MEDIA_TYPE req_mt; IFilterGraph2 *graph; @@ -1122,6 +1145,153 @@ static void test_connect_pin(void) test_sink_allocator(meminput); + /* Test source connection. */ + + peer = (IPin *)0xdeadbeef; + hr = IPin_ConnectedTo(source, &peer); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + ok(!peer, "Got peer %p.\n", peer); + + hr = IPin_ConnectionMediaType(source, &mt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + + /* Exact connection. */ + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + init_pcm_mt(&req_mt, &req_format, 1, 32000, 16); + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#lx.\n", hr); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + init_pcm_mt(&req_mt, &req_format, 1, 32000, 16); + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IPin_ConnectedTo(source, &peer); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(peer == &testsink.sink.pin.IPin_iface, "Got peer %p.\n", peer); + IPin_Release(peer); + + hr = IPin_ConnectionMediaType(source, &mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); + ok(compare_media_types(&testsink.sink.pin.mt, &req_mt), "Media types didn't match.\n"); + FreeMediaType(&mt); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IFilterGraph2_Disconnect(graph, source); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#lx.\n", hr); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IFilterGraph2_Disconnect(graph, source); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IFilterGraph2_Disconnect(graph, source); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(testsink.sink.pin.peer == source, "Got peer %p.\n", testsink.sink.pin.peer); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + init_pcm_mt(&req_mt, &req_format, 1, 32000, 16); + req_mt.lSampleSize = 999; + req_mt.bTemporalCompression = TRUE; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, &req_mt), "Media types didn't match.\n"); + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + init_pcm_mt(&req_mt, &req_format, 1, 32000, 16); + req_mt.majortype = MEDIATYPE_Video; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#lx.\n", hr); + + /* Connection with wildcards. */ + + init_pcm_mt(&source_mt, &source_format, 1, 32000, 16); + source_mt.lSampleSize = 2304; + + init_pcm_mt(&req_mt, &req_format, 1, 32000, 16); + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, &source_mt), "Media types didn't match.\n"); + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + init_pcm_mt(&req_mt, &req_format, 1, 32000, 16); + req_mt.majortype = GUID_NULL; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, &source_mt), "Media types didn't match.\n"); + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + init_pcm_mt(&req_mt, &req_format, 1, 32000, 16); + req_mt.majortype = GUID_NULL; + req_mt.subtype = GUID_NULL; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, &source_mt), "Media types didn't match.\n"); + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + init_pcm_mt(&req_mt, &req_format, 1, 32000, 16); + req_mt.majortype = GUID_NULL; + req_mt.subtype = GUID_NULL; + req_mt.formattype = FORMAT_None; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#lx.\n", hr); + + init_pcm_mt(&req_mt, &req_format, 1, 32000, 16); + req_mt.formattype = GUID_NULL; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, &source_mt), "Media types didn't match.\n"); + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + init_pcm_mt(&req_mt, &req_format, 1, 32000, 16); + req_mt.subtype = GUID_NULL; + req_mt.formattype = GUID_NULL; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, &source_mt), "Media types didn't match.\n"); + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + init_pcm_mt(&req_mt, &req_format, 1, 32000, 16); + req_mt.majortype = MEDIATYPE_Video; + req_mt.subtype = GUID_NULL; + req_mt.formattype = GUID_NULL; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#lx.\n", hr); + + /* Test enumeration of sink media types. */ + + init_pcm_mt(&req_mt, &req_format, 1, 32000, 16); + req_mt.majortype = MEDIATYPE_Video; + req_mt.subtype = GUID_NULL; + req_mt.formattype = GUID_NULL; + testsink.mt = &req_mt; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, NULL); + ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#lx.\n", hr); + + init_pcm_mt(&req_mt, &req_format, 1, 32000, 16); + req_mt.lSampleSize = 444; + testsink.mt = &req_mt; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, &req_mt), "Media types didn't match.\n"); + + hr = IFilterGraph2_Disconnect(graph, sink); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IFilterGraph2_Disconnect(graph, sink); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(testsource.source.pin.peer == sink, "Got peer %p.\n", testsource.source.pin.peer); + IFilterGraph2_Disconnect(graph, &testsource.source.pin.IPin_iface); + IMemInputPin_Release(meminput); IPin_Release(sink); IPin_Release(source);

1 0

Anton Baskanov : quartz/tests: Add tests for MPEG layer-3 decoder sample processing.
by Alexandre Julliard 01 Dec '22

01 Dec '22

Module: wine Branch: master Commit: 54a59330a6d44b216ed463a507d6792c9c146911 URL: https://gitlab.winehq.org/wine/wine/-/commit/54a59330a6d44b216ed463a507d679… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Oct 4 12:41:01 2022 +0700 quartz/tests: Add tests for MPEG layer-3 decoder sample processing. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/quartz/tests/mpeglayer3.c | 92 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/quartz/tests/mpeglayer3.c b/dlls/quartz/tests/mpeglayer3.c index 96307331431..85229efc6d9 100644 --- a/dlls/quartz/tests/mpeglayer3.c +++ b/dlls/quartz/tests/mpeglayer3.c @@ -781,6 +781,9 @@ struct testfilter struct strmbase_source source; struct strmbase_sink sink; const AM_MEDIA_TYPE *mt; + unsigned int got_sample; + LONG sample_size; + LONG sample_actual; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -854,11 +857,27 @@ static HRESULT testsink_connect(struct strmbase_sink *iface, IPin *peer, const A return S_OK; } +static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample *sample) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + + ++filter->got_sample; + + if (filter->got_sample == 1) + { + filter->sample_size = IMediaSample_GetSize(sample); + filter->sample_actual = IMediaSample_GetActualDataLength(sample); + } + + return S_OK; +} + static const struct strmbase_sink_ops testsink_ops = { .base.pin_query_interface = testsink_query_interface, .base.pin_get_media_type = testsink_get_media_type, .sink_connect = testsink_connect, + .pfnReceive = testsink_Receive, }; static void testfilter_init(struct testfilter *filter) @@ -997,6 +1016,67 @@ static void test_source_allocator(IFilterGraph2 *graph, IMediaControl *control, IFilterGraph2_Disconnect(graph, &testsource->source.pin.IPin_iface); } +static void test_sample_processing(IMediaControl *control, + IMemInputPin *meminput, struct testfilter *testsink) +{ + IMemAllocator *allocator; + IMediaSample *sample; + HRESULT hr; + BYTE *data; + LONG size; + + hr = IMemInputPin_ReceiveCanBlock(meminput); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemInputPin_GetAllocator(meminput, &allocator); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#lx.\n", hr); + + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + size = IMediaSample_GetSize(sample); + ok(size == 256, "Got size %ld.\n", size); + memset(data, 0, 144); + data[0] = 0xff; + data[1] = 0xfb; + data[2] = 0x18; + data[3] = 0xc4; + hr = IMediaSample_SetActualDataLength(sample, 144); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemInputPin_Receive(meminput, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemInputPin_Receive(meminput, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemInputPin_Receive(meminput, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(testsink->got_sample >= 1, "Got %u calls to Receive().\n", testsink->got_sample); + ok(testsink->sample_size == 2304 || testsink->sample_size == 9216, + "Got size %lu.\n", testsink->sample_size); + ok(testsink->sample_actual == 2304 || testsink->sample_actual == 4608, + "Got valid size %lu.\n", testsink->sample_actual); + testsink->got_sample = 0; + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemInputPin_Receive(meminput, sample); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#lx.\n", hr); + + IMediaSample_Release(sample); + IMemAllocator_Release(allocator); +} + static void test_connect_pin(void) { IBaseFilter *filter = create_mpeg_layer3_decoder(); @@ -1208,6 +1288,18 @@ static void test_connect_pin(void) hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#lx.\n", hr); + init_pcm_mt(&req_mt, &req_format, 1, 32000, 16); + req_mt.lSampleSize = 2304; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + test_sample_processing(control, meminput, &testsink); + + hr = IFilterGraph2_Disconnect(graph, source); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + /* Connection with wildcards. */ init_pcm_mt(&source_mt, &source_format, 1, 32000, 16);

1 0

Anton Baskanov : quartz/tests: Add tests for MPEG layer-3 decoder sample timestamps.
by Alexandre Julliard 01 Dec '22

01 Dec '22

Module: wine Branch: master Commit: dce5f731a270dc4bc6be18d317f3ef6bebf3c06a URL: https://gitlab.winehq.org/wine/wine/-/commit/dce5f731a270dc4bc6be18d317f3ef… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Oct 4 15:27:32 2022 +0700 quartz/tests: Add tests for MPEG layer-3 decoder sample timestamps. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/quartz/tests/mpeglayer3.c | 75 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/quartz/tests/mpeglayer3.c b/dlls/quartz/tests/mpeglayer3.c index 85229efc6d9..1509d628954 100644 --- a/dlls/quartz/tests/mpeglayer3.c +++ b/dlls/quartz/tests/mpeglayer3.c @@ -784,6 +784,8 @@ struct testfilter unsigned int got_sample; LONG sample_size; LONG sample_actual; + REFERENCE_TIME sample_start_time; + REFERENCE_TIME sample_stop_time; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -860,6 +862,8 @@ static HRESULT testsink_connect(struct strmbase_sink *iface, IPin *peer, const A static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample *sample) { struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + REFERENCE_TIME start, stop; + HRESULT hr; ++filter->got_sample; @@ -869,6 +873,16 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample filter->sample_actual = IMediaSample_GetActualDataLength(sample); } + start = 0xdeadbeef; + stop = 0xdeadbeef; + hr = IMediaSample_GetTime(sample, &start, &stop); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (filter->got_sample == 1) + { + filter->sample_start_time = start; + filter->sample_stop_time = stop; + } + return S_OK; } @@ -1019,6 +1033,7 @@ static void test_source_allocator(IFilterGraph2 *graph, IMediaControl *control, static void test_sample_processing(IMediaControl *control, IMemInputPin *meminput, struct testfilter *testsink) { + REFERENCE_TIME start, stop; IMemAllocator *allocator; IMediaSample *sample; HRESULT hr; @@ -1054,6 +1069,62 @@ static void test_sample_processing(IMediaControl *control, hr = IMediaSample_SetActualDataLength(sample, 144); ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMediaSample_SetTime(sample, NULL, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemInputPin_Receive(meminput, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemInputPin_Receive(meminput, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemInputPin_Receive(meminput, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(testsink->got_sample >= 1, "Got %u calls to Receive().\n", testsink->got_sample); + ok(testsink->sample_size == 2304 || testsink->sample_size == 9216, + "Got size %lu.\n", testsink->sample_size); + ok(testsink->sample_actual == 2304 || testsink->sample_actual == 4608, + "Got valid size %lu.\n", testsink->sample_actual); + ok(testsink->sample_start_time == 0, "Got start time %s.\n", + wine_dbgstr_longlong(testsink->sample_start_time)); + ok(testsink->sample_stop_time == (testsink->sample_actual == 2304 ? 360000 : 720000), + "Got stop time %s.\n", wine_dbgstr_longlong(testsink->sample_stop_time)); + testsink->got_sample = 0; + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + start = 22222; + hr = IMediaSample_SetTime(sample, &start, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemInputPin_Receive(meminput, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemInputPin_Receive(meminput, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemInputPin_Receive(meminput, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(testsink->got_sample >= 1, "Got %u calls to Receive().\n", testsink->got_sample); + ok(testsink->sample_size == 2304 || testsink->sample_size == 9216, + "Got size %lu.\n", testsink->sample_size); + ok(testsink->sample_actual == 2304 || testsink->sample_actual == 4608, + "Got valid size %lu.\n", testsink->sample_actual); + ok(testsink->sample_start_time == 22222, "Got start time %s.\n", + wine_dbgstr_longlong(testsink->sample_start_time)); + ok(testsink->sample_stop_time == (testsink->sample_actual == 2304 ? 382222 : 742222), + "Got stop time %s.\n", wine_dbgstr_longlong(testsink->sample_stop_time)); + testsink->got_sample = 0; + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + start = 22222; + stop = 33333; + hr = IMediaSample_SetTime(sample, &start, &stop); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemInputPin_Receive(meminput, sample); ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IMemInputPin_Receive(meminput, sample); @@ -1065,6 +1136,10 @@ static void test_sample_processing(IMediaControl *control, "Got size %lu.\n", testsink->sample_size); ok(testsink->sample_actual == 2304 || testsink->sample_actual == 4608, "Got valid size %lu.\n", testsink->sample_actual); + ok(testsink->sample_start_time == 22222, "Got start time %s.\n", + wine_dbgstr_longlong(testsink->sample_start_time)); + ok(testsink->sample_stop_time == (testsink->sample_actual == 2304 ? 382222 : 742222), + "Got stop time %s.\n", wine_dbgstr_longlong(testsink->sample_stop_time)); testsink->got_sample = 0; hr = IMediaControl_Stop(control);

1 0