summaryrefslogtreecommitdiffstats
path: root/browser/app/winlauncher
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 01:13:33 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 01:13:33 +0000
commit086c044dc34dfc0f74fbe41f4ecb402b2cd34884 (patch)
treea4f824bd33cb075dd5aa3eb5a0a94af221bbe83a /browser/app/winlauncher
parentAdding debian version 124.0.1-1. (diff)
downloadfirefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.tar.xz
firefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.zip
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'browser/app/winlauncher')
-rw-r--r--browser/app/winlauncher/LauncherProcessWin.cpp8
-rw-r--r--browser/app/winlauncher/freestanding/DllBlocklist.cpp9
2 files changed, 8 insertions, 9 deletions
diff --git a/browser/app/winlauncher/LauncherProcessWin.cpp b/browser/app/winlauncher/LauncherProcessWin.cpp
index b40e0fceb5..81d4ee91e9 100644
--- a/browser/app/winlauncher/LauncherProcessWin.cpp
+++ b/browser/app/winlauncher/LauncherProcessWin.cpp
@@ -401,8 +401,12 @@ Maybe<int> LauncherMain(int& argc, wchar_t* argv[],
}
#endif // defined(MOZ_LAUNCHER_PROCESS)
- // Now proceed with setting up the parameters for process creation
- UniquePtr<wchar_t[]> cmdLine(MakeCommandLine(argc, argv));
+ // Now proceed with setting up the parameters for process creation.
+ constexpr static const wchar_t* extraArgs[] = {
+ L"/prefetch:1", // for APFL; see ipc/glue/GeckoChildProcessHost.cpp
+ };
+ UniquePtr<wchar_t[]> cmdLine(
+ MakeCommandLine(argc, argv, ARRAYSIZE(extraArgs), extraArgs));
if (!cmdLine) {
HandleLauncherError(LAUNCHER_ERROR_GENERIC());
return Nothing();
diff --git a/browser/app/winlauncher/freestanding/DllBlocklist.cpp b/browser/app/winlauncher/freestanding/DllBlocklist.cpp
index bfb3d6239b..f8f9560acb 100644
--- a/browser/app/winlauncher/freestanding/DllBlocklist.cpp
+++ b/browser/app/winlauncher/freestanding/DllBlocklist.cpp
@@ -11,7 +11,6 @@
#include "mozilla/Types.h"
#include "mozilla/WindowsDllBlocklist.h"
-#include "CrashAnnotations.h"
#include "DllBlocklist.h"
#include "LoaderPrivateAPI.h"
#include "ModuleLoadFrame.h"
@@ -136,12 +135,8 @@ void NativeNtBlockSet::Write(WritableBuffer& aBuffer) {
static NativeNtBlockSet gBlockSet;
-extern "C" void MOZ_EXPORT
-NativeNtBlockSet_Write(CrashReporter::AnnotationWriter& aWriter) {
- WritableBuffer buffer;
- gBlockSet.Write(buffer);
- aWriter.Write(CrashReporter::Annotation::BlockedDllList, buffer.Data(),
- buffer.Length());
+extern "C" void MOZ_EXPORT NativeNtBlockSet_Write(WritableBuffer& aBuffer) {
+ gBlockSet.Write(aBuffer);
}
enum class BlockAction {