From e9b2fe6591ac8e0194a2e80811bf5ed6c22adc6e Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 25 Apr 2011 21:55:41 +0000 Subject: [PATCH] [CRT/MINGW-W64] * Call pei and __main before possible invocation of DllEntryPoint. By Kai Tietz. svn path=/trunk/; revision=51458 --- reactos/lib/3rdparty/mingw/crtdll.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/lib/3rdparty/mingw/crtdll.c b/reactos/lib/3rdparty/mingw/crtdll.c index f930f0d6a5a..55665bda536 100644 --- a/reactos/lib/3rdparty/mingw/crtdll.c +++ b/reactos/lib/3rdparty/mingw/crtdll.c @@ -179,6 +179,9 @@ __DllMainCRTStartup (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) retcode = FALSE; goto i__leave; } + _pei386_runtime_relocator (); + if (retcode && dwReason == DLL_PROCESS_ATTACH) + __main (); if (dwReason == DLL_PROCESS_ATTACH || dwReason == DLL_THREAD_ATTACH) { retcode = DllEntryPoint (hDllHandle, dwReason, lpreserved); @@ -187,9 +190,6 @@ __DllMainCRTStartup (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) if (! retcode) goto i__leave; } - _pei386_runtime_relocator (); - if (retcode && dwReason == DLL_PROCESS_ATTACH) - __main (); retcode = DllMain(hDllHandle,dwReason,lpreserved); if ((dwReason == DLL_PROCESS_ATTACH) && ! retcode) {