mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-23 15:25:35 +08:00
b80f204293
QTBUG-53833 - which caused a console application to launch with a console if it was started with QProcess::startDetached - is fixed in 5.8.0. There were use cases for both options - with and without console - but not offered by Qt API. Therefore CProcessCtrl is refactored as a wrapper to offer both options. If no console is required, it defaults to QProcess::startDetached. Otherwise uses its own implementation. refs #866
78 lines
2.4 KiB
C++
78 lines
2.4 KiB
C++
/* Copyright (C) 2016
|
|
* swift project Community / Contributors
|
|
*
|
|
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
|
|
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
|
|
* including this file, may be copied, modified, propagated, or distributed except according to the terms
|
|
* contained in the LICENSE file.
|
|
*/
|
|
|
|
#include "blackmisc/processctrl.h"
|
|
#include "blackmisc/logmessage.h"
|
|
|
|
#include <array>
|
|
|
|
#ifdef Q_OS_WIN
|
|
#include <windows.h>
|
|
#endif
|
|
|
|
namespace BlackMisc
|
|
{
|
|
CProcessCtrl::CProcessCtrl(QObject *parent) :
|
|
QProcess(parent)
|
|
{ }
|
|
|
|
#ifdef Q_OS_WIN
|
|
bool startDetachedWithConsoleWindow(const QString &program, const QStringList &arguments)
|
|
{
|
|
bool inherit = false;
|
|
|
|
PROCESS_INFORMATION processInfo;
|
|
memset (&processInfo, 0, sizeof (processInfo));
|
|
|
|
STARTUPINFO startupInfo;
|
|
memset (&startupInfo, 0, sizeof (startupInfo));
|
|
startupInfo.cb = sizeof (startupInfo);
|
|
|
|
QString command;
|
|
command += program;
|
|
command += ' ';
|
|
command += arguments.join(' ').replace('/', '\\');
|
|
|
|
DWORD flags = 0;
|
|
flags |= NORMAL_PRIORITY_CLASS;
|
|
flags |= CREATE_UNICODE_ENVIRONMENT;
|
|
flags |= CREATE_NEW_CONSOLE;
|
|
|
|
Q_ASSERT(command.length() <= MAX_PATH);
|
|
std::array<WCHAR, MAX_PATH> wszCommandLine = {{}};
|
|
command.toWCharArray(wszCommandLine.data());
|
|
|
|
int result = CreateProcess (nullptr, wszCommandLine.data(), 0, 0, inherit, flags, nullptr, nullptr, &startupInfo, &processInfo);
|
|
|
|
if (result == 0)
|
|
{
|
|
CLogMessage(static_cast<CProcessCtrl*>(nullptr)).warning("Failed to start %1: %2") << program << GetLastError();
|
|
return false;
|
|
}
|
|
|
|
CloseHandle (processInfo.hProcess);
|
|
CloseHandle (processInfo.hThread);
|
|
return true;
|
|
}
|
|
#else
|
|
bool startDetachedWithConsoleWindow(const QString &program, const QStringList &arguments)
|
|
{
|
|
//! \fixme Handle Linux and OS X here
|
|
return QProcess::startDetached(program, arguments);
|
|
}
|
|
#endif
|
|
|
|
bool CProcessCtrl::startDetached(const QString &program, const QStringList &arguments, bool withConsoleWindow)
|
|
{
|
|
if (withConsoleWindow) { return startDetachedWithConsoleWindow(program, arguments); }
|
|
else { return QProcess::startDetached(program, arguments); }
|
|
}
|
|
|
|
} // ns
|