From ada2ac0cb5d0ef2039ce55794928c4d05255ed65 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Thu, 31 Oct 2019 07:37:24 -0400
Subject: removed redundant checkBinary(), which used to check for non existing
 binaries, that's handled when spawning removed useless checkEnvironment(),
 which checked for EventLog removed CREATE_BREAKAWAY_FROM_JOB from
 CreateProcess() calls, didn't do anything fixed setFromFileOrExecutable()
 when running just a filename that's not an executable name split run() fixed
 lock widget being disabled when running without a ui

---
 src/spawn.cpp | 43 +++----------------------------------------
 1 file changed, 3 insertions(+), 40 deletions(-)

(limited to 'src/spawn.cpp')

diff --git a/src/spawn.cpp b/src/spawn.cpp
index 62745542..f95846c8 100644
--- a/src/spawn.cpp
+++ b/src/spawn.cpp
@@ -490,7 +490,7 @@ DWORD spawn(const SpawnParameters& sp, HANDLE& processHandle)
   const QString moPath = QCoreApplication::applicationDirPath();
   const auto oldPath = env::addPath(QDir::toNativeSeparators(moPath));
 
-  PROCESS_INFORMATION pi;
+  PROCESS_INFORMATION pi = {};
   BOOL success = FALSE;
 
   logSpawning(sp, commandLine);
@@ -501,13 +501,11 @@ DWORD spawn(const SpawnParameters& sp, HANDLE& processHandle)
   if (sp.hooked) {
     success = ::CreateProcessHooked(
       nullptr, const_cast<wchar_t*>(wcommandLine.c_str()), nullptr, nullptr,
-      inheritHandles, CREATE_BREAKAWAY_FROM_JOB, nullptr,
-      wcwd.c_str(), &si, &pi);
+      inheritHandles, 0, nullptr, wcwd.c_str(), &si, &pi);
   } else {
     success = ::CreateProcess(
       nullptr, const_cast<wchar_t*>(wcommandLine.c_str()), nullptr, nullptr,
-      inheritHandles, CREATE_BREAKAWAY_FROM_JOB, nullptr,
-      wcwd.c_str(), &si, &pi);
+      inheritHandles, 0, nullptr, wcwd.c_str(), &si, &pi);
   }
 
   const auto e = GetLastError();
@@ -557,16 +555,6 @@ void startBinaryAdmin(QWidget* parent, const SpawnParameters& sp)
   restartAsAdmin(parent);
 }
 
-bool checkBinary(QWidget* parent, const SpawnParameters& sp)
-{
-  if (!sp.binary.exists()) {
-    dialogs::spawnFailed(parent, sp, ERROR_FILE_NOT_FOUND);
-    return false;
-  }
-
-  return true;
-}
-
 struct SteamStatus
 {
   bool running=false;
@@ -754,31 +742,6 @@ bool checkSteam(
   return true;
 }
 
-bool checkEnvironment(QWidget* parent, const SpawnParameters& sp)
-{
-  // check if the Windows Event Logging service is running; for some reason,
-  // this seems to be critical to the successful running of usvfs.
-  const auto serviceName = "EventLog";
-
-  const auto s = env::getService(serviceName);
-
-  if (!s.isValid()) {
-    log::error(
-      "cannot determine the status of the {} service, continuing",
-      serviceName);
-
-    return true;
-  }
-
-  if (s.status() == env::Service::Status::Running) {
-    log::debug("{}", s.toString());
-    return true;
-  }
-
-  log::error("{}", s.toString());
-  return dialogs::eventLogNotRunning(parent, s, sp);
-}
-
 bool checkBlacklist(
   QWidget* parent, const SpawnParameters& sp, Settings& settings)
 {
-- 
cgit v1.3.1