Skip to content

Commit 60c9974

Browse files
author
WindowsAddict
committed
3.0
1 parent 8f3f392 commit 60c9974

File tree

14 files changed

+13907
-421
lines changed

14 files changed

+13907
-421
lines changed

‎.gitattributes‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# MAS export-ignore
2-
# LICENSE export-ignore
3-
# README.md export-ignore
1+
MAS export-ignore
2+
LICENSE export-ignore
3+
README.md export-ignore
44
.gitattributes export-ignore

‎MAS/All-In-One-Version-KL/MAS_AIO.cmd‎

Lines changed: 6226 additions & 221 deletions
Large diffs are not rendered by default.

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

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@set masver=2.9
1+
@set masver=3.0
22
@echo off
33

44

@@ -161,19 +161,29 @@ for %%A in (%_act% %_NoEditionChange%) do (if "%%A"=="1" set _unattended=1)
161161

162162
call :dk_setvar
163163

164+
if %winbuild% EQU 1 (
165+
%eline%
166+
echo Failed to detect Windows build number.
167+
echo:
168+
setlocal EnableDelayedExpansion
169+
set fixes=%fixes% %mas%troubleshoot
170+
call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
171+
goto dk_done
172+
)
173+
164174
if %winbuild% LSS 10240 (
165175
%eline%
166176
echo Unsupported OS version detected [%winbuild%].
167177
echo HWID Activation is only supported on Windows 10/11.
168178
echo:
169-
call :dk_color %Blue% "Use Online KMS activation option."
179+
call :dk_color %Blue% "Use TSforge activation option from the main menu."
170180
goto dk_done
171181
)
172182

173183
if exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-Server*Edition~*.mum" (
174184
%eline%
175185
echo HWID Activation is not supported on Windows Server.
176-
call :dk_color %Blue% "Use KMS38 or Online KMS activation option."
186+
call :dk_color %Blue% "Use TSforge activation option from the main menu."
177187
goto dk_done
178188
)
179189

@@ -294,9 +304,13 @@ set "d4=$k=$t.CreateType(); $b=$k::SetConsoleMode($k::GetStdHandle(-10), 0x0080)
294304

295305
set -=
296306
set old=
307+
set upver=%masver:.=%
297308

298-
for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck.mass%-%grave.dev') do (
299-
if not "%%#"=="" (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
309+
for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 activ%-%ated.win') do (
310+
if not "%%#"=="" set old=1
311+
for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck%upver%.activ%-%ated.win') do (
312+
if not "%%#"=="" set old=
313+
)
300314
)
301315

302316
if defined old (
@@ -312,7 +326,7 @@ echo:
312326
call :dk_color %_Green% "Choose a menu option using your keyboard [1,0] :"
313327
choice /C:10 /N
314328
if !errorlevel!==2 rem
315-
if !errorlevel!==1 (start ht%-%tps://github.com/mass%-%gravel/Microsoft-Acti%-%vation-Scripts & start %mas% & exit /b)
329+
if !errorlevel!==1 (start %mas% & exit /b)
316330
)
317331
)
318332

