d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-02 09:55:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5576 from Chocobo1/msiexec

Browse Source 
Call system msiexec.exe directly
This commit is contained in:
sledgehammer999 2016-08-23 11:29:53 -05:00 committed by GitHub
commit 025ee32281
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/application.cpp
View File

@ -261,13 +261,8 @@ void Application::runExternalProgram(BitTorrent::TorrentHandle *const torrent) c
#if defined(Q_OS_UNIX) #if defined(Q_OS_UNIX)
QProcess::startDetached(QLatin1String("/bin/sh"), {QLatin1String("-c"), program}); QProcess::startDetached(QLatin1String("/bin/sh"), {QLatin1String("-c"), program});
#elif defined(Q_OS_WIN) // test cmd: `echo "%F" > "c:\ab ba.txt"` #elif defined(Q_OS_WIN) // test cmd: `echo "%F" > "c:\ab ba.txt"`
static const QString cmdPath = []() -> QString {
WCHAR systemPath[64] = {0};
GetSystemDirectoryW(systemPath, sizeof(systemPath) / sizeof(WCHAR));
return QString::fromWCharArray(systemPath) + QLatin1String("\\cmd.exe /C ");
}();
program.prepend(QLatin1String("\"")).append(QLatin1String("\"")); program.prepend(QLatin1String("\"")).append(QLatin1String("\""));
program.prepend(cmdPath); program.prepend(Utils::Misc::windowsSystemPath() + QLatin1String("\\cmd.exe /C "));
const uint cmdMaxLength = 32768; // max length (incl. terminate char) for `lpCommandLine` in `CreateProcessW()` const uint cmdMaxLength = 32768; // max length (incl. terminate char) for `lpCommandLine` in `CreateProcessW()`
if ((program.size() + 1) > cmdMaxLength) { if ((program.size() + 1) > cmdMaxLength) {
logger->addMessage(tr("Torrent: %1, run external program command too long (length > %2), execution failed.").arg(torrent->name()).arg(cmdMaxLength), Log::CRITICAL); logger->addMessage(tr("Torrent: %1, run external program command too long (length > %2), execution failed.").arg(torrent->name()).arg(cmdMaxLength), Log::CRITICAL);

12
src/base/utils/misc.cpp
View File

@ -670,3 +670,15 @@ QString Utils::Misc::libtorrentVersionString()
static const QString ver = LIBTORRENT_VERSION; static const QString ver = LIBTORRENT_VERSION;
return ver; return ver;
} }
#ifdef Q_OS_WIN
QString Utils::Misc::windowsSystemPath()
{
static const QString path = []() -> QString {
WCHAR systemPath[64] = {0};
GetSystemDirectoryW(systemPath, sizeof(systemPath) / sizeof(WCHAR));
return QString::fromWCharArray(systemPath);
}();
return path;
}
#endif

6
src/base/utils/misc.h
View File

@ -102,12 +102,16 @@ namespace Utils
QList<int> intListfromStringList(const QStringList &l); QList<int> intListfromStringList(const QStringList &l);
QList<bool> boolListfromStringList(const QStringList &l); QList<bool> boolListfromStringList(const QStringList &l);
void msleep(unsigned long msecs);
#ifndef DISABLE_GUI #ifndef DISABLE_GUI
void openPath(const QString& absolutePath); void openPath(const QString& absolutePath);
void openFolderSelect(const QString& absolutePath); void openFolderSelect(const QString& absolutePath);
#endif #endif
void msleep(unsigned long msecs); #ifdef Q_OS_WIN
QString windowsSystemPath();
#endif
} }
} }

2
src/gui/mainwindow.cpp
View File

@ -1772,7 +1772,7 @@ void MainWindow::pythonDownloadSuccess(const QString &url, const QString &filePa
QProcess installer; QProcess installer;
qDebug("Launching Python installer in passive mode..."); qDebug("Launching Python installer in passive mode...");
installer.start("msiexec.exe /passive /i " + Utils::Fs::toNativePath(filePath) + ".msi"); installer.start(Utils::Misc::windowsSystemPath() + "\\msiexec.exe /passive /i " + Utils::Fs::toNativePath(filePath) + ".msi");
// Wait for setup to complete // Wait for setup to complete
installer.waitForFinished(); installer.waitForFinished();