From 979dfb750bb5589bb7a257f082969ca59a7fad19 Mon Sep 17 00:00:00 2001 From: WindowsAddict Date: Tue, 11 Nov 2025 14:46:32 +0530 Subject: [PATCH 1/2] Update as per abbodi1406's CAS No KMS Client info when ADBA is shown --- MAS/All-In-One-Version-KL/MAS_AIO.cmd | 21 +++++++++++-------- .../Check_Activation_Status.cmd | 21 +++++++++++-------- 2 files changed, 24 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 e733ad1..e061840 100644 --- a/MAS/All-In-One-Version-KL/MAS_AIO.cmd +++ b/MAS/All-In-One-Version-KL/MAS_AIO.cmd @@ -14965,6 +14965,7 @@ function DetectSubscription { function DetectAdbaClient { $propADBA | foreach { set $_ (SlGetInfoSku $licID $_) } + DetectActType CONOUT "`nAD Activation client information:" CONOUT " Object Name: $ADActivationObjectName" CONOUT " Domain Name: $ADActivationObjectDN" @@ -15055,17 +15056,18 @@ function DetectKmsHost if ($null -NE $KeyManagementServiceNotificationRequests) {CONOUT " Notification: $KeyManagementServiceNotificationRequests"} } +function DetectActType +{ + $VLType = strGetRegistry ($SPKeyPath + '\' + $strApp + '\' + $licID) "VLActivationType" + if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath + '\' + $strApp) "VLActivationType"} + if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath) "VLActivationType"} + if ($null -EQ $VLType -Or $VLType -GT 3) {$VLType = 0} + if ($null -NE $VLType) {CONOUT "Configured Activation Type: $($VLActTypes[$VLType])"} +} + function DetectKmsClient { - if ($win8) - { - $VLType = strGetRegistry ($SPKeyPath + '\' + $strApp + '\' + $licID) "VLActivationType" - if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath + '\' + $strApp) "VLActivationType"} - if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath) "VLActivationType"} - if ($null -EQ $VLType -Or $VLType -GT 3) {$VLType = 0} - } - if ($null -NE $VLType) {CONOUT "Configured Activation Type: $($VLActTypes[$VLType])"} - + if ($win8) {DetectActType} CONOUT "`r" if ($LicenseStatus -NE 1) { CONOUT "Please activate the product in order to update KMS client information values." @@ -15313,6 +15315,7 @@ function GetResult($strSLP, $strApp, $entry) if ($win8 -And $VLActivationType -EQ 1) { DetectAdbaClient + $cKmsClient = $null } if ($winID -And $null -NE $cAvmClient) { diff --git a/MAS/Separate-Files-Version/Check_Activation_Status.cmd b/MAS/Separate-Files-Version/Check_Activation_Status.cmd index 83f64cc..a7959ef 100644 --- a/MAS/Separate-Files-Version/Check_Activation_Status.cmd +++ b/MAS/Separate-Files-Version/Check_Activation_Status.cmd @@ -518,6 +518,7 @@ function DetectSubscription { function DetectAdbaClient { $propADBA | foreach { set $_ (SlGetInfoSku $licID $_) } + DetectActType CONOUT "`nAD Activation client information:" CONOUT " Object Name: $ADActivationObjectName" CONOUT " Domain Name: $ADActivationObjectDN" @@ -608,17 +609,18 @@ function DetectKmsHost if ($null -NE $KeyManagementServiceNotificationRequests) {CONOUT " Notification: $KeyManagementServiceNotificationRequests"} } +function DetectActType +{ + $VLType = strGetRegistry ($SPKeyPath + '\' + $strApp + '\' + $licID) "VLActivationType" + if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath + '\' + $strApp) "VLActivationType"} + if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath) "VLActivationType"} + if ($null -EQ $VLType -Or $VLType -GT 3) {$VLType = 0} + if ($null -NE $VLType) {CONOUT "Configured Activation Type: $($VLActTypes[$VLType])"} +} + function DetectKmsClient { - if ($win8) - { - $VLType = strGetRegistry ($SPKeyPath + '\' + $strApp + '\' + $licID) "VLActivationType" - if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath + '\' + $strApp) "VLActivationType"} - if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath) "VLActivationType"} - if ($null -EQ $VLType -Or $VLType -GT 3) {$VLType = 0} - } - if ($null -NE $VLType) {CONOUT "Configured Activation Type: $($VLActTypes[$VLType])"} - + if ($win8) {DetectActType} CONOUT "`r" if ($LicenseStatus -NE 1) { CONOUT "Please activate the product in order to update KMS client information values." @@ -866,6 +868,7 @@ function GetResult($strSLP, $strApp, $entry) if ($win8 -And $VLActivationType -EQ 1) { DetectAdbaClient + $cKmsClient = $null } if ($winID -And $null -NE $cAvmClient) { From f4e08dac3de82f797e7b9ff6d70174b54a758aee Mon Sep 17 00:00:00 2001 From: WindowsAddict Date: Tue, 11 Nov 2025 15:27:47 +0530 Subject: [PATCH 2/2] Update WLMS service check --- MAS/All-In-One-Version-KL/MAS_AIO.cmd | 4 +++- MAS/Separate-Files-Version/Activators/HWID_Activation.cmd | 4 +++- .../Activators/Ohook_Activation_AIO.cmd | 4 +++- .../Activators/Online_KMS_Activation.cmd | 4 +++- MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/MAS/All-In-One-Version-KL/MAS_AIO.cmd b/MAS/All-In-One-Version-KL/MAS_AIO.cmd index e061840..3c95faf 100644 --- a/MAS/All-In-One-Version-KL/MAS_AIO.cmd +++ b/MAS/All-In-One-Version-KL/MAS_AIO.cmd @@ -2127,7 +2127,9 @@ call :dk_color %Gray% "Checking SLC/WMI SKU [Difference Found :: This "WLMS" service was included in previous Eval editions (which were activable) to automatically shut down the system every hour after the evaluation period expired and prevent SPPSVC from stopping. -if exist "%SysPath%\wlms\wlms.exe" ( +sc query wlms %nul% + +if %errorlevel% NEQ 1060 ( echo Checking Eval WLMS Service [Found] ) diff --git a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd index 3326546..cbb92c0 100644 --- a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd +++ b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd @@ -1820,7 +1820,9 @@ call :dk_color %Gray% "Checking SLC/WMI SKU [Difference Found :: This "WLMS" service was included in previous Eval editions (which were activable) to automatically shut down the system every hour after the evaluation period expired and prevent SPPSVC from stopping. -if exist "%SysPath%\wlms\wlms.exe" ( +sc query wlms %nul% + +if %errorlevel% NEQ 1060 ( echo Checking Eval WLMS Service [Found] ) diff --git a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd index ae3ae34..f5c3952 100644 --- a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd +++ b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd @@ -2506,7 +2506,9 @@ call :dk_color %Gray% "Checking SLC/WMI SKU [Difference Found :: This "WLMS" service was included in previous Eval editions (which were activable) to automatically shut down the system every hour after the evaluation period expired and prevent SPPSVC from stopping. -if exist "%SysPath%\wlms\wlms.exe" ( +sc query wlms %nul% + +if %errorlevel% NEQ 1060 ( echo Checking Eval WLMS Service [Found] ) diff --git a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd index ba039cb..9242be8 100644 --- a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd +++ b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd @@ -3569,7 +3569,9 @@ call :dk_color %Gray% "Checking SLC/WMI SKU [Difference Found :: This "WLMS" service was included in previous Eval editions (which were activable) to automatically shut down the system every hour after the evaluation period expired and prevent SPPSVC from stopping. -if exist "%SysPath%\wlms\wlms.exe" ( +sc query wlms %nul% + +if %errorlevel% NEQ 1060 ( echo Checking Eval WLMS Service [Found] ) diff --git a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd index fc5f28d..cb10b11 100644 --- a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd +++ b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd @@ -3579,7 +3579,9 @@ call :dk_color %Gray% "Checking SLC/WMI SKU [Difference Found :: This "WLMS" service was included in previous Eval editions (which were activable) to automatically shut down the system every hour after the evaluation period expired and prevent SPPSVC from stopping. -if exist "%SysPath%\wlms\wlms.exe" ( +sc query wlms %nul% + +if %errorlevel% NEQ 1060 ( echo Checking Eval WLMS Service [Found] )