[ros-diffs] [tkreuzer] 56315: [XDK/DDK] Some fixes for Vista/Win7
tkreuzer at svn.reactos.org
tkreuzer at svn.reactos.org
Sun Apr 1 22:30:00 UTC 2012
Author: tkreuzer
Date: Sun Apr 1 22:30:00 2012
New Revision: 56315
URL: http://svn.reactos.org/svn/reactos?rev=56315&view=rev
Log:
[XDK/DDK]
Some fixes for Vista/Win7
Modified:
trunk/reactos/include/ddk/ntifs.h
trunk/reactos/include/ddk/wdm.h
trunk/reactos/include/xdk/iotypes.h
trunk/reactos/include/xdk/ketypes.h
trunk/reactos/include/xdk/sspi.h
Modified: trunk/reactos/include/ddk/ntifs.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=56315&r1=56314&r2=56315&view=diff
==============================================================================
--- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Sun Apr 1 22:30:00 2012
@@ -4501,8 +4501,8 @@
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 @@
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 @@
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
Modified: trunk/reactos/include/ddk/wdm.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=56315&r1=56314&r2=56315&view=diff
==============================================================================
--- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sun Apr 1 22:30:00 2012
@@ -1033,7 +1033,7 @@
struct _KWAIT_BLOCK *NextWaitBlock;
USHORT WaitKey;
UCHAR WaitType;
-#if (NTDDI_VERSION >= NTDDI_LONGHORN)
+#if (NTDDI_VERSION >= NTDDI_WIN7)
volatile UCHAR BlockState;
#else
UCHAR SpareByte;
Modified: trunk/reactos/include/xdk/iotypes.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iotypes.h?rev=56315&r1=56314&r2=56315&view=diff
==============================================================================
--- trunk/reactos/include/xdk/iotypes.h [iso-8859-1] (original)
+++ trunk/reactos/include/xdk/iotypes.h [iso-8859-1] Sun Apr 1 22:30:00 2012
@@ -6588,8 +6588,8 @@
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;
Modified: trunk/reactos/include/xdk/ketypes.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ketypes.h?rev=56315&r1=56314&r2=56315&view=diff
==============================================================================
--- trunk/reactos/include/xdk/ketypes.h [iso-8859-1] (original)
+++ trunk/reactos/include/xdk/ketypes.h [iso-8859-1] Sun Apr 1 22:30:00 2012
@@ -463,7 +463,7 @@
struct _KWAIT_BLOCK *NextWaitBlock;
USHORT WaitKey;
UCHAR WaitType;
-#if (NTDDI_VERSION >= NTDDI_LONGHORN)
+#if (NTDDI_VERSION >= NTDDI_WIN7)
volatile UCHAR BlockState;
#else
UCHAR SpareByte;
Modified: trunk/reactos/include/xdk/sspi.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/sspi.h?rev=56315&r1=56314&r2=56315&view=diff
==============================================================================
--- trunk/reactos/include/xdk/sspi.h [iso-8859-1] (original)
+++ trunk/reactos/include/xdk/sspi.h [iso-8859-1] Sun Apr 1 22:30:00 2012
@@ -1234,14 +1234,14 @@
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 @@
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
More information about the Ros-diffs
mailing list