drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* autoload.cc (dll_load): Only call LoadLibraryExW with 

DONT_RESOLVE_DLL_REFERENCES if a normal LoadLibrary call failed with
	ERROR_INVALID_ADDRESS.
	(LsaRegisterLogonProcess): Align comment to previous change.
This commit is contained in:
Corinna Vinschen 2011-02-27 09:45:58 +00:00
parent a16b0549d4
commit 7b5dc6db8e
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2011-02-27 Corinna Vinschen <corinna@vinschen.de>
* autoload.cc (dll_load): Only call LoadLibraryExW with
DONT_RESOLVE_DLL_REFERENCES if a normal LoadLibrary call failed with
ERROR_INVALID_ADDRESS.
(LsaRegisterLogonProcess): Align comment to previous change.
2011-02-26 Christopher Faylor <me+cygwin@cgf.cx> 2011-02-26 Christopher Faylor <me+cygwin@cgf.cx>
* autoload.cc: Use LoadDLLfuncEx3 for all winmm functions. Accommodate * autoload.cc: Use LoadDLLfuncEx3 for all winmm functions. Accommodate

6
winsup/cygwin/autoload.cc
View File

@ -215,7 +215,9 @@ union retchain
static bool static bool
dll_load (HANDLE& handle, WCHAR *name) dll_load (HANDLE& handle, WCHAR *name)
{ {
HANDLE h = LoadLibraryExW (name, NULL, (in_forkee && handle) ? DONT_RESOLVE_DLL_REFERENCES : 0); HANDLE h = LoadLibraryW (name);
if (!h && in_forkee && handle && GetLastError () == ERROR_INVALID_ADDRESS)
h = LoadLibraryExW (name, NULL, DONT_RESOLVE_DLL_REFERENCES);
return h ? (handle = h) : 0; return h ? (handle = h) : 0;
} }
@ -405,7 +407,7 @@ LoadDLLfunc (LsaFreeReturnBuffer, 4, secur32)
LoadDLLfunc (LsaLogonUser, 56, secur32) LoadDLLfunc (LsaLogonUser, 56, secur32)
LoadDLLfunc (LsaLookupAuthenticationPackage, 12, secur32) LoadDLLfunc (LsaLookupAuthenticationPackage, 12, secur32)
/* secur32 functions return NTSTATUS values. However, the error code must /* secur32 functions return NTSTATUS values. However, the error code must
fit in a single byte, see LoadDLLprime. fit in a single word, see LoadDLLprime.
The calling function, lsaauth(), checks for STATUS_SUCCESS (0), so we The calling function, lsaauth(), checks for STATUS_SUCCESS (0), so we
simply return some arbitrary non-0 value (127 == ERROR_PROC_NOT_FOUND) simply return some arbitrary non-0 value (127 == ERROR_PROC_NOT_FOUND)
from here, if the function can't be loaded. */ from here, if the function can't be loaded. */