From 325ee1ce3dae4879b00fb06059e8d33d49d6ba11 Mon Sep 17 00:00:00 2001 From: George Adams Date: Wed, 30 Oct 2024 11:07:27 +0000 Subject: [PATCH] os: fix findOneDriveDir to expand REG_SZ registry values On some Windows systems the SOFTWARE\Microsoft\OneDrive registry key is REG_SZ rather than REG_EXPAND_SZ. Change-Id: I3ccb8771377a73456f48da1b5cfae668130b3f7b Reviewed-on: https://go-review.googlesource.com/c/go/+/623515 Reviewed-by: Quim Muntal Reviewed-by: Ian Lance Taylor LUCI-TryBot-Result: Go LUCI Auto-Submit: Ian Lance Taylor Reviewed-by: Carlos Amedee --- src/os/os_windows_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/os/os_windows_test.go b/src/os/os_windows_test.go index d4cd61067e..9208fe3b16 100644 --- a/src/os/os_windows_test.go +++ b/src/os/os_windows_test.go @@ -931,7 +931,9 @@ func findOneDriveDir() (string, error) { return "", fmt.Errorf("reading UserFolder failed: %v", err) } - if valtype == registry.EXPAND_SZ { + // REG_SZ values may also contain environment variables that need to be expanded. + // It's recommended but not required to use REG_EXPAND_SZ for paths that contain environment variables. + if valtype == registry.EXPAND_SZ || valtype == registry.SZ { expanded, err := registry.ExpandString(path) if err != nil { return "", fmt.Errorf("expanding UserFolder failed: %v", err) -- 2.48.1