hgw/Microsoft-Activation-Scripts
1
Fork 0
mirror of https://github.com/massgravel/Microsoft-Activation-Scripts.git synced 2024-11-22 23:56:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: hgw:dd3d788bfac0af29ccca04e062d741aeb3f606b0
Branches Tags
hgw:master
hgw:dev
hgw:2.8
hgw:2.7
hgw:2.6
hgw:2.5
hgw:2.4
hgw:2.3
hgw:2.2
hgw:2.1
hgw:2.0
hgw:1.9
hgw:1.8
hgw:1.7
hgw:1.6
hgw:1.5
hgw:1.4
hgw:1.3
hgw:1.2
..
compare: hgw:e1b994222310dfa33fc78bd62f1d9d1416b6cdfc
Branches Tags
hgw:master
hgw:dev
hgw:2.8
hgw:2.7
hgw:2.6
hgw:2.5
hgw:2.4
hgw:2.3
hgw:2.2
hgw:2.1
hgw:2.0
hgw:1.9
hgw:1.8
hgw:1.7
hgw:1.6
hgw:1.5
hgw:1.4
hgw:1.3
hgw:1.2

No commits in common. "dd3d788bfac0af29ccca04e062d741aeb3f606b0" and "e1b994222310dfa33fc78bd62f1d9d1416b6cdfc" have entirely different histories.
dd3d788bfa ... e1b9942223

4 changed files with 38 additions and 49 deletions
Show Stats Expand all files Collapse all files

22
MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
View File

