Don't call process attach notification during process shutdown.

Make sure we don't insert a module in the same list twice.

Don't call process attach notification during process shutdown.
31dd4af5 · Alexandre Julliard · 388b9c6d · 31dd4af5
Commit 31dd4af5 authored Aug 09, 2005 by Alexandre Julliard
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

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

No files found.
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -875,6 +875,8 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved )
    NTSTATUS status = STATUS_SUCCESS;
    int i;

+    if (process_detaching) return status;
+
    /* prevent infinite recursion in case of cyclical dependencies */
    if (    ( wm->ldr.Flags & LDR_LOAD_IN_PROGRESS )
         || ( wm->ldr.Flags & LDR_PROCESS_ATTACHED ) )
@@ -911,6 +913,7 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved )
        current_modref = prev;
    }

+    if (!wm->ldr.InInitializationOrderModuleList.Flink)
        InsertTailList(&NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList,
                       &wm->ldr.InInitializationOrderModuleList);