[PATCH 0/1] MR5515: mfreadwrite: Store result of object activation in stream transform.
In source_reader_create_transform(), store the result of IMFActivate_ActivateObject() so that in the event of failure, resources are freed and an appropriate HRESULT is returned. Previously, if every object's activation failed, the last part of the function was not aware of this. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5515
From: Danyil Blyschak <dblyschak(a)codeweavers.com> In source_reader_create_transform(), store the result of IMFActivate_ActivateObject() so that in the event of failure, resources are freed and an appropriate HRESULT is returned. Previously, if every object's activation failed, the last part of the function was not aware of this. --- dlls/mfreadwrite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 11eac81d2ca..96bb316ac85 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -2011,7 +2011,7 @@ static HRESULT source_reader_create_transform(struct source_reader *reader, BOOL { IMFMediaType *media_type; - if (FAILED(IMFActivate_ActivateObject(activates[i], &IID_IMFTransform, (void **)&transform))) + if (FAILED(hr = IMFActivate_ActivateObject(activates[i], &IID_IMFTransform, (void **)&transform))) continue; if (SUCCEEDED(hr = IMFTransform_SetInputType(transform, 0, input_type, 0)) && SUCCEEDED(hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type))) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5515
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=145120 Your paranoid android. === debian11 (32 bit report) === mfreadwrite: mfplat: Timeout
This change is from 17fd8c8e11ea. @rbernon, could you comment, if this was intentional for some reason? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5515#note_68134
It wasn't intentional, probably some leftover from a different kind of loop where hr was checked in the loop condition to break on success, then I changed my mind. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5515#note_68403
This merge request was approved by Nikolay Sivov. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5515
participants (5)
-
Danyil Blyschak -
Danyil Blyschak (@blyss) -
Marvin -
Nikolay Sivov (@nsivov) -
Rémi Bernon