May 2024 - Wine-commits - list.winehq.org

Alexandre Julliard : Release 9.9.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: fd1da4521e68042cbb3ce88124415c22761ae9dd URL: https://gitlab.winehq.org/wine/wine/-/commit/fd1da4521e68042cbb3ce88124415c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 22:10:05 2024 +0200 Release 9.9. --- ANNOUNCE.md | 654 ++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 361 insertions(+), 315 deletions(-)

1 0

Tag wine-9.9 : Alexandre Julliard : Release 9.9
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: refs/tags/wine-9.9 Tag: 2ff25b800c62468eb0ab8b03f1bb3cc743075ad1 URL: https://gitlab.winehq.org/wine/wine/-/tags/2ff25b800c62468eb0ab8b03f1bb3cc7… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 22:10:05 2024 +0200 Release 9.9

1 0

Rémi Bernon : mfplat: Add MFVideoFormat_ABGR32 format information.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: 47884f6fbae0f886c9998a76ee53b7ecea510e59 URL: https://gitlab.winehq.org/wine/wine/-/commit/47884f6fbae0f886c9998a76ee53b7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 23 00:45:19 2023 +0100 mfplat: Add MFVideoFormat_ABGR32 format information. --- dlls/mfplat/mediatype.c | 4 ++++ dlls/mfplat/tests/mfplat.c | 30 +++++++++++++++++++++++------- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index dd0b29fac32..3944d64849e 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -39,6 +39,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_MEDIATYPE_GUID(MFVideoFormat_RGB1, D3DFMT_A1); DEFINE_MEDIATYPE_GUID(MFVideoFormat_RGB4, MAKEFOURCC('4','P','x','x')); +DEFINE_MEDIATYPE_GUID(MFVideoFormat_ABGR32, D3DFMT_A8B8G8R8); DEFINE_MEDIATYPE_GUID(MFVideoFormat_ARGB1555, D3DFMT_A1R5G5B5); DEFINE_MEDIATYPE_GUID(MFVideoFormat_ARGB4444, D3DFMT_A4R4G4B4); /* SDK MFVideoFormat_A2R10G10B10 uses D3DFMT_A2B10G10R10, let's name it the other way */ @@ -2713,6 +2714,7 @@ static struct uncompressed_video_format video_formats[] = { &MFVideoFormat_RGB32, 32, 3, 1, 0, BI_RGB }, { &MFVideoFormat_RGB565, 16, 3, 1, 0, BI_BITFIELDS }, { &MFVideoFormat_RGB555, 16, 3, 1, 0, BI_RGB }, + { &MFVideoFormat_ABGR32, 32, 3, 1, 0, BI_RGB }, { &MFVideoFormat_A2R10G10B10, 32, 3, 1, 0, -1 }, { &MFVideoFormat_A2B10G10R10, 32, 3, 1, 0, -1 }, { &MFVideoFormat_RGB8, 8, 3, 1, 0, BI_RGB }, @@ -3632,6 +3634,8 @@ DXGI_FORMAT WINAPI MFMapDX9FormatToDXGIFormat(DWORD format) return DXGI_FORMAT_B8G8R8A8_UNORM; case D3DFMT_X8R8G8B8: return DXGI_FORMAT_B8G8R8X8_UNORM; + case D3DFMT_A8B8G8R8: + return DXGI_FORMAT_R8G8B8A8_UNORM; case MAKEFOURCC('A','Y','U','V'): return DXGI_FORMAT_AYUV; case MAKEFOURCC('Y','4','1','0'): diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index a4ca567367c..21977807ac2 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -67,9 +67,11 @@ DEFINE_GUID(DUMMY_GUID3, 0x12345678,0x1234,0x1234,0x23,0x23,0x23,0x23,0x23,0x23, extern const CLSID CLSID_FileSchemePlugin; DEFINE_MEDIATYPE_GUID(MEDIASUBTYPE_Base,0); +DEFINE_GUID(MEDIASUBTYPE_ABGR32,D3DFMT_A8B8G8R8,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70); DEFINE_MEDIATYPE_GUID(MFVideoFormat_RGB1, D3DFMT_A1); DEFINE_MEDIATYPE_GUID(MFVideoFormat_RGB4, MAKEFOURCC('4','P','x','x')); +DEFINE_MEDIATYPE_GUID(MFVideoFormat_ABGR32, D3DFMT_A8B8G8R8); DEFINE_MEDIATYPE_GUID(MFVideoFormat_ARGB1555, D3DFMT_A1R5G5B5); DEFINE_MEDIATYPE_GUID(MFVideoFormat_ARGB4444, D3DFMT_A4R4G4B4); /* SDK MFVideoFormat_A2R10G10B10 uses D3DFMT_A2B10G10R10, let's name it the other way */ @@ -4748,6 +4750,9 @@ image_size_tests[] = { &MFVideoFormat_ARGB32, 3, 5, 60, 0, 320, 60, 64 }, { &MFVideoFormat_ARGB32, 1, 1, 4, 0, 64, 4, 64 }, { &MFVideoFormat_ARGB32, 320, 240, 307200, 0, 307200, 307200, 1280 }, + { &MFVideoFormat_ABGR32, 3, 5, 60, 0, 320, 60, 64 }, + { &MFVideoFormat_ABGR32, 1, 1, 4, 0, 64, 4, 64 }, + { &MFVideoFormat_ABGR32, 320, 240, 307200, 0, 307200, 307200, 1280 }, { &MFVideoFormat_A2R10G10B10, 3, 5, 60, 0, 320, 60, 64 }, { &MFVideoFormat_A2R10G10B10, 1, 1, 4, 0, 64, 4, 64 }, { &MFVideoFormat_A2R10G10B10, 320, 240, 307200, 0, 307200, 307200, 1280 }, @@ -4910,12 +4915,16 @@ static void test_MFCalculateImageSize(void) /* Those are supported since Win10. */ BOOL is_broken = IsEqualGUID(ptr->subtype, &MFVideoFormat_A16B16G16R16F) || - IsEqualGUID(ptr->subtype, &MFVideoFormat_A2R10G10B10); + IsEqualGUID(ptr->subtype, &MFVideoFormat_A2R10G10B10) || + IsEqualGUID(ptr->subtype, &MFVideoFormat_ABGR32); hr = MFCalculateImageSize(ptr->subtype, ptr->width, ptr->height, &size); - ok(hr == S_OK || (is_broken && hr == E_INVALIDARG), "%u: failed to calculate image size, hr %#lx.\n", i, hr); - ok(size == ptr->size, "%u: unexpected image size %u, expected %u. Size %u x %u, format %s.\n", i, size, ptr->size, - ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->subtype->Data1, 4)); + ok(hr == S_OK || broken(is_broken && hr == E_INVALIDARG), "%u: failed to calculate image size, hr %#lx.\n", i, hr); + if (hr == S_OK) + { + ok(size == ptr->size, "%u: unexpected image size %u, expected %u. Size %u x %u, format %s.\n", i, size, ptr->size, + ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->subtype->Data1, 4)); + } } } @@ -6224,6 +6233,8 @@ static void test_MFGetStrideForBitmapInfoHeader(void) { &MFVideoFormat_RGB32, 1, -4 }, { &MFVideoFormat_ARGB32, 3, -12 }, { &MFVideoFormat_ARGB32, 1, -4 }, + { &MFVideoFormat_ABGR32, 3, -12 }, + { &MFVideoFormat_ABGR32, 1, -4 }, { &MFVideoFormat_A2R10G10B10, 3, -12 }, { &MFVideoFormat_A2R10G10B10, 1, -4 }, { &MFVideoFormat_A2B10G10R10, 3, -12 }, @@ -9272,6 +9283,7 @@ static void test_MFMapDXGIFormatToDX9Format(void) { DXGI_FORMAT dxgi_format; DWORD d3d9_format; + BOOL broken; } formats_map[] = { @@ -9304,6 +9316,7 @@ static void test_MFMapDXGIFormatToDX9Format(void) { DXGI_FORMAT_B8G8R8X8_UNORM, D3DFMT_X8R8G8B8 }, { DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, D3DFMT_A8R8G8B8 }, { DXGI_FORMAT_B8G8R8X8_UNORM_SRGB, D3DFMT_X8R8G8B8 }, + { DXGI_FORMAT_R8G8B8A8_UNORM, D3DFMT_A8B8G8R8, .broken = TRUE /* <= w1064v1507 */ }, { DXGI_FORMAT_AYUV, MAKEFOURCC('A','Y','U','V') }, { DXGI_FORMAT_Y410, MAKEFOURCC('Y','4','1','0') }, { DXGI_FORMAT_Y416, MAKEFOURCC('Y','4','1','6') }, @@ -9332,7 +9345,8 @@ static void test_MFMapDXGIFormatToDX9Format(void) for (i = 0; i < ARRAY_SIZE(formats_map); ++i) { format = pMFMapDXGIFormatToDX9Format(formats_map[i].dxgi_format); - ok(format == formats_map[i].d3d9_format, "Unexpected d3d9 format %#lx, dxgi format %#x.\n", format, formats_map[i].dxgi_format); + ok(format == formats_map[i].d3d9_format || broken(formats_map[i].broken && format == 0), + "Unexpected d3d9 format %#lx, dxgi format %#x.\n", format, formats_map[i].dxgi_format); } } @@ -9342,6 +9356,7 @@ static void test_MFMapDX9FormatToDXGIFormat(void) { DXGI_FORMAT dxgi_format; DWORD d3d9_format; + BOOL broken; } formats_map[] = { @@ -9369,6 +9384,7 @@ static void test_MFMapDX9FormatToDXGIFormat(void) { DXGI_FORMAT_BC3_UNORM, D3DFMT_DXT4 }, { DXGI_FORMAT_B8G8R8A8_UNORM, D3DFMT_A8R8G8B8 }, { DXGI_FORMAT_B8G8R8X8_UNORM, D3DFMT_X8R8G8B8 }, + { DXGI_FORMAT_R8G8B8A8_UNORM, D3DFMT_A8B8G8R8, .broken = TRUE }, { DXGI_FORMAT_AYUV, MAKEFOURCC('A','Y','U','V') }, { DXGI_FORMAT_Y410, MAKEFOURCC('Y','4','1','0') }, { DXGI_FORMAT_Y416, MAKEFOURCC('Y','4','1','6') }, @@ -9397,8 +9413,8 @@ static void test_MFMapDX9FormatToDXGIFormat(void) for (i = 0; i < ARRAY_SIZE(formats_map); ++i) { format = pMFMapDX9FormatToDXGIFormat(formats_map[i].d3d9_format); - ok(format == formats_map[i].dxgi_format, "Unexpected DXGI format %#x, d3d9 format %#lx.\n", - format, formats_map[i].d3d9_format); + ok(format == formats_map[i].dxgi_format || broken(formats_map[i].broken && format == 0), + "Unexpected DXGI format %#x, d3d9 format %#lx.\n", format, formats_map[i].d3d9_format); } }

1 0

Rémi Bernon : mf/tests: Add video processor tests with MFVideoFormat_ABGR32 format.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: 1c1f03a8b84064a770e0d1d7f371bd93aae62b8b URL: https://gitlab.winehq.org/wine/wine/-/commit/1c1f03a8b84064a770e0d1d7f371bd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 25 10:31:53 2024 +0200 mf/tests: Add video processor tests with MFVideoFormat_ABGR32 format. --- dlls/mf/tests/abgr32frame-crop.bmp | Bin 0 -> 27606 bytes dlls/mf/tests/resource.rc | 8 + dlls/mf/tests/rgb32frame-crop-flip.bmp | Bin 0 -> 27606 bytes dlls/mf/tests/rgb32frame-crop.bmp | Bin 27606 -> 27606 bytes dlls/mf/tests/transform.c | 372 ++++++++++++++++++++++++++++++--- 5 files changed, 350 insertions(+), 30 deletions(-)

1 0

Rémi Bernon : mfreadwrite/tests: Add tests with MFVideoFormat_ABGR32 output format.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: cc57b05d47506fc1d69f47616a1d8e699a862e15 URL: https://gitlab.winehq.org/wine/wine/-/commit/cc57b05d47506fc1d69f47616a1d8e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 11 19:06:10 2024 +0200 mfreadwrite/tests: Add tests with MFVideoFormat_ABGR32 output format. --- dlls/mfreadwrite/tests/mfplat.c | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index b51c9739afe..b819b2238e9 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -48,6 +48,7 @@ DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); #include "wine/test.h" DEFINE_MEDIATYPE_GUID(MFVideoFormat_TEST,MAKEFOURCC('T','E','S','T')); +DEFINE_MEDIATYPE_GUID(MFVideoFormat_ABGR32,D3DFMT_A8B8G8R8); #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) @@ -2503,7 +2504,8 @@ static HRESULT WINAPI test_decoder_SetOutputType(IMFTransform *iface, DWORD id, HRESULT hr; if (type && SUCCEEDED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype)) - && IsEqualGUID(&subtype, &MFVideoFormat_RGB32)) + && (IsEqualGUID(&subtype, &MFVideoFormat_RGB32) + || IsEqualGUID(&subtype, &MFVideoFormat_ABGR32))) return MF_E_INVALIDMEDIATYPE; if (flags & MFT_SET_TYPE_TEST_ONLY) @@ -3101,6 +3103,12 @@ static void test_source_reader_transforms_d3d9(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(value == 0, "got %u.\n", value); IMFAttributes_Release(attributes); + + hr = IMFTransform_GetOutputCurrentType(video_processor, 0, &media_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + check_media_type(media_type, rgb32_expect_desc, -1); + IMFMediaType_Release(media_type); + IMFTransform_Release(video_processor); hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 0, NULL, &test_decoder); @@ -3281,6 +3289,22 @@ static void test_source_reader_transforms_d3d11(void) ATTR_UINT32(MF_MT_INTERLACE_MODE, 2, .todo = TRUE), {0}, }; + static const struct attribute_desc abgr32_stream_type_desc[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_ABGR32), + {0}, + }; + static const struct attribute_desc abgr32_expect_desc[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_ABGR32), + ATTR_RATIO(MF_MT_FRAME_SIZE, 96, 96), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + ATTR_UINT32(MF_MT_COMPRESSED, 0, .todo = TRUE), + ATTR_UINT32(MF_MT_INTERLACE_MODE, 2, .todo = TRUE), + {0}, + }; const MFT_REGISTER_TYPE_INFO output_info[] = { {MFMediaType_Video, MFVideoFormat_NV12}, @@ -3389,6 +3413,21 @@ static void test_source_reader_transforms_d3d11(void) IMFMediaType_Release(media_type); ok(!test_decoder_got_d3d_manager, "d3d manager received\n"); + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + init_media_type(media_type, abgr32_stream_type_desc, -1); + hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type); + todo_wine ok(hr == S_OK || broken(hr == MF_E_INVALIDMEDIATYPE) /* needs a GPU */, "Unexpected hr %#lx.\n", hr); + IMFMediaType_Release(media_type); + + if (hr == S_OK) + { + hr = IMFSourceReader_GetCurrentMediaType(reader, 0, &media_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + check_media_type(media_type, abgr32_expect_desc, -1); + IMFMediaType_Release(media_type); + } + hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); init_media_type(media_type, rgb32_stream_type_desc, -1);

1 0

Rémi Bernon : winegstreamer: Support MFVideoFormat_ABGR32 output in the video processor.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: f131faaa5acea8e245a63fdd2ea9cb0fb1d8240f URL: https://gitlab.winehq.org/wine/wine/-/commit/f131faaa5acea8e245a63fdd2ea9cb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 10 17:12:17 2024 +0200 winegstreamer: Support MFVideoFormat_ABGR32 output in the video processor. --- dlls/mf/tests/transform.c | 14 +++++++------- dlls/winegstreamer/main.c | 2 ++ dlls/winegstreamer/mfplat.c | 2 ++ dlls/winegstreamer/quartz_parser.c | 6 ++++++ dlls/winegstreamer/unixlib.h | 1 + dlls/winegstreamer/video_processor.c | 3 +++ dlls/winegstreamer/wg_format.c | 3 +++ 7 files changed, 24 insertions(+), 7 deletions(-)

1 0

Rémi Bernon : mfreadwrite/reader: Fixup MFVideoFormat_ABGR32 subtype to enumerate the video processor.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: f0e77b163dad11e47576d71561cf03f09b9187fc URL: https://gitlab.winehq.org/wine/wine/-/commit/f0e77b163dad11e47576d71561cf03… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 17 11:19:38 2024 +0200 mfreadwrite/reader: Fixup MFVideoFormat_ABGR32 subtype to enumerate the video processor. --- dlls/mfreadwrite/reader.c | 13 +++++++++++++ dlls/mfreadwrite/tests/mfplat.c | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 87ed0fe6cfc..0e0ba10b076 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -41,6 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +DEFINE_MEDIATYPE_GUID(MFVideoFormat_ABGR32, D3DFMT_A8B8G8R8); + struct stream_response { struct list entry; @@ -2036,6 +2038,17 @@ static HRESULT source_reader_create_transform(struct source_reader *reader, BOOL entry->min_buffer_size = max(entry->min_buffer_size, bytes_per_second); } + if (IsEqualGUID(&out_type.guidMajorType, &MFMediaType_Video) && IsEqualGUID(&out_type.guidSubtype, &MFVideoFormat_ABGR32) + && IsEqualGUID(&category, &MFT_CATEGORY_VIDEO_PROCESSOR)) + { + /* The video processor isn't registered for MFVideoFormat_ABGR32, and native even only supports that format when + * D3D-enabled, we still want to instantiate a video processor in such case, so fixup the subtype for MFTEnumEx. + */ + WARN("Fixing up MFVideoFormat_ABGR32 subtype for the video processor\n"); + out_type.guidSubtype = MFVideoFormat_RGB32; + } + + count = 0; if (SUCCEEDED(hr = MFTEnumEx(category, 0, &in_type, allow_processor ? NULL : &out_type, &activates, &count))) { diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index b819b2238e9..b6981479a1b 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -3417,7 +3417,7 @@ static void test_source_reader_transforms_d3d11(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); init_media_type(media_type, abgr32_stream_type_desc, -1); hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type); - todo_wine ok(hr == S_OK || broken(hr == MF_E_INVALIDMEDIATYPE) /* needs a GPU */, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK || broken(hr == MF_E_INVALIDMEDIATYPE) /* needs a GPU */, "Unexpected hr %#lx.\n", hr); IMFMediaType_Release(media_type); if (hr == S_OK)

