* init.cc (in_dllentry): Delete.
(dll_entry): Remove assignment to deleted variable. * winsup.h (in_dllentry): Delete declaration. * exceptions.cc (inside_kernel): Use another method to see if we are in dll_entry phase.
This commit is contained in:
parent
d409af3661
commit
6f76c68713
|
@ -1,3 +1,11 @@
|
||||||
|
2007-07-14 Christopher Faylor <me+cygwin@cgf.cx>
|
||||||
|
|
||||||
|
* init.cc (in_dllentry): Delete.
|
||||||
|
(dll_entry): Remove assignment to deleted variable.
|
||||||
|
* winsup.h (in_dllentry): Delete declaration.
|
||||||
|
* exceptions.cc (inside_kernel): Use another method to see if we are in
|
||||||
|
dll_entry phase.
|
||||||
|
|
||||||
2007-07-13 Christopher Faylor <me+cygwin@cgf.cx>
|
2007-07-13 Christopher Faylor <me+cygwin@cgf.cx>
|
||||||
|
|
||||||
* init.cc (in_dllentry): Make NO_COPY to avoid spurious false
|
* init.cc (in_dllentry): Make NO_COPY to avoid spurious false
|
||||||
|
|
|
@ -288,7 +288,7 @@ inside_kernel (CONTEXT *cx)
|
||||||
int res;
|
int res;
|
||||||
MEMORY_BASIC_INFORMATION m;
|
MEMORY_BASIC_INFORMATION m;
|
||||||
|
|
||||||
if (in_dllentry)
|
if (!_my_tls.isinitialized ())
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
memset (&m, 0, sizeof m);
|
memset (&m, 0, sizeof m);
|
||||||
|
|
|
@ -118,15 +118,12 @@ respawn_wow64_process ()
|
||||||
extern void __stdcall dll_crt0_0 ();
|
extern void __stdcall dll_crt0_0 ();
|
||||||
|
|
||||||
HMODULE NO_COPY cygwin_hmodule;
|
HMODULE NO_COPY cygwin_hmodule;
|
||||||
bool NO_COPY in_dllentry;
|
|
||||||
|
|
||||||
extern "C" BOOL WINAPI
|
extern "C" BOOL WINAPI
|
||||||
dll_entry (HANDLE h, DWORD reason, void *static_load)
|
dll_entry (HANDLE h, DWORD reason, void *static_load)
|
||||||
{
|
{
|
||||||
BOOL wow64_test_stack_marker;
|
BOOL wow64_test_stack_marker;
|
||||||
|
|
||||||
in_dllentry = true;
|
|
||||||
|
|
||||||
switch (reason)
|
switch (reason)
|
||||||
{
|
{
|
||||||
case DLL_PROCESS_ATTACH:
|
case DLL_PROCESS_ATTACH:
|
||||||
|
@ -162,6 +159,5 @@ dll_entry (HANDLE h, DWORD reason, void *static_load)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
in_dllentry = false;
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,7 @@ details. */
|
||||||
#define WSSC 60000 // Wait for signal completion
|
#define WSSC 60000 // Wait for signal completion
|
||||||
#define WPSP 40000 // Wait for proc_subproc mutex
|
#define WPSP 40000 // Wait for proc_subproc mutex
|
||||||
|
|
||||||
#define no_signals_available(x) (!hwait_sig || hwait_sig == INVALID_HANDLE_VALUE || ((x) && myself->exitcode & EXITCODE_SET) || &_my_tls == _sig_tls || in_dllentry)
|
#define no_signals_available(x) (!hwait_sig || hwait_sig == INVALID_HANDLE_VALUE || ((x) && myself->exitcode & EXITCODE_SET) || &_my_tls == _sig_tls)
|
||||||
|
|
||||||
#define NPROCS 256
|
#define NPROCS 256
|
||||||
|
|
||||||
|
|
|
@ -353,7 +353,6 @@ extern bool display_title;
|
||||||
extern bool transparent_exe;
|
extern bool transparent_exe;
|
||||||
|
|
||||||
extern bool in_forkee;
|
extern bool in_forkee;
|
||||||
extern bool in_dllentry;
|
|
||||||
|
|
||||||
extern HANDLE hMainThread;
|
extern HANDLE hMainThread;
|
||||||
extern HANDLE hMainProc;
|
extern HANDLE hMainProc;
|
||||||
|
|
Loading…
Reference in New Issue