Rémi Bernon : dmime: Use the correct interface methods.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2dc15d394374ac2a29c482d8e74994ab903bd849
URL:    https://gitlab.winehq.org/wine/wine/-/commit/2dc15d394374ac2a29c482d8e74994a...

Author: Rémi Bernon 
Date:   Mon Sep  4 13:19:25 2023 +0200

dmime: Use the correct interface methods.

---

dlls/dmime/graph.c             | 4 ++--
 dlls/dmime/performance.c       | 2 +-
 dlls/dmime/tests/dmime.c       | 8 ++++----
 dlls/dmime/tests/performance.c | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c
index 8ac037e43bc..159923b6a70 100644
--- a/dlls/dmime/graph.c
+++ b/dlls/dmime/graph.c
@@ -129,8 +129,8 @@ static HRESULT WINAPI DirectMusicGraph_InsertTool(IDirectMusicGraph *iface, IDir
     pNewTool = calloc(1, sizeof(*pNewTool));
     pNewTool->pTool = pTool;
     pNewTool->dwIndex = lIndex;
-    IDirectMusicTool8_AddRef(pTool);
-    IDirectMusicTool8_Init(pTool, iface);
+    IDirectMusicTool_AddRef(pTool);
+    IDirectMusicTool_Init(pTool, iface);
     list_add_tail (pPrevEntry->next, &pNewTool->entry);

#if 0
diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
index a1acc6d97cc..f6eb53e365f 100644
--- a/dlls/dmime/performance.c
+++ b/dlls/dmime/performance.c
@@ -879,7 +879,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CloseDown(IDirectMusicPerform
         This->dsound = NULL;
     }
     if (This->dmusic) {
-        IDirectMusic_SetDirectSound(This->dmusic, NULL, NULL);
+        IDirectMusic8_SetDirectSound(This->dmusic, NULL, NULL);
         IDirectMusic8_Release(This->dmusic);
         This->dmusic = NULL;
     }
diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c
index f00b5073b48..e95a1c02427 100644
--- a/dlls/dmime/tests/dmime.c
+++ b/dlls/dmime/tests/dmime.c
@@ -223,7 +223,7 @@ static BOOL missing_dmime(void)

if (hr == S_OK && dms)
     {
-        IDirectMusicSegment_Release(dms);
+        IDirectMusicSegment8_Release(dms);
         return FALSE;
     }
     return TRUE;
@@ -1015,7 +1015,7 @@ static void expect_getparam(IDirectMusicTrack *track, REFGUID type, const char *
     HRESULT hr;
     char buf[64] = { 0 };

-    hr = IDirectMusicTrack8_GetParam(track, type, 0, NULL, buf);
+    hr = IDirectMusicTrack_GetParam(track, type, 0, NULL, buf);
     ok(hr == expect, "GetParam(%s) failed: %#lx, expected %#lx\n", name, hr, expect);
 }

@@ -1025,7 +1025,7 @@ static void expect_setparam(IDirectMusicTrack *track, REFGUID type, const char *
     HRESULT hr;
     char buf[64] = { 0 };

-    hr = IDirectMusicTrack8_SetParam(track, type, 0, buf);
+    hr = IDirectMusicTrack_SetParam(track, type, 0, buf);
     ok(hr == expect, "SetParam(%s) failed: %#lx, expected %#lx\n", name, hr, expect);
 }

@@ -1103,7 +1103,7 @@ static void test_track(void)
         /* IDirectMusicTrack */
         if (class[i].has_params != ~0) {
             for (j = 0; j < ARRAY_SIZE(param_types); j++) {
-                hr = IDirectMusicTrack8_IsParamSupported(dmt, param_types[j].type);
+                hr = IDirectMusicTrack_IsParamSupported(dmt, param_types[j].type);
                 if (class[i].has_params & (1 << j)) {
                     ok(hr == S_OK, "IsParamSupported(%s) failed: %#lx, expected S_OK\n",
                             param_types[j].name, hr);
diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c
index 100d8e40be0..4af91fc3130 100644
--- a/dlls/dmime/tests/performance.c
+++ b/dlls/dmime/tests/performance.c
@@ -334,7 +334,7 @@ static void test_createport(void)
     ok(hr == S_OK, "CloseDown failed: %#lx\n", hr);

IDirectMusic_Release(music);
-    IDirectMusicPerformance_Release(perf);
+    IDirectMusicPerformance8_Release(perf);
 }

static void test_pchannel(void)