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

Throw exception when ReadShortcutLink failed

Browse source
This commit is contained in:
Cheng Zhao 2016-07-27 16:32:32 +09:00
commit ff5b8047a1
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
atom/common/api/atom_api_shell.cc
View file

@ -93,15 +93,16 @@ bool WriteShortcutLink(const base::FilePath& shortcut_path,
shortcut_path, properties, operation); shortcut_path, properties, operation);
} }
mate::Dictionary ReadShortcutLink(v8::Isolate* isolate, v8::Local<v8::Value> ReadShortcutLink(mate::Arguments* args,
const base::FilePath& path) { const base::FilePath& path) {
using base::win::ShortcutProperties; using base::win::ShortcutProperties;
mate::Dictionary options = mate::Dictionary::CreateEmpty(isolate); mate::Dictionary options = mate::Dictionary::CreateEmpty(args->isolate());
base::win::ScopedCOMInitializer com_initializer; base::win::ScopedCOMInitializer com_initializer;
base::win::ShortcutProperties properties; base::win::ShortcutProperties properties;
if (!base::win::ResolveShortcutProperties( if (!base::win::ResolveShortcutProperties(
path, ShortcutProperties::PROPERTIES_ALL, &properties)) { path, ShortcutProperties::PROPERTIES_ALL, &properties)) {
return options; args->ThrowError("Failed to read shortcut link");
return v8::Null(args->isolate());
} }
options.Set("target", properties.target); options.Set("target", properties.target);
options.Set("cwd", properties.working_dir); options.Set("cwd", properties.working_dir);
@ -110,7 +111,7 @@ mate::Dictionary ReadShortcutLink(v8::Isolate* isolate,
options.Set("icon", properties.icon); options.Set("icon", properties.icon);
options.Set("iconIndex", properties.icon_index); options.Set("iconIndex", properties.icon_index);
options.Set("appUserModelId", properties.app_id); options.Set("appUserModelId", properties.app_id);
return options; return options.GetHandle();
} }
#endif #endif