Merge branch 'dev'3.1

1 files changed, 489 insertions, 255 deletions

diff --git a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
index 519c1bd..bb6fd92 100644
--- a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
@@ -1,4 +1,4 @@
-@set masver=3.0

+@set masver=3.1

 @echo off

 

 

@@ -134,7 +134,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

@@ -149,7 +149,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

@@ -198,14 +198,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 7600 (

+if %winbuild% LSS 6001 (

 %nceline%

 echo Unsupported OS version detected [%winbuild%].

-echo MAS only supports Windows 7/8/8.1/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:

+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

 )

 

@@ -241,40 +258,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

 )

 

@@ -290,34 +332,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

 

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

@@ -326,12 +367,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=

+)

 )

 )

 

@@ -438,12 +485,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

 )

 

@@ -492,7 +542,7 @@ call :dk_color %Blue% "Internet is required for Online %KS% Activation."
 

 echo Initiating Diagnostic Tests...

 

-set "_serv=sppsvc Winmgmt"

+set "_serv=%_slser% Winmgmt"

 

 ::  Software Protection

 ::  Windows Management Instrumentation

@@ -536,7 +586,7 @@ call :dk_color %Blue% "Go back to main menu and use [Change Edition] option."
 ) else (

 call :dk_color %Blue% "Use TSforge activation option from the main menu to reset evaluation period."

 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"

 )

 

 goto :ks_office

@@ -582,17 +632,19 @@ echo [%winos% ^| %winbuild% ^| SKU:%osSKU%]
 if %winbuild% GEQ 9200 if exist "%SysPath%\spp\tokens\skus\%osedition%\*GVLK*.xrm-ms" set sppks=1

 if %winbuild% LSS 9200 if exist "%SysPath%\spp\tokens\skus\Security-SPP-Component-SKU-%osedition%\*VLKMS*.xrm-ms" set sppks=1

 if %winbuild% LSS 9200 if exist "%SysPath%\spp\tokens\skus\Security-SPP-Component-SKU-%osedition%\*VL-BYPASS*.xrm-ms" set sppks=1

+if %winbuild% LSS 7600 if exist "%SysPath%\licensing\skus\Security-Licensing-SLC-Component-SKU-%osedition%\*KMS*.xrm-ms" set sppks=1

+if %winbuild% LSS 7600 if exist "%SysPath%\licensing\skus\Security-Licensing-SLC-Component-SKU-%osedition%\*VL-BYPASS*.xrm-ms" set sppks=1

 

 if defined skunotfound (

-call :dk_color %Red% "Required license files not found in %SysPath%\spp\tokens\skus\"

+call :dk_color %Red% "Required license files not found."

 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"

 )

 

 if defined sppks (

 call :dk_color %Red% "%KS% activation is supported but failed to find the %KS% key."

 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"

 )

 

 if not defined skunotfound if not defined sppks (

@@ -625,6 +677,7 @@ call echo Checking Installed Product Key          [Partial Key - %%_partial%%] [
 )

 

 if defined key (

+set generickey=1

 call :dk_inskey "[%key%]"

 )

 

@@ -634,7 +687,7 @@ call :dk_inskey "[%key%]"
 

 if not %_actoff%==1 goto :ks_activate

 

-call :ks_setspp

+call :oh_setspp

 

 ::  Check ohook install

 

@@ -679,7 +732,7 @@ set ohub=1
 

 ::  Check supported office versions

 

-call :ks_getpath

+call :oh_getpath

 

 set o16uwp=

 set o16uwp_path=

@@ -858,9 +911,9 @@ call :ks_process
 

 :ks_startmsi

 

-if defined o14msi call :ks_setspp 14

+if defined o14msi call :oh_setspp 14

 if defined o14msi call :ks_processmsi 14 %o14msi_reg%

-call :ks_setspp

+call :oh_setspp

 if defined o15msi call :ks_processmsi 15 %o15msi_reg%

 if defined o16msi call :ks_processmsi 16 %o16msi_reg%

 

@@ -999,12 +1052,12 @@ set _prids=
 set _config=

 set _version=

 set _License=

-set _oBranding=

+set _oMSI=

 exit /b

 

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

 

-:ks_getpath

+:oh_getpath

 

 set o16c2r=

 set o15c2r=

@@ -1091,16 +1144,19 @@ exit /b
 

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

 

-:ks_setspp

+: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

 )

