windows: Run --versions command if double-clicked

framework_tool/Cargo.toml

@@ -9,3 +9,11 @@ path = "../framework_lib"
 [build-dependencies]
 # Note: Only takes effect in release builds
 static_vcruntime = "2.0"
+embed-resource = "3.0"
+winresource = "0.1.17"
+
+[target.'cfg(windows)'.dependencies.winapi]
+version = "0.3.9"
+features = [
+  "wincon"
+]

framework_tool/build.rs

@@ -1,3 +1,19 @@
 fn main() {
-    static_vcruntime::metabuild();
+    // Add app icon
+    if std::env::var_os("CARGO_CFG_WINDOWS").is_some() {
+        winresource::WindowsResource::new()
+            .set_icon("..\\res\\framework_startmenuicon.ico")
+            .compile()
+            .unwrap();
+    }
+
+    if !cfg!(debug_assertions) {
+        // Statically link vcruntime to allow running on clean install
+        static_vcruntime::metabuild();
+
+        // Embed resources file to force running as admin
+        embed_resource::compile("framework_tool-manifest.rc", embed_resource::NONE)
+            .manifest_optional()
+            .unwrap();
+    }
 }

framework_tool/framework_tool-manifest.rc

@@ -0,0 +1,2 @@
+#define RT_MANIFEST 24
+1 RT_MANIFEST "framework_tool.exe.manifest"

framework_tool/framework_tool.exe.manifest

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+        <security>
+            <requestedPrivileges>
+                <requestedExecutionLevel level="requireAdministrator" uiAccess="false"/>
+            </requestedPrivileges>
+        </security>
+    </trustInfo>
+</assembly>

framework_tool/src/main.rs

@@ -6,9 +6,49 @@ fn get_args() -> Vec<String> {
 }
 
 fn main() -> Result<(), &'static str> {
-    let args = commandline::parse(&get_args());
+    let args = get_args();
+
+    // If the user double-clicks (opens from explorer/desktop),
+    // then we want to have the default behavior of showing a report of
+    // all firmware versions.
+    #[cfg(windows)]
+    let (args, double_clicked) = {
+        let double_clicked = unsafe {
+            // See https://devblogs.microsoft.com/oldnewthing/20160125-00/?p=92922
+            let mut plist: winapi::shared::minwindef::DWORD = 0;
+            let processes = winapi::um::wincon::GetConsoleProcessList(&mut plist, 1);
+
+            // If we're the only process that means we're in a fresh terminal
+            // without CMD or powershell. This happens in some cases, for example
+            // if the user double-clicks the app from Explorer.
+            processes == 1
+        };
+        // But it also happens if launched from the commandline and a UAC prompt is necessary,
+        // for example with sudo set to open "In a new windows", therefore we also have to
+        // check that no commandline arguments were provided.
+        if double_clicked && args.len() == 1 {
+            (
+                vec![args[0].clone(), "--versions".to_string()],
+                double_clicked,
+            )
+        } else {
+            (args, double_clicked)
+        }
+    };
+
+    let args = commandline::parse(&args);
     if (commandline::run_with_args(&args, false)) != 0 {
         return Err("Fail");
     }
+
+    // Prevent command prompt from auto closing
+    #[cfg(windows)]
+    if double_clicked {
+        println!();
+        println!("Press ENTER to exit...");
+        let mut line = String::new();
+        let _ = std::io::stdin().read_line(&mut line).unwrap();
+    }
+
     Ok(())
 }