Fixed std::system opening a terminal window

Author: adriengivry

Sources/Overload/OvEditor/include/OvEditor/Utils/ExternalTools.h

@@ -19,7 +19,7 @@ namespace OvEditor::Utils
 	};
 
 	constexpr auto ExternalTools = std::to_array<ExternalTool>({
-		ExternalTool{ "Visual Studio Code", "code \"{}\"" },
+		ExternalTool{ "Visual Studio Code", "code {}" },
 		ExternalTool{ "Sublime Text", "subl {}" },
 		ExternalTool{ "Atom", "atom {}" },
 	});

Sources/Overload/OvEditor/src/OvEditor/Panels/AssetBrowser.cpp

@@ -190,9 +190,9 @@ class FolderContextualMenu : public BrowserItemContextualMenu
 			OvEditor::Settings::EditorSettings::FolderExternalToolName.Get()
 		);
 	}
-	virtual void Execute() override
+	virtual void Execute(OvUI::Plugins::EPluginExecutionContext p_context) override
 	{
-		BrowserItemContextualMenu::Execute();
+		BrowserItemContextualMenu::Execute(p_context);
 
 		// Keep the "Open In External Tool" menu item label up to date
 		m_openInExternalTool->name = GetOpenInExternalToolName();
@@ -214,14 +214,11 @@ class FolderContextualMenu : public BrowserItemContextualMenu
 				std::make_format_args(filePath)
 			);
 
-			const auto result = std::system(command.c_str());
-
-			if (result != 0)
+			if (!OvTools::Utils::SystemCalls::ExecuteCommand(command))
 			{
 				OVLOG_ERROR(std::format(
-					"Failed to open {} with error code: {}",
-					OvEditor::Settings::EditorSettings::FolderExternalToolName.Get(),
-					std::to_string(result)
+					"Failed to open {}",
+					OvEditor::Settings::EditorSettings::FolderExternalToolName.Get()
 				));
 			}
 		};

Sources/Overload/OvTools/include/OvTools/Utils/SystemCalls.h

@@ -38,6 +38,12 @@ namespace OvTools::Utils
 		*/
 		static void EditFile(const std::string& p_file);
 
+		/**
+		* Execute a custom command. Returns true if the command invocation succeeded
+		* @param p_command
+		*/
+		static bool ExecuteCommand(const std::string_view p_command);
+
 		/**
 		* Open the given url with the default browser
 		* @param p_url

Sources/Overload/OvTools/src/OvTools/Utils/SystemCalls.cpp

@@ -4,13 +4,16 @@
 * @licence: MIT
 */
 
+#include <cassert>
+#include <format>
+#include <iostream>
+#include <memory>
+
 #include "OvTools/Utils/PathParser.h"
 #include "OvTools/Utils/SystemCalls.h"
 
-#include <Windows.h>
 #include <ShlObj.h>
-#include <memory>
-#include <assert.h>
+#include <Windows.h>
 
 void OvTools::Utils::SystemCalls::ShowInExplorer(const std::string & p_path)
 {
@@ -26,9 +29,44 @@ void OvTools::Utils::SystemCalls::OpenFile(const std::string & p_file, const std
 
 void OvTools::Utils::SystemCalls::EditFile(const std::string & p_file)
 {
-	ShellExecuteW(NULL, NULL, std::wstring(p_file.begin(), p_file.end()).c_str(), NULL, NULL, SW_NORMAL);
+	ShellExecuteW(NULL, NULL, std::wstring(p_file.begin(), p_file.end()).c_str(), NULL, NULL, SW_SHOWNORMAL);
 }
 
+bool OvTools::Utils::SystemCalls::ExecuteCommand(const std::string_view p_command)
+{
+	STARTUPINFO startupInfo;
+	PROCESS_INFORMATION processInfo;
+
+	ZeroMemory(&startupInfo, sizeof(startupInfo));
+	startupInfo.cb = sizeof(startupInfo);
+	ZeroMemory(&processInfo, sizeof(processInfo));
+
+	std::string command = std::format("cmd.exe /c {}", p_command);
+
+	bool success = (CreateProcess(
+		nullptr,							// Application name (nullptr uses command line)
+		command.data(),						// Command to execute
+		nullptr,							// Process security attributes
+		nullptr,							// Thread security attributes
+		FALSE,								// Do not inherit handles
+		CREATE_NO_WINDOW,					// Run the process without a window
+		nullptr,							// Environment variables
+		nullptr,							// Current directory
+		&startupInfo,						// STARTUPINFO structure
+		&processInfo						// PROCESS_INFORMATION structure
+	));
+
+	// Wait until child process exits.
+	WaitForSingleObject(processInfo.hProcess, INFINITE);
+
+	// Close the process and thread handles
+	CloseHandle(processInfo.hProcess);
+	CloseHandle(processInfo.hThread);
+
+	return success;
+}
+
+
 void OvTools::Utils::SystemCalls::OpenURL(const std::string& p_url)
 {
 	ShellExecute(0, 0, p_url.c_str(), 0, 0, SW_SHOW);