Module: wine Branch: master Commit: 1943fb29bfe539d0a1602d58037e79ebd67ff953 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1943fb29bfe539d0a1602d580...
Author: Alexandre Julliard julliard@winehq.org Date: Fri May 24 11:22:16 2019 +0200
ntdll: Don't pass DLL_WINE_PREATTACH to the TLS callbacks.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/ntdll/loader.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index da41fdf..1660667 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1217,6 +1217,8 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) const PIMAGE_TLS_CALLBACK *callback; ULONG dirsize;
+ if (reason == DLL_WINE_PREATTACH) return; + dir = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_TLS, &dirsize ); if (!dir || !dir->AddressOfCallBacks) return;