mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r25155) -Codechange: [Win32] Improve SHGetFolderPath emulation.

release/1.4
michi_cc 2013-04-06 18:36:49 +00:00
parent 3349cb3347
commit 2d67f07975
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/os/windows/win32.cpp
View File

@ -17,6 +17,7 @@
#include "../../fios.h" #include "../../fios.h"
#include <windows.h> #include <windows.h>
#include <fcntl.h> #include <fcntl.h>
#include <regstr.h>
#include <shlobj.h> /* SHGetFolderPath */ #include <shlobj.h> /* SHGetFolderPath */
#include <Shellapi.h> #include <Shellapi.h>
#include "win32.h" #include "win32.h"
@ -732,8 +733,11 @@ HRESULT OTTDSHGetFolderPath(HWND hwnd, int csidl, HANDLE hToken, DWORD dwFlags,
#else #else
# define W(x) x "A" # define W(x) x "A"
#endif #endif
if (!LoadLibraryList((Function*)&SHGetFolderPath, "SHFolder.dll\0" W("SHGetFolderPath") "\0\0")) { /* The function lives in shell32.dll for all current Windows versions, but it first started to appear in SHFolder.dll. */
DEBUG(misc, 0, "Unable to load " W("SHGetFolderPath") "from SHFolder.dll"); if (!LoadLibraryList((Function*)&SHGetFolderPath, "shell32.dll\0" W("SHGetFolderPath") "\0\0")) {
if (!LoadLibraryList((Function*)&SHGetFolderPath, "SHFolder.dll\0" W("SHGetFolderPath") "\0\0")) {
DEBUG(misc, 0, "Unable to load " W("SHGetFolderPath") "from either shell32.dll or SHFolder.dll");
}
} }
#undef W #undef W
first_time = false; first_time = false;
@ -758,6 +762,17 @@ HRESULT OTTDSHGetFolderPath(HWND hwnd, int csidl, HANDLE hToken, DWORD dwFlags,
return (HRESULT)0; return (HRESULT)0;
case CSIDL_PERSONAL:
case CSIDL_COMMON_DOCUMENTS: {
HKEY key;
if (RegOpenKeyEx(csidl == CSIDL_PERSONAL ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, REGSTR_PATH_SPECIAL_FOLDERS, 0, KEY_READ, &key) != ERROR_SUCCESS) break;
DWORD len = MAX_PATH;
ret = RegQueryValueEx(key, csidl == CSIDL_PERSONAL ? _T("Personal") : _T("Common Documents"), NULL, NULL, (LPBYTE)pszPath, &len);
RegCloseKey(key);
if (ret == ERROR_SUCCESS) return (HRESULT)0;
break;
}
/* XXX - other types to go here when needed... */ /* XXX - other types to go here when needed... */
} }
} }