App Updates

- 7z Updated to 22.01
- DiskGenius.script update to 5.4.5.1412

Projects/PhoenixPE/Applications/Disk Management/DiskGenius.script

@@ -30,22 +30,22 @@
 
 [Main]
 Title=DiskGenius
-Description=DiskGenius is an all-in-one Data Recovery, Partition Manager, and Backup/Cloning Utility for IT Professionals.
+Description=(v5.4.5.1412) DiskGenius is an all-in-one Data Recovery, Partition Manager, and Backup/Cloning Utility for IT Professionals.
 Author=Homes32
 Level=5
 Selected=False
 Mandatory=False
-Version=1.0.0.0
+Version=1.1.0.0
-Date=2022-03-03
+Date=2022-08-18
 
 [Variables]
 %ProgramFolder%="DiskGenius"
 %ProgramExe%="DiskGenius.exe"
-%ProgramVersion%=5431328
+%ProgramVersion%=5451412
 %SetupFile%="DiskGenius_%SourceArch%.zip"
 %DownloadURLx86%=http://engdownload.eassos.cn/winpe/DGEng%ProgramVersion%_x86.zip
 %DownloadURLx64%=http://engdownload.eassos.cn/winpe/DGEng%ProgramVersion%_x64.zip
-%aLangMap%=English|1252|Japanese|932
+%aLangMap%=Arabic|العربية|Dutch|Nederlands|English||French|Français|German|Deutsch|Italian|Italian|Japanese|日本語|Korean|한국어|Polish|Polski|Portuguese|Português|Russian|Русский|Spanish|Español
 
 [Process]
 Echo,"Processing %ScriptTitle%..."
@@ -63,17 +63,19 @@ FileCopy,"%ProjectTemp%\%ProgramFolder%\DiskGenius\*.*","%TargetPrograms%\%Progr
 
 Echo,"Configuring %ScriptTitle%..."
 
+FileCreateBlank,"%TargetPrograms%\%ProgramFolder%\Options.ini",Encoding=UTF16
+
 // Language
 List,Pos,%aLangMap%,%cmb_Language%,%LangPos%
 If,Not,%LangPos%,Equal,0,Begin
   Math,Add,%LangPos%,%LangPos%,1
   List,Get,%aLangMap%,%LangPos%,%LangCode%
-  IniWrite,"%TargetPrograms%\%ProgramFolder%\Options.ini","Settings","Language","%LangCode%"
+  IniWrite,"%TargetPrograms%\%ProgramFolder%\Options.ini","Settings","Language","#$q1252#$q"
+  IniWrite,"%TargetPrograms%\%ProgramFolder%\Options.ini","Settings","LanguagePack","#$q%LangCode%#$q"
 End
 Else,Halt,"INTERNAL LOGIC ERROR: The specified language is not defined."
 
 // Don't show nag screen
-FileCreateBlank,"%TargetPrograms%\%ProgramFolder%\Options.ini"
 IniWrite,"%TargetPrograms%\%ProgramFolder%\Options.ini","LicenseInfo","Show","#$qN#$q"
 IniWrite,"%TargetPrograms%\%ProgramFolder%\Options.ini","LicenseInfo","Remind","#$qN#$q"
   
@@ -295,7 +297,7 @@ txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Disk Management"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,DiskGenius
 bvl_Options=Options,1,12,145,90,197,184,8,Bold
 lbl_Language=Language,1,1,154,110,153,16,8,Normal
-cmb_Language=English,1,4,155,126,150,21,English,Japanese
+cmb_Language=English,1,4,155,126,150,21,Arabic,Dutch,English,French,German,Italian,Japanese,Korean,Polish,Portuguese,Russian,Spanish
 lbl_RegEdition="Software Edition",1,1,155,160,153,16,8,Normal
 cmb_RegEdition=Free,1,4,155,175,171,21,Free,"Use Host License","Enter Registration Info",_ToggleProductReg_,True
 bvl_Registration="Product Registration",0,12,349,90,226,184,8,Bold

Projects/PhoenixPE/Applications/File Managers/7Zip.script

@@ -32,16 +32,16 @@
 Title=7-Zip
 Author=Homes32
 Level=5
-Version=1.1.2.0
+Version=1.2.0.0
-Description=(v22.00) 7-Zip is a free and open-source file archiver capable of reading and writing many archive formats.
+Description=(v22.01) 7-Zip is a free and open-source file archiver capable of reading and writing many archive formats.
-Date=2022-06-22
+Date=2022-08-18
 Selected=False
 Mandatory=False
 
 [Variables]
 %ProgramFolder%="7-Zip"
 %ProgramExe%="7zFM.exe"
-%ProgramVersion%=2200
+%ProgramVersion%=2201
 %DownloadURL86%=https://www.7-zip.org/a/7z%ProgramVersion%.exe
 %DownloadURL64%=https://www.7-zip.org/a/7z%ProgramVersion%-x64.exe
 
@@ -55,13 +55,8 @@ StrFormat,RTRIM,%7zLang%,1,%7zLang%
 
 ///////////////////////////////////////////////////////////////////////////////////
 // Extract
-
 If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\Setup-%SourceArch%.exe",Run,%ScriptFile%,DownloadProgram
-Echo,"Extracting files..."
+Run,%ScriptFile%,ExtractProgram,"%TargetPrograms%\%ProgramFolder%"
-7z,"x -r -y #$q%ProgramsCache%\%ProgramFolder%\Setup-%SourceArch%.exe#$q * -xr!uninstall.exe -o#$q%ProjectTemp%\%ProgramFolder%#$q"
-DirMake,"%TargetPrograms%\%ProgramFolder%"
-If,#r,Equal,0,FileCopy,"%ProjectTemp%\%ProgramFolder%\*.*","%TargetPrograms%\%ProgramFolder%"
-Else,Halt,"Error: Failed to extract files."
 
 ///////////////////////////////////////////////////////////////////////////////////
 // Settings
@@ -394,6 +389,22 @@ If,%cb_ExtZip%,Equal,True,Begin
   RegWrite,HKLM,0x1,"Tmp_Software\Classes\7-Zip.zip","","zip Archive"
 End
 
+[#ExtractProgram#]
+// ===============================================================================================================================
+// Name...........: ExtractProgram
+// Description....: Extract program files from script/setup files.
+// Syntax.........: Run,%ScriptFile%,ExtractProgram,<DestPath>
+// Parameters.....: 
+// Return values..: 
+// Author.........: Homes32
+// Remarks........:
+// Related........: 
+// ===============================================================================================================================
+[ExtractProgram]
+Echo,"Extracting files..."
+7z,"x -r -y #$q%ProgramsCache%\%ProgramFolder%\Setup-%SourceArch%.exe#$q * -xr!uninstall.exe -o#$q#1#$q"
+If,Not,#r,Equal,0,Halt,"Error: Failed to extract program files."
+
 [#DownloadProgram#]
 // ===============================================================================================================================
 // Name...........: DownloadProgram
@@ -407,10 +418,9 @@ End
 // ===============================================================================================================================
 [DownloadProgram]
 System,SetLocal
-Echo,"Downloading 7-Zip [%SourceArch%]..."
+Echo,"Downloading %ScriptTitle%..."
-If,%SourceArch%,Equal,x64,Set,%URL%,%DownloadURL64%
+Run,%ScriptFile%,SetProgramArch
-Else,Set,%URL%,%DownloadURL86%
+WebGet,"%DownloadURL%","%ProgramsCache%\%ProgramFolder%\Setup-%SourceArch%.exe",NOERR
-WebGet,"%URL%","%ProgramsCache%\%ProgramFolder%\Setup-%SourceArch%.exe",NOERR
 If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
 System,EndLocal
 
@@ -428,6 +438,28 @@ System,EndLocal
 [ClearDownloadCache]
 DirDeleteEx,"%ProgramsCache%\%ProgramFolder%"
 
+[#SetProgramArch#]
+// ===============================================================================================================================
+// Name...........: SetProgramArch
+// Description....: Configure the script for the correct source architecture.
+// Syntax.........: Run,%ScriptFile%,SetProgramArch
+// Parameters.....: 
+// Return values..: Sets the following local variables:
+//                  %DownloadURL%    - The x86 or x64 download URL for %SetupFile%.
+// Author.........: Homes32
+// Remarks........:
+// Related........: 
+// ===============================================================================================================================
+[SetProgramArch]
+If,%SourceArch%,Equal,x64,Begin
+  Set,%SetupFile%,Setup-x64.exe
+  Set,%DownloadURL%,%DownloadURL64%
+End
+Else,Begin
+  Set,%SetupFile%,Setup-x86.exe
+  Set,%DownloadURL%,%DownloadURL86%
+End
+
 [#LaunchProgram#]
 // ===============================================================================================================================
 // Name...........: LaunchProgram
@@ -441,11 +473,9 @@ DirDeleteEx,"%ProgramsCache%\%ProgramFolder%"
 // ===============================================================================================================================
 [LaunchProgram]
 System,SetLocal
-If,%HostArch%,Equal,x64,Set,%SetupFile%,Setup-x64.exe
+Run,%ScriptFile%,SetProgramArch
-Else,Set,%SetupFile%,Setup-x86.exe
 If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
-7z,"x -r -y #$q%ProgramsCache%\%ProgramFolder%\%SetupFile%#$q * -xr!uninstall.exe -o#$q%ProjectTemp%\%ProgramFolder%#$q"
+Run,%ScriptFile%,ExtractProgram,"%ProjectTemp%\%ProgramFolder%"
-If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupFile%]."
 ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%"
 System,EndLocal