Use FOLDERID_Programs to detects Start Menu/Programs folder

lchudinov · lchudinov · commit b93639f1747f · 2020-08-11T14:24:30.000+05:00
diff --git a/utils/utils_windows.go b/utils/utils_windows.go
@@ -325,21 +325,13 @@ func RemoveStartMenuFolder(folder string) error {
 }
 
 func getProgramsStartMenuDir() (string, error) {
-	startMenuFolder, err := GetStartMenuFolder()
-	if err != nil {
-		return "", err
-	}
-	return filepath.Join(startMenuFolder, "Programs"), nil
+	return windows.KnownFolderPath(windows.FOLDERID_Programs, 0)
 }
 
 func GetDesktopFolder() (string, error) {
 	return windows.KnownFolderPath(windows.FOLDERID_Desktop, 0)
 }
 
-func GetStartMenuFolder() (string, error) {
-	return windows.KnownFolderPath(windows.FOLDERID_StartMenu, 0)
-}
-
 var (
 	pMessageBoxW = user32.NewProc("MessageBoxW")
 )

Original file line number	Diff line number	Diff line change
`@@ -325,21 +325,13 @@ func RemoveStartMenuFolder(folder string) error {`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`func getProgramsStartMenuDir() (string, error) {`
`328`		`- startMenuFolder, err := GetStartMenuFolder()`
`329`		`- if err != nil {`
`330`		`- return "", err`
`331`		`- }`
`332`		`- return filepath.Join(startMenuFolder, "Programs"), nil`
	`328`	`+ return windows.KnownFolderPath(windows.FOLDERID_Programs, 0)`
`333`	`329`	`}`
`334`	`330`
`335`	`331`	`func GetDesktopFolder() (string, error) {`
`336`	`332`	`return windows.KnownFolderPath(windows.FOLDERID_Desktop, 0)`
`337`	`333`	`}`
`338`	`334`
`339`		`-func GetStartMenuFolder() (string, error) {`
`340`		`- return windows.KnownFolderPath(windows.FOLDERID_StartMenu, 0)`
`341`		`-}`
`342`		`-`
`343`	`335`	`var (`
`344`	`336`	`pMessageBoxW = user32.NewProc("MessageBoxW")`
`345`	`337`	`)`