JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* winsup.h (cygwin_hmodule): Declare.

Browse Source 
* 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.
This commit is contained in:
Christopher Faylor
2006-02-23 19:21:21 +00:00
parent 7db9cdd24e
commit 7fbfec2b64
5 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
winsup/cygwin/exceptions.cc
View File

@ -293,6 +293,10 @@ inside_kernel (CONTEXT *cx)
{
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))
@ -305,16 +309,16 @@ inside_kernel (CONTEXT *cx)
/* 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;
if (!h || m.State != MEM_COMMIT || h == cygwin_hmodule)
res = true;
else if (h == user_data->hmodule)
res = true;
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;
}
@ -726,7 +730,7 @@ _cygtls::interrupt_now (CONTEXT *cx, int sig, void *handler,
{
bool interrupted;
if (incyg || spinning || locked () || !inside_kernel (cx))
if (incyg || spinning || locked () || inside_kernel (cx))
interrupted = false;
else
{