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

imm32: Fix crash in DllMain when FreeLibrary is called from a thread which existed before the DLL was loaded. 

The code in IMM_FreeThreadData shouldn't assume that thread data will
always have been created, so check for NULL data.

Make loading the DLL more robust against errors.
This commit is contained in:
Rob Shearman 2009-02-24 14:50:55 +00:00 committed by Alexandre Julliard
parent fe0da5e528
commit f970db947a
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/imm32/imm.c
View File

@ -223,22 +223,28 @@ static IMMThreadData* IMM_GetThreadData(void)
return TlsGetValue(tlsIndex);
}
static void IMM_InitThreadData(void)
static BOOL IMM_InitThreadData(void)
{
IMMThreadData* data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
sizeof(IMMThreadData));
if (!data) return FALSE;
TlsSetValue(tlsIndex,data);
TRACE("Thread Data Created\n");
return TRUE;
}
static void IMM_FreeThreadData(void)
{
IMMThreadData* data = TlsGetValue(tlsIndex);
IMM_DestroyContext(data->defaultContext);
DestroyWindow(data->hwndDefault);
HeapFree(GetProcessHeap(),0,data);
TRACE("Thread Data Destroyed\n");
if (data)
{
IMM_DestroyContext(data->defaultContext);
DestroyWindow(data->hwndDefault);
HeapFree(GetProcessHeap(),0,data);
TRACE("Thread Data Destroyed\n");
}
}
static HMODULE LoadDefaultWineIME(void)
@ -378,7 +384,8 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved)
case DLL_PROCESS_ATTACH:
IMM_RegisterMessages();
tlsIndex = TlsAlloc();
IMM_InitThreadData();
if (tlsIndex == TLS_OUT_OF_INDEXES || !IMM_InitThreadData())
return FALSE;
break;
case DLL_THREAD_ATTACH:
IMM_InitThreadData();