From 7fbfec2b642a0f2560cd4840bab76285b17c3fd0 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Thu, 23 Feb 2006 19:21:21 +0000 Subject: * winsup.h (cygwin_hmodule): Declare. * exceptions.cc (inside_kernel): Reverse return values to reflect function name. Return true if we're in cygwin1.dll or if we're executing in dll_entry. (_cygtls::interrupt_now): Reflect reversal of inside_kernel return value. * hookapi.cc (cygwin_hmodule): Remove declaration. * init.cc (dll_entry): Use in_dllentry global to record that we are executing in dllentry. --- winsup/cygwin/init.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'winsup/cygwin/init.cc') diff --git a/winsup/cygwin/init.cc b/winsup/cygwin/init.cc index 5a4d5690b..3fd91c1d6 100644 --- a/winsup/cygwin/init.cc +++ b/winsup/cygwin/init.cc @@ -142,12 +142,14 @@ respawn_wow64_process () extern void __stdcall dll_crt0_0 (); HMODULE NO_COPY cygwin_hmodule; +bool in_dllentry; extern "C" BOOL WINAPI dll_entry (HANDLE h, DWORD reason, void *static_load) { BOOL wow64_test_stack_marker; - // _STRACE_ON; + + in_dllentry = true; switch (reason) { @@ -182,5 +184,6 @@ dll_entry (HANDLE h, DWORD reason, void *static_load) break; } + in_dllentry = false; return TRUE; } -- cgit v1.2.3