@@ -380,7 +394,8 @@ reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul2
380394
%eline%
381395
echo [%winos% ^| %winbuild%]
382396
echo:
383-
echo Evaluation editions cannot be activated outside of their evaluation period.
397+
echo Evaluation editions cannot be activated outside of their evaluation period.
398+
call :dk_color %Blue% "Use TSforge activation option from the main menu to reset evaluation period."
384399
echo:
385400
set fixes=%fixes% %mas%evaluation_editions
386401
call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%evaluation_editions"
@@ -464,7 +479,7 @@ echo [%winos% ^| %winbuild% ^| SKU:%osSKU%]
464479
if not defined skunotfound (
465480
echo This product does not support HWID activation.
466481
echo Make sure you are using the latest version of the script.
467-
echo If you are, then try KMS38 activation option.
482+
echo If you are, then try TSforge activation option from the main menu.
468483
set fixes=%fixes% %mas%
469484
echo %mas%
470485
) else (
@@ -725,7 +740,7 @@ call :dk_color %Green% "%winos% is permanently activated with a digital license.
725740
call :dk_color %Red% "Activation Failed %error_code%"
726741
if defined notworking (
727742
call :dk_color %Blue% "At the time of writing, HWID Activation is not supported for this product."
728-
call :dk_color %Blue% "Use KMS38 activation option instead."
743+
call :dk_color %Blue% "Use TSforge activation option from the main menu instead."
729744
) else (
730745
if not defined error call :dk_color %Blue% "%_fixmsg%"
731746
set fixes=%fixes% %mas%troubleshoot

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

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@set masver=2.9
1+
@set masver=3.0
22
@echo off
33

44

@@ -167,15 +167,25 @@ set _k38=
167167
call :dk_setvar
168168
set "specific_kms=SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\55c92734-d682-4d71-983e-d6ec3f16059f"
169169

170+
if %winbuild% EQU 1 (
171+
%eline%
172+
echo Failed to detect Windows build number.
173+
echo:
174+
setlocal EnableDelayedExpansion
175+
set fixes=%fixes% %mas%troubleshoot
176+
call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
177+
goto dk_done
178+
)
179+
170180
if %winbuild% LSS 14393 (
171181
%eline%
172182
echo Unsupported OS version detected [%winbuild%].
173183
echo KMS38 activation is only supported on Windows 10/11/Server, build 14393 and later.
174184
echo:
175185
if %winbuild% LSS 10240 (
176-
call :dk_color %Blue% "Use Online KMS activation option."
186+
call :dk_color %Blue% "Use TSforge activation option from the main menu."
177187
) else (
178-
call :dk_color %Blue% "Use HWID activation option."
188+
call :dk_color %Blue% "Use HWID activation option from the main menu."
179189
)
180190
goto dk_done
181191
)
@@ -297,9 +307,13 @@ set "d4=$k=$t.CreateType(); $b=$k::SetConsoleMode($k::GetStdHandle(-10), 0x0080)
297307

298308
set -=
299309
set old=
310+
set upver=%masver:.=%
300311

301-
for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck.mass%-%grave.dev') do (
302-
if not "%%#"=="" (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
312+
for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 activ%-%ated.win') do (
313+
if not "%%#"=="" set old=1
314+
for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck%upver%.activ%-%ated.win') do (
315+
if not "%%#"=="" set old=
316+
)
303317
)
304318

305319
if defined old (
@@ -315,7 +329,7 @@ echo:
315329
call :dk_color %_Green% "Choose a menu option using your keyboard [1,0] :"
316330
choice /C:10 /N
317331
if !errorlevel!==2 rem
318-
if !errorlevel!==1 (start ht%-%tps://github.com/mass%-%gravel/Microsoft-Acti%-%vation-Scripts & start %mas% & exit /b)
332+
if !errorlevel!==1 (start %mas% & exit /b)
319333
)
320334
)
321335
cls
@@ -431,7 +445,8 @@ echo Server Evaluation cannot be activated. Convert it to full Server OS.
431445
echo:
432446
call :dk_color %Blue% "Go Back to main menu and use [Change Edition] option."
433447
) else (
434-
echo Evaluation editions cannot be activated outside of their evaluation period.
448+
echo Evaluation editions cannot be activated outside of their evaluation period.
449+
call :dk_color %Blue% "Use TSforge activation option from the main menu to reset evaluation period."
435450
echo:
436451
set fixes=%fixes% %mas%evaluation_editions
437452
call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%evaluation_editions"
@@ -541,7 +556,7 @@ call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
541556

542557
if not defined skunotfound if not defined sppks (
543558
call :dk_color %Red% "This product does not support KMS38 activation."
544-
call :dk_color %Blue% "Make sure you are using the latest version of the script."
559+
call :dk_color %Blue% "Use TSforge activation option from the main menu."
545560
set fixes=%fixes% %mas%
546561
echo %mas%
547562
)

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

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@set masver=2.9
1+
@set masver=3.0
22
@echo off
33

44

@@ -161,6 +161,16 @@ for %%A in (%_act% %_rem%) do (if "%%A"=="1" set _unattended=1)
161161

162162
call :dk_setvar
163163

164+
if %winbuild% EQU 1 (
165+
%eline%
166+
echo Failed to detect Windows build number.
167+
echo:
168+
setlocal EnableDelayedExpansion
169+
set fixes=%fixes% %mas%troubleshoot
170+
call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
171+
goto dk_done
172+
)
173+
164174
if %winbuild% LSS 9200 (
165175
%eline%
166176
echo Unsupported OS version detected [%winbuild%].
@@ -287,9 +297,13 @@ set "d4=$k=$t.CreateType(); $b=$k::SetConsoleMode($k::GetStdHandle(-10), 0x0080)
287297

288298
set -=
289299
set old=
300+
set upver=%masver:.=%
290301

291-
for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck.mass%-%grave.dev') do (
292-
if not "%%#"=="" (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
302+
for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 activ%-%ated.win') do (
303+
if not "%%#"=="" set old=1
304+
for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck%upver%.activ%-%ated.win') do (
305+
if not "%%#"=="" set old=
306+
)
293307
)
294308

295309
if defined old (
@@ -305,7 +319,7 @@ echo:
305319
call :dk_color %_Green% "Choose a menu option using your keyboard [1,0] :"
306320
choice /C:10 /N
307321
if !errorlevel!==2 rem
308-
if !errorlevel!==1 (start ht%-%tps://github.com/mass%-%gravel/Microsoft-Acti%-%vation-Scripts & start %mas% & exit /b)
322+
if !errorlevel!==1 (start %mas% & exit /b)
309323
)
310324
)
311325
cls
@@ -520,11 +534,11 @@ echo "!_oIds!" | find /i " %%a " %nul1% || (set "_oIds= !_oIds! %%a ")
520534
set "_oLPath=%_oRoot%\Licenses"
521535
set "_oIntegrator=%_oRoot%\integration\integrator.exe"
522536

523-
if "%_oArch%"=="x64" (set "_hookPath=%_oRoot%\vfs\System" & set "_hook=sppc64.dll")
524-
if "%_oArch%"=="x86" (set "_hookPath=%_oRoot%\vfs\SystemX86" & set "_hook=sppc32.dll")
537+
if /i "%_oArch%"=="x64" (set "_hookPath=%_oRoot%\vfs\System" & set "_hook=sppc64.dll")
538+
if /i "%_oArch%"=="x86" (set "_hookPath=%_oRoot%\vfs\SystemX86" & set "_hook=sppc32.dll")
525539
if not "%osarch%"=="x86" (
526-
if "%_oArch%"=="x64" set "_sppcPath=%SystemRoot%\System32\sppc.dll"
527-
if "%_oArch%"=="x86" set "_sppcPath=%SystemRoot%\SysWOW64\sppc.dll"
540+
if /i "%_oArch%"=="x64" set "_sppcPath=%SystemRoot%\System32\sppc.dll"
541+
if /i "%_oArch%"=="x86" set "_sppcPath=%SystemRoot%\SysWOW64\sppc.dll"
528542
) else (
529543
set "_sppcPath=%SystemRoot%\System32\sppc.dll"
530544
)
@@ -570,11 +584,11 @@ set _o16c2rIds=%_oIds%
570584
set "_oLPath=%_oRoot%\Licenses16"
571585
set "_oIntegrator=%_oRoot%\integration\integrator.exe"
572586

573-
if "%_oArch%"=="x64" (set "_hookPath=%_oRoot%\vfs\System" & set "_hook=sppc64.dll")
574-
if "%_oArch%"=="x86" (set "_hookPath=%_oRoot%\vfs\SystemX86" & set "_hook=sppc32.dll")
587+
if /i "%_oArch%"=="x64" (set "_hookPath=%_oRoot%\vfs\System" & set "_hook=sppc64.dll")
588+
if /i "%_oArch%"=="x86" (set "_hookPath=%_oRoot%\vfs\SystemX86" & set "_hook=sppc32.dll")
575589
if not "%osarch%"=="x86" (
576-
if "%_oArch%"=="x64" set "_sppcPath=%SystemRoot%\System32\sppc.dll"
577-
if "%_oArch%"=="x86" set "_sppcPath=%SystemRoot%\SysWOW64\sppc.dll"
590+
if /i "%_oArch%"=="x64" set "_sppcPath=%SystemRoot%\System32\sppc.dll"
591+
if /i "%_oArch%"=="x86" set "_sppcPath=%SystemRoot%\SysWOW64\sppc.dll"
578592
) else (
579593
set "_sppcPath=%SystemRoot%\System32\sppc.dll"
580594
)
@@ -1020,11 +1034,11 @@ echo "%2" | find /i "Wow6432Node" %nul1% && set _oArch=x86
10201034
if not "%osarch%"=="x86" if not defined _oArch set _oArch=x64
10211035
if "%osarch%"=="x86" set _oArch=x86
10221036

1023-
if "%_oArch%"=="x64" (set "_hookPath=%_oRoot%" & set "_hook=sppc64.dll")
1024-
if "%_oArch%"=="x86" (set "_hookPath=%_oRoot%" & set "_hook=sppc32.dll")
1037+
if /i "%_oArch%"=="x64" (set "_hookPath=%_oRoot%" & set "_hook=sppc64.dll")
1038+
if /i "%_oArch%"=="x86" (set "_hookPath=%_oRoot%" & set "_hook=sppc32.dll")
10251039
if not "%osarch%"=="x86" (
1026-
if "%_oArch%"=="x64" set "_sppcPath=%SystemRoot%\System32\sppc.dll"
1027-
if "%_oArch%"=="x86" set "_sppcPath=%SystemRoot%\SysWOW64\sppc.dll"
1040+
if /i "%_oArch%"=="x64" set "_sppcPath=%SystemRoot%\System32\sppc.dll"
1041+
if /i "%_oArch%"=="x86" set "_sppcPath=%SystemRoot%\SysWOW64\sppc.dll"
10281042
) else (
10291043
set "_sppcPath=%SystemRoot%\System32\sppc.dll"
10301044
)

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

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@set masver=2.9
1+
@set masver=3.0
22
@echo off
33

44

@@ -192,6 +192,16 @@ for %%A in (%_actwin% %_actoff% %_actprojvis% %_actwinoff% %_uni%) do (if "%%A"=
192192

193193
call :dk_setvar
194194

195+
if %winbuild% EQU 1 (
196+
%eline%
197+
echo Failed to detect Windows build number.
198+
echo:
199+
setlocal EnableDelayedExpansion
200+
set fixes=%fixes% %mas%troubleshoot
201+
call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
202+
goto dk_done
203+
)
204+
195205
if %winbuild% LSS 7600 (
196206
%nceline%
197207
echo Unsupported OS version detected [%winbuild%].
@@ -316,9 +326,13 @@ set "d4=$k=$t.CreateType(); $b=$k::SetConsoleMode($k::GetStdHandle(-10), 0x0080)
316326

317327
set -=
318328
set old=
329+
set upver=%masver:.=%
319330

320-
for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck.mass%-%grave.dev') do (
321-
if not "%%#"=="" (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
331+
for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 activ%-%ated.win') do (
332+
if not "%%#"=="" set old=1
333+
for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck%upver%.activ%-%ated.win') do (
334+
if not "%%#"=="" set old=
335+
)
322336
)
323337

324338
if defined old (
@@ -334,7 +348,7 @@ echo:
334348
call :dk_color %_Green% "Choose a menu option using your keyboard [1,0] :"
335349
choice /C:10 /N
336350
if !errorlevel!==2 rem
337-
if !errorlevel!==1 (start ht%-%tps://github.com/mass%-%gravel/Microsoft-Acti%-%vation-Scripts & start %mas% & exit /b)
351+
if !errorlevel!==1 (start %mas% & exit /b)
338352
)
339353
)
340354

@@ -520,6 +534,7 @@ call :dk_color %Red% "Checking Evaluation Edition [Evaluation editio
520534
if defined _evalserv (
521535
call :dk_color %Blue% "Go back to main menu and use [Change Edition] option."
522536
) else (
537+
call :dk_color %Blue% "Use TSforge activation option from the main menu to reset evaluation period."
523538
set fixes=%fixes% %mas%evaluation_editions
524539
call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%evaluation_editions"
525540
)
@@ -582,10 +597,7 @@ call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
582597

583598
if not defined skunotfound if not defined sppks (
584599
call :dk_color %Red% "This product does not support %KS% activation."
585-
if %winbuild% LSS 9200 (
586-
call :dk_color2 %Blue% "Use the alternative activator listed here - " %_Yellow% " %mas%unsupported_products_activation"
587-
)
588-
set fixes=%fixes% %mas%unsupported_products_activation
600+
call :dk_color %Blue% "Use TSforge activation option from the main menu."
589601
)
590602
echo:
591603
goto :ks_office
@@ -1828,8 +1840,7 @@ if defined t_name (
18281840
echo %prodname% cannot be KMS-activated on this computer due to unqualified OEM BIOS [0xC004F035].
18291841
) else (
18301842
call :dk_color %Red% "%prodname% cannot be KMS-activated on this computer due to unqualified OEM BIOS [0xC004F035]."
1831-
set fixes=%fixes% %mas%unsupported_products_activation
1832-
call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%unsupported_products_activation"
1843+
call :dk_color %Blue% "Use TSforge activation option from the main menu."
18331844
)
18341845
set oemerr=1
18351846
set showfix=1

‎MAS/Separate-Files-Version/Activators/ReadMe.txt‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)