diff --git a/Projects/PhoenixPE/Applications/Backup & Imaging/ActiveDiskImage.script b/Projects/PhoenixPE/Applications/Backup & Imaging/ActiveDiskImage.script index 725fa1d..e6d9546 100644 --- a/Projects/PhoenixPE/Applications/Backup & Imaging/ActiveDiskImage.script +++ b/Projects/PhoenixPE/Applications/Backup & Imaging/ActiveDiskImage.script @@ -92,7 +92,7 @@ If,Not,%LangPos%,Equal,0,Begin List,Get,%aLangMap%,%LangPos%,%LangCode% RegWrite,HKLM,0x4,"Tmp_Default\Software\LSoft Technologies\Active Disk Image","Language",%LangCode% End -Else,Halt,"LOGIC ERROR: The specified language is not defined." +Else,Halt,"INTERNAL LOGIC ERROR: The specified language is not defined." // Product Registration If,%cmb_RegEdition%,Equal,"Use Host License",Begin diff --git a/Projects/PhoenixPE/Applications/Disk Management/AOMI-PartitionAssistant.script b/Projects/PhoenixPE/Applications/Disk Management/AOMI-PartitionAssistant.script index b79e0c1..3edfe45 100644 --- a/Projects/PhoenixPE/Applications/Disk Management/AOMI-PartitionAssistant.script +++ b/Projects/PhoenixPE/Applications/Disk Management/AOMI-PartitionAssistant.script @@ -115,7 +115,7 @@ If,Not,%LangPos%,Equal,0,Begin IniWrite,"%TargetPrograms%\%ProgramFolder%\cfg.ini","Language","LANGUAGE","%LangCode%" IniWrite,"%TargetPrograms%\%ProgramFolder%\cfg.ini","Language","LANGCHANGED",1 End -Else,Halt,"LOGIC ERROR: The specified language is not defined." +Else,Halt,"INTERNAL LOGIC ERROR: The specified language is not defined." // Product Registration List,Pos,%aSoftwareEditon%,%cmb_RegEdition%,%RegEditionCodePos% diff --git a/Projects/PhoenixPE/Applications/Disk Management/DiskGenius.script b/Projects/PhoenixPE/Applications/Disk Management/DiskGenius.script index 7571ab4..27a6849 100644 --- a/Projects/PhoenixPE/Applications/Disk Management/DiskGenius.script +++ b/Projects/PhoenixPE/Applications/Disk Management/DiskGenius.script @@ -70,7 +70,7 @@ If,Not,%LangPos%,Equal,0,Begin List,Get,%aLangMap%,%LangPos%,%LangCode% IniWrite,"%TargetPrograms%\%ProgramFolder%\Options.ini","Settings","Language","%LangCode%" End -Else,Halt,"LOGIC ERROR: The specified language is not defined." +Else,Halt,"INTERNAL LOGIC ERROR: The specified language is not defined." // Don't show nag screen FileCreateBlank,"%TargetPrograms%\%ProgramFolder%\Options.ini" diff --git a/Projects/PhoenixPE/Applications/Networking/Firefox.script b/Projects/PhoenixPE/Applications/Networking/Firefox.script index 1d7c8d2..a6c9ff1 100644 --- a/Projects/PhoenixPE/Applications/Networking/Firefox.script +++ b/Projects/PhoenixPE/Applications/Networking/Firefox.script @@ -58,7 +58,7 @@ StrFormat,RTRIM,%FirefoxLang%,1,%FirefoxLang% If,%rbtn_GA%,Equal,True,Set,%FirefoxEdition%,"firefox-latest-ssl" Else,If,%rbtn_Dev%,Equal,True,Set,%FirefoxEdition%,"firefox-devedition-latest-ssl" Else,If,%rbtn_ESR%,Equal,True,Set,%FirefoxEdition%,"firefox-esr-latest-ssl" -Else,Halt,"Logic Error: The selected release is not defined." +Else,Halt,"INTERNAL LOGIC ERROR: The selected release is not defined." /////////////////////////////////////////////////////////////////////////////////// // Extract diff --git a/Projects/PhoenixPE/Applications/Networking/PuTTY.script b/Projects/PhoenixPE/Applications/Networking/PuTTY.script index b2826ca..2793283 100644 --- a/Projects/PhoenixPE/Applications/Networking/PuTTY.script +++ b/Projects/PhoenixPE/Applications/Networking/PuTTY.script @@ -67,7 +67,7 @@ If,%SourceArch%,Equal,x64,Begin If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\putty64.zip",Run,%ScriptFile%,DownloadProgram,%DownloadURL64-putty.zip%,"%ProgramsCache%\%ProgramFolder%\putty64.zip" Decompress,"%ProgramsCache%\%ProgramFolder%\putty64.zip","%TargetPrograms%\%ProgramFolder%" End - Else,Halt,"LOGIC ERROR: The option is not defined." + Else,Halt,"INTERNAL LOGIC ERROR: The option is not defined." End Else,If,%SourceArch%,Equal,x86,Begin If,%rbtn_puttyOnly%,Equal,True,Begin @@ -80,7 +80,7 @@ Else,If,%SourceArch%,Equal,x86,Begin If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\putty.zip",Run,%ScriptFile%,DownloadProgram,%DownloadURL86-putty.zip%,"%ProgramsCache%\%ProgramFolder%\putty.zip" Decompress,"%ProgramsCache%\%ProgramFolder%\putty.zip","%TargetPrograms%\%ProgramFolder%" End - Else,Halt,"LOGIC ERROR: The option is not defined." + Else,Halt,"INTERNAL LOGIC ERROR: The option is not defined." End Else,Halt,"ERROR: [%SourceArch%] is not a supported architecture." diff --git a/Projects/PhoenixPE/Applications/Networking/WinSCP.script b/Projects/PhoenixPE/Applications/Networking/WinSCP.script index 0556910..a755f17 100644 --- a/Projects/PhoenixPE/Applications/Networking/WinSCP.script +++ b/Projects/PhoenixPE/Applications/Networking/WinSCP.script @@ -87,7 +87,7 @@ If,Not,%LCID%,Equal,"1033",Begin List,Get,%aLangMap%,%LCIDStrPos%,%LCIDStr% FileCopy,"%ProjectTemp%\%ProgramFolder%\{app}\Translations\WinSCP.%LCIDStr%","%TargetPrograms%\%ProgramFolder%\Translations\WinSCP.%LCIDStr%" End - Else,Halt,"LOGIC ERROR: The specified language is not defined." + Else,Halt,"INTERNAL LOGIC ERROR: The specified language is not defined." End DirCopy,"%ProjectTemp%\%ProgramFolder%\{app}\PuTTY","%TargetPrograms%\%ProgramFolder%\PuTTY" diff --git a/Projects/PhoenixPE/Applications/System Information/Aida64.script b/Projects/PhoenixPE/Applications/System Information/Aida64.script index 153c8b7..7e31a83 100644 --- a/Projects/PhoenixPE/Applications/System Information/Aida64.script +++ b/Projects/PhoenixPE/Applications/System Information/Aida64.script @@ -53,7 +53,7 @@ Echo,"Processing %ScriptTitle%..." If,%cb_RunFromRam%,Equal,True,RunFromRam If,%rbtn_Extreme%,Equal,True,Set,%DownloadURL%,%DownloadURL-Extreme% Else,If,%rbtn_Engineer%,Equal,True,Set,%DownloadURL%,%DownloadURL-Engineer% -Else,Halt,"LOGIC ERROR: Invalid Release selected." +Else,Halt,"INTERNAL LOGIC ERROR: Invalid Release selected." /////////////////////////////////////////////////////////////////////////////////// // Extract @@ -117,7 +117,7 @@ Decompress,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",#1 Echo,"Downloading %ScriptTitle%..." If,%rbtn_Extreme%,Equal,True,Set,%DownloadURL%,%DownloadURL-Extreme% Else,If,%rbtn_Engineer%,Equal,True,Set,%DownloadURL%,%DownloadURL-Engineer% -Else,Halt,"LOGIC ERROR: Invalid Release selected." +Else,Halt,"INTERNAL LOGIC ERROR: Invalid Release selected." WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",NOERR If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]." diff --git a/Projects/PhoenixPE/Applications/System Tools/AttributeChanger.script b/Projects/PhoenixPE/Applications/System Tools/AttributeChanger.script index 1f57f02..da02481 100644 --- a/Projects/PhoenixPE/Applications/System Tools/AttributeChanger.script +++ b/Projects/PhoenixPE/Applications/System Tools/AttributeChanger.script @@ -94,7 +94,7 @@ If,Not,%LangPos%,Equal,0,Begin List,Get,%aLangMap-Docs%,%LangPos%,%LangCode% FileCopy,"%ProjectTemp%\%ProgramFolder%\{app}\ac#$c%LangCode%.pdf","%TargetPrograms%\%ProgramFolder%\ac.pdf" End -Else,Echo,"LOGIC ERROR: The specified language does not exist in [#$paLangMap-Docs#$p]. Help files will not be included.",WARN +Else,Echo,"INTERNAL LOGIC ERROR: The specified language does not exist in [#$paLangMap-Docs#$p]. Help files will not be included.",WARN // ConfirmChanges If,%cb_ConfirmChanges%,Equal,True,RegWrite,HKLM,0x4,"Tmp_Default\Software\Attribute Changer\Global Settings","OtherConfirm",1 diff --git a/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-10.script b/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-10.script index b1daae7..247c853 100644 --- a/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-10.script +++ b/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-10.script @@ -52,7 +52,7 @@ Else,If,%SourceArch%,Equal,x86,Begin ExtractFile,%ScriptFile%,x86,VC10.7z,%ProjectTemp%\x86 Decompress,%ProjectTemp%\x86\VC10.7z,%TargetSystem32% End -Else,Halt,"Logic Error: Only x86 and x64 sources are supported." +Else,Halt,"INTERNAL LOGIC ERROR: Only x86 and x64 sources are supported." [#Interface#] // =============================================================================================================================== diff --git a/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-11.script b/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-11.script index 2c0c7bc..1c2ccb2 100644 --- a/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-11.script +++ b/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-11.script @@ -52,7 +52,7 @@ Else,If,%SourceArch%,Equal,x86,Begin ExtractFile,%ScriptFile%,x86,VC11.7z,%ProjectTemp%\x86 Decompress,%ProjectTemp%\x86\VC11.7z,%TargetSystem32% End -Else,Halt,"Logic Error: Only x86 and x64 sources are supported." +Else,Halt,"INTERNAL LOGIC ERROR: Only x86 and x64 sources are supported." [#Interface#] // =============================================================================================================================== diff --git a/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-12.script b/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-12.script index 01f6e82..aba4e43 100644 --- a/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-12.script +++ b/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-12.script @@ -52,7 +52,7 @@ Else,If,%SourceArch%,Equal,x86,Begin ExtractFile,%ScriptFile%,x86,VC12.7z,%ProjectTemp%\x86 Decompress,%ProjectTemp%\x86\VC12.7z,%TargetSystem32% End -Else,Halt,"Logic Error: Only x86 and x64 sources are supported." +Else,Halt,"INTERNAL LOGIC ERROR: Only x86 and x64 sources are supported." [#Interface#] // =============================================================================================================================== diff --git a/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-14.script b/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-14.script index 4e78c88..a36d4e8 100644 --- a/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-14.script +++ b/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-14.script @@ -52,7 +52,7 @@ Else,If,%SourceArch%,Equal,x86,Begin ExtractFile,%ScriptFile%,x86,VC14.7z,%ProjectTemp%\x86 Decompress,%ProjectTemp%\x86\VC14.7z,%TargetSystem32% End -Else,Halt,"Logic Error: Only x86 and x64 sources are supported." +Else,Halt,"INTERNAL LOGIC ERROR: Only x86 and x64 sources are supported." [#Interface#] // =============================================================================================================================== diff --git a/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-Embedded.script b/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-Embedded.script index 3b3a12a..c2c5a67 100644 --- a/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-Embedded.script +++ b/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-Embedded.script @@ -49,7 +49,7 @@ RegHiveLoad,Tmp_Install_Software,%RegInstallSoftware% Run,%ScriptFile%,Embedded-Common If,%SourceArch%,Equal,x86,Run,%ScriptFile%,Embedded-x86 Else,If,%SourceArch%,Equal,x64,Run,%ScriptFile%,Embedded-x64 -Else,Halt,"Logic Error: Only x86 and x64 sources are supported." +Else,Halt,"INTERNAL LOGIC ERROR: Only x86 and x64 sources are supported." RegHiveUnload,Tmp_Software RegHiveUnload,Tmp_Install_Software diff --git a/Projects/PhoenixPE/Core/212-ShellConfig.script b/Projects/PhoenixPE/Core/212-ShellConfig.script index a8e059c..d7fe81b 100644 --- a/Projects/PhoenixPE/Core/212-ShellConfig.script +++ b/Projects/PhoenixPE/Core/212-ShellConfig.script @@ -290,7 +290,7 @@ RegWrite,HKLM,0x4,"Tmp_System\ControlSet001\Services\FBWF","WinPECacheThreshold" If,%cmb_NumlockStatus%,Equal,"ON",Set,%NumlockStatus%,2 Else,If,%cmb_NumlockStatus%,Equal,"OFF",Set,%NumlockStatus%,0 Else,If,%cmb_NumlockStatus%,Equal,"BIOS",Set,%NumlockStatus%,2147483648 -Else,Halt,"Logic Error: [%cmb_NumlockStatus%] is not a valid numlock status." +Else,Halt,"INTERNAL LOGIC ERROR: [%cmb_NumlockStatus%] is not a valid numlock status." RegWrite,HKLM,0x1,"Tmp_Default\Control Panel\Keyboard","InitialKeyboardIndicators",%NumlockStatus% [#RunOnceEx#] diff --git a/Projects/PhoenixPE/Finalize/709-TweakBox.script b/Projects/PhoenixPE/Finalize/709-TweakBox.script index 00e96b8..a96dee8 100644 --- a/Projects/PhoenixPE/Finalize/709-TweakBox.script +++ b/Projects/PhoenixPE/Finalize/709-TweakBox.script @@ -280,7 +280,7 @@ btn_SetDefaultOptions=,1,8,543,5,25,25,SetDefaultOptions,SetDefaults_16.png,True btn_AdvancedOptions=,1,8,574,5,25,25,ToggleAdvancedOptions,Advanced_16.png,True,"__Show Advanced Options" btn_ScriptInfo=,1,8,605,5,25,25,ShowScriptInfo,Help_16.png,True,"__Script Info" bvl_ReqFiles=" Codebox",1,12,5,50,625,295,8,Bold -cb_Codebox=,1,3,15,40,85,18,False +cb_Codebox=,1,3,15,40,85,18,True rtf_Codebox=Codebox.txt,1,6,15,99,602,236 btn_ExecCodebox=Execute,1,8,15,66,80,25,ExecCodebox,play-16.ico,False btn_EditCodebox="Edit Codebox",1,8,104,66,100,25,EditCodebox,Log.ico,False diff --git a/Projects/PhoenixPE/Media Creation/Copy2Folder.script b/Projects/PhoenixPE/Media Creation/Copy2Folder.script index a90472b..8951af8 100644 --- a/Projects/PhoenixPE/Media Creation/Copy2Folder.script +++ b/Projects/PhoenixPE/Media Creation/Copy2Folder.script @@ -78,7 +78,7 @@ Else,If,%rbtn_CopyOutputDir%,Equal,True,Begin If,ExistDir,%OutputDir%,FileCopy,"%OutputDir%\*.*",%fb_Dest% Else,RaiseErr,"[%OutputDir%] does not exist. Please rebuild your project." End -Else,Halt,"Logic Error: No configuration defined for file copy." +Else,Halt,"INTERNAL LOGIC ERROR: No configuration defined for file copy." [#RaiseErr#] // =============================================================================================================================== diff --git a/Projects/PhoenixPE/PhoenixAPI.script b/Projects/PhoenixPE/PhoenixAPI.script index 1c1524f..dde007d 100644 --- a/Projects/PhoenixPE/PhoenixAPI.script +++ b/Projects/PhoenixPE/PhoenixAPI.script @@ -32,8 +32,8 @@ Title=PhoenixPE API Author=Homes32 Description=PhoenixPE scripting support library. -Version=1.5.0.0 -Date=2022-03-05 +Version=1.5.1.0 +Date=2022-06-16 Level=0 Selected=None @@ -1048,7 +1048,7 @@ Else,Begin If,Not,%WorkDir%,Equal,"",Echo,"Warning: Shortcuts.exe does not support the argument for AddShortcut.",Warn // Hotkey - If,%Hotkey%,Not,Equal,"",Echo,"Warning: Shortcuts.exe does not support the argument for AddShortcut.",Warn + If,Not,%Hotkey%,Equal,"",Echo,"Warning: Shortcuts.exe does not support the argument for AddShortcut.",Warn // Final Cfg Entry If,%Type%,Equal,"Desktop",IniWriteTextLine,%TargetSystem32%\PhoenixPE.cfg,Shortcut,"%Folder%|%Title%|%ProgramExe%|%Icon%|%Parameters%" diff --git a/Projects/PhoenixPE/Shell/051-StartIsBack++.script b/Projects/PhoenixPE/Shell/051-StartIsBack++.script index d9d165f..03cc129 100644 --- a/Projects/PhoenixPE/Shell/051-StartIsBack++.script +++ b/Projects/PhoenixPE/Shell/051-StartIsBack++.script @@ -103,7 +103,7 @@ If,%cmb_Orb%,Equal,"Shamrock",RegWrite,HKLM,0x1,"Tmp_Default\Software\StartIsBac Else,If,%cmb_Orb%,Equal,"Win10",RegWrite,HKLM,0x1,"Tmp_Default\Software\StartIsBack","OrbBitmap","" Else,If,%cmb_Orb%,Equal,"Win8",RegWrite,HKLM,0x1,"Tmp_Default\Software\StartIsBack","OrbBitmap","X:\Program Files\StartIsBack\Orbs\StartIsBack_Ei8htOrb_v2_by_PainteR.bmp" Else,If,%cmb_Orb%,Equal,"Win7",RegWrite,HKLM,0x1,"Tmp_Default\Software\StartIsBack","OrbBitmap","X:\Program Files\StartIsBack\Orbs\Windows 7.orb" -Else,Halt,"Logic Error: No configuration defined for Orb Bitmap [%cmb_Orb%]" +Else,Halt,"INTERNAL LOGIC ERROR: No configuration defined for Orb Bitmap [%cmb_Orb%]" // User Account Picture If,%cb_ShowUserPic%,Equal,True,RegWrite,HKLM,0x4,"Tmp_Default\Software\StartIsBack","HideUserFrame",0 diff --git a/Projects/PhoenixPE/Testing/VMWare.script b/Projects/PhoenixPE/Testing/VMWare.script index 19eb691..64cd44b 100644 --- a/Projects/PhoenixPE/Testing/VMWare.script +++ b/Projects/PhoenixPE/Testing/VMWare.script @@ -168,13 +168,13 @@ If,Not,%cmb_NetworkAdapter%,Equal,Disabled,Begin TXTAddLine,%VMCfg%,"Ethernet0.present = #$qTRUE#$q",Append If,%cmb_NetworkMode%,Equal,Bridged,TXTAddLine,%VMCfg%,"Ethernet0.connectionType = #$qbridged#$q",Append Else,If,%cmb_NetworkMode%,Equal,NAT,TXTAddLine,%VMCfg%,"Ethernet0.connectionType = #$qnat#$q",Append - Else,Halt,"Logic Error: No configuration has been defined for Network Connection [%cmb_NetworkMode%]" + Else,Halt,"INTERNAL LOGIC ERROR: No configuration has been defined for Network Connection [%cmb_NetworkMode%]" TXTAddLine,%VMCfg%,"Ethernet0.addressType = #$qgenerated#$q",Append If,%cmb_NetworkAdapter%,Equal,"Intel 82545EM",TXTAddLine,%VMCfg%,"Ethernet0.virtualDev = #$qe1000#$q",Append Else,If,%cmb_NetworkAdapter%,Equal,"AMD 79C970",TXTAddLine,%VMCfg%,"Ethernet0.virtualDev = #$qvlance#$q",Append Else,If,%cmb_NetworkAdapter%,Equal,"VMXNET 3",TXTAddLine,%VMCfg%,"Ethernet0.virtualDev = #$qvmxnet3#$q",Append - Else,Halt,"Logic Error: No configuration has been defined for Network Adapter [%cmb_NetworkAdapter%]" + Else,Halt,"INTERNAL LOGIC ERROR: No configuration has been defined for Network Adapter [%cmb_NetworkAdapter%]" //TXTAddLine,%VMCfg%,Ethernet0.virtualDev=#$qvmxnet#$q,Append End @@ -185,7 +185,7 @@ If,Not,%cmb_Audio%,Equal,Disabled,Begin TXTAddLine,%VMCfg%,"sound.autodetect = #$qTRUE#$q",Append If,%cmb_Audio%,Equal,"Creative ES1371",TXTAddLine,%VMCfg%,"sound.virtualDev = #$qes1371#$q",Append Else,If,%cmb_Audio%,Equal,"Intel HD Audio",TXTAddLine,%VMCfg%,"sound.virtualDev = #$qhdaudio#$q",Append - Else,Halt,"Logic Error: No configuration has been defined for Audio Driver [%cmb_Audio%]" + Else,Halt,"INTERNAL LOGIC ERROR: No configuration has been defined for Audio Driver [%cmb_Audio%]" End // USB 1/2/3 @@ -199,7 +199,7 @@ Else,If,%cmb_USB%,Equal,"USB 3.0",Begin TXTAddLine,%VMCfg%,"ehci.present = #$qTRUE#$q",Append TXTAddLine,%VMCfg%,"usb_xhci.present = #$qTRUE#$q",Append End -Else,Halt,"Logic Error: No configuration has been defined for USB [%cmb_USB%]" +Else,Halt,"INTERNAL LOGIC ERROR: No configuration has been defined for USB [%cmb_USB%]" // Boot Delay Math,Mul,%tmp_Delay%,%num_BootDelay%,1000 @@ -209,7 +209,7 @@ Set,%tmp_Delay%,Nil // Firmware If,%cmb_Firmware%,Equal,"UEFI",TxtAddLine,%VMCfg%,"firmware = #$qefi#$q",Append Else,If,%cmb_Firmware%,Equal,"BIOS",TxtAddLine,%VMCfg%,"firmware = #$qbios#$q",Append -Else,Halt,"Logic Error: No configuration has been defined for Firmware [%cmb_Firmware%]" +Else,Halt,"INTERNAL LOGIC ERROR: No configuration has been defined for Firmware [%cmb_Firmware%]" // Trusted Platform Module (TPM) - This setting is not available in VMWare Player Pref. -- We should check and make sure Firmware is UEFI...) If,%cb_EnableTPM%,Equal,True,TxtAddLine,%VMCfg%,"managedvm.autoAddVTPM = #$qsoftware#$q",Append @@ -235,7 +235,7 @@ If,Not,%cmb_SharedFolder%,Equal,Disabled,Begin TXTAddLine,%VMCfg%,"sharedFolder0.readAccess = #$qTRUE#$q",Append TXTAddLine,%VMCfg%,"sharedFolder0.writeAccess = #$qTRUE#$q",Append End - Else,Halt,"Logic Error: No configuration exists for [%cmb_SharedFolder%]" + Else,Halt,"INTERNAL LOGIC ERROR: No configuration exists for [%cmb_SharedFolder%]" TXTAddLine,%VMCfg%,"sharedFolder0.hostPath = #$q%fb_SharedFolder%#$q",Append TXTAddLine,%VMCfg%,"sharedFolder0.guestName = #$q%SharedFolderName%#$q",Append @@ -261,7 +261,7 @@ If,Not,%cmb_VirtualHDD%,Equal,Disabled,Begin If,ExistFile,%fb_VirtualHDD%,TXTAddLine,%VMCfg%,"sata0:0.fileName = #$q%fb_VirtualHDD%#$q",Append Else,Halt,"Error: The virtual hard disk [%fb_VirtualHDD%] does not exist." End - Else,Halt,"Logic Error: No configuration exists for [%cmb_VirtualHDD%]" + Else,Halt,"INTERNAL LOGIC ERROR: No configuration exists for [%cmb_VirtualHDD%]" End [#RebuildWIM+ISO#] diff --git a/Projects/PhoenixPE/Testing/VirtualBox.script b/Projects/PhoenixPE/Testing/VirtualBox.script index 9702075..99c7e6e 100644 --- a/Projects/PhoenixPE/Testing/VirtualBox.script +++ b/Projects/PhoenixPE/Testing/VirtualBox.script @@ -129,7 +129,7 @@ If,%ExtensionPackInstalled%,Equal,True,Begin If,%cmb_USB%,Equal,"USB 1.1",Set,%tmp_USB%,"--usb on" Else,If,%cmb_USB%,Equal,"USB 2.0",Set,%tmp_USB%,"--usb on --usbehci on" Else,If,%cmb_USB%,Equal,"USB 3.0",Set,%tmp_USB%,"--usb on --usbehci on --usbxhci on" - Else,Halt,"Logic Error: No configuration has been defined for USB [%cmb_USB%]" + Else,Halt,"INTERNAL LOGIC ERROR: No configuration has been defined for USB [%cmb_USB%]" ShellExecute,Hide,%VBoxManage.exe%,"modifyvm #$q%vmName%#$q %tmp_USB%" Set,%tmp_USB%,Nil @@ -170,7 +170,7 @@ If,%cmb_Audio%,Equal,Disabled,ShellExecute,Hide,%VBoxManage.exe%,"modifyvm #$q%v Else,Begin If,%cmb_Audio%,Equal,"Intel HD Audio",ShellExecute,Hide,%VBoxManage.exe%,"modifyvm #$q%vmName%#$q --audio dsound --audiocontroller hda --audioout on" Else,If,%cmb_Audio%,Equal,"ICH AC'97",ShellExecute,Hide,%VBoxManage.exe%,"modifyvm #$q%vmName%#$q --audio dsound --audiocontroller ac97 --audioout on" - Else,Halt,"Logic Error: No configuration has been defined for Audio Driver [%cmb_Audio%]" + Else,Halt,"INTERNAL LOGIC ERROR: No configuration has been defined for Audio Driver [%cmb_Audio%]" End // Network @@ -178,17 +178,17 @@ If,%cmb_NetworkAdapter%,Equal,Disabled,ShellExecute,Hide,%VBoxManage.exe%,"modif Else,Begin If,%cmb_NetworkMode%,Equal,Bridged,ShellExecute,Hide,%VBoxManage.exe%,"modifyvm #$q%vmName%#$q --nic1 bridged" Else,If,%cmb_NetworkMode%,Equal,NAT,ShellExecute,Hide,%VBoxManage.exe%,"modifyvm #$q%vmName%#$q --nic1 nat" - Else,Halt,"Logic Error: No configuration has been defined for Network Connection [%cmb_NetworkMode%]" + Else,Halt,"INTERNAL LOGIC ERROR: No configuration has been defined for Network Connection [%cmb_NetworkMode%]" If,%cmb_NetworkAdapter%,Equal,"Intel PRO/1000 MT",ShellExecute,Hide,%VBoxManage.exe%,"modifyvm #$q%vmName%#$q --nictype1 82540EM --cableconnected1 on" Else,If,%cmb_NetworkAdapter%,Equal,"PCnet-Fast III",ShellExecute,Hide,%VBoxManage.exe%,"modifyvm #$q%vmName%#$q --nictype1 Am79C973 --cableconnected1 on" - Else,Halt,"Logic Error: No configuration has been defined for Network Adapter [%cmb_NetworkAdapter%]" + Else,Halt,"INTERNAL LOGIC ERROR: No configuration has been defined for Network Adapter [%cmb_NetworkAdapter%]" End // Firmware If,%cmb_Firmware%,Equal,"UEFI",ShellExecute,Hide,%VBoxManage.exe%,"modifyvm #$q%vmName%#$q --firmware efi" Else,If,%cmb_Firmware%,Equal,"BIOS",ShellExecute,Hide,%VBoxManage.exe%,"modifyvm #$q%vmName%#$q --firmware bios" -Else,Halt,"Logic Error: No configuration has been defined for Firmware [%cmb_Firmware%]" +Else,Halt,"INTERNAL LOGIC ERROR: No configuration has been defined for Firmware [%cmb_Firmware%]" // Boot Delay Math,Mul,%tmp_Delay%,%num_BootDelay%,1000 @@ -204,7 +204,7 @@ If,Not,%cmb_SharedFolder%,Equal,Disabled,Begin If,%cmb_SharedFolder%,Equal,"Read-Only",ShellExecute,Hide,%VBoxManage.exe%,"sharedfolder add #$q%vmName%#$q --name #$q%SharedFolderName%#$q --hostpath #$q%fb_SharedFolder%#$q --automount --readonly" Else,If,%cmb_SharedFolder%,Equal,"Read/Write",ShellExecute,Hide,%VBoxManage.exe%,"sharedfolder add #$q%vmName%#$q --name #$q%SharedFolderName%#$q --hostpath #$q%fb_SharedFolder%#$q --automount" - Else,Halt,"Logic Error: No configuration exists for [%cmb_SharedFolder%]" + Else,Halt,"INTERNAL LOGIC ERROR: No configuration exists for [%cmb_SharedFolder%]" End // Virtual HDD (sata0:0) @@ -221,7 +221,7 @@ If,Not,%cmb_VirtualHDD%,Equal,Disabled,Begin If,ExistFile,%fb_VirtualHDD%,ShellExecute,Hide,%VBoxManage.exe%,"storageattach #$q%vmName%#$q --storagectl #$qSATA Controller#$q --port 0 --device 0 --type hdd --medium #$q%fb_VirtualHDD%#$q" Else,Halt,"Error: The virtual hard disk [%fb_VirtualHDD%] does not exist." End - Else,Halt,"Logic Error: No configuration exists for [%cmb_VirtualHDD%]" + Else,Halt,"INTERNAL LOGIC ERROR: No configuration exists for [%cmb_VirtualHDD%]" End // Misc. Settings (Enable Copy/Paste, Disable mouse capture) diff --git a/Projects/PhoenixPE/Toolbox/ScriptFactory.script b/Projects/PhoenixPE/Toolbox/ScriptFactory.script index 168396b..f6739b8 100644 --- a/Projects/PhoenixPE/Toolbox/ScriptFactory.script +++ b/Projects/PhoenixPE/Toolbox/ScriptFactory.script @@ -76,7 +76,7 @@ Set,%NewScript%,"%myAppsFolder%\%LevelFolder%\%txt_ScriptFolder%\%txt_ScriptTitl If,%cmb_ScriptTemplate%,Equal,"Simple Embedded App",Run,%ScriptFile%,CreateSimpleEmbeddedScript Else,If,%cmb_ScriptTemplate%,Equal,"Simple Download App",Run,%ScriptFile%,CreateSimpleDownloadScript Else,If,%cmb_ScriptTemplate%,Equal,"Blank Script",Run,%ScriptFile%,CreateBlankScript -Else,Exit,"LOGIC ERROR: An invalid template was selected.",WARN +Else,Exit,"INTERNAL LOGIC ERROR: An invalid template was selected.",WARN // Configure our basic script information IniWrite,%NewScript%,"Main","Title",%txt_ScriptTitle% @@ -182,7 +182,7 @@ FileRename,"%myAppsFolder%\%LevelFolder%\%txt_ScriptFolder%\%TemplateScript%",%N If,%cmb_ScriptTemplate%,Equal,"Simple Embedded App",WriteInterface,Text,%ScriptFile%,Interface,lbl_TemplateDescr,"A simple script that contains embedded programs and extracts them at build time." Else,If,%cmb_ScriptTemplate%,Equal,"Simple Download App",WriteInterface,Text,%ScriptFile%,Interface,lbl_TemplateDescr,"A simple script that downloads programs at build time." Else,If,%cmb_ScriptTemplate%,Equal,"Blank Script",WriteInterface,Text,%ScriptFile%,Interface,lbl_TemplateDescr,"A skeleton framework for advanced users." -Else,Exit,"LOGIC ERROR: An invalid template was selected.",WARN +Else,Exit,"INTERNAL LOGIC ERROR: An invalid template was selected.",WARN [#SetDefaultOptions#] // =============================================================================================================================== diff --git a/Projects/PhoenixPE/Tools/x64/gron.exe b/Projects/PhoenixPE/Tools/x64/gron.exe deleted file mode 100644 index b8ed091..0000000 Binary files a/Projects/PhoenixPE/Tools/x64/gron.exe and /dev/null differ diff --git a/Projects/PhoenixPE/Tweaks/IME.script b/Projects/PhoenixPE/Tweaks/IME.script index a953dbb..2799592 100644 --- a/Projects/PhoenixPE/Tweaks/IME.script +++ b/Projects/PhoenixPE/Tweaks/IME.script @@ -107,7 +107,7 @@ RegWrite,HKLM,0x3,"Tmp_Default\Control Panel\Desktop","UserPreferencesMask",#r If,%cmb_LangBarPos%,Equal,"Docked in the TaskBar",RegWrite,HKLM,0x4,"Tmp_Default\Software\Microsoft\CTF\LangBar","ShowStatus",4 Else,If,%cmb_LangBarPos%,Equal,"Floating On Desktop",RegWrite,HKLM,0x4,"Tmp_Default\Software\Microsoft\CTF\LangBar","ShowStatus",0 Else,If,%cmb_LangBarPos%,Equal,"Hidden",RegWrite,HKLM,0x4,"Tmp_Default\Software\Microsoft\CTF\LangBar","ShowStatus",3 -Else,Halt,"Logic Error: No configuration defined for language bar position [%cmb_LangBarPos%]" +Else,Halt,"INTERNAL LOGIC ERROR: No configuration defined for language bar position [%cmb_LangBarPos%]" // Show the Language bar as transparent when inactive If,%cb_LangBarTransparent%,Equal,True,RegWrite,HKLM,0x4,"Tmp_Default\Software\Microsoft\CTF\LangBar","Transparency",64 diff --git a/Projects/PhoenixPE/Tweaks/Theme.script b/Projects/PhoenixPE/Tweaks/Theme.script index 521a7d7..df7f56f 100644 --- a/Projects/PhoenixPE/Tweaks/Theme.script +++ b/Projects/PhoenixPE/Tweaks/Theme.script @@ -55,7 +55,7 @@ If,%cmb_Theme%,Equal,"Default",Echo,"Using Default Theme" Else,If,%cmb_Theme%,Equal,"Annihilator",Run,%ScriptFile%,Theme-Annihilator Else,If,%cmb_Theme%,Equal,"Nocturnal",Run,%ScriptFile%,Theme-Nocturnal Else,If,%cmb_Theme%,Equal,"Custom",Run,%ScriptFile%,Theme-Custom -Else,Halt,"LOGIC ERROR: [%cmb_Theme%] is not a valid theme." +Else,Halt,"INTERNAL LOGIC ERROR: [%cmb_Theme%] is not a valid theme." Run,%ScriptFile%,ColorMeBadd diff --git a/Projects/PhoenixPE/Tweaks/Wallpaper.script b/Projects/PhoenixPE/Tweaks/Wallpaper.script index 56803d3..2ed4315 100644 --- a/Projects/PhoenixPE/Tweaks/Wallpaper.script +++ b/Projects/PhoenixPE/Tweaks/Wallpaper.script @@ -120,7 +120,7 @@ Else,If,%cmb_Position%,Equal,"Tile",Begin RegWrite,HKLM,0x1,"Tmp_Default\Software\Microsoft\Internet Explorer\Desktop\General","TileWallpaper",1 RegWrite,HKLM,0x1,"Tmp_Default\Software\Microsoft\Internet Explorer\Desktop\General","WallpaperStyle",0 End -Else,Halt,"LOGIC ERROR: No configuration exists for [%cmb_Position%]" +Else,Halt,"INTERNAL LOGIC ERROR: No configuration exists for [%cmb_Position%]" Run,%ScriptFile%,ColorMeBadd