Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1330496 - Part 3: Remove other ipc checks for Windows Vista or 7+. r=aklotz

Browse Source 
MozReview-Commit-ID: 9z5LKw71Veg

--HG--
extra : rebase_source : 34e4edb7f5dd92cdca0ca638398705ded48bd3bc
extra : histedit_source : 06350bb2aa8baf386431e634d63819d87cd18fe1
This commit is contained in:
Chris Peterson 2017-01-09 21:03:57 -08:00
parent cab8e99bea
commit 971f368adf
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ipc/glue/WindowsMessageLoop.cpp
View File

@ -19,7 +19,6 @@
#include "mozilla/ArrayUtils.h"
#include "mozilla/ipc/ProtocolUtils.h"
#include "mozilla/PaintTracker.h"
#include "mozilla/WindowsVersion.h"
using namespace mozilla;
using namespace mozilla::ipc;
@ -1022,7 +1021,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();
}

17
ipc/mscom/MainThreadRuntime.cpp
View File

@ -10,7 +10,6 @@
#include "mozilla/Assertions.h"
#include "mozilla/RefPtr.h"
#include "mozilla/UniquePtr.h"
#include "mozilla/WindowsVersion.h"
#include "nsDebug.h"
#include "nsWindowsHelpers.h"
@ -44,13 +43,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));
@ -67,12 +59,8 @@ MainThreadRuntime::MainThreadRuntime()
return;
}
// Windows 7 has a policy that is even more strict. We should use that one
// whenever possible.
ULONG_PTR exceptionSetting = IsWin7OrLater() ?
COMGLB_EXCEPTION_DONOT_HANDLE_ANY :
COMGLB_EXCEPTION_DONOT_HANDLE;
mInitResult = globalOpts->Set(COMGLB_EXCEPTION_HANDLING, exceptionSetting);
mInitResult = globalOpts->Set(COMGLB_EXCEPTION_HANDLING,
COMGLB_EXCEPTION_DONOT_HANDLE_ANY);
MOZ_ASSERT(SUCCEEDED(mInitResult));
}
@ -177,4 +165,3 @@ MainThreadRuntime::InitializeSecurity()
} // namespace mscom
} // namespace mozilla