commit e1adc7bc3a00614aab14fbaec0361375a73d7100
author Adrian McCarthy <amccarth@google.com> Fri May 29 23:01:25 2015 +0000
committer Adrian McCarthy <amccarth@google.com> Fri May 29 23:01:25 2015 +0000
tree ed906a2979a0857674f82bffe533bded3cf16d93
parent 2d0913cd8d0d697bd7095e5796f14f7882a266fd

Fix inferior's i/o connections to its console window on Windows 7.

llvm-svn: 238629

lldb/source/Host/windows/ProcessLauncherWindows.cpp

diff --git a/lldb/source/Host/windows/ProcessLauncherWindows.cpp b/lldb/source/Host/windows/ProcessLauncherWindows.cpp
index d498eea..a09906d 100644
--- a/lldb/source/Host/windows/ProcessLauncherWindows.cpp
+++ b/lldb/source/Host/windows/ProcessLauncherWindows.cpp
@@ -34,9 +34,9 @@
 
     startupinfo.cb = sizeof(startupinfo);
     startupinfo.dwFlags |= STARTF_USESTDHANDLES;
-    startupinfo.hStdError = stderr_handle;
-    startupinfo.hStdInput = stdin_handle;
-    startupinfo.hStdOutput = stdout_handle;
+    startupinfo.hStdError  = stderr_handle ? stderr_handle : ::GetStdHandle(STD_ERROR_HANDLE);
+    startupinfo.hStdInput  = stdin_handle  ? stdin_handle  : ::GetStdHandle(STD_INPUT_HANDLE);
+    startupinfo.hStdOutput = stdout_handle ? stdout_handle : ::GetStdHandle(STD_OUTPUT_HANDLE);
 
     const char *hide_console_var = getenv("LLDB_LAUNCH_INFERIORS_WITHOUT_CONSOLE");
     if (hide_console_var && llvm::StringRef(hide_console_var).equals_lower("true"))