1 0

Brendan McGrath : mplat/tests: Test Media Source is freed if immediately released.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: ac32d3fd727af8db2e35f96aaf5fbd921d39f49b URL: https://gitlab.winehq.org/wine/wine/-/commit/ac32d3fd727af8db2e35f96aaf5fbd… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Fri May 17 15:27:23 2024 +1000 mplat/tests: Test Media Source is freed if immediately released. Tests that the Media Source and its associated resources are freed if Release is called immediately after creation. That is, without a call to either Start or Shutdown. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56686 --- dlls/mfplat/tests/mfplat.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 21977807ac2..40853f6fc00 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -966,6 +966,7 @@ static void test_source_resolver(void) GUID guid; float rate; UINT32 rotation; + ULONG refcount; if (!pMFCreateSourceResolver) { @@ -1045,12 +1046,6 @@ static void test_source_resolver(void) hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &stream); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - /* Wrap ::Close to test when the media source calls it */ - bytestream_vtbl_orig = stream->lpVtbl; - bytestream_vtbl_wrapper = *bytestream_vtbl_orig; - bytestream_vtbl_wrapper.Close = bytestream_wrapper_Close; - stream->lpVtbl = &bytestream_vtbl_wrapper; - hr = IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attributes); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_SetString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, L"video/mp4"); @@ -1077,6 +1072,33 @@ static void test_source_resolver(void) ok(mediasource != NULL, "got %p\n", mediasource); ok(obj_type == MF_OBJECT_MEDIASOURCE, "got %d\n", obj_type); + refcount = IMFMediaSource_Release(mediasource); + todo_wine + ok(!refcount, "Unexpected refcount %ld\n", refcount); + IMFByteStream_Release(stream); + + /* We have to create a new bytestream here, because all following + * calls to CreateObjectFromByteStream will fail. */ + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &stream); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + /* Wrap ::Close to test when the media source calls it */ + bytestream_vtbl_orig = stream->lpVtbl; + bytestream_vtbl_wrapper = *bytestream_vtbl_orig; + bytestream_vtbl_wrapper.Close = bytestream_wrapper_Close; + stream->lpVtbl = &bytestream_vtbl_wrapper; + + hr = IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attributes); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFAttributes_SetString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, L"video/mp4"); + ok(hr == S_OK, "Failed to set string value, hr %#lx.\n", hr); + IMFAttributes_Release(attributes); + + hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, + &obj_type, (IUnknown **)&mediasource); + ok(mediasource != NULL, "got %p\n", mediasource); + ok(obj_type == MF_OBJECT_MEDIASOURCE, "got %d\n", obj_type); + check_interface(mediasource, &IID_IMFGetService, TRUE); check_service_interface(mediasource, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE);

1 0

Piotr Caban : ntdll: Don't use gmtime concurrently.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: 04927ec80db6b6d3a7aae46d06e62d06f67fd9b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/04927ec80db6b6d3a7aae46d06e62d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 17 14:29:38 2024 +0200 ntdll: Don't use gmtime concurrently. The function may be called by NtQuerySystemInformation(SystemTimeOfDayInformation) and NtQuerySystemInformation(SystemCurrentTimeZoneInformation) concurrently. --- dlls/ntdll/unix/system.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index b7c424b6548..b0d87dbc6bd 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2370,7 +2370,6 @@ static time_t find_dst_change(time_t start, time_t end, int *is_dst) static void get_timezone_info( RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi ) { - static pthread_mutex_t tz_mutex = PTHREAD_MUTEX_INITIALIZER; static RTL_DYNAMIC_TIME_ZONE_INFORMATION cached_tzi; static int current_year = -1, current_bias = 65535; struct tm *tm; @@ -2378,7 +2377,7 @@ static void get_timezone_info( RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi ) time_t year_start, year_end, tmp, dlt = 0, std = 0; int is_dst, bias; - mutex_lock( &tz_mutex ); + mutex_lock( &timezone_mutex ); year_start = time(NULL); tm = gmtime(&year_start); @@ -2388,7 +2387,7 @@ static void get_timezone_info( RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi ) if (current_year == tm->tm_year && current_bias == bias) { *tzi = cached_tzi; - mutex_unlock( &tz_mutex ); + mutex_unlock( &timezone_mutex ); return; } @@ -2481,7 +2480,7 @@ static void get_timezone_info( RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi ) find_reg_tz_info(tzi, tz_name, current_year + 1900); cached_tzi = *tzi; - mutex_unlock( &tz_mutex ); + mutex_unlock( &timezone_mutex ); }

1 0

Huw Davies : nsi/tests: Use NSI_IP_COMPARTMENT_TABLE instead of hard coding the integer.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: 8af82d67ecbd0ec74d236dcdd116855c08c96fda URL: https://gitlab.winehq.org/wine/wine/-/commit/8af82d67ecbd0ec74d236dcdd11685… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 17 10:26:32 2024 +0100 nsi/tests: Use NSI_IP_COMPARTMENT_TABLE instead of hard coding the integer. --- dlls/nsi/tests/nsi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 1bae78d2563..0c0644064f7 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -439,7 +439,8 @@ static void test_ip_cmpt( int family ) key = 1; for (i = 0; i < ARRAY_SIZE(rw_sizes); i++) { - err = NsiGetAllParameters( 1, mod, 2, &key, sizeof(key), &rw, rw_sizes[i], &dyn, sizeof(dyn), NULL, 0 ); + err = NsiGetAllParameters( 1, mod, NSI_IP_COMPARTMENT_TABLE, &key, sizeof(key), &rw, rw_sizes[i], + &dyn, sizeof(dyn), NULL, 0 ); if (!err) break; } ok( !err, "got %lx\n", err );

1 0