system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 15:20:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

mfplat: Fix media type compare logic regarding user data.

Browse source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2020-02-18 17:18:28 +03:00 committed by Alexandre Julliard
parent d38bd69b15
commit ad4c734c37
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dlls/mfplat/mediatype.c
View file

@ -514,13 +514,14 @@ static HRESULT WINAPI mediatype_IsEqual(IMFMediaType *iface, IMFMediaType *type,
PropVariantInit(&right.value);
right.hr = IMFAttributes_GetItem(right.type, &MF_MT_USER_DATA, &right.value);
if (SUCCEEDED(left.hr) && SUCCEEDED(left.hr))
/* Compare user data if both types have it, otherwise simply check if both don't. */
if (SUCCEEDED(left.hr) && SUCCEEDED(right.hr))
{
result = FALSE;
IMFAttributes_CompareItem(left.type, &MF_MT_USER_DATA, &left.value, &result);
}
else if (FAILED(left.hr) && FAILED(left.hr))
result = TRUE;
else
result = FAILED(left.hr) && FAILED(right.hr);
PropVariantClear(&left.value);
PropVariantClear(&right.value);

13
dlls/mfplat/tests/mfplat.c
View file

@ -762,6 +762,19 @@ if(0)
ok(flags == (MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_DATA
| MF_MEDIATYPE_EQUAL_FORMAT_USER_DATA), "Unexpected flags %#x.\n", flags);
/* Different user data. */
hr = IMFMediaType_SetBlob(mediatype, &MF_MT_USER_DATA, (const UINT8 *)&flags, sizeof(flags));
ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr);
flags = 0;
hr = IMFMediaType_IsEqual(mediatype, mediatype2, &flags);
ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);
ok(flags == (MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_DATA),
"Unexpected flags %#x.\n", flags);
hr = IMFMediaType_DeleteItem(mediatype, &MF_MT_USER_DATA);
ok(hr == S_OK, "Failed to delete item, hr %#x.\n", hr);
hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32);
ok(hr == S_OK, "Failed to set subtype, hr %#x.\n", hr);