0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fs: Use SHGetFolderPath() instead of SHGetSpecialFolderPath()

Browse source 
The former has been "unsupported" since Windows XP, while the latter is
still supported in Vista and later as a wrapper around a newer API.

Most importantly, used this as an excuse to rewrite the code to take
advantage of the fact that we already link to SHELL32.DLL at runtime
(it implements ShellExecute() and Shell_NotifyIcon(), used elsewhere in
our code), only run on versions of Windows guarantee to provide the
SHGetFolderPath symbol, and thus don't need all the LoadLibrary mumbo
jumbo that made the code considerably uglier and denser.
This commit is contained in:
Ignacio R. Morelle 2015-10-20 22:45:10 -03:00
parent bc22ec9176
commit 8f8fde43ba
1 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/filesystem_boost.cpp
View file

@ -36,6 +36,7 @@ using boost::uintmax_t;
#ifdef _WIN32
#include <boost/locale.hpp>
#include <windows.h>
#include <shlobj.h>
#endif /* !_WIN32 */
#include "config.hpp"
@ -509,32 +510,20 @@ void set_user_data_dir(std::string newprefdir)
newprefdir = "Wesnoth" + get_version_path_suffix();
}
//
// TODO: we no longer need to use LoadLibrary since versions <
// Windows XP are no longer supported so the required
// functionality is guaranteed to be available.
//
HMODULE module = LoadLibraryA("shell32");
// CSIDL_MYDOCUMENTS
const int docs_csidl = 5;
typedef BOOL (WINAPI *SHGSFPAddress)(HWND, LPWSTR, int, BOOL);
SHGSFPAddress SHGetSpecialFolderPathW
= reinterpret_cast<SHGSFPAddress>(
GetProcAddress(module, "SHGetSpecialFolderPathW"));
wchar_t docs_path[MAX_PATH];
if(!SHGetSpecialFolderPathW ||
!SHGetSpecialFolderPathW(NULL, docs_path, docs_csidl, TRUE)) {
HRESULT res = SHGetFolderPathW(NULL,
CSIDL_PERSONAL | CSIDL_FLAG_CREATE, NULL,
SHGFP_TYPE_CURRENT,
docs_path);
if(res != S_OK) {
//
// Crummy fallback path full of pain and suffering.
//
ERR_FS << "Could not determine path to user's Documents folder! "
"User config/data directories may be unavailable for "
"this session. Please report this as a bug.\n";
ERR_FS << "Could not determine path to user's Documents folder! ("
<< std::hex << "0x" << res << std::dec << ") "
<< "User config/data directories may be unavailable for "
<< "this session. Please report this as a bug.\n";
user_data_dir = path(get_cwd()) / newprefdir;
} else {
path games_path = path(docs_path) / "My Games";