Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Windows) Added an %ESCAPESPECIALS% variable that escapes some special characters.

Browse source
This commit is contained in:
Leon Styhre 2022-05-08 14:25:27 +02:00
parent 595037b301
commit 0758d799ba
1 changed files with 35 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
es-app/src/FileData.cpp
View file

@ -914,14 +914,12 @@ void FileData::launchGame()
std::vector<std::string> emulatorCorePaths;
#if defined(_WIN64)
bool hideWindow = false;
bool hideWindow {false};
// If the %HIDEWINDOW% variable is defined, we pass a flag to launchGameWindows() to
// hide the window. This is intended primarily for hiding console windows when launching
// scripts (used for example by Steam games and source ports).
size_t hideWindowPos = command.find("%HIDEWINDOW%");
if (hideWindowPos != std::string::npos) {
if (command.find("%HIDEWINDOW%") != std::string::npos) {
hideWindow = true;
command = Utils::String::replace(command, "%HIDEWINDOW%", "");
// Trim any leading whitespaces as they could cause the script execution to fail.
@ -929,6 +927,19 @@ void FileData::launchGame()
return !std::isspace(static_cast<unsigned char>(c));
}));
}
bool escapeSpecials {false};
// If calling scripts and links using some binaries like cmd.exe then the special characters
// &()^=;, must be escaped.
if (command.find("%ESCAPESPECIALS%") != std::string::npos) {
escapeSpecials = true;
command = Utils::String::replace(command, "%ESCAPESPECIALS%", "");
// Trim any leading whitespaces as they could cause the script execution to fail.
command.erase(command.begin(), std::find_if(command.begin(), command.end(), [](char c) {
return !std::isspace(static_cast<unsigned char>(c));
}));
}
#endif
// If there's a quotation mark before the %CORE_ variable, then remove it.
@ -1261,6 +1272,26 @@ void FileData::launchGame()
}
}
#if defined(_WIN64)
if (escapeSpecials) {
bool foundSpecial {false};
// The special characters need to be procesed in this order.
std::string specialCharacters {"^&()=;,"};
for (size_t i = 0; i < specialCharacters.size(); ++i) {
std::string special(1, specialCharacters[i]);
if (romPath.find(special) != std::string::npos) {
romPath = Utils::String::replace(romPath, special, "^" + special);
foundSpecial = true;
}
}
if (foundSpecial)
romPath = Utils::String::replace(romPath, " ", "^ ");
}
#endif
// Replace the remaining variables with their actual values.
command = Utils::String::replace(command, "%ROM%", romPath);
command = Utils::String::replace(command, "%BASENAME%", baseName);