include: Change the rest of sspi.h to use LONG/ULONG for Win64 compatibility.
Michael Stefaniuc
mstefani at redhat.de
Mon Jan 5 17:09:12 CST 2009
---
dlls/secur32/tests/schannel.c | 2 +-
include/sspi.h | 38 +++++++++++++++++++-------------------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c
index a6032be..154ba97 100644
--- a/dlls/secur32/tests/schannel.c
+++ b/dlls/secur32/tests/schannel.c
@@ -249,7 +249,7 @@ static void testAcquireSecurityContext(void)
NULL, NULL, NULL, NULL, &cred, &exp);
ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st);
/* 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);
/* Bad version in SCHANNEL_CRED */
diff --git a/include/sspi.h b/include/sspi.h
index 9a7134f..f8a71bd 100644
--- a/include/sspi.h
+++ b/include/sspi.h
@@ -71,8 +71,8 @@ typedef PSecHandle PCtxtHandle;
typedef struct _SECURITY_INTEGER
{
- unsigned long LowPart;
- long HighPart;
+ ULONG LowPart;
+ LONG HighPart;
} SECURITY_INTEGER, *PSECURITY_INTEGER;
typedef SECURITY_INTEGER TimeStamp, *PTimeStamp;
@@ -171,7 +171,7 @@ typedef struct _SecBufferDesc
#define SECBUFFER_VERSION 0
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,
PSecPkgInfoA *ppPackageInfo);
@@ -532,7 +532,7 @@ typedef struct _SecPkgContext_PasswordExpiry
typedef struct _SecPkgContext_SessionKey
{
- unsigned long SessionKeyLength;
+ ULONG SessionKeyLength;
unsigned char *SessionKey;
} SecPkgContext_SessionKey, *PSecPkgContext_SessionKey;
@@ -551,24 +551,24 @@ typedef struct _SecPkgContext_PackageInfoW
typedef struct _SecPkgContext_Flags
{
- unsigned long Flags;
+ ULONG Flags;
} SecPkgContext_Flags, *PSecPkgContext_Flags;
typedef struct _SecPkgContext_UserFlags
{
- unsigned long UserFlags;
+ ULONG UserFlags;
} SecPkgContext_UserFlags, *PSecPkgContext_UserFlags;
typedef struct _SecPkgContext_NegotiationInfoA
{
- PSecPkgInfoA PackageInfo;
- unsigned long NegotiationState;
+ PSecPkgInfoA PackageInfo;
+ ULONG NegotiationState;
} SecPkgContext_NegotiationInfoA, *PSecPkgContext_NegotiationInfoA;
typedef struct _SecPkgContext_NegotiationInfoW
{
- PSecPkgInfoW PackageInfo;
- unsigned long NegotiationState;
+ PSecPkgInfoW PackageInfo;
+ ULONG NegotiationState;
} SecPkgContext_NegotiationInfoW, *PSecPkgContext_NegotiationInfoW;
#define SecPkgContext_NegotiationInfo WINELIB_NAME_AW(SecPkgContext_NegotiationInfo)
@@ -598,14 +598,14 @@ typedef struct _SecPkgContext_NativeNamesW
typedef struct _SecPkgContext_CredentialNameA
{
- unsigned long CredentialType;
- SEC_CHAR *sCredentialName;
+ ULONG CredentialType;
+ SEC_CHAR *sCredentialName;
} SecPkgContext_CredentialNameA, *PSecPkgContext_CredentialNameA;
typedef struct _SecPkgContext_CredentialNameW
{
- unsigned long CredentialType;
- SEC_WCHAR *sCredentialName;
+ ULONG CredentialType;
+ SEC_WCHAR *sCredentialName;
} SecPkgContext_CredentialNameW, *PSecPkgContext_CredentialNameW;
#define SecPkgContext_CredentialName WINELIB_NAME_AW(SecPkgContext_CredentialName)
@@ -618,20 +618,20 @@ typedef struct _SecPkgContext_AccessToken
typedef struct _SecPkgContext_TargetInformation
{
- unsigned long MarshalledTargetInfoLength;
+ ULONG MarshalledTargetInfoLength;
unsigned char *MarshalledTargetInfo;
} SecPkgContext_TargetInformation, *PSecPkgContext_TargetInformation;
typedef struct _SecPkgContext_AuthzID
{
- unsigned long AuthzIDLength;
- char *AuthzID;
+ ULONG AuthzIDLength;
+ char *AuthzID;
} SecPkgContext_AuthzID, *PSecPkgContext_AuthzID;
typedef struct _SecPkgContext_Target
{
- unsigned long TargetLength;
- char *Target;
+ ULONG TargetLength;
+ char *Target;
} SecPkgContext_Target, *PSecPkgContext_Target;
SECURITY_STATUS SEC_ENTRY ImpersonateSecurityContext(PCtxtHandle phContext);
--
1.6.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20090106/b3eb3666/attachment-0001.pgp
More information about the wine-patches
mailing list