mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #13578 from electron/miniak/refactoring

Browse source 
refactor: statically link functions available on Windows 7+
This commit is contained in:
John Kleinschmidt 2018-07-13 10:52:37 -04:00 • committed by GitHub
commit 539b554ecc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/api/atom_api_system_preferences.h
View file

@ -50,11 +50,6 @@ class SystemPreferences : public mate::EventEmitter<SystemPreferences>
#if defined(OS_WIN) #if defined(OS_WIN)
bool IsAeroGlassEnabled(); bool IsAeroGlassEnabled();
typedef HRESULT(STDAPICALLTYPE* DwmGetColorizationColor)(DWORD*, BOOL*);
DwmGetColorizationColor dwmGetColorizationColor =
(DwmGetColorizationColor)GetProcAddress(LoadLibraryW(L"dwmapi.dll"),
"DwmGetColorizationColor");
std::string GetAccentColor(); std::string GetAccentColor();
std::string GetColor(const std::string& color, mate::Arguments* args); std::string GetColor(const std::string& color, mate::Arguments* args);

3
atom/browser/api/atom_api_system_preferences_win.cc
View file

@ -2,6 +2,7 @@
// Use of this source code is governed by the MIT license that can be // Use of this source code is governed by the MIT license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include <dwmapi.h>
#include <iomanip> #include <iomanip>
#include "atom/browser/api/atom_api_system_preferences.h" #include "atom/browser/api/atom_api_system_preferences.h"
@ -38,7 +39,7 @@ std::string SystemPreferences::GetAccentColor() {
DWORD color = 0; DWORD color = 0;
BOOL opaque = FALSE; BOOL opaque = FALSE;
if (FAILED(dwmGetColorizationColor(&color, &opaque))) { if (FAILED(DwmGetColorizationColor(&color, &opaque))) {
return ""; return "";
} }

31
atom/common/platform_util_win.cc
View file

@ -240,33 +240,6 @@ bool ShowItemInFolder(const base::FilePath& full_path) {
if (dir.empty()) if (dir.empty())
return false; return false;
typedef HRESULT(WINAPI * SHOpenFolderAndSelectItemsFuncPtr)(
PCIDLIST_ABSOLUTE pidl_Folder, UINT cidl, PCUITEMID_CHILD_ARRAY pidls,
DWORD flags);
static SHOpenFolderAndSelectItemsFuncPtr open_folder_and_select_itemsPtr =
NULL;
static bool initialize_open_folder_proc = true;
if (initialize_open_folder_proc) {
initialize_open_folder_proc = false;
// The SHOpenFolderAndSelectItems API is exposed by shell32 version 6
// and does not exist in Win2K. We attempt to retrieve this function export
// from shell32 and if it does not exist, we just invoke ShellExecute to
// open the folder thus losing the functionality to select the item in
// the process.
HMODULE shell32_base = GetModuleHandle(L"shell32.dll");
if (!shell32_base) {
NOTREACHED() << " " << __FUNCTION__ << "(): Can't open shell32.dll";
return false;
}
open_folder_and_select_itemsPtr =
reinterpret_cast<SHOpenFolderAndSelectItemsFuncPtr>(
GetProcAddress(shell32_base, "SHOpenFolderAndSelectItems"));
}
if (!open_folder_and_select_itemsPtr) {
return ui::win::OpenFolderViaShell(dir);
}
Microsoft::WRL::ComPtr<IShellFolder> desktop; Microsoft::WRL::ComPtr<IShellFolder> desktop;
HRESULT hr = SHGetDesktopFolder(desktop.GetAddressOf()); HRESULT hr = SHGetDesktopFolder(desktop.GetAddressOf());
if (FAILED(hr)) if (FAILED(hr))
@ -290,8 +263,8 @@ bool ShowItemInFolder(const base::FilePath& full_path) {
const ITEMIDLIST* highlight[] = {file_item}; const ITEMIDLIST* highlight[] = {file_item};
hr = (*open_folder_and_select_itemsPtr)(dir_item, arraysize(highlight), hr = SHOpenFolderAndSelectItems(dir_item, arraysize(highlight), highlight,
highlight, NULL); NULL);
if (!FAILED(hr)) if (!FAILED(hr))
return true; return true;

1
electron.gyp
View file

@ -363,6 +363,7 @@
], ],
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'-ldwmapi.lib',
'-limm32.lib', '-limm32.lib',
'-lgdi32.lib', '-lgdi32.lib',
'-loleacc.lib', '-loleacc.lib',