[CRT/MINGW-W64]

* Call pei and __main before possible invocation of DllEntryPoint. By Kai Tietz.

svn path=/trunk/; revision=51458
This commit is contained in:
Amine Khaldi
2011-04-25 21:55:41 +00:00
parent 7ba64c2ad6
commit e9b2fe6591
+3 -3
View File
@@ -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)
{