Mercurial > hg > xemacs-beta
comparison src/process-nt.c @ 2367:ecf1ebac70d8
[xemacs-hg @ 2004-11-04 23:05:23 by ben]
commit mega-patch
configure.in: Turn off -Winline and -Wchar-subscripts.
Use the right set of cflags when compiling modules.
Rewrite ldap configuration to separate the inclusion of lber
(needed in recent Cygwin) from the basic checks for the
needed libraries.
add a function for MAKE_JUNK_C; initially code was added to
generate xemacs.def using this, but it will need to be rewritten.
add an rm -f for junk.c to avoid weird Cygwin bug with cp -f onto
an existing file.
Sort list of auto-detected functions and eliminate unused checks for
stpcpy, setlocale and getwd.
Add autodetection of Cygwin scanf problems
BETA: Rewrite section on configure to indicate what flags are important
and what not.
digest-doc.c, make-dump-id.c, profile.c, sorted-doc.c: Add proper decls for main().
make-msgfile.c: Document that this is old junk.
Move proposal to text.c.
make-msgfile.lex: Move proposal to text.c.
make-mswin-unicode.pl: Convert error-generating code so that the entire message will
be seen as a single unrecognized token.
mule/mule-ccl.el: Update docs.
lispref/mule.texi: Update CCL docs.
ldap/eldap.c: Mule-ize.
Use EXTERNAL_LIST_LOOP_2 instead of deleted EXTERNAL_LIST_LOOP.
* XEmacs 21.5.18 "chestnut" is released.
---------------------------------------------------------------
MULE-RELATED WORK:
---------------------------------------------------------------
---------------------------
byte-char conversion
---------------------------
buffer.c, buffer.h, insdel.c, text.c: Port FSF algorithm for byte-char conversion, replacing broken
previous version. Track the char position of the gap. Add
functions to do char-byte conversion downwards as well as upwards.
Move comments about algorithm workings to internals manual.
---------------------------
work on types
---------------------------
alloc.c, console-x-impl.h, dump-data.c, dump-data.h, dumper.c, dialog-msw.c, dired-msw.c, doc.c, editfns.c, esd.c, event-gtk.h, event-msw.c, events.c, file-coding.c, file-coding.h, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-x.c, glyphs.c, glyphs.h, gui.c, hpplay.c, imgproc.c, intl-win32.c, lrecord.h, lstream.c, keymap.c, lisp.h, libsst.c, linuxplay.c, miscplay.c, miscplay.h, mule-coding.c, nas.c, nt.c, ntheap.c, ntplay.c, objects-msw.c, objects-tty.c, objects-x.c, print.c, process-nt.c, process.c, redisplay.h, select-common.h, select-gtk.c, select-x.c, sgiplay.c, sound.c, sound.h, sunplay.c, sysfile.h, sysdep.c, syswindows.h, text.c, unexnt.c, win32.c, xgccache.c: Further work on types. This creates a full set of types for all
the basic semantics of `char' that I have so far identified, so that
its semantics can always be identified for the purposes of proper
Mule-safe code, and the raw use of `char' always avoided.
(1) More type renaming, for consistency of naming.
Char_ASCII -> Ascbyte
UChar_ASCII -> UAscbyte
Char_Binary -> CBinbyte
UChar_Binary -> Binbyte
SChar_Binary -> SBinbyte
(2) Introduce Rawbyte, CRawbyte, Boolbyte, Chbyte, UChbyte, and
Bitbyte and use them.
(3) New types Itext, Wexttext and Textcount for separating out
the concepts of bytes and textual units (different under UTF-16
and UTF-32, which are potential internal encodings).
(4) qxestr*_c -> qxestr*_ascii.
lisp.h: New; goes with other qxe() functions. #### Maybe goes in a
different section.
lisp.h: Group generic int-type defs together with EMACS_INT defs.
lisp.h: * lisp.h (WEXTTEXT_IS_WIDE)
New defns.
lisp.h: New type to replace places where int occurs as a boolean.
It's signed because occasionally people may want to use -1 as
an error value, and because unsigned ints are viral -- see comments
in the internals manual against using them.
dynarr.c: int -> Bytecount.
---------------------------
Mule-izing
---------------------------
device-x.c: Partially Mule-ize.
dumper.c, dumper.h: Mule-ize. Use Rawbyte. Use stderr_out not printf. Use wext_*().
sysdep.c, syswindows.h, text.c: New Wexttext API for manipulation of external text that may be
Unicode (e.g. startup code under Windows).
emacs.c: Mule-ize. Properly deal with argv in external encoding.
Use wext_*() and Wexttext. Use Rawbyte.
#if 0 some old junk on SCO that is unlikely to be correct.
Rewrite allocation code in run-temacs.
emacs.c, symsinit.h, win32.c: Rename win32 init function and call it even earlier, to
initialize mswindows_9x_p even earlier, for use in startup code
(XEUNICODE_P).
process.c: Use _wenviron not environ under Windows, to get Unicode environment
variables.
event-Xt.c: Mule-ize drag-n-drop related stuff.
dragdrop.c, dragdrop.h, frame-x.c: Mule-ize.
text.h: Add some more stand-in defines for particular kinds of conversion;
use in Mule-ization work in frame-x.c etc.
---------------------------
Freshening
---------------------------
intl-auto-encap-win32.c, intl-auto-encap-win32.h: Regenerate.
---------------------------
Unicode-work
---------------------------
intl-win32.c, syswindows.h: Factor out common options to MultiByteToWideChar and
WideCharToMultiByte. Add convert_unicode_to_multibyte_malloc()
and convert_unicode_to_multibyte_dynarr() and use. Add stuff for
alloca() conversion of multibyte/unicode.
alloc.c: Use dfc_external_data_len() in case of unicode coding system.
alloc.c, mule-charset.c: Don't zero out and reinit charset Unicode tables. This fucks up
dump-time loading. Anyway, either we load them at dump time or
run time, never both.
unicode.c: Dump the blank tables as well.
---------------------------------------------------------------
DOCUMENTATION, MOSTLY MULE-RELATED:
---------------------------------------------------------------
EmacsFrame.c, emodules.c, event-Xt.c, fileio.c, input-method-xlib.c, mule-wnnfns.c, redisplay-gtk.c, redisplay-tty.c, redisplay-x.c, regex.c, sysdep.c: Add comment about Mule work needed.
text.h: Add more documentation describing why DFC routines were not written
to return their value. Add some other DFC documentation.
console-msw.c, console-msw.h: Add pointer to docs in win32.c.
emacs.c: Add comments on sources of doc info.
text.c, charset.h, unicode.c, intl-win32.c, intl-encap-win32.c, text.h, file-coding.c, mule-coding.c: Collect background comments and related to text matters and
internationalization, and proposals for work to be done, in text.c
or Internals manual, stuff related to specific textual API's in
text.h, and stuff related to internal implementation of Unicode
conversion in unicode.c. Put lots of pointers to the comments to
make them easier to find.
s/mingw32.h, s/win32-common.h, s/win32-native.h, s/windowsnt.h, win32.c: Add bunches of new documentation on the different kinds of
builds and environments under Windows and how they work.
Collect this info in win32.c. Add pointers to these docs in
the relevant s/* files.
emacs.c: Document places with long comments.
Remove comment about exiting, move to internals manual, put
in pointer.
event-stream.c: Move docs about event queues and focus to internals manual, put
in pointer.
events.h: Move docs about event stream callbacks to internals manual, put
in pointer.
profile.c, redisplay.c, signal.c: Move documentation to the Internals manual.
process-nt.c: Add pointer to comment in win32-native.el.
lisp.h: Add comments about some comment conventions.
lisp.h: Add comment about the second argument.
device-msw.c, redisplay-msw.c: @@#### comments are out-of-date.
---------------------------------------------------------------
PDUMP WORK (MOTIVATED BY UNICODE CHANGES)
---------------------------------------------------------------
alloc.c, buffer.c, bytecode.c, console-impl.h, console.c, device.c, dumper.c, lrecord.h, elhash.c, emodules.h, events.c, extents.c, frame.c, glyphs.c, glyphs.h, mule-charset.c, mule-coding.c, objects.c, profile.c, rangetab.c, redisplay.c, specifier.c, specifier.h, window.c, lstream.c, file-coding.h, file-coding.c: PDUMP:
Properly implement dump_add_root_block(), which never worked before,
and is necessary for dumping Unicode tables.
Pdump name changes for accuracy:
XD_STRUCT_PTR -> XD_BLOCK_PTR.
XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY.
XD_C_STRING -> XD_ASCII_STRING.
*_structure_* -> *_block_*.
lrecord.h: some comments added about
dump_add_root_block() vs dump_add_root_block_ptr().
extents.c: remove incorrect comment about pdump problems with gap array.
---------------------------------------------------------------
ALLOCATION
---------------------------------------------------------------
abbrev.c, alloc.c, bytecode.c, casefiddle.c, device-msw.c, device-x.c, dired-msw.c, doc.c, doprnt.c, dragdrop.c, editfns.c, emodules.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-msw.c, gui-x.c, imgproc.c, intl-win32.c, lread.c, menubar-gtk.c, menubar.c, nt.c, objects-msw.c, objects-x.c, print.c, process-nt.c, process-unix.c, process.c, realpath.c, redisplay.c, search.c, select-common.c, symbols.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: New macros {alloca,xnew}_{itext,{i,ext,raw,bin,asc}bytes} for
more convenient allocation of these commonly requested items.
Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes,
xnew_ibytes, etc. also XREALLOC_ARRAY, xnew.
alloc.c: Rewrite the allocation functions to factor out repeated code.
Add assertions for freeing dumped data.
lisp.h: Moved down and consolidated with other allocation stuff.
lisp.h, dynarr.c: New functions for allocation that's very efficient when mostly in
LIFO order.
lisp.h, text.c, text.h: Factor out some stuff for general use by alloca()-conversion funs.
text.h, lisp.h: Fill out convenience routines for allocating various kinds of
bytes and put them in lisp.h. Use them in place of xmalloc(),
ALLOCA().
text.h: Fill out the convenience functions so the _MALLOC() kinds match
the alloca() kinds.
---------------------------------------------------------------
ERROR-CHECKING
---------------------------------------------------------------
text.h: Create ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN()
from similar Eistring checkers and change the Eistring checkers to
use them instead.
---------------------------------------------------------------
MACROS IN LISP.H
---------------------------------------------------------------
lisp.h: Redo GCPRO declarations. Create a "base" set of functions that can
be used to generate any kind of gcpro sets -- regular, ngcpro,
nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2.
buffer.c, callint.c, chartab.c, console-msw.c, device-x.c, dialog-msw.c, dired.c, extents.c, ui-gtk.c, rangetab.c, nt.c, mule-coding.c, minibuf.c, menubar-msw.c, menubar.c, menubar-gtk.c, lread.c, lisp.h, gutter.c, glyphs.c, glyphs-widget.c, fns.c, fileio.c, file-coding.c, specifier.c: Eliminate EXTERNAL_LIST_LOOP, which does not check for circularities.
Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3
or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2
(new macro). Removed/redid comments on EXTERNAL_LIST_LOOP.
---------------------------------------------------------------
SPACING FIXES
---------------------------------------------------------------
callint.c, hftctl.c, number-gmp.c, process-unix.c: Spacing fixes.
---------------------------------------------------------------
FIX FOR GEOMETRY PROBLEM IN FIRST FRAME
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
toolbar.c: bug fix for problem of initial frame being 77 chars wide on Windows.
will be overridden by my other ws.
---------------------------------------------------------------
FIX FOR LEAKING PROCESS HANDLES:
---------------------------------------------------------------
process-nt.c: Fixes for leaking handles. Inspired by work done by Adrian Aichner
<adrian@xemacs.org>.
---------------------------------------------------------------
FIX FOR CYGWIN BUG (Unicode-related):
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
---------------------------------------------------------------
WARNING FIXES:
---------------------------------------------------------------
console-stream.c: `reinit' is unused.
compiler.h, event-msw.c, frame-msw.c, intl-encap-win32.c, text.h: Add stuff to deal with ANSI-aliasing warnings I got.
regex.c: Gather includes together to avoid warning.
---------------------------------------------------------------
CHANGES TO INITIALIZATION ROUTINES:
---------------------------------------------------------------
buffer.c, emacs.c, console.c, debug.c, device-x.c, device.c, dragdrop.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, font-lock.c, frame-msw.c, glyphs-widget.c, glyphs.c, gui-x.c, insdel.c, lread.c, lstream.c, menubar-gtk.c, menubar-x.c, minibuf.c, mule-wnnfns.c, objects-msw.c, objects.c, print.c, scrollbar-x.c, search.c, select-x.c, text.c, undo.c, unicode.c, window.c, symsinit.h: Call reinit_*() functions directly from emacs.c, for clarity.
Factor out some redundant init code. Move disallowed stuff
that had crept into vars_of_glyphs() into complex_vars_of_glyphs().
Call init_eval_semi_early() from eval.c not in the middle of
vars_of_() in emacs.c since there should be no order dependency
in the latter calls.
---------------------------------------------------------------
ARMAGEDDON:
---------------------------------------------------------------
alloc.c, emacs.c, lisp.h, print.c: Rename inhibit_non_essential_printing_operations to
inhibit_non_essential_conversion_operations.
text.c: Assert on !inhibit_non_essential_conversion_operations.
console-msw.c, print.c: Don't do conversion in SetConsoleTitle or FindWindow to avoid
problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT
in places where problems would arise.
---------------------------------------------------------------
CHANGES TO THE BUILD PROCEDURE:
---------------------------------------------------------------
config.h.in, s/cxux.h, s/usg5-4-2.h, m/powerpc.h: Add comment about correct ordering of this file.
Rearrange everything to follow this -- put all #undefs together
and before the s&m files. Add undefs for HAVE_ALLOCA, C_ALLOCA,
BROKEN_ALLOCA_IN_FUNCTION_CALLS, STACK_DIRECTION. Remove unused
HAVE_STPCPY, HAVE_GETWD, HAVE_SETLOCALE.
m/gec63.h: Deleted; totally broken, not used at all, not in FSF.
m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/apollo.h, m/att3b.h, m/aviion.h, m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp300bsd.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/isi-ov.h, m/luna88k.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/news.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion105.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpc.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/xps100.h: Delete C_ALLOCA, HAVE_ALLOCA, STACK_DIRECTION,
BROKEN_ALLOCA_IN_FUNCTION_CALLS. All of this is auto-detected.
When in doubt, I followed recent FSF sources, which also have
these things deleted.
author | ben |
---|---|
date | Thu, 04 Nov 2004 23:08:28 +0000 |
parents | 04bc9d2f42c7 |
children | ab71ad6ff3dd |
comparison
equal
deleted
inserted
replaced
2366:2a392e0c390a | 2367:ecf1ebac70d8 |
---|---|
1 /* Asynchronous subprocess implementation for Win32 | 1 /* Asynchronous subprocess implementation for Win32 |
2 Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 1995 | 2 Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 1995 |
3 Free Software Foundation, Inc. | 3 Free Software Foundation, Inc. |
4 Copyright (C) 1995 Sun Microsystems, Inc. | 4 Copyright (C) 1995 Sun Microsystems, Inc. |
5 Copyright (C) 1995, 1996, 2000, 2001, 2002 Ben Wing. | 5 Copyright (C) 1995, 1996, 2000, 2001, 2002, 2004 Ben Wing. |
6 | 6 |
7 This file is part of XEmacs. | 7 This file is part of XEmacs. |
8 | 8 |
9 XEmacs is free software; you can redistribute it and/or modify it | 9 XEmacs is free software; you can redistribute it and/or modify it |
10 under the terms of the GNU General Public License as published by the | 10 under the terms of the GNU General Public License as published by the |
23 | 23 |
24 /* Written by Kirill M. Katsnelson <kkm@kis.ru>, April 1998 */ | 24 /* Written by Kirill M. Katsnelson <kkm@kis.ru>, April 1998 */ |
25 | 25 |
26 /* Mule-ized as of 8-6-00 */ | 26 /* Mule-ized as of 8-6-00 */ |
27 | 27 |
28 /* Major comment about parsing and/or constructing a command line taken | |
29 from Windows, or suitable for giving to one of the library routines that | |
30 calls a subprocess is in win32-native.el */ | |
31 | |
28 #include <config.h> | 32 #include <config.h> |
29 #include "lisp.h" | 33 #include "lisp.h" |
30 | 34 |
31 #include "console-msw.h" | 35 #include "console-msw.h" |
36 #include "events.h" | |
32 #include "hash.h" | 37 #include "hash.h" |
33 #include "lstream.h" | 38 #include "lstream.h" |
34 #include "process.h" | 39 #include "process.h" |
35 #include "procimpl.h" | 40 #include "procimpl.h" |
36 | 41 |
117 { | 122 { |
118 HANDLE h_process; | 123 HANDLE h_process; |
119 HANDLE h_thread; | 124 HANDLE h_thread; |
120 LPVOID address; | 125 LPVOID address; |
121 } process_memory; | 126 } process_memory; |
127 | |
128 static void | |
129 free_process_memory (process_memory *pmc) | |
130 { | |
131 ResumeThread (pmc->h_thread); | |
132 CloseHandle (pmc->h_thread); | |
133 } | |
122 | 134 |
123 /* | 135 /* |
124 * Allocate SIZE bytes in H_PROCESS address space. Fill in PMC used | 136 * Allocate SIZE bytes in H_PROCESS address space. Fill in PMC used |
125 * further by other routines. Return nonzero if successful. | 137 * further by other routines. Return nonzero if successful. |
126 * | 138 * |
174 | 186 |
175 pmc->address = mbi.BaseAddress; | 187 pmc->address = mbi.BaseAddress; |
176 return 1; | 188 return 1; |
177 | 189 |
178 failure: | 190 failure: |
179 ResumeThread (pmc->h_thread); | 191 free_process_memory (pmc); |
180 pmc->address = 0; | 192 pmc->address = 0; |
181 return 0; | 193 return 0; |
182 } | |
183 | |
184 static void | |
185 free_process_memory (process_memory *pmc) | |
186 { | |
187 ResumeThread (pmc->h_thread); | |
188 } | 194 } |
189 | 195 |
190 /* | 196 /* |
191 * Run ROUTINE in the context of process determined by H_PROCESS. The | 197 * Run ROUTINE in the context of process determined by H_PROCESS. The |
192 * routine is passed the address of DATA as parameter. The ROUTINE must | 198 * routine is passed the address of DATA as parameter. The ROUTINE must |
254 return exit_code; | 260 return exit_code; |
255 } | 261 } |
256 | 262 |
257 failure: | 263 failure: |
258 free_process_memory (&pm); | 264 free_process_memory (&pm); |
259 return (DWORD)-1; | 265 return (DWORD) -1; |
260 } | 266 } |
261 | 267 |
262 /*-----------------------------------------------------------------------*/ | 268 /*-----------------------------------------------------------------------*/ |
263 /* Sending signals */ | 269 /* Sending signals */ |
264 /*-----------------------------------------------------------------------*/ | 270 /*-----------------------------------------------------------------------*/ |
380 (BOOL (WINAPI *) (DWORD, DWORD)) | 386 (BOOL (WINAPI *) (DWORD, DWORD)) |
381 GetProcAddress (h_kernel, "GenerateConsoleCtrlEvent"); | 387 GetProcAddress (h_kernel, "GenerateConsoleCtrlEvent"); |
382 assert (d.adr_GenerateConsoleCtrlEvent); | 388 assert (d.adr_GenerateConsoleCtrlEvent); |
383 d.event = CTRL_C_EVENT; | 389 d.event = CTRL_C_EVENT; |
384 retval = run_in_other_process (h_process, | 390 retval = run_in_other_process (h_process, |
385 (LPTHREAD_START_ROUTINE) sigint_proc, | 391 (LPTHREAD_START_ROUTINE) sigint_proc, |
386 &d, sizeof (d)); | 392 &d, sizeof (d)); |
387 break; | 393 break; |
388 } | 394 } |
389 default: | 395 default: |
390 assert (0); | 396 assert (0); |
391 } | 397 } |
392 | 398 |
393 if (close_process) | 399 if (close_process) |
394 CloseHandle (h_process); | 400 CloseHandle (h_process); |
395 return (int)retval > 0 ? 1 : 0; | 401 return (int) retval > 0 ? 1 : 0; |
396 } | 402 } |
397 | 403 |
398 /* | 404 /* |
399 * Enable CTRL_C_EVENT handling in a new child process | 405 * Enable CTRL_C_EVENT handling in a new child process |
400 */ | 406 */ |
652 static void | 658 static void |
653 nt_finalize_process_data (Lisp_Process *p, int for_disksave) | 659 nt_finalize_process_data (Lisp_Process *p, int for_disksave) |
654 { | 660 { |
655 assert (!for_disksave); | 661 assert (!for_disksave); |
656 /* If it's still in the list of processes we are waiting on delete | 662 /* If it's still in the list of processes we are waiting on delete |
657 it. */ | 663 it. This can happen if we forcibly delete a process and are unable |
664 to kill it. */ | |
658 mswindows_unwait_process (p); | 665 mswindows_unwait_process (p); |
659 if (NT_DATA (p)->h_process) | 666 if (NT_DATA (p)->h_process) |
660 CloseHandle (NT_DATA (p)->h_process); | 667 { |
668 CloseHandle (NT_DATA (p)->h_process); | |
669 NT_DATA (p)->h_process = 0; | |
670 } | |
661 } | 671 } |
662 | 672 |
663 /* | 673 /* |
664 * Initialize XEmacs process implementation once | 674 * Initialize XEmacs process implementation once |
665 */ | 675 */ |
698 } | 708 } |
699 | 709 |
700 int | 710 int |
701 mswindows_compare_env (const void *strp1, const void *strp2) | 711 mswindows_compare_env (const void *strp1, const void *strp2) |
702 { | 712 { |
703 const Ibyte *str1 = *(const Ibyte **)strp1, | 713 const Itext *str1 = * (const Itext **) strp1, |
704 *str2 = *(const Ibyte **)strp2; | 714 *str2 = * (const Itext **) strp2; |
705 | 715 |
706 while (*str1 && *str2 && *str1 != '=' && *str2 != '=') | 716 while (*str1 && *str2 && *str1 != '=' && *str2 != '=') |
707 { | 717 { |
708 if ((*str1) > (*str2)) | 718 if ((*str1) > (*str2)) |
709 return 1; | 719 return 1; |
797 | 807 |
798 if (separate_err) | 808 if (separate_err) |
799 CreatePipe (&hmyslurp_err, &hprocerr, &sa, 0); | 809 CreatePipe (&hmyslurp_err, &hprocerr, &sa, 0); |
800 else | 810 else |
801 /* Duplicate the stdout handle for use as stderr */ | 811 /* Duplicate the stdout handle for use as stderr */ |
802 DuplicateHandle(GetCurrentProcess(), hprocout, GetCurrentProcess(), | 812 DuplicateHandle (GetCurrentProcess(), hprocout, GetCurrentProcess(), |
803 &hprocerr, 0, TRUE, DUPLICATE_SAME_ACCESS); | 813 &hprocerr, 0, TRUE, DUPLICATE_SAME_ACCESS); |
804 | 814 |
805 /* Stupid Win32 allows to create a pipe with *both* ends either | 815 /* Stupid Win32 allows to create a pipe with *both* ends either |
806 inheritable or not. We need process ends inheritable, and local | 816 inheritable or not. We need process ends inheritable, and local |
807 ends not inheritable. */ | 817 ends not inheritable. */ |
808 DuplicateHandle (GetCurrentProcess(), hmyshove, GetCurrentProcess(), | 818 DuplicateHandle (GetCurrentProcess(), hmyshove, GetCurrentProcess(), |
835 for (i = 0; i < nargv; ++i) | 845 for (i = 0; i < nargv; ++i) |
836 args_or_ret = Fcons (*argv++, args_or_ret); | 846 args_or_ret = Fcons (*argv++, args_or_ret); |
837 args_or_ret = Fnreverse (args_or_ret); | 847 args_or_ret = Fnreverse (args_or_ret); |
838 args_or_ret = Fcons (program, args_or_ret); | 848 args_or_ret = Fcons (program, args_or_ret); |
839 | 849 |
850 /* This Lisp function is in win32-native.el and has lots of comments | |
851 about what exactly is going on. */ | |
840 args_or_ret = call1 (Qmswindows_construct_process_command_line, | 852 args_or_ret = call1 (Qmswindows_construct_process_command_line, |
841 args_or_ret); | 853 args_or_ret); |
842 | 854 |
843 if (!STRINGP (args_or_ret)) | 855 if (!STRINGP (args_or_ret)) |
844 /* Luser wrote his/her own clever version */ | 856 /* Luser wrote his/her own clever version */ |
936 /* On Windows 95, if cmdname is a DOS app, we invoke a helper | 948 /* On Windows 95, if cmdname is a DOS app, we invoke a helper |
937 application to start it by specifying the helper app as cmdname, | 949 application to start it by specifying the helper app as cmdname, |
938 while leaving the real app name as argv[0]. */ | 950 while leaving the real app name as argv[0]. */ |
939 if (is_dos_app) | 951 if (is_dos_app) |
940 { | 952 { |
941 cmdname = (Ibyte *) ALLOCA (PATH_MAX); | 953 cmdname = alloca_ibytes (PATH_MAX); |
942 if (egetenv ("CMDPROXY")) | 954 if (egetenv ("CMDPROXY")) |
943 qxestrcpy (cmdname, egetenv ("CMDPROXY")); | 955 qxestrcpy (cmdname, egetenv ("CMDPROXY")); |
944 else | 956 else |
945 { | 957 { |
946 qxestrcpy (cmdname, XSTRING_DATA (Vinvocation_directory)); | 958 qxestrcpy (cmdname, XSTRING_DATA (Vinvocation_directory)); |
1132 } | 1144 } |
1133 } | 1145 } |
1134 } | 1146 } |
1135 } | 1147 } |
1136 | 1148 |
1149 static void | |
1150 nt_deactivate_process (Lisp_Process *p, | |
1151 USID *in_usid, | |
1152 USID *err_usid) | |
1153 { | |
1154 event_stream_delete_io_streams (p->pipe_instream, p->pipe_outstream, | |
1155 p->pipe_errstream, in_usid, err_usid); | |
1156 /* Go ahead and close the process handle now to prevent accumulation | |
1157 of handles when lots of processes are run. (The handle gets closed | |
1158 anyway upon GC, but that might be a ways away, esp. if | |
1159 deleted-exited-processes is set to nil.) */ | |
1160 nt_finalize_process_data (p, 0); | |
1161 } | |
1162 | |
1137 /* | 1163 /* |
1138 * Send a signal number SIGNO to PROCESS. | 1164 * Send a signal number SIGNO to PROCESS. |
1139 * CURRENT_GROUP means send to the process group that currently owns | 1165 * CURRENT_GROUP means send to the process group that currently owns |
1140 * the terminal being used to communicate with PROCESS. | 1166 * the terminal being used to communicate with PROCESS. |
1141 * This is used for various commands in shell mode. | 1167 * This is used for various commands in shell mode. |
1194 /* Return 0 for success, or error code */ | 1220 /* Return 0 for success, or error code */ |
1195 | 1221 |
1196 static int | 1222 static int |
1197 get_internet_address (Lisp_Object host, struct sockaddr_in *address) | 1223 get_internet_address (Lisp_Object host, struct sockaddr_in *address) |
1198 { | 1224 { |
1199 Char_Binary buf[MAXGETHOSTSTRUCT]; | 1225 CBinbyte buf[MAXGETHOSTSTRUCT]; |
1200 HWND hwnd; | 1226 HWND hwnd; |
1201 HANDLE hasync; | 1227 HANDLE hasync; |
1202 int errcode = 0; | 1228 int errcode = 0; |
1203 | 1229 |
1204 address->sin_family = AF_INET; | 1230 address->sin_family = AF_INET; |
1556 PROCESS_HAS_METHOD (nt, finalize_process_data); | 1582 PROCESS_HAS_METHOD (nt, finalize_process_data); |
1557 PROCESS_HAS_METHOD (nt, init_process); | 1583 PROCESS_HAS_METHOD (nt, init_process); |
1558 PROCESS_HAS_METHOD (nt, create_process); | 1584 PROCESS_HAS_METHOD (nt, create_process); |
1559 PROCESS_HAS_METHOD (nt, update_status_if_terminated); | 1585 PROCESS_HAS_METHOD (nt, update_status_if_terminated); |
1560 PROCESS_HAS_METHOD (nt, send_process); | 1586 PROCESS_HAS_METHOD (nt, send_process); |
1587 PROCESS_HAS_METHOD (nt, deactivate_process); | |
1561 PROCESS_HAS_METHOD (nt, kill_child_process); | 1588 PROCESS_HAS_METHOD (nt, kill_child_process); |
1562 PROCESS_HAS_METHOD (nt, kill_process_by_pid); | 1589 PROCESS_HAS_METHOD (nt, kill_process_by_pid); |
1563 #ifdef HAVE_SOCKETS | 1590 #ifdef HAVE_SOCKETS |
1564 PROCESS_HAS_METHOD (nt, canonicalize_host_name); | 1591 PROCESS_HAS_METHOD (nt, canonicalize_host_name); |
1565 PROCESS_HAS_METHOD (nt, open_network_stream); | 1592 PROCESS_HAS_METHOD (nt, open_network_stream); |