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

chore: fix some more warnings in windows build (#13431)

Browse source 
Remove an unused function and fix an int type comparison warning. Only showed up when building with GN.
This commit is contained in:
Jeremy Apthorp 2018-06-26 02:00:20 +02:00 committed by GitHub
parent 6f91af9343
commit 78bc1081fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/ui/win/jump_list.cc
View file

@ -275,9 +275,9 @@ JumpListResult JumpList::AppendCategory(const JumpListCategory& category) {
result = JumpListResult::GENERIC_ERROR;
}
} else {
auto hr = destinations_->AppendCategory(category.name.c_str(), items);
HRESULT hr = destinations_->AppendCategory(category.name.c_str(), items);
if (FAILED(hr)) {
if (hr == 0x80040F03) {
if (hr == static_cast<HRESULT>(0x80040F03)) {
LOG(ERROR) << "Failed to append custom category "
<< "'" << category.name << "' "
<< "to Jump List due to missing file type registration.";

16
atom/common/platform_util_win.cc
View file

@ -31,22 +31,6 @@
namespace {
// Old ShellExecute crashes the process when the command for a given scheme
// is empty. This function tells if it is.
bool ValidateShellCommandForScheme(const std::string& scheme) {
base::win::RegKey key;
base::string16 registry_path =
base::ASCIIToUTF16(scheme) + L"\\shell\\open\\command";
key.Open(HKEY_CLASSES_ROOT, registry_path.c_str(), KEY_READ);
if (!key.Valid())
return false;
DWORD size = 0;
key.ReadValue(NULL, NULL, &size, NULL);
if (size <= 2)
return false;
return true;
}
// Required COM implementation of IFileOperationProgressSink so we can
// precheck files before deletion to make sure they can be move to the
// Recycle Bin.