mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-05-01 10:34:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change os2.user_* on Windows to use SHGetKnownFolderPath.

Browse Source 
Known folders can be redirected using `SHSetKnownFolderPath`, and it's a bit iffy to rely on environment variables.

This also more easily allows us to add `user_*_dir` procedures for the remaining 139 GUIDs in `known_folders.odin`, provided they have equivalents on other platforms.
This commit is contained in:
Jeroen van Rijn
2025-06-05 16:37:41 +02:00
parent da3b3a4139
commit 93e1c6593e
2 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/os/os2/user.odin
View File

@@ -1,6 +1,7 @@
package os2
import "base:runtime"
@(require) import win32 "core:sys/windows"
@(require_results)
user_cache_dir :: proc(allocator: runtime.Allocator) -> (dir: string, err: Error) {
@@ -8,10 +9,8 @@ user_cache_dir :: proc(allocator: runtime.Allocator) -> (dir: string, err: Error
#partial switch ODIN_OS {
case .Windows:
dir = get_env("LocalAppData", temp_allocator)
if dir != "" {
dir = clone_string(dir, allocator) or_return
}
guid := win32.FOLDERID_LocalAppData
return _get_known_folder_path(&guid, allocator)
case .Darwin:
dir = get_env("HOME", temp_allocator)
if dir != "" {
@@ -39,10 +38,8 @@ user_config_dir :: proc(allocator: runtime.Allocator) -> (dir: string, err: Erro
#partial switch ODIN_OS {
case .Windows:
dir = get_env("AppData", temp_allocator)
if dir != "" {
dir = clone_string(dir, allocator) or_return
}
guid := win32.FOLDERID_RoamingAppData
return _get_known_folder_path(&guid, allocator)
case .Darwin:
dir = get_env("HOME", temp_allocator)
if dir != "" {
@@ -66,14 +63,15 @@ user_config_dir :: proc(allocator: runtime.Allocator) -> (dir: string, err: Erro
@(require_results)
user_home_dir :: proc(allocator: runtime.Allocator) -> (dir: string, err: Error) {
env := "HOME"
#partial switch ODIN_OS {
case .Windows:
env = "USERPROFILE"
}
if v := get_env(env, allocator); v != "" {
return v, nil
guid := win32.FOLDERID_Profile
return _get_known_folder_path(&guid, allocator)
case:
if v := get_env("HOME", allocator); v != "" {
return v, nil
}
}
return "", .Invalid_Path
}
}

20
core/os/os2/user_windows.odin Normal file
View File

@@ -0,0 +1,20 @@
package os2
import "base:runtime"
@(require) import win32 "core:sys/windows"
@(require_results)
_get_known_folder_path :: proc(rfid: win32.REFKNOWNFOLDERID, allocator: runtime.Allocator) -> (dir: string, err: Error) {
// https://learn.microsoft.com/en-us/windows/win32/api/shlobj_core/nf-shlobj_core-shgetknownfolderpath
// See also `known_folders.odin` in `core:sys/windows` for the GUIDs.
path_w: win32.LPWSTR
res := win32.SHGetKnownFolderPath(rfid, 0, nil, &path_w)
defer win32.CoTaskMemFree(path_w)
if res != 0 {
return "", .Invalid_Path
}
dir, _ = win32.wstring_to_utf8(path_w, -1, allocator)
return
}