Improve error info

6 files changed, 36 insertions, 24 deletions

diff --git a/MAS/All-In-One-Version-KL/MAS_AIO.cmd b/MAS/All-In-One-Version-KL/MAS_AIO.cmd
index 870355b..0a4ae97 100644
--- a/MAS/All-In-One-Version-KL/MAS_AIO.cmd
+++ b/MAS/All-In-One-Version-KL/MAS_AIO.cmd
@@ -1768,14 +1768,16 @@ call :dk_color %Gray% "Checking SLC/WMI SKU                    [Difference Found
 reg query "HKU\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\PersistedTSReArmed" %nul% && (

 set error=1

 set showfix=1

-call :dk_color2 %Red% "Checking Rearm                          " %Blue% "[System Restart Is Required]"

+call :dk_color %Red% "Checking Rearm                          [System is ReArmed]"

+call :dk_color %Blue% "Reboot your machine using the restart option to fix this error."

 )

 

 

 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ClipSVC\Volatile\PersistedSystemState" %nul% && (

 set error=1

 set showfix=1

-call :dk_color2 %Red% "Checking ClipSVC                        " %Blue% "[System Restart Is Required]"

+call :dk_color %Red% "Checking ClipSVC PersistedSystemState   [Found]"

+call :dk_color %Blue% "Reboot your machine using the restart option to fix this error."

 )

 

 

@@ -1817,9 +1819,9 @@ call :dk_color %Red% "Checking SkipRearm                      [Default 0 Value N
 

 

 if %winbuild% GEQ 7600 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\Plugins\Objects\msft:rm/algorithm/hwid/4.0" /f ba02fed39662 /d %nul% || (

-call :dk_color %Red% "Checking SPP Registry Key               [Incorrect ModuleId Found]"

+call :dk_color %Red% "Checking SPP Registry Key               [Incorrect ModuleId Found] [Most likely caused by gaming spoofers]"

 set fixes=%fixes% %mas%issues_due_to_gaming_spoofers

-call :dk_color2 %Blue% "Most likely caused by gaming spoofers. Check this webpage for help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"

+call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"

 set error=1

 set showfix=1

 )

diff --git a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
index d69a488..621e381 100644
--- a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
@@ -1452,14 +1452,16 @@ call :dk_color %Gray% "Checking SLC/WMI SKU                    [Difference Found
 reg query "HKU\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\PersistedTSReArmed" %nul% && (

 set error=1

 set showfix=1

-call :dk_color2 %Red% "Checking Rearm                          " %Blue% "[System Restart Is Required]"

+call :dk_color %Red% "Checking Rearm                          [System is ReArmed]"

+call :dk_color %Blue% "Reboot your machine using the restart option to fix this error."

 )

 

 

 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ClipSVC\Volatile\PersistedSystemState" %nul% && (

 set error=1

 set showfix=1

-call :dk_color2 %Red% "Checking ClipSVC                        " %Blue% "[System Restart Is Required]"

+call :dk_color %Red% "Checking ClipSVC PersistedSystemState   [Found]"

+call :dk_color %Blue% "Reboot your machine using the restart option to fix this error."

 )

 

 

@@ -1501,9 +1503,9 @@ call :dk_color %Red% "Checking SkipRearm                      [Default 0 Value N
 

 

 if %winbuild% GEQ 7600 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\Plugins\Objects\msft:rm/algorithm/hwid/4.0" /f ba02fed39662 /d %nul% || (

-call :dk_color %Red% "Checking SPP Registry Key               [Incorrect ModuleId Found]"

+call :dk_color %Red% "Checking SPP Registry Key               [Incorrect ModuleId Found] [Most likely caused by gaming spoofers]"

 set fixes=%fixes% %mas%issues_due_to_gaming_spoofers

-call :dk_color2 %Blue% "Most likely caused by gaming spoofers. Check this webpage for help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"

+call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"

 set error=1

 set showfix=1

 )

diff --git a/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd b/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
index 7b2965a..704e7a3 100644
--- a/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
@@ -1592,14 +1592,16 @@ call :dk_color %Gray% "Checking SLC/WMI SKU                    [Difference Found
 reg query "HKU\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\PersistedTSReArmed" %nul% && (

 set error=1

 set showfix=1

-call :dk_color2 %Red% "Checking Rearm                          " %Blue% "[System Restart Is Required]"

+call :dk_color %Red% "Checking Rearm                          [System is ReArmed]"

+call :dk_color %Blue% "Reboot your machine using the restart option to fix this error."

 )

 

 

 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ClipSVC\Volatile\PersistedSystemState" %nul% && (

 set error=1

 set showfix=1

-call :dk_color2 %Red% "Checking ClipSVC                        " %Blue% "[System Restart Is Required]"

+call :dk_color %Red% "Checking ClipSVC PersistedSystemState   [Found]"

+call :dk_color %Blue% "Reboot your machine using the restart option to fix this error."

 )

 

 

@@ -1641,9 +1643,9 @@ call :dk_color %Red% "Checking SkipRearm                      [Default 0 Value N
 

 

 if %winbuild% GEQ 7600 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\Plugins\Objects\msft:rm/algorithm/hwid/4.0" /f ba02fed39662 /d %nul% || (

-call :dk_color %Red% "Checking SPP Registry Key               [Incorrect ModuleId Found]"

+call :dk_color %Red% "Checking SPP Registry Key               [Incorrect ModuleId Found] [Most likely caused by gaming spoofers]"

 set fixes=%fixes% %mas%issues_due_to_gaming_spoofers

-call :dk_color2 %Blue% "Most likely caused by gaming spoofers. Check this webpage for help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"

+call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"

 set error=1

 set showfix=1

 )

diff --git a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
index 0d5e62f..aa445f0 100644
--- a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
+++ b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
@@ -2127,14 +2127,16 @@ call :dk_color %Gray% "Checking SLC/WMI SKU                    [Difference Found
 reg query "HKU\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\PersistedTSReArmed" %nul% && (

 set error=1

 set showfix=1

-call :dk_color2 %Red% "Checking Rearm                          " %Blue% "[System Restart Is Required]"

+call :dk_color %Red% "Checking Rearm                          [System is ReArmed]"

+call :dk_color %Blue% "Reboot your machine using the restart option to fix this error."

 )

 

 

 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ClipSVC\Volatile\PersistedSystemState" %nul% && (

 set error=1

 set showfix=1

-call :dk_color2 %Red% "Checking ClipSVC                        " %Blue% "[System Restart Is Required]"

+call :dk_color %Red% "Checking ClipSVC PersistedSystemState   [Found]"

+call :dk_color %Blue% "Reboot your machine using the restart option to fix this error."

 )

 

 

@@ -2176,9 +2178,9 @@ call :dk_color %Red% "Checking SkipRearm                      [Default 0 Value N
 

 

 if %winbuild% GEQ 7600 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\Plugins\Objects\msft:rm/algorithm/hwid/4.0" /f ba02fed39662 /d %nul% || (

-call :dk_color %Red% "Checking SPP Registry Key               [Incorrect ModuleId Found]"

+call :dk_color %Red% "Checking SPP Registry Key               [Incorrect ModuleId Found] [Most likely caused by gaming spoofers]"

 set fixes=%fixes% %mas%issues_due_to_gaming_spoofers

-call :dk_color2 %Blue% "Most likely caused by gaming spoofers. Check this webpage for help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"

+call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"

 set error=1

 set showfix=1

 )

diff --git a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
index ae8808a..d23e544 100644
--- a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
@@ -3183,14 +3183,16 @@ call :dk_color %Gray% "Checking SLC/WMI SKU                    [Difference Found
 reg query "HKU\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\PersistedTSReArmed" %nul% && (

 set error=1

 set showfix=1

-call :dk_color2 %Red% "Checking Rearm                          " %Blue% "[System Restart Is Required]"

+call :dk_color %Red% "Checking Rearm                          [System is ReArmed]"

+call :dk_color %Blue% "Reboot your machine using the restart option to fix this error."

 )

 

 

 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ClipSVC\Volatile\PersistedSystemState" %nul% && (

 set error=1

 set showfix=1

-call :dk_color2 %Red% "Checking ClipSVC                        " %Blue% "[System Restart Is Required]"

+call :dk_color %Red% "Checking ClipSVC PersistedSystemState   [Found]"

+call :dk_color %Blue% "Reboot your machine using the restart option to fix this error."

 )

 

 

@@ -3232,9 +3234,9 @@ call :dk_color %Red% "Checking SkipRearm                      [Default 0 Value N
 

 

 if %winbuild% GEQ 7600 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\Plugins\Objects\msft:rm/algorithm/hwid/4.0" /f ba02fed39662 /d %nul% || (

-call :dk_color %Red% "Checking SPP Registry Key               [Incorrect ModuleId Found]"

+call :dk_color %Red% "Checking SPP Registry Key               [Incorrect ModuleId Found] [Most likely caused by gaming spoofers]"

 set fixes=%fixes% %mas%issues_due_to_gaming_spoofers

-call :dk_color2 %Blue% "Most likely caused by gaming spoofers. Check this webpage for help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"

+call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"

 set error=1

 set showfix=1

 )

diff --git a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
index dd8f1a4..2cee818 100644
--- a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
@@ -3190,14 +3190,16 @@ call :dk_color %Gray% "Checking SLC/WMI SKU                    [Difference Found
 reg query "HKU\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\PersistedTSReArmed" %nul% && (

 set error=1

 set showfix=1

-call :dk_color2 %Red% "Checking Rearm                          " %Blue% "[System Restart Is Required]"

+call :dk_color %Red% "Checking Rearm                          [System is ReArmed]"

+call :dk_color %Blue% "Reboot your machine using the restart option to fix this error."

 )

 

 

 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ClipSVC\Volatile\PersistedSystemState" %nul% && (

 set error=1

 set showfix=1

-call :dk_color2 %Red% "Checking ClipSVC                        " %Blue% "[System Restart Is Required]"

+call :dk_color %Red% "Checking ClipSVC PersistedSystemState   [Found]"

+call :dk_color %Blue% "Reboot your machine using the restart option to fix this error."

 )

 

 

@@ -3239,9 +3241,9 @@ call :dk_color %Red% "Checking SkipRearm                      [Default 0 Value N
 

 

 if %winbuild% GEQ 7600 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\Plugins\Objects\msft:rm/algorithm/hwid/4.0" /f ba02fed39662 /d %nul% || (

-call :dk_color %Red% "Checking SPP Registry Key               [Incorrect ModuleId Found]"

+call :dk_color %Red% "Checking SPP Registry Key               [Incorrect ModuleId Found] [Most likely caused by gaming spoofers]"

 set fixes=%fixes% %mas%issues_due_to_gaming_spoofers

-call :dk_color2 %Blue% "Most likely caused by gaming spoofers. Check this webpage for help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"

+call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"

 set error=1

 set showfix=1

 )