[XDK/DDK]

Some fixes for Vista/Win7

svn path=/trunk/; revision=56315
This commit is contained in:
Timo Kreuzer 2012-04-01 22:30:00 +00:00
parent 372271d5bf
commit e5c9bc2f70
5 changed files with 16 additions and 16 deletions

View file

@ -4501,8 +4501,8 @@ typedef struct _STORAGE_QUERY_DEPENDENT_VOLUME_RESPONSE {
ULONG ResponseLevel; ULONG ResponseLevel;
ULONG NumberEntries; ULONG NumberEntries;
_ANONYMOUS_UNION union { _ANONYMOUS_UNION union {
STORAGE_QUERY_DEPENDENT_VOLUME_LEV1_ENTRY Lev1Depends[]; STORAGE_QUERY_DEPENDENT_VOLUME_LEV1_ENTRY Lev1Depends[0];
STORAGE_QUERY_DEPENDENT_VOLUME_LEV2_ENTRY Lev2Depends[]; STORAGE_QUERY_DEPENDENT_VOLUME_LEV2_ENTRY Lev2Depends[0];
} DUMMYUNIONNAME; } DUMMYUNIONNAME;
} STORAGE_QUERY_DEPENDENT_VOLUME_RESPONSE, *PSTORAGE_QUERY_DEPENDENT_VOLUME_RESPONSE; } STORAGE_QUERY_DEPENDENT_VOLUME_RESPONSE, *PSTORAGE_QUERY_DEPENDENT_VOLUME_RESPONSE;
@ -10572,14 +10572,14 @@ SEC_ENTRY
SspiMarshalAuthIdentity( SspiMarshalAuthIdentity(
_In_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE AuthIdentity, _In_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE AuthIdentity,
_Out_ PULONG AuthIdentityLength, _Out_ PULONG AuthIdentityLength,
_Deref_out__bcount(*AuthIdentityLength) PCHAR* AuthIdentityByteArray); _Outptr_result_bytebuffer_(*AuthIdentityLength) PCHAR* AuthIdentityByteArray);
SECURITY_STATUS SECURITY_STATUS
SEC_ENTRY SEC_ENTRY
SspiUnmarshalAuthIdentity( SspiUnmarshalAuthIdentity(
_In_ PULONG AuthIdentityLength, _In_ PULONG AuthIdentityLength,
_In__bcount(AuthIdentityLength) PCHAR AuthIdentityByteArray, _In_reads_bytes_(AuthIdentityLength) PCHAR AuthIdentityByteArray,
_Deref_out_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE* ppAuthIdentity); _Outptr_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE* ppAuthIdentity);
BOOLEAN BOOLEAN
SEC_ENTRY SEC_ENTRY
@ -10590,14 +10590,14 @@ SECURITY_STATUS
SEC_ENTRY SEC_ENTRY
SspiGetTargetHostName( SspiGetTargetHostName(
_In_ PCWSTR pszTargetName, _In_ PCWSTR pszTargetName,
_Deref_out_ PWSTR* pszHostName); _Outptr_ PWSTR* pszHostName);
SECURITY_STATUS SECURITY_STATUS
SEC_ENTRY SEC_ENTRY
SspiExcludePackage( SspiExcludePackage(
_In_opt_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE AuthIdentity, _In_opt_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE AuthIdentity,
_In_ PCWSTR pszPackageName, _In_ PCWSTR pszPackageName,
_Deref_out_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE* ppNewAuthIdentity); _Outptr_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE* ppNewAuthIdentity);
#define SEC_WINNT_AUTH_IDENTITY_MARSHALLED 0x04 #define SEC_WINNT_AUTH_IDENTITY_MARSHALLED 0x04
#define SEC_WINNT_AUTH_IDENTITY_ONLY 0x08 #define SEC_WINNT_AUTH_IDENTITY_ONLY 0x08

View file

@ -1033,7 +1033,7 @@ typedef struct _KWAIT_BLOCK {
struct _KWAIT_BLOCK *NextWaitBlock; struct _KWAIT_BLOCK *NextWaitBlock;
USHORT WaitKey; USHORT WaitKey;
UCHAR WaitType; UCHAR WaitType;
#if (NTDDI_VERSION >= NTDDI_LONGHORN) #if (NTDDI_VERSION >= NTDDI_WIN7)
volatile UCHAR BlockState; volatile UCHAR BlockState;
#else #else
UCHAR SpareByte; UCHAR SpareByte;

View file

@ -6588,8 +6588,8 @@ typedef struct _STORAGE_QUERY_DEPENDENT_VOLUME_RESPONSE {
ULONG ResponseLevel; ULONG ResponseLevel;
ULONG NumberEntries; ULONG NumberEntries;
_ANONYMOUS_UNION union { _ANONYMOUS_UNION union {
STORAGE_QUERY_DEPENDENT_VOLUME_LEV1_ENTRY Lev1Depends[]; STORAGE_QUERY_DEPENDENT_VOLUME_LEV1_ENTRY Lev1Depends[0];
STORAGE_QUERY_DEPENDENT_VOLUME_LEV2_ENTRY Lev2Depends[]; STORAGE_QUERY_DEPENDENT_VOLUME_LEV2_ENTRY Lev2Depends[0];
} DUMMYUNIONNAME; } DUMMYUNIONNAME;
} STORAGE_QUERY_DEPENDENT_VOLUME_RESPONSE, *PSTORAGE_QUERY_DEPENDENT_VOLUME_RESPONSE; } STORAGE_QUERY_DEPENDENT_VOLUME_RESPONSE, *PSTORAGE_QUERY_DEPENDENT_VOLUME_RESPONSE;

View file

@ -463,7 +463,7 @@ typedef struct _KWAIT_BLOCK {
struct _KWAIT_BLOCK *NextWaitBlock; struct _KWAIT_BLOCK *NextWaitBlock;
USHORT WaitKey; USHORT WaitKey;
UCHAR WaitType; UCHAR WaitType;
#if (NTDDI_VERSION >= NTDDI_LONGHORN) #if (NTDDI_VERSION >= NTDDI_WIN7)
volatile UCHAR BlockState; volatile UCHAR BlockState;
#else #else
UCHAR SpareByte; UCHAR SpareByte;

View file

@ -1234,14 +1234,14 @@ SEC_ENTRY
SspiMarshalAuthIdentity( SspiMarshalAuthIdentity(
_In_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE AuthIdentity, _In_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE AuthIdentity,
_Out_ PULONG AuthIdentityLength, _Out_ PULONG AuthIdentityLength,
_Deref_out__bcount(*AuthIdentityLength) PCHAR* AuthIdentityByteArray); _Outptr_result_bytebuffer_(*AuthIdentityLength) PCHAR* AuthIdentityByteArray);
SECURITY_STATUS SECURITY_STATUS
SEC_ENTRY SEC_ENTRY
SspiUnmarshalAuthIdentity( SspiUnmarshalAuthIdentity(
_In_ PULONG AuthIdentityLength, _In_ PULONG AuthIdentityLength,
_In__bcount(AuthIdentityLength) PCHAR AuthIdentityByteArray, _In_reads_bytes_(AuthIdentityLength) PCHAR AuthIdentityByteArray,
_Deref_out_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE* ppAuthIdentity); _Outptr_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE* ppAuthIdentity);
BOOLEAN BOOLEAN
SEC_ENTRY SEC_ENTRY
@ -1252,14 +1252,14 @@ SECURITY_STATUS
SEC_ENTRY SEC_ENTRY
SspiGetTargetHostName( SspiGetTargetHostName(
_In_ PCWSTR pszTargetName, _In_ PCWSTR pszTargetName,
_Deref_out_ PWSTR* pszHostName); _Outptr_ PWSTR* pszHostName);
SECURITY_STATUS SECURITY_STATUS
SEC_ENTRY SEC_ENTRY
SspiExcludePackage( SspiExcludePackage(
_In_opt_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE AuthIdentity, _In_opt_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE AuthIdentity,
_In_ PCWSTR pszPackageName, _In_ PCWSTR pszPackageName,
_Deref_out_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE* ppNewAuthIdentity); _Outptr_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE* ppNewAuthIdentity);
#define SEC_WINNT_AUTH_IDENTITY_MARSHALLED 0x04 #define SEC_WINNT_AUTH_IDENTITY_MARSHALLED 0x04
#define SEC_WINNT_AUTH_IDENTITY_ONLY 0x08 #define SEC_WINNT_AUTH_IDENTITY_ONLY 0x08