[PATCH 0/1] MR3003: mf/tests: Remove duplicate call to MFStartup().

[Bernhard Kölbl]

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

[PATCH 1/1] mf/tests: Remove duplicate call to MFStartup().

[Bernhard Kölbl]

From: Bernhard Kölbl <besentv(a)gmail.com>

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com>
---
 dlls/mf/tests/mf.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index 010c8b2bd12..71fd2435d32 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -4962,9 +4962,6 @@ static void test_sample_grabber_orientation(GUID subtype)
     grabber_callback->done_event = CreateEventW(NULL, FALSE, FALSE, NULL);
     ok(!!grabber_callback->done_event, "CreateEventW failed, error %lu\n", GetLastError());
 
-    hr = MFStartup(MF_VERSION, MFSTARTUP_FULL);
-    ok(hr == S_OK, "Startup failure, hr %#lx.\n", hr);
-
     hr = MFCreateMediaSession(NULL, &session);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
 
-- 
GitLab

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

[PATCH 0/1] MR3003: mf/tests: Remove duplicate call to MFStartup(). - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3003

[Nikolay Sivov (＠nsivov)]

In addition to that, it's better to do MFShutdown() after win_skip() in this function, or jump to its cleanup section.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3003#note_34982

[Bernhard Kölbl]

On Wed Jun  7 19:09:39 2023 +0000, Nikolay Sivov wrote:
> In addition to that, it's better to do MFShutdown() after win_skip() in
> this function, or jump to its cleanup section.
> Right, I didn't consider the skip.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3003#note_34986