diff options
| author | David Karlaš <david.karlas@xamarin.com> | 2014-05-10 21:11:30 +0400 |
|---|---|---|
| committer | David Karlaš <david.karlas@xamarin.com> | 2014-05-10 21:23:30 +0400 |
| commit | 1b43ee1211297fbe1bbadad03ada33b5a8b8dabf (patch) | |
| tree | e8a3969c82e485b86e053afce55993f43307bad0 /main/src/addins/MonoDevelop.Debugger.Win32 | |
| parent | 169f13c191a1f179311d67b66c4a8b5f260ae2a6 (diff) | |
[Debugger] "Application Output" pad error text is now red and Debug.Write(); and tracepoints text is now blue
[Win32] Error output works now
[DebuggerUnitTests] Added tests for Console.Write, Console.Error.Write and Debug.Write
[DebuggerUnitTests] Removed redirecting debuggee Console.Write to unit tests logs
[CustomSoftDebuggerEngine] Fixed inverted console output and error text
Diffstat (limited to 'main/src/addins/MonoDevelop.Debugger.Win32')
3 files changed, 4 insertions, 3 deletions
diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/Extensions/DebuggerExtensions.cs b/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/Extensions/DebuggerExtensions.cs index da59106722..e6411cc4c7 100644 --- a/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/Extensions/DebuggerExtensions.cs +++ b/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/Extensions/DebuggerExtensions.cs @@ -122,7 +122,7 @@ namespace Microsoft.Samples.Debugging.Extensions si.hStdError = errorWritePipe;
}
- internal static void SetupOutputRedirection (STARTUPINFO si, ref int flags, out SafeFileHandle outReadPipe, SafeFileHandle errorReadPipe)
+ internal static void SetupOutputRedirection (STARTUPINFO si, ref int flags, out SafeFileHandle outReadPipe, out SafeFileHandle errorReadPipe)
{
if ((flags & CREATE_REDIRECT_STD) != 0) {
CreateHandles (si, out outReadPipe, out errorReadPipe);
@@ -130,6 +130,7 @@ namespace Microsoft.Samples.Debugging.Extensions }
else {
outReadPipe = null;
+ errorReadPipe = null;
si.hStdInput = new SafeFileHandle (IntPtr.Zero, false);
si.hStdOutput = new SafeFileHandle (IntPtr.Zero, false);
si.hStdError = new SafeFileHandle (IntPtr.Zero, false);
diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/debug/Debugger.cs b/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/debug/Debugger.cs index be9fe036a8..3563897f6d 100644 --- a/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/debug/Debugger.cs +++ b/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/debug/Debugger.cs @@ -202,7 +202,7 @@ namespace Microsoft.Samples.Debugging.CorDebug // initialize safe handles
// [Xamarin] ASP.NET Debugging and output redirection.
SafeFileHandle outReadPipe = null, errorReadPipe = null;
- DebuggerExtensions.SetupOutputRedirection (si, ref flags, out outReadPipe, errorReadPipe);
+ DebuggerExtensions.SetupOutputRedirection (si, ref flags, out outReadPipe, out errorReadPipe);
IntPtr env = DebuggerExtensions.SetupEnvironment (environment);
CorProcess ret;
diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorDebuggerSession.cs b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorDebuggerSession.cs index 0d937ee1fc..51c8d3866c 100644 --- a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorDebuggerSession.cs +++ b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorDebuggerSession.cs @@ -201,7 +201,7 @@ namespace MonoDevelop.Debugger.Win32 void OnLogMessage (object sender, CorLogMessageEventArgs e)
{
- OnTargetOutput (false, e.Message);
+ OnTargetDebug (e.Level, e.LogSwitchName, e.Message);
e.Continue = true;
}
|