Alistair Leslie-Hughes : msctf: Always return FALSE in DllCanUnloadNow.
Module: wine Branch: master Commit: 46198a5fa669f617ec4b6acd85f77430584948b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46198a5fa669f617ec4b6acd85... Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 2 12:30:48 2015 +1100 msctf: Always return FALSE in DllCanUnloadNow. --- dlls/msctf/msctf.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 1ce3b8e..4ea6a0a 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -41,8 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctf); -static LONG MSCTF_refCount; - static HINSTANCE MSCTF_hinstance; typedef struct @@ -110,7 +108,6 @@ static void ClassFactory_Destructor(ClassFactory *This) { TRACE("Destroying class factory %p\n", This); HeapFree(GetProcessHeap(),0,This); - InterlockedDecrement(&MSCTF_refCount); } static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppvOut) @@ -163,11 +160,6 @@ static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) TRACE("(%p)->(%x)\n", This, fLock); - if(fLock) - InterlockedIncrement(&MSCTF_refCount); - else - InterlockedDecrement(&MSCTF_refCount); - return S_OK; } @@ -190,7 +182,6 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) This->ctor = ctor; *ppvOut = This; TRACE("Created class factory %p\n", This); - InterlockedIncrement(&MSCTF_refCount); return S_OK; } @@ -539,7 +530,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) */ HRESULT WINAPI DllCanUnloadNow(void) { - return MSCTF_refCount ? S_FALSE : S_OK; + return S_FALSE; } /***********************************************************************
participants (1)
-
Alexandre Julliard