summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-20 10:11:31 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-20 10:11:31 +0100
commita930db1c9e8444ed89754c5a79085d59c7295952 (patch)
tree220e93e98eaa08ce0987bac359600aec7e83de74
parentf1e863a490ae20173210a53f516e146ebc677a36 (diff)
downloadUXP-a930db1c9e8444ed89754c5a79085d59c7295952.tar
UXP-a930db1c9e8444ed89754c5a79085d59c7295952.tar.gz
UXP-a930db1c9e8444ed89754c5a79085d59c7295952.tar.lz
UXP-a930db1c9e8444ed89754c5a79085d59c7295952.tar.xz
UXP-a930db1c9e8444ed89754c5a79085d59c7295952.zip
Remove more Vista checks in ipc code
-rw-r--r--ipc/chromium/src/base/process_util_win.cc37
-rw-r--r--ipc/glue/WindowsMessageLoop.cpp2
-rw-r--r--ipc/mscom/MainThreadRuntime.cpp7
3 files changed, 1 insertions, 45 deletions
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,
diff --git a/ipc/glue/WindowsMessageLoop.cpp b/ipc/glue/WindowsMessageLoop.cpp
index 8057ee25d..8f3471efc 100644
--- a/ipc/glue/WindowsMessageLoop.cpp
+++ b/ipc/glue/WindowsMessageLoop.cpp
@@ -1034,7 +1034,7 @@ MessageChannel::WaitForSyncNotify(bool aHandleWindowsMessages)
MOZ_ASSERT(gUIThreadId, "InitUIThread was not called!");
#if defined(ACCESSIBILITY)
- if (IsVistaOrLater() && (mFlags & REQUIRE_A11Y_REENTRY)) {
+ if (mFlags & REQUIRE_A11Y_REENTRY) {
MOZ_ASSERT(!(mFlags & REQUIRE_DEFERRED_MESSAGE_PROTECTION));
return WaitForSyncNotifyWithA11yReentry();
}
diff --git a/ipc/mscom/MainThreadRuntime.cpp b/ipc/mscom/MainThreadRuntime.cpp
index d86317966..8e77d2f12 100644
--- a/ipc/mscom/MainThreadRuntime.cpp
+++ b/ipc/mscom/MainThreadRuntime.cpp
@@ -44,13 +44,6 @@ MainThreadRuntime::MainThreadRuntime()
return;
}
- // Windows XP doesn't support setting of the COM exception policy, so we'll
- // just stop here in that case.
- if (!IsVistaOrLater()) {
- mInitResult = S_OK;
- return;
- }
-
// We are required to initialize security in order to configure global options.
mInitResult = InitializeSecurity();
MOZ_ASSERT(SUCCEEDED(mInitResult));