Zebediah Figura : ntdll: Set the process detaching flag before calling FLS callbacks.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 16592ca918999dd28764e071384361ea44bdf11d
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=16592ca918999dd28764e0713...

Author: Zebediah Figura 
Date:   Thu Jan  7 09:51:02 2021 -0600

ntdll: Set the process detaching flag before calling FLS callbacks.

So that we will not deadlock trying to acquire fls_section.

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

dlls/ntdll/loader.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 9b7e30b2c2b..3f43062f9f8 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -3182,12 +3182,14 @@ fail:
  */
 void WINAPI LdrShutdownProcess(void)
 {
+    BOOL detaching = process_detaching;
+
     TRACE("()\n");

-    if (!process_detaching)
+    process_detaching = TRUE;
+    if (!detaching)
         RtlProcessFlsData( NtCurrentTeb()->FlsSlots, 1 );

-    process_detaching = TRUE;
     process_detach();
 }