diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2009-12-18 23:32:04 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2009-12-18 23:32:04 +0300 |
| commit | f16706de978322fb69a39bae0dd817fb2fdaeaf2 (patch) | |
| tree | 057ab687428b320ffe92db406a7767039756e398 /winsup/cygwin/fhandler.cc | |
| parent | 333a47d316455824fb63bf35938a1c8ea870b84b (diff) | |
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.cc')
| -rw-r--r-- | winsup/cygwin/fhandler.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc index fa93110f7..57fcb8610 100644 --- a/winsup/cygwin/fhandler.cc +++ b/winsup/cygwin/fhandler.cc @@ -1143,8 +1143,9 @@ fhandler_base::dup (fhandler_base *child) HANDLE nh; if (!nohandle ()) { - if (!DuplicateHandle (hMainProc, get_handle (), hMainProc, &nh, 0, TRUE, - DUPLICATE_SAME_ACCESS)) + if (!DuplicateHandle (GetCurrentProcess (), get_handle (), + GetCurrentProcess (), &nh, + 0, TRUE, DUPLICATE_SAME_ACCESS)) { debug_printf ("dup(%s) failed, handle %x, %E", get_name (), get_handle ()); @@ -1319,8 +1320,8 @@ fhandler_base::fork_fixup (HANDLE parent, HANDLE &h, const char *name) bool res = false; if (/* !is_socket () && */ !close_on_exec ()) debug_printf ("handle %p already opened", h); - else if (!DuplicateHandle (parent, h, hMainProc, &h, 0, !close_on_exec (), - DUPLICATE_SAME_ACCESS)) + else if (!DuplicateHandle (parent, h, GetCurrentProcess (), &h, + 0, !close_on_exec (), DUPLICATE_SAME_ACCESS)) system_printf ("%s - %E, handle %s<%p>", get_name (), name, h); else { |