Zebediah Figura : dmusic: Store the master clock as an IReferenceClock pointer.

[Alexandre Julliard]

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

Author: Zebediah Figura <z.figura12(a)gmail.com>
Date:   Fri Jun 14 11:42:44 2019 -0500

dmusic: Store the master clock as an IReferenceClock pointer.

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/dmusic/dmusic.c         | 6 +++---
 dlls/dmusic/dmusic_private.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c
index 94c0ff4..a74a31e 100644
--- a/dlls/dmusic/dmusic.c
+++ b/dlls/dmusic/dmusic.c
@@ -72,7 +72,7 @@ static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface)
     TRACE("(%p)->(): new ref = %u\n", This, ref);
 
     if (!ref) {
-        IReferenceClock_Release(&This->master_clock->IReferenceClock_iface);
+        IReferenceClock_Release(This->master_clock);
         if (This->dsound)
             IDirectSound_Release(This->dsound);
         HeapFree(GetProcessHeap(), 0, This->system_ports);
@@ -246,9 +246,9 @@ static HRESULT WINAPI IDirectMusic8Impl_GetMasterClock(LPDIRECTMUSIC8 iface, LPG
     TRACE("(%p)->(%p, %p)\n", This, guid_clock, reference_clock);
 
     if (guid_clock)
-        *guid_clock = This->master_clock->pClockInfo.guidClock;
+        *guid_clock = GUID_NULL;
     if (reference_clock) {
-        *reference_clock = &This->master_clock->IReferenceClock_iface;
+        *reference_clock = This->master_clock;
         IReferenceClock_AddRef(*reference_clock);
     }
 
diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h
index c59646d..4863aad 100644
--- a/dlls/dmusic/dmusic_private.h
+++ b/dlls/dmusic/dmusic_private.h
@@ -111,7 +111,7 @@ struct IDirectMusic8Impl {
     IDirectMusic8 IDirectMusic8_iface;
     LONG ref;
     IDirectSound *dsound;
-    IReferenceClockImpl *master_clock;
+    IReferenceClock *master_clock;
     IDirectMusicPort **ports;
     int num_ports;
     port_info *system_ports;