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

Henri Verbeet : tests/shader_runner: Add GLSL support to the GL runner.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: vkd3d Branch: master Commit: 0715734dfb6120c2ea8d3dbbbeef9b3311dbc9ad URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0715734dfb6120c2ea8d3dbbbeef9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 19 12:36:23 2024 +0100 tests/shader_runner: Add GLSL support to the GL runner. --- tests/hlsl/abs.shader_test | 4 +- tests/hlsl/all.shader_test | 14 +-- tests/hlsl/angle-unit.shader_test | 4 +- tests/hlsl/any.shader_test | 36 +++--- tests/hlsl/arithmetic-float-uniform.shader_test | 12 +- tests/hlsl/arithmetic-float.shader_test | 12 +- tests/hlsl/arithmetic-int-uniform.shader_test | 16 +-- tests/hlsl/arithmetic-int.shader_test | 20 ++-- tests/hlsl/arithmetic-uint.shader_test | 8 +- tests/hlsl/array-parameters.shader_test | 8 +- tests/hlsl/array-size-expr.shader_test | 6 +- tests/hlsl/asfloat.shader_test | 4 +- tests/hlsl/asuint.shader_test | 4 +- tests/hlsl/bitwise.shader_test | 24 ++-- tests/hlsl/bool-cast.shader_test | 6 +- tests/hlsl/bool-semantics.shader_test | 2 +- tests/hlsl/cast-broadcast.shader_test | 4 +- .../hlsl/cast-componentwise-compatible.shader_test | 46 ++++---- tests/hlsl/cast-componentwise-equal.shader_test | 10 +- tests/hlsl/cast-to-float.shader_test | 4 +- tests/hlsl/cast-to-half.shader_test | 4 +- tests/hlsl/cast-to-int.shader_test | 6 +- tests/hlsl/cast-to-uint.shader_test | 4 +- tests/hlsl/cbuffer.shader_test | 30 ++--- tests/hlsl/ceil.shader_test | 8 +- tests/hlsl/cf-cond-types.shader_test | 4 +- tests/hlsl/clamp.shader_test | 4 +- tests/hlsl/clip.shader_test | 8 +- tests/hlsl/combined-samplers.shader_test | 12 +- tests/hlsl/comma.shader_test | 2 +- tests/hlsl/compute.shader_test | 2 +- tests/hlsl/conditional.shader_test | 10 +- tests/hlsl/const.shader_test | 2 +- tests/hlsl/cross.shader_test | 4 +- tests/hlsl/d3dcolor-to-ubyte4.shader_test | 4 +- tests/hlsl/ddxddy.shader_test | 8 +- tests/hlsl/determinant.shader_test | 14 +-- tests/hlsl/discard.shader_test | 4 +- tests/hlsl/distance.shader_test | 2 +- tests/hlsl/dot.shader_test | 14 +-- tests/hlsl/duplicate-modifiers.shader_test | 2 +- tests/hlsl/entry-point-semantics.shader_test | 18 +-- tests/hlsl/exp.shader_test | 4 +- tests/hlsl/expr-indexing.shader_test | 14 +-- tests/hlsl/float-comparison.shader_test | 4 +- tests/hlsl/floor.shader_test | 8 +- tests/hlsl/fmod.shader_test | 8 +- tests/hlsl/for.shader_test | 6 +- tests/hlsl/frac.shader_test | 2 +- tests/hlsl/function-return.shader_test | 38 +++--- tests/hlsl/function.shader_test | 14 +-- tests/hlsl/fwidth.shader_test | 2 +- tests/hlsl/gather-offset.shader_test | 14 +-- tests/hlsl/gather.shader_test | 12 +- tests/hlsl/getdimensions.shader_test | 4 +- tests/hlsl/half.shader_test | 2 +- tests/hlsl/hard-copy-prop.shader_test | 12 +- tests/hlsl/initializer-flatten.shader_test | 10 +- tests/hlsl/initializer-implicit-array.shader_test | 8 +- .../hlsl/initializer-invalid-arg-count.shader_test | 4 +- tests/hlsl/initializer-local-array.shader_test | 4 +- tests/hlsl/initializer-matrix.shader_test | 12 +- tests/hlsl/initializer-multi.shader_test | 6 +- tests/hlsl/initializer-nested.shader_test | 6 +- tests/hlsl/initializer-numeric.shader_test | 12 +- tests/hlsl/initializer-objects.shader_test | 4 +- tests/hlsl/initializer-static-array.shader_test | 4 +- tests/hlsl/initializer-struct.shader_test | 6 +- tests/hlsl/intrinsic-override.shader_test | 6 +- tests/hlsl/inverse-trig.shader_test | 60 +++++----- tests/hlsl/is-front-face.shader_test | 4 +- tests/hlsl/ldexp.shader_test | 6 +- tests/hlsl/length.shader_test | 10 +- tests/hlsl/lerp.shader_test | 6 +- tests/hlsl/lit.shader_test | 8 +- tests/hlsl/load-level.shader_test | 6 +- tests/hlsl/log.shader_test | 6 +- tests/hlsl/logic-operations.shader_test | 24 ++-- tests/hlsl/loop.shader_test | 14 +-- tests/hlsl/majority-pragma.shader_test | 30 ++--- tests/hlsl/majority-syntax.shader_test | 2 +- tests/hlsl/majority-typedef.shader_test | 2 +- tests/hlsl/math.shader_test | 2 +- tests/hlsl/matrix-indexing.shader_test | 18 +-- tests/hlsl/matrix-semantics.shader_test | 12 +- tests/hlsl/max.shader_test | 6 +- tests/hlsl/minimum-precision.shader_test | 4 +- tests/hlsl/mul.shader_test | 40 +++---- tests/hlsl/multiple-rt.shader_test | 2 +- tests/hlsl/nested-arrays.shader_test | 2 +- tests/hlsl/nointerpolation.shader_test | 10 +- tests/hlsl/non-const-indexing.shader_test | 48 ++++---- tests/hlsl/normalize.shader_test | 10 +- .../numeric-constructor-truncation.shader_test | 4 +- tests/hlsl/numeric-types.shader_test | 10 +- tests/hlsl/numthreads.shader_test | 2 +- tests/hlsl/object-field-offsets.shader_test | 6 +- tests/hlsl/object-references.shader_test | 10 +- tests/hlsl/pow.shader_test | 4 +- tests/hlsl/precise-modifier.shader_test | 6 +- tests/hlsl/rasteriser-ordered-views.shader_test | 2 +- tests/hlsl/reflect.shader_test | 12 +- .../hlsl/register-reservations-numeric.shader_test | 12 +- .../register-reservations-resources.shader_test | 20 ++-- tests/hlsl/return-implicit-conversion.shader_test | 28 ++--- tests/hlsl/return.shader_test | 50 ++++---- tests/hlsl/round.shader_test | 6 +- tests/hlsl/sample-bias.shader_test | 6 +- tests/hlsl/sample-cmp.shader_test | 20 ++-- tests/hlsl/sample-grad.shader_test | 6 +- tests/hlsl/sample-level.shader_test | 12 +- tests/hlsl/sampler-offset.shader_test | 6 +- tests/hlsl/sampler.shader_test | 4 +- tests/hlsl/saturate.shader_test | 4 +- tests/hlsl/shader-interstage-interface.shader_test | 2 +- tests/hlsl/shape.shader_test | 54 ++++----- tests/hlsl/side-effects.shader_test | 6 +- tests/hlsl/sign.shader_test | 20 ++-- tests/hlsl/single-numeric-initializer.shader_test | 4 +- tests/hlsl/sm1-const-folding.shader_test | 24 ++-- tests/hlsl/smoothstep.shader_test | 18 +-- tests/hlsl/sqrt.shader_test | 4 +- tests/hlsl/srv-buffers.shader_test | 14 +-- tests/hlsl/state-block-syntax.shader_test | 2 +- tests/hlsl/static-initializer.shader_test | 8 +- tests/hlsl/step.shader_test | 6 +- tests/hlsl/storage-qualifiers.shader_test | 4 +- tests/hlsl/struct-array.shader_test | 2 +- tests/hlsl/struct-assignment.shader_test | 2 +- tests/hlsl/struct-semantics.shader_test | 2 +- tests/hlsl/switch.shader_test | 58 ++++----- tests/hlsl/swizzle-constant-prop.shader_test | 6 +- tests/hlsl/swizzle-matrix.shader_test | 10 +- tests/hlsl/swizzles.shader_test | 24 ++-- tests/hlsl/ternary.shader_test | 28 ++--- tests/hlsl/texture-load-offset.shader_test | 4 +- tests/hlsl/texture-load-typed.shader_test | 4 +- tests/hlsl/texture-load.shader_test | 8 +- tests/hlsl/texture-ordering.shader_test | 10 +- tests/hlsl/transpose.shader_test | 10 +- tests/hlsl/trigonometry.shader_test | 8 +- tests/hlsl/trunc.shader_test | 8 +- tests/hlsl/type-names.shader_test | 2 +- tests/hlsl/uav-load.shader_test | 2 +- tests/hlsl/uav-out-param.shader_test | 4 +- tests/hlsl/uav-rwbuffer.shader_test | 4 +- tests/hlsl/uav-rwtexture.shader_test | 10 +- tests/hlsl/uniform-parameters.shader_test | 4 +- tests/hlsl/uniform-semantics.shader_test | 4 +- tests/hlsl/vector-indexing-uniform.shader_test | 2 +- tests/hlsl/vector-indexing.shader_test | 6 +- tests/hlsl/vertex-shader-ops.shader_test | 14 +-- tests/hlsl/writemask-assignop-0.shader_test | 2 +- tests/hlsl/writemask-assignop-1.shader_test | 2 +- tests/hlsl/writemask-assignop-2.shader_test | 2 +- tests/hlsl/writemask-assignop-3.shader_test | 2 +- tests/shader_runner.c | 108 ++++++++++++----- tests/shader_runner.h | 3 + tests/shader_runner_gl.c | 129 +++++++++++++++++---- 159 files changed, 989 insertions(+), 859 deletions(-)

