Properly implement DllCanUnloadNow ref counting.

diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c
index 2e33ec2ddf5979733f177abb19703dbbeb5919d0..c1de82125c6fcf4272170e2e113bcd112e409f68 100644 (file)
--- a/dlls/dmband/band.c
+++ b/dlls/dmband/band.c
@@ -60,6 +60,8 @@ ULONG WINAPI IDirectMusicBandImpl_IUnknown_AddRef (LPUNKNOWN iface) {
 
        TRACE("(%p) : AddRef from %ld\n", This, ref - 1);
 
+       DMBAND_LockModule();
+
        return ref;
 }
 
@@ -72,6 +74,9 @@ ULONG WINAPI IDirectMusicBandImpl_IUnknown_Release (LPUNKNOWN iface) {
        if (ref == 0) {
                HeapFree(GetProcessHeap(), 0, This);
        }
+
+       DMBAND_UnlockModule();
+       
        return ref;
 }
 

diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c
index 27c71c2179116249b38e6d842f0b92a236bcae90..fb3c6aa293cb7cd3d4459b46ffc08a485f845e05 100644 (file)
--- a/dlls/dmband/bandtrack.c
+++ b/dlls/dmband/bandtrack.c
@@ -55,6 +55,8 @@ ULONG WINAPI IDirectMusicBandTrack_IUnknown_AddRef (LPUNKNOWN iface) {
 
   TRACE("(%p) : AddRef from %ld\n", This, ref - 1);
 
+  DMBAND_LockModule();
+
   return ref;
 }
 
@@ -67,6 +69,9 @@ ULONG WINAPI IDirectMusicBandTrack_IUnknown_Release (LPUNKNOWN iface) {
   if (ref == 0) {
     HeapFree(GetProcessHeap(), 0, This);
   }
+
+  DMBAND_UnlockModule();
+  
   return ref;
 }
 

diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c
index 7ccfaa5b8d4934cb5bf58347585db00a1dd2138f..bd6c6bee6a3c3697304a8a767dc1635b17810b85 100644 (file)
--- a/dlls/dmband/dmband_main.c
+++ b/dlls/dmband/dmband_main.c
@@ -21,10 +21,10 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(dmband);
 
+LONG DMBAND_refCount = 0;
+
 typedef struct {
-    /* IUnknown fields */
     IClassFactoryVtbl          *lpVtbl;
-    DWORD                       ref;
 } IClassFactoryImpl;
 
 /******************************************************************
@@ -32,31 +32,39 @@ typedef struct {
  */
  
 static HRESULT WINAPI BandCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
-       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
-       FIXME("(%p, %s, %p): stub\n",This, debugstr_dmguid(riid), ppobj);
+       FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid));
+
+       if (ppobj == NULL) return E_POINTER;
+       
        return E_NOINTERFACE;
 }
 
 static ULONG WINAPI BandCF_AddRef(LPCLASSFACTORY iface) {
-       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
-       return InterlockedIncrement(&This->ref);
+       DMBAND_LockModule();
+
+       return 2; /* non-heap based object */
 }
 
 static ULONG WINAPI BandCF_Release(LPCLASSFACTORY iface) {
-       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
-       /* static class, won't be  freed */
-       return InterlockedDecrement(&This->ref);
+       DMBAND_UnlockModule();
+
+       return 1; /* non-heap based object */
 }
 
 static HRESULT WINAPI BandCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) {
-       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
-       TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj);
+       TRACE ("(%p, %s, %p)\n", pOuter, debugstr_dmguid(riid), ppobj);
+       
        return DMUSIC_CreateDirectMusicBandImpl (riid, ppobj, pOuter);
 }
 
 static HRESULT WINAPI BandCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
-       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
-       FIXME("(%p, %d): stub\n", This, dolock);
+       TRACE("(%d)\n", dolock);
+
+       if (dolock)
+               DMBAND_LockModule();
+       else
+               DMBAND_UnlockModule();
+       
        return S_OK;
 }
 
@@ -68,7 +76,7 @@ static IClassFactoryVtbl BandCF_Vtbl = {
        BandCF_LockServer
 };
 
-static IClassFactoryImpl Band_CF = {&BandCF_Vtbl, 1 };
+static IClassFactoryImpl Band_CF = {&BandCF_Vtbl};
 
 
 /******************************************************************
@@ -76,32 +84,39 @@ static IClassFactoryImpl Band_CF = {&BandCF_Vtbl, 1 };
  */
  
 static HRESULT WINAPI BandTrackCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
-       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
-
-       FIXME("(%p, %s, %p): stub\n", This, debugstr_dmguid(riid), ppobj);
+       FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid));
+       
+       if (ppobj == NULL) return E_POINTER;
+       
        return E_NOINTERFACE;
 }
 
 static ULONG WINAPI BandTrackCF_AddRef(LPCLASSFACTORY iface) {
-       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
-       return InterlockedIncrement(&This->ref);
+       DMBAND_LockModule();
+
+       return 2; /* non-heap based object */
 }
 
 static ULONG WINAPI BandTrackCF_Release(LPCLASSFACTORY iface) {
-       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
-       /* static class, won't be  freed */
-       return InterlockedDecrement(&This->ref);
+       DMBAND_UnlockModule();
+
+       return 1; /* non-heap based object */
 }
 
 static HRESULT WINAPI BandTrackCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) {
-       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
-       TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj);
+       TRACE ("(%p, %s, %p)\n", pOuter, debugstr_dmguid(riid), ppobj);
+       
        return DMUSIC_CreateDirectMusicBandTrack (riid, ppobj, pOuter);
 }
 
 static HRESULT WINAPI BandTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
-       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
-       FIXME("(%p, %d): stub\n", This, dolock);
+       TRACE("(%d)\n", dolock);
+
+       if (dolock)
+               DMBAND_LockModule();
+       else
+               DMBAND_UnlockModule();
+       
        return S_OK;
 }
 
@@ -113,7 +128,7 @@ static IClassFactoryVtbl BandTrackCF_Vtbl = {
        BandTrackCF_LockServer
 };
 
-static IClassFactoryImpl BandTrack_CF = {&BandTrackCF_Vtbl, 1 };
+static IClassFactoryImpl BandTrack_CF = {&BandTrackCF_Vtbl};
 
 /******************************************************************
  *             DllMain
@@ -138,8 +153,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
  *
  */
 HRESULT WINAPI DMBAND_DllCanUnloadNow(void) {
-    FIXME("(void): stub\n");
-    return S_FALSE;
+       return DMBAND_refCount != 0 ? S_FALSE : S_OK;
 }
 
 

diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h
index 25a23b12e43301f80ea9b4b766a597323ad1e358..8c71a7402de64085d2425d009c31d7ba3bf03ad2 100644 (file)
--- a/dlls/dmband/dmband_private.h
+++ b/dlls/dmband/dmband_private.h
@@ -192,6 +192,12 @@ extern HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_Load (LPPERSISTSTREAM
 extern HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty);
 extern HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize);
 
+/**********************************************************************
+ * Dll lifetime tracking declaration for dmband.dll
+ */
+extern LONG DMBAND_refCount;
+static inline void DMBAND_LockModule() { InterlockedIncrement( &DMBAND_refCount ); }
+static inline void DMBAND_UnlockModule() { InterlockedDecrement( &DMBAND_refCount ); }
 
 /*****************************************************************************
  * Misc.

diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c
index 852bb9ac9109c75bd45d92ee6d9947b261db11d5..f7928a99896f60971e313cc9497f17bc1539e000 100644 (file)
--- a/dlls/dmsynth/dmsynth_main.c
+++ b/dlls/dmsynth/dmsynth_main.c
@@ -23,41 +23,48 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(dmsynth);
 
+LONG DMSYNTH_refCount = 0;
+
 typedef struct {
-    /* IUnknown fields */
     IClassFactoryVtbl          *lpVtbl;
-    DWORD                       ref;
 } IClassFactoryImpl;
 
 /******************************************************************
  *             DirectMusicSynth ClassFactory
  */
 static HRESULT WINAPI SynthCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
-       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
-       FIXME("(%p, %s, %p): stub\n", This, debugstr_dmguid(riid), ppobj);
+       FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid));
+
+       if (ppobj == NULL) return E_POINTER;
+       
        return E_NOINTERFACE;
 }
 
 static ULONG WINAPI SynthCF_AddRef(LPCLASSFACTORY iface) {
-       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
-       return InterlockedIncrement(&This->ref);
+       DMSYNTH_LockModule();
+
+       return 2; /* non-heap based object */
 }
 
 static ULONG WINAPI SynthCF_Release(LPCLASSFACTORY iface) {
-       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
-       /* static class, won't be  freed */
-       return InterlockedDecrement(&This->ref);
+       DMSYNTH_UnlockModule();
+
+       return 1; /* non-heap based object */
 }
 
 static HRESULT WINAPI SynthCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) {
-       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
-       TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj);
+       TRACE ("(%p, %s, %p)\n", pOuter, debugstr_dmguid(riid), ppobj);
        return DMUSIC_CreateDirectMusicSynthImpl (riid, ppobj, pOuter);
 }
 
 static HRESULT WINAPI SynthCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
-       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
-       FIXME("(%p, %d): stub\n", This, dolock);
+       TRACE("(%d)\n", dolock);
+
+       if (dolock)
+               DMSYNTH_LockModule();
+       else
+               DMSYNTH_UnlockModule();
+
        return S_OK;
 }
 
@@ -69,37 +76,44 @@ static IClassFactoryVtbl SynthCF_Vtbl = {
        SynthCF_LockServer
 };
 
-static IClassFactoryImpl Synth_CF = {&SynthCF_Vtbl, 1 };
+static IClassFactoryImpl Synth_CF = {&SynthCF_Vtbl};
 
 /******************************************************************
  *             DirectMusicSynthSink ClassFactory
  */
 static HRESULT WINAPI SynthSinkCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
-       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
-       FIXME("(%p, %s, %p): stub\n", This, debugstr_dmguid(riid), ppobj);
+       FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid));
+
+       if (ppobj == NULL) return E_POINTER;
+       
        return E_NOINTERFACE;
 }
 
 static ULONG WINAPI SynthSinkCF_AddRef(LPCLASSFACTORY iface) {
-       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
-       return InterlockedIncrement(&This->ref);
+       DMSYNTH_LockModule();
+
+       return 2; /* non-heap based object */
 }
 
 static ULONG WINAPI SynthSinkCF_Release(LPCLASSFACTORY iface) {
-       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
-       /* static class, won't be  freed */
-       return InterlockedDecrement(&This->ref);
+       DMSYNTH_UnlockModule();
+
+       return 1; /* non-heap based object */
 }
 
 static HRESULT WINAPI SynthSinkCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) {
-       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
-       TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj);
+       TRACE ("(%p, %s, %p)\n", pOuter, debugstr_dmguid(riid), ppobj);
        return DMUSIC_CreateDirectMusicSynthSinkImpl (riid, ppobj, pOuter);
 }
 
 static HRESULT WINAPI SynthSinkCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
-       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
-       FIXME("(%p, %d): stub\n", This, dolock);
+       TRACE("(%d)\n", dolock);
+
+       if (dolock)
+               DMSYNTH_LockModule();
+       else
+               DMSYNTH_UnlockModule();
+       
        return S_OK;
 }
 
@@ -111,7 +125,7 @@ static IClassFactoryVtbl SynthSinkCF_Vtbl = {
        SynthSinkCF_LockServer
 };
 
-static IClassFactoryImpl SynthSink_CF = {&SynthSinkCF_Vtbl, 1 };
+static IClassFactoryImpl SynthSink_CF = {&SynthSinkCF_Vtbl};
        
 /******************************************************************
  *             DllMain
@@ -136,8 +150,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
  *
  */
 HRESULT WINAPI DMSYNTH_DllCanUnloadNow(void) {
-    FIXME("(void): stub\n");
-    return S_FALSE;
+       return DMSYNTH_refCount != 0 ? S_FALSE : S_OK;
 }
 
 

diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h
index 4c2da07f2cf803d1c1593d05ef7b2ae8070dfae5..9559c5d26901da43ac6349e059633249a56e57f2 100644 (file)
--- a/dlls/dmsynth/dmsynth_private.h
+++ b/dlls/dmsynth/dmsynth_private.h
@@ -127,6 +127,12 @@ extern HRESULT WINAPI IDirectMusicSynthSinkImpl_RefTimeToSample (LPDIRECTMUSICSY
 extern HRESULT WINAPI IDirectMusicSynthSinkImpl_SetDirectSound (LPDIRECTMUSICSYNTHSINK iface, LPDIRECTSOUND pDirectSound, LPDIRECTSOUNDBUFFER pDirectSoundBuffer);
 extern HRESULT WINAPI IDirectMusicSynthSinkImpl_GetDesiredBufferSize (LPDIRECTMUSICSYNTHSINK iface, LPDWORD pdwBufferSizeInSamples);
 
+/**********************************************************************
+ * Dll lifetime tracking declaration for dmsynth.dll
+ */
+extern LONG DMSYNTH_refCount;
+static inline void DMSYNTH_LockModule() { InterlockedIncrement( &DMSYNTH_refCount ); }
+static inline void DMSYNTH_UnlockModule() { InterlockedDecrement( &DMSYNTH_refCount ); }
 
 /*****************************************************************************
  * Misc.

diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c
index 20fdd10b380d847503fc00b18a89494bcea969f0..d9b6d6f31e7e19e2f4e14acf427cb126b939a7f1 100644 (file)
--- a/dlls/dmsynth/synth.c
+++ b/dlls/dmsynth/synth.c
@@ -43,6 +43,8 @@ ULONG WINAPI IDirectMusicSynth8Impl_AddRef (LPDIRECTMUSICSYNTH8 iface) {
 
        TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1);
 
+       DMSYNTH_LockModule();
+
        return refCount;
 }
 
@@ -55,6 +57,9 @@ ULONG WINAPI IDirectMusicSynth8Impl_Release (LPDIRECTMUSICSYNTH8 iface) {
        if (!refCount) {
                HeapFree(GetProcessHeap(), 0, This);
        }
+
+       DMSYNTH_UnlockModule();
+       
        return refCount;
 }
 

diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c
index d190da5f8e56a4201a81b5d59fb779d186503968..3177ed7983b2152475f37de06326843f3c825581 100644 (file)
--- a/dlls/dmsynth/synthsink.c
+++ b/dlls/dmsynth/synthsink.c
@@ -42,6 +42,8 @@ ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef (LPDIRECTMUSICSYNTHSINK iface) {
 
        TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1);
 
+       DMSYNTH_LockModule();
+
        return refCount;
 }
 
@@ -54,6 +56,9 @@ ULONG WINAPI IDirectMusicSynthSinkImpl_Release (LPDIRECTMUSICSYNTHSINK iface) {
        if (!refCount) {
                HeapFree(GetProcessHeap(), 0, This);
        }
+
+       DMSYNTH_UnlockModule();
+
        return refCount;
 }