Bug 1462187: Fix incorrect version for PreferSystem32Images mitigation; r=mhowell
authorAaron Klotz <aklotz@mozilla.com>
Wed, 16 May 2018 17:54:58 -0600
changeset 418601 649a11ffa9bffddfd90019c6c0930db8b3a73d43
parent 418600 9e0c05903821bd86d8481a7f1dbca11d64b5225d
child 418602 6be9c9eef3775e34b8c2bbea33fe4554999574c6
push id103349
push useraklotz@mozilla.com
push dateThu, 17 May 2018 05:52:25 +0000
treeherdermozilla-inbound@649a11ffa9bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmhowell
bugs1462187
milestone62.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1462187: Fix incorrect version for PreferSystem32Images mitigation; r=mhowell
browser/app/LauncherProcessWin.cpp
--- a/browser/app/LauncherProcessWin.cpp
+++ b/browser/app/LauncherProcessWin.cpp
@@ -49,17 +49,17 @@ SetProcessMitigationPolicy(PROCESS_MITIG
 
 /**
  * Any mitigation policies that should be set on the browser process should go
  * here.
  */
 static void
 SetMitigationPolicies(mozilla::ProcThreadAttributes& aAttrs, const bool aIsSafeMode)
 {
-  if (mozilla::IsWin10November2015UpdateOrLater()) {
+  if (mozilla::IsWin10AnniversaryUpdateOrLater()) {
     aAttrs.AddMitigationPolicy(PROCESS_CREATION_MITIGATION_POLICY_IMAGE_LOAD_PREFER_SYSTEM32_ALWAYS_ON);
   }
 }
 
 static void
 ShowError(DWORD aError = ::GetLastError())
 {
   if (aError == ERROR_SUCCESS) {
@@ -117,17 +117,17 @@ RunAsLauncherProcess(int& argc, wchar_t*
                   static_cast<const wchar_t**>(nullptr),
                   CheckArgFlag::CheckOSInt | CheckArgFlag::RemoveArg);
 }
 
 int
 LauncherMain(int argc, wchar_t* argv[])
 {
   // Make sure that the launcher process itself has image load policies set
-  if (IsWin10November2015UpdateOrLater()) {
+  if (IsWin10AnniversaryUpdateOrLater()) {
     const DynamicallyLinkedFunctionPtr<decltype(&SetProcessMitigationPolicy)>
       pSetProcessMitigationPolicy(L"kernel32.dll", "SetProcessMitigationPolicy");
     if (pSetProcessMitigationPolicy) {
       PROCESS_MITIGATION_IMAGE_LOAD_POLICY imgLoadPol = {};
       imgLoadPol.PreferSystem32Images = 1;
 
       DebugOnly<BOOL> setOk = pSetProcessMitigationPolicy(ProcessImageLoadPolicy,
                                                           &imgLoadPol,