1 0

Hans Leidekker : ntdll/tests: Load NtMakeTemporaryObject() dynamically.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: 4fdb45f23ffe7a0578404f6a8fc08e904fc7f962 URL: https://gitlab.winehq.org/wine/wine/-/commit/4fdb45f23ffe7a0578404f6a8fc08e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 19 11:25:46 2024 +0100 ntdll/tests: Load NtMakeTemporaryObject() dynamically. --- dlls/ntdll/tests/om.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 3f416f75f0f..d9bcce6d365 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -72,6 +72,7 @@ static NTSTATUS (WINAPI *pNtOpenThreadToken)(HANDLE,DWORD,BOOLEAN,HANDLE*); static NTSTATUS (WINAPI *pNtDuplicateToken)(HANDLE,ACCESS_MASK,OBJECT_ATTRIBUTES*,BOOLEAN,TOKEN_TYPE,HANDLE*); static NTSTATUS (WINAPI *pNtDuplicateObject)(HANDLE,HANDLE,HANDLE,HANDLE*,ACCESS_MASK,ULONG,ULONG); static NTSTATUS (WINAPI *pNtCompareObjects)(HANDLE,HANDLE); +static NTSTATUS (WINAPI *pNtMakeTemporaryObject)(HANDLE); #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 @@ -3258,6 +3259,12 @@ static void test_object_permanence(void) NTSTATUS status; BOOL creatpermapriv = FALSE; + if (!pNtMakeTemporaryObject) + { + win_skip( "NtMakeTemporaryObject is not available.\n" ); + return; + } + status = NtOpenProcessToken( GetCurrentProcess(), TOKEN_DUPLICATE, &process_token ); ok( status == STATUS_SUCCESS, "NtOpenProcessToken returned %08lx\n", status ); @@ -3320,7 +3327,7 @@ static void test_object_permanence(void) if (test->make_temp_status == STATUS_SUCCESS) ok( !!(obi.GrantedAccess & DELETE), "expected DELETE access in %08lx\n", obi.GrantedAccess ); - status = NtMakeTemporaryObject( handle ); + status = pNtMakeTemporaryObject( handle ); todo_wine_if(test->make_temp_status == STATUS_ACCESS_DENIED) ok( status == test->make_temp_status, "NtMakeTemporaryObject returned %08lx\n", status ); if (!NT_ERROR(status)) is_permanent = FALSE; @@ -3372,7 +3379,7 @@ static void test_object_permanence(void) ok( obi_new.Attributes == expect_attr, "expected attr %08lx, got %08lx\n", expect_attr, obi_new.Attributes ); /* ensure object is deleted */ - NtMakeTemporaryObject( handle ); + pNtMakeTemporaryObject( handle ); NtClose( handle ); } winetest_pop_context(); @@ -3429,6 +3436,7 @@ START_TEST(om) pNtDuplicateToken = (void *)GetProcAddress(hntdll, "NtDuplicateToken"); pNtDuplicateObject = (void *)GetProcAddress(hntdll, "NtDuplicateObject"); pNtCompareObjects = (void *)GetProcAddress(hntdll, "NtCompareObjects"); + pNtMakeTemporaryObject = (void *)GetProcAddress(hntdll, "NtMakeTemporaryObject"); test_null_in_object_name(); test_case_sensitive();

