kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

win32.c: use SHGetPathFromIDListEx

Browse source 
* win32/win32.c (get_special_folder): use SHGetPathFromIDListEx if
  available instead of old SHGetPathFromIDListW, to check the
  buffer size.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-06-02 12:18:12 +00:00
parent 360f742564
commit 0661411671
2 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Thu Jun 2 21:18:10 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.c (get_special_folder): use SHGetPathFromIDListEx if
available instead of old SHGetPathFromIDListW, to check the
buffer size.
Thu Jun 2 17:05:19 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (ruby_init_loadpath_safe): remove MAXPATHLEN restriction

26
win32/win32.c
View file

@ -115,6 +115,7 @@ static int wstati64(const WCHAR *path, struct stati64 *st);
static int wlstati64(const WCHAR *path, struct stati64 *st);
VALUE rb_w32_conv_from_wchar(const WCHAR *wstr, rb_encoding *enc);
int ruby_brace_glob_with_enc(const char *str, int flags, ruby_glob_func *func, VALUE arg, rb_encoding *enc);
static FARPROC get_proc_address(const char *module, const char *func, HANDLE *mh);
#define RUBY_CRITICAL if (0) {} else /* just remark */
@ -420,13 +421,26 @@ translate_char(char *p, int from, int to, UINT cp)
/* License: Ruby's */
static BOOL
get_special_folder(int n, WCHAR *env)
get_special_folder(int n, WCHAR *buf, size_t len)
{
LPITEMIDLIST pidl;
LPMALLOC alloc;
BOOL f = FALSE;
typedef BOOL (*get_path_func)(LPITEMIDLIST, WCHAR*, DWORD, int);
static get_path_func func = (get_path_func)-1;
if (func = (get_path_func)-1) {
func = (get_path_func)
get_proc_address("shell32", "SHGetPathFromIDListEx", NULL);
}
if (SHGetSpecialFolderLocation(NULL, n, &pidl) == 0) {
f = SHGetPathFromIDListW(pidl, env);
if (func) {
f = func(pidl, buf, len, 0);
}
else if (len >= 260) {
f = SHGetPathFromIDListW(pidl, buf);
}
SHGetMalloc(&alloc);
alloc->lpVtbl->Free(alloc, pidl);
alloc->lpVtbl->Release(alloc);
@ -475,7 +489,7 @@ rb_w32_special_folder(int type)
{
WCHAR path[_MAX_PATH];
if (!get_special_folder(type, path)) return Qnil;
if (!get_special_folder(type, path, numberof(path))) return Qnil;
regulate_path(path);
return rb_w32_conv_from_wchar(path, rb_filesystem_encoding());
}
@ -487,7 +501,7 @@ rb_w32_system_tmpdir(WCHAR *path, UINT len)
static const WCHAR temp[] = L"temp";
WCHAR *p;
if (!get_special_folder(CSIDL_LOCAL_APPDATA, path)) {
if (!get_special_folder(CSIDL_LOCAL_APPDATA, path, len)) {
if (GetSystemWindowsDirectoryW(path, len)) return 0;
}
p = translate_wchar(path, L'\\', L'/');
@ -527,10 +541,10 @@ init_env(void)
else if (GetEnvironmentVariableW(L"USERPROFILE", env, numberof(env))) {
f = TRUE;
}
else if (get_special_folder(CSIDL_PROFILE, env)) {
else if (get_special_folder(CSIDL_PROFILE, env, numberof(env))) {
f = TRUE;
}
else if (get_special_folder(CSIDL_PERSONAL, env)) {
else if (get_special_folder(CSIDL_PERSONAL, env, numberof(env))) {
f = TRUE;
}
if (f) {