Bug 1445025: Part 6 - Enable initialization of DLL blocklist from launcher process; r=mhowell
authorAaron Klotz <aklotz@mozilla.com>
Tue, 05 Jun 2018 15:33:44 -0600
changeset 805578 9a56f487daae272c8f49d3df8af2576cb729efe6
parent 805577 64936071bf7710033436a4c5141057fad3d3685b
child 805579 7b4cd53cbfb8dbc6207d34e549516b84ffe3601c
push id112702
push userbmo:mh+mozilla@glandium.org
push dateFri, 08 Jun 2018 01:32:47 +0000
reviewersmhowell
bugs1445025
milestone62.0a1
Bug 1445025: Part 6 - Enable initialization of DLL blocklist from launcher process; r=mhowell
browser/app/winlauncher/LauncherProcessWin.cpp
--- a/browser/app/winlauncher/LauncherProcessWin.cpp
+++ b/browser/app/winlauncher/LauncherProcessWin.cpp
@@ -16,30 +16,31 @@
 #include "mozilla/SafeMode.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/WindowsVersion.h"
 #include "nsWindowsHelpers.h"
 
 #include <windows.h>
 #include <processthreadsapi.h>
 
+#include "DllBlocklistWin.h"
 #include "LaunchUnelevated.h"
 #include "ProcThreadAttributes.h"
 
 /**
  * At this point the child process has been created in a suspended state. Any
  * additional startup work (eg, blocklist setup) should go here.
  *
  * @return true if browser startup should proceed, otherwise false.
  */
 static bool
 PostCreationSetup(HANDLE aChildProcess, HANDLE aChildMainThread,
                   const bool aIsSafeMode)
 {
-  return true;
+  return mozilla::InitializeDllBlocklistOOP(aChildProcess);
 }
 
 #if !defined(PROCESS_CREATION_MITIGATION_POLICY_IMAGE_LOAD_PREFER_SYSTEM32_ALWAYS_ON)
 # define PROCESS_CREATION_MITIGATION_POLICY_IMAGE_LOAD_PREFER_SYSTEM32_ALWAYS_ON (0x00000001ui64 << 60)
 #endif // !defined(PROCESS_CREATION_MITIGATION_POLICY_IMAGE_LOAD_PREFER_SYSTEM32_ALWAYS_ON)
 
 #if (_WIN32_WINNT < 0x0602)
 BOOL WINAPI