[ros-diffs] [tkreuzer] 59094: [INCLUDE] - Add some missing 64 bit intrinsics - Fix a warning in intsafe.h - Use SAL2 annotations in sspi.h - Fix some annotations

Author: tkreuzer
Date: Mon May 27 20:55:23 2013
New Revision: 59094

URL: http://svn.reactos.org/svn/reactos?rev=59094&view=rev
Log:
[INCLUDE]
- Add some missing 64 bit intrinsics
- Fix a warning in intsafe.h
- Use SAL2 annotations in sspi.h
- Fix some annotations

Modified:
    trunk/reactos/include/crt/msc/intrin.h
    trunk/reactos/include/ndk/obfuncs.h
    trunk/reactos/include/psdk/intsafe.h
    trunk/reactos/include/xdk/sspi.h

Modified: trunk/reactos/include/crt/msc/intrin.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/intrin.h?r…
==============================================================================
--- trunk/reactos/include/crt/msc/intrin.h	[iso-8859-1] (original)
+++ trunk/reactos/include/crt/msc/intrin.h	[iso-8859-1] Mon May 27 20:55:23 2013
@@ -191,6 +191,12 @@
 #pragma intrinsic(_BitScanForward)
 unsigned char _BitScanReverse(unsigned long * Index, unsigned long Mask);
 #pragma intrinsic(_BitScanReverse)
+#ifdef _WIN64
+unsigned char _BitScanForward64(unsigned long * Index, unsigned long long Mask);
+#pragma intrinsic(_BitScanForward64)
+unsigned char _BitScanReverse64(unsigned long * Index, unsigned long long Mask);
+#pragma intrinsic(_BitScanReverse64)
+#endif
 unsigned char _bittest(const long * a, long b);
 #pragma intrinsic(_bittest)
 unsigned char _bittestandcomplement(long * a, long b);

Modified: trunk/reactos/include/ndk/obfuncs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/obfuncs.h?rev=…
==============================================================================
--- trunk/reactos/include/ndk/obfuncs.h	[iso-8859-1] (original)
+++ trunk/reactos/include/ndk/obfuncs.h	[iso-8859-1] Mon May 27 20:55:23 2013
@@ -74,7 +74,7 @@
 ObCreateObjectType(
     _In_ PUNICODE_STRING TypeName,
     _In_ POBJECT_TYPE_INITIALIZER ObjectTypeInitializer,
-    _In_ PVOID Reserved,
+    _Reserved_ PVOID Reserved,
     _Out_ POBJECT_TYPE *ObjectType
 );
 
@@ -111,7 +111,7 @@
     _In_ KPROCESSOR_MODE AccessMode,
     _In_opt_ PACCESS_STATE PassedAccessState,
     _In_ ACCESS_MASK DesiredAccess,
-    _Inout_ PVOID ParseContext,
+    _Inout_opt_ PVOID ParseContext,
     _Out_ PHANDLE Handle
 );
 

Modified: trunk/reactos/include/psdk/intsafe.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intsafe.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/intsafe.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/intsafe.h	[iso-8859-1] Mon May 27 20:55:23 2013
@@ -340,7 +340,7 @@
     _In_ _TypeFrom Input, \
     _Out_ _Deref_out_range_(==, Input) _TypeTo *pOutput) \
 { \
-    if ((Input >= 0) && (Input <= _TypeTo ## _MAX)) \
+    if ((Input >= 0) && ((_TypeTo)Input <= _TypeTo ## _MAX)) \
     { \
         *pOutput = (_TypeTo)Input; \
         return INTSAFE_SUCCESS; \
@@ -694,7 +694,7 @@
 
 
 #define DEFINE_SAFE_MULT_U32(_Name, _Type, _Convert) \
-__checkReturn \
+_Must_inspect_result_ \
 __forceinline \
 INTSAFE_RESULT \
 INTSAFE_NAME(_Name)( \

Modified: trunk/reactos/include/xdk/sspi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/sspi.h?rev=590…
==============================================================================
--- trunk/reactos/include/xdk/sspi.h	[iso-8859-1] (original)
+++ trunk/reactos/include/xdk/sspi.h	[iso-8859-1] Mon May 27 20:55:23 2013
@@ -379,7 +379,7 @@
 #ifdef MIDL_PASS
     MIDL_PROP([size_is(cbBuffer)]) PCHAR pvBuffer;
 #else
-    __field_bcount(cbBuffer) void SEC_FAR *pvBuffer;
+    _Field_size_bytes_(cbBuffer) void SEC_FAR *pvBuffer;
 #endif
 } SecBuffer, *PSecBuffer;
 
@@ -387,7 +387,7 @@
 {
     ULONG ulVersion;
     ULONG cBuffers;
-    MIDL_PROP([size_is(cBuffers)]) __field_ecount(cBuffers) PSecBuffer pBuffers;
+    MIDL_PROP([size_is(cBuffers)]) _Field_size_(cBuffers) PSecBuffer pBuffers;
 } SecBufferDesc, SEC_FAR *PSecBufferDesc;
 
 typedef struct _SecPkgInfoW
@@ -498,17 +498,17 @@
 typedef struct _SecPkgContext_SessionKey
 {
     ULONG SessionKeyLength;
-    __field_bcount(SessionKeyLength) PUCHAR SessionKey;
+    _Field_size_bytes_(SessionKeyLength) PUCHAR SessionKey;
 } SecPkgContext_SessionKey, *PSecPkgContext_SessionKey;
 
 typedef struct _SecPkgContext_NegoKeys
 {
     ULONG KeyType;
     USHORT KeyLength;
-    __field_bcount(KeyLength) PUCHAR KeyValue;
+    _Field_size_bytes_(KeyLength) PUCHAR KeyValue;
     ULONG  VerifyKeyType;
     USHORT VerifyKeyLength;
-    __field_bcount(VerifyKeyLength) PUCHAR VerifyKeyValue;
+    _Field_size_bytes_(VerifyKeyLength) PUCHAR VerifyKeyValue;
 } SecPkgContext_NegoKeys, *PSecPkgContext_NegoKeys;
 
 typedef struct _SecPkgContext_DceInfo