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

Fixed: Use launchProgram to launch batch

Browse source
This commit is contained in:
kervala 2016-02-02 19:28:10 +01:00
parent 178a8a949d
commit 6d41451d64
1 changed files with 25 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -917,93 +917,44 @@ void CPatchManager::executeBatchFile()
extern void quitCrashReport (); extern void quitCrashReport ();
quitCrashReport (); quitCrashReport ();
#ifdef NL_OS_WINDOWS
// Launch the batch file
STARTUPINFO si;
PROCESS_INFORMATION pi;
ZeroMemory( &si, sizeof(si) );
si.dwFlags = STARTF_USESHOWWINDOW;
si.wShowWindow = SW_HIDE; // SW_SHOW
si.cb = sizeof(si);
ZeroMemory( &pi, sizeof(pi) );
// Start the child process.
string strCmdLine;
bool r2Mode = false;
#ifndef RY_BG_DOWNLOADER
r2Mode = ClientCfg.R2Mode;
#endif
if (r2Mode)
{
strCmdLine = UpdateBatchFilename + " " + LoginLogin + " " + LoginPassword;
}
else
{
strCmdLine = UpdateBatchFilename + " " + LoginLogin + " " + LoginPassword + " " + toString(LoginShardId);
}
if( !CreateProcess( NULL, // No module name (use command line).
(char*)strCmdLine.c_str(), // Command line.
NULL, // Process handle not inheritable.
NULL, // Thread handle not inheritable.
FALSE, // Set handle inheritance to FALSE.
0, // No creation flags.
NULL, // Use parent's environment block.
NULL, // Use parent's starting directory.
&si, // Pointer to STARTUPINFO structure.
&pi ) // Pointer to PROCESS_INFORMATION structure.
)
{
// error occurs during the launch
string str = toString("Can't execute '%s': code=%d %s (error code 30)", UpdateBatchFilename.c_str(), errno, strerror(errno));
throw Exception (str);
}
// Close process and thread handles.
// CloseHandle( pi.hProcess );
// CloseHandle( pi.hThread );
#else
// Start the child process.
bool r2Mode = false; bool r2Mode = false;
#ifndef RY_BG_DOWNLOADER #ifndef RY_BG_DOWNLOADER
r2Mode = ClientCfg.R2Mode; r2Mode = ClientCfg.R2Mode;
#endif #endif
string strCmdLine; std::string batchFilename;
strCmdLine = "./" + UpdateBatchFilename; #ifdef NL_OS_WINDOWS
batchFilename = CPath::standardizeDosPath(ClientRootPath);
#else
batchFilename = ClientRootPath;
#endif
chmod(strCmdLine.c_str(), S_IRWXU); batchFilename += UpdateBatchFilename;
if (r2Mode)
#ifdef NL_OS_UNIX
// make script executable under UNIX
chmod(batchFilename.c_str(), S_IRWXU);
#endif
std::string cmdLine = "\"" + batchFilename + "\" " + LoginLogin + " " + LoginPassword;
if (!r2Mode)
{ {
if (execl(strCmdLine.c_str(), strCmdLine.c_str(), LoginLogin.c_str(), LoginPassword.c_str(), (char *) NULL) == -1) cmdLine += " " + toString(LoginShardId);
{ }
int errsv = errno;
nlerror("Execl Error: %d %s", errsv, strCmdLine.c_str()); if (launchProgram("", cmdLine, false))
} {
else exit(0);
{
nlinfo("Ran batch file r2Mode Success");
}
} }
else else
{ {
if (execl(strCmdLine.c_str(), strCmdLine.c_str(), LoginLogin.c_str(), LoginPassword.c_str(), toString(LoginShardId).c_str(), (char *) NULL) == -1) // error occurs during the launch
{ string str = toString("Can't execute '%s': code=%d %s (error code 30)", UpdateBatchFilename.c_str(), errno, strerror(errno));
int errsv = errno; throw Exception (str);
nlerror("Execl r2mode Error: %d %s", errsv, strCmdLine.c_str());
}
else
{
nlinfo("Ran batch file Success");
}
} }
#endif
// exit(0);
} }
// **************************************************************************** // ****************************************************************************