include: Change the rest of sspi.h to use LONG/ULONG for Win64 compatibility.

This commit is contained in:
Michael Stefaniuc 2009-01-06 00:09:12 +01:00 committed by Alexandre Julliard
parent 57ab0cd9a6
commit 230fb06d2e
2 changed files with 20 additions and 20 deletions

View File

@ -249,7 +249,7 @@ static void testAcquireSecurityContext(void)
NULL, NULL, NULL, NULL, &cred, &exp); NULL, NULL, NULL, NULL, &cred, &exp);
ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st); ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st);
/* expriy is indeterminate in win2k3 */ /* expriy is indeterminate in win2k3 */
trace("expiry: %08lx%08lx\n", exp.HighPart, exp.LowPart); trace("expiry: %08x%08x\n", exp.HighPart, exp.LowPart);
pFreeCredentialsHandle(&cred); pFreeCredentialsHandle(&cred);
/* Bad version in SCHANNEL_CRED */ /* Bad version in SCHANNEL_CRED */

View File

@ -71,8 +71,8 @@ typedef PSecHandle PCtxtHandle;
typedef struct _SECURITY_INTEGER typedef struct _SECURITY_INTEGER
{ {
unsigned long LowPart; ULONG LowPart;
long HighPart; LONG HighPart;
} SECURITY_INTEGER, *PSECURITY_INTEGER; } SECURITY_INTEGER, *PSECURITY_INTEGER;
typedef SECURITY_INTEGER TimeStamp, *PTimeStamp; typedef SECURITY_INTEGER TimeStamp, *PTimeStamp;
@ -171,7 +171,7 @@ typedef struct _SecBufferDesc
#define SECBUFFER_VERSION 0 #define SECBUFFER_VERSION 0
typedef void (SEC_ENTRY *SEC_GET_KEY_FN)(void *Arg, void *Principal, typedef void (SEC_ENTRY *SEC_GET_KEY_FN)(void *Arg, void *Principal,
unsigned long KeyVer, void **Key, SECURITY_STATUS *Status); ULONG KeyVer, void **Key, SECURITY_STATUS *Status);
SECURITY_STATUS SEC_ENTRY EnumerateSecurityPackagesA(PULONG pcPackages, SECURITY_STATUS SEC_ENTRY EnumerateSecurityPackagesA(PULONG pcPackages,
PSecPkgInfoA *ppPackageInfo); PSecPkgInfoA *ppPackageInfo);
@ -532,7 +532,7 @@ typedef struct _SecPkgContext_PasswordExpiry
typedef struct _SecPkgContext_SessionKey typedef struct _SecPkgContext_SessionKey
{ {
unsigned long SessionKeyLength; ULONG SessionKeyLength;
unsigned char *SessionKey; unsigned char *SessionKey;
} SecPkgContext_SessionKey, *PSecPkgContext_SessionKey; } SecPkgContext_SessionKey, *PSecPkgContext_SessionKey;
@ -551,24 +551,24 @@ typedef struct _SecPkgContext_PackageInfoW
typedef struct _SecPkgContext_Flags typedef struct _SecPkgContext_Flags
{ {
unsigned long Flags; ULONG Flags;
} SecPkgContext_Flags, *PSecPkgContext_Flags; } SecPkgContext_Flags, *PSecPkgContext_Flags;
typedef struct _SecPkgContext_UserFlags typedef struct _SecPkgContext_UserFlags
{ {
unsigned long UserFlags; ULONG UserFlags;
} SecPkgContext_UserFlags, *PSecPkgContext_UserFlags; } SecPkgContext_UserFlags, *PSecPkgContext_UserFlags;
typedef struct _SecPkgContext_NegotiationInfoA typedef struct _SecPkgContext_NegotiationInfoA
{ {
PSecPkgInfoA PackageInfo; PSecPkgInfoA PackageInfo;
unsigned long NegotiationState; ULONG NegotiationState;
} SecPkgContext_NegotiationInfoA, *PSecPkgContext_NegotiationInfoA; } SecPkgContext_NegotiationInfoA, *PSecPkgContext_NegotiationInfoA;
typedef struct _SecPkgContext_NegotiationInfoW typedef struct _SecPkgContext_NegotiationInfoW
{ {
PSecPkgInfoW PackageInfo; PSecPkgInfoW PackageInfo;
unsigned long NegotiationState; ULONG NegotiationState;
} SecPkgContext_NegotiationInfoW, *PSecPkgContext_NegotiationInfoW; } SecPkgContext_NegotiationInfoW, *PSecPkgContext_NegotiationInfoW;
#define SecPkgContext_NegotiationInfo WINELIB_NAME_AW(SecPkgContext_NegotiationInfo) #define SecPkgContext_NegotiationInfo WINELIB_NAME_AW(SecPkgContext_NegotiationInfo)
@ -598,14 +598,14 @@ typedef struct _SecPkgContext_NativeNamesW
typedef struct _SecPkgContext_CredentialNameA typedef struct _SecPkgContext_CredentialNameA
{ {
unsigned long CredentialType; ULONG CredentialType;
SEC_CHAR *sCredentialName; SEC_CHAR *sCredentialName;
} SecPkgContext_CredentialNameA, *PSecPkgContext_CredentialNameA; } SecPkgContext_CredentialNameA, *PSecPkgContext_CredentialNameA;
typedef struct _SecPkgContext_CredentialNameW typedef struct _SecPkgContext_CredentialNameW
{ {
unsigned long CredentialType; ULONG CredentialType;
SEC_WCHAR *sCredentialName; SEC_WCHAR *sCredentialName;
} SecPkgContext_CredentialNameW, *PSecPkgContext_CredentialNameW; } SecPkgContext_CredentialNameW, *PSecPkgContext_CredentialNameW;
#define SecPkgContext_CredentialName WINELIB_NAME_AW(SecPkgContext_CredentialName) #define SecPkgContext_CredentialName WINELIB_NAME_AW(SecPkgContext_CredentialName)
@ -618,20 +618,20 @@ typedef struct _SecPkgContext_AccessToken
typedef struct _SecPkgContext_TargetInformation typedef struct _SecPkgContext_TargetInformation
{ {
unsigned long MarshalledTargetInfoLength; ULONG MarshalledTargetInfoLength;
unsigned char *MarshalledTargetInfo; unsigned char *MarshalledTargetInfo;
} SecPkgContext_TargetInformation, *PSecPkgContext_TargetInformation; } SecPkgContext_TargetInformation, *PSecPkgContext_TargetInformation;
typedef struct _SecPkgContext_AuthzID typedef struct _SecPkgContext_AuthzID
{ {
unsigned long AuthzIDLength; ULONG AuthzIDLength;
char *AuthzID; char *AuthzID;
} SecPkgContext_AuthzID, *PSecPkgContext_AuthzID; } SecPkgContext_AuthzID, *PSecPkgContext_AuthzID;
typedef struct _SecPkgContext_Target typedef struct _SecPkgContext_Target
{ {
unsigned long TargetLength; ULONG TargetLength;
char *Target; char *Target;
} SecPkgContext_Target, *PSecPkgContext_Target; } SecPkgContext_Target, *PSecPkgContext_Target;
SECURITY_STATUS SEC_ENTRY ImpersonateSecurityContext(PCtxtHandle phContext); SECURITY_STATUS SEC_ENTRY ImpersonateSecurityContext(PCtxtHandle phContext);