d02c9f8bc6
* chore: bump chromium in DEPS to 111.0.5522.0 * chore: bump chromium in DEPS to 111.0.5524.0 * chore: bump chromium in DEPS to 111.0.5526.0 * chore: bump chromium in DEPS to 111.0.5528.0 * chore: update patches/chromium/mas_avoid_usage_of_private_macos_apis.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4132807 Fix simple code shear * chore: update patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4130675 Fix simple code shear * chore: update patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/disable_unload_metrics.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126173 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/feat_add_data_parameter_to_processsingleton.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/preconnect_manager.patch https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/v8/force_cppheapcreateparams_to_be_noncopyable.patch https://chromium-review.googlesource.com/c/v8/v8/+/3533019 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches * chore: update patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4128765 Upstream added a new call to HeaderContext(), whose signature we have patched * chore: bump chromium in DEPS to 111.0.5530.0 * chore: update patches * Move ChildProcessHost* from content/common to content/browser Xref: Move ChildProcessHost* from content/common to content/browser * Remove RenderViewHostChanged Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [upstream removal of RenderViewHostChanged] Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4092763 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4093234 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133892 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [examples of upstream code adjusting to the change] Upstream handles this change in roughly two approaches: 1. Move the code over to RenderFrameHostChanged(old_host, new_host) but test for new_host->IsInPrimaryMainFrame() before acting 2. Migrate to the PrimaryPageChanged(page) API and use page.GetMainDocument() to get the RenderFrameHost. I've chosen 1. because electron_api_web_contents needed that pointer to old_host to call RemoveInputEventListener(), but I may be missing some context & would appreciate review on this commit. * Make electron/shell/browser/relauncher_win.cc use <winternl.h> Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4129135 Many internal Windows types are now available in winternl.h so upstrem no longer defines the types themselves. * Move ChildProcessHost* from content/common to content/browser Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134795 * fixup! Make electron/shell/browser/relauncher_win.cc use <winternl.h> winternl.h does not define the field we need, so clone the struct Chromium was using into unnamed namespace * fixup! Move ChildProcessHost* from content/common to content/browser chore: update #includes too * chore: bump chromium in DEPS to 111.0.5532.0 * chore: sync patches/chromium/pepper_plugin_support.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/chromium/mas_no_private_api.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4143865 the content/common/pseudonymization_salt.cc patch is no longer needed * chore: sync patches/chromium/mas_disable_remote_accessibility.patch patch-fuzz update; no manual changes * chore: sync patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4111725 manually reync patch; no code changes * chore: sync patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch Xref: https://chromium-review.googlesource.com/c/v8/v8/+/4127230 patch-fuzz update; no manual changes * chore: rebuild patches * fixup! Remove RenderViewHostChanged Use PrimaryPageChanged() * chore: remove unused method TabsUpdateFunction::OnExecuteCodeFinished() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133991 This private, already-unused function showed up as a FTBFS because it took a base::ListValue parameter and ListValue was removed upstream. * task posting v3: remove includes of runner handles and IWYU task runners Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 * chore: lint * chore: more lint * fixup! task posting v3: remove includes of runner handles and IWYU task runners macOS, too * fixup! task posting v3: remove includes of runner handles and IWYU task runners * chore: bump chromium in DEPS to 111.0.5534.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: sync patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4153110 Sync to minor upstream changes. Add const correctness. * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch sync https://chromium-review.googlesource.com/c/v8/v8/+/4147787 patch-fuzz update; no manual changes * chore: update patches * chore: bump chromium in DEPS to 111.0.5536.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 Sync with upstream code changes. Minor code golf for readability. Note: upstream is laying groundwork for being able to work off of env vars instead of switches. Doesn't affect us yet but worth being aware of. > + // Environment variables could be supported in the future, but are not > + // currently supported when launching with the zygote. * chore: update patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126836 patch-fuzz update; no manual changes * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 manual sync * chore: sync electron/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch https://chromium-review.googlesource.com/c/v8/v8/+/4147788 fuzz-patch * chore: rebuild patches * chore: bump chromium in DEPS to 111.0.5538.0 * chore: bump chromium in DEPS to 111.0.5540.0 * chore: update patches * Remove sdk_forward_declarations https://chromium-review.googlesource.com/c/chromium/src/+/4166680 * task posting v3: Remove task runner handles from codebase entirely Refs https://chromium-review.googlesource.com/c/chromium/src/+/4150928 * Cleanup child_process_launcher_helper* Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * fix: utilityprocess spec on macOS * fix: build on windows Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * chore: fix lint * chore: bump chromium 111.0.5544.3 * chore: gen filenames.libcxx.gni * Add check for Executable+Writable handles in renderer processes. Refs https://chromium-review.googlesource.com/c/chromium/src/+/3774416 * fixup! Add check for Executable+Writable handles in renderer processes. * 4143761: [110] Disable SwiftShader for WebGL on M1 Macs. https://chromium-review.googlesource.com/c/chromium/src/+/4143761 (cherry picked from commit 2f74db3c2139424c416f92d9169aeaa8a2f9c1ec) * chore: bump chromium to 111.0.5555.0 * 56085: Remove hmac.h include from ssl.h. https://boringssl-review.googlesource.com/c/boringssl/+/56085 * 4167020: Remove forwarding headers https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * chore: bump chromium to 111.0.5559.0 * 4181044: Restrict WebCursor usage to RenderWidgetHostViewAura https://chromium-review.googlesource.com/c/chromium/src/+/4181044 * 4189437: views: rename ink_drop_host_view to ink_drop_host https://chromium-review.googlesource.com/c/chromium/src/+/4189437 * chore: bump chromium to 111.0.5560.0 * 4167016: win7dep: remove non aeroglass code https://chromium-review.googlesource.com/c/chromium/src/+/4167016 * fixup after rebase: Remove forwarding header s https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * 4125755: Reland "Reject getDisplayMedia calls without user activation" https://chromium-review.googlesource.com/c/chromium/src/+/4125755 * test: add workaround * chore: update patches * fix: alter coreModuleRegExp to prevent arm crash * Revert "fix: alter coreModuleRegExp to prevent arm crash" This reverts commit 7e50630c98137831a711c5abdbc8809e60cf1d73. * 4218354: Disable the use of preserve_most on arm64 Windows https://chromium-review.googlesource.com/c/v8/v8/+/4218354 * chore: review changes --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
268 lines
8.9 KiB
C++
268 lines
8.9 KiB
C++
// Copyright (c) 2014 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include <dwmapi.h>
|
|
#include <windows.devices.enumeration.h>
|
|
#include <wrl/client.h>
|
|
#include <iomanip>
|
|
|
|
#include "shell/browser/api/electron_api_system_preferences.h"
|
|
|
|
#include "base/win/core_winrt_util.h"
|
|
#include "base/win/windows_types.h"
|
|
#include "base/win/wrapped_window_proc.h"
|
|
#include "shell/common/color_util.h"
|
|
#include "ui/base/win/shell.h"
|
|
#include "ui/gfx/color_utils.h"
|
|
#include "ui/gfx/win/hwnd_util.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
const wchar_t kSystemPreferencesWindowClass[] =
|
|
L"Electron_SystemPreferencesHostWindow";
|
|
|
|
using ABI::Windows::Devices::Enumeration::DeviceAccessStatus;
|
|
using ABI::Windows::Devices::Enumeration::DeviceClass;
|
|
using ABI::Windows::Devices::Enumeration::IDeviceAccessInformation;
|
|
using ABI::Windows::Devices::Enumeration::IDeviceAccessInformationStatics;
|
|
using Microsoft::WRL::ComPtr;
|
|
|
|
DeviceAccessStatus GetDeviceAccessStatus(DeviceClass device_class) {
|
|
ComPtr<IDeviceAccessInformationStatics> dev_access_info_statics;
|
|
HRESULT hr = base::win::GetActivationFactory<
|
|
IDeviceAccessInformationStatics,
|
|
RuntimeClass_Windows_Devices_Enumeration_DeviceAccessInformation>(
|
|
&dev_access_info_statics);
|
|
if (FAILED(hr)) {
|
|
VLOG(1) << "IDeviceAccessInformationStatics failed: " << hr;
|
|
return DeviceAccessStatus::DeviceAccessStatus_Allowed;
|
|
}
|
|
|
|
ComPtr<IDeviceAccessInformation> dev_access_info;
|
|
hr = dev_access_info_statics->CreateFromDeviceClass(device_class,
|
|
&dev_access_info);
|
|
if (FAILED(hr)) {
|
|
VLOG(1) << "IDeviceAccessInformation failed: " << hr;
|
|
return DeviceAccessStatus::DeviceAccessStatus_Allowed;
|
|
}
|
|
|
|
auto status = DeviceAccessStatus::DeviceAccessStatus_Unspecified;
|
|
dev_access_info->get_CurrentStatus(&status);
|
|
return status;
|
|
}
|
|
|
|
std::string ConvertDeviceAccessStatus(DeviceAccessStatus value) {
|
|
switch (value) {
|
|
case DeviceAccessStatus::DeviceAccessStatus_Unspecified:
|
|
return "not-determined";
|
|
case DeviceAccessStatus::DeviceAccessStatus_Allowed:
|
|
return "granted";
|
|
case DeviceAccessStatus::DeviceAccessStatus_DeniedBySystem:
|
|
return "restricted";
|
|
case DeviceAccessStatus::DeviceAccessStatus_DeniedByUser:
|
|
return "denied";
|
|
default:
|
|
return "unknown";
|
|
}
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace api {
|
|
|
|
bool SystemPreferences::IsAeroGlassEnabled() {
|
|
return true;
|
|
}
|
|
|
|
std::string hexColorDWORDToRGBA(DWORD color) {
|
|
DWORD rgba = color << 8 | color >> 24;
|
|
std::ostringstream stream;
|
|
stream << std::hex << std::setw(8) << std::setfill('0') << rgba;
|
|
return stream.str();
|
|
}
|
|
|
|
std::string SystemPreferences::GetAccentColor() {
|
|
DWORD color = 0;
|
|
BOOL opaque = FALSE;
|
|
|
|
if (FAILED(DwmGetColorizationColor(&color, &opaque))) {
|
|
return "";
|
|
}
|
|
|
|
return hexColorDWORDToRGBA(color);
|
|
}
|
|
|
|
std::string SystemPreferences::GetColor(gin_helper::ErrorThrower thrower,
|
|
const std::string& color) {
|
|
int id;
|
|
if (color == "3d-dark-shadow") {
|
|
id = COLOR_3DDKSHADOW;
|
|
} else if (color == "3d-face") {
|
|
id = COLOR_3DFACE;
|
|
} else if (color == "3d-highlight") {
|
|
id = COLOR_3DHIGHLIGHT;
|
|
} else if (color == "3d-light") {
|
|
id = COLOR_3DLIGHT;
|
|
} else if (color == "3d-shadow") {
|
|
id = COLOR_3DSHADOW;
|
|
} else if (color == "active-border") {
|
|
id = COLOR_ACTIVEBORDER;
|
|
} else if (color == "active-caption") {
|
|
id = COLOR_ACTIVECAPTION;
|
|
} else if (color == "active-caption-gradient") {
|
|
id = COLOR_GRADIENTACTIVECAPTION;
|
|
} else if (color == "app-workspace") {
|
|
id = COLOR_APPWORKSPACE;
|
|
} else if (color == "button-text") {
|
|
id = COLOR_BTNTEXT;
|
|
} else if (color == "caption-text") {
|
|
id = COLOR_CAPTIONTEXT;
|
|
} else if (color == "desktop") {
|
|
id = COLOR_DESKTOP;
|
|
} else if (color == "disabled-text") {
|
|
id = COLOR_GRAYTEXT;
|
|
} else if (color == "highlight") {
|
|
id = COLOR_HIGHLIGHT;
|
|
} else if (color == "highlight-text") {
|
|
id = COLOR_HIGHLIGHTTEXT;
|
|
} else if (color == "hotlight") {
|
|
id = COLOR_HOTLIGHT;
|
|
} else if (color == "inactive-border") {
|
|
id = COLOR_INACTIVEBORDER;
|
|
} else if (color == "inactive-caption") {
|
|
id = COLOR_INACTIVECAPTION;
|
|
} else if (color == "inactive-caption-gradient") {
|
|
id = COLOR_GRADIENTINACTIVECAPTION;
|
|
} else if (color == "inactive-caption-text") {
|
|
id = COLOR_INACTIVECAPTIONTEXT;
|
|
} else if (color == "info-background") {
|
|
id = COLOR_INFOBK;
|
|
} else if (color == "info-text") {
|
|
id = COLOR_INFOTEXT;
|
|
} else if (color == "menu") {
|
|
id = COLOR_MENU;
|
|
} else if (color == "menu-highlight") {
|
|
id = COLOR_MENUHILIGHT;
|
|
} else if (color == "menubar") {
|
|
id = COLOR_MENUBAR;
|
|
} else if (color == "menu-text") {
|
|
id = COLOR_MENUTEXT;
|
|
} else if (color == "scrollbar") {
|
|
id = COLOR_SCROLLBAR;
|
|
} else if (color == "window") {
|
|
id = COLOR_WINDOW;
|
|
} else if (color == "window-frame") {
|
|
id = COLOR_WINDOWFRAME;
|
|
} else if (color == "window-text") {
|
|
id = COLOR_WINDOWTEXT;
|
|
} else {
|
|
thrower.ThrowError("Unknown color: " + color);
|
|
return "";
|
|
}
|
|
|
|
return ToRGBHex(color_utils::GetSysSkColor(id));
|
|
}
|
|
|
|
std::string SystemPreferences::GetMediaAccessStatus(
|
|
gin_helper::ErrorThrower thrower,
|
|
const std::string& media_type) {
|
|
if (media_type == "camera") {
|
|
return ConvertDeviceAccessStatus(
|
|
GetDeviceAccessStatus(DeviceClass::DeviceClass_VideoCapture));
|
|
} else if (media_type == "microphone") {
|
|
return ConvertDeviceAccessStatus(
|
|
GetDeviceAccessStatus(DeviceClass::DeviceClass_AudioCapture));
|
|
} else if (media_type == "screen") {
|
|
return ConvertDeviceAccessStatus(
|
|
DeviceAccessStatus::DeviceAccessStatus_Allowed);
|
|
} else {
|
|
thrower.ThrowError("Invalid media type");
|
|
return std::string();
|
|
}
|
|
}
|
|
|
|
void SystemPreferences::InitializeWindow() {
|
|
inverted_color_scheme_ = IsInvertedColorScheme();
|
|
high_contrast_color_scheme_ = IsHighContrastColorScheme();
|
|
|
|
// Wait until app is ready before creating sys color listener
|
|
// Creating this listener before the app is ready causes global shortcuts
|
|
// to not fire
|
|
if (Browser::Get()->is_ready())
|
|
color_change_listener_ =
|
|
std::make_unique<gfx::ScopedSysColorChangeListener>(this);
|
|
else
|
|
Browser::Get()->AddObserver(this);
|
|
|
|
WNDCLASSEX window_class;
|
|
base::win::InitializeWindowClass(
|
|
kSystemPreferencesWindowClass,
|
|
&base::win::WrappedWindowProc<SystemPreferences::WndProcStatic>, 0, 0, 0,
|
|
NULL, NULL, NULL, NULL, NULL, &window_class);
|
|
instance_ = window_class.hInstance;
|
|
atom_ = RegisterClassEx(&window_class);
|
|
|
|
// Create an offscreen window for receiving broadcast messages for the system
|
|
// colorization color. Create a hidden WS_POPUP window instead of an
|
|
// HWND_MESSAGE window, because only top-level windows such as popups can
|
|
// receive broadcast messages like "WM_DWMCOLORIZATIONCOLORCHANGED".
|
|
window_ = CreateWindow(MAKEINTATOM(atom_), 0, WS_POPUP, 0, 0, 0, 0, 0, 0,
|
|
instance_, 0);
|
|
gfx::CheckWindowCreated(window_, ::GetLastError());
|
|
gfx::SetWindowUserData(window_, this);
|
|
}
|
|
|
|
LRESULT CALLBACK SystemPreferences::WndProcStatic(HWND hwnd,
|
|
UINT message,
|
|
WPARAM wparam,
|
|
LPARAM lparam) {
|
|
auto* msg_wnd = reinterpret_cast<SystemPreferences*>(
|
|
GetWindowLongPtr(hwnd, GWLP_USERDATA));
|
|
if (msg_wnd)
|
|
return msg_wnd->WndProc(hwnd, message, wparam, lparam);
|
|
else
|
|
return ::DefWindowProc(hwnd, message, wparam, lparam);
|
|
}
|
|
|
|
LRESULT CALLBACK SystemPreferences::WndProc(HWND hwnd,
|
|
UINT message,
|
|
WPARAM wparam,
|
|
LPARAM lparam) {
|
|
if (message == WM_DWMCOLORIZATIONCOLORCHANGED) {
|
|
DWORD new_color = (DWORD)wparam;
|
|
std::string new_color_string = hexColorDWORDToRGBA(new_color);
|
|
if (new_color_string != current_color_) {
|
|
Emit("accent-color-changed", hexColorDWORDToRGBA(new_color));
|
|
current_color_ = new_color_string;
|
|
}
|
|
}
|
|
return ::DefWindowProc(hwnd, message, wparam, lparam);
|
|
}
|
|
|
|
void SystemPreferences::OnSysColorChange() {
|
|
bool new_inverted_color_scheme = IsInvertedColorScheme();
|
|
if (new_inverted_color_scheme != inverted_color_scheme_) {
|
|
inverted_color_scheme_ = new_inverted_color_scheme;
|
|
Emit("inverted-color-scheme-changed", new_inverted_color_scheme);
|
|
}
|
|
|
|
bool new_high_contrast_color_scheme = IsHighContrastColorScheme();
|
|
if (new_high_contrast_color_scheme != high_contrast_color_scheme_) {
|
|
high_contrast_color_scheme_ = new_high_contrast_color_scheme;
|
|
Emit("high-contrast-color-scheme-changed", new_high_contrast_color_scheme);
|
|
}
|
|
|
|
Emit("color-changed");
|
|
}
|
|
|
|
void SystemPreferences::OnFinishLaunching(base::Value::Dict launch_info) {
|
|
color_change_listener_ =
|
|
std::make_unique<gfx::ScopedSysColorChangeListener>(this);
|
|
}
|
|
|
|
} // namespace api
|
|
|
|
} // namespace electron
|