Rémi Bernon : dmsynth: Always return S_FALSE from DllCanUnloadNow.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3b5160c97567ceb13d719219e45972f07f990fbb
URL:    https://gitlab.winehq.org/wine/wine/-/commit/3b5160c97567ceb13d719219e45972f...

Author: Rémi Bernon 
Date:   Tue Aug 22 17:44:17 2023 +0200

dmsynth: Always return S_FALSE from DllCanUnloadNow.

---

dlls/dmsynth/dmsynth_main.c    | 22 ----------------------
 dlls/dmsynth/dmsynth_private.h |  7 -------
 dlls/dmsynth/synth.c           |  2 --
 dlls/dmsynth/synthsink.c       |  2 --
 4 files changed, 33 deletions(-)

diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c
index a5e2e605419..edeaab8474e 100644
--- a/dlls/dmsynth/dmsynth_main.c
+++ b/dlls/dmsynth/dmsynth_main.c
@@ -25,8 +25,6 @@

WINE_DEFAULT_DEBUG_CHANNEL(dmsynth);

-LONG DMSYNTH_refCount = 0;
-
 typedef struct {
         IClassFactory IClassFactory_iface;
         HRESULT (*fnCreateInstance)(REFIID riid, void **ppv);
@@ -62,15 +60,11 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r

static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface)
 {
-        DMSYNTH_LockModule();
-
         return 2; /* non-heap based object */
 }

static ULONG WINAPI ClassFactory_Release(IClassFactory *iface)
 {
-        DMSYNTH_UnlockModule();
-
         return 1; /* non-heap based object */
 }

@@ -90,12 +84,6 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown
 static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock)
 {
         TRACE("(%d)\n", dolock);
-
-        if (dolock)
-                DMSYNTH_LockModule();
-        else
-                DMSYNTH_UnlockModule();
-
         return S_OK;
 }

@@ -111,16 +99,6 @@ static IClassFactoryImpl Synth_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMu
 static IClassFactoryImpl SynthSink_CF = {{&classfactory_vtbl},
                                          DMUSIC_CreateDirectMusicSynthSinkImpl};

-/******************************************************************
- *		DllCanUnloadNow (DMSYNTH.@)
- *
- *
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-	return DMSYNTH_refCount != 0 ? S_FALSE : S_OK;
-}
-

/******************************************************************
  *		DllGetClassObject (DMSYNTH.@)
diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h
index c21a9e84a84..3a3e76dfaf4 100644
--- a/dlls/dmsynth/dmsynth_private.h
+++ b/dlls/dmsynth/dmsynth_private.h
@@ -80,13 +80,6 @@ struct IDirectMusicSynthSinkImpl {
     BOOL active;
 };

-/**********************************************************************
- * Dll lifetime tracking declaration for dmsynth.dll
- */
-extern LONG DMSYNTH_refCount;
-static inline void DMSYNTH_LockModule(void) { InterlockedIncrement( &DMSYNTH_refCount ); }
-static inline void DMSYNTH_UnlockModule(void) { InterlockedDecrement( &DMSYNTH_refCount ); }
-
 /*****************************************************************************
  * Misc.
  */
diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c
index 2c46abf661b..bcfc6e0ab37 100644
--- a/dlls/dmsynth/synth.c
+++ b/dlls/dmsynth/synth.c
@@ -83,7 +83,6 @@ static ULONG WINAPI IDirectMusicSynth8Impl_Release(IDirectMusicSynth8 *iface)
         if (This->latency_clock)
             IReferenceClock_Release(This->latency_clock);
         HeapFree(GetProcessHeap(), 0, This);
-        DMSYNTH_UnlockModule();
     }

return ref;
@@ -750,7 +749,6 @@ HRESULT DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj)
     obj->caps.dwEffectFlags = DMUS_EFFECT_REVERB;
     lstrcpyW(obj->caps.wszDescription, L"Microsoft Synthesizer");

-    DMSYNTH_LockModule();
     hr = IDirectMusicSynth8_QueryInterface(&obj->IDirectMusicSynth8_iface, riid, ppobj);
     IDirectMusicSynth8_Release(&obj->IDirectMusicSynth8_iface);

diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c
index abc422f2b10..b9d9a31012c 100644
--- a/dlls/dmsynth/synthsink.c
+++ b/dlls/dmsynth/synthsink.c
@@ -81,7 +81,6 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(IDirectMusicSynthSink *ifa
         if (This->master_clock)
             IReferenceClock_Release(This->master_clock);
         HeapFree(GetProcessHeap(), 0, This);
-        DMSYNTH_UnlockModule();
     }

return ref;
@@ -317,7 +316,6 @@ HRESULT DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void **ret_iface)
         return hr;
     }

-    DMSYNTH_LockModule();
     hr = IDirectMusicSynthSink_QueryInterface(&obj->IDirectMusicSynthSink_iface, riid, ret_iface);
     IDirectMusicSynthSink_Release(&obj->IDirectMusicSynthSink_iface);