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

ntdll: Call TLS callbacks for main exe on thread detach. 

Signed-off-by: Paul Gofman <pgofman@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Paul Gofman 2020-06-24 23:30:06 +03:00 committed by Alexandre Julliard
parent 1dc3383389
commit 1f6423f778
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/ntdll/loader.c
View File

@ -3178,6 +3178,7 @@ void WINAPI LdrShutdownThread(void)
{ {
PLIST_ENTRY mark, entry; PLIST_ENTRY mark, entry;
LDR_DATA_TABLE_ENTRY *mod; LDR_DATA_TABLE_ENTRY *mod;
WINE_MODREF *wm;
UINT i; UINT i;
void **pointers; void **pointers;
@ -3187,6 +3188,7 @@ void WINAPI LdrShutdownThread(void)
if (process_detaching) return; if (process_detaching) return;
RtlEnterCriticalSection( &loader_section ); RtlEnterCriticalSection( &loader_section );
wm = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress );
mark = &NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList; mark = &NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList;
for (entry = mark->Blink; entry != mark; entry = entry->Blink) for (entry = mark->Blink; entry != mark; entry = entry->Blink)
@ -3202,6 +3204,8 @@ void WINAPI LdrShutdownThread(void)
DLL_THREAD_DETACH, NULL ); DLL_THREAD_DETACH, NULL );
} }
if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, DLL_THREAD_DETACH );
RtlAcquirePebLock(); RtlAcquirePebLock();
RemoveEntryList( &NtCurrentTeb()->TlsLinks ); RemoveEntryList( &NtCurrentTeb()->TlsLinks );
if ((pointers = NtCurrentTeb()->ThreadLocalStoragePointer)) if ((pointers = NtCurrentTeb()->ThreadLocalStoragePointer))