[PATCH] dmusic/tests: Use void* instead of void** type value for outer argument
Nikolay Sivov
nsivov at codeweavers.com
Mon Apr 24 13:19:16 CDT 2017
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/dmband/tests/dmband.c | 4 ++--
dlls/dmcompos/tests/dmcompos.c | 8 ++++----
dlls/dmime/tests/dmime.c | 10 +++++-----
dlls/dmime/tests/performance.c | 2 +-
dlls/dmloader/tests/loader.c | 4 ++--
dlls/dmstyle/tests/dmstyle.c | 6 +++---
dlls/dmsynth/tests/dmsynth.c | 4 ++--
dlls/dmusic/tests/dmusic.c | 4 ++--
8 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c
index e1f00ae701..f3042ea3e2 100644
--- a/dlls/dmband/tests/dmband.c
+++ b/dlls/dmband/tests/dmband.c
@@ -55,7 +55,7 @@ static void test_COM(void)
HRESULT hr;
/* COM aggregation */
- hr = CoCreateInstance(&CLSID_DirectMusicBand, (IUnknown*)&dmb, CLSCTX_INPROC_SERVER,
+ hr = CoCreateInstance(&CLSID_DirectMusicBand, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmb);
ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicBand create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
@@ -104,7 +104,7 @@ static void test_COM_bandtrack(void)
HRESULT hr;
/* COM aggregation */
- hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, (IUnknown*)&dmbt, CLSCTX_INPROC_SERVER,
+ hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmbt);
ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicBandTrack create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c
index fd68ac374c..26c6e1f9a3 100644
--- a/dlls/dmcompos/tests/dmcompos.c
+++ b/dlls/dmcompos/tests/dmcompos.c
@@ -48,7 +48,7 @@ static void test_COM(void)
HRESULT hr;
/* COM aggregation */
- hr = CoCreateInstance(&CLSID_DirectMusicComposer, (IUnknown*)&dmc, CLSCTX_INPROC_SERVER,
+ hr = CoCreateInstance(&CLSID_DirectMusicComposer, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmc);
ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicComposer create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
@@ -86,7 +86,7 @@ static void test_COM_chordmap(void)
HRESULT hr;
/* COM aggregation */
- hr = CoCreateInstance(&CLSID_DirectMusicChordMap, (IUnknown*)&dmcm, CLSCTX_INPROC_SERVER,
+ hr = CoCreateInstance(&CLSID_DirectMusicChordMap, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmcm);
ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicChordMap create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
@@ -134,7 +134,7 @@ static void test_COM_template(void)
HRESULT hr;
/* COM aggregation */
- hr = CoCreateInstance(&CLSID_DirectMusicTemplate, (IUnknown*)&ps, CLSCTX_INPROC_SERVER,
+ hr = CoCreateInstance(&CLSID_DirectMusicTemplate, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&ps);
ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicTemplate create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
@@ -187,7 +187,7 @@ static void test_COM_track(void)
for (i = 0; i < ARRAY_SIZE(class); i++) {
/* COM aggregation */
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);
if (hr == REGDB_E_CLASSNOTREG) {
win_skip("%s not registered\n", class[i].name);
diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c
index 1e96abaa48..a154eac50b 100644
--- a/dlls/dmime/tests/dmime.c
+++ b/dlls/dmime/tests/dmime.c
@@ -104,7 +104,7 @@ static void test_COM_audiopathconfig(void)
HRESULT hr;
/* COM aggregation */
- hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, (IUnknown*)&dmap, CLSCTX_INPROC_SERVER,
+ hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmap);
if (hr == REGDB_E_CLASSNOTREG) {
win_skip("DirectMusicAudioPathConfig not registered\n");
@@ -164,7 +164,7 @@ static void test_COM_graph(void)
HRESULT hr;
/* COM aggregation */
- hr = CoCreateInstance(&CLSID_DirectMusicGraph, (IUnknown*)&dmg, CLSCTX_INPROC_SERVER,
+ hr = CoCreateInstance(&CLSID_DirectMusicGraph, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmg);
ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicGraph create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
@@ -217,7 +217,7 @@ static void test_COM_segment(void)
HRESULT hr;
/* COM aggregation */
- hr = CoCreateInstance(&CLSID_DirectMusicSegment, (IUnknown*)&dms, CLSCTX_INPROC_SERVER,
+ hr = CoCreateInstance(&CLSID_DirectMusicSegment, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dms);
ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicSegment create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
@@ -268,7 +268,7 @@ static void test_COM_segmentstate(void)
HRESULT hr;
/* COM aggregation */
- hr = CoCreateInstance(&CLSID_DirectMusicSegmentState, (IUnknown*)&dmss8, CLSCTX_INPROC_SERVER,
+ hr = CoCreateInstance(&CLSID_DirectMusicSegmentState, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmss8);
ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicSegmentState8 create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
@@ -334,7 +334,7 @@ static void test_COM_track(void)
trace("Testing %s\n", class[i].name);
/* COM aggregation */
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);
if (hr == REGDB_E_CLASSNOTREG) {
win_skip("%s not registered\n", class[i].name);
diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c
index de8b76ee88..90fd6ee2a5 100644
--- a/dlls/dmime/tests/performance.c
+++ b/dlls/dmime/tests/performance.c
@@ -208,7 +208,7 @@ static void test_COM(void)
HRESULT hr;
/* COM aggregation */
- hr = CoCreateInstance(&CLSID_DirectMusicPerformance, (IUnknown*)&dmp, CLSCTX_INPROC_SERVER,
+ hr = CoCreateInstance(&CLSID_DirectMusicPerformance, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmp);
ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicPerformance create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c
index 4b141f3a0d..56f84158e1 100644
--- a/dlls/dmloader/tests/loader.c
+++ b/dlls/dmloader/tests/loader.c
@@ -143,7 +143,7 @@ static void test_COM(void)
HRESULT hr;
/* COM aggregation */
- hr = CoCreateInstance(&CLSID_DirectMusicLoader, (IUnknown*)&dml8, CLSCTX_INPROC_SERVER,
+ hr = CoCreateInstance(&CLSID_DirectMusicLoader, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dml8);
ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicLoader create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
@@ -180,7 +180,7 @@ static void test_COM_container(void)
HRESULT hr;
/* COM aggregation */
- hr = CoCreateInstance(&CLSID_DirectMusicContainer, (IUnknown*)&dmc, CLSCTX_INPROC_SERVER,
+ hr = CoCreateInstance(&CLSID_DirectMusicContainer, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmc);
ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicContainer create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c
index 404dad6cc5..664b208127 100644
--- a/dlls/dmstyle/tests/dmstyle.c
+++ b/dlls/dmstyle/tests/dmstyle.c
@@ -50,7 +50,7 @@ static void test_COM(void)
HRESULT hr;
/* COM aggregation */
- hr = CoCreateInstance(&CLSID_DirectMusicStyle, (IUnknown*)&dms8, CLSCTX_INPROC_SERVER,
+ hr = CoCreateInstance(&CLSID_DirectMusicStyle, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dms8);
ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicStyle8 create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
@@ -102,7 +102,7 @@ static void test_COM_section(void)
HRESULT hr;
/* COM aggregation */
- hr = CoCreateInstance(&CLSID_DirectMusicSection, (IUnknown*)&dmo, CLSCTX_INPROC_SERVER,
+ hr = CoCreateInstance(&CLSID_DirectMusicSection, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmo);
ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicSection create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
@@ -165,7 +165,7 @@ static void test_COM_track(void)
for (i = 0; i < ARRAY_SIZE(class); i++) {
/* COM aggregation */
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);
if (hr == REGDB_E_CLASSNOTREG) {
win_skip("%s not registered\n", class[i].name);
diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c
index 2035783ba1..3ddf40817a 100644
--- a/dlls/dmsynth/tests/dmsynth.c
+++ b/dlls/dmsynth/tests/dmsynth.c
@@ -145,7 +145,7 @@ static void test_COM(void)
HRESULT hr;
/* COM aggregation */
- hr = CoCreateInstance(&CLSID_DirectMusicSynth, (IUnknown*)&dms8, CLSCTX_INPROC_SERVER,
+ hr = CoCreateInstance(&CLSID_DirectMusicSynth, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dms8);
ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicSynth create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
@@ -193,7 +193,7 @@ static void test_COM_synthsink(void)
HRESULT hr;
/* COM aggregation */
- hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, (IUnknown*)&dmss, CLSCTX_INPROC_SERVER,
+ hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmss);
ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicSynthSink create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c
index b56bba4a4a..0a1eca6acd 100644
--- a/dlls/dmusic/tests/dmusic.c
+++ b/dlls/dmusic/tests/dmusic.c
@@ -221,7 +221,7 @@ static void test_COM(void)
HRESULT hr;
/* 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);
ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusic8 create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
@@ -270,7 +270,7 @@ static void test_COM_dmcoll(void)
HRESULT hr;
/* COM aggregation */
- hr = CoCreateInstance(&CLSID_DirectMusicCollection, (IUnknown*)&dmc, CLSCTX_INPROC_SERVER,
+ hr = CoCreateInstance(&CLSID_DirectMusicCollection, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmc);
ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicCollection create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
--
2.11.0
More information about the wine-patches
mailing list