fix run elevated powershell scripts

Yetenol · Oct 10, 2022 · a2c1022 · a2c1022
1 parent f4c7b49
commit a2c1022
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/scripts/wingetUpdateAll.ps1.bat b/scripts/wingetUpdateAll.ps1.bat
@@ -2,8 +2,8 @@
 # Script is executable and self-elevating when renamed *.cmd or *.bat
 
 # Import known folder
-$env:CommonDesktop = New-Object -ComObject Shell.Application).NameSpace('shell:Common Desktop').Self.Path
-$env:Desktop = New-Object -ComObject Shell.Application).NameSpace('shell:Desktop').Self.Path
+$env:CommonDesktop = (New-Object -ComObject Shell.Application).NameSpace('shell:Common Desktop').Self.Path
+$env:Desktop = (New-Object -ComObject Shell.Application).NameSpace('shell:Desktop').Self.Path
 
 # Update all winget applications
 winget upgrade --all

diff --git a/source/trayMenu.ahk b/source/trayMenu.ahk
@@ -321,7 +321,8 @@ handler(itemName, itemPosition, menu) {
         Send action.send
     }
     if action.hasOwnProp("run") {
-        Run action.run
+        file := NormalizePath(action.run)
+        Run file, A_WorkingDir
     }
     if action.HasOwnProp("switch") {
         menu.ToggleCheck(itemName)
@@ -340,4 +341,11 @@ findAction(&menu, text) {
         }
     }
     return false    ; couldn't find item
+}
+
+NormalizePath(path) {
+    cc := DllCall("GetFullPathName", "str", path, "uint", 0, "ptr", 0, "ptr", 0, "uint")
+    buf := Buffer(cc * 2)
+    DllCall("GetFullPathName", "str", path, "uint", cc, "ptr", buf, "ptr", 0)
+    return StrGet(buf)
 }