Show update related troubleshooting when activation fails

2 files changed, 34 insertions, 8 deletions

diff --git a/MAS/All-In-One-Version-KL/MAS_AIO.cmd b/MAS/All-In-One-Version-KL/MAS_AIO.cmd
index 1bb8bdf..eb7b965 100644
--- a/MAS/All-In-One-Version-KL/MAS_AIO.cmd
+++ b/MAS/All-In-One-Version-KL/MAS_AIO.cmd
@@ -900,29 +900,42 @@ call :dk_color %Red% "Generating New IdentityCRL Registry     [Failed] [%_ident%
 

 reg query "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate" /v DisableWindowsUpdateAccess %nul2% | find /i "0x1" %nul% && set wublock=1

 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]"

+if defined wublock (

+call :dk_color %Red% "Checking Update Blocker In Registry     [Found]"

+call :dk_color %Blue% "HWID activation needs working Windows updates, if you have used any tool to block updates, undo it."

+)

 

 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]"

+call :dk_color %Blue% "If you have used any tool to block Store, undo it."

 )

 

+set wcount=0

 for %%G in (DependOnService Description DisplayName ErrorControl ImagePath ObjectName Start Type ServiceSidType RequiredPrivileges FailureActions) do if not defined wucorrupt (

-reg query HKLM\SYSTEM\CurrentControlSet\Services\wuauserv /v %%G %nul% || set wucorrupt=1

+reg query HKLM\SYSTEM\CurrentControlSet\Services\wuauserv /v %%G %nul% || (set wucorrupt=1&set /a wcount+=1)

 )

 

-for %%G in (Parameters Security TriggerInfo) do if not defined wucorrupt (

-reg query HKLM\SYSTEM\CurrentControlSet\Services\wuauserv\%%G %nul% || set wucorrupt=1

+for %%G in (Parameters Security) do if not defined wucorrupt (

+reg query HKLM\SYSTEM\CurrentControlSet\Services\wuauserv\%%G %nul% || (set wucorrupt=1&set /a wcount+=1)

 )

 

 if defined wucorrupt (

 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."

+set fixes=%fixes% %mas%remove_mal%w%ware

+call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%remove_mal%w%ware"

+) else (

+call :dk_color %Blue% "HWID activation needs working Windows updates, if you have used any tool to block updates, undo it."

+)

 ) else (

 %psc% "Start-Job { Start-Service wuauserv } | Wait-Job -Timeout 20 | Out-Null"

 sc query wuauserv | find /i "RUNNING" %nul% || (

 set wuerror=1

 sc start wuauserv %nul%

 call :dk_color %Red% "Starting Windows Update Service         [Failed] [!errorlevel!]"

+call :dk_color %Blue% "HWID activation needs working Windows updates, if you have used any tool to block updates, undo it."

 )

 )

 

diff --git a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
index 1ab708e..a5dfc14 100644
--- a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
@@ -663,29 +663,42 @@ call :dk_color %Red% "Generating New IdentityCRL Registry     [Failed] [%_ident%
 

 reg query "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate" /v DisableWindowsUpdateAccess %nul2% | find /i "0x1" %nul% && set wublock=1

 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]"

+if defined wublock (

+call :dk_color %Red% "Checking Update Blocker In Registry     [Found]"

+call :dk_color %Blue% "HWID activation needs working Windows updates, if you have used any tool to block updates, undo it."

+)

 

 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]"

+call :dk_color %Blue% "If you have used any tool to block Store, undo it."

 )

 

+set wcount=0

 for %%G in (DependOnService Description DisplayName ErrorControl ImagePath ObjectName Start Type ServiceSidType RequiredPrivileges FailureActions) do if not defined wucorrupt (

-reg query HKLM\SYSTEM\CurrentControlSet\Services\wuauserv /v %%G %nul% || set wucorrupt=1

+reg query HKLM\SYSTEM\CurrentControlSet\Services\wuauserv /v %%G %nul% || (set wucorrupt=1&set /a wcount+=1)

 )

 

-for %%G in (Parameters Security TriggerInfo) do if not defined wucorrupt (

-reg query HKLM\SYSTEM\CurrentControlSet\Services\wuauserv\%%G %nul% || set wucorrupt=1

+for %%G in (Parameters Security) do if not defined wucorrupt (

+reg query HKLM\SYSTEM\CurrentControlSet\Services\wuauserv\%%G %nul% || (set wucorrupt=1&set /a wcount+=1)

 )

 

 if defined wucorrupt (

 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."

+set fixes=%fixes% %mas%remove_mal%w%ware

+call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%remove_mal%w%ware"

+) else (

+call :dk_color %Blue% "HWID activation needs working Windows updates, if you have used any tool to block updates, undo it."

+)

 ) else (

 %psc% "Start-Job { Start-Service wuauserv } | Wait-Job -Timeout 20 | Out-Null"

 sc query wuauserv | find /i "RUNNING" %nul% || (

 set wuerror=1

 sc start wuauserv %nul%

 call :dk_color %Red% "Starting Windows Update Service         [Failed] [!errorlevel!]"

+call :dk_color %Blue% "HWID activation needs working Windows updates, if you have used any tool to block updates, undo it."

 )

 )