From b0749350e83f0e8422caa8cb4197c42b00b1fa32 Mon Sep 17 00:00:00 2001
From: DSR! <xchwarze@gmail.com>
Date: Sun, 8 Jun 2025 04:46:04 -0300
Subject: [PATCH] Minor changes in extras

---
 bin/updater/scripts/VBDEC.bat                 |   2 --
 extras/ghidra/installer/setup.iss             |  17 +++++--------
 extras/vbdec/installer/setup.iss              |  23 +++++++++---------
 .../[VB] VBDEC}/VBDEC-register.bat            |   0
 .../Decompilers/[VB] VBDEC}/tregsvr.exe       | Bin
 5 files changed, 17 insertions(+), 25 deletions(-)
 rename {bin/updater/bin => extras/vbdec/toolkit/Decompilers/[VB] VBDEC}/VBDEC-register.bat (100%)
 rename {bin/updater/bin => extras/vbdec/toolkit/Decompilers/[VB] VBDEC}/tregsvr.exe (100%)

diff --git a/bin/updater/scripts/VBDEC.bat b/bin/updater/scripts/VBDEC.bat
index dbb1b96..542ce27 100644
--- a/bin/updater/scripts/VBDEC.bat
+++ b/bin/updater/scripts/VBDEC.bat
@@ -27,5 +27,3 @@ move {sys} sys
 :: copy register script
 echo.
 echo Remember to run the "VBDEC-register.bat" script before starting the program for the first time!
-copy "%BIN_DIR%\VBDEC-register.bat" . /Y
-copy "%BIN_DIR%\tregsvr.exe" . /Y
diff --git a/extras/ghidra/installer/setup.iss b/extras/ghidra/installer/setup.iss
index b84eecf..ab6eac7 100644
--- a/extras/ghidra/installer/setup.iss
+++ b/extras/ghidra/installer/setup.iss
@@ -56,23 +56,18 @@ Name: "ghidra"; Description: "Install Ghidra via Updater"; ExtraDiskSpaceRequire
 [Components]
 Name: "updater"; Description: "Tools auto updater"; Types: full compact custom; Flags: fixed;
 
-
-; Updater
-[Components]
-Name: "updater\main"; Description: "Updater"; Types: full compact custom; Flags: fixed;
-
 [Files]
-Source: "{#MySrcDir}\bin\updater\*"; DestDir: "{#MyAppBinsFolder}\updater"; Components: "updater\main"; Flags: ignoreversion recursesubdirs createallsubdirs; BeforeInstall: BeforeInstallScript;
-Source: "{#MySrcDir}\bin\hstart\*"; Destdir: "{#MyAppBinsFolder}\hstart\"; Components: "updater\main"; Flags: ignoreversion recursesubdirs createallsubdirs;
+Source: "{#MySrcDir}\bin\updater\*"; DestDir: "{#MyAppBinsFolder}\updater"; Components: "updater"; Flags: ignoreversion recursesubdirs createallsubdirs; BeforeInstall: BeforeInstallScript;
+Source: "{#MySrcDir}\bin\hstart\*"; Destdir: "{#MyAppBinsFolder}\hstart"; Components: "updater"; Flags: ignoreversion recursesubdirs createallsubdirs;
 
 [Icons]
-Name: "{group}\Toolkit Updater"; Filename: "{#MyAppBinsFolder}\updater\updater.exe"; WorkingDir: "{#MyAppBinsFolder}\updater"; Components: "updater\main";
-Name: "{userdesktop}\{#MyAppNameOriginal}\Toolkit Updater"; Filename: "{#MyAppBinsFolder}\updater\updater.exe"; WorkingDir: "{#MyAppBinsFolder}\updater"; Components: "updater\main";
+Name: "{group}\Toolkit Updater"; Filename: "{#MyAppBinsFolder}\updater\updater.exe"; WorkingDir: "{#MyAppBinsFolder}\updater"; Components: "updater";
+Name: "{userdesktop}\{#MyAppNameOriginal}\Toolkit Updater"; Filename: "{#MyAppBinsFolder}\updater\updater.exe"; WorkingDir: "{#MyAppBinsFolder}\updater"; Components: "updater";
 
 ; Fix default update config
 [INI]
