diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.c | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/win32/win32.c b/win32/win32.c index 316b69b873..e518e935d0 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -360,13 +360,31 @@ translate_char(char *p, int from, int to) return p; } +#ifndef CSIDL_PROFILE +#define CSIDL_PROFILE 40 +#endif + +static BOOL +get_special_folder(int n, char *env) +{ + LPITEMIDLIST pidl; + LPMALLOC alloc; + BOOL f = FALSE; + if (SHGetSpecialFolderLocation(NULL, n, &pidl) == 0) { + f = SHGetPathFromIDList(pidl, env); + SHGetMalloc(&alloc); + alloc->lpVtbl->Free(alloc, pidl); + alloc->lpVtbl->Release(alloc); + } + return f; +} + static void init_env(void) { char env[_MAX_PATH]; DWORD len; BOOL f; - LPITEMIDLIST pidl; if (!GetEnvironmentVariable("HOME", env, sizeof(env))) { f = FALSE; @@ -380,12 +398,11 @@ init_env(void) else if (GetEnvironmentVariable("USERPROFILE", env, sizeof(env))) { f = TRUE; } - else if (SHGetSpecialFolderLocation(NULL, CSIDL_PERSONAL, &pidl) == 0) { - LPMALLOC alloc; - f = SHGetPathFromIDList(pidl, env); - SHGetMalloc(&alloc); - alloc->lpVtbl->Free(alloc, pidl); - alloc->lpVtbl->Release(alloc); + else if (get_special_folder(CSIDL_PROFILE, env)) { + f = TRUE; + } + else if (get_special_folder(CSIDL_PERSONAL, env)) { + f = TRUE; } if (f) { char *p = translate_char(env, '\\', '/'); |