[ros-diffs] [tkreuzer] 58348: [PSDK] Add some more annotations to driverspecs.h

Author: tkreuzer
Date: Fri Feb 22 12:58:06 2013
New Revision: 58348

URL: http://svn.reactos.org/svn/reactos?rev=58348&view=rev
Log:
[PSDK]
Add some more annotations to driverspecs.h

Modified:
    trunk/reactos/include/psdk/driverspecs.h
    trunk/reactos/include/psdk/sal.h

Modified: trunk/reactos/include/psdk/driverspecs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/driverspecs.h…
==============================================================================
--- trunk/reactos/include/psdk/driverspecs.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/driverspecs.h [iso-8859-1] Fri Feb 22 12:58:06 2013
@@ -34,7 +34,7 @@
 #define _IRQL_uses_cancel_
 #define __drv_setsIRQL(irql)
 
-#define _Dispatch_type_                                 _Function_class_
+#define _Dispatch_type_                             _Function_class_
 #define _Kernel_clear_do_init_(yesNo)               _Post_
_SA_annotes1(SAL_clearDoInit,yesNo)
 #define _Kernel_float_restored_                     _Post_
_SA_annotes0(SAL_floatRestored)
 #define _Kernel_float_saved_                        _Post_ _SA_annotes0(SAL_floatSaved)
@@ -45,44 +45,44 @@
 #define _Kernel_requires_resource_not_held_(kind)   _Pre_ _SA_annotes1(SAL_neverHold,
#kind)
 #define _Kernel_acquires_resource_(kind)            _Post_ _SA_annotes1(SAL_acquire,
#kind)
 
-#define __drv_acquiresCancelSpinLock
-#define __drv_acquiresCriticalRegion
-#define __drv_acquiresExclusiveResource(kind)
-#define __drv_acquiresExclusiveResourceGlobal(kind,param)
-#define __drv_acquiresPriorityRegion
-#define __drv_acquiresResource(kind)
-#define __drv_acquiresResourceGlobal(kind,param)
-#define __drv_aliasesMem                _Post_ _SA_annotes0(SAL_IsAliased)
-#define __drv_allocatesMem(kind)        _Post_ _SA_annotes1(SAL_NeedsRelease,__yes)
-#define __drv_arg(expr,annotes)         _At_(expr,annotes)
-#define __drv_at(expr,annotes)          _At_(expr,annotes)
-#define __drv_callbackType(kind)        _SA_annotes1(SAL_callbackType, #kind)
-#define __drv_clearDoInit
-#define __drv_completionType(kindlist)
-#define __drv_constant
-#define __drv_defined(x)
-#define __drv_deref(annotes)
-#define __drv_dispatchType_other
-#define __drv_dispatchType(x)
-#define __drv_floatRestored
-#define __drv_floatSaved
-#define __drv_floatUsed
-#define __drv_formatString(kind)
-#define __drv_freesMem(kind)            _Post_ _SA_annotes1(SAL_NeedsRelease,__no)
-#define __drv_fun(annotes)
-#define __drv_functionClass
-#define __drv_holdsCancelSpinLock()    
_Holds_resource_global_("CancelSpinLock",)
-#define __drv_holdsCriticalRegion()    
_Holds_resource_global_("CriticalRegion",)
-#define __drv_holdsPriorityRegion()    
_Holds_resource_global_("PriorityRegion",)
-#define __drv_in_deref(annotes)
-#define __drv_in(annotes)
-#define __drv_innerAcquiresGlobal(kind,param)
+#define __drv_acquiresCancelSpinLock               
_Acquires_nonreentrant_lock_(_Global_cancel_spin_lock_)
+#define __drv_acquiresCriticalRegion               
_Acquires_lock_(_Global_critical_region_)
+#define __drv_acquiresExclusiveResource(kind)       _Acquires_nonreentrant_lock_(_Curr_)
+#define __drv_acquiresExclusiveResourceGlobal(kind,param)  
_Acquires_nonreentrant_lock_(param)
+#define __drv_acquiresPriorityRegion               
_Acquires_lock_(_Global_priority_region_)
+#define __drv_acquiresResource(kind)                _Acquires_lock_(_Curr_)
+#define __drv_acquiresResourceGlobal(kind,param)    _Acquires_lock_(param)
+#define __drv_aliasesMem                            _Post_ _SA_annotes0(SAL_IsAliased)
+#define __drv_allocatesMem(kind)                    _Post_
_SA_annotes1(SAL_NeedsRelease,__yes)
+#define __drv_arg(expr,annotes)                     _At_(expr,annotes)
+#define __drv_at(expr,annotes)                      _At_(expr,annotes)
+#define __drv_callbackType(kind)                    _SA_annotes1(SAL_callbackType,
#kind)
+#define __drv_clearDoInit                           _Kernel_clear_do_init_
+#define __drv_completionType(kindlist)              _SA_annotes1(SAL_completionType,
#kindlist)
+#define __drv_constant                              _Literal_
+#define __drv_defined(x)                            _Macro_defined_(#x)
+#define __drv_deref(annotes)                        __deref _Group_(annotes)
+#define __drv_dispatchType_other                    _Dispatch_type_(IRP_MJ_OTHER)
+#define __drv_dispatchType(x)                       _Dispatch_type_(x)
+#define __drv_floatRestored                         _Kernel_float_restored_
+#define __drv_floatSaved                            _Kernel_float_saved_
+#define __drv_floatUsed                             _Kernel_float_used_
+#define __drv_formatString(kind)                    _SA_annotes1(SAL_IsFormatString,
#kind)
+#define __drv_freesMem(kind)                        _Post_
_SA_annotes1(SAL_NeedsRelease,__no)
+#define __drv_fun(annotes)                          _At_(return, annotes)
+#define __drv_functionClass                         _Function_class_
+#define __drv_holdsCancelSpinLock()                
_Holds_resource_global_("CancelSpinLock",)
+#define __drv_holdsCriticalRegion()                
_Holds_resource_global_("CriticalRegion",)
+#define __drv_holdsPriorityRegion()                
_Holds_resource_global_("PriorityRegion",)
+#define __drv_in_deref(annotes)                     _Pre_ __deref _Group_(annotes)
+#define __drv_in(annotes)                           _Pre_ _Group_(annotes)
+#define __drv_innerAcquiresGlobal(kind,param)       _Post_
_SA_annotes2(SAL_acquireGlobal, #kind, param\t)
 #define __drv_innerMustHoldGlobal(kind,param)
 #define __drv_innerNeverHoldGlobal(kind,param)
 #define __drv_innerReleasesGlobal(kind,param)
 #define __drv_interlocked
 #define __drv_IoGetDmaAdapter
-#define __drv_isCancelIRQL              _IRQL_is_cancel_
+#define __drv_isCancelIRQL                          _IRQL_is_cancel_
 #define __drv_isObjectPointer
 #define __drv_KMDF
 #define __drv_maxFunctionIRQL

Modified: trunk/reactos/include/psdk/sal.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=583…
==============================================================================
--- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Fri Feb 22 12:58:06 2013
@@ -35,7 +35,7 @@
 #endif // ]
 
 /* Check for deprecated use of declspecs for sal */
-#if _USE_DECLSPECS_FOR_SAL // [
+#if defined(_USE_DECLSPECS_FOR_SAL) && _USE_DECLSPECS_FOR_SAL // [
 #pragma message("declspecs for sal are deprecated.")
 #ifdef _PREFAST_ // [
 #error Support for _USE_DECLSPECS_FOR_SAL is dropped