diff --git a/Projects/PhoenixPE/Applications/Networking/Chrome.script b/Projects/PhoenixPE/Applications/Networking/Chrome.script index 969f4e0..162d45a 100644 --- a/Projects/PhoenixPE/Applications/Networking/Chrome.script +++ b/Projects/PhoenixPE/Applications/Networking/Chrome.script @@ -30,19 +30,19 @@ [Main] Title=Google Chrome -Description=(v100.0.4896.88) Google Chrome is a cross-platform web browser developed by Google. +Description=(v106.0.5249.119) Google Chrome is a cross-platform web browser developed by Google. Author=Homes32 Level=5 Selected=False Mandatory=False -Version=1.1.1.0 -Date=2022-04-11 +Version=1.1.2.0 +Date=2022-10-24 [Variables] %ProgramFolder%="Chrome" %ProgramExe%="chrome.exe" -%DownloadURLx86%=https://dl.google.com/release2/chrome/ad52aeusevow3sthhu5tkjyosjcq_100.0.4896.88/100.0.4896.88_chrome_installer.exe -%DownloadURLx64%=https://dl.google.com/release2/chrome/bpliook2kzxwfxlv5csiyuvxle_100.0.4896.88/100.0.4896.88_chrome_installer.exe +%DownloadURLx86%=https://dl.google.com/release2/chrome/adligqeuub6pghhs4zfp2xs4ca5q_106.0.5249.119/106.0.5249.119_chrome_installer.exe +%DownloadURLx64%=https://dl.google.com/release2/chrome/gfu3lptcra3hizbjcq3dbfrdnq_106.0.5249.119/106.0.5249.119_chrome_installer.exe %SetupFile%="Chrome_x86.exe" [Process] diff --git a/Projects/PhoenixPE/Applications/Productivity/Notepad++.script b/Projects/PhoenixPE/Applications/Productivity/Notepad++.script index f19bd46..60daa11 100644 --- a/Projects/PhoenixPE/Applications/Productivity/Notepad++.script +++ b/Projects/PhoenixPE/Applications/Productivity/Notepad++.script @@ -30,19 +30,19 @@ [Main] Title=Notepad++ -Description=(v8.4.5.0) Notepad++ is a free and open source code editor and Notepad replacement that supports multiple languages. +Description=(v8.4.6.0) Notepad++ is a free and open source code editor and Notepad replacement that supports multiple languages. Author=Homes32 Level=5 Selected=True Mandatory=False -Version=1.4.1.3 -Date=2022-09-25 +Version=1.4.1.4 +Date=2022-10-22 [Variables] %ProgramFolder%="Notepad++" %ProgramExe%="notepad++.exe" %ShellExtDll%="NppShell_06.dll" -%ProgramVersion%=8.4.5 +%ProgramVersion%=8.4.6 %DownloadURLx86%=https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v%ProgramVersion%/npp.%ProgramVersion%.portable.7z %DownloadURLx64%=https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v%ProgramVersion%/npp.%ProgramVersion%.portable.x64.7z %aToolbarIconMap%=Fluent UI: small|small|Fluent UI: large|large|Filled Fluent UI: small|small2|Filled Fluent UI: large|large2|Standard icons: small|standard diff --git a/Projects/PhoenixPE/Components/310-Networking.script b/Projects/PhoenixPE/Components/310-Networking.script index c1bad12..441d57a 100644 --- a/Projects/PhoenixPE/Components/310-Networking.script +++ b/Projects/PhoenixPE/Components/310-Networking.script @@ -74,7 +74,7 @@ End FileCopy,"%ProgramsCache%\%ProgramFolder%\PENetwork.ini","%TargetPrograms%\%ProgramFolder%" // Workaround a couple of bugs in PENetwork where .ini settings are not properly handled -// for certain Global Settings, such as UseProfiles, StartMode, and StartToTray. +// for certain Global Settings, such as UseProfiles, StartMode, CloseToTray, and StartToTray. IniRead,"%ProgramsCache%\%ProgramFolder%\PENetwork.ini","PENetwork","UseProfiles",%PENMini_UseProfiles% If,%PENMini_UseProfiles%,Equal,"Yes",RegWrite,HKLM,0x1,"Tmp_Software\PENetwork","UseProfiles",1 Else,RegWrite,HKLM,0x1,"Tmp_Software\PENetwork","UseProfiles",0 @@ -83,7 +83,16 @@ IniRead,"%ProgramsCache%\%ProgramFolder%\PENetwork.ini","PENetwork","StartMode", RegWrite,HKLM,0x1,"Tmp_Default\Software\PENetwork","StartMode",%PENMini_StartMode% IniRead,"%ProgramsCache%\%ProgramFolder%\PENetwork.ini","PENetwork","StartToTray",%PENMini_StartToTray%,Default=1 -RegWrite,HKLM,0x1,"Tmp_Default\Software\PENetwork","StartToTray",%PENMini_StartToTray% +If,%PENMini_StartToTray%,Equal,"Yes",RegWrite,HKLM,0x4,"Tmp_Default\Software\PENetwork","StartToTray",1 +Else,RegWrite,HKLM,0x4,"Tmp_Default\Software\PENetwork","StartToTray",0 + +// CloseToTray is a reg only setting, so we will assume the user wants to mirror MinimizeToTray +IniRead,"%ProgramsCache%\%ProgramFolder%\PENetwork.ini","PENetwork","MinimizeToTray",%PENMini_MinimizeToTray%,Default=1 +If,%PENMini_MinimizeToTray%,Equal,"Yes",RegWrite,HKLM,0x4,"Tmp_Software\PENetwork","CloseToTray",1 +Else,RegWrite,HKLM,0x4,"Tmp_Software\PENetwork","CloseToTray",0 + +// Force install network services even if no NICs are detected (missing GUI option) +RegWrite,HKLM,0x1,"Tmp_Software\PENetwork,ForceServices",1 // Custom Wireless Config If,%cb_AutoConnectWifi%,Equal,True,Run,%ScriptFile%,PENetwork-AutoConnectWifi diff --git a/Projects/PhoenixPE/Components/DotNET6.script b/Projects/PhoenixPE/Components/DotNET6.script index 04fe0bb..9a66a0b 100644 --- a/Projects/PhoenixPE/Components/DotNET6.script +++ b/Projects/PhoenixPE/Components/DotNET6.script @@ -30,20 +30,20 @@ [Main] Title=.NET 6 -Description=(v6.0.8) .NET 6 is a cross-platform software development framework for building and running applications. -Selected=False +Description=(v6.0.10) .NET 6 is a cross-platform software development framework for building and running applications. +Selected=True Level=4 Author=Homes32 -Version=1.0.3.0 -Date=2022-08-12 +Version=1.0.4.0 +Date=2022-10-22 Mandatory=False [Variables] %ProgramTitle%=".NET 6 Desktop Runtime" %ProgramFolder%="dotnet" -%ProgramVersion%="6.0.8" -%DownloadURLx86%=https://download.visualstudio.microsoft.com/download/pr/61747fc6-7236-4d5e-85e5-a5df5f480f3a/02203594bf1331f0875aa6491419ffa1/windowsdesktop-runtime-6.0.8-win-x86.exe -%DownloadURLx64%=https://download.visualstudio.microsoft.com/download/pr/b4a17a47-2fe8-498d-b817-30ad2e23f413/00020402af25ba40990c6cc3db5cb270/windowsdesktop-runtime-6.0.8-win-x64.exe +%ProgramVersion%="6.0.10" +%DownloadURLx86%=https://download.visualstudio.microsoft.com/download/pr/6f8cf899-4800-400e-a196-867e7593c8e4/351213f8ae397c30efcfbb78fb10def2/windowsdesktop-runtime-6.0.10-win-x86.exe +%DownloadURLx64%=https://download.visualstudio.microsoft.com/download/pr/a6e878eb-d1da-40cb-8b6a-7f5b9390f09c/e4431ce2aa28b6c9956db672209be500/windowsdesktop-runtime-6.0.10-win-x64.exe [Process] Echo,"Processing %ScriptTitle%..." diff --git a/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-Embedded.script b/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-Embedded.script index c2c5a67..571cb80 100644 --- a/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-Embedded.script +++ b/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-Embedded.script @@ -32,11 +32,11 @@ Title=Visual C++ 8-9 Runtime Author=Homes32 Description=Allows you to run programs created with Microsoft Visual C++ 2005/2008 -Version=1.0.0.0 +Version=1.0.1.0 Level=4 Selected=True Mandatory=False -Date=2019-03-16 +Date=2022-10-22 [Variables] @@ -78,7 +78,8 @@ RequireFileEx,AppendList,\Windows\System32\msvcrt40.dll // VC .Net RequireFileEx,AppendList,\Windows\System32\msvcr100_clr0400.dll RequireFileEx,AppendList,\Windows\System32\msvcr120_clr0400.dll -RequireFileEx,AppendList,\Windows\SysWOW64\ucrtbase_clr0400.dll +RequireFileEx,AppendList,\Windows\System32\vcruntime140_clr0400.dll +RequireFileEx,AppendList,\Windows\System32\ucrtbase_clr0400.dll // VC++ RequireFileEx,AppendList,\Windows\System32\msvcp110.dll @@ -88,6 +89,7 @@ RequireFileEx,AppendList,\Windows\System32\ucrtbase_enclave.dll RequireFileEx,AppendList,\Windows\System32\msvcp120_clr0400.dll RequireFileEx,AppendList,\Windows\System32\msvcp140_clr0400.dll + /////////////////////////////////////////////////////////////////////////////////// // Extract RequireFileEx,ExtractList @@ -164,6 +166,7 @@ If,ExistFile,"%TargetSystem32%\wow64.dll",Begin RequireFileEx,AppendList,\Windows\SysWOW64\msvcr100_clr0400.dll RequireFileEx,AppendList,\Windows\SysWOW64\msvcr120_clr0400.dll RequireFileEx,AppendList,\Windows\SysWOW64\ucrtbase_clr0400.dll + RequireFileEx,AppendList,\Windows\SysWOW64\ucrtbase_clr0400.dll // VC++ RequireFileEx,AppendList,\Windows\SysWOW64\msvcp_win.dll diff --git a/Projects/PhoenixPE/Core/210-Core.script b/Projects/PhoenixPE/Core/210-Core.script index cd49d8c..9ffe0e5 100644 --- a/Projects/PhoenixPE/Core/210-Core.script +++ b/Projects/PhoenixPE/Core/210-Core.script @@ -30,7 +30,7 @@ [Main] Title=Core Files -Description=Build and configure the base WinRE environment. +Description=Build and configure the base WinPE environment. Author=Homes32 Level=2 Selected=True diff --git a/Projects/PhoenixPE/PhoenixAPI.script b/Projects/PhoenixPE/PhoenixAPI.script index b311d40..c62df8a 100644 --- a/Projects/PhoenixPE/PhoenixAPI.script +++ b/Projects/PhoenixPE/PhoenixAPI.script @@ -483,7 +483,10 @@ End // #2 DestDir - The full path to the directory where the files will be unpacked. // Return values..: // Author.........: Homes32 -// Remarks........: *** Experimental - May be changed or removed without notice *** +// Remarks........: Note: DestDir MUST end with a \ or lessmsi will consider it a file name to extract. We play it safe by trimming +// any \ from the user provided directory and add it ourselves. +// In the future it would be nice to have the option to extract individual files. lessmsi supports this but +// does not provide a usable exit code if the file can't be found. // Related........: Depends on lessmsi.exe for extraction. (http://lessmsi.activescott.com/) // =============================================================================================================================== [_PhoenixAPI_MSIExtract] @@ -492,7 +495,7 @@ If,#1,Equal,"",Halt,"MSIExtract Syntax Error: You must specify the setup file." If,#2,Equal,"",Halt,"MSIExtract Syntax Error: You must specify the destination directory." GetParam,1,%SetupFile% -Getparam,2,%DestDir% +GetParam,2,%DestDir% StrFormat,CTrim,%DestDir%,"\","%DestDir%"