conf: move configuration to C:\Program Files\WireGuard\Data

It doesn't get wiped out on Windows upgrades.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

2 files changed, 6 insertions, 26 deletions

diff --git a/ringlogger/dump.go b/ringlogger/dump.go
index 05a9b27f..495f08bd 100644
--- a/ringlogger/dump.go
+++ b/ringlogger/dump.go
@@ -11,36 +11,16 @@ import (
 	"path/filepath"
 
 	"golang.org/x/sys/windows"
-	"golang.org/x/sys/windows/registry"
 
 	"golang.zx2c4.com/wireguard/windows/conf"
 )
 
-func DumpTo(out io.Writer, localSystem bool) error {
-	var path string
-	if !localSystem {
-		root, err := conf.RootDirectory()
-		if err != nil {
-			return err
-		}
-		path = filepath.Join(root, "log.bin")
-	} else {
-		k, err := registry.OpenKey(registry.LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList\\S-1-5-18", registry.QUERY_VALUE)
-		if err != nil {
-			return err
-		}
-		defer k.Close()
-
-		systemprofile, _, err := k.GetStringValue("ProfileImagePath")
-		if err != nil {
-			return err
-		}
-		systemprofile, err = registry.ExpandString(systemprofile)
-		if err != nil {
-			return err
-		}
-		path = filepath.Join(systemprofile, "AppData", "Local", "WireGuard", "log.bin")
+func DumpTo(out io.Writer, notSystem bool) error {
+	root, err := conf.RootDirectory(!notSystem)
+	if err != nil {
+		return err
 	}
+	path := filepath.Join(root, "log.bin")
 	file, err := os.Open(path)
 	if err != nil {
 		return err
diff --git a/ringlogger/global.go b/ringlogger/global.go
index 60e750a5..06d3840e 100644
--- a/ringlogger/global.go
+++ b/ringlogger/global.go
@@ -18,7 +18,7 @@ func InitGlobalLogger(tag string) error {
 	if Global != nil {
 		return nil
 	}
-	root, err := conf.RootDirectory()
+	root, err := conf.RootDirectory(true)
 	if err != nil {
 		return err
 	}