[PATCH 2/3] dmusic: Store the master clock as an IReferenceClock pointer.
Zebediah Figura
z.figura12 at gmail.com
Fri Jun 14 10:35:43 CDT 2019
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
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 94c0ff441c8..a74a31e68bf 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 c59646d5709..4863aad80b3 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;
--
2.20.1
More information about the wine-devel
mailing list