From adaa32003df7e25de9e6fd8143a28875f505a780 Mon Sep 17 00:00:00 2001 From: Milan Burda Date: Fri, 6 Jul 2018 23:39:56 +0200 Subject: [PATCH] refactor: DwmGetColorizationColor does not have to be dynamically resolved --- atom/browser/api/atom_api_system_preferences.h | 5 ----- atom/browser/api/atom_api_system_preferences_win.cc | 3 ++- electron.gyp | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/atom/browser/api/atom_api_system_preferences.h b/atom/browser/api/atom_api_system_preferences.h index bfd64e8015..e0ef26a9fc 100644 --- a/atom/browser/api/atom_api_system_preferences.h +++ b/atom/browser/api/atom_api_system_preferences.h @@ -50,11 +50,6 @@ class SystemPreferences : public mate::EventEmitter #if defined(OS_WIN) bool IsAeroGlassEnabled(); - typedef HRESULT(STDAPICALLTYPE* DwmGetColorizationColor)(DWORD*, BOOL*); - DwmGetColorizationColor dwmGetColorizationColor = - (DwmGetColorizationColor)GetProcAddress(LoadLibraryW(L"dwmapi.dll"), - "DwmGetColorizationColor"); - std::string GetAccentColor(); std::string GetColor(const std::string& color, mate::Arguments* args); diff --git a/atom/browser/api/atom_api_system_preferences_win.cc b/atom/browser/api/atom_api_system_preferences_win.cc index b3fd74d59d..0a24d1abf4 100644 --- a/atom/browser/api/atom_api_system_preferences_win.cc +++ b/atom/browser/api/atom_api_system_preferences_win.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. +#include #include #include "atom/browser/api/atom_api_system_preferences.h" @@ -38,7 +39,7 @@ std::string SystemPreferences::GetAccentColor() { DWORD color = 0; BOOL opaque = FALSE; - if (FAILED(dwmGetColorizationColor(&color, &opaque))) { + if (FAILED(DwmGetColorizationColor(&color, &opaque))) { return ""; } diff --git a/electron.gyp b/electron.gyp index 790d0ed5e2..922c6b2570 100644 --- a/electron.gyp +++ b/electron.gyp @@ -363,6 +363,7 @@ ], 'link_settings': { 'libraries': [ + '-ldwmapi.lib', '-limm32.lib', '-lgdi32.lib', '-loleacc.lib',