Revert of Allow handles through for official builds too (partial revert) (patchset #3 id:40001 of h…

base/process/launch_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/process/launch.h"
 
 #include <fcntl.h>
 #include <io.h>
 #include <shellapi.h>
 #include <windows.h>
@@ skipping 124 matching lines @@
   // likely does not go anywhere.
   //
   // We don't use GetStdHandle() to check stdout/stderr here because
   // it can return dangling IDs of handles that were never inherited
   // by this process.  These IDs could have been reused by the time
   // this function is called.  The CRT checks the validity of
   // stdout/stderr on startup (before the handle IDs can be reused).
   // _fileno(stdout) will return -2 (_NO_CONSOLE_FILENO) if stdout was
   // invalid.
   if (_fileno(stdout) >= 0 || _fileno(stderr) >= 0) {
-    return;
+    // _fileno was broken for SUBSYSTEM:WINDOWS from VS2010 to VS2012/2013.
+    // http://crbug.com/358267. Confirm that the underlying HANDLE is valid
+    // before aborting.
+
+    intptr_t stdout_handle = _get_osfhandle(_fileno(stdout));
+    intptr_t stderr_handle = _get_osfhandle(_fileno(stderr));
+    if (stdout_handle >= 0 || stderr_handle >= 0)
+      return;
   }
 
   if (!AttachConsole(ATTACH_PARENT_PROCESS)) {
     unsigned int result = GetLastError();
     // Was probably already attached.
     if (result == ERROR_ACCESS_DENIED)
       return;
     // Don't bother creating a new console for each child process if the
     // parent process is invalid (eg: crashed).
     if (result == ERROR_GEN_FAILURE)
@@ skipping 211 matching lines @@
 
 bool GetAppOutput(const StringPiece16& cl, std::string* output) {
   return GetAppOutputInternal(cl, false, output);
 }
 
 void RaiseProcessToHighPriority() {
   SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS);
 }
 
 }  // namespace base