Nikolay Sivov : mf/tests: Use interface check helper more.
Alexandre Julliard
julliard at winehq.org
Fri Jan 29 15:10:21 CST 2021
Module: wine
Branch: master
Commit: be3bab5efbcef1470468b982f342d401af8047c5
URL: https://source.winehq.org/git/wine.git/?a=commit;h=be3bab5efbcef1470468b982f342d401af8047c5
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Fri Jan 29 15:09:56 2021 +0300
mf/tests: Use interface check helper more.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mf/tests/mf.c | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index 8272064466f..34090d0a9d4 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -1154,7 +1154,6 @@ static void test_session_events(IMFMediaSession *session)
static void test_media_session(void)
{
IMFRateControl *rate_control, *rate_control2;
- IMFLocalMFTRegistration *local_reg;
MFCLOCK_PROPERTIES clock_props;
IMFRateSupport *rate_support;
IMFAttributes *attributes;
@@ -1163,7 +1162,6 @@ static void test_media_session(void)
IMFShutdown *shutdown;
PROPVARIANT propvar;
DWORD status, caps;
- IMFGetService *gs;
IMFClock *clock;
IUnknown *unk;
HRESULT hr;
@@ -1176,23 +1174,19 @@ static void test_media_session(void)
hr = MFCreateMediaSession(NULL, &session);
ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr);
- hr = IMFMediaSession_QueryInterface(session, &IID_IMFAttributes, (void **)&unk);
- ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr);
+ check_interface(session, &IID_IMFGetService, TRUE);
+ check_interface(session, &IID_IMFAttributes, FALSE);
- hr = IMFMediaSession_QueryInterface(session, &IID_IMFGetService, (void **)&gs);
- ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr);
-
- hr = IMFGetService_GetService(gs, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support);
+ hr = MFGetService((IUnknown *)session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support);
ok(hr == S_OK, "Failed to get rate support interface, hr %#x.\n", hr);
- hr = IMFGetService_GetService(gs, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, (void **)&rate_control);
+ hr = MFGetService((IUnknown *)session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, (void **)&rate_control);
ok(hr == S_OK, "Failed to get rate control interface, hr %#x.\n", hr);
- hr = IMFGetService_GetService(gs, &MF_LOCAL_MFT_REGISTRATION_SERVICE, &IID_IMFLocalMFTRegistration,
- (void **)&local_reg);
+ hr = MFGetService((IUnknown *)session, &MF_LOCAL_MFT_REGISTRATION_SERVICE, &IID_IMFLocalMFTRegistration, (void **)&unk);
ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Vista */, "Failed to get registration service, hr %#x.\n", hr);
if (SUCCEEDED(hr))
- IMFLocalMFTRegistration_Release(local_reg);
+ IUnknown_Release(unk);
hr = IMFRateSupport_QueryInterface(rate_support, &IID_IMFMediaSession, (void **)&unk);
ok(hr == S_OK, "Failed to get session interface, hr %#x.\n", hr);
@@ -1220,6 +1214,8 @@ static void test_media_session(void)
hr = IMFMediaSession_GetClock(session, &clock);
ok(hr == S_OK, "Failed to get clock, hr %#x.\n", hr);
+ check_interface(clock, &IID_IMFPresentationClock, TRUE);
+
hr = IMFClock_QueryInterface(clock, &IID_IMFRateControl, (void **)&rate_control2);
ok(hr == S_OK, "Failed to get rate control, hr %#x.\n", hr);
@@ -1241,8 +1237,6 @@ todo_wine
IMFRateControl_Release(rate_control);
IMFRateSupport_Release(rate_support);
- IMFGetService_Release(gs);
-
IMFMediaSession_Release(session);
hr = MFCreateMediaSession(NULL, &session);
More information about the wine-cvs
mailing list