ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mfplat: Copy attributes when cloning presentation descriptor. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2019-04-30 13:33:24 +03:00 committed by Alexandre Julliard
parent fe0f8a150f
commit dda9037c37
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/mfplat/mediatype.c
View File

@ -1616,7 +1616,8 @@ static HRESULT WINAPI presentation_descriptor_Clone(IMFPresentationDescriptor *i
object->descriptors[i] = presentation_desc->descriptors[i];
IMFStreamDescriptor_AddRef(object->descriptors[i].descriptor);
}
/* FIXME: copy attributes */
attributes_CopyAllItems(&presentation_desc->attributes, (IMFAttributes *)&object->IMFPresentationDescriptor_iface);
LeaveCriticalSection(&presentation_desc->cs);

11
dlls/mfplat/tests/mfplat.c
View File

@ -2289,6 +2289,7 @@ static void test_presentation_descriptor(void)
IMFMediaType *media_type;
unsigned int i;
BOOL selected;
UINT64 value;
DWORD count;
HRESULT hr;
@ -2330,14 +2331,24 @@ static void test_presentation_descriptor(void)
ok(!!selected, "Unexpected selected state.\n");
IMFStreamDescriptor_Release(stream_desc2);
hr = IMFPresentationDescriptor_SetUINT64(pd, &MF_PD_TOTAL_FILE_SIZE, 1);
ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr);
hr = IMFPresentationDescriptor_Clone(pd, &pd2);
ok(hr == S_OK, "Failed to clone, hr %#x.\n", hr);
hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd2, 0, &selected, &stream_desc2);
ok(hr == S_OK, "Failed to get stream descriptor, hr %#x.\n", hr);
ok(!!selected, "Unexpected selected state.\n");
ok(stream_desc2 == stream_desc[0], "Unexpected stream descriptor.\n");
IMFStreamDescriptor_Release(stream_desc2);
value = 0;
hr = IMFPresentationDescriptor_GetUINT64(pd2, &MF_PD_TOTAL_FILE_SIZE, &value);
ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr);
ok(value == 1, "Unexpected attribute value.\n");
IMFPresentationDescriptor_Release(pd2);
IMFPresentationDescriptor_Release(pd);
for (i = 0; i < ARRAY_SIZE(stream_desc); ++i)