From fdd506794d6465872f3e02b73f4eb3f3f6679797 Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Thu, 6 Jun 2019 03:58:33 -0500 Subject: [PATCH 1/6] Fix for steam quickscript --- Engines/Wine/QuickScript/Steam Script/script.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Engines/Wine/QuickScript/Steam Script/script.js b/Engines/Wine/QuickScript/Steam Script/script.js index 651d54b5ca..7e591e71ca 100644 --- a/Engines/Wine/QuickScript/Steam Script/script.js +++ b/Engines/Wine/QuickScript/Steam Script/script.js @@ -116,11 +116,16 @@ SteamScript.prototype.go = function () { .wizard(setupWizard) .prefix(this._name, this._wineDistribution, this._wineArchitecture, this._wineVersion) .luna(); + .corefonts(); // Steam must be started once such that config.vdf is created (see fixCertificateIssue()) setupWizard.wait(tr("Please follow the steps of the Steam setup. Then, wait until Steam is updated, log in and finally close Steam completely so the installation of \"{0}\" can continue.", this._name)); wine.run(tempFile, [], null, false, true); + // Set windows environment for executable that needs it + wine.setOsForApplication().set("steam.exe", "winxp").do(); + wine.setOsForApplication().set("steamwebhelper.exe", "winxp").do(); + // ensure that Steam is running (user might have unchecked "run Steam after installation finished") wine.runInsidePrefix(wine.programFiles() + "/Steam/Steam.exe", ["steam://nav/games"], false); From 5f8cf905ee5539067b6ae9b54b76a1b147c0d2ad Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Thu, 6 Jun 2019 03:58:40 -0500 Subject: [PATCH 2/6] Added include for corefonts --- Engines/Wine/QuickScript/Steam Script/script.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Engines/Wine/QuickScript/Steam Script/script.js b/Engines/Wine/QuickScript/Steam Script/script.js index 7e591e71ca..6cbb67c3d7 100644 --- a/Engines/Wine/QuickScript/Steam Script/script.js +++ b/Engines/Wine/QuickScript/Steam Script/script.js @@ -5,6 +5,7 @@ include("engines.wine.plugins.override_dll"); include("utils.functions.filesystem.extract"); include("utils.functions.filesystem.files"); include("engines.wine.verbs.luna"); +include("engines.wine.verbs.corefonts"); function SteamScript() { From 9ac4f73f2bd83088572388ef18289173dfb5c6f6 Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Thu, 6 Jun 2019 04:00:08 -0500 Subject: [PATCH 3/6] Added include for windows_version --- Engines/Wine/QuickScript/Steam Script/script.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Engines/Wine/QuickScript/Steam Script/script.js b/Engines/Wine/QuickScript/Steam Script/script.js index 6cbb67c3d7..115b2a14d8 100644 --- a/Engines/Wine/QuickScript/Steam Script/script.js +++ b/Engines/Wine/QuickScript/Steam Script/script.js @@ -6,6 +6,7 @@ include("utils.functions.filesystem.extract"); include("utils.functions.filesystem.files"); include("engines.wine.verbs.luna"); include("engines.wine.verbs.corefonts"); +include("engines.wine.plugins.windows_version"); function SteamScript() { From fb996d2404519760036fbec8ed8a3e01fec899df Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Thu, 6 Jun 2019 04:11:14 -0500 Subject: [PATCH 4/6] Fix for corefonts syntax, imperator was right dammit! --- Engines/Wine/QuickScript/Steam Script/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/QuickScript/Steam Script/script.js b/Engines/Wine/QuickScript/Steam Script/script.js index 115b2a14d8..19793e66b0 100644 --- a/Engines/Wine/QuickScript/Steam Script/script.js +++ b/Engines/Wine/QuickScript/Steam Script/script.js @@ -118,7 +118,7 @@ SteamScript.prototype.go = function () { .wizard(setupWizard) .prefix(this._name, this._wineDistribution, this._wineArchitecture, this._wineVersion) .luna(); - .corefonts(); + wine.corefonts(); // Steam must be started once such that config.vdf is created (see fixCertificateIssue()) setupWizard.wait(tr("Please follow the steps of the Steam setup. Then, wait until Steam is updated, log in and finally close Steam completely so the installation of \"{0}\" can continue.", this._name)); From b81bb195811cc97e3137836679fde92f7422a25e Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Thu, 6 Jun 2019 04:15:16 -0500 Subject: [PATCH 5/6] Fixed indentation --- Engines/Wine/QuickScript/Steam Script/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/QuickScript/Steam Script/script.js b/Engines/Wine/QuickScript/Steam Script/script.js index 19793e66b0..bccebd4ca5 100644 --- a/Engines/Wine/QuickScript/Steam Script/script.js +++ b/Engines/Wine/QuickScript/Steam Script/script.js @@ -118,7 +118,7 @@ SteamScript.prototype.go = function () { .wizard(setupWizard) .prefix(this._name, this._wineDistribution, this._wineArchitecture, this._wineVersion) .luna(); - wine.corefonts(); + wine.corefonts(); // Steam must be started once such that config.vdf is created (see fixCertificateIssue()) setupWizard.wait(tr("Please follow the steps of the Steam setup. Then, wait until Steam is updated, log in and finally close Steam completely so the installation of \"{0}\" can continue.", this._name)); From 0cc166cac1d066bb879a0a45c62a3c09c30c593f Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Thu, 6 Jun 2019 08:39:32 -0500 Subject: [PATCH 6/6] Added fix for Uplay games on steam --- Engines/Wine/QuickScript/Steam Script/script.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Engines/Wine/QuickScript/Steam Script/script.js b/Engines/Wine/QuickScript/Steam Script/script.js index bccebd4ca5..6b44dec29b 100644 --- a/Engines/Wine/QuickScript/Steam Script/script.js +++ b/Engines/Wine/QuickScript/Steam Script/script.js @@ -128,6 +128,10 @@ SteamScript.prototype.go = function () { wine.setOsForApplication().set("steam.exe", "winxp").do(); wine.setOsForApplication().set("steamwebhelper.exe", "winxp").do(); + // Fix for Uplay games that are executed on steam + wine.setOsForApplication().set("upc.exe", "winvista").do(); + wine.setOsForApplication().set("UbisoftGameLauncher.exe", "winvista").do(); + // ensure that Steam is running (user might have unchecked "run Steam after installation finished") wine.runInsidePrefix(wine.programFiles() + "/Steam/Steam.exe", ["steam://nav/games"], false);