Merge pull request #11 from psct/fixes

Collection of 7 small fixes

Projects/PhoenixPE/Applications/Developer Tools/DbgView.script

@@ -35,14 +35,14 @@ Author=Homes32
 Level=5
 Selected=False
 Mandatory=False
-Version=1.0.0.0
+Version=1.0.1.0
-Date=2020-03-01
+Date=2020-12-04
 
 [Variables]
 %ProgramFolder%="DbgView"
 %ProgramExex86%="Dbgview.exe"
 %ProgramExex64%="Dbgview64.exe"
-%DownloadURLx32%=http://live.sysinternals.com/Dbgview.exe
+%DownloadURLx86%=http://live.sysinternals.com/Dbgview.exe
 %DownloadURLx64%=http://live.sysinternals.com/dbgview64.exe
 %DownloadURLCHM%=http://live.sysinternals.com/Dbgview.chm
 %ProgramSettings%=90,01,00,00,64,00,00,00,64,00,00,00,f4,01,00,00,2c,01,00,00,23,00,00,00,64,00,00,00,2c,01,00,00,00,00,00,00,01,00,01,00,00,00,00,00,f3,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,01,02,02,22,43,6f,75,72,69,65,72,20,4e,65,77,00,78,68,4c,00,80,68,4c,00,04,00,00,04,00,00,00,00,3a,00,00,01,00,01,01,01,ff,ff,ff,00,ff,ff,ff,00,ff,ff,ff,00,ff,ff,ff,00,ff,ff,ff,00,ff,00,00,00,80,00,ff,00,ff,80,40,00,40,80,80,00,00,80,ff,00,01,00,00,00,00,00,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,80,80,ff,00,80,ff,80,00,80,ff,ff,00,80,ff,80,00,ff,ff,80,00,01,00,00,00,ff,ff,ff,00,ff,ff,ff,00,ff,ff,ff,00,ff,ff,ff,00,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,ff,00,00,00,80,00,ff,00,ff,80,40,00,40,80,80,00,00,80,ff,00,80,80,ff,00,80,ff,80,00,80,ff,ff,00,80,ff,80,00,ff,ff,80,00,00,00,00,00

Projects/PhoenixPE/Applications/Developer Tools/Dependencies.script

@@ -35,15 +35,15 @@ Author=Homes32
 Level=5
 Selected=False
 Mandatory=False
-Version=1.1.0.0
+Version=1.1.1.0
-Date=2020-05-27
+Date=2022-12-04
 
 [Variables]
 %ProgramFolder%="Dependencies"
 %ProgramExe%="DependenciesGui.exe"
 %SetupFilex86%="Dependencies_x86.zip"
 %SetupFilex64%="Dependencies_x64.zip"
-%DownloadURLx32%=https://github.com/lucasg/Dependencies/releases/latest/download/Dependencies_x86_Release.zip
+%DownloadURLx86%=https://github.com/lucasg/Dependencies/releases/latest/download/Dependencies_x86_Release.zip
 %DownloadURLx64%=https://github.com/lucasg/Dependencies/releases/latest/download/Dependencies_x64_Release.zip
 
 [Process]

Projects/PhoenixPE/Applications/Developer Tools/ProcDump.script

@@ -35,14 +35,14 @@ Author=Homes32
 Level=5
 Selected=False
 Mandatory=False
-Version=1.1.0.0
+Version=1.1.1.0
-Date=2022-13-02
+Date=2022-12-04
 
 [Variables]
 %ProgramFolder%="ProcDump"
 %ProgramExex86%="ProcDump.exe"
 %ProgramExex64%="ProcDump64.exe"
-%DownloadURLx32%=https://live.sysinternals.com/ProcDump.exe
+%DownloadURLx86%=https://live.sysinternals.com/ProcDump.exe
 %DownloadURLx64%=https://live.sysinternals.com/ProcDump64.exe
 
 [Process]

Projects/PhoenixPE/Applications/Developer Tools/ProcExp.script

@@ -35,14 +35,14 @@ Author=Homes32
 Level=5
 Selected=False
 Mandatory=False
-Version=1.1.0.0
+Version=1.1.1.0
-Date=2020-03-01
+Date=2022-12-04
 
 [Variables]
 %ProgramFolder%="Procexp"
 %ProgramExex86%="Procexp.exe"
 %ProgramExex64%="Procexp64.exe"
-%DownloadURLx32%=https://live.sysinternals.com/Procexp.exe
+%DownloadURLx86%=https://live.sysinternals.com/Procexp.exe
 %DownloadURLx64%=https://live.sysinternals.com/Procexp64.exe
 %DownloadURLCHM%=https://live.sysinternals.com/procexp.chm
 

Projects/PhoenixPE/Applications/Developer Tools/ProcMon.script

@@ -35,14 +35,14 @@ Author=Homes32
 Level=5
 Selected=False
 Mandatory=False
-Version=1.2.0.0
+Version=1.2.1.0
-Date=2021-11-06
+Date=2022-12-04
 
 [Variables]
 %ProgramFolder%="Procmon"
 %ProgramExex86%="Procmon.exe"
 %ProgramExex64%="Procmon64.exe"
-%DownloadURLx32%=https://live.sysinternals.com/Procmon.exe
+%DownloadURLx86%=https://live.sysinternals.com/Procmon.exe
 %DownloadURLx64%=https://live.sysinternals.com/Procmon64.exe
 %DownloadURLCHM%=https://live.sysinternals.com/procmon.chm
 // *Do not modify.* Used by script settings for processing cmdline operations such as importing config.

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

@@ -33,26 +33,22 @@ 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=False
+Selected=True
 Mandatory=False
-Version=1.0.0.0
+Version=1.0.1.0
-Date=2020-04-07
+Date=2022-12-04
 
 [Variables]
 %ProgramFolder%="AVZ"
-%ProgramExe%="avz5.exe"
+%ProgramExe%="avz5rn.exe"
-%DownloadURL%=http://media.kaspersky.com/utilities/ConsumerUtilities/avz5.exe
+%SetupFile%=avz5.zip
+%DownloadURL%=https://media.kaspersky.com/utilities/ConsumerUtilities/%SetupFile%
 
 [Process]
 Echo,"Processing %ScriptTitle%..."
 
 If,%cb_RunFromRam%,Equal,True,RunFromRam
-
+Run,%ScriptFile%,ExtractProgram
-///////////////////////////////////////////////////////////////////////////////////
-// Extract
-If,%cb_AlwaysDownload%,Equal,True,DirDeleteEx,"%ProgramsCache%\%ProgramFolder%"
-If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%ProgramExe%",Run,%ScriptFile%,DownloadProgram
-FileCopy,"%ProgramsCache%\%ProgramFolder%\%ProgramExe%","%TargetPrograms%\%ProgramFolder%\%ProgramExe%"
 
 ///////////////////////////////////////////////////////////////////////////////////
 // Shortcuts
@@ -62,6 +58,11 @@ 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]
+If,%cb_AlwaysDownload%,Equal,True,DirDeleteEx,"%ProgramsCache%\%ProgramFolder%"
+If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
+7z,"x -r #$q%ProgramsCache%\%ProgramFolder%\%SetupFile%#$q -y -o#$q%TargetPrograms%\%ProgramFolder%#$q"
+
 [#DownloadProgram#]
 // ===============================================================================================================================
 // Name...........: DownloadProgram
@@ -75,7 +76,7 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog
 // ===============================================================================================================================
 [DownloadProgram]
 Echo,"Downloading %ScriptTitle%..."
-WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%ProgramExe%",NOERR
+WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",NOERR
 If,Not,#r,Equal,200,Halt,"Download [%ProgramExe%] failed: The code returned was [#r]."
 
 [#LaunchProgram#]
@@ -91,9 +92,8 @@ If,Not,#r,Equal,200,Halt,"Download [%ProgramExe%] failed: The code returned was
 // ===============================================================================================================================
 [LaunchProgram]
 Echo,"Launching %ScriptTitle%..."
-If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%ProgramExe%",Run,%ScriptFile%,DownloadProgram
+If,Not,ExistFile,"%TargetPrograms%\%ProgramFolder%\%ProgramExe%",Run,%ScriptFile%,ExtractProgram
-FileCopy,"%ProgramsCache%\%ProgramFolder%\%ProgramExe%","%ProjectTemp%\%ProgramFolder%\%ProgramExe%"
+ShellExecuteEx,Open,"%TargetPrograms%\%ProgramFolder%\%ProgramExe%"
-ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%"
 
 [#ClearDownloadCache#]
 // ===============================================================================================================================

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

@@ -35,8 +35,8 @@ Author=Homes32
 Level=5
 Selected=False
 Mandatory=False
-Version=1.0.0.0
+Version=1.0.1.0
-Date=2020-03-01
+Date=2022-12-04
 
 [Variables]
 %ProgramFolder%="NetworkPasswordRecovery"
@@ -101,7 +101,7 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog
 // ===============================================================================================================================
 [ExtractProgram]
 Echo,"Extracting files..."
-Decompress,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",#1
+7z,"x -r #$q%ProgramsCache%\%ProgramFolder%\%SetupFile%#$q -y -p%Password% -o#$q%TargetPrograms%\%ProgramFolder%#$q"
 
 [#DownloadProgram#]
 // ===============================================================================================================================
@@ -272,6 +272,7 @@ 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/Productivity/Notepad3.script

@@ -35,14 +35,14 @@ Author=Homes32
 Level=5
 Selected=False
 Mandatory=False
-Version=1.1.1.0
+Version=1.1.2.0
-Date=2022-06-27
+Date=2022-12-04
 
 [Variables]
 %ProgramFolder%="Notepad3"
 %ProgramExe%="Notepad3.exe"
 %ProgramVersion%=5.21.1129.1
-%DownloadURLx32%=https://github.com/rizonesoft/Notepad3/releases/download/RELEASE_%ProgramVersion%/Notepad3_%ProgramVersion%_x86.zip
+%DownloadURLx86%=https://github.com/rizonesoft/Notepad3/releases/download/RELEASE_%ProgramVersion%/Notepad3_%ProgramVersion%_x86.zip
 %DownloadURLx64%=https://github.com/rizonesoft/Notepad3/releases/download/RELEASE_%ProgramVersion%/Notepad3_%ProgramVersion%_x64.zip
 %SetupFile%="Notepad3_%SourceArch%.zip"
 %ConfigFile%="%ProgramsCache%\%ProgramFolder%\Notepad3.ini"

Projects/PhoenixPE/Applications/System Information/BGInfo.script

@@ -35,14 +35,14 @@ Author=Homes32
 Level=5
 Selected=False
 Mandatory=False
-Version=1.0.0.0
+Version=1.0.1.0
-Date=2020-03-01
+Date=2022-12-04
 
 [Variables]
 %ProgramFolder%="BgInfo"
 %ProgramExex86%="BgInfo.exe"
 %ProgramExex64%="BgInfo64.exe"
-%DownloadURLx32%=http://live.sysinternals.com/Bginfo.exe
+%DownloadURLx86%=http://live.sysinternals.com/Bginfo.exe
 %DownloadURLx64%=http://live.sysinternals.com/Bginfo64.exe
 
 [Process]

Projects/PhoenixPE/Applications/System Information/GPU-Z.script

@@ -35,8 +35,8 @@ Author=Homes32
 Level=5
 Selected=False
 Mandatory=False
-Version=1.1.3.0
+Version=1.1.4.0
-Date=2022-11-13
+Date=2022-12-04
 
 [Variables]
 %ProgramFolder%="GPU-Z"
@@ -53,7 +53,7 @@ If,%cb_RunFromRam%,Equal,True,RunFromRam
 ///////////////////////////////////////////////////////////////////////////////////
 // Extract
 If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%ProgramExe%",Run,%ScriptFile%,DownloadProgram
-FileCopy,"%ProgramsCache%\%ProgramFolder%\%ProgramExe%","%TargetPrograms%\%ProgramFolder%"
+FileCopy,"%ProgramsCache%\%ProgramFolder%\%ProgramExe%","%TargetPrograms%\%ProgramFolder%\%ProgramExe%"
 
 ///////////////////////////////////////////////////////////////////////////////////
 // Settings

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

@@ -35,8 +35,8 @@ Author=Homes32
 Level=5
 Selected=False
 Mandatory=False
-Version=1.1.3.0
+Version=1.1.4.0
-Date=2022-04-11
+Date=2022-12-04
 
 [Variables]
 %ProgramFolder%="Attribute Changer"
@@ -169,6 +169,7 @@ 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/Components/DotNET6.script

@@ -34,8 +34,8 @@ Description=(v6.0.10) .NET 6 is a cross-platform software development framework
 Selected=False
 Level=4
 Author=Homes32
-Version=1.0.4.0
+Version=1.0.5.0
-Date=2022-10-22
+Date=2022-12-04
 Mandatory=False
 
 [Variables]
@@ -69,7 +69,7 @@ RegLoadHives
 // Add to system PATH
 RegRead,HKLM,"Tmp_System\ControlSet001\Control\Session Manager\Environment","Path",%SysPath%
 StrFormat,CTrim,%SysPath%,";",%SysPath%
-RegWrite,HKLM,0x1,"Tmp_System\ControlSet001\Control\Session Manager\Environment","Path","%SysPath%;%PEPrograms%\dotnet\;"
+RegWrite,HKLM,0x2,"Tmp_System\ControlSet001\Control\Session Manager\Environment","Path","%SysPath%;%PEPrograms%\dotnet\;"
 
 // Add version to reg for other programs to detect
 If,%SourceArch%,Equal,x64,Begin

Projects/PhoenixPE/Shell/001-Explorer.script

@@ -35,8 +35,8 @@ Author=Homes32
 Level=3
 Selected=True
 Mandatory=False
-Version=1.5.1.0
+Version=1.5.2.0
-Date=2022-10-25
+Date=2022-12-04
 
 [Variables]
 
@@ -620,6 +620,8 @@ RequireFileEx,AppendList,\Windows\System32\ShellCommonCommonProxyStub.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