Alexandre Julliard : winecrt0: Don' t bother passing the environment to the _init function.
Alexandre Julliard
julliard at winehq.org
Tue Mar 31 12:19:23 CDT 2009
Module: wine
Branch: master
Commit: 2ef9411434d9865ea703b322e30265ee7b196207
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef9411434d9865ea703b322e30265ee7b196207
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Mar 31 16:06:11 2009 +0200
winecrt0: Don't bother passing the environment to the _init function.
We'd have to use the Windows environment anyway, not the Unix one.
---
dlls/winecrt0/dll_entry.c | 2 +-
dlls/winecrt0/drv_entry.c | 2 +-
dlls/winecrt0/exe_entry.c | 2 +-
dlls/winecrt0/exe_wentry.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/winecrt0/dll_entry.c b/dlls/winecrt0/dll_entry.c
index c739ea2..9bbe8c4 100644
--- a/dlls/winecrt0/dll_entry.c
+++ b/dlls/winecrt0/dll_entry.c
@@ -34,7 +34,7 @@ BOOL WINAPI DECLSPEC_HIDDEN __wine_spec_dll_entry( HINSTANCE inst, DWORD reason,
if (reason == DLL_PROCESS_ATTACH && __wine_spec_init_state != CONSTRUCTORS_DONE)
{
call_fini = TRUE;
- _init( __wine_main_argc, __wine_main_argv, __wine_main_environ );
+ _init( __wine_main_argc, __wine_main_argv, NULL );
}
ret = DllMain( inst, reason, reserved );
diff --git a/dlls/winecrt0/drv_entry.c b/dlls/winecrt0/drv_entry.c
index a55f81d..32a87ee 100644
--- a/dlls/winecrt0/drv_entry.c
+++ b/dlls/winecrt0/drv_entry.c
@@ -31,7 +31,7 @@ NTSTATUS DECLSPEC_HIDDEN WINAPI __wine_spec_drv_entry( struct _DRIVER_OBJECT *ob
{
BOOL needs_init = (__wine_spec_init_state != CONSTRUCTORS_DONE);
- if (needs_init) _init( __wine_main_argc, __wine_main_argv, __wine_main_environ );
+ if (needs_init) _init( __wine_main_argc, __wine_main_argv, NULL );
return DriverEntry( obj, path );
/* there is no detach routine so we can't call destructors */
}
diff --git a/dlls/winecrt0/exe_entry.c b/dlls/winecrt0/exe_entry.c
index 4722da3..4165651 100644
--- a/dlls/winecrt0/exe_entry.c
+++ b/dlls/winecrt0/exe_entry.c
@@ -32,7 +32,7 @@ DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_entry( PEB *peb )
BOOL needs_init = (__wine_spec_init_state != CONSTRUCTORS_DONE);
DWORD ret;
- if (needs_init) _init( __wine_main_argc, __wine_main_argv, __wine_main_environ );
+ if (needs_init) _init( __wine_main_argc, __wine_main_argv, NULL );
ret = main( __wine_main_argc, __wine_main_argv );
if (needs_init) _fini();
ExitProcess( ret );
diff --git a/dlls/winecrt0/exe_wentry.c b/dlls/winecrt0/exe_wentry.c
index b267c2f..11cff89 100644
--- a/dlls/winecrt0/exe_wentry.c
+++ b/dlls/winecrt0/exe_wentry.c
@@ -32,7 +32,7 @@ DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_wentry( PEB *peb )
BOOL needs_init = (__wine_spec_init_state != CONSTRUCTORS_DONE);
DWORD ret;
- if (needs_init) _init( __wine_main_argc, __wine_main_argv, __wine_main_environ );
+ if (needs_init) _init( __wine_main_argc, __wine_main_argv, NULL );
ret = wmain( __wine_main_argc, __wine_main_wargv );
if (needs_init) _fini();
ExitProcess( ret );
More information about the wine-cvs
mailing list