summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--win32/win32.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 712009fae7..571bf92614 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jun 21 00:56:47 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * win32/win32.c (get_special_folder): fix calling convention of
+ SHGetPathFromIDListEx, which should be WINAPI. pointed out by
+ @arton at http://twitter.com/arton/status/744884064277016576
+
Tue Jun 21 00:22:02 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in, include/ruby/defines.h (RUBY_USE_SETJMPEX):
diff --git a/win32/win32.c b/win32/win32.c
index b694d5a49b..4192a19add 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -436,7 +436,7 @@ 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);
+ typedef BOOL (WINAPI *get_path_func)(LPITEMIDLIST, WCHAR*, DWORD, int);
static get_path_func func = (get_path_func)-1;
if (func == (get_path_func)-1) {