Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 14:56:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSVCRTEX]

Browse source 
- I say let msvcrt handle atexit registered functions.
Fix msvc build

svn path=/trunk/; revision=52836
This commit is contained in:
Jérôme Gardou 2011-07-24 14:37:28 +00:00
parent c81afef878
commit d5534dc11d
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
reactos/lib/sdk/crt/startup/crtdll.c
View file

@ -49,8 +49,8 @@ extern const PIMAGE_TLS_CALLBACK __dyn_tls_init_callback;
static int __proc_attached = 0; static int __proc_attached = 0;
extern _PVFV *__onexitbegin; //extern _PVFV *__onexitbegin;
extern _PVFV *__onexitend; //extern _PVFV *__onexitend;
extern int mingw_app_type; extern int mingw_app_type;
@ -65,7 +65,7 @@ _CRTALLOC(".CRT$XIAA") _PIFV pcinit = pre_c_init;
static int static int
pre_c_init (void) pre_c_init (void)
{ {
_PVFV *onexitbegin; /* _PVFV *onexitbegin;
onexitbegin = (_PVFV *) malloc (32 * sizeof (_PVFV)); onexitbegin = (_PVFV *) malloc (32 * sizeof (_PVFV));
__onexitend = __onexitbegin = (_PVFV *) _encode_pointer (onexitbegin); __onexitend = __onexitbegin = (_PVFV *) _encode_pointer (onexitbegin);
@ -73,7 +73,8 @@ pre_c_init (void)
if (onexitbegin == NULL) if (onexitbegin == NULL)
return 1; return 1;
*onexitbegin = (_PVFV) NULL; *onexitbegin = (_PVFV) NULL;
return 0; return 0;*/
return 1;
} }
WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
@ -135,7 +136,7 @@ WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
_amsg_exit (31); _amsg_exit (31);
} }
else else
{ {/*
_PVFV * onexitbegin = (_PVFV *) _decode_pointer (__onexitbegin); _PVFV * onexitbegin = (_PVFV *) _decode_pointer (__onexitbegin);
if (onexitbegin) if (onexitbegin)
{ {
@ -145,7 +146,7 @@ WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
(**onexitend) (); (**onexitend) ();
free (onexitbegin); free (onexitbegin);
__onexitbegin = __onexitend = (_PVFV *) NULL; __onexitbegin = __onexitend = (_PVFV *) NULL;
} }*/
__native_startup_state = __uninitialized; __native_startup_state = __uninitialized;
(void) InterlockedExchangePointer ((volatile PVOID *) &__native_startup_lock, 0); (void) InterlockedExchangePointer ((volatile PVOID *) &__native_startup_lock, 0);
} }