diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2015-03-11 12:56:53 +0100 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-03-11 12:56:53 +0100 |
| commit | 6bd719beeb334e07ca7b0cb097494b28c5137fc3 (patch) | |
| tree | f0d2235c6fdd0357680a876a8c34649e2058bb74 | |
| parent | f085e9d3212360cfbce69a7a42c04ad7999b8cd6 (diff) | |
| download | cygnal-6bd719beeb334e07ca7b0cb097494b28c5137fc3.tar.gz cygnal-6bd719beeb334e07ca7b0cb097494b28c5137fc3.tar.bz2 cygnal-6bd719beeb334e07ca7b0cb097494b28c5137fc3.zip | |
* autoload.cc (CreateEnvironmentBlock): Make loading non-fatal.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/autoload.cc | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 56af2b899..bcf1bdeab 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,9 @@ 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 loading loop. diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc index fd25e1780..5832e27bf 100644 --- 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) |