Skip to content

Commit 066b135

Browse files
committed
2.5
1 parent 64e0067 commit 066b135

12 files changed

+1222
-723
lines changed

.gitattributes

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

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

Lines changed: 424 additions & 313 deletions
Large diffs are not rendered by default.

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

Lines changed: 222 additions & 125 deletions
Large diffs are not rendered by default.

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

Lines changed: 228 additions & 122 deletions
Large diffs are not rendered by default.

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

Lines changed: 225 additions & 67 deletions
Large diffs are not rendered by default.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
@set masver=2.4
1+
@set masver=2.5
22
@setlocal DisableDelayedExpansion
33
@echo off
44

55

6-
::
6+
77
::=================================================================================================
88
::
99
:: Online KMS Script is a fork of @abbodi1406's KMS_VL_ALL forums.mydigitallife.net/posts/838808
@@ -248,7 +248,7 @@ echo You are running outdated version MAS %masver%
248248
echo ________________________________________________
249249
echo:
250250
if not defined _unattended (
251-
echo [1] Download Latest MAS
251+
echo [1] Get Latest MAS
252252
echo [0] Continue Anyway
253253
echo:
254254
call :_color %_Green% "Enter a menu option in the Keyboard [1,0] :"

MAS/Separate-Files-Version/Change_Edition.cmd

Lines changed: 34 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
@set masver=2.4
1+
@set masver=2.5
22
@setlocal DisableDelayedExpansion
33
@echo off
44

55

6-
::
6+
77
::============================================================================
88
::
99
:: This script is a part of 'Microsoft_Activation_Scripts' (MAS) project.
@@ -230,7 +230,7 @@ echo ________________________________________________
230230
echo You are running outdated version MAS %masver%
231231
echo ________________________________________________
232232
echo:
233-
echo [1] Download Latest MAS
233+
echo [1] Get Latest MAS
234234
echo [0] Continue Anyway
235235
echo:
236236
call :dk_color %_Green% "Enter a menu option in the Keyboard [1,0] :"
@@ -282,24 +282,7 @@ goto ced_done
282282

283283
::========================================================================================================================================
284284

285-
:: Check SKU value
286-
287-
set osSKU=
288-
set slcSKU=
289-
set wmiSKU=
290-
291-
if %winbuild% GEQ 14393 (set info=Kernel-BrandingInfo) else (set info=Kernel-ProductInfo)
292-
set d1=%ref% [void]$TypeBuilder.DefinePInvokeMethod('SLGetWindowsInformationDWORD', 'slc.dll', 'Public, Static', 1, [int], @([String], [int].MakeByRefType()), 1, 3);
293-
set d1=%d1% $Sku = 0; [void]$TypeBuilder.CreateType()::SLGetWindowsInformationDWORD('%info%', [ref]$Sku); $Sku
294-
for /f "delims=" %%s in ('"%psc% %d1%"') do if not errorlevel 1 (set slcSKU=%%s)
295-
if "%slcSKU%"=="0" set slcSKU=
296-
if 1%slcSKU% NEQ +1%slcSKU% set slcSKU=
297-
298-
if %_wmic% EQU 1 for /f "tokens=2 delims==" %%a in ('"wmic Path Win32_OperatingSystem Get OperatingSystemSKU /format:LIST" %nul6%') do if not errorlevel 1 set "wmiSKU=%%a"
299-
if %_wmic% EQU 0 for /f "tokens=1" %%a in ('%psc% "([WMI]'Win32_OperatingSystem=@').OperatingSystemSKU" %nul6%') do if not errorlevel 1 set "wmiSKU=%%a"
300-
301-
set osSKU=%slcSKU%
302-
if not defined osSKU set osSKU=%wmiSKU%
285+
call :dk_checksku
303286

304287
if not defined osSKU (
305288
%eline%
@@ -324,7 +307,7 @@ if not defined osedition (
324307
for /f "skip=2 tokens=3" %%a in ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul6%') do set "osedition=%%a"
325308
)
326309

327-
:: Workaround for a Windows bug in builds between 1607 and 1709 where ProfessionalEducation is shown as Professional
310+
:: Workaround for an issue in builds between 1607 and 1709 where ProfessionalEducation is shown as Professional
328311

329312
if %osSKU%==164 set osedition=ProfessionalEducation
330313
if %osSKU%==165 set osedition=ProfessionalEducationN
@@ -354,7 +337,10 @@ for /f "skip=2 tokens=2*" %%a in ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT
354337

355338
%psc% $ExecutionContext.SessionState.LanguageMode %nul2% | find /i "Full" %nul1% || (
356339
%eline%
357-
echo PowerShell is not responding properly. Aborting...
340+
%psc% $ExecutionContext.SessionState.LanguageMode
341+
echo:
342+
echo PowerShell is not working. Aborting...
343+
echo If you have applied restrictions on Powershell then undo those changes.
358344
echo:
359345
echo Check this page for help. %mas%troubleshoot
360346
goto ced_done
@@ -654,6 +640,31 @@ exit /b
654640

655641
::========================================================================================================================================
656642

643+
:: Check SKU value
644+
645+
:dk_checksku
646+
647+
set osSKU=
648+
set slcSKU=
649+
set wmiSKU=
650+
set regSKU=
651+
652+
if %winbuild% GEQ 14393 (set info=Kernel-BrandingInfo) else (set info=Kernel-ProductInfo)
653+
set d1=%ref% [void]$TypeBuilder.DefinePInvokeMethod('SLGetWindowsInformationDWORD', 'slc.dll', 'Public, Static', 1, [int], @([String], [int].MakeByRefType()), 1, 3);
654+
set d1=%d1% $Sku = 0; [void]$TypeBuilder.CreateType()::SLGetWindowsInformationDWORD('%info%', [ref]$Sku); $Sku
655+
for /f "delims=" %%s in ('"%psc% %d1%"') do if not errorlevel 1 (set slcSKU=%%s)
656+
if "%slcSKU%"=="0" set slcSKU=
657+
if 1%slcSKU% NEQ +1%slcSKU% set slcSKU=
658+
659+
for /f "tokens=3 delims=." %%a in ('reg query "HKLM\SYSTEM\CurrentControlSet\Control\ProductOptions" /v OSProductPfn %nul6%') do set "regSKU=%%a"
660+
if %_wmic% EQU 1 for /f "tokens=2 delims==" %%a in ('"wmic Path Win32_OperatingSystem Get OperatingSystemSKU /format:LIST" %nul6%') do if not errorlevel 1 set "wmiSKU=%%a"
661+
if %_wmic% EQU 0 for /f "tokens=1" %%a in ('%psc% "([WMI]'Win32_OperatingSystem=@').OperatingSystemSKU" %nul6%') do if not errorlevel 1 set "wmiSKU=%%a"
662+
663+
set osSKU=%slcSKU%
664+
if not defined osSKU set osSKU=%wmiSKU%
665+
if not defined osSKU set osSKU=%regSKU%
666+
exit /b
667+
657668
:: Refresh license status
658669

659670
:dk_refresh

MAS/Separate-Files-Version/Check-Activation-Status-vbs.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66

7-
:: Check-Activation-Status
7+
:: Check-Activation-Status-vbs.cmd
88
:: Written by @abbodi1406
99
:: forums.mydigitallife.net/posts/838808
1010

MAS/Separate-Files-Version/Check-Activation-Status-wmi.cmd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<!-- : Begin batch script
21
@setlocal DisableDelayedExpansion
32
@echo off
43

MAS/Separate-Files-Version/Extract_OEM_Folder.cmd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
@set masver=2.4
1+
@set masver=2.5
22
@setlocal DisableDelayedExpansion
33
@echo off
44

55

6-
::
6+
77
::============================================================================
88
::
99
:: This script is a part of 'Microsoft_Activation_Scripts' (MAS) project.
@@ -222,7 +222,7 @@ echo ________________________________________________
222222
echo You are running outdated version MAS %masver%
223223
echo ________________________________________________
224224
echo:
225-
echo [1] Download Latest MAS
225+
echo [1] Get Latest MAS
226226
echo [0] Continue Anyway
227227
echo:
228228
call :ex_color %_Green% "Enter a menu option in the Keyboard [1,0] :"

0 commit comments

Comments
 (0)