diff --git a/Projects/PhoenixPE/Shell/001-Explorer.script b/Projects/PhoenixPE/Shell/001-Explorer.script index dd36485..08533c9 100644 --- a/Projects/PhoenixPE/Shell/001-Explorer.script +++ b/Projects/PhoenixPE/Shell/001-Explorer.script @@ -35,8 +35,8 @@ Author=Homes32 Level=3 Selected=True Mandatory=False -Version=1.4.0.0 -Date=2022-06-10 +Version=1.4.1.0 +Date=2022-07-20 [Variables] @@ -884,9 +884,9 @@ Else,If,%cmb_Win10ExplorerSource%,Equal,"Use explorer.exe from my Win10 host",Be Echo,"Copying explorer.exe from Host..." FileVersion,"C:\Windows\explorer.exe",%HostExplorerVer% If,%HostExplorerVer%,Smaller,"10.0.22000.0",FileCopy,"C:\Windows\explorer.exe",%TargetWindows% - Else,Halt,"You must build from a Win10 host in order to copy explorer.exe from your host." + Else,Halt,"ERROR: You must build from a Win10 host in order to copy explorer.exe from your host." End -Else,If,%cmb_Win10ExplorerSource%,Equal,"Extract explorer.exe from a Win10 ISO",Begin +Else,If,%cmb_Win10ExplorerSource%,Equal,"Extract explorer.exe from a Win10 ISO/Source",Begin // Extract Explorer from the provided .wim file + index Echo,"Extracting explorer.exe from .wim image..." If,ExistFile,"%pb_Win10ExplorerWIM%Sources\Install.wim",Begin @@ -896,7 +896,7 @@ Else,If,%cmb_Win10ExplorerSource%,Equal,"Extract explorer.exe from a Win10 ISO", Echo,"Warning:#$xYou have selected a source with [Install.esd] present.#$x.esd files MAY be encrypted. If you encounter problems building please select a different source which contains an unencrypted Install.esd or Install.wim",WARN WimExtract,"%pb_Win10ExplorerWIM%Sources\Install.esd",%num_WimImage%,"\Windows\explorer.exe",%TargetWindows% End - Else,Halt,"Invalid Source!#$x#$x Could not extract explorer.exe because %pb_Win10ExplorerWIM%Sources\Install.wim#$x#$xcould not be found." + Else,Halt,"ERROR: Invalid Source!#$x#$x Could not extract explorer.exe because %pb_Win10ExplorerWIM%Sources\Install.wim#$x#$xcould not be found." End Else,If,%cmb_Win10ExplorerSource%,Equal,"Use the explorer.exe application provided below",Begin // Copy from Path Box @@ -906,9 +906,9 @@ Else,If,%cmb_Win10ExplorerSource%,Equal,"Use the explorer.exe application provid FileVersion,%pb_Win10ExplorerEXE%,%HostExplorerVer% FileCopy,%pb_Win10Explorer%,%TargetWindows% End - Else,Halt,"You must provide the full path to the explorer.exe application." + Else,Halt,"ERROR: You must provide the full path to the explorer.exe application." End -Else,Halt,"INTERNAL LOGIC ERROR: Invalid selection." +Else,Halt,"INTERNAL LOGIC ERROR: Invalid selection [%cmb_Win10ExplorerSource%]." [#CheckWin10ExplorerSource#] // =============================================================================================================================== @@ -938,7 +938,7 @@ Else,Message,"Invalid Source!#$x#$x %pb_Win10ExplorerWIM%Sources\Install.wim#$x // Related........: cmb_Win10ExplorerSource // =============================================================================================================================== [ToggleWin10ExplorerSource] -If,%cmb_Win10ExplorerSource%,Equal,"Extract explorer.exe from a Win10 ISO",Begin +If,%cmb_Win10ExplorerSource%,Equal,"Extract explorer.exe from a Win10 ISO/Source",Begin WriteInterface,Visible,%ScriptFile%,Interface,pb_Win10ExplorerEXE,False WriteInterface,Visible,%ScriptFile%,Interface,pb_Win10ExplorerWIM,True WriteInterface,Visible,%ScriptFile%,Interface,num_WimImage,True @@ -987,7 +987,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_SmallIconsOnDesktop,True WriteInterface,Value,%ScriptFile%,Interface,cb_DisableDPIScaling,True WriteInterface,Value,%ScriptFile%,Interface,cb_ExpandOpStatusDlg,True WriteInterface,Value,%ScriptFile%,Interface,cb_ShowHiddenFiles,True -WriteInterface,Value,%ScriptFile%,Interface,cmb_Win10ExplorerSource,"Use explorer.exe from the Win11 source image" +WriteInterface,Value,%ScriptFile%,Interface,cmb_Win10ExplorerSource,"Use explorer.exe from my Win10 host" WriteInterface,Value,%ScriptFile%,Interface,pb_Win10ExplorerEXE,"" WriteInterface,Value,%ScriptFile%,Interface,pb_Win10ExplorerWIM,"" WriteInterface,Value,%ScriptFile%,Interface,num_WimImage,1 @@ -1060,7 +1060,7 @@ cb_ExpandOpStatusDlg="Expand Operation Status",1,3,160,145,200,18,True,"__Expand cb_ShowHiddenFiles="Show Hidden & System Files",1,3,160,97,200,18,True bvl_Win11Support="Win11 Support",1,12,151,275,403,94,8,Bold lbl_Win11Explorer="This option will only be processed if building from a Win11 source.",1,1,160,290,380,16,8,Normal -cmb_Win10ExplorerSource="Use explorer.exe from my Win10 host",1,4,160,310,311,21,"Use explorer.exe from the Win11 source image","Use explorer.exe from my Win10 host","Extract explorer.exe from a Win10 ISO","Use the explorer.exe application provided below",_ToggleWin10ExplorerSource_,True +cmb_Win10ExplorerSource="Use explorer.exe from my Win10 host",1,4,160,310,311,21,"Use explorer.exe from the Win11 source image","Use explorer.exe from my Win10 host","Extract explorer.exe from a Win10 ISO/Source","Use the explorer.exe application provided below",_ToggleWin10ExplorerSource_,True web_WhatIsThis="What is this?",1,10,480,312,67,18,https://github.com/PhoenixPE/PhoenixPE/wiki/FAQ#building-from-a-win11-source-with-explorer-shell-causes-blackscreen-on-boot pb_Win10ExplorerEXE=,0,20,160,340,380,20,file,"Title=Select the explorer.exe to include in your build",Filter=explorer.exe|explorer.exe,"__Select the explorer.exe to include in your build" pb_Win10ExplorerWIM=,0,20,160,340,329,20,dir,"Title=Select the directory containing your extracted Win10 ISO image.",_CheckWin10ExplorerSource_,True,"__Select the directory containing your extracted Win10 ISO image."