Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 07:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[INCLUDE]

Browse source 
- Add some missing 64 bit intrinsics
- Fix a warning in intsafe.h
- Use SAL2 annotations in sspi.h
- Fix some annotations

svn path=/trunk/; revision=59094
This commit is contained in:
Timo Kreuzer 2013-05-27 20:55:23 +00:00
parent 9ec0fe4e61
commit 5057af6764
4 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/include/crt/msc/intrin.h
View file

@ -191,6 +191,12 @@ unsigned char _BitScanForward(unsigned long * Index, unsigned long Mask);
#pragma intrinsic(_BitScanForward) #pragma intrinsic(_BitScanForward)
unsigned char _BitScanReverse(unsigned long * Index, unsigned long Mask); unsigned char _BitScanReverse(unsigned long * Index, unsigned long Mask);
#pragma intrinsic(_BitScanReverse) #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); unsigned char _bittest(const long * a, long b);
#pragma intrinsic(_bittest) #pragma intrinsic(_bittest)
unsigned char _bittestandcomplement(long * a, long b); unsigned char _bittestandcomplement(long * a, long b);

4
reactos/include/ndk/obfuncs.h
View file

@ -74,7 +74,7 @@ NTAPI
ObCreateObjectType( ObCreateObjectType(
_In_ PUNICODE_STRING TypeName, _In_ PUNICODE_STRING TypeName,
_In_ POBJECT_TYPE_INITIALIZER ObjectTypeInitializer, _In_ POBJECT_TYPE_INITIALIZER ObjectTypeInitializer,
_In_ PVOID Reserved, _Reserved_ PVOID Reserved,
_Out_ POBJECT_TYPE *ObjectType _Out_ POBJECT_TYPE *ObjectType
); );
@ -111,7 +111,7 @@ ObOpenObjectByName(
_In_ KPROCESSOR_MODE AccessMode, _In_ KPROCESSOR_MODE AccessMode,
_In_opt_ PACCESS_STATE PassedAccessState, _In_opt_ PACCESS_STATE PassedAccessState,
_In_ ACCESS_MASK DesiredAccess, _In_ ACCESS_MASK DesiredAccess,
_Inout_ PVOID ParseContext, _Inout_opt_ PVOID ParseContext,
_Out_ PHANDLE Handle _Out_ PHANDLE Handle
); );

4
reactos/include/psdk/intsafe.h
View file

@ -340,7 +340,7 @@ INTSAFE_NAME(_Name)( \
_In_ _TypeFrom Input, \ _In_ _TypeFrom Input, \
_Out_ _Deref_out_range_(==, Input) _TypeTo *pOutput) \ _Out_ _Deref_out_range_(==, Input) _TypeTo *pOutput) \
{ \ { \
if ((Input >= 0) && (Input <= _TypeTo ## _MAX)) \ if ((Input >= 0) && ((_TypeTo)Input <= _TypeTo ## _MAX)) \
{ \ { \
*pOutput = (_TypeTo)Input; \ *pOutput = (_TypeTo)Input; \
return INTSAFE_SUCCESS; \ return INTSAFE_SUCCESS; \
@ -694,7 +694,7 @@ INTSAFE_NAME(ULongLongMult)(
#define DEFINE_SAFE_MULT_U32(_Name, _Type, _Convert) \ #define DEFINE_SAFE_MULT_U32(_Name, _Type, _Convert) \
__checkReturn \ _Must_inspect_result_ \
__forceinline \ __forceinline \
INTSAFE_RESULT \ INTSAFE_RESULT \
INTSAFE_NAME(_Name)( \ INTSAFE_NAME(_Name)( \

10
reactos/include/xdk/sspi.h
View file

@ -379,7 +379,7 @@ typedef struct _SecBuffer
#ifdef MIDL_PASS #ifdef MIDL_PASS
MIDL_PROP([size_is(cbBuffer)]) PCHAR pvBuffer; MIDL_PROP([size_is(cbBuffer)]) PCHAR pvBuffer;
#else #else
__field_bcount(cbBuffer) void SEC_FAR *pvBuffer; _Field_size_bytes_(cbBuffer) void SEC_FAR *pvBuffer;
#endif #endif
} SecBuffer, *PSecBuffer; } SecBuffer, *PSecBuffer;
@ -387,7 +387,7 @@ typedef struct _SecBufferDesc
{ {
ULONG ulVersion; ULONG ulVersion;
ULONG cBuffers; 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; } SecBufferDesc, SEC_FAR *PSecBufferDesc;
typedef struct _SecPkgInfoW typedef struct _SecPkgInfoW
@ -498,17 +498,17 @@ typedef struct _SecPkgContext_KeyInfoW
typedef struct _SecPkgContext_SessionKey typedef struct _SecPkgContext_SessionKey
{ {
ULONG SessionKeyLength; ULONG SessionKeyLength;
__field_bcount(SessionKeyLength) PUCHAR SessionKey; _Field_size_bytes_(SessionKeyLength) PUCHAR SessionKey;
} SecPkgContext_SessionKey, *PSecPkgContext_SessionKey; } SecPkgContext_SessionKey, *PSecPkgContext_SessionKey;
typedef struct _SecPkgContext_NegoKeys typedef struct _SecPkgContext_NegoKeys
{ {
ULONG KeyType; ULONG KeyType;
USHORT KeyLength; USHORT KeyLength;
__field_bcount(KeyLength) PUCHAR KeyValue; _Field_size_bytes_(KeyLength) PUCHAR KeyValue;
ULONG VerifyKeyType; ULONG VerifyKeyType;
USHORT VerifyKeyLength; USHORT VerifyKeyLength;
__field_bcount(VerifyKeyLength) PUCHAR VerifyKeyValue; _Field_size_bytes_(VerifyKeyLength) PUCHAR VerifyKeyValue;
} SecPkgContext_NegoKeys, *PSecPkgContext_NegoKeys; } SecPkgContext_NegoKeys, *PSecPkgContext_NegoKeys;
typedef struct _SecPkgContext_DceInfo typedef struct _SecPkgContext_DceInfo