@ -428,6 +428,7 @@ call :dk_errorcheck
set key= set key=
set altkey= set altkey=
set skufound=
set changekey= set changekey=
set altapplist= set altapplist=
set altedition= set altedition=
@ -452,17 +453,14 @@ call :dk_color %Red% "Checking Alternate Edition For HWID [%altedition% Acti
if not defined key ( if not defined key (
%eline% %eline%
echo [%winos% ^| %winbuild% ^| SKU:%osSKU%] echo [%winos% ^| %winbuild% ^| SKU:%osSKU%]
if not defined skunotfound ( if not defined skufound (
echo This product does not support HWID Activation. echo Unable to find this product in the supported product list.
echo Try KMS38 Activation option. ) else (
echo Required License files not found in %SysPath%\spp\tokens\skus\
)
echo Make sure you are using updated version of the script. echo Make sure you are using updated version of the script.
set fixes=%fixes% %mas% set fixes=%fixes% %mas%
echo %mas% echo %mas%
) else (
echo Required License files not found in %SysPath%\spp\tokens\skus\
set fixes=%fixes% %mas%troubleshoot
call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
)
echo: echo:
goto dk_done goto dk_done
) )
@ -1244,24 +1242,23 @@ call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%evaluation-editions"
) )
set osedition=0 set osedition=
for /f "skip=2 tokens=3" %%a in ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul6%') do set "osedition=%%a" for /f "skip=2 tokens=3" %%a in ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul6%') do set "osedition=%%a"
:: Workaround for an issue in builds between 1607 and 1709 where ProfessionalEducation is shown as Professional :: Workaround for an issue in builds between 1607 and 1709 where ProfessionalEducation is shown as Professional
if not %osedition%==0 ( if defined osedition (
if "%osSKU%"=="164" set osedition=ProfessionalEducation if "%osSKU%"=="164" set osedition=ProfessionalEducation
if "%osSKU%"=="165" set osedition=ProfessionalEducationN if "%osSKU%"=="165" set osedition=ProfessionalEducationN
) )
if not defined officeact ( if not defined officeact (
if %osedition%==0 ( if not defined osedition (
call :dk_color %Red% "Checking Edition Name [Not Found In Registry]" call :dk_color %Red% "Checking Edition Name [Not Found In Registry]"
) else ( ) else (
if not exist "%SysPath%\spp\tokens\skus\%osedition%\%osedition%*.xrm-ms" if not exist "%SysPath%\spp\tokens\skus\Security-SPP-Component-SKU-%osedition%\*-%osedition%-*.xrm-ms" ( if not exist "%SysPath%\spp\tokens\skus\%osedition%\%osedition%*.xrm-ms" if not exist "%SysPath%\spp\tokens\skus\Security-SPP-Component-SKU-%osedition%\*-%osedition%-*.xrm-ms" (
set error=1 set error=1
set skunotfound=1
call :dk_color %Red% "Checking License Files [Not Found] [%osedition%]" call :dk_color %Red% "Checking License Files [Not Found] [%osedition%]"
) )
@ -1631,6 +1628,7 @@ for /f "tokens=1-9 delims=_" %%A in ("%%#") do (
REM Detect key REM Detect key
if %1==key if %osSKU%==%%C if not defined key ( if %1==key if %osSKU%==%%C if not defined key (
set skufound=1
echo "!allapps! !altapplist!" | find /i "%%A" %nul1% && ( echo "!allapps! !altapplist!" | find /i "%%A" %nul1% && (
if %%F==1 set notworking=1 if %%F==1 set notworking=1
set key=%%B set key=%%B

21
MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
View File

@ -473,6 +473,7 @@ call :k_channel
set key= set key=
set pkey= set pkey=
set altkey= set altkey=
set skufound=
set changekey= set changekey=
set altedition= set altedition=
@ -498,16 +499,14 @@ call :dk_color %Red% "Checking Alternate Edition For KMS38 [%altedition% Acti
if not defined key if not defined _gvlk ( if not defined key if not defined _gvlk (
%eline% %eline%
echo [%winos% ^| %winbuild% ^| SKU:%osSKU%] echo [%winos% ^| %winbuild% ^| SKU:%osSKU%]
if not defined skunotfound ( if not defined skufound (
echo This product does not support KMS38 Activation. echo Unable to find this product in the supported product list.
) else (
echo Required License files not found in %SysPath%\spp\tokens\skus\
)
echo Make sure you are using updated version of the script. echo Make sure you are using updated version of the script.
set fixes=%fixes% %mas% set fixes=%fixes% %mas%
echo %mas% echo %mas%
) else (
echo Required License files not found in %SysPath%\spp\tokens\skus\
set fixes=%fixes% %mas%troubleshoot
call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
)
echo: echo:
goto dk_done goto dk_done
) )
@ -1382,24 +1381,23 @@ call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%evaluation-editions"
) )
set osedition=0 set osedition=
for /f "skip=2 tokens=3" %%a in ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul6%') do set "osedition=%%a" for /f "skip=2 tokens=3" %%a in ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul6%') do set "osedition=%%a"
:: Workaround for an issue in builds between 1607 and 1709 where ProfessionalEducation is shown as Professional :: Workaround for an issue in builds between 1607 and 1709 where ProfessionalEducation is shown as Professional
if not %osedition%==0 ( if defined osedition (
if "%osSKU%"=="164" set osedition=ProfessionalEducation if "%osSKU%"=="164" set osedition=ProfessionalEducation
if "%osSKU%"=="165" set osedition=ProfessionalEducationN if "%osSKU%"=="165" set osedition=ProfessionalEducationN
) )
if not defined officeact ( if not defined officeact (
if %osedition%==0 ( if not defined osedition (
call :dk_color %Red% "Checking Edition Name [Not Found In Registry]" call :dk_color %Red% "Checking Edition Name [Not Found In Registry]"
) else ( ) else (
if not exist "%SysPath%\spp\tokens\skus\%osedition%\%osedition%*.xrm-ms" if not exist "%SysPath%\spp\tokens\skus\Security-SPP-Component-SKU-%osedition%\*-%osedition%-*.xrm-ms" ( if not exist "%SysPath%\spp\tokens\skus\%osedition%\%osedition%*.xrm-ms" if not exist "%SysPath%\spp\tokens\skus\Security-SPP-Component-SKU-%osedition%\*-%osedition%-*.xrm-ms" (
set error=1 set error=1
set skunotfound=1
call :dk_color %Red% "Checking License Files [Not Found] [%osedition%]" call :dk_color %Red% "Checking License Files [Not Found] [%osedition%]"
) )
@ -1782,6 +1780,7 @@ c2e946d1-cfa2-4523-8c87-30bc696ee584_XGN3F-F394H-FD2MY-PP6FD-8M%f%CRC_407_Server
19b5e0fb-4431-46bc-bac1-2f1873e4ae73_NTBV8-9K7Q8-V27C6-M2BTV-KH%f%MXV_407_ServerTurbine_RS5 19b5e0fb-4431-46bc-bac1-2f1873e4ae73_NTBV8-9K7Q8-V27C6-M2BTV-KH%f%MXV_407_ServerTurbine_RS5
) do ( ) do (
for /f "tokens=1-5 delims=_" %%A in ("%%#") do if %osSKU%==%%C ( for /f "tokens=1-5 delims=_" %%A in ("%%#") do if %osSKU%==%%C (
set skufound=1
if %1==key if not defined key echo "!allapps!" | find /i "%%A" %nul1% && set key=%%B if %1==key if not defined key echo "!allapps!" | find /i "%%A" %nul1% && set key=%%B
) )
) )

23
MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
View File

@ -952,7 +952,7 @@ exit /b
for %%# in (%_oIds%) do ( for %%# in (%_oIds%) do (
echo: !actiProds%oVer%! | find /i "-%%#-" %nul1% && ( echo: !actiProds%oVer%! | find /i "%%#" %nul1% && (
call :dk_color %Gray% "Checking Activation Status [%%# is already permanently activated]" call :dk_color %Gray% "Checking Activation Status [%%# is already permanently activated]"
) || ( ) || (
@ -1066,7 +1066,6 @@ if not defined actiProds exit /b
for %%# in (%actiProds%) do ( for %%# in (%actiProds%) do (
set _sortIds=%%# set _sortIds=%%#
set _sortIds=!_sortIds:OfficeSPDFreeR_=SPDRetail_!
set _sortIds=!_sortIds:XC2RVL_=XVolume_! set _sortIds=!_sortIds:XC2RVL_=XVolume_!
set _sortIds=!_sortIds:CO365R_=Retail_! set _sortIds=!_sortIds:CO365R_=Retail_!
set _sortIds=!_sortIds:O365R_=Retail_! set _sortIds=!_sortIds:O365R_=Retail_!
@ -1076,21 +1075,14 @@ set _sortIds=!_sortIds:DemoR_=Retail_!
set _sortIds=!_sortIds:EDUR_=Retail_! set _sortIds=!_sortIds:EDUR_=Retail_!
set _sortIds=!_sortIds:R_=Retail_! set _sortIds=!_sortIds:R_=Retail_!
set _sortIds=!_sortIds:VL_=Volume_! set _sortIds=!_sortIds:VL_=Volume_!
set _sortIds=!_sortIds:Office16=!
set _sortIds=!_sortIds:Office19=!
set _sortIds=!_sortIds:Office21=!
set _sortIds=!_sortIds:Office24=!
set _sortIds=!_sortIds:Office=!
for /f "tokens=1 delims=-_" %%a in ("!_sortIds!") do set "_sortIds=-%%a-"
set _FsortIds=!_sortIds! !_FsortIds! set _FsortIds=!_sortIds! !_FsortIds!
) )
call :ohookdata findactivated %2 call :ohookdata findactivated %2
exit /b exit /b
:: Below IDs are not checked for permanent activation :: Preview VL is not checked for permanent activation
set _sortIds=!_sortIds:PreviewVL_=Volume_! set _sortIds=!_sortIds:PreviewVL_=Volume_!
set _sortIds=!_sortIds:PreInstallR_=Retail_!
::======================================================================================================================================== ::========================================================================================================================================
@ -1694,24 +1686,23 @@ call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%evaluation-editions"
) )
set osedition=0 set osedition=
for /f "skip=2 tokens=3" %%a in ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul6%') do set "osedition=%%a" for /f "skip=2 tokens=3" %%a in ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul6%') do set "osedition=%%a"
:: Workaround for an issue in builds between 1607 and 1709 where ProfessionalEducation is shown as Professional :: Workaround for an issue in builds between 1607 and 1709 where ProfessionalEducation is shown as Professional
if not %osedition%==0 ( if defined osedition (
if "%osSKU%"=="164" set osedition=ProfessionalEducation if "%osSKU%"=="164" set osedition=ProfessionalEducation
if "%osSKU%"=="165" set osedition=ProfessionalEducationN if "%osSKU%"=="165" set osedition=ProfessionalEducationN
) )
if not defined officeact ( if not defined officeact (
if %osedition%==0 ( if not defined osedition (
call :dk_color %Red% "Checking Edition Name [Not Found In Registry]" call :dk_color %Red% "Checking Edition Name [Not Found In Registry]"
) else ( ) else (
if not exist "%SysPath%\spp\tokens\skus\%osedition%\%osedition%*.xrm-ms" if not exist "%SysPath%\spp\tokens\skus\Security-SPP-Component-SKU-%osedition%\*-%osedition%-*.xrm-ms" ( if not exist "%SysPath%\spp\tokens\skus\%osedition%\%osedition%*.xrm-ms" if not exist "%SysPath%\spp\tokens\skus\Security-SPP-Component-SKU-%osedition%\*-%osedition%-*.xrm-ms" (
set error=1 set error=1
set skunotfound=1
call :dk_color %Red% "Checking License Files [Not Found] [%osedition%]" call :dk_color %Red% "Checking License Files [Not Found] [%osedition%]"
) )
@ -2261,8 +2252,8 @@ if defined _oIds (set _oIds=!_oIds! %%E) else (set _oIds=%%E)
) )
if %1==findactivated if %oVer%==%%A ( if %1==findactivated if %oVer%==%%A (
echo "!_FsortIds!" | find /i "-%%E-" %nul% && ( echo "!_FsortIds!" | find /i "%%E" %nul% && (
set actiProds%oVer%=!actiProds%oVer%! -%%E- set actiProds%oVer%=!actiProds%oVer%! %%E
) )
) )

21
MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
View File

@ -524,6 +524,7 @@ call :k_channel
set key= set key=
set pkey= set pkey=
set altkey= set altkey=
set skufound=
set changekey= set changekey=
set altedition= set altedition=
@ -538,7 +539,7 @@ set /a UBR=0
if %osSKU%==191 if defined altkey if defined altedition ( 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 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% LSS 22598 if !UBR! LSS 2788 (
call :dk_color %Blue% "Windows must to be updated to build 19044.2788 or higher for IotEnterpriseS %KS% activation." call :dk_color %Blue% "Windows must to be updated to build 19044.2788 or higher for IotEnterpriseS KMS38 activation."
) )
) )
@ -548,16 +549,14 @@ call :dk_color %Red% "Checking Alternate Edition For %KS% [%altedition% Act
if not defined key if not defined _gvlk ( if not defined key if not defined _gvlk (
echo [%winos% ^| %winbuild% ^| SKU:%osSKU%] echo [%winos% ^| %winbuild% ^| SKU:%osSKU%]
if not defined skunotfound ( if not defined skufound (
echo This product does not support %KS% Activation. call :dk_color %Red% "Unable to find this product in the supported product list."
echo:
set fixes=%fixes% %mas%unsupported_products_activation set fixes=%fixes% %mas%unsupported_products_activation
call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%unsupported_products_activation" call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%unsupported_products_activation"
) else ( ) else (
echo Required License files not found in %SysPath%\spp\tokens\skus\ echo Required License files not found in %SysPath%\spp\tokens\skus\
set fixes=%fixes% %mas%troubleshoot
call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
) )
echo:
goto :ks_office goto :ks_office
) )
@ -654,7 +653,9 @@ if defined ohub (
echo: echo:
echo You have only Office dashboard app installed, you need to install full Office version. echo You have only Office dashboard app installed, you need to install full Office version.
) )
echo:
call :dk_color %Blue% "Download and install Office from below URL and try again." call :dk_color %Blue% "Download and install Office from below URL and try again."
echo:
set fixes=%fixes% %mas%genuine-installation-media set fixes=%fixes% %mas%genuine-installation-media
call :dk_color %_Yellow% "%mas%genuine-installation-media" call :dk_color %_Yellow% "%mas%genuine-installation-media"
goto :ks_activate goto :ks_activate
@ -2693,24 +2694,23 @@ call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%evaluation-editions"
) )
set osedition=0 set osedition=
for /f "skip=2 tokens=3" %%a in ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul6%') do set "osedition=%%a" for /f "skip=2 tokens=3" %%a in ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul6%') do set "osedition=%%a"
:: Workaround for an issue in builds between 1607 and 1709 where ProfessionalEducation is shown as Professional :: Workaround for an issue in builds between 1607 and 1709 where ProfessionalEducation is shown as Professional
if not %osedition%==0 ( if defined osedition (
if "%osSKU%"=="164" set osedition=ProfessionalEducation if "%osSKU%"=="164" set osedition=ProfessionalEducation
if "%osSKU%"=="165" set osedition=ProfessionalEducationN if "%osSKU%"=="165" set osedition=ProfessionalEducationN
) )
if not defined officeact ( if not defined officeact (
if %osedition%==0 ( if not defined osedition (
call :dk_color %Red% "Checking Edition Name [Not Found In Registry]" call :dk_color %Red% "Checking Edition Name [Not Found In Registry]"
) else ( ) else (
if not exist "%SysPath%\spp\tokens\skus\%osedition%\%osedition%*.xrm-ms" if not exist "%SysPath%\spp\tokens\skus\Security-SPP-Component-SKU-%osedition%\*-%osedition%-*.xrm-ms" ( if not exist "%SysPath%\spp\tokens\skus\%osedition%\%osedition%*.xrm-ms" if not exist "%SysPath%\spp\tokens\skus\Security-SPP-Component-SKU-%osedition%\*-%osedition%-*.xrm-ms" (
set error=1 set error=1
set skunotfound=1
call :dk_color %Red% "Checking License Files [Not Found] [%osedition%]" call :dk_color %Red% "Checking License Files [Not Found] [%osedition%]"
) )
@ -3407,6 +3407,7 @@ d0eded01-0881-4b37-9738-190400095098_MQ84N-7VYDM-FXV7C-6K7CC-VF%f%W9J__16_Word20
for /f "tokens=1-5 delims=_" %%A in ("%%#") do ( for /f "tokens=1-5 delims=_" %%A in ("%%#") do (
if %1==winkey if %osSKU%==%%C if not defined key ( if %1==winkey if %osSKU%==%%C if not defined key (
set skufound=1
echo "!allapps!" | find /i "%%A" %nul1% && set key=%%B echo "!allapps!" | find /i "%%A" %nul1% && set key=%%B
) )