diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2009-12-18 20:32:04 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2009-12-18 20:32:04 +0000 |
| commit | f16706de978322fb69a39bae0dd817fb2fdaeaf2 (patch) | |
| tree | 057ab687428b320ffe92db406a7767039756e398 /winsup/cygwin/fhandler_tty.cc | |
| parent | 333a47d316455824fb63bf35938a1c8ea870b84b (diff) | |
| download | cygnal-f16706de978322fb69a39bae0dd817fb2fdaeaf2.tar.gz cygnal-f16706de978322fb69a39bae0dd817fb2fdaeaf2.tar.bz2 cygnal-f16706de978322fb69a39bae0dd817fb2fdaeaf2.zip | |
Throughout, replace hMainProc with GetCurrentProcess/NtCurrentProcess
according to context. Throughout, replace hMainThread with
GetCurrentThread/NtCurrentThread according to context.
* dcrt0.cc (dll_crt0_0): Drop duplication of GetCurrentProcess to
hMainProc. Drop duplication of GetCurrentThread to hMainThread.
* dtable.cc (dtable::stdio_init): Remove useless comment.
* globals.cc (hMainProc): Remove.
(hMainThread): Remove.
* ntdll.h (NtCurrentProcess): Define.
(NtCurrentThread: Define.
Diffstat (limited to 'winsup/cygwin/fhandler_tty.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_tty.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index fbb766c3f..378e9fba4 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -556,7 +556,7 @@ fhandler_tty_slave::open (int flags, mode_t) } if (!DuplicateHandle (tty_owner, get_ttyp ()->from_master, - hMainProc, &from_master_local, 0, TRUE, + GetCurrentProcess (), &from_master_local, 0, TRUE, DUPLICATE_SAME_ACCESS)) { termios_printf ("can't duplicate input from %u/%p, %E", @@ -567,7 +567,7 @@ fhandler_tty_slave::open (int flags, mode_t) VerifyHandle (from_master_local); if (!DuplicateHandle (tty_owner, get_ttyp ()->to_master, - hMainProc, &to_master_local, 0, TRUE, + GetCurrentProcess (), &to_master_local, 0, TRUE, DUPLICATE_SAME_ACCESS)) { termios_printf ("can't duplicate output, %E"); @@ -1459,10 +1459,10 @@ fhandler_pty_master::fixup_after_fork (HANDLE parent) if (arch->dwProcessId != wpid) { tty& t = *get_ttyp (); - if (!DuplicateHandle (parent, arch->from_master, hMainProc, + if (!DuplicateHandle (parent, arch->from_master, GetCurrentProcess (), &arch->from_master, 0, false, DUPLICATE_SAME_ACCESS)) system_printf ("couldn't duplicate from_parent(%p), %E", arch->from_master); - if (!DuplicateHandle (parent, arch->to_master, hMainProc, + if (!DuplicateHandle (parent, arch->to_master, GetCurrentProcess (), &arch->to_master, 0, false, DUPLICATE_SAME_ACCESS)) system_printf ("couldn't duplicate to_parent(%p), %E", arch->from_master); if (myself->pid == t.master_pid) |