[Scummvm-git-logs] scummvm master -> b46a1b688d65c94ec7631eba861ea1ed1600dd20

Kirben kirben at optusnet.com.au
Mon Apr 24 02:57:37 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:
b46a1b688d WINDOWS: Hopefully fix mingw compilation.


Commit: b46a1b688d65c94ec7631eba861ea1ed1600dd20
    https://github.com/scummvm/scummvm/commit/b46a1b688d65c94ec7631eba861ea1ed1600dd20
Author: Kirben (kirben at optusnet.com.au)
Date: 2017-04-24T10:57:02+10:00

Commit Message:
WINDOWS: Hopefully fix mingw compilation.

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 e09fb5e..f50059e 100644
--- a/backends/platform/sdl/win32/win32.cpp
+++ b/backends/platform/sdl/win32/win32.cpp
@@ -29,7 +29,8 @@
 #include <windows.h>
 #undef ARRAYSIZE // winnt.h defines ARRAYSIZE, but we want our own one...
 #include <shellapi.h>
-//#include <ShlObj.h>
+#define _WIN32_IE 0x500 // required for SHGFP_TYPE_CURRENT in shlobj.h
+#include <shlobj.h>
 
 #include "common/scummsys.h"
 #include "common/config-manager.h"
@@ -154,22 +155,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