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>

ntdll: Call TLS callbacks for main exe on thread detach.
1f6423f7 · Paul Gofman · Alexandre Julliard · 1dc33833 · 1f6423f7
Commit 1f6423f7 authored Jun 24, 2020 by Paul Gofman Committed by Alexandre Julliard Jun 24, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

loader.c dlls/ntdll/loader.c +4 -0

No files found.
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -3178,6 +3178,7 @@ void WINAPI LdrShutdownThread(void)
 {
    PLIST_ENTRY mark, entry;
    LDR_DATA_TABLE_ENTRY *mod;
+    WINE_MODREF *wm;
    UINT i;
    void **pointers;

@@ -3187,6 +3188,7 @@ void WINAPI LdrShutdownThread(void)
    if (process_detaching) return;

    RtlEnterCriticalSection( &loader_section );
+    wm = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress );

    mark = &NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList;
    for (entry = mark->Blink; entry != mark; entry = entry->Blink)
@@ -3202,6 +3204,8 @@ void WINAPI LdrShutdownThread(void)
                        DLL_THREAD_DETACH, NULL );
    }

+    if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, DLL_THREAD_DETACH );
+
    RtlAcquirePebLock();
    RemoveEntryList( &NtCurrentTeb()->TlsLinks );
    if ((pointers = NtCurrentTeb()->ThreadLocalStoragePointer))