@@ -1113,7 +1169,7 @@ exit /b
 for %%# in (%_oIds%) do (

 

 set skipprocess=

-if %_NoEditionChange%==1 if not defined _oBranding (

+if %_NoEditionChange%==1 if not defined _oMSI (

 set foundprod=

 call :ksdata chkprod %%#

 if not defined foundprod (

@@ -1160,15 +1216,16 @@ call :ks_osppready
 

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

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

+set generickey=1

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

 ) else (

-if not defined _oBranding (

+if not defined _oMSI (

 set error=1

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

 call :dk_color %Blue% "Make sure you are using Latest MAS script."

 ) else (

 call :dk_color %Red% "Checking Product In Script              [!_prod! MSI Retail is not supported]"

-call :dk_color %Blue% "Uninstall this and Install C2R or MSI VL version of Office."

+call :dk_color %Blue% "Use Ohook option to activate it."

 )

 set fixes=%fixes% %mas%genuine-installation-media

 call :dk_color %_Yellow% "%mas%genuine-installation-media"

@@ -1185,6 +1242,7 @@ exit /b
 ::  Process Office MSI Version

 

 call :ks_reset

+set _oMSI=1

 

 if "%1"=="14" (

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

@@ -1201,25 +1259,11 @@ echo "%2" | find /i "Wow6432Node" %nul1% && set _oArch=x86
 if not "%osarch%"=="x86" if not defined _oArch set _oArch=x64

 if "%osarch%"=="x86" set _oArch=x86

 

-set "_common=%CommonProgramFiles%"

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

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

-

-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 :ksdata getmsiprod %2

-call :ks_msiretaildata getmsiret %2

+call :msiofficedata %2

 

 echo:

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

 

-if not defined _oBranding (

-set error=1

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

-exit /b

-)

-

 if not defined _oIds (

 set error=1

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

@@ -1625,7 +1669,12 @@ set _tserror=
 set winbuild=1

 set "nul=>nul 2>&1"

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

-set psc=powershell.exe

+set psc=powershell.exe -nop -c

+

+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 run_once=

 set t_name=Renewal Task

@@ -1638,6 +1687,7 @@ set _wmic=0
 for %%# in (wmic.exe) do @if not "%%~$PATH:#"=="" (

 cmd /c "wmic path Win32_ComputerSystem get CreationClassName /value" 2>nul | find /i "computersystem" 1>nul && set _wmic=1

 )

+if %winbuild% LSS 9200 set _wmic=1

 

 setlocal EnableDelayedExpansion

 if exist "%ProgramFiles%\Activation-Renewal\" call :_taskstart>>"%ProgramFiles%\Activation-Renewal\Logs.txt"

@@ -1690,7 +1740,7 @@ call :_taskclear-cache
 ::  Check WMI and sppsvc Errors

 

 set applist=

-net start sppsvc /y %nul%

+net start %_slser% /y %nul%

 if %_wmic% EQU 1 set "chkapp=for /f "tokens=2 delims==" %%a in ('"wmic path %slp% where (ApplicationID='%_wApp%') get ID /VALUE" 2^>nul')"

 if %_wmic% EQU 0 set "chkapp=for /f "tokens=2 delims==" %%a in ('%psc% "(([WMISEARCHER]'SELECT ID FROM %slp% WHERE ApplicationID=''%_wApp%''').Get()).ID ^| %% {echo ('ID='+$_)}" 2^>nul')"

 %chkapp% do (if defined applist (call set "applist=!applist! %%a") else (call set "applist=%%a"))

@@ -1992,12 +2042,20 @@ exit /b
 :_taskclear-cache

 

 set w=

-for %%# in (SppE%w%xtComObj.exe sppsvc.exe) do (

+for %%# in (SppE%w%xtComObj.exe sppsvc.exe SLsvc.exe) do (

 reg delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Ima%w%ge File Execu%w%tion Options\%%#" /f %nul%

 )

 

 set "OPPk=SOFTWARE\Microsoft\OfficeSoftwareProtectionPlatform"

+

+if %winbuild% LSS 7600 (

+reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SL" %nul% && (

+set "SPPk=SOFTWARE\Microsoft\Windows NT\CurrentVersion\SL"

+)

+)

+if not defined SPPk (

 set "SPPk=SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform"

+)

 

 set "slp=SoftwareLicensingProduct"

 set "ospp=OfficeSoftwareProtectionProduct"

@@ -2113,10 +2171,11 @@ for /f %%G in ('%psc% "[Guid]::NewGuid().Guid"') do set "randguid=%%G"
 set "_temp=%SystemRoot%\Temp\%Random%%randguid%"

 

 set nil=

+if %winbuild% LSS 7600 (set _vista=_vista)

 if exist "%_temp%\.*" rmdir /s /q "%_temp%\" %nul%

 md "%_temp%\" %nul%

-call :ks_RenExport renewal "%_temp%\Renewal.xml" Unicode

-if not defined _int (call :ks_RenExport run_once "%_temp%\Run_Once.xml" Unicode)

+call :ks_RenExport renewal%_vista% "%_temp%\Renewal.xml" Unicode

+if not defined _int (call :ks_RenExport run_once%_vista% "%_temp%\Run_Once.xml" Unicode)

 s%nil%cht%nil%asks /cre%nil%ate /tn "Activation-Renewal" /ru "SYS%nil%TEM" /xml "%_temp%\Renewal.xml" %nul%

 if not defined _int (s%nil%cht%nil%asks /cre%nil%ate /tn "Activation-Run_Once" /ru "SYS%nil%TEM" /xml "%_temp%\Run_Once.xml" %nul%)

 if exist "%_temp%\.*" rmdir /s /q "%_temp%\" %nul%

@@ -2305,16 +2364,137 @@ exit /b
 </Task>

 :run_once:

 

+:renewal_vista:

+<?xml version="1.0" encoding="UTF-16"?>

+<Task version="1.2" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">

+  <RegistrationInfo>

+    <Date>1999-01-01T12:00:00.34375</Date>

+    <Author>WindowsAddict</Author>

+    <Description>Online K-M-S Activation-Renewal - Weekly Task</Description>

+  </RegistrationInfo>

+  <Triggers>

+    <CalendarTrigger>

+      <StartBoundary>1999-01-01T12:00:00.34375</StartBoundary>

+      <Enabled>true</Enabled>

+      <ScheduleByWeek>

+        <DaysOfWeek>

+          <Sunday />

+        </DaysOfWeek>

+        <WeeksInterval>1</WeeksInterval>

+      </ScheduleByWeek>

+    </CalendarTrigger>

+  </Triggers>

+  <Principals>

+    <Principal id="Author">

+      <UserId>S-1-5-18</UserId>

+      <RunLevel>HighestAvailable</RunLevel>

+    </Principal>

+  </Principals>

+  <Settings>

+    <IdleSettings>

+      <Duration>PT10M</Duration>

+      <WaitTimeout>PT1H</WaitTimeout>

+      <StopOnIdleEnd>true</StopOnIdleEnd>

+      <RestartOnIdle>false</RestartOnIdle>

+    </IdleSettings>

+    <MultipleInstancesPolicy>IgnoreNew</MultipleInstancesPolicy>

+    <DisallowStartIfOnBatteries>false</DisallowStartIfOnBatteries>

+    <StopIfGoingOnBatteries>true</StopIfGoingOnBatteries>

+    <AllowHardTerminate>true</AllowHardTerminate>

+    <StartWhenAvailable>true</StartWhenAvailable>

+    <RunOnlyIfNetworkAvailable>true</RunOnlyIfNetworkAvailable>

+    <NetworkSettings />

+    <AllowStartOnDemand>true</AllowStartOnDemand>

+    <Enabled>true</Enabled>

+    <Hidden>false</Hidden>

+    <RunOnlyIfIdle>false</RunOnlyIfIdle>

+    <WakeToRun>false</WakeToRun>

+    <ExecutionTimeLimit>PT10M</ExecutionTimeLimit>

+    <Priority>7</Priority>

+    <RestartOnFailure>

+      <Interval>PT5M</Interval>

+      <Count>3</Count>

+    </RestartOnFailure>

+  </Settings>

+  <Actions Context="Author">

+    <Exec>

+      <Command>%ProgramFiles%\Activation-Renewal\Activation_task.cmd</Command>

+      <Arguments>Task</Arguments>

+    </Exec>

+  </Actions>

+</Task>

+:renewal_vista:

+

+:run_once_vista:

+<?xml version="1.0" encoding="UTF-16"?>

+<Task version="1.2" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">

+  <RegistrationInfo>

+    <Date>1999-01-01T12:00:00.34375</Date>

+    <Author>WindowsAddict</Author>

+    <Description>Online K-M-S Activation Run Once - Run and Delete itself on first Internet Contact</Description>

+  </RegistrationInfo>

+  <Triggers>

+    <LogonTrigger>

+      <Enabled>true</Enabled>

+    </LogonTrigger>

+  </Triggers>

+  <Principals>

+    <Principal id="Author">

+      <UserId>S-1-5-18</UserId>

+      <RunLevel>HighestAvailable</RunLevel>

+    </Principal>

+  </Principals>

+  <Settings>

+    <IdleSettings>

+      <Duration>PT10M</Duration>

+      <WaitTimeout>PT1H</WaitTimeout>

+      <StopOnIdleEnd>true</StopOnIdleEnd>

+      <RestartOnIdle>false</RestartOnIdle>

+    </IdleSettings>

+    <MultipleInstancesPolicy>IgnoreNew</MultipleInstancesPolicy>

+    <DisallowStartIfOnBatteries>false</DisallowStartIfOnBatteries>

+    <StopIfGoingOnBatteries>true</StopIfGoingOnBatteries>

+    <AllowHardTerminate>true</AllowHardTerminate>

+    <StartWhenAvailable>true</StartWhenAvailable>

+    <RunOnlyIfNetworkAvailable>true</RunOnlyIfNetworkAvailable>

+    <NetworkSettings />

+    <AllowStartOnDemand>true</AllowStartOnDemand>

+    <Enabled>true</Enabled>

+    <Hidden>false</Hidden>

+    <RunOnlyIfIdle>false</RunOnlyIfIdle>

+    <WakeToRun>false</WakeToRun>

+    <ExecutionTimeLimit>PT10M</ExecutionTimeLimit>

+    <Priority>7</Priority>

+    <RestartOnFailure>

+      <Interval>PT5M</Interval>

+      <Count>3</Count>

+    </RestartOnFailure>

+  </Settings>

+  <Actions Context="Author">

+    <Exec>

+      <Command>%ProgramFiles%\Activation-Renewal\Activation_task.cmd</Command>

+      <Arguments>Task</Arguments>

+    </Exec>

+  </Actions>

+</Task>

+:run_once_vista:

+

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

 

 ::  Set variables

 

 :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)

@@ -2454,11 +2634,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%"

@@ -2467,6 +2648,7 @@ set showfix=1
 set error=1

 )

 

+set generickey=

 exit /b

 

 ::  Get Windows installed key channel

@@ -2518,6 +2700,8 @@ exit /b
 

 :dk_reeval

 

+if %winbuild% LSS 7600 exit /b

+

 ::  This key is left by the system in rearm process and sppsvc sometimes fails to delete it, it causes issues in working of the Scheduled Tasks of SPP

 

 set "ruleskey=HKU\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\PersistedSystemState"

@@ -2545,13 +2729,13 @@ 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"

-    $Spp = "$env:SysPath\spp\tokens"

-    InstallLicenseDir "$Spp"

-    If (Test-Path $Oem) {InstallLicenseDir "$Oem"}

+	$Paths = @("$env:SysPath\oem", "$env:SysPath\licensing", "$env:SysPath\spp\tokens")

+	foreach ($Path in $Paths) {

+    if (Test-Path $Path) { InstallLicenseDir "$Path" }

+	}

 }

 :xrm:

 

