September 2023 - Wine-commits

Ziqing Hui : mf/tests: Call check_attributes in check_mft_get_output_current_type_.
by Alexandre Julliard 05 Sep '23

05 Sep '23

Module: wine Branch: master Commit: c22b9defe73833941526fc41849b8e6dc74e83b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/c22b9defe73833941526fc41849b8e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Aug 26 14:56:45 2023 +0800 mf/tests: Call check_attributes in check_mft_get_output_current_type_. --- dlls/mf/tests/transform.c | 63 ++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 34 deletions(-)

1 0

Ziqing Hui : mf/tests: Add tests for h264 encoder.
by Alexandre Julliard 05 Sep '23

05 Sep '23

Module: wine Branch: master Commit: b4be3b1b2576e0536b15df30f16f36713942097d URL: https://gitlab.winehq.org/wine/wine/-/commit/b4be3b1b2576e0536b15df30f16f36… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Aug 26 16:01:26 2023 +0800 mf/tests: Add tests for h264 encoder. --- dlls/mf/tests/mf_test.h | 7 +++ dlls/mf/tests/transform.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) diff --git a/dlls/mf/tests/mf_test.h b/dlls/mf/tests/mf_test.h index 47b05e14777..488acac0c35 100644 --- a/dlls/mf/tests/mf_test.h +++ b/dlls/mf/tests/mf_test.h @@ -37,6 +37,13 @@ extern HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceMa extern BOOL has_video_processor; void init_functions(void); +static const BYTE test_h264_sequence_header[] = +{ + 0x00, 0x00, 0x00, 0x01, 0x67, 0x4d, 0x40, 0x0b, 0x96, 0x56, 0x31, 0xb4, + 0x20, 0x00, 0x00, 0x7d, 0x20, 0x00, 0x1d, 0x4c, 0x01, 0xb4, 0x11, 0x08, + 0xa7, 0x00, 0x00, 0x00, 0x01, 0x68, 0xce, 0x3c, 0x80, +}; + struct attribute_desc { const GUID *key; diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index faddbce7da7..1071d089e69 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -3602,6 +3602,121 @@ static IMFSample *next_h264_sample_(int line, const BYTE **h264_buf, ULONG *h264 return create_sample(sample_data, *h264_buf - sample_data); } +static void test_h264_encoder(void) +{ + static const DWORD actual_width = 96, actual_height = 96; + const GUID *const class_id = &CLSID_MSH264EncoderMFT; + const struct transform_info expect_mft_info = + { + .name = L"H264 Encoder MFT", + .major_type = &MFMediaType_Video, + .inputs = + { + {.subtype = &MFVideoFormat_IYUV}, + {.subtype = &MFVideoFormat_YV12}, + {.subtype = &MFVideoFormat_NV12}, + {.subtype = &MFVideoFormat_YUY2}, + }, + .outputs = + { + {.subtype = &MFVideoFormat_H264}, + }, + }; + static const struct attribute_desc expect_transform_attributes[] = + { + ATTR_UINT32(MFT_ENCODER_SUPPORTS_CONFIG_EVENT, 1), + {0}, + }; + const struct attribute_desc input_type_desc[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12, .required = TRUE), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001, .required = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), + {0}, + }; + const struct attribute_desc output_type_desc[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264, .required = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), + ATTR_UINT32(MF_MT_AVG_BITRATE, 193540), + ATTR_UINT32(MF_MT_INTERLACE_MODE, MFVideoInterlace_Progressive), + {0}, + }; + const struct attribute_desc expect_input_type_desc[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), + ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), + {0}, + }; + const struct attribute_desc expect_output_type_desc[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264), + ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), + ATTR_UINT32(MF_MT_AVG_BITRATE, 193540), + ATTR_BLOB(MF_MT_MPEG_SEQUENCE_HEADER, test_h264_sequence_header, sizeof(test_h264_sequence_header)), + {0}, + }; + static const MFT_OUTPUT_STREAM_INFO expect_output_info = {.cbSize = 0x8000}; + MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_H264}; + MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Video, MFVideoFormat_NV12}; + IMFTransform *transform; + HRESULT hr; + ULONG ret; + + hr = CoInitialize(NULL); + ok(hr == S_OK, "Failed to initialize, hr %#lx.\n", hr); + + winetest_push_context("h264enc"); + + if (!has_video_processor) + { + win_skip("Skipping inconsistent h264 encoder tests on Win7.\n"); + goto failed; + } + + if (!check_mft_enum(MFT_CATEGORY_VIDEO_ENCODER, &input_type, &output_type, class_id)) + goto failed; + check_mft_get_info(class_id, &expect_mft_info); + + hr = CoCreateInstance(class_id, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)&transform); + ok(hr == S_OK, "CoCreateInstance returned %#lx.\n", hr); + + check_interface(transform, &IID_IMFTransform, TRUE); + check_interface(transform, &IID_IMediaObject, FALSE); + check_interface(transform, &IID_IPropertyStore, FALSE); + check_interface(transform, &IID_IPropertyBag, FALSE); + + check_mft_get_attributes(transform, expect_transform_attributes, FALSE); + check_mft_get_input_stream_info(transform, S_OK, NULL); + check_mft_get_output_stream_info(transform, S_OK, NULL); + + check_mft_set_output_type_required(transform, output_type_desc); + check_mft_set_output_type(transform, output_type_desc, S_OK); + + check_mft_set_input_type_required(transform, input_type_desc); + check_mft_set_input_type(transform, input_type_desc); + check_mft_get_input_current_type(transform, expect_input_type_desc); + + check_mft_get_output_current_type(transform, expect_output_type_desc); + + check_mft_get_input_stream_info(transform, S_OK, NULL); + check_mft_get_output_stream_info(transform, S_OK, &expect_output_info); + + ret = IMFTransform_Release(transform); + ok(ret == 0, "Release returned %lu\n", ret); + +failed: + winetest_pop_context(); + CoUninitialize(); +} + static void test_h264_decoder(void) { const GUID *const class_id = &CLSID_MSH264DecoderMFT; @@ -8456,6 +8571,7 @@ START_TEST(transform) test_wma_decoder(); test_wma_decoder_dmo_input_type(); test_wma_decoder_dmo_output_type(); + test_h264_encoder(); test_h264_decoder(); test_wmv_encoder(); test_wmv_decoder();

