* Sync up to trunk head (r64377).

[reactos.git] / dll / directx / wine / dmusic / dmusic.c

diff --git a/dll/directx/wine/dmusic/dmusic.c b/dll/directx/wine/dmusic/dmusic.c
index fb73112..0e7cbaf 100644 (file)
--- a/dll/directx/wine/dmusic/dmusic.c
+++ b/dll/directx/wine/dmusic/dmusic.c
@@ -59,8 +59,6 @@ static ULONG WINAPI IDirectMusic8Impl_AddRef(LPDIRECTMUSIC8 iface)
 
     TRACE("(%p)->(): new ref = %u\n", This, ref);
 
-    DMUSIC_LockModule();
-
     return ref;
 }
 
@@ -72,13 +70,13 @@ static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface)
     TRACE("(%p)->(): new ref = %u\n", This, ref);
 
     if (!ref) {
+        IReferenceClock_Release(&This->pMasterClock->IReferenceClock_iface);
         HeapFree(GetProcessHeap(), 0, This->system_ports);
         HeapFree(GetProcessHeap(), 0, This->ppPorts);
         HeapFree(GetProcessHeap(), 0, This);
+        DMUSIC_UnlockModule();
     }
 
-    DMUSIC_UnlockModule();
-
     return ref;
 }
 
@@ -210,8 +208,10 @@ static HRESULT WINAPI IDirectMusic8Impl_GetMasterClock(LPDIRECTMUSIC8 iface, LPG
 
     if (guid_clock)
         *guid_clock = This->pMasterClock->pClockInfo.guidClock;
-    if (reference_clock)
-        *reference_clock = (IReferenceClock*)This->pMasterClock;
+    if (reference_clock) {
+        *reference_clock = &This->pMasterClock->IReferenceClock_iface;
+        IReferenceClock_AddRef(*reference_clock);
+    }
 
     return S_OK;
 }
@@ -414,7 +414,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPU
         return E_OUTOFMEMORY;
 
     dmusic->IDirectMusic8_iface.lpVtbl = &DirectMusic8_Vtbl;
-    dmusic->ref = 0; /* Will be inited by QueryInterface */
+    dmusic->ref = 1;
     dmusic->pMasterClock = NULL;
     dmusic->ppPorts = NULL;
     dmusic->nrofports = 0;
@@ -424,14 +424,11 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPU
         return ret;
     }
 
-    ret = IDirectMusic8Impl_QueryInterface(&dmusic->IDirectMusic8_iface, riid, ret_iface);
-    if (FAILED(ret)) {
-        IReferenceClock_Release(&dmusic->pMasterClock->IReferenceClock_iface);
-        HeapFree(GetProcessHeap(), 0, dmusic);
-        return ret;
-    }
-
     create_system_ports_list(dmusic);
 
-    return S_OK;
+    DMUSIC_LockModule();
+    ret = IDirectMusic8Impl_QueryInterface(&dmusic->IDirectMusic8_iface, riid, ret_iface);
+    IDirectMusic8Impl_Release(&dmusic->IDirectMusic8_iface);
+
+    return ret;
 }