From d1212e0b1a66e3ea6a049ef8e985033adb661919 Mon Sep 17 00:00:00 2001 From: michi_cc Date: Sat, 6 Apr 2013 18:36:41 +0000 Subject: (svn r25153) -Fix [FS#5522] (r24487): [Win32] Don't statically link to SHGetFolderPath as it may not exist. --- src/os/windows/win32.cpp | 4 ++-- src/os/windows/win32.h | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'src/os') diff --git a/src/os/windows/win32.cpp b/src/os/windows/win32.cpp index 992ae16c7..bf4235346 100644 --- a/src/os/windows/win32.cpp +++ b/src/os/windows/win32.cpp @@ -505,14 +505,14 @@ void DetermineBasePaths(const char *exe) char tmp[MAX_PATH]; TCHAR path[MAX_PATH]; #ifdef WITH_PERSONAL_DIR - SHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, path); + OTTDSHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, path); strecpy(tmp, WIDE_TO_MB_BUFFER(path, tmp, lengthof(tmp)), lastof(tmp)); AppendPathSeparator(tmp, MAX_PATH); ttd_strlcat(tmp, PERSONAL_DIR, MAX_PATH); AppendPathSeparator(tmp, MAX_PATH); _searchpaths[SP_PERSONAL_DIR] = strdup(tmp); - SHGetFolderPath(NULL, CSIDL_COMMON_DOCUMENTS, NULL, SHGFP_TYPE_CURRENT, path); + OTTDSHGetFolderPath(NULL, CSIDL_COMMON_DOCUMENTS, NULL, SHGFP_TYPE_CURRENT, path); strecpy(tmp, WIDE_TO_MB_BUFFER(path, tmp, lengthof(tmp)), lastof(tmp)); AppendPathSeparator(tmp, MAX_PATH); ttd_strlcat(tmp, PERSONAL_DIR, MAX_PATH); diff --git a/src/os/windows/win32.h b/src/os/windows/win32.h index 66c519973..941d3ea84 100644 --- a/src/os/windows/win32.h +++ b/src/os/windows/win32.h @@ -40,12 +40,6 @@ extern uint _codepage; // local code-page in the system @see win32_v.cpp:WM_INPU # define WIDE_TO_MB_BUFFER(str, buffer, buflen) (str) #endif -/* Override SHGetFolderPath with our custom implementation */ -#if defined(SHGetFolderPath) -#undef SHGetFolderPath -#endif -#define SHGetFolderPath OTTDSHGetFolderPath - HRESULT OTTDSHGetFolderPath(HWND, int, HANDLE, DWORD, LPTSTR); #if defined(__MINGW32__) -- cgit v1.2.3-54-g00ecf