1 0

Ziqing Hui : mf/tests: Use h264 and aac in mp4 media sink tests.
by Alexandre Julliard 05 Sep '23

05 Sep '23

Module: wine Branch: master Commit: f98f36123acd60fc0386d6270cd29dc7b4d1c464 URL: https://gitlab.winehq.org/wine/wine/-/commit/f98f36123acd60fc0386d6270cd29d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Aug 18 11:18:18 2023 +0800 mf/tests: Use h264 and aac in mp4 media sink tests. --- dlls/mf/tests/mf.c | 25 ++++++++++++++++++------- dlls/mf/tests/mf_test.h | 6 ++++++ dlls/mf/tests/transform.c | 6 ++---- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 7217e744343..dccc1b5b142 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6883,7 +6883,7 @@ static void test_mpeg4_media_sink(void) { IMFMediaSink *sink = NULL, *sink2 = NULL, *sink_audio = NULL, *sink_video = NULL, *sink_empty = NULL; IMFByteStream *bytestream, *bytestream_audio, *bytestream_video, *bytestream_empty; - DWORD id, count, flags, width = 16, height = 16, fps = 10; + DWORD id, count, flags, width = 96, height = 96; IMFMediaType *audio_type, *video_type, *media_type; IMFMediaTypeHandler *type_handler = NULL; IMFPresentationClock *clock; @@ -6899,22 +6899,33 @@ static void test_mpeg4_media_sink(void) hr = IMFMediaType_SetGUID(audio_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFMediaType_SetGUID(audio_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + hr = IMFMediaType_SetGUID(audio_type, &MF_MT_SUBTYPE, &MFAudioFormat_AAC); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFMediaType_SetUINT32(audio_type, &MF_MT_AUDIO_NUM_CHANNELS, 2); + hr = IMFMediaType_SetUINT32(audio_type, &MF_MT_AUDIO_NUM_CHANNELS, 1); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFMediaType_SetUINT32(audio_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000); + hr = IMFMediaType_SetUINT32(audio_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, 16); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFMediaType_SetUINT32(audio_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, 8); + hr = IMFMediaType_SetUINT32(audio_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetUINT32(audio_type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 12000); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetUINT32(audio_type, &MF_MT_AAC_AUDIO_PROFILE_LEVEL_INDICATION, 41); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetUINT32(audio_type, &MF_MT_AAC_PAYLOAD_TYPE, 0); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetBlob(audio_type, &MF_MT_USER_DATA, test_aac_codec_data, sizeof(test_aac_codec_data)); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetGUID(video_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFMediaType_SetGUID(video_type, &MF_MT_SUBTYPE, &MFVideoFormat_RGB24); + hr = IMFMediaType_SetGUID(video_type, &MF_MT_SUBTYPE, &MFVideoFormat_H264); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, ((UINT64)width << 32) | height); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_RATE, ((UINT64)fps << 32) | 1); + hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_RATE, ((UINT64)30000 << 32) | 1001); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetBlob(video_type, &MF_MT_MPEG_SEQUENCE_HEADER, + test_h264_sequence_header, sizeof(test_h264_sequence_header)); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFCreateTempFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_DELETE_IF_EXIST, 0, &bytestream_audio); diff --git a/dlls/mf/tests/mf_test.h b/dlls/mf/tests/mf_test.h index 488acac0c35..5a247e4a0ef 100644 --- a/dlls/mf/tests/mf_test.h +++ b/dlls/mf/tests/mf_test.h @@ -44,6 +44,12 @@ static const BYTE test_h264_sequence_header[] = 0xa7, 0x00, 0x00, 0x00, 0x01, 0x68, 0xce, 0x3c, 0x80, }; +const static BYTE test_aac_codec_data[] = +{ + 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x12, 0x08, +}; + struct attribute_desc { const GUID *key; diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 1071d089e69..87dcf7f0814 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -1973,8 +1973,6 @@ static IMFSample *create_sample(const BYTE *data, ULONG size) return sample; } -static const BYTE aac_codec_data[14] = {0x00,0x00,0x29,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x12,0x08}; - static void test_aac_encoder(void) { const GUID *const class_id = &CLSID_AACMFTEncoder; @@ -2045,7 +2043,7 @@ static void test_aac_encoder(void) ATTR_UINT32(MF_MT_AUDIO_PREFER_WAVEFORMATEX, 1), ATTR_UINT32(MF_MT_AAC_AUDIO_PROFILE_LEVEL_INDICATION, 41), ATTR_UINT32(MF_MT_AAC_PAYLOAD_TYPE, 0), - ATTR_BLOB(MF_MT_USER_DATA, aac_codec_data, sizeof(aac_codec_data)), + ATTR_BLOB(MF_MT_USER_DATA, test_aac_codec_data, sizeof(test_aac_codec_data)), {0}, }; const MFT_OUTPUT_STREAM_INFO initial_output_info = {0}, output_info = {.cbSize = 0x600}; @@ -2506,7 +2504,7 @@ static void test_aac_decoder(void) ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_AAC, .required = TRUE), ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100, .required = TRUE), - ATTR_BLOB(MF_MT_USER_DATA, aac_codec_data, sizeof(aac_codec_data), .required = TRUE), + ATTR_BLOB(MF_MT_USER_DATA, test_aac_codec_data, sizeof(test_aac_codec_data), .required = TRUE), ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 16), ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 1), ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 12000),

