Michael Stefaniuc : dmime/tests: Move some ok() calls to make it clear what is being tested.
Alexandre Julliard
julliard at winehq.org
Sun Feb 16 15:23:58 CST 2020
Module: wine
Branch: master
Commit: 67f55f9b13376789d02c9389515b68f14e69a673
URL: https://source.winehq.org/git/wine.git/?a=commit;h=67f55f9b13376789d02c9389515b68f14e69a673
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Fri Feb 14 01:21:04 2020 +0100
dmime/tests: Move some ok() calls to make it clear what is being tested.
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dmime/tests/performance.c | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c
index e6a3fe2271..ff275eb9c2 100644
--- a/dlls/dmime/tests/performance.c
+++ b/dlls/dmime/tests/performance.c
@@ -270,35 +270,27 @@ static void test_createport(void)
/* dwValidParams == 0 -> S_OK, filled struct */
portparams.dwValidParams = 0;
- hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth,
- &portparams, &port, NULL);
+ hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL);
ok(hr == S_OK, "CreatePort failed: %08x\n", hr);
ok(port != NULL, "Didn't get IDirectMusicPort pointer\n");
-
+ todo_wine ok(portparams.dwValidParams, "portparams struct was not filled in\n");
IDirectMusicPort_Release(port);
port = NULL;
- todo_wine ok(portparams.dwValidParams != 0, "portparams struct was not filled in\n");
-
/* dwValidParams != 0, invalid param -> S_FALSE, filled struct */
portparams.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS;
portparams.dwChannelGroups = 0;
- hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth,
- &portparams, &port, NULL);
+ hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL);
todo_wine ok(hr == S_FALSE, "CreatePort failed: %08x\n", hr);
ok(port != NULL, "Didn't get IDirectMusicPort pointer\n");
-
+ ok(portparams.dwValidParams, "portparams struct was not filled in\n");
IDirectMusicPort_Release(port);
port = NULL;
- ok(portparams.dwValidParams != 0, "portparams struct was not filled in\n");
-
/* dwValidParams != 0, valid params -> S_OK */
- hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth,
- &portparams, &port, NULL);
+ hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL);
ok(hr == S_OK, "CreatePort failed: %08x\n", hr);
ok(port != NULL, "Didn't get IDirectMusicPort pointer\n");
-
IDirectMusicPort_Release(port);
port = NULL;
@@ -307,12 +299,10 @@ static void test_createport(void)
hr = IDirectMusic_CreatePort(music, &GUID_NULL, &portparams, &port, NULL);
ok(hr == S_OK, "CreatePort failed: %08x\n", hr);
ok(port != NULL, "Didn't get IDirectMusicPort pointer\n");
-
+ todo_wine ok(portparams.dwValidParams, "portparams struct was not filled in\n");
IDirectMusicPort_Release(port);
port = NULL;
- todo_wine ok(portparams.dwValidParams != 0, "portparams struct was not filled in\n");
-
/* null GUID fails */
portparams.dwValidParams = 0;
hr = IDirectMusic_CreatePort(music, NULL, &portparams, &port, NULL);
More information about the wine-cvs
mailing list