| tbs.h (6.3.9600.17415-Windows 8.1) | | tbs.h (10.0.10586.0-Windows 10 1511 10586.494) |
|---|
| | |
| skipping to change at line 21 | | skipping to change at line 21 |
|---|
| ---------------------------------------------------------------------------*/ | | ---------------------------------------------------------------------------*/ |
| | |
| #ifndef _TBS_H_ | | #ifndef _TBS_H_ |
| #define _TBS_H_ | | #define _TBS_H_ |
| | |
| #if _MSC_VER > 1000 | | #if _MSC_VER > 1000 |
| #pragma once | | #pragma once |
| #endif | | #endif |
| #include <winapifamily.h> | | #include <winapifamily.h> |
| | |
|
| #pragma region Desktop Family | | #pragma region Desktop Family or SecureStartup Package |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_PKG_SECU |
| | RESTARTUP) |
| | |
| #if defined(__cplusplus) | | #if defined(__cplusplus) |
| extern "C" { | | extern "C" { |
| #endif | | #endif |
| | |
| #if (NTDDI_VERSION >= NTDDI_VISTA) | | #if (NTDDI_VERSION >= NTDDI_VISTA) |
| | |
| #ifndef WINAPI | | #ifndef WINAPI |
| #define WINAPI __stdcall | | #define WINAPI __stdcall |
| #endif | | #endif |
| | |
| skipping to change at line 57 | | skipping to change at line 57 |
|---|
| | |
| typedef UINT8 BYTE, *PBYTE; | | typedef UINT8 BYTE, *PBYTE; |
| typedef const BYTE *PCBYTE; | | typedef const BYTE *PCBYTE; |
| | |
| typedef BOOL TBS_BOOL; | | typedef BOOL TBS_BOOL; |
| typedef UINT32 TBS_RESULT; | | typedef UINT32 TBS_RESULT; |
| typedef PVOID TBS_HCONTEXT, *PTBS_HCONTEXT; | | typedef PVOID TBS_HCONTEXT, *PTBS_HCONTEXT; |
| typedef UINT32 TBS_COMMAND_PRIORITY; | | typedef UINT32 TBS_COMMAND_PRIORITY; |
| typedef UINT32 TBS_COMMAND_LOCALITY; | | typedef UINT32 TBS_COMMAND_LOCALITY; |
| typedef UINT32 TBS_OWNERAUTH_TYPE; | | typedef UINT32 TBS_OWNERAUTH_TYPE; |
|
| | typedef UINT32 TBS_HANDLE; |
| | |
| #define TBS_CONTEXT_VERSION_ONE 1 | | #define TBS_CONTEXT_VERSION_ONE 1 |
| | |
| #define TBS_COMMAND_PRIORITY_LOW 100 | | #define TBS_COMMAND_PRIORITY_LOW 100 |
| #define TBS_COMMAND_PRIORITY_NORMAL 200 | | #define TBS_COMMAND_PRIORITY_NORMAL 200 |
| #define TBS_COMMAND_PRIORITY_HIGH 300 | | #define TBS_COMMAND_PRIORITY_HIGH 300 |
| #define TBS_COMMAND_PRIORITY_SYSTEM 400 | | #define TBS_COMMAND_PRIORITY_SYSTEM 400 |
| #define TBS_COMMAND_PRIORITY_MAX 0x80000000 | | #define TBS_COMMAND_PRIORITY_MAX 0x80000000 |
| | |
| #define TBS_COMMAND_LOCALITY_ZERO 0 | | #define TBS_COMMAND_LOCALITY_ZERO 0 |
| | |
| skipping to change at line 172 | | skipping to change at line 173 |
|---|
| // | | // |
| #define TPM_VERSION_UNKNOWN 0 | | #define TPM_VERSION_UNKNOWN 0 |
| #define TPM_VERSION_12 1 | | #define TPM_VERSION_12 1 |
| #define TPM_VERSION_20 2 | | #define TPM_VERSION_20 2 |
| | |
| #define TPM_IFTYPE_UNKNOWN 0 | | #define TPM_IFTYPE_UNKNOWN 0 |
| #define TPM_IFTYPE_1 1 // for 1.2 - use I/O-port or MMIO | | #define TPM_IFTYPE_1 1 // for 1.2 - use I/O-port or MMIO |
| #define TPM_IFTYPE_TRUSTZONE 2 // 2.0: Trustzone | | #define TPM_IFTYPE_TRUSTZONE 2 // 2.0: Trustzone |
| #define TPM_IFTYPE_HW 3 // 2.0: HW TPM | | #define TPM_IFTYPE_HW 3 // 2.0: HW TPM |
| #define TPM_IFTYPE_EMULATOR 4 // 2.0: SW-emulator | | #define TPM_IFTYPE_EMULATOR 4 // 2.0: SW-emulator |
|
| | #define TPM_IFTYPE_SPB 5 // 2.0: SPB attached |
| | |
| typedef struct _TPM_DEVICE_INFO | | typedef struct _TPM_DEVICE_INFO |
| { | | { |
| UINT32 structVersion; // = 1 for now | | UINT32 structVersion; // = 1 for now |
| UINT32 tpmVersion; // 1.2 / 2.0 | | UINT32 tpmVersion; // 1.2 / 2.0 |
| UINT32 tpmInterfaceType; // HW, simulator, ... | | UINT32 tpmInterfaceType; // HW, simulator, ... |
| UINT32 tpmImpRevision; // code-drop revision, | | UINT32 tpmImpRevision; // code-drop revision, |
| // implenmentation-specific | | // implenmentation-specific |
| } TPM_DEVICE_INFO, *PTPM_DEVICE_INFO; | | } TPM_DEVICE_INFO, *PTPM_DEVICE_INFO; |
| typedef const TPM_DEVICE_INFO *PCTPM_DEVICE_INFO; | | typedef const TPM_DEVICE_INFO *PCTPM_DEVICE_INFO; |
| | |
| skipping to change at line 222 | | skipping to change at line 224 |
|---|
| | |
| HRESULT | | HRESULT |
| GetDeviceIDString( | | GetDeviceIDString( |
| _Out_writes_to_opt_(cchWindowsAIK, *pcchResult) PWSTR pszWindowsAIK, | | _Out_writes_to_opt_(cchWindowsAIK, *pcchResult) PWSTR pszWindowsAIK, |
| _In_ UINT32 cchWindowsAIK, | | _In_ UINT32 cchWindowsAIK, |
| _Out_ PUINT32 pcchResult, | | _Out_ PUINT32 pcchResult, |
| _Out_opt_ BOOL *pfProtectedByTPM); | | _Out_opt_ BOOL *pfProtectedByTPM); |
| | |
| #endif // ifndef _NTDDK_ | | #endif // ifndef _NTDDK_ |
| | |
|
| | #if (NTDDI_VERSION >= NTDDI_WINTHRESHOLD) |
| | |
| | TBS_RESULT WINAPI |
| | Tbsi_Create_Windows_Key( |
| | __in TBS_HANDLE keyHandle); |
| | |
| | #endif // (NTDDI_VERSION >= NTDDI_WINTHRESHOLD) |
| | |
| #endif // (NTDDI_VERSION >= NTDDI_WINBLUE) | | #endif // (NTDDI_VERSION >= NTDDI_WINBLUE) |
| | |
| #endif // (NTDDI_VERSION >= NTDDI_WIN8) | | #endif // (NTDDI_VERSION >= NTDDI_WIN8) |
| | |
| #endif // (NTDDI_VERSION >= NTDDI_VISTA) | | #endif // (NTDDI_VERSION >= NTDDI_VISTA) |
| | |
| #if defined(__cplusplus) | | #if defined(__cplusplus) |
| } | | } |
| #endif | | #endif |
| | |
|
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_PK
G_SECURESTARTUP) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #endif // ifndef _TBS_H_ | | #endif // ifndef _TBS_H_ |
| | |
| End of changes. 5 change blocks. |
|---|
| 3 lines changed or deleted | | 14 lines changed or added |
|---|
|