1 0

Ziqing Hui : winegstreamer: Add MFMPEG4SinkClassFactory.
by Alexandre Julliard 05 Sep '23

05 Sep '23

Module: wine Branch: master Commit: b3edb269ec84ea12f7b76b1c08358ff3b0b2ecef URL: https://gitlab.winehq.org/wine/wine/-/commit/b3edb269ec84ea12f7b76b1c08358f… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jul 5 10:34:18 2023 +0800 winegstreamer: Add MFMPEG4SinkClassFactory. --- dlls/mf/tests/mf.c | 43 +++++++++++++--------------- dlls/mfreadwrite/tests/mfplat.c | 13 ++------- dlls/winegstreamer/main.c | 2 ++ dlls/winegstreamer/winegstreamer_classes.idl | 7 +++++ 4 files changed, 31 insertions(+), 34 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index dccc1b5b142..aefc1b92b4d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6938,58 +6938,39 @@ static void test_mpeg4_media_sink(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFCreateMPEG4MediaSink(NULL, NULL, NULL, NULL); - todo_wine ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); sink = (void *)0xdeadbeef; hr = MFCreateMPEG4MediaSink(NULL, NULL, NULL, &sink); - todo_wine ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); ok(sink == (void *)0xdeadbeef, "Unexpected pointer %p.\n", sink); sink = NULL; hr = MFCreateMPEG4MediaSink(bytestream_empty, NULL, NULL, &sink_empty); - todo_wine ok(hr == S_OK || broken(hr == E_INVALIDARG), "Unexpected hr %#lx.\n", hr); hr = MFCreateMPEG4MediaSink(bytestream_audio, NULL, audio_type, &sink_audio); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFCreateMPEG4MediaSink(bytestream_video, video_type, NULL, &sink_video); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFCreateMPEG4MediaSink(bytestream, video_type, audio_type, &sink); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (!sink) - { - if (sink_video) - IMFMediaSink_Release(sink_video); - if (sink_audio) - IMFMediaSink_Release(sink_audio); - if (sink_empty) - IMFMediaSink_Release(sink_empty); - IMFByteStream_Release(bytestream); - IMFByteStream_Release(bytestream_empty); - IMFByteStream_Release(bytestream_video); - IMFByteStream_Release(bytestream_audio); - IMFMediaType_Release(video_type); - IMFMediaType_Release(audio_type); - return; - } - /* Test sink. */ + flags = 0xdeadbeef; hr = IMFMediaSink_GetCharacteristics(sink, &flags); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(flags == MEDIASINK_RATELESS || broken(flags == (MEDIASINK_RATELESS | MEDIASINK_FIXED_STREAMS)), "Unexpected flags %#lx.\n", flags); check_interface(sink, &IID_IMFMediaEventGenerator, TRUE); check_interface(sink, &IID_IMFFinalizableMediaSink, TRUE); check_interface(sink, &IID_IMFClockStateSink, TRUE); + todo_wine check_interface(sink, &IID_IMFGetService, TRUE); /* Test sink stream count. */ @@ -7104,8 +7085,11 @@ static void test_mpeg4_media_sink(void) hr = MFCreatePresentationClock(&clock); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaSink_SetPresentationClock(sink, NULL); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine hr = IMFMediaSink_SetPresentationClock(sink, clock); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFPresentationClock_Release(clock); @@ -7124,13 +7108,18 @@ static void test_mpeg4_media_sink(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaTypeHandler_GetMajorType(type_handler, NULL); + todo_wine ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFMediaTypeHandler_GetMajorType(type_handler, &guid); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(IsEqualGUID(&guid, &MFMediaType_Audio), "Unexpected major type.\n"); hr = IMFMediaTypeHandler_GetMediaTypeCount(type_handler, &count); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(count == 1, "Unexpected count %lu.\n", count); hr = IMFMediaTypeHandler_GetCurrentMediaType(type_handler, &media_type); @@ -7140,8 +7129,10 @@ static void test_mpeg4_media_sink(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, NULL); + todo_wine ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, media_type); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaType_Release(media_type); @@ -7160,19 +7151,25 @@ static void test_mpeg4_media_sink(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaTypeHandler_GetMajorType(type_handler, NULL); + todo_wine ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFMediaTypeHandler_GetMajorType(type_handler, &guid); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFStreamSink_Release(stream_sink); hr = IMFMediaSink_AddStreamSink(sink, 0, audio_type, &stream_sink); + todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream_sink); + todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaSink_GetStreamSinkById(sink, 0, &stream_sink); + todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaSink_GetCharacteristics(sink, &flags); + todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); IMFMediaTypeHandler_Release(type_handler); diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 3b54aa4ff4c..17e64fcc0bf 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -1468,44 +1468,35 @@ static void test_sink_writer_mp4(void) ok(!writer, "Unexpected pointer %p.\n", writer); hr = MFCreateSinkWriterFromURL(NULL, stream, attr, &writer); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (hr == S_OK) IMFSinkWriter_Release(writer); hr = MFCreateSinkWriterFromURL(tmp_file, NULL, NULL, &writer); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (hr == S_OK) IMFSinkWriter_Release(writer); hr = MFCreateSinkWriterFromURL(tmp_file, NULL, attr, &writer); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (hr == S_OK) IMFSinkWriter_Release(writer); hr = MFCreateSinkWriterFromURL(tmp_file, stream, NULL, &writer); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (hr == S_OK) IMFSinkWriter_Release(writer); hr = MFCreateSinkWriterFromURL(tmp_file, stream, attr, &writer); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (hr != S_OK) - { - IMFByteStream_Release(stream); - IMFAttributes_Release(attr); - return; - } /* Test GetServiceForStream. */ sink = (void *)0xdeadbeef; hr = IMFSinkWriter_GetServiceForStream(writer, MF_SINK_WRITER_MEDIASINK, &GUID_NULL, &IID_IMFMediaSink, (void **)&sink); + todo_wine ok(hr == MF_E_UNSUPPORTED_SERVICE, "Unexpected hr %#lx.\n", hr); + todo_wine ok(!sink, "Unexpected pointer %p.\n", sink); DeleteFileW(tmp_file); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 9624c469314..c78d73537f7 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -649,6 +649,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) factory = &color_convert_cf; else if (IsEqualGUID(clsid, &CLSID_MFMP3SinkClassFactory)) factory = &sink_class_factory_cf; + else if (IsEqualGUID(clsid, &CLSID_MFMPEG4SinkClassFactory)) + factory = &sink_class_factory_cf; else { FIXME("%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(clsid)); diff --git a/dlls/winegstreamer/winegstreamer_classes.idl b/dlls/winegstreamer/winegstreamer_classes.idl index 2bc85e70b3a..3e9b19c90e9 100644 --- a/dlls/winegstreamer/winegstreamer_classes.idl +++ b/dlls/winegstreamer/winegstreamer_classes.idl @@ -117,3 +117,10 @@ coclass CColorConvertDMO {} uuid(11275a82-5e5a-47fd-a01c-3683c12fb196) ] coclass MFMP3SinkClassFactory {} + +[ + helpstring("MF MPEG4 Sink Class Factory"), + threading(both), + uuid(a22c4fc7-6e91-4e1d-89e9-53b2667b72ba) +] +coclass MFMPEG4SinkClassFactory {}

