Update WPA keys check code

6 files changed, 18 insertions, 18 deletions

diff --git a/MAS/All-In-One-Version-KL/MAS_AIO.cmd b/MAS/All-In-One-Version-KL/MAS_AIO.cmd
index f8cda8c..bdcee26 100644
--- a/MAS/All-In-One-Version-KL/MAS_AIO.cmd
+++ b/MAS/All-In-One-Version-KL/MAS_AIO.cmd
@@ -1879,7 +1879,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++

     }

 }

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

         }

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

diff --git a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
index 2730ec6..6a379f7 100644
--- a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
@@ -1594,7 +1594,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++

     }

 }

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

         }

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

diff --git a/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd b/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
index 19586c1..ff6e59d 100644
--- a/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
@@ -1743,7 +1743,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++

     }

 }

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

         }

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

diff --git a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
index 53860bd..ce9ad93 100644
--- a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
+++ b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
@@ -2013,7 +2013,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++

     }

 }

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

         }

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

diff --git a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
index 2a15a50..f1576e0 100644
--- a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
@@ -3167,7 +3167,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++

     }

 }

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

         }

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

diff --git a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
index 3067851..1cf85e9 100644
--- a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
@@ -2722,7 +2722,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++

     }

 }

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

         }

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