more reorganizing and minor app updates

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

@@ -35,22 +35,22 @@ Author=Homes32
 Level=5
 Selected=False
 Mandatory=False
-Version=1.0.0.0
+Version=1.1.0.0
 Date=2020-03-01
 
 [Variables]
 %ProgramFolder%="Procmon"
-%ProgramExe%="Procmon.exe"
-%DownloadURL32%=https://live.sysinternals.com/Procmon.exe
-%DownloadURL64%=https://live.sysinternals.com/Procmon64.exe
+%ProgramExex86%="Procmon.exe"
+%ProgramExex64%="Procmon64.exe"
+%DownloadURLx32%=https://live.sysinternals.com/Procmon.exe
+%DownloadURLx64%=https://live.sysinternals.com/Procmon64.exe
 %DownloadURLCHM%=https://live.sysinternals.com/procmon.chm
 
 [Process]
 Echo,"Processing %ScriptTitle%..."
 
 If,%cb_RunFromRam%,Equal,True,RunFromRam
-
-If,%SourceArch%,Equal,x64,Set,%ProgramExe%,"Procmon64.exe"
+Run,%ScriptFile%,SetProgramArch
 
 ///////////////////////////////////////////////////////////////////////////////////
 // Extract
@@ -114,21 +114,38 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog
 // Related........: 
 // ===============================================================================================================================
 [DownloadProgram]
-If,%SourceArch%,Equal,x64,Begin
-  Echo,"Downloading %ScriptTitle% x64..."
-  WebGet,%DownloadURL64%,"%ProgramsCache%\%ProgramFolder%\Procmon64.exe",NOERR
-  If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
-End
-Else,Begin
-  Echo,"Downloading %ScriptTitle% x86..."
-  WebGet,%DownloadURL32%,"%ProgramsCache%\%ProgramFolder%\Procmon.exe",NOERR
-  If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
-End
+Echo,"Downloading %ScriptTitle%..."
+Run,%ScriptFile%,SetProgramArch
+WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%ProgramExe%",NOERR
+If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
 
 Echo,"Downloading %ScriptTitle% Help files..."
 WebGet,%DownloadURLCHM%,"%ProgramsCache%\%ProgramFolder%\Procmon.chm",NOERR
 If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
   
+[#SetProgramArch#]
+// ===============================================================================================================================
+// Name...........: SetProgramArch
+// Description....: Configure the script for the correct source architecture.
+// Syntax.........: Run,%ScriptFile%,SetProgramArch
+// Parameters.....: 
+// Return values..: Sets the following local variables:
+//                  %DownloadURL%    - The x86 or x64 download URL for %SetupFile%.
+//                  %ProgramExe%     - The x86 or x64 program name.
+// Author.........: Homes32
+// Remarks........:
+// Related........: 
+// ===============================================================================================================================
+[SetProgramArch]
+If,%SourceArch%,Equal,x64,Begin
+  Set,%DownloadURL%,%DownloadURLx64%
+  Set,%ProgramExe%,%ProgramExex64%
+End  
+Else,Begin
+  Set,%DownloadURL%,%DownloadURLx86%
+  Set,%ProgramExe%,%ProgramExex86%
+End
+ 
 [#LaunchProgram#]
 // ===============================================================================================================================
 // Name...........: LaunchProgram
@@ -141,7 +158,7 @@ If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
 // Related........: btn_LaunchProgram
 // ===============================================================================================================================
 [LaunchProgram]
-If,%HostArch%,Equal,x64,Set,%ProgramExe%,"Procmon64.exe"
+Run,%ScriptFile%,SetProgramArch
 If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%ProgramExe%",Run,%ScriptFile%,DownloadProgram
 ShellExecuteEx,Open,"%ProgramsCache%\%ProgramFolder%\%ProgramExe%"
 
@@ -178,7 +195,7 @@ 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 Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Developer Tools"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Process Monitor"
 WriteInterface,Value,%ScriptFile%,Interface,cb_AutoRunProcMon,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_EnableBootLogging,False
@@ -249,7 +266,7 @@ 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 Tools"
+txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Developer Tools"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,"Process Monitor"
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
 cb_AutoRunProcMon="Launch Process Monitor at boot",1,3,157,104,181,18,False,"__Select this option to automatically launch ProcMon when your PE boots.#$x#$xUseful for developers."
@@ -271,7 +288,6 @@ Logo=ProcMon_80.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
@@ -292,8 +308,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-ProcMon_80.png]
 lines=3
 0=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