From a930db1c9e8444ed89754c5a79085d59c7295952 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Tue, 20 Feb 2018 10:11:31 +0100 Subject: Remove more Vista checks in ipc code --- ipc/chromium/src/base/process_util_win.cc | 37 ------------------------------- 1 file changed, 37 deletions(-) (limited to 'ipc/chromium') diff --git a/ipc/chromium/src/base/process_util_win.cc b/ipc/chromium/src/base/process_util_win.cc index 12fbc23a5..f22f7216f 100644 --- a/ipc/chromium/src/base/process_util_win.cc +++ b/ipc/chromium/src/base/process_util_win.cc @@ -297,43 +297,6 @@ bool LaunchApp(const std::wstring& cmdline, startup_info.wShowWindow = start_hidden ? SW_HIDE : SW_SHOW; LPPROC_THREAD_ATTRIBUTE_LIST lpAttributeList = NULL; - // Don't even bother trying pre-Vista... - if (mozilla::IsVistaOrLater()) { - // setup our handle array first - if we end up with no handles that can - // be inherited we can avoid trying to do the ThreadAttributeList dance... - HANDLE handlesToInherit[2]; - int handleCount = 0; - HANDLE stdOut = ::GetStdHandle(STD_OUTPUT_HANDLE); - HANDLE stdErr = ::GetStdHandle(STD_ERROR_HANDLE); - - if (IsInheritableHandle(stdOut)) - handlesToInherit[handleCount++] = stdOut; - if (stdErr != stdOut && IsInheritableHandle(stdErr)) - handlesToInherit[handleCount++] = stdErr; - - if (handleCount) { - lpAttributeList = CreateThreadAttributeList(handlesToInherit, handleCount); - if (lpAttributeList) { - // it's safe to inherit handles, so arrange for that... - startup_info.cb = sizeof(startup_info_ex); - startup_info.dwFlags |= STARTF_USESTDHANDLES; - startup_info.hStdOutput = stdOut; - startup_info.hStdError = stdErr; - startup_info.hStdInput = INVALID_HANDLE_VALUE; - startup_info_ex.lpAttributeList = lpAttributeList; - dwCreationFlags |= EXTENDED_STARTUPINFO_PRESENT; - bInheritHandles = TRUE; - } - } - } else if (PR_GetEnv("MOZ_WIN_INHERIT_STD_HANDLES_PRE_VISTA")) { - // Even if we can't limit what gets inherited, we sometimes want to inherit - // stdout/err for testing purposes. - startup_info.dwFlags |= STARTF_USESTDHANDLES; - startup_info.hStdOutput = ::GetStdHandle(STD_OUTPUT_HANDLE); - startup_info.hStdError = ::GetStdHandle(STD_ERROR_HANDLE); - startup_info.hStdInput = INVALID_HANDLE_VALUE; - bInheritHandles = TRUE; - } PROCESS_INFORMATION process_info; BOOL createdOK = CreateProcess(NULL, -- cgit v1.2.3