Skip to content

W
wine-winehq
Commit f0fb2f16 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

dmusic/tests: Use void* instead of void** type value for outer argument.

Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 2926c282
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 21 deletions
dlls/dmband/tests/dmband.c
View file @ f0fb2f16
...@@ -55,7 +55,7 @@ static void test_COM(void) ...@@ -55,7 +55,7 @@ static void test_COM(void)
HRESULT hr; HRESULT hr;
/* COM aggregation */ /* COM aggregation */
hr = CoCreateInstance(&CLSID_DirectMusicBand, (IUnknown*)&dmb, CLSCTX_INPROC_SERVER, hr = CoCreateInstance(&CLSID_DirectMusicBand, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmb); &IID_IUnknown, (void**)&dmb);
ok(hr == CLASS_E_NOAGGREGATION, ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicBand create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); "DirectMusicBand create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
...@@ -104,7 +104,7 @@ static void test_COM_bandtrack(void) ...@@ -104,7 +104,7 @@ static void test_COM_bandtrack(void)
HRESULT hr; HRESULT hr;
/* COM aggregation */ /* COM aggregation */
hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, (IUnknown*)&dmbt, CLSCTX_INPROC_SERVER, hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmbt); &IID_IUnknown, (void**)&dmbt);
ok(hr == CLASS_E_NOAGGREGATION, ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicBandTrack create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); "DirectMusicBandTrack create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
......
dlls/dmcompos/tests/dmcompos.c
View file @ f0fb2f16
...@@ -48,7 +48,7 @@ static void test_COM(void) ...@@ -48,7 +48,7 @@ static void test_COM(void)
HRESULT hr; HRESULT hr;
/* COM aggregation */ /* COM aggregation */
hr = CoCreateInstance(&CLSID_DirectMusicComposer, (IUnknown*)&dmc, CLSCTX_INPROC_SERVER, hr = CoCreateInstance(&CLSID_DirectMusicComposer, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmc); &IID_IUnknown, (void**)&dmc);
ok(hr == CLASS_E_NOAGGREGATION, ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicComposer create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); "DirectMusicComposer create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
...@@ -86,7 +86,7 @@ static void test_COM_chordmap(void) ...@@ -86,7 +86,7 @@ static void test_COM_chordmap(void)
HRESULT hr; HRESULT hr;
/* COM aggregation */ /* COM aggregation */
hr = CoCreateInstance(&CLSID_DirectMusicChordMap, (IUnknown*)&dmcm, CLSCTX_INPROC_SERVER, hr = CoCreateInstance(&CLSID_DirectMusicChordMap, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmcm); &IID_IUnknown, (void**)&dmcm);
ok(hr == CLASS_E_NOAGGREGATION, ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicChordMap create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); "DirectMusicChordMap create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
...@@ -134,7 +134,7 @@ static void test_COM_template(void) ...@@ -134,7 +134,7 @@ static void test_COM_template(void)
HRESULT hr; HRESULT hr;
/* COM aggregation */ /* COM aggregation */
hr = CoCreateInstance(&CLSID_DirectMusicTemplate, (IUnknown*)&ps, CLSCTX_INPROC_SERVER, hr = CoCreateInstance(&CLSID_DirectMusicTemplate, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&ps); &IID_IUnknown, (void**)&ps);
ok(hr == CLASS_E_NOAGGREGATION, ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicTemplate create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); "DirectMusicTemplate create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
...@@ -187,7 +187,7 @@ static void test_COM_track(void) ...@@ -187,7 +187,7 @@ static void test_COM_track(void)
for (i = 0; i < ARRAY_SIZE(class); i++) { for (i = 0; i < ARRAY_SIZE(class); i++) {
/* COM aggregation */ /* COM aggregation */
dmt8 = (IDirectMusicTrack8*)0xdeadbeef; dmt8 = (IDirectMusicTrack8*)0xdeadbeef;
hr = CoCreateInstance(class[i].clsid, (IUnknown*)&dmt8, CLSCTX_INPROC_SERVER, &IID_IUnknown, hr = CoCreateInstance(class[i].clsid, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown,
(void**)&dmt8); (void**)&dmt8);
if (hr == REGDB_E_CLASSNOTREG) { if (hr == REGDB_E_CLASSNOTREG) {
win_skip("%s not registered\n", class[i].name); win_skip("%s not registered\n", class[i].name);
......
dlls/dmime/tests/dmime.c
View file @ f0fb2f16
...@@ -104,7 +104,7 @@ static void test_COM_audiopathconfig(void) ...@@ -104,7 +104,7 @@ static void test_COM_audiopathconfig(void)
HRESULT hr; HRESULT hr;
/* COM aggregation */ /* COM aggregation */
hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, (IUnknown*)&dmap, CLSCTX_INPROC_SERVER, hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmap); &IID_IUnknown, (void**)&dmap);
if (hr == REGDB_E_CLASSNOTREG) { if (hr == REGDB_E_CLASSNOTREG) {
win_skip("DirectMusicAudioPathConfig not registered\n"); win_skip("DirectMusicAudioPathConfig not registered\n");
...@@ -164,7 +164,7 @@ static void test_COM_graph(void) ...@@ -164,7 +164,7 @@ static void test_COM_graph(void)
HRESULT hr; HRESULT hr;
/* COM aggregation */ /* COM aggregation */
hr = CoCreateInstance(&CLSID_DirectMusicGraph, (IUnknown*)&dmg, CLSCTX_INPROC_SERVER, hr = CoCreateInstance(&CLSID_DirectMusicGraph, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmg); &IID_IUnknown, (void**)&dmg);
ok(hr == CLASS_E_NOAGGREGATION, ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicGraph create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); "DirectMusicGraph create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
...@@ -217,7 +217,7 @@ static void test_COM_segment(void) ...@@ -217,7 +217,7 @@ static void test_COM_segment(void)
HRESULT hr; HRESULT hr;
/* COM aggregation */ /* COM aggregation */
hr = CoCreateInstance(&CLSID_DirectMusicSegment, (IUnknown*)&dms, CLSCTX_INPROC_SERVER, hr = CoCreateInstance(&CLSID_DirectMusicSegment, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dms); &IID_IUnknown, (void**)&dms);
ok(hr == CLASS_E_NOAGGREGATION, ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicSegment create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); "DirectMusicSegment create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
...@@ -268,7 +268,7 @@ static void test_COM_segmentstate(void) ...@@ -268,7 +268,7 @@ static void test_COM_segmentstate(void)
HRESULT hr; HRESULT hr;
/* COM aggregation */ /* COM aggregation */
hr = CoCreateInstance(&CLSID_DirectMusicSegmentState, (IUnknown*)&dmss8, CLSCTX_INPROC_SERVER, hr = CoCreateInstance(&CLSID_DirectMusicSegmentState, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmss8); &IID_IUnknown, (void**)&dmss8);
ok(hr == CLASS_E_NOAGGREGATION, ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicSegmentState8 create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); "DirectMusicSegmentState8 create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
...@@ -334,7 +334,7 @@ static void test_COM_track(void) ...@@ -334,7 +334,7 @@ static void test_COM_track(void)
trace("Testing %s\n", class[i].name); trace("Testing %s\n", class[i].name);
/* COM aggregation */ /* COM aggregation */
dmt8 = (IDirectMusicTrack8*)0xdeadbeef; dmt8 = (IDirectMusicTrack8*)0xdeadbeef;
hr = CoCreateInstance(class[i].clsid, (IUnknown*)&dmt8, CLSCTX_INPROC_SERVER, &IID_IUnknown, hr = CoCreateInstance(class[i].clsid, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown,
(void**)&dmt8); (void**)&dmt8);
if (hr == REGDB_E_CLASSNOTREG) { if (hr == REGDB_E_CLASSNOTREG) {
win_skip("%s not registered\n", class[i].name); win_skip("%s not registered\n", class[i].name);
......
dlls/dmime/tests/performance.c
View file @ f0fb2f16
...@@ -208,7 +208,7 @@ static void test_COM(void) ...@@ -208,7 +208,7 @@ static void test_COM(void)
HRESULT hr; HRESULT hr;
/* COM aggregation */ /* COM aggregation */
hr = CoCreateInstance(&CLSID_DirectMusicPerformance, (IUnknown*)&dmp, CLSCTX_INPROC_SERVER, hr = CoCreateInstance(&CLSID_DirectMusicPerformance, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmp); &IID_IUnknown, (void**)&dmp);
ok(hr == CLASS_E_NOAGGREGATION, ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicPerformance create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); "DirectMusicPerformance create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
......
dlls/dmloader/tests/loader.c
View file @ f0fb2f16
...@@ -143,7 +143,7 @@ static void test_COM(void) ...@@ -143,7 +143,7 @@ static void test_COM(void)
HRESULT hr; HRESULT hr;
/* COM aggregation */ /* COM aggregation */
hr = CoCreateInstance(&CLSID_DirectMusicLoader, (IUnknown*)&dml8, CLSCTX_INPROC_SERVER, hr = CoCreateInstance(&CLSID_DirectMusicLoader, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dml8); &IID_IUnknown, (void**)&dml8);
ok(hr == CLASS_E_NOAGGREGATION, ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicLoader create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); "DirectMusicLoader create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
...@@ -180,7 +180,7 @@ static void test_COM_container(void) ...@@ -180,7 +180,7 @@ static void test_COM_container(void)
HRESULT hr; HRESULT hr;
/* COM aggregation */ /* COM aggregation */
hr = CoCreateInstance(&CLSID_DirectMusicContainer, (IUnknown*)&dmc, CLSCTX_INPROC_SERVER, hr = CoCreateInstance(&CLSID_DirectMusicContainer, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmc); &IID_IUnknown, (void**)&dmc);
ok(hr == CLASS_E_NOAGGREGATION, ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicContainer create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); "DirectMusicContainer create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
......
dlls/dmstyle/tests/dmstyle.c
View file @ f0fb2f16
...@@ -50,7 +50,7 @@ static void test_COM(void) ...@@ -50,7 +50,7 @@ static void test_COM(void)
HRESULT hr; HRESULT hr;
/* COM aggregation */ /* COM aggregation */
hr = CoCreateInstance(&CLSID_DirectMusicStyle, (IUnknown*)&dms8, CLSCTX_INPROC_SERVER, hr = CoCreateInstance(&CLSID_DirectMusicStyle, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dms8); &IID_IUnknown, (void**)&dms8);
ok(hr == CLASS_E_NOAGGREGATION, ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicStyle8 create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); "DirectMusicStyle8 create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
...@@ -102,7 +102,7 @@ static void test_COM_section(void) ...@@ -102,7 +102,7 @@ static void test_COM_section(void)
HRESULT hr; HRESULT hr;
/* COM aggregation */ /* COM aggregation */
hr = CoCreateInstance(&CLSID_DirectMusicSection, (IUnknown*)&dmo, CLSCTX_INPROC_SERVER, hr = CoCreateInstance(&CLSID_DirectMusicSection, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmo); &IID_IUnknown, (void**)&dmo);
ok(hr == CLASS_E_NOAGGREGATION, ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicSection create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); "DirectMusicSection create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
...@@ -165,7 +165,7 @@ static void test_COM_track(void) ...@@ -165,7 +165,7 @@ static void test_COM_track(void)
for (i = 0; i < ARRAY_SIZE(class); i++) { for (i = 0; i < ARRAY_SIZE(class); i++) {
/* COM aggregation */ /* COM aggregation */
dmt8 = (IDirectMusicTrack8*)0xdeadbeef; dmt8 = (IDirectMusicTrack8*)0xdeadbeef;
hr = CoCreateInstance(class[i].clsid, (IUnknown*)&dmt8, CLSCTX_INPROC_SERVER, &IID_IUnknown, hr = CoCreateInstance(class[i].clsid, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown,
(void**)&dmt8); (void**)&dmt8);
if (hr == REGDB_E_CLASSNOTREG) { if (hr == REGDB_E_CLASSNOTREG) {
win_skip("%s not registered\n", class[i].name); win_skip("%s not registered\n", class[i].name);
......
dlls/dmsynth/tests/dmsynth.c
View file @ f0fb2f16
...@@ -145,7 +145,7 @@ static void test_COM(void) ...@@ -145,7 +145,7 @@ static void test_COM(void)
HRESULT hr; HRESULT hr;
/* COM aggregation */ /* COM aggregation */
hr = CoCreateInstance(&CLSID_DirectMusicSynth, (IUnknown*)&dms8, CLSCTX_INPROC_SERVER, hr = CoCreateInstance(&CLSID_DirectMusicSynth, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dms8); &IID_IUnknown, (void**)&dms8);
ok(hr == CLASS_E_NOAGGREGATION, ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicSynth create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); "DirectMusicSynth create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
...@@ -193,7 +193,7 @@ static void test_COM_synthsink(void) ...@@ -193,7 +193,7 @@ static void test_COM_synthsink(void)
HRESULT hr; HRESULT hr;
/* COM aggregation */ /* COM aggregation */
hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, (IUnknown*)&dmss, CLSCTX_INPROC_SERVER, hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmss); &IID_IUnknown, (void**)&dmss);
ok(hr == CLASS_E_NOAGGREGATION, ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicSynthSink create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); "DirectMusicSynthSink create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
......
dlls/dmusic/tests/dmusic.c
View file @ f0fb2f16
...@@ -221,7 +221,7 @@ static void test_COM(void) ...@@ -221,7 +221,7 @@ static void test_COM(void)
HRESULT hr; HRESULT hr;
/* COM aggregation */ /* COM aggregation */
hr = CoCreateInstance(&CLSID_DirectMusic, (IUnknown*)&dm8, CLSCTX_INPROC_SERVER, &IID_IUnknown, hr = CoCreateInstance(&CLSID_DirectMusic, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown,
(void**)&dm8); (void**)&dm8);
ok(hr == CLASS_E_NOAGGREGATION, ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusic8 create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); "DirectMusic8 create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
...@@ -270,7 +270,7 @@ static void test_COM_dmcoll(void) ...@@ -270,7 +270,7 @@ static void test_COM_dmcoll(void)
HRESULT hr; HRESULT hr;
/* COM aggregation */ /* COM aggregation */
hr = CoCreateInstance(&CLSID_DirectMusicCollection, (IUnknown*)&dmc, CLSCTX_INPROC_SERVER, hr = CoCreateInstance(&CLSID_DirectMusicCollection, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmc); &IID_IUnknown, (void**)&dmc);
ok(hr == CLASS_E_NOAGGREGATION, ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicCollection create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); "DirectMusicCollection create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment