![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 137.0.7107.0 * chore: bump chromium in DEPS to 137.0.7109.0 * chore: bump chromium in DEPS to 137.0.7111.0 * chore: bump chromium in DEPS to 137.0.7113.0 * 6384240: Remove double-declaration for accessibility on macOS |6384240
* 6422872: Remove unused includes in isolation_info_mojom_traits.h |6422872
* chore: update patches * 6400733: Avoid ipc_message_macros.h usage in some foo_param_traits_macros.h files |6400733
* chore: update patches * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* chore: iwyu * refactor: prefer value initialization over memset() From the looks up upstream commits in base/, it looks like memset() could trigger `-Wunsafe-buffer-usage` warnings soon? Value initialization is more C++ish and less error-prone anyway, due to memset()'s easily swappable parameters. * refactor: NotifyIcon::InitIconData() returns a NOTIFYICONDATA This follows F.20 in the C++ Core Guidelines and also removes the need for memset() * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - strcmp() * fixup! 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* 6433203: Add a PassKey to RegisterDeleteDelegateCallback(). |6433203
* chore: bump chromium in DEPS to 137.0.7115.0 * 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* chore: update patches * 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* fix: add pragma for MacSDK unsafe buffers | 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* chore: bump chromium in DEPS to 137.0.7117.0 * chore: update patches * chore: update filesnames.libcxx.gni * 6431756: Replace SetOwnedByWidget() bool arg with a PassKey. |6431756
* 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* 6428345: Remove ExtensionService usage from ChromeExtensionRegistrarDelegate |6428345
* 6384315: Migrate extensions_enabled from ExtensionService to Registrar |6384315
* 6428749: [extensions] Refactor ExtensionService for AddNewAndUpdateExtension. |6428749
* chore: bump chromium in DEPS to 137.0.7119.0 * 6440290: corner-shape: support inset shadow |6440290
* 6429230: FSA: Move blocked paths to the PermissionContext class |6429230
* chore: update patches * chore: bump chromium in DEPS to 137.0.7121.0 * chore: update patches * fix: partially revert 6443473: Remove ItemDelete from the Mac version of AppleKeychain |6443473
* fix: update filenames.libcxx.gni * chore: bump chromium in DEPS to 137.0.7123.0 * chore: update patches * chore: "grandfather in" electron views too Lock further access to View::set_owned_by_client() |6448510
* chore: update feat_corner_smoothing_css_rule_and_blink_painting.patch corner-shape: support inset shadow |6440290
* refactor: grandfather in AutofillPopupView as a subclass of WidgetDelegateView Add a PassKey for std::make_unique<WidgetDelegateView>() |6442265
* Provide dbus appmenu information on Wayland |6405535
* [extensions] Move OnExtensionInstalled out of ExtensionService. |6443325
* refactor: grandfather in NativeWindowViews for delete callbacks 6433203: Add a PassKey to RegisterDeleteDelegateCallback(). |6433203
* chore: merge the four "grandfather" patches into one * [A11yPerformance] Remove IsAccessibilityAllowed() | 6404386: [A11yPerformance] Remove IsAccessibilityAllowed() |6404386
NB: the changes here are copied from the upstream changes in chrome/browser/ui/webui/accessibility/accessibility_ui.cc * 6420753: [PermissionOptions] Use PermissionDescriptorPtr in PermissionController |6420753
* 6429573: [accessibility] Move mode change out of AccessibilityNotificationWaiter |6429573
* chore: e patches all * 6419936: [win] Change ScreenWin public static methods to virtual |6419936
* 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - fprintf() - fputs() - snprintf() - vsnprintf() * fix: size conversion FTBFS on Win * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - wcscpy_s() * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - wcsncpy_s() * chore: update mas_avoid_private_macos_api_usage.patch.patch 6394283: Remove double-declaration for accessibility on iOS |6394283
Lots of context shear in this commit but the only interesting part is: -+ return nullptr; ++ return {}; Which is needed because the return type is sometimes not a pointer. * chore: e patches all * chore: disable -Wmacro-redefined warning in electron_main_win.cc * chore: bump chromium in DEPS to 137.0.7123.5 * refactor: patch electron PermissionTypes into blink 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* chore: e patches all * chore: remove the box_painter_base.cc part of feat_corner_smoothing_css_rule_and_blink_painting.patch as per code review @ https://github.com/electron/electron/pull/46482#pullrequestreview-2777338370 * test: enable window-smaller-than-64x64 test on Linux * chore: bump chromium in DEPS to 137.0.7124.1 * chore: bump chromium in DEPS to 137.0.7125.1 * chore: bump chromium in DEPS to 137.0.7127.3 * 6459201: [Extensions] Remove ExtensionSystem::FinishDelayedInstallationIfReady() |6459201
* 6454796: [Extensions] Move (most) registrar delayed install logic to //extensions |6454796
* chore: bump chromium in DEPS to 137.0.7128.1 * chore: e patches all * chore: node ./script/gen-libc++-filenames.js * [views] Gate DesktopWindowTreeHostWin::window_enlargement_ behind flag Refs6428649
* feat: allow opt-out animated_content_sampler. Refs6438681
* Trigger CI --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
238 lines
8.8 KiB
C++
238 lines
8.8 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>
|
|
|
|
// workaround for base/strings/strcat.h(18,9): error: 'StrCat' macro redefined
|
|
// [-Werror,-Wmacro-redefined]
|
|
#pragma clang diagnostic push
|
|
#pragma clang diagnostic ignored "-Wmacro-redefined"
|
|
|
|
#include "base/at_exit.h"
|
|
#include "base/debug/alias.h"
|
|
#include "base/i18n/icu_util.h"
|
|
#include "base/memory/raw_ptr_exclusion.h"
|
|
#include "base/process/launch.h"
|
|
#include "base/strings/cstring_view.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "base/win/dark_mode_support.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"
|
|
|
|
#pragma clang diagnostic pop
|
|
|
|
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";
|
|
|
|
[[nodiscard]] bool IsEnvSet(const base::cstring_view name) {
|
|
size_t required_size = 0;
|
|
getenv_s(&required_size, nullptr, 0, name.c_str());
|
|
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)
|
|
|
|
{
|
|
int argc = 0;
|
|
wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc);
|
|
if (!argv)
|
|
return -1;
|
|
base::CommandLine::Init(0, nullptr); // args ignored on Windows
|
|
electron::ElectronCommandLine::Init(argc, argv);
|
|
LocalFree(argv);
|
|
}
|
|
|
|
#ifdef _DEBUG
|
|
// Don't display assert dialog boxes in CI test runs
|
|
static constexpr base::cstring_view 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
|
|
|
|
bool run_as_node =
|
|
electron::fuses::IsRunAsNodeEnabled() && IsEnvSet(electron::kRunAsNode);
|
|
|
|
// Make sure the output is printed to console.
|
|
if (run_as_node || !IsEnvSet("ELECTRON_NO_ATTACH_CONSOLE"))
|
|
base::RouteStdioToConsole(false);
|
|
|
|
if (run_as_node) {
|
|
base::AtExitManager atexit_manager;
|
|
base::i18n::InitializeICU();
|
|
return electron::NodeMain();
|
|
}
|
|
|
|
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(command_line->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;
|
|
return content::ContentMain(std::move(params));
|
|
}
|