Обновить README.md

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

@@ -2676,6 +2676,10 @@ if not defined winserver (
 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul2% | find /i "Server" %nul1% && set winserver=1
 )
 
+set rdsh=
+for /f "tokens=3" %%a in ('reg query "HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server" /v TSAppCompat 2^>nul') do set "edid=%%a"
+if "%edid%"=="0x1" set "rdsh=1"
+
 ::========================================================================================================================================
 
 :: Check Smart App Control
@@ -2725,6 +2729,9 @@ set "_oIntegrator=%_oRoot%\integration\integrator.exe"
 if /i "%_oArch%"=="x64" (set "_hookPath=%_oRoot%\vfs\System"    & set "_hook=sppc64.dll")
 if /i "%_oArch%"=="x86" (set "_hookPath=%_oRoot%\vfs\SystemX86" & set "_hook=sppc32.dll")
 
+call :oh_checkrdsh
+if defined _rdshfail goto :dk_done
+
 call :oh_ppcpath
 
 echo:
@@ -2783,6 +2790,9 @@ set "_oIntegrator=%_oRoot%\integration\integrator.exe"
 if /i "%_oArch%"=="x64" (set "_hookPath=%_oRoot%\vfs\System"    & set "_hook=sppc64.dll")
 if /i "%_oArch%"=="x86" (set "_hookPath=%_oRoot%\vfs\SystemX86" & set "_hook=sppc32.dll")
 
+call :oh_checkrdsh
+if defined _rdshfail goto :dk_done
+
 call :oh_ppcpath
 
 echo:
@@ -3126,6 +3136,22 @@ exit /b
 
 ::========================================================================================================================================
 
+:oh_checkrdsh
+
+set _rdshfail=
+if defined winserver if defined rdsh if defined _config if exist "%_oLPath%\Word2019VL_KMS_Client_AE*.xrm-ms" (
+echo %_oIds% | find /i "Retail" %nul1% && (
+set error=1
+call :dk_color %Red% "Retail versions of Office cannot be activated with Ohook when running on a Remote Desktop Services host."
+call :dk_color %Blue% "Go back to Main Menu, select Change Office Edition option, and change to Volume."
+set _rdshfail=1
+)
+)
+
+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
@@ -3414,19 +3440,6 @@ call :dk_color %_Yellow% "%mas%"
 )
 )
 
-::  Add SharedComputerLicensing registry key if Retail Office C2R is installed on Windows Server
-::  https://learn.microsoft.com/en-us/office/troubleshoot/office-suite-issues/click-to-run-office-on-terminal-server
-
-if defined winserver if defined _config if exist "%_oLPath%\Word2019VL_KMS_Client_AE*.xrm-ms" (
-echo %_oIds% | find /i "Retail" %nul1% && (
-set scaIsNeeded=1
-reg add %_config% /v SharedComputerLicensing /t REG_SZ /d "1" /f %nul1%
-echo Adding SharedComputerLicensing Reg      [Successful] [Needed on Server With Retail Office]"
-)
-)
-
-exit /b
-
 ::========================================================================================================================================
 
 :oh_processmsi
@@ -5249,6 +5262,10 @@ if not defined winserver (
 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul2% | find /i "Server" %nul1% && set winserver=1
 )
 
+set rdsh=
+for /f "tokens=3" %%a in ('reg query "HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server" /v TSAppCompat 2^>nul') do set "edid=%%a"
+if "%edid%"=="0x1" set "rdsh=1"
+
 ::========================================================================================================================================
 
 ::  Process Office UWP
@@ -5317,6 +5334,9 @@ set "_oLPath=%_oRoot%\Licenses"
 set "pkeypath=%_oRoot%\Office15\pkeyconfig-office.xrm-ms"
 set "_oIntegrator=%_oRoot%\integration\integrator.exe"
 
+call :ts_checkrdsh
+if defined _rdshfail goto :dk_done
+
 echo:
 echo Processing Office...                    [C2R ^| %_version% ^| %_oArch%]
 
@@ -5359,6 +5379,9 @@ set "_oLPath=%_oRoot%\Licenses16"
 set "pkeypath=%_oRoot%\Office16\pkeyconfig-office.xrm-ms"
 set "_oIntegrator=%_oRoot%\integration\integrator.exe"
 
+call :ts_checkrdsh
+if defined _rdshfail goto :dk_done
+
 echo:
 echo Processing Office...                    [C2R ^| %_version% %_AudienceData%^| %_oArch%]
 
@@ -5960,6 +5983,22 @@ exit /b
 
 ::========================================================================================================================================
 
