1 files changed, 30 insertions, 19 deletions
diff --git a/src/spawn.cpp b/src/spawn.cpp
index 49e89a8b..19cf304c 100644
--- a/src/spawn.cpp
+++ b/src/spawn.cpp
@@ -23,6 +23,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "utility.h"
 #include <report.h>
 #include <inject.h>
+#include <usvfs.h>
+#include <Shellapi.h>
 #include <appconfig.h>
 #include <windows_error.h>
 
@@ -39,7 +41,8 @@ using namespace MOShared;
 
 static const int BUFSIZE = 4096;
 
-static bool spawn(LPCWSTR binary, LPCWSTR arguments, LPCWSTR currentDirectory, bool suspended,
+static bool spawn(LPCWSTR binary, LPCWSTR arguments, LPCWSTR currentDirectory,
+                  bool suspended, bool hooked,
                   HANDLE stdOut, HANDLE stdErr,
                   HANDLE& processHandle, HANDLE& threadHandle)
 {
@@ -87,15 +90,28 @@ static bool spawn(LPCWSTR binary, LPCWSTR arguments, LPCWSTR currentDirectory, b
   }
 
   PROCESS_INFORMATION pi;
-  BOOL success = ::CreateProcess(nullptr,
-                                 commandLine,
-                                 nullptr, nullptr,       // no special process or thread attributes
-                                 inheritHandles,   // inherit handles if we plan to use stdout or stderr reroute
-                                 CREATE_BREAKAWAY_FROM_JOB | (suspended ? CREATE_SUSPENDED : 0), // create suspended so I have time to inject the DLL
-                                 nullptr,             // same environment as parent
-                                 currentDirectory, // current directory
-                                 &si, &pi          // startup and process information
-                                 );
+  BOOL success = FALSE;
+  if (hooked) {
+    success = ::CreateProcessHooked(nullptr,
+                                    commandLine,
+                                    nullptr, nullptr,       // no special process or thread attributes
+                                    inheritHandles,   // inherit handles if we plan to use stdout or stderr reroute
+                                    CREATE_BREAKAWAY_FROM_JOB,
+                                    nullptr,             // same environment as parent
+                                    currentDirectory, // current directory
+                                    &si, &pi          // startup and process information
+                                    );
+  } else {
+    success = ::CreateProcess(nullptr,
+                              commandLine,
+                              nullptr, nullptr,       // no special process or thread attributes
+                              inheritHandles,   // inherit handles if we plan to use stdout or stderr reroute
+                              CREATE_BREAKAWAY_FROM_JOB,
+                              nullptr,             // same environment as parent
+                              currentDirectory, // current directory
+                              &si, &pi          // startup and process information
+                              );
+  }
 
   ::SetEnvironmentVariable(TEXT("PATH"), oldPath.get());
 
@@ -113,8 +129,6 @@ static bool spawn(LPCWSTR binary, LPCWSTR arguments, LPCWSTR currentDirectory, b
 
 HANDLE startBinary(const QFileInfo &binary,
                    const QString &arguments,
-                   const QString& profileName,
-                   int logLevel,
                    const QDir &currentDirectory,
                    bool hooked,
                    HANDLE stdOut,
@@ -138,8 +152,8 @@ HANDLE startBinary(const QFileInfo &binary,
   std::wstring currentDirectoryName = ToWString(QDir::toNativeSeparators(currentDirectory.absolutePath()));
 
   try {
-    if (!spawn(binaryName.c_str(), ToWString(arguments).c_str(), currentDirectoryName.c_str(), true,
-               stdOut, stdErr, processHandle, threadHandle)) {
+    if (!spawn(binaryName.c_str(), ToWString(arguments).c_str(), currentDirectoryName.c_str(),
+               true, hooked, stdOut, stdErr, processHandle, threadHandle)) {
       reportError(QObject::tr("failed to spawn \"%1\"").arg(binary.fileName()));
       return INVALID_HANDLE_VALUE;
     }
@@ -167,7 +181,7 @@ HANDLE startBinary(const QFileInfo &binary,
       return INVALID_HANDLE_VALUE;
     }
   }
-
+/*
   if (hooked) {
     try {
       QFileInfo dllInfo(QApplication::applicationDirPath() + "/" + ToQString(AppConfig::hookDLLName()));
@@ -187,6 +201,7 @@ HANDLE startBinary(const QFileInfo &binary,
     reportError("ready?");
 #endif // DEBUG
   }
+  */
 
   if (::AssignProcessToJobObject(jobObject, processHandle) == 0) {
     qWarning("failed to assign to job object: %lu", ::GetLastError());
@@ -196,10 +211,6 @@ HANDLE startBinary(const QFileInfo &binary,
     ::CloseHandle(processHandle);
   }
 
-  if (::ResumeThread(threadHandle) == (DWORD)-1) {
-    reportError(QObject::tr("failed to run \"%1\"").arg(binary.fileName()));
-    return INVALID_HANDLE_VALUE;
-  }
   ::CloseHandle(threadHandle);
   return jobObject;
 }