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

Merge pull request #8347 from Rastaban/master

Browse source 
fix permissive C++ code (MSVC /permissive-)
This commit is contained in:
Kevin Sawicki 2017-01-05 14:53:11 -08:00 committed by GitHub
commit d3d09ff25f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,7 @@ bool AppendTask(const JumpListItem& item, IObjectCollection* collection) {
item.icon_index))) item.icon_index)))
return false; return false;
CComQIPtr<IPropertyStore> property_store = link; CComQIPtr<IPropertyStore> property_store(link);
if (!base::win::SetStringValueForPropertyStore(property_store, PKEY_Title, if (!base::win::SetStringValueForPropertyStore(property_store, PKEY_Title,
item.title.c_str())) item.title.c_str()))
return false; return false;
@ -44,7 +44,7 @@ bool AppendSeparator(IObjectCollection* collection) {
CComPtr<IShellLink> shell_link; CComPtr<IShellLink> shell_link;
if (SUCCEEDED(shell_link.CoCreateInstance(CLSID_ShellLink))) { if (SUCCEEDED(shell_link.CoCreateInstance(CLSID_ShellLink))) {
CComQIPtr<IPropertyStore> property_store = shell_link; CComQIPtr<IPropertyStore> property_store(shell_link);
if (base::win::SetBooleanValueForPropertyStore( if (base::win::SetBooleanValueForPropertyStore(
property_store, PKEY_AppUserModel_IsDestListSeparator, true)) property_store, PKEY_AppUserModel_IsDestListSeparator, true))
return SUCCEEDED(collection->AddObject(shell_link)); return SUCCEEDED(collection->AddObject(shell_link));
@ -254,7 +254,7 @@ JumpListResult JumpList::AppendCategory(const JumpListCategory& category) {
result = JumpListResult::GENERIC_ERROR; result = JumpListResult::GENERIC_ERROR;
} }
CComQIPtr<IObjectArray> items = collection; CComQIPtr<IObjectArray> items(collection);
if (category.type == JumpListCategory::Type::TASKS) { if (category.type == JumpListCategory::Type::TASKS) {
if (FAILED(destinations_->AddUserTasks(items))) { if (FAILED(destinations_->AddUserTasks(items))) {