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

* fhandler.h (set_console_state_for_spawn): Eliminate argument from

Browse Source 
declaration.
* fhandler.cc (set_console_state_for_spawn): Eliminate argument from
definition.  Always check for invisible console.
(fhandler_console::need_invisible): Don't do anything if the windows station is
already not visible.
* spawn.cc (spawn_guts): Accommodate change of argument to
set_console_state_for_spawn.
This commit is contained in:
Christopher Faylor 2006-01-07 17:57:26 +00:00
parent a37aaf88a8
commit 85c804ec4b
4 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,14 @@
2006-01-07 Christopher Faylor <cgf@timesys.com>
* fhandler.h (set_console_state_for_spawn): Eliminate argument from
declaration.
* fhandler.cc (set_console_state_for_spawn): Eliminate argument from
definition. Always check for invisible console.
(fhandler_console::need_invisible): Don't do anything if the windows
station is already not visible.
* spawn.cc (spawn_guts): Accommodate change of argument to
set_console_state_for_spawn.
2006-01-05 Christopher Faylor <cgf@timesys.com> 2006-01-05 Christopher Faylor <cgf@timesys.com>
* sigproc.cc (no_signals_available): Use existence of signal thread * sigproc.cc (no_signals_available): Use existence of signal thread

2
winsup/cygwin/fhandler.h
View File

@ -1365,6 +1365,6 @@ class select_stuff
device_specific_mailslot (0) {} device_specific_mailslot (0) {}
}; };
void __stdcall set_console_state_for_spawn (bool) __attribute__ ((regparm (1))); void __stdcall set_console_state_for_spawn ();
#endif /* _FHANDLER_H_ */ #endif /* _FHANDLER_H_ */

53
winsup/cygwin/fhandler_console.cc
View File

@ -146,7 +146,7 @@ tty_list::get_tty (int n)
void __stdcall void __stdcall
set_console_state_for_spawn (bool noncygwin_process) set_console_state_for_spawn (bool noncygwin_process)
{ {
if (noncygwin_process && fhandler_console::need_invisible ()) if (fhandler_console::need_invisible ())
return; return;
HANDLE h = CreateFile ("CONIN$", GENERIC_READ, FILE_SHARE_WRITE, HANDLE h = CreateFile ("CONIN$", GENERIC_READ, FILE_SHARE_WRITE,
@ -1825,6 +1825,9 @@ fhandler_console::fixup_after_fork_exec (bool execing)
bool NO_COPY fhandler_console::invisible_console; bool NO_COPY fhandler_console::invisible_console;
// #define WINSTA_ACCESS (WINSTA_READATTRIBUTES | STANDARD_RIGHTS_READ | STANDARD_RIGHTS_WRITE | WINSTA_CREATEDESKTOP | WINSTA_EXITWINDOWS)
#define WINSTA_ACCESS STANDARD_RIGHTS_READ
bool bool
fhandler_console::need_invisible () fhandler_console::need_invisible ()
{ {
@ -1854,25 +1857,39 @@ fhandler_console::need_invisible ()
process using setsid: bash -lc "setsid rxvt". */ process using setsid: bash -lc "setsid rxvt". */
h = horig = GetProcessWindowStation (); h = horig = GetProcessWindowStation ();
if (myself->ctty == -1)
USEROBJECTFLAGS oi;
DWORD len;
if (!horig
|| !GetUserObjectInformation (horig, UOI_FLAGS, &oi, sizeof (oi), &len)
|| !(oi.dwFlags & WSF_VISIBLE))
{ {
if (!(h = CreateWindowStation (NULL, 0, WINSTA_ALL_ACCESS, &sec_all_nih))) b = true;
h = CreateWindowStation ("CygwinInvisible", 0, WINSTA_ALL_ACCESS, debug_printf ("window station is not visible");
&sec_all_nih); invisible_console = true;
termios_printf ("CreateWindowStation(\"CygwinInvisible\", %p), %E", h); }
if (h) else
{ {
b = SetProcessWindowStation (h); if (myself->ctty == -1 && oi.dwFlags & WSF_VISIBLE)
termios_printf ("SetProcessWindowStation %d, %E", b); {
} h = CreateWindowStation (NULL, 0, WINSTA_ACCESS, NULL);
termios_printf ("CreateWindowStation(NULL, %p), %E", h);
if (h)
{
b = SetProcessWindowStation (h);
termios_printf ("SetProcessWindowStation %d, %E", b);
}
}
b = AllocConsole (); /* will cause flashing if CreateWorkstation
failed */
debug_printf ("h %p, horig %p, flags %p", h, horig, oi.dwFlags);
if (horig && h && h != horig && SetProcessWindowStation (horig))
{
CloseWindowStation (h);
}
termios_printf ("%d = AllocConsole (), %E", b);
invisible_console = true;
} }
b = AllocConsole (); /* will cause flashing if CreateWorkstation
failed */
debug_printf ("h (%p), horig (%p)", h, horig);
if (horig && h && h != horig && SetProcessWindowStation (horig))
CloseWindowStation (h);
termios_printf ("%d = AllocConsole (), %E", b);
invisible_console = true;
} }
debug_printf ("invisible_console %d", invisible_console); debug_printf ("invisible_console %d", invisible_console);

2
winsup/cygwin/spawn.cc
View File

@ -617,7 +617,7 @@ spawn_guts (const char * prog_arg, const char *const *argv,
else else
system_printf ("duplicate to pid_handle failed, %E"); system_printf ("duplicate to pid_handle failed, %E");
if (mode != _P_DETACH) if (mode != _P_DETACH)
set_console_state_for_spawn (!real_path.iscygexec ()); set_console_state_for_spawn ();
} }
/* Some file types (currently only sockets) need extra effort in the parent /* Some file types (currently only sockets) need extra effort in the parent