- use Decompress when feasible so we can take advantage of the progressbar

- always try and copy \Windows\System32\shellstyle.dll in addition to any in \Windows\Resources

Projects/PhoenixPE/Applications/Malware Removal/AVZ.script

@@ -33,9 +33,9 @@ Title=AVZ
 Description=AVZ is a free tool for scanning your computer and running a script that quarantines or deletes files that are considered suspicious.
 Author=Homes32
 Level=5
-Selected=True
+Selected=False
 Mandatory=False
-Version=1.0.1.0
+Version=1.0.2.0
 Date=2022-12-04
 
 [Variables]
@@ -48,7 +48,10 @@ Date=2022-12-04
 Echo,"Processing %ScriptTitle%..."
 
 If,%cb_RunFromRam%,Equal,True,RunFromRam
-Run,%ScriptFile%,ExtractProgram
+
+If,%cb_AlwaysDownload%,Equal,True,DirDeleteEx,"%ProgramsCache%\%ProgramFolder%"
+If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
+Run,%ScriptFile%,ExtractProgram,"%TargetPrograms%\%ProgramFolder%"
 
 ///////////////////////////////////////////////////////////////////////////////////
 // Shortcuts
@@ -58,10 +61,20 @@ If,%cb_StartMenuShc%,Equal,True,AddShortcut,StartMenu,%txt_StartMenuFolder%,%txt
 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,<DestDir>
+// Parameters.....: #1 DestDir - The directory where the files will be extracted.
+// Return values..: 
+// Author.........: Homes32
+// Remarks........:
+// Related........: 
+// ===============================================================================================================================
 [ExtractProgram]