@@ -2559,6 +2743,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

@@ -2569,16 +2754,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)

@@ -2586,7 +2771,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)

@@ -2687,11 +2872,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%"=="" (

@@ -2699,7 +2884,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:

 )

 

@@ -2771,6 +2956,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%

@@ -2819,7 +3005,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

 )

 )

@@ -2876,7 +3062,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"

 )

 )

 

@@ -2900,7 +3086,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%]"

 )

@@ -2912,7 +3098,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%"

@@ -2982,7 +3169,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 (

@@ -2996,38 +3183,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)';"

@@ -3048,7 +3236,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"

@@ -3063,7 +3251,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%\]"

 )

@@ -3146,7 +3334,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++

     }

 }

@@ -3155,7 +3343,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

         }

@@ -3169,7 +3357,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) {

@@ -3198,8 +3386,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

 

@@ -3207,8 +3397,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

 

@@ -3240,132 +3432,174 @@ exit /b
 

 ::  1st column = Office version number

 ::  2nd column = Activation ID

-::  3rd column = Edition

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

+::  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  = "_"

 

-:ks_msiretaildata

+:msiofficedata

 

 for %%# in (

-:: Office 2010

-14_4d463c2c-0505-4626-8cdb-a4da82e2d8ed_AccessR

-14_745fb377-0a59-4ca9-b9a9-c359557a2c4e_AccessRuntimeR

-14_4eaff0d0-c6cb-4187-94f3-c7656d49a0aa_ExcelR

-14_7004b7f0-6407-4f45-8eac-966e5f868bde_GrooveR

-14_7b7d1f17-fdcb-4820-9789-9bec6e377821_HomeBusinessR_[HomeBusinessDemoR]

-14_19316117-30a8-4773-8fd9-7f7231f4e060_HomeBusinessSubR

-14_09e2d37e-474b-4121-8626-58ad9be5776f_HomeStudentR_[HomeStudentDemoR]

-14_c3ae020c-5a71-4cc5-a27a-2a97c2d46860_HSExcelR

-14_25fe4611-b44d-49cc-ae87-2143d299194e_HSOneNoteR

-14_d652ad8d-da5c-4358-b928-7fb1b4de7a7c_HSPowerPointR

-14_a963d7ae-7a88-41a7-94da-8bb5635a8af9_HSWordR

-14_ef1da464-01c8-43a6-91af-e4e5713744f9_InfoPathR

-14_14f5946a-debc-4716-babc-7e2c240fec08_MondoR

-14_c1ceda8b-c578-4d5d-a4aa-23626be4e234_OEM

-14_3f7aa693-9a7e-44fc-9309-bb3d8e604925_OneNoteR

-14_fbf4ac36-31c8-4340-8666-79873129cf40_OutlookR

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

-14_133c8359-4e93-4241-8118-30bb18737ea0_PowerPointR

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

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

-14_4d06f72e-fd50-4bc2-a24b-d448d7f17ef2_ProjectProSubR

-14_688f6589-2bd9-424e-a152-b13f36aa6de1_ProjectStdR

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

-14_e98ef0c0-71c4-42ce-8305-287d8721e26c_ProPlusSubR

-14_98677603-a668-4fa4-9980-3f1f05f78f69_PublisherR

-14_dbe3aee0-5183-4ff7-8142-66050173cb01_SmallBusBasicsR_[SmallBusBasicsMSDNR]

-14_b78df69e-0966-40b1-ae85-30a5134dedd0_SPDR

-14_d3422cfb-8d8b-4ead-99f9-eab0ccd990d7_StandardR

-14_2745e581-565a-4670-ae90-6bf7c57ffe43_StarterR

-14_66cad568-c2dc-459d-93ec-2f3cb967ee34_VisioSIR_Prem[Pro,Std]

-14_db3bbc9c-ce52-41d1-a46f-1a1d68059119_WordR

+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_AccessRetail

-15_259de5be-492b-44b3-9d78-9645f848f7b0_AccessRuntimeRetail

-15_1b1d9bd5-12ea-4063-964c-16e7e87d6e08_ExcelRetail

-15_cfaf5356-49e3-48a8-ab3c-e729ab791250_GrooveRetail

-15_c02fb62e-1cd5-4e18-ba25-e0480467ffaa_HomeBusinessPipcRetail

-15_a2b90e7a-a797-4713-af90-f0becf52a1dd_HomeBusinessRetail

-15_1fdfb4e4-f9c9-41c4-b055-c80daf00697d_HomeStudentARMRetail

-15_ebef9f05-5273-404a-9253-c5e252f50555_HomeStudentPlusARMRetail

-15_f2de350d-3028-410a-bfae-283e00b44d0e_HomeStudentRetail

-15_44984381-406e-4a35-b1c3-e54f499556e2_InfoPathRetail

-15_9103f3ce-1084-447a-827e-d6097f68c895_LyncAcademicRetail

-15_ff693bf4-0276-4ddb-bb42-74ef1a0c9f4d_LyncEntryRetail

-15_fada6658-bfc6-4c4e-825a-59a89822cda8_LyncRetail

-15_69ec9152-153b-471a-bf35-77ec88683eae_MondoRetail

-15_3391e125-f6e4-4b1e-899c-a25e6092d40d_OneNoteFreeRetail

-15_8b524bcc-67ea-4876-a509-45e46f6347e8_OneNoteRetail

-15_12004b48-e6c8-4ffa-ad5a-ac8d4467765a_OutlookRetail

-15_5aab8561-1686-43f7-9ff5-2c861da58d17_PersonalPipcRetail

-15_17e9df2d-ed91-4382-904b-4fed6a12caf0_PersonalRetail

-15_31743b82-bfbc-44b6-aa12-85d42e644d5b_PowerPointRetail

-15_064383fa-1538-491c-859b-0ecab169a0ab_ProPlusRetail

-15_4e26cac1-e15a-4467-9069-cb47b67fe191_ProfessionalPipcRetail

-15_44bc70e2-fb83-4b09-9082-e5557e0c2ede_ProfessionalRetail

-15_2f72340c-b555-418d-8b46-355944fe66b8_ProjectProRetail

-15_58d95b09-6af6-453d-a976-8ef0ae0316b1_ProjectStdRetail

-15_c3a0814a-70a4-471f-af37-2313a6331111_PublisherRetail

-15_ba3e3833-6a7e-445a-89d0-7802a9a68588_SPDRetail

-15_32255c0a-16b4-4ce2-b388-8a4267e219eb_StandardRetail

-15_a56a3b37-3a35-4bbb-a036-eee5f1898eee_VisioProRetail

-15_980f9e3e-f5a8-41c8-8596-61404addf677_VisioStdRetail

-15_191509f2-6977-456f-ab30-cf0492b1e93a_WordRetail

+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_6337137e-7c07-4197-8986-bece6a76fc33_O365BusinessRetail

-15_537ea5b5-7d50-4876-bd38-a53a77caca32_O365HomePremRetail

-15_149dbce7-a48e-44db-8364-a53386cd4580_O365ProPlusRetail

-15_bacd4614-5bef-4a5e-bafc-de4c788037a2_O365SmallBusPremRetail

+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_O365BusinessRetail

-16_2f5c71b4-5b7a-4005-bb68-f9fac26f2ea3_O365EduCloudRetail

-16_537ea5b5-7d50-4876-bd38-a53a77caca32_O365HomePremRetail

-16_149dbce7-a48e-44db-8364-a53386cd4580_O365ProPlusRetail

-16_bacd4614-5bef-4a5e-bafc-de4c788037a2_O365SmallBusPremRetail

+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_AccessRetail

-16_9d9faf9e-d345-4b49-afce-68cb0a539c7c_AccessRuntimeRetail

-16_424d52ff-7ad2-4bc7-8ac6-748d767b455d_ExcelRetail

-16_c02fb62e-1cd5-4e18-ba25-e0480467ffaa_HomeBusinessPipcRetail

-16_86834d00-7896-4a38-8fae-32f20b86fa2b_HomeBusinessRetail

-16_c28acdb8-d8b3-4199-baa4-024d09e97c99_HomeStudentRetail

-16_090896a0-ea98-48ac-b545-ba5da0eb0c9c_HomeStudentARMRetail

-16_6bbe2077-01a4-4269-bf15-5bf4d8efc0b2_HomeStudentPlusARMRetail

-16_e2127526-b60c-43e0-bed1-3c9dc3d5a468_HomeStudentVNextRetail

-16_69ec9152-153b-471a-bf35-77ec88683eae_MondoRetail

-16_436366de-5579-4f24-96db-3893e4400030_OneNoteFreeRetail

-16_83ac4dd9-1b93-40ed-aa55-ede25bb6af38_OneNoteRetail

-16_5a670809-0983-4c2d-8aad-d3c2c5b7d5d1_OutlookRetail

-16_5aab8561-1686-43f7-9ff5-2c861da58d17_PersonalPipcRetail

-16_a9f645a1-0d6a-4978-926a-abcb363b72a6_PersonalRetail

-16_f32d1284-0792-49da-9ac6-deb2bc9c80b6_PowerPointRetail

-16_de52bd50-9564-4adc-8fcb-a345c17f84f9_ProPlusRetail

-16_4e26cac1-e15a-4467-9069-cb47b67fe191_ProfessionalPipcRetail

-16_d64edc00-7453-4301-8428-197343fafb16_ProfessionalRetail

-16_2f72340c-b555-418d-8b46-355944fe66b8_ProjectProRetail

-16_58d95b09-6af6-453d-a976-8ef0ae0316b1_ProjectStdRetail

-16_6e0c1d99-c72e-4968-bcb7-ab79e03e201e_PublisherRetail

-16_9103f3ce-1084-447a-827e-d6097f68c895_SkypeServiceBypassRetail

-16_971cd368-f2e1-49c1-aedd-330909ce18b6_SkypeforBusinessEntryRetail

-16_418d2b9f-b491-4d7f-84f1-49e27cc66597_SkypeforBusinessRetail

-16_4a31c291-3a12-4c64-b8ab-cd79212be45e_StandardRetail

-16_a56a3b37-3a35-4bbb-a036-eee5f1898eee_VisioProRetail

-16_980f9e3e-f5a8-41c8-8596-61404addf677_VisioStdRetail

-16_cacaa1bf-da53-4c3b-9700-11738ef1c2a5_WordRetail

+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 %1==getmsiret if "%oVer%"=="%%A" (

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

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

-set prodId=!prodId:~-4!

-if "%oVer%"=="14" (

-REM Exception case for Visio because wrong primary product ID is mentioned in Branding.xml

-echo %%C | find /i "Visio" %nul% && set prodId=0057

-)

-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! %%C) else (set _oIds=%%C)

+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

 )

 )

 )

@@ -3509,7 +3743,22 @@ a78b8bd9-8017-4df5-b86a-09f756affa7c_6TPJF-RBVHG-WBW2R-86QPH-6R%f%TM4__17_Server
 cda18cf3-c196-46ad-b289-60c072869994_TT8MH-CG224-D3D7Q-498W2-9Q%f%CTX__18_ServerHPC

 a78b8bd9-8017-4df5-b86a-09f756affa7c_6TPJF-RBVHG-WBW2R-86QPH-6R%f%TM4__29_ServerWebCore

 f772515c-0e87-48d5-a676-e6962c3e1195_736RG-XDKJK-V34PF-BHK87-J6%f%X3K__56_ServerEmbeddedSolution

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

+:: Windows Vista

+cfd8ff08-c0d7-452b-9f60-ef5c70c32094_VKK3X-68KWM-X2YGT-QR4M6-4B%f%WMV___4_Enterprise

+4f3d1606-3fea-4c01-be3c-8d671c401e3b_YFKBB-PQJJV-G996G-VWGXY-2V%f%3X8___6_Business

+2c682dc2-8b68-4f63-a165-ae291d4cf138_HMBQG-8H2RH-C77VX-27R82-VM%f%QBT__16_BusinessN

+d4f54950-26f2-4fb4-ba21-ffab16afcade_VTC42-BM838-43QHV-84HX6-XJ%f%XKV__27_EnterpriseN

+:: Windows Server 2008

+ad2542d4-9154-4c6d-8a44-30f11ee96989_TM24T-X9RMF-VWXK6-X8JC9-BF%f%GM2___7_ServerStandard

+68b6e220-cf09-466b-92d3-45cd964b9509_7M67G-PC374-GR742-YH8V4-TC%f%BY3___8_ServerDatacenter

+c1af4d90-d1bc-44ca-85d4-003ba33db3b9_YQGMW-MPWTJ-34KDK-48M3W-X4%f%Q6V__10_ServerEnterprise

+01ef176b-3e0d-422a-b4f8-4ea880035e8f_4DWFP-JF3DJ-B7DTH-78FJB-PD%f%RHK__15_ServerEnterpriseIA64

+ddfa9f7c-f09e-40b9-8c1a-be877a9a7f4b_WYR28-R7TFJ-3X2YQ-YCY4H-M2%f%49D__17_ServerWeb

+7afb1156-2c1d-40fc-b260-aab7442b62fe_RCTX3-KWVHP-BR6TB-RB6DM-6X%f%7HP__18_ServerComputeCluster

+2401e3d0-c50a-4b58-87b2-7e794b7d2607_W7VD6-7JFBR-RX26B-YKQ3Y-6F%f%FFJ__36_ServerStandardV

+fd09ef77-5647-4eff-809c-af2b64659a45_22XQ2-VRXRG-P8D42-K34TD-G3%f%QQC__37_ServerDatacenterV

+8198490a-add0-47b2-b3ba-316b12d647b4_39BXF-X8Q23-P2WWT-38T2F-G3%f%FPG__38_ServerEnterpriseV

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

 :: Office 2010

 8ce7e872-188c-4b98-9d90-f8f90b7aad02_V7Y44-9T38C-R2VJK-666HK-T7%f%DDX__14_AccessVL

 cee5d470-6e3b-4fcc-8c2b-d17428568a9f_H62QG-HXVKF-PP4HP-66KMR-CW%f%9BM__14_ExcelVL

@@ -3641,7 +3890,7 @@ if /i "%2"=="%%D" (
 set key=%%B

 set _actid=%%A

 set _allactid=!_allactid! %%A

-) else if not defined _oBranding if %_NoEditionChange%==0 (

+) else if not defined _oMSI if %_NoEditionChange%==0 (

 echo: %%E | find /i "-%2-" %nul% && (

 set key=%%B

 set _altoffid=%%D

@@ -3651,21 +3900,6 @@ set _allactid=!_allactid! %%A
 )

 )

 

-if %1==getmsiprod if "%oVer%"=="%%C" (

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

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

-set prodId=!prodId:~-4!

-if "%oVer%"=="14" (

-REM Exception case for Visio because wrong primary product ID is mentioned in Branding.xml

-echo %%D | find /i "Visio" %nul% && set prodId=0057

-)

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

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

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

-)

-)

-)

-

 )

 )

 exit /b