Merge master

Engines/Wine/Engine/Object/script.js

@@ -5,7 +5,7 @@ include(["utils", "functions", "net", "download"]);
 include(["utils", "functions", "net", "resource"]);
 
 /* exported LATEST_STABLE_VERSION */
-var LATEST_STABLE_VERSION = "3.0.1";
+var LATEST_STABLE_VERSION = "3.0";
 /* exported LATEST_DEVELOPMENT_VERSION */
 var LATEST_DEVELOPMENT_VERSION = "3.8";
 /* exported LATEST_STAGING_VERSION */
@@ -21,6 +21,26 @@ function Wine() {
     this._OperatingSystemFetcher = Bean("operatingSystemFetcher");
 }
 
+/**
+*
+* @returns {string} architecture ("x86" or "amd64")
+*/
+Wine.prototype.architecture = function () {
+    // get
+    if (arguments.length == 0) {
+        if (fileExists(this.prefixDirectory())) {
+            var configFactory = Bean("compatibleConfigFileFormatFactory");
+            var containerConfiguration = configFactory.open(this.prefixDirectory() + "/phoenicis.cfg");
+            var architecture = containerConfiguration.readValue("wineArchitecture", "x86");
+            return architecture;
+        }
+        else {
+            print("Wine prefix \"" + this.prefixDirectory() + "\" does not exist!");
+            return "";
+        }
+    }
+};
+
 /**
 *
 * @param {SetupWizard} [wizard]
@@ -128,6 +148,8 @@ Wine.prototype.runInsidePrefix = function (executable, args) {
 Wine.prototype.run = function (executable, args, workingDirectory, captureOutput, wait, userData) {
     if (!args) {
         args = [];
+    } else if (typeof args === 'string' || args instanceof String) {
+        args = [args];
     }
     if (!workingDirectory) {
         workingDirectory = this._implementation.getContainerDirectory(this._implementation.getWorkingContainer());

Engines/Wine/QuickScript/Steam Script/script.js

@@ -90,7 +90,7 @@ SteamScript.prototype.go = function () {
     new Downloader()
         .wizard(setupWizard)
         .url("http://media.steampowered.com/client/installer/SteamSetup.exe")
-        .checksum("e930dbdb3bc638f772a8fcd92dbcd0919c924318")
+        .checksum("4b1b85ec2499a4ce07c89609b256923a4fc479e5")
         .to(tempFile)
         .get();
 

Engines/Wine/QuickScript/Uplay Script/script.js

@@ -49,15 +49,16 @@ UplayScript.prototype.go = function () {
         .to(tempFile)
         .get();
 
+    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));
+
     var wine = new Wine()
         .wizard(setupWizard)
         .architecture(this._wineArchitecture)
         .distribution(this._wineDistribution)
         .version(this._wineVersion)
         .prefix(this._name)
         .luna()
-        .run(tempFile)
-        .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));
+        .run(tempFile, [], null, false, true);
 
     wine.setOsForApplication().set("upc.exe", "winxp").do();
 

Engines/Wine/Verbs/DXVK/script.js

@@ -11,7 +11,7 @@ Wine.prototype.DXVK = function () {
     print("NOTE: you need a driver that supports Vulkan enough to run DXVK");
     print("NOTE: wine version should be greater or equal to 3.5");
 
-    var dxvkVersion = "0.51";
+    var dxvkVersion = "0.52";
 
     var setupFile = new Resource()
         .wizard(this.wizard())

Engines/Wine/Verbs/PhysX/script.js

@@ -8,14 +8,14 @@ include(["engines", "wine", "verbs", "luna"]);
 */
 Wine.prototype.physx = function () {
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("http://uk.download.nvidia.com/Windows/9.14.0702/PhysX-9.14.0702-SystemSoftware.msi")
         .checksum("81e2d38e2356e807ad80cdf150ed5acfff839c8b")
         .name("PhysX-9.14.0702-SystemSoftware.msi")
         .get();
 
-    this.run("msiexec", ["/i", setupFile, "/q"])
-        .wait(tr("Please wait while {0} is installed ...", "PhysX"));
+    this.wizard().wait(tr("Please wait while {0} is installed ...", "PhysX"));
+    this.run("msiexec", ["/i", setupFile, "/q"], null, false, true);
 
     return this;
 };

Engines/Wine/Verbs/QuickTime 7.6/script.js

@@ -7,14 +7,14 @@ include(["utils", "functions", "net", "resource"]);
 */
 Wine.prototype.quicktime76 = function () {
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("http://appldnld.apple.com/QuickTime/041-0025.20101207.Ptrqt/QuickTimeInstaller.exe")
         .checksum("1eec8904f041d9e0ad3459788bdb690e45dbc38e")
         .name("QuickTimeInstaller.exe")
         .get();
 
-    this.run(setupFile, ["ALLUSERS=1", "DESKTOP_SHORTCUTS=0", "QTTaskRunFlags=0", "QTINFO.BISQTPRO=1", "SCHEDULE_ASUW=0", "REBOOT_REQUIRED=No"])
-        .wait(tr("Please wait while {0} is installed ...", "QuickTime"));
+    this.wizard().wait(tr("Please wait while {0} is installed ...", "QuickTime"));
+    this.run(setupFile, ["ALLUSERS=1", "DESKTOP_SHORTCUTS=0", "QTTaskRunFlags=0", "QTINFO.BISQTPRO=1", "SCHEDULE_ASUW=0", "REBOOT_REQUIRED=No"], null, false, true);
 
     return this;
 };

Engines/Wine/Verbs/Tahoma/script.js

@@ -10,14 +10,14 @@ include(["utils", "functions", "filesystem", "files"]);
 */
 Wine.prototype.tahoma = function () {
     var tahoma = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("https://github.com/caarlos0/msfonts/blob/master/fonts/tahoma.ttf?raw=true")
         .checksum("ae34f679d7f384123ff10453bbeaca649d4987b1")
         .name("tahoma.ttf")
         .get();
 
     var tahomabd = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("https://github.com/caarlos0/msfonts/blob/master/fonts/tahomabd.ttf?raw=true")
         .checksum("07e766641293bfd570ed85bce75abc9be2da0ee1")
         .name("tahomabd.ttf")

Engines/Wine/Verbs/Uplay/script.js

@@ -7,13 +7,13 @@ include(["utils", "functions", "net", "resource"]);
 */
 Wine.prototype.uplay = function () {
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("https://ubistatic3-a.akamaihd.net/orbit/launcher_installer/UplayInstaller.exe")
         .name("UplayInstaller.exe")
         .get();
 
-    this.run(setupFile)
-        .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 can continue."));
+    this.wizard().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 can continue."));
+    this.run(setupFile, [], null, false, true);
 
     return this;
 };

Engines/Wine/Verbs/Windows XP SP 3/script.js

@@ -16,23 +16,23 @@ Wine.prototype.sp3extract = function (fileToExtract) {
     };
 
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("http://freeware.epsc.wustl.edu/Win/XP_SP3/WindowsXP-KB936929-SP3-x86-ENU.exe")// Just a test, the URL needs to be fixed
         .checksum("c81472f7eeea2eca421e116cd4c03e2300ebfde4")
         .name("WindowsXP-KB936929-SP3-x86-ENU.exe")
         .get();
 
     new CabExtract()
         .archive(setupFile)
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .to(this.prefixDirectory() + "/drive_c/sp3/")
         .extract(["-F", "i386/" + fileToExtract.slice(0, -1) + "_"]);
 
     remove(that._targetDirectory + "/" + fileToExtract);
 
     new CabExtract()
         .archive(this.prefixDirectory() + "/drive_c/sp3/i386/" + fileToExtract.slice(0, -1) + "_")
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .to(that._targetDirectory)
         .extract();
 

Engines/Wine/Verbs/corefonts/script.js

@@ -11,77 +11,77 @@ Wine.prototype.corefonts = function () {
     var fontResources =
     [
         new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://mirrors.kernel.org/gentoo/distfiles/arial32.exe")
             .checksum("6d75f8436f39ab2da5c31ce651b7443b4ad2916e")
             .name("arial32.exe")
             .get(),
 
         new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://mirrors.kernel.org/gentoo/distfiles/arialb32.exe")
             .checksum("d45cdab84b7f4c1efd6d1b369f50ed0390e3d344")
             .name("arialb32.exe")
             .get(),
 
         new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://mirrors.kernel.org/gentoo/distfiles/comic32.exe")
             .checksum("2371d0327683dcc5ec1684fe7c275a8de1ef9a51")
             .name("comic32.exe")
             .get(),
 
         new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://mirrors.kernel.org/gentoo/distfiles/courie32.exe")
             .checksum("06a745023c034f88b4135f5e294fece1a3c1b057")
             .name("courie32.exe")
             .get(),
 
         new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://mirrors.kernel.org/gentoo/distfiles/georgi32.exe")
             .checksum("90e4070cb356f1d811acb943080bf97e419a8f1e")
             .name("georgi32.exe")
             .get(),
 
         new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://mirrors.kernel.org/gentoo/distfiles/impact32.exe")
             .checksum("86b34d650cfbbe5d3512d49d2545f7509a55aad2")
             .name("impact32.exe")
             .get(),
 
         new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://mirrors.kernel.org/gentoo/distfiles/times32.exe")
             .checksum("20b79e65cdef4e2d7195f84da202499e3aa83060")
             .name("times32.exe")
             .get(),
 
         new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://mirrors.kernel.org/gentoo/distfiles/trebuc32.exe ")
             .checksum("50aab0988423efcc9cf21fac7d64d534d6d0a34a")
             .name("trebuc32.exe")
             .get(),
 
         new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://mirrors.kernel.org/gentoo/distfiles/verdan32.exe ")
             .checksum("f5b93cedf500edc67502f116578123618c64a42a")
             .name("verdan32.exe")
             .get(),
 
         new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://mirrors.kernel.org/gentoo/distfiles/webdin32.exe ")
             .checksum("2fb4a42c53e50bc70707a7b3c57baf62ba58398f")
             .name("webdin32.exe")
             .get()
     ];
 
-    var progressBar = this._wizard.progressBar(tr("Please wait ..."));
+    var progressBar = this.wizard().progressBar(tr("Please wait ..."));
     progressBar.setText(tr("Installing {0} ...", tr("fonts")));
     progressBar.setProgressPercentage(0.);
     var numInstalledFonts = 0;

Engines/Wine/Verbs/d3dx10/script.js

@@ -26,13 +26,13 @@ Wine.prototype.d3dx10 = function () {
     };
 
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("http://download.microsoft.com/download/8/4/A/84A35BF1-DAFE-4AE8-82AF-AD2AE20B6B14/directx_Jun2010_redist.exe")
         .checksum("f8f1217f666bf2f6863631a7d5e5fb3a8d1542df")
         .name("directx_Jun2010_redist.exe")
         .get();
 
-    var progressBar = this._wizard.progressBar(tr("Please wait ..."));
+    var progressBar = this.wizard().progressBar(tr("Please wait ..."));
     progressBar.setText(tr("Extracting {0} ...", "DirectX 10"));
     progressBar.setProgressPercentage(0.);
 

Engines/Wine/Verbs/d3dx9/script.js

@@ -26,13 +26,13 @@ Wine.prototype.d3dx9 = function () {
     };
 
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("http://download.microsoft.com/download/8/4/A/84A35BF1-DAFE-4AE8-82AF-AD2AE20B6B14/directx_Jun2010_redist.exe")
         .checksum("f8f1217f666bf2f6863631a7d5e5fb3a8d1542df")
         .name("directx_Jun2010_redist.exe")
         .get();
 
-    var progressBar = this._wizard.progressBar(tr("Please wait ..."));
+    var progressBar = this.wizard().progressBar(tr("Please wait ..."));
     progressBar.setText(tr("Extracting {0} ...", "DirectX 9"));
     progressBar.setProgressPercentage(0.);
 

Engines/Wine/Verbs/dotnet40/script.js

@@ -10,34 +10,34 @@ include(["utils", "functions", "filesystem", "files"]);
 */
 Wine.prototype.dotnet40 = function () {
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("http://download.microsoft.com/download/9/5/A/95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE/dotNetFx40_Full_x86_x64.exe")
         .checksum("58da3d74db353aad03588cbb5cea8234166d8b99")
         .name("dotNetFx40_Full_x86_x64.exe")
         .get();
 
     this.uninstall("Mono");
 
-    this.run("reg", ["delete", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4", "/f"])
-        .wait(tr("Please wait ..."));
+    this.wizard().wait(tr("Please wait ..."));
+    this.run("reg", ["delete", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4", "/f"], null, false, true);
 
     remove(this.system32directory() + "/mscoree.dll");
 
     this.overrideDLL()
         .set("builtin", ["fusion"])
         .do();
 
-    this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""])
-        .wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.0"));
+    this.wizard().wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.0"));
+    this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
     this.overrideDLL()
         .set("native", ["mscoree"])
         .do();
 
-    this.run("reg", ["add", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4\Full", "/v", "Install", "/t", "REG_DWORD", "/d", "0001", "/f"])
-        .wait(tr("Please wait ..."));
-    this.run("reg", ["add", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4\Full", "/v", "Version", "/t", "REG_SZ", "/d", "4.0.30319", "/f"])
-        .wait(tr("Please wait ..."));
+    this.wizard().wait(tr("Please wait ..."));
+    this.run("reg", ["add", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4\Full", "/v", "Install", "/t", "REG_DWORD", "/d", "0001", "/f"], null, false, true);
+    this.wizard().wait(tr("Please wait ..."));
+    this.run("reg", ["add", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4\Full", "/v", "Version", "/t", "REG_SZ", "/d", "4.0.30319", "/f"], null, false, true);
 
     return this;
 };

Engines/Wine/Verbs/dotnet45/script.js

@@ -19,16 +19,16 @@ Wine.prototype.dotnet45 = function () {
     var OSVersion = this.windowsVersion();
 
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("http://download.microsoft.com/download/b/a/4/ba4a7e71-2906-4b2d-a0e1-80cf16844f5f/dotnetfx45_full_x86_x64.exe")
         .checksum("b2ff712ca0947040ca0b8e9bd7436a3c3524bb5d")
         .name("dotnetfx45_full_x86_x64.exe")
         .get();
 
     this.uninstall("Mono");
 
-    this.run("reg", ["delete", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4", "/f"])
-        .wait(tr("Please wait ..."));
+    this.wizard().wait(tr("Please wait ..."));
+    this.run("reg", ["delete", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4", "/f"], null, false, true);
 
     remove(this.system32directory() + "/mscoree.dll");
 
@@ -39,8 +39,8 @@ Wine.prototype.dotnet45 = function () {
         .set("builtin", ["fusion"])
         .do();
 
-    this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""])
-        .wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.5"));
+    this.wizard().wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.5"));
+    this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
     this.overrideDLL()
         .set("native", ["mscoree"])