1 0

Stefan Dösinger : d3d9/tests: Skip big test_query loops if the d3d implementation is too slow.
by Alexandre Julliard 05 Sep '23

05 Sep '23

Module: wine Branch: master Commit: 1356f253b91390a452f4ac710bb39c64dd663fc3 URL: https://gitlab.winehq.org/wine/wine/-/commit/1356f253b91390a452f4ac710bb39c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 29 22:31:46 2023 +0300 d3d9/tests: Skip big test_query loops if the d3d implementation is too slow. --- dlls/d3d9/tests/device.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 8ab52c7d5e4..8284e3365c8 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6431,6 +6431,7 @@ static void test_occlusion_query(void) }; unsigned int data_size, i, count; struct device_desc device_desc; + LARGE_INTEGER start, end, freq; IDirect3DQuery9 *query = NULL; IDirect3DDevice9 *device; IDirect3DSurface9 *rt; @@ -6438,6 +6439,7 @@ static void test_occlusion_query(void) D3DVIEWPORT9 vp; ULONG refcount; D3DCAPS9 caps; + DWORD elapsed; HWND window; HRESULT hr; union @@ -6448,6 +6450,7 @@ static void test_occlusion_query(void) } data, expected; BOOL broken_occlusion = FALSE; expected.uint = registry_mode.dmPelsWidth * registry_mode.dmPelsHeight; + QueryPerformanceFrequency(&freq); window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); @@ -6578,6 +6581,39 @@ static void test_occlusion_query(void) if (broken_occlusion) goto done; + /* On my system (MacBookPro14,3 - Radeon 560M, i7-7920HQ), this loop + * takes about 20 ms with HW rendering and 160 ms with mesa software. + * I can't reliably read timings smaller than 20 ms though, so don't + * reduce the test count too much. + * + * wait_query() times out after 5 seconds, so if the 1000 iteration + * loop takes more than 100 ms the full test is bound to fail. I put + * it to 70 ms below to avoid flaky failures if e.g. a CI machine + * has CPU load from other processes. */ + QueryPerformanceCounter(&start); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Failed to begin scene, hr %#lx.\n", hr); + for (i = 0; i < 1000; ++i) + { + hr = IDirect3DQuery9_Issue(query, D3DISSUE_BEGIN); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + } + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Failed to end scene, hr %#lx.\n", hr); + + wait_query(query); + QueryPerformanceCounter(&end); + + elapsed = (end.QuadPart - start.QuadPart) * 1000 / freq.QuadPart; + + if (elapsed > 70) + { + skip("Test loop took too long (%lu ms), skipping large query tests.\n", elapsed); + goto done; + } + hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "Failed to begin scene, hr %#lx.\n", hr); for (i = 0; i < 50000; ++i)

