Fixed windows ShellExecute(Ex) parsing of arguments with double quotes and/or spaces

Author: luskaner

launcher-common/executor/exec/ShellExecuteExW_windows.go

@@ -36,7 +36,7 @@ func shellExecuteEx(verb string, start bool, executable string, executableWorkin
 	exitCode = common.ErrSuccess
 	verbPtr, _ := windows.UTF16PtrFromString(verb)
 	exe, _ := windows.UTF16PtrFromString(executable)
-	args, _ := windows.UTF16PtrFromString(strings.Join(arg, " "))
+	args, _ := windows.UTF16PtrFromString(strings.Join(fixArgs(arg...), " "))
 
 	info := &SHELLEXECUTEINFO{
 		cbSize:       uint32(unsafe.Sizeof(SHELLEXECUTEINFO{})),

launcher-common/executor/exec/executor_windows.go

@@ -1,25 +1,32 @@
 package exec
 
 import (
+	"fmt"
 	"golang.org/x/sys/windows"
 	"os/exec"
 	"path/filepath"
 	"strings"
 )
 
+func fixArgs(arg ...string) []string {
+	for i := range arg {
+		arg[i] = fmt.Sprintf(`"%s"`, strings.ReplaceAll(arg[i], `"`, `\"`))
+	}
+	return arg
+}
+
 func shellExecute(verb string, file string, executableWorkingPath bool, showWindow int32, arg ...string) error {
 	verbPtr, _ := windows.UTF16PtrFromString(verb)
 	exe, _ := windows.UTF16PtrFromString(file)
-	args, _ := windows.UTF16PtrFromString(strings.Join(arg, " "))
+	args, _ := windows.UTF16PtrFromString(strings.Join(fixArgs(arg...), " "))
 	var workingDirPtr *uint16
 	if executableWorkingPath {
 		workingDirPtr, _ = windows.UTF16PtrFromString(filepath.Dir(file))
 	} else {
 		workingDirPtr = nil
 	}
 
-	err := windows.ShellExecute(0, verbPtr, exe, args, workingDirPtr, showWindow)
-	return err
+	return windows.ShellExecute(0, verbPtr, exe, args, workingDirPtr, showWindow)
 }
 
 func (options Options) exec() (result *Result) {