[PATCH 0/1] MR6536: mfplat: Fill user data when converting VIDEOINFOHEADER formats.

[Rémi Bernon]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56975

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6536

[PATCH 1/1] mfplat: Fill user data when converting VIDEOINFOHEADER formats.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56975
---
 dlls/mfplat/mediatype.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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;
 }
 
 /***********************************************************************
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6536

[Nikolay Sivov (＠nsivov)]

Could you please add a test for that? It looks trivial to do.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6536#note_82745