ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msctf: Always return FALSE in DllCanUnloadNow.

This commit is contained in:
Alistair Leslie-Hughes 2015-04-02 12:30:48 +11:00 committed by Alexandre Julliard
parent af30ffaa43
commit 46198a5fa6
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/msctf/msctf.c
View File

@ -41,8 +41,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(msctf); WINE_DEFAULT_DEBUG_CHANNEL(msctf);
static LONG MSCTF_refCount;
static HINSTANCE MSCTF_hinstance; static HINSTANCE MSCTF_hinstance;
typedef struct typedef struct
@ -110,7 +108,6 @@ static void ClassFactory_Destructor(ClassFactory *This)
{ {
TRACE("Destroying class factory %p\n", This); TRACE("Destroying class factory %p\n", This);
HeapFree(GetProcessHeap(),0,This); HeapFree(GetProcessHeap(),0,This);
InterlockedDecrement(&MSCTF_refCount);
} }
static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppvOut) 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); TRACE("(%p)->(%x)\n", This, fLock);
if(fLock)
InterlockedIncrement(&MSCTF_refCount);
else
InterlockedDecrement(&MSCTF_refCount);
return S_OK; return S_OK;
} }
@ -190,7 +182,6 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut)
This->ctor = ctor; This->ctor = ctor;
*ppvOut = This; *ppvOut = This;
TRACE("Created class factory %p\n", This); TRACE("Created class factory %p\n", This);
InterlockedIncrement(&MSCTF_refCount);
return S_OK; return S_OK;
} }
@ -539,7 +530,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad)
*/ */
HRESULT WINAPI DllCanUnloadNow(void) HRESULT WINAPI DllCanUnloadNow(void)
{ {
return MSCTF_refCount ? S_FALSE : S_OK; return S_FALSE;
} }
/*********************************************************************** /***********************************************************************