Use wmic.exe on builds below 9200

8 files changed, 23 insertions, 20 deletions

diff --git a/MAS/All-In-One-Version-KL/MAS_AIO.cmd b/MAS/All-In-One-Version-KL/MAS_AIO.cmd
index bc8220d..e5bc555 100644
--- a/MAS/All-In-One-Version-KL/MAS_AIO.cmd
+++ b/MAS/All-In-One-Version-KL/MAS_AIO.cmd
@@ -1374,6 +1374,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

@@ -1687,7 +1688,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%"

@@ -10978,12 +10980,6 @@ set "_xmlexist=if exist "%tdir%\GenuineTicket.xml""
 

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

 

-sc query sppsvc | find /i "STOPPED" %nul% && (

-echo Stopping sppsvc Service                 [Successful]

-) || (

-call :dk_color %Gray% "Stopping sppsvc Service                 [Failed]"

-)

-

 %_xmlexist% (

 %psc% "Start-Job { Restart-Service ClipSVC } | Wait-Job -Timeout 20 | Out-Null"

 %_xmlexist% timeout /t 2 %nul%

@@ -12431,6 +12427,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"

diff --git a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
index 6aa033b..6409cec 100644
--- a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
@@ -1072,6 +1072,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

@@ -1385,7 +1386,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%"

diff --git a/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd b/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
index 890ac89..bb2c624 100644
--- a/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
@@ -718,12 +718,6 @@ set "_xmlexist=if exist "%tdir%\GenuineTicket.xml""
 

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

 

-sc query sppsvc | find /i "STOPPED" %nul% && (

-echo Stopping sppsvc Service                 [Successful]

-) || (

-call :dk_color %Gray% "Stopping sppsvc Service                 [Failed]"

-)

-

 %_xmlexist% (

 %psc% "Start-Job { Restart-Service ClipSVC } | Wait-Job -Timeout 20 | Out-Null"

 %_xmlexist% timeout /t 2 %nul%

@@ -1176,6 +1170,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

@@ -1534,7 +1529,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%"

diff --git a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
index e2978a4..5be9615 100644
--- a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
+++ b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
@@ -1495,6 +1495,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

@@ -1793,7 +1794,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%"

diff --git a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
index 8e316c0..48e93ac 100644
--- a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
@@ -1686,6 +1686,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"

@@ -2739,6 +2740,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

@@ -3097,7 +3099,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%"

diff --git a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
index 9c64be6..b4effe7 100644
--- a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
@@ -2400,6 +2400,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

@@ -2712,8 +2713,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%"

@@ -2850,7 +2851,7 @@ set showfix=1
 if not defined notwinact (

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

 if not defined apps (

-%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"

+%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"

diff --git a/MAS/Separate-Files-Version/Change_Office_Edition.cmd b/MAS/Separate-Files-Version/Change_Office_Edition.cmd
index 7cd7548..a068afa 100644
--- a/MAS/Separate-Files-Version/Change_Office_Edition.cmd
+++ b/MAS/Separate-Files-Version/Change_Office_Edition.cmd
@@ -1408,6 +1408,7 @@ exit /b
 

 :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

diff --git a/MAS/Separate-Files-Version/Change_Windows_Edition.cmd b/MAS/Separate-Files-Version/Change_Windows_Edition.cmd
index ad5083a..5c34093 100644
--- a/MAS/Separate-Files-Version/Change_Windows_Edition.cmd
+++ b/MAS/Separate-Files-Version/Change_Windows_Edition.cmd
@@ -910,6 +910,7 @@ exit /b
 

 :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