diff --git a/Projects/PhoenixPE/Applications/Multimedia/MPC-BE.script b/Projects/PhoenixPE/Applications/Multimedia/MPC-BE.script index 4763954..038e310 100644 --- a/Projects/PhoenixPE/Applications/Multimedia/MPC-BE.script +++ b/Projects/PhoenixPE/Applications/Multimedia/MPC-BE.script @@ -60,7 +60,7 @@ If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%, // Extract Run,%ScriptFile%,ExtractProgram,"%TargetPrograms%\%ProgramFolder%" -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." RequireFileEx,AppendList,\Windows\System32\devenum.dll RequireFileEx,AppendList,\Windows\System32\dsound.dll RequireFileEx,AppendList,\Windows\System32\dxva2.dll diff --git a/Projects/PhoenixPE/Applications/Multimedia/Potplayer.script b/Projects/PhoenixPE/Applications/Multimedia/Potplayer.script index 6feb293..fe4e700 100644 --- a/Projects/PhoenixPE/Applications/Multimedia/Potplayer.script +++ b/Projects/PhoenixPE/Applications/Multimedia/Potplayer.script @@ -62,7 +62,7 @@ If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%, // Extract Run,%ScriptFile%,ExtractProgram,"%TargetPrograms%\%ProgramFolder%" -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." RequireFileEx,AppendList,\Windows\System32\devenum.dll RequireFileEx,AppendList,\Windows\System32\evr.dll diff --git a/Projects/PhoenixPE/Components/.NET Runtime/000-DotNETFx.script b/Projects/PhoenixPE/Components/.NET Runtime/000-DotNETFx.script index 1e52438..9b0e4b1 100644 --- a/Projects/PhoenixPE/Components/.NET Runtime/000-DotNETFx.script +++ b/Projects/PhoenixPE/Components/.NET Runtime/000-DotNETFx.script @@ -47,7 +47,7 @@ Mandatory=False /////////////////////////////////////////////////////////////////////////////////// // Build Files List -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." If,%SourceArch%,Equal,x86,Begin RequireFileEx,AppendList,\Program Files\Microsoft.NET diff --git a/Projects/PhoenixPE/Components/Bluetooth.script b/Projects/PhoenixPE/Components/Bluetooth.script index 875c586..b71c51c 100644 --- a/Projects/PhoenixPE/Components/Bluetooth.script +++ b/Projects/PhoenixPE/Components/Bluetooth.script @@ -43,7 +43,7 @@ Interface=Interface [Variables] [Process] -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." RequireFileEx,AppendList,\Windows\System32\*Bluetooth.dll RequireFileEx,AppendList,\Windows\System32\Bluetooth*.* diff --git a/Projects/PhoenixPE/Components/Camera.script b/Projects/PhoenixPE/Components/Camera.script index dd8bf25..130ea4d 100644 --- a/Projects/PhoenixPE/Components/Camera.script +++ b/Projects/PhoenixPE/Components/Camera.script @@ -72,7 +72,7 @@ End // Related........: Called from [Process] // =============================================================================================================================== [ExtractFiles] -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." RequireFileEx,AppendList,\Windows\WMSysPr9.prx diff --git a/Projects/PhoenixPE/Components/DirectX.script b/Projects/PhoenixPE/Components/DirectX.script index 4dfb20d..c819b60 100644 --- a/Projects/PhoenixPE/Components/DirectX.script +++ b/Projects/PhoenixPE/Components/DirectX.script @@ -69,7 +69,7 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%ProgramFolder%\%P // Related........: Called from [Process] // =============================================================================================================================== [ExtractFiles] -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." RequireFileEx,AppendList,\Windows\INF\bda.inf,NOMUI RequireFileEx,AppendList,\Windows\INF\ks.inf,NOMUI diff --git a/Projects/PhoenixPE/Components/LogonAsAdmin.script b/Projects/PhoenixPE/Components/LogonAsAdmin.script index f5380ce..5665521 100644 --- a/Projects/PhoenixPE/Components/LogonAsAdmin.script +++ b/Projects/PhoenixPE/Components/LogonAsAdmin.script @@ -167,7 +167,7 @@ End // Related........: // =============================================================================================================================== [ExtractProgram] -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." RequireFileEx,AppendList,\Windows\inf\wvmic_ext.inf diff --git a/Projects/PhoenixPE/Components/MMC.script b/Projects/PhoenixPE/Components/MMC.script index a5b5e0c..96fb371 100644 --- a/Projects/PhoenixPE/Components/MMC.script +++ b/Projects/PhoenixPE/Components/MMC.script @@ -45,7 +45,7 @@ Mandatory=False /////////////////////////////////////////////////////////////////////////////////// // Collect Files -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." // Microsoft Management Control (MMC) RequireFileEx,AppendList,\windows\system32\apphelp.dll diff --git a/Projects/PhoenixPE/Components/MTP.script b/Projects/PhoenixPE/Components/MTP.script index 6d406bf..05666db 100644 --- a/Projects/PhoenixPE/Components/MTP.script +++ b/Projects/PhoenixPE/Components/MTP.script @@ -42,7 +42,7 @@ Mandatory=False [Variables] [Process] -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." RequireFileEx,AppendList,\Windows\system32\CatRoot\{F750E6C3-38EE-11D1-85E5-00C04FC295EE}\Microsoft-Windows-WPD-UltimatePortableDeviceFeature-Feature-Package~*.cat If,%SourceVer%,Bigger,10.0.19000.0,RequireFileEx,AppendList,\Windows\system32\Microsoft-Windows-Portable-Devices-merged-Package~*.cat diff --git a/Projects/PhoenixPE/Components/RDP.script b/Projects/PhoenixPE/Components/RDP.script index ca23e13..33b8c61 100644 --- a/Projects/PhoenixPE/Components/RDP.script +++ b/Projects/PhoenixPE/Components/RDP.script @@ -147,7 +147,7 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%ProgramFolder%\%P // Related........: Called from [Process] // =============================================================================================================================== [ExtractFiles] -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." RequireFileEx,AppendList,\Windows\System32\cngcredui.dll RequireFileEx,AppendList,\Windows\System32\CredentialUIBroker.exe @@ -215,7 +215,7 @@ RegCopy,HKLM,"Tmp_Install_System\ControlSet001\Control\Terminal Server",HKLM,"Tm RegWrite,HKLM,REG_DWORD,"Tmp_Software\Policies\Microsoft\Windows NT\Terminal Services","fEnableWddmDriver",0 RegWrite,HKLM,REG_DWORD,"Tmp_System\ControlSet001\Control\Terminal Server","fDenyTSConnections",0 -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." RequireFileEx,AppendList,\Windows\System32\SessEnv.dll RequireFileEx,AppendList,\Windows\System32\termsrv.dll RequireFileEx,AppendList,\Windows\System32\umrdp.dll diff --git a/Projects/PhoenixPE/Components/WindowsPowerShell.script b/Projects/PhoenixPE/Components/WindowsPowerShell.script index 56983ad..eed242f 100644 --- a/Projects/PhoenixPE/Components/WindowsPowerShell.script +++ b/Projects/PhoenixPE/Components/WindowsPowerShell.script @@ -50,7 +50,7 @@ RunFromRam /////////////////////////////////////////////////////////////////////////////////// // Extract -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." RequireFileEx,AppendList,\Windows\System32\WindowsPowerShell If,ExistFile,"%TargetSystem32%\wow64.dll",RequireFileEx,AppendList,\Windows\SysWOW64\WindowsPowerShell diff --git a/Projects/PhoenixPE/Core/210-Core.script b/Projects/PhoenixPE/Core/210-Core.script index 44a7601..765f965 100644 --- a/Projects/PhoenixPE/Core/210-Core.script +++ b/Projects/PhoenixPE/Core/210-Core.script @@ -230,15 +230,13 @@ System,EndLocal // =============================================================================================================================== [SuperchargeBootWim] -Echo,"Supercharging boot.wim...#$x#$xThis can take awhile, please be patient." +Echo,"Supercharging boot.wim..." RequireFileEx,AppendList,\Windows\BrowserCore // Undocked Update Stack (UUS) is required for some Reset/Image Recover/System Restore options in Win11 If,%SourceVer%,>=,10.0.22000,RequireFileEx,AppendList,\Windows\UUS -// Inf -RequireDriver,netnwifi.inf - +// Inf (netnwifi.ini) are copied in Network.script // L2Schemas are copied in Network.script // PLA diff --git a/Projects/PhoenixPE/Core/251-WoW64.script b/Projects/PhoenixPE/Core/251-WoW64.script index d21fd52..48310e3 100644 --- a/Projects/PhoenixPE/Core/251-WoW64.script +++ b/Projects/PhoenixPE/Core/251-WoW64.script @@ -69,7 +69,7 @@ RegHiveUnload,Tmp_Install_Software // =============================================================================================================================== [ExtractFiles-Full] -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." /////////////////////////////////////////////////////////////////////////////////// // Core WoW64 Emulation Layer @@ -100,7 +100,7 @@ WimExtract,%SourceInstallWim%,%SourceInstallWimImage%,\Windows\SysWOW64,%TargetW // =============================================================================================================================== [ExtractFiles-Lite] -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." /////////////////////////////////////////////////////////////////////////////////// // Core WoW64 Emulation Layer diff --git a/Projects/PhoenixPE/Drivers/DisplayDrivers.script b/Projects/PhoenixPE/Drivers/DisplayDrivers.script index 1fdf9a6..7c21ef0 100644 --- a/Projects/PhoenixPE/Drivers/DisplayDrivers.script +++ b/Projects/PhoenixPE/Drivers/DisplayDrivers.script @@ -76,7 +76,7 @@ RegHiveUnload,Tmp_Install_System AddAutoRun,PreShell,HideWait,"Loading display drivers...","#$pWinDir#$p\System32\Drvload.exe","#$pWinDir#$p\inf\basicdisplay.inf" [ExtractFiles] -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." /////////////////////////////////////////////////////////////////////////////////// // Basic Display Drivers diff --git a/Projects/PhoenixPE/Drivers/NetworkDrivers.script b/Projects/PhoenixPE/Drivers/NetworkDrivers.script index 6264f34..9573d5b 100644 --- a/Projects/PhoenixPE/Drivers/NetworkDrivers.script +++ b/Projects/PhoenixPE/Drivers/NetworkDrivers.script @@ -248,7 +248,7 @@ RegHiveUnload,Tmp_Install_Drivers // Related........: // =============================================================================================================================== [ExtractDrivers] -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." // Driver Files to Extract If,%SourceArch%,Equal,"x64",Begin diff --git a/Projects/PhoenixPE/Shell/001-Explorer.script b/Projects/PhoenixPE/Shell/001-Explorer.script index 94acc23..bfe81e5 100644 --- a/Projects/PhoenixPE/Shell/001-Explorer.script +++ b/Projects/PhoenixPE/Shell/001-Explorer.script @@ -582,7 +582,7 @@ Else,RegWrite,HKLM,REG_DWORD,"Tmp_Default\Software\Microsoft\Windows\CurrentVers // =============================================================================================================================== [ExtractFiles] -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." /////////////////////////////////////////////////////////////////////////////////// // Misc Windows Files diff --git a/Projects/PhoenixPE/Shell/002-WinXShell.script b/Projects/PhoenixPE/Shell/002-WinXShell.script index 5adcce4..492a54b 100644 --- a/Projects/PhoenixPE/Shell/002-WinXShell.script +++ b/Projects/PhoenixPE/Shell/002-WinXShell.script @@ -137,7 +137,7 @@ RegWrite,HKLM,REG_BINARY,"Tmp_Default\Software\Microsoft\Windows\CurrentVersion\ // =============================================================================================================================== [ExtractFiles] -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." /////////////////////////////////////////////////////////////////////////////////// // Support Files diff --git a/Projects/PhoenixPE/Tweaks/411-IME.script b/Projects/PhoenixPE/Tweaks/411-IME.script index c1094cf..bea8365 100644 --- a/Projects/PhoenixPE/Tweaks/411-IME.script +++ b/Projects/PhoenixPE/Tweaks/411-IME.script @@ -133,7 +133,7 @@ Else,RegWrite,HKLM,REG_DWORD,"Tmp_Default\Software\Microsoft\CTF\LangBar","Label // Related........: Called from [Process] // =============================================================================================================================== [Process-Common] -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." /////////////////////////////////////////////////////////////////////////////////// // Common IME Files @@ -269,7 +269,7 @@ End Echo,"Processing Japanese IME components..." -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." RequireFileEx,AppendList,\Windows\System32\tsf3gip.dll RequireFileEx,AppendList,\Windows\IME\IMEJP\DICTS @@ -327,7 +327,7 @@ RegWrite,HKLM,REG_DWORD,"Tmp_Default\Software\Microsoft\CTF\TIP\{A028AE76-01B1-4 [Process-ko-KR] Echo,"Processing Korean IME components..." -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." // Included in ko-KR Winre.wim: \Windows\Fonts\gulim.ttc, \Windows\Fonts\malgun.ttf @@ -401,7 +401,7 @@ RegWrite,HKLM,REG_DWORD,"Tmp_System\Software\Microsoft\CTF\TIP\{A028AE76-01B1-46 [Process-zh-CN] Echo,"Processing Simplified Chinese IME components..." -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." RequireFileEx,AppendList,\Windows\InputMethod\CHS\ChsPinyin.lex RequireFileEx,AppendList,\Windows\InputMethod\CHS\ChsPinyin.lm @@ -496,7 +496,7 @@ RegWrite,HKLM,REG_DWORD,"Tmp_Default\Software\Microsoft\InputMethod\Settings\CHS Echo,"Processing Traditional Chinese IME components..." -Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +Echo,"Building a list of required files..." // Common zh-TW RequireFileEx,AppendList,\Windows\System32\MSWB70404.dll