diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | version.h | 6 | ||||
| -rw-r--r-- | win32/win32.c | 31 |
3 files changed, 32 insertions, 10 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. + Sun Jan 4 11:58:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * numeric.c (ruby_float_step): extracted from num_step(). @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-01-04" +#define RUBY_RELEASE_DATE "2009-01-05" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20090104 +#define RUBY_RELEASE_CODE 20090105 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 4 +#define RUBY_RELEASE_DAY 5 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; diff --git a/win32/win32.c b/win32/win32.c index de90cfb144..ba22825503 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -389,13 +389,31 @@ exit_handler(void) DeleteCriticalSection(&select_mutex); } +#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; @@ -409,12 +427,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 = env; |