Merge pull request #887 from isanae/spawning-and-waiting

Spawning, waiting and locking

1 files changed, 20 insertions, 4 deletions

diff --git a/src/spawn.h b/src/spawn.h
index 31b44739..a615b5ff 100644
--- a/src/spawn.h
+++ b/src/spawn.h
@@ -46,20 +46,17 @@ struct SpawnParameters
   QFileInfo binary;

   QString arguments;

   QDir currentDirectory;

+  QString steamAppID;

   bool hooked = false;

   HANDLE stdOut = INVALID_HANDLE_VALUE;

   HANDLE stdErr = INVALID_HANDLE_VALUE;

 };

 

 

-bool checkBinary(QWidget* parent, const SpawnParameters& sp);

-

 bool checkSteam(

   QWidget* parent, const SpawnParameters& sp,

   const QDir& gameDirectory, const QString &steamAppID, const Settings& settings);

 

-bool checkEnvironment(QWidget* parent, const SpawnParameters& sp);

-

 bool checkBlacklist(

   QWidget* parent, const SpawnParameters& sp, Settings& settings);

 

@@ -69,6 +66,25 @@ bool checkBlacklist(
  **/

 HANDLE startBinary(QWidget* parent, const SpawnParameters& sp);

 

+

+enum class FileExecutionTypes

+{

+  Executable = 1,

+  Other

+};

+

+struct FileExecutionContext

+{

+  QFileInfo binary;

+  QString arguments;

+  FileExecutionTypes type;

+};

+

+QString findJavaInstallation(const QString& jarFile);

+

+FileExecutionContext getFileExecutionContext(

+  QWidget* parent, const QFileInfo& target);

+

 } // namespace