28ada6ea8b
* chore: bump chromium in DEPS to 99.0.4819.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4824.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4827.0
* chore: update patches
* 3352511: PiP: Add inkdrop and pointer cursor to PiP window buttons
https://chromium-review.googlesource.com/c/chromium/src/+/3352511
* 3309164: webhid: Show FIDO devices in the chooser if allowed
https://chromium-review.googlesource.com/c/chromium/src/+/3309164
* 3297868: hid: Add experimental HIDDevice.forget()
https://chromium-review.googlesource.com/c/chromium/src/+/3297868
* 3362491: [Extensions] Move i18n API to //extensions
https://chromium-review.googlesource.com/c/chromium/src/+/3362491
* MCC Refactor step0: Allow embedders to register associated_interface binders with RenderFrameHostImpl::associated_registry_.
https://chromium-review.googlesource.com/c/chromium/src/+/3281481
* 3352616: [Gtk] Remove libgtk from the link-line
https://chromium-review.googlesource.com/c/chromium/src/+/3352616
* 3249211: Clear-Site-Data support for partitioned cookies
https://chromium-review.googlesource.com/c/chromium/src/+/3249211
* [Extensions][COIL] Use [allow|block]list in //extensions/common
https://chromium-review.googlesource.com/c/chromium/src/+/3372668
* Begin ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3376154
* [Code Health] Refactor PrefService GetDict + GetList to use base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3343526
* 3354997: [CodeHealth] Remove deprecated SetDictionary method
https://chromium-review.googlesource.com/c/chromium/src/+/3354997
* 3287323: Add LacrosPrefStore for lacros settings
https://chromium-review.googlesource.com/c/chromium/src/+/3287323
* 3365916: [PA] Clean up remaining lazy commit code
https://chromium-review.googlesource.com/c/chromium/src/+/3365916
* [MPArch] Target the external protocol error at the responsible frame.
https://chromium-review.googlesource.com/c/chromium/src/+/3011560
* Pass origin to RegisterNonNetworkSubresourceURLLoaderFactories
https://chromium-review.googlesource.com/c/chromium/src/+/3350608
* Linux: Send OSCrypt raw encryption key to the Network Service
https://chromium-review.googlesource.com/c/chromium/src/+/3320484
* [PlzServiceWorker] Remove remaining references to PlzServiceWorker.
https://chromium-review.googlesource.com/c/chromium/src/+/3359441
* chore: fixup for lint
* 3327621: Fix tablet mode detection for Win 11.
https://chromium-review.googlesource.com/c/chromium/src/+/3327621
* 3342428: ax_mac: move AXTextMarker conversion utils under ui umbrella
https://chromium-review.googlesource.com/c/chromium/src/+/3342428
* 3353974: Mac: Use base::Feature for overlay features
https://chromium-review.googlesource.com/c/chromium/src/+/3353974
* chore: bump chromium in DEPS to 99.0.4828.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4837.0
* chore: update patches
* chore: update patches
* 3379142: Drop FALLTHROUGH macro
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3379142
* 3381749: C++17: Allow use of std::map::try_emplace and std::map::insert_or_assign
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3381749
* chore: bump chromium in DEPS to 99.0.4839.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4840.0
* chore: bump chromium in DEPS to 99.0.4844.0
* 3395881: [api] Deprecate Local<v8::Context> v8::Object::CreationContext()
Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3395881
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4845.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4847.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4849.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4851.0
* chore: bump chromium in DEPS to 100.0.4853.0
* update patches
* chore: update patches
* update patches
* 3383599: Fonts Access: Remove prototype that uses a font picker.
https://chromium-review.googlesource.com/c/chromium/src/+/3383599
* 3404768: Remove ALLOW_UNUSED macros
https://chromium-review.googlesource.com/c/chromium/src/+/3404768
* 3374762: Remove ignore_result.h
https://chromium-review.googlesource.com/c/chromium/src/+/3374762
* 3399305: [unseasoned-pdf] Apply proper frame offsets for touch selections
https://chromium-review.googlesource.com/c/chromium/src/+/3399305
* 3402210: [Extensions] Don't trigger unload event for already unloaded extension
https://chromium-review.googlesource.com/c/chromium/src/+/3402210
* 3410912: Combine URLLoaderClient OnReceiveResponse and OnStartLoadingResponseBody.
https://chromium-review.googlesource.com/c/chromium/src/+/3410912
* 3370428: Make the AuthSchemes policy support dynamic refresh
https://chromium-review.googlesource.com/c/chromium/src/+/3370428
* 3407603: Finish ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3407603
* 3378352: ozone/x11: move code from //ui/p/x11 to //ui/ozone/p/x11
https://chromium-review.googlesource.com/c/chromium/src/+/3378352
* 3370810: Delete chrome/service, AKA the Cloud Print service process.
https://chromium-review.googlesource.com/c/chromium/src/+/3370810
* chore: bump chromium in DEPS to 100.0.4855.0
* chore: update patches
* fixup! 3370810: Delete chrome/service, AKA the Cloud Print service process.
* revert 3348007 to fix windows build
* 3318572: [Code health] Fix gn check errors in //extensions/browser:*
https://chromium-review.googlesource.com/c/chromium/src/+/3318572
* fix printing.patch
* fix iwyu issue
* 3408515: win: Make ShorcutOperation an enum class and modernize names
https://chromium-review.googlesource.com/c/chromium/src/+/3408515
* 3388333: [UIA] Remove dead code accessibility_misc_utils.h/cc
https://chromium-review.googlesource.com/c/chromium/src/+/3388333
* fix windows build? i hope
* patch gn visibility of //ui/ozone/platform/x11
* missing include base/logging.h
* use BUILDFLAG for USE_NSS_CERTS
https://chromium-review.googlesource.com/c/chromium/src/+/3379123
* defined(OS_*) ==> BUILDFLAG(IS_*)
https://bugs.chromium.org/p/chromium/issues/detail?id=1234043
* fixup! 3404768: Remove ALLOW_UNUSED macros
* another attempt to fix windows build
* temporarily disable the custom scheme service worker test
https://github.com/electron/electron/issues/32664
* fix loading mv3 extensions
not sure what cl broke this unfort.
* fixup! 3404768: Remove ALLOW_UNUSED macros
* patch nan
https://chromium-review.googlesource.com/c/v8/v8/+/3395880
* fix node test
* fix nullptr in FindPdfFrame
* patch perfetto to fix build issue on win-ia32
bc44c3c753
* fix build for linux-x64-testing-no-run-as-node
* fix patch
* skip <webview>.capturePage() test
https://github.com/electron/electron/issues/32705
* test: fix failing tests of focus/blur events of WebContents (#32711)
* inherit stdio from app module test child processes
this prevents them from timing out due to full stdout buffers
* test to see if we can get better logs on windows ci
* try again for appveyor log things
* skip contentTracing tests on ia32
* ci: disable gpu compositing
* drop applied patch
* fix merge fail
* Revert "ci: disable gpu compositing"
This reverts commit 0344129fcb19ea3e87e06c1110d751f22eba3fec.
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
239 lines
8.9 KiB
C++
239 lines
8.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/windows_version.h"
|
|
#include "components/browser_watcher/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";
|
|
|
|
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<browser_watcher::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<browser_watcher::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 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));
|
|
}
|