Zebediah Figura : winegstreamer: Always return S_FALSE from DllCanUnloadNow().

Alexandre Julliard julliard at winehq.org
Thu Aug 26 15:22:29 CDT 2021


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

Author: Zebediah Figura <zfigura at codeweavers.com>
Date:   Wed Aug 25 17:10:38 2021 -0500

winegstreamer: Always return S_FALSE from DllCanUnloadNow().

Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/winegstreamer/gst_private.h |  2 --
 dlls/winegstreamer/main.c        | 14 --------------
 dlls/winegstreamer/mfplat.c      |  6 ------
 3 files changed, 22 deletions(-)

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index 55a62361966..c6c99b1dd55 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -198,8 +198,6 @@ struct unix_funcs
 
 extern const struct unix_funcs *unix_funcs;
 
-extern LONG object_locks;
-
 HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN;
 HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN;
 HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN;
diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
index 9211a090cf1..6742724948e 100644
--- a/dlls/winegstreamer/main.c
+++ b/dlls/winegstreamer/main.c
@@ -27,8 +27,6 @@
 #include "initguid.h"
 #include "gst_guids.h"
 
-LONG object_locks;
-
 WINE_DEFAULT_DEBUG_CHANNEL(quartz);
 
 const struct unix_funcs *unix_funcs = NULL;
@@ -43,13 +41,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
     return TRUE;
 }
 
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    TRACE(".\n");
-
-    return object_locks ? S_FALSE : S_OK;
-}
-
 struct class_factory
 {
     IClassFactory IClassFactory_iface;
@@ -110,11 +101,6 @@ static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface, IUnknow
 static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL lock)
 {
     TRACE("iface %p, lock %d.\n", iface, lock);
-
-    if (lock)
-        InterlockedIncrement(&object_locks);
-    else
-        InterlockedDecrement(&object_locks);
     return S_OK;
 }
 
diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index dcbd03137ba..93f4b8d5bd7 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -354,12 +354,6 @@ static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface, IUnknow
 static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL dolock)
 {
     TRACE("%p, %d.\n", iface, dolock);
-
-    if (dolock)
-        InterlockedIncrement(&object_locks);
-    else
-        InterlockedDecrement(&object_locks);
-
     return S_OK;
 }
 




More information about the wine-cvs mailing list