Merge 72892db014 into 95ba158235

es-core/src/platform.cpp

@@ -2,7 +2,9 @@
 
 #include <SDL_events.h>
 #ifdef WIN32
-#include <codecvt>
+#include <windows.h>
+#include "Shlwapi.h"
+#pragma comment(lib, "Shlwapi.lib")
 #else
 #include <unistd.h>
 #endif
@@ -31,12 +33,24 @@ int runRestartCommand()
 int runSystemCommand(const std::string& cmd_utf8)
 {
 #ifdef WIN32
-	// on Windows we use _wsystem to support non-ASCII paths
+	std::string args = std::string(PathGetArgs(cmd_utf8.c_str()));
-	// which requires converting from utf8 to a wstring
+	std::string program = cmd_utf8.substr(0, cmd_utf8.length() - args.length());
-	typedef std::codecvt_utf8<wchar_t> convert_type;
+	SHELLEXECUTEINFO ShExecInfo = {0};
-	std::wstring_convert<convert_type, wchar_t> converter;
+	ShExecInfo.cbSize = sizeof(SHELLEXECUTEINFO);
-	std::wstring wchar_str = converter.from_bytes(cmd_utf8);
+	ShExecInfo.fMask = SEE_MASK_NOCLOSEPROCESS;
-	return _wsystem(wchar_str.c_str());
+	ShExecInfo.hwnd = NULL;
+	ShExecInfo.lpVerb = NULL;
+	ShExecInfo.lpFile = program.c_str();        
+	ShExecInfo.lpParameters = args.c_str();   
+	ShExecInfo.lpDirectory = NULL;
+	ShExecInfo.nShow = SW_SHOW;
+	ShExecInfo.hInstApp = NULL; 
+	ShellExecuteEx(&ShExecInfo);
+	WaitForSingleObject(ShExecInfo.hProcess, INFINITE);
+	CloseHandle(ShExecInfo.hProcess);
+	DWORD dwExitCode = 0;
+	GetExitCodeProcess(ShExecInfo.hProcess, &dwExitCode);
+	return dwExitCode;
 #else
 	return system(cmd_utf8.c_str());
 #endif