diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-05 03:52:11 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-05 03:52:11 +0000 |
commit | 97826efddd45f85de681cc2c62f4bace1c642b3d (patch) | |
tree | 1371b78b0dc733188f1dd29481f8e8bccfd506c2 | |
parent | 8b7b9e33a517c09c487cd118ffa9c2efd7bed769 (diff) | |
download | ruby-97826efddd45f85de681cc2c62f4bace1c642b3d.tar.gz |
* win32/win32.c (init_env): use user profile folder than personal
folder.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | win32/win32.c | 31 |
2 files changed, 29 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Mon Jan 5 12:52:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * win32/win32.c (init_env): use user profile folder than personal + folder. + Mon Jan 5 08:41:13 2009 Yukihiro Matsumoto <matz@ruby-lang.org> * file.c (rb_file_s_stat): need type check for non string values. 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, '\\', '/'); |