* cygheap.cc (cygheap_fixup_in_child): Call set_dll_dir.

(init_cygheap::init_installation_root): Just memmove contents of
	installation_root instead of calling GetModuleFileNameW again.
	Copy installation_root to installation_dir before stripping of
	"bin" dir.  Don't call SetDllDirectory here.  Explain what we do.
	(setup_cygheap): New function taking over initial cygheap setup
	from memory_init.  Additionally call set_dll_dir.
	* cygheap.h (struct init_cygheap): Add installation_dir member.
	(init_cygheap::set_dll_dir): Define.
	(setup_cygheap): Declare.
	* dcrt0.cc: Throughout drop parameter from memory_init call.
	(dll_crt0_0): Call setup_cygheap prior to memory_init.
	* dlfcn.cc (dlopen): Change comment to point to the right function.
	* shared.cc (memory_init): Drop parameter.  Drop cygheap setup.
	* shared_info.h (memory_init): Change declaration accordingly.
This commit is contained in:
Corinna Vinschen
2014-10-17 14:36:59 +00:00
parent 1f0bd6f96f
commit cc5a7d7519
7 changed files with 63 additions and 31 deletions

View File

@@ -609,7 +609,7 @@ void
child_info_fork::handle_fork ()
{
cygheap_fixup_in_child (false);
memory_init (false);
memory_init ();
myself.thisproc (NULL);
myself->uid = cygheap->user.real_uid;
myself->gid = cygheap->user.real_gid;
@@ -663,7 +663,7 @@ child_info_spawn::handle_spawn ()
if (!dynamically_loaded || get_parent_handle ())
{
cygheap_fixup_in_child (true);
memory_init (false);
memory_init ();
}
if (!moreinfo->myself_pinfo ||
!DuplicateHandle (GetCurrentProcess (), moreinfo->myself_pinfo,
@@ -769,7 +769,8 @@ dll_crt0_0 ()
if (!child_proc_info)
{
memory_init (true);
setup_cygheap ();
memory_init ();
#ifndef __x86_64__
/* WOW64 process on XP/64 or Server 2003/64? Check if we have been
started from 64 bit process and if our stack is at an unusual