diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-09 02:18:59 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-09 02:18:59 +0000 |
commit | 7083fd551a823da87fb70317c180d637e54e39f6 (patch) | |
tree | f607a2c604859ee6107c3d087fd4c0522f9269f7 /win32/win32.c | |
parent | df7a140b214650f93dc8f493a7e8fec342cda848 (diff) |
merges r21336 from trunk into ruby_1_9_1.
* win32/win32.c (init_env): use user profile folder than personal
folder.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21403 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/win32.c')
-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, '\\', '/'); |