feaf18e371
* chore: bump chromium in DEPS to 112.0.5576.0 * 4211172: Use the Mac ImageTransportSurface on iOS. https://chromium-review.googlesource.com/c/chromium/src/+/4211172 * 4191759: Reuse PrintBackend process from query for printing https://chromium-review.googlesource.com/c/chromium/src/+/4191759 * 4189718: Revert "[code health] Remove NotificationService use by SpellcheckService" https://chromium-review.googlesource.com/c/chromium/src/+/4189718 * 4216074: web_contents_delegate: remove content:: https://chromium-review.googlesource.com/c/chromium/src/+/4216074 * 4192284: ios: Add feature flag for PartitionAlloc. https://chromium-review.googlesource.com/c/chromium/src/+/4192284 * chore: bump chromium in DEPS to 112.0.5578.0 * 4211172: Use the Mac ImageTransportSurface on iOS. https://chromium-review.googlesource.com/c/chromium/src/+/4211172 * 4067682: Define ThirdPartyCookiesUserBypass runtime feature and plumb it through to URLRequest.cookie_setting_overrides. https://chromium-review.googlesource.com/c/chromium/src/+/4067682 * chore: fixup patch indices * 4218354: Disable the use of preserve_most on arm64 Windows https://chromium-review.googlesource.com/c/v8/v8/+/4218354 * chore: fixup patch indices * chore: bump chromium in DEPS to 112.0.5579.0 * chore: update patches * chore: bump chromium in DEPS to 112.0.5581.0 * chore: update patches * refactor: use modern base values in tracing Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4210912 * refactor: remove GetFontLookupTableCacheDir Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4191820 * refactor: base value type DICTIONARY replaced with DICT Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4198081 * chore: add stub impls for WCO routing Refs: https://chromium-review.googlesource.com/c/chromium/src/+/4182690 * refactor: rename latency metrics Refs: https://chromium-review.googlesource.com/c/chromium/src/+/4048262 * refactor: add sanitized context to clipboard write Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4178264 * refactor: s/Rect/WindowFeatures Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4167001 * refacotr: switch mojom::NetworkHintsHandler to use SchemeHostPair instead of URL Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4185417 * chore: remove dead DecodeToken code * refactor: refactoring geolocation manager Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4161603 * chore: iwyu net/cert/cert_verify_result.h * build: use xcode 14 * chore: bump chromium in DEPS to 112.0.5583.0 * chore: update patches * chore: fixup mas patches * refactor: base::span explicit conversion checks Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4219636 * chore: bump chromium in DEPS to 112.0.5591.0 * chore: bump chromium in DEPS to 112.0.5593.0 * chore: bump chromium in DEPS to 112.0.5594.3 * chore: bump chromium in DEPS to 112.0.5597.0 * chore: update chromium patches * 4242507: Move most of GetChromeKeySystems() into components/cdm Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4242507 It seems as though the bug this patch was trying to resolve is now fixed. * chore: update v8 patches * 4240798: Get rid of ShowInvalidPrinterSettingsError() in PrintManagerHost. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4240798 * 4247938: Bump min required GTK version to 3.20 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4247938 * 4173660: Remove unused argument in BeforeUnloadCompleted Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4173660 * 4226656: Add response url to SimpleURLLoader::OnRedirectCallback Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4226656 * fixup!: 4240798: Get rid of ShowInvalidPrinterSettingsError() in PrintManager Host. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4240798 * chore: bump chromium in DEPS to 112.0.5599.0 * chore: update patches * 4251237: [StorageKey Cleanup] (2) Rename CreateFirstParty constructors Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4251237 * 4256866: [Extensions] Replace GetHooksForAPI with a RegisterHooksDelegate Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4256866 * chore: bump chromium in DEPS to 112.0.5601.0 * chore: update patches * chore: bump chromium in DEPS to 112.0.5603.0 * chore: bump chromium in DEPS to 112.0.5605.0 * chore: bump chromium in DEPS to 112.0.5607.0 * update patches * fix mas patch * chore: bump chromium in DEPS to 112.0.5609.0 * chore: update patches * build: update appveyor image 4072083: New toolchain for Windows 11 10.0.22621.755 SDK | https://chromium-review.googlesource.com/c/chromium/src/+/4072083 * chore: bump chromium in DEPS to 112.0.5611.0 * fix patches * chore: update patches * 4261434: Remove browser_watcher (1/3): Move ExitCodeWatcher to chrome/app https://chromium-review.googlesource.com/c/chromium/src/+/4261434 * 4258446: Move network::mojom::ClearDataFilter to its own mojom file https://chromium-review.googlesource.com/c/chromium/src/+/4258446 * 4128591: Enable large pdbs by default https://chromium-review.googlesource.com/c/chromium/src/+/4128591 * move dbgcore/dbghelp to extensions_to_skip * chore: bump chromium in DEPS to 113.0.5624.0 * chore: bump chromium in DEPS to 113.0.5626.0 * chore: bump chromium in DEPS to 113.0.5628.2 * chore: bump chromium in DEPS to 113.0.5630.0 * chore: bump chromium in DEPS to 113.0.5632.0 * chore: bump chromium in DEPS to 113.0.5634.0 * chore: bump chromium in DEPS to 113.0.5636.0 * 4255184: Permit popups from fullscreen-within-tab openers https://chromium-review.googlesource.com/c/chromium/src/+/4255184 * 4297715: [mac] Introduce BluetoothLowEnergyAdapterApple to reuse CoreBluetooth https://chromium-review.googlesource.com/c/chromium/src/+/4297715 * 4301154: Remove GLContextCGL and cleanup relevant code https://chromium-review.googlesource.com/c/chromium/src/+/4301154 * 4278389: CDP: fix Page.addScriptToEvaluateOnNewDocument in iframes https://chromium-review.googlesource.com/c/chromium/src/+/4278389 * 4240798: Get rid of ShowInvalidPrinterSettingsError() in PrintManagerHost. https://chromium-review.googlesource.com/c/chromium/src/+/4240798 * 4291989: Refactor logic determining untrusted mojo invitation flag. https://chromium-review.googlesource.com/c/chromium/src/+/4291989 * 4110189: Add Select option to content touch selection menu. https://chromium-review.googlesource.com/c/chromium/src/+/4110189 * 4309923: [Extensions] Add a unit test for API permissions having features https://chromium-review.googlesource.com/c/chromium/src/+/4309923 * 4282657: Revert "[headless] Route stdio to parent console on Windows." https://chromium-review.googlesource.com/c/chromium/src/+/4282657 * 4306685: [v8] Improve V8 flag configuration to avoid errors https://chromium-review.googlesource.com/c/chromium/src/+/4306685 * 4295455: Add fallback Linux UI for when GTK 3.20 isn't available https://chromium-review.googlesource.com/c/chromium/src/+/4295455 * 4289774: Remove feature for shared sandbox policies https://chromium-review.googlesource.com/c/chromium/src/+/4289774 * 4292705: Rename WebSwapCGLLayer to ANGLESwapCGLLayer outside WebKit. https://chromium-review.googlesource.com/c/angle/angle/+/4292705 * chore: fixup patch indices * fixup! 4297715: [mac] Introduce BluetoothLowEnergyAdapterApple to reuse CoreBluetooth * 4289789: Remove base::JSONReader::ReadDeprecated https://chromium-review.googlesource.com/c/chromium/src/+/4289789 * 4281521: Remove `base::Value::FindKey()` https://chromium-review.googlesource.com/c/chromium/src/+/4281521 * 4276761: Update NAK constructor and GetIsCrossSite https://chromium-review.googlesource.com/c/chromium/src/+/4276761 * 4288119: Let GetUpload work with UploadInfo pointers https://chromium-review.googlesource.com/c/chromium/src/+/4288119 * 4285322: content: Move WebExposedIsolationLevel to its own public header https://chromium-review.googlesource.com/c/chromium/src/+/4285322 * 4251818: [Extensions] Make ExtensionSet moveable. https://chromium-review.googlesource.com/c/chromium/src/+/4251818 * 4299554: [json-schema-compiler] Refactor to Params::Create (14/74) https://chromium-review.googlesource.com/c/chromium/src/+/4299554 * chore: update printing patch indices * chore: update chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4295455 Our patch changes the signature of `LinuxUiTheme::GetWindowFrameProvider()`. Upstream 4295455 added a new subclass (FallbackLinuxUi) so sync its version of GetWindowFrameProvider() to match our changes. * chore: disable node test parallel/test-intl Disabling the test because upstream is still working on this feature. Xref: https://chromium-review.googlesource.com/c/v8/v8/+/4237675 Xref: https://bugs.chromium.org/p/chromium/issues/detail?id=1414292 When upstream churn is done we should re-enable this test and update it as necessary. * win7dep: Remove ResolveCoreWinRTStringDelayload Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4277708 Upstream has removed this since Win7 support is deprecated. This updates our `language_util_win.cc` file using the same approach that 4277708 uses for `base/win/win_util.cc`. * fix: remove use of ResolveCoreWinRTDelayload() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4297979 A followup to prev commit, which removed ResolveCoreWinRTStringDelayload(). This PR follows the 4297979 approach of simply removing the calls, e.g. https://chromium-review.googlesource.com/c/chromium/src/+/4297979/4/chrome/browser/device_reauth/win/authenticator_win.cc * fix: add d3dcompiler_47 to the zip manifest Xref: https://chromium-review.googlesource.com/c/angle/angle/+/4285717 Xref (24-x-y):0fb1def32b
* This clang roll breaks Linux arm 32-bit Xref (24-x-y):1229114494
Xref (chromium): https://crbug.com/1410101 * fix: WebUSB on ARM64 macs (#37441) * chore: update patches * chore: fix macOS CI build. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4278307 That whole dir was previously being removed to save space since we don't use it. We still don't use anything in the file, but gn needs it to exist. * fixup! chore: fix macOS CI build. chore: mkdir --parents does not exist on BSD; use mkdir -p * chore: update chromium/mas_disable_remote_accessibility.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4273450 Upstream added a new block of code using NSAccessibilityRemoteUIElement, so stub it out with `#if !IS_MAS_BUILD()` same as we do everwhere else. * chore: address code review nit :) --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
244 lines
9 KiB
C++
244 lines
9 KiB
C++
// Copyright (c) 2022 Slack Technologies, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include <windows.h> // windows.h must be included first
|
|
|
|
#include <atlbase.h> // ensures that ATL statics like `_AtlWinModule` are initialized (it's an issue in static debug build)
|
|
#include <shellapi.h>
|
|
#include <shellscalingapi.h>
|
|
#include <tchar.h>
|
|
|
|
#include <algorithm>
|
|
#include <cstdlib>
|
|
#include <memory>
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "base/at_exit.h"
|
|
#include "base/environment.h"
|
|
#include "base/i18n/icu_util.h"
|
|
#include "base/process/launch.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "base/win/dark_mode_support.h"
|
|
#include "base/win/windows_version.h"
|
|
#include "chrome/app/exit_code_watcher_win.h"
|
|
#include "components/crash/core/app/crash_switches.h"
|
|
#include "components/crash/core/app/run_as_crashpad_handler_win.h"
|
|
#include "content/public/app/content_main.h"
|
|
#include "content/public/app/sandbox_helper_win.h"
|
|
#include "electron/buildflags/buildflags.h"
|
|
#include "electron/fuses.h"
|
|
#include "sandbox/win/src/sandbox_types.h"
|
|
#include "shell/app/command_line_args.h"
|
|
#include "shell/app/electron_main_delegate.h"
|
|
#include "shell/app/node_main.h"
|
|
#include "shell/common/electron_command_line.h"
|
|
#include "shell/common/electron_constants.h"
|
|
#include "third_party/crashpad/crashpad/util/win/initial_client_data.h"
|
|
|
|
namespace {
|
|
|
|
// Redefined here so we don't have to introduce a dependency on //content
|
|
// from //electron:electron_app
|
|
const char kUserDataDir[] = "user-data-dir";
|
|
const char kProcessType[] = "type";
|
|
|
|
[[maybe_unused]] bool IsEnvSet(const char* name) {
|
|
size_t required_size;
|
|
getenv_s(&required_size, nullptr, 0, name);
|
|
return required_size != 0;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace crash_reporter {
|
|
extern const char kCrashpadProcess[];
|
|
}
|
|
|
|
// In 32-bit builds, the main thread starts with the default (small) stack size.
|
|
// The ARCH_CPU_32_BITS blocks here and below are in support of moving the main
|
|
// thread to a fiber with a larger stack size.
|
|
#if defined(ARCH_CPU_32_BITS)
|
|
// The information needed to transfer control to the large-stack fiber and later
|
|
// pass the main routine's exit code back to the small-stack fiber prior to
|
|
// termination.
|
|
struct FiberState {
|
|
HINSTANCE instance;
|
|
LPVOID original_fiber;
|
|
int fiber_result;
|
|
};
|
|
|
|
// A PFIBER_START_ROUTINE function run on a large-stack fiber that calls the
|
|
// main routine, stores its return value, and returns control to the small-stack
|
|
// fiber. |params| must be a pointer to a FiberState struct.
|
|
void WINAPI FiberBinder(void* params) {
|
|
auto* fiber_state = static_cast<FiberState*>(params);
|
|
// Call the wWinMain routine from the fiber. Reusing the entry point minimizes
|
|
// confusion when examining call stacks in crash reports - seeing wWinMain on
|
|
// the stack is a handy hint that this is the main thread of the process.
|
|
fiber_state->fiber_result =
|
|
wWinMain(fiber_state->instance, nullptr, nullptr, 0);
|
|
// Switch back to the main thread to exit.
|
|
::SwitchToFiber(fiber_state->original_fiber);
|
|
}
|
|
#endif // defined(ARCH_CPU_32_BITS)
|
|
|
|
int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
|
|
#if defined(ARCH_CPU_32_BITS)
|
|
enum class FiberStatus { kConvertFailed, kCreateFiberFailed, kSuccess };
|
|
FiberStatus fiber_status = FiberStatus::kSuccess;
|
|
// GetLastError result if fiber conversion failed.
|
|
DWORD fiber_error = ERROR_SUCCESS;
|
|
if (!::IsThreadAFiber()) {
|
|
// Make the main thread's stack size 4 MiB so that it has roughly the same
|
|
// effective size as the 64-bit build's 8 MiB stack.
|
|
constexpr size_t kStackSize = 4 * 1024 * 1024; // 4 MiB
|
|
// Leak the fiber on exit.
|
|
LPVOID original_fiber =
|
|
::ConvertThreadToFiberEx(nullptr, FIBER_FLAG_FLOAT_SWITCH);
|
|
if (original_fiber) {
|
|
FiberState fiber_state = {instance, original_fiber};
|
|
// Create a fiber with a bigger stack and switch to it. Leak the fiber on
|
|
// exit.
|
|
LPVOID big_stack_fiber = ::CreateFiberEx(
|
|
0, kStackSize, FIBER_FLAG_FLOAT_SWITCH, FiberBinder, &fiber_state);
|
|
if (big_stack_fiber) {
|
|
::SwitchToFiber(big_stack_fiber);
|
|
// The fibers must be cleaned up to avoid obscure TLS-related shutdown
|
|
// crashes.
|
|
::DeleteFiber(big_stack_fiber);
|
|
::ConvertFiberToThread();
|
|
// Control returns here after Chrome has finished running on FiberMain.
|
|
return fiber_state.fiber_result;
|
|
}
|
|
fiber_status = FiberStatus::kCreateFiberFailed;
|
|
} else {
|
|
fiber_status = FiberStatus::kConvertFailed;
|
|
}
|
|
// If we reach here then creating and switching to a fiber has failed. This
|
|
// probably means we are low on memory and will soon crash. Try to report
|
|
// this error once crash reporting is initialized.
|
|
fiber_error = ::GetLastError();
|
|
base::debug::Alias(&fiber_error);
|
|
}
|
|
// If we are already a fiber then continue normal execution.
|
|
#endif // defined(ARCH_CPU_32_BITS)
|
|
|
|
struct Arguments {
|
|
int argc = 0;
|
|
wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc);
|
|
|
|
~Arguments() { LocalFree(argv); }
|
|
} arguments;
|
|
|
|
if (!arguments.argv)
|
|
return -1;
|
|
|
|
#ifdef _DEBUG
|
|
// Don't display assert dialog boxes in CI test runs
|
|
static const char kCI[] = "CI";
|
|
if (IsEnvSet(kCI)) {
|
|
_CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE);
|
|
_CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR);
|
|
|
|
_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE);
|
|
_CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
|
|
|
|
_set_error_mode(_OUT_TO_STDERR);
|
|
}
|
|
#endif
|
|
|
|
#if BUILDFLAG(ENABLE_RUN_AS_NODE)
|
|
bool run_as_node =
|
|
electron::fuses::IsRunAsNodeEnabled() && IsEnvSet(electron::kRunAsNode);
|
|
#else
|
|
bool run_as_node = false;
|
|
#endif
|
|
|
|
// Make sure the output is printed to console.
|
|
if (run_as_node || !IsEnvSet("ELECTRON_NO_ATTACH_CONSOLE"))
|
|
base::RouteStdioToConsole(false);
|
|
|
|
std::vector<char*> argv(arguments.argc);
|
|
std::transform(arguments.argv, arguments.argv + arguments.argc, argv.begin(),
|
|
[](auto& a) { return _strdup(base::WideToUTF8(a).c_str()); });
|
|
#if BUILDFLAG(ENABLE_RUN_AS_NODE)
|
|
if (electron::fuses::IsRunAsNodeEnabled() && run_as_node) {
|
|
base::AtExitManager atexit_manager;
|
|
base::i18n::InitializeICU();
|
|
auto ret = electron::NodeMain(argv.size(), argv.data());
|
|
std::for_each(argv.begin(), argv.end(), free);
|
|
return ret;
|
|
}
|
|
#endif
|
|
|
|
base::CommandLine::Init(argv.size(), argv.data());
|
|
const base::CommandLine* command_line =
|
|
base::CommandLine::ForCurrentProcess();
|
|
|
|
const std::string process_type =
|
|
command_line->GetSwitchValueASCII(kProcessType);
|
|
|
|
if (process_type == crash_reporter::switches::kCrashpadHandler) {
|
|
// Check if we should monitor the exit code of this process
|
|
std::unique_ptr<ExitCodeWatcher> exit_code_watcher;
|
|
|
|
// Retrieve the client process from the command line
|
|
crashpad::InitialClientData initial_client_data;
|
|
if (initial_client_data.InitializeFromString(
|
|
command_line->GetSwitchValueASCII("initial-client-data"))) {
|
|
// Setup exit code watcher to monitor the parent process
|
|
HANDLE duplicate_handle = INVALID_HANDLE_VALUE;
|
|
if (DuplicateHandle(
|
|
::GetCurrentProcess(), initial_client_data.client_process(),
|
|
::GetCurrentProcess(), &duplicate_handle,
|
|
PROCESS_QUERY_INFORMATION, FALSE, DUPLICATE_SAME_ACCESS)) {
|
|
base::Process parent_process(duplicate_handle);
|
|
exit_code_watcher = std::make_unique<ExitCodeWatcher>();
|
|
if (exit_code_watcher->Initialize(std::move(parent_process))) {
|
|
exit_code_watcher->StartWatching();
|
|
}
|
|
}
|
|
}
|
|
|
|
// The handler process must always be passed the user data dir on the
|
|
// command line.
|
|
DCHECK(command_line->HasSwitch(kUserDataDir));
|
|
|
|
base::FilePath user_data_dir =
|
|
command_line->GetSwitchValuePath(kUserDataDir);
|
|
int crashpad_status = crash_reporter::RunAsCrashpadHandler(
|
|
*command_line, user_data_dir, kProcessType, kUserDataDir);
|
|
if (crashpad_status != 0 && exit_code_watcher) {
|
|
// Crashpad failed to initialize, explicitly stop the exit code watcher
|
|
// so the crashpad-handler process can exit with an error
|
|
exit_code_watcher->StopWatching();
|
|
}
|
|
return crashpad_status;
|
|
}
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
// access ui native theme here to prevent blocking calls later
|
|
base::win::AllowDarkModeForApp(true);
|
|
#endif
|
|
|
|
#if defined(ARCH_CPU_32_BITS)
|
|
// Intentionally crash if converting to a fiber failed.
|
|
CHECK_EQ(fiber_status, FiberStatus::kSuccess);
|
|
#endif // defined(ARCH_CPU_32_BITS)
|
|
|
|
if (!electron::CheckCommandLineArguments(arguments.argc, arguments.argv))
|
|
return -1;
|
|
|
|
sandbox::SandboxInterfaceInfo sandbox_info = {nullptr};
|
|
content::InitializeSandboxInfo(&sandbox_info);
|
|
electron::ElectronMainDelegate delegate;
|
|
|
|
content::ContentMainParams params(&delegate);
|
|
params.instance = instance;
|
|
params.sandbox_info = &sandbox_info;
|
|
electron::ElectronCommandLine::Init(arguments.argc, arguments.argv);
|
|
return content::ContentMain(std::move(params));
|
|
}
|