Merge with branch1.1

1 files changed, 30 insertions, 8 deletions

diff --git a/src/spawn.cpp b/src/spawn.cpp
index ab43b687..6adafba0 100644
--- a/src/spawn.cpp
+++ b/src/spawn.cpp
@@ -36,10 +36,23 @@ using namespace MOShared;
 
 static const int BUFSIZE = 4096;
 
-bool spawn(LPCWSTR binary, LPCWSTR arguments, LPCWSTR currentDirectory, bool suspended, HANDLE& processHandle, HANDLE& threadHandle)
+bool spawn(LPCWSTR binary, LPCWSTR arguments, LPCWSTR currentDirectory, bool suspended,
+           HANDLE stdOut, HANDLE stdErr,
+           HANDLE& processHandle, HANDLE& threadHandle)
 {
+  BOOL inheritHandles = FALSE;
   STARTUPINFO si;
   ::ZeroMemory(&si, sizeof(si));
+  if (stdOut != INVALID_HANDLE_VALUE) {
+    si.hStdOutput = stdOut;
+    inheritHandles = TRUE;
+    si.dwFlags |= STARTF_USESTDHANDLES;
+  }
+  if (stdErr != INVALID_HANDLE_VALUE) {
+    si.hStdError = stdErr;
+    inheritHandles = TRUE;
+    si.dwFlags |= STARTF_USESTDHANDLES;
+  }
   si.cb = sizeof(si);
   int length = wcslen(binary) + wcslen(arguments) + 4;
   wchar_t *commandLine = NULL;
@@ -74,7 +87,7 @@ bool spawn(LPCWSTR binary, LPCWSTR arguments, LPCWSTR currentDirectory, bool sus
   BOOL success = ::CreateProcess(NULL,
                                  commandLine,
                                  NULL, NULL,       // no special process or thread attributes
-                                 FALSE,            // don't inherit handle
+                                 inheritHandles,   // inherit handles if we plan to use stdout or stderr reroute
                                  suspended ? CREATE_SUSPENDED : 0, // create suspended so I have time to inject the DLL
                                  NULL,             // same environment as parent
                                  currentDirectory, // current directory
@@ -95,14 +108,22 @@ bool spawn(LPCWSTR binary, LPCWSTR arguments, LPCWSTR currentDirectory, bool sus
 }
 
 
-HANDLE startBinary(const QFileInfo &binary, const QString &arguments, const QString& profileName, int logLevel, const QDir &currentDirectory, bool hooked)
+HANDLE startBinary(const QFileInfo &binary,
+                   const QString &arguments,
+                   const QString& profileName,
+                   int logLevel,
+                   const QDir &currentDirectory,
+                   bool hooked,
+                   HANDLE stdOut,
+                   HANDLE stdErr)
 {
   HANDLE processHandle, threadHandle;
   std::wstring binaryName = ToWString(QDir::toNativeSeparators(binary.absoluteFilePath()));
   std::wstring currentDirectoryName = ToWString(QDir::toNativeSeparators(currentDirectory.absolutePath()));
 
   try {
-    if (!spawn(binaryName.c_str(), ToWString(arguments).c_str(), currentDirectoryName.c_str(), hooked, processHandle, threadHandle)) {
+    if (!spawn(binaryName.c_str(), ToWString(arguments).c_str(), currentDirectoryName.c_str(), hooked,
+               stdOut, stdErr, processHandle, threadHandle)) {
       reportError(QObject::tr("failed to spawn \"%1\"").arg(binary.fileName()));
       return INVALID_HANDLE_VALUE;
     }
@@ -117,9 +138,10 @@ HANDLE startBinary(const QFileInfo &binary, const QString &arguments, const QStr
                                     "can be installed to work without elevation.\n\n"
                                     "Start elevated anyway? "
                                     "(you will be asked if you want to allow ModOrganizer.exe to make changes to the system)").arg(
-                                        QDir::toNativeSeparators(binary.absoluteFilePath()))) == QMessageBox::Yes) {
+                                        QDir::toNativeSeparators(binary.absoluteFilePath())),
+                                QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
         ::ShellExecuteW(NULL, L"runas", ToWString(QCoreApplication::applicationFilePath()).c_str(),
-                        (binaryName + L" " + ToWString(arguments)).c_str(), currentDirectoryName.c_str(), SW_SHOWNORMAL);
+                        (std::wstring(L"\"") + binaryName + L"\" " + ToWString(arguments)).c_str(), currentDirectoryName.c_str(), SW_SHOWNORMAL);
         return INVALID_HANDLE_VALUE;
       } else {
         return INVALID_HANDLE_VALUE;
@@ -156,7 +178,7 @@ HANDLE startBinary(const QFileInfo &binary, const QString &arguments, const QStr
   return processHandle;
 }
 
-
+/*
 ExitProxy *ExitProxy::s_Instance = NULL;
 
 ExitProxy *ExitProxy::instance()
@@ -170,4 +192,4 @@ ExitProxy *ExitProxy::instance()
 void ExitProxy::emitExit()
 {
   emit exit();
-}
+}*/