From d2ad619d87a7f6280f4b878cc5e9d762db74911b Mon Sep 17 00:00:00 2001
From: James Rowe <jroweboy@gmail.com>
Date: Fri, 6 Dec 2019 00:27:44 -0700
Subject: [PATCH] Use the correct icon for the application shortcuts

---
 src/native/interop.cpp               | 6 +++++-
 src/native/mod.rs                    | 5 +++++
 src/tasks/install_global_shortcut.rs | 1 +
 src/tasks/install_shortcuts.rs       | 1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/native/interop.cpp b/src/native/interop.cpp
index 7121614..6ff0154 100644
--- a/src/native/interop.cpp
+++ b/src/native/interop.cpp
@@ -43,7 +43,8 @@ extern "C" int saveShortcut(
     const wchar_t *description,
     const wchar_t *path,
     const wchar_t *args,
-    const wchar_t *workingDir)
+    const wchar_t *workingDir,
+    const wchar_t *exePath)
 {
     const char *errStr = NULL;
     HRESULT h;
@@ -82,6 +83,9 @@ extern "C" int saveShortcut(
         shellLink->SetDescription(description);
     if (path != NULL)
         shellLink->SetPath(path);
+    // default to using the first icon in the exe (usually correct)
+    if (exePath != NULL)
+        shellLink->SetIconLocation(exePath, 0);
     if (args != NULL)
         shellLink->SetArguments(args);
     if (workingDir != NULL)
diff --git a/src/native/mod.rs b/src/native/mod.rs
index b138870..0a1e9b5 100644
--- a/src/native/mod.rs
+++ b/src/native/mod.rs
@@ -39,6 +39,7 @@ mod natives {
             path: *const winapi::ctypes::wchar_t,
             args: *const winapi::ctypes::wchar_t,
             workingDir: *const winapi::ctypes::wchar_t,
+            exePath: *const winapi::ctypes::wchar_t,
         ) -> ::std::os::raw::c_int;
 
         pub fn isDarkThemeActive() -> ::std::os::raw::c_uint;
@@ -59,6 +60,7 @@ mod natives {
         target: &str,
         args: &str,
         working_dir: &str,
+        exe_path: &str,
     ) -> Result<String, String> {
         let source_file = format!(
             "{}\\Microsoft\\Windows\\Start Menu\\Programs\\{}.lnk",
@@ -78,6 +80,8 @@ mod natives {
             U16CString::from_str(args).log_expect("Error while converting to wchar_t");
         let native_working_dir =
             U16CString::from_str(working_dir).log_expect("Error while converting to wchar_t");
+        let native_exe_path =
+            U16CString::from_str(exe_path).log_expect("Error while converting to wchar_t");
 
         let shortcutResult = unsafe {
             saveShortcut(
@@ -86,6 +90,7 @@ mod natives {
                 native_target.as_ptr(),
                 native_args.as_ptr(),
                 native_working_dir.as_ptr(),
+                native_exe_path.as_ptr(),
             )
         };
 
diff --git a/src/tasks/install_global_shortcut.rs b/src/tasks/install_global_shortcut.rs
index 26013e4..58e1597 100644
--- a/src/tasks/install_global_shortcut.rs
+++ b/src/tasks/install_global_shortcut.rs
@@ -58,6 +58,7 @@ impl Task for InstallGlobalShortcutsTask {
             // TODO: Send by list
             "",
             &starting_dir,
+            "",
         )?;
 
         if !shortcut_file.is_empty() {
diff --git a/src/tasks/install_shortcuts.rs b/src/tasks/install_shortcuts.rs
index e9c3986..0495e33 100644
--- a/src/tasks/install_shortcuts.rs
+++ b/src/tasks/install_shortcuts.rs
@@ -83,6 +83,7 @@ impl Task for InstallShortcutsTask {
                 // TODO: Send by list
                 &format!("--launcher \"{}\"", exe_path),
                 &starting_dir,
+                exe_path,
             )?);
         }