diff options
| author | Christopher Faylor <me@cgf.cx> | 2006-02-23 19:21:21 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2006-02-23 19:21:21 +0000 |
| commit | 7fbfec2b642a0f2560cd4840bab76285b17c3fd0 (patch) | |
| tree | 16067604f6876513595616ee2e1897e2ed140b64 /winsup/cygwin/init.cc | |
| parent | 7db9cdd24e884d70f3444fcd3abdf87b0df24479 (diff) | |
| download | cygnal-7fbfec2b642a0f2560cd4840bab76285b17c3fd0.tar.gz cygnal-7fbfec2b642a0f2560cd4840bab76285b17c3fd0.tar.bz2 cygnal-7fbfec2b642a0f2560cd4840bab76285b17c3fd0.zip | |
* 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.
Diffstat (limited to 'winsup/cygwin/init.cc')
| -rw-r--r-- | winsup/cygwin/init.cc | 5 |
1 files changed, 4 insertions, 1 deletions
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; } |