-If,%cb_AlwaysDownload%,Equal,True,DirDeleteEx,"%ProgramsCache%\%ProgramFolder%"
+Echo,"Extracting %ScriptTitle%..."
-If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
+Decompress,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",#1
-7z,"x -r #$q%ProgramsCache%\%ProgramFolder%\%SetupFile%#$q -y -o#$q%TargetPrograms%\%ProgramFolder%#$q"
 
 [#DownloadProgram#]
 // ===============================================================================================================================
@@ -92,8 +105,9 @@ If,Not,#r,Equal,200,Halt,"Download [%ProgramExe%] failed: The code returned was
 // ===============================================================================================================================
 [LaunchProgram]
 Echo,"Launching %ScriptTitle%..."
-If,Not,ExistFile,"%TargetPrograms%\%ProgramFolder%\%ProgramExe%",Run,%ScriptFile%,ExtractProgram
+If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
-ShellExecuteEx,Open,"%TargetPrograms%\%ProgramFolder%\%ProgramExe%"
+Run,%ScriptFile%,ExtractProgram,"%ProjectTemp%\%ProgramFolder%"
+ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%"
 
 [#ClearDownloadCache#]
 // ===============================================================================================================================
@@ -227,7 +241,6 @@ lines=0
 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
 
-
 [EncodedFile-AuthorEncoded-AVZ_80.png]
 lines=3
 0=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

Projects/PhoenixPE/Applications/Password Recovery/NetworkPasswordRecovery.script

@@ -35,7 +35,7 @@ Author=Homes32
 Level=5
 Selected=False
 Mandatory=False
-Version=1.0.1.0
+Version=1.0.2.0
 Date=2022-12-04
 
 [Variables]
@@ -45,6 +45,7 @@ Date=2022-12-04
 %DownloadURLx64%=https://www.nirsoft.net/toolsdownload/netpass-x64.zip
 %aLangMap%=Arabic|netpass_arabic.zip|Bulgarian|netpass_bulgarian.zip|Chinese (Simplified)|netpass_schinese.zip|Chinese (Traditional)|netpass_tchinese.zip|Czech|netpass_czech.zip|Dutch|netpass_dutch.zip|French|netpass_french.zip|Galician|netpass_galician.zip|German|netpass_german.zip|Greek|netpass_greek.zip|Hebrew|netpass_hebrew.zip|Hungarian|netpass_hungarian.zip|Italian|netpass_italian1.zip|Japanese|netpass_japanese.zip|Korean|netpass_korean.zip|Norwegian|netpass_norwegian.zip|Persian|netpass_persian.zip|Polish|netpass_polish.zip|Portuguese (Brazil)|netpass_brazilian_portuguese.zip|Romanian|netpass_romanian.zip|Russian|netpass_russian.zip|Slovak|netpass_slovak.zip|Slovenian|netpass_slovenian.zip|Spanish|netpass_spanish.zip|Spanish (Mexico)|netpass_spanish_mexican.zip|Taiwanese|netpass_taiwanese.zip|Thai|netpass_thai.zip|Turkish|netpass_turkish.zip|Valencian|netpass_valencian.zip
 %SetupFile%="NetworkPasswordRecovery-%SourceArch%.zip"
+%SetupFilePassword%="ntps5291#"
 
 [Process]
 Echo,"Processing %ScriptTitle%..."
@@ -53,7 +54,7 @@ If,%cb_RunFromRam%,Equal,True,RunFromRam
 Run,%ScriptFile%,SetProgramArch
 
 ///////////////////////////////////////////////////////////////////////////////////
-// Extract
+// Download & Extract
 
 If,%cb_AlwaysDownload%,Equal,True,DirDeleteEx,"%ProgramsCache%\%ProgramFolder%"
 If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
@@ -101,7 +102,7 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog
 // ===============================================================================================================================
 [ExtractProgram]
 Echo,"Extracting files..."
-7z,"x -r #$q%ProgramsCache%\%ProgramFolder%\%SetupFile%#$q -y -p%Password% -o#$q%TargetPrograms%\%ProgramFolder%#$q"
+Decompress,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",#1,Password=%SetupFilePassword%
 
 [#DownloadProgram#]
 // ===============================================================================================================================
@@ -272,7 +273,6 @@ 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,Bulgarian,"Chinese (Simplified)","Chinese (Traditional)",Czech,Dutch,English,French,Galician,German,Greek,Hebrew,Hungarian,Italian,Japanese,Korean,Norwegian,Persian,Polish,"Portuguese (Brazil)",Romanian,Russian,Slovak,Slovenian,Spanish,"Spanish (Mexico)",Taiwanese,Thai,Turkish,Valencian,_DeleteCachedLangFile_,True
 rtf_FalsePositives=FalsePositives.rtf,1,6,5,283,623,122
-Password=Zip-Password,1,0,159,198,159,21,ntps5291#
 
 [InterfaceEncoded]
 play-hot.png=841,1220

Projects/PhoenixPE/Applications/System Tools/AttributeChanger.script

@@ -52,7 +52,8 @@ Echo,"Processing %ScriptTitle%..."
 If,%cb_RunFromRam%,Equal,True,RunFromRam
 
 ///////////////////////////////////////////////////////////////////////////////////
-// Extract
+// Download & Extract
+If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
 Run,%ScriptFile%,ExtractProgram
 
 ///////////////////////////////////////////////////////////////////////////////////
@@ -169,7 +170,6 @@ RegHiveUnLoad,Tmp_Software
 // ===============================================================================================================================
 [ExtractProgram]
 Echo,"Extracting files..."
-If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
 InnoExtract,"%ProgramsCache%\%ProgramFolder%\%SetupFile%","%ProjectTemp%\%ProgramFolder%"
 
 [#DownloadProgram#]

Projects/PhoenixPE/Core/251-WoW64.script

@@ -306,12 +306,7 @@ RequireFileEx,AppendList,\Windows\SysWOW64\SensApi.dll,NOMUI
 RequireFileEx,AppendList,\Windows\SysWOW64\setupapi.dll
 RequireFileEx,AppendList,\Windows\SysWOW64\SHCore.dll
 RequireFileEx,AppendList,\Windows\SysWOW64\shell32.dll
-
+RequireFileEx,AppendList,\Windows\SysWOW64\shellstyle.dll
-// As of Win10 17763 shellstyle.dll is moved to windows\resources, so it will be extract by Explorer
-StrFormat,NTrim,%SourceVer%,%tmp_SourceVer%
-If,%SourceVer%,Equal,10.0.17764.,RequireFileEx,AppendList,\Windows\SysWOW64\shellstyle.dll
-Set,%tmp_SourceVer%,Nil
-
 RequireFileEx,AppendList,\Windows\SysWOW64\shfolder.dll,NOMUI
 RequireFileEx,AppendList,\Windows\SysWOW64\shlwapi.dll
 RequireFileEx,AppendList,\Windows\SysWOW64\slc.dll

Projects/PhoenixPE/Shell/001-Explorer.script

@@ -617,11 +617,9 @@ If,%SourceVer%,BiggerEqual,10.0.19041.0,RequireFileEx,AppendList,\Windows\System
 If,%SourceVer%,BiggerEqual,10.0.19041.0,RequireFileEx,AppendList,\Windows\System32\Shell32.dll
 RequireFileEx,AppendList,\Windows\System32\ShellCommonCommonProxyStub.dll
 
+RequireFileEx,AppendList,\Windows\System32\shellstyle.dll
 // In Win10 17763 shellstyle.dll is moved to windows\resources
 If,%SourceVer%,BiggerEqual,10.0.17763.0,RequireFileEx,AppendList,\Windows\resources\Themes\aero\shell\normalcolor\shellstyle.dll
-Else,RequireFileEx,AppendList,\Windows\System32\shellstyle.dll
-RequireFileEx,AppendList,\Windows\System32\shellstyle.dll
-RequireFileEx,AppendList,\Windows\SysWOW64\shellstyle.dll
 
 RequireFileEx,AppendList,\Windows\System32\shfolder.dll,NOMUI
 RequireFileEx,AppendList,\Windows\System32\shpafact.dll

Projects/PhoenixPE/script.project

@@ -3,7 +3,7 @@
 //
 // MIT License
 //
-// Copyright (c) 2014-2021 Jonathan Holmgren
+// Copyright (c) 2014-2022 Jonathan Holmgren
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -36,6 +36,7 @@ Level=0
 Selected=None
 Mandatory=False
 InterfaceList=Interface,Interface_About,Interface_Options
+Interface=Interface
 
 [#Variables#]
 // ===============================================================================================================================