From ddff16f99fced5bf41224bec27e14b50adc6d4f5 Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Wed, 5 Jun 2019 18:32:05 -0500 Subject: [PATCH 1/5] Fixed Uplay --- Applications/Games/Uplay/Online/script.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Applications/Games/Uplay/Online/script.js b/Applications/Games/Uplay/Online/script.js index 9db2e9d950..66bbc21d0d 100644 --- a/Applications/Games/Uplay/Online/script.js +++ b/Applications/Games/Uplay/Online/script.js @@ -1,4 +1,6 @@ include("engines.wine.quick_script.online_installer_script"); +include("engines.wine.plugins.windows_version"); +include("engines.wine.verbs.corefonts"); var installerImplementation = { run: function () { @@ -6,12 +8,17 @@ var installerImplementation = { .name("Uplay") .editor("Ubisoft") .applicationHomepage("https://uplay.ubi.com/") - .author("Plata") + .author("Plata, KREYREN") .url("https://ubistatic3-a.akamaihd.net/orbit/launcher_installer/UplayInstaller.exe") .category("Games") .executable("UbisoftGameLauncher.exe") .wineVersion(LATEST_STAGING_VERSION) .wineDistribution("staging") + .preInstall(function (wine/*, wizard*/) { + wine.corefonts(); + wine.setOsForApplication().set("upc.exe", "winvista").do(); + wine.setOsForApplication().set("UbisoftGameLauncher.exe", "winvista").do(); + }) .go(); } }; From 4818ae2b1bd727334e2b786470fd6093122501e6 Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Wed, 5 Jun 2019 19:13:58 -0500 Subject: [PATCH 2/5] Added fix in quickscript --- Engines/Wine/QuickScript/Uplay Script/script.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Engines/Wine/QuickScript/Uplay Script/script.js b/Engines/Wine/QuickScript/Uplay Script/script.js index a76f26146e..8ea2b7f262 100644 --- a/Engines/Wine/QuickScript/Uplay Script/script.js +++ b/Engines/Wine/QuickScript/Uplay Script/script.js @@ -4,6 +4,7 @@ include("engines.wine.engine.object"); 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 UplayScript() { @@ -53,12 +54,14 @@ UplayScript.prototype.go = function () { .wizard(setupWizard) .prefix(this._name, this._wineDistribution, this._wineArchitecture, this._wineVersion) .luna(); + .corefonts(); setupWizard.message(tr("Please ensure that winbind is installed before you continue.")); setupWizard.wait(tr("Please follow the steps of the Uplay setup.\n\nUncheck \"Run Uplay\" or close Uplay completely after the setup so that the installation of \"{0}\" can continue.", this._name)); wine.run(tempFile, [], null, false, true); - wine.setOsForApplication().set("upc.exe", "winxp").do(); + wine.setOsForApplication().set("upc.exe", "winvista").do(); + wine.setOsForApplication().set("UbisoftGameLauncher.exe", "winvista").do(); // Uplay installation has finished setupWizard.wait(tr("Please wait...")); From 50050b91026a2bec7c9b70f13a28caefdedd553f Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Thu, 6 Jun 2019 04:22:38 -0500 Subject: [PATCH 3/5] Syntax fix --- Engines/Wine/QuickScript/Uplay Script/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/QuickScript/Uplay Script/script.js b/Engines/Wine/QuickScript/Uplay Script/script.js index 8ea2b7f262..15b53f031b 100644 --- a/Engines/Wine/QuickScript/Uplay Script/script.js +++ b/Engines/Wine/QuickScript/Uplay Script/script.js @@ -54,7 +54,7 @@ UplayScript.prototype.go = function () { .wizard(setupWizard) .prefix(this._name, this._wineDistribution, this._wineArchitecture, this._wineVersion) .luna(); - .corefonts(); + wine.corefonts(); setupWizard.message(tr("Please ensure that winbind is installed before you continue.")); setupWizard.wait(tr("Please follow the steps of the Uplay setup.\n\nUncheck \"Run Uplay\" or close Uplay completely after the setup so that the installation of \"{0}\" can continue.", this._name)); From fc2f539b41d7de20ee01febf0aa19dc2324230b7 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Thu, 6 Jun 2019 11:23:37 +0200 Subject: [PATCH 4/5] Update script.js --- Engines/Wine/QuickScript/Uplay Script/script.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Engines/Wine/QuickScript/Uplay Script/script.js b/Engines/Wine/QuickScript/Uplay Script/script.js index 15b53f031b..9f267f4668 100644 --- a/Engines/Wine/QuickScript/Uplay Script/script.js +++ b/Engines/Wine/QuickScript/Uplay Script/script.js @@ -54,6 +54,7 @@ UplayScript.prototype.go = function () { .wizard(setupWizard) .prefix(this._name, this._wineDistribution, this._wineArchitecture, this._wineVersion) .luna(); + wine.corefonts(); setupWizard.message(tr("Please ensure that winbind is installed before you continue.")); From 590a247ddfd4b5b53d3e2c2fe52b1ec7b71a791b Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Thu, 6 Jun 2019 11:30:00 +0200 Subject: [PATCH 5/5] Update script.js --- Engines/Wine/QuickScript/Uplay Script/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/QuickScript/Uplay Script/script.js b/Engines/Wine/QuickScript/Uplay Script/script.js index 9f267f4668..8aac8932a9 100644 --- a/Engines/Wine/QuickScript/Uplay Script/script.js +++ b/Engines/Wine/QuickScript/Uplay Script/script.js @@ -54,7 +54,7 @@ UplayScript.prototype.go = function () { .wizard(setupWizard) .prefix(this._name, this._wineDistribution, this._wineArchitecture, this._wineVersion) .luna(); - + wine.corefonts(); setupWizard.message(tr("Please ensure that winbind is installed before you continue."));