Commit d90ab080 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

winegstreamer: Always return S_FALSE from DllCanUnloadNow().

parent d3cd3ebc
...@@ -198,8 +198,6 @@ struct unix_funcs ...@@ -198,8 +198,6 @@ struct unix_funcs
extern const struct unix_funcs *unix_funcs; extern const struct unix_funcs *unix_funcs;
extern LONG object_locks;
HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN;
HRESULT decodebin_parser_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; HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN;
......
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
#include "initguid.h" #include "initguid.h"
#include "gst_guids.h" #include "gst_guids.h"
LONG object_locks;
WINE_DEFAULT_DEBUG_CHANNEL(quartz); WINE_DEFAULT_DEBUG_CHANNEL(quartz);
const struct unix_funcs *unix_funcs = NULL; const struct unix_funcs *unix_funcs = NULL;
...@@ -43,13 +41,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) ...@@ -43,13 +41,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
return TRUE; return TRUE;
} }
HRESULT WINAPI DllCanUnloadNow(void)
{
TRACE(".\n");
return object_locks ? S_FALSE : S_OK;
}
struct class_factory struct class_factory
{ {
IClassFactory IClassFactory_iface; IClassFactory IClassFactory_iface;
...@@ -110,11 +101,6 @@ static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface, IUnknow ...@@ -110,11 +101,6 @@ static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface, IUnknow
static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL lock) static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL lock)
{ {
TRACE("iface %p, lock %d.\n", iface, lock); TRACE("iface %p, lock %d.\n", iface, lock);
if (lock)
InterlockedIncrement(&object_locks);
else
InterlockedDecrement(&object_locks);
return S_OK; return S_OK;
} }
......
...@@ -354,12 +354,6 @@ static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface, IUnknow ...@@ -354,12 +354,6 @@ static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface, IUnknow
static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL dolock) static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL dolock)
{ {
TRACE("%p, %d.\n", iface, dolock); TRACE("%p, %d.\n", iface, dolock);
if (dolock)
InterlockedIncrement(&object_locks);
else
InterlockedDecrement(&object_locks);
return S_OK; return S_OK;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment