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

ntdll: Cache contents of IMAGE_TLS_DIRECTORY instead of saving a directory pointer.

This commit is contained in:
Dmitry Timoshkov 2015-07-14 16:36:12 +08:00 committed by Alexandre Julliard
parent f59551c222
commit 21c3724813
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/ntdll/loader.c
View File

@ -94,7 +94,7 @@ static struct builtin_load_info *builtin_load_info = &default_load_info;
static HANDLE main_exe_file; static HANDLE main_exe_file;
static UINT tls_module_count; /* number of modules with TLS directory */ static UINT tls_module_count; /* number of modules with TLS directory */
static const IMAGE_TLS_DIRECTORY **tls_dirs; /* array of TLS directories */ static IMAGE_TLS_DIRECTORY *tls_dirs; /* array of TLS directories */
LIST_ENTRY tls_links = { &tls_links, &tls_links }; LIST_ENTRY tls_links = { &tls_links, &tls_links };
static RTL_CRITICAL_SECTION loader_section; static RTL_CRITICAL_SECTION loader_section;
@ -772,7 +772,12 @@ static SHORT alloc_tls_slot( LDR_MODULE *mod )
size = dir->EndAddressOfRawData - dir->StartAddressOfRawData; size = dir->EndAddressOfRawData - dir->StartAddressOfRawData;
if (!size && !dir->SizeOfZeroFill && !dir->AddressOfCallBacks) return -1; if (!size && !dir->SizeOfZeroFill && !dir->AddressOfCallBacks) return -1;
for (i = 0; i < tls_module_count; i++) if (!tls_dirs[i]) break; for (i = 0; i < tls_module_count; i++)
{
if (!tls_dirs[i].StartAddressOfRawData && !tls_dirs[i].EndAddressOfRawData &&
!tls_dirs[i].SizeOfZeroFill && !tls_dirs[i].AddressOfCallBacks)
break;
}
TRACE( "module %p data %p-%p zerofill %u index %p callback %p flags %x -> slot %u\n", mod->BaseAddress, TRACE( "module %p data %p-%p zerofill %u index %p callback %p flags %x -> slot %u\n", mod->BaseAddress,
(void *)dir->StartAddressOfRawData, (void *)dir->EndAddressOfRawData, dir->SizeOfZeroFill, (void *)dir->StartAddressOfRawData, (void *)dir->EndAddressOfRawData, dir->SizeOfZeroFill,
@ -824,7 +829,7 @@ static SHORT alloc_tls_slot( LDR_MODULE *mod )
} }
*(DWORD *)dir->AddressOfIndex = i; *(DWORD *)dir->AddressOfIndex = i;
tls_dirs[i] = dir; tls_dirs[i] = *dir;
return i; return i;
} }
@ -841,7 +846,7 @@ static void free_tls_slot( LDR_MODULE *mod )
if (mod->TlsIndex == -1) return; if (mod->TlsIndex == -1) return;
assert( i < tls_module_count ); assert( i < tls_module_count );
tls_dirs[i] = NULL; memset( &tls_dirs[i], 0, sizeof(tls_dirs[i]) );
} }
@ -987,7 +992,7 @@ static NTSTATUS alloc_thread_tls(void)
for (i = 0; i < tls_module_count; i++) for (i = 0; i < tls_module_count; i++)
{ {
const IMAGE_TLS_DIRECTORY *dir = tls_dirs[i]; const IMAGE_TLS_DIRECTORY *dir = &tls_dirs[i];
if (!dir) continue; if (!dir) continue;
size = dir->EndAddressOfRawData - dir->StartAddressOfRawData; size = dir->EndAddressOfRawData - dir->StartAddressOfRawData;