[PATCH 1/2] ntdll: Call TLS callbacks also for main exe on thread attach.

Paul Gofman pgofman at codeweavers.com
Wed Jun 24 15:30:05 CDT 2020


Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49007
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49098
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49041
Signed-off-by: Paul Gofman <pgofman at codeweavers.com>
---
 dlls/ntdll/loader.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 42cdc628021..bc437d1a589 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -3469,6 +3469,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow
         if ((status = alloc_thread_tls()) != STATUS_SUCCESS)
             NtTerminateThread( GetCurrentThread(), status );
         thread_attach();
+        if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, DLL_THREAD_ATTACH );
     }
 
     RtlLeaveCriticalSection( &loader_section );
-- 
2.26.2




More information about the wine-devel mailing list