| slpublic.h (6.3.9600.16384-Windows 8.1) | | slpublic.h (10.0.10586.0-Windows 10 1511 10586.494) |
| | |
| skipping to change at line 147 | | skipping to change at line 147 |
| #define SL_INFO_KEY_PARTIAL_PRODUCT_KEY L"PartialProductKey" | | #define SL_INFO_KEY_PARTIAL_PRODUCT_KEY L"PartialProductKey" |
| #define SL_INFO_KEY_PRODUCT_SKU_ID L"ProductSkuId" | | #define SL_INFO_KEY_PRODUCT_SKU_ID L"ProductSkuId" |
| #define SL_INFO_KEY_LICENSE_TYPE L"LicenseType" | | #define SL_INFO_KEY_LICENSE_TYPE L"LicenseType" |
| #define SL_INFO_KEY_VERSION L"Version" | | #define SL_INFO_KEY_VERSION L"Version" |
| #define SL_INFO_KEY_SYSTEM_STATE L"SystemState" | | #define SL_INFO_KEY_SYSTEM_STATE L"SystemState" |
| #define SL_INFO_KEY_ACTIVE_PLUGINS L"ActivePlugins" | | #define SL_INFO_KEY_ACTIVE_PLUGINS L"ActivePlugins" |
| #define SL_INFO_KEY_SECURE_STORE_ID L"SecureStoreId" | | #define SL_INFO_KEY_SECURE_STORE_ID L"SecureStoreId" |
| #define SL_INFO_KEY_BIOS_PKEY L"BiosProductKey" | | #define SL_INFO_KEY_BIOS_PKEY L"BiosProductKey" |
| #define SL_INFO_KEY_BIOS_SLIC_STATE L"BiosSlicState" | | #define SL_INFO_KEY_BIOS_SLIC_STATE L"BiosSlicState" |
| #define SL_INFO_KEY_BIOS_OA2_MINOR_VERSION L"BiosOA2MinorVersio
n" | | #define SL_INFO_KEY_BIOS_OA2_MINOR_VERSION L"BiosOA2MinorVersio
n" |
|
| | #define SL_INFO_KEY_BIOS_PKEY_DESCRIPTION L"BiosProductKeyDesc |
| | ription" |
| | #define SL_INFO_KEY_BIOS_PKEY_PKPN L"BiosProductKeyPkPn |
| | " |
| | |
| #define SL_INFO_KEY_SECURE_PROCESSOR_ACTIVATION_URL L"SPCURL" | | #define SL_INFO_KEY_SECURE_PROCESSOR_ACTIVATION_URL L"SPCURL" |
| #define SL_INFO_KEY_RIGHT_ACCOUNT_ACTIVATION_URL L"RACURL" | | #define SL_INFO_KEY_RIGHT_ACCOUNT_ACTIVATION_URL L"RACURL" |
| #define SL_INFO_KEY_PRODUCT_KEY_ACTIVATION_URL L"PKCURL" | | #define SL_INFO_KEY_PRODUCT_KEY_ACTIVATION_URL L"PKCURL" |
| #define SL_INFO_KEY_USE_LICENSE_ACTIVATION_URL L"EULURL" | | #define SL_INFO_KEY_USE_LICENSE_ACTIVATION_URL L"EULURL" |
| | |
| #define SL_INFO_KEY_IS_KMS L"IsKeyManagementSer
vice" | | #define SL_INFO_KEY_IS_KMS L"IsKeyManagementSer
vice" |
| #define SL_INFO_KEY_KMS_CURRENT_COUNT L"KeyManagementServi
ceCurrentCount" | | #define SL_INFO_KEY_KMS_CURRENT_COUNT L"KeyManagementServi
ceCurrentCount" |
| #define SL_INFO_KEY_KMS_REQUIRED_CLIENT_COUNT L"KeyManagementServi
ceRequiredClientCount" | | #define SL_INFO_KEY_KMS_REQUIRED_CLIENT_COUNT L"KeyManagementServi
ceRequiredClientCount" |
| #define SL_INFO_KEY_KMS_UNLICENSED_REQUESTS L"KeyManagementServi
ceUnlicensedRequests" | | #define SL_INFO_KEY_KMS_UNLICENSED_REQUESTS L"KeyManagementServi
ceUnlicensedRequests" |
| | |
| skipping to change at line 204 | | skipping to change at line 206 |
| // | | // |
| #define SPP_MIGRATION_GATHER_MIGRATABLE_APPS 0x00000001 | | #define SPP_MIGRATION_GATHER_MIGRATABLE_APPS 0x00000001 |
| #define SPP_MIGRATION_GATHER_ACTIVATED_WINDOWS_STATE 0x00000002 | | #define SPP_MIGRATION_GATHER_ACTIVATED_WINDOWS_STATE 0x00000002 |
| #define SPP_MIGRATION_GATHER_ALL 0xFFFFFFFF | | #define SPP_MIGRATION_GATHER_ALL 0xFFFFFFFF |
| | |
| typedef enum _SL_GENUINE_STATE | | typedef enum _SL_GENUINE_STATE |
| { | | { |
| SL_GEN_STATE_IS_GENUINE = 0, | | SL_GEN_STATE_IS_GENUINE = 0, |
| SL_GEN_STATE_INVALID_LICENSE, | | SL_GEN_STATE_INVALID_LICENSE, |
| SL_GEN_STATE_TAMPERED, | | SL_GEN_STATE_TAMPERED, |
|
| | SL_GEN_STATE_OFFLINE, |
| SL_GEN_STATE_LAST, | | SL_GEN_STATE_LAST, |
| } SL_GENUINE_STATE; | | } SL_GENUINE_STATE; |
| | |
| typedef struct _tagSL_NONGENUINE_UI_OPTIONS | | typedef struct _tagSL_NONGENUINE_UI_OPTIONS |
| { | | { |
| DWORD cbSize; | | DWORD cbSize; |
| CONST SLID* pComponentId; | | CONST SLID* pComponentId; |
| HRESULT hResultUI; | | HRESULT hResultUI; |
| | |
| } SL_NONGENUINE_UI_OPTIONS; | | } SL_NONGENUINE_UI_OPTIONS; |
| | |
| #define SL_PROP_BRT_DATA L"SL_BRT_DATA" | | #define SL_PROP_BRT_DATA L"SL_BRT_DATA" |
| #define SL_PROP_BRT_COMMIT L"SL_BRT_COMMIT" | | #define SL_PROP_BRT_COMMIT L"SL_BRT_COMMIT" |
| #define SL_PROP_GENUINE_RESULT L"SL_GENUINE_RESULT" | | #define SL_PROP_GENUINE_RESULT L"SL_GENUINE_RESULT" |
| #define SL_PROP_NONGENUINE_GRACE_FLAG L"SL_NONGENUINE_GRAC
E_FLAG" | | #define SL_PROP_NONGENUINE_GRACE_FLAG L"SL_NONGENUINE_GRAC
E_FLAG" |
| #define SL_PROP_GET_GENUINE_AUTHZ L"SL_GET_GENUINE_AUT
HZ" | | #define SL_PROP_GET_GENUINE_AUTHZ L"SL_GET_GENUINE_AUT
HZ" |
|
| | #define SL_PROP_GET_GENUINE_SERVER_AUTHZ L"SL_GET_GENUINE_SER
VER_AUTHZ" |
| #define SL_PROP_LAST_ACT_ATTEMPT_HRESULT L"SL_LAST_ACT_ATTEMP
T_HRESULT" | | #define SL_PROP_LAST_ACT_ATTEMPT_HRESULT L"SL_LAST_ACT_ATTEMP
T_HRESULT" |
| #define SL_PROP_LAST_ACT_ATTEMPT_TIME L"SL_LAST_ACT_ATTEMP
T_TIME" | | #define SL_PROP_LAST_ACT_ATTEMPT_TIME L"SL_LAST_ACT_ATTEMP
T_TIME" |
| #define SL_PROP_LAST_ACT_ATTEMPT_SERVER_FLAGS L"SL_LAST_ACT_ATTEMP
T_SERVER_FLAGS" | | #define SL_PROP_LAST_ACT_ATTEMPT_SERVER_FLAGS L"SL_LAST_ACT_ATTEMP
T_SERVER_FLAGS" |
| #define SL_PROP_ACTIVATION_VALIDATION_IN_PROGRESS L"SL_ACTIVATION_VALI
DATION_IN_PROGRESS" | | #define SL_PROP_ACTIVATION_VALIDATION_IN_PROGRESS L"SL_ACTIVATION_VALI
DATION_IN_PROGRESS" |
| | |
| #define SL_POLICY_EVALUATION_MODE_ENABLED L"Security-SPP-Evalu
ationModeEnabled" | | #define SL_POLICY_EVALUATION_MODE_ENABLED L"Security-SPP-Evalu
ationModeEnabled" |
| | |
| #define SL_DEFAULT_MIGRATION_ENCRYPTOR_URI L"msft:spp/migration
encryptor/tokenact/1.0" | | #define SL_DEFAULT_MIGRATION_ENCRYPTOR_URI L"msft:spp/migration
encryptor/tokenact/1.0" |
| | |
| __control_entrypoint(DllExport) | | __control_entrypoint(DllExport) |
| | |
| skipping to change at line 2325 | | skipping to change at line 2329 |
| This function gets genuine related information. | | This function gets genuine related information. |
| | |
| Arguments: | | Arguments: |
| | |
| pQueryId | | pQueryId |
| pQueryId can be one of the following. | | pQueryId can be one of the following. |
| | |
| GenuineId in case of querying following property values. | | GenuineId in case of querying following property values. |
| SL_PROP_GENUINE_RESULT | | SL_PROP_GENUINE_RESULT |
| SL_PROP_GET_GENUINE_AUTHZ | | SL_PROP_GET_GENUINE_AUTHZ |
|
| | SL_PROP_GET_GENUINE_SERVER_AUTHZ |
| | |
| ApplicationId in case of querying following property values. | | ApplicationId in case of querying following property values. |
| SL_PROP_BRT_DATA | | SL_PROP_BRT_DATA |
| SL_PROP_BRT_COMMIT | | SL_PROP_BRT_COMMIT |
| SL_PROP_NONGENUINE_GRACE_FLAG | | SL_PROP_NONGENUINE_GRACE_FLAG |
| | |
| SKUId in case of querying following property values. | | SKUId in case of querying following property values. |
| SL_PROP_LAST_ACT_ATTEMPT_HRESULT | | SL_PROP_LAST_ACT_ATTEMPT_HRESULT |
| SL_PROP_LAST_ACT_ATTEMPT_TIME | | SL_PROP_LAST_ACT_ATTEMPT_TIME |
| SL_PROP_LAST_ACT_ATTEMPT_SERVER_FLAGS | | SL_PROP_LAST_ACT_ATTEMPT_SERVER_FLAGS |
| SL_PROP_ACTIVATION_VALIDATION_IN_PROGRESS | | SL_PROP_ACTIVATION_VALIDATION_IN_PROGRESS |
| | |
| pwszValueName | | pwszValueName |
| pwszValueName can be one of the following property names. | | pwszValueName can be one of the following property names. |
| SL_PROP_GENUINE_RESULT | | SL_PROP_GENUINE_RESULT |
| SL_PROP_GET_GENUINE_AUTHZ:<sessiondId> | | SL_PROP_GET_GENUINE_AUTHZ:<sessiondId> |
|
| | SL_PROP_GET_GENUINE_SERVER_AUTHZ |
| SL_PROP_BRT_DATA | | SL_PROP_BRT_DATA |
| SL_PROP_BRT_COMMIT | | SL_PROP_BRT_COMMIT |
| SL_PROP_NONGENUINE_GRACE_FLAG | | SL_PROP_NONGENUINE_GRACE_FLAG |
| SL_PROP_LAST_ACT_ATTEMPT_HRESULT | | SL_PROP_LAST_ACT_ATTEMPT_HRESULT |
| SL_PROP_LAST_ACT_ATTEMPT_TIME | | SL_PROP_LAST_ACT_ATTEMPT_TIME |
| SL_PROP_LAST_ACT_ATTEMPT_SERVER_FLAGS | | SL_PROP_LAST_ACT_ATTEMPT_SERVER_FLAGS |
| SL_PROP_ACTIVATION_VALIDATION_IN_PROGRESS | | SL_PROP_ACTIVATION_VALIDATION_IN_PROGRESS |
| | |
| eType | | eType |
| See SLDATATYPE | | See SLDATATYPE |
| | |
| skipping to change at line 2532 | | skipping to change at line 2538 |
| One or more arguments are invalid | | One or more arguments are invalid |
| | |
| E_ACCESSDENIED | | E_ACCESSDENIED |
| Access denied (API requires admin privileges) | | Access denied (API requires admin privileges) |
| --*/ | | --*/ |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| } | | } |
| #endif | | #endif |
| | |
|
| | #define ID_CAP_SLAPI L"slapiQueryLicenseValue" |
| | typedef struct _SL_SYSTEM_POLICY_INFORMATION { |
| | PVOID Reserved1[2]; |
| | ULONG Reserved2[3]; |
| | } SL_SYSTEM_POLICY_INFORMATION, *PSL_SYSTEM_POLICY_INFORMATION; |
| | |
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| #pragma endregion | | #pragma endregion |
| | |
|
| | #pragma region Application Family |
| | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) |
| | |
| | // |
| | // Capability needed by appcontainers for this API is slapiQueryLicensingValue |
| | // |
| | |
| | /*++ |
| | Routine Description: |
| | |
| | This function is used to for Windows components to get |
| | component policy value. |
| | |
| | Arguments: |
| | valueName - Pointer to wide char string for policy name to look up. |
| | |
| | valueType - Receives policy type. (OPTIONAL) |
| | Following types are supported: |
| | |
| | REG_DWORD - 32-bit integer, Data buffer should be at |
| | least 4 bytes. |
| | |
| | REG_BINARY - any binary value. |
| | |
| | REG_SZ - wide-char null-terminated string including |
| | last null character. |
| | |
| | dataBuffer - Buffer that receives value. (OPTIONAL) |
| | |
| | dataSize - Supplies input buffer length in bytes, |
| | |
| | resultDataSize - Receives actual data size in bytes. |
| | |
| | Return Error: |
| | E_INVALIDARG |
| | SL_E_VALUE_NOT_FOUND |
| | Other error codes. |
| | |
| | --*/ |
| | STDAPI |
| | SLQueryLicenseValueFromApp( |
| | _In_ PCWSTR valueName, |
| | _Out_opt_ ULONG* valueType, |
| | _Out_writes_bytes_to_opt_(dataSize, *resultDataSize) PVOID dataBuffer, |
| | _In_ ULONG dataSize, |
| | _Out_ ULONG* resultDataSize |
| | ); |
| | |
| | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ |
| | #pragma endregion |
| | |
| #endif | | #endif |
| | |
| End of changes. 7 change blocks. |
| 0 lines changed or deleted | | 65 lines changed or added |
|