2006-08-09 Gonzalo Paniagua Javier <gonzalo@ximian.com>
[mono.git] / mcs / class / System / System.Diagnostics / Process.cs
index d910af2e4762d3d293e0d541eb5c749ae297fce9..8ec25f8d5bb1aabc9faec8ef1c995369f51001cd 100644 (file)
@@ -8,7 +8,7 @@
 //
 // (C) 2002 Ximian, Inc.
 // (C) 2003 Andreas Nahr
-// (c) 2004 Novell, Inc. (http://www.novell.com)
+// (c) 2004,2005,2006 Novell, Inc. (http://www.novell.com)
 //
 
 //
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 using System.IO;
+using System.Text;
 using System.ComponentModel;
 using System.ComponentModel.Design;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security.Permissions;
 using System.Collections;
 using System.Threading;
 
 namespace System.Diagnostics {
+
        [DefaultEvent ("Exited"), DefaultProperty ("StartInfo")]
        [Designer ("System.Diagnostics.Design.ProcessDesigner, " + Consts.AssemblySystem_Design)]
+       [PermissionSet (SecurityAction.LinkDemand, Unrestricted = true)]
+       [PermissionSet (SecurityAction.InheritanceDemand, Unrestricted = true)]
        public class Process : Component 
        {
                [StructLayout(LayoutKind.Sequential)]
@@ -60,7 +64,6 @@ namespace System.Diagnostics {
                        public int tid;
                        public string [] envKeys;
                        public string [] envValues;
-                       public bool useShellExecute;
                };
                
                IntPtr process_handle;
@@ -69,6 +72,8 @@ namespace System.Diagnostics {
                bool already_waiting;
                ISynchronizeInvoke synchronizingObject;
                EventHandler exited_event;
+               IntPtr stdout_rd;
+               IntPtr stderr_rd;
                
                /* Private constructor called from other methods */
                private Process(IntPtr handle, int id) {
@@ -194,6 +199,10 @@ namespace System.Diagnostics {
                [MonitoringDescription ("Process identifier.")]
                public int Id {
                        get {
+                               if (pid == 0) {
+                                       throw new InvalidOperationException ("Process ID has not been set.");
+                               }
+
                                return(pid);
                        }
                }
@@ -318,6 +327,9 @@ namespace System.Diagnostics {
                }
 
                [MonoTODO]
+#if NET_2_0
+               [Obsolete ("Use NonpagedSystemMemorySize64")]
+#endif
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                [MonitoringDescription ("The number of bytes that are not pageable.")]
                public int NonpagedSystemMemorySize {
@@ -327,6 +339,9 @@ namespace System.Diagnostics {
                }
 
                [MonoTODO]
+#if NET_2_0
+               [Obsolete ("Use PagedMemorySize64")]
+#endif
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                [MonitoringDescription ("The number of bytes that are paged.")]
                public int PagedMemorySize {
@@ -336,6 +351,9 @@ namespace System.Diagnostics {
                }
 
                [MonoTODO]
+#if NET_2_0
+               [Obsolete ("Use PagedSystemMemorySize64")]
+#endif
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                [MonitoringDescription ("The amount of paged system memory in bytes.")]
                public int PagedSystemMemorySize {
@@ -345,6 +363,9 @@ namespace System.Diagnostics {
                }
 
                [MonoTODO]
+#if NET_2_0
+               [Obsolete ("Use PeakPagedMemorySize64")]
+#endif
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                [MonitoringDescription ("The maximum amount of paged memory used by this process.")]
                public int PeakPagedMemorySize {
@@ -354,6 +375,9 @@ namespace System.Diagnostics {
                }
 
                [MonoTODO]
+#if NET_2_0
+               [Obsolete ("Use PeakVirtualMemorySize64")]
+#endif
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                [MonitoringDescription ("The maximum amount of virtual memory used by this process.")]
                public int PeakVirtualMemorySize {
@@ -363,6 +387,9 @@ namespace System.Diagnostics {
                }
 
                [MonoTODO]
+#if NET_2_0
+               [Obsolete ("Use PeakWorkingSet64")]
+#endif
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                [MonitoringDescription ("The maximum amount of system memory used by this process.")]
                public int PeakWorkingSet {
@@ -371,6 +398,62 @@ namespace System.Diagnostics {
                        }
                }
 
+#if NET_2_0
+               [MonoTODO]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+               [MonitoringDescription ("The number of bytes that are not pageable.")]
+               public long NonpagedSystemMemorySize64 {
+                       get {
+                               return(0);
+                       }
+               }
+
+               [MonoTODO]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+               [MonitoringDescription ("The number of bytes that are paged.")]
+               public long PagedMemorySize64 {
+                       get {
+                               return(0);
+                       }
+               }
+
+               [MonoTODO]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+               [MonitoringDescription ("The amount of paged system memory in bytes.")]
+               public long PagedSystemMemorySize64 {
+                       get {
+                               return(0);
+                       }
+               }
+
+               [MonoTODO]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+               [MonitoringDescription ("The maximum amount of paged memory used by this process.")]
+               public long PeakPagedMemorySize64 {
+                       get {
+                               return(0);
+                       }
+               }
+
+               [MonoTODO]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+               [MonitoringDescription ("The maximum amount of virtual memory used by this process.")]
+               public long PeakVirtualMemorySize64 {
+                       get {
+                               return(0);
+                       }
+               }
+
+               [MonoTODO]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+               [MonitoringDescription ("The maximum amount of system memory used by this process.")]
+               public long PeakWorkingSet64 {
+                       get {
+                               return(0);
+                       }
+               }
+#endif
+
                [MonoTODO]
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                [MonitoringDescription ("Process will be of higher priority while it is actively used.")]
@@ -476,6 +559,12 @@ namespace System.Diagnostics {
                                if (error_stream == null) {
                                        throw new InvalidOperationException("Standard error has not been redirected");
                                }
+#if NET_2_0
+                               if ((async_mode & AsyncModes.AsyncError) != 0)
+                                       throw new InvalidOperationException ("Cannot mix asynchronous and synchonous reads.");
+
+                               async_mode |= AsyncModes.SyncError;
+#endif
 
                                return(error_stream);
                        }
@@ -504,6 +593,12 @@ namespace System.Diagnostics {
                                if (output_stream == null) {
                                        throw new InvalidOperationException("Standard output has not been redirected");
                                }
+#if NET_2_0
+                               if ((async_mode & AsyncModes.AsyncOutput) != 0)
+                                       throw new InvalidOperationException ("Cannot mix asynchronous and synchonous reads.");
+
+                               async_mode |= AsyncModes.SyncOutput;
+#endif
 
                                return(output_stream);
                        }
@@ -579,6 +674,9 @@ namespace System.Diagnostics {
                }
 
                [MonoTODO]
+#if NET_2_0
+               [Obsolete ("Use VirtualMemorySize64")]
+#endif
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                [MonitoringDescription ("The amount of virtual memory currently used for this process.")]
                public int VirtualMemorySize {
@@ -588,6 +686,9 @@ namespace System.Diagnostics {
                }
 
                [MonoTODO]
+#if NET_2_0
+               [Obsolete ("Use WorkingSet64")]
+#endif
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                [MonitoringDescription ("The amount of physical memory currently used for this process.")]
                public int WorkingSet {
@@ -596,6 +697,26 @@ namespace System.Diagnostics {
                        }
                }
 
+#if NET_2_0
+               [MonoTODO]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+               [MonitoringDescription ("The amount of virtual memory currently used for this process.")]
+               public long VirtualMemorySize64 {
+                       get {
+                               return(0);
+                       }
+               }
+
+               [MonoTODO]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+               [MonitoringDescription ("The amount of physical memory currently used for this process.")]
+               public long WorkingSet64 {
+                       get {
+                               return(0);
+                       }
+               }
+#endif
+
                public void Close()
                {
                        Dispose (true);
@@ -720,38 +841,59 @@ namespace System.Diagnostics {
                }
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               private extern static bool Start_internal(string appname,
-                                                         string cmdline,
-                                                         string dir,
-                                                         IntPtr stdin,
-                                                         IntPtr stdout,
-                                                         IntPtr stderr,
-                                                         ref ProcInfo proc_info);
-
-               private static bool Start_common(ProcessStartInfo startInfo,
-                                                Process process) {
+               private extern static bool ShellExecuteEx_internal(ProcessStartInfo startInfo,
+                                                                  ref ProcInfo proc_info);
+
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               private extern static bool CreateProcess_internal(ProcessStartInfo startInfo,
+                                                                 IntPtr stdin,
+                                                                 IntPtr stdout,
+                                                                 IntPtr stderr,
+                                                                 ref ProcInfo proc_info);
+
+               private static bool Start_shell (ProcessStartInfo startInfo,
+                                                Process process)
+               {
                        ProcInfo proc_info=new ProcInfo();
-                       IntPtr stdin_rd, stdin_wr;
-                       IntPtr stdout_rd, stdout_wr;
-                       IntPtr stderr_rd, stderr_wr;
                        bool ret;
-                       
-                       if(startInfo.FileName == null || startInfo.FileName == "") {
-                               throw new InvalidOperationException("File name has not been set");
-                       }
-                       
-                       proc_info.useShellExecute = startInfo.UseShellExecute;
-                       if (proc_info.useShellExecute && (startInfo.RedirectStandardInput ||
-                           startInfo.RedirectStandardOutput || startInfo.RedirectStandardError)) {
-                               throw new InvalidOperationException ("UseShellExecute must be false when " +
-                                                                    "redirecting I/O.");
+
+                       if (startInfo.RedirectStandardInput ||
+                           startInfo.RedirectStandardOutput ||
+                           startInfo.RedirectStandardError) {
+                               throw new InvalidOperationException ("UseShellExecute must be false when redirecting I/O.");
                        }
 
                        if (startInfo.HaveEnvVars) {
-                               if (startInfo.UseShellExecute)
-                                       throw new InvalidOperationException ("UseShellExecute must be false in order " +
-                                                                            "to use environment variables.");
+                               throw new InvalidOperationException ("UseShellExecute must be false in order to use environment variables.");
+                       }
+
+                       ret = ShellExecuteEx_internal (startInfo,
+                                                      ref proc_info);
+                       if (!ret) {
+                               throw new Win32Exception (-proc_info.pid);
+                       }
+
+                       process.process_handle = proc_info.process_handle;
+                       process.pid = proc_info.pid;
+
+                       process.StartExitCallbackIfNeeded ();
+
+                       return(ret);
+               }
+
+               private static bool Start_noshell (ProcessStartInfo startInfo,
+                                                  Process process)
+               {
+                       if (Path.IsPathRooted (startInfo.FileName) && !File.Exists (startInfo.FileName))
+                               throw new FileNotFoundException  ("Executable not found: " + startInfo.FileName);
+                       ProcInfo proc_info=new ProcInfo();
+                       IntPtr stdin_rd, stdin_wr;
+                       IntPtr stdout_wr;
+                       IntPtr stderr_wr;
+                       bool ret;
+                       MonoIOError error;
 
+                       if (startInfo.HaveEnvVars) {
                                string [] strs = new string [startInfo.EnvironmentVariables.Count];
                                startInfo.EnvironmentVariables.Keys.CopyTo (strs, 0);
                                proc_info.envKeys = strs;
@@ -761,101 +903,127 @@ namespace System.Diagnostics {
                                proc_info.envValues = strs;
                        }
 
-                       if(startInfo.RedirectStandardInput==true) {
-                               ret=MonoIO.CreatePipe(out stdin_rd,
-                                                     out stdin_wr);
+                       if (startInfo.RedirectStandardInput == true) {
+                               ret = MonoIO.CreatePipe (out stdin_rd,
+                                                        out stdin_wr);
                                if (ret == false) {
-                                       throw new IOException("Error creating standard input pipe");
+                                       throw new IOException ("Error creating standard input pipe");
                                }
                        } else {
-                               stdin_rd=MonoIO.ConsoleInput;
+                               stdin_rd = MonoIO.ConsoleInput;
                                /* This is required to stop the
                                 * &$*£ing stupid compiler moaning
                                 * that stdin_wr is unassigned, below.
                                 */
-                               stdin_wr=(IntPtr)0;
+                               stdin_wr = (IntPtr)0;
                        }
 
-                       if(startInfo.RedirectStandardOutput==true) {
-                               ret=MonoIO.CreatePipe(out stdout_rd,
-                                                     out stdout_wr);
+                       if (startInfo.RedirectStandardOutput == true) {
+                               IntPtr out_rd;
+                               ret = MonoIO.CreatePipe (out out_rd,
+                                                        out stdout_wr);
+
+                               process.stdout_rd = out_rd;
                                if (ret == false) {
-                                       throw new IOException("Error creating standard output pipe");
+                                       if (startInfo.RedirectStandardInput == true) {
+                                               MonoIO.Close (stdin_rd, out error);
+                                               MonoIO.Close (stdin_wr, out error);
+                                       }
+
+                                       throw new IOException ("Error creating standard output pipe");
                                }
                        } else {
-                               stdout_rd=(IntPtr)0;
-                               stdout_wr=MonoIO.ConsoleOutput;
+                               process.stdout_rd = (IntPtr)0;
+                               stdout_wr = MonoIO.ConsoleOutput;
                        }
 
-                       if(startInfo.RedirectStandardError==true) {
-                               ret=MonoIO.CreatePipe(out stderr_rd,
-                                                     out stderr_wr);
+                       if (startInfo.RedirectStandardError == true) {
+                               IntPtr err_rd;
+                               ret = MonoIO.CreatePipe (out err_rd,
+                                                        out stderr_wr);
+
+                               process.stderr_rd = err_rd;
                                if (ret == false) {
-                                       throw new IOException("Error creating standard error pipe");
+                                       if (startInfo.RedirectStandardInput == true) {
+                                               MonoIO.Close (stdin_rd, out error);
+                                               MonoIO.Close (stdin_wr, out error);
+                                       }
+                                       if (startInfo.RedirectStandardOutput == true) {
+                                               MonoIO.Close (process.stdout_rd, out error);
+                                               MonoIO.Close (stdout_wr, out error);
+                                       }
+                                       
+                                       throw new IOException ("Error creating standard error pipe");
                                }
                        } else {
-                               stderr_rd=(IntPtr)0;
-                               stderr_wr=MonoIO.ConsoleError;
+                               process.stderr_rd = (IntPtr)0;
+                               stderr_wr = MonoIO.ConsoleError;
                        }
                        
-                       string cmdline;
-                       string appname;
-                       if (startInfo.UseShellExecute) {
-                               appname = null;
-                               string args = startInfo.Arguments;
-                               if (args == null || args.Trim () == "")
-                                       cmdline = startInfo.FileName;
-                               else
-                                       cmdline = startInfo.FileName + " " + startInfo.Arguments.Trim ();
-                       } else {
-                               appname = startInfo.FileName;
-                               cmdline = startInfo.Arguments.Trim ();
-                       }
-
-                       ret=Start_internal(appname,
-                                          cmdline,
-                                          startInfo.WorkingDirectory,
-                                          stdin_rd, stdout_wr, stderr_wr,
-                                          ref proc_info);
-
-                       MonoIOError error;
-                       
+                       ret = CreateProcess_internal (startInfo,
+                                                     stdin_rd, stdout_wr, stderr_wr,
+                                                     ref proc_info);
                        if (!ret) {
-                               if (startInfo.RedirectStandardInput == true)
+                               if (startInfo.RedirectStandardInput == true) {
                                        MonoIO.Close (stdin_rd, out error);
+                                       MonoIO.Close (stdin_wr, out error);
+                               }
 
-                               if (startInfo.RedirectStandardOutput == true)
+                               if (startInfo.RedirectStandardOutput == true) {
+                                       MonoIO.Close (process.stdout_rd, out error);
                                        MonoIO.Close (stdout_wr, out error);
+                               }
 
-                               if (startInfo.RedirectStandardError == true)
+                               if (startInfo.RedirectStandardError == true) {
+                                       MonoIO.Close (process.stderr_rd, out error);
                                        MonoIO.Close (stderr_wr, out error);
+                               }
 
-                               throw new Win32Exception (-proc_info.pid);
+                               throw new Win32Exception (-proc_info.pid, 
+                                       "ApplicationName='"+startInfo.FileName+
+                                       "', CommandLine='"+startInfo.Arguments+
+                                       "', CurrentDirectory='"+startInfo.WorkingDirectory+
+                                       "', PATH='"+startInfo.EnvironmentVariables["PATH"]+"'");
                        }
 
-                       process.process_handle=proc_info.process_handle;
-                       process.pid=proc_info.pid;
+                       process.process_handle = proc_info.process_handle;
+                       process.pid = proc_info.pid;
                        
-                       if(startInfo.RedirectStandardInput==true) {
-                               MonoIO.Close(stdin_rd, out error);
-                               process.input_stream=new StreamWriter(new FileStream(stdin_wr, FileAccess.Write, true));
-                               process.input_stream.AutoFlush=true;
+                       if (startInfo.RedirectStandardInput == true) {
+                               MonoIO.Close (stdin_rd, out error);
+                               process.input_stream = new StreamWriter (new FileStream (stdin_wr, FileAccess.Write, true));
+                               process.input_stream.AutoFlush = true;
                        }
 
-                       if(startInfo.RedirectStandardOutput==true) {
-                               MonoIO.Close(stdout_wr, out error);
-                               process.output_stream=new StreamReader(new FileStream(stdout_rd, FileAccess.Read, true));
+                       if (startInfo.RedirectStandardOutput == true) {
+                               MonoIO.Close (stdout_wr, out error);
+                               process.output_stream = new StreamReader (new FileStream (process.stdout_rd, FileAccess.Read, true));
                        }
 
-                       if(startInfo.RedirectStandardError==true) {
-                               MonoIO.Close(stderr_wr, out error);
-                               process.error_stream=new StreamReader(new FileStream(stderr_rd, FileAccess.Read, true));
+                       if (startInfo.RedirectStandardError == true) {
+                               MonoIO.Close (stderr_wr, out error);
+                               process.error_stream = new StreamReader (new FileStream (process.stderr_rd, FileAccess.Read, true));
                        }
 
                        process.StartExitCallbackIfNeeded ();
 
                        return(ret);
                }
+
+               private static bool Start_common (ProcessStartInfo startInfo,
+                                                 Process process)
+               {
+                       if(startInfo.FileName == null ||
+                          startInfo.FileName == "") {
+                               throw new InvalidOperationException("File name has not been set");
+                       }
+                       
+                       if (startInfo.UseShellExecute) {
+                               return (Start_shell (startInfo, process));
+                       } else {
+                               return (Start_noshell (startInfo, process));
+                       }
+               }
                
                public bool Start() {
                        bool ret;
@@ -896,18 +1064,45 @@ namespace System.Diagnostics {
                 * exit.  ms can be <0 to mean wait forever.
                 */
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               private extern bool WaitForExit_internal(IntPtr handle,
-                                                        int ms);
+               private extern bool WaitForExit_internal(IntPtr handle, int ms);
 
-               public void WaitForExit() {
-                       WaitForExit_internal(process_handle, -1);
+               public void WaitForExit ()
+               {
+                       WaitForExit (-1);
                }
 
                public bool WaitForExit(int milliseconds) {
-                       if (milliseconds == int.MaxValue)
-                               milliseconds = -1;
+                       int ms = milliseconds;
+                       if (ms == int.MaxValue)
+                               ms = -1;
+
+#if NET_2_0
+                       DateTime start = DateTime.UtcNow;
+                       if (async_output != null && !async_output.IsCompleted) {
+                               if (false == async_output.WaitHandle.WaitOne (ms, false))
+                                       return false; // Timed out
+
+                               if (ms >= 0) {
+                                       DateTime now = DateTime.UtcNow;
+                                       ms -= (int) (now - start).TotalMilliseconds;
+                                       if (ms <= 0)
+                                               return false;
+                                       start = now;
+                               }
+                       }
+
+                       if (async_error != null && !async_error.IsCompleted) {
+                               if (false == async_error.WaitHandle.WaitOne (ms, false))
+                                       return false; // Timed out
 
-                       return WaitForExit_internal (process_handle, milliseconds);
+                               if (ms >= 0) {
+                                       ms -= (int) (DateTime.UtcNow - start).TotalMilliseconds;
+                                       if (ms <= 0)
+                                               return false;
+                               }
+                       }
+#endif
+                       return WaitForExit_internal (process_handle, ms);
                }
 
                [MonoTODO]
@@ -920,6 +1115,225 @@ namespace System.Diagnostics {
                        return(false);
                }
 
+
+#if NET_2_0
+               public event DataReceivedEventHandler OutputDataReceived;
+               public event DataReceivedEventHandler ErrorDataReceived;
+
+               void OnOutputDataReceived (string str)
+               {
+                       if (OutputDataReceived != null)
+                               OutputDataReceived (this, new DataReceivedEventArgs (str));
+               }
+
+               void OnErrorDataReceived (string str)
+               {
+                       if (ErrorDataReceived != null)
+                               ErrorDataReceived (this, new DataReceivedEventArgs (str));
+               }
+
+               [Flags]
+               enum AsyncModes {
+                       NoneYet = 0,
+                       SyncOutput = 1,
+                       SyncError = 1 << 1,
+                       AsyncOutput = 1 << 2,
+                       AsyncError = 1 << 3
+               }
+
+               [StructLayout (LayoutKind.Sequential)]
+               sealed class ProcessAsyncReader
+               {
+                       /*
+                          The following fields match those of SocketAsyncResult.
+                          This is so that changes needed in the runtime to handle
+                          asynchronous reads are trivial
+                       */
+                       /* DON'T shuffle fields around. DON'T remove fields */
+                       public object Sock;
+                       public IntPtr handle;
+                       public object state;
+                       public AsyncCallback callback;
+                       public ManualResetEvent wait_handle;
+
+                       public Exception delayedException;
+
+                       public object EndPoint;
+                       byte [] buffer = new byte [4196];
+                       public int Offset;
+                       public int Size;
+                       public int SockFlags;
+
+                       public object acc_socket;
+                       public int total;
+                       public bool completed_sync;
+                       bool completed;
+                       bool err_out; // true -> stdout, false -> stderr
+                       internal int error;
+                       public int operation = 6; // MAGIC NUMBER: Maximum in SocketOperation + 1
+                       public object ares;
+
+
+                       // These fields are not in SocketAsyncResult
+                       Process process;
+                       Stream stream;
+                       StringBuilder sb = new StringBuilder ();
+                       public AsyncReadHandler ReadHandler;
+
+                       public ProcessAsyncReader (Process process, IntPtr handle, bool err_out)
+                       {
+                               this.process = process;
+                               this.handle = handle;
+                               stream = new FileStream (handle, FileAccess.Read, false);
+                               this.ReadHandler = new AsyncReadHandler (AddInput);
+                               this.err_out = err_out;
+                       }
+
+                       public void AddInput ()
+                       {
+                               lock (this) {
+                                       int nread = stream.Read (buffer, 0, buffer.Length);
+                                       if (nread == 0) {
+                                               completed = true;
+                                               if (wait_handle != null)
+                                                       wait_handle.Set ();
+                                               Flush (true);
+                                               return;
+                                       }
+
+                                       try {
+                                               sb.Append (Encoding.Default.GetString (buffer, 0, nread));
+                                       } catch {
+                                               // Just in case the encoding fails...
+                                               for (int i = 0; i < nread; i++) {
+                                                       sb.Append ((char) buffer [i]);
+                                               }
+                                       }
+
+                                       Flush (false);
+                                       ReadHandler.BeginInvoke (null, this);
+                               }
+                       }
+
+                       void Flush (bool last)
+                       {
+                               if (sb.Length == 0 ||
+                                   (err_out && process.output_canceled) ||
+                                   (!err_out && process.error_canceled))
+                                       return;
+
+                               string total = sb.ToString ();
+                               sb.Length = 0;
+                               string [] strs = total.Split ('\n');
+                               int len = strs.Length;
+                               if (len == 0)
+                                       return;
+
+                               for (int i = 0; i < len - 1; i++) {
+                                       if (err_out)
+                                               process.OnOutputDataReceived (strs [i]);
+                                       else
+                                               process.OnErrorDataReceived (strs [i]);
+                               }
+
+                               string end = strs [len - 1];
+                               if (last || end == "") {
+                                       if (err_out)
+                                               process.OnOutputDataReceived (end);
+                                       else
+                                               process.OnErrorDataReceived (end);
+                               } else {
+                                       sb.Append (end);
+                               }
+                       }
+
+                       public bool IsCompleted {
+                               get { return completed; }
+                       }
+
+                       public WaitHandle WaitHandle {
+                               get {
+                                       lock (this) {
+                                               if (wait_handle == null)
+                                                       wait_handle = new ManualResetEvent (completed);
+                                               return wait_handle;
+                                       }
+                               }
+                       }
+               }
+
+               AsyncModes async_mode;
+               bool output_canceled;
+               bool error_canceled;
+               ProcessAsyncReader async_output;
+               ProcessAsyncReader async_error;
+               delegate void AsyncReadHandler ();
+
+               [ComVisibleAttribute(false)] 
+               public void BeginOutputReadLine ()
+               {
+                       if (process_handle == IntPtr.Zero || output_stream == null || StartInfo.RedirectStandardOutput == false)
+                               throw new InvalidOperationException ("Standard output has not been redirected or process has not been started.");
+
+                       if ((async_mode & AsyncModes.SyncOutput) != 0)
+                               throw new InvalidOperationException ("Cannot mix asynchronous and synchonous reads.");
+
+                       async_mode |= AsyncModes.AsyncOutput;
+                       output_canceled = false;
+                       if (async_output == null) {
+                               async_output = new ProcessAsyncReader (this, stdout_rd, true);
+                               async_output.ReadHandler.BeginInvoke (null, async_output);
+                       }
+               }
+
+               [ComVisibleAttribute(false)] 
+               public void CancelOutputRead ()
+               {
+                       if (process_handle == IntPtr.Zero || output_stream == null || StartInfo.RedirectStandardOutput == false)
+                               throw new InvalidOperationException ("Standard output has not been redirected or process has not been started.");
+
+                       if ((async_mode & AsyncModes.SyncOutput) != 0)
+                               throw new InvalidOperationException ("OutputStream is not enabled for asynchronous read operations.");
+
+                       if (async_output == null)
+                               throw new InvalidOperationException ("No async operation in progress.");
+
+                       output_canceled = true;
+               }
+
+               [ComVisibleAttribute(false)] 
+               public void BeginErrorReadLine ()
+               {
+                       if (process_handle == IntPtr.Zero || error_stream == null || StartInfo.RedirectStandardError == false)
+                               throw new InvalidOperationException ("Standard error has not been redirected or process has not been started.");
+
+                       if ((async_mode & AsyncModes.SyncError) != 0)
+                               throw new InvalidOperationException ("Cannot mix asynchronous and synchonous reads.");
+
+                       async_mode |= AsyncModes.AsyncError;
+                       error_canceled = false;
+                       if (async_error == null) {
+                               async_error = new ProcessAsyncReader (this, stderr_rd, false);
+                               async_error.ReadHandler.BeginInvoke (null, async_error);
+                       }
+               }
+
+               [ComVisibleAttribute(false)] 
+               public void CancelErrorRead ()
+               {
+                       if (process_handle == IntPtr.Zero || output_stream == null || StartInfo.RedirectStandardOutput == false)
+                               throw new InvalidOperationException ("Standard output has not been redirected or process has not been started.");
+
+                       if ((async_mode & AsyncModes.SyncOutput) != 0)
+                               throw new InvalidOperationException ("OutputStream is not enabled for asynchronous read operations.");
+
+                       if (async_error == null)
+                               throw new InvalidOperationException ("No async operation in progress.");
+
+                       error_canceled = true;
+               }
+#endif
+
                [Category ("Behavior")]
                [MonitoringDescription ("Raised when this process exits.")]
                public event EventHandler Exited {
@@ -981,6 +1395,11 @@ namespace System.Diagnostics {
                        base.Dispose (disposing);
                }
 
+               ~Process ()
+               {
+                       Dispose (false);
+               }
+
                static void CBOnExit (object state, bool unused)
                {
                        Process p = (Process) state;