1 0

Rémi Bernon : mfplat/tests: Test that aperture is dropped with VIDEOINFOHEADER2.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: 7598556b64834e432b7a144d33af4996b5dda9a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/7598556b64834e432b7a144d33af49… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 6 23:13:04 2024 +0100 mfplat/tests: Test that aperture is dropped with VIDEOINFOHEADER2. But preserved with MFVIDEOFORMAT. --- dlls/mfplat/tests/mfplat.c | 47 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 14873422d04..39fb439b65a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -7143,8 +7143,10 @@ static void test_MFInitAMMediaTypeFromMFMediaType(void) WAVEFORMATEXTENSIBLE *wave_format_ext; VIDEOINFOHEADER *video_info; WAVEFORMATEX *wave_format; - IMFMediaType *media_type; + IMFMediaType *media_type, *other_type; AM_MEDIA_TYPE am_type; + MFVideoArea *area; + UINT32 value32; HRESULT hr; hr = MFCreateMediaType(&media_type); @@ -7713,6 +7715,49 @@ static void test_MFInitAMMediaTypeFromMFMediaType(void) CoTaskMemFree(am_type.pbFormat); IMFMediaType_DeleteAllItems(media_type); + /* aperture is lost with VIDEOINFOHEADER(2), preserved with MFVIDEOFORMAT */ + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFVideoFormat_NV12); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)1920 << 32 | 1088); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetBlob(media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (BYTE *)&aperture, sizeof(aperture)); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = MFCreateMediaType(&other_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = MFInitAMMediaTypeFromMFMediaType(media_type, FORMAT_VideoInfo, &am_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFInitMediaTypeFromAMMediaType(other_type, &am_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_GetAllocatedBlob(other_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (BYTE **)&area, &value32); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + IMFMediaType_DeleteAllItems(other_type); + CoTaskMemFree(am_type.pbFormat); + + hr = MFInitAMMediaTypeFromMFMediaType(media_type, FORMAT_VideoInfo2, &am_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFInitMediaTypeFromAMMediaType(other_type, &am_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_GetAllocatedBlob(other_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (BYTE **)&area, &value32); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + IMFMediaType_DeleteAllItems(other_type); + CoTaskMemFree(am_type.pbFormat); + + hr = MFInitAMMediaTypeFromMFMediaType(media_type, FORMAT_MFVideoFormat, &am_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFInitMediaTypeFromAMMediaType(other_type, &am_type); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_GetAllocatedBlob(other_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (BYTE **)&area, &value32); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr == S_OK) CoTaskMemFree(area); + IMFMediaType_DeleteAllItems(other_type); + CoTaskMemFree(am_type.pbFormat); + + IMFMediaType_Release(other_type); + IMFMediaType_Release(media_type); }

1 0

Rémi Bernon : mfplat/tests: Test that MFCreateMFVideoFormatFromMFMediaType appends user data.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: 75a5263c60882e4ed6e523ad69bf2dc0fb019a42 URL: https://gitlab.winehq.org/wine/wine/-/commit/75a5263c60882e4ed6e523ad69bf2d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 7 22:46:07 2024 +0100 mfplat/tests: Test that MFCreateMFVideoFormatFromMFMediaType appends user data. --- dlls/mfplat/tests/mfplat.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 39fb439b65a..860a7424170 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -7120,16 +7120,43 @@ static void test_MFCreateMFVideoFormatFromMFMediaType(void) { MFVIDEOFORMAT *video_format; IMFMediaType *media_type; - UINT32 size; + UINT32 size, expect_size; + PALETTEENTRY palette[64]; + BYTE codec_data[32]; HRESULT hr; + hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "Failed to create media type, hr %#lx.\n", hr); + expect_size = sizeof(*video_format); + hr = MFCreateMFVideoFormatFromMFMediaType(media_type, &video_format, &size); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!video_format, "Unexpected format.\n"); + ok(size == expect_size, "Unexpected size %u.\n", size); + ok(video_format->dwSize == size, "Unexpected size %u.\n", size); + CoTaskMemFree(video_format); + + memset(palette, 0xa5, sizeof(palette)); + expect_size = offsetof(MFVIDEOFORMAT, surfaceInfo.Palette[ARRAY_SIZE(palette) + 1]); + hr = IMFMediaType_SetBlob(media_type, &MF_MT_PALETTE, (BYTE *)palette, sizeof(palette)); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFCreateMFVideoFormatFromMFMediaType(media_type, &video_format, &size); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!video_format, "Unexpected format.\n"); + todo_wine ok(size == expect_size, "Unexpected size %u.\n", size); + ok(video_format->dwSize == size, "Unexpected size %u.\n", size); + CoTaskMemFree(video_format); + + memset(codec_data, 0xcd, sizeof(codec_data)); + expect_size += sizeof(codec_data); + hr = IMFMediaType_SetBlob(media_type, &MF_MT_USER_DATA, codec_data, sizeof(codec_data)); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFCreateMFVideoFormatFromMFMediaType(media_type, &video_format, &size); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!video_format, "Unexpected format.\n"); - ok(video_format->dwSize == size && size == sizeof(*video_format), "Unexpected size %u.\n", size); + todo_wine ok(size == expect_size, "Unexpected size %u.\n", size); + ok(video_format->dwSize == size, "Unexpected size %u.\n", size); CoTaskMemFree(video_format); IMFMediaType_Release(media_type);

1 0

Rémi Bernon : mfplat/mediatype: Append user data in MFCreateMFVideoFormatFromMFMediaType.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: b1d7c03514b7f7a5a490c9208a80fdc9c7a38d3d URL: https://gitlab.winehq.org/wine/wine/-/commit/b1d7c03514b7f7a5a490c9208a80fd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 12 19:40:24 2024 +0100 mfplat/mediatype: Append user data in MFCreateMFVideoFormatFromMFMediaType. --- dlls/mfplat/mediatype.c | 16 ++++++++++++---- dlls/mfplat/tests/mfplat.c | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 35fce38652b..b550649022f 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3247,17 +3247,20 @@ static UINT32 media_type_get_uint32(IMFMediaType *media_type, REFGUID guid) */ HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MFVIDEOFORMAT **video_format, UINT32 *size) { - UINT32 palette_size = 0; + UINT32 palette_size = 0, user_data_size = 0; MFVIDEOFORMAT *format; INT32 stride; GUID guid; TRACE("%p, %p, %p.\n", media_type, video_format, size); - *size = sizeof(*format); - if (SUCCEEDED(IMFMediaType_GetBlobSize(media_type, &MF_MT_PALETTE, &palette_size))) - *size += palette_size; + *size = offsetof(MFVIDEOFORMAT, surfaceInfo.Palette[palette_size / sizeof(MFPaletteEntry) + 1]); + else + *size = sizeof(*format); + + if (SUCCEEDED(IMFMediaType_GetBlobSize(media_type, &MF_MT_USER_DATA, &user_data_size))) + *size += user_data_size; if (!(format = CoTaskMemAlloc(*size))) return E_OUTOFMEMORY; @@ -3316,6 +3319,11 @@ HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MF IMFMediaType_GetBlob(media_type, &MF_MT_PALETTE, (UINT8 *)format->surfaceInfo.Palette, palette_size, NULL); } + if (user_data_size) + { + IMFMediaType_GetBlob(media_type, &MF_MT_USER_DATA, (UINT8 *)format + *size - user_data_size, user_data_size, NULL); + } + return S_OK; } diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 860a7424170..4e580d5d2b9 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -7144,7 +7144,7 @@ static void test_MFCreateMFVideoFormatFromMFMediaType(void) hr = MFCreateMFVideoFormatFromMFMediaType(media_type, &video_format, &size); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!video_format, "Unexpected format.\n"); - todo_wine ok(size == expect_size, "Unexpected size %u.\n", size); + ok(size == expect_size, "Unexpected size %u.\n", size); ok(video_format->dwSize == size, "Unexpected size %u.\n", size); CoTaskMemFree(video_format); @@ -7155,7 +7155,7 @@ static void test_MFCreateMFVideoFormatFromMFMediaType(void) hr = MFCreateMFVideoFormatFromMFMediaType(media_type, &video_format, &size); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!video_format, "Unexpected format.\n"); - todo_wine ok(size == expect_size, "Unexpected size %u.\n", size); + ok(size == expect_size, "Unexpected size %u.\n", size); ok(video_format->dwSize == size, "Unexpected size %u.\n", size); CoTaskMemFree(video_format);

1 0

Rémi Bernon : mfplat/tests: Check the conditions for the MFVideoFlag_BottomUpLinearRep flags.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: fe0c129e0bfcdf38360b2ebca33e2a3c0d2c43bf URL: https://gitlab.winehq.org/wine/wine/-/commit/fe0c129e0bfcdf38360b2ebca33e2a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 19 10:18:09 2024 +0100 mfplat/tests: Check the conditions for the MFVideoFlag_BottomUpLinearRep flags. --- dlls/mfplat/tests/mfplat.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 4e580d5d2b9..dcdb886ae41 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -7137,6 +7137,37 @@ static void test_MFCreateMFVideoFormatFromMFMediaType(void) ok(video_format->dwSize == size, "Unexpected size %u.\n", size); CoTaskMemFree(video_format); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)123 << 32 | 456); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_SAMPLE_SIZE, 123 * 456 * 4); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFCreateMFVideoFormatFromMFMediaType(media_type, &video_format, &size); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(video_format->videoInfo.dwWidth == 123, "got %lu.\n", video_format->videoInfo.dwWidth); + ok(video_format->videoInfo.dwHeight == 456, "got %lu.\n", video_format->videoInfo.dwHeight); + ok(video_format->videoInfo.VideoFlags == 0, "got %#I64x.\n", video_format->videoInfo.VideoFlags); + CoTaskMemFree(video_format); + + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, 123 * 4); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFCreateMFVideoFormatFromMFMediaType(media_type, &video_format, &size); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(video_format->videoInfo.VideoFlags == 0, "got %#I64x.\n", video_format->videoInfo.VideoFlags); + CoTaskMemFree(video_format); + + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, -123 * 4); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFCreateMFVideoFormatFromMFMediaType(media_type, &video_format, &size); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(video_format->videoInfo.VideoFlags == MFVideoFlag_BottomUpLinearRep, "got %#I64x.\n", video_format->videoInfo.VideoFlags); + CoTaskMemFree(video_format); + + memset(palette, 0xa5, sizeof(palette)); expect_size = offsetof(MFVIDEOFORMAT, surfaceInfo.Palette[ARRAY_SIZE(palette) + 1]); hr = IMFMediaType_SetBlob(media_type, &MF_MT_PALETTE, (BYTE *)palette, sizeof(palette));

1 0

Rémi Bernon : mfplat/mediatype: Stub MFInitMediaTypeFromMFVideoFormat.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: a712d7ec871e5bd87ec0edfdf1e95991faadbd43 URL: https://gitlab.winehq.org/wine/wine/-/commit/a712d7ec871e5bd87ec0edfdf1e959… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 5 23:03:31 2024 +0100 mfplat/mediatype: Stub MFInitMediaTypeFromMFVideoFormat. --- dlls/mfplat/mediatype.c | 9 +++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index b550649022f..edd249979eb 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3756,6 +3756,15 @@ HRESULT WINAPI MFCreateVideoMediaTypeFromVideoInfoHeader(const KS_VIDEOINFOHEADE return E_NOTIMPL; } +/*********************************************************************** + * MFInitMediaTypeFromMFVideoFormat (mfplat.@) + */ +HRESULT WINAPI MFInitMediaTypeFromMFVideoFormat(IMFMediaType *media_type, const MFVIDEOFORMAT *format, UINT32 size) +{ + FIXME("%p, %p, %u\n", media_type, format, size); + return E_NOTIMPL; +} + /*********************************************************************** * MFInitMediaTypeFromVideoInfoHeader2 (mfplat.@) */ diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 44d1b89fff5..d8a6eb5ce83 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -120,7 +120,7 @@ @ stdcall MFInitAMMediaTypeFromMFMediaType(ptr int128 ptr) @ stdcall MFInitAttributesFromBlob(ptr ptr long) @ stdcall MFInitMediaTypeFromAMMediaType(ptr ptr) -@ stub MFInitMediaTypeFromMFVideoFormat +@ stdcall MFInitMediaTypeFromMFVideoFormat(ptr ptr long) @ stub MFInitMediaTypeFromMPEG1VideoInfo @ stub MFInitMediaTypeFromMPEG2VideoInfo @ stdcall MFInitMediaTypeFromVideoInfoHeader2(ptr ptr long ptr) diff --git a/include/mfapi.h b/include/mfapi.h index 27b0f4fd841..f986edd0d5a 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -593,6 +593,7 @@ BOOL WINAPI MFIsFormatYUV(DWORD format); HRESULT WINAPI MFInitAttributesFromBlob(IMFAttributes *attributes, const UINT8 *buffer, UINT size); HRESULT WINAPI MFInitAMMediaTypeFromMFMediaType(IMFMediaType *media_type, GUID format, AM_MEDIA_TYPE *am_type); HRESULT WINAPI MFInitMediaTypeFromAMMediaType(IMFMediaType *mediatype, const AM_MEDIA_TYPE *am_type); +HRESULT WINAPI MFInitMediaTypeFromMFVideoFormat(IMFMediaType *media_type, const MFVIDEOFORMAT *format, UINT32 size); HRESULT WINAPI MFInitMediaTypeFromVideoInfoHeader(IMFMediaType *media_type, const VIDEOINFOHEADER *vih, UINT32 size, const GUID *subtype); HRESULT WINAPI MFInitMediaTypeFromVideoInfoHeader2(IMFMediaType *media_type, const VIDEOINFOHEADER2 *vih,

1 0

Rémi Bernon : mfplat/tests: Add tests for MFInitMediaTypeFromMFVideoFormat.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: 899abeafe42cfe9b2ca717bfdfc96ae79391eec5 URL: https://gitlab.winehq.org/wine/wine/-/commit/899abeafe42cfe9b2ca717bfdfc96a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 19 08:01:50 2024 +0100 mfplat/tests: Add tests for MFInitMediaTypeFromMFVideoFormat. --- dlls/mfplat/tests/mfplat.c | 557 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 557 insertions(+)

1 0

Rémi Bernon : mfplat/mediatype: Implement MFInitMediaTypeFromMFVideoFormat.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: eac5ad2a2618218028b7c563b5b3e0b6efafdf76 URL: https://gitlab.winehq.org/wine/wine/-/commit/eac5ad2a2618218028b7c563b5b3e0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 11 11:53:36 2024 +0100 mfplat/mediatype: Implement MFInitMediaTypeFromMFVideoFormat. --- dlls/mfplat/mediatype.c | 91 ++++++++++++++++++++++++++++++++++++- dlls/mfplat/tests/mfplat.c | 109 --------------------------------------------- 2 files changed, 89 insertions(+), 111 deletions(-)

1 0

Rémi Bernon : winebus: Add HID usages in the device descriptor when possible.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: d48e25083565e78a0553e2ab158907218a139748 URL: https://gitlab.winehq.org/wine/wine/-/commit/d48e25083565e78a0553e2ab158907… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 19 11:34:51 2024 +0100 winebus: Add HID usages in the device descriptor when possible. As a hint for the frontend to decide whether to use hidraw. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56450 --- dlls/winebus.sys/bus_iohid.c | 9 ++++----- dlls/winebus.sys/bus_sdl.c | 4 ++++ dlls/winebus.sys/bus_udev.c | 3 +++ dlls/winebus.sys/unixlib.h | 7 +++++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index a44944576e9..e7960e185e9 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -276,18 +276,17 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * }; struct iohid_device *impl; CFStringRef str; - UINT usage_page, usage; - usage_page = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDPrimaryUsagePageKey))); - usage = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDPrimaryUsageKey))); + desc.usages.UsagePage = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDPrimaryUsagePageKey))); + desc.usages.Usage = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDPrimaryUsageKey))); desc.vid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVendorIDKey))); desc.pid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDProductIDKey))); desc.version = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVersionNumberKey))); desc.uid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDLocationIDKey))); - if (usage_page != HID_USAGE_PAGE_GENERIC || - !(usage == HID_USAGE_GENERIC_JOYSTICK || usage == HID_USAGE_GENERIC_GAMEPAD)) + if (desc.usages.UsagePage != HID_USAGE_PAGE_GENERIC || + !(desc.usages.Usage == HID_USAGE_GENERIC_JOYSTICK || desc.usages.Usage == HID_USAGE_GENERIC_GAMEPAD)) { /* winebus isn't currently meant to handle anything but these, and * opening keyboards, mice, or the Touch Bar on older MacBooks triggers diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 7b43df82f83..2a60f112a83 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -990,6 +990,8 @@ static void sdl_add_device(unsigned int index) if (controller) { desc.is_gamepad = TRUE; + desc.usages.UsagePage = HID_USAGE_PAGE_GENERIC; + desc.usages.Usage = HID_USAGE_GENERIC_GAMEPAD; axis_count = 6; } else @@ -997,6 +999,8 @@ static void sdl_add_device(unsigned int index) int button_count = pSDL_JoystickNumButtons(joystick); axis_count = pSDL_JoystickNumAxes(joystick); desc.is_gamepad = (axis_count == 6 && button_count >= 14); + desc.usages.UsagePage = HID_USAGE_PAGE_GENERIC; + desc.usages.Usage = HID_USAGE_GENERIC_JOYSTICK; } for (axis_offset = 0; axis_offset < axis_count; axis_offset += (options.split_controllers ? 6 : axis_count)) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index f8c6ccb9060..419de2e7af3 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1332,6 +1332,7 @@ static void udev_add_device(struct udev_device *dev, int fd) #ifdef HAS_PROPER_INPUT_HEADER else if (!strcmp(subsystem, "input")) { + const USAGE_AND_PAGE device_usage = *what_am_I(dev, fd); static const WCHAR evdev[] = {'e','v','d','e','v',0}; struct input_id device_id = {0}; char buffer[MAX_PATH]; @@ -1352,6 +1353,8 @@ static void udev_add_device(struct udev_device *dev, int fd) if (!desc.serialnumber[0] && ioctl(fd, EVIOCGUNIQ(sizeof(buffer)), buffer) >= 0) ntdll_umbstowcs(buffer, strlen(buffer) + 1, desc.serialnumber, ARRAY_SIZE(desc.serialnumber)); + + desc.usages = device_usage; } #endif diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index 80852696dd1..753886304db 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -25,6 +25,7 @@ #include <winbase.h> #include <winternl.h> #include <ddk/hidclass.h> +#include <ddk/hidpi.h> #include <hidusage.h> #include "wine/debug.h" @@ -37,6 +38,7 @@ struct device_desc UINT version; UINT input; UINT uid; + USAGE_AND_PAGE usages; BOOL is_gamepad; BOOL is_hidraw; @@ -148,8 +150,9 @@ enum unix_funcs static inline const char *debugstr_device_desc(struct device_desc *desc) { if (!desc) return "(null)"; - return wine_dbg_sprintf("{vid %04x, pid %04x, version %04x, input %d, uid %08x, is_gamepad %u, is_hidraw %u}", - desc->vid, desc->pid, desc->version, desc->input, desc->uid, desc->is_gamepad, desc->is_hidraw); + return wine_dbg_sprintf("{vid %04x, pid %04x, version %04x, input %d, uid %08x, usage %04x:%04x, is_gamepad %u, is_hidraw %u}", + desc->vid, desc->pid, desc->version, desc->input, desc->uid, desc->usages.UsagePage, desc->usages.Usage, + desc->is_gamepad, desc->is_hidraw); } static inline BOOL is_xbox_gamepad(WORD vid, WORD pid)

1 0