From 3cdb717a7b81c466b9735a8229581e0c237bd1e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Mon, 25 Jun 2018 14:55:46 +0200 Subject: [PATCH] [PSDK] ntsecpkg.h: fix minor typos (make some structure names MS-PSDK-compatible), and add LSA_TOKEN_INFORMATION_V2. --- sdk/include/psdk/ntsecpkg.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sdk/include/psdk/ntsecpkg.h b/sdk/include/psdk/ntsecpkg.h index c7d837e1ad0..c10f26b7e38 100644 --- a/sdk/include/psdk/ntsecpkg.h +++ b/sdk/include/psdk/ntsecpkg.h @@ -42,7 +42,8 @@ extern "C" { /* enum definitions for Secure Service Provider/Authentication Packages */ typedef enum _LSA_TOKEN_INFORMATION_TYPE { LsaTokenInformationNull, - LsaTokenInformationV1 + LsaTokenInformationV1, + LsaTokenInformationV2 } LSA_TOKEN_INFORMATION_TYPE, *PLSA_TOKEN_INFORMATION_TYPE; typedef enum _SECPKG_EXTENDED_INFORMATION_CLASS @@ -78,6 +79,8 @@ typedef struct _LSA_TOKEN_INFORMATION_V1 TOKEN_DEFAULT_DACL DefaultDacl; } LSA_TOKEN_INFORMATION_V1, *PLSA_TOKEN_INFORMATION_V1; +typedef LSA_TOKEN_INFORMATION_V1 LSA_TOKEN_INFORMATION_V2, *PLSA_TOKEN_INFORMATION_V2; + typedef struct _SECPKG_PRIMARY_CRED { LUID LogonId; UNICODE_STRING DownlevelName; @@ -255,14 +258,14 @@ typedef NTSTATUS (NTAPI *PLSA_CALL_PACKAGE_PASSTHROUGH)(PUNICODE_STRING, PVOID, PVOID, ULONG, PVOID*, PULONG, PNTSTATUS); /* Dispatch tables of functions used by SSP/AP */ -typedef struct SECPKG_DLL_FUNCTIONS { +typedef struct _SECPKG_DLL_FUNCTIONS { PLSA_ALLOCATE_LSA_HEAP AllocateHeap; PLSA_FREE_LSA_HEAP FreeHeap; PLSA_REGISTER_CALLBACK RegisterCallback; } SECPKG_DLL_FUNCTIONS, *PSECPKG_DLL_FUNCTIONS; -typedef struct LSA_DISPATCH_TABLE { +typedef struct _LSA_DISPATCH_TABLE { PLSA_CREATE_LOGON_SESSION CreateLogonSession; PLSA_DELETE_LOGON_SESSION DeleteLogonSession; PLSA_ADD_CREDENTIAL AddCredential; @@ -418,7 +421,7 @@ typedef NTSTATUS (NTAPI SpImportSecurityContextFn)(PSecBuffer, HANDLE, #endif /* dispatch tables of LSA-mode functions implemented by SSP/AP */ -typedef struct SECPKG_FUNCTION_TABLE { +typedef struct _SECPKG_FUNCTION_TABLE { PLSA_AP_INITIALIZE_PACKAGE InitializePackage; PLSA_AP_LOGON_USER LsaLogonUser; PLSA_AP_CALL_PACKAGE CallPackage; @@ -466,7 +469,7 @@ typedef struct SECPKG_FUNCTION_TABLE { *PSECPKG_FUNCTION_TABLE; /* dispatch tables of user-mode functions implemented by SSP/AP */ -typedef struct SECPKG_USER_FUNCTION_TABLE { +typedef struct _SECPKG_USER_FUNCTION_TABLE { SpInstanceInitFn *InstanceInit; SpInitUserModeContextFn *InitUserModeContext; SpMakeSignatureFn *MakeSignature;