mirror of
				https://github.com/massgravel/Microsoft-Activation-Scripts.git
				synced 2025-11-04 00:46:57 +01:00 
			
		
		
		
	Compare commits
	
		
			3 Commits
		
	
	
		
			52decdde18
			...
			63b3c5097b
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					63b3c5097b | ||
| 
						 | 
					69430c6458 | ||
| 
						 | 
					9f57f585d5 | 
@ -1131,6 +1131,7 @@ if defined _corrupt (if defined serv_cor (set "serv_cor=!serv_cor! %%#") else (s
 | 
			
		||||
 | 
			
		||||
if defined serv_cor (
 | 
			
		||||
set error=1
 | 
			
		||||
set showfix=1
 | 
			
		||||
call :dk_color %Red% "Checking Corrupt Services               [%serv_cor%]"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
@ -1406,6 +1407,7 @@ call :dk_color %Gray% "Checking SPP Token Folder               [Not Found. Creat
 | 
			
		||||
) else (
 | 
			
		||||
call :dk_color %Red% "Checking SPP Token Folder               [Not Found. Failed To Create] [%tokenstore%\]"
 | 
			
		||||
set error=1
 | 
			
		||||
set showfix=1
 | 
			
		||||
)
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -1274,6 +1274,7 @@ if defined _corrupt (if defined serv_cor (set "serv_cor=!serv_cor! %%#") else (s
 | 
			
		||||
 | 
			
		||||
if defined serv_cor (
 | 
			
		||||
set error=1
 | 
			
		||||
set showfix=1
 | 
			
		||||
call :dk_color %Red% "Checking Corrupt Services               [%serv_cor%]"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
@ -1549,6 +1550,7 @@ call :dk_color %Gray% "Checking SPP Token Folder               [Not Found. Creat
 | 
			
		||||
) else (
 | 
			
		||||
call :dk_color %Red% "Checking SPP Token Folder               [Not Found. Failed To Create] [%tokenstore%\]"
 | 
			
		||||
set error=1
 | 
			
		||||
set showfix=1
 | 
			
		||||
)
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -1581,6 +1581,7 @@ if defined _corrupt (if defined serv_cor (set "serv_cor=!serv_cor! %%#") else (s
 | 
			
		||||
 | 
			
		||||
if defined serv_cor (
 | 
			
		||||
set error=1
 | 
			
		||||
set showfix=1
 | 
			
		||||
call :dk_color %Red% "Checking Corrupt Services               [%serv_cor%]"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
@ -1856,6 +1857,7 @@ call :dk_color %Gray% "Checking SPP Token Folder               [Not Found. Creat
 | 
			
		||||
) else (
 | 
			
		||||
call :dk_color %Red% "Checking SPP Token Folder               [Not Found. Failed To Create] [%tokenstore%\]"
 | 
			
		||||
set error=1
 | 
			
		||||
set showfix=1
 | 
			
		||||
)
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -805,11 +805,28 @@ call :_taskregserv
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
call :_taskact
 | 
			
		||||
if defined sppoid if not defined _tserror if %_NoEditionChange%==0 if defined ohub call :dk_color %Gray% "Office apps such as Word, Excel are activated, use them directly. Ignore 'Buy' button in Office dashboard app."
 | 
			
		||||
if not defined showfix if defined _tserror (call :dk_color %Blue% "%_fixmsg%" & set showfix=1)
 | 
			
		||||
 | 
			
		||||
if %_norentsk%==0 (
 | 
			
		||||
::  Don't create renewal task if Windows/Office volume IDs are not found, even if script is set to create it by default
 | 
			
		||||
::  Don't create renewal task if only Windows volume ID is found and OEM BIOS error is present on Windows 7, even if script is set to create it by default
 | 
			
		||||
 | 
			
		||||
set _deltask=
 | 
			
		||||
if not %_norentsk%==0 set _deltask=1
 | 
			
		||||
if not defined _deltask (
 | 
			
		||||
if %_actwin%==0 call :_taskgetids sppwid %slp% windows
 | 
			
		||||
if %_actoff%==0 call :_taskgetids sppoid %slp% office
 | 
			
		||||
if %_actoff%==0 call :_taskgetids osppid %ospp% office
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
if not defined sppwid if not defined sppoid if not defined osppid (set _deltask=1)
 | 
			
		||||
if defined oemerr if not defined sppoid if not defined osppid (set _deltask=1)
 | 
			
		||||
 | 
			
		||||
if not defined _deltask (
 | 
			
		||||
call :ks_renewal
 | 
			
		||||
) else (
 | 
			
		||||
if exist "%ProgramFiles%\Activation-Renewal\Activation_task.cmd" call :dk_color %Gray% "Deleting activation renewal task..."
 | 
			
		||||
call :dk_color %Gray% "Skipping to create activation renewal task..."
 | 
			
		||||
call :ks_clearstuff %nul%
 | 
			
		||||
if not defined _server (
 | 
			
		||||
if %winbuild% GEQ 9200 (
 | 
			
		||||
@ -1704,6 +1721,7 @@ call :dk_color %Red% "%prodname% cannot be KMS-activated on this computer due to
 | 
			
		||||
set fixes=%fixes% %mas%unsupported_products_activation
 | 
			
		||||
call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%unsupported_products_activation"
 | 
			
		||||
)
 | 
			
		||||
set oemerr=1
 | 
			
		||||
set showfix=1
 | 
			
		||||
exit /b
 | 
			
		||||
)
 | 
			
		||||
@ -2586,6 +2604,7 @@ if defined _corrupt (if defined serv_cor (set "serv_cor=!serv_cor! %%#") else (s
 | 
			
		||||
 | 
			
		||||
if defined serv_cor (
 | 
			
		||||
set error=1
 | 
			
		||||
set showfix=1
 | 
			
		||||
call :dk_color %Red% "Checking Corrupt Services               [%serv_cor%]"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
@ -2861,6 +2880,7 @@ call :dk_color %Gray% "Checking SPP Token Folder               [Not Found. Creat
 | 
			
		||||
) else (
 | 
			
		||||
call :dk_color %Red% "Checking SPP Token Folder               [Not Found. Failed To Create] [%tokenstore%\]"
 | 
			
		||||
set error=1
 | 
			
		||||
set showfix=1
 | 
			
		||||
)
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user