From e5c9bc2f708bde727a4627a0e03fad5adad84d32 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sun, 1 Apr 2012 22:30:00 +0000
Subject: [PATCH] [XDK/DDK] Some fixes for Vista/Win7

svn path=/trunk/; revision=56315
---
 reactos/include/ddk/ntifs.h   | 14 +++++++-------
 reactos/include/ddk/wdm.h     |  2 +-
 reactos/include/xdk/iotypes.h |  4 ++--
 reactos/include/xdk/ketypes.h |  2 +-
 reactos/include/xdk/sspi.h    | 10 +++++-----
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/reactos/include/ddk/ntifs.h b/reactos/include/ddk/ntifs.h
index dce94963a0f..6559723dc28 100644
--- a/reactos/include/ddk/ntifs.h
+++ b/reactos/include/ddk/ntifs.h
@@ -4501,8 +4501,8 @@ typedef struct _STORAGE_QUERY_DEPENDENT_VOLUME_RESPONSE {
   ULONG ResponseLevel;
   ULONG NumberEntries;
   _ANONYMOUS_UNION union {
-    STORAGE_QUERY_DEPENDENT_VOLUME_LEV1_ENTRY Lev1Depends[];
-    STORAGE_QUERY_DEPENDENT_VOLUME_LEV2_ENTRY Lev2Depends[];
+    STORAGE_QUERY_DEPENDENT_VOLUME_LEV1_ENTRY Lev1Depends[0];
+    STORAGE_QUERY_DEPENDENT_VOLUME_LEV2_ENTRY Lev2Depends[0];
   } DUMMYUNIONNAME;
 } STORAGE_QUERY_DEPENDENT_VOLUME_RESPONSE, *PSTORAGE_QUERY_DEPENDENT_VOLUME_RESPONSE;
 
@@ -10572,14 +10572,14 @@ SEC_ENTRY
 SspiMarshalAuthIdentity(
     _In_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE AuthIdentity,
     _Out_ PULONG AuthIdentityLength,
-    _Deref_out__bcount(*AuthIdentityLength) PCHAR* AuthIdentityByteArray);
+    _Outptr_result_bytebuffer_(*AuthIdentityLength) PCHAR* AuthIdentityByteArray);
 
 SECURITY_STATUS
 SEC_ENTRY
 SspiUnmarshalAuthIdentity(
     _In_ PULONG AuthIdentityLength,
-    _In__bcount(AuthIdentityLength) PCHAR AuthIdentityByteArray,
-    _Deref_out_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE* ppAuthIdentity);
+    _In_reads_bytes_(AuthIdentityLength) PCHAR AuthIdentityByteArray,
+    _Outptr_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE* ppAuthIdentity);
 
 BOOLEAN
 SEC_ENTRY
@@ -10590,14 +10590,14 @@ SECURITY_STATUS
 SEC_ENTRY
 SspiGetTargetHostName(
     _In_ PCWSTR pszTargetName,
-    _Deref_out_ PWSTR* pszHostName);
+    _Outptr_ PWSTR* pszHostName);
 
 SECURITY_STATUS
 SEC_ENTRY
 SspiExcludePackage(
     _In_opt_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE AuthIdentity,
     _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_ONLY 0x08
diff --git a/reactos/include/ddk/wdm.h b/reactos/include/ddk/wdm.h
index a1ef206c78a..e6b8cb91c1a 100644
--- a/reactos/include/ddk/wdm.h
+++ b/reactos/include/ddk/wdm.h
@@ -1033,7 +1033,7 @@ typedef struct _KWAIT_BLOCK {
   struct _KWAIT_BLOCK *NextWaitBlock;
   USHORT WaitKey;
   UCHAR WaitType;
-#if (NTDDI_VERSION >= NTDDI_LONGHORN)
+#if (NTDDI_VERSION >= NTDDI_WIN7)
   volatile UCHAR BlockState;
 #else
   UCHAR SpareByte;
diff --git a/reactos/include/xdk/iotypes.h b/reactos/include/xdk/iotypes.h
index 2bd4f2f450b..15178acad42 100644
--- a/reactos/include/xdk/iotypes.h
+++ b/reactos/include/xdk/iotypes.h
@@ -6588,8 +6588,8 @@ typedef struct _STORAGE_QUERY_DEPENDENT_VOLUME_RESPONSE {
   ULONG ResponseLevel;
   ULONG NumberEntries;
   _ANONYMOUS_UNION union {
-    STORAGE_QUERY_DEPENDENT_VOLUME_LEV1_ENTRY Lev1Depends[];
-    STORAGE_QUERY_DEPENDENT_VOLUME_LEV2_ENTRY Lev2Depends[];
+    STORAGE_QUERY_DEPENDENT_VOLUME_LEV1_ENTRY Lev1Depends[0];
+    STORAGE_QUERY_DEPENDENT_VOLUME_LEV2_ENTRY Lev2Depends[0];
   } DUMMYUNIONNAME;
 } STORAGE_QUERY_DEPENDENT_VOLUME_RESPONSE, *PSTORAGE_QUERY_DEPENDENT_VOLUME_RESPONSE;
 
diff --git a/reactos/include/xdk/ketypes.h b/reactos/include/xdk/ketypes.h
index 5790ec61570..8a8c6d3996f 100644
--- a/reactos/include/xdk/ketypes.h
+++ b/reactos/include/xdk/ketypes.h
@@ -463,7 +463,7 @@ typedef struct _KWAIT_BLOCK {
   struct _KWAIT_BLOCK *NextWaitBlock;
   USHORT WaitKey;
   UCHAR WaitType;
-#if (NTDDI_VERSION >= NTDDI_LONGHORN)
+#if (NTDDI_VERSION >= NTDDI_WIN7)
   volatile UCHAR BlockState;
 #else
   UCHAR SpareByte;
diff --git a/reactos/include/xdk/sspi.h b/reactos/include/xdk/sspi.h
index 40be2fc4ef1..be393de6068 100644
--- a/reactos/include/xdk/sspi.h
+++ b/reactos/include/xdk/sspi.h
@@ -1234,14 +1234,14 @@ SEC_ENTRY
 SspiMarshalAuthIdentity(
     _In_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE AuthIdentity,
     _Out_ PULONG AuthIdentityLength,
-    _Deref_out__bcount(*AuthIdentityLength) PCHAR* AuthIdentityByteArray);
+    _Outptr_result_bytebuffer_(*AuthIdentityLength) PCHAR* AuthIdentityByteArray);
 
 SECURITY_STATUS
 SEC_ENTRY
 SspiUnmarshalAuthIdentity(
     _In_ PULONG AuthIdentityLength,
-    _In__bcount(AuthIdentityLength) PCHAR AuthIdentityByteArray,
-    _Deref_out_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE* ppAuthIdentity);
+    _In_reads_bytes_(AuthIdentityLength) PCHAR AuthIdentityByteArray,
+    _Outptr_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE* ppAuthIdentity);
 
 BOOLEAN
 SEC_ENTRY
@@ -1252,14 +1252,14 @@ SECURITY_STATUS
 SEC_ENTRY
 SspiGetTargetHostName(
     _In_ PCWSTR pszTargetName,
-    _Deref_out_ PWSTR* pszHostName);
+    _Outptr_ PWSTR* pszHostName);
 
 SECURITY_STATUS
 SEC_ENTRY
 SspiExcludePackage(
     _In_opt_ PSEC_WINNT_AUTH_IDENTITY_OPAQUE AuthIdentity,
     _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_ONLY 0x08