marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Ensure alignment of static TLS data and free it at thread exit.

oldstable
Alexandre Julliard 2010-12-15 13:16:55 +01:00
parent 156f611ba8
commit e272b31b6b
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/ntdll/loader.c
View File

@ -97,6 +97,8 @@ static HANDLE main_exe_file;
static UINT tls_module_count; /* number of modules with TLS directory */
static UINT tls_total_size; /* total size of TLS storage */
static const IMAGE_TLS_DIRECTORY **tls_dirs; /* array of TLS directories */
#define TLS_ALIGNMENT (2 * sizeof(void *))
#define TLS_ALIGN(size) (((size) + TLS_ALIGNMENT - 1) & ~(TLS_ALIGNMENT - 1))
static RTL_CRITICAL_SECTION loader_section;
static RTL_CRITICAL_SECTION_DEBUG critsect_debug =
@ -843,7 +845,7 @@ static NTSTATUS alloc_process_tls(void)
continue;
size = (dir->EndAddressOfRawData - dir->StartAddressOfRawData) + dir->SizeOfZeroFill;
if (!size && !dir->AddressOfCallBacks) continue;
tls_total_size += size;
tls_total_size += TLS_ALIGN(size);
tls_module_count++;
}
if (!tls_module_count) return STATUS_SUCCESS;
@ -878,24 +880,19 @@ static NTSTATUS alloc_thread_tls(void)
{
void **pointers;
char *data;
UINT i;
UINT i, size;
if (!tls_module_count) return STATUS_SUCCESS;
if (!(pointers = RtlAllocateHeap( GetProcessHeap(), 0,
tls_module_count * sizeof(*pointers) )))
size = TLS_ALIGN( tls_module_count * sizeof(*pointers) );
if (!(pointers = RtlAllocateHeap( GetProcessHeap(), 0, size + tls_total_size )))
return STATUS_NO_MEMORY;
if (!(data = RtlAllocateHeap( GetProcessHeap(), 0, tls_total_size )))
{
RtlFreeHeap( GetProcessHeap(), 0, pointers );
return STATUS_NO_MEMORY;
}
data = (char *)pointers + size;
for (i = 0; i < tls_module_count; i++)
{
const IMAGE_TLS_DIRECTORY *dir = tls_dirs[i];
ULONG size = dir->EndAddressOfRawData - dir->StartAddressOfRawData;
size = dir->EndAddressOfRawData - dir->StartAddressOfRawData;
TRACE( "thread %04x idx %d: %d/%d bytes from %p to %p\n",
GetCurrentThreadId(), i, size, dir->SizeOfZeroFill,
@ -903,9 +900,8 @@ static NTSTATUS alloc_thread_tls(void)
pointers[i] = data;
memcpy( data, (void *)dir->StartAddressOfRawData, size );
data += size;
memset( data, 0, dir->SizeOfZeroFill );
data += dir->SizeOfZeroFill;
memset( data + size, 0, dir->SizeOfZeroFill );
data += TLS_ALIGN( size + dir->SizeOfZeroFill );
}
NtCurrentTeb()->ThreadLocalStoragePointer = pointers;
return STATUS_SUCCESS;