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

[Alexandre Julliard]

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

Author: Michael Stefaniuc 
Date:   Tue Dec  3 23:51:23 2019 +0100

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

Signed-off-by: Michael Stefaniuc 
Signed-off-by: Alexandre Julliard

---

dlls/dmime/tests/dmime.c  |  9 +++++++++
 dlls/dmime/timesigtrack.c | 38 ++++++++++++++++++++++++++++----------
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c
index a08fc19c22..3e25328cd8 100644
--- a/dlls/dmime/tests/dmime.c
+++ b/dlls/dmime/tests/dmime.c
@@ -716,6 +716,15 @@ static void test_track(void)
                     ok(hr == DMUS_E_TYPE_UNSUPPORTED,
                             "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n",
                             param_types[j].name, hr);
+                /* GetParam / SetParam for IsParamSupported supported types */
+                if (class[i].clsid == &CLSID_DirectMusicTimeSigTrack) {
+                    expect_getparam(dmt, &GUID_DisableTimeSig, "GUID_DisableTimeSig",
+                                DMUS_E_GET_UNSUPPORTED);
+                    expect_getparam(dmt, &GUID_EnableTimeSig, "GUID_EnableTimeSig",
+                                DMUS_E_GET_UNSUPPORTED);
+                    expect_setparam(dmt, &GUID_TimeSignature, "GUID_TimeSignature",
+                                DMUS_E_SET_UNSUPPORTED);
+                }
             }
         } else {
             hr = IDirectMusicTrack_GetParam(dmt, NULL, 0, NULL, NULL);
diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c
index 74b2c3652d..697b3e3593 100644
--- a/dlls/dmime/timesigtrack.c
+++ b/dlls/dmime/timesigtrack.c
@@ -117,20 +117,38 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Play(IDirectMusicTrack *iface, void
    return S_OK;
 }

-static HRESULT WINAPI IDirectMusicTrackImpl_GetParam(IDirectMusicTrack *iface, REFGUID rguidType,
-        MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam)
+static HRESULT WINAPI IDirectMusicTrackImpl_GetParam(IDirectMusicTrack *iface, REFGUID type,
+        MUSIC_TIME time, MUSIC_TIME *next, void *param)
 {
-        IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface);
-	FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam);
-	return S_OK;
+    IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface);
+
+    TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param);
+
+    if (IsEqualGUID(type, &GUID_TimeSignature)) {
+        FIXME("GUID_TimeSignature not handled yet\n");
+        return DMUS_E_NOT_FOUND;
+    }
+
+    return DMUS_E_GET_UNSUPPORTED;
 }

-static HRESULT WINAPI IDirectMusicTrackImpl_SetParam(IDirectMusicTrack *iface, REFGUID rguidType,
-        MUSIC_TIME mtTime, void *pParam)
+static HRESULT WINAPI IDirectMusicTrackImpl_SetParam(IDirectMusicTrack *iface, REFGUID type,
+        MUSIC_TIME time, void *param)
 {
-        IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface);
-	FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam);
-	return S_OK;
+    IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface);
+
+    TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param);
+
+    if (IsEqualGUID(type, &GUID_DisableTimeSig)) {
+        FIXME("GUID_DisableTimeSig not handled yet\n");
+        return S_OK;
+    }
+    if (IsEqualGUID(type, &GUID_EnableTimeSig)) {
+        FIXME("GUID_EnableTimeSig not handled yet\n");
+        return S_OK;
+    }
+
+    return DMUS_E_SET_UNSUPPORTED;
 }

static HRESULT WINAPI IDirectMusicTrackImpl_IsParamSupported(IDirectMusicTrack *iface,