+:ts_checkrdsh
+
+set _rdshfail=
+if /i not %tsmethod%==KMS4k if defined rdsh if defined winserver if defined _config if exist "%_oLPath%\Word2019VL_KMS_Client_AE*.xrm-ms" (
+echo %_oIds% | find /i "Retail" %nul1% && (
+set error=1
+call :dk_color %Red% "Retail versions of Office cannot be activated with TSForge when running on a Remote Desktop Services host."
+call :dk_color %Blue% "Go back to Main Menu, select Change Office Edition option, and change to Volume."
+set _rdshfail=1
+)
+)
+
+exit /b
+
+::========================================================================================================================================
+
 :ts_process
 
 if not exist "%pkeypath%" (
@@ -6075,17 +6114,6 @@ echo "!allapps!" | find /i "!_actid!" %nul1% || call :oh_installlic
 )
 )
 
-::  Add SharedComputerLicensing registry key if Retail Office C2R is installed on Windows Server
-::  https://learn.microsoft.com/en-us/office/troubleshoot/office-suite-issues/click-to-run-office-on-terminal-server
-
-if /i not %tsmethod%==KMS4k if defined winserver if defined _config if exist "%_oLPath%\Word2019VL_KMS_Client_AE*.xrm-ms" (
-echo %_oIds% | find /i "Retail" %nul1% && (
-set scaIsNeeded=1
-reg add %_config% /v SharedComputerLicensing /t REG_SZ /d "1" /f %nul1%
-echo Adding SharedComputerLicensing Reg      [Successful] [Needed on Server With Retail Office]"
-)
-)
-
 exit /b
 
 ::========================================================================================================================================

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

@@ -598,6 +598,10 @@ if not defined winserver (
 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul2% | find /i "Server" %nul1% && set winserver=1
 )
 
+set rdsh=
+for /f "tokens=3" %%a in ('reg query "HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server" /v TSAppCompat 2^>nul') do set "edid=%%a"
+if "%edid%"=="0x1" set "rdsh=1"
+
 ::========================================================================================================================================
 
 :: Check Smart App Control
@@ -647,6 +651,9 @@ set "_oIntegrator=%_oRoot%\integration\integrator.exe"
 if /i "%_oArch%"=="x64" (set "_hookPath=%_oRoot%\vfs\System"    & set "_hook=sppc64.dll")
 if /i "%_oArch%"=="x86" (set "_hookPath=%_oRoot%\vfs\SystemX86" & set "_hook=sppc32.dll")
 
+call :oh_checkrdsh
+if defined _rdshfail goto :dk_done
+
 call :oh_ppcpath
 
 echo:
@@ -705,6 +712,9 @@ set "_oIntegrator=%_oRoot%\integration\integrator.exe"
 if /i "%_oArch%"=="x64" (set "_hookPath=%_oRoot%\vfs\System"    & set "_hook=sppc64.dll")
 if /i "%_oArch%"=="x86" (set "_hookPath=%_oRoot%\vfs\SystemX86" & set "_hook=sppc32.dll")
 
+call :oh_checkrdsh
+if defined _rdshfail goto :dk_done
+
 call :oh_ppcpath
 
 echo:
@@ -1046,6 +1056,23 @@ if defined _osppPath86 set _hook86=sppc32.dll
 
 exit /b
 
+::========================================================================================================================================
+
+:oh_checkrdsh
+
+set _rdshfail=
+if defined winserver if defined rdsh if defined _config if exist "%_oLPath%\Word2019VL_KMS_Client_AE*.xrm-ms" (
+echo %_oIds% | find /i "Retail" %nul1% && (
+set error=1
+call :dk_color %Red% "Retail versions of Office cannot be activated with Ohook when running on a Remote Desktop Services host."
+call :dk_color %Blue% "Go back to Main Menu, select Change Office Edition option, and change to Volume."
+set _rdshfail=1
+)
+)
+
+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.
@@ -1336,17 +1363,6 @@ call :dk_color %_Yellow% "%mas%"
 )
 )
 
-::  Add SharedComputerLicensing registry key if Retail Office C2R is installed on Windows Server
-::  https://learn.microsoft.com/en-us/office/troubleshoot/office-suite-issues/click-to-run-office-on-terminal-server
-
-if defined winserver if defined _config if exist "%_oLPath%\Word2019VL_KMS_Client_AE*.xrm-ms" (
-echo %_oIds% | find /i "Retail" %nul1% && (
-set scaIsNeeded=1
-reg add %_config% /v SharedComputerLicensing /t REG_SZ /d "1" /f %nul1%
-echo Adding SharedComputerLicensing Reg      [Successful] [Needed on Server With Retail Office]"
-)
-)
-
 exit /b
 
 ::========================================================================================================================================

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

@@ -1355,6 +1355,10 @@ if not defined winserver (
 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul2% | find /i "Server" %nul1% && set winserver=1
 )
 
+set rdsh=
+for /f "tokens=3" %%a in ('reg query "HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server" /v TSAppCompat 2^>nul') do set "edid=%%a"
+if "%edid%"=="0x1" set "rdsh=1"
+
 ::========================================================================================================================================
 
 ::  Process Office UWP
@@ -1423,6 +1427,9 @@ set "_oLPath=%_oRoot%\Licenses"
 set "pkeypath=%_oRoot%\Office15\pkeyconfig-office.xrm-ms"
 set "_oIntegrator=%_oRoot%\integration\integrator.exe"
 
+call :ts_checkrdsh
+if defined _rdshfail goto :dk_done
+
 echo:
 echo Processing Office...                    [C2R ^| %_version% ^| %_oArch%]
 
@@ -1465,6 +1472,9 @@ set "_oLPath=%_oRoot%\Licenses16"
 set "pkeypath=%_oRoot%\Office16\pkeyconfig-office.xrm-ms"
 set "_oIntegrator=%_oRoot%\integration\integrator.exe"
 
+call :ts_checkrdsh
+if defined _rdshfail goto :dk_done
+
 echo:
 echo Processing Office...                    [C2R ^| %_version% %_AudienceData%^| %_oArch%]
 
@@ -2148,6 +2158,22 @@ exit /b
 
 ::========================================================================================================================================
 
+:ts_checkrdsh
+
+set _rdshfail=
+if /i not %tsmethod%==KMS4k if defined rdsh if defined winserver if defined _config if exist "%_oLPath%\Word2019VL_KMS_Client_AE*.xrm-ms" (
+echo %_oIds% | find /i "Retail" %nul1% && (
+set error=1
+call :dk_color %Red% "Retail versions of Office cannot be activated with TSForge when running on a Remote Desktop Services host."
+call :dk_color %Blue% "Go back to Main Menu, select Change Office Edition option, and change to Volume."
+set _rdshfail=1
+)
+)
+
+exit /b
+
+::========================================================================================================================================
+
 :ts_process
 
 if not exist "%pkeypath%" (
@@ -2263,17 +2289,6 @@ echo "!allapps!" | find /i "!_actid!" %nul1% || call :oh_installlic
 )
 )
 
-::  Add SharedComputerLicensing registry key if Retail Office C2R is installed on Windows Server
-::  https://learn.microsoft.com/en-us/office/troubleshoot/office-suite-issues/click-to-run-office-on-terminal-server
-
-if /i not %tsmethod%==KMS4k if defined winserver if defined _config if exist "%_oLPath%\Word2019VL_KMS_Client_AE*.xrm-ms" (
-echo %_oIds% | find /i "Retail" %nul1% && (
-set scaIsNeeded=1
-reg add %_config% /v SharedComputerLicensing /t REG_SZ /d "1" /f %nul1%
-echo Adding SharedComputerLicensing Reg      [Successful] [Needed on Server With Retail Office]"
-)
-)
-
 exit /b
 
 ::========================================================================================================================================

README.md

@@ -53,30 +53,6 @@
 	
 ### Homepage - [https://massgrave.dev/](https://massgrave.dev/)
   
-[![1.1]][1]
-[![1.2]][2]
-[![1.3]][3]
-[![1.4]][4]
-[![1.5]][5]
-[![1.6]][6]
-[![1.7]][7]
-
-[1.1]: https://massgrave.dev/img/logo_discord.png (Chat with us without signup)
-[1.2]: https://massgrave.dev/img/logo_reddit.png (Reddit)
-[1.3]: https://massgrave.dev/img/logo_bluesky.png (Bluesky)
-[1.4]: https://massgrave.dev/img/logo_x.png (Twitter)
-
-[1.5]: https://massgrave.dev/img/logo_github.png (GitHub)
-[1.6]: https://massgrave.dev/img/logo_azuredevops.png (AzureDevOps)
-[1.7]: https://massgrave.dev/img/logo_gitea.png (Self-hosted Git)
-
-[1]: https://discord.gg/j2yFsV5ZVC
-[2]: https://www.reddit.com/r/MAS_Activator
-[3]: https://bsky.app/profile/massgrave.dev
-[4]: https://twitter.com/massgravel
-[5]: https://github.com/massgravel/Microsoft-Activation-Scripts
-[6]: https://dev.azure.com/massgrave/_git/Microsoft-Activation-Scripts
-[7]: https://git.activated.win/Microsoft-Activation-Scripts
 
 ---