* autoload.cc (CreateEnvironmentBlock): Make loading non-fatal.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 56af2b899b54a4c9d14821f2b75a40a57da41bf0..bcf1bdeab68a731ff5eade7ce4acef300d74318a 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-11  Corinna Vinschen  <corinna@vinschen.de>
+
+       * autoload.cc (CreateEnvironmentBlock): Make loading non-fatal.
+
 2015-03-11  Corinna Vinschen  <corinna@vinschen.de>
 
        * autoload.cc (std_dll_init): Fix condition for breaking from DLL

diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc
index fd25e17805dfb78d5ae06980c3668c18ee69506f..5832e27bf43b4ae1b9f3f76eda3c68d536515311 100644 (file)
--- a/winsup/cygwin/autoload.cc
+++ b/winsup/cygwin/autoload.cc
@@ -676,7 +676,7 @@ LoadDLLfunc (SetParent, 8, user32)
 LoadDLLfunc (SetProcessWindowStation, 4, user32)
 LoadDLLfunc (SetThreadDesktop, 4, user32)
 
-LoadDLLfunc (CreateEnvironmentBlock, 12, userenv)
+LoadDLLfuncEx (CreateEnvironmentBlock, 12, userenv, 1)
 LoadDLLfuncEx2 (CreateProfile, 16, userenv, 1, 1)
 LoadDLLfunc (DestroyEnvironmentBlock, 4, userenv)
 LoadDLLfunc (LoadUserProfileW, 8, userenv)