diff --git a/Projects/PhoenixPE/100-ConfigSource.script b/Projects/PhoenixPE/100-ConfigSource.script index 24b8a5e..145fdc7 100644 --- a/Projects/PhoenixPE/100-ConfigSource.script +++ b/Projects/PhoenixPE/100-ConfigSource.script @@ -37,6 +37,7 @@ Selected=True Mandatory=True Version=1.1.0.0 Date=2020-11-19 +Interface=Interface [Variables] @@ -439,31 +440,33 @@ Message,"Configure the source directory and Wim images used for building the pro [Interface] btn_GetISOFido="Download Win10 ISO",1,8,5,5,140,25,DownloadWithFido,VistalcoDownload_16.png,False,"__Download Win10 ISO Images with FIDO" btn_ExtractISO="Extract Win10 ISO",1,8,151,5,125,25,ExtractISO,Images_Iso_16.png,False,"__Extract a downloaded Win10 ISO file to use as source." +bvl_Homepage=bvl_Homepage,1,12,302,5,121,25 +web_TechBench="Techbench ISO Images",1,10,309,9,113,18,https://tb.rg-adguard.net/public.php btn_SetDefaultOptions=,1,8,452,5,25,25,SetDefaultOptions,SetDefaults_16.png,False,"__Restore Defaults" btn_AdvancedOptions=,1,8,482,5,25,25,ToggleAdvancedOptions,Advanced_16.png,True,"__Show/Hide Advanced Options" btn_ScriptInfo=,1,8,513,5,25,25,ShowScriptInfo,Help_16.png,True,"__Script Info" -bvl_SourceCfg="Configure Source",1,12,5,50,532,81,8,Bold -lbl_Source="Source Files",1,1,17,74,83,18,8,Bold -fb_SrcPath=D:\Images\Win10_1909_English_x64\,1,13,94,68,433,20,dir,Title=Select the directory containing your extracted ISO image -bvl_Homepage=bvl_Homepage,1,12,302,5,121,25 -web_TechBench="Techbench ISO Images",1,10,309,9,113,18,https://tb.rg-adguard.net/public.php -bvl_ImageCfg="Configure Source Image",1,12,5,146,532,130,8,Bold -lbl_BaseWim="Base Wim:",0,1,69,166,54,18,8,Normal -cmb_BaseWim=WinRE.wim,0,4,130,162,100,21,Boot.wim,WinRE.wim,_SaveSource_,False -lbl_SrcBaseImg="'Base' Image:",1,1,56,193,92,18,8,Normal -cmb_SrcBaseImage="1 - Microsoft Windows Recovery Environment",1,4,130,188,395,21,"1 - Microsoft Windows Recovery Environment",_UpdateBaseWimLabel_,True -lbl_SrcInstallImage="'install.wim' Image:",1,1,29,221,94,18,8,Normal -cmb_SrcInstallImage="6 - Windows 10 Pro",1,4,130,214,395,21,"1 - Windows 10 Home","2 - Windows 10 Home N","3 - Windows 10 Home Single Language","4 - Windows 10 Education","5 - Windows 10 Education N","6 - Windows 10 Pro","7 - Windows 10 Pro N","8 - Windows 10 Pro Education","9 - Windows 10 Pro Education N","10 - Windows 10 Pro for Workstations","11 - Windows 10 Pro N for Workstations",_GetSourceWimImage_,True -lbl_ImageInfo="Image Info:",1,1,64,251,60,16,8,Normal -lbl_ImgInfo="Language: en-US Architecture: x64 Version: 10.0.18362.418",1,1,131,251,393,16,8,Bold -btn_SrcSave=" Save",1,8,421,96,80,25,SaveSource,Disquette_16.png,False -bvl_DestCfg="Configure Destination",0,12,5,290,532,112,8,Bold -fb_OutputDir=%BaseDir%\Output\%ProjectTitle%\,0,13,94,340,433,20,dir,Title=Select the directory where the final build will be saved,"__The directory where the final build will be saved. (eg. BOOT.WIM, Programs, etc.)" -lbl_OutputDir="Output Dir",0,1,17,346,70,16,8,Bold -fb_IsoOutputDir=%BaseDir%\Output\,0,13,94,371,433,20,dir,Title=Select the directory where the final ISO file will be saved,"__The directory where the final ISO file will be saved." -lbl_IsoOutputDir="ISO Dir",0,1,17,377,70,16,8,Bold -cb_RunFromWim="Run all programs from RAM (Boot.wim)",0,3,16,309,215,18,False,"__Select this option to pack all programs into Boot.wim regardless of individual script settings.#$x#$xRequired for PXE/Network boot." -lbl_ClickSave="Select the directory containing your extracted ISO image and click 'Save'.",1,1,55,104,354,16,8,Normal +bvl_SourceCfg="Configure Source",1,12,5,50,532,105,8,Bold +lbl_SupportedVer1="Supported Versions: 1809 (10.0.17763), 1903 (10.0.18362), 1909 (10.0.18363), 2004 (10.0.19041)",0,1,16,66,510,16,8,Normal,Italic +lbl_SupportedVer2="Supported Versions",1,1,412,66,97,16,8,Normal,Italic,"__1809 (10.0.17763)#$x1903 (10.0.18362)#$x1909 (10.0.18363)#$x2004 (10.0.19041)#$x" +lbl_Source="Source Files:",1,1,17,94,83,18,8,Bold +fb_SrcPath=,1,13,94,88,433,20,dir,Title=Select the directory containing your extracted ISO image +lbl_ClickSave="Select the directory containing your extracted ISO image and click 'Save'.",1,1,55,124,354,16,8,Normal +btn_SrcSave=" Save",1,8,421,116,80,25,SaveSource,Disquette_16.png,False +bvl_ImageCfg="Configure Source Image",1,12,5,169,532,130,8,Bold +lbl_BaseWim="Base Wim:",0,1,69,189,54,18,8,Normal +cmb_BaseWim=WinRE.wim,0,4,130,185,100,21,Boot.wim,WinRE.wim,_SaveSource_,False +lbl_SrcBaseImg="'Base' Image:",1,1,56,216,92,18,8,Normal +cmb_SrcBaseImage="[Please select a valid source]",1,4,130,211,395,21,"[Please select a valid source]",_UpdateBaseWimLabel_,True +lbl_SrcInstallImage="'install.wim' Image:",1,1,29,244,94,18,8,Normal +cmb_SrcInstallImage="[Please select a valid source]",1,4,130,237,395,21,"[Please select a valid source]",_GetSourceWimImage_,True +lbl_ImageInfo="Image Info:",1,1,64,274,60,16,8,Normal +lbl_ImgInfo=,1,1,131,274,393,16,8,Bold +bvl_DestCfg="Configure Destination",0,12,5,313,532,112,8,Bold +cb_RunFromWim="Run all programs from RAM (Boot.wim)",0,3,16,332,215,18,False,"__Select this option to pack all programs into Boot.wim regardless of individual script settings.#$x#$xRequired for PXE/Network boot." +lbl_OutputDir="Output Dir:",0,1,17,369,70,16,8,Bold +fb_OutputDir=%BaseDir%\Output\%ProjectTitle%\,0,13,94,363,433,20,dir,Title=Select the directory where the final build will be saved,"__The directory where the final build will be saved. (eg. BOOT.WIM, Programs, etc.)" +lbl_IsoOutputDir="ISO Dir:",0,1,17,400,70,16,8,Bold +fb_IsoOutputDir=%BaseDir%\Output\,0,13,94,394,433,20,dir,Title=Select the directory where the final ISO file will be saved,"__The directory where the final ISO file will be saved." [InterfaceEncoded] Advanced_Exit_16.png=705,1048 @@ -512,3 +515,5 @@ lines=0 [EncodedFile-InterfaceEncoded-VistalcoDownload_16.png] 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 + + diff --git a/Projects/PhoenixPE/Components/310-Networking.script b/Projects/PhoenixPE/Components/310-Networking.script index b300036..d4d1253 100644 --- a/Projects/PhoenixPE/Components/310-Networking.script +++ b/Projects/PhoenixPE/Components/310-Networking.script @@ -577,7 +577,7 @@ RegCopy,HKLM,"Tmp_Install_System\ControlSet001\Control\NetTrace\Scenarios\WLAN", RegCopy,HKLM,"Tmp_Install_System\ControlSet001\Services\WlanSvc",HKLM,"Tmp_System\ControlSet001\Services\WlanSvc" RegWrite,HKLM,0x7,"Tmp_System\ControlSet001\Services\WlanSvc","DependOnService","nativewifip,RpcSs,Ndisuio,wcmsvc",NOWARN -If,%SourceVer%,BiggerEqual,10.0.17134.0,Begin +If,%SourceVer%,BiggerEqual,10.0.17000.0,Begin RegWrite,HKLM,0x4,"Tmp_System\ControlSet001\Services\WlanSvc","ErrorControl",1 RegWrite,HKLM,0x2,"Tmp_System\ControlSet001\Services\WlanSvc","ImagePath","#$pSystemRoot#$p\System32\Svchost.exe -k LocalSystemNetworkRestricted -p" RegWrite,HKLM,0x4,"Tmp_System\ControlSet001\Services\WlanSvc","Start",2 diff --git a/Projects/PhoenixPE/Components/320-Audio.script b/Projects/PhoenixPE/Components/320-Audio.script index 332e72b..1b4eda7 100644 --- a/Projects/PhoenixPE/Components/320-Audio.script +++ b/Projects/PhoenixPE/Components/320-Audio.script @@ -63,16 +63,12 @@ If,Not,%fb_StartupSound%,Equal,"",If,ExistFile,%fb_StartupSound%,Begin End Echo,"Loading registry hives..." -RegHiveLoad,Tmp_Default,%RegDefault% -RegHiveLoad,Tmp_Drivers,%RegDrivers% -RegHiveLoad,Tmp_Software,%RegSoftware% -RegHiveLoad,Tmp_System,%RegSystem% -RegHiveLoad,Tmp_Install_Drivers,%RegInstallDrivers% -RegHiveLoad,Tmp_Install_Software,%RegInstallSoftware% -RegHiveLoad,Tmp_Install_System,%RegInstallSystem% +RegLoadHives Run,%ScriptFile%,Config-Audio Run,%ScriptFile%,Reg-Drivers +ExtractFile,%ScriptFile%,Reg,Audio-Stereo.reg,%ProjectTemp% +RegImport,%ProjectTemp%\Audio-Stereo.reg If,%cb_IncludeMPG123%,Equal,True,Run,%ScriptFile%,MPG123 If,%cb_AppSoundEvents%,Equal,True,Begin @@ -80,13 +76,7 @@ If,%cb_AppSoundEvents%,Equal,True,Begin RegImport,%ProjectTemp%\Audio-Events.reg End -RegHiveUnload,Tmp_Default -RegHiveUnload,Tmp_Drivers -RegHiveUnload,Tmp_Software -RegHiveUnload,Tmp_System -RegHiveUnload,Tmp_Install_Drivers -RegHiveUnload,Tmp_Install_Software -RegHiveUnload,Tmp_Install_System +RegUnloadHives [#ExtractFiles#] // =============================================================================================================================== @@ -198,7 +188,7 @@ RequireFileEx,ExtractList // Parameters.....: // Return values..: // Author.........: Homes32 -// Remarks........: +// Remarks........: Microsoft\Windows\CurrentVersion\MMDevices requires special rights on Audiosrv & AudioEndpointBuilder. It can be Full Control. // Related........: // =============================================================================================================================== [Config-Audio] @@ -269,14 +259,14 @@ RegCopy,HKLM,"Tmp_Install_Drivers\DriverDatabase\DriverInfFiles\modemcsa.inf",HK RegCopy,HKLM,"Tmp_Install_Drivers\DriverDatabase\DriverInfFiles\usbvideo.inf",HKLM,"Tmp_Drivers\DriverDatabase\DriverInfFiles\usbvideo.inf" RegCopy,HKLM,"Tmp_Install_Drivers\DriverDatabase\DriverInfFiles\wave.inf",HKLM,"Tmp_Drivers\DriverDatabase\DriverInfFiles\wave.inf" -RegCopy,HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages\bda.inf*",HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages",WILDCARD -RegCopy,HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages\gameport.inf*",HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages",WILDCARD -RegCopy,HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages\ks.inf*",HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages",WILDCARD -RegCopy,HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages\kscaptur.inf*",HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages",WILDCARD -RegCopy,HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages\ksfilter.inf*",HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages",WILDCARD -RegCopy,HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages\modemcsa.inf*",HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages",WILDCARD -RegCopy,HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages\usbvideo.inf*",HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages",WILDCARD -RegCopy,HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages\wave.inf*",HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages",WILDCARD +RegCopy,HKLM,"Tmp_Install_Drivers\DriverDatabase\DriverPackages\bda.inf*",HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages",WILDCARD +RegCopy,HKLM,"Tmp_Install_Drivers\DriverDatabase\DriverPackages\gameport.inf*",HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages",WILDCARD +RegCopy,HKLM,"Tmp_Install_Drivers\DriverDatabase\DriverPackages\ks.inf*",HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages",WILDCARD +RegCopy,HKLM,"Tmp_Install_Drivers\DriverDatabase\DriverPackages\kscaptur.inf*",HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages",WILDCARD +RegCopy,HKLM,"Tmp_Install_Drivers\DriverDatabase\DriverPackages\ksfilter.inf*",HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages",WILDCARD +RegCopy,HKLM,"Tmp_Install_Drivers\DriverDatabase\DriverPackages\modemcsa.inf*",HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages",WILDCARD +RegCopy,HKLM,"Tmp_Install_Drivers\DriverDatabase\DriverPackages\usbvideo.inf*",HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages",WILDCARD +RegCopy,HKLM,"Tmp_Install_Drivers\DriverDatabase\DriverPackages\wave.inf*",HKLM,"Tmp_Drivers\DriverDatabase\DriverPackages",WILDCARD [#SetDefaultOptions#] // =============================================================================================================================== @@ -351,17 +341,19 @@ btn_SetDefaultOptions=,1,8,541,5,25,25,SetDefaultOptions,SetDefaults_16.png,True btn_AdvancedOptions=,1,8,572,5,25,25,ToggleAdvancedOptions,Advanced_16.png,True,"__Show/Hide Advanced Options" btn_ScriptInfo=,1,8,603,5,25,25,ShowScriptInfo,Help_16.png,True,"__Script Info" cb_IncludeMPG123="Include MPG123 Player",1,3,5,50,140,15,True,"__MPG123 is a lightweight open source audio player." -cb_AppSoundEvents="Register App Event Sounds",1,3,5,65,200,18,False,"__Use default sounds for application events. (~25 MB)" -cb_VolMute=Mute,1,3,70,125,86,18,False +cb_AppSoundEvents="Register App Event Sounds",1,3,5,69,200,18,False,"__Use default sounds for application events. (~25 MB)" +cb_VolMute=Mute,1,3,90,125,61,18,False num_VolLevel=num_VolLevel,1,2,15,121,40,22,67,0,100,1,"__Ajust the system volume %" bvl_SysVol="System Volume",1,12,5,105,160,49,8,Normal bvl_AdvancedOptions="Advanced Options",0,12,190,48,440,107,8,Bold lbl_StartupSound="Startup Sound (.mp3)",0,1,201,107,200,16,8,Normal fb_StartupSound=,0,13,200,125,200,20,file,"__.mp3 file that waill be played on statup.#$x#$x(Requires 'Include MPG123 Player')" +lbl_Percent=%,1,1,60,128,20,16,8,Normal [Reg] Audio-Drivers.reg=11742,1316 Audio-Events.reg=78144,4216 +Audio-Stereo.reg=158328,8904 [EncodedFile-Reg-Audio-Drivers.reg] lines=0 @@ -536,3 +528,9 @@ lines=2 0=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 1=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 2=gYbqkR0wecD7K74hFg8BYrEIHtXJXWx1p1ZDMgTNk6hmm0iIIw+LTFIzgkvL/swztx+tb22BJ/pH/luWgddmmXq6dNbseWiOdfmUA55uyvv83n0UI3r96ybUdRBLuh+7jvFUCggcy7hsqdMgpikCoq21RZ3Bcx7pMpc0t4gmu84NHJl86PpdVt+QAYG6/K6J7vfMBC598SzSSUzhVpZaMeYtiJFEAAAAAD9H1eDOcbxqAAGbMYA8AACkCZ3oscRn+wIAAAAABFlaeJzjDsvPcS4pytFLrUhlGAUjD8hBqAMS2KXXaZb8Y2IDADQqB4kYYay/AQAAAAIAAAAmAAAAwBgAAAAAAAABAAAAAAAAAAAAAAA + +[EncodedFile-Reg-Audio-Stereo.reg] +lines=2 +0=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 +1=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 +2=7P9VeHZRJjbiM42HjDv+UOex+Y93dOCe1Cy8bovi2w0soHuDAUiPU6gVHU6wYkuL7CSfJKoivFx9uiRXdM2g1VKPbZRuzJyZKSF8LdQQpSTo7L80IXtaK/NJ/QaVQi/mZjqMqsCIr1AgfYLVAOmlrYYdLmfUOpioqF0lm8S5NdO39cSAQX0pSo0C7BSEgLQEAlGGe4vcPb2Huf/X1wEg+BjGG9lVi8PlZEhN1dB1+qWaYTsTSvmC5Mo/wAY/fTpzoiN2nMhYXsvqifHwpZRccen7Ce9chM2Qr6zE9vlwYO1gUQQDeg9/SoSuXK7tVZW6LB0QH6Xw/PUwNtxr1WLFrOpkE18k1+77DFdcPY2qAG8h7cFAUAHNdO1TWYq1SBwAcqNvugGQAH1LcL5IqLWgGbyKDuULyQ1y496FhPY5oS5bV2fs3sSVMt+DOFTLTZSWPvS15UZLDb72Xbx7yBZeFH60KygBax2fww7fa5LJbNH2jb5vgejotvxrk1cns4vXJ/anpW+R6wP9TKfSXqCaLWD02UvqLtQ59Mf4+ouJEOcYR9XkORS9G9oAAAAAPy8tHk1wwSEAAZ0z+NQJAPsLvJyxxGf7AgAAAAAEWVp4nBNwLE3JzNcNLkktSs3XK0pNZxgFIwlUZDGB6SOS2OV3/4psZGIDABaxCmZfjfG6AQAAAAIAAAAtAAAAxBkAAAAAAAABAAAAAAAAAAAAAAA diff --git a/Projects/PhoenixPE/Components/DotNET4.script b/Projects/PhoenixPE/Components/DotNET4.script index e789347..991f01c 100644 --- a/Projects/PhoenixPE/Components/DotNET4.script +++ b/Projects/PhoenixPE/Components/DotNET4.script @@ -41,6 +41,8 @@ Mandatory=False [TODO] // Finish writing .Net detector tool in PureBasic (Zero Runtime Dependencies) and include in build. +// .Net3 Registry + [Variables] [Process] @@ -50,9 +52,16 @@ Mandatory=False Echo,"Building a list of required files...#$x#$xThis can take awhile, please be patient." +If,%SourceArch%,Equal,x86,Begin + RequireFileEx,AppendList,\Program Files\Microsoft.NET + RequireFileEx,AppendList,\Program Files\Reference Assemblies +End +Else,Begin + RequireFileEx,AppendList,\Program Files (x86)\Microsoft.NET + RequireFileEx,AppendList,\Program Files (x86)\Reference Assemblies +End + RequireFileEx,AppendList,\Windows\Microsoft.NET -If,%SourceArch%,Equal,x86,RequireFileEx,AppendList,\Program Files\Microsoft.NET -Else,RequireFileEx,AppendList,\Program Files (x86)\Microsoft.NET RequireFileEx,AppendList,\Windows\System32\MUI\0409\mscorees.dll RequireFileEx,AppendList,\Windows\System32\aspnet_counters.dll RequireFileEx,AppendList,\Windows\System32\dfshim.dll @@ -69,10 +78,10 @@ RequireFileEx,AppendList,\Windows\System32\PresentationCFFRasterizerNative_v0300 RequireFileEx,AppendList,\Windows\System32\PresentationHost.exe RequireFileEx,AppendList,\Windows\System32\PresentationHostProxy.dll RequireFileEx,AppendList,\Windows\System32\PresentationNative_v0300.dll +RequireFileEx,AppendList,\Windows\System32\sxstrace.exe RequireFileEx,AppendList,\Windows\System32\ucrtbase_clr0400.dll RequireFileEx,AppendList,\Windows\System32\UIAutomationCore.dll RequireFileEx,AppendList,\Windows\System32\vcruntime140_clr0400.dll -RequireFileEx,AppendList,\Windows\System32\sxstrace.exe RequireFileEx,AppendList,\Windows\System32\WindowsCodecs.dll RequireFileEx,AppendList,\Windows\System32\WindowsCodecsExt.dll @@ -90,13 +99,13 @@ If,ExistFile,"%TargetSystem32%\wow64.dll",Begin RequireFileEx,AppendList,\Windows\SysWOW64\msvcr120_clr0400.dll RequireFileEx,AppendList,\Windows\SysWOW64\netfxperf.dll RequireFileEx,AppendList,\Windows\SysWOW64\PresentationCFFRasterizerNative_v0300.dll + RequireFileEx,AppendList,\Windows\SysWOW64\PresentationHost.exe + RequireFileEx,AppendList,\Windows\SysWOW64\PresentationHostProxy.dll + RequireFileEx,AppendList,\Windows\SysWOW64\PresentationNative_v0300.dll + RequireFileEx,AppendList,\Windows\SysWOW64\sxstrace.exe RequireFileEx,AppendList,\Windows\SysWoW64\UIAutomationCore.dll RequireFileEx,AppendList,\Windows\SysWOW64\ucrtbase_clr0400.dll RequireFileEx,AppendList,\Windows\SysWOW64\vcruntime140_clr0400.dll - RequireFileEx,AppendList,\Windows\SysWOW64\PresentationHost.exe - RequireFileEx,AppendList,\Windows\SysWOW64\PresentationHostProxy.dll - RequireFileEx,AppendList,\Windows\SysWOW64\PresentationNative_v0300.dll - RequireFileEx,AppendList,\Windows\SysWOW64\sxstrace.exe RequireFileEx,AppendList,\Windows\SysWOW64\WindowsCodecs.dll RequireFileEx,AppendList,\Windows\SysWOW64\WindowsCodecsExt.dll End @@ -110,20 +119,14 @@ RequireFileEx,ExtractList /////////////////////////////////////////////////////////////////////////////////// // Configure Dummy Registry Echo,"Configuring the Registry..." -RegHiveLoad,Tmp_Software,%RegSoftware% -RegHiveLoad,Tmp_System,%RegSystem% -RegHiveLoad,Tmp_Install_Software,%RegInstallSoftware% -RegHiveLoad,Tmp_Install_System,%RegInstallSystem% +RegLoadHives RegCopy,HKLM,"Tmp_Install_Software\Microsoft\Fusion",HKLM,"Tmp_Software\Microsoft\Fusion" RegCopy,HKLM,"Tmp_Install_Software\Microsoft\.NETFramework",HKLM,"Tmp_Software\Microsoft\.NETFramework" RegCopy,HKLM,"Tmp_Install_Software\Microsoft\NET Framework Setup",HKLM,"Tmp_Software\Microsoft\NET Framework Setup" -RegCopy,HKLM,"Tmp_Install_System\ControlSet001\Services\FontCache*",HKLM,"Tmp_System\ControlSet001\Services",WILDCARD +RegCopy,HKLM,"Tmp_Install_System\ControlSet001\Services\FontCache",HKLM,"Tmp_System\ControlSet001\Services\FontCache" RegCopy,HKLM,"Tmp_Install_Software\WOW6432Node\Microsoft\.NETFramework",HKLM,"Tmp_Software\WOW6432Node\Microsoft\.NETFramework" RegCopy,HKLM,"Tmp_Install_Software\WOW6432Node\Microsoft\NET Framework Setup",HKLM,"Tmp_Software\WOW6432Node\Microsoft\NET Framework Setup" -RegHiveUnload,Tmp_Software -RegHiveUnload,Tmp_System -RegHiveUnload,Tmp_Install_Software -RegHiveUnload,Tmp_Install_System +RegUnloadHives [#Interface#] // =============================================================================================================================== diff --git a/Projects/PhoenixPE/Components/RDP.script b/Projects/PhoenixPE/Components/RDP.script index a143bf2..33ec6ce 100644 --- a/Projects/PhoenixPE/Components/RDP.script +++ b/Projects/PhoenixPE/Components/RDP.script @@ -204,8 +204,7 @@ RequireFileEx,AppendList,\Windows\SystemResources\Windows.UI.Cred If,%cb_EnableTSConnections%,Equal,True,Begin RequireFileEx,AppendList,\Windows\System32\SessEnv.dll RequireFileEx,AppendList,\Windows\System32\termsrv.dll - RequireFileEx,AppendList,\Windows\System32\umrdp.dll - + RequireFileEx,AppendList,\Windows\System32\umrdp.dll End /////////////////////////////////////////////////////////////////////////////////// diff --git a/Projects/PhoenixPE/Core/200-PreFlight.script b/Projects/PhoenixPE/Core/200-PreFlight.script index 608a429..d242ae3 100644 --- a/Projects/PhoenixPE/Core/200-PreFlight.script +++ b/Projects/PhoenixPE/Core/200-PreFlight.script @@ -45,12 +45,36 @@ Date=2020-07-12 Echo,"Starting Pre-Flight Check..." Run,%ScriptFile%,CheckEngine +Run,%ScriptFile%,CheckOutputDir +If,%cb_CheckFreeSpace%,Equal,True,Run,%ScriptFile%,CheckDiskSpace Run,%ScriptFile%,CheckTools -If,%cb_CheckForSupportedBuildVer%,Equal,True,Run,%ScriptFile%,KnownBuilds +If,%cb_CheckForSupportedBuildVer%,Equal,True,Run,%ScriptFile%,CheckKnownBuilds Run,%ScriptFile%,CheckWinREVersion +[#CheckOutputDir#] +// =============================================================================================================================== +// Name...........: CheckOutputDir +// Description....: Verify that %OutputDir% is not a root drive (ie. d:\). This will cause issues with creating/cleaning up +// the build environment. +// Syntax.........: +// Parameters.....: +// Return values..: +// Author.........: Homes32 +// Remarks........: +// Related........: Called by [Process] +// =============================================================================================================================== +[CheckOutputDir] +System,SetLocal +StrFormat,SPLIT,%OutputDir%,"\",0,%NumSplits% +If,%NumSplits%,Equal,1,Begin + Message,"Error: Setting the OutputDir to the root of a drive is not supported.",Error + Halt,"Error: Setting the OutputDir to the root of a drive is not supported." +End +System,EndLocal + [#CheckEngine#] // =============================================================================================================================== +// Name...........: CheckEngine // Description....: Verify that PEBakery is using a supported configuration. // Syntax.........: // Parameters.....: @@ -137,36 +161,38 @@ System,EndLocal [#CheckTools#] // =============================================================================================================================== +// Name...........: CheckTools // Description....: Verify that all tools needed by the project exist in the %Tools% directory. // Syntax.........: // Parameters.....: // Return values..: // Author.........: Homes32 // Remarks........: -// Related........: [MissingTool], [Process] +// Related........: [ErrMissingTool], [Process] // =============================================================================================================================== [CheckTools] Echo,"Verifying required 3rd party tools are present..." -If,Not,ExistFile,"%Tools%\%HostArch%\7z.exe",Run,%ScriptFile%,MissingTool,7z.exe -If,Not,ExistFile,"%Tools%\%HostArch%\BcastEnvChg.exe",Run,%ScriptFile%,MissingTool,BcastEnvChg.exe -If,Not,ExistFile,"%Tools%\%HostArch%\binmay.exe",Run,%ScriptFile%,MissingTool,binmay.exe -If,Not,ExistFile,"%Tools%\%HostArch%\GetBinaryResource.exe",Run,%ScriptFile%,MissingTool,GetBinaryResource.exe -If,Not,ExistFile,"%Tools%\%HostArch%\GetStringResource.exe",Run,%ScriptFile%,MissingTool,GetStringResource.exe -If,Not,ExistFile,"%Tools%\%HostArch%\GWT.exe",Run,%ScriptFile%,MissingTool,GWT.exe -If,Not,ExistFile,"%Tools%\%HostArch%\hiderun.exe",Run,%ScriptFile%,MissingTool,hiderun.exe -If,Not,ExistFile,"%Tools%\x86\HiveUnload.exe",Run,%ScriptFile%,MissingTool,HiveUnload.exe -If,Not,ExistFile,"%Tools%\x86\innounp.exe",Run,%ScriptFile%,MissingTool,innounp.exe -If,Not,ExistFile,"%Tools%\x86\mkISOfs.exe",Run,%ScriptFile%,MissingTool,mkISOfs.exe -If,Not,ExistFile,"%Tools%\x86\SetACL.exe",Run,%ScriptFile%,MissingTool,SetACL.exe -If,Not,ExistFile,"%Tools%\x86\xml.exe",Run,%ScriptFile%,MissingTool,xml.exe +If,Not,ExistFile,"%Tools%\%HostArch%\7z.exe",Run,%ScriptFile%,ErrMissingTool,7z.exe +If,Not,ExistFile,"%Tools%\%HostArch%\BcastEnvChg.exe",Run,%ScriptFile%,ErrMissingTool,BcastEnvChg.exe +If,Not,ExistFile,"%Tools%\%HostArch%\binmay.exe",Run,%ScriptFile%,ErrMissingTool,binmay.exe +If,Not,ExistFile,"%Tools%\%HostArch%\GetBinaryResource.exe",Run,%ScriptFile%,ErrMissingTool,GetBinaryResource.exe +If,Not,ExistFile,"%Tools%\%HostArch%\GetStringResource.exe",Run,%ScriptFile%,ErrMissingTool,GetStringResource.exe +If,Not,ExistFile,"%Tools%\%HostArch%\GWT.exe",Run,%ScriptFile%,ErrMissingTool,GWT.exe +If,Not,ExistFile,"%Tools%\%HostArch%\hiderun.exe",Run,%ScriptFile%,ErrMissingTool,hiderun.exe +If,Not,ExistFile,"%Tools%\x86\HiveUnload.exe",Run,%ScriptFile%,ErrMissingTool,HiveUnload.exe +If,Not,ExistFile,"%Tools%\x86\innounp.exe",Run,%ScriptFile%,ErrMissingTool,innounp.exe +If,Not,ExistFile,"%Tools%\x86\mkISOfs.exe",Run,%ScriptFile%,ErrMissingTool,mkISOfs.exe +If,Not,ExistFile,"%Tools%\x86\SetACL.exe",Run,%ScriptFile%,ErrMissingTool,SetACL.exe +If,Not,ExistFile,"%Tools%\x86\xml.exe",Run,%ScriptFile%,ErrMissingTool,xml.exe // WaikTools If,Not,ExistFile,"%Tools%\%HostArch%\BCDBoot\bcdedit.exe",Run,%ScriptFile%,GetWaikTools If,Not,ExistFile,"%Tools%\%HostArch%\DISM\dism.exe",Run,%ScriptFile%,GetWaikTools If,Not,ExistFile,"%Tools%\%HostArch%\Oscdimg\oscdimg.exe",Run,%ScriptFile%,GetWaikTools -[#MissingTool#] +[#ErrMissingTool#] // =============================================================================================================================== +// Name...........: ErrMissingTool // Description....: Present an error message and halt the build if a required .exe is missing from the %Tools% folder. // Syntax.........: Run,%ScriptFile%, // Parameters.....: #1 - Tool Name @@ -175,12 +201,13 @@ If,Not,ExistFile,"%Tools%\%HostArch%\Oscdimg\oscdimg.exe",Run,%ScriptFile%,GetWa // Remarks........: INTERNAL FUNCTION // Related........: [CheckTools] // =============================================================================================================================== -[MissingTool] +[ErrMissingTool] Message,"The build cannot continue because the required application [ #1 ] is missing.#$x#$xPlease re-download the project.#$x#$x If the issue persists you may need to add an exception for the [%Tools%] folder in your anti-virus software in order to prevent false-positives from recurring.",ERROR Halt,"The build cannot continue because [ #1 ] is missing." [#GetWaikTools#] // =============================================================================================================================== +// Name...........: GetWaikTools // Description....: Download missing/required WAIK tools (dism, oscdimg, etc.) using JFX's GWT.exe // Syntax.........: // Parameters.....: @@ -196,8 +223,9 @@ DirCopy,"%ProjectTemp%\ADK_6\x86\*.*","%Tools%\x86" DirCopy,"%ProjectTemp%\ADK_6\amd64\*.*","%Tools%\x64" If,Not,ExistFile,"%Tools%\x64\Oscdimg\oscdimg.exe",Halt,"Error downloading required Windows 10 ADK tools. The build cannot continue." -[#KnownBuilds#] +[#CheckKnownBuilds#] // =============================================================================================================================== +// Name...........: CheckKnownBuilds // Description....: Verify if the source is a known working version. If not warn the user that there may be issues. // // Version OS Build Release Date Codename Marketing Name @@ -220,7 +248,7 @@ If,Not,ExistFile,"%Tools%\x64\Oscdimg\oscdimg.exe",Halt,"Error downloading requi // Remarks........: As a general rule PhoenixPE will attempt to support the 2 most recent verified builds. // Related........: Called by [Process] // =============================================================================================================================== -[KnownBuilds] +[CheckKnownBuilds] System,SetLocal // Minimum supported version @@ -274,11 +302,59 @@ If,ExistFile,"%ProjectCache%\WinRE.wim",Begin Set,%WinREVer%,%imgVerMaj%.%imgVerMin%.%imgVerBld%.%imgVerSPBld% If,Not,%WinREVer%,Equal,%SourceVer%,Begin - Echo,"Warning: Version mismatch. WinRE is not the same version as the source image. This could result in build failures.",Warn + Echo,"Warning: Version mismatch. WinRE is not the same version as the source image. This may result in build failures.",Warn Message,"Warning: Version Mismatch#$x#$xThe WinRE image is not the same version as the Windows source (install.wim).#$xThis doesn't necessarily mean the build will fail, but the resulting PE environment may be unstable.#$x#$xProceed at your own risk.#$x#$xInstall.wim: %SourceVer%#$xWinRE.wim: %WinREVer%",Warning,10 End End +[#CheckDiskSpace#] +// =============================================================================================================================== +// Name...........: CheckDiskSpace +// Description....: Make sure we have the minimum amount of free disk space required to build. +// +// Minimum Free Space is somewhat arbitrary, as we can't be sure what the final build size will be with +// whatever apps, features, etc. the user decides to include. +// +// For the purpose of this check we are primarily making sure we have the space needed to: +// - extract our base .wim image and cache it +// - extract the contents of the base .wim image to %TargetDir% +// - copy files from install.wim for "core" features such as Explorer, etc. to %TargetDir% +// - compress the resulting files back into a .wim image in %OutputDir% +// Syntax.........: +// Parameters.....: +// Return values..: +// Author.........: Homes32 +// Remarks........: If %TargetDir% doesn't exist yet GetFreeSpace will fallback to the drive letter specified by the path. +// Related........: +// =============================================================================================================================== +[CheckDiskSpace] +System,SetLocal + +// Set minimum space required to 5 GB +Set,%MinimumFreeMegabytes%,5120 +Math,Mul,%MinimumFreeBytes%,%MinimumFreeMegabytes%,1048576 +StrFormat,IntToBytes,%MinimumFreeBytes%,%HumanReadableMinimumFreeSpace% + +// Check %TargetDir% & %Workbench% +System,GetFreeSpace,%TargetDir%,%FreeMegabytes% +Math,Mul,%FreeBytes%,%FreeMegabytes%,1048576 +StrFormat,IntToBytes,%FreeBytes%,%HumanReadableFreeSpace% +If,%FreeMegabytes%,Smaller,%MinimumFreeMegabytes%,Begin + Echo,"Warning: You have less then %HumanReadableMinimumFreeSpace% of free disk space on your target drive [%TargetDir%]. This may result in build failures.",Warn + Message,"Warning: You only have [%HumanReadableFreeSpace%] free disk space on your target drive, which is less then the recommended %HumanReadableMinimumFreeSpace%. This may result in build failures.",Warning,10 +End + +// Check %OutputDir% +System,GetFreeSpace,%OutputDir%,%FreeMegabytes% +Math,Mul,%FreeBytes%,%FreeMegabytes%,1048576 +StrFormat,IntToBytes,%FreeBytes%,%HumanReadableFreeSpace% +If,%FreeMegabytes%,Smaller,%MinimumFreeMegabytes%,Begin + Echo,"Warning: You have less then %HumanReadableMinimumFreeSpace% of free disk space on your output drive [%OutputDir%]. This may result in build failures.",Warn + Message,"Warning: You only have [%HumanReadableFreeSpace%] free disk space on your output drive [%OutputDir%], which is less then the recommended %HumanReadableMinimumFreeSpace%. This may result in build failures.",Warning,10 +End + +System,EndLocal + [#SetDefaultOptions#] // =============================================================================================================================== // Name...........: SetDefaultOptions @@ -292,6 +368,7 @@ End // =============================================================================================================================== [SetDefaultOptions] WriteInterface,Value,%ScriptFile%,Interface,cb_CheckForSupportedBuildVer,True +WriteInterface,Value,%ScriptFile%,Interface,cb_CheckFreeSpace,True [#ToggleAdvancedOptions#] // =============================================================================================================================== @@ -313,6 +390,7 @@ End Else,Set,%Toggle%,False WriteInterface,Visible,%ScriptFile%,Interface,cb_CheckForSupportedBuildVer,%Toggle% +WriteInterface,Visible,%ScriptFile%,Interface,cb_CheckFreeSpace,%Toggle% WriteInterface,Visible,%ScriptFile%,Interface,bvl_AdvancedOptions,%Toggle% System,EndLocal @@ -346,7 +424,8 @@ btn_SetDefaultOptions=,1,8,541,5,25,25,SetDefaultOptions,SetDefaults_16.png,True btn_AdvancedOptions=,1,8,571,5,25,25,ToggleAdvancedOptions,Advanced_16.png,True,"__Show/Hide Advanced Options" btn_ScriptInfo=,1,8,601,5,25,25,ShowScriptInfo,Help_16.png,True,"__Script Info" bvl_AdvancedOptions="Advanced Options",0,12,5,50,446,71,8,Bold -cb_CheckForSupportedBuildVer="Verify Source Build Number",0,3,12,79,150,18,True,"__Check and see if the Win10 build version has been tested with this project." +cb_CheckForSupportedBuildVer="Verify Source Build Number",0,3,12,64,150,18,True,"__Check and see if the Win10 build version has been tested with this project." +cb_CheckFreeSpace="Verify Free Disk Space",0,3,12,84,150,18,True,"__Verify we have the free disk space required to build this project." [InterfaceEncoded] Advanced_16.png=1722,2396 diff --git a/Projects/PhoenixPE/Core/210-Core.script b/Projects/PhoenixPE/Core/210-Core.script index 19bd4be..8364545 100644 --- a/Projects/PhoenixPE/Core/210-Core.script +++ b/Projects/PhoenixPE/Core/210-Core.script @@ -44,6 +44,7 @@ Date=2019-01-01 Run,%ScriptFile%,Cleanup Run,%ScriptFile%,CreateTargetFolders Run,%ScriptFile%,ExtractBaseWim +If,%cb_IncludeFullWinSxS%,Equal,False,Run,%ScriptFile%,CleanupWinSxS [#Cleanup#] // =============================================================================================================================== @@ -103,10 +104,6 @@ Echo,"Creating Output directory..." DirMake,%OutputDir% DirMake,"%OutputDir%\Programs" DirMake,"%OutputDir%\sources" -//DirMake,"%OutputDir%\boot" -//DirMake,%OutputDir%\boot\fonts -//DirMake,"%OutputDir%\efi" -//DirMake,"%OutputDir%\efi\microsoft\boot\fonts" Echo,"Granting full access to [%OutputDir%]..." SetFileACL,%OutputDir% @@ -131,8 +128,6 @@ StrFormat,FileName,%SourceBaseWim%,%tmp_BaseFileName% Echo,"Extracting [%tmp_BaseFileName%:%SourceBaseWimImage%] to [%TargetDir%]...#$x#$xThis can take awhile, please be patient." WimApply,%SourceBaseWim%,%SourceBaseWimImage%,%TargetDir%,NOACL,NOATTRIB -If,%cb_IncludeFullWinSxS%,Equal,False,Run,%ScriptFile%,CleanupWinSxS - // WallpaperHost.exe causes issues with explorer starting FileDeleteEx,%TargetDir%\Windows\System32\WallpaperHost.exe diff --git a/Projects/PhoenixPE/Core/211-Registry.script b/Projects/PhoenixPE/Core/211-Registry.script index 3c52114..5af1f61 100644 --- a/Projects/PhoenixPE/Core/211-Registry.script +++ b/Projects/PhoenixPE/Core/211-Registry.script @@ -483,7 +483,7 @@ cmb_SoftwareHive=Install.wim,0,4,272,99,100,21,Boot.wim,Install.wim,_SetRegistry lbl_DriversHive="Drivers hive:",0,1,17,105,64,18,8,Normal cmb_DriversHive=Boot.wim,0,4,82,99,100,21,Boot.wim,Install.wim,_SetRegistryHiveSource_,True lbl_HiveInfo="These settings allow you to choose the hive to be used as the #$qBase#$q for the registry.",0,1,16,130,419,30,8,Normal -cb_TakeFullOwnershipRegSoftware="Take full ownership of %RegSoftware%",0,3,15,163,213,18,True,_PurgeRegCache_,True,"__By default PhoenixPE only takes full ownership of a few important %RegSoftware% keys.#$xEnable this option to take full ownership of the entire %RegSoftware% hive.#$x#$xWARNING: Enabling this option can add up to 5 minutes to your initial build time.#$x#$xToggling this option will purge the current registry cache." +cb_TakeFullOwnershipRegSoftware="Take full ownership of the Software hive",0,3,15,163,213,18,True,_PurgeRegCache_,True,"__By default PhoenixPE only takes full ownership of a few important %RegSoftware% keys.#$xEnable this option to take full ownership of the entire %RegSoftware% hive.#$x#$xWARNING: Enabling this option can add up to 5 minutes to your initial build time.#$x#$xToggling this option will purge the current registry cache." [InterfaceEncoded] Trash.ico=1150,1212 diff --git a/Projects/PhoenixPE/Core/212-ShellConfig.script b/Projects/PhoenixPE/Core/212-ShellConfig.script index b4774e1..3e95dfe 100644 --- a/Projects/PhoenixPE/Core/212-ShellConfig.script +++ b/Projects/PhoenixPE/Core/212-ShellConfig.script @@ -125,6 +125,9 @@ RegWrite,HKLM,0x1,"Tmp_Software\Microsoft\Windows NT\CurrentVersion\ProfileList\ // Manage Computer on My Computer context menu RegWrite,HKLM,0x2,"Tmp_software\Classes\CLSID\{20D04FE0-3AEA-1069-A2D8-08002B30309D}\shell\Manage\command","","#$pSystemRoot#$p\System32\mmc.exe /b compmgmt.msc",NoWarn +// Add C:\Windows\System32\DriverStore\FileRepository to Installation Sources. This will allow our PE look for drivers on the C: drive of the Host computer. +RegWrite,HKLM,0x7,"Tmp_Software\Microsoft\Windows\CurrentVersion\Setup","Installation Sources","C:\Windows\System32\DriverStore\FileRepository" + // Enable SIHost RegWrite,HKLM,0x4,"Tmp_Software\Microsoft\Windows NT\CurrentVersion\Winlogon","EnableSIHostIntegration",1 @@ -182,6 +185,10 @@ RegWrite,HKLM,0x4,"Tmp_System\ControlSet001\Services\usbhub\HubG","DisableOnSoft // Turn off WMI Telemetry RegWrite,HKLM,0x4,"Tmp_System\ControlSet001\Control\WMI\Autologger\AutoLogger-Diagtrack-Listener","Start",0 +// Disable Telemetry Service +RegWrite,HKLM,0x4,"Tmp_System\ControlSet001\Services\diagnosticshub.standardcollector.service","Start",4 +RegWrite,HKLM,0x4,"Tmp_System\ControlSet001\Services\DiagTrack","Start",4 + // EnableWheelDetection RegWrite,HKLM,0x4,"Tmp_System\ControlSet001\Services\i8042prt\Parameters","EnableWheelDetection",2 @@ -218,6 +225,10 @@ RegWrite,HKLM,0x1,"Tmp_System\ControlSet001\services\Tcpip\Parameters","NV Hostn RegWrite,HKLM,0x1,"Tmp_System\ControlSet001\services\Tcpip\Parameters","Hostname",%ProjectTitle%,NoWarn RegWrite,HKLM,0x1,"Tmp_System\ControlSet001\Control\Session Manager\Environment","ComputerName",%ProjectTitle%,NoWarn +// Create and Disable Remote Desktop service to avoid event log errors +RegCopy,HKLM,"Tmp_Install_System\ControlSet001\Services\TermService",HKLM,"Tmp_System\ControlSet001\Services\TermService" +If,ExistRegSubKey,HKLM,"Tmp_System\ControlSet001\Services\TermService",RegWrite,HKLM,0x4,"Tmp_System\ControlSet001\Services\TermService","Start",4 + // Start Services in Redstone 5+ If,%SourceVer%,Bigger,"10.0.17700.0",Begin // Fix Base Filtering Engine startup (Firewalls) diff --git a/Projects/PhoenixPE/Core/251-WoW64.script b/Projects/PhoenixPE/Core/251-WoW64.script index 9c1ad6e..3af74cd 100644 --- a/Projects/PhoenixPE/Core/251-WoW64.script +++ b/Projects/PhoenixPE/Core/251-WoW64.script @@ -74,6 +74,7 @@ Echo,"Building a list of required files...#$x#$xThis can take awhile, please be /////////////////////////////////////////////////////////////////////////////////// // Core WoW64 Emulation Layer +RequireFileEx,AppendList,\Windows\System32\ntdll.dll RequireFileEx,AppendList,\Windows\System32\wow64.dll,NOMUI RequireFileEx,AppendList,\Windows\System32\wow64cpu.dll,NOMUI RequireFileEx,AppendList,\Windows\System32\wow64win.dll,NOMUI @@ -102,6 +103,7 @@ Echo,"Building a list of required files...#$x#$xThis can take awhile, please be /////////////////////////////////////////////////////////////////////////////////// // Core WoW64 Emulation Layer +RequireFileEx,AppendList,\Windows\System32\ntdll.dll RequireFileEx,AppendList,\Windows\System32\wow64.dll,NOMUI RequireFileEx,AppendList,\Windows\System32\wow64cpu.dll,NOMUI RequireFileEx,AppendList,\Windows\System32\wow64win.dll,NOMUI diff --git a/Projects/PhoenixPE/Drivers/DisplayDrivers.script b/Projects/PhoenixPE/Drivers/DisplayDrivers.script index 23b2a04..7c39e63 100644 --- a/Projects/PhoenixPE/Drivers/DisplayDrivers.script +++ b/Projects/PhoenixPE/Drivers/DisplayDrivers.script @@ -51,6 +51,10 @@ RegHiveLoad,Tmp_Install_System,%RegInstallSystem% // Extract Driver Files Run,%ScriptFile%,ExtractFiles +// Register Display Driver +RegCopyDriver,display.inf +RegCopyDriver,displayoverride.inf + // Register Monitor Driver Echo,"Registering Monitor driver..." RegCopy,HKLM,"Tmp_Install_System\ControlSet001\Services\monitor",HKLM,"Tmp_System\ControlSet001\Services\monitor" diff --git a/Projects/PhoenixPE/Finalize/710-SlimFast.script b/Projects/PhoenixPE/Finalize/710-SlimFast.script index a4d1d30..1080472 100644 --- a/Projects/PhoenixPE/Finalize/710-SlimFast.script +++ b/Projects/PhoenixPE/Finalize/710-SlimFast.script @@ -43,7 +43,6 @@ Date=2019-10-20 [Process] Echo,"Cleaning up [TargetDir]..." -If,%SourceArch%,Equal,x64,DirDeleteEx,"%TargetDir%\Program Files (x86)" DirDeleteEx,"%TargetDir%\Users\Default\Desktop\Desktop.ini" /////////////////////////////////////////////////////////////////////////////////// @@ -62,51 +61,51 @@ FileDeleteEx,%TargetSystem32%\windows.immersiveshell.serviceprovider.dll // Disable Diagnostic Telemetry Service // DiagTrack and diagnosticshub.standardcollector.service are disabled Shell Config -FileDeleteEx,%TargetSystem32%\Windows\DiagTrack -FileDeleteEx,%TargetSystem32%\Windows\System32\DiagSvcs -FileDeleteEx,%TargetSystem32%\Windows\System32\diagER.dll -FileDeleteEx,%TargetSystem32%\Windows\System32\diagtrack.dll +DirDeleteEx,%TargetWindows%\DiagTrack +DirDeleteEx,%TargetSystem32%\DiagSvcs +FileDeleteEx,%TargetSystem32%\diagER.dll +FileDeleteEx,%TargetSystem32%\diagtrack.dll // WMI Repository will be rebuilt at startup -DirDeleteEx,%TargetSystem32%\Windows\System32\wbem\AutoRecover -DirDeleteEx,%TargetSystem32%\Windows\System32\wbem\Logs -DirDeleteEx,%TargetSystem32%\Windows\System32\wbem\Repository -DirDeleteEx,%TargetSystem32%\Windows\System32\wbem\tmf -DirDeleteEx,%TargetSystem32%\Windows\System32\wbem\xml +DirDeleteEx,%TargetSystem32%\wbem\AutoRecover +DirDeleteEx,%TargetSystem32%\wbem\Logs +DirDeleteEx,%TargetSystem32%\wbem\Repository +DirDeleteEx,%TargetSystem32%\wbem\tmf +DirDeleteEx,%TargetSystem32%\wbem\xml // Edge web platform -FileDeleteEx,%TargetSystem32%\Windows\System32\edgehtml.dll -FileDeleteEx,%TargetSystem32%\Windows\System32\%SourceLang%\edgehtml.dll.mui -FileDeleteEx,%TargetSystem32%\Windows\SystemResources\edgehtml.dll.mun -FileDeleteEx,%TargetSystem32%\Windows\System32\edgeIso.dll -FileDeleteEx,%TargetSystem32%\Windows\System32\EdgeManager.dll +//FileDeleteEx,%TargetSystem32%\edgehtml.dll +//FileDeleteEx,%TargetSystem32%\%SourceLang%\edgehtml.dll.mui +//FileDeleteEx,%TargetWindows%\SystemResources\edgehtml.dll.mun +//FileDeleteEx,%TargetSystem32%\edgeIso.dll +//FileDeleteEx,%TargetSystem32%\EdgeManager.dll /////////////////////////////////////////////////////////////////////////////////// // Unused Language (MUI) Folders If,%cb_CleanupLangFolders%,Equal,True,Begin - Run,%ScriptFile%,CleanupMui,%TargetDir%\Windows\System32 - Run,%ScriptFile%,CleanupMui,%TargetDir%\Windows\Boot\EFI - Run,%ScriptFile%,CleanupMui,%TargetDir%\Windows\Boot\PCAT - Run,%ScriptFile%,CleanupMui,%TargetDir%\Windows\Boot\PXE - Run,%ScriptFile%,CleanupMui,%TargetDir%\Windows\System32\wbem - If,%SourceArch%,Equal,x64,Run,%ScriptFile%,CleanupMui,%TargetDir%\Windows\SysWOW64 + Run,%ScriptFile%,CleanupMui,%TargetSystem32% + Run,%ScriptFile%,CleanupMui,%TargetWindows%\Boot\EFI + Run,%ScriptFile%,CleanupMui,%TargetWindows%\Boot\PCAT + Run,%ScriptFile%,CleanupMui,%TargetWindows%\Boot\PXE + Run,%ScriptFile%,CleanupMui,%TargetWindows%\System32\wbem + If,%SourceArch%,Equal,x64,Run,%ScriptFile%,CleanupMui,%TargetWindows%\SysWOW64 End /////////////////////////////////////////////////////////////////////////////////// // Windows Speech2Text -Echo,"Removing folder [%TargetDir%\Windows\Speech]..." -If,%cb_DeleteSpeechFolder%,Equal,True,DirDeleteEx,"%TargetDir%\Windows\Speech" +Echo,"Removing folder [%TargetWindows%\Speech]..." +If,%cb_DeleteSpeechFolder%,Equal,True,DirDeleteEx,"%TargetWindows%\Speech" /////////////////////////////////////////////////////////////////////////////////// // WoW64 -// It's possible some poorly designed user scripts might add WoW64 files +// It's possible some user scripts might add WoW64 files // even if the user has disabled the Core - W0W64 script. Let's clean them up and save space. If,%cb_DeleteWoW64%,Equal,True,If,Not,ExistFile,"%TargetSystem32%\wow64.dll",Begin Echo,"Removing unused WoW64 files..." - DirDeleteEx,"%TargetDir%\Windows\SysWOW64" + DirDeleteEx,"%TargetWindows%\SysWOW64" RegHiveLoad,Tmp_Software,%RegSoftware% RegHiveLoad,Tmp_Default,%RegDefault% RegDelete,HKLM,"Tmp_Software\Software\Wow6432Node" diff --git a/Projects/PhoenixPE/Media Creation/Copy2Folder.script b/Projects/PhoenixPE/Media Creation/Copy2Folder.script index c126cef..4da2a91 100644 --- a/Projects/PhoenixPE/Media Creation/Copy2Folder.script +++ b/Projects/PhoenixPE/Media Creation/Copy2Folder.script @@ -202,8 +202,6 @@ OpenFolder_16.png=2299,3168 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-SetDefaults_16.png] lines=0 0=iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAHEGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDggNzkuMTY0MDM2LCAyMDE5LzA4LzEzLTAxOjA2OjU3ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDE5LTEwLTIxVDE3OjIxOjEyLTA1OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAxOS0xMi0wMlQyMTo1MTo1Mi0wNjowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAxOS0xMi0wMlQyMTo1MTo1Mi0wNjowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpiMWM3ZDhlNS1mMGMxLTMwNDgtOGNiOS03YWU4YjgyNDgyNmQiIHhtcE1NOkRvY3VtZW50SUQ9ImFkb2JlOmRvY2lkOnBob3Rvc2hvcDowNzhkNDM1MC04NWRmLTg4NDQtOTY0Mi1lYTIxNmU3YjUwNDIiIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpmMDM1MDg3Mi1hYmUxLWU5NDAtOTE2NC1kYzRjMzdjOGIwOTUiPiA8ZGM6Y3JlYXRvcj4gPHJkZjpTZXE+IDxyZGY6bGk+SG9tZXMzMjwvcmRmOmxpPiA8L3JkZjpTZXE+IDwvZGM6Y3JlYXRvcj4gPHhtcE1NOkhpc3Rvcnk+IDxyZGY6U2VxPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY3JlYXRlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDpmMDM1MDg3Mi1hYmUxLWU5NDAtOTE2NC1kYzRjMzdjOGIwOTUiIHN0RXZ0OndoZW49IjIwMTktMTAtMjFUMTc6MjE6MTItMDU6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChXaW5kb3dzKSIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6MDdmNDNiMDctMTg1NC1hNjQwLWEwM2UtYTQxMTM2YTA0ODA2IiBzdEV2dDp3aGVuPSIyMDE5LTEwLTIxVDE3OjIxOjQ3LTA1OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOmIxYzdkOGU1LWYwYzEtMzA0OC04Y2I5LTdhZThiODI0ODI2ZCIgc3RFdnQ6d2hlbj0iMjAxOS0xMi0wMlQyMTo1MTo1Mi0wNjowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDwvcmRmOlNlcT4gPC94bXBNTTpIaXN0b3J5PiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PlYy9voAAAJBSURBVDiNpdHLThNRHAbwvkCjpalcSyyUEDo09Jw5MxZeggXdQHSpa96ARTclolWpLYtG20IDwdpaoeVOW63G0gvEmEaj3cFKYrxMXLjw88wAbQ3smOQ3OTn/73yZiw6A7jK0G9tjJ0rcPmtnB8zNFbnjU0VtT52VWD1/UcE4KzOFw39K3D6D44NDYRWeOVdQYKoxDue8YxjeH4b1lRXm5S70v+7HSHlkjO83FeSZkcNFnAUnDFsGuOIu7L0v4M7GbXRlusDeMGO9QMyIHikrYSA7ACEnQF2LuyLkrIzuTDd6Q704rB1CvabWp6B/qYeYFT31AmlTqtrX7XAmb2AwLsCyZoFz2wn7th2GqAHxfEI7nM6voW2+DY4dB8QNsVovsKVsCl2myOXyGrpA0LHSAWOsBZOxSeAL8LH0GWJYRGeyE/KqDHFFVOoFQkJQBucFpFNb+JH/gxeJFMx+M4SADW/TZdR2jnAzdAtXo1cgJ2XQ51TVKGBLrGqJXofkl7C5uotvld9YiC/hSSyCr8VfmF6cQcucAUPPhkAX6ZnGK9Aw9UhRCdeCJhAvQblwAPzkk+9ApXgA6z0rLGELWISBRuiZxkckQWLkIIUkGH1G9Ln7UPtUA/4Co75R6O/rIT2VoGaaNH4jmSM6EiAu4ieQgzJava2QZ2RMBCZgvmsGDVLweTOXeqZR8Jic8JFx8ogosl9Gj7cHpmkTqJ8/7iwvmCUqRcuc5i8q0JGHpJ08IG6uyB1rvNrarc18RHeu4DL+AeXUQV071uymAAAAAElFTkSuQmCCeJwTCk4tcUlNSyzNKSmONzTTK8hLZxgFIwes5sQv/03zkSgjAwBGXgl7UO9x9wEAAAACAAAAKgAAAKsJAAAAAAAAAQAAAAAAAAAAAAAA @@ -229,4 +227,3 @@ lines=2 [AuthorEncoded] FileCopy_80.png=7295,9828 Logo=FileCopy_80.png - diff --git a/Projects/PhoenixPE/Media Creation/Tools/Ventoy.script b/Projects/PhoenixPE/Media Creation/Tools/Ventoy.script index ca5c785..51234c2 100644 --- a/Projects/PhoenixPE/Media Creation/Tools/Ventoy.script +++ b/Projects/PhoenixPE/Media Creation/Tools/Ventoy.script @@ -30,19 +30,19 @@ [Main] Title=Ventoy -Description=(v1.0.39) Ventoy is an open source tool used to create bootable USB devices capable of launching multiple ISO/WIM/IMG/VHD(x)/EFI files. +Description=(v1.0.41) Ventoy is an open source tool used to create bootable USB devices capable of launching multiple ISO/WIM/IMG/VHD(x)/EFI files. Author=Homes32 Level=8 Selected=None Mandatory=False -Version=1.1.2.0 -Date=2021-03-28 +Version=1.1.3.0 +Date=2021-04-25 Interface=Interface [Variables] %ProgramFolder%="%Workbench%\Ventoy" %ProgramExe%="Ventoy2Disk.exe" -%ProgramVer%="1.0.39" +%ProgramVer%="1.0.41" %DownloadURL%=https://github.com/ventoy/Ventoy/releases/download/v%ProgramVer%/ventoy-%ProgramVer%-windows.zip %SetupFile%="Ventoy.zip" diff --git a/Projects/PhoenixPE/PhoenixAPI.script b/Projects/PhoenixPE/PhoenixAPI.script index bb973f0..d406d4d 100644 --- a/Projects/PhoenixPE/PhoenixAPI.script +++ b/Projects/PhoenixPE/PhoenixAPI.script @@ -76,7 +76,7 @@ Innounp=Run,%API%,_PhoenixAPI_Innounp // XML XMLAdd=Run,%API%,_PhoenixAPI_XMLAdd XMLDelete=Run,%API%,_PhoenixAPI_XMLDelete -//XMLRead= +//XMLRead=NOT IMPLIMENTED XMLRename=Run,%API%,_PhoenixAPI_XMLRename XMLUpdate=Run,%API%,_PhoenixAPI_XMLUpdate diff --git a/Projects/PhoenixPE/Shell/001-Explorer.script b/Projects/PhoenixPE/Shell/001-Explorer.script index 1cb9b4f..6cc870b 100644 --- a/Projects/PhoenixPE/Shell/001-Explorer.script +++ b/Projects/PhoenixPE/Shell/001-Explorer.script @@ -814,14 +814,6 @@ RequireFileEx,AppendList,\Windows\System32\appinfo.dll RequireFileEx,AppendList,\Windows\System32\appinfoext.dll,NOMUI RequireFileEx,AppendList,\Windows\System32\objsel.dll -/////////////////////////////////////////////////////////////////////////////////// -// Monitor - Moved to Display Drivers Script -//RequireFileEx,AppendList,\Windows\INF\c_monitor.inf,NOMUI -//RequireFileEx,AppendList,\Windows\INF\monitor.inf,NOMUI -//RequireFileEx,AppendList,\Windows\System32\drivers\monitor.sys,NOMUI -//RequireFileEx,AppendList,\Windows\System32\DriverStore\FileRepository\c_monitor.inf_*,NOMUI -//RequireFileEx,AppendList,\Windows\System32\DriverStore\FileRepository\monitor.inf_*,NOMUI - /////////////////////////////////////////////////////////////////////////////////// // Battery icon diff --git a/Projects/PhoenixPE/Testing/HostBoot.script b/Projects/PhoenixPE/Testing/HostBoot.script index 8d6b6c5..6a0fa27 100644 --- a/Projects/PhoenixPE/Testing/HostBoot.script +++ b/Projects/PhoenixPE/Testing/HostBoot.script @@ -147,17 +147,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_GraphicalBootMenu,False // Related........: btn_AdvancedOptions // =============================================================================================================================== [ToggleAdvancedOptions] -System,SetLocal -ReadInterface,Visible,%ScriptFile%,Interface,btn_RemoveBootMenuEntry,%state% -If,%state%,Equal,False,Begin, - If,Question,"WARNING!#$x#$xAdvanced options are intended for expert users only!#$x#$xModifying advanced options without knowing what you are doing can cause permanent damage to your project and may result in unexpected behavior and/or build failures.#$x#$xAre you sure you want to continue?",Set,%Toggle%,True - Else,Set,%Toggle%,False -End -Else,Set,%Toggle%,False - -WriteInterface,Visible,%ScriptFile%,Interface,btn_RemoveBootMenuEntry,%Toggle% - -System,EndLocal +Message,"There are no advanced options available for this script." [#ShowScriptInfo#] // =============================================================================================================================== @@ -186,7 +176,7 @@ Message,"This script will create a menu entry in your computer’s Boot Menu giv // =============================================================================================================================== [Interface] btn_CreateBootMenuEntry="Create Boot Menu Entry",1,8,5,5,150,25,Process,Add_16.png,True -btn_RemoveBootMenuEntry="Remove Boot Menu Entry",0,8,163,5,150,25,RemoveBootMenuEntry,Remove_16.png,True +btn_RemoveBootMenuEntry="Remove Boot Menu Entry",1,8,163,5,150,25,RemoveBootMenuEntry,Remove_16.png,True btn_SetDefaultOptions=,1,8,541,5,25,25,SetDefaultOptions,SetDefaults_16.png,True,"__Restore Defaults" btn_AdvancedOptions=,1,8,571,5,25,25,ToggleAdvancedOptions,Advanced_16.png,True,"__Show/Hide Advanced Options" btn_ScriptInfo=,1,8,601,5,25,25,ShowScriptInfo,Help_16.png,True,"__Script Info" diff --git a/Projects/PhoenixPE/Testing/VMWare.script b/Projects/PhoenixPE/Testing/VMWare.script index 3ddb162..d1e8140 100644 --- a/Projects/PhoenixPE/Testing/VMWare.script +++ b/Projects/PhoenixPE/Testing/VMWare.script @@ -32,12 +32,12 @@ Title=VMware Author=Homes32 Description=Run your ISO in VMware Player/Workstation -Version=1.0.0.0 +Version=1.0.1.0 Level=9 Selected=True Mandatory=False NoWarning=False -Date=2019-05-05 +Date=2021-04-25 [Variables] %VMPath%=%ProjectTemp%\VMware @@ -131,9 +131,14 @@ TXTAddLine,%VMCfg%,"guestOS = #$q%VMOS%#$q",Append If,%cmb_numProc%,Equal,Auto,Begin System,GetEnv,"NUMBER_OF_PROCESSORS",%numProcessors% If,%numProcessors%,Equal,"",Set,%numProcessors%,1 + Else,Begin + // Set to n-1 to reserve an entire processor for the host system + Math,Sub,%numProcessors%,%numProcessors%,1 + End End Else,Set,%numProcessors%,%cmb_numProc% TXTAddLine,%VMCfg%,"numvcpus=#$q%numProcessors%#$q",Append +TXTAddLine,%VMCfg%,"cpuid.coresPerSocket=#$q%numProcessors%#$q",Append // Memory TXTAddLine,%VMCfg%,"memsize = #$q%cmb_MemSize%#$q",Append diff --git a/Projects/PhoenixPE/Testing/VirtualBox.script b/Projects/PhoenixPE/Testing/VirtualBox.script index 832266a..62e133c 100644 --- a/Projects/PhoenixPE/Testing/VirtualBox.script +++ b/Projects/PhoenixPE/Testing/VirtualBox.script @@ -32,12 +32,12 @@ Title=VirtualBox Author=Homes32 Description=Run your ISO in Oracle VirtualBox -Version=1.0.0.0 +Version=1.0.1.0 Level=9 Selected=False Mandatory=False NoWarning=False -Date=2019-05-05 +Date=2021-04-25 [Variables] %vmName%=%ProjectTitle% @@ -140,6 +140,10 @@ End If,%cmb_numProc%,Equal,Auto,Begin System,GetEnv,"NUMBER_OF_PROCESSORS",%numProcessors% If,%numProcessors%,Equal,"",Set,%numProcessors%,1 + Else,Begin + // Set to n-1 to reserve an entire processor for the host system + Math,Sub,%numProcessors%,%numProcessors%,1 + End End Else,Set,%numProcessors%,%cmb_numProc% ShellExecute,Hide,%VBoxManage.exe%,"modifyvm #$q%vmName%#$q --cpus %numProcessors%" diff --git a/Projects/PhoenixPE/Toolbox/HiveEdit.script b/Projects/PhoenixPE/Toolbox/HiveEdit.script index 78eb242..b6fd9fa 100644 --- a/Projects/PhoenixPE/Toolbox/HiveEdit.script +++ b/Projects/PhoenixPE/Toolbox/HiveEdit.script @@ -289,7 +289,7 @@ cb_CustomDefaultHive=Default,0,3,214,98,70,18,False,"__Edit the Default registry cb_CustomDriversHive=Drivers,0,3,214,116,70,18,False,"__Edit the Drivers registry hive" lbl_CustomHivePath="Hive directory:",0,1,304,90,84,16,8,Bold fb_CustomHives=,0,13,303,108,307,20,dir -lbl_CustomHiveInfo="Load offline registry hives from any location. This can be useful if you want to compare your build to another project or build.",0,1,302,59,314,27,8,Normal +lbl_CustomHiveInfo="Load offline registry hives from any location. This can be useful if you want to compare your hives to another project or build.",0,1,302,59,314,27,8,Normal [InterfaceEncoded] Help.png=3774,3999 diff --git a/Projects/PhoenixPE/Tweaks/CmdPrompt.script b/Projects/PhoenixPE/Tweaks/CmdPrompt.script index 10d40cd..8ec717f 100644 --- a/Projects/PhoenixPE/Tweaks/CmdPrompt.script +++ b/Projects/PhoenixPE/Tweaks/CmdPrompt.script @@ -135,7 +135,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Accessories" WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Command Prompt" -WriteInterface,Value,%ScriptFile%,Interface,cb_CmdPromptHere,False +WriteInterface,Value,%ScriptFile%,Interface,cb_CmdPromptHere,True System,Cursor,Normal [#ToggleAdvancedOptions#] @@ -188,7 +188,7 @@ cb_PinToTaskbar="Pin to Taskbar",1,3,12,103,122,18,False cb_PinToStartMenu="Pin to Start Menu",1,3,12,122,122,18,False txt_StartMenuFolder="Start Menu Folder:",1,0,12,162,119,21,Accessories txt_ShortcutName="Shortcut Name:",1,0,12,204,119,21,"Command Prompt" -cb_CmdPromptHere="Replace 'Open with Powershell'",1,3,147,65,200,18,False,"__Replace 'Open with Powershell' context menu entry with 'Open with Command Prompt'" +cb_CmdPromptHere="Replace 'Open with Powershell'",1,3,147,65,200,18,True,"__Replace 'Open with Powershell' context menu entry with 'Open with Command Prompt'" [InterfaceEncoded] SetDefaults_16.png=2475,3404 diff --git a/Projects/PhoenixPE/script.project b/Projects/PhoenixPE/script.project index 6f56f11..044fa9f 100644 --- a/Projects/PhoenixPE/script.project +++ b/Projects/PhoenixPE/script.project @@ -27,7 +27,7 @@ [Main] Title=PhoenixPE -Description=PhoenixPE is a rescue and recovery environment based on Win10 WinRE. +Description=PhoenixPE is a rescue and recovery environment based on Win10. Author=Homes32 Version=1.0.0.3 PathSetting=False @@ -99,15 +99,15 @@ InterfaceList=Interface,Interface_About,Interface_Options /////////////////////////////////////////////////////////////////////////////////// // Source Globals - Do Not Modify! - Set by 'Config Source' script -%SourceDir%=D:\Images\Win10_1909_English_x64 -%SourceBaseWim%=P:\PhoenixPE\Workbench\PhoenixPE\Cache\WinRE.wim -%SourceInstallWim%=D:\Images\Win10_1909_English_x64\Sources\Install.wim -%SourceBaseWimImage%=1 -%SourceInstallWimImage%=6 -%SourceArch%=x64 -%SourceLang%=en-US -%SourceFallbackLang%=en-US -%SourceVer%=10.0.18362.418 +%SourceDir%= +%SourceBaseWim%= +%SourceInstallWim%= +%SourceBaseWimImage%= +%SourceInstallWimImage%= +%SourceArch%= +%SourceLang%= +%SourceFallbackLang%= +%SourceVer%= [#Process#] // ===============================================================================================================================