MAS/Separate-Files-Version/Activators/HWID_Activation.cmd

@@ -317,7 +317,6 @@ title  HWID Activation %masver%
 
 echo:
 echo Initializing...
-call :dk_chkmal
 
 for %%# in (
 sppsvc.exe
@@ -1057,13 +1056,14 @@ exit /b
 
 ::========================================================================================================================================
 
-:dk_chkmal
+:dk_errorcheck
+
+set w=
+set showfix=
 
 ::  Many users unknowingly download mal-ware by using activators found through Google search.
 ::  This code aims to notify users that their system has been affected by mal-ware.
 
-set w=
-set results=
 if exist "%ProgramFiles%\KM%w%Spico" set pupfound1= KM%w%Spico 
 if exist "%SysPath%\Tasks\R@1n-KMS"  set pupfound2= R@inKMS 
 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Schedule\taskcache\tasks" /f Path /s | find /i "AutoPico" %nul% && set pupfound1= KM%w%Spico 
@@ -1094,15 +1094,9 @@ set fixes=%fixes% %mas%remove_mal%w%ware
 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%remove_mal%w%ware"
 echo:
 )
-exit /b
 
 ::========================================================================================================================================
 
-:dk_errorcheck
-
-set showfix=
-call :dk_chkmal
-
 ::  Check corrupt services
 
 set serv_cor=

MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd

@@ -352,7 +352,6 @@ title  KMS38 Activation %masver%
 
 echo:
 echo Initializing...
-call :dk_chkmal
 
 if exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-Server*CorEdition~*.mum" if not exist "%SysPath%\clipup.exe" set a_cor=1
 if not exist %SysPath%\sppsvc.exe (set _fmiss=sppsvc.exe)
@@ -487,7 +486,7 @@ if defined altkey (set key=%altkey%&set changekey=1)
 set /a UBR=0
 if %osSKU%==191 if defined altkey if defined altedition (
 for /f "skip=2 tokens=2*" %%a in ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v UBR %nul6%') do if not errorlevel 1 set /a UBR=%%b
-if %winbuild% LSS 22598 if !UBR! LSS 2788 (
+if %winbuild% GEQ 19044 if !UBR! LSS 2788 (
 call :dk_color %Blue% "Windows must to be updated to build 19044.2788 or higher for IotEnterpriseS KMS38 activation."
 )
 )
@@ -1196,13 +1195,14 @@ exit /b
 
 ::========================================================================================================================================
 
-:dk_chkmal
+:dk_errorcheck
+
+set w=
+set showfix=
 
 ::  Many users unknowingly download mal-ware by using activators found through Google search.
 ::  This code aims to notify users that their system has been affected by mal-ware.
 
-set w=
-set results=
 if exist "%ProgramFiles%\KM%w%Spico" set pupfound1= KM%w%Spico 
 if exist "%SysPath%\Tasks\R@1n-KMS"  set pupfound2= R@inKMS 
 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Schedule\taskcache\tasks" /f Path /s | find /i "AutoPico" %nul% && set pupfound1= KM%w%Spico 
@@ -1233,15 +1233,9 @@ set fixes=%fixes% %mas%remove_mal%w%ware
 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%remove_mal%w%ware"
 echo:
 )
-exit /b
 
 ::========================================================================================================================================
 
-:dk_errorcheck
-
-set showfix=
-call :dk_chkmal
-
 ::  Check corrupt services
 
 set serv_cor=

MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd

@@ -351,7 +351,6 @@ title  Ohook Activation %masver%
 
 echo:
 echo Initializing...
-call :dk_chkmal
 
 if not exist %SysPath%\sppsvc.exe (
 %eline%
@@ -466,7 +465,7 @@ if not "%o16c2r%%o15c2r%%o16msi%%o15msi%"=="1" set multioffice=1
 if not "%o14msi%%o14c2r%%o16uwp%"=="" set multioffice=1
 
 if defined multioffice (
-call :dk_color %Gray% "Checking Multiple Office Install        [Found. Recommended to install one version only]"
+call :dk_color %Gray% "Checking Multiple Office Install        [Found. Its best to install only one version]"
 )
 
 ::========================================================================================================================================
@@ -1501,13 +1500,14 @@ exit /b
 
 ::========================================================================================================================================
 
-:dk_chkmal
+:dk_errorcheck
+
+set w=
+set showfix=
 
 ::  Many users unknowingly download mal-ware by using activators found through Google search.
 ::  This code aims to notify users that their system has been affected by mal-ware.
 
-set w=
-set results=
 if exist "%ProgramFiles%\KM%w%Spico" set pupfound1= KM%w%Spico 
 if exist "%SysPath%\Tasks\R@1n-KMS"  set pupfound2= R@inKMS 
 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Schedule\taskcache\tasks" /f Path /s | find /i "AutoPico" %nul% && set pupfound1= KM%w%Spico 
@@ -1538,15 +1538,9 @@ set fixes=%fixes% %mas%remove_mal%w%ware
 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%remove_mal%w%ware"
 echo:
 )
-exit /b
 
 ::========================================================================================================================================
 
-:dk_errorcheck
-
-set showfix=
-call :dk_chkmal
-
 ::  Check corrupt services
 
 set serv_cor=

MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd

@@ -408,7 +408,6 @@ title  Online %KS% Activation %masver%
 
 echo:
 echo Initializing...
-call :dk_chkmal
 
 if not exist %SysPath%\sppsvc.exe (
 %eline%
@@ -538,13 +537,13 @@ if defined altkey (set key=%altkey%&set changekey=1)
 set /a UBR=0
 if %osSKU%==191 if defined altkey if defined altedition (
 for /f "skip=2 tokens=2*" %%a in ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v UBR %nul6%') do if not errorlevel 1 set /a UBR=%%b
-if %winbuild% LSS 22598 if !UBR! LSS 2788 (
+if %winbuild% GEQ 19044 if !UBR! LSS 2788 (
 call :dk_color %Blue% "Windows must to be updated to build 19044.2788 or higher for IotEnterpriseS KMS38 activation."
 )
 )
 
 if not defined key if defined notfoundaltactID (
-call :dk_color %Red% "Checking Alternate Edition For %KS%      [%altedition% Activation ID Not Found]"
+call :dk_color %Red% "Checking Alternate Edition For KMS      [%altedition% Activation ID Not Found]"
 )
 
 if not defined key if not defined _gvlk (
@@ -667,7 +666,7 @@ if not "%o14c2r%%o16uwp%"=="" set multioffice=1
 
 if defined multioffice (
 echo:
-call :dk_color %Gray% "Checking Multiple Office Install        [Found. Recommended to install one version only]"
+call :dk_color %Gray% "Checking Multiple Office Install        [Found. Its best to install only one version]"
 )
 
 ::========================================================================================================================================
@@ -705,7 +704,7 @@ set error=1
 goto :ks_starto16c2r
 )
 
-if "%_actprojvis%"=="0" call :oh_fixprids
+call :oh_fixprids
 call :ks_process
 
 ::========================================================================================================================================
@@ -745,7 +744,7 @@ set error=1
 goto :ks_startmsi
 )
 
-if "%_actprojvis%"=="0" call :oh_fixprids
+call :oh_fixprids
 call :ks_process
 
 ::========================================================================================================================================
@@ -949,15 +948,6 @@ set "_osppready=%_config%"
 )
 
 reg add %_osppready% /f /v %_altoffid%.OSPPReady /t %_osppt% /d 1 %nul1%
-
-::  Office builds before 16.0.10730.20102 need the Installed license product ID in ProductReleaseIds, otherwise product info may not fully reflect 
-
-if exist "%_oLPath%\Word2019VL_KMS_Client_AE*.xrm-ms" exit /b
-
-reg query %_prids% | findstr /I "%_altoffid%" %nul1%
-if %errorlevel% NEQ 0 (
-for /f "skip=2 tokens=2*" %%a in ('reg query %_prids%') do reg add %_prids% /t REG_SZ /d "%%b,%_altoffid%" /f %nul1%
-)
 exit /b
 
 ::========================================================================================================================================
@@ -1775,7 +1765,7 @@ set _kms38=1
 call :_taskchkEnterpriseG _kms38
 )
 
-:: Set specific K-M-S host to Local Host so that global K-M-S IP can not replace KMS38 activation but can be used with Office and other Windows Editions.
+:: Set specific K-M-S host to Local Host so that global KMS IP can not replace KMS38 activation but can be used with Office and other Windows Editions.
 
 if %_kms38% EQU 1 (
 %nul% reg add "HKLM\%SPPk%\%_wApp%\%sppwid%" /f /v KeyManagementServiceName /t REG_SZ /d "127.0.0.2"
@@ -1935,7 +1925,7 @@ set KMS_IP=!server%rand%!
 set !server%rand%!=1
 
 ::  Get IPv4 address of K-M-S server to use for the activation, works even if ICMP echo is disabled.
-::  Microsoft and Antivirus's may flag the issue if public K-M-S server host name is directly used for the activation.
+::  Microsoft and Antivirus's may flag the issue if public KMS server host name is directly used for the activation.
 
 set /a server_num+=1
 (for /f "delims=[] tokens=2" %%a in ('ping -4 -n 1 %KMS_IP% 2^>nul') do set "KMS_IP=%%a"
@@ -2509,13 +2499,14 @@ exit /b
 
 ::========================================================================================================================================
 
-:dk_chkmal
+:dk_errorcheck
+
+set w=
+set showfix=
 
 ::  Many users unknowingly download mal-ware by using activators found through Google search.
 ::  This code aims to notify users that their system has been affected by mal-ware.
 
-set w=
-set results=
 if exist "%ProgramFiles%\KM%w%Spico" set pupfound1= KM%w%Spico 
 if exist "%SysPath%\Tasks\R@1n-KMS"  set pupfound2= R@inKMS 
 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Schedule\taskcache\tasks" /f Path /s | find /i "AutoPico" %nul% && set pupfound1= KM%w%Spico 
@@ -2546,15 +2537,9 @@ set fixes=%fixes% %mas%remove_mal%w%ware
 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%remove_mal%w%ware"
 echo:
 )
-exit /b
 
 ::========================================================================================================================================
 
-:dk_errorcheck
-
-set showfix=
-call :dk_chkmal
-
 ::  Check corrupt services
 
 set serv_cor=