From 72cd62552ed497d0d6d34d93d898efc40a2967fe Mon Sep 17 00:00:00 2001 From: Lyssa Date: Tue, 27 Jan 2026 20:59:20 +0400 Subject: [PATCH] Remove newlines before blue lines --- .../Activators/HWID_Activation.cmd | 26 ------------------ .../Activators/Ohook_Activation_AIO.cmd | 25 ++--------------- .../Activators/Online_KMS_Activation.cmd | 27 +++---------------- .../Activators/TSforge_Activation.cmd | 24 ++--------------- .../Change_Office_Edition.cmd | 5 ---- .../Change_Windows_Edition.cmd | 4 --- MAS/Separate-Files-Version/Troubleshoot.cmd | 1 - 7 files changed, 7 insertions(+), 105 deletions(-) diff --git a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd index 8428e6b..cdf1653 100644 --- a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd +++ b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd @@ -187,7 +187,6 @@ if %winbuild% LSS 10240 ( %eline% echo Unsupported OS version detected [%winbuild%]. echo HWID Activation is only supported on Windows 10/11. -echo: call :dk_color %Blue% "Use TSforge activation option from the main menu." goto dk_done ) @@ -674,7 +673,6 @@ call :dk_color %Red% "Checking Ticket Migration [Failed]" if not defined altapplist if not defined showfix if defined rebuildinfo ( set showfix=1 -echo: call :dk_color %Blue% "%_fixmsg%" echo: ) @@ -762,7 +760,6 @@ reg query "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate" /v DisableWin reg query "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate" /v DoNotConnectToWindowsUpdateInternetLocations %nul2% | find /i "0x1" %nul% && set wublock=1 if defined wublock ( call :dk_color %Red% "Checking Update Blocker In Registry [Found]" -echo: call :dk_color %Blue% "HWID activation needs working Windows updates, if you have used any tool to block updates, undo it." echo: ) @@ -770,7 +767,6 @@ echo: reg query "HKLM\SOFTWARE\Policies\Microsoft\WindowsStore" /v DisableStoreApps %nul2% | find /i "0x1" %nul% && ( set storeblock=1 call :dk_color %Red% "Checking Store Blocker In Registry [Found]" -echo: call :dk_color %Blue% "If you have used any tool to block Store, undo it." echo: ) @@ -789,12 +785,10 @@ set error=1 call :dk_color %Red% "Checking Windows Update Registry [Corruption Found]" if !wcount! GTR 2 ( call :dk_color %Red% "Windows seems to be infected with Mal%w%ware." -echo: set fixes=%fixes% %mas%remove_mal%w%ware call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%remove_mal%w%ware" echo: ) else ( -echo: call :dk_color %Blue% "HWID activation needs working Windows updates, if you have used any tool to block updates, undo it." echo: ) @@ -805,7 +799,6 @@ set error=1 set wuerror=1 sc start wuauserv %nul% call :dk_color %Red% "Starting Windows Update Service [Failed] [!errorlevel!]" -echo: call :dk_color %Blue% "HWID activation needs working Windows updates, if you have used any tool to block updates, undo it." echo: ) @@ -1032,7 +1025,6 @@ echo %keyecho% %~1 [Successful] call :dk_color %Red% "%keyecho% %~1 [Failed] %keyerror%" if not defined showfix ( if defined altapplist call :dk_color %Red% "Activation ID not found for this key." -echo: call :dk_color %Blue% "%_fixmsg%" echo: set showfix=1 @@ -1158,7 +1150,6 @@ if %spperror% NEQ 1056 if %spperror% NEQ 0 ( %eline% echo sc start %_slser% [Error Code: %spperror%] if %spperror% EQU 1053 ( -echo: call :dk_color %Blue% "Reboot your machine using the restart option and try again." call :dk_color %Blue% "If it still does not work, go back to Main Menu, select Troubleshoot and run Fix WPA Registry option." ) @@ -1268,7 +1259,6 @@ call :dk_chkmal sc query Null %nul% || ( call :dk_color %Red% "Checking Sandboxing [Found, script may not work properly]" if not defined showfix ( -echo: call :dk_color %Blue% "If you are using any third-party antivirus, check if it is blocking the script." echo: ) @@ -1284,7 +1274,6 @@ reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinPE" /v InstRoot call :dk_color %Red% "Checking WinPE [Found]" if not defined showfix ( -echo: call :dk_color %Blue% "WinPE mode found. Reboot the system and run in normal mode." echo: ) @@ -1299,7 +1288,6 @@ set showfix=1 if defined safeboot_option ( call :dk_color %Red% "Checking Boot Mode [%safeboot_option%]" if not defined showfix ( -echo: call :dk_color %Blue% "Safe mode found. Reboot the system and run in normal mode." echo: ) @@ -1318,7 +1306,6 @@ if /i not "%imagestate%"=="IMAGE_STATE_COMPLETE" ( call :dk_color %Gray% "Checking Windows Setup State [%imagestate%]" echo "%imagestate%" | find /i "RESEAL" %nul% && ( if not defined showfix ( -echo: call :dk_color %Blue% "You need to run it in normal mode in case you are running it in Audit Mode." echo: ) @@ -1413,7 +1400,6 @@ if not defined showfix ( echo: echo %serv_cste% | findstr /i "ClipSVC sppsvc" %nul% && ( echo A registry fix has been applied to enable the disabled service. -echo: call :dk_color %Blue% "Reboot your machine using the restart option to fix this error." ) || ( set fixes=%fixes% %mas%in-place_repair_upgrade @@ -1454,7 +1440,6 @@ if not defined showfix ( set listwospp=%_serv:sppsvc=% echo %serv_e% | findstr /i "!listwospp!" %nul% && ( set showfix=1 -echo: call :dk_color %Blue% "Reboot your machine using the restart option and run the script again." set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "If service error is still not fixed, do this - " %_Yellow% " %mas%in-place_repair_upgrade" @@ -1486,7 +1471,6 @@ if defined wmifailed ( call :dk_color %Red% "Checking WMI [Not Working]" if not defined showfix ( -echo: call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run Fix WMI option." echo: ) @@ -1598,7 +1582,6 @@ if !errorlevel!==3 set "permerror=Error Found In S-1-5-20 SPP" if defined permerror ( call :dk_color %Red% "Checking SPP Permissions [!permerror!]" if not defined showfix ( -echo: call :dk_color %Blue% "%_fixmsg%" echo: ) @@ -1620,7 +1603,6 @@ if defined chkalp ( call :dk_color %Red% "Checking WPA Registry Errors [%wpainfo%]" if not defined showfix ( echo "%wpainfo%" | find /i "Error Found" %nul% && ( -echo: call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run Fix WPA Registry option." echo: set error=1 @@ -1633,7 +1615,6 @@ set wpainfo=a if not defined chkalp ( if %wpainfo% GEQ 5000 ( call :dk_color %Gray% "Checking WPA Registry Count [%wpainfo%]" -echo: call :dk_color %Blue% "A large number of WPA registries have been found, which may cause high CPU usage." call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run Fix WPA Registry option." echo: @@ -1649,7 +1630,6 @@ echo Checking WPA Registry Count [%wpainfo%] reg query "HKU\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\PersistedTSReArmed" %nul% && ( call :dk_color %Red% "Checking Rearm [System is Rearmed]" if not defined showfix ( -echo: call :dk_color %Blue% "Reboot your machine using the restart option to fix this error." echo: ) @@ -1661,7 +1641,6 @@ set showfix=1 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ClipSVC\Volatile\PersistedSystemState" %nul% && ( call :dk_color %Red% "Checking ClipSVC PersistedSystemState [Found]" if not defined showfix ( -echo: call :dk_color %Blue% "Reboot your machine using the restart option to fix this error." echo: ) @@ -1676,7 +1655,6 @@ set showfix=1 if %error_code% NEQ 0 ( call :dk_color %Red% "Checking SoftwareLicensingService [Not Working] [%error_code%]" if not defined showfix ( -echo: call :dk_color %Blue% "%_fixmsg%" call :dk_color %Blue% "If activation still fails then run Fix WPA Registry option." echo: @@ -1706,7 +1684,6 @@ call :dk_color %Gray% "Checking Activation IDs [Key Not Installe if not defined apps if not defined allapps ( call :dk_color %Red% "Checking Activation IDs [Not found]" if not defined showfix ( -echo: call :dk_color %Blue% "%_fixmsg%" call :dk_color %Blue% "If activation still fails then run Fix WPA Registry option." echo: @@ -1716,7 +1693,6 @@ set showfix=1 ) if not defined showfix if defined rlicfailed ( -echo: call :dk_color %Blue% "%_fixmsg%" call :dk_color %Blue% "If activation still fails then run Fix WPA Registry option." echo: @@ -1734,7 +1710,6 @@ if not defined notwinact if exist "%SystemRoot%\Servicing\Packages\Microsoft-Win reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul2% | find /i "Eval" %nul1% || ( call :dk_color %Red% "Checking Eval Packages [License swapping found. Non-Eval licenses are installed in Eval Windows]" if not defined showfix ( -echo: call :dk_color %Blue% "License swapping is not the right way to upgrade to the full version. Learn the correct method at the link below." set fixes=%fixes% %mas%evaluation_editions call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%evaluation_editions" @@ -1843,7 +1818,6 @@ if defined _sppint ( echo %_sppint% | find /i "PerfOptions" %nul% && ( call :dk_color %Red% "Checking SPP Interference In IFEO [%_sppint% - System might deactivate later]" if not defined showfix ( -echo: call :dk_color %Blue% "%_fixmsg%" echo: ) diff --git a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd index ac27093..4299d70 100644 --- a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd +++ b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd @@ -570,10 +570,9 @@ call :dk_color %Red% "Checking Installed Office [Not Found]" if defined ohub ( echo: -echo You only have the Office Dashboard app installed. You need to install the full version of Office. +echo You only have the Office Dashboard app installed; you need to install the full version of Office. ) -echo: -call :dk_color %Blue% "Download and install Office from the below URL and then try again." +call :dk_color %Blue% "Download and install Office from the URL below, then try again." echo: set fixes=%fixes% %mas%genuine-installation-media call :dk_color %_Yellow% "%mas%genuine-installation-media" @@ -1635,7 +1634,6 @@ if %upk_result%==1 echo Uninstalling Other/Grace Keys [Successful] if %upk_result%==2 ( call :dk_color %Red% "Uninstalling Other/Grace Keys [Failed]" if not defined showfix ( -echo: call :dk_color %Blue% "%_fixmsg%" echo: set showfix=1 @@ -1784,7 +1782,6 @@ echo %keyecho% %~1 [Successful] call :dk_color %Red% "%keyecho% %~1 [Failed] %keyerror%" if not defined showfix ( if defined altapplist call :dk_color %Red% "Activation ID not found for this key." -echo: call :dk_color %Blue% "%_fixmsg%" echo: set showfix=1 @@ -1878,7 +1875,6 @@ if %spperror% NEQ 1056 if %spperror% NEQ 0 ( %eline% echo sc start %_slser% [Error Code: %spperror%] if %spperror% EQU 1053 ( -echo: call :dk_color %Blue% "Reboot your machine using the restart option and try again." call :dk_color %Blue% "If it still does not work, go back to Main Menu, select Troubleshoot and run Fix WPA Registry option." ) @@ -1973,7 +1969,6 @@ call :dk_chkmal sc query Null %nul% || ( call :dk_color %Red% "Checking Sandboxing [Found, script may not work properly]" if not defined showfix ( -echo: call :dk_color %Blue% "If you are using any third-party antivirus, check if it is blocking the script." echo: ) @@ -1989,7 +1984,6 @@ reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinPE" /v InstRoot call :dk_color %Red% "Checking WinPE [Found]" if not defined showfix ( -echo: call :dk_color %Blue% "WinPE mode found. Reboot the system and run in normal mode." echo: ) @@ -2004,7 +1998,6 @@ set showfix=1 if defined safeboot_option ( call :dk_color %Red% "Checking Boot Mode [%safeboot_option%]" if not defined showfix ( -echo: call :dk_color %Blue% "Safe mode found. Reboot the system and run in normal mode." echo: ) @@ -2023,7 +2016,6 @@ if /i not "%imagestate%"=="IMAGE_STATE_COMPLETE" ( call :dk_color %Gray% "Checking Windows Setup State [%imagestate%]" echo "%imagestate%" | find /i "RESEAL" %nul% && ( if not defined showfix ( -echo: call :dk_color %Blue% "You need to run it in normal mode in case you are running it in Audit Mode." echo: ) @@ -2118,7 +2110,6 @@ if not defined showfix ( echo: echo %serv_cste% | findstr /i "ClipSVC sppsvc" %nul% && ( echo A registry fix has been applied to enable the disabled service. -echo: call :dk_color %Blue% "Reboot your machine using the restart option to fix this error." ) || ( set fixes=%fixes% %mas%in-place_repair_upgrade @@ -2159,7 +2150,6 @@ if not defined showfix ( set listwospp=%_serv:sppsvc=% echo %serv_e% | findstr /i "!listwospp!" %nul% && ( set showfix=1 -echo: call :dk_color %Blue% "Reboot your machine using the restart option and run the script again." set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "If service error is still not fixed, do this - " %_Yellow% " %mas%in-place_repair_upgrade" @@ -2191,7 +2181,6 @@ if defined wmifailed ( call :dk_color %Red% "Checking WMI [Not Working]" if not defined showfix ( -echo: call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run Fix WMI option." echo: ) @@ -2303,7 +2292,6 @@ if !errorlevel!==3 set "permerror=Error Found In S-1-5-20 SPP" if defined permerror ( call :dk_color %Red% "Checking SPP Permissions [!permerror!]" if not defined showfix ( -echo: call :dk_color %Blue% "%_fixmsg%" echo: ) @@ -2325,7 +2313,6 @@ if defined chkalp ( call :dk_color %Red% "Checking WPA Registry Errors [%wpainfo%]" if not defined showfix ( echo "%wpainfo%" | find /i "Error Found" %nul% && ( -echo: call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run Fix WPA Registry option." echo: set error=1 @@ -2338,7 +2325,6 @@ set wpainfo=a if not defined chkalp ( if %wpainfo% GEQ 5000 ( call :dk_color %Gray% "Checking WPA Registry Count [%wpainfo%]" -echo: call :dk_color %Blue% "A large number of WPA registries have been found, which may cause high CPU usage." call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run Fix WPA Registry option." echo: @@ -2354,7 +2340,6 @@ echo Checking WPA Registry Count [%wpainfo%] reg query "HKU\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\PersistedTSReArmed" %nul% && ( call :dk_color %Red% "Checking Rearm [System is Rearmed]" if not defined showfix ( -echo: call :dk_color %Blue% "Reboot your machine using the restart option to fix this error." echo: ) @@ -2366,7 +2351,6 @@ set showfix=1 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ClipSVC\Volatile\PersistedSystemState" %nul% && ( call :dk_color %Red% "Checking ClipSVC PersistedSystemState [Found]" if not defined showfix ( -echo: call :dk_color %Blue% "Reboot your machine using the restart option to fix this error." echo: ) @@ -2381,7 +2365,6 @@ set showfix=1 if %error_code% NEQ 0 ( call :dk_color %Red% "Checking SoftwareLicensingService [Not Working] [%error_code%]" if not defined showfix ( -echo: call :dk_color %Blue% "%_fixmsg%" call :dk_color %Blue% "If activation still fails then run Fix WPA Registry option." echo: @@ -2411,7 +2394,6 @@ call :dk_color %Gray% "Checking Activation IDs [Key Not Installe if not defined apps if not defined allapps ( call :dk_color %Red% "Checking Activation IDs [Not found]" if not defined showfix ( -echo: call :dk_color %Blue% "%_fixmsg%" call :dk_color %Blue% "If activation still fails then run Fix WPA Registry option." echo: @@ -2421,7 +2403,6 @@ set showfix=1 ) if not defined showfix if defined rlicfailed ( -echo: call :dk_color %Blue% "%_fixmsg%" call :dk_color %Blue% "If activation still fails then run Fix WPA Registry option." echo: @@ -2439,7 +2420,6 @@ if not defined notwinact if exist "%SystemRoot%\Servicing\Packages\Microsoft-Win reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul2% | find /i "Eval" %nul1% || ( call :dk_color %Red% "Checking Eval Packages [License swapping found. Non-Eval licenses are installed in Eval Windows]" if not defined showfix ( -echo: call :dk_color %Blue% "License swapping is not the right way to upgrade to the full version. Learn the correct method at the link below." set fixes=%fixes% %mas%evaluation_editions call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%evaluation_editions" @@ -2548,7 +2528,6 @@ if defined _sppint ( echo %_sppint% | find /i "PerfOptions" %nul% && ( call :dk_color %Red% "Checking SPP Interference In IFEO [%_sppint% - System might deactivate later]" if not defined showfix ( -echo: call :dk_color %Blue% "%_fixmsg%" echo: ) diff --git a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd index ecc455d..e03a156 100644 --- a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd +++ b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd @@ -816,9 +816,9 @@ call :dk_color %Red% "Checking Installed Office [Not Found]" if defined ohub ( echo: -echo You only have the Office Dashboard app installed. You need to install the full version of Office. +echo You only have the Office Dashboard app installed; you need to install the full version of Office. ) -call :dk_color %Blue% "Download and install Office from below URL and try again." +call :dk_color %Blue% "Download and install Office from the URL below, then try again." set fixes=%fixes% %mas%genuine-installation-media call :dk_color %_Yellow% "%mas%genuine-installation-media" goto :ks_activate @@ -1594,7 +1594,6 @@ if %upk_result%==1 echo Uninstalling Other/Grace Keys [Successful] if %upk_result%==2 ( call :dk_color %Red% "Uninstalling Other/Grace Keys [Failed]" if not defined showfix ( -echo: call :dk_color %Blue% "%_fixmsg%" echo: set showfix=1 @@ -1648,7 +1647,6 @@ call :ks_clearstuff set error_=9 echo Failed to completely clear %KS% Cache. reg query "HKLM\%SPPk%\%_wApp%" /s %nul2% | findstr /i "127.0.0.2" %nul1% && echo KMS38 activation is locked. -echo: call :dk_color %Blue% "%_fixmsg%" echo: ) || ( @@ -2739,7 +2737,6 @@ echo %keyecho% %~1 [Successful] call :dk_color %Red% "%keyecho% %~1 [Failed] %keyerror%" if not defined showfix ( if defined altapplist call :dk_color %Red% "Activation ID not found for this key." -echo: call :dk_color %Blue% "%_fixmsg%" echo: set showfix=1 @@ -2860,7 +2857,6 @@ if %spperror% NEQ 1056 if %spperror% NEQ 0 ( %eline% echo sc start %_slser% [Error Code: %spperror%] if %spperror% EQU 1053 ( -echo: call :dk_color %Blue% "Reboot your machine using the restart option and try again." call :dk_color %Blue% "If it still does not work, go back to Main Menu, select Troubleshoot and run Fix WPA Registry option." ) @@ -3015,7 +3011,6 @@ call :dk_chkmal sc query Null %nul% || ( call :dk_color %Red% "Checking Sandboxing [Found, script may not work properly]" if not defined showfix ( -echo: call :dk_color %Blue% "If you are using any third-party antivirus, check if it is blocking the script." echo: ) @@ -3031,7 +3026,6 @@ reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinPE" /v InstRoot call :dk_color %Red% "Checking WinPE [Found]" if not defined showfix ( -echo: call :dk_color %Blue% "WinPE mode found. Reboot the system and run in normal mode." echo: ) @@ -3046,7 +3040,6 @@ set showfix=1 if defined safeboot_option ( call :dk_color %Red% "Checking Boot Mode [%safeboot_option%]" if not defined showfix ( -echo: call :dk_color %Blue% "Safe mode found. Reboot the system and run in normal mode." echo: ) @@ -3065,7 +3058,6 @@ if /i not "%imagestate%"=="IMAGE_STATE_COMPLETE" ( call :dk_color %Gray% "Checking Windows Setup State [%imagestate%]" echo "%imagestate%" | find /i "RESEAL" %nul% && ( if not defined showfix ( -echo: call :dk_color %Blue% "You need to run it in normal mode in case you are running it in Audit Mode." echo: ) @@ -3160,7 +3152,6 @@ if not defined showfix ( echo: echo %serv_cste% | findstr /i "ClipSVC sppsvc" %nul% && ( echo A registry fix has been applied to enable the disabled service. -echo: call :dk_color %Blue% "Reboot your machine using the restart option to fix this error." ) || ( set fixes=%fixes% %mas%in-place_repair_upgrade @@ -3201,7 +3192,6 @@ if not defined showfix ( set listwospp=%_serv:sppsvc=% echo %serv_e% | findstr /i "!listwospp!" %nul% && ( set showfix=1 -echo: call :dk_color %Blue% "Reboot your machine using the restart option and run the script again." set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "If service error is still not fixed, do this - " %_Yellow% " %mas%in-place_repair_upgrade" @@ -3233,7 +3223,6 @@ if defined wmifailed ( call :dk_color %Red% "Checking WMI [Not Working]" if not defined showfix ( -echo: call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run Fix WMI option." echo: ) @@ -3345,7 +3334,6 @@ if !errorlevel!==3 set "permerror=Error Found In S-1-5-20 SPP" if defined permerror ( call :dk_color %Red% "Checking SPP Permissions [!permerror!]" if not defined showfix ( -echo: call :dk_color %Blue% "%_fixmsg%" echo: ) @@ -3367,7 +3355,6 @@ if defined chkalp ( call :dk_color %Red% "Checking WPA Registry Errors [%wpainfo%]" if not defined showfix ( echo "%wpainfo%" | find /i "Error Found" %nul% && ( -echo: call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run Fix WPA Registry option." echo: set error=1 @@ -3380,7 +3367,6 @@ set wpainfo=a if not defined chkalp ( if %wpainfo% GEQ 5000 ( call :dk_color %Gray% "Checking WPA Registry Count [%wpainfo%]" -echo: call :dk_color %Blue% "A large number of WPA registries have been found, which may cause high CPU usage." call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run Fix WPA Registry option." echo: @@ -3395,8 +3381,7 @@ echo Checking WPA Registry Count [%wpainfo%] reg query "HKU\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\PersistedTSReArmed" %nul% && ( call :dk_color %Red% "Checking Rearm [System is Rearmed]" -if not defined showfix ( -echo: +if not defined showfix call :dk_color %Blue% "Reboot your machine using the restart option to fix this error." echo: ) @@ -3408,7 +3393,6 @@ set showfix=1 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ClipSVC\Volatile\PersistedSystemState" %nul% && ( call :dk_color %Red% "Checking ClipSVC PersistedSystemState [Found]" if not defined showfix ( -echo: call :dk_color %Blue% "Reboot your machine using the restart option to fix this error." echo: ) @@ -3423,7 +3407,6 @@ set showfix=1 if %error_code% NEQ 0 ( call :dk_color %Red% "Checking SoftwareLicensingService [Not Working] [%error_code%]" if not defined showfix ( -echo: call :dk_color %Blue% "%_fixmsg%" call :dk_color %Blue% "If activation still fails then run Fix WPA Registry option." echo: @@ -3453,7 +3436,6 @@ call :dk_color %Gray% "Checking Activation IDs [Key Not Installe if not defined apps if not defined allapps ( call :dk_color %Red% "Checking Activation IDs [Not found]" if not defined showfix ( -echo: call :dk_color %Blue% "%_fixmsg%" call :dk_color %Blue% "If activation still fails then run Fix WPA Registry option." echo: @@ -3463,7 +3445,6 @@ set showfix=1 ) if not defined showfix if defined rlicfailed ( -echo: call :dk_color %Blue% "%_fixmsg%" call :dk_color %Blue% "If activation still fails then run Fix WPA Registry option." echo: @@ -3481,7 +3462,6 @@ if not defined notwinact if exist "%SystemRoot%\Servicing\Packages\Microsoft-Win reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul2% | find /i "Eval" %nul1% || ( call :dk_color %Red% "Checking Eval Packages [License swapping found. Non-Eval licenses are installed in Eval Windows]" if not defined showfix ( -echo: call :dk_color %Blue% "License swapping is not the right way to upgrade to the full version. Learn the correct method at the link below." set fixes=%fixes% %mas%evaluation_editions call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%evaluation_editions" @@ -3590,7 +3570,6 @@ if defined _sppint ( echo %_sppint% | find /i "PerfOptions" %nul% && ( call :dk_color %Red% "Checking SPP Interference In IFEO [%_sppint% - System might deactivate later]" if not defined showfix ( -echo: call :dk_color %Blue% "%_fixmsg%" echo: ) diff --git a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd index 82dd5e5..61ceda0 100644 --- a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd +++ b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd @@ -1320,9 +1320,9 @@ call :dk_color %Gray% "Checking Installed Office [Not Found]" if defined ohub ( echo: -echo You only have the Office Dashboard app installed. You need to install the full version of Office. +echo You only have the Office Dashboard app installed; you need to install the full version of Office. ) -call :dk_color %Blue% "Download and install Office from below URL and try again." +call :dk_color %Blue% "Download and install Office from the URL below, then try again." if %_actwin%==0 set fixes=%fixes% %mas%genuine-installation-media call :dk_color %_Yellow% "%mas%genuine-installation-media" goto :ts_act @@ -2560,7 +2560,6 @@ if %upk_result%==1 echo Uninstalling Other/Grace Keys [Successful] if %upk_result%==2 ( call :dk_color %Red% "Uninstalling Other/Grace Keys [Failed]" if not defined showfix ( -echo: call :dk_color %Blue% "%_fixmsg%" echo: set showfix=1 @@ -2796,7 +2795,6 @@ echo %keyecho% %~1 [Successful] call :dk_color %Red% "%keyecho% %~1 [Failed] %keyerror%" if not defined showfix ( if defined altapplist call :dk_color %Red% "Activation ID not found for this key." -echo: call :dk_color %Blue% "%_fixmsg%" echo: set showfix=1 @@ -2920,7 +2918,6 @@ if %spperror% NEQ 1056 if %spperror% NEQ 0 ( %eline% echo sc start %_slser% [Error Code: %spperror%] if %spperror% EQU 1053 ( -echo: call :dk_color %Blue% "Reboot your machine using the restart option and try again." call :dk_color %Blue% "If it still does not work, go back to Main Menu, select Troubleshoot and run Fix WPA Registry option." ) @@ -3030,7 +3027,6 @@ call :dk_chkmal sc query Null %nul% || ( call :dk_color %Red% "Checking Sandboxing [Found, script may not work properly]" if not defined showfix ( -echo: call :dk_color %Blue% "If you are using any third-party antivirus, check if it is blocking the script." echo: ) @@ -3046,7 +3042,6 @@ reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinPE" /v InstRoot call :dk_color %Red% "Checking WinPE [Found]" if not defined showfix ( -echo: call :dk_color %Blue% "WinPE mode found. Reboot the system and run in normal mode." echo: ) @@ -3061,7 +3056,6 @@ set showfix=1 if defined safeboot_option ( call :dk_color %Red% "Checking Boot Mode [%safeboot_option%]" if not defined showfix ( -echo: call :dk_color %Blue% "Safe mode found. Reboot the system and run in normal mode." echo: ) @@ -3080,7 +3074,6 @@ if /i not "%imagestate%"=="IMAGE_STATE_COMPLETE" ( call :dk_color %Gray% "Checking Windows Setup State [%imagestate%]" echo "%imagestate%" | find /i "RESEAL" %nul% && ( if not defined showfix ( -echo: call :dk_color %Blue% "You need to run it in normal mode in case you are running it in Audit Mode." echo: ) @@ -3175,7 +3168,6 @@ if not defined showfix ( echo: echo %serv_cste% | findstr /i "ClipSVC sppsvc" %nul% && ( echo A registry fix has been applied to enable the disabled service. -echo: call :dk_color %Blue% "Reboot your machine using the restart option to fix this error." ) || ( set fixes=%fixes% %mas%in-place_repair_upgrade @@ -3216,7 +3208,6 @@ if not defined showfix ( set listwospp=%_serv:sppsvc=% echo %serv_e% | findstr /i "!listwospp!" %nul% && ( set showfix=1 -echo: call :dk_color %Blue% "Reboot your machine using the restart option and run the script again." set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "If service error is still not fixed, do this - " %_Yellow% " %mas%in-place_repair_upgrade" @@ -3248,7 +3239,6 @@ if defined wmifailed ( call :dk_color %Red% "Checking WMI [Not Working]" if not defined showfix ( -echo: call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run Fix WMI option." echo: ) @@ -3360,7 +3350,6 @@ if !errorlevel!==3 set "permerror=Error Found In S-1-5-20 SPP" if defined permerror ( call :dk_color %Red% "Checking SPP Permissions [!permerror!]" if not defined showfix ( -echo: call :dk_color %Blue% "%_fixmsg%" echo: ) @@ -3382,7 +3371,6 @@ if defined chkalp ( call :dk_color %Red% "Checking WPA Registry Errors [%wpainfo%]" if not defined showfix ( echo "%wpainfo%" | find /i "Error Found" %nul% && ( -echo: call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run Fix WPA Registry option." echo: set error=1 @@ -3395,7 +3383,6 @@ set wpainfo=a if not defined chkalp ( if %wpainfo% GEQ 5000 ( call :dk_color %Gray% "Checking WPA Registry Count [%wpainfo%]" -echo: call :dk_color %Blue% "A large number of WPA registries have been found, which may cause high CPU usage." call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run Fix WPA Registry option." echo: @@ -3411,7 +3398,6 @@ echo Checking WPA Registry Count [%wpainfo%] reg query "HKU\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\PersistedTSReArmed" %nul% && ( call :dk_color %Red% "Checking Rearm [System is Rearmed]" if not defined showfix ( -echo: call :dk_color %Blue% "Reboot your machine using the restart option to fix this error." echo: ) @@ -3423,7 +3409,6 @@ set showfix=1 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ClipSVC\Volatile\PersistedSystemState" %nul% && ( call :dk_color %Red% "Checking ClipSVC PersistedSystemState [Found]" if not defined showfix ( -echo: call :dk_color %Blue% "Reboot your machine using the restart option to fix this error." echo: ) @@ -3438,7 +3423,6 @@ set showfix=1 if %error_code% NEQ 0 ( call :dk_color %Red% "Checking SoftwareLicensingService [Not Working] [%error_code%]" if not defined showfix ( -echo: call :dk_color %Blue% "%_fixmsg%" call :dk_color %Blue% "If activation still fails then run Fix WPA Registry option." echo: @@ -3468,7 +3452,6 @@ call :dk_color %Gray% "Checking Activation IDs [Key Not Installe if not defined apps if not defined allapps ( call :dk_color %Red% "Checking Activation IDs [Not found]" if not defined showfix ( -echo: call :dk_color %Blue% "%_fixmsg%" call :dk_color %Blue% "If activation still fails then run Fix WPA Registry option." echo: @@ -3478,7 +3461,6 @@ set showfix=1 ) if not defined showfix if defined rlicfailed ( -echo: call :dk_color %Blue% "%_fixmsg%" call :dk_color %Blue% "If activation still fails then run Fix WPA Registry option." echo: @@ -3496,7 +3478,6 @@ if not defined notwinact if exist "%SystemRoot%\Servicing\Packages\Microsoft-Win reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul2% | find /i "Eval" %nul1% || ( call :dk_color %Red% "Checking Eval Packages [License swapping found. Non-Eval licenses are installed in Eval Windows]" if not defined showfix ( -echo: call :dk_color %Blue% "License swapping is not the right way to upgrade to the full version. Learn the correct method at the link below." set fixes=%fixes% %mas%evaluation_editions call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%evaluation_editions" @@ -3605,7 +3586,6 @@ if defined _sppint ( echo %_sppint% | find /i "PerfOptions" %nul% && ( call :dk_color %Red% "Checking SPP Interference In IFEO [%_sppint% - System might deactivate later]" if not defined showfix ( -echo: call :dk_color %Blue% "%_fixmsg%" echo: ) diff --git a/MAS/Separate-Files-Version/Change_Office_Edition.cmd b/MAS/Separate-Files-Version/Change_Office_Edition.cmd index 5e9e7c3..34fbc62 100644 --- a/MAS/Separate-Files-Version/Change_Office_Edition.cmd +++ b/MAS/Separate-Files-Version/Change_Office_Edition.cmd @@ -397,7 +397,6 @@ if %_wmic% EQU 0 set "chkedi=for /f "tokens=2 delims==" %%a in ('%psc% "(([WMISE if %osedition%==0 ( %eline% echo Failed to detect OS Edition. Aborting... -echo: call :dk_color %Blue% "To fix this issue, activate Windows from the main menu." goto dk_done ) @@ -434,7 +433,6 @@ if %verchk% LSS 9029 ( echo Installed Office version is %_version%. echo Minimum required version is 16.0.9029.2167 echo Aborting... -echo: call :dk_color %Blue% "Download and install latest Office from below URL and try again." set fixes=%fixes% %mas%genuine-installation-media call :dk_color %_Yellow% "%mas%genuine-installation-media" @@ -457,7 +455,6 @@ _masterxml if not defined %%A ( %eline% echo Failed to find %%A. Aborting... -echo: call :dk_color %Blue% "Download and install Office from below URL and try again." set fixes=%fixes% %mas%genuine-installation-media call :dk_color %_Yellow% "%mas%genuine-installation-media" @@ -809,7 +806,6 @@ if /i "%_lang%"=="%%#" set langmatched=1 if not defined langmatched ( %eline% echo %_lang% language is not available for Project/Visio apps. -echo: call :dk_color %Blue% "Install Office in the supported language for Project/Visio from the below URL." set fixes=%fixes% %mas%genuine-installation-media call :dk_color %_Yellow% "%mas%genuine-installation-media" @@ -1617,7 +1613,6 @@ if %spperror% NEQ 1056 if %spperror% NEQ 0 ( %eline% echo sc start %_slser% [Error Code: %spperror%] if %spperror% EQU 1053 ( -echo: call :dk_color %Blue% "Reboot your machine using the restart option and try again." call :dk_color %Blue% "If it still does not work, go back to Main Menu, select Troubleshoot and run Fix WPA Registry option." ) diff --git a/MAS/Separate-Files-Version/Change_Windows_Edition.cmd b/MAS/Separate-Files-Version/Change_Windows_Edition.cmd index 4e05233..c9600da 100644 --- a/MAS/Separate-Files-Version/Change_Windows_Edition.cmd +++ b/MAS/Separate-Files-Version/Change_Windows_Edition.cmd @@ -395,7 +395,6 @@ dism.exe if not exist %SysPath%\%%# ( %eline% echo [%SysPath%\%%#] file is missing, aborting... -echo: call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run DISM Restore and SFC Scan options." call :dk_color %Blue% "After that, restart system and try activation again." echo: @@ -431,7 +430,6 @@ call :dk_actids 55c92734-d682-4d71-983e-d6ec3f16059f if not defined allapps ( %eline% echo Failed to find activation IDs. Aborting... -echo: call :dk_color %Blue% "To fix this issue, activate Windows from the main menu." goto dk_done ) @@ -453,7 +451,6 @@ if not defined osedition %chkedi% do if not errorlevel 1 (call set "osedition=%% if not defined osedition ( %eline% echo Failed to detect OS edition, aborting... -echo: call :dk_color %Blue% "To fix this issue, activate Windows from the main menu." goto dk_done ) @@ -972,7 +969,6 @@ if %spperror% NEQ 1056 if %spperror% NEQ 0 ( %eline% echo sc start %_slser% [Error Code: %spperror%] if %spperror% EQU 1053 ( -echo: call :dk_color %Blue% "Reboot your machine using the restart option and try again." call :dk_color %Blue% "If it still does not work, go back to Main Menu, select Troubleshoot and run Fix WPA Registry option." ) diff --git a/MAS/Separate-Files-Version/Troubleshoot.cmd b/MAS/Separate-Files-Version/Troubleshoot.cmd index dc0668f..ba7e9a9 100644 --- a/MAS/Separate-Files-Version/Troubleshoot.cmd +++ b/MAS/Separate-Files-Version/Troubleshoot.cmd @@ -1165,7 +1165,6 @@ sc query Winmgmt | find /i "STOPPED" %nul% && ( echo [Successful] ) || ( call :dk_color %Red% "[Failed]" -echo: call :dk_color %Blue% "Its recommended to select [Restart] option and then apply Fix WMI option again." echo %line% echo: