[PATCH] WBEMProxy: Implemented Complete SoftwareLicensingProduct row and data

Ben Shefte shefben at gmail.com
Tue Jan 25 08:18:47 CST 2022


Signed-off-by: Ben Shefte<shefben at gmail.com>
---
 dlls/wbemprox/builtin.c | 98 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 92 insertions(+), 6 deletions(-)

diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c
index 5a09d64b8fb..4122afee59d 100644
--- a/dlls/wbemprox/builtin.c
+++ b/dlls/wbemprox/builtin.c
@@ -388,9 +388,51 @@ static const struct column col_sid[] =
     { L"SidLength",            CIM_UINT32 },
 };
 static const struct column col_softwarelicensingproduct[] =
-{
-    { L"LicenseIsAddon", CIM_BOOLEAN },
-    { L"LicenseStatus",  CIM_UINT32 },
+ {
+    { L"ID", CIM_STRING | COL_FLAG_KEY },
+    { L"Name", CIM_STRING },
+    { L"Description", CIM_STRING },
+    { L"ApplicationID", CIM_STRING },
+    { L"ProcessorURL", CIM_STRING },
+    { L"MachineURL", CIM_STRING },
+    { L"ProductKeyURL", CIM_STRING },
+    { L"UseLicenseURL", CIM_STRING },
+    { L"LicenseStatus", CIM_UINT32 },
+    { L"LicenseStatusReason", CIM_UINT32 },
+    { L"GracePeriodRemaining", CIM_UINT32 },
+    { L"EvaluationEndDate", CIM_DATETIME },
+    { L"OfflineInstallationId", CIM_STRING },
+    { L"PartialProductKey", CIM_STRING },
+    { L"ProductKeyID", CIM_STRING },
+    { L"LicenseFamily", CIM_STRING },
+    { L"LicenseDependsOn", CIM_STRING },
+    { L"LicenseIsAddon", CIM_BOOLEAN},
+    { L"VLActivationInterval", CIM_UINT32 },
+    { L"VLRenewalInterval", CIM_UINT32 },
+    { L"KeyManagementServiceProductKeyID", CIM_STRING },
+    { L"KeyManagementServiceMachine", CIM_STRING },
+    { L"KeyManagementServicePort", CIM_UINT32 },
+    { L"DiscoveredKeyManagementServiceMachineName", CIM_STRING },
+    { L"DiscoveredKeyManagementServiceMachinePort", CIM_UINT32 },
+    { L"IsKeyManagementServiceMachine", CIM_UINT32 },
+    { L"KeyManagementServiceCurrentCount", CIM_UINT32 },
+    { L"RequiredClientCount", CIM_UINT32 },
+    { L"KeyManagementServiceUnlicensedRequests", CIM_UINT32 },
+    { L"KeyManagementServiceLicensedRequests", CIM_UINT32 },
+    { L"KeyManagementServiceOOBGraceRequests", CIM_UINT32 },
+    { L"KeyManagementServiceOOTGraceRequests", CIM_UINT32 },
+    { L"KeyManagementServiceNonGenuineGraceRequests", CIM_UINT32 },
+    { L"KeyManagementServiceTotalRequests", CIM_UINT32 },
+    { L"KeyManagementServiceFailedRequests", CIM_UINT32 },
+    { L"KeyManagementServiceNotificationRequests", CIM_UINT32 },
+    { L"GenuineStatus", CIM_UINT32 },
+    { L"ExtendedGrace", CIM_UINT32 },
+    { L"TokenActivationILID", CIM_STRING },
+    { L"TokenActivationILVID", CIM_UINT32 },
+    { L"TokenActivationGrantNumber", CIM_UINT32 },
+    { L"TokenActivationCertificateThumbprint", CIM_STRING },
+    { L"TokenActivationAdditionalInfo", CIM_STRING },
+    { L"TrustedTime", CIM_DATETIME },
 };
 static const struct column col_sounddevice[] =
 {
@@ -816,8 +858,50 @@ struct record_sid
 };
 struct record_softwarelicensingproduct
 {
-    int    license_is_addon;
-    UINT32 license_status;
+    const WCHAR *id;
+    const WCHAR *name;
+    const WCHAR *description;
+    const WCHAR *appid;
+    const WCHAR *processorurl;
+    const WCHAR *machineurl;
+    const WCHAR *productkeyurl;
+    const WCHAR *useLicenseurl;
+    UINT32       licensestatus;
+    UINT32       licensestatusreason;
+    UINT32       graceperiodremaining;
+    const WCHAR *evaluationenddate;
+    const WCHAR *offlineinstallationid;
+    const WCHAR *partialproductkey;
+    const WCHAR *productkeyid;
+    const WCHAR *licensefamily;
+    const WCHAR *licensedependson;
+    BOOLEAN      licenseisaddon;
+    UINT32       vlactivationinterval;
+    UINT32       vlrenewalinterval;
+    const WCHAR *keymanagementserviceproductkeyid;
+    const WCHAR *keymanagementservicemachine;
+    UINT32       keymanagementserviceport;
+    const WCHAR  *discoveredkeymanagementservicemachinename;
+    UINT32       discoveredkeymanagementservicemachineport;
+    UINT32       isKeymanagementservicemachine;
+    UINT32       keymanagementservicecurrentcount;
+    UINT32       requiredclientcount;
+    UINT32       keymanagementserviceunlicensedrequests;
+    UINT32       keymanagementservicelicensedrequests;
+    UINT32       keymanagementserviceoobgracerequests;
+    UINT32       keymanagementserviceootgracerequests;
+    UINT32       keymanagementservicenongenuinegracerequests;
+    UINT32       keymanagementservicetotalrequests;
+    UINT32       keymanagementservicefailedrequests;
+    UINT32       keymanagementservicenotificationrequests;
+    UINT32       genuinestatus;
+    UINT32       extendedgrace;
+    const WCHAR *tokenactivationilid;
+    UINT32       tokenactivationilvid;
+    UINT32       tokenactivationgrantnumber;
+    const WCHAR *tokenactivationcertificatethumbprint;
+    const WCHAR *tokenactivationadditionalinfo;
+    const WCHAR *trustedtime;
 };
 struct record_sounddevice
 {
@@ -990,7 +1074,9 @@ static const struct record_quickfixengineering data_quickfixengineering[] =
 
 static const struct record_softwarelicensingproduct data_softwarelicensingproduct[] =
 {
-    { 0, 1 },
+    { L"0", L"Nonexistent", L"first entry into table", L"0", L"localhost", L"localhost", L"localhost", 
+    L"localhost", 1, 1, 0, L"1-1-1991", L"0", L"inval", L"0", L"0", NULL, FALSE, 0, 0, L"0", L"localhost",
+    80, L"localhost", 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, L"noid", 0, 0, L"none", L"none", L"1-1-1991"},
 };
 
 static const struct record_stdregprov data_stdregprov[] =
-- 
2.27.0




More information about the wine-devel mailing list