[Scummvm-git-logs] scummvm master -> 119bcc2b9010ee16a35defab71a3ea4524018508

bluegr bluegr at gmail.com
Mon Jun 24 16:00:25 CEST 2019


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:
119bcc2b90 WIN32: Use HINSTANCE for OSystem_Win32::openUrl


Commit: 119bcc2b9010ee16a35defab71a3ea4524018508
    https://github.com/scummvm/scummvm/commit/119bcc2b9010ee16a35defab71a3ea4524018508
Author: Lothar Serra Mari (serra at scummvm.org)
Date: 2019-06-24T17:00:20+03:00

Commit Message:
WIN32: Use HINSTANCE for OSystem_Win32::openUrl

This implementation now matches previous ShellExecute() calls, so we are
now consistent in that regard. It also
silences a warning in Mingw complaining about a type mismatch.

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 30ebf9d..ef101d3 100644
--- a/backends/platform/sdl/win32/win32.cpp
+++ b/backends/platform/sdl/win32/win32.cpp
@@ -169,10 +169,10 @@ bool OSystem_Win32::displayLogFile() {
 }
 
 bool OSystem_Win32::openUrl(const Common::String &url) {
-	const uint64 result = (uint64)ShellExecute(0, 0, /*(wchar_t*)nativeFilePath.utf16()*/url.c_str(), 0, 0, SW_SHOWNORMAL);
+	HINSTANCE result = ShellExecute(NULL, NULL, /*(wchar_t*)nativeFilePath.utf16()*/url.c_str(), NULL, NULL, SW_SHOWNORMAL);
 	// ShellExecute returns a value greater than 32 if successful
-	if (result <= 32) {
-		warning("ShellExecute failed: error = %u", result);
+	if ((intptr_t)result <= 32) {
+		warning("ShellExecute failed: error = %p", (void*)result);
 		return false;
 	}
 	return true;





More information about the Scummvm-git-logs mailing list