+2006-02-23 Christopher Faylor <cgf@timesys.com>
+
+ * 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.
+
2006-02-22 Corinna Vinschen <corinna@vinschen.de>
* exceptions.cc (_cygtls::interrupt_now): Reorder conditional
{
int res;
MEMORY_BASIC_INFORMATION m;
+ extern bool in_dllentry;
+
+ if (in_dllentry)
+ return true;
memset (&m, 0, sizeof m);
if (!VirtualQuery ((LPCVOID) cx->Eip, &m, sizeof m))
/* Apparently Windows 95 can sometimes return bogus addresses from
GetThreadContext. These resolve to a strange allocation base.
These should *never* be treated as interruptible. */
- if (!h || m.State != MEM_COMMIT)
- res = false;
- else if (h == user_data->hmodule)
+ if (!h || m.State != MEM_COMMIT || h == cygwin_hmodule)
res = true;
+ else if (h == user_data->hmodule)
+ res = false;
else if (!GetModuleFileName (h, checkdir, windows_system_directory_length + 2))
- res = true;
+ res = false;
else
- res = !strncasematch (windows_system_directory, checkdir,
- windows_system_directory_length);
- sigproc_printf ("pc %p, h %p, interruptible %d", cx->Eip, h, res);
+ res = strncasematch (windows_system_directory, checkdir,
+ windows_system_directory_length);
+ sigproc_printf ("pc %p, h %p, inside_kernel %d", cx->Eip, h, res);
# undef h
return res;
}
{
bool interrupted;
- if (incyg || spinning || locked () || !inside_kernel (cx))
+ if (incyg || spinning || locked () || inside_kernel (cx))
interrupted = false;
else
{
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)
{
break;
}
+ in_dllentry = false;
return TRUE;
}