-Filename: {#MyAppBinsFolder}\updater\tools.ini; Section: UpdaterConfig; Key: disable_clean; String: True; Components: "updater\main"; 
-Filename: {#MyAppBinsFolder}\updater\tools.ini; Section: UpdaterConfig; Key: disable_repack; String: True; Components: "updater\main"; 
+Filename: {#MyAppBinsFolder}\updater\tools.ini; Section: UpdaterConfig; Key: disable_clean; String: True; Components: "updater"; 
+Filename: {#MyAppBinsFolder}\updater\tools.ini; Section: UpdaterConfig; Key: disable_repack; String: True; Components: "updater"; 
 
 
 [Components]
diff --git a/extras/vbdec/installer/setup.iss b/extras/vbdec/installer/setup.iss
index b3c1a9e..19849b1 100644
--- a/extras/vbdec/installer/setup.iss
+++ b/extras/vbdec/installer/setup.iss
@@ -10,6 +10,7 @@
 #define MyAppBinsFolder "{app}\bin"
 #define MyAppToolsIconsFolder "{app}\assets\icons"
 #define MySrcDir "C:\code\toolkit"
+#define MyExtrasSrcDir "C:\code\toolkit\extras\vbdec"
 #define MyOutputDir "C:\code"
 
 [Setup]
@@ -50,33 +51,31 @@ portuguese.FolderValidationError=O conjunto de ferramentas não foi encontrado n
 
 
 [Components]
-Name: "vbdec"; Description: "Install VBDEC via Updater"; ExtraDiskSpaceRequired: 996147200; Types: full compact custom; Flags: fixed;
+Name: "vbdec"; Description: "Install VBDEC via Updater"; ExtraDiskSpaceRequired: 15000000; Types: full compact custom; Flags: fixed;
 
 
 [Components]
 Name: "updater"; Description: "Tools auto updater"; Types: full compact custom; Flags: fixed;
 
-
-; Updater
-[Components]
-Name: "updater\main"; Description: "Updater"; Types: full compact custom; Flags: fixed;
-
 [Files]
-Source: "{#MySrcDir}\bin\updater\*"; DestDir: "{#MyAppBinsFolder}\updater"; Components: "updater\main"; Flags: ignoreversion recursesubdirs createallsubdirs; BeforeInstall: BeforeInstallScript;
-Source: "{#MySrcDir}\bin\hstart\*"; Destdir: "{#MyAppBinsFolder}\hstart\"; Components: "updater\main"; Flags: ignoreversion recursesubdirs createallsubdirs;
+Source: "{#MySrcDir}\bin\updater\*"; DestDir: "{#MyAppBinsFolder}\updater"; Components: "updater"; Flags: ignoreversion recursesubdirs createallsubdirs; BeforeInstall: BeforeInstallScript;
+Source: "{#MySrcDir}\bin\hstart\*"; Destdir: "{#MyAppBinsFolder}\hstart"; Components: "updater"; Flags: ignoreversion recursesubdirs createallsubdirs;
 
 [Icons]
-Name: "{group}\Toolkit Updater"; Filename: "{#MyAppBinsFolder}\updater\updater.exe"; WorkingDir: "{#MyAppBinsFolder}\updater"; Components: "updater\main";
-Name: "{userdesktop}\{#MyAppNameOriginal}\Toolkit Updater"; Filename: "{#MyAppBinsFolder}\updater\updater.exe"; WorkingDir: "{#MyAppBinsFolder}\updater"; Components: "updater\main";
+Name: "{group}\Toolkit Updater"; Filename: "{#MyAppBinsFolder}\updater\updater.exe"; WorkingDir: "{#MyAppBinsFolder}\updater"; Components: "updater";
+Name: "{userdesktop}\{#MyAppNameOriginal}\Toolkit Updater"; Filename: "{#MyAppBinsFolder}\updater\updater.exe"; WorkingDir: "{#MyAppBinsFolder}\updater"; Components: "updater";
 
 ; Fix default update config
 [INI]
-Filename: {#MyAppBinsFolder}\updater\tools.ini; Section: UpdaterConfig; Key: disable_clean; String: True; Components: "updater\main"; 
-Filename: {#MyAppBinsFolder}\updater\tools.ini; Section: UpdaterConfig; Key: disable_repack; String: True; Components: "updater\main"; 
+Filename: {#MyAppBinsFolder}\updater\tools.ini; Section: UpdaterConfig; Key: disable_clean; String: True; Components: "updater"; 
+Filename: {#MyAppBinsFolder}\updater\tools.ini; Section: UpdaterConfig; Key: disable_repack; String: True; Components: "updater"; 
 
 
 ;;; etc
 ;;;;;;;;;;;;;;;;;;;;;;;;
+[Files]
+Source: "{#MyExtrasSrcDir}\toolkit\Decompilers\[VB] VBDEC\*"; DestDir: "{#MyAppToolsFolder}\Decompilers\[VB] VBDEC"; Components: "vbdec"; Flags: ignoreversion recursesubdirs createallsubdirs; 
+
 [Run]
 ; Install VBDEC in toolkit
 Filename: "{#MyAppBinsFolder}\updater\updater.exe"; Parameters: "-f -u VBDEC -dic -dsu"; Flags: shellexec waituntilterminated;
diff --git a/bin/updater/bin/VBDEC-register.bat b/extras/vbdec/toolkit/Decompilers/[VB] VBDEC/VBDEC-register.bat
similarity index 100%
rename from bin/updater/bin/VBDEC-register.bat
rename to extras/vbdec/toolkit/Decompilers/[VB] VBDEC/VBDEC-register.bat
diff --git a/bin/updater/bin/tregsvr.exe b/extras/vbdec/toolkit/Decompilers/[VB] VBDEC/tregsvr.exe
similarity index 100%
rename from bin/updater/bin/tregsvr.exe
rename to extras/vbdec/toolkit/Decompilers/[VB] VBDEC/tregsvr.exe