From 78cdd0957872e4c8e6186ed9d4a0681ac8abf1e5 Mon Sep 17 00:00:00 2001 From: Homes32 Date: Tue, 28 Jul 2020 21:15:55 -0500 Subject: [PATCH] move 7z operations to a macro to us x86/x64 7z.exe based on Host Arch Added PCI-Z.script --- .../Applications/Accessories/7Zip.script | 7 +- .../Applications/Anti-Malware/AVZ.script | 2 +- .../Backup & Recovery/Autobackup7Pro.script | 2 +- .../DiskInternals-LinuxReader.script | 2 +- .../Backup & Recovery/ProduKey.script | 8 +- .../Backup & Recovery/Recuva.script | 2 +- .../Backup & Recovery/TestDiskPhotoRec.script | 6 +- .../Applications/Dev Tools/NSudo.script | 2 +- .../Dev Tools/RegistryChangesView.script | 10 +- .../Applications/Dev Tools/x64dbg.script | 2 +- .../Diagnostics & Repair/Defraggler.script | 2 +- .../Applications/Hardware Info/Aida64.script | 11 +- .../{CPUZ.script => CPU-Z.script} | 18 +- .../Applications/Hardware Info/HWinfo.script | 12 +- .../Applications/Hardware Info/PCI-Z.script | 250 ++++++++++++++++++ .../Applications/Hardware Info/Speccy.script | 12 +- .../Hardware Info/WinDirStat.script | 14 +- .../Applications/Hardware Info/WizTree.script | 13 +- .../Multimedia/FastStoneViewer.script | 6 +- .../Applications/Multimedia/IrfanView.script | 2 +- .../Applications/Multimedia/MPC-BE.script | 4 +- .../Applications/Productivity/Firefox.script | 2 +- .../Productivity/SumatraPDF.script | 3 +- .../{Disk Tools => Security}/VeraCrypt.script | 0 .../System Tools/BlueScreenView.script | 8 +- .../System Tools/FullEventLogView.script | 8 +- .../Applications/System Tools/HashTab.script | 2 +- .../Applications/System Tools/HotSwap.script | 2 +- .../Applications/System Tools/ServiWin.script | 8 +- .../PhoenixPE/Applications/WinNTSetup.script | 4 +- Projects/PhoenixPE/Core/200-PreFlight.script | 2 +- .../PhoenixPE/Drivers/NetworkDrivers.script | 2 +- Projects/PhoenixPE/PhoenixAPI.script | 2 +- 33 files changed, 324 insertions(+), 106 deletions(-) rename Projects/PhoenixPE/Applications/Hardware Info/{CPUZ.script => CPU-Z.script} (97%) create mode 100644 Projects/PhoenixPE/Applications/Hardware Info/PCI-Z.script rename Projects/PhoenixPE/Applications/{Disk Tools => Security}/VeraCrypt.script (100%) diff --git a/Projects/PhoenixPE/Applications/Accessories/7Zip.script b/Projects/PhoenixPE/Applications/Accessories/7Zip.script index e9534db..db14bac 100644 --- a/Projects/PhoenixPE/Applications/Accessories/7Zip.script +++ b/Projects/PhoenixPE/Applications/Accessories/7Zip.script @@ -28,9 +28,6 @@ // ////////////////////////////////////////////////////////////////////////////////////////////////////////// -[TODO] -// Fix launch program to use hostos arch. - [Main] Title=7-Zip Author=Homes32 @@ -60,7 +57,7 @@ StrFormat,RTRIM,%7zLang%,1,%7zLang% If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\Setup-%SourceArch%.exe",Run,%ScriptFile%,DownloadProgram Echo,"Extracting files..." -ShellExecute,Hide,"%Tools%\7z.exe","x -r -y #$q%ProgramsCache%\%ProgramFolder%\Setup-%SourceArch%.exe#$q * -xr!uninstall.exe -o#$q%ProjectTemp%\%ProgramFolder%#$q" +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." @@ -447,7 +444,7 @@ System,GetEnv,PROCESSOR_ARCHITECTURE,%HostArch% If,%HostArch%,Equal,AMD64,Set,%SetupFile%,Setup-x64.exe Else,Set,%SetupFile%,Setup-x86.exe If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram -ShellExecute,Hide,"%Tools%\7z.exe","x -r -y #$q%ProgramsCache%\%ProgramFolder%\%SetupFile%#$q * -xr!uninstall.exe -o#$q%ProjectTemp%\%ProgramFolder%#$q" +7z,"x -r -y #$q%ProgramsCache%\%ProgramFolder%\%SetupFile%#$q * -xr!uninstall.exe -o#$q%ProjectTemp%\%ProgramFolder%#$q" If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupFile%]." ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%" System,EndLocal diff --git a/Projects/PhoenixPE/Applications/Anti-Malware/AVZ.script b/Projects/PhoenixPE/Applications/Anti-Malware/AVZ.script index db861c9..db186f2 100644 --- a/Projects/PhoenixPE/Applications/Anti-Malware/AVZ.script +++ b/Projects/PhoenixPE/Applications/Anti-Malware/AVZ.script @@ -182,7 +182,7 @@ btn_AdvancedOptions=,1,8,571,5,25,25,ToggleAdvancedOptions,Advanced_16.png,True, btn_ScriptInfo=,1,8,601,5,25,25,ShowScriptInfo,Help_16.png,True,"__Script Info" bvl_RunFromRam=bvl_RunFromRam,1,12,5,50,133,25 cb_RunFromRam="Run From RAM",1,3,12,54,100,18,False,"__When this option is enabled the program files will be stored in Boot.wim and loaded into memory on boot.#$x#$xYou should only select this option if you are booting from Read-Only media and your program requires write-access to the file system." -cb_AlwaysDownload="Always download latest version",1,3,155,54,177,18,False,"__Enable this option to ensure you always included the latest version of AVZ in your build." +cb_AlwaysDownload="Always download latest version",1,3,155,54,177,18,False,"__Enable this option to ensure you always include the latest version of AVZ in your build." bvl_Shortcuts=Shortcuts,1,12,5,90,133,184,8,Bold cb_DesktopShc=Desktop,1,3,12,104,122,18,False cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True diff --git a/Projects/PhoenixPE/Applications/Backup & Recovery/Autobackup7Pro.script b/Projects/PhoenixPE/Applications/Backup & Recovery/Autobackup7Pro.script index eec4804..64ab1ae 100644 --- a/Projects/PhoenixPE/Applications/Backup & Recovery/Autobackup7Pro.script +++ b/Projects/PhoenixPE/Applications/Backup & Recovery/Autobackup7Pro.script @@ -102,7 +102,7 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog [ExtractProgram] Echo,"Extracting files..." Set,%SetupFile%,%fb_SrcFiles% -ShellExecute,Hide,"%Tools%\7z.exe","x -r -y #$q%SetupFile%#$q -xr!#$qCommand Line Builder 7.exe#$q -xr!#$qTranslation Tool.exe#$q -xr!Updater.exe -o#$q#1#$q" +7z,"x -r -y #$q%SetupFile%#$q -xr!#$qCommand Line Builder 7.exe#$q -xr!#$qTranslation Tool.exe#$q -xr!Updater.exe -o#$q#1#$q" If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupFile%]. The error code returned was [#r]" [#SetDefaultOptions#] diff --git a/Projects/PhoenixPE/Applications/Backup & Recovery/DiskInternals-LinuxReader.script b/Projects/PhoenixPE/Applications/Backup & Recovery/DiskInternals-LinuxReader.script index 0d50eb8..5a41b78 100644 --- a/Projects/PhoenixPE/Applications/Backup & Recovery/DiskInternals-LinuxReader.script +++ b/Projects/PhoenixPE/Applications/Backup & Recovery/DiskInternals-LinuxReader.script @@ -74,7 +74,7 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog // =============================================================================================================================== [ExtractProgram] Echo,"Extracting files..." -ShellExecute,Hide,"%Tools%\7z.exe","x -r -y #$q%ProgramsCache%\%ProgramFolder%\LinuxReader.exe#$q * -xr!$PLUGINSDIR -xr!uninstall.exe* -o#$q#1#$q" +7z,"x -r -y #$q%ProgramsCache%\%ProgramFolder%\LinuxReader.exe#$q * -xr!$PLUGINSDIR -xr!uninstall.exe* -o#$q#1#$q" If,Not,#r,Equal,0,Halt,"Error: Failed to extract [LinuxReader.exe]." [#DownloadProgram#] diff --git a/Projects/PhoenixPE/Applications/Backup & Recovery/ProduKey.script b/Projects/PhoenixPE/Applications/Backup & Recovery/ProduKey.script index e5b8aa2..ed45501 100644 --- a/Projects/PhoenixPE/Applications/Backup & Recovery/ProduKey.script +++ b/Projects/PhoenixPE/Applications/Backup & Recovery/ProduKey.script @@ -73,8 +73,7 @@ Else,Begin If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]." End - ShellExecute,Hide,"%Tools%\7z.exe","e -r -y #$q%ProgramsCache%\%ProgramFolder%\ProduKey-Lang.zip#$q * -o#$q%TargetPrograms%\%ProgramFolder%#$q" - If,Not,#r,Equal,0,Halt,"Error: Failed to extract [ProduKey-Lang.zip]. The error code returned was [#r]." + Decompress,"%ProgramsCache%\%ProgramFolder%\ProduKey-Lang.zip","%TargetPrograms%\%ProgramFolder%" End // Prefill data source for offline system @@ -101,11 +100,8 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog // Related........: // =============================================================================================================================== [ExtractProgram] -System,SetLocal Echo,"Extracting files..." -ShellExecute,Hide,"%Tools%\7z.exe","e -r -y #$q%ProgramsCache%\%ProgramFolder%\ProduKey-%SourceArch%.zip#$q * -o#$q#1#$q" -If,Not,#r,Equal,0,Halt,"Error: Failed to extract [ProduKey-%SourceArch%.zip]. The error code returned was [#r]." -System,EndLocal +Decompress,"%ProgramsCache%\%ProgramFolder%\ProduKey-%SourceArch%.zip",#1 [#DownloadProgram#] // =============================================================================================================================== diff --git a/Projects/PhoenixPE/Applications/Backup & Recovery/Recuva.script b/Projects/PhoenixPE/Applications/Backup & Recovery/Recuva.script index 648ce14..b17e61a 100644 --- a/Projects/PhoenixPE/Applications/Backup & Recovery/Recuva.script +++ b/Projects/PhoenixPE/Applications/Backup & Recovery/Recuva.script @@ -173,7 +173,7 @@ RegHiveUnLoad,Tmp_Software // =============================================================================================================================== [ExtractProgram] Echo,"Extracting files..." -ShellExecute,Hide,"%Tools%\7z.exe","x -r -y #$q%ProgramsCache%\%ProgramFolder%\%SetupFile%#$q -xr!$* -xr!uninst.exe -o#$q#1#$q" +7z,"x -r -y #$q%ProgramsCache%\%ProgramFolder%\%SetupFile%#$q -xr!$* -xr!uninst.exe -o#$q#1#$q" If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupFile%]. The error code returned was [#r]." [#DownloadProgram#] diff --git a/Projects/PhoenixPE/Applications/Backup & Recovery/TestDiskPhotoRec.script b/Projects/PhoenixPE/Applications/Backup & Recovery/TestDiskPhotoRec.script index e708c95..d802ff3 100644 --- a/Projects/PhoenixPE/Applications/Backup & Recovery/TestDiskPhotoRec.script +++ b/Projects/PhoenixPE/Applications/Backup & Recovery/TestDiskPhotoRec.script @@ -91,11 +91,11 @@ If,%cb_PinToStartMenu2%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Pro // =============================================================================================================================== [ExtractProgram] Echo,"Extracting files..." -ShellExecute,Hide,"%Tools%\7z.exe","e -r -y #$q%ProgramsCache%\%ProgramFolder%\TestDisk-%SourceArch%.zip#$q testdisk-7.2-WIP\* -o#$q#1#$q" +7z,"e -r -y #$q%ProgramsCache%\%ProgramFolder%\TestDisk-%SourceArch%.zip#$q testdisk-7.2-WIP\* -o#$q#1#$q" If,Not,#r,Equal,0,Halt,"Error: Failed to extract [TestDisk-%SourceArch%.zip]. The error code returned was [#r]." -ShellExecute,Hide,"%Tools%\7z.exe","e -r -y #$q%ProgramsCache%\%ProgramFolder%\TestDisk-%SourceArch%.zip#$q testdisk-7.2-WIP\63\* -o#$q#1\63#$q" +7z,"e -r -y #$q%ProgramsCache%\%ProgramFolder%\TestDisk-%SourceArch%.zip#$q testdisk-7.2-WIP\63\* -o#$q#1\63#$q" If,Not,#r,Equal,0,Halt,"Error: Failed to extract [TestDisk-%SourceArch%.zip]. The error code returned was [#r]." -ShellExecute,Hide,"%Tools%\7z.exe","e -r -y #$q%ProgramsCache%\%ProgramFolder%\TestDisk-%SourceArch%.zip#$q testdisk-7.2-WIP\platforms\* -o#$q#1\platforms#$q" +7z,"e -r -y #$q%ProgramsCache%\%ProgramFolder%\TestDisk-%SourceArch%.zip#$q testdisk-7.2-WIP\platforms\* -o#$q#1\platforms#$q" If,Not,#r,Equal,0,Halt,"Error: Failed to extract [TestDisk-%SourceArch%.zip]. The error code returned was [#r]." [#DownloadProgram#] diff --git a/Projects/PhoenixPE/Applications/Dev Tools/NSudo.script b/Projects/PhoenixPE/Applications/Dev Tools/NSudo.script index ff968ba..16fc777 100644 --- a/Projects/PhoenixPE/Applications/Dev Tools/NSudo.script +++ b/Projects/PhoenixPE/Applications/Dev Tools/NSudo.script @@ -58,7 +58,7 @@ If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%, If,%SourceArch%,Equal,x64,Set,%ExtractFile%,"#$qNSudo_8.0_All_Components\NSudo Launcher\x64\NSudoLG.exe#$q" Else,Set,%ExtractFile%,"#$qNSudo_8.0_All_Components\NSudo Launcher\Win32\NSudoLG.exe#$q" -ShellExecute,Hide,"%Tools%\7z.exe","e -y #$q%ProgramsCache%\%ProgramFolder%\%SetupFile%#$q %ExtractFile% -o#$q%TargetPrograms%\%ProgramFolder%#$q" +7z,"e -y #$q%ProgramsCache%\%ProgramFolder%\%SetupFile%#$q %ExtractFile% -o#$q%TargetPrograms%\%ProgramFolder%#$q" If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupFile%]." /////////////////////////////////////////////////////////////////////////////////// diff --git a/Projects/PhoenixPE/Applications/Dev Tools/RegistryChangesView.script b/Projects/PhoenixPE/Applications/Dev Tools/RegistryChangesView.script index 66d3946..7ea9edc 100644 --- a/Projects/PhoenixPE/Applications/Dev Tools/RegistryChangesView.script +++ b/Projects/PhoenixPE/Applications/Dev Tools/RegistryChangesView.script @@ -73,8 +73,7 @@ Else,Begin If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]." End - ShellExecute,Hide,"%Tools%\7z.exe","e -r -y #$q%ProgramsCache%\%ProgramFolder%\RegistryChangesView-Lang.zip#$q * -o#$q%TargetPrograms%\%ProgramFolder%#$q" - If,Not,#r,Equal,0,Halt,"Error: Failed to extract [RegistryChangesViewLang.zip]. The error code returned was [#r]." + Decompress,"%ProgramsCache%\%ProgramFolder%\RegistryChangesView-Lang.zip","%TargetPrograms%\%ProgramFolder%" End /////////////////////////////////////////////////////////////////////////////////// @@ -97,11 +96,8 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog // Related........: // =============================================================================================================================== [ExtractProgram] -System,SetLocal Echo,"Extracting files..." -ShellExecute,Hide,"%Tools%\7z.exe","e -r -y #$q%ProgramsCache%\%ProgramFolder%\RegistryChangesView-%SourceArch%.zip#$q * -o#$q#1#$q" -If,Not,#r,Equal,0,Halt,"Error: Failed to extract [RegistryChangesView-%SourceArch%.zip]. The error code returned was [#r]." -System,EndLocal +Decompress,"%ProgramsCache%\%ProgramFolder%\RegistryChangesView-%SourceArch%.zip",#1 [#DownloadProgram#] // =============================================================================================================================== @@ -255,7 +251,7 @@ txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"System Tools" txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,RegistryChangesView bvl_Options=Options,1,12,150,90,197,184,8,Bold lbl_Language=Language,1,1,159,110,153,16,8,Normal -cmb_Language=English,1,4,160,126,150,21,Arabic,"Chinese (Simplified)",Czech,Dutch,English,French,German,Greek,Hungarian,Italian,Japanese,Polish,Russian,Slovak,Spanish,Ukrainian,_DeleteCachedLangFile_,True +cmb_Language=Arabic,1,4,160,126,150,21,Arabic,"Chinese (Simplified)",Czech,Dutch,English,French,German,Greek,Hungarian,Italian,Japanese,Polish,Russian,Slovak,Spanish,Ukrainian,_DeleteCachedLangFile_,True [InterfaceEncoded] play-hot.png=841,1220 diff --git a/Projects/PhoenixPE/Applications/Dev Tools/x64dbg.script b/Projects/PhoenixPE/Applications/Dev Tools/x64dbg.script index a5d842e..b17b66a 100644 --- a/Projects/PhoenixPE/Applications/Dev Tools/x64dbg.script +++ b/Projects/PhoenixPE/Applications/Dev Tools/x64dbg.script @@ -81,7 +81,7 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog // =============================================================================================================================== [ExtractProgram] Echo,"Extracting files..." -ShellExecute,Hide,"%Tools%\7z.exe","x -r -y #$q%ProgramsCache%\%ProgramFolder%\%SetupFile%#$q release\* -o#$q#1#$q" +7z,"x -r -y #$q%ProgramsCache%\%ProgramFolder%\%SetupFile%#$q release\* -o#$q#1#$q" If,Not,#r,Equal,0,Halt,"ERROR: Failed to extract [%SetupFile%]. The error code returned was [#r]." [#DownloadProgram#] diff --git a/Projects/PhoenixPE/Applications/Diagnostics & Repair/Defraggler.script b/Projects/PhoenixPE/Applications/Diagnostics & Repair/Defraggler.script index d9a6e7b..2e451db 100644 --- a/Projects/PhoenixPE/Applications/Diagnostics & Repair/Defraggler.script +++ b/Projects/PhoenixPE/Applications/Diagnostics & Repair/Defraggler.script @@ -167,7 +167,7 @@ RegHiveUnLoad,Tmp_Software // =============================================================================================================================== [ExtractProgram] Echo,"Extracting files..." -ShellExecute,Hide,"%Tools%\7z.exe","x -r -y #$q%ProgramsCache%\%ProgramFolder%\%SetupFile%#$q -xr!$* -xr!uninst.exe -o#$q#1#$q" +7z,"x -r -y #$q%ProgramsCache%\%ProgramFolder%\%SetupFile%#$q -xr!$* -xr!uninst.exe -o#$q#1#$q" If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupFile%]. The error code returned was [#r]." [#DownloadProgram#] diff --git a/Projects/PhoenixPE/Applications/Hardware Info/Aida64.script b/Projects/PhoenixPE/Applications/Hardware Info/Aida64.script index 434d9be..f9e8d6f 100644 --- a/Projects/PhoenixPE/Applications/Hardware Info/Aida64.script +++ b/Projects/PhoenixPE/Applications/Hardware Info/Aida64.script @@ -44,7 +44,7 @@ Date=2020-04-07 %ProgramIni%="aida64.ini" %DownloadURL-Extreme%=http://download.aida64.com/aida64extreme625.zip %DownloadURL-Engineer%=http://download.aida64.com/aida64engineer625.zip -%SetupExe%="aida64.zip" +%SetupFile%="aida64.zip" [Process] Echo,"Processing %ScriptTitle%..." @@ -56,7 +56,7 @@ Else,Halt,"LOGIC ERROR: Invalid Release selected." /////////////////////////////////////////////////////////////////////////////////// // Extract -If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupExe%",Run,%ScriptFile%,DownloadProgram +If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram Run,%ScriptFile%,ExtractProgram,"%TargetPrograms%\%ProgramFolder%" /////////////////////////////////////////////////////////////////////////////////// @@ -96,8 +96,7 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog // =============================================================================================================================== [ExtractProgram] Echo,"Extracting files..." -ShellExecute,Hide,"%Tools%\7z.exe","x -r -y #$q%ProgramsCache%\%ProgramFolder%\%SetupExe%#$q -o#$q#1#$q" -If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupExe%]." +Decompress,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",#1 [#DownloadProgram#] // =============================================================================================================================== @@ -115,7 +114,7 @@ Echo,"Downloading %ScriptTitle%..." If,%rbtn_Extreme%,Equal,True,Set,%DownloadURL%,%DownloadURL-Extreme% Else,If,%rbtn_Engineer%,Equal,True,Set,%DownloadURL%,%DownloadURL-Engineer% Else,Halt,"LOGIC ERROR: Invalid Release selected." -WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupExe%",NOERR +WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",NOERR If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]." [#LaunchProgram#] @@ -131,7 +130,7 @@ If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]." // =============================================================================================================================== [LaunchProgram] Echo,"Launching %ScriptTitle%..." -If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupExe%",Run,%ScriptFile%,DownloadProgram +If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram Run,%ScriptFile%,ExtractProgram,"%ProjectTemp%\%ProgramFolder%" ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%" diff --git a/Projects/PhoenixPE/Applications/Hardware Info/CPUZ.script b/Projects/PhoenixPE/Applications/Hardware Info/CPU-Z.script similarity index 97% rename from Projects/PhoenixPE/Applications/Hardware Info/CPUZ.script rename to Projects/PhoenixPE/Applications/Hardware Info/CPU-Z.script index 143ef58..f2d029f 100644 --- a/Projects/PhoenixPE/Applications/Hardware Info/CPUZ.script +++ b/Projects/PhoenixPE/Applications/Hardware Info/CPU-Z.script @@ -43,8 +43,8 @@ Date=2020-04-07 %ProgramExe%="cpuz_x32.exe" %DownloadURL%=http://download.cpuid.com/cpu-z/cpu-z_1.91-en.zip %DownloadURL-cn%=http://download.cpuid.com/cpu-z/cpu-z_1.91-cn.zip -%SetupExe%="cpu-z-en.zip" -%SetupExe-cn%="cpu-z-cn.zip" +%SetupFile%="cpu-z-en.zip" +%SetupFile-cn%="cpu-z-cn.zip" [Process] Echo,"Processing %ScriptTitle%..." @@ -53,12 +53,12 @@ If,%cb_RunFromRam%,Equal,True,RunFromRam If,%SourceArch%,Equal,x64,Set,%ProgramExe%,"cpuz_x64.exe" If,%cmb_Language%,Equal,"Chinese",Begin Set,%DownloadURL%,%DownloadURL-cn% - Set,%SetupExe%,%SetupExe-cn% + Set,%SetupFile%,%SetupFile-cn% End /////////////////////////////////////////////////////////////////////////////////// // Extract -If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupExe%",Run,%ScriptFile%,DownloadProgram +If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram Run,%ScriptFile%,ExtractProgram,"%TargetPrograms%\%ProgramFolder%" /////////////////////////////////////////////////////////////////////////////////// @@ -89,8 +89,8 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog [ExtractProgram] Echo,"Extracting files..." If,%SourceArch%,Equal,x64,Set,%ProgramExe%,"cpuz_x64.exe" -ShellExecute,Hide,"%Tools%\7z.exe","x -r -y #$q%ProgramsCache%\%ProgramFolder%\%SetupExe%#$q -i!cpuz.ini -i!cpuz_readme.txt -i!%ProgramExe% -o#$q#1#$q" -If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupExe%]." +7z,"x -r -y #$q%ProgramsCache%\%ProgramFolder%\%SetupFile%#$q -i!cpuz.ini -i!cpuz_readme.txt -i!%ProgramExe% -o#$q#1#$q" +If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupFile%]." [#DownloadProgram#] // =============================================================================================================================== @@ -107,9 +107,9 @@ If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupExe%]." Echo,"Downloading %ScriptTitle%..." If,%cmb_Language%,Equal,"Chinese",Begin Set,%DownloadURL%,%DownloadURL-cn% - Set,%SetupExe%,%SetupExe-cn% + Set,%SetupFile%,%SetupExe-cn% End -WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupExe%",NOERR +WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",NOERR If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]." [#LaunchProgram#] @@ -126,7 +126,7 @@ If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]." [LaunchProgram] Echo,"Launching %ScriptTitle%..." If,%SourceArch%,Equal,x64,Set,%ProgramExe%,"cpuz_x64.exe" -If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupExe%",Run,%ScriptFile%,DownloadProgram +If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram Run,%ScriptFile%,ExtractProgram,"%ProjectTemp%\%ProgramFolder%" ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%" diff --git a/Projects/PhoenixPE/Applications/Hardware Info/HWinfo.script b/Projects/PhoenixPE/Applications/Hardware Info/HWinfo.script index f5c3d9b..130c810 100644 --- a/Projects/PhoenixPE/Applications/Hardware Info/HWinfo.script +++ b/Projects/PhoenixPE/Applications/Hardware Info/HWinfo.script @@ -43,7 +43,7 @@ Date=2020-04-07 %ProgramExe%="hwinfo32.exe" %ProgramIni%="hwinfo32.ini" %DownloadURL%=https://www.sac.sk/download/utildiag/hwi_624.zip -%SetupExe%="hwinfo.zip" +%SetupFile%="hwinfo.zip" [Process] Echo,"Processing %ScriptTitle%..." @@ -56,7 +56,7 @@ End /////////////////////////////////////////////////////////////////////////////////// // Extract -If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupExe%",Run,%ScriptFile%,DownloadProgram +If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram Run,%ScriptFile%,ExtractProgram,"%TargetPrograms%\%ProgramFolder%" /////////////////////////////////////////////////////////////////////////////////// @@ -91,8 +91,8 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog [ExtractProgram] Echo,"Extracting files..." If,%SourceArch%,Equal,x64,Set,%ProgramExe%,"hwinfo64.exe" -ShellExecute,Hide,"%Tools%\7z.exe","x -r -y #$q%ProgramsCache%\%ProgramFolder%\%SetupExe%#$q -i!hwinfo32.ini -i!%ProgramExe% -o#$q#1#$q" -If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupExe%]." +7z,"x -r -y #$q%ProgramsCache%\%ProgramFolder%\%SetupFile%#$q -i!hwinfo32.ini -i!%ProgramExe% -o#$q#1#$q" +If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupFile%]." [#DownloadProgram#] // =============================================================================================================================== @@ -107,7 +107,7 @@ If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupExe%]." // =============================================================================================================================== [DownloadProgram] Echo,"Downloading %ScriptTitle%..." -WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupExe%",NOERR +WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",NOERR If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]." [#LaunchProgram#] @@ -124,7 +124,7 @@ If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]." [LaunchProgram] Echo,"Launching %ScriptTitle%..." If,%SourceArch%,Equal,x64,Set,%ProgramExe%,"hwinfo64.exe" -If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupExe%",Run,%ScriptFile%,DownloadProgram +If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram Run,%ScriptFile%,ExtractProgram,"%ProjectTemp%\%ProgramFolder%" ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%" diff --git a/Projects/PhoenixPE/Applications/Hardware Info/PCI-Z.script b/Projects/PhoenixPE/Applications/Hardware Info/PCI-Z.script new file mode 100644 index 0000000..661dafc --- /dev/null +++ b/Projects/PhoenixPE/Applications/Hardware Info/PCI-Z.script @@ -0,0 +1,250 @@ +[License] +////////////////////////////////////////////////////////////////////////////////////////////////////////// +// +// This script is part of the PhoenixPE project and distributed under the MIT License. +// +// Additional 3rd party tools, encoded files, and programs used by the project are the property +// of their respective authors and may be subject to their own license agreement. +// +// Copyright (c) 2014-2020 Jonathan Holmgren (Homes32) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// +////////////////////////////////////////////////////////////////////////////////////////////////////////// + +[Main] +Title=PCI-Z +Description=PCI-Z is designed for detecting unknown hardware on your PC. It will help you determine vendor, device and certain details about device even if you don't have drivers installed. +Author=Homes32 +Level=5 +Selected=True +Mandatory=False +Version=1.0.0.0 +Date=2020-07-27 + +[Variables] +%ProgramFolder%="PCI-Z" +%ProgramExe%="PCI-Z.exe" +%DownloadURLx86%=https://www.pci-z.com/current/PCI-Z.zip +%DownloadURLx64%=https://www.pci-z.com/current/x64/PCI-Z.zip +%SetupFile%="PCI-Z_%SourceArch%.zip" + +[Process] +Echo,"Processing %ScriptTitle%..." + +If,%cb_RunFromRam%,Equal,True,RunFromRam +If,%cb_AlwaysDownload%,Equal,True,DirDeleteEx,"%ProgramsCache%\%ProgramFolder%" + +/////////////////////////////////////////////////////////////////////////////////// +// Extract +If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram +Run,%ScriptFile%,ExtractProgram,"%TargetPrograms%\%ProgramFolder%" + +/////////////////////////////////////////////////////////////////////////////////// +// Settings + +Echo,"Configuring %ScriptTitle%..." + +/////////////////////////////////////////////////////////////////////////////////// +// Shortcuts + +If,%cb_DesktopShc%,Equal,True,AddShortcut,Desktop,,%txt_ShortcutName%,"%PEPrograms%\%ProgramFolder%\%ProgramExe%" +If,%cb_StartMenuShc%,Equal,True,AddShortcut,StartMenu,%txt_StartMenuFolder%,%txt_ShortcutName%,"%PEPrograms%\%ProgramFolder%\%ProgramExe%" +If,%cb_PinToTaskbar%,Equal,True,PinShortcut,Taskbar,Auto,"%PEPrograms%\%ProgramFolder%\%ProgramExe%" +If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%ProgramFolder%\%ProgramExe%" + +[#ExtractProgram#] +// =============================================================================================================================== +// Name...........: ExtractProgram +// Description....: Extract program files from script/setup files. +// Syntax.........: Run,%ScriptFile%,ExtractProgram, +// Parameters.....: #1 DestDir - The directory where the files will be extracted. +// Return values..: +// Author.........: Homes32 +// Remarks........: +// Related........: +// =============================================================================================================================== +[ExtractProgram] +Echo,"Extracting files..." +Decompress,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",#1 + +[#DownloadProgram#] +// =============================================================================================================================== +// Name...........: DownloadProgram +// Description....: Download the program files from the author's website. +// Syntax.........: Run,%ScriptFile%,DownloadProgram +// Parameters.....: +// Return values..: +// Author.........: Homes32 +// Remarks........: +// Related........: +// =============================================================================================================================== +[DownloadProgram] +Echo,"Downloading %ScriptTitle%..." +If,%SourceArch%,Equal,x64,Set,%DownloadURL%,%DownloadURLx64% +Else,Set,%DownloadURL%,%DownloadURLx86% +WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",NOERR +If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]." + +[#LaunchProgram#] +// =============================================================================================================================== +// Name...........: LaunchProgram +// Description....: Unpack and launch the program. +// Syntax.........: Run,%ScriptFile%,LaunchProgram +// Parameters.....: +// Return values..: +// Author.........: Homes32 +// Remarks........: +// Related........: btn_LaunchProgram +// =============================================================================================================================== +[LaunchProgram] +Echo,"Launching %ScriptTitle%..." +If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram +Run,%ScriptFile%,ExtractProgram,"%ProjectTemp%\%ProgramFolder%" +ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%" + +[#ClearDownloadCache#] +// =============================================================================================================================== +// Name...........: ClearDownloadCache +// Description....: Remove all downloaded setup and program files. +// Syntax.........: Run,%ScriptFile%,ClearDownloadCache +// Parameters.....: +// Return values..: +// Author.........: Homes32 +// Remarks........: +// Related........: btn_PurgeCache +// =============================================================================================================================== +[ClearDownloadCache] +DirDeleteEx,"%ProgramsCache%\%ProgramFolder%" + +[#SetDefaultOptions#] +// =============================================================================================================================== +// Name...........: SetDefaultOptions +// Description....: Sets script options to default values. +// Syntax.........: +// Parameters.....: +// Return values..: +// Author.........: Homes32 +// Remarks........: +// Related........: btn_SetDefaultOptions +// =============================================================================================================================== +[SetDefaultOptions] +System,Cursor,Wait +WriteInterface,Value,%ScriptFile%,Interface,cb_RunFromRam,False +WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False +WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True +WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False +WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False +WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Info" +WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"PCI-Z" +System,Cursor,Normal + +[#ToggleAdvancedOptions#] +// =============================================================================================================================== +// Name...........: ToggleAdvancedOptions +// Description....: Show/Hide advanced options. +// Syntax.........: +// Parameters.....: +// Return values..: +// Author.........: Homes32 +// Remarks........: +// Related........: btn_AdvancedOptions +// =============================================================================================================================== +[ToggleAdvancedOptions] +Message,"There are no advanced options available for this script." + +[#ShowScriptInfo#] +// =============================================================================================================================== +// Name...........: ShowScriptInfo +// Description....: +// Syntax.........: +// Parameters.....: +// Return values..: +// Author.........: Homes32 +// Remarks........: +// Related........: btn_ScriptInfo +// =============================================================================================================================== +[ShowScriptInfo] +Message,"PCI-Z is designed for detecting unknown hardware on your PC. It will help you determine vendor, device and certain details about device even if you don't have drivers installed.#$x#$xPCI-Z is free for both commercial and non commercial usage. If you enjoy the software please support the developer.#$x#$xOn first run this script will download the setup file (~1 MB) and cache it for future builds." + +[#Interface#] +// =============================================================================================================================== +// Name...........: Interface +// Description....: +// Syntax.........: +// Parameters.....: +// Return values..: +// Author.........: Homes32 +// Remarks........: +// Related........: +// =============================================================================================================================== +[Interface] +btn_LaunchProgram="Launch PCI-Z",1,8,5,5,132,25,LaunchProgram,play-hot.png,False +bvl_Homepage=bvl_Homepage,1,12,367,5,72,25 +web_Homepage=Homepage,1,10,377,9,60,18,https://www.pci-z.com/ +btn_DownloadProgram=,1,8,448,5,25,25,DownloadProgram,VistalcoDownload_16.png,False,"__Download the program." +btn_PurgeCache=,1,8,479,5,25,25,ClearDownloadCache,Trash.ico,True,"__Remove all downloaded setup files." +btn_SetDefaultOptions=,1,8,541,5,25,25,SetDefaultOptions,SetDefaults_16.png,True,"__Restore Defaults" +btn_AdvancedOptions=,1,8,571,5,25,25,ToggleAdvancedOptions,Advanced_16.png,True,"__Show/Hide Advanced Options" +btn_ScriptInfo=,1,8,601,5,25,25,ShowScriptInfo,Help_16.png,True,"__Script Info" +bvl_RunFromRam=bvl_RunFromRam,1,12,5,50,133,25 +cb_AlwaysDownload="Always download latest version",1,3,155,54,177,18,False,"__Enable this option to ensure you always include the latest version of PCI-Z and up-to-date device database in your build." +cb_RunFromRam="Run From RAM",1,3,12,54,100,18,False,"__When this option is enabled the program files will be stored in Boot.wim and loaded into memory on boot.#$x#$xYou should only select this option if you are booting from Read-Only media and your program requires write-access to the file system." +bvl_Shortcuts=Shortcuts,1,12,5,90,133,184,8,Bold +cb_DesktopShc=Desktop,1,3,12,104,122,18,False +cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True +cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False +cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False +txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"System Info" +txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,PCI-Z + +[InterfaceEncoded] +play-hot.png=841,1220 +Trash.ico=1150,1212 +SetDefaults_16.png=2475,3404 +Advanced_16.png=2000,2768 +Help_16.png=2830,3868 +VistalcoDownload_16.png=927,1348 + +[AuthorEncoded] + +[EncodedFile-InterfaceEncoded-play-hot.png] +lines=0 +0=iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAAAZiS0dEAP4A/gD+6xjUggAAAAlwSFlzAAAASAAAAEgARslrPgAAAAl2cEFnAAAAEAAAABAAXMatwwAAAiJJREFUOMutkz1oU2EUhp/vu3/5ublJappqqDRiIlYXFStKxy4WdCkibhXcXMVRBEGhUB0V3BsFRTqIQnHQRRSnFKzUIuK/TdPGJG2Te2/u/dwq1tIK+k5nOc9wzvPCP0asTUkDFAKlQBOKH/7fU/SRPpS6w4HHA6OHHh25kh/f3ztUGUYUYlvuSgChg8id1SIR/UQqHbnU25+6t/Bgflgv2nrm/K6tAXRCiCu0VSH0VYGtGUd7somJgZHitaTj5E4+PwV95mYABbKDtgraskRf0YkGsXS3nblQLOTvf39aH9YKXXp2tH9jgAoAQmTbwHAj6J6N4TlYHUemI+lj+Z09E0OnB6525eK5My/PQVZfd4NQggLdj2P4DlbHwVRRpBSEmotmddKZ7sTFvQf77k4/LBcOXx789QAAQg0CMIIYMjCpeYtU3Xnqfg2PNioSYjmWSIWZWKfum16ivQ4gFKR3sORWeL+yQKU1jy9diCpkUiANvblcdUufXyxdd0uNOSx+BygRksrsYa45Q0dfhQRoKYHlmEprm9PerBhrlLxJsxhpuTTAXQdAU4SLISIZIJOC+DaLpGU31VejVH/m3aje/vjWiCZYfrP0p4QA0hQ03lXZnbdVtieG3bLL9bI/NnezMpncF28B+K3mxhYDyHqAqs4Ex58MTiUWrS8fpmq3Xo2XZ41YjNrrb5uauFYmM7YdFYZSha7QLSdoNz9t2YP/kp+AfsdFsD8fGgAAAC56VFh0Y3JlYXRlLWRhdGUAAHjaMzIwsNA1sNA1MgkxMLAyMrMyNNY1MLUyMAAAQe0FE0pvDAgAAAAuelRYdG1vZGlmeS1kYXRlAAB42jMyMLDQNbDQNTIIMbSwMrG0MrLQNTC1MjAAAEKCBSOylbeyAAAAInpUWHRTb2Z0d2FyZQAAeNpzTMlPSlXwzE1MTw1KTUypBAAvnAXUrgypTQAAAABJRU5ErkJggnic4ynISazUzcgv0SvIS2cYBSMNeDLjl/9974ElIwMACj8H7bPi5SwBAAAAAgAAACQAAABJAwAAAAAAAAEAAAAAAAAAAAAAAA + +[EncodedFile-InterfaceEncoded-Trash.ico] +lines=0 +0=eJx10/1PEnEcB/DzYT2s7GHNHpYrY2221dbjVlsPs9asNVdtPfsHNEtt+ZRsyXjyNAFBHgQjKQi0YEIiBmJmoM5MwTISrOzB0jSndRToYctPd7Yro/re3vfD9+51973P53sIEkEcixYhxDkeSY1GkKUIgqwjQkwRMz/nyZEYjfw1Dh08MGff3sSYlDOndyQkJAiIyIko/hM5jUbjxsWtXL5t65b5R48cnkU+o1wiijx54jjb5eoEj8cDvT4f4DgOg4ODYLXWQUWFEszmGnj6tBtkMhnQ4uOXZV9Ii5i5DpTFyFKpVFMajQa0Wi1YLBYwGAwgkYgBRQugtFQEarUaOGxWIHHXzsXh36EuZpx67+vGxj68w0IT41goFMI+j41ifZ4n/h5XO9bV0jQdvbT4MW31qiXh3iTnn6d8T2NtsFHKDnVZTcG7gsu4hUfHOx/Yp71NI38VHRm5NNzfEjDyST/U1+u3C/NDtuKcSVetPlgvZOBmNCvUqCkPkP7+7RsDC+bNXRPuDWKuiPQ9TdavzUoejo2M+Mn1v3rWjTVXKoPmwks46R2mqqHYhTEbw3217IqG9B57TcBemP6NWMcX0r/xPcNqWecnbSLmBOlb64wfaSti91wVFP5R/3taeR3ph1+/wF4+dAbc+oqJkcEBrNOkCzq15cF2W42f9O0NltENa+KS5byCP7zluqSNqt/rR86Ag5/5zV1TOd6Apk/aRQycqr/L0fBpx/q1KWU8NJKyrfW1Ea13tL2Ux8cD2AuHNeg26cbbNJKJ7pYmP+XdzfexpO2bzmWnpUZRXlcmnNNpqx74V//7+55jM/tP5tj+3fnJB5NmU76Qw0rj83lTErEYhCUloFQqp/egQqEADocDubk5QKfToaioCMTEPedSU8cOHUiaR3leEcro6HgEPq8XHne5YXh4CIj3Q39/P9TX20ClugY6nRaczU7wenuIf0D6PetC+q+/UaVUbMjIyLgnlUqnyH1ebdCDvqoSblXqpve+Ql4GIqEQTEYjCPh8yM3JloX3nxzE2jfT8/K4N9XqD1U6nYfPK85mMpk3Mi9ezEMLCoxcDvssyuXGhzsW0UlH1D8S8Tus8BDX3xIV/AEUry6xeJzjDClKLM7Qy0zOZxgFIxDUsUBoV2bs8iFCkXoMbAB8oQUybAHR5gEAAAACAAAAJAAAAEUDAAAAAAAAAQAAAAAAAAAAAAAA + +[EncodedFile-InterfaceEncoded-SetDefaults_16.png] +lines=0 +0=iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAHEGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDggNzkuMTY0MDM2LCAyMDE5LzA4LzEzLTAxOjA2OjU3ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDE5LTEwLTIxVDE3OjIxOjEyLTA1OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAxOS0xMi0wMlQyMTo1MTo1Mi0wNjowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAxOS0xMi0wMlQyMTo1MTo1Mi0wNjowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpiMWM3ZDhlNS1mMGMxLTMwNDgtOGNiOS03YWU4YjgyNDgyNmQiIHhtcE1NOkRvY3VtZW50SUQ9ImFkb2JlOmRvY2lkOnBob3Rvc2hvcDowNzhkNDM1MC04NWRmLTg4NDQtOTY0Mi1lYTIxNmU3YjUwNDIiIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpmMDM1MDg3Mi1hYmUxLWU5NDAtOTE2NC1kYzRjMzdjOGIwOTUiPiA8ZGM6Y3JlYXRvcj4gPHJkZjpTZXE+IDxyZGY6bGk+SG9tZXMzMjwvcmRmOmxpPiA8L3JkZjpTZXE+IDwvZGM6Y3JlYXRvcj4gPHhtcE1NOkhpc3Rvcnk+IDxyZGY6U2VxPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY3JlYXRlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDpmMDM1MDg3Mi1hYmUxLWU5NDAtOTE2NC1kYzRjMzdjOGIwOTUiIHN0RXZ0OndoZW49IjIwMTktMTAtMjFUMTc6MjE6MTItMDU6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChXaW5kb3dzKSIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6MDdmNDNiMDctMTg1NC1hNjQwLWEwM2UtYTQxMTM2YTA0ODA2IiBzdEV2dDp3aGVuPSIyMDE5LTEwLTIxVDE3OjIxOjQ3LTA1OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOmIxYzdkOGU1LWYwYzEtMzA0OC04Y2I5LTdhZThiODI0ODI2ZCIgc3RFdnQ6d2hlbj0iMjAxOS0xMi0wMlQyMTo1MTo1Mi0wNjowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDwvcmRmOlNlcT4gPC94bXBNTTpIaXN0b3J5PiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PlYy9voAAAJBSURBVDiNpdHLThNRHAbwvkCjpalcSyyUEDo09Jw5MxZeggXdQHSpa96ARTclolWpLYtG20IDwdpaoeVOW63G0gvEmEaj3cFKYrxMXLjw88wAbQ3smOQ3OTn/73yZiw6A7jK0G9tjJ0rcPmtnB8zNFbnjU0VtT52VWD1/UcE4KzOFw39K3D6D44NDYRWeOVdQYKoxDue8YxjeH4b1lRXm5S70v+7HSHlkjO83FeSZkcNFnAUnDFsGuOIu7L0v4M7GbXRlusDeMGO9QMyIHikrYSA7ACEnQF2LuyLkrIzuTDd6Q704rB1CvabWp6B/qYeYFT31AmlTqtrX7XAmb2AwLsCyZoFz2wn7th2GqAHxfEI7nM6voW2+DY4dB8QNsVovsKVsCl2myOXyGrpA0LHSAWOsBZOxSeAL8LH0GWJYRGeyE/KqDHFFVOoFQkJQBucFpFNb+JH/gxeJFMx+M4SADW/TZdR2jnAzdAtXo1cgJ2XQ51TVKGBLrGqJXofkl7C5uotvld9YiC/hSSyCr8VfmF6cQcucAUPPhkAX6ZnGK9Aw9UhRCdeCJhAvQblwAPzkk+9ApXgA6z0rLGELWISBRuiZxkckQWLkIIUkGH1G9Ln7UPtUA/4Co75R6O/rIT2VoGaaNH4jmSM6EiAu4ieQgzJava2QZ2RMBCZgvmsGDVLweTOXeqZR8Jic8JFx8ogosl9Gj7cHpmkTqJ8/7iwvmCUqRcuc5i8q0JGHpJ08IG6uyB1rvNrarc18RHeu4DL+AeXUQV071uymAAAAAElFTkSuQmCCeJwTCk4tcUlNSyzNKSmONzTTK8hLZxgFIwes5sQv/03zkSgjAwBGXgl7UO9x9wEAAAACAAAAKgAAAKsJAAAAAAAAAQAAAAAAAAAAAAAA + +[EncodedFile-InterfaceEncoded-Advanced_16.png] +lines=0 +0=iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAGMmlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDggNzkuMTY0MDM2LCAyMDE5LzA4LzEzLTAxOjA2OjU3ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDE5LTEwLTIwVDE5OjQwOjExLTA1OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAxOS0xMi0wMlQyMTo1MjozNy0wNjowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAxOS0xMi0wMlQyMTo1MjozNy0wNjowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo3NTgwZWU4NC04ZDRlLTlkNDQtOTBjYS03MzYzZWI5YTZhOGEiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NWE2M2YxZGQtNTk3ZS0yNzQ0LThmZGYtMjMxNThmNjgyNDBkIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6NWE2M2YxZGQtNTk3ZS0yNzQ0LThmZGYtMjMxNThmNjgyNDBkIj4gPGRjOmNyZWF0b3I+IDxyZGY6U2VxPiA8cmRmOmxpPkhvbWVzMzI8L3JkZjpsaT4gPC9yZGY6U2VxPiA8L2RjOmNyZWF0b3I+IDx4bXBNTTpIaXN0b3J5PiA8cmRmOlNlcT4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImNyZWF0ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6NWE2M2YxZGQtNTk3ZS0yNzQ0LThmZGYtMjMxNThmNjgyNDBkIiBzdEV2dDp3aGVuPSIyMDE5LTEwLTIwVDE5OjQwOjExLTA1OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjc1ODBlZTg0LThkNGUtOWQ0NC05MGNhLTczNjNlYjlhNmE4YSIgc3RFdnQ6d2hlbj0iMjAxOS0xMi0wMlQyMTo1MjozNy0wNjowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDwvcmRmOlNlcT4gPC94bXBNTTpIaXN0b3J5PiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PshFAqcAAAFESURBVDgRjcExaxphAADQtwUKgUJxCGYLxV/RQiGQUFKSMWSuOHRJiQ52MGChc7cOgWQ51w46am8oFmnifSZ6lcal91MiOHgYLHnPf5TRQwd7nuAFDvDMwicMcYNTCxs4RsmKLXxGhiYO0cYAfVzgNc4xwxVKct4iQw8JpghIkWKCeyToIsOJnOf4giFiBESooooIATESNLFpxSvMENBA0VIRDQRMcSRnH2e4wAQtFDxWQAsjtFFH2VwHN/iFFDXr1ZBigCG65n5giAFS1KxXwx/8xDV65sqoo40RWih4rIAW7hDhDBU5R5gioIGipSIaCBjjvRWbaCJBjIAIVVQRISDGb3zDtpwTZOgiwV+MkSLFCPe4RRcZKnJKuMIM59jFJfoY4Dve4BT/cIkdK0o4xoaFj7jGBF8tvcNLT7CHDmJ8sMYD9WpkFHmxHNIAAAAASUVORK5CYIJ4nON3TClLzEtOTYk3NNMryEtnGAUjClxgxy9f4tTwh5EBAInYCGlNR/4PAQAAAAIAAAAnAAAA0AcAAAAAAAABAAAAAAAAAAAAAAA + +[EncodedFile-InterfaceEncoded-Help_16.png] +lines=0 +0=iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAHAWlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDggNzkuMTY0MDM2LCAyMDE5LzA4LzEzLTAxOjA2OjU3ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgKFdpbmRvd3MpIiB4bXA6Q3JlYXRlRGF0ZT0iMjAxOC0wMi0yMlQxNjo1OTo1MC0wNjowMCIgeG1wOk1vZGlmeURhdGU9IjIwMTktMTItMDJUMjE6NTM6MDQtMDY6MDAiIHhtcDpNZXRhZGF0YURhdGU9IjIwMTktMTItMDJUMjE6NTM6MDQtMDY6MDAiIGRjOmZvcm1hdD0iaW1hZ2UvcG5nIiBwaG90b3Nob3A6Q29sb3JNb2RlPSIzIiBwaG90b3Nob3A6SUNDUHJvZmlsZT0ic1JHQiBJRUM2MTk2Ni0yLjEiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6YWQ2OTFmMzItY2FiZC1hZTQzLTlmNjAtMzk5YjQyOTBlMTNiIiB4bXBNTTpEb2N1bWVudElEPSJhZG9iZTpkb2NpZDpwaG90b3Nob3A6OTBjZmFlNjAtYWJhZS1iNTQ3LWIyODEtOWYxNzg2YzM1NjQ2IiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6MzUwYTZiYzMtZDFiMi03MjRjLTlmZWQtY2RmYTM4YzhjM2FkIj4gPGRjOmNyZWF0b3I+IDxyZGY6U2VxPiA8cmRmOmxpPkhvbWVzMzI8L3JkZjpsaT4gPC9yZGY6U2VxPiA8L2RjOmNyZWF0b3I+IDx4bXBNTTpIaXN0b3J5PiA8cmRmOlNlcT4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImNyZWF0ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6MzUwYTZiYzMtZDFiMi03MjRjLTlmZWQtY2RmYTM4YzhjM2FkIiBzdEV2dDp3aGVuPSIyMDE4LTAyLTIyVDE2OjU5OjUwLTA2OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgKFdpbmRvd3MpIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDo4MmNhNWFiYy05Mzg0LWUwNGYtOGE5NC0yMTk1NjY1NjY1YTUiIHN0RXZ0OndoZW49IjIwMTgtMDItMjJUMTc6MTA6MDUtMDY6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAoV2luZG93cykiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOmFkNjkxZjMyLWNhYmQtYWU0My05ZjYwLTM5OWI0MjkwZTEzYiIgc3RFdnQ6d2hlbj0iMjAxOS0xMi0wMlQyMTo1MzowNC0wNjowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDwvcmRmOlNlcT4gPC94bXBNTTpIaXN0b3J5PiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PozE0ngAAAOzSURBVDgRBcF9TJR1AMDx7/N7nnuOez/kxUJe4q2pWEgoykxLpqkzx6bhlszN/soZ/dE0W9bWZrVZ2WYt/ypn5VrmzDkZZk2INoRyNJEUUDg4TuC4g7vjjrvjHu7uefp8pJljb2KymMlr2g5rq5H0ZQj6V+mzwYOh4qrGbDyadqN1GfOhK7Hp2cV4VQWRE5+SF42QUVUUAEOSkDJZsMvuQEg68/OgfOBPjzvf4xnDpArW1xQe2rxS/XB/Q8kPzlnv6blYXJeEAEB+Z8MGTOllrE0b13V4uXXk3NDuS3/4rYmoTnGeDUk30f1PkNvDmntQz3/5mecKm2o8//6WGByNY7ehmI0Mec9Xlvw6rf51+Mv7K3IzBmff2sgbB2rJdZpJpZa5NzzJR+fv0dMxwqPZqq0XT37cvqbo/JapvpFl+fPtGxhv2PHjkauxuqJMFpdL5qtTO3A7ZMa8fnJtBmUlKissaR75UmgzER66K4qa1ttVqafvttBLi9d868lpTvkXWVloxunI4cLVfg6/e43GQ9c4e3GAWCDECjVJYikBqsTd30e4mSw9aq0tt4ontvx9vZ4lCi0SmayO2ST45dYYfQNR5r0ZkokkTruG50mYwcdRYnGNwHiQjmHdpW3b2iYixZV74sFFTMJAUWQkIZHSdHwTi5w8VsXpo2WMjgU5ezmA1e7G5bCQ67IyN7FApm7TdpFWFIvIGiiKjCwkxn0R7g/O09pSzmfHy+m6M8He40MMzTgoL3ZiiBzUHDsm1YJsMUtCHfmvU813oMiCJ/4Y4WgKcszUP2sFC1zuijA6qlJT5ULHhGq2ogsHT6+uQNztva8UxWba66rrT10fnkMsazhtKkIxOPeTB99kmP5HOgWVuUjChCzMWK0qWtLOltUWTe3u/VoUKNm/D1Yu9U9rglQ8jWwSxGMp9r5Uxqu7XqTt8CYcFkEqo+ByWPEFFNbWV/Oa5cHV2FR4WgQmw2yd6Gl7v7WIuTmZQDBJPLFMy+5KtjWWcGRfAZKRQVWt+OYkYvYyPtm1EOHCF+8FH3iR366vRQuEppsb3SPyuqr9XQNLUjaR5nr3FOGFBT74ZoBRv5m47iSvZBXfn3DP1E5d2TP43Y3Hsm4gH9/8AlmbHWMp9XBnafbOtj01lSa7rdQbynDrxgQR3DQ0VvB6UwFndgban5q82eqZiD6QRscR2SwKgGToaLKKP5Tu3Gib7Fxd4Ws5+Upd82JuwypTNqMXJANeOTxwCd9i91g4jaSawTAA+B9saZuyCHkkigAAAABJRU5ErkJggnic4/ZIzSmINzTTK8hLZxgFIw7wceOXd9V7kMTIAAAhOQWdbDOZ9gEAAAACAAAAIwAAAA4LAAAAAAAAAQAAAAAAAAAAAAAA + +[EncodedFile-InterfaceEncoded-VistalcoDownload_16.png] +lines=0 +0=iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADZklEQVQ4jUWT3WubdRTHP89L3p8mTfpim7ZL37ZZp6UTV1F0g00dXky9myAiXhf8A0QRvFCGF96o4IViJ0Mm4lSUIbIqdVs6W+3W1da+LW3SpC9Jm6TJ8+RJ+uT5SdLBDpzD4cD3e76Hc470zIUTHJiMU4szP3Yav+stXr00PVQqNL4SG1ea/ltYW29wp8Y2/roxuTF2CzOhANU6StVLe/VEkqBg5sHv8vf2D38b+Hv4bJdS5chRgcdUuZ28hud4elr+ff1lSCbud0UtapkaHCFnMLNPhc8+/8XsyEsEIxK4VYVCBXo98PP8Ga7eOnbc8l2/pzg/HHD1xJaNhSxq/+N9gI1pO/CrI9+c7yM46AMnIGqDqTCgQjoCi3EX0ptBVaRPfR/76Z/BuoL9vIGo6pjejhcOO7wnxVacsd0k4YYAgz2P4LEhU3PHCk88d4Ngbpu07H4sfT1y3mTtspqYy2OXDfTW1tOPhsfJKVPMbW7QUI4Q7nqPlKgwkbvJkrFNceMQvt4Z8EPjcNuZTHTtslpKeqESIG/FO2NCojtwglTvDI41ia/iP5DyXqNs5PFrTSwsj5CdPYe76Qr5lcZwfYT8TQ+KpWNFAtmELfGj8TUxLUdDeYaN6hKhUBiqMgV1hsaBL1m68ixWIUOlulhfn6IdbaVcbqN8+x2s0OJrpcN3kHRw52t1F3ljmb29KusJnYr0L67QFLolMKaXPy8nzEm19ekZ2WpWPFu/Vv5wO1djzYfoqcjgmHuIwuIHbGkfoYWmEXYDOztFKGqUk3rJuJO9VFdguhGyJd7vPJe46n+4YPs68HqCkDO20AJRukIa89FtbKuCpNrsb/vIfLf1hlXMT9UJnL1QXCLqj8ivt58S7e2tENLADkK3v8zUxR2yq1k8ARV5p43cpPPdStb3mRLqROgpVFcASXFhbE+IC76I8qnvySpeDY41aUx+coS9TRdDJ1swkyqbt/QdW6/OSk1VkOSDUxZVhOIkZGaFvjshVoVX7u4fcpP8s2Iu3M381tf34oqc6rJ25+Y3S/vpFcknTUv79sHz1Ajq0WbX6WfU3LOFdU8dLewL7o5XPqYl/vZc9Beqqx0QEjg0LzIC6T74AYF0QFjc5KJtWslk1Oos5Rn1toDd7MDINSK7aydvI+QHYID/Ab48jqdfCQxIAAAAAElFTkSuQmCCeJwTD8ssLknMSc53yS/Py8lPTIk3NNMryEtnGAUjAsxnxi+fwnL8OSMDAKdDC4fwuePJAQAAAAIAAAAvAAAAnwMAAAAAAAABAAAAAAAAAAAAAAA + diff --git a/Projects/PhoenixPE/Applications/Hardware Info/Speccy.script b/Projects/PhoenixPE/Applications/Hardware Info/Speccy.script index a776040..3ca6d6f 100644 --- a/Projects/PhoenixPE/Applications/Hardware Info/Speccy.script +++ b/Projects/PhoenixPE/Applications/Hardware Info/Speccy.script @@ -42,7 +42,7 @@ Date=2020-02-16 %ProgramFolder%="Speccy" %ProgramExe%="speccy.exe" %DownloadURL%=https://download.ccleaner.com/spsetup132.exe -%SetupExe%="spsetup.exe" +%SetupFile%="spsetup.exe" [Process] Echo,"Processing %ScriptTitle%..." @@ -53,7 +53,7 @@ If,%SourceArch%,Equal,x64,Set,%ProgramExe%,"speccy64.exe" /////////////////////////////////////////////////////////////////////////////////// // Extract -If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupExe%",Run,%ScriptFile%,DownloadProgram +If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram Run,%ScriptFile%,ExtractProgram,"%TargetPrograms%\%ProgramFolder%" /////////////////////////////////////////////////////////////////////////////////// @@ -93,8 +93,8 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog // =============================================================================================================================== [ExtractProgram] Echo,"Extracting files..." -ShellExecute,Hide,"%Tools%\7z.exe","x -r -y #$q%ProgramsCache%\%ProgramFolder%\%SetupExe%#$q -xr!$* -xr!uninst.exe -o#$q#1#$q" -If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupExe%]. The error code returned was [#r]." +7z,"x -r -y #$q%ProgramsCache%\%ProgramFolder%\%SetupFile%#$q -xr!$* -xr!uninst.exe -o#$q#1#$q" +If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupFile%]. The error code returned was [#r]." [#DownloadProgram#] // =============================================================================================================================== @@ -109,7 +109,7 @@ If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupExe%]. The error code re // =============================================================================================================================== [DownloadProgram] Echo,"Downloading %ScriptTitle%..." -WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupExe%",NOERR +WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",NOERR If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]." [#LaunchProgram#] @@ -125,7 +125,7 @@ If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]." // =============================================================================================================================== [LaunchProgram] Echo,"Launching %ScriptTitle%..." -If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupExe%",Run,%ScriptFile%,DownloadProgram +If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram Run,%ScriptFile%,ExtractProgram,"%ProjectTemp%\%ProgramFolder%" ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%" diff --git a/Projects/PhoenixPE/Applications/Hardware Info/WinDirStat.script b/Projects/PhoenixPE/Applications/Hardware Info/WinDirStat.script index b0d744e..a4aef26 100644 --- a/Projects/PhoenixPE/Applications/Hardware Info/WinDirStat.script +++ b/Projects/PhoenixPE/Applications/Hardware Info/WinDirStat.script @@ -42,7 +42,7 @@ Date=2020-04-05 %ProgramFolder%="WinDirStat" %ProgramExe%="WinDirStat.exe" %DownloadURL%=https://windirstat.net/wds_current_setup.exe -%SetupExe%="setup.exe" +%SetupFile%="setup.exe" [Process] Echo,"Processing %ScriptTitle%..." @@ -52,7 +52,7 @@ If,%cb_RunFromRam%,Equal,True,RunFromRam /////////////////////////////////////////////////////////////////////////////////// // Extract If,%cb_AlwaysDownload%,Equal,True,DirDeleteEx,"%ProgramsCache%\%ProgramFolder%" -If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupExe%",Run,%ScriptFile%,DownloadProgram +If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram Run,%ScriptFile%,ExtractProgram,"%TargetPrograms%\%ProgramFolder%" /////////////////////////////////////////////////////////////////////////////////// @@ -103,8 +103,8 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog // =============================================================================================================================== [ExtractProgram] Echo,"Extracting files..." -ShellExecute,Hide,"%Tools%\7z.exe","x -r -y #$q%ProgramsCache%\%ProgramFolder%\%SetupExe%#$q -xr!$* -xr!shfolder.dll -xr!Uninstall.exe -o#$q#1#$q" -If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupExe%]." +7z,"x -r -y #$q%ProgramsCache%\%ProgramFolder%\%SetupFile%#$q -xr!$* -xr!shfolder.dll -xr!Uninstall.exe -o#$q#1#$q" +If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupFile%]." [#DownloadProgram#] // =============================================================================================================================== @@ -119,8 +119,8 @@ If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupExe%]." // =============================================================================================================================== [DownloadProgram] Echo,"Downloading %ScriptTitle%..." -WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupExe%",NOERR -If,Not,#r,Equal,200,Halt,"Failed to download [%SetupExe%]. The code returned was [#r]." +WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",NOERR +If,Not,#r,Equal,200,Halt,"Failed to download [%SetupFile%]. The code returned was [#r]." [#LaunchProgram#] // =============================================================================================================================== @@ -135,7 +135,7 @@ If,Not,#r,Equal,200,Halt,"Failed to download [%SetupExe%]. The code returned was // =============================================================================================================================== [LaunchProgram] Echo,"Launching %ScriptTitle%..." -If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupExe%",Run,%ScriptFile%,DownloadProgram +If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram Run,%ScriptFile%,ExtractProgram,"%ProjectTemp%\%ProgramFolder%" ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%" diff --git a/Projects/PhoenixPE/Applications/Hardware Info/WizTree.script b/Projects/PhoenixPE/Applications/Hardware Info/WizTree.script index e94c076..d8d15b0 100644 --- a/Projects/PhoenixPE/Applications/Hardware Info/WizTree.script +++ b/Projects/PhoenixPE/Applications/Hardware Info/WizTree.script @@ -42,7 +42,7 @@ Date=2020-04-05 %ProgramFolder%="WizTree" %ProgramExe%="WizTree.exe" %DownloadURL%=https://antibody-software.com/files/wiztree_3_33_portable.zip -%SetupExe%="WizTree.zip" +%SetupFile%="WizTree.zip" [Process] Echo,"Processing %ScriptTitle%..." @@ -53,7 +53,7 @@ If,%SourceArch%,Equal,x64,Set,%ProgramExe%,"WizTree64.exe" /////////////////////////////////////////////////////////////////////////////////// // Extract -If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupExe%",Run,%ScriptFile%,DownloadProgram +If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram Run,%ScriptFile%,ExtractProgram,"%TargetPrograms%\%ProgramFolder%" /////////////////////////////////////////////////////////////////////////////////// @@ -110,8 +110,7 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog // =============================================================================================================================== [ExtractProgram] Echo,"Extracting files..." -ShellExecute,Hide,"%Tools%\7z.exe","x -r -y #$q%ProgramsCache%\%ProgramFolder%\%SetupExe%#$q -o#$q#1#$q" -If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupExe%]." +Decompress,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",#1 [#DownloadProgram#] // =============================================================================================================================== @@ -126,8 +125,8 @@ If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupExe%]." // =============================================================================================================================== [DownloadProgram] Echo,"Downloading %ScriptTitle%..." -WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupExe%",NOERR -If,Not,#r,Equal,200,Halt,"Failed to download [%SetupExe%]. The code returned was [#r]." +WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",NOERR +If,Not,#r,Equal,200,Halt,"Failed to download [%SetupFile%]. The code returned was [#r]." [#LaunchProgram#] // =============================================================================================================================== @@ -142,7 +141,7 @@ If,Not,#r,Equal,200,Halt,"Failed to download [%SetupExe%]. The code returned was // =============================================================================================================================== [LaunchProgram] Echo,"Launching %ScriptTitle%..." -If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupExe%",Run,%ScriptFile%,DownloadProgram +If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram Run,%ScriptFile%,ExtractProgram,"%ProjectTemp%\%ProgramFolder%" ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%" diff --git a/Projects/PhoenixPE/Applications/Multimedia/FastStoneViewer.script b/Projects/PhoenixPE/Applications/Multimedia/FastStoneViewer.script index b8bd00d..46a9baa 100644 --- a/Projects/PhoenixPE/Applications/Multimedia/FastStoneViewer.script +++ b/Projects/PhoenixPE/Applications/Multimedia/FastStoneViewer.script @@ -171,12 +171,10 @@ TXTAddLine,"%TargetPrograms%\%ProgramFolder%\DBPath.db","*",APPEND // =============================================================================================================================== [ExtractProgram] Echo,"Extracting files..." -ShellExecute,Hide,"%Tools%\7z.exe","x -r -y #$q%ProgramsCache%\%ProgramFolder%\FSViewer.zip#$q -o#$q#1#$q" -If,Not,#r,Equal,0,Halt,"Error: Failed to extract [FSViewer.zip]." +Decompress,"%ProgramsCache%\%ProgramFolder%\FSViewer.zip",#1 // It's annoying when people create zip files containing a directory with an every changing name FileCopy,"#1\FSViewer75\*.*",#1 -Wait,1 DirDeleteEx,"#1\FSViewer75" [#DownloadProgram#] @@ -291,7 +289,7 @@ Message,"FastStone Image Viewer is an image browser, converter and editor that s // Related........: // =============================================================================================================================== [Interface] -btn_LaunchProgram="Launch FSViewer",1,8,5,5,130,25,LaunchProgram,play-hot.png,True +btn_LaunchProgram="Launch FSViewer",1,8,5,5,130,25,LaunchProgram,play-hot.png,False bvl_Homepage=bvl_Homepage,1,12,367,5,72,25 web_Homepage=Homepage,1,10,377,9,60,18,https://www.faststone.org/FSViewerDetail.htm btn_DownloadProgram=,1,8,448,5,25,25,DownloadProgram,VistalcoDownload_16.png,False,"__Download the program." diff --git a/Projects/PhoenixPE/Applications/Multimedia/IrfanView.script b/Projects/PhoenixPE/Applications/Multimedia/IrfanView.script index 344ba08..d56dd66 100644 --- a/Projects/PhoenixPE/Applications/Multimedia/IrfanView.script +++ b/Projects/PhoenixPE/Applications/Multimedia/IrfanView.script @@ -130,7 +130,7 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog [ExtractProgram] Echo,"Extracting files..." ExtractAllFiles,%ScriptFile%,%SourceArch%,"%ProjectTemp%\%ProgramFolder%" -ShellExecute,Hide,"%Tools%\7z.exe","x -r -y #$q%ProjectTemp%\%ProgramFolder%\iview_setup.exe#$q -xr!iv_uninstall.exe -xr!##readme_zip_users.txt -o#$q#1#$q" +7z,"x -r -y #$q%ProjectTemp%\%ProgramFolder%\iview_setup.exe#$q -xr!iv_uninstall.exe -xr!##readme_zip_users.txt -o#$q#1#$q" If,Not,#r,Equal,0,Halt,"Error: Failed to extract [iview_setup.exe]. The error code returned was [#r]." [#BrowseIncludeDir#] diff --git a/Projects/PhoenixPE/Applications/Multimedia/MPC-BE.script b/Projects/PhoenixPE/Applications/Multimedia/MPC-BE.script index 110e556..0d9153c 100644 --- a/Projects/PhoenixPE/Applications/Multimedia/MPC-BE.script +++ b/Projects/PhoenixPE/Applications/Multimedia/MPC-BE.script @@ -390,14 +390,12 @@ RegWrite,HKLM,0x1,"Tmp_Software\Classes\.xesc","","MPC-BE" // =============================================================================================================================== [ExtractProgram] Echo,"Extracting program files..." -ShellExecute,Hide,"%Tools%\7z.exe","x -r -y #$q%ProgramsCache%\%ProgramFolder%\%SetupFile%#$q -o#$q#1#$q" -If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupFile%]." +Decompress,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",#1 // It's annoying when people create zip files containing a directory with an every changing name If,%SourceArch%,Equal,x64,Set,%SetupFileFolder%,%SetupFileFolderx64% Else,Set,%SetupFileFolder%,%SetupFileFolderx86% FileCopy,"#1\%SetupFileFolder%\*.*",#1 -Wait,1 DirDeleteEx,"#1\%SetupFileFolder%" [#DownloadProgram#] diff --git a/Projects/PhoenixPE/Applications/Productivity/Firefox.script b/Projects/PhoenixPE/Applications/Productivity/Firefox.script index dce38ca..77ace58 100644 --- a/Projects/PhoenixPE/Applications/Productivity/Firefox.script +++ b/Projects/PhoenixPE/Applications/Productivity/Firefox.script @@ -66,7 +66,7 @@ Else,Halt,"Logic Error: The selected release is not defined." If,%cb_AlwaysDownload%,Equal,True,FileDeleteEx,"%ProgramsCache%\%ProgramFolder%\%FirefoxEdition%-%FirefoxArch%-%FirefoxLang%.exe" If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%FirefoxEdition%-%FirefoxArch%-%FirefoxLang%.exe",Run,%ScriptFile%,DownloadProgram Echo,"Extracting files..." -ShellExecute,Hide,"%Tools%\7z.exe","x -r -y #$q%ProgramsCache%\%ProgramFolder%\%FirefoxEdition%-%FirefoxArch%-%FirefoxLang%.exe#$q core\* -xr!core\browser\features -xr!core\crashreporter* -xr!core\maintenanceservice* -xr!core\minidump-analyzer.exe -xr!core\pingsender.exe -xr!core\precomplete -xr!core\removed-files -xr!core\update* -xr!core\uninstall -o#$q%ProjectTemp%\%ProgramFolder%#$q" +7z,"x -r -y #$q%ProgramsCache%\%ProgramFolder%\%FirefoxEdition%-%FirefoxArch%-%FirefoxLang%.exe#$q core\* -xr!core\browser\features -xr!core\crashreporter* -xr!core\maintenanceservice* -xr!core\minidump-analyzer.exe -xr!core\pingsender.exe -xr!core\precomplete -xr!core\removed-files -xr!core\update* -xr!core\uninstall -o#$q%ProjectTemp%\%ProgramFolder%#$q" DirMake,"%TargetPrograms%\%ProgramFolder%" If,#r,Equal,0,FileCopy,"%ProjectTemp%\%ProgramFolder%\core\*.*","%TargetPrograms%\%ProgramFolder%" Else,Halt,"Error: Failed to extract files." diff --git a/Projects/PhoenixPE/Applications/Productivity/SumatraPDF.script b/Projects/PhoenixPE/Applications/Productivity/SumatraPDF.script index 8e23d88..c77d468 100644 --- a/Projects/PhoenixPE/Applications/Productivity/SumatraPDF.script +++ b/Projects/PhoenixPE/Applications/Productivity/SumatraPDF.script @@ -97,8 +97,7 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog // =============================================================================================================================== [ExtractProgram] Echo,"Extracting files..." -ShellExecute,Hide,"%Tools%\7z.exe","x -r -y #$q%ProgramsCache%\%ProgramFolder%\%SetupFile%#$q -o#$q#1#$q" -If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupFile%]." +Decompress,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",#1 [#DownloadProgram#] // =============================================================================================================================== diff --git a/Projects/PhoenixPE/Applications/Disk Tools/VeraCrypt.script b/Projects/PhoenixPE/Applications/Security/VeraCrypt.script similarity index 100% rename from Projects/PhoenixPE/Applications/Disk Tools/VeraCrypt.script rename to Projects/PhoenixPE/Applications/Security/VeraCrypt.script diff --git a/Projects/PhoenixPE/Applications/System Tools/BlueScreenView.script b/Projects/PhoenixPE/Applications/System Tools/BlueScreenView.script index c5de87e..c71dbb1 100644 --- a/Projects/PhoenixPE/Applications/System Tools/BlueScreenView.script +++ b/Projects/PhoenixPE/Applications/System Tools/BlueScreenView.script @@ -73,8 +73,7 @@ Else,Begin If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]." End - ShellExecute,Hide,"%Tools%\7z.exe","e -r -y #$q%ProgramsCache%\%ProgramFolder%\BlueScreenView-Lang.zip#$q * -o#$q%TargetPrograms%\%ProgramFolder%#$q" - If,Not,#r,Equal,0,Halt,"Error: Failed to extract [BlueScreenView-Lang.zip]. The error code retured was [#r]." + Decompress,"%ProgramsCache%\%ProgramFolder%\BlueScreenView-Lang.zip","%TargetPrograms%\%ProgramFolder%" End /////////////////////////////////////////////////////////////////////////////////// @@ -97,11 +96,8 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog // Related........: // =============================================================================================================================== [ExtractProgram] -System,SetLocal Echo,"Extracting files..." -ShellExecute,Hide,"%Tools%\7z.exe","e -r -y #$q%ProgramsCache%\%ProgramFolder%\BlueScreenView-%SourceArch%.zip#$q * -o#$q#1#$q" -If,Not,#r,Equal,0,Halt,"Error: Failed to extract [BlueScreenView-%SourceArch%.zip]. The error code returned was [#r]." -System,EndLocal +Decompress,"%ProgramsCache%\%ProgramFolder%\BlueScreenView-%SourceArch%.zip",#1 [#DownloadProgram#] // =============================================================================================================================== diff --git a/Projects/PhoenixPE/Applications/System Tools/FullEventLogView.script b/Projects/PhoenixPE/Applications/System Tools/FullEventLogView.script index 45fb2b6..19b77ba 100644 --- a/Projects/PhoenixPE/Applications/System Tools/FullEventLogView.script +++ b/Projects/PhoenixPE/Applications/System Tools/FullEventLogView.script @@ -73,8 +73,7 @@ Else,Begin If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]." End - ShellExecute,Hide,"%Tools%\7z.exe","e -r -y #$q%ProgramsCache%\%ProgramFolder%\FullEventLogView-Lang.zip#$q * -o#$q%TargetPrograms%\%ProgramFolder%#$q" - If,Not,#r,Equal,0,Halt,"Error: Failed to extract [FullEventLogView-Lang.zip]. The error code returned was [#r]." + Decompress,"%ProgramsCache%\%ProgramFolder%\FullEventLogView-Lang.zip","%TargetPrograms%\%ProgramFolder%" End // Prefill data source for offline system @@ -102,11 +101,8 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog // Related........: // =============================================================================================================================== [ExtractProgram] -System,SetLocal Echo,"Extracting files..." -ShellExecute,Hide,"%Tools%\7z.exe","e -r -y #$q%ProgramsCache%\%ProgramFolder%\FullEventLogView-%SourceArch%.zip#$q * -o#$q#1#$q" -If,Not,#r,Equal,0,Halt,"Error: Failed to extract [FullEventLogView-%SourceArch%.zip]. The error code returned was [#r]." -System,EndLocal +Decompress,"%ProgramsCache%\%ProgramFolder%\FullEventLogView-%SourceArch%.zip",#1 [#DownloadProgram#] // =============================================================================================================================== diff --git a/Projects/PhoenixPE/Applications/System Tools/HashTab.script b/Projects/PhoenixPE/Applications/System Tools/HashTab.script index 3c63a25..b794675 100644 --- a/Projects/PhoenixPE/Applications/System Tools/HashTab.script +++ b/Projects/PhoenixPE/Applications/System Tools/HashTab.script @@ -55,7 +55,7 @@ RunFromRam If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupExe%",Run,%ScriptFile%,DownloadProgram DirDeleteEx,"%TargetPrograms%\%ProgramFolder%" -ShellExecute,Hide,"%Tools%\7z.exe","x -y #$q%ProgramsCache%\%ProgramFolder%\%SetupExe%#$q -xr!$PLUGINSDIR -xr!uninst.exe.nsis -o#$q%TargetPrograms%\%ProgramFolder%#$q" +7z,"x -y #$q%ProgramsCache%\%ProgramFolder%\%SetupExe%#$q -xr!$PLUGINSDIR -xr!uninst.exe.nsis -o#$q%TargetPrograms%\%ProgramFolder%#$q" If,Not,#r,Equal,0,Halt,"Extract [%SetupExe%] failed: The code returned was [#r]." If,%SourceArch%,Equal,x64,FileRename,"%TargetPrograms%\%ProgramFolder%\$R0","%TargetPrograms%\%ProgramFolder%\HashTab64-%HashTabVer%.dll" Else,FileDelete,"%TargetPrograms%\%ProgramFolder%\$R0" diff --git a/Projects/PhoenixPE/Applications/System Tools/HotSwap.script b/Projects/PhoenixPE/Applications/System Tools/HotSwap.script index 196c49a..cfb3aac 100644 --- a/Projects/PhoenixPE/Applications/System Tools/HotSwap.script +++ b/Projects/PhoenixPE/Applications/System Tools/HotSwap.script @@ -96,7 +96,7 @@ System,SetLocal Echo,"Extracting files..." If,%SourceArch%,Equal,x64,Set,%Arch%,"64bit" Else,Set,%Arch%,"32bit" -ShellExecute,Hide,"%Tools%\7z.exe","e -r -y #$q%ProgramsCache%\%ProgramFolder%\HotSwap.zip#$q %Arch%\* -o#$q#1#$q" +7z,"e -r -y #$q%ProgramsCache%\%ProgramFolder%\HotSwap.zip#$q %Arch%\* -o#$q#1#$q" If,Not,#r,Equal,0,Halt,"Error: Failed to extract [HotSwap.zip]. The error code returned was [#r]." System,EndLocal diff --git a/Projects/PhoenixPE/Applications/System Tools/ServiWin.script b/Projects/PhoenixPE/Applications/System Tools/ServiWin.script index de5dfa4..dfdecd1 100644 --- a/Projects/PhoenixPE/Applications/System Tools/ServiWin.script +++ b/Projects/PhoenixPE/Applications/System Tools/ServiWin.script @@ -74,8 +74,7 @@ Else,Begin If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]." End - ShellExecute,Hide,"%Tools%\7z.exe","e -r -y #$q%ProgramsCache%\%ProgramFolder%\ServiWin-Lang.zip#$q * -o#$q%TargetPrograms%\%ProgramFolder%#$q" - If,Not,#r,Equal,0,Halt,"Error: Failed to extract [ServiWin-Lang.zip]. The error code returned was [#r]." + Decompress,"%ProgramsCache%\%ProgramFolder%\ServiWin-Lang.zip","%TargetPrograms%\%ProgramFolder%" End /////////////////////////////////////////////////////////////////////////////////// @@ -104,11 +103,8 @@ If,%cb_PinToStartMenu2%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Pro // Related........: // =============================================================================================================================== [ExtractProgram] -System,SetLocal Echo,"Extracting files..." -ShellExecute,Hide,"%Tools%\7z.exe","e -r -y #$q%ProgramsCache%\%ProgramFolder%\ServiWin-%SourceArch%.zip#$q * -o#$q#1#$q" -If,Not,#r,Equal,0,Halt,"Error: Failed to extract [ServiWin-%SourceArch%.zip]. The error code returned was [#r]." -System,EndLocal +Decompress,"%ProgramsCache%\%ProgramFolder%\ServiWin-%SourceArch%.zip",#1 [#DownloadProgram#] // =============================================================================================================================== diff --git a/Projects/PhoenixPE/Applications/WinNTSetup.script b/Projects/PhoenixPE/Applications/WinNTSetup.script index b52a8e9..1f66281 100644 --- a/Projects/PhoenixPE/Applications/WinNTSetup.script +++ b/Projects/PhoenixPE/Applications/WinNTSetup.script @@ -41,13 +41,12 @@ Interface=Interface [Variables] %ProgramFolder%="WinNTSetup" -%ProgramExe%="" +%ProgramExe%="WinNTSetup_%SourceArch%.exe" [Process] Echo,"Processing %ScriptTitle%..." If,%cb_RunFromRam%,Equal,True,RunFromRam -Set,%ProgramExe%,"WinNTSetup_%SourceArch%.exe" StrFormat,SPLIT,%cmb_Language%,"[",2,%Lang% StrFormat,RTRIM,%Lang%,1,%Lang% @@ -61,7 +60,6 @@ Decompress,"%ProjectTemp%\WinNTSetup4.rar","%TargetPrograms%\%ProgramFolder%" // Settings // WinNTSetup .ini file needs to be UTF-8. BOM is not supported. -//FileCreateBlank,"%TargetPrograms%\%ProgramFolder%\WinNTSetup.ini",UTF8 // Language IniWrite,"%TargetPrograms%\%ProgramFolder%\WinNTSetup.ini","Options","Lang",%Lang% diff --git a/Projects/PhoenixPE/Core/200-PreFlight.script b/Projects/PhoenixPE/Core/200-PreFlight.script index 2060276..9f16f7b 100644 --- a/Projects/PhoenixPE/Core/200-PreFlight.script +++ b/Projects/PhoenixPE/Core/200-PreFlight.script @@ -158,7 +158,7 @@ If,Not,ExistFile,"%Tools%\HiveUnload.exe",Run,%ScriptFile%,MissingTool,HiveUnloa If,Not,ExistFile,"%Tools%\innounp.exe",Run,%ScriptFile%,MissingTool,innounp.exe If,Not,ExistFile,"%Tools%\mkISOfs.exe",Run,%ScriptFile%,MissingTool,mkISOfs.exe If,Not,ExistFile,"%Tools%\SetACL.exe",Run,%ScriptFile%,MissingTool,SetACL.exe -If,Not,ExistFile,"%Tools%\xml.exe",Run,%ScriptFile%,MissingTool,xml.exe +If,Not,ExistFile,"%Tools%\x86\xml.exe",Run,%ScriptFile%,MissingTool,xml.exe // WaikTools If,Not,ExistFile,"%Tools%\x86\BCDBoot\bcdedit.exe",Run,%ScriptFile%,GetWaikTools diff --git a/Projects/PhoenixPE/Drivers/NetworkDrivers.script b/Projects/PhoenixPE/Drivers/NetworkDrivers.script index b65186f..ccd633b 100644 --- a/Projects/PhoenixPE/Drivers/NetworkDrivers.script +++ b/Projects/PhoenixPE/Drivers/NetworkDrivers.script @@ -34,7 +34,7 @@ Title=Network Drivers Description=Load network drivers included with Windows 10. Author=Homes32 Level=6 -Selected=False +Selected=True Mandatory=False Version=1.0.0.0 Date=2019-08-12 diff --git a/Projects/PhoenixPE/PhoenixAPI.script b/Projects/PhoenixPE/PhoenixAPI.script index e5b35b9..56e79e3 100644 --- a/Projects/PhoenixPE/PhoenixAPI.script +++ b/Projects/PhoenixPE/PhoenixAPI.script @@ -645,7 +645,7 @@ If,#1,Equal,"",Halt,"Syntax Error: Directory was not specified." System,ErrorOff If,ExistDir,#1,DirDelete,#1 -//Wait a few seconds to give async tasks time to complete... +// If Dir still exists wait a few more seconds to give async tasks time to complete... If,ExistDir,#1,Wait,5 If,ExistDir,#1,Begin If,Question,"Error: The specified folder could not be deleted.#$x#$x#1#$x#$xPlease make sure there are no files open in other applications (eg. Text Editor/vmWare/VirtualBox), registry hives are unloaded, and you do not have the directory open in Explorer.#$x#$xRetry?",Begin