mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
* chore: bump chromium in DEPS to 146.0.7652.0 * fix(patch-conflict): update mas_avoid_private_macos_api_usage context for constrainFrameRect method The upstream CL added a new constrainFrameRect:toScreen: method override to NativeWidgetMacNSWindow as part of headless mode window zoom implementation. The MAS patch's #endif for frameViewClassForStyleMask now correctly appears after that method, since constrainFrameRect is a public API override that doesn't need to be guarded. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7487666 * fix(patch-conflict): update printing.patch for base::DictValue rename Updated printing.patch to use the new base::DictValue type name instead of base::Value::Dict following Chromium's type renaming change. This affects CompleteUpdatePrintSettings() signature and related code. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * fix(patch-conflict): update accessibility_ui patch for base::DictValue/ListValue rename Updated adjust_accessibility_ui_for_electron.patch to use the new base::DictValue and base::ListValue type names instead of base::Value::Dict and base::Value::List following Chromium's type renaming change. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * chore: update patches * 6625736: Rename DURABLE_STORAGE to PERSISTENT_STORAGE for consistency | https://chromium-review.googlesource.com/c/chromium/src/+/6625736 * chore: bump chromium in DEPS to 146.0.7653.0 * chore: update patches * 7000847: add type tag to v8::External for gin_helper function templates The upstream gin function templates now use v8::ExternalPointerTypeTag for type safety when using v8::External. Updated Electron's forked gin_helper function template to use the same kGinInternalCallbackHolderBaseTag that Chromium's gin uses. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * fix(patch-update): extend V8 Object API deprecation patch for Node.js Extended the existing patch to cover additional files that use GetAlignedPointerFromInternalField and SetAlignedPointerInInternalField: - src/stream_base-inl.h - src/udp_wrap.cc - src/js_udp_wrap.cc - src/node_process_methods.cc - src/node_snapshotable.cc - src/base_object.cc These APIs now require an EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * 7000847: add type tag to v8::External calls in shared_texture Updated v8::External::New and v8::External::Value calls to use the kExternalPointerTypeTagDefault tag as required by the V8 API change that deprecates the tagless versions. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * 7508687: use ChildProcessId for file permission APIs The ChildProcessSecurityPolicy::CanReadFile and GrantReadFile APIs now require ChildProcessId instead of int. Updated to use GetID() instead of GetDeprecatedID() for these specific calls. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7508687 * 7000847: add type tag to v8::External calls in callback and osr_converter The v8::External API now requires an EmbedderPointerTypeTag parameter for both New() and Value() methods to improve V8 sandbox type safety. Updated calls in: - callback.cc: TranslatorHolder constructor and CallTranslator - osr_converter.cc: OffscreenSharedTextureValue converter Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7000847 * fixup! 7087956: [api] Promote deprecation of v8::Context and v8::Object API methods Extended the Node.js patch to cover histogram.cc which also uses SetAlignedPointerInInternalField and GetAlignedPointerFromInternalField APIs that now require the EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * chore: bump chromium in DEPS to 146.0.7655.0 * chore: update patches * 7509043: update WebSpellingMarker type for API change The upstream Chromium API changed - WebSpellingMarker was moved from a nested type within WebTextCheckClient to a standalone type in the blink namespace. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509043 * 7498491: update process_id to use OriginatingProcess type The upstream Chromium API changed - URLLoaderFactoryParams::process_id was changed from an integer to a union type network::OriginatingProcess that distinguishes between browser and renderer processes. - For browser process requests, use OriginatingProcess::browser() - For renderer process lookups, check !is_browser() and use renderer_process().value() to get the child_id Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7498491 * 5710330: Add crash keys to debug NativeWidgetMacNSWindowBorderlessFrame exception | https://chromium-review.googlesource.com/c/chromium/src/+/5710330 5710330 added a new NSNextStepFrame interface extension and implementations for NativeWidgetMacNSWindowTitledFrame and NativeWidgetMacNSWindowBorderlessFrame. These use private macOS APIs that are not available in Mac App Store builds. * chore: update patches * chore: bump chromium in DEPS to 146.0.7661.0 * chore: bump chromium in DEPS to 146.0.7663.0 * fix(patch-conflict): update accessibility_ui for string_view API change Upstream removed redundant std::string(default_api_type) conversion as part of a string_view optimization cleanup. Updated patch context to match. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7514107 * fix(patch-conflict): update service process launch options for sandbox API refactor Upstream removed content/common/sandbox_init_win.cc and content/public/common/sandbox_init_win.h, moving the functionality directly into ChildProcessLauncherHelper. Updated patch to call sandbox::policy::SandboxWin::StartSandboxedProcess directly with the LaunchOptions pointer instead of going through the removed helper. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7528253 * fix(patch-conflict): update MAS safestorage for keychain API refactor Upstream refactored KeychainPassword::GetPassword() to use a new GetPasswordImpl() helper function with improved error tracking via base::expected<std::string, OSStatus>. Adapted patch to use the new GetPasswordImpl with the suffixed account name and handle migration from legacy accounts through the new API. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7516438 * chore: update patches * chore: bump chromium in DEPS to 146.0.7663.0 * fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: include new cookie exclusion reason https://chromium-review.googlesource.com/c/chromium/src/+/7486527 * fix: enable libc++ ABI flag for trivially copyable std::vector<bool> Required for changes introduced in the following CL https://chromium-review.googlesource.com/c/chromium/src/+/7513653 * fixup! fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: spellcheck not working in tests https://chromium-review.googlesource.com/c/chromium/src/+/7452579 * fix: cookie test failing due to multiple rejection reasons https://chromium-review.googlesource.com/c/chromium/src/+/7506629 * fix: macos sizing unmaximized window incorrectly https://chromium-review.googlesource.com/c/chromium/src/+/7487666 Changes to headless mode caused the unmaximized window to subtract the height of the menubar. * fix: skip tests for incompatible BoringSSL ML-DSA crypto https://boringssl-review.googlesource.com/c/boringssl/+/84929 * test: fix pseudonymization registration in utility process on Linux Ref: 7486913: Pass pseudonymization salt via shared memory at process launch | https://chromium-review.googlesource.com/c/chromium/src/+/7486913 * fix: restore MAS patch-outs Restores some `#if !IS_MAS_BUILD()` gates dropped in773054ad59* fixup! 7508687: use ChildProcessId for file permission APIs * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor * chore: add note about parallel upstream change * fixup! Merge remote-tracking branch 'origin/main' into roller/chromium/main * Revert "fixup! 7508687: use ChildProcessId for file permission APIs" This reverts commit05c43e4e5d. The _impl version has the signature, but not the public interface. :oof: * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor --------- 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: Samuel Maddock <samuelmaddock@electronjs.org> Co-authored-by: clavin <clavin@electronjs.org>
233 lines
8.2 KiB
C++
233 lines
8.2 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 <iomanip>
|
|
#include <string_view>
|
|
|
|
#include <windows.devices.enumeration.h>
|
|
#include <wrl/client.h>
|
|
|
|
#include "shell/browser/api/electron_api_system_preferences.h"
|
|
|
|
#include "base/containers/fixed_flat_map.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 "shell/common/process_util.h"
|
|
#include "skia/ext/skia_utils_win.h"
|
|
#include "ui/gfx/win/hwnd_util.h"
|
|
#include "ui/gfx/win/singleton_hwnd.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 {
|
|
|
|
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() {
|
|
std::optional<DWORD> color = GetSystemAccentColor();
|
|
|
|
if (!color.has_value())
|
|
return "";
|
|
|
|
return ToRGBAHex(skia::COLORREFToSkColor(color.value()), false);
|
|
}
|
|
|
|
std::string SystemPreferences::GetColor(gin_helper::ErrorThrower thrower,
|
|
const std::string& color) {
|
|
static constexpr auto Lookup = base::MakeFixedFlatMap<std::string_view, int>({
|
|
{"3d-dark-shadow", COLOR_3DDKSHADOW},
|
|
{"3d-face", COLOR_3DFACE},
|
|
{"3d-highlight", COLOR_3DHIGHLIGHT},
|
|
{"3d-light", COLOR_3DLIGHT},
|
|
{"3d-shadow", COLOR_3DSHADOW},
|
|
{"active-border", COLOR_ACTIVEBORDER},
|
|
{"active-caption", COLOR_ACTIVECAPTION},
|
|
{"active-caption-gradient", COLOR_GRADIENTACTIVECAPTION},
|
|
{"app-workspace", COLOR_APPWORKSPACE},
|
|
{"button-text", COLOR_BTNTEXT},
|
|
{"caption-text", COLOR_CAPTIONTEXT},
|
|
{"desktop", COLOR_DESKTOP},
|
|
{"disabled-text", COLOR_GRAYTEXT},
|
|
{"highlight", COLOR_HIGHLIGHT},
|
|
{"highlight-text", COLOR_HIGHLIGHTTEXT},
|
|
{"hotlight", COLOR_HOTLIGHT},
|
|
{"inactive-border", COLOR_INACTIVEBORDER},
|
|
{"inactive-caption", COLOR_INACTIVECAPTION},
|
|
{"inactive-caption-gradient", COLOR_GRADIENTINACTIVECAPTION},
|
|
{"inactive-caption-text", COLOR_INACTIVECAPTIONTEXT},
|
|
{"info-background", COLOR_INFOBK},
|
|
{"info-text", COLOR_INFOTEXT},
|
|
{"menu", COLOR_MENU},
|
|
{"menu-highlight", COLOR_MENUHILIGHT},
|
|
{"menu-text", COLOR_MENUTEXT},
|
|
{"menubar", COLOR_MENUBAR},
|
|
{"scrollbar", COLOR_SCROLLBAR},
|
|
{"window", COLOR_WINDOW},
|
|
{"window-frame", COLOR_WINDOWFRAME},
|
|
{"window-text", COLOR_WINDOWTEXT},
|
|
});
|
|
|
|
if (auto iter = Lookup.find(color); iter != Lookup.end())
|
|
return ToRGBAHex(GetSysSkColor(iter->second));
|
|
|
|
thrower.ThrowError("Unknown color: " + color);
|
|
return "";
|
|
}
|
|
|
|
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 {};
|
|
}
|
|
}
|
|
|
|
void SystemPreferences::InitializeWindow() {
|
|
if (electron::IsUtilityProcess())
|
|
return;
|
|
// 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())
|
|
hwnd_subscription_ =
|
|
gfx::SingletonHwnd::GetInstance()->RegisterCallback(base::BindRepeating(
|
|
&SystemPreferences::OnWndProc, base::Unretained(this)));
|
|
else
|
|
Browser::Get()->AddObserver(this);
|
|
|
|
WNDCLASSEX window_class;
|
|
base::win::InitializeWindowClass(
|
|
kSystemPreferencesWindowClass,
|
|
&base::win::WrappedWindowProc<SystemPreferences::WndProcStatic>, 0, 0, 0,
|
|
nullptr, nullptr, nullptr, nullptr, nullptr, &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::OnWndProc(HWND hwnd,
|
|
UINT message,
|
|
WPARAM wparam,
|
|
LPARAM lparam) {
|
|
if (message != WM_SYSCOLORCHANGE &&
|
|
(message != WM_SETTINGCHANGE || wparam != SPI_SETHIGHCONTRAST)) {
|
|
return;
|
|
}
|
|
Emit("color-changed");
|
|
}
|
|
|
|
void SystemPreferences::OnFinishLaunching(base::DictValue launch_info) {
|
|
hwnd_subscription_ =
|
|
gfx::SingletonHwnd::GetInstance()->RegisterCallback(base::BindRepeating(
|
|
&SystemPreferences::OnWndProc, base::Unretained(this)));
|
|
}
|
|
|
|
} // namespace api
|
|
|
|
} // namespace electron
|