Michael Stefaniuc : dmime: Partial implementation of the Wave track Get/SetParam.

Alexandre Julliard julliard at winehq.org
Wed Dec 4 16:13:03 CST 2019


Module: wine
Branch: master
Commit: d4233399607b33fd114a92275ee8c8dc10e3205f
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=d4233399607b33fd114a92275ee8c8dc10e3205f

Author: Michael Stefaniuc <mstefani at winehq.org>
Date:   Tue Dec  3 23:51:22 2019 +0100

dmime: Partial implementation of the Wave track Get/SetParam.

Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/dmime/tests/dmime.c |  3 +++
 dlls/dmime/wavetrack.c   | 48 ++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c
index 723dc88399..a08fc19c22 100644
--- a/dlls/dmime/tests/dmime.c
+++ b/dlls/dmime/tests/dmime.c
@@ -709,6 +709,9 @@ static void test_track(void)
                     } else if (class[i].clsid == &CLSID_DirectMusicMarkerTrack)
                         expect_setparam(dmt, param_types[j].type, param_types[j].name,
                                 DMUS_E_SET_UNSUPPORTED);
+                    else if (class[i].clsid == &CLSID_DirectMusicWaveTrack)
+                        expect_getparam(dmt, param_types[j].type, param_types[j].name,
+                                DMUS_E_GET_UNSUPPORTED);
                 } else
                     ok(hr == DMUS_E_TYPE_UNSUPPORTED,
                             "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n",
diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c
index 34adca6065..1c6b08b523 100644
--- a/dlls/dmime/wavetrack.c
+++ b/dlls/dmime/wavetrack.c
@@ -120,20 +120,48 @@ static HRESULT WINAPI wave_track_Play(IDirectMusicTrack8 *iface, void *pStateDat
 	return S_OK;
 }
 
-static HRESULT WINAPI wave_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
-        MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam)
+static HRESULT WINAPI wave_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time,
+        MUSIC_TIME *next, void *param)
 {
-        IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam);
-	return S_OK;
+    IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
+
+    TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param);
+    return DMUS_E_GET_UNSUPPORTED;
 }
 
-static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
-        MUSIC_TIME mtTime, void *pParam)
+static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time,
+        void *param)
 {
-        IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
-	FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam);
-	return S_OK;
+    IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
+
+    TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param);
+
+    if (IsEqualGUID(type, &GUID_Disable_Auto_Download)) {
+        FIXME("GUID_Disable_Auto_Download not handled yet\n");
+        return S_OK;
+    }
+    if (IsEqualGUID(type, &GUID_Download)) {
+        FIXME("GUID_Download not handled yet\n");
+        return S_OK;
+    }
+    if (IsEqualGUID(type, &GUID_DownloadToAudioPath)) {
+        FIXME("GUID_DownloadToAudioPath not handled yet\n");
+        return S_OK;
+    }
+    if (IsEqualGUID(type, &GUID_Enable_Auto_Download)) {
+        FIXME("GUID_Enable_Auto_Download not handled yet\n");
+        return S_OK;
+    }
+    if (IsEqualGUID(type, &GUID_Unload)) {
+        FIXME("GUID_Unload not handled yet\n");
+        return S_OK;
+    }
+    if (IsEqualGUID(type, &GUID_UnloadFromAudioPath)) {
+        FIXME("GUID_UnloadFromAudioPath not handled yet\n");
+        return S_OK;
+    }
+
+    return DMUS_E_TYPE_UNSUPPORTED;
 }
 
 static HRESULT WINAPI wave_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type)




More information about the wine-cvs mailing list