1 0

Hans Leidekker : wbemprox: Call GetAdaptersAddresses() in a loop.
by Alexandre Julliard 05 Sep '23

05 Sep '23

Module: wine Branch: master Commit: e5468c5484fe8920288dbf0b038766e6de795662 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5468c5484fe8920288dbf0b038766… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 4 17:18:37 2023 +0200 wbemprox: Call GetAdaptersAddresses() in a loop. --- dlls/wbemprox/builtin.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 3703fd0cca5..5f183251752 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2849,26 +2849,36 @@ static WCHAR *get_networkadapter_guid( const IF_LUID *luid ) return guid_to_str( &guid ); } +static IP_ADAPTER_ADDRESSES *get_network_adapters(void) +{ + ULONG err, size = 4096; + IP_ADAPTER_ADDRESSES *tmp, *ret; + + if (!(ret = malloc( size ))) return NULL; + err = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, NULL, ret, &size ); + while (err == ERROR_BUFFER_OVERFLOW) + { + if (!(tmp = realloc( ret, size ))) break; + ret = tmp; + err = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, NULL, ret, &size ); + } + if (err == ERROR_SUCCESS) return ret; + free( ret ); + return NULL; +} + static enum fill_status fill_networkadapter( struct table *table, const struct expr *cond ) { WCHAR device_id[11]; struct record_networkadapter *rec; IP_ADAPTER_ADDRESSES *aa, *buffer; UINT row = 0, offset = 0, count = 0; - DWORD size = 0, ret; int adaptertypeid, physical; UINT16 connection_status; enum fill_status status = FILL_STATUS_UNFILTERED; - ret = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ); - if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED; + if (!(buffer = get_network_adapters())) return FILL_STATUS_FAILED; - if (!(buffer = malloc( size ))) return FILL_STATUS_FAILED; - if (GetAdaptersAddresses( AF_UNSPEC, 0, NULL, buffer, &size )) - { - free( buffer ); - return FILL_STATUS_FAILED; - } for (aa = buffer; aa; aa = aa->Next) { if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK) count++; @@ -3092,18 +3102,10 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st struct record_networkadapterconfig *rec; IP_ADAPTER_ADDRESSES *aa, *buffer; UINT row = 0, offset = 0, count = 0; - DWORD size = 0, ret; enum fill_status status = FILL_STATUS_UNFILTERED; - ret = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, NULL, NULL, &size ); - if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED; + if (!(buffer = get_network_adapters())) return FILL_STATUS_FAILED; - if (!(buffer = malloc( size ))) return FILL_STATUS_FAILED; - if (GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, NULL, buffer, &size )) - { - free( buffer ); - return FILL_STATUS_FAILED; - } for (aa = buffer; aa; aa = aa->Next) { if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK) count++;

1 0

Biswapriyo Nath : include: Add AudioEffectsManager runtimeclass in windows.media.effects.idl.
by Alexandre Julliard 05 Sep '23

05 Sep '23

Module: wine Branch: master Commit: 9ae771bac8e9ff5fda3e8bc1bb677c1ea731c9b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ae771bac8e9ff5fda3e8bc1bb677c… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 5 05:28:42 2023 +0000 include: Add AudioEffectsManager runtimeclass in windows.media.effects.idl. --- include/windows.media.effects.idl | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/include/windows.media.effects.idl b/include/windows.media.effects.idl index f0f8cba0c83..395d98df67f 100644 --- a/include/windows.media.effects.idl +++ b/include/windows.media.effects.idl @@ -22,6 +22,9 @@ import "inspectable.idl"; import "windows.foundation.idl"; +import "windows.media.idl"; +import "windows.media.capture.idl"; +import "windows.media.render.idl"; import "windows.storage.streams.idl"; namespace Windows.Media.Effects { @@ -29,11 +32,13 @@ namespace Windows.Media.Effects { interface IAudioCaptureEffectsManager; interface IAudioEffect; + interface IAudioEffectsManagerStatics; interface IAudioRenderEffectsManager; interface IAudioRenderEffectsManager2; runtimeclass AudioCaptureEffectsManager; runtimeclass AudioEffect; + runtimeclass AudioEffectsManager; runtimeclass AudioRenderEffectsManager; declare { @@ -102,6 +107,41 @@ namespace Windows.Media.Effects { [propget] HRESULT AudioEffectType([out, retval] Windows.Media.Effects.AudioEffectType *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.Effects.AudioEffectsManager), + uuid(66406c04-86fa-47cc-a315-f489d8c3fe10) + ] + interface IAudioEffectsManagerStatics : IInspectable + { + [overload("CreateAudioRenderEffectsManager")] + HRESULT CreateAudioRenderEffectsManager( + [in] HSTRING device_id, + [in] Windows.Media.Render.AudioRenderCategory category, + [out, retval] Windows.Media.Effects.AudioRenderEffectsManager **value + ); + [overload("CreateAudioRenderEffectsManager")] + HRESULT CreateAudioRenderEffectsManagerWithMode( + [in] HSTRING device_id, + [in] Windows.Media.Render.AudioRenderCategory category, + [in] Windows.Media.AudioProcessing mode, + [out, retval] Windows.Media.Effects.AudioRenderEffectsManager **value + ); + [overload("CreateAudioCaptureEffectsManager")] + HRESULT CreateAudioCaptureEffectsManager( + [in] HSTRING device_id, + [in] Windows.Media.Capture.MediaCategory category, + [out, retval] Windows.Media.Effects.AudioCaptureEffectsManager **value + ); + [overload("CreateAudioCaptureEffectsManager")] + HRESULT CreateAudioCaptureEffectsManagerWithMode( + [in] HSTRING device_id, + [in] Windows.Media.Capture.MediaCategory category, + [in] Windows.Media.AudioProcessing mode, + [out, retval] Windows.Media.Effects.AudioCaptureEffectsManager **value + ); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.Effects.AudioRenderEffectsManager), @@ -157,6 +197,16 @@ namespace Windows.Media.Effects { [default] interface Windows.Media.Effects.IAudioEffect; } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Media.Effects.IAudioEffectsManagerStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(mta) + ] + runtimeclass AudioEffectsManager + { + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile),

1 0

Mohamad Al-Jaf : windows.applicationmodel: Add stub DLL.
by Alexandre Julliard 05 Sep '23

05 Sep '23

Module: wine Branch: master Commit: 04c26b455f7deecbb5cdd56da89fd2c5266cc9c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/04c26b455f7deecbb5cdd56da89fd2… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Dec 18 22:14:58 2022 -0500 windows.applicationmodel: Add stub DLL. --- configure | 3 + configure.ac | 2 + dlls/windows.applicationmodel/Makefile.in | 9 ++ dlls/windows.applicationmodel/classes.idl | 33 ++++++ dlls/windows.applicationmodel/main.c | 46 ++++++++ dlls/windows.applicationmodel/package.c | 116 +++++++++++++++++++++ dlls/windows.applicationmodel/private.h | 40 +++++++ dlls/windows.applicationmodel/tests/Makefile.in | 5 + dlls/windows.applicationmodel/tests/model.c | 88 ++++++++++++++++ .../windows.applicationmodel.spec | 3 + include/windows.applicationmodel.core.idl | 2 + include/windows.applicationmodel.idl | 2 + 12 files changed, 349 insertions(+)

1 0

Rémi Bernon : windows.applicationmodel/tests: Add some IPackageManager tests.
by Alexandre Julliard 05 Sep '23

05 Sep '23

Module: wine Branch: master Commit: 2f8fa39ddfdfc6c0a668927c5da97a8007eecc3c URL: https://gitlab.winehq.org/wine/wine/-/commit/2f8fa39ddfdfc6c0a668927c5da97a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 11 10:15:22 2023 +0200 windows.applicationmodel/tests: Add some IPackageManager tests. --- dlls/windows.applicationmodel/tests/model.c | 81 +++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/windows.applicationmodel/tests/model.c b/dlls/windows.applicationmodel/tests/model.c index a86da0e84ad..50513e45fd4 100644 --- a/dlls/windows.applicationmodel/tests/model.c +++ b/dlls/windows.applicationmodel/tests/model.c @@ -30,7 +30,11 @@ #define WIDL_using_Windows_Foundation_Collections #include "windows.foundation.h" #define WIDL_using_Windows_ApplicationModel +#define WIDL_using_Windows_ApplicationModel_Core +#define WIDL_using_Windows_Management_Deployment +#define WIDL_using_Windows_Storage #include "windows.applicationmodel.h" +#include "windows.management.deployment.h" #include "wine/test.h" @@ -47,6 +51,82 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) IUnknown_Release( unk ); } +static void test_PackageManager(void) +{ + static const WCHAR *statics_name = RuntimeClass_Windows_Management_Deployment_PackageManager; + IStorageFolder *storage_folder; + IStorageItem *storage_item; + IActivationFactory *factory; + IIterable_Package *packages; + IPackageManager *manager; + IIterator_Package *iter; + IPackage *package; + HSTRING str; + HRESULT hr; + LONG ref; + + hr = WindowsCreateString( statics_name, wcslen( statics_name ), &str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + hr = RoGetActivationFactory( str, &IID_IActivationFactory, (void **)&factory ); + WindowsDeleteString( str ); + todo_wine + ok( hr == S_OK || broken( hr == REGDB_E_CLASSNOTREG ), "got hr %#lx.\n", hr ); + if (hr == REGDB_E_CLASSNOTREG) + { + todo_wine + win_skip( "%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w( statics_name ) ); + return; + } + + check_interface( factory, &IID_IUnknown ); + check_interface( factory, &IID_IInspectable ); + check_interface( factory, &IID_IAgileObject ); + + hr = IActivationFactory_ActivateInstance( factory, (IInspectable **)&manager ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + check_interface( manager, &IID_IUnknown ); + check_interface( manager, &IID_IInspectable ); + check_interface( manager, &IID_IAgileObject ); + check_interface( manager, &IID_IPackageManager ); + + hr = IPackageManager_FindPackages( manager, &packages ); + ok( hr == S_OK || broken(hr == E_ACCESSDENIED) /* w8adm */, "got hr %#lx.\n", hr ); + if (broken(hr == E_ACCESSDENIED)) + { + win_skip("Unable to list packages, skipping package manager tests\n"); + goto skip_tests; + } + + hr = IIterable_Package_First( packages, &iter ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IIterator_Package_get_Current( iter, &package ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IPackage_get_InstalledLocation( package, &storage_folder ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IStorageFolder_QueryInterface( storage_folder, &IID_IStorageItem, (void **)&storage_item ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IStorageItem_get_Path( storage_item, &str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + WindowsDeleteString( str ); + ref = IStorageItem_Release( storage_item ); + ok( ref == 1, "got ref %ld.\n", ref ); + ref = IStorageFolder_Release( storage_folder ); + ok( !ref, "got ref %ld.\n", ref ); + IPackage_Release( package ); + ref = IIterator_Package_Release( iter ); + ok( !ref, "got ref %ld.\n", ref ); + ref = IIterable_Package_Release( packages ); + ok( !ref, "got ref %ld.\n", ref ); + +skip_tests: + ref = IPackageManager_Release( manager ); + ok( !ref, "got ref %ld.\n", ref ); + ref = IActivationFactory_Release( factory ); + ok( ref == 1, "got ref %ld.\n", ref ); +} + static void test_PackageStatics(void) { static const WCHAR *package_statics_name = L"Windows.ApplicationModel.Package"; @@ -82,6 +162,7 @@ START_TEST(model) hr = RoInitialize( RO_INIT_MULTITHREADED ); ok( hr == S_OK, "RoInitialize failed, hr %#lx\n", hr ); + test_PackageManager(); test_PackageStatics(); RoUninitialize();

1 0

Rémi Bernon : makedep: Use #pragma makedep testdll for TESTDLL resources.
by Alexandre Julliard 05 Sep '23

05 Sep '23

Module: wine Branch: master Commit: 81da9ff0f8dea4932a3afdc4c447c1c9242bb596 URL: https://gitlab.winehq.org/wine/wine/-/commit/81da9ff0f8dea4932a3afdc4c447c1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 11 10:15:22 2023 +0200 makedep: Use #pragma makedep testdll for TESTDLL resources. --- dlls/combase/tests/wine.combase.test.c | 4 ++++ dlls/dinput/tests/driver_bus.c | 4 ++++ dlls/dinput/tests/driver_hid.c | 4 ++++ dlls/dinput/tests/driver_hid_poll.c | 4 ++++ dlls/imagehlp/tests/testdll.c | 4 ++++ dlls/imm32/tests/ime_wrapper.c | 4 ++++ dlls/kernel32/tests/dummy.c | 22 ++++++++++++++++++++ dlls/msi/tests/custom.c | 4 ++++ dlls/msi/tests/selfreg.c | 4 ++++ dlls/ntoskrnl.exe/tests/driver.c | 4 ++++ dlls/ntoskrnl.exe/tests/driver2.c | 4 ++++ dlls/ntoskrnl.exe/tests/driver3.c | 4 ++++ dlls/ntoskrnl.exe/tests/driver_netio.c | 4 ++++ dlls/ntoskrnl.exe/tests/driver_pnp.c | 4 ++++ dlls/ole32/tests/testlib.c | 4 ++++ dlls/setupapi/tests/coinst.c | 4 ++++ dlls/setupapi/tests/selfreg.c | 4 ++++ dlls/ucrtbase/tests/threaddll.c | 4 ++++ tools/makedep.c | 38 ++++++++++++++++++++++++---------- 19 files changed, 117 insertions(+), 11 deletions(-)

1 0