Fix WMI check regarding SPP

6 files changed, 42 insertions, 36 deletions

diff --git a/MAS/All-In-One-Version-KL/MAS_AIO.cmd b/MAS/All-In-One-Version-KL/MAS_AIO.cmd
index 8fe2fe2..c648563 100644
--- a/MAS/All-In-One-Version-KL/MAS_AIO.cmd
+++ b/MAS/All-In-One-Version-KL/MAS_AIO.cmd
@@ -1790,6 +1790,13 @@ if %_wmic% EQU 1 wmic path Win32_ComputerSystem get CreationClassName /value %nu
 if %_wmic% EQU 0 %psc% "Get-WmiObject -Class Win32_ComputerSystem | Select-Object -Property CreationClassName" %nul2% | find /i "computersystem" %nul1%

 

 if %errorlevel% NEQ 0 set wmifailed=1

+

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

+

 echo "%error_code%" | findstr /i "0x800410 0x800440 0x80131501" %nul1% && set wmifailed=1& ::  https://learn.microsoft.com/en-us/windows/win32/wmisdk/wmi-error-constants

 

 if defined wmifailed (

@@ -1983,12 +1990,6 @@ set showfix=1
 

 ::  Check SoftwareLicensingService

 

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

-

 if %error_code% NEQ 0 (

 call :dk_color %Red% "Checking SoftwareLicensingService       [Not Working] [%error_code%]"

 if not defined showfix (

diff --git a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
index d6e5b4d..0bada26 100644
--- a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
@@ -1474,6 +1474,13 @@ if %_wmic% EQU 1 wmic path Win32_ComputerSystem get CreationClassName /value %nu
 if %_wmic% EQU 0 %psc% "Get-WmiObject -Class Win32_ComputerSystem | Select-Object -Property CreationClassName" %nul2% | find /i "computersystem" %nul1%

 

 if %errorlevel% NEQ 0 set wmifailed=1

+

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

+

 echo "%error_code%" | findstr /i "0x800410 0x800440 0x80131501" %nul1% && set wmifailed=1& ::  https://learn.microsoft.com/en-us/windows/win32/wmisdk/wmi-error-constants

 

 if defined wmifailed (

@@ -1667,12 +1674,6 @@ set showfix=1
 

 ::  Check SoftwareLicensingService

 

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

-

 if %error_code% NEQ 0 (

 call :dk_color %Red% "Checking SoftwareLicensingService       [Not Working] [%error_code%]"

 if not defined showfix (

diff --git a/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd b/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
index 8f6c718..7b0025e 100644
--- a/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
@@ -1556,6 +1556,13 @@ if %_wmic% EQU 1 wmic path Win32_ComputerSystem get CreationClassName /value %nu
 if %_wmic% EQU 0 %psc% "Get-WmiObject -Class Win32_ComputerSystem | Select-Object -Property CreationClassName" %nul2% | find /i "computersystem" %nul1%

 

 if %errorlevel% NEQ 0 set wmifailed=1

+

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

+

 echo "%error_code%" | findstr /i "0x800410 0x800440 0x80131501" %nul1% && set wmifailed=1& ::  https://learn.microsoft.com/en-us/windows/win32/wmisdk/wmi-error-constants

 

 if defined wmifailed (

@@ -1749,12 +1756,6 @@ set showfix=1
 

 ::  Check SoftwareLicensingService

 

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

-

 if %error_code% NEQ 0 (

 call :dk_color %Red% "Checking SoftwareLicensingService       [Not Working] [%error_code%]"

 if not defined showfix (

diff --git a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
index 8fd4a28..ae3ae34 100644
--- a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
+++ b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
@@ -2160,6 +2160,13 @@ if %_wmic% EQU 1 wmic path Win32_ComputerSystem get CreationClassName /value %nu
 if %_wmic% EQU 0 %psc% "Get-WmiObject -Class Win32_ComputerSystem | Select-Object -Property CreationClassName" %nul2% | find /i "computersystem" %nul1%

 

 if %errorlevel% NEQ 0 set wmifailed=1

+

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

+

 echo "%error_code%" | findstr /i "0x800410 0x800440 0x80131501" %nul1% && set wmifailed=1& ::  https://learn.microsoft.com/en-us/windows/win32/wmisdk/wmi-error-constants

 

 if defined wmifailed (

@@ -2353,12 +2360,6 @@ set showfix=1
 

 ::  Check SoftwareLicensingService

 

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

-

 if %error_code% NEQ 0 (

 call :dk_color %Red% "Checking SoftwareLicensingService       [Not Working] [%error_code%]"

 if not defined showfix (

diff --git a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
index a311a93..2be8ae5 100644
--- a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
@@ -3223,6 +3223,13 @@ if %_wmic% EQU 1 wmic path Win32_ComputerSystem get CreationClassName /value %nu
 if %_wmic% EQU 0 %psc% "Get-WmiObject -Class Win32_ComputerSystem | Select-Object -Property CreationClassName" %nul2% | find /i "computersystem" %nul1%

 

 if %errorlevel% NEQ 0 set wmifailed=1

+

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

+

 echo "%error_code%" | findstr /i "0x800410 0x800440 0x80131501" %nul1% && set wmifailed=1& ::  https://learn.microsoft.com/en-us/windows/win32/wmisdk/wmi-error-constants

 

 if defined wmifailed (

@@ -3416,12 +3423,6 @@ set showfix=1
 

 ::  Check SoftwareLicensingService

 

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

-

 if %error_code% NEQ 0 (

 call :dk_color %Red% "Checking SoftwareLicensingService       [Not Working] [%error_code%]"

 if not defined showfix (

diff --git a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
index 51431a0..a2e8111 100644
--- a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
@@ -3233,6 +3233,13 @@ if %_wmic% EQU 1 wmic path Win32_ComputerSystem get CreationClassName /value %nu
 if %_wmic% EQU 0 %psc% "Get-WmiObject -Class Win32_ComputerSystem | Select-Object -Property CreationClassName" %nul2% | find /i "computersystem" %nul1%

 

 if %errorlevel% NEQ 0 set wmifailed=1

+

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

+

 echo "%error_code%" | findstr /i "0x800410 0x800440 0x80131501" %nul1% && set wmifailed=1& ::  https://learn.microsoft.com/en-us/windows/win32/wmisdk/wmi-error-constants

 

 if defined wmifailed (

@@ -3426,12 +3433,6 @@ set showfix=1
 

 ::  Check SoftwareLicensingService

 

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

-

 if %error_code% NEQ 0 (

 call :dk_color %Red% "Checking SoftwareLicensingService       [Not Working] [%error_code%]"

 if not defined showfix (