Avoid a potential crash in wmic.exe check

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

@@ -290,7 +290,7 @@ set -=
 set old=
 
 for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck.mass%-%grave.dev') do (
-if not [%%#]==[] (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
+if not "%%#"=="" (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
 )
 
 if defined old (
@@ -395,7 +395,7 @@ call :dk_showosinfo
 
 set _int=
 for %%a in (l.root-servers.net resolver1.opendns.com download.windowsupdate.com google.com) do if not defined _int (
-for /f "delims=[] tokens=2" %%# in ('ping -n 1 %%a') do (if not [%%#]==[] set _int=1)
+for /f "delims=[] tokens=2" %%# in ('ping -n 1 %%a') do (if not "%%#"=="" set _int=1)
 )
 
 if not defined _int (
@@ -992,7 +992,7 @@ function ReinstallLicenses() {
 
 set _wmic=0
 for %%# in (wmic.exe) do @if not "%%~$PATH:#"=="" (
-wmic path Win32_ComputerSystem get CreationClassName /value %nul2% | find /i "computersystem" %nul1% && set _wmic=1
+cmd /c "wmic path Win32_ComputerSystem get CreationClassName /value" %nul2% | find /i "computersystem" %nul1% && set _wmic=1
 )
 exit /b
 

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

@@ -293,7 +293,7 @@ set -=
 set old=
 
 for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck.mass%-%grave.dev') do (
-if not [%%#]==[] (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
+if not "%%#"=="" (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
 )
 
 if defined old (
@@ -1090,7 +1090,7 @@ function ReinstallLicenses() {
 
 set _wmic=0
 for %%# in (wmic.exe) do @if not "%%~$PATH:#"=="" (
-wmic path Win32_ComputerSystem get CreationClassName /value %nul2% | find /i "computersystem" %nul1% && set _wmic=1
+cmd /c "wmic path Win32_ComputerSystem get CreationClassName /value" %nul2% | find /i "computersystem" %nul1% && set _wmic=1
 )
 exit /b
 
@@ -1190,7 +1190,7 @@ for %%# in (pkeyhelper.dll) do @if "%%~$PATH:#"=="" exit /b
 for %%# in (Volume:GVLK) do (
 call :k_pkey %osSKU% '%%#'
 if defined pkey call :k_pkeychannel !pkey!
-if /i [!pkeychannel!]==[%%#] (
+if /i "!pkeychannel!"=="%%#" (
 set key=!pkey!
 exit /b
 )

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

@@ -283,7 +283,7 @@ set -=
 set old=
 
 for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck.mass%-%grave.dev') do (
-if not [%%#]==[] (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
+if not "%%#"=="" (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
 )
 
 if defined old (
@@ -520,11 +520,11 @@ echo "!_oIds!" | find /i " %%a " %nul1% || (set "_oIds= !_oIds! %%a ")
 set "_oLPath=%_oRoot%\Licenses"
 set "_oIntegrator=%_oRoot%\integration\integrator.exe"
 
-if [%_oArch%]==[x64] (set "_hookPath=%_oRoot%\vfs\System"    & set "_hook=sppc64.dll")
+if "%_oArch%"=="x64" (set "_hookPath=%_oRoot%\vfs\System"    & set "_hook=sppc64.dll")
-if [%_oArch%]==[x86] (set "_hookPath=%_oRoot%\vfs\SystemX86" & set "_hook=sppc32.dll")
+if "%_oArch%"=="x86" (set "_hookPath=%_oRoot%\vfs\SystemX86" & set "_hook=sppc32.dll")
-if not [%osarch%]==[x86] (
+if not "%osarch%"=="x86" (
-if [%_oArch%]==[x64] set "_sppcPath=%SystemRoot%\System32\sppc.dll"
+if "%_oArch%"=="x64" set "_sppcPath=%SystemRoot%\System32\sppc.dll"
-if [%_oArch%]==[x86] set "_sppcPath=%SystemRoot%\SysWOW64\sppc.dll"
+if "%_oArch%"=="x86" set "_sppcPath=%SystemRoot%\SysWOW64\sppc.dll"
 ) else (
 set "_sppcPath=%SystemRoot%\System32\sppc.dll"
 )
@@ -570,11 +570,11 @@ set _o16c2rIds=%_oIds%
 set "_oLPath=%_oRoot%\Licenses16"
 set "_oIntegrator=%_oRoot%\integration\integrator.exe"
 
-if [%_oArch%]==[x64] (set "_hookPath=%_oRoot%\vfs\System"    & set "_hook=sppc64.dll")
+if "%_oArch%"=="x64" (set "_hookPath=%_oRoot%\vfs\System"    & set "_hook=sppc64.dll")
-if [%_oArch%]==[x86] (set "_hookPath=%_oRoot%\vfs\SystemX86" & set "_hook=sppc32.dll")
+if "%_oArch%"=="x86" (set "_hookPath=%_oRoot%\vfs\SystemX86" & set "_hook=sppc32.dll")
-if not [%osarch%]==[x86] (
+if not "%osarch%"=="x86" (
-if [%_oArch%]==[x64] set "_sppcPath=%SystemRoot%\System32\sppc.dll"
+if "%_oArch%"=="x64" set "_sppcPath=%SystemRoot%\System32\sppc.dll"
-if [%_oArch%]==[x86] set "_sppcPath=%SystemRoot%\SysWOW64\sppc.dll"
+if "%_oArch%"=="x86" set "_sppcPath=%SystemRoot%\SysWOW64\sppc.dll"
 ) else (
 set "_sppcPath=%SystemRoot%\System32\sppc.dll"
 )
@@ -613,7 +613,7 @@ call :dk_color %Gray% "Checking Old Office With Sub License    [Found. Update Of
 set "kmskey=HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\0ff1ce15-a989-479d-af46-f275c6370663"
 echo "%_oIds%" | find /i "Volume" %nul1% && (
 if %winbuild% GEQ 9200 (
-if not [%osarch%]==[x86] (
+if not "%osarch%"=="x86" (
 reg delete "%kmskey%" /f /reg:32 %nul%
 reg add "%kmskey%" /f /v KeyManagementServiceName /t REG_SZ /d "10.0.0.10" /reg:32 %nul%
 )
@@ -976,7 +976,7 @@ set _prod=%%#!_preview!
 
 call :ohookdata getinfo !_prod!
 
-if not [!key!]==[] (
+if not "!key!"=="" (
 echo "!allapps!" | find /i "!_actid!" %nul1% || call :oh_installlic
 call :dk_inskey "[!key!] [!_prod!] [!_lic!]"
 ) else (
@@ -1017,14 +1017,14 @@ for /f "skip=2 tokens=2*" %%a in ('"reg query %2\Common\ProductVersion /v LastPr
 if "%_oRoot:~-1%"=="\" set "_oRoot=%_oRoot:~0,-1%"
 
 echo "%2" | find /i "Wow6432Node" %nul1% && set _oArch=x86
-if not [%osarch%]==[x86] if not defined _oArch set _oArch=x64
+if not "%osarch%"=="x86" if not defined _oArch set _oArch=x64
-if [%osarch%]==[x86] set _oArch=x86
+if "%osarch%"=="x86" set _oArch=x86
 
-if [%_oArch%]==[x64] (set "_hookPath=%_oRoot%" & set "_hook=sppc64.dll")
+if "%_oArch%"=="x64" (set "_hookPath=%_oRoot%" & set "_hook=sppc64.dll")
-if [%_oArch%]==[x86] (set "_hookPath=%_oRoot%" & set "_hook=sppc32.dll")
+if "%_oArch%"=="x86" (set "_hookPath=%_oRoot%" & set "_hook=sppc32.dll")
-if not [%osarch%]==[x86] (
+if not "%osarch%"=="x86" (
-if [%_oArch%]==[x64] set "_sppcPath=%SystemRoot%\System32\sppc.dll"
+if "%_oArch%"=="x64" set "_sppcPath=%SystemRoot%\System32\sppc.dll"
-if [%_oArch%]==[x86] set "_sppcPath=%SystemRoot%\SysWOW64\sppc.dll"
+if "%_oArch%"=="x86" set "_sppcPath=%SystemRoot%\SysWOW64\sppc.dll"
 ) else (
 set "_sppcPath=%SystemRoot%\System32\sppc.dll"
 )
@@ -1458,7 +1458,7 @@ function ReinstallLicenses() {
 
 set _wmic=0
 for %%# in (wmic.exe) do @if not "%%~$PATH:#"=="" (
-wmic path Win32_ComputerSystem get CreationClassName /value %nul2% | find /i "computersystem" %nul1% && set _wmic=1
+cmd /c "wmic path Win32_ComputerSystem get CreationClassName /value" %nul2% | find /i "computersystem" %nul1% && set _wmic=1
 )
 exit /b
 

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

@@ -312,7 +312,7 @@ set -=
 set old=
 
 for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck.mass%-%grave.dev') do (
-if not [%%#]==[] (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
+if not "%%#"=="" (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
 )
 
 if defined old (
@@ -452,7 +452,7 @@ call :dk_showosinfo
 
 set _int=
 for %%a in (l.root-servers.net resolver1.opendns.com download.windowsupdate.com google.com) do if not defined _int (
-for /f "delims=[] tokens=2" %%# in ('ping -n 1 %%a') do (if not [%%#]==[] set _int=1)
+for /f "delims=[] tokens=2" %%# in ('ping -n 1 %%a') do (if not "%%#"=="" set _int=1)
 )
 
 if not defined _int (
@@ -1079,7 +1079,7 @@ set _prod=!_altoffid!
 call :ks_osppready
 )
 
-if not [!key!]==[] (
+if not "!key!"=="" (
 echo "!allapps!" | find /i "!_actid!" %nul1% || call :oh_installlic
 call :dk_inskey "[!key!] [!_prod!]"
 ) else (
@@ -1119,8 +1119,8 @@ for /f "skip=2 tokens=2*" %%a in ('"reg query %2\Common\ProductVersion /v LastPr
 if "%_oRoot:~-1%"=="\" set "_oRoot=%_oRoot:~0,-1%"
 
 echo "%2" | find /i "Wow6432Node" %nul1% && set _oArch=x86
-if not [%osarch%]==[x86] if not defined _oArch set _oArch=x64
+if not "%osarch%"=="x86" if not defined _oArch set _oArch=x64
-if [%osarch%]==[x86] set _oArch=x86
+if "%osarch%"=="x86" set _oArch=x86
 
 set "_common=%CommonProgramFiles%"
 if defined PROCESSOR_ARCHITEW6432 set "_common=%CommonProgramW6432%"
@@ -1540,7 +1540,7 @@ set t_name=Run Once Task
 
 set _wmic=0
 for %%# in (wmic.exe) do @if not "%%~$PATH:#"=="" (
-wmic path Win32_ComputerSystem get CreationClassName /value 2>nul | find /i "computersystem" 1>nul && set _wmic=1
+cmd /c "wmic path Win32_ComputerSystem get CreationClassName /value" 2>nul | find /i "computersystem" 1>nul && set _wmic=1
 )
 
 setlocal EnableDelayedExpansion
@@ -1565,12 +1565,12 @@ call :_tasksetserv
 
 for %%a in (%srvlist%) do (
 for /f "delims=[] tokens=2" %%# in ('ping -n 1 %%a') do (
-if not [%%#]==[] goto _taskIntConnected
+if not "%%#"=="" goto _taskIntConnected
 )
 )
 
 nslookup dns.msftncsi.com 2>nul | find "131.107.255.255" 1>nul
-if [%errorlevel%]==[0] goto _taskIntConnected
+if "%errorlevel%"=="0" goto _taskIntConnected
 
 if %loop%==%max_loop% (
 set _tserror=1
@@ -1681,14 +1681,14 @@ set /a act_attempt=0
 
 if %act_attempt% GTR 4 exit /b
 
-if not [%act_ok%]==[1] (
+if not "%act_ok%"=="1" (
 if not defined _server call :_taskgetserv
 call :_taskregserv
 )
 
 if not !server_num! GTR %max_servers% (
 
-if [%1]==[act_win] if %_kms38% EQU 1 (
+if "%1"=="act_win" if %_kms38% EQU 1 (
 set act_ok=1
 exit /b
 )
@@ -1702,7 +1702,7 @@ if !errorcode! EQU 0 (
 set act_ok=1
 exit /b
 )
-if [%1]==[act_win] if !errorcode! EQU -1073418187 if %winbuild% LSS 9200 (
+if "%1"=="act_win" if !errorcode! EQU -1073418187 if %winbuild% LSS 9200 (
 set act_ok=1
 exit /b
 )
@@ -1717,9 +1717,9 @@ exit /b
 
 :_actinfo
 
-if [%1]==[act_win] if not defined t_name (set prodname=%winos%)
+if "%1"=="act_win" if not defined t_name (set prodname=%winos%)
 
-if [%1]==[act_win] if %_kms38% EQU 1 (
+if "%1"=="act_win" if %_kms38% EQU 1 (
 if defined t_name (
 echo %prodname% is already activated with KMS38.
 ) else (
@@ -1739,7 +1739,7 @@ set _tserror=1
 exit /b
 )
 
-if %errorcode% EQU -1073418187 if [%1]==[act_win] if %winbuild% LSS 9200 (
+if %errorcode% EQU -1073418187 if "%1"=="act_win" if %winbuild% LSS 9200 (
 if defined t_name (
 echo %prodname% cannot be KMS-activated on this computer due to unqualified OEM BIOS [0xC004F035].
 ) else (
@@ -1784,9 +1784,9 @@ exit /b
 )
 
 set _actpass=1
-if %gpr% EQU 43200  if [%1]==[act_win] if %winbuild% GEQ 9200 set _actpass=0
+if %gpr% EQU 43200  if "%1"=="act_win" if %winbuild% GEQ 9200 set _actpass=0
 if %gpr% EQU 64800  set _actpass=0
-if %gpr% GTR 259200 if [%1]==[act_win] call :_taskchkEnterpriseG _actpass
+if %gpr% GTR 259200 if "%1"=="act_win" call :_taskchkEnterpriseG _actpass
 if %gpr% EQU 259200 set _actpass=0
 
 if %errorcode% EQU 0 if %_actpass% EQU 0 (
@@ -1990,8 +1990,8 @@ set !server%rand%!=1
 
 set /a server_num+=1
 (for /f "delims=[] tokens=2" %%a in ('ping -4 -n 1 %KMS_IP% 2^>nul') do set "KMS_IP=%%a"
-if [%KMS_IP%]==[!KMS_IP!] for /f "delims=[] tokens=2" %%# in ('pathping -4 -h 1 -n -p 1 -q 1 -w 1 %KMS_IP% 2^>nul') do set "KMS_IP=%%#"
+if "%KMS_IP%"=="!KMS_IP!" for /f "delims=[] tokens=2" %%# in ('pathping -4 -h 1 -n -p 1 -q 1 -w 1 %KMS_IP% 2^>nul') do set "KMS_IP=%%#"
-if not [%KMS_IP%]==[!KMS_IP!] exit /b
+if not "%KMS_IP%"=="!KMS_IP!" exit /b
 goto :_taskgetserv
 )
 ::Ver:2.7
@@ -2446,7 +2446,7 @@ function ReinstallLicenses() {
 
 set _wmic=0
 for %%# in (wmic.exe) do @if not "%%~$PATH:#"=="" (
-wmic path Win32_ComputerSystem get CreationClassName /value %nul2% | find /i "computersystem" %nul1% && set _wmic=1
+cmd /c "wmic path Win32_ComputerSystem get CreationClassName /value" %nul2% | find /i "computersystem" %nul1% && set _wmic=1
 )
 exit /b
 
@@ -2546,7 +2546,7 @@ for %%# in (pkeyhelper.dll) do @if "%%~$PATH:#"=="" exit /b
 for %%# in (Volume:GVLK) do (
 call :k_pkey %osSKU% '%%#'
 if defined pkey call :k_pkeychannel !pkey!
-if /i [!pkeychannel!]==[%%#] (
+if /i "!pkeychannel!"=="%%#" (
 set key=!pkey!
 exit /b
 )

MAS/Separate-Files-Version/Change_Edition.cmd

@@ -248,7 +248,7 @@ set -=
 set old=
 
 for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck.mass%-%grave.dev') do (
-if not [%%#]==[] (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
+if not "%%#"=="" (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
 )
 
 if defined old (
@@ -850,7 +850,7 @@ exit /b
 
 set _wmic=0
 for %%# in (wmic.exe) do @if not "%%~$PATH:#"=="" (
-wmic path Win32_ComputerSystem get CreationClassName /value %nul2% | find /i "computersystem" %nul1% && set _wmic=1
+cmd /c "wmic path Win32_ComputerSystem get CreationClassName /value" %nul2% | find /i "computersystem" %nul1% && set _wmic=1
 )
 exit /b
 
@@ -935,7 +935,7 @@ for %%# in (pkeyhelper.dll) do @if "%%~$PATH:#"=="" exit /b
 for %%# in (%keyflow%) do (
 call :k_pkey %targetSKU% '%%#'
 if defined pkey call :k_pkeychannel !pkey!
-if /i [!pkeychannel!]==[%%#] (
+if /i "!pkeychannel!"=="%%#" (
 set key=!pkey!
 exit /b
 )

MAS/Separate-Files-Version/Extract_OEM_Folder.cmd

@@ -242,7 +242,7 @@ set -=
 set old=
 
 for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck.mass%-%grave.dev') do (
-if not [%%#]==[] (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
+if not "%%#"=="" (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
 )
 
 if defined old (

MAS/Separate-Files-Version/Troubleshoot.cmd

@@ -243,7 +243,7 @@ set -=
 set old=
 
 for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck.mass%-%grave.dev') do (
-if not [%%#]==[] (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
+if not "%%#"=="" (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
 )
 
 if defined old (
@@ -340,7 +340,7 @@ goto :at_back
 
 set _int=
 for %%a in (l.root-servers.net resolver1.opendns.com download.windowsupdate.com google.com) do if not defined _int (
-for /f "delims=[] tokens=2" %%# in ('ping -n 1 %%a') do (if not [%%#]==[] set _int=1)
+for /f "delims=[] tokens=2" %%# in ('ping -n 1 %%a') do (if not "%%#"=="" set _int=1)
 )
 
 echo: