[PATCH v2 0/2] MR6536: mfplat: Fill user data when converting VIDEOINFOHEADER formats.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56975 -- v2: mfplat: Fill user data when converting VIDEOINFOHEADER formats. mfplat/tests: Add tests for VIDEOINFOHEADER(2) user data conversion. https://gitlab.winehq.org/wine/wine/-/merge_requests/6536
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 192 ++++++++++++++++++++++++++++++++++++- 1 file changed, 190 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 6a2761e6613..494b4d7efc0 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -11608,9 +11608,14 @@ static void test_MFInitMediaTypeFromVideoInfoHeader(void) { static const MFVideoArea expect_aperture = {.OffsetX = {.value = 1}, .OffsetY = {.value = 2}, .Area = {.cx = 3, .cy = 5}}; static const RECT source = {1, 2, 4, 7}, target = {3, 2, 12, 9}; + static const PALETTEENTRY expect_palette[] = {{1},{2},{3},{4},{5},{6},{7},{8}}; + static const BYTE expect_user_data[] = {6,5,4,3,2,1}; + PALETTEENTRY palette[ARRAY_SIZE(expect_palette)]; + BYTE user_data[sizeof(expect_user_data)]; + char buffer[sizeof(VIDEOINFOHEADER2) + sizeof(user_data) + sizeof(palette)]; IMFMediaType *media_type; MFVideoArea aperture; - VIDEOINFOHEADER vih; + VIDEOINFOHEADER vih, *vih_buf = (VIDEOINFOHEADER *)buffer; UINT32 value32; UINT64 value64; HRESULT hr; @@ -11625,6 +11630,25 @@ static void test_MFInitMediaTypeFromVideoInfoHeader(void) hr = MFInitMediaTypeFromVideoInfoHeader(media_type, &vih, sizeof(vih), NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + /* bmiHeader.biSize and the size parameter are checked together */ + vih.bmiHeader.biSize = 1; + hr = MFInitMediaTypeFromVideoInfoHeader(media_type, &vih, sizeof(vih), &GUID_NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + vih.bmiHeader.biSize = sizeof(vih.bmiHeader) - 1; + hr = MFInitMediaTypeFromVideoInfoHeader(media_type, &vih, sizeof(vih), &GUID_NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + vih.bmiHeader.biSize = sizeof(vih.bmiHeader); + hr = MFInitMediaTypeFromVideoInfoHeader(media_type, &vih, sizeof(vih), &GUID_NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + vih.bmiHeader.biSize = sizeof(vih.bmiHeader) - 1; + hr = MFInitMediaTypeFromVideoInfoHeader(media_type, &vih, sizeof(vih) - 1, &GUID_NULL); + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + *vih_buf = vih; + vih_buf->bmiHeader.biSize = sizeof(vih.bmiHeader) + 1; + hr = MFInitMediaTypeFromVideoInfoHeader(media_type, vih_buf, sizeof(*vih_buf) + 1, &GUID_NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + vih.bmiHeader.biSize = 0; hr = MFInitMediaTypeFromVideoInfoHeader(media_type, &vih, sizeof(vih), &GUID_NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_GetGUID(media_type, &MF_MT_MAJOR_TYPE, &guid); @@ -11852,6 +11876,76 @@ static void test_MFInitMediaTypeFromVideoInfoHeader(void) winetest_pop_context(); } + hr = IMFMediaType_GetItem(media_type, &MF_MT_USER_DATA, NULL); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_GetItem(media_type, &MF_MT_PALETTE, NULL); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + + *vih_buf = vih; + vih_buf->bmiHeader.biCompression = BI_RGB; + vih_buf->bmiHeader.biBitCount = 24; + hr = MFInitMediaTypeFromVideoInfoHeader(media_type, vih_buf, sizeof(*vih_buf), NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + memcpy( vih_buf + 1, expect_palette, sizeof(expect_palette) ); + vih_buf->bmiHeader.biClrUsed = ARRAY_SIZE(expect_palette); + + /* palette only works with 8bit RGB format */ + vih_buf->bmiHeader.biSize = sizeof(vih_buf->bmiHeader) + sizeof(expect_palette); + hr = MFInitMediaTypeFromVideoInfoHeader(media_type, vih_buf, sizeof(*vih_buf) + sizeof(expect_palette), NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_GetItem(media_type, &MF_MT_PALETTE, NULL); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + value32 = 0xdeadbeef; + memset(palette, 0xcd, sizeof(palette)); + hr = IMFMediaType_GetBlob(media_type, &MF_MT_USER_DATA, (BYTE *)palette, sizeof(palette), &value32); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(value32 == sizeof(expect_palette), "got %u.\n", value32); + todo_wine ok(!memcmp(palette, expect_palette, value32), "Unexpected user data.\n"); + + vih_buf->bmiHeader.biBitCount = 16; + hr = MFInitMediaTypeFromVideoInfoHeader(media_type, vih_buf, sizeof(*vih_buf) + sizeof(expect_palette), NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_GetItem(media_type, &MF_MT_PALETTE, NULL); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + value32 = 0xdeadbeef; + memset(palette, 0xcd, sizeof(palette)); + hr = IMFMediaType_GetBlob(media_type, &MF_MT_USER_DATA, (BYTE *)palette, sizeof(palette), &value32); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(value32 == sizeof(expect_palette), "got %u.\n", value32); + todo_wine ok(!memcmp(palette, expect_palette, value32), "Unexpected user data.\n"); + + /* palette shouldn't be accounted for in the header size */ + vih_buf->bmiHeader.biBitCount = 8; + hr = MFInitMediaTypeFromVideoInfoHeader(media_type, vih_buf, sizeof(*vih_buf) + sizeof(expect_palette), NULL); + todo_wine ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#lx.\n", hr); + vih_buf->bmiHeader.biSize = sizeof(vih_buf->bmiHeader); + hr = MFInitMediaTypeFromVideoInfoHeader(media_type, vih_buf, sizeof(*vih_buf) + sizeof(expect_palette), NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_GetItem(media_type, &MF_MT_USER_DATA, NULL); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + value32 = 0xdeadbeef; + memset(palette, 0xcd, sizeof(palette)); + hr = IMFMediaType_GetBlob(media_type, &MF_MT_PALETTE, (BYTE *)palette, sizeof(palette), &value32); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(value32 == sizeof(expect_palette), "got %u.\n", value32); + todo_wine ok(!memcmp(palette, expect_palette, value32), "Unexpected palette.\n"); + + /* cannot have both user data and palette */ + memcpy( vih_buf + 1, expect_user_data, sizeof(expect_user_data) ); + memcpy( (BYTE *)(vih_buf + 1) + sizeof(expect_user_data), expect_palette, sizeof(expect_palette) ); + vih_buf->bmiHeader.biSize = sizeof(vih_buf->bmiHeader) + sizeof(expect_user_data); + hr = MFInitMediaTypeFromVideoInfoHeader(media_type, vih_buf, sizeof(*vih_buf) + sizeof(expect_user_data) + sizeof(expect_palette), NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_GetItem(media_type, &MF_MT_USER_DATA, NULL); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + value32 = 0xdeadbeef; + memset(palette, 0xcd, sizeof(palette)); + hr = IMFMediaType_GetBlob(media_type, &MF_MT_PALETTE, (BYTE *)palette, sizeof(palette), &value32); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(value32 == sizeof(expect_palette), "got %u.\n", value32); + todo_wine ok(!memcmp(palette, expect_palette, value32), "Unexpected palette.\n"); + IMFMediaType_Release(media_type); } @@ -11859,8 +11953,13 @@ static void test_MFInitMediaTypeFromVideoInfoHeader2(void) { static const MFVideoArea expect_aperture = {.OffsetX = {.value = 1}, .OffsetY = {.value = 2}, .Area = {.cx = 3, .cy = 5}}; static const RECT source = {1, 2, 4, 7}, target = {3, 2, 12, 9}; + static const RGBQUAD expect_palette[] = {{1},{2},{3},{4},{5},{6},{7},{8}}; + static const BYTE expect_user_data[] = {6,5,4,3,2,1}; + RGBQUAD palette[ARRAY_SIZE(expect_palette)]; + BYTE user_data[sizeof(expect_user_data)]; + char buffer[sizeof(VIDEOINFOHEADER2) + sizeof(palette) + sizeof(user_data)]; IMFMediaType *media_type; - VIDEOINFOHEADER2 vih; + VIDEOINFOHEADER2 vih, *vih_buf = (VIDEOINFOHEADER2 *)buffer; MFVideoArea aperture; UINT32 value32; UINT64 value64; @@ -11876,6 +11975,25 @@ static void test_MFInitMediaTypeFromVideoInfoHeader2(void) hr = MFInitMediaTypeFromVideoInfoHeader2(media_type, &vih, sizeof(vih), NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + /* bmiHeader.biSize and the size parameter are checked together */ + vih.bmiHeader.biSize = 1; + hr = MFInitMediaTypeFromVideoInfoHeader2(media_type, &vih, sizeof(vih), &GUID_NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + vih.bmiHeader.biSize = sizeof(vih.bmiHeader) - 1; + hr = MFInitMediaTypeFromVideoInfoHeader2(media_type, &vih, sizeof(vih), &GUID_NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + vih.bmiHeader.biSize = sizeof(vih.bmiHeader); + hr = MFInitMediaTypeFromVideoInfoHeader2(media_type, &vih, sizeof(vih), &GUID_NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + vih.bmiHeader.biSize = sizeof(vih.bmiHeader) - 1; + hr = MFInitMediaTypeFromVideoInfoHeader2(media_type, &vih, sizeof(vih) - 1, &GUID_NULL); + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + *vih_buf = vih; + vih_buf->bmiHeader.biSize = sizeof(vih.bmiHeader) + 1; + hr = MFInitMediaTypeFromVideoInfoHeader2(media_type, vih_buf, sizeof(*vih_buf) + 1, &GUID_NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + vih.bmiHeader.biSize = 0; hr = MFInitMediaTypeFromVideoInfoHeader2(media_type, &vih, sizeof(vih), &GUID_NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_GetGUID(media_type, &MF_MT_MAJOR_TYPE, &guid); @@ -12152,6 +12270,76 @@ static void test_MFInitMediaTypeFromVideoInfoHeader2(void) winetest_pop_context(); } + hr = IMFMediaType_GetItem(media_type, &MF_MT_USER_DATA, NULL); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_GetItem(media_type, &MF_MT_PALETTE, NULL); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + + *vih_buf = vih; + vih_buf->bmiHeader.biCompression = BI_RGB; + vih_buf->bmiHeader.biBitCount = 24; + hr = MFInitMediaTypeFromVideoInfoHeader2(media_type, vih_buf, sizeof(*vih_buf), NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + memcpy( vih_buf + 1, expect_palette, sizeof(expect_palette) ); + vih_buf->bmiHeader.biClrUsed = ARRAY_SIZE(expect_palette); + + /* palette only works with 8bit RGB format */ + vih_buf->bmiHeader.biSize = sizeof(vih_buf->bmiHeader) + sizeof(expect_palette); + hr = MFInitMediaTypeFromVideoInfoHeader2(media_type, vih_buf, sizeof(*vih_buf) + sizeof(expect_palette), NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_GetItem(media_type, &MF_MT_PALETTE, NULL); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + value32 = 0xdeadbeef; + memset(palette, 0xcd, sizeof(palette)); + hr = IMFMediaType_GetBlob(media_type, &MF_MT_USER_DATA, (BYTE *)palette, sizeof(palette), &value32); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(value32 == sizeof(expect_palette), "got %u.\n", value32); + todo_wine ok(!memcmp(palette, expect_palette, value32), "Unexpected user data.\n"); + + vih_buf->bmiHeader.biBitCount = 16; + hr = MFInitMediaTypeFromVideoInfoHeader2(media_type, vih_buf, sizeof(*vih_buf) + sizeof(expect_palette), NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_GetItem(media_type, &MF_MT_PALETTE, NULL); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + value32 = 0xdeadbeef; + memset(palette, 0xcd, sizeof(palette)); + hr = IMFMediaType_GetBlob(media_type, &MF_MT_USER_DATA, (BYTE *)palette, sizeof(palette), &value32); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(value32 == sizeof(expect_palette), "got %u.\n", value32); + todo_wine ok(!memcmp(palette, expect_palette, value32), "Unexpected user data.\n"); + + /* palette shouldn't be accounted for in the header size */ + vih_buf->bmiHeader.biBitCount = 8; + hr = MFInitMediaTypeFromVideoInfoHeader2(media_type, vih_buf, sizeof(*vih_buf) + sizeof(expect_palette), NULL); + todo_wine ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#lx.\n", hr); + vih_buf->bmiHeader.biSize = sizeof(vih_buf->bmiHeader); + hr = MFInitMediaTypeFromVideoInfoHeader2(media_type, vih_buf, sizeof(*vih_buf) + sizeof(expect_palette), NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_GetItem(media_type, &MF_MT_USER_DATA, NULL); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + value32 = 0xdeadbeef; + memset(palette, 0xcd, sizeof(palette)); + hr = IMFMediaType_GetBlob(media_type, &MF_MT_PALETTE, (BYTE *)palette, sizeof(palette), &value32); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(value32 == sizeof(expect_palette), "got %u.\n", value32); + todo_wine ok(!memcmp(palette, expect_palette, value32), "Unexpected palette.\n"); + + /* cannot have both user data and palette */ + memcpy( vih_buf + 1, expect_user_data, sizeof(expect_user_data) ); + memcpy( (BYTE *)(vih_buf + 1) + sizeof(expect_user_data), expect_palette, sizeof(expect_palette) ); + vih_buf->bmiHeader.biSize = sizeof(vih_buf->bmiHeader) + sizeof(expect_user_data); + hr = MFInitMediaTypeFromVideoInfoHeader2(media_type, vih_buf, sizeof(*vih_buf) + sizeof(expect_user_data) + sizeof(expect_palette), NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_GetItem(media_type, &MF_MT_USER_DATA, NULL); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + value32 = 0xdeadbeef; + memset(palette, 0xcd, sizeof(palette)); + hr = IMFMediaType_GetBlob(media_type, &MF_MT_PALETTE, (BYTE *)palette, sizeof(palette), &value32); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(value32 == sizeof(expect_palette), "got %u.\n", value32); + todo_wine ok(!memcmp(palette, expect_palette, value32), "Unexpected palette.\n"); + IMFMediaType_Release(media_type); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6536
From: Rémi Bernon <rbernon(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56975 --- dlls/mfplat/mediatype.c | 6 +++++- dlls/mfplat/tests/mfplat.c | 32 ++++++++++++++++---------------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 3944d64849e..916ab77408d 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3992,6 +3992,7 @@ HRESULT WINAPI MFInitMediaTypeFromVideoInfoHeader2(IMFMediaType *media_type, con else FIXME("dwInterlaceFlags %#lx not implemented\n", vih->dwInterlaceFlags); + if (size > sizeof(*vih)) mediatype_set_blob(media_type, &MF_MT_USER_DATA, (BYTE *)(vih + 1), size - sizeof(*vih), &hr); return hr; } @@ -4010,10 +4011,13 @@ HRESULT WINAPI MFInitMediaTypeFromVideoInfoHeader(IMFMediaType *media_type, cons .AvgTimePerFrame = vih->AvgTimePerFrame, .bmiHeader = vih->bmiHeader, }; + HRESULT hr; TRACE("%p, %p, %u, %s.\n", media_type, vih, size, debugstr_guid(subtype)); - return MFInitMediaTypeFromVideoInfoHeader2(media_type, &vih2, sizeof(vih2), subtype); + hr = MFInitMediaTypeFromVideoInfoHeader2(media_type, &vih2, sizeof(vih2), subtype); + if (size > sizeof(*vih)) mediatype_set_blob(media_type, &MF_MT_USER_DATA, (BYTE *)(vih + 1), size - sizeof(*vih), &hr); + return hr; } /*********************************************************************** diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 494b4d7efc0..19d82c3d324 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -11899,9 +11899,9 @@ static void test_MFInitMediaTypeFromVideoInfoHeader(void) value32 = 0xdeadbeef; memset(palette, 0xcd, sizeof(palette)); hr = IMFMediaType_GetBlob(media_type, &MF_MT_USER_DATA, (BYTE *)palette, sizeof(palette), &value32); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(value32 == sizeof(expect_palette), "got %u.\n", value32); - todo_wine ok(!memcmp(palette, expect_palette, value32), "Unexpected user data.\n"); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value32 == sizeof(expect_palette), "got %u.\n", value32); + ok(!memcmp(palette, expect_palette, value32), "Unexpected user data.\n"); vih_buf->bmiHeader.biBitCount = 16; hr = MFInitMediaTypeFromVideoInfoHeader(media_type, vih_buf, sizeof(*vih_buf) + sizeof(expect_palette), NULL); @@ -11911,9 +11911,9 @@ static void test_MFInitMediaTypeFromVideoInfoHeader(void) value32 = 0xdeadbeef; memset(palette, 0xcd, sizeof(palette)); hr = IMFMediaType_GetBlob(media_type, &MF_MT_USER_DATA, (BYTE *)palette, sizeof(palette), &value32); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(value32 == sizeof(expect_palette), "got %u.\n", value32); - todo_wine ok(!memcmp(palette, expect_palette, value32), "Unexpected user data.\n"); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value32 == sizeof(expect_palette), "got %u.\n", value32); + ok(!memcmp(palette, expect_palette, value32), "Unexpected user data.\n"); /* palette shouldn't be accounted for in the header size */ vih_buf->bmiHeader.biBitCount = 8; @@ -11923,7 +11923,7 @@ static void test_MFInitMediaTypeFromVideoInfoHeader(void) hr = MFInitMediaTypeFromVideoInfoHeader(media_type, vih_buf, sizeof(*vih_buf) + sizeof(expect_palette), NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_GetItem(media_type, &MF_MT_USER_DATA, NULL); - ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + todo_wine ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); value32 = 0xdeadbeef; memset(palette, 0xcd, sizeof(palette)); hr = IMFMediaType_GetBlob(media_type, &MF_MT_PALETTE, (BYTE *)palette, sizeof(palette), &value32); @@ -11938,7 +11938,7 @@ static void test_MFInitMediaTypeFromVideoInfoHeader(void) hr = MFInitMediaTypeFromVideoInfoHeader(media_type, vih_buf, sizeof(*vih_buf) + sizeof(expect_user_data) + sizeof(expect_palette), NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_GetItem(media_type, &MF_MT_USER_DATA, NULL); - ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + todo_wine ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); value32 = 0xdeadbeef; memset(palette, 0xcd, sizeof(palette)); hr = IMFMediaType_GetBlob(media_type, &MF_MT_PALETTE, (BYTE *)palette, sizeof(palette), &value32); @@ -12293,9 +12293,9 @@ static void test_MFInitMediaTypeFromVideoInfoHeader2(void) value32 = 0xdeadbeef; memset(palette, 0xcd, sizeof(palette)); hr = IMFMediaType_GetBlob(media_type, &MF_MT_USER_DATA, (BYTE *)palette, sizeof(palette), &value32); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(value32 == sizeof(expect_palette), "got %u.\n", value32); - todo_wine ok(!memcmp(palette, expect_palette, value32), "Unexpected user data.\n"); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value32 == sizeof(expect_palette), "got %u.\n", value32); + ok(!memcmp(palette, expect_palette, value32), "Unexpected user data.\n"); vih_buf->bmiHeader.biBitCount = 16; hr = MFInitMediaTypeFromVideoInfoHeader2(media_type, vih_buf, sizeof(*vih_buf) + sizeof(expect_palette), NULL); @@ -12305,9 +12305,9 @@ static void test_MFInitMediaTypeFromVideoInfoHeader2(void) value32 = 0xdeadbeef; memset(palette, 0xcd, sizeof(palette)); hr = IMFMediaType_GetBlob(media_type, &MF_MT_USER_DATA, (BYTE *)palette, sizeof(palette), &value32); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(value32 == sizeof(expect_palette), "got %u.\n", value32); - todo_wine ok(!memcmp(palette, expect_palette, value32), "Unexpected user data.\n"); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value32 == sizeof(expect_palette), "got %u.\n", value32); + ok(!memcmp(palette, expect_palette, value32), "Unexpected user data.\n"); /* palette shouldn't be accounted for in the header size */ vih_buf->bmiHeader.biBitCount = 8; @@ -12317,7 +12317,7 @@ static void test_MFInitMediaTypeFromVideoInfoHeader2(void) hr = MFInitMediaTypeFromVideoInfoHeader2(media_type, vih_buf, sizeof(*vih_buf) + sizeof(expect_palette), NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_GetItem(media_type, &MF_MT_USER_DATA, NULL); - ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + todo_wine ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); value32 = 0xdeadbeef; memset(palette, 0xcd, sizeof(palette)); hr = IMFMediaType_GetBlob(media_type, &MF_MT_PALETTE, (BYTE *)palette, sizeof(palette), &value32); @@ -12332,7 +12332,7 @@ static void test_MFInitMediaTypeFromVideoInfoHeader2(void) hr = MFInitMediaTypeFromVideoInfoHeader2(media_type, vih_buf, sizeof(*vih_buf) + sizeof(expect_user_data) + sizeof(expect_palette), NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_GetItem(media_type, &MF_MT_USER_DATA, NULL); - ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + todo_wine ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); value32 = 0xdeadbeef; memset(palette, 0xcd, sizeof(palette)); hr = IMFMediaType_GetBlob(media_type, &MF_MT_PALETTE, (BYTE *)palette, sizeof(palette), &value32); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6536
v2: Add some tests. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6536#note_82978
This merge request was approved by Nikolay Sivov. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6536
participants (2)
-
Nikolay Sivov (＠nsivov) -
Rémi Bernon