diff --git a/MAS/All-In-One-Version-KL/MAS_AIO.cmd b/MAS/All-In-One-Version-KL/MAS_AIO.cmd index 4a15d57..f9b8c35 100644 --- a/MAS/All-In-One-Version-KL/MAS_AIO.cmd +++ b/MAS/All-In-One-Version-KL/MAS_AIO.cmd @@ -2423,6 +2423,7 @@ set error=1 goto :starto16c2r ) +call :oh_expiredpreview 2013 call :oh_fixprids call :oh_process if defined isOspp ( @@ -2480,6 +2481,7 @@ set error=1 goto :startmsi ) +call :oh_expiredpreview 2016 2019 2021 2024 call :oh_fixprids call :oh_process if defined isOspp ( @@ -2739,6 +2741,21 @@ exit /b ::======================================================================================================================================== +:oh_expiredpreview + +for %%# in (%*) do ( +if exist "!_oLPath!\ProPlus%%#PreviewVL_*.xrm-ms" if not exist "!_oLPath!\ProPlus%%#VL_*.xrm-ms" ( +set error=1 +set showfix=1 +call :dk_color %Red% "Checking Expired Preview Products [Office %%# Preview Found]" +call :dk_color %Blue% "Please run the Office updates first, and then attempt to activate it again." +) +) + +exit /b + +::======================================================================================================================================== + :oh_ppcpath if not defined isOspp ( @@ -4111,29 +4128,29 @@ echo: echo: echo ______________________________________________________________ echo: -call :dk_color2 %_White% " [1] " %_Green% "Auto" -echo Builds ^> 19041 -StaticCID (KMS4k if offline) -echo Builds ^< 19041 -ZeroCID -echo ________________________________________________ +call :dk_color2 %_White% " [1] " %_Green% "Auto" +echo Builds ^>= 19041 - StaticCID (KMS4k if offline) +echo Builds ^< 19041 - ZeroCID +echo __________________________________________________ echo: -echo [2] StaticCID -echo Needs Internet -echo Not for Windows 7 or older -echo ________________________________________________ +echo [2] StaticCID +echo Needs Internet +echo Not for Windows 7 or older +echo __________________________________________________ echo: -echo [3] ZeroCID -echo Works reliably on builds below 19041 -echo May break on builds between 19041-26100 -echo Does not work on builds above 26100.4188 -echo ________________________________________________ +echo [3] ZeroCID +echo Works reliably on builds below 19041 +echo May break on builds between 19041-26100 +echo Does not work on builds above 26100.4188 +echo __________________________________________________ echo: -echo [4] KMS4k -echo Volume licenses only -echo Activates for 4000+ years -echo ________________________________________________ +echo [4] KMS4k +echo Volume licenses only +echo Activates for 4000+ years +echo __________________________________________________ echo: -echo [5] Learn More -echo [0] %_exitmsg% +echo [5] Learn More +echo [0] %_exitmsg% echo ______________________________________________________________ echo: call :dk_color2 %_White% " " %_Green% "Choose a menu option using your keyboard..." @@ -4980,6 +4997,7 @@ set error=1 goto :ts_starto16c2r ) +call :oh_expiredpreview 2013 if "%_actprojvis%"=="0" call :oh_fixprids call :ts_process @@ -5021,6 +5039,7 @@ set error=1 goto :ts_startmsi ) +call :oh_expiredpreview 2016 2019 2021 2024 if "%_actprojvis%"=="0" call :oh_fixprids call :ts_process @@ -12966,6 +12985,7 @@ set error=1 goto :ks_starto16c2r ) +call :oh_expiredpreview 2013 if "%_actprojvis%"=="0" call :oh_fixprids call :ks_process @@ -13006,6 +13026,7 @@ set error=1 goto :ks_startmsi ) +call :oh_expiredpreview 2016 2019 2021 2024 if "%_actprojvis%"=="0" call :oh_fixprids call :ks_process diff --git a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd index 60e7a5c..0a5ae7c 100644 --- a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd +++ b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd @@ -614,6 +614,7 @@ set error=1 goto :starto16c2r ) +call :oh_expiredpreview 2013 call :oh_fixprids call :oh_process if defined isOspp ( @@ -671,6 +672,7 @@ set error=1 goto :startmsi ) +call :oh_expiredpreview 2016 2019 2021 2024 call :oh_fixprids call :oh_process if defined isOspp ( @@ -930,6 +932,21 @@ exit /b ::======================================================================================================================================== +:oh_expiredpreview + +for %%# in (%*) do ( +if exist "!_oLPath!\ProPlus%%#PreviewVL_*.xrm-ms" if not exist "!_oLPath!\ProPlus%%#VL_*.xrm-ms" ( +set error=1 +set showfix=1 +call :dk_color %Red% "Checking Expired Preview Products [Office %%# Preview Found]" +call :dk_color %Blue% "Please run the Office updates first, and then attempt to activate it again." +) +) + +exit /b + +::======================================================================================================================================== + :oh_ppcpath if not defined isOspp ( diff --git a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd index 27e539a..670cc67 100644 --- a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd +++ b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd @@ -876,6 +876,7 @@ set error=1 goto :ks_starto16c2r ) +call :oh_expiredpreview 2013 if "%_actprojvis%"=="0" call :oh_fixprids call :ks_process @@ -916,6 +917,7 @@ set error=1 goto :ks_startmsi ) +call :oh_expiredpreview 2016 2019 2021 2024 if "%_actprojvis%"=="0" call :oh_fixprids call :ks_process @@ -1096,6 +1098,21 @@ exit /b ::======================================================================================================================================== +:oh_expiredpreview + +for %%# in (%*) do ( +if exist "!_oLPath!\ProPlus%%#PreviewVL_*.xrm-ms" if not exist "!_oLPath!\ProPlus%%#VL_*.xrm-ms" ( +set error=1 +set showfix=1 +call :dk_color %Red% "Checking Expired Preview Products [Office %%# Preview Found]" +call :dk_color %Blue% "Please run the Office updates first, and then attempt to activate it again." +) +) + +exit /b + +::======================================================================================================================================== + :: Some Office Retail to Volume converter tools may edit the ProductReleaseIds to add VL products. This code restores it because it may affect features. :oh_fixprids diff --git a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd index 3de091f..e07baeb 100644 --- a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd +++ b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd @@ -511,29 +511,29 @@ echo: echo: echo ______________________________________________________________ echo: -call :dk_color2 %_White% " [1] " %_Green% "Auto" -echo Builds ^> 19041 -StaticCID (KMS4k if offline) -echo Builds ^< 19041 -ZeroCID -echo ________________________________________________ +call :dk_color2 %_White% " [1] " %_Green% "Auto" +echo Builds ^>= 19041 - StaticCID (KMS4k if offline) +echo Builds ^< 19041 - ZeroCID +echo __________________________________________________ echo: -echo [2] StaticCID -echo Needs Internet -echo Not for Windows 7 or older -echo ________________________________________________ +echo [2] StaticCID +echo Needs Internet +echo Not for Windows 7 or older +echo __________________________________________________ echo: -echo [3] ZeroCID -echo Works reliably on builds below 19041 -echo May break on builds between 19041-26100 -echo Does not work on builds above 26100.4188 -echo ________________________________________________ +echo [3] ZeroCID +echo Works reliably on builds below 19041 +echo May break on builds between 19041-26100 +echo Does not work on builds above 26100.4188 +echo __________________________________________________ echo: -echo [4] KMS4k -echo Volume licenses only -echo Activates for 4000+ years -echo ________________________________________________ +echo [4] KMS4k +echo Volume licenses only +echo Activates for 4000+ years +echo __________________________________________________ echo: -echo [5] Learn More -echo [0] %_exitmsg% +echo [5] Learn More +echo [0] %_exitmsg% echo ______________________________________________________________ echo: call :dk_color2 %_White% " " %_Green% "Choose a menu option using your keyboard..." @@ -1380,6 +1380,7 @@ set error=1 goto :ts_starto16c2r ) +call :oh_expiredpreview 2013 if "%_actprojvis%"=="0" call :oh_fixprids call :ts_process @@ -1421,6 +1422,7 @@ set error=1 goto :ts_startmsi ) +call :oh_expiredpreview 2016 2019 2021 2024 if "%_actprojvis%"=="0" call :oh_fixprids call :ts_process @@ -2002,6 +2004,21 @@ exit /b ::======================================================================================================================================== +:oh_expiredpreview + +for %%# in (%*) do ( +if exist "!_oLPath!\ProPlus%%#PreviewVL_*.xrm-ms" if not exist "!_oLPath!\ProPlus%%#VL_*.xrm-ms" ( +set error=1 +set showfix=1 +call :dk_color %Red% "Checking Expired Preview Products [Office %%# Preview Found]" +call :dk_color %Blue% "Please run the Office updates first, and then attempt to activate it again." +) +) + +exit /b + +::======================================================================================================================================== + :: Some Office Retail to Volume converter tools may edit the ProductReleaseIds to add VL products. This code restores it because it may affect features. :oh_fixprids