Merge branch 'dev'3.1

1 files changed, 672 insertions, 155 deletions

diff --git a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
index 454644c..ca9a308 100644
--- a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
+++ b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
@@ -1,4 +1,4 @@
-@set masver=3.0

+@set masver=3.1

 @echo off

 

 

@@ -109,7 +109,7 @@ echo:
 echo Null service is not running, script may crash...

 echo:

 echo:

-echo Help - %mas%fix_service

+echo Check this webpage for help - %mas%fix_service

 echo:

 echo:

 ping 127.0.0.1 -n 20

@@ -124,7 +124,7 @@ echo:
 echo Error - Script either has LF line ending issue or an empty line at the end of the script is missing.

 echo:

 echo:

-echo Help - %mas%troubleshoot

+echo Check this webpage for help - %mas%troubleshoot

 echo:

 echo:

 ping 127.0.0.1 -n 20 >nul

@@ -167,16 +167,31 @@ echo Failed to detect Windows build number.
 echo:

 setlocal EnableDelayedExpansion

 set fixes=%fixes% %mas%troubleshoot

-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"

+call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot"

 goto dk_done

 )

 

-if %winbuild% LSS 9200 (

-%eline%

+if %winbuild% LSS 6001 (

+%nceline%

 echo Unsupported OS version detected [%winbuild%].

-echo Ohook Activation is supported only on Windows 8/10/11 and their server equivalents.

+echo MAS only supports Windows Vista/7/8/8.1/10/11 and their Server equivalents.

+if %winbuild% EQU 6000 (

+echo:

+echo Windows Vista RTM is not supported because Powershell cannot be installed.

+echo Upgrade to Windows Vista SP1 or SP2.

+)

+goto dk_done

+)

+

+if not exist %ps% (

+%nceline%

+echo PowerShell is not installed in your system.

+if %winbuild% LSS 7600 (

+echo Install PowerShell using the following URL.

 echo:

-call :dk_color %Blue% "Use Online KMS activation option instead."

+echo https://www.catalog.update.microsoft.com/Search.aspx?q=KB968930

+if %_unattended%==0 start https://www.catalog.update.microsoft.com/Search.aspx?q=KB968930

+)

 goto dk_done

 )

 

@@ -212,40 +227,65 @@ goto dk_done
 

 ::========================================================================================================================================

 

+::  Elevate script as admin and pass arguments and preventing loop

+

+%nul1% fltmc || (

+if not defined _elev %psc% "start cmd.exe -arg '/c \"!_PSarg!\"' -verb runas" && exit /b

+%eline%

+echo This script needs admin rights.

+echo Right click on this script and select 'Run as administrator'.

+goto dk_done

+)

+

+::========================================================================================================================================

+

 ::  Check PowerShell

 

-REM :PStest: $ExecutionContext.SessionState.LanguageMode :PStest:

+::pstst $ExecutionContext.SessionState.LanguageMode :pstst

 

-cmd /c "%psc% "$f=[io.file]::ReadAllText('!_batp!') -split ':PStest:\s*';iex ($f[1])"" | find /i "FullLanguage" %nul1% || (

+for /f "delims=" %%a in ('%psc% "if ($PSVersionTable.PSEdition -ne 'Core') {$f=[io.file]::ReadAllText('!_batp!') -split ':pstst';iex ($f[1])}" %nul6%') do (set tstresult=%%a)

+

+if /i not "%tstresult%"=="FullLanguage" (

 %eline%

-cmd /c "%psc% "$ExecutionContext.SessionState.LanguageMode""

-echo:

-cmd /c "%psc% "$ExecutionContext.SessionState.LanguageMode"" | find /i "FullLanguage" %nul1% && (

-echo Failed to run Powershell command but Powershell is working.

-echo:

-cmd /c "%psc% ""$av = Get-WmiObject -Namespace root\SecurityCenter2 -Class AntiVirusProduct; $n = @(); foreach ($i in $av) { if ($i.displayName -notlike '*windows*') { $n += $i.displayName } }; if ($n) { Write-Host ('Installed 3rd party Antivirus might be blocking the script - ' + ($n -join ', ')) -ForegroundColor White -BackgroundColor Blue }"""

-echo:

-set fixes=%fixes% %mas%troubleshoot

-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"

-) || (

-echo PowerShell is not working. Aborting...

+echo: %tstresult%

+cmd /c "%psc% $ExecutionContext.SessionState.LanguageMode"

+

+REM check LanguageMode

+

+cmd /c "%psc% "$ExecutionContext.SessionState.LanguageMode"" | findstr /i "ConstrainedLanguage RestrictedLanguage NoLanguage" %nul1% && (

+echo FullLanguage mode not found in PowerShell. Aborting...

 echo If you have applied restrictions on Powershell then undo those changes.

 echo:

 set fixes=%fixes% %mas%fix_powershell

-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%fix_powershell"

+call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%fix_powershell"

+goto dk_done

 )

+

+REM check Powershell core version

+

+cmd /c "%psc% "$PSVersionTable.PSEdition"" | find /i "Core" %nul1% && (

+echo Windows Powershell is needed for MAS but it seems to be replaced with Powershell core. Aborting...

 goto dk_done

 )

 

-::========================================================================================================================================

+REM check for Mal-ware that may cause issues with Powershell

 

-::  Elevate script as admin and pass arguments and preventing loop

+for /r "%ProgramFiles%\" %%f in (secureboot.exe) do if exist "%%f" (

+echo "%%f"

+echo Mal%blank%ware found, PowerShell is not working properly.

+echo:

+set fixes=%fixes% %mas%remove_mal%w%ware

+call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%remove_mal%w%ware"

+goto dk_done

+)

 

-%nul1% fltmc || (

-if not defined _elev %psc% "start cmd.exe -arg '/c \"!_PSarg!\"' -verb runas" && exit /b

-%eline%

-echo This script needs admin rights.

-echo Right click on this script and select 'Run as administrator'.

+REM check antivirus and other errors

+

+echo PowerShell is not working properly. Aborting...

+cmd /c "%psc% ""$av = Get-WmiObject -Namespace root\SecurityCenter2 -Class AntiVirusProduct; $n = @(); foreach ($i in $av) { if ($i.displayName -notlike '*windows*') { $n += $i.displayName } }; if ($n) { Write-Host ('Installed 3rd party Antivirus might be blocking the script - ' + ($n -join ', ')) -ForegroundColor White -BackgroundColor Blue }"""

+echo:

+set fixes=%fixes% %mas%troubleshoot

+call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot"

 goto dk_done

 )

 

@@ -261,34 +301,33 @@ set terminal=
 

 ::  Check if script is running in Terminal app

 

-set r1=$TB = [AppDomain]::CurrentDomain.DefineDynamicAssembly(4, 1).DefineDynamicModule(2, $False).DefineType(0);

-set r2=%r1% [void]$TB.DefinePInvokeMethod('GetConsoleWindow', 'kernel32.dll', 22, 1, [IntPtr], @(), 1, 3).SetImplementationFlags(128);

-set r3=%r2% [void]$TB.DefinePInvokeMethod('SendMessageW', 'user32.dll', 22, 1, [IntPtr], @([IntPtr], [UInt32], [IntPtr], [IntPtr]), 1, 3).SetImplementationFlags(128);

-set d1=%r3% $hIcon = $TB.CreateType(); $hWnd = $hIcon::GetConsoleWindow();

-set d2=%d1% echo $($hIcon::SendMessageW($hWnd, 127, 0, 0) -ne [IntPtr]::Zero);

-

 if defined terminal (

-%psc% "%d2%" %nul2% | find /i "True" %nul1% && set terminal=

+set lines=0

+for /f "skip=2 tokens=2 delims=: " %%A in ('mode con') do if "!lines!"=="0" set lines=%%A

+if !lines! GEQ 100 set terminal=

 )

 

-if defined ps32onArm goto :skipQE

 if %_unattended%==1 goto :skipQE

 for %%# in (%_args%) do (if /i "%%#"=="-qedit" goto :skipQE)

 

-if defined terminal (

-set "launchcmd=start conhost.exe %psc%"

-) else (

-set "launchcmd=%psc%"

-)

+::  Relaunch to disable QuickEdit in the current session and use conhost.exe instead of the Terminal app

+::  This code disables QuickEdit for the current cmd.exe session without making permanent registry changes

+::  It is included because clicking on the script window can pause execution, causing confusion that the script has stopped due to an error

 

-::  Disable QuickEdit in current session

+set resetQE=1

+reg query HKCU\Console /v QuickEdit %nul2% | find /i "0x0" %nul1% && set resetQE=0

+reg add HKCU\Console /v QuickEdit /t REG_DWORD /d 0 /f %nul1%

 

-set "d1=$t=[AppDomain]::CurrentDomain.DefineDynamicAssembly(4, 1).DefineDynamicModule(2, $False).DefineType(0);"

-set "d2=$t.DefinePInvokeMethod('GetStdHandle', 'kernel32.dll', 22, 1, [IntPtr], @([Int32]), 1, 3).SetImplementationFlags(128);"

-set "d3=$t.DefinePInvokeMethod('SetConsoleMode', 'kernel32.dll', 22, 1, [Boolean], @([IntPtr], [Int32]), 1, 3).SetImplementationFlags(128);"

-set "d4=$k=$t.CreateType(); $b=$k::SetConsoleMode($k::GetStdHandle(-10), 0x0080);"

+if defined terminal (

+start conhost.exe "!_batf!" %_args% -qedit

+start reg add HKCU\Console /v QuickEdit /t REG_DWORD /d %resetQE% /f %nul1%

+exit /b

+) else if %resetQE% EQU 1 (

+start cmd.exe /c ""!_batf!" %_args% -qedit"

+start reg add HKCU\Console /v QuickEdit /t REG_DWORD /d %resetQE% /f %nul1%

+exit /b

+)

 

-%launchcmd% "%d1% %d2% %d3% %d4% & cmd.exe '/c' '!_PSarg! -qedit'" && (exit /b) || (set terminal=1)

 :skipQE

 

 ::========================================================================================================================================

@@ -297,12 +336,18 @@ set "d4=$k=$t.CreateType(); $b=$k::SetConsoleMode($k::GetStdHandle(-10), 0x0080)
 

 set -=

 set old=

+set pingp=

 set upver=%masver:.=%

 

-for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 activ%-%ated.win') do (

-if not "%%#"=="" set old=1

-for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck%upver%.activ%-%ated.win') do (

-if not "%%#"=="" set old=

+for %%A in (

+activ%-%ated.win

+mass%-%grave.dev

+) do if not defined pingp (

+for /f "delims=[] tokens=2" %%B in ('ping -n 1 %%A') do (

+if not "%%B"=="" (set old=1& set pingp=1)

+for /f "delims=[] tokens=2" %%C in ('ping -n 1 updatecheck%upver%.%%A') do (

+if not "%%C"=="" set old=

+)

 )

 )

 

@@ -368,8 +413,8 @@ goto :oh_menu
 

 cls

 if not defined terminal (

-mode 130, 32

-if exist "%SysPath%\spp\store_test\" mode 134, 32

+mode 140, 32

+if exist "%SysPath%\spp\store_test\" mode 140, 32

 %psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=32;$B.Height=300;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}" %nul%

 )

 title  Ohook Activation %masver%

@@ -378,12 +423,15 @@ echo:
 echo Initializing...

 call :dk_chkmal

 

-if not exist %SysPath%\sppsvc.exe (

+if not exist %SysPath%\%_slexe% (

 %eline%

-echo [%SysPath%\sppsvc.exe] file is missing, aborting...

+echo [%SysPath%\%_slexe%] file is missing, aborting...

+echo:

+call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run DISM Restore and SFC Scan options."

+call :dk_color %Blue% "After that, restart system and try activation again."

 echo:

 set fixes=%fixes% %mas%troubleshoot

-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"

+call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot"

 goto dk_done

 )

 

@@ -409,7 +457,7 @@ call :dk_showosinfo
 

 echo Initiating Diagnostic Tests...

 

-set "_serv=sppsvc Winmgmt"

+set "_serv=%_slser% Winmgmt"

 

 ::  Software Protection

 ::  Windows Management Instrumentation

@@ -418,16 +466,15 @@ set notwinact=1
 set ohookact=1

 call :dk_errorcheck

 

+call :oh_setspp

+

 ::  Check unsupported office versions

 

-set o14msi=

 set o14c2r=

 set o16uwp=

 

 set _68=HKLM\SOFTWARE\Microsoft\Office

 set _86=HKLM\SOFTWARE\Wow6432Node\Microsoft\Office

-for /f "skip=2 tokens=2*" %%a in ('"reg query %_86%\14.0\Common\InstallRoot /v Path" %nul6%') do if exist "%%b\EntityPicker.dll" (set o14msi=Office 2010 MSI )

-for /f "skip=2 tokens=2*" %%a in ('"reg query %_68%\14.0\Common\InstallRoot /v Path" %nul6%') do if exist "%%b\EntityPicker.dll" (set o14msi=Office 2010 MSI )

 %nul% reg query %_68%\14.0\CVH /f Click2run /k         && set o14c2r=Office 2010 C2R 

 %nul% reg query %_86%\14.0\CVH /f Click2run /k         && set o14c2r=Office 2010 C2R 

 

@@ -435,10 +482,10 @@ if %winbuild% GEQ 10240 (
 for /f "delims=" %%a in ('%psc% "(Get-AppxPackage -name 'Microsoft.Office.Desktop' | Select-Object -ExpandProperty InstallLocation)" %nul6%') do (if exist "%%a\Integration\Integrator.exe" set o16uwp=Office UWP )

 )

 

-if not "%o14msi%%o14c2r%%o16uwp%"=="" (

+if not "%o14c2r%%o16uwp%"=="" (

 echo:

-call :dk_color %Red% "Checking Unsupported Office Install     [ %o14msi%%o14c2r%%o16uwp%]"

-if not "%o14msi%%o16uwp%"=="" call :dk_color %Blue% "Use Online KMS option to activate it."

+call :dk_color %Red% "Checking Unsupported Office Install     [ %o14c2r%%o16uwp%]"

+if not "%o16uwp%"=="" call :dk_color %Blue% "Use TSforge option to activate it."

 )

 

 if %winbuild% GEQ 10240 %psc% "Get-AppxPackage -name "Microsoft.MicrosoftOfficeHub"" | find /i "Office" %nul1% && (

@@ -469,10 +516,10 @@ set o15c2r=
 set error=1

 )

 

-if "%o16c2r%%o15c2r%%o16msi%%o15msi%"=="" (

+if "%o16c2r%%o15c2r%%o16msi%%o15msi%%o14msi%"=="" (

 set error=1

 echo:

-if not "%o14msi%%o14c2r%%o16uwp%"=="" (

+if not "%o14c2r%%o16uwp%"=="" (

 call :dk_color %Red% "Checking Supported Office Install       [Not Found]"

 ) else (

 call :dk_color %Red% "Checking Installed Office               [Not Found]"

@@ -491,8 +538,8 @@ goto dk_done
 )

 

 set multioffice=

-if not "%o16c2r%%o15c2r%%o16msi%%o15msi%"=="1" set multioffice=1

-if not "%o14msi%%o14c2r%%o16uwp%"=="" set multioffice=1

+if not "%o16c2r%%o15c2r%%o16msi%%o15msi%%o14msi%"=="1" set multioffice=1

+if not "%o14c2r%%o16uwp%"=="" set multioffice=1

 

 if defined multioffice (

 call :dk_color %Gray% "Checking Multiple Office Install        [Found, its recommended to install only one version]"

@@ -536,12 +583,8 @@ 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")

-if not "%osarch%"=="x86" (

-if /i "%_oArch%"=="x64" set "_sppcPath=%SystemRoot%\System32\sppc.dll"

-if /i "%_oArch%"=="x86" set "_sppcPath=%SystemRoot%\SysWOW64\sppc.dll"

-) else (

-set "_sppcPath=%SystemRoot%\System32\sppc.dll"

-)

+

+call :oh_ppcpath

 

 echo:

 echo Activating Office...                    [C2R ^| %_version% ^| %_oArch%]

@@ -552,9 +595,20 @@ set error=1
 goto :starto16c2r

 )

 

+if defined noOsppc (

+call :dk_color %Red% "Checking OSPPC.DLL                      [Not found. Aborting activation...]"

+call :dk_color %Blue% "%_fixmsg%"

+set error=1

+goto :starto16c2r

+)

+

 call :oh_fixprids

 call :oh_process

+if defined isOspp (

+call :oh_hookinstall_ospp

+) else (

 call :oh_hookinstall

+)

 

 ::========================================================================================================================================

 

@@ -586,12 +640,8 @@ 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")

-if not "%osarch%"=="x86" (

-if /i "%_oArch%"=="x64" set "_sppcPath=%SystemRoot%\System32\sppc.dll"

-if /i "%_oArch%"=="x86" set "_sppcPath=%SystemRoot%\SysWOW64\sppc.dll"

-) else (

-set "_sppcPath=%SystemRoot%\System32\sppc.dll"

-)

+

+call :oh_ppcpath

 

 echo:

 echo Activating Office...                    [C2R ^| %_version% %_AudienceData%^| %_oArch%]

@@ -602,9 +652,20 @@ set error=1
 goto :startmsi

 )

 

+if defined noOsppc (

+call :dk_color %Red% "Checking OSPPC.DLL                      [Not found. Aborting activation...]"

+call :dk_color %Blue% "%_fixmsg%"

+set error=1

+goto :startmsi

+)

+

 call :oh_fixprids

 call :oh_process

+if defined isOspp (

+call :oh_hookinstall_ospp

+) else (

 call :oh_hookinstall

+)

 

 ::========================================================================================================================================

 

@@ -641,6 +702,9 @@ echo Adding a Registry to Prevent Banner     [Successful]
 

 :startmsi

 

+if defined o14msi call :oh_setspp 14

+if defined o14msi call :oh_processmsi 14 %o14msi_reg%

+call :oh_setspp

 if defined o15msi call :oh_processmsi 15 %o15msi_reg%

 if defined o16msi call :oh_processmsi 16 %o16msi_reg%

 

@@ -662,7 +726,7 @@ call :dk_color %Red% "Some errors were detected."
 if not defined ierror if not defined showfix if not defined serv_cor if not defined serv_cste call :dk_color %Blue% "%_fixmsg%"

 echo:

 set fixes=%fixes% %mas%troubleshoot

-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"

+call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot"

 )

 

 goto :dk_done

@@ -672,7 +736,7 @@ goto :dk_done
 :oh_uninstall

 

 cls

-if not defined terminal mode 99, 32

+if not defined terminal mode 145, 32

 title  Uninstall Ohook Activation %masver%

 

 set _present=

@@ -688,6 +752,7 @@ if defined o16c2r_reg (for /f "skip=2 tokens=2*" %%a in ('"reg query %o16c2r_reg
 if defined o15c2r_reg (for /f "skip=2 tokens=2*" %%a in ('"reg query %o15c2r_reg% /v InstallPath" %nul6%') do (set "_15CHook=%%b\root\vfs"))

 if defined o16msi_reg (for /f "skip=2 tokens=2*" %%a in ('"reg query %o16msi_reg%\Common\InstallRoot /v Path" %nul6%') do (set "_16MHook=%%b"))

 if defined o15msi_reg (for /f "skip=2 tokens=2*" %%a in ('"reg query %o15msi_reg%\Common\InstallRoot /v Path" %nul6%') do (set "_15MHook=%%b"))

+if defined o14msi_reg (for /f "skip=2 tokens=2*" %%a in ('"reg query %o14msi_reg%\Common\InstallRoot /v Path" %nul6%') do (set "_14MHook=%%b"))

 

 if defined _16CHook (if exist "%_16CHook%\System\sppc*dll"    (set _present=1& del /s /f /q "%_16CHook%\System\sppc*dll"    & if exist "%_16CHook%\System\sppc*dll"    set _unerror=1))

 if defined _16CHook (if exist "%_16CHook%\SystemX86\sppc*dll" (set _present=1& del /s /f /q "%_16CHook%\SystemX86\sppc*dll" & if exist "%_16CHook%\SystemX86\sppc*dll" set _unerror=1))

@@ -695,8 +760,9 @@ if defined _15CHook (if exist "%_15CHook%\System\sppc*dll"    (set _present=1& d
 if defined _15CHook (if exist "%_15CHook%\SystemX86\sppc*dll" (set _present=1& del /s /f /q "%_15CHook%\SystemX86\sppc*dll" & if exist "%_15CHook%\SystemX86\sppc*dll" set _unerror=1))

 if defined _16MHook (if exist "%_16MHook%sppc*dll"            (set _present=1& del /s /f /q "%_16MHook%sppc*dll"            & if exist "%_16MHook%sppc*dll"            set _unerror=1))

 if defined _15MHook (if exist "%_15MHook%sppc*dll"            (set _present=1& del /s /f /q "%_15MHook%sppc*dll"            & if exist "%_15MHook%sppc*dll"            set _unerror=1))

+if defined _14MHook (if exist "%_14MHook%sppc*dll"            (set _present=1& del /s /f /q "%_14MHook%sppc*dll"            & if exist "%_14MHook%sppc*dll"            set _unerror=1))

 

-for %%# in (15 16) do (

+for %%# in (14 15 16) do (

 for %%A in ("%ProgramFiles%" "%ProgramW6432%" "%ProgramFiles(x86)%") do (

 if exist "%%~A\Microsoft Office\Office%%#\sppc*dll" (set _present=1& del /s /f /q "%%~A\Microsoft Office\Office%%#\sppc*dll" & if exist "%%~A\Microsoft Office\Office%%#\sppc*dll" set _unerror=1)

 )

@@ -710,6 +776,31 @@ if exist "%%~A\Microsoft %%~G\root\vfs\%%#\sppc*dll" (set _present=1& del /s /f
 )

 )

 

+::==================================

+

+for %%# in (OSPPC.DLL sppcs.dll) do (

+for %%A in ("%CommonProgramFiles%" "%CommonProgramW6432%" "%CommonProgramFiles(x86)%") do (

+for %%G in ("%%~A\Microsoft Shared\OfficeSoftwareProtectionPlatform\%%#") do (

+set size=0

+set size=%%~zG

+if !size! GEQ 1 if !size! LSS 100000 (

+set _present=1

+del /f /q "%%~G"

+if exist "%%~G" (move /y "%%~G" "!_ttemp!\needsToBeDeleted%random%" %nul%)

+if exist "%%~G" (set _unerror=1) else (echo Deleted file - %%~G)

+)

+if /i sppcs.dll==%%# if !size! GEQ 100000 (

+move /y "%%~G" "%%~A\Microsoft Shared\OfficeSoftwareProtectionPlatform\OSPPC.DLL" %nul%

+if exist "%%~G" (move /y "%%~A\Microsoft Shared\OfficeSoftwareProtectionPlatform\OSPPC.DLL" "!_ttemp!\needsToBeDeleted%random%" %nul%)

+move /y "%%~G" "%%~A\Microsoft Shared\OfficeSoftwareProtectionPlatform\OSPPC.DLL" %nul%

+if exist "%%~G" (set _unerror=1&echo Failed to rename sppcs.dll back to "%%~A\Microsoft Shared\OfficeSoftwareProtectionPlatform\OSPPC.DLL") else (echo Renamed sppcs.dll back to "%%~A\Microsoft Shared\OfficeSoftwareProtectionPlatform\OSPPC.DLL")

+)

+)

+)

+)

+

+::==================================

+

 reg query HKCU\Software\Microsoft\Office\16.0\Common\Licensing\Resiliency %nul% && (

 echo:

 echo Deleting - Registry keys for skipping license check

@@ -739,6 +830,8 @@ reg unload HKU\%%# %nul%
 )

 )

 

+::==================================

+

 set "kmskey=HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\0ff1ce15-a989-479d-af46-f275c6370663"

 reg query "%kmskey%" %nul% && (

 echo:

@@ -785,6 +878,7 @@ set _oLPath=
 set _hookPath=

 set _hook=

 set _sppcPath=

+set _osppPath=

 set _actid=

 set _prod=

 set _lic=

@@ -793,7 +887,6 @@ set _prids=
 set _config=

 set _version=

 set _License=

-set _oBranding=

 exit /b

 

 ::========================================================================================================================================

@@ -804,6 +897,7 @@ set o16c2r=
 set o15c2r=

 set o16msi=

 set o15msi=

+set o14msi=

 

 set _68=HKLM\SOFTWARE\Microsoft\Office

 set _86=HKLM\SOFTWARE\Wow6432Node\Microsoft\Office

@@ -817,6 +911,52 @@ for /f "skip=2 tokens=2*" %%a in ('"reg query %_86%\16.0\Common\InstallRoot /v P
 for /f "skip=2 tokens=2*" %%a in ('"reg query %_68%\16.0\Common\InstallRoot /v Path" %nul6%') do if exist "%%b\EntityPicker.dll" (set o16msi=1&set o16msi_reg=%_68%\16.0)

 for /f "skip=2 tokens=2*" %%a in ('"reg query %_86%\15.0\Common\InstallRoot /v Path" %nul6%') do if exist "%%b\EntityPicker.dll" (set o15msi=1&set o15msi_reg=%_86%\15.0)

 for /f "skip=2 tokens=2*" %%a in ('"reg query %_68%\15.0\Common\InstallRoot /v Path" %nul6%') do if exist "%%b\EntityPicker.dll" (set o15msi=1&set o15msi_reg=%_68%\15.0)

+for /f "skip=2 tokens=2*" %%a in ('"reg query %_86%\14.0\Common\InstallRoot /v Path" %nul6%') do if exist "%%b\EntityPicker.dll" (set o14msi=1&set o14msi_reg=%_86%\14.0)

+for /f "skip=2 tokens=2*" %%a in ('"reg query %_68%\14.0\Common\InstallRoot /v Path" %nul6%') do if exist "%%b\EntityPicker.dll" (set o14msi=1&set o14msi_reg=%_68%\14.0)

+

+exit /b

+

+::========================================================================================================================================

+

+:oh_ppcpath

+

+if not defined isOspp (

+if not "%osarch%"=="x86" (

+if /i "%_oArch%"=="x64" set "_sppcPath=%SystemRoot%\System32\sppc.dll"

+if /i "%_oArch%"=="x86" set "_sppcPath=%SystemRoot%\SysWOW64\sppc.dll"

+) else (

+set "_sppcPath=%SystemRoot%\System32\sppc.dll"

+)

+)

+

+set noOsppc=

+set _hook68=

+set _hook86=

+set _osppPath68=

+set _osppPath86=

+

+if defined isOspp (

+if not "%osarch%"=="x86" (

+if /i "%_oArch%"=="x64" (

+for /f "skip=2 tokens=2*" %%a in ('"reg query HKLM\SOFTWARE\Microsoft\OfficeSoftwareProtectionPlatform /v Path" %nul6%') do (set "_osppPath68=%%b")

+if not exist "!_osppPath68!OSPPC.DLL" set noOsppc=1

+)

+if /i "%_oArch%"=="x86" (

+for /f "skip=2 tokens=2*" %%a in ('"reg query HKLM\SOFTWARE\Microsoft\OfficeSoftwareProtectionPlatform /v Path" %nul6%') do (set "_osppPath68=%%b")

+for /f "skip=2 tokens=2*" %%a in ('"reg query HKLM\SOFTWARE\Wow6432Node\Microsoft\OfficeSoftwareProtectionPlatform /v Path" %nul6%') do (set "_osppPath86=%%b")

+if not exist "!_osppPath68!OSPPC.DLL" set noOsppc=1

+if not exist "!_osppPath86!OSPPC.DLL" set noOsppc=1

+)

+) else (

+for /f "skip=2 tokens=2*" %%a in ('"reg query HKLM\SOFTWARE\Microsoft\OfficeSoftwareProtectionPlatform /v Path" %nul6%') do (set "_osppPath86=%%b")

+if not exist "!_osppPath86!OSPPC.DLL" set noOsppc=1

+)

+if "!_osppPath68:~-1!"=="\" set "_osppPath68=!_osppPath68:~0,-1!"

+if "!_osppPath86:~-1!"=="\" set "_osppPath86=!_osppPath86:~0,-1!"

+)

+

+if defined _osppPath68 set _hook68=sppc64.dll

+if defined _osppPath86 set _hook86=sppc32.dll

 

 exit /b

 

@@ -912,15 +1052,24 @@ set hasherror=
 if %_hook%==sppc32.dll set offset=2564

 if %_hook%==sppc64.dll set offset=3076

 

-del /s /q "%_hookPath%\sppcs.dll" %nul%

-del /s /q "%_hookPath%\sppc.dll" %nul%

+::======================================

+

+::  Remove previous Install

 

-if exist "%_hookPath%\sppcs.dll" set "ierror=Remove Previous Ohook Install"

-if exist "%_hookPath%\sppc.dll" set "ierror=Remove Previous Ohook Install"

+for %%# in (sppcs.dll sppc.dll) do (

+del /f /q "%_hookPath%\%%#" %nul%

+if exist "%_hookPath%\%%#" (move /y "%_hookPath%\%%#" "!_ttemp!\needsToBeDeleted%random%" %nul%)

+if exist "%_hookPath%\%%#" (set "ierror=Remove Previous Ohook Install [%%#]")

+)

+

+if defined ierror goto :oh_hookinstall_error

+

+::======================================

 

 mklink "%_hookPath%\sppcs.dll" "%_sppcPath%" %nul%

-if not %errorlevel%==0 (

-if not defined ierror set ierror=mklink

+if not exist "%_hookPath%\sppcs.dll" (

+set ierror=mklink sppcs.dll

+goto :oh_hookinstall_error

 )

 

 set exhook=

@@ -935,17 +1084,122 @@ popd
 call :oh_extractdll "%_hookPath%\sppc.dll" "%offset%"

 )

 )

-if not exist "%_hookPath%\sppc.dll" (if not defined ierror set ierror=Copy)

+if not exist "%_hookPath%\sppc.dll" (

+set ierror=Copy

+goto :oh_hookinstall_error

+)

 

 echo:

-if not defined ierror (

-echo Symlinking System's sppc.dll to         ["%_hookPath%\sppcs.dll"] [Successful]

+echo Symlinking System's sppc.dll            ["%_hookPath%\sppcs.dll"] [Successful]

 if defined exhook (

 echo Copying Custom %_hook% to            ["%_hookPath%\sppc.dll"] [Successful]

 ) else (

 echo Extracting Custom %_hook% to         ["%_hookPath%\sppc.dll"] [Successful]

 )

+

+goto :oh_hookinstall_error

+

+::========================================================================================================================================

+

+:oh_hookinstall_ospp

+

+set ierror=

+set hasherror=

+

+if defined _hook86 set offset86=2564

+if defined _hook68 set offset68=3076

+

+::======================================

+

+::  Remove previous Install

+

+for %%# in (OSPPC.DLL sppcs.dll) do (

+for %%A in ("%_osppPath68%\%%#" "%_osppPath86%\%%#") do (

+set size=0

+set size=%%~zA

+if !size! GEQ 1 if !size! LSS 100000 (

+del /f /q "%%~A" %nul%

+if exist "%%~A" (move /y "%%~A" "!_ttemp!\needsToBeDeleted%random%" %nul%)

+if exist "%%~A" (set "ierror=Remove Previous Ohook Install [%%#]")

+)

+)

+)

+

+if defined ierror goto :oh_hookinstall_error

+

+for %%A in ("%_osppPath68%" "%_osppPath86%") do (

+if exist "%%~A\sppcs.dll" (move /y "%%~A\sppcs.dll" "%%~A\OSPPC.DLL" %nul%)

+if exist "%%~A\sppcs.dll" (

+move /y "%%~A\OSPPC.DLL" "!_ttemp!\needsToBeDeleted%random%" %nul%

+move /y "%%~A\sppcs.dll" "%%~A\OSPPC.DLL" %nul%

+)

+if exist "%%~A\sppcs.dll" (set "ierror=Move sppcs.dll back to OSPPC.DLL")

+)

+

+del /f /q "%_hookPath%\sppcs.dll" %nul%

+if exist "%_hookPath%\sppcs.dll" (move /y "%_hookPath%\sppcs.dll" "!_ttemp!\needsToBeDeleted%random%" %nul%)

+if exist "%_hookPath%\sppcs.dll" (set "ierror=Remove Previous Ohook mklink sppcs.dll")

+

+if defined ierror goto :oh_hookinstall_error

+

+::======================================

+

+if defined _osppPath68 (move /y "%_osppPath68%\OSPPC.DLL" "%_osppPath68%\sppcs.dll" %nul% & if not exist "%_osppPath68%\sppcs.dll" set ierror=1)

+if defined _osppPath86 (move /y "%_osppPath86%\OSPPC.DLL" "%_osppPath86%\sppcs.dll" %nul% & if not exist "%_osppPath86%\sppcs.dll" set ierror=1)

+

+if defined ierror (

+set "ierror=Rename OSPPC.DLL"

+goto :oh_hookinstall_error

+)

+

+if defined _osppPath68 if defined _osppPath86     (mklink "%_hookPath%\sppcs.dll" "%_osppPath86%\sppcs.dll" %nul%)

+if defined _osppPath68 if not defined _osppPath86 (mklink "%_hookPath%\sppcs.dll" "%_osppPath68%\sppcs.dll" %nul%)

+if defined _osppPath86 if not defined _osppPath68 (mklink "%_hookPath%\sppcs.dll" "%_osppPath86%\sppcs.dll" %nul%)

+

+if not exist "%_hookPath%\sppcs.dll" (

+set ierror=mklink sppcs.dll

+goto :oh_hookinstall_error

+)

+

+set exhook=

+if exist "!_work!\BIN\%_hook68%" if exist "!_work!\BIN\%_hook86%"  set exhook=1

+

+if defined exhook (

+pushd "!_work!\BIN\"

+if defined _osppPath68 (copy /y /b "%_hook68%" "%_osppPath68%\OSPPC.DLL" %nul%)

+if defined _osppPath86 (copy /y /b "%_hook86%" "%_osppPath86%\OSPPC.DLL" %nul%)

+popd

 ) else (

+if defined _osppPath68 (set _hook=%_hook68%&call :oh_extractdll "%_osppPath68%\OSPPC.DLL" "%offset68%")

+if defined _osppPath86 (set _hook=%_hook86%&call :oh_extractdll "%_osppPath86%\OSPPC.DLL" "%offset86%")

+)

+

+if defined _osppPath68 (if not exist "%_osppPath68%\OSPPC.DLL" set ierror=1)

+if defined _osppPath86 (if not exist "%_osppPath86%\OSPPC.DLL" set ierror=1)

+

+if defined ierror (

+set ierror=Copy

+goto :oh_hookinstall_error

+)

+

+echo:

+if defined _osppPath68 (echo Renaming OSPPC.DLL to sppcs.dll         ["%_osppPath68%\sppcs.dll"])

+if defined _osppPath86 (echo Renaming OSPPC.DLL to sppcs.dll         ["%_osppPath86%\sppcs.dll"])

+if defined exhook (

+if defined _osppPath68 (echo Copying Custom %_hook68% to            ["%_osppPath68%\OSPPC.DLL"])

+if defined _osppPath86 (echo Copying Custom %_hook86% to            ["%_osppPath86%\OSPPC.DLL"])

+) else (

+if defined _osppPath68 (echo Extracting Custom %_hook68% to         ["%_osppPath68%\OSPPC.DLL"])

+if defined _osppPath86 (echo Extracting Custom %_hook86% to         ["%_osppPath86%\OSPPC.DLL"])

+)

+

+echo Symlinking Renamed sppcs.dll            ["%_hookPath%\sppcs.dll"]

+

+::========================================================================================================================================

+

+:oh_hookinstall_error

+

+if defined ierror (

 set error=1

 call :dk_color %Red% "Installing Ohook                        [Failed to %ierror%]"

 echo:

@@ -964,9 +1218,9 @@ if not defined exhook if not defined ierror (
 if defined hasherror (

 set error=1

 set ierror=1

-call :dk_color %Red% "Modifying Hash of Custom %_hook%     [Failed]"

+call :dk_color %Red% "Modifying Hash of Custom sppcs.dll      [Failed]"

 ) else (

-echo Modifying Hash of Custom %_hook%     [Successful]

+echo Modifying Hash of Custom sppcs.dll      [Successful]

 )

 )

 

@@ -974,6 +1228,26 @@ exit /b
 

 ::========================================================================================================================================

 

+:oh_setspp

+

+set isOspp=

+if %winbuild% GEQ 9200 (

+set spp=SoftwareLicensingProduct

+set sps=SoftwareLicensingService

+) else (

+set isOspp=1

+set spp=OfficeSoftwareProtectionProduct

+set sps=OfficeSoftwareProtectionService

+)

+if "%1"=="14" (

+set isOspp=1

+set spp=OfficeSoftwareProtectionProduct

+set sps=OfficeSoftwareProtectionService

+)

+exit /b

+

+::========================================================================================================================================

+

 :oh_process

 

 for %%# in (%_oIds%) do (

@@ -993,10 +1267,11 @@ call :ohookdata getinfo !_prod!
 

 if not "!key!"=="" (

 echo "!allapps!" | find /i "!_actid!" %nul1% || call :oh_installlic

+if not %oVer%==14 set generickey=1

 call :dk_inskey "[!key!] [!_prod!] [!_lic!]"

 ) else (

 set error=1

-call :dk_color %Red% "Checking Product In Script              [Office %oVer%.0 !_prod! not found in script]"

+call :dk_color %Red% "Checking Product In Script              [Office %oVer%.0 !_prod! key not found in script]"

 call :dk_color %Blue% "Make sure you are using the latest version of MAS."

 set fixes=%fixes% %mas%

 call :dk_color %_Yellow% "%mas%"

@@ -1006,7 +1281,7 @@ 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 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%

@@ -1023,7 +1298,11 @@ exit /b
 ::  Process Office MSI Version

 

 call :oh_reset

+if "%1"=="14" (

+call :dk_actids 59a52881-a989-479d-af46-f275c6370663

+) else (

 call :dk_actids 0ff1ce15-a989-479d-af46-f275c6370663

+)

 

 set oVer=%1

 for /f "skip=2 tokens=2*" %%a in ('"reg query %2\Common\InstallRoot /v Path" %nul6%') do (set "_oRoot=%%b")

@@ -1036,39 +1315,37 @@ if "%osarch%"=="x86" set _oArch=x86
 

 if /i "%_oArch%"=="x64" (set "_hookPath=%_oRoot%" & set "_hook=sppc64.dll")

 if /i "%_oArch%"=="x86" (set "_hookPath=%_oRoot%" & set "_hook=sppc32.dll")

-if not "%osarch%"=="x86" (

-if /i "%_oArch%"=="x64" set "_sppcPath=%SystemRoot%\System32\sppc.dll"

-if /i "%_oArch%"=="x86" set "_sppcPath=%SystemRoot%\SysWOW64\sppc.dll"

-) else (

-set "_sppcPath=%SystemRoot%\System32\sppc.dll"

-)

 

-set "_common=%CommonProgramFiles%"

-if defined PROCESSOR_ARCHITEW6432 set "_common=%CommonProgramW6432%"

-set "_common2=%CommonProgramFiles(x86)%"

+call :oh_ppcpath

 

-for /r "%_common%\Microsoft Shared\OFFICE%oVer%\" %%f in (BRANDING.XML) do if exist "%%f" set "_oBranding=%%f"

-if not defined _oBranding for /r "%_common2%\Microsoft Shared\OFFICE%oVer%\" %%f in (BRANDING.XML) do if exist "%%f" set "_oBranding=%%f"

-

-call :ohookdata getmsiprod %2

+call :msiofficedata %2

 

 echo:

 echo Activating Office...                    [MSI ^| %_version% ^| %_oArch%]

 

-if not defined _oBranding (

+if not defined _oIds (

 set error=1

-call :dk_color %Red% "Checking BRANDING.XML                   [Not Found, aborting activation...]"

+call :dk_color %Red% "Checking Installed Products             [Product IDs not found, aborting activation...]"

 exit /b

 )

 

-if not defined _oIds (

+if defined noOsppc (

+call :dk_color %Red% "Checking OSPPC.DLL                      [Not found. Aborting activation...]"

+call :dk_color %Blue% "%_fixmsg%"

 set error=1

-call :dk_color %Red% "Checking Installed Products             [Product IDs not found, aborting activation...]"

 exit /b

 )

 

+if %oVer%==14 if defined SingleImage (

+echo Checking Installed Products             [SingleImage product found, Professional Retail key will be used for activation]

+)

+

 call :oh_process

+if defined isOspp (

+call :oh_hookinstall_ospp

+) else (

 call :oh_hookinstall

+)

 

 exit /b

 

@@ -1306,10 +1583,16 @@ exit /b
 

 :dk_setvar

 

-set psc=powershell.exe

+set ps=%SysPath%\WindowsPowerShell\v1.0\powershell.exe

+set psc=%ps% -nop -c

 set winbuild=1

 for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G

 

+set _slexe=sppsvc.exe& set _slser=sppsvc

+if %winbuild% LEQ 6300 (set _slexe=SLsvc.exe& set _slser=SLsvc)

+if %winbuild% LSS 7600 if exist "%SysPath%\SLsvc.exe" (set _slexe=SLsvc.exe& set _slser=SLsvc)

+if %_slexe%==SLsvc.exe set _vis=1

+

 set _NCS=1

 if %winbuild% LSS 10586 set _NCS=0

 if %winbuild% GEQ 10586 reg query "HKCU\Console" /v ForceV2 %nul2% | find /i "0x0" %nul1% && (set _NCS=0)

@@ -1386,11 +1669,12 @@ set keyerror=%errorlevel%
 cmd /c exit /b %keyerror%

 if %keyerror% NEQ 0 set "keyerror=[0x%=ExitCode%]"

 

+if defined generickey (set "keyecho=Installing Generic Product Key         ") else (set "keyecho=Installing Product Key                 ")

 if %keyerror% EQU 0 (

 if %sps%==SoftwareLicensingService call :dk_refresh

-echo Installing Generic Product Key          %~1 [Successful]

+echo %keyecho% %~1 [Successful]

 ) else (

-call :dk_color %Red% "Installing Generic Product Key          %~1 [Failed] %keyerror%"

+call :dk_color %Red% "%keyecho% %~1 [Failed] %keyerror%"

 if not defined error (

 if defined altapplist call :dk_color %Red% "Activation ID not found for this key."

 call :dk_color %Blue% "%_fixmsg%"

@@ -1399,6 +1683,7 @@ set showfix=1
 set error=1

 )

 

+set generickey=

 exit /b

 

 ::  Get all products Activation IDs

@@ -1452,7 +1737,7 @@ function InstallLicenseArr($Str) {
     ForEach ($x in $a) {InstallLicenseFile "$x"}

 }

 function InstallLicenseDir($Loc) {

-    dir $Loc *.xrm-ms -af -s | select -expand FullName | % {InstallLicenseFile "$_"}

+	Get-ChildItem $Loc -Recurse -Filter *.xrm-ms | ForEach-Object {InstallLicenseFile $_.FullName}

 }

 function ReinstallLicenses() {

     $Oem = "$env:SysPath\oem"

@@ -1466,6 +1751,7 @@ function ReinstallLicenses() {
 

 :dk_ckeckwmic

 

+if %winbuild% LSS 9200 (set _wmic=1&exit /b)

 set _wmic=0

 for %%# in (wmic.exe) do @if not "%%~$PATH:#"=="" (

 cmd /c "wmic path Win32_ComputerSystem get CreationClassName /value" %nul2% | find /i "computersystem" %nul1% && set _wmic=1

@@ -1476,16 +1762,16 @@ exit /b
 

 :dk_sppissue

 

-sc start sppsvc %nul%

+sc start %_slser% %nul%

 set spperror=%errorlevel%

 

 if %spperror% NEQ 1056 if %spperror% NEQ 0 (

 %eline%

-echo sc start sppsvc [Error Code: %spperror%]

+echo sc start %_slser% [Error Code: %spperror%]

 )

 

 echo:

-%psc% "$job = Start-Job { (Get-WmiObject -Query 'SELECT * FROM %sps%').Version }; if (-not (Wait-Job $job -Timeout 30)) {write-host 'sppsvc is not working correctly. Help - %mas%troubleshoot'}"

+%psc% "$job = Start-Job { (Get-WmiObject -Query 'SELECT * FROM %sps%').Version }; if (-not (Wait-Job $job -Timeout 30)) {write-host '%_slser% is not working correctly. Check this webpage for help - %mas%troubleshoot'}"

 exit /b

 

 ::  Get Product name (WMI/REG methods are not reliable in all conditions, hence winbrand.dll method is used)

@@ -1493,7 +1779,7 @@ exit /b
 :dk_product

 

 set d1=%ref% $meth = $TypeBuilder.DefinePInvokeMethod('BrandingFormatString', 'winbrand.dll', 'Public, Static', 1, [String], @([String]), 1, 3);

-set d1=%d1% $meth.SetImplementationFlags(128); $TypeBuilder.CreateType()::BrandingFormatString('%%WINDOWS_LONG%%')

+set d1=%d1% $meth.SetImplementationFlags(128); $TypeBuilder.CreateType()::BrandingFormatString('%%WINDOWS_LONG%%') -replace [string][char]0xa9, '(C)' -replace [string][char]0xae, '(R)' -replace [string][char]0x2122, '(TM)'

 

 set winos=

 for /f "delims=" %%s in ('"%psc% %d1%"') do if not errorlevel 1 (set winos=%%s)

@@ -1503,6 +1789,7 @@ if %winbuild% GEQ 22000 (
 set winos=!winos:Windows 10=Windows 11!

 )

 )

+

 exit /b

 

 ::  Common lines used in PowerShell reflection code

@@ -1533,11 +1820,11 @@ for %%# in (avira.com kaspersky.com virustotal.com mcafee.com) do (
 find /i "%%#" %SysPath%\drivers\etc\hosts %nul% && set /a hcount+=1)

 if %hcount%==4 set "results=[Antivirus URLs are blocked in hosts]"

 

-sc start sppsvc %nul%

+sc start %_slser% %nul%

 echo "%errorlevel%" | findstr "577 225" %nul% && (

 set "results=%results%[Likely File Infector]"

 ) || (

-if not exist %SysPath%\sppsvc.exe if not exist %SysPath%\alg.exe (set "results=%results%[Likely File Infector]")

+if not exist %SysPath%\%_slexe% if not exist %SysPath%\alg.exe (set "results=%results%[Likely File Infector]")

 )

 

 if not "%results%%pupfound%"=="" (

@@ -1545,7 +1832,7 @@ if defined pupfound call :dk_color %Gray% "Checking PUP Activators
 if defined results call :dk_color %Red% "Checking Probable Mal%w%ware Infection..."

 if defined results call :dk_color %Red% "%results%"

 set fixes=%fixes% %mas%remove_mal%w%ware

-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%remove_mal%w%ware"

+call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%remove_mal%w%ware"

 echo:

 )

 

@@ -1617,6 +1904,7 @@ for %%# in (%serv_ste%) do (
 if /i %%#==ClipSVC          (reg add "HKLM\SYSTEM\CurrentControlSet\Services\%%#" /v "Start" /t REG_DWORD /d "3" /f %nul% & sc config %%# start= demand %nul%)

 if /i %%#==wlidsvc          sc config %%# start= demand %nul%

 if /i %%#==sppsvc           (reg add "HKLM\SYSTEM\CurrentControlSet\Services\%%#" /v "Start" /t REG_DWORD /d "2" /f %nul% & sc config %%# start= delayed-auto %nul%)

+if /i %%#==SLsvc            sc config %%# start= auto %nul%

 if /i %%#==KeyIso           sc config %%# start= demand %nul%

 if /i %%#==LicenseManager   sc config %%# start= demand %nul%

 if /i %%#==Winmgmt          sc config %%# start= auto %nul%

@@ -1665,7 +1953,7 @@ set showfix=1
 )

 echo %serv_e% | findstr /i "sppsvc-1060" %nul% && (

 set fixes=%fixes% %mas%fix_service

-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%fix_service"

+call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%fix_service"

 set showfix=1

 )

 )

@@ -1722,7 +2010,7 @@ if not defined notwinact if exist "%SystemRoot%\Servicing\Packages\Microsoft-Win
 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul2% | find /i "Eval" %nul1% || (

 call :dk_color %Red% "Checking Eval Packages                  [Non-Eval Licenses are installed in Eval Windows]"

 set fixes=%fixes% %mas%evaluation_editions

-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%evaluation_editions"

+call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%evaluation_editions"

 )

 )

 

@@ -1746,7 +2034,7 @@ if %osedition%==0 (
 call :dk_color %Red% "Checking Edition Name                   [Not Found In Registry]"

 ) 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" if not exist "%SysPath%\licensing\skus\Security-Licensing-SLC-Component-SKU-%osedition%\*-%osedition%-*.xrm-ms" (

 set skunotfound=1

 call :dk_color %Red% "Checking License Files                  [Not Found] [%osedition%]"

 )

@@ -1758,7 +2046,8 @@ call :dk_color %Red% "Checking Package Files                  [Not Found] [%osed
 )

 

 

-%psc% "try { $null=([WMISEARCHER]'SELECT * FROM %sps%').Get().Version; exit 0 } catch { exit $_.Exception.InnerException.HResult }" %nul%

+if %_wmic% EQU 1 wmic path %sps% get Version %nul%

+if %_wmic% EQU 0 %psc% "try { $null=([WMISEARCHER]'SELECT * FROM %sps%').Get().Version; exit 0 } catch { exit $_.Exception.InnerException.HResult }" %nul%

 set error_code=%errorlevel%

 cmd /c exit /b %error_code%

 if %error_code% NEQ 0 set "error_code=0x%=ExitCode%"

@@ -1828,7 +2117,7 @@ call :dk_color2 %Blue% "In case of activation issues, do this - " %_Yellow% " %m
 )

 

 

-for %%# in (SppEx%w%tComObj.exe sppsvc.exe sppsvc.exe\PerfOptions) do (

+for %%# in (SppEx%w%tComObj.exe SLsvc.exe sppsvc.exe sppsvc.exe\PerfOptions) do (

 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Ima%w%ge File Execu%w%tion Options\%%#" %nul% && (if defined _sppint (set "_sppint=!_sppint!, %%#") else (set "_sppint=%%#"))

 )

 if defined _sppint (

@@ -1842,38 +2131,39 @@ echo Checking SPP In IFEO                    [%_sppint%]
 )

 

 

-for /f "skip=2 tokens=2*" %%a in ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform" /v "SkipRearm" %nul6%') do if /i %%b NEQ 0x0 (

+if %winbuild% GEQ 7600 for /f "skip=2 tokens=2*" %%a in ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform" /v "SkipRearm" %nul6%') do if /i %%b NEQ 0x0 (

 reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform" /v "SkipRearm" /t REG_DWORD /d "0" /f %nul%

 call :dk_color %Red% "Checking SkipRearm                      [Default 0 Value Not Found. Changing To 0]"

 %psc% "Start-Job { Stop-Service sppsvc -force } | Wait-Job -Timeout 20 | Out-Null"

 )

 

 

-reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\Plugins\Objects\msft:rm/algorithm/hwid/4.0" /f ba02fed39662 /d %nul% || (

+if %winbuild% GEQ 7600 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\Plugins\Objects\msft:rm/algorithm/hwid/4.0" /f ba02fed39662 /d %nul% || (

 call :dk_color %Red% "Checking SPP Registry Key               [Incorrect ModuleId Found]"

 set fixes=%fixes% %mas%issues_due_to_gaming_spoofers

-call :dk_color2 %Blue% "Most likely caused by gaming spoofers. Help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"

+call :dk_color2 %Blue% "Most likely caused by gaming spoofers. Check this webpage for help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"

 set error=1

 set showfix=1

 )

 

 

 set tokenstore=

+if %winbuild% GEQ 7600 (

 for /f "skip=2 tokens=2*" %%a in ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform" /v TokenStore %nul6%') do call set "tokenstore=%%b"

 if %winbuild% LSS 9200 set "tokenstore=%Systemdrive%\Windows\ServiceProfiles\NetworkService\AppData\Roaming\Microsoft\SoftwareProtectionPlatform"

-if %winbuild% GEQ 9200 if /i not "%tokenstore%"=="%SysPath%\spp\store" if /i not "%tokenstore%"=="%SysPath%\spp\store\2.0" if /i not "%tokenstore%"=="%SysPath%\spp\store_test\2.0" (

+if %winbuild% GEQ 9200 if /i not "!tokenstore!"=="%SysPath%\spp\store" if /i not "!tokenstore!"=="%SysPath%\spp\store\2.0" if /i not "!tokenstore!"=="%SysPath%\spp\store_test\2.0" (

 set toerr=1

 set error=1

 set showfix=1

-call :dk_color %Red% "Checking TokenStore Registry Key        [Correct Path Not Found] [%tokenstore%]"

+call :dk_color %Red% "Checking TokenStore Registry Key        [Correct Path Not Found] [!tokenstore!]"

 set fixes=%fixes% %mas%troubleshoot

-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"

+call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot"

+)

 )

-

 

 ::  This code creates token folder only if it's missing and sets default permission for it

 

-if not defined toerr if not exist "%tokenstore%\" (

+if %winbuild% GEQ 7600 if not defined toerr if not exist "%tokenstore%\" (

 mkdir "%tokenstore%" %nul%

 if %winbuild% LSS 9200 set "d=$sddl = 'O:NSG:NSD:AI(A;OICIID;FA;;;SY)(A;OICIID;FA;;;BA)(A;OICIID;FA;;;NS)';"

 if %winbuild% GEQ 9200 set "d=$sddl = 'O:BAG:BAD:PAI(A;OICI;FA;;;SY)(A;OICI;FA;;;BA)(A;OICIIO;GR;;;BU)(A;;FR;;;BU)(A;OICI;FA;;;S-1-5-80-123231216-2592883651-3715271367-3753151631-4175906628)';"

@@ -1894,7 +2184,7 @@ set showfix=1
 if not defined notwinact (

 call :dk_actid 55c92734-d682-4d71-983e-d6ec3f16059f

 if not defined apps (

-%psc% "Start-Job { Stop-Service sppsvc -force } | Wait-Job -Timeout 20 | Out-Null; $sls = Get-WmiObject SoftwareLicensingService; $f=[io.file]::ReadAllText('!_batp!') -split ':xrm\:.*';iex ($f[1]); ReinstallLicenses" %nul%

+%psc% "if (-not $env:_vis) {Start-Job { Stop-Service %_slser% -force } | Wait-Job -Timeout 20 | Out-Null}; $sls = Get-WmiObject SoftwareLicensingService; $f=[io.file]::ReadAllText('!_batp!') -split ':xrm\:.*';iex ($f[1]); ReinstallLicenses" %nul%

 call :dk_actid 55c92734-d682-4d71-983e-d6ec3f16059f

 if not defined apps (

 set "_notfoundids=Key Not Installed / Act ID Not Found"

@@ -1909,7 +2199,7 @@ call :dk_color %Red% "Checking Activation IDs                 [!_notfoundids!]"
 )

 

 

-if exist "%tokenstore%\" if not exist "%tokenstore%\tokens.dat" (

+if %winbuild% GEQ 7600 if exist "%tokenstore%\" if not exist "%tokenstore%\tokens.dat" (

 set error=1

 call :dk_color %Red% "Checking SPP tokens.dat                 [Not Found] [%tokenstore%\]"

 )

@@ -1992,7 +2282,7 @@ exit /b
 $wpaKey = [Microsoft.Win32.RegistryKey]::OpenRemoteBaseKey('LocalMachine', $env:COMPUTERNAME).OpenSubKey("SYSTEM\\WPA")

 $count = 0

 foreach ($subkeyName in $wpaKey.GetSubKeyNames()) {

-    if ($subkeyName -match '.*-.*-.*-.*-.*-') {

+    if ($subkeyName -match '8DEC0AF1-0341-4b93-85CD-72606C2DF94C.*') {

         $count++

     }

 }

@@ -2001,7 +2291,7 @@ $minBuildNumber = 14393
 if ($osVersion.Build -ge $minBuildNumber) {

     $subkeyHashTable = @{}

     foreach ($subkeyName in $wpaKey.GetSubKeyNames()) {

-        if ($subkeyName -match '.*-.*-.*-.*-.*-') {

+        if ($subkeyName -match '8DEC0AF1-0341-4b93-85CD-72606C2DF94C.*') {

             $keyNumber = $subkeyName -replace '.*-', ''

             $subkeyHashTable[$keyNumber] = $true

         }

@@ -2015,7 +2305,7 @@ if ($osVersion.Build -ge $minBuildNumber) {
     }

 }

 $wpaKey.GetSubKeyNames() | ForEach-Object {

-    if ($_ -match '.*-.*-.*-.*-.*-') {

+    if ($_ -match '8DEC0AF1-0341-4b93-85CD-72606C2DF94C.*') {

         if ($PSVersionTable.PSVersion.Major -lt 3) {

             cmd /c "reg query "HKLM\SYSTEM\WPA\$_" /ve /t REG_BINARY >nul 2>&1"

 			if ($LASTEXITCODE -ne 0) {

@@ -2044,8 +2334,10 @@ $wpaKey.Close()
 

 if %_NCS% EQU 1 (

 echo %esc%[%~1%~2%esc%[0m

-) else (

+) else if exist %ps% (

 %psc% write-host -back '%1' -fore '%2' '%3'

+) else if not exist %ps% (

+echo %~3

 )

 exit /b

 

@@ -2053,8 +2345,10 @@ exit /b
 

 if %_NCS% EQU 1 (

 echo %esc%[%~1%~2%esc%[%~3%~4%esc%[0m

-) else (

+) else if exist %ps% (

 %psc% write-host -back '%1' -fore '%2' '%3' -NoNewline; write-host -back '%4' -fore '%5' '%6'

+) else if not exist %ps% (

+echo %~3 %~6

 )

 exit /b

 

@@ -2086,15 +2380,69 @@ exit /b
 

 ::  1st column = Office version number

 ::  2nd column = Activation ID

-::  3rd column = Generic key. Preference is given in this order, Retail:TB:Sub > Retail > OEM:NONSLP > Volume:MAK > Volume:GVLK

+::  3rd column = For Office 2013 and later, the generated keys are listed. For Office 2010, the blocked keys sourced from the Internet are listed.

+::               For Office 2013 and later, key preference is given in this order, Retail:TB:Sub > Retail > OEM:NONSLP > Volume:MAK > Volume:GVLK

+::               For Office 2010, key preference is given in this order, Retail > Volume:MAK

 ::  4th column = Last part of license description

 ::  5th column = Edition

+::  6th column = Other Edition IDs if they are part of the same primary product (For reference only)

 ::  Separator  = "_"

 

+::===============

+

+:: We couldn't find any keys (blocked/generic doesn't matter) for these Office 2010 products. If you have them, please share with us.

+

+14_4eaff0d0-c6cb-4187-94f3-c7656d49a0aa_Retail________ExcelR_[HSExcelR]

+14_7004b7f0-6407-4f45-8eac-966e5f868bde_Retail________GrooveR

+14_fbf4ac36-31c8-4340-8666-79873129cf40_Retail________OutlookR

+14_133c8359-4e93-4241-8118-30bb18737ea0_Retail________PowerPointR_[HSPowerPointR]

+14_98677603-a668-4fa4-9980-3f1f05f78f69_Retail________PublisherR

+14_db3bbc9c-ce52-41d1-a46f-1a1d68059119_Retail________WordR_[HSWordR]

+14_dbe3aee0-5183-4ff7-8142-66050173cb01_Retail________SmallBusBasicsR_[SmallBusBasicsMSDNR]

+

+:: These installers are not publicly available, so it doesn't matter if we don't have their keys.

+

+14_19316117-30a8-4773-8fd9-7f7231f4e060_SubPrepid_____HomeBusinessSubR

+14_4d06f72e-fd50-4bc2-a24b-d448d7f17ef2_SubPrepid_____ProjectProSubR

+14_e98ef0c0-71c4-42ce-8305-287d8721e26c_SubPrepid_____ProPlusSubR

+14_14f5946a-debc-4716-babc-7e2c240fec08_Retail________MondoR

+14_533b656a-4425-480b-8e30-1a2358898350_MAK___________MondoVL

+

 :ohookdata

 

 set f=

 for %%# in (

+:: Office 2010

+14_4d463c2c-0505-4626-8cdb-a4da82e2d8ed_7KTYC-XR43P-C3MRW-BJKFD-XB%f%YPG_Retail________AccessR

+14_745fb377-0a59-4ca9-b9a9-c359557a2c4e_7XHPQ-BQMYG-YBP49-CY8B2-T8%f%CGQ_ByPass________AccessRuntimeR

+14_95ab3ec8-4106-4f9d-b632-03c019d1d23f_89RTQ-MT4GK-6CPTX-WWP7C-J9%f%KXR_MAK___________AccessVL

+14_71dc86ff-f056-40d0-8ffb-9592705c9b76_39TRR-C2F37-9WYJ2-MJQXH-B9%f%38K_MAK___________ExcelVL

+14_fdad0dfa-417d-4b4f-93e4-64ea8867b7fd_RCGT3-FPQDV-H49CD-PPDBF-TH%f%47G_MAK___________GrooveVL

+14_7b7d1f17-fdcb-4820-9789-9bec6e377821_3YR9B-D9W79-BY66R-R8XYP-QY%f%YYY_Retail________HomeBusinessR_[HomeBusinessDemoR]

+14_09e2d37e-474b-4121-8626-58ad9be5776f_3X43R-HHHXX-FRHRW-2M2WJ-8V%f%PHD_Retail________HomeStudentR_[HomeStudentDemoR]

+14_ef1da464-01c8-43a6-91af-e4e5713744f9_XDGJY-KFHW9-JWX9X-YM4GW-GC%f%8WR_Retail________InfoPathR

+14_85e22450-b741-430c-a172-a37962c938af_6GKT2-KMJPK-4RRBF-8VQKB-JB%f%6G6_MAK___________InfoPathVL

+14_3f7aa693-9a7e-44fc-9309-bb3d8e604925_2TG3P-9DB76-4YT99-8RXGD-CW%f%XBP_Retail________OneNoteR_[HSOneNoteR]

+14_6860b31f-6a67-48b8-84b9-e312b3485c4b_CV64P-F4VRH-BJ33D-PH6MR-X6%f%9RY_MAK___________OneNoteVL

+14_a9aeabd8-63b8-4079-a28e-f531807fd6b8_J8C9M-YXMH2-9CX44-2C3YG-V7%f%692_MAK___________OutlookVL

+14_acb51361-c0db-4895-9497-1831c41f31a6_GMBWM-WVX26-7WHV4-DB43D-WV%f%DY2_Retail________PersonalR_[PersonalDemoR,PersonalPrepaidR]

+14_38252940-718c-4aa6-81a4-135398e53851_HPBQP-RJHDR-Q3472-PT9Q6-PB%f%B72_MAK___________PowerPointVL

+14_8b559c37-0117-413e-921b-b853aeb6e210_367X9-9HP9R-TKHY6-DH4QH-K9%f%PY7_Retail________ProfessionalR_[ProfessionalAcadR,ProfessionalDemoR,OEM-SingleImage]

+14_725714d7-d58f-4d12-9fa8-35873c6f7215_6JD4G-KRW3J-48MGV-DM6FC-T9%f%WKR_Retail________ProjectProR_[ProjectProMSDNR]

+14_1cf57a59-c532-4e56-9a7d-ffa2fe94b474_3XDTH-MMGJ6-F9MKX-THP8D-G9%f%BP7_MAK___________ProjectProVL

+14_688f6589-2bd9-424e-a152-b13f36aa6de1_2W96V-RTQ9R-2BPVT-PT8H9-MV%f%68T_Retail________ProjectStdR

+14_11b39439-6b93-4642-9570-f2eb81be2238_4DTT4-D4MKX-23KFH-JKR6T-YK%f%G2J_MAK___________ProjectStdVL

+14_71af7e84-93e6-4363-9b69-699e04e74071_2J9H6-H4D3G-PCXD2-96XVM-TR%f%R73_Retail________ProPlusR_[ProPlusAcadR,ProPlusMSDNR,Sub4R]

+14_fdf3ecb9-b56f-43b2-a9b8-1b48b6bae1a7_6CD6C-9R8PB-T2D9Y-8RKKX-W7%f%DFK_MAK___________ProPlusVL_[ProPlusAcadVL]

+14_3d014759-b128-4466-9018-e80f6320d9d0_32YG9-3VX77-YXJVV-PRVFW-TT%f%8BV_MAK___________PublisherVL

+14_8090771e-d41a-4482-929e-de87f1f47e46_7VKXH-9BWCG-RPTBB-JBRV3-GR%f%HYC_MAK___________SmallBusBasicsVL

+14_b78df69e-0966-40b1-ae85-30a5134dedd0_H48K6-FB4Y6-P83GH-9J7XG-HD%f%KKX_ByPass________SPDR

+14_b6d2565c-341d-4768-ad7d-addbe00bb5ce_W3BTX-H6BW7-Q6DFW-BXFFY-8R%f%VJP_Retail________StandardR_[StandardMSDNR][KeyisforMSDNR]

+14_1f76e346-e0be-49bc-9954-70ec53a4fcfe_2XTQP-GDR7C-GTXPC-6W6PV-4R%f%XGC_MAK___________StandardVL_[StandardAcadVL]

+14_2745e581-565a-4670-ae90-6bf7c57ffe43_VXHHB-W7HBD-7M342-RJ7P8-CH%f%BD6_ByPass________StarterR

+14_66cad568-c2dc-459d-93ec-2f3cb967ee34_2RDPT-WPYQM-C2WXF-BTPDW-2J%f%2HM_Retail________VisioSIR_Prem[Pro,Std]

+14_36756cb8-8e69-4d11-9522-68899507cd6a_7PKFT-X2MKQ-GT6X2-8CB2W-CH%f%C9K_MAK___________VisioSIVL_Prem[Pro,Std]

+14_98d4050e-9c98-49bf-9be1-85e12eb3ab13_6J3XK-DFKGK-X373V-QJHYM-V3%f%FC2_MAK___________WordVL

 :: Office 2013

 15_ab4d047b-97cf-4126-a69f-34df08e2f254_B7RFY-7NXPK-Q4342-Y9X2H-3J%f%X4X_Retail________AccessRetail

 15_259de5be-492b-44b3-9d78-9645f848f7b0_X3XNB-HJB7K-66THH-8DWQ3-XH%f%GJP_Bypass________AccessRuntimeRetail

@@ -2317,13 +2665,182 @@ if %oVer%==16 (echo "%%D" | find /i "Subscription" %nul% && set _sublic=1)
 )

 )

 

-if %1==getmsiprod if %oVer%==%%A (

-for /f "tokens=*" %%x in ('findstr /i /c:"%%B" "%_oBranding%"') do set "prodId=%%x"

-set prodId=!prodId:"/>=!

-set prodId=!prodId:~-4!

-reg query "%2\Registration\{%%B}" /v ProductCode %nul2% | find /i "-!prodId!-" %nul% && (

-reg query "%2\Common\InstalledPackages" %nul2% | find /i "-!prodId!-" %nul% && (

-if defined _oIds (set _oIds=!_oIds! %%E) else (set _oIds=%%E)

+)

+)

+exit /b

+

+::========================================================================================================================================

+

+::  1st column = Office version number

+::  2nd column = Activation ID

+::  3rd column = Product ID from branding.xml

+::  4th column = Edition

+::  5th column = Other Edition IDs if they are part of the same primary product (For reference only)

+::  Separator  = "_"

+

+:msiofficedata

+

+for %%# in (

+14_4d463c2c-0505-4626-8cdb-a4da82e2d8ed_0015_AccessR

+14_745fb377-0a59-4ca9-b9a9-c359557a2c4e_001C_AccessRuntimeR

+14_95ab3ec8-4106-4f9d-b632-03c019d1d23f_0015_AccessVL

+14_4eaff0d0-c6cb-4187-94f3-c7656d49a0aa_0016_ExcelR_[HSExcelR]

+14_71dc86ff-f056-40d0-8ffb-9592705c9b76_0016_ExcelVL

+14_7004b7f0-6407-4f45-8eac-966e5f868bde_00BA_GrooveR

+14_fdad0dfa-417d-4b4f-93e4-64ea8867b7fd_00BA_GrooveVL

+14_7b7d1f17-fdcb-4820-9789-9bec6e377821_0013_HomeBusinessR_[HomeBusinessDemoR]

+14_19316117-30a8-4773-8fd9-7f7231f4e060_011E_HomeBusinessSubR

+14_09e2d37e-474b-4121-8626-58ad9be5776f_002F_HomeStudentR_[HomeStudentDemoR]

+14_ef1da464-01c8-43a6-91af-e4e5713744f9_0044_InfoPathR

+14_85e22450-b741-430c-a172-a37962c938af_0044_InfoPathVL

+14_14f5946a-debc-4716-babc-7e2c240fec08_000F_MondoR

+14_533b656a-4425-480b-8e30-1a2358898350_000F_MondoVL

+14_c1ceda8b-c578-4d5d-a4aa-23626be4e234_003D_ProfessionalR_[OEM-SingleImage]Exception

+14_3f7aa693-9a7e-44fc-9309-bb3d8e604925_00A1_OneNoteR_[HSOneNoteR]

+14_6860b31f-6a67-48b8-84b9-e312b3485c4b_00A1_OneNoteVL

+14_fbf4ac36-31c8-4340-8666-79873129cf40_001A_OutlookR

+14_a9aeabd8-63b8-4079-a28e-f531807fd6b8_001A_OutlookVL

+14_acb51361-c0db-4895-9497-1831c41f31a6_0033_PersonalR_[PersonalDemoR,PersonalPrepaidR]

+14_133c8359-4e93-4241-8118-30bb18737ea0_0018_PowerPointR_[HSPowerPointR]

+14_38252940-718c-4aa6-81a4-135398e53851_0018_PowerPointVL

+14_8b559c37-0117-413e-921b-b853aeb6e210_0014_ProfessionalR_[ProfessionalAcadR,ProfessionalDemoR]

+14_725714d7-d58f-4d12-9fa8-35873c6f7215_003B_ProjectProR_[ProjectProMSDNR]

+14_4d06f72e-fd50-4bc2-a24b-d448d7f17ef2_011F_ProjectProSubR

+14_1cf57a59-c532-4e56-9a7d-ffa2fe94b474_003B_ProjectProVL

+14_688f6589-2bd9-424e-a152-b13f36aa6de1_003A_ProjectStdR

+14_11b39439-6b93-4642-9570-f2eb81be2238_003A_ProjectStdVL

+14_71af7e84-93e6-4363-9b69-699e04e74071_0011_ProPlusR_[ProPlusAcadR,ProPlusMSDNR,Sub4R]

+14_e98ef0c0-71c4-42ce-8305-287d8721e26c_011D_ProPlusSubR

+14_fdf3ecb9-b56f-43b2-a9b8-1b48b6bae1a7_0011_ProPlusVL_[ProPlusAcadVL]

+14_98677603-a668-4fa4-9980-3f1f05f78f69_0019_PublisherR

+14_3d014759-b128-4466-9018-e80f6320d9d0_0019_PublisherVL

+14_dbe3aee0-5183-4ff7-8142-66050173cb01_008B_SmallBusBasicsR_[SmallBusBasicsMSDNR]

+14_8090771e-d41a-4482-929e-de87f1f47e46_008B_SmallBusBasicsVL

+14_b78df69e-0966-40b1-ae85-30a5134dedd0_0017_SPDR

+14_d3422cfb-8d8b-4ead-99f9-eab0ccd990d7_0012_StandardR

+14_1f76e346-e0be-49bc-9954-70ec53a4fcfe_0012_StandardVL_[StandardAcadVL]

+14_2745e581-565a-4670-ae90-6bf7c57ffe43_0066_StarterR

+14_66cad568-c2dc-459d-93ec-2f3cb967ee34_0057_VisioSIR_Prem[Pro,Std]Exception

+14_36756cb8-8e69-4d11-9522-68899507cd6a_0057_VisioSIVL_Prem[Pro,Std]Exception

+14_db3bbc9c-ce52-41d1-a46f-1a1d68059119_001B_WordR_[HSWordR]

+14_98d4050e-9c98-49bf-9be1-85e12eb3ab13_001B_WordVL

+:: Office 2013

+15_ab4d047b-97cf-4126-a69f-34df08e2f254_0015_AccessRetail

+15_259de5be-492b-44b3-9d78-9645f848f7b0_001C_AccessRuntimeRetail

+15_4374022d-56b8-48c1-9bb7-d8f2fc726343_0015_AccessVolume

+15_1b1d9bd5-12ea-4063-964c-16e7e87d6e08_0016_ExcelRetail

+15_ac1ae7fd-b949-4e04-a330-849bc40638cf_0016_ExcelVolume

+15_cfaf5356-49e3-48a8-ab3c-e729ab791250_00BA_GrooveRetail

+15_4825ac28-ce41-45a7-9e6e-1fed74057601_00BA_GrooveVolume

+15_c02fb62e-1cd5-4e18-ba25-e0480467ffaa_00E7_HomeBusinessPipcRetail

+15_cd256150-a898-441f-aac0-9f8f33390e45_0013_HomeBusinessRetail

+15_1fdfb4e4-f9c9-41c4-b055-c80daf00697d_00CE_HomeStudentARMRetail

+15_ebef9f05-5273-404a-9253-c5e252f50555_00DA_HomeStudentPlusARMRetail

+15_98685d21-78bd-4c62-bc4f-653344a63035_002F_HomeStudentRetail

+15_44984381-406e-4a35-b1c3-e54f499556e2_0044_InfoPathRetail

+15_9e016989-4007-42a6-8051-64eb97110cf2_0044_InfoPathVolume

+15_9103f3ce-1084-447a-827e-d6097f68c895_00EA_LyncAcademicRetail

+15_ff693bf4-0276-4ddb-bb42-74ef1a0c9f4d_012D_LyncEntryRetail

+15_fada6658-bfc6-4c4e-825a-59a89822cda8_012C_LyncRetail

+15_e1264e10-afaf-4439-a98b-256df8bb156f_012C_LyncVolume

+15_3169c8df-f659-4f95-9cc6-3115e6596e83_000F_MondoRetail

+15_f33485a0-310b-4b72-9a0e-b1d605510dbd_000F_MondoVolume

+15_3391e125-f6e4-4b1e-899c-a25e6092d40d_00A1_OneNoteFreeRetail

+15_8b524bcc-67ea-4876-a509-45e46f6347e8_00A1_OneNoteRetail

+15_b067e965-7521-455b-b9f7-c740204578a2_00A1_OneNoteVolume

+15_12004b48-e6c8-4ffa-ad5a-ac8d4467765a_001A_OutlookRetail

+15_8d577c50-ae5e-47fd-a240-24986f73d503_001A_OutlookVolume

+15_5aab8561-1686-43f7-9ff5-2c861da58d17_00E6_PersonalPipcRetail

+15_17e9df2d-ed91-4382-904b-4fed6a12caf0_0033_PersonalRetail

+15_31743b82-bfbc-44b6-aa12-85d42e644d5b_0018_PowerPointRetail

+15_e40dcb44-1d5c-4085-8e8f-943f33c4f004_0018_PowerPointVolume

+15_4e26cac1-e15a-4467-9069-cb47b67fe191_00E8_ProfessionalPipcRetail

+15_44bc70e2-fb83-4b09-9082-e5557e0c2ede_0014_ProfessionalRetail

+15_f2435de4-5fc0-4e5b-ac97-34f515ec5ee7_003B_ProjectProRetail

+15_ed34dc89-1c27-4ecd-8b2f-63d0f4cedc32_003B_ProjectProVolume

+15_5517e6a2-739b-4822-946f-7f0f1c5934b1_003A_ProjectStdRetail

+15_2b9e4a37-6230-4b42-bee2-e25ce86c8c7a_003A_ProjectStdVolume

+15_064383fa-1538-491c-859b-0ecab169a0ab_0011_ProPlusRetail

+15_2b88c4f2-ea8f-43cd-805e-4d41346e18a7_0011_ProPlusVolume

+15_c3a0814a-70a4-471f-af37-2313a6331111_0019_PublisherRetail

+15_38ea49f6-ad1d-43f1-9888-99a35d7c9409_0019_PublisherVolume

+15_ba3e3833-6a7e-445a-89d0-7802a9a68588_0017_SPDRetail

+15_32255c0a-16b4-4ce2-b388-8a4267e219eb_0012_StandardRetail

+15_a24cca51-3d54-4c41-8a76-4031f5338cb2_0012_StandardVolume

+15_15d12ad4-622d-4257-976c-5eb3282fb93d_0051_VisioProRetail

+15_3e4294dd-a765-49bc-8dbd-cf8b62a4bd3d_0051_VisioProVolume

+15_dae597ce-5823-4c77-9580-7268b93a4b23_0053_VisioStdRetail

+15_44a1f6ff-0876-4edb-9169-dbb43101ee89_0053_VisioStdVolume

+15_191509f2-6977-456f-ab30-cf0492b1e93a_001B_WordRetail

+15_9cedef15-be37-4ff0-a08a-13a045540641_001B_WordVolume

+:: Office 365 - 15.0 version

+15_befee371-a2f5-4648-85db-a2c55fdf324c_00E9_O365BusinessRetail

+15_537ea5b5-7d50-4876-bd38-a53a77caca32_00D6_O365HomePremRetail

+15_149dbce7-a48e-44db-8364-a53386cd4580_00D4_O365ProPlusRetail

+15_bacd4614-5bef-4a5e-bafc-de4c788037a2_00D5_O365SmallBusPremRetail

+:: Office 365 - 16.0 version

+16_6337137e-7c07-4197-8986-bece6a76fc33_00E9_O365BusinessRetail

+16_2f5c71b4-5b7a-4005-bb68-f9fac26f2ea3_00D6_O365EduCloudRetail

+16_537ea5b5-7d50-4876-bd38-a53a77caca32_00D6_O365HomePremRetail

+16_149dbce7-a48e-44db-8364-a53386cd4580_00D4_O365ProPlusRetail

+16_bacd4614-5bef-4a5e-bafc-de4c788037a2_00D5_O365SmallBusPremRetail

+:: Office 2016

+16_bfa358b0-98f1-4125-842e-585fa13032e6_0015_AccessRetail

+16_9d9faf9e-d345-4b49-afce-68cb0a539c7c_001C_AccessRuntimeRetail

+16_3b2fa33f-cd5a-43a5-bd95-f49f3f546b0b_0015_AccessVolume

+16_424d52ff-7ad2-4bc7-8ac6-748d767b455d_0016_ExcelRetail

+16_685062a7-6024-42e7-8c5f-6bb9e63e697f_0016_ExcelVolume

+16_c02fb62e-1cd5-4e18-ba25-e0480467ffaa_00E7_HomeBusinessPipcRetail

+16_86834d00-7896-4a38-8fae-32f20b86fa2b_0013_HomeBusinessRetail

+16_090896a0-ea98-48ac-b545-ba5da0eb0c9c_00CE_HomeStudentARMRetail

+16_6bbe2077-01a4-4269-bf15-5bf4d8efc0b2_00DA_HomeStudentPlusARMRetail

+16_c28acdb8-d8b3-4199-baa4-024d09e97c99_002F_HomeStudentRetail

+16_e2127526-b60c-43e0-bed1-3c9dc3d5a468_002F_HomeStudentVNextRetail

+16_b21367df-9545-4f02-9f24-240691da0e58_000F_MondoRetail

+16_2cd0ea7e-749f-4288-a05e-567c573b2a6c_000F_MondoVolume

+16_436366de-5579-4f24-96db-3893e4400030_00A3_OneNoteFreeRetail

+16_83ac4dd9-1b93-40ed-aa55-ede25bb6af38_00A1_OneNoteRetail

+16_23b672da-a456-4860-a8f3-e062a501d7e8_00A1_OneNoteVolume

+16_5a670809-0983-4c2d-8aad-d3c2c5b7d5d1_001A_OutlookRetail

+16_50059979-ac6f-4458-9e79-710bcb41721a_001A_OutlookVolume

+16_5aab8561-1686-43f7-9ff5-2c861da58d17_00E6_PersonalPipcRetail

+16_a9f645a1-0d6a-4978-926a-abcb363b72a6_0033_PersonalRetail

+16_f32d1284-0792-49da-9ac6-deb2bc9c80b6_0018_PowerPointRetail

+16_9b4060c9-a7f5-4a66-b732-faf248b7240f_0018_PowerPointVolume

+16_4e26cac1-e15a-4467-9069-cb47b67fe191_00E8_ProfessionalPipcRetail

+16_d64edc00-7453-4301-8428-197343fafb16_0014_ProfessionalRetail

+16_0f42f316-00b1-48c5-ada4-2f52b5720ad0_003B_ProjectProRetail

+16_82f502b5-b0b0-4349-bd2c-c560df85b248_003B_ProjectProVolume

+16_16728639-a9ab-4994-b6d8-f81051e69833_003B_ProjectProXVolume

+16_e9f0b3fc-962f-4944-ad06-05c10b6bcd5e_003A_ProjectStdRetail

+16_82e6b314-2a62-4e51-9220-61358dd230e6_003A_ProjectStdVolume

+16_431058f0-c059-44c5-b9e7-ed2dd46b6789_003A_ProjectStdXVolume

+16_de52bd50-9564-4adc-8fcb-a345c17f84f9_0011_ProPlusRetail

+16_c47456e3-265d-47b6-8ca0-c30abbd0ca36_0011_ProPlusVolume

+16_6e0c1d99-c72e-4968-bcb7-ab79e03e201e_0019_PublisherRetail

+16_fcc1757b-5d5f-486a-87cf-c4d6dedb6032_0019_PublisherVolume

+16_971cd368-f2e1-49c1-aedd-330909ce18b6_012D_SkypeforBusinessEntryRetail

+16_418d2b9f-b491-4d7f-84f1-49e27cc66597_012C_SkypeforBusinessRetail

+16_03ca3b9a-0869-4749-8988-3cbc9d9f51bb_012C_SkypeforBusinessVolume

+16_9103f3ce-1084-447a-827e-d6097f68c895_012C_SkypeServiceBypassRetail

+16_4a31c291-3a12-4c64-b8ab-cd79212be45e_0012_StandardRetail

+16_0ed94aac-2234-4309-ba29-74bdbb887083_0012_StandardVolume

+16_2dfe2075-2d04-4e43-816a-eb60bbb77574_0051_VisioProRetail

+16_295b2c03-4b1c-4221-b292-1411f468bd02_0051_VisioProVolume

+16_0594dc12-8444-4912-936a-747ca742dbdb_0051_VisioProXVolume

+16_c76dbcbc-d71b-4f45-b5b3-b7494cb4e23e_0053_VisioStdRetail

+16_44151c2d-c398-471f-946f-7660542e3369_0053_VisioStdVolume

+16_1d1c6879-39a3-47a5-9a6d-aceefa6a289d_0053_VisioStdXVolume

+16_cacaa1bf-da53-4c3b-9700-11738ef1c2a5_001B_WordRetail

+16_c3000759-551f-4f4a-bcac-a4b42cbf1de2_001B_WordVolume

+) do (

+for /f "tokens=1-5 delims=_" %%A in ("%%#") do (

+

+if "%oVer%"=="%%A" (

+reg query "%1\Registration\{%%B}" /v ProductCode %nul2% | find /i "-%%C-" %nul% && (

+reg query "%1\Common\InstalledPackages" %nul2% | find /i "-%%C-" %nul% && (

+if defined _oIds (set _oIds=!_oIds! %%D) else (set _oIds=%%D)

+if /i 003D==%%C set SingleImage=1

 )

 )

 )

@@ -2340,7 +2857,7 @@ exit /b
 :oh_extractdll

 

 set b=

-%psc% "$f=[io.file]::ReadAllText('!_batp!') -split ':%_hook%\:.*';$encoded = ($f[1]) -replace '-', 'A' -replace '_', 'a';$bytes = [Con%b%vert]::FromBas%b%e64String($encoded); $PePath='%1'; $offset='%2'; $m=[io.file]::ReadAllText('!_batp!') -split ':hexedit\:.*';iex ($m[1]);" %nul2% | find /i "Error found" %nul1% && set hasherror=1

+%psc% "$f=[io.file]::ReadAllText('!_batp!') -split ':%_hook%\:.*';$encoded = ($f[1]) -replace '-', 'A' -replace '_', 'a';$bytes = [Con%b%vert]::FromBas%b%e64String($encoded); $PePath='%1'; $offset='%2'; $m=[io.file]::ReadAllText('!_batp!') -split ':hexedit\:.*';iex ($m[1])" %nul2% | find /i "Error found" %nul1% && set hasherror=1

 exit /b

 

 :hexedit:

@@ -2379,7 +2896,7 @@ $Writer.Write($unixTimestamp)
 $Writer.Flush()

 

 # Write the current state of the MemoryStream to a temporary file

-$tempFilePath = [System.IO.Path]::Combine($env:windir, "Temp", [System.IO.Path]::GetRandomFileName())

+$tempFilePath = "$env:windir\Temp\$([System.IO.Path]::GetRandomFileName())"

 [System.IO.File]::WriteAllBytes($tempFilePath, $MemoryStream.ToArray())

 

 # Update hash using the temporary file