Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Detect .bat file in launchProgram and adapt syntax of CreateProcess

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-02-02 19:49:37 +01:00
parent 27e7efca56
commit 923434aa72
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
code/nel/src/misc/common.cpp
View file

@ -732,7 +732,22 @@ bool launchProgram(const std::string &programName, const std::string &arguments,
SetEnvironmentVariable( SE_TRANSLATOR_IN_MAIN_MODULE, NULL ); SetEnvironmentVariable( SE_TRANSLATOR_IN_MAIN_MODULE, NULL );
} }
BOOL res = CreateProcessA(programName.empty() ? NULL:programName.c_str(), (char*)arguments.c_str(), NULL, NULL, FALSE, CREATE_DEFAULT_ERROR_MODE | CREATE_NO_WINDOW, NULL, NULL, &si, &pi); const char *sProgramName = programName.c_str();
std::string args;
// a .bat file must have first parameter to NULL and use 2nd parameter to pass filename
if (CFile::getExtension(programName) == "bat")
{
sProgramName = NULL;
args = "\"" + programName + "\" " + arguments;
}
else
{
args = arguments;
}
BOOL res = CreateProcessA(sProgramName, (char*)args.c_str(), NULL, NULL, FALSE, CREATE_DEFAULT_ERROR_MODE | CREATE_NO_WINDOW, NULL, NULL, &si, &pi);
if (res) if (res)
{ {

6
code/ryzom/client/src/login_patch.cpp
View file

@ -938,14 +938,14 @@ void CPatchManager::executeBatchFile()
chmod(batchFilename.c_str(), S_IRWXU); chmod(batchFilename.c_str(), S_IRWXU);
#endif #endif
std::string cmdLine = "\"" + batchFilename + "\" " + LoginLogin + " " + LoginPassword; std::string arguments = LoginLogin + " " + LoginPassword;
if (!r2Mode) if (!r2Mode)
{ {
cmdLine += " " + toString(LoginShardId); arguments += " " + toString(LoginShardId);
} }
if (launchProgram("", cmdLine, false)) if (launchProgram(batchFilename, arguments, false))
{ {
exit(0); exit(0);
} }