Skip to content

W
wine-winehq
Commit 31dd4af5 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Don't call process attach notification during process shutdown.

Make sure we don't insert a module in the same list twice.
parent 388b9c6d
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
dlls/ntdll/loader.c
View file @ 31dd4af5
...@@ -875,6 +875,8 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ) ...@@ -875,6 +875,8 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved )
NTSTATUS status = STATUS_SUCCESS; NTSTATUS status = STATUS_SUCCESS;
int i; int i;
if (process_detaching) return status;
/* prevent infinite recursion in case of cyclical dependencies */ /* prevent infinite recursion in case of cyclical dependencies */
if ( ( wm->ldr.Flags & LDR_LOAD_IN_PROGRESS ) if ( ( wm->ldr.Flags & LDR_LOAD_IN_PROGRESS )
|| ( wm->ldr.Flags & LDR_PROCESS_ATTACHED ) ) || ( wm->ldr.Flags & LDR_PROCESS_ATTACHED ) )
...@@ -911,8 +913,9 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ) ...@@ -911,8 +913,9 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved )
current_modref = prev; current_modref = prev;
} }
InsertTailList(&NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList, if (!wm->ldr.InInitializationOrderModuleList.Flink)
&wm->ldr.InInitializationOrderModuleList); InsertTailList(&NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList,
&wm->ldr.InInitializationOrderModuleList);
/* Remove recursion flag */ /* Remove recursion flag */
wm->ldr.Flags &= ~LDR_LOAD_IN_PROGRESS; wm->ldr.Flags &= ~LDR_LOAD_IN_PROGRESS;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment