Update script.js

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;