[Scummvm-git-logs] scummvm master -> 23987cc724df6a96cd823c03ddb26bd818794dd2

criezy criezy at scummvm.org
Mon Apr 24 02:24:00 CEST 2017


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

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


Commit: 23987cc724df6a96cd823c03ddb26bd818794dd2
    https://github.com/scummvm/scummvm/commit/23987cc724df6a96cd823c03ddb26bd818794dd2
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2017-04-24T01:21:36+01:00

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

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.

Changed paths:
    backends/platform/sdl/win32/win32.cpp


diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp
index 5724250..a29151a 100644
--- a/backends/platform/sdl/win32/win32.cpp
+++ b/backends/platform/sdl/win32/win32.cpp
@@ -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;
 }





More information about the Scummvm-git-logs mailing list