Jacek Caban : atl: Always return S_FALSE in DllCanUnloadNow.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0cc483a07b7e8a5392692b16edfc2c00d8120e46
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0cc483a07b7e8a5392692b16ed...

Author: Jacek Caban 
Date:   Wed Nov 21 11:10:01 2012 +0100

atl: Always return S_FALSE in DllCanUnloadNow.

---

dlls/atl/registrar.c |   16 +---------------
 1 files changed, 1 insertions(+), 15 deletions(-)

diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c
index 028f35e..2aaf888 100644
--- a/dlls/atl/registrar.c
+++ b/dlls/atl/registrar.c
@@ -36,8 +36,6 @@

WINE_DEFAULT_DEBUG_CHANNEL(atl);

-static LONG dll_count;
-
 /**************************************************************
  * ATLRegistrar implementation
  */
@@ -570,7 +568,6 @@ static ULONG WINAPI Registrar_Release(IRegistrar *iface)
     if(!ref) {
         IRegistrar_ClearReplacements(iface);
         HeapFree(GetProcessHeap(), 0, This);
-        InterlockedDecrement(&dll_count);
     }
     return ref;
 }
@@ -711,8 +708,6 @@ static HRESULT AtlCreateRegistrar(IRegistrar **ret)
     registrar->ref = 1;
     registrar->rep = NULL;

-    InterlockedIncrement(&dll_count);
-
     *ret = &registrar->IRegistrar_iface;
     return S_OK;
 }
@@ -736,13 +731,11 @@ static HRESULT WINAPI RegistrarCF_QueryInterface(IClassFactory *iface, REFIID ri

static ULONG WINAPI RegistrarCF_AddRef(IClassFactory *iface)
 {
-    InterlockedIncrement(&dll_count);
     return 2;
 }

static ULONG WINAPI RegistrarCF_Release(IClassFactory *iface)
 {
-    InterlockedDecrement(&dll_count);
     return 1;
 }

@@ -771,12 +764,6 @@ static HRESULT WINAPI RegistrarCF_CreateInstance(IClassFactory *iface, LPUNKNOWN
 static HRESULT WINAPI RegistrarCF_LockServer(IClassFactory *iface, BOOL lock)
 {
     TRACE("(%p)->(%x)\n", iface, lock);
-
-    if(lock)
-        InterlockedIncrement(&dll_count);
-    else
-        InterlockedDecrement(&dll_count);
-
     return S_OK;
 }

@@ -886,6 +873,5 @@ HRESULT WINAPI DllUnregisterServer(void)
  */
 HRESULT WINAPI DllCanUnloadNow(void)
 {
-    TRACE("dll_count = %u\n", dll_count);
-    return dll_count ? S_FALSE : S_OK;
+    return S_FALSE;
 }