mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-17 23:35:34 +00:00
4c4286f348
Removing #define XRE_DONT_PROTECT_DLL_LOAD from plugin-container.cpp and xpcshell.cpp allows the #included nsWindowsWMain.cpp to protect DLL loads much earlier in the plugin process startup. MozReview-Commit-ID: HbgyfvljvFs --HG-- extra : rebase_source : dccdabb2e5bee4472d5aef9400a58cb0e397c112 extra : histedit_source : da248fc6fbdf96f30979f3a0396aefcf4bfcd5d9
53 lines
1.5 KiB
C++
53 lines
1.5 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
|
* vim: sw=4 ts=4 et :
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "nsXPCOM.h"
|
|
#include "nsXULAppAPI.h"
|
|
#include "mozilla/Bootstrap.h"
|
|
|
|
#ifdef XP_WIN
|
|
#include <windows.h>
|
|
// we want a wmain entry point
|
|
#include "nsWindowsWMain.cpp"
|
|
#else
|
|
// FIXME/cjones testing
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#if defined(XP_WIN) && defined(MOZ_SANDBOX)
|
|
#include "mozilla/sandboxing/SandboxInitialization.h"
|
|
#include "mozilla/sandboxing/sandboxLogging.h"
|
|
#endif
|
|
|
|
int
|
|
content_process_main(mozilla::Bootstrap* bootstrap, int argc, char* argv[])
|
|
{
|
|
// Check for the absolute minimum number of args we need to move
|
|
// forward here. We expect the last arg to be the child process type.
|
|
if (argc < 1) {
|
|
return 3;
|
|
}
|
|
|
|
XREChildData childData;
|
|
|
|
#if defined(XP_WIN) && defined(MOZ_SANDBOX)
|
|
if (IsSandboxedProcess()) {
|
|
childData.sandboxTargetServices =
|
|
mozilla::sandboxing::GetInitializedTargetServices();
|
|
if (!childData.sandboxTargetServices) {
|
|
return 1;
|
|
}
|
|
|
|
childData.ProvideLogFunction = mozilla::sandboxing::ProvideLogFunction;
|
|
}
|
|
#endif
|
|
|
|
bootstrap->XRE_SetProcessType(argv[--argc]);
|
|
|
|
nsresult rv = bootstrap->XRE_InitChildProcess(argc, argv, &childData);
|
|
return NS_FAILED(rv);
|
|
}
|