From 86fd07c3fc124698e868509b2123884b2e8c3bfa Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Mon, 28 Aug 2017 15:32:29 +0200 Subject: [PATCH 01/30] Update script.js --- Applications/Games/Hearthstone/Online/script.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Applications/Games/Hearthstone/Online/script.js b/Applications/Games/Hearthstone/Online/script.js index a7998c4920..a5feeb11ca 100644 --- a/Applications/Games/Hearthstone/Online/script.js +++ b/Applications/Games/Hearthstone/Online/script.js @@ -5,11 +5,11 @@ include(["Engines", "Wine", "Verbs", "corefonts"]); new OnlineInstallerScript() .name("Hearthstone") .editor("Blizzard") - .applicationHomepage("http://eu.battle.net/en/app/") + .applicationHomepage("https://eu.battle.net/hearthstone/") .author("ImperatorS79") - .url("https://www.battle.net/download/getInstallerForGame?os=win&locale=enGB&version=LIVE&gameProgram=BATTLENET_APP.exe") + .url("https://eu.battle.net/download/getInstaller?os=win&installer=Hearthstone-Setup.exe") .category("Games") - .executable("Battle.net.exe") + .executable("Hearthstone.exe") .wineVersion("2.15") .wineDistribution("staging") .preInstall(function(wine, wizard) { From e4fd56fe6a404be95d0c2d26bf7196378a15a72c Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Tue, 10 Sep 2019 00:05:55 +0200 Subject: [PATCH 02/30] Update gdiplus verb (winetricks) --- Engines/Wine/Verbs/gdiplus/script.js | 41 +++++++++++++++++++++------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/Engines/Wine/Verbs/gdiplus/script.js b/Engines/Wine/Verbs/gdiplus/script.js index 4a1b2ce0fa..7b6d51db98 100644 --- a/Engines/Wine/Verbs/gdiplus/script.js +++ b/Engines/Wine/Verbs/gdiplus/script.js @@ -1,6 +1,7 @@ const Wine = include("engines.wine.engine.object"); const Resource = include("utils.functions.net.resource"); -const {cp} = include("utils.functions.filesystem.files"); +const {CabExtract} = include("utils.functions.filesystem.extract"); +const {cp, remove} = include("utils.functions.filesystem.files"); include("engines.wine.plugins.override_dll"); @@ -9,23 +10,43 @@ include("engines.wine.plugins.override_dll"); * * @returns {Wine} Wine object */ -Wine.prototype.gdiplus = function () { +Wine.prototype.gdiplus = function () { var setupFile = new Resource() .wizard(this.wizard()) - .url("http://download.microsoft.com/download/a/b/c/abc45517-97a0-4cee-a362-1957be2f24e1/WindowsXP-KB975337-x86-ENU.exe") - .checksum("b9a84bc3de92863bba1f5eb1d598446567fbc646") - .name("WindowsXP-KB975337-x86-ENU.exe") + .url("https://download.microsoft.com/download/0/A/F/0AFB5316-3062-494A-AB78-7FB0D4461357/windows6.1-KB976932-X86.exe") + .checksum("c3516bc5c9e69fee6d9ac4f981f5b95977a8a2fa") + .name("windows6.1-KB976932-X86.exe") .get(); - - this.wizard().wait(tr("Please wait while {0} is installed...", "GDI+")); - this.run(setupFile, ["/extract:C:\\Tmp", "/q"], null, true, true); + + new CabExtract() + .archive(setupFile) + .to(this.prefixDirectory() + "/drive_c/gdiplus/") + .extract(["-L", "-F", "x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.17514_none_72d18a4386696c80/gdiplus.dll"]); + + cp(this.prefixDirectory() + "/drive_c/gdiplus/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.17514_none_72d18a4386696c80/gdiplus.dll", this.system32directory()); + + if (this.architecture() == "amd64") { + var setupFile64 = new Resource() + .wizard(this.wizard()) + .url("https://download.microsoft.com/download/0/A/F/0AFB5316-3062-494A-AB78-7FB0D4461357/windows6.1-KB976932-X64.exe") + .checksum("74865ef2562006e51d7f9333b4a8d45b7a749dab") + .name("windows6.1-KB976932-X64.exe") + .get(); + + new CabExtract() + .archive(setupFile64) + .to(this.prefixDirectory() + "/drive_c/gdiplus/") + .extract(["-L", "-F", "amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.17514_none_2b24536c71ed437a/gdiplus.dll"]); + + cp(this.prefixDirectory() + "/drive_c/gdiplus/amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.17514_none_2b24536c71ed437a/gdiplus.dll", this.system64directory()); + } + + remove(this.prefixDirectory() + "/drive_c/gdiplus/"); this.overrideDLL() .set("native", ["gdiplus"]) .do(); - cp(this.prefixDirectory() + "/drive_c/Tmp/asms/10/msft/windows/gdiplus/gdiplus.dll", this.system32directory()); - return this; }; From 80eb8dc3e6e59316c58702567c7b3c76a36af3e2 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Tue, 10 Sep 2019 00:08:20 +0200 Subject: [PATCH 03/30] Add gdiplus_winxp verb --- Engines/Wine/Verbs/gdiplus_winxp/script.js | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 Engines/Wine/Verbs/gdiplus_winxp/script.js diff --git a/Engines/Wine/Verbs/gdiplus_winxp/script.js b/Engines/Wine/Verbs/gdiplus_winxp/script.js new file mode 100644 index 0000000000..ad00477b16 --- /dev/null +++ b/Engines/Wine/Verbs/gdiplus_winxp/script.js @@ -0,0 +1,55 @@ +const Wine = include("engines.wine.engine.object"); +const Resource = include("utils.functions.net.resource"); +const {CabExtract} = include("utils.functions.filesystem.extract"); +const {remove, cat, writeToFile} = include("utils.functions.filesystem.files"); + +include("engines.wine.plugins.override_dll"); + +/** + * Verb to install gdiplus (windows xp) + * + * @returns {Wine} Wine object + */ +Wine.prototype.gdiplus_winxp = function () { + var setupFile = new Resource() + .wizard(this.wizard()) + .url("https://download.microsoft.com/download/1/4/6/1467c2ba-4d1f-43ad-8d9b-3e8bc1c6ac3d/NDP1.0sp2-KB830348-X86-Enu.exe") + .checksum("6113cd89d77525958295ccbd73b5fb8b89abd0aa") + .name("NDP1.0sp2-KB830348-X86-Enu.exe") + .get(); + + new CabExtract() + .archive(setupFile) + .to(this.prefixDirectory() + "/drive_c/gdiplus/") + .extract(["-F", "FL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8"]); + + var content = cat(this.prefixDirectory() + "/drive_c/gdiplusFL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8"); + writeToFile(this.system32directory() + "/gdiplus.dll", content); + + remove(this.prefixDirectory() + "/drive_c/gdiplus/"); + + this.overrideDLL() + .set("native", ["gdiplus"]) + .do(); + + return this; +}; + +/** + * Verb to install gdiplus + */ +// eslint-disable-next-line no-unused-vars +module.default = class GdiplusWinXPVerb { + constructor() { + // do nothing + } + + install(container) { + var wine = new Wine(); + wine.prefix(container); + var wizard = SetupWizard(InstallationType.VERBS, "gdiplus (windows xp)", java.util.Optional.empty()); + wine.wizard(wizard); + wine.gdiplus_winxp(); + wizard.close(); + } +} From 5de1fedb171559626d673f263c689447e5b48d6d Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Tue, 10 Sep 2019 00:09:12 +0200 Subject: [PATCH 04/30] Create script.json --- Engines/Wine/Verbs/gdiplus_winxp/script.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Engines/Wine/Verbs/gdiplus_winxp/script.json diff --git a/Engines/Wine/Verbs/gdiplus_winxp/script.json b/Engines/Wine/Verbs/gdiplus_winxp/script.json new file mode 100644 index 0000000000..1b0c4ada8c --- /dev/null +++ b/Engines/Wine/Verbs/gdiplus_winxp/script.json @@ -0,0 +1,11 @@ +{ + "scriptName" : "gdiplus_winxp", + "id" : "engines.wine.verbs.gdiplus_winxp"", + "compatibleOperatingSystems" : [ + "MACOSX", + "LINUX" + ], + "testingOperatingSystems" : [], + "free" : true, + "requiresPatch" : false +} From 7de730ab9fc187ca53af6cb1cd66070e12d40a30 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Tue, 10 Sep 2019 00:11:03 +0200 Subject: [PATCH 05/30] Update script.js --- Engines/Wine/Verbs/gdiplus_winxp/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/gdiplus_winxp/script.js b/Engines/Wine/Verbs/gdiplus_winxp/script.js index ad00477b16..977b26a6da 100644 --- a/Engines/Wine/Verbs/gdiplus_winxp/script.js +++ b/Engines/Wine/Verbs/gdiplus_winxp/script.js @@ -18,7 +18,7 @@ Wine.prototype.gdiplus_winxp = function () { .name("NDP1.0sp2-KB830348-X86-Enu.exe") .get(); - new CabExtract() + new CabExtract() .archive(setupFile) .to(this.prefixDirectory() + "/drive_c/gdiplus/") .extract(["-F", "FL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8"]); From a326f62e498db817b6443d54d3f84a3ef3cf3d04 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Tue, 10 Sep 2019 00:14:30 +0200 Subject: [PATCH 06/30] Update script.js --- Engines/Wine/Verbs/gdiplus_winxp/script.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Engines/Wine/Verbs/gdiplus_winxp/script.js b/Engines/Wine/Verbs/gdiplus_winxp/script.js index 977b26a6da..6f85ff31e8 100644 --- a/Engines/Wine/Verbs/gdiplus_winxp/script.js +++ b/Engines/Wine/Verbs/gdiplus_winxp/script.js @@ -23,10 +23,10 @@ Wine.prototype.gdiplus_winxp = function () { .to(this.prefixDirectory() + "/drive_c/gdiplus/") .extract(["-F", "FL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8"]); - var content = cat(this.prefixDirectory() + "/drive_c/gdiplusFL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8"); - writeToFile(this.system32directory() + "/gdiplus.dll", content); + var content = cat(this.prefixDirectory() + "/drive_c/gdiplusFL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8"); + writeToFile(this.system32directory() + "/gdiplus.dll", content); - remove(this.prefixDirectory() + "/drive_c/gdiplus/"); + remove(this.prefixDirectory() + "/drive_c/gdiplus/"); this.overrideDLL() .set("native", ["gdiplus"]) From 103868393b912bd0923fd1bae617dc65904486b6 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Tue, 10 Sep 2019 00:15:23 +0200 Subject: [PATCH 07/30] Update script.js --- Engines/Wine/Verbs/gdiplus_winxp/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/gdiplus_winxp/script.js b/Engines/Wine/Verbs/gdiplus_winxp/script.js index 6f85ff31e8..3e9faa7eec 100644 --- a/Engines/Wine/Verbs/gdiplus_winxp/script.js +++ b/Engines/Wine/Verbs/gdiplus_winxp/script.js @@ -23,7 +23,7 @@ Wine.prototype.gdiplus_winxp = function () { .to(this.prefixDirectory() + "/drive_c/gdiplus/") .extract(["-F", "FL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8"]); - var content = cat(this.prefixDirectory() + "/drive_c/gdiplusFL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8"); + var content = cat(this.prefixDirectory() + "/drive_c/gdiplus/FL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8"); writeToFile(this.system32directory() + "/gdiplus.dll", content); remove(this.prefixDirectory() + "/drive_c/gdiplus/"); From 31aa000ca3f69d8d806fddf249173766afbbb331 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Tue, 10 Sep 2019 11:53:41 +0200 Subject: [PATCH 08/30] Update script.json --- Engines/Wine/Verbs/gdiplus_winxp/script.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/gdiplus_winxp/script.json b/Engines/Wine/Verbs/gdiplus_winxp/script.json index 1b0c4ada8c..5abc77a611 100644 --- a/Engines/Wine/Verbs/gdiplus_winxp/script.json +++ b/Engines/Wine/Verbs/gdiplus_winxp/script.json @@ -1,6 +1,6 @@ { "scriptName" : "gdiplus_winxp", - "id" : "engines.wine.verbs.gdiplus_winxp"", + "id" : "engines.wine.verbs.gdiplus_winxp", "compatibleOperatingSystems" : [ "MACOSX", "LINUX" From 5c2d54efa55560f078dd4ccbdf483a7df30dbb61 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Tue, 10 Sep 2019 12:47:44 +0200 Subject: [PATCH 09/30] Update script.js --- Engines/Wine/Verbs/gdiplus/script.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Engines/Wine/Verbs/gdiplus/script.js b/Engines/Wine/Verbs/gdiplus/script.js index 7b6d51db98..d9899d1381 100644 --- a/Engines/Wine/Verbs/gdiplus/script.js +++ b/Engines/Wine/Verbs/gdiplus/script.js @@ -10,7 +10,7 @@ include("engines.wine.plugins.override_dll"); * * @returns {Wine} Wine object */ -Wine.prototype.gdiplus = function () { +Wine.prototype.gdiplus = function () { var setupFile = new Resource() .wizard(this.wizard()) .url("https://download.microsoft.com/download/0/A/F/0AFB5316-3062-494A-AB78-7FB0D4461357/windows6.1-KB976932-X86.exe") @@ -40,7 +40,7 @@ Wine.prototype.gdiplus = function () { cp(this.prefixDirectory() + "/drive_c/gdiplus/amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.17514_none_2b24536c71ed437a/gdiplus.dll", this.system64directory()); } - + remove(this.prefixDirectory() + "/drive_c/gdiplus/"); this.overrideDLL() From 18386834cf0eb4b778e4b33811c2d253f2afeb0a Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Tue, 10 Sep 2019 12:48:39 +0200 Subject: [PATCH 10/30] Update script.js --- Engines/Wine/Verbs/gdiplus_winxp/script.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Engines/Wine/Verbs/gdiplus_winxp/script.js b/Engines/Wine/Verbs/gdiplus_winxp/script.js index 3e9faa7eec..498fc0e3bb 100644 --- a/Engines/Wine/Verbs/gdiplus_winxp/script.js +++ b/Engines/Wine/Verbs/gdiplus_winxp/script.js @@ -10,7 +10,7 @@ include("engines.wine.plugins.override_dll"); * * @returns {Wine} Wine object */ -Wine.prototype.gdiplus_winxp = function () { +Wine.prototype.gdiplusWinXP = function () { var setupFile = new Resource() .wizard(this.wizard()) .url("https://download.microsoft.com/download/1/4/6/1467c2ba-4d1f-43ad-8d9b-3e8bc1c6ac3d/NDP1.0sp2-KB830348-X86-Enu.exe") @@ -25,7 +25,7 @@ Wine.prototype.gdiplus_winxp = function () { var content = cat(this.prefixDirectory() + "/drive_c/gdiplus/FL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8"); writeToFile(this.system32directory() + "/gdiplus.dll", content); - + remove(this.prefixDirectory() + "/drive_c/gdiplus/"); this.overrideDLL() From e9defcad1704ed450a9f8ffc9455e6c3b938c9a1 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Tue, 10 Sep 2019 20:30:17 +0200 Subject: [PATCH 11/30] Update script.js --- Engines/Wine/Verbs/gdiplus/script.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Engines/Wine/Verbs/gdiplus/script.js b/Engines/Wine/Verbs/gdiplus/script.js index d9899d1381..4f2ec56fb6 100644 --- a/Engines/Wine/Verbs/gdiplus/script.js +++ b/Engines/Wine/Verbs/gdiplus/script.js @@ -11,7 +11,7 @@ include("engines.wine.plugins.override_dll"); * @returns {Wine} Wine object */ Wine.prototype.gdiplus = function () { - var setupFile = new Resource() + const setupFile = new Resource() .wizard(this.wizard()) .url("https://download.microsoft.com/download/0/A/F/0AFB5316-3062-494A-AB78-7FB0D4461357/windows6.1-KB976932-X86.exe") .checksum("c3516bc5c9e69fee6d9ac4f981f5b95977a8a2fa") @@ -26,7 +26,7 @@ Wine.prototype.gdiplus = function () { cp(this.prefixDirectory() + "/drive_c/gdiplus/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.17514_none_72d18a4386696c80/gdiplus.dll", this.system32directory()); if (this.architecture() == "amd64") { - var setupFile64 = new Resource() + const setupFile64 = new Resource() .wizard(this.wizard()) .url("https://download.microsoft.com/download/0/A/F/0AFB5316-3062-494A-AB78-7FB0D4461357/windows6.1-KB976932-X64.exe") .checksum("74865ef2562006e51d7f9333b4a8d45b7a749dab") @@ -60,9 +60,9 @@ module.default = class GdiplusVerb { } install(container) { - var wine = new Wine(); + const wine = new Wine(); wine.prefix(container); - var wizard = SetupWizard(InstallationType.VERBS, "gdiplus", java.util.Optional.empty()); + const wizard = SetupWizard(InstallationType.VERBS, "gdiplus", java.util.Optional.empty()); wine.wizard(wizard); wine.gdiplus(); wizard.close(); From a4a79b0ca491f48dccb4d3dcb84fdde59717124d Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Tue, 10 Sep 2019 20:31:01 +0200 Subject: [PATCH 12/30] Update script.js --- Engines/Wine/Verbs/gdiplus_winxp/script.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Engines/Wine/Verbs/gdiplus_winxp/script.js b/Engines/Wine/Verbs/gdiplus_winxp/script.js index 498fc0e3bb..d4803895e7 100644 --- a/Engines/Wine/Verbs/gdiplus_winxp/script.js +++ b/Engines/Wine/Verbs/gdiplus_winxp/script.js @@ -11,7 +11,7 @@ include("engines.wine.plugins.override_dll"); * @returns {Wine} Wine object */ Wine.prototype.gdiplusWinXP = function () { - var setupFile = new Resource() + const setupFile = new Resource() .wizard(this.wizard()) .url("https://download.microsoft.com/download/1/4/6/1467c2ba-4d1f-43ad-8d9b-3e8bc1c6ac3d/NDP1.0sp2-KB830348-X86-Enu.exe") .checksum("6113cd89d77525958295ccbd73b5fb8b89abd0aa") @@ -23,7 +23,7 @@ Wine.prototype.gdiplusWinXP = function () { .to(this.prefixDirectory() + "/drive_c/gdiplus/") .extract(["-F", "FL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8"]); - var content = cat(this.prefixDirectory() + "/drive_c/gdiplus/FL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8"); + const content = cat(this.prefixDirectory() + "/drive_c/gdiplus/FL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8"); writeToFile(this.system32directory() + "/gdiplus.dll", content); remove(this.prefixDirectory() + "/drive_c/gdiplus/"); @@ -45,9 +45,9 @@ module.default = class GdiplusWinXPVerb { } install(container) { - var wine = new Wine(); + const wine = new Wine(); wine.prefix(container); - var wizard = SetupWizard(InstallationType.VERBS, "gdiplus (windows xp)", java.util.Optional.empty()); + const wizard = SetupWizard(InstallationType.VERBS, "gdiplus (windows xp)", java.util.Optional.empty()); wine.wizard(wizard); wine.gdiplus_winxp(); wizard.close(); From 464f44442dbb2adc641a71b8b17d24dc28bca50f Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Tue, 10 Sep 2019 23:16:20 +0200 Subject: [PATCH 13/30] Update script.js --- Engines/Wine/Verbs/gdiplus_winxp/script.js | 80 +++++++++++++--------- 1 file changed, 46 insertions(+), 34 deletions(-) diff --git a/Engines/Wine/Verbs/gdiplus_winxp/script.js b/Engines/Wine/Verbs/gdiplus_winxp/script.js index d4803895e7..7d5d3ade90 100644 --- a/Engines/Wine/Verbs/gdiplus_winxp/script.js +++ b/Engines/Wine/Verbs/gdiplus_winxp/script.js @@ -1,7 +1,9 @@ const Wine = include("engines.wine.engine.object"); const Resource = include("utils.functions.net.resource"); -const {CabExtract} = include("utils.functions.filesystem.extract"); -const {remove, cat, writeToFile} = include("utils.functions.filesystem.files"); +const { CabExtract } = include("utils.functions.filesystem.extract"); +const { remove, cat, writeToFile } = include("utils.functions.filesystem.files"); + +const Optional = Java.type("java.util.Optional"); include("engines.wine.plugins.override_dll"); @@ -10,46 +12,56 @@ include("engines.wine.plugins.override_dll"); * * @returns {Wine} Wine object */ -Wine.prototype.gdiplusWinXP = function () { - const setupFile = new Resource() - .wizard(this.wizard()) - .url("https://download.microsoft.com/download/1/4/6/1467c2ba-4d1f-43ad-8d9b-3e8bc1c6ac3d/NDP1.0sp2-KB830348-X86-Enu.exe") - .checksum("6113cd89d77525958295ccbd73b5fb8b89abd0aa") - .name("NDP1.0sp2-KB830348-X86-Enu.exe") - .get(); - - new CabExtract() - .archive(setupFile) - .to(this.prefixDirectory() + "/drive_c/gdiplus/") - .extract(["-F", "FL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8"]); - - const content = cat(this.prefixDirectory() + "/drive_c/gdiplus/FL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8"); - writeToFile(this.system32directory() + "/gdiplus.dll", content); - - remove(this.prefixDirectory() + "/drive_c/gdiplus/"); +class GDIPlusWinXP { + constructor(wine) { + this.wine = wine; + } - this.overrideDLL() - .set("native", ["gdiplus"]) - .do(); + go() { + const wizard = this.wine.wizard(); + const prefixDirectory = this.wine.prefixDirectory(); + const system32directory = this.wine.system32directory(); + const system64directory = this.wine.system64directory(); + const architecture = this.wine.architecture(); - return this; -}; + const setupFile = new Resource() + .wizard(this.wizard()) + .url("https://download.microsoft.com/download/1/4/6/1467c2ba-4d1f-43ad-8d9b-3e8bc1c6ac3d/NDP1.0sp2-KB830348-X86-Enu.exe") + .checksum("6113cd89d77525958295ccbd73b5fb8b89abd0aa") + .name("NDP1.0sp2-KB830348-X86-Enu.exe") + .get(); + + new CabExtract() + .archive(setupFile) + .to(`${prefixDirectory}/drive_c/gdiplus/`) + .extract(["-F", "FL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8"]); + + new CabExtract() + .archive(setupFile) + .to(`${prefixDirectory}/drive_c/gdiplus/`) + .extract(["-L", "-F", "x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.17514_none_72d18a4386696c80/gdiplus.dll"]); + + const content = cat(`${prefixDirectory}/drive_c/gdiplus/drive_c/gdiplus/FL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8`); + writeToFile(`${system32directory}/gdiplus.dll`, content); + + remove(`${prefixDirectory}/drive_c/gdiplus/`); -/** - * Verb to install gdiplus - */ -// eslint-disable-next-line no-unused-vars -module.default = class GdiplusWinXPVerb { - constructor() { - // do nothing + this.overrideDLL() + .set("native", ["gdiplus"]) + .do(); } - install(container) { + static install(container) { const wine = new Wine(); + const wizard = SetupWizard(InstallationType.VERBS, "gdiplus (windows xp)", Optional.empty()); + wine.prefix(container); - const wizard = SetupWizard(InstallationType.VERBS, "gdiplus (windows xp)", java.util.Optional.empty()); wine.wizard(wizard); - wine.gdiplus_winxp(); + + new GDIPlusWinXP(wine).go(); + wizard.close(); } } + +module.default = GDIPlusWindowsXP; From f3c976bc57907a60183c6589f8ffbc83d7b0585a Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Tue, 10 Sep 2019 23:24:07 +0200 Subject: [PATCH 14/30] Update script.js --- Engines/Wine/Verbs/gdiplus_winxp/script.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/Engines/Wine/Verbs/gdiplus_winxp/script.js b/Engines/Wine/Verbs/gdiplus_winxp/script.js index 7d5d3ade90..b66c0f8703 100644 --- a/Engines/Wine/Verbs/gdiplus_winxp/script.js +++ b/Engines/Wine/Verbs/gdiplus_winxp/script.js @@ -21,8 +21,6 @@ class GDIPlusWinXP { const wizard = this.wine.wizard(); const prefixDirectory = this.wine.prefixDirectory(); const system32directory = this.wine.system32directory(); - const system64directory = this.wine.system64directory(); - const architecture = this.wine.architecture(); const setupFile = new Resource() .wizard(this.wizard()) From 511bdf50e5356bb98c30d62072de48f8c6860e83 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Tue, 10 Sep 2019 23:42:56 +0200 Subject: [PATCH 15/30] Update script.js --- Engines/Wine/Verbs/gdiplus/script.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Engines/Wine/Verbs/gdiplus/script.js b/Engines/Wine/Verbs/gdiplus/script.js index c95b04a636..3f04186b28 100644 --- a/Engines/Wine/Verbs/gdiplus/script.js +++ b/Engines/Wine/Verbs/gdiplus/script.js @@ -31,6 +31,7 @@ class GDIPlus { new CabExtract() .archive(setupFile) + .wizard(wizard) .to(`${prefixDirectory}/drive_c/gdiplus/`) .extract(["-L", "-F", "x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.17514_none_72d18a4386696c80/gdiplus.dll"]); @@ -46,6 +47,7 @@ class GDIPlus { new CabExtract() .archive(setupFile64) + .wizard(wizard) .to(`${prefixDirectory}/drive_c/gdiplus/`) .extract(["-L", "-F", "amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.17514_none_2b24536c71ed437a/gdiplus.dll"]); From 0e93a227dca517d45ffe18811f29ea8d0721ec66 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Tue, 10 Sep 2019 23:44:40 +0200 Subject: [PATCH 16/30] Update script.js --- Engines/Wine/Verbs/gdiplus_winxp/script.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/gdiplus_winxp/script.js b/Engines/Wine/Verbs/gdiplus_winxp/script.js index b66c0f8703..4ee1298b97 100644 --- a/Engines/Wine/Verbs/gdiplus_winxp/script.js +++ b/Engines/Wine/Verbs/gdiplus_winxp/script.js @@ -23,7 +23,7 @@ class GDIPlusWinXP { const system32directory = this.wine.system32directory(); const setupFile = new Resource() - .wizard(this.wizard()) + .wizard(wizard) .url("https://download.microsoft.com/download/1/4/6/1467c2ba-4d1f-43ad-8d9b-3e8bc1c6ac3d/NDP1.0sp2-KB830348-X86-Enu.exe") .checksum("6113cd89d77525958295ccbd73b5fb8b89abd0aa") .name("NDP1.0sp2-KB830348-X86-Enu.exe") @@ -31,11 +31,13 @@ class GDIPlusWinXP { new CabExtract() .archive(setupFile) + .wizard(wizard) .to(`${prefixDirectory}/drive_c/gdiplus/`) .extract(["-F", "FL_gdiplus_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8"]); new CabExtract() .archive(setupFile) + .wizard(wizard) .to(`${prefixDirectory}/drive_c/gdiplus/`) .extract(["-L", "-F", "x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.17514_none_72d18a4386696c80/gdiplus.dll"]); From cfb8c979e657861cd072459a51416855eea624a4 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Tue, 10 Sep 2019 23:52:40 +0200 Subject: [PATCH 17/30] Update script.js --- Engines/Wine/Verbs/adobeair/script.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/adobeair/script.js b/Engines/Wine/Verbs/adobeair/script.js index 207b405014..c5d334f5fb 100644 --- a/Engines/Wine/Verbs/adobeair/script.js +++ b/Engines/Wine/Verbs/adobeair/script.js @@ -14,6 +14,7 @@ class AdobeAir { } go() { + const wizard = this.wine.wizard(); // Using Windows XP to workaround the wine bug 43506 // See https://bugs.winehq.org/show_bug.cgi?id=43506 const currentWindowsVersion = this.wine.windowsVersion(); @@ -21,7 +22,7 @@ class AdobeAir { this.wine.windowsVersion("winxp"); const adobeair = new Resource() - .wizard(this.wizard()) + .wizard(wizard) .url("https://airdownload.adobe.com/air/win/download/latest/AdobeAIRInstaller.exe") .name("AdobeAIRInstaller.exe") .get(); From 45b32c8a90a509a9f90549018df1d117872d6745 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Wed, 11 Sep 2019 16:18:52 +0200 Subject: [PATCH 18/30] Update script.js --- Engines/Wine/Verbs/gdiplus/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/gdiplus/script.js b/Engines/Wine/Verbs/gdiplus/script.js index 3f04186b28..face7c8063 100644 --- a/Engines/Wine/Verbs/gdiplus/script.js +++ b/Engines/Wine/Verbs/gdiplus/script.js @@ -19,7 +19,6 @@ class GDIPlus { const wizard = this.wine.wizard(); const prefixDirectory = this.wine.prefixDirectory(); const system32directory = this.wine.system32directory(); - const system64directory = this.wine.system64directory(); const architecture = this.wine.architecture(); const setupFile = new Resource() @@ -38,6 +37,7 @@ class GDIPlus { cp(`${prefixDirectory}/drive_c/gdiplus/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.17514_none_72d18a4386696c80/gdiplus.dll`, system32directory); if (architecture == "amd64") { + const system64directory = this.wine.system64directory(); const setupFile64 = new Resource() .wizard(wizard) .url("https://download.microsoft.com/download/0/A/F/0AFB5316-3062-494A-AB78-7FB0D4461357/windows6.1-KB976932-X64.exe") From b214dc3d6af3a57224d6729108478834cbb5526e Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Wed, 11 Sep 2019 20:21:07 +0200 Subject: [PATCH 19/30] Update script.js --- Engines/Wine/Verbs/gdiplus_winxp/script.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/gdiplus_winxp/script.js b/Engines/Wine/Verbs/gdiplus_winxp/script.js index 4ee1298b97..e1c16a787b 100644 --- a/Engines/Wine/Verbs/gdiplus_winxp/script.js +++ b/Engines/Wine/Verbs/gdiplus_winxp/script.js @@ -46,7 +46,8 @@ class GDIPlusWinXP { remove(`${prefixDirectory}/drive_c/gdiplus/`); - this.overrideDLL() + this.wine + .overrideDLL() .set("native", ["gdiplus"]) .do(); } From bb609420a150da74c08750ebe66164fabb43c141 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Wed, 11 Sep 2019 20:33:05 +0200 Subject: [PATCH 20/30] Update script.js --- Engines/Wine/Verbs/gdiplus/script.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Engines/Wine/Verbs/gdiplus/script.js b/Engines/Wine/Verbs/gdiplus/script.js index face7c8063..73832d13dc 100644 --- a/Engines/Wine/Verbs/gdiplus/script.js +++ b/Engines/Wine/Verbs/gdiplus/script.js @@ -38,6 +38,7 @@ class GDIPlus { if (architecture == "amd64") { const system64directory = this.wine.system64directory(); + const setupFile64 = new Resource() .wizard(wizard) .url("https://download.microsoft.com/download/0/A/F/0AFB5316-3062-494A-AB78-7FB0D4461357/windows6.1-KB976932-X64.exe") From 4ac506491eac0f703d05900a9e527b5ac0ca2aef Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Wed, 11 Sep 2019 21:01:04 +0200 Subject: [PATCH 21/30] Update script.js --- Engines/Wine/Verbs/d3dx9/script.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/d3dx9/script.js b/Engines/Wine/Verbs/d3dx9/script.js index ed45bfe376..ea3e497247 100644 --- a/Engines/Wine/Verbs/d3dx9/script.js +++ b/Engines/Wine/Verbs/d3dx9/script.js @@ -47,6 +47,7 @@ class D3DX9 { const wizard = this.wine.wizard(); const prefixDirectory = this.wine.prefixDirectory(); const system32directory = this.wine.system32directory(); + const architecture = this.wine.architecture(); const setupFile = new Resource() .wizard(wizard) @@ -92,7 +93,7 @@ class D3DX9 { this.extractDirectXToSystemDirectory(progressBar, filesToExtractx86, system32directory, "d3dx9*.dll"); - if (this.architecture() == "amd64") { + if (architecture == "amd64") { const system64directory = this.wine.system64directory(); new CabExtract() From 7db65fbb9ed47c67df8d0ebb00298cdd523cd3a5 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Wed, 11 Sep 2019 21:03:43 +0200 Subject: [PATCH 22/30] Update script.js --- Engines/Wine/Verbs/d3dx11/script.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/d3dx11/script.js b/Engines/Wine/Verbs/d3dx11/script.js index 554bd10f72..d5b0d71961 100644 --- a/Engines/Wine/Verbs/d3dx11/script.js +++ b/Engines/Wine/Verbs/d3dx11/script.js @@ -47,6 +47,7 @@ class D3DX11 { const wizard = this.wine.wizard(); const prefixDirectory = this.wine.prefixDirectory(); const system32directory = this.wine.system32directory(); + const architecture = this.wine.architecture(); const setupFile = new Resource() .wizard(wizard) @@ -72,7 +73,7 @@ class D3DX11 { this.extractDirectXToSystemDirectory(progressBar, filesToExtractx86, system32directory, "*.dll"); - if (this.architecture() == "amd64") { + if (architecture == "amd64") { const system64directory = this.wine.system64directory(); new CabExtract() From 2570942b3c7a3e2a5b4c39574ec6b9a4d9b8b275 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Wed, 11 Sep 2019 21:12:05 +0200 Subject: [PATCH 23/30] Update script.js --- Engines/Wine/Verbs/d3dx10/script.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/d3dx10/script.js b/Engines/Wine/Verbs/d3dx10/script.js index d66a5e908c..c17812b978 100644 --- a/Engines/Wine/Verbs/d3dx10/script.js +++ b/Engines/Wine/Verbs/d3dx10/script.js @@ -47,6 +47,7 @@ class D3DX10 { const wizard = this.wine.wizard(); const prefixDirectory = this.wine.prefixDirectory(); const system32directory = this.wine.system32directory(); + const architecture = this.wine.architecture(); const setupFile = new Resource() .wizard(wizard) @@ -84,7 +85,7 @@ class D3DX10 { this.extractDirectXToSystemDirectory(progressBar, filesToExtractx86, system32directory, "d3dx10*.dll"); - if (this.architecture() == "amd64") { + if (architecture == "amd64") { const system64directory = this.wine.system64directory(); new CabExtract() From d17faf6212bcc22c93556df4ba23d132058be139 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Wed, 11 Sep 2019 21:13:47 +0200 Subject: [PATCH 24/30] Update script.js --- Engines/Wine/Verbs/dotnet45/script.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js index f7540feb3b..677af49130 100755 --- a/Engines/Wine/Verbs/dotnet45/script.js +++ b/Engines/Wine/Verbs/dotnet45/script.js @@ -20,8 +20,9 @@ class DotNET45 { go() { const wizard = this.wine.wizard(); const windowsVersion = this.wine.windowsVersion(); + const architecture = this.wine.architecture(); - if (this.architecture() == "amd64") { + if (architecture == "amd64") { print( tr( "This package ({0}) may not fully work on a 64-bit installation. 32-bit prefixes may work better.", From 780c97a8f1309ac8464255f3dba8dd0421cc110e Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Wed, 11 Sep 2019 21:19:45 +0200 Subject: [PATCH 25/30] Update script.js --- Engines/Wine/Verbs/xact/script.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Engines/Wine/Verbs/xact/script.js b/Engines/Wine/Verbs/xact/script.js index be383594c6..61c9bf7dec 100644 --- a/Engines/Wine/Verbs/xact/script.js +++ b/Engines/Wine/Verbs/xact/script.js @@ -70,7 +70,7 @@ class Xact { const wizard = this.wine.wizard(); const prefixDirectory = this.wine.prefixDirectory(); const system32directory = this.wine.system32directory(); - const system64directory = this.wine.system64directory(); + const architecture = this.wine.architecture(); const setupFile = new Resource() .wizard(wizard) @@ -195,7 +195,9 @@ class Xact { remove(`${prefixDirectory}/drive_c/x3daudio_x86/`); remove(`${prefixDirectory}/drive_c/xaudio_x86/`); - if (this.architecture() == "amd64") { + if (architecture == "amd64") { + const system64directory = this.wine.system64directory(); + //---------------------------------------------------------Extract xactengine*.dll (x64)-------------------------------------------- new CabExtract() .wizard(wizard) From eb0950eb5988961995327d984db9e7746cbd3f14 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Wed, 11 Sep 2019 21:21:06 +0200 Subject: [PATCH 26/30] Update script.js --- Engines/Wine/Verbs/amstream/script.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/amstream/script.js b/Engines/Wine/Verbs/amstream/script.js index 4ed2cf4e92..91b430bbe3 100644 --- a/Engines/Wine/Verbs/amstream/script.js +++ b/Engines/Wine/Verbs/amstream/script.js @@ -19,6 +19,7 @@ class Amstream { go() { const wizard = this.wine.wizard(); const system32directory = this.wine.system32directory(); + const architecture = this.wine.architecture(); const setupFile = new Resource() .wizard(wizard) @@ -50,7 +51,7 @@ class Amstream { this.wine.regsvr32().install("amstream.dll"); - if (this.architecture() == "amd64") { + if (architecture == "amd64") { const system64directory = this.wine.system64directory(); const setupFilex64 = new Resource() From 1d7e793bfe9c9008f646a9ca1b4f722688ccee37 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Wed, 11 Sep 2019 21:23:04 +0200 Subject: [PATCH 27/30] Update script.js --- Engines/Wine/Verbs/secur32/script.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Engines/Wine/Verbs/secur32/script.js b/Engines/Wine/Verbs/secur32/script.js index ff48fd0017..cf4f58ce02 100644 --- a/Engines/Wine/Verbs/secur32/script.js +++ b/Engines/Wine/Verbs/secur32/script.js @@ -19,7 +19,7 @@ class Secur32 { const wizard = this.wine.wizard(); const prefixDirectory = this.wine.prefixDirectory(); const system32directory = this.wine.system32directory(); - const system64directory = this.wine.system64directory(); + const architecture = this.wine.architecture(); const setupFilex86 = new Resource() .wizard(wizard) @@ -47,7 +47,9 @@ class Secur32 { remove(`${prefixDirectory}/TMP/`); - if (this.architecture() == "amd64") { + if (architecture == "amd64") { + const system64directory = this.wine.system64directory(); + const setupFilex64 = new Resource() .wizard(wizard) .url( From b080ae842fdda4d07ff318e0919237c72c78b94d Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Wed, 11 Sep 2019 21:25:30 +0200 Subject: [PATCH 28/30] Update script.js --- Engines/Wine/Verbs/D9VK/script.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/D9VK/script.js b/Engines/Wine/Verbs/D9VK/script.js index e97c495e72..073344f30a 100644 --- a/Engines/Wine/Verbs/D9VK/script.js +++ b/Engines/Wine/Verbs/D9VK/script.js @@ -34,6 +34,7 @@ class D9VK { const wizard = this.wine.wizard(); const prefixDirectory = this.wine.prefixDirectory(); const system32directory = this.wine.system32directory(); + const architecture = this.wine.architecture(): print("NOTE: Wine version should be greater or equal to 3.10"); @@ -83,7 +84,7 @@ class D9VK { } }); - if (this.architecture() == "amd64") { + if (architecture == "amd64") { const system64directory = this.wine.system64directory(); // copy 64 bits dll to system* From 5eaf186dbd0c46b820e3f17e826bdc461b4a7376 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Wed, 11 Sep 2019 21:26:07 +0200 Subject: [PATCH 29/30] Update script.js --- Engines/Wine/Verbs/DXVK/script.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/DXVK/script.js b/Engines/Wine/Verbs/DXVK/script.js index 7dd5046980..6992625e9a 100644 --- a/Engines/Wine/Verbs/DXVK/script.js +++ b/Engines/Wine/Verbs/DXVK/script.js @@ -35,6 +35,7 @@ class DXVK { const wizard = this.wine.wizard(); const prefixDirectory = this.wine.prefixDirectory(); const sys32dir = this.wine.system32directory(); + const architecture = this.wine.architecture(); print("NOTE: wine version should be greater or equal to 3.10"); @@ -90,7 +91,7 @@ class DXVK { } }); - if (this.wine.architecture() == "amd64") { + if (architecture == "amd64") { const sys64dir = this.wine.system64directory(); //Copy 64 bits dll to system* From 7f1925b40df3c7ca3f2afc60f0e0cad3099b2ec0 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Wed, 11 Sep 2019 21:33:31 +0200 Subject: [PATCH 30/30] Update script.js --- Engines/Wine/Verbs/gallium9/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/gallium9/script.js b/Engines/Wine/Verbs/gallium9/script.js index 0db50e40fb..efb30e5a25 100644 --- a/Engines/Wine/Verbs/gallium9/script.js +++ b/Engines/Wine/Verbs/gallium9/script.js @@ -37,7 +37,7 @@ class Gallium9 { this.gallium9Version = "0.4"; } - this.wizard().message( + wizard.message( tr( "Using Gallium 9 requires to have a driver supporting the Gallium 9 state tracker, as well as d3dapater9.so installed (ex: libd3d9adapter-mesa package). Please be sure it is installed (both 32 and 64 bits)." )