From ac12284b4330c6c818a5f44ae7d5837822a42ec5 Mon Sep 17 00:00:00 2001 From: plata Date: Mon, 21 Jan 2019 19:50:20 +0100 Subject: [PATCH 01/14] Update Wine LATEST_DEVELOPMENT_VERSION and LATEST_STAGING_VERSION to 4.0-rc7 (#833) --- Engines/Wine/Engine/Object/script.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Engines/Wine/Engine/Object/script.js b/Engines/Wine/Engine/Object/script.js index 9cf76d82b2..b39af8bcd5 100644 --- a/Engines/Wine/Engine/Object/script.js +++ b/Engines/Wine/Engine/Object/script.js @@ -7,9 +7,9 @@ include(["utils", "functions", "net", "resource"]); /* exported LATEST_STABLE_VERSION */ var LATEST_STABLE_VERSION = "3.0.4"; /* exported LATEST_DEVELOPMENT_VERSION */ -var LATEST_DEVELOPMENT_VERSION = "4.0-rc6"; +var LATEST_DEVELOPMENT_VERSION = "4.0-rc7"; /* exported LATEST_STAGING_VERSION */ -var LATEST_STAGING_VERSION = "4.0-rc4"; +var LATEST_STAGING_VERSION = "4.0-rc7"; /* exported LATEST_DOS_SUPPORT_VERSION */ var LATEST_DOS_SUPPORT_VERSION = "4.0-rc4"; From 01155f8d6df17cd1c76ab407c2c5693de44dbd77 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 21 Jan 2019 18:59:51 +0000 Subject: [PATCH 02/14] Update JSDoc --- docs/jsdoc/Engines_Wine_Engine_Object_script.js.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/jsdoc/Engines_Wine_Engine_Object_script.js.html b/docs/jsdoc/Engines_Wine_Engine_Object_script.js.html index 0340c70aba..85e5eb263d 100644 --- a/docs/jsdoc/Engines_Wine_Engine_Object_script.js.html +++ b/docs/jsdoc/Engines_Wine_Engine_Object_script.js.html @@ -35,9 +35,9 @@

Source: Engines/Wine/Engine/Object/script.js

/* exported LATEST_STABLE_VERSION */ var LATEST_STABLE_VERSION = "3.0.4"; /* exported LATEST_DEVELOPMENT_VERSION */ -var LATEST_DEVELOPMENT_VERSION = "4.0-rc6"; +var LATEST_DEVELOPMENT_VERSION = "4.0-rc7"; /* exported LATEST_STAGING_VERSION */ -var LATEST_STAGING_VERSION = "4.0-rc4"; +var LATEST_STAGING_VERSION = "4.0-rc7"; /* exported LATEST_DOS_SUPPORT_VERSION */ var LATEST_DOS_SUPPORT_VERSION = "4.0-rc4"; From 6d0e4813f4a3fc39c19c9c1eb45a27717ff238e9 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Tue, 22 Jan 2019 17:50:03 +0100 Subject: [PATCH 03/14] Update DXVK (add new versions) (#837) --- Engines/Wine/Verbs/DXVK/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/DXVK/script.js b/Engines/Wine/Verbs/DXVK/script.js index 4971c51fc5..2a40d475ca 100644 --- a/Engines/Wine/Verbs/DXVK/script.js +++ b/Engines/Wine/Verbs/DXVK/script.js @@ -76,7 +76,7 @@ var verbImplementation = { .get(); var latestVersion = cat(releaseFile).replaceAll("\\n", ""); // query desired version (default: latest release version) - var versions = ["0.93", "0.92", "0.91", "0.90", + var versions = ["0.95", "0.94", "0.93", "0.92", "0.91", "0.90", "0.81", "0.80", "0.72", "0.71", "0.70", "0.65", "0.64", "0.63", "0.62", "0.61", "0.60", "0.54", "0.53", "0.52", "0.51", "0.50", From 3cbf97692bd61d5f19fe85a2820b082ba0d87183 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 22 Jan 2019 16:54:19 +0000 Subject: [PATCH 04/14] Update JSDoc --- docs/jsdoc/Engines_Wine_Verbs_DXVK_script.js.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/jsdoc/Engines_Wine_Verbs_DXVK_script.js.html b/docs/jsdoc/Engines_Wine_Verbs_DXVK_script.js.html index 1892986100..c2a2c47dca 100644 --- a/docs/jsdoc/Engines_Wine_Verbs_DXVK_script.js.html +++ b/docs/jsdoc/Engines_Wine_Verbs_DXVK_script.js.html @@ -104,7 +104,7 @@

Source: Engines/Wine/Verbs/DXVK/script.js

.get(); var latestVersion = cat(releaseFile).replaceAll("\\n", ""); // query desired version (default: latest release version) - var versions = ["0.93", "0.92", "0.91", "0.90", + var versions = ["0.95", "0.94", "0.93", "0.92", "0.91", "0.90", "0.81", "0.80", "0.72", "0.71", "0.70", "0.65", "0.64", "0.63", "0.62", "0.61", "0.60", "0.54", "0.53", "0.52", "0.51", "0.50", From 39ebf05aa0969f257dee1c5a38b3b7957b7dbcc5 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Wed, 23 Jan 2019 19:20:36 +0100 Subject: [PATCH 05/14] Update VK9 (#838) New versions + do not propose versions before 0.28.0 --- Engines/Wine/Verbs/VK9/script.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Engines/Wine/Verbs/VK9/script.js b/Engines/Wine/Verbs/VK9/script.js index 3dc356aeaa..64eabe1de0 100644 --- a/Engines/Wine/Verbs/VK9/script.js +++ b/Engines/Wine/Verbs/VK9/script.js @@ -15,7 +15,7 @@ Wine.prototype.VK9 = function (vk9Version) { print("NOTE: works from 0.28.0"); if (typeof vk9Version !== 'string') - vk9Version = "0.28.1"; + vk9Version = "0.29.0"; var setupFile32 = new Resource() .wizard(this.wizard()) @@ -68,7 +68,7 @@ var verbImplementation = { wine.prefix(container); var wizard = SetupWizard(InstallationType.VERBS, "VK9", java.util.Optional.empty()); // query desired version (default: 0.28.1) - var versions = ["0.28.1", "0.28.0", "0.27.0", "0.26.0", "0.25.0", "0.23.0", "0.17.0", "0.16.0", "0.6.0", "0.4.0"]; + var versions = ["0.29.0", "0.28.1", "0.28.0"]; //this script is not able to install older versions (VK9.conf mandatory) var selectedVersion = wizard.menu(tr("Please select the version."), versions, "0.28.1"); wine.wizard(wizard); // install selected version From 914819007b7ead4ee52aff2dd26557dc1f3ca75e Mon Sep 17 00:00:00 2001 From: Travis CI Date: Wed, 23 Jan 2019 18:25:18 +0000 Subject: [PATCH 06/14] Update JSDoc --- docs/jsdoc/Engines_Wine_Verbs_VK9_script.js.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/jsdoc/Engines_Wine_Verbs_VK9_script.js.html b/docs/jsdoc/Engines_Wine_Verbs_VK9_script.js.html index d503f08662..4f0f0ee4d1 100644 --- a/docs/jsdoc/Engines_Wine_Verbs_VK9_script.js.html +++ b/docs/jsdoc/Engines_Wine_Verbs_VK9_script.js.html @@ -43,7 +43,7 @@

Source: Engines/Wine/Verbs/VK9/script.js

print("NOTE: works from 0.28.0"); if (typeof vk9Version !== 'string') - vk9Version = "0.28.1"; + vk9Version = "0.29.0"; var setupFile32 = new Resource() .wizard(this.wizard()) @@ -96,7 +96,7 @@

Source: Engines/Wine/Verbs/VK9/script.js

wine.prefix(container); var wizard = SetupWizard(InstallationType.VERBS, "VK9", java.util.Optional.empty()); // query desired version (default: 0.28.1) - var versions = ["0.28.1", "0.28.0", "0.27.0", "0.26.0", "0.25.0", "0.23.0", "0.17.0", "0.16.0", "0.6.0", "0.4.0"]; + var versions = ["0.29.0", "0.28.1", "0.28.0"]; //this script is not able to install older versions (VK9.conf mandatory) var selectedVersion = wizard.menu(tr("Please select the version."), versions, "0.28.1"); wine.wizard(wizard); // install selected version From 8343f1771872617e100093f14047b621c2244984 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Wed, 23 Jan 2019 21:15:49 +0100 Subject: [PATCH 07/14] Add Faudio verb (#804) --- Engines/Wine/Verbs/FAudio/script.js | 70 +++++++++++++++++++++++++++ Engines/Wine/Verbs/FAudio/script.json | 12 +++++ 2 files changed, 82 insertions(+) create mode 100644 Engines/Wine/Verbs/FAudio/script.js create mode 100644 Engines/Wine/Verbs/FAudio/script.json diff --git a/Engines/Wine/Verbs/FAudio/script.js b/Engines/Wine/Verbs/FAudio/script.js new file mode 100644 index 0000000000..9cca797a64 --- /dev/null +++ b/Engines/Wine/Verbs/FAudio/script.js @@ -0,0 +1,70 @@ +include(["engines", "wine", "engine", "object"]); +include(["engines", "wine", "plugins", "override_dll"]); +include(["utils", "functions", "net", "resource"]); +include(["utils", "functions", "filesystem", "files"]); + +/** +* Verb to install FAudio +* see: https://github.com/Kron4ek/FAudio-Builds +* @param {String} faudioVersion version of FAudio to downlaod +* @returns {Wine} Wine object +*/ +Wine.prototype.faudio = function (faudioVersion) { + if(typeof faudioVersion !== 'string') + faudioVersion = "19.01"; + + var setupFile = new Resource() + .wizard(this.wizard()) + .url("https://github.com/Kron4ek/FAudio-Builds/releases/download/" + faudioVersion + "/faudio-" + faudioVersion + ".tar.xz") + .name("faudio-" + faudioVersion + ".tar.xz") + .get(); + + new Extractor() + .wizard(this.wizard()) + .archive(setupFile) + .to(this.prefixDirectory() + "/FAudio/") + .extract(); + + var forEach = Array.prototype.forEach; + var sys32dir = this.system32directory(); + var sys64dir = this.system64directory(); + var faudioDir = this.prefixDirectory() + "/FAudio/faudio-" + faudioVersion; + var self = this; + + forEach.call(ls(faudioDir + "/x32"), function (file) { + if (file.endsWith(".dll")) { + cp(faudioDir + "/x32/" + file, sys32dir); + self.overrideDLL() + .set("native", [file]) + .do(); + } + }); + + if (this.architecture() == "amd64") + { + forEach.call(ls(faudioDir + "/x64"), function (file) { + if (file.endsWith(".dll")) { + cp(faudioDir + "/x64/" + file, sys64dir); + } + }); + } + + return this; +} + +/** + * Verb to install FAudio +*/ +var verbImplementation = { + install: function (container) { + var wine = new Wine(); + wine.prefix(container); + var wizard = SetupWizard(InstallationType.VERBS, "FAudio", java.util.Optional.empty()); + wine.wizard(wizard); + wine.faudio(); + wizard.close(); + } +}; + +/* exported Verb */ +var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation); diff --git a/Engines/Wine/Verbs/FAudio/script.json b/Engines/Wine/Verbs/FAudio/script.json new file mode 100644 index 0000000000..ddd7e26bbd --- /dev/null +++ b/Engines/Wine/Verbs/FAudio/script.json @@ -0,0 +1,12 @@ +{ + "scriptName" : "faudio", + "id" : "faudio", + "compatibleOperatingSystems" : [ + "LINUX" + ], + "testingOperatingSystems" : [ + "LINUX" + ], + "free" : true, + "requiresPatch" : false +} From 6aecdc766887e7ab6a65ad514b1ca256f22f6845 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Wed, 23 Jan 2019 20:18:00 +0000 Subject: [PATCH 08/14] Update translations --- i18n/Messages.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/i18n/Messages.properties b/i18n/Messages.properties index 750efa2e5b..b22e677230 100644 --- a/i18n/Messages.properties +++ b/i18n/Messages.properties @@ -1725,6 +1725,9 @@ d3dx9=d3dx9 #: i18n/tmp/Engines/Wine/Verbs/devenum/script.js:1 devenum=devenum +#: i18n/tmp/Engines/Wine/Verbs/FAudio/script.js:1 +faudio=faudio + #: Engines/Wine/Verbs/corefonts/script.js:85 #: Engines/Wine/Verbs/corefonts/script.js:91 fonts=fonts From 79bfb5d5a95e168d776d2a18e47669c453757bb7 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Wed, 23 Jan 2019 20:21:49 +0000 Subject: [PATCH 09/14] Update JSDoc --- .../Engines_Wine_Verbs_FAudio_script.js.html | 121 ++++++++++ docs/jsdoc/Wine.html | 158 +++++++++++++ docs/jsdoc/global.html | 216 +++++++++++------- 3 files changed, 418 insertions(+), 77 deletions(-) create mode 100644 docs/jsdoc/Engines_Wine_Verbs_FAudio_script.js.html diff --git a/docs/jsdoc/Engines_Wine_Verbs_FAudio_script.js.html b/docs/jsdoc/Engines_Wine_Verbs_FAudio_script.js.html new file mode 100644 index 0000000000..1616aa73e8 --- /dev/null +++ b/docs/jsdoc/Engines_Wine_Verbs_FAudio_script.js.html @@ -0,0 +1,121 @@ + + + + + JSDoc: Source: Engines/Wine/Verbs/FAudio/script.js + + + + + + + + + + +
+ +

Source: Engines/Wine/Verbs/FAudio/script.js

+ + + + + + +
+
+ 
include(["engines", "wine", "engine", "object"]);
+include(["engines", "wine", "plugins", "override_dll"]);
+include(["utils", "functions", "net", "resource"]);
+include(["utils", "functions", "filesystem", "files"]);
+
+/**
+* Verb to install FAudio
+* see: https://github.com/Kron4ek/FAudio-Builds
+* @param {String} faudioVersion version of FAudio to downlaod
+* @returns {Wine} Wine object
+*/
+Wine.prototype.faudio = function (faudioVersion) {
+    if(typeof faudioVersion !== 'string') 
+        faudioVersion = "19.01";
+
+    var setupFile = new Resource()
+        .wizard(this.wizard())
+        .url("https://github.com/Kron4ek/FAudio-Builds/releases/download/" + faudioVersion + "/faudio-" + faudioVersion + ".tar.xz")
+        .name("faudio-" + faudioVersion + ".tar.xz")
+        .get();
+
+    new Extractor()
+        .wizard(this.wizard())
+        .archive(setupFile)
+        .to(this.prefixDirectory() + "/FAudio/")
+        .extract();
+
+    var forEach = Array.prototype.forEach;
+    var sys32dir = this.system32directory();
+    var sys64dir = this.system64directory();
+    var faudioDir = this.prefixDirectory() + "/FAudio/faudio-" + faudioVersion;
+    var self = this;
+
+    forEach.call(ls(faudioDir + "/x32"), function (file) {
+        if (file.endsWith(".dll")) {
+            cp(faudioDir + "/x32/" + file, sys32dir);
+            self.overrideDLL()
+                .set("native", [file])
+                .do();
+        }
+    });
+
+    if (this.architecture() == "amd64")
+    {
+        forEach.call(ls(faudioDir + "/x64"), function (file) {
+            if (file.endsWith(".dll")) {
+                cp(faudioDir + "/x64/" + file, sys64dir);
+            }
+        });
+    }
+
+    return this;
+}
+
+/**
+ * Verb to install FAudio
+*/
+var verbImplementation = {
+    install: function (container) {
+        var wine = new Wine();
+        wine.prefix(container);
+        var wizard = SetupWizard(InstallationType.VERBS, "FAudio", java.util.Optional.empty());
+        wine.wizard(wizard);
+        wine.faudio();
+        wizard.close();
+    }
+};
+
+/* exported Verb */
+var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation);
+
+
+
+ + + + +
+ + + +
+ + + + + + + diff --git a/docs/jsdoc/Wine.html b/docs/jsdoc/Wine.html index 0e93b3ade7..ad130b0fd9 100644 --- a/docs/jsdoc/Wine.html +++ b/docs/jsdoc/Wine.html @@ -3154,6 +3154,164 @@

enableCSMT< +

Returns:
+ + +
+ Wine object +
+ + + +
+
+ Type +
+
+ +Wine + + +
+
+ + + + + + + + + + + + + +

faudio(faudioVersion) → {Wine}

+ + + + + + +
+ Verb to install FAudio +see: https://github.com/Kron4ek/FAudio-Builds +
+ + + + + + + + + +
Parameters:
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDescription
faudioVersion + + +String + + + + version of FAudio to downlaod
+ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
Source:
+
+ + + + + + + +
+ + + + + + + + + + + + +
Returns:
diff --git a/docs/jsdoc/global.html b/docs/jsdoc/global.html index f11db9eab3..e888c6af77 100644 --- a/docs/jsdoc/global.html +++ b/docs/jsdoc/global.html @@ -166,7 +166,7 @@

- setting to configure mouse warp override + setting to configure strict draw ordering
@@ -204,7 +204,7 @@

Source:
@@ -228,7 +228,7 @@

- setting to configure multisampling + setting to set the offscreen rendering mode
@@ -266,7 +266,7 @@

Source:
@@ -290,7 +290,7 @@

- setting to configure strict draw ordering + setting to set the render target lock mode
@@ -328,7 +328,7 @@

Source:
@@ -352,7 +352,7 @@

- setting to set the offscreen rendering mode + setting to set the video memory size
@@ -390,7 +390,7 @@

Source:
@@ -414,7 +414,7 @@

- setting to set the render target lock mode + setting to enable/disable Retina
@@ -452,7 +452,7 @@

Source:
@@ -476,7 +476,7 @@

- setting to set the video memory size + setting to configure multisampling
@@ -514,7 +514,7 @@

Source:
@@ -600,7 +600,7 @@

- setting to enable/disable GLSL + setting to configure mouse warp override
@@ -638,7 +638,7 @@

Source:
@@ -662,7 +662,7 @@

- setting to enable/disable Retina + setting to enable/disable GLSL
@@ -700,7 +700,7 @@

Source:
@@ -786,7 +786,7 @@

too
- tool to open the Wine task manager + tool to open a Wine console
@@ -824,7 +824,7 @@

too
Source:
@@ -848,7 +848,7 @@

too
- tool to repair a Wine prefix + tool to open a terminal in a Wine prefix
@@ -886,7 +886,7 @@

too
Source:
@@ -910,7 +910,7 @@

too
- tool to open the Wine registry editor + tool to uninstall Wine
@@ -948,7 +948,7 @@

too
Source:
@@ -972,7 +972,7 @@

too
- tool to configure Wine + tool to repair a Wine prefix
@@ -1010,7 +1010,7 @@

too
Source:
@@ -1034,7 +1034,7 @@

too
- tool to open a terminal in a Wine prefix + tool to reboot Wine
@@ -1072,7 +1072,7 @@

too
Source:
@@ -1096,7 +1096,7 @@

too
- tool to uninstall Wine + tool to open the Wine registry editor
@@ -1134,7 +1134,7 @@

too
Source:
@@ -1158,7 +1158,7 @@

too
- tool to open a Wine console + tool to configure Wine
@@ -1196,7 +1196,69 @@

too
Source:
+ + + + + + + + + + + + + + + + +

toolImplementation

+ + + + +
+ tool to open the Wine task manager +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
Source:
+
@@ -1276,13 +1338,13 @@

too -

toolImplementation

+

verbImplementation

- tool to reboot Wine + Verb to install FAudio
@@ -1320,7 +1382,7 @@

too
Source:
@@ -1344,7 +1406,7 @@

ver
- Verb to install d3drm + Verb to install a sandbox
@@ -1382,7 +1444,7 @@

ver
Source:
@@ -1468,7 +1530,7 @@

ver
- Verb to install xact + Verb to install quartz
@@ -1506,7 +1568,7 @@

ver
Source:
@@ -1592,7 +1654,7 @@

ver
- Verb to install all the necessary things to run winevulkan (even inside wine mainline or newest wine-staging) + Verb to install msls31.dll
@@ -1630,7 +1692,7 @@

ver
Source:
@@ -1654,7 +1716,7 @@

ver
- Verb to install the Tahoma font + Verb to install mspatcha
@@ -1692,7 +1754,7 @@

ver
Source:
@@ -1716,7 +1778,7 @@

ver
- Verb to install vcrun2017 + Verb to install luna
@@ -1754,7 +1816,7 @@

ver
Source:
@@ -1840,7 +1902,7 @@

ver
- Verb to install vcrun2015 + Verb to install DXVK
@@ -1878,7 +1940,7 @@

ver
Source:
@@ -1964,7 +2026,7 @@

ver
- Verb to install vcrun2013 + Verb to install mfc42.dll and mfc42u.dll
@@ -2002,7 +2064,7 @@

ver
Source:
@@ -2088,7 +2150,7 @@

ver
- Verb to install vcrun2012 + Verb to install secur32
@@ -2126,7 +2188,7 @@

ver
Source:
@@ -2212,7 +2274,7 @@

ver
- Verb to install vcrun2010 + Verb to install gdiplus
@@ -2250,7 +2312,7 @@

ver
Source:
@@ -2336,7 +2398,7 @@

ver
- Verb to install vcrun2008 + Verb to install vcrun2003
@@ -2374,7 +2436,7 @@

ver
Source:
@@ -2460,7 +2522,7 @@

ver
- Verb to install vcrun2005 + Verb to install .NET 4.6.1
@@ -2498,7 +2560,7 @@

ver
Source:
@@ -2584,7 +2646,7 @@

ver
- Verb to install vcrun2003 + Verb to install vcrun2005
@@ -2622,7 +2684,7 @@

ver
Source:
@@ -2646,7 +2708,7 @@

ver
- Verb to install secur32 + Verb to install d3drm
@@ -2684,7 +2746,7 @@

ver
Source:
@@ -2708,7 +2770,7 @@

ver
- Verb to install a sandbox + Verb to install xact
@@ -2746,7 +2808,7 @@

ver
Source:
@@ -2832,7 +2894,7 @@

ver
- Verb to install quartz + Verb to install all the necessary things to run winevulkan (even inside wine mainline or newest wine-staging)
@@ -2870,7 +2932,7 @@

ver
Source:
@@ -2956,7 +3018,7 @@

ver
- Verb to install mspatcha + Verb to install vcrun2017
@@ -2994,7 +3056,7 @@

ver
Source:
@@ -3080,7 +3142,7 @@

ver
- Verb to install DXVK + Verb to install vcrun2015
@@ -3118,7 +3180,7 @@

ver
Source:
@@ -3204,7 +3266,7 @@

ver
- Verb to install mfc42.dll and mfc42u.dll + Verb to install vcrun2013
@@ -3242,7 +3304,7 @@

ver
Source:
@@ -3266,7 +3328,7 @@

ver
- Verb to install luna + Verb to install vcrun2012
@@ -3304,7 +3366,7 @@

ver
Source:
@@ -3390,7 +3452,7 @@

ver
- Verb to install gdiplus + Verb to install vcrun2010
@@ -3428,7 +3490,7 @@

ver
Source:
@@ -3514,7 +3576,7 @@

ver
- Verb to install .NET 4.6.1 + Verb to install vcrun2008
@@ -3552,7 +3614,7 @@

ver
Source:
@@ -3638,7 +3700,7 @@

ver
- Verb to install msls31.dll + Verb to install the Tahoma font
@@ -3676,7 +3738,7 @@

ver
Source:
From 4f96383d136343102e729844d04b7ed2868de2f6 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Fri, 25 Jan 2019 21:00:06 +0100 Subject: [PATCH 10/14] Update Faudio verb (#845) Only call `this.system64directory()` for 64 bits container. --- Engines/Wine/Verbs/FAudio/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/FAudio/script.js b/Engines/Wine/Verbs/FAudio/script.js index 9cca797a64..655946d67b 100644 --- a/Engines/Wine/Verbs/FAudio/script.js +++ b/Engines/Wine/Verbs/FAudio/script.js @@ -27,7 +27,6 @@ Wine.prototype.faudio = function (faudioVersion) { var forEach = Array.prototype.forEach; var sys32dir = this.system32directory(); - var sys64dir = this.system64directory(); var faudioDir = this.prefixDirectory() + "/FAudio/faudio-" + faudioVersion; var self = this; @@ -42,6 +41,7 @@ Wine.prototype.faudio = function (faudioVersion) { if (this.architecture() == "amd64") { + var sys64dir = this.system64directory(); forEach.call(ls(faudioDir + "/x64"), function (file) { if (file.endsWith(".dll")) { cp(faudioDir + "/x64/" + file, sys64dir); From be90b20d0934765a7ef02165df24e5635b5d1519 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 25 Jan 2019 20:04:29 +0000 Subject: [PATCH 11/14] Update JSDoc --- docs/jsdoc/Engines_Wine_Verbs_FAudio_script.js.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/jsdoc/Engines_Wine_Verbs_FAudio_script.js.html b/docs/jsdoc/Engines_Wine_Verbs_FAudio_script.js.html index 1616aa73e8..c46bffcea5 100644 --- a/docs/jsdoc/Engines_Wine_Verbs_FAudio_script.js.html +++ b/docs/jsdoc/Engines_Wine_Verbs_FAudio_script.js.html @@ -55,7 +55,6 @@

Source: Engines/Wine/Verbs/FAudio/script.js

var forEach = Array.prototype.forEach; var sys32dir = this.system32directory(); - var sys64dir = this.system64directory(); var faudioDir = this.prefixDirectory() + "/FAudio/faudio-" + faudioVersion; var self = this; @@ -70,6 +69,7 @@

Source: Engines/Wine/Verbs/FAudio/script.js

if (this.architecture() == "amd64") { + var sys64dir = this.system64directory(); forEach.call(ls(faudioDir + "/x64"), function (file) { if (file.endsWith(".dll")) { cp(faudioDir + "/x64/" + file, sys64dir); From 53598da39347b21465dae1c09ad9d99dc4aade22 Mon Sep 17 00:00:00 2001 From: plata Date: Sat, 26 Jan 2019 16:45:22 +0100 Subject: [PATCH 12/14] Update to Wine 4.0 (#846) --- Engines/Wine/Engine/Object/script.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Engines/Wine/Engine/Object/script.js b/Engines/Wine/Engine/Object/script.js index b39af8bcd5..860de0022b 100644 --- a/Engines/Wine/Engine/Object/script.js +++ b/Engines/Wine/Engine/Object/script.js @@ -5,13 +5,13 @@ include(["utils", "functions", "net", "download"]); include(["utils", "functions", "net", "resource"]); /* exported LATEST_STABLE_VERSION */ -var LATEST_STABLE_VERSION = "3.0.4"; +var LATEST_STABLE_VERSION = "4.0"; /* exported LATEST_DEVELOPMENT_VERSION */ -var LATEST_DEVELOPMENT_VERSION = "4.0-rc7"; +var LATEST_DEVELOPMENT_VERSION = "4.0"; /* exported LATEST_STAGING_VERSION */ -var LATEST_STAGING_VERSION = "4.0-rc7"; +var LATEST_STAGING_VERSION = "4.0"; /* exported LATEST_DOS_SUPPORT_VERSION */ -var LATEST_DOS_SUPPORT_VERSION = "4.0-rc4"; +var LATEST_DOS_SUPPORT_VERSION = "4.0"; /** * Wine main prototype From dd3145f1b94fd59b3faa2afbe2efcc35056d14d8 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 26 Jan 2019 15:48:44 +0000 Subject: [PATCH 13/14] Update JSDoc --- docs/jsdoc/Engines_Wine_Engine_Object_script.js.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/jsdoc/Engines_Wine_Engine_Object_script.js.html b/docs/jsdoc/Engines_Wine_Engine_Object_script.js.html index 85e5eb263d..70139d4f19 100644 --- a/docs/jsdoc/Engines_Wine_Engine_Object_script.js.html +++ b/docs/jsdoc/Engines_Wine_Engine_Object_script.js.html @@ -33,13 +33,13 @@

Source: Engines/Wine/Engine/Object/script.js

include(["utils", "functions", "net", "resource"]); /* exported LATEST_STABLE_VERSION */ -var LATEST_STABLE_VERSION = "3.0.4"; +var LATEST_STABLE_VERSION = "4.0"; /* exported LATEST_DEVELOPMENT_VERSION */ -var LATEST_DEVELOPMENT_VERSION = "4.0-rc7"; +var LATEST_DEVELOPMENT_VERSION = "4.0"; /* exported LATEST_STAGING_VERSION */ -var LATEST_STAGING_VERSION = "4.0-rc7"; +var LATEST_STAGING_VERSION = "4.0"; /* exported LATEST_DOS_SUPPORT_VERSION */ -var LATEST_DOS_SUPPORT_VERSION = "4.0-rc4"; +var LATEST_DOS_SUPPORT_VERSION = "4.0"; /** * Wine main prototype From a67408c1a39455d6f2f4171d930da2bbeae4f400 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Tue, 29 Jan 2019 08:58:04 +0100 Subject: [PATCH 14/14] Add precision about windows dll's destination (#847) Fix #695. --- docs/_docs/Develop/verbs.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/_docs/Develop/verbs.md b/docs/_docs/Develop/verbs.md index cf921a5322..26f0a72a2b 100644 --- a/docs/_docs/Develop/verbs.md +++ b/docs/_docs/Develop/verbs.md @@ -80,7 +80,11 @@ It is also possible to pass additional parameters to the `extract()`, e.g. ``` If you extract many files, don't forget to add a progress bar like it is done for [d3dx9](https://github.com/PhoenicisOrg/scripts/blob/master/Engines/Wine/Verbs/d3dx9/script.js). +### Copying DLL's to `C:\windows\sys*` +On Windows 32 bits, 32 bits dll's go to `C:\windows\system32`. +On Windows 64 bits, 32 bits dll's go to `C:\windows\syswow64` and 64 bits dll's go to system32. +This is already handled inside the engine implementation if you use the functions `wine.system64directory()` for 64 bits dll's and bits and `wine.system32directory` for 32 bits dll's inside your scripts. ### DLL Overrides ```javascript this.overrideDLL()