mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 05:37:11 +00:00
061201563e
- Bug 1274192 part 1 - make the MediaDecoderReaderWrapper as a proxy of WaitForData(); r=jwwang (9debdca9a9) - Bug 1274192 part 2 - make MDSM and SeekTask to adopt new MediaDecoderReaderWrapper API; r=jwwang (156f924dc9) - Bug 1276495: Don't reset audio promises for video only seek. r=jwwang,jya (c4632c7ff6) - Bug 1276318, part 1 - Fix leading tabs in ipc/glue. r=billm (46bcc4ccb3) - Bug 1035125 Part 1: Back out changeset 1910714b56c6 and associated subsequent changes. r=bsmedberg (3ead5efb66) - Bug 1035125 Part 2: Back out changeset 3c59642f6445 and associated subsequent changes. r=glandium (e86b4f4651) - Bug 1035125 Part 3: Back out changeset fa15c3e929d0 and associated subsequent changes. r=glandium (49585d6caf) - Bug 1188045 - Part 2: Delay-load xul.dll when built with clang-cl (90877526a3) - Bug 1188045 - Part 1: Move the definition of sandboxTarget::Instance() out-of-line; r=bobowen,glandium (5523a15f0e) - Bug 1035125 Part 4: Back out changeset 8ae39d920f5c and associated subsequent changes. r=glandium (4b952b6311) - Bug 1035125 Part 5: Back out changeset baa3f852133b and associated subsequent changes. r=glandium (0b08d2e71d) - Bug 1035125 Part 6: Take Chromium commit 3181ba39ee787e1b40f4aea4be23f4f666ad0945 to add Windows 10 version to enumeration. r=aklotz (af62c8065f) - Bug 1035125 Part 7: Remove unused functions in security/sandbox/chromium/base/time/time.h to avoid nspr dependency. r=aklotz (e10430c6ae) - Bug 1035125 Part 8: Pass sandboxing pointers through XRE_InitChildProcess instead of linking to more functions in xul. r=aklotz,glandium (07590ba9cd) - Bug 1035125 Part 9: Link Chromium sandbox into firefox.exe instead of having a separate DLL. r=aklotz,glandium (ae40d509d5) - Bug 1270752 - Fix lifetime of buffer passed to PR_SetEnv(). r=jduell (bfce06ebea) - Bug 1275117 - Fix static strings leaks when mozlogging is on. r=jduell (8e9066c5d7) - Bug 1114647 - Use firefox for child processes instead of plugin-container. r=ted (4e5871566d) - Bug 1271169 - Move all device binding code into librlz and remove static runtime requirement. r=glandium (fc9cfccbec) - Bug 1271169 - Move EME/GMP device binding code into GMPDeviceBinding.h/cpp. r=gerald (3fabde64b8) - Bug 1273048 - Add MOZ_GCC_VERSION_AT_MOST macro. r=froydnj (cfb5acdbe6) - Bug 1269968 - Remove unnecessary deduction on RefPtr.h. r=froydnj (30cf9bbf47) - Bug 525063 - add attribute to mark member variables that should be skipped by clang plugin initialization checker. r=nfroyd (78aa863f88) - Bug 1278391 - add move constructor to EnumeratedArray (r=njn) (5effe4e473) - Bug 1268518: Update basic-integer tests for rotations + clean up; r=sunfish (46827b6211) - Bug 1270370 - Part 1: Move SetIteratorObject to MapObject.h; r=jorendorff (01a27fbd50) - Bug 1270370 - Part 2: Expose MapIterator and SetIterator through ESClassValues; r=jorendorff (3edb3c7551) - Bug 1267551 (part 3) - Use MOZ_MUST_USE more in js/src/builtin/. r=jonco. (ea96d0fae0) - Bug 1267551 (part 4) - Use MOZ_MUST_USE more in js/src/asmjs/. r=bbouvier. (3e622c736d) - Bug 1268910: Refactor WebAssembly trap handling; r=luke (b59394a287) - Bug 1268910: Trap on edge cases for integer div/mod; r=sunfish (3d85230cc8) - Bug 1267551 (part 5) - Use MOZ_MUST_USE more in js/src/ctypes/. r=sfink. (e6580fb645) - Bug 1267551 (part 6) - Remove dead GenerateBlockId declaration. r=jorendorff. (74afcc549e) - Bug 1240072 - Add public JS APIs related to modules r=shu Bug 1267551 (part 7) - Use MOZ_MUST_USE more in js/src/frontend/. r=jorendorff. (5275c57768) - Bug 1267551 (part 8) - Use MOZ_MUST_USE more in js/src/gc/. r=terrence. (2572cc1c58) - Bug 1261063 - Part 1 - Remove public Telemetry functions that return raw histogram instances. r=chutten (3a68653c8f) - Bug 1261063 - Part 2 - Expose C++ function to clear Telemetry histograms. r=chutten (1f42f6aa1e) - Bug 1261063 - Part 3 - Make RasterImage use the public Telemetry API. r=tnikkel (0f564f3836) - Bug 1261063 - Part 4 - Use a count histogram for WebRTC call counts. r=jesup (b6b7b649e0) - Bug 1270073 - Point to Telemetry documentation in Telemetry.h. r=chutten (517279b284) - Bug 1261052 - Move C++ histogram implementation code into a separate module. r=gfritzsche. (66bcb1e167) - Bug 1145164 - Allow non-unitary increments to count histograms. r=gfritzsche (507e076e28) - Bug 1173447 - Add test for incremental pre-barriers when storing things under roots, r=jonco (caf8bd16be) - Bug 1267551 (part 10) - Use MOZ_MUST_USE in AutoVectorRooterBase. r=terrence. (2c5ed87a9f) - This catches a missing check. (b2fcd30fc5) - Bug 1267551 (part 11b) - Follow-up to fix Android bustage. r=me (f464ca7b98) - Bug 1271854 - Part 1: Allow specifying multiple GC zeal levels; r=terrence (da3c3e1281) - Bug 1271854 - Part 2: Allow specifying zeal modes by name as well; r=terrence (f63926e45b) - Bug 1271854 - Part 3: Avoid saving the GC zeal string inside the JS shell; r=terrence (f09b262e55) - Bug 1270062 - Unbust Windows full duplex. a=Tomcat (3c8b5887b6) - Bug 1270062 - Update libcubeb. rs=jesup (71805cb0e0) - Bug 1270004 - Update libcubeb. rs=jesup (2d90b9662f) - Bug 1280280 - Update cubeb to 073c9f011114. r=kinetik (6bee6a7f21) - Bug 1280280 - Update media/libcube/update.sh to add cubeb_jack.cpp, and sort the list of files. r=kinetik (430b7533c4) - Bug 1272604 - Add a zeal mode to check the heap after a moving GC r=terrence (85c018d71f) - Bug 1272604 - Fix bad implicit conversion constructor build error r=me (5c4e1dbc44) - Bug 1272604 - Fix hazard analysis failure r=me (0591aa2dca) - Bug 1232417 - Use a Variant to represent the CrossCompartmentWrapperMap key; r=jonco (19e759f1ba) - Bug 1269928 - Fold DirectProxyHandler into Wrapper, which is now its only (non-test) consumer. r=efaust (7550dde64d) - Bug 1273639 - Add a nonunified spidermonkey build, r=terrence (065364af2e) - Bug 1273639 - Fix nonunified spidermonkey builds, r=terrence (626042a5e0) - Bug 1273180 - Trigger major GC if necessary after minor GC r=terrence (cab82a4146) - Bug 1268992 - Assert that the heap is empty after a shutdown GC; r=jonco (35e37de1b2) - Bug 1273908 - Refactor GC to make it easier to add new kinds of GC thing r=terrence (edc8c4d66a)
308 lines
8.2 KiB
C++
308 lines
8.2 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* 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 "nsXULAppAPI.h"
|
|
#include "application.ini.h"
|
|
#include "nsXPCOMGlue.h"
|
|
#if defined(XP_WIN)
|
|
#include <windows.h>
|
|
#include <stdlib.h>
|
|
#elif defined(XP_UNIX)
|
|
#include <sys/time.h>
|
|
#include <sys/resource.h>
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
#include <stdarg.h>
|
|
#include <string.h>
|
|
|
|
#include "nsCOMPtr.h"
|
|
#include "nsIFile.h"
|
|
#include "nsStringGlue.h"
|
|
|
|
#ifdef XP_WIN
|
|
// we want a wmain entry point
|
|
#include "nsWindowsWMain.cpp"
|
|
#if defined(_MSC_VER) && (_MSC_VER < 1900)
|
|
#define snprintf _snprintf
|
|
#endif
|
|
#define strcasecmp _stricmp
|
|
#endif
|
|
|
|
#ifdef MOZ_WIDGET_GONK
|
|
#include "BootAnimation.h"
|
|
#endif
|
|
|
|
#include "BinaryPath.h"
|
|
|
|
#include "nsXPCOMPrivate.h" // for MAXPATHLEN and XPCOM_DLL
|
|
|
|
#ifdef MOZ_WIDGET_GONK
|
|
# include <binder/ProcessState.h>
|
|
#endif
|
|
|
|
#include "mozilla/Telemetry.h"
|
|
#include "mozilla/WindowsDllBlocklist.h"
|
|
|
|
static void Output(const char *fmt, ... )
|
|
{
|
|
va_list ap;
|
|
va_start(ap, fmt);
|
|
|
|
#if defined(XP_WIN) && !MOZ_WINCONSOLE
|
|
char16_t msg[2048];
|
|
_vsnwprintf(msg, sizeof(msg)/sizeof(msg[0]), NS_ConvertUTF8toUTF16(fmt).get(), ap);
|
|
MessageBoxW(nullptr, msg, L"XULRunner", MB_OK | MB_ICONERROR);
|
|
#else
|
|
vfprintf(stderr, fmt, ap);
|
|
#endif
|
|
|
|
va_end(ap);
|
|
}
|
|
|
|
/**
|
|
* Return true if |arg| matches the given argument name.
|
|
*/
|
|
static bool IsArg(const char* arg, const char* s)
|
|
{
|
|
if (*arg == '-')
|
|
{
|
|
if (*++arg == '-')
|
|
++arg;
|
|
return !strcasecmp(arg, s);
|
|
}
|
|
|
|
#if defined(XP_WIN)
|
|
if (*arg == '/')
|
|
return !strcasecmp(++arg, s);
|
|
#endif
|
|
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* A helper class which calls NS_LogInit/NS_LogTerm in its scope.
|
|
*/
|
|
class ScopedLogging
|
|
{
|
|
public:
|
|
ScopedLogging() { NS_LogInit(); }
|
|
~ScopedLogging() { NS_LogTerm(); }
|
|
};
|
|
|
|
XRE_GetFileFromPathType XRE_GetFileFromPath;
|
|
XRE_CreateAppDataType XRE_CreateAppData;
|
|
XRE_FreeAppDataType XRE_FreeAppData;
|
|
XRE_TelemetryAccumulateType XRE_TelemetryAccumulate;
|
|
XRE_mainType XRE_main;
|
|
|
|
static const nsDynamicFunctionLoad kXULFuncs[] = {
|
|
{ "XRE_GetFileFromPath", (NSFuncPtr*) &XRE_GetFileFromPath },
|
|
{ "XRE_CreateAppData", (NSFuncPtr*) &XRE_CreateAppData },
|
|
{ "XRE_FreeAppData", (NSFuncPtr*) &XRE_FreeAppData },
|
|
{ "XRE_TelemetryAccumulate", (NSFuncPtr*) &XRE_TelemetryAccumulate },
|
|
{ "XRE_main", (NSFuncPtr*) &XRE_main },
|
|
{ nullptr, nullptr }
|
|
};
|
|
|
|
static int do_main(int argc, char* argv[])
|
|
{
|
|
nsCOMPtr<nsIFile> appini;
|
|
nsresult rv;
|
|
|
|
// Allow firefox.exe to launch XULRunner apps via -app <application.ini>
|
|
// Note that -app must be the *first* argument.
|
|
const char *appDataFile = getenv("XUL_APP_FILE");
|
|
if (appDataFile && *appDataFile) {
|
|
rv = XRE_GetFileFromPath(appDataFile, getter_AddRefs(appini));
|
|
if (NS_FAILED(rv)) {
|
|
Output("Invalid path found: '%s'", appDataFile);
|
|
return 255;
|
|
}
|
|
}
|
|
else if (argc > 1 && IsArg(argv[1], "app")) {
|
|
if (argc == 2) {
|
|
Output("Incorrect number of arguments passed to -app");
|
|
return 255;
|
|
}
|
|
|
|
rv = XRE_GetFileFromPath(argv[2], getter_AddRefs(appini));
|
|
if (NS_FAILED(rv)) {
|
|
Output("application.ini path not recognized: '%s'", argv[2]);
|
|
return 255;
|
|
}
|
|
|
|
char appEnv[MAXPATHLEN];
|
|
snprintf(appEnv, MAXPATHLEN, "XUL_APP_FILE=%s", argv[2]);
|
|
if (putenv(appEnv)) {
|
|
Output("Couldn't set %s.\n", appEnv);
|
|
return 255;
|
|
}
|
|
argv[2] = argv[0];
|
|
argv += 2;
|
|
argc -= 2;
|
|
}
|
|
|
|
#ifdef MOZ_WIDGET_GONK
|
|
/* Start boot animation */
|
|
mozilla::StartBootAnimation();
|
|
#endif
|
|
|
|
if (appini) {
|
|
nsXREAppData *appData;
|
|
rv = XRE_CreateAppData(appini, &appData);
|
|
if (NS_FAILED(rv)) {
|
|
Output("Couldn't read application.ini");
|
|
return 255;
|
|
}
|
|
int result = XRE_main(argc, argv, appData, 0);
|
|
XRE_FreeAppData(appData);
|
|
return result;
|
|
}
|
|
|
|
return XRE_main(argc, argv, &sAppData, 0);
|
|
}
|
|
|
|
#ifdef MOZ_B2G_LOADER
|
|
/*
|
|
* The main() in B2GLoader.cpp is the new main function instead of the
|
|
* main() here if it is enabled. So, rename it to b2g_man().
|
|
*/
|
|
#define main b2g_main
|
|
#define _CONST const
|
|
#else
|
|
#define _CONST
|
|
#endif
|
|
|
|
int main(int argc, _CONST char* argv[])
|
|
{
|
|
#ifndef MOZ_B2G_LOADER
|
|
char exePath[MAXPATHLEN];
|
|
#endif
|
|
|
|
#ifdef MOZ_WIDGET_GONK
|
|
// This creates a ThreadPool for binder ipc. A ThreadPool is necessary to
|
|
// receive binder calls, though not necessary to send binder calls.
|
|
// ProcessState::Self() also needs to be called once on the main thread to
|
|
// register the main thread with the binder driver.
|
|
android::ProcessState::self()->startThreadPool();
|
|
#endif
|
|
|
|
nsresult rv;
|
|
#ifndef MOZ_B2G_LOADER
|
|
rv = mozilla::BinaryPath::Get(argv[0], exePath);
|
|
if (NS_FAILED(rv)) {
|
|
Output("Couldn't calculate the application directory.\n");
|
|
return 255;
|
|
}
|
|
|
|
char *lastSlash = strrchr(exePath, XPCOM_FILE_PATH_SEPARATOR[0]);
|
|
if (!lastSlash || ((lastSlash - exePath) + sizeof(XPCOM_DLL) + 1 > MAXPATHLEN))
|
|
return 255;
|
|
|
|
strcpy(++lastSlash, XPCOM_DLL);
|
|
#endif // MOZ_B2G_LOADER
|
|
|
|
#if defined(XP_UNIX)
|
|
// If the b2g app is launched from adb shell, then the shell will wind
|
|
// up being the process group controller. This means that we can't send
|
|
// signals to the process group (useful for profiling).
|
|
// We ignore the return value since setsid() fails if we're already the
|
|
// process group controller (the normal situation).
|
|
(void)setsid();
|
|
#endif
|
|
|
|
int gotCounters;
|
|
#if defined(XP_UNIX)
|
|
struct rusage initialRUsage;
|
|
gotCounters = !getrusage(RUSAGE_SELF, &initialRUsage);
|
|
#elif defined(XP_WIN)
|
|
IO_COUNTERS ioCounters;
|
|
gotCounters = GetProcessIoCounters(GetCurrentProcess(), &ioCounters);
|
|
#else
|
|
#error "Unknown platform" // having this here keeps cppcheck happy
|
|
#endif
|
|
|
|
#ifdef HAS_DLL_BLOCKLIST
|
|
DllBlocklist_Initialize();
|
|
#endif
|
|
|
|
// B2G loader has already initialized Gecko so we can't initialize
|
|
// it again here.
|
|
#ifndef MOZ_B2G_LOADER
|
|
// We do this because of data in bug 771745
|
|
XPCOMGlueEnablePreload();
|
|
|
|
rv = XPCOMGlueStartup(exePath);
|
|
if (NS_FAILED(rv)) {
|
|
Output("Couldn't load XPCOM.\n");
|
|
return 255;
|
|
}
|
|
// Reset exePath so that it is the directory name and not the xpcom dll name
|
|
*lastSlash = 0;
|
|
#endif // MOZ_B2G_LOADER
|
|
|
|
rv = XPCOMGlueLoadXULFunctions(kXULFuncs);
|
|
if (NS_FAILED(rv)) {
|
|
Output("Couldn't load XRE functions.\n");
|
|
return 255;
|
|
}
|
|
|
|
if (gotCounters) {
|
|
#if defined(XP_WIN)
|
|
XRE_TelemetryAccumulate(mozilla::Telemetry::EARLY_GLUESTARTUP_READ_OPS,
|
|
int(ioCounters.ReadOperationCount));
|
|
XRE_TelemetryAccumulate(mozilla::Telemetry::EARLY_GLUESTARTUP_READ_TRANSFER,
|
|
int(ioCounters.ReadTransferCount / 1024));
|
|
IO_COUNTERS newIoCounters;
|
|
if (GetProcessIoCounters(GetCurrentProcess(), &newIoCounters)) {
|
|
XRE_TelemetryAccumulate(mozilla::Telemetry::GLUESTARTUP_READ_OPS,
|
|
int(newIoCounters.ReadOperationCount - ioCounters.ReadOperationCount));
|
|
XRE_TelemetryAccumulate(mozilla::Telemetry::GLUESTARTUP_READ_TRANSFER,
|
|
int((newIoCounters.ReadTransferCount - ioCounters.ReadTransferCount) / 1024));
|
|
}
|
|
#elif defined(XP_UNIX)
|
|
XRE_TelemetryAccumulate(mozilla::Telemetry::EARLY_GLUESTARTUP_HARD_FAULTS,
|
|
int(initialRUsage.ru_majflt));
|
|
struct rusage newRUsage;
|
|
if (!getrusage(RUSAGE_SELF, &newRUsage)) {
|
|
XRE_TelemetryAccumulate(mozilla::Telemetry::GLUESTARTUP_HARD_FAULTS,
|
|
int(newRUsage.ru_majflt - initialRUsage.ru_majflt));
|
|
}
|
|
#else
|
|
#error "Unknown platform" // having this here keeps cppcheck happy
|
|
#endif
|
|
}
|
|
|
|
int result;
|
|
{
|
|
ScopedLogging log;
|
|
char **_argv;
|
|
|
|
/*
|
|
* Duplicate argument vector to conform non-const argv of
|
|
* do_main() since XRE_main() is very stupid with non-const argv.
|
|
*/
|
|
_argv = new char *[argc + 1];
|
|
for (int i = 0; i < argc; i++) {
|
|
size_t len = strlen(argv[i]) + 1;
|
|
_argv[i] = new char[len];
|
|
MOZ_ASSERT(_argv[i] != nullptr);
|
|
memcpy(_argv[i], argv[i], len);
|
|
}
|
|
_argv[argc] = nullptr;
|
|
|
|
result = do_main(argc, _argv);
|
|
|
|
for (int i = 0; i < argc; i++) {
|
|
delete[] _argv[i];
|
|
}
|
|
delete[] _argv;
|
|
}
|
|
|
|
return result;
|
|
}
|