thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIN32: Comment out code that gets the user My Pictures directory

Browse source 
This broke compilation on buildbot as ShlObj.h cannot be found.
A developer that has access to Windows should take a look to
properly fix this.
This commit is contained in:
Thierry Crozat 2017-04-24 01:20:47 +01:00
parent 25bb9106b6
commit 23987cc724
1 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
backends/platform/sdl/win32/win32.cpp
View file

@ -29,7 +29,7 @@
#include <windows.h>
#undef ARRAYSIZE // winnt.h defines ARRAYSIZE, but we want our own one...
#include <shellapi.h>
#include <ShlObj.h>
//#include <ShlObj.h>
#include "common/scummsys.h"
#include "common/config-manager.h"
@ -154,22 +154,22 @@ Common::String OSystem_Win32::getScreenshotsPath() {
return screenshotsPath;
}
char picturesPath[MAXPATHLEN];
// Use the My Pictures folder.
if (SHGetFolderPath(NULL, CSIDL_MYPICTURES, NULL, SHGFP_TYPE_CURRENT, picturesPath) != S_OK) {
warning("Unable to access My Pictures directory");
return Common::String();
}
screenshotsPath = Common::String(picturesPath) + "\\ScummVM Screenshots\\";
// If the directory already exists (as it should in most cases),
// we don't want to fail, but we need to stop on other errors (such as ERROR_PATH_NOT_FOUND)
if (!CreateDirectory(screenshotsPath.c_str(), NULL)) {
if (GetLastError() != ERROR_ALREADY_EXISTS)
error("Cannot create ScummVM Screenshots folder");
}
// char picturesPath[MAXPATHLEN];
//
// // Use the My Pictures folder.
// if (SHGetFolderPath(NULL, CSIDL_MYPICTURES, NULL, SHGFP_TYPE_CURRENT, picturesPath) != S_OK) {
// warning("Unable to access My Pictures directory");
// return Common::String();
// }
//
// screenshotsPath = Common::String(picturesPath) + "\\ScummVM Screenshots\\";
//
// // If the directory already exists (as it should in most cases),
// // we don't want to fail, but we need to stop on other errors (such as ERROR_PATH_NOT_FOUND)
// if (!CreateDirectory(screenshotsPath.c_str(), NULL)) {
// if (GetLastError() != ERROR_ALREADY_EXISTS)
// error("Cannot create ScummVM Screenshots folder");
// }
return screenshotsPath;
}