From 1791c28ddb26f8e758d46fd64b63463f260decb2 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Wed, 1 May 2019 11:48:14 +0200 Subject: [PATCH 1/6] Add files via upload --- Engines/Wine/Verbs/atmlib/script.js | 50 +++++++++++++++++++++++++++ Engines/Wine/Verbs/atmlib/script.json | 11 ++++++ 2 files changed, 61 insertions(+) create mode 100644 Engines/Wine/Verbs/atmlib/script.js create mode 100644 Engines/Wine/Verbs/atmlib/script.json diff --git a/Engines/Wine/Verbs/atmlib/script.js b/Engines/Wine/Verbs/atmlib/script.js new file mode 100644 index 0000000000..8b8070d03c --- /dev/null +++ b/Engines/Wine/Verbs/atmlib/script.js @@ -0,0 +1,50 @@ +include("engines.wine.engine.object"); +include("utils.functions.net.resource"); +include("utils.functions.filesystem.files"); + +/** +* Verb to install atmlib +* @returns {Wine} Wine object +*/ +Wine.prototype.atmlib = function () { + var setupFile = new Resource() + .wizard(this.wizard()) + .url("https://ftp.gnome.org/mirror/archive/ftp.sunet.se/pub/security/vendor/microsoft/win2000/Service_Packs/usa/W2KSP4_EN.EXE") + .checksum("fadea6d94a014b039839fecc6e6a11c20afa4fa8") + .name("W2ksp4_EN.exe") + .get(); + + new CabExtract() + .archive(setupFile) + .wizard(this.wizard()) + .to(this.system32directory()) + .extract(); + + new CabExtract() + .archive(this.system32directory() + "/i386/atmlib.dl_") + .wizard(this.wizard()) + .to(this.system32directory()) + .extract(); + + remove(this.system32directory() + "/i386/"); + + return this; +}; + +/** + * Verb to install atmlib +*/ +var verbImplementation = { + install: function (container) { + var wine = new Wine(); + wine.prefix(container); + var wizard = SetupWizard(InstallationType.VERBS, "atmlib", java.util.Optional.empty()); + wine.wizard(wizard); + wine.atmlib(); + wizard.close(); + } +}; + +/* exported Verb */ +var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation); + diff --git a/Engines/Wine/Verbs/atmlib/script.json b/Engines/Wine/Verbs/atmlib/script.json new file mode 100644 index 0000000000..70cc4b033e --- /dev/null +++ b/Engines/Wine/Verbs/atmlib/script.json @@ -0,0 +1,11 @@ +{ + "scriptName" : "atmlib", + "id" : "engines.wine.verbs.atmlib", + "compatibleOperatingSystems" : [ + "MACOSX", + "LINUX" + ], + "testingOperatingSystems" : [], + "free" : true, + "requiresPatch" : false +} From 82998ba24922cf3c992e077e20397423eb14236a Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Mon, 13 May 2019 22:30:19 +0200 Subject: [PATCH 2/6] Add files via upload --- Engines/Wine/Verbs/vcrun6sp6/script.js | 50 ++++++++++++++++++++++++ Engines/Wine/Verbs/vcrun6sp6/script.json | 11 ++++++ 2 files changed, 61 insertions(+) create mode 100644 Engines/Wine/Verbs/vcrun6sp6/script.js create mode 100644 Engines/Wine/Verbs/vcrun6sp6/script.json diff --git a/Engines/Wine/Verbs/vcrun6sp6/script.js b/Engines/Wine/Verbs/vcrun6sp6/script.js new file mode 100644 index 0000000000..a67f9a7cbc --- /dev/null +++ b/Engines/Wine/Verbs/vcrun6sp6/script.js @@ -0,0 +1,50 @@ +include("engines.wine.engine.object"); +include("utils.functions.net.resource"); +include("engines.wine.verbs.luna"); + +/** +* Verb to install vcrun6sp6 +* @returns {Wine} Wine object +*/ +Wine.prototype.vcrun6sp6 = function () { + var toBeCabExtracted = new Resource() + .wizard(this.wizard()) + .url("https://download.microsoft.com/download/1/9/f/19fe4660-5792-4683-99e0-8d48c22eed74/Vs6sp6.exe") + .checksum("2292437a8967349261c810ae8b456592eeb76620") + .name("Vs6sp6.exe") + .get(); + + var setupFile = new CabExtract() + .archive(toBeCabExtracted) + .to(this.prefixDirectory() + "/drive_c/vcrun6sp6/") + .extract(["-L", "-F", "vcredist.exe"]); + + remove(this.system32directory() + "atl80.dll"); + remove(this.system32directory() + "msvcm80.dll"); + remove(this.system32directory() + "msvcp80.dll"); + remove(this.system32directory() + "msvcr80.dll"); + remove(this.system32directory() + "vcomp.dll"); + + this.wizard().wait(tr("Please wait while {0} is installed...", "vcrun6sp6")); + this.run(setupFile, "/q", null, false, true); + + return this; +}; + +/** + * Verb to install vcrun6sp6 +*/ +var verbImplementation = { + install: function (container) { + var wine = new Wine(); + wine.prefix(container); + var wizard = SetupWizard(InstallationType.VERBS, "vcrun6sp6", java.util.Optional.empty()); + wine.wizard(wizard); + wine.vcrun6sp6(); + wizard.close(); + } +}; + +/* exported Verb */ +var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation); + diff --git a/Engines/Wine/Verbs/vcrun6sp6/script.json b/Engines/Wine/Verbs/vcrun6sp6/script.json new file mode 100644 index 0000000000..ff19733890 --- /dev/null +++ b/Engines/Wine/Verbs/vcrun6sp6/script.json @@ -0,0 +1,11 @@ +{ + "scriptName" : "vcrun6sp6", + "id" : "engines.wine.verbs.vcrun6sp6", + "compatibleOperatingSystems" : [ + "MACOSX", + "LINUX" + ], + "testingOperatingSystems" : [], + "free" : true, + "requiresPatch" : false +} From 070b81f894a3636adb0bb9ce0603996f9de66321 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Mon, 13 May 2019 22:31:15 +0200 Subject: [PATCH 3/6] Delete script.js --- Engines/Wine/Verbs/atmlib/script.js | 50 ----------------------------- 1 file changed, 50 deletions(-) delete mode 100644 Engines/Wine/Verbs/atmlib/script.js diff --git a/Engines/Wine/Verbs/atmlib/script.js b/Engines/Wine/Verbs/atmlib/script.js deleted file mode 100644 index 8b8070d03c..0000000000 --- a/Engines/Wine/Verbs/atmlib/script.js +++ /dev/null @@ -1,50 +0,0 @@ -include("engines.wine.engine.object"); -include("utils.functions.net.resource"); -include("utils.functions.filesystem.files"); - -/** -* Verb to install atmlib -* @returns {Wine} Wine object -*/ -Wine.prototype.atmlib = function () { - var setupFile = new Resource() - .wizard(this.wizard()) - .url("https://ftp.gnome.org/mirror/archive/ftp.sunet.se/pub/security/vendor/microsoft/win2000/Service_Packs/usa/W2KSP4_EN.EXE") - .checksum("fadea6d94a014b039839fecc6e6a11c20afa4fa8") - .name("W2ksp4_EN.exe") - .get(); - - new CabExtract() - .archive(setupFile) - .wizard(this.wizard()) - .to(this.system32directory()) - .extract(); - - new CabExtract() - .archive(this.system32directory() + "/i386/atmlib.dl_") - .wizard(this.wizard()) - .to(this.system32directory()) - .extract(); - - remove(this.system32directory() + "/i386/"); - - return this; -}; - -/** - * Verb to install atmlib -*/ -var verbImplementation = { - install: function (container) { - var wine = new Wine(); - wine.prefix(container); - var wizard = SetupWizard(InstallationType.VERBS, "atmlib", java.util.Optional.empty()); - wine.wizard(wizard); - wine.atmlib(); - wizard.close(); - } -}; - -/* exported Verb */ -var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation); - From 2451c67c5525286beb45ab025395d6857bb1d059 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Mon, 13 May 2019 22:31:24 +0200 Subject: [PATCH 4/6] Delete script.json --- Engines/Wine/Verbs/atmlib/script.json | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 Engines/Wine/Verbs/atmlib/script.json diff --git a/Engines/Wine/Verbs/atmlib/script.json b/Engines/Wine/Verbs/atmlib/script.json deleted file mode 100644 index 70cc4b033e..0000000000 --- a/Engines/Wine/Verbs/atmlib/script.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "scriptName" : "atmlib", - "id" : "engines.wine.verbs.atmlib", - "compatibleOperatingSystems" : [ - "MACOSX", - "LINUX" - ], - "testingOperatingSystems" : [], - "free" : true, - "requiresPatch" : false -} From 7880da73afc0066eafb3940fc2b8fe2956f37610 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Tue, 14 May 2019 10:56:37 +0200 Subject: [PATCH 5/6] Update script.js Now removing the correct fake dlls. --- Engines/Wine/Verbs/vcrun6sp6/script.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Engines/Wine/Verbs/vcrun6sp6/script.js b/Engines/Wine/Verbs/vcrun6sp6/script.js index a67f9a7cbc..4491f23727 100644 --- a/Engines/Wine/Verbs/vcrun6sp6/script.js +++ b/Engines/Wine/Verbs/vcrun6sp6/script.js @@ -19,11 +19,11 @@ Wine.prototype.vcrun6sp6 = function () { .to(this.prefixDirectory() + "/drive_c/vcrun6sp6/") .extract(["-L", "-F", "vcredist.exe"]); - remove(this.system32directory() + "atl80.dll"); - remove(this.system32directory() + "msvcm80.dll"); - remove(this.system32directory() + "msvcp80.dll"); - remove(this.system32directory() + "msvcr80.dll"); - remove(this.system32directory() + "vcomp.dll"); + remove(this.system32directory() + "comcat.dll"); + remove(this.system32directory() + "msvcrt.dll"); + remove(this.system32directory() + "oleaut32.dll"); + remove(this.system32directory() + "olepro32.dll"); + remove(this.system32directory() + "stdole2.dll"); this.wizard().wait(tr("Please wait while {0} is installed...", "vcrun6sp6")); this.run(setupFile, "/q", null, false, true); From e35aedf9fe59d1a2890abb21e40ba7575d6c776a Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Wed, 15 May 2019 09:22:19 +0200 Subject: [PATCH 6/6] Update script.js --- Engines/Wine/Verbs/vcrun6sp6/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engines/Wine/Verbs/vcrun6sp6/script.js b/Engines/Wine/Verbs/vcrun6sp6/script.js index 4491f23727..be8af529e0 100644 --- a/Engines/Wine/Verbs/vcrun6sp6/script.js +++ b/Engines/Wine/Verbs/vcrun6sp6/script.js @@ -14,7 +14,7 @@ Wine.prototype.vcrun6sp6 = function () { .name("Vs6sp6.exe") .get(); - var setupFile = new CabExtract() + var setupFile = new CabExtract() .archive(toBeCabExtracted) .to(this.prefixDirectory() + "/drive_c/vcrun6sp6/") .extract(["-L", "-F", "vcredist.exe"]);