From 6c17a1f707cdee9e7f715f028ca874c7afd4f8de Mon Sep 17 00:00:00 2001
From: Brian Rogers <broger@microsoft.com>
Date: Tue, 26 Apr 2022 10:35:37 -0700
Subject: [PATCH] Update SAL annotations in TraceLoggingDynamic.h

Update the SAL annotations in TraceLoggingDynamic.h to use the recommended
SAL 2 constructs. Fixes #36
---
 etw/TraceLoggingDynamic_CPP/TraceLoggingDynamic.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/etw/TraceLoggingDynamic_CPP/TraceLoggingDynamic.h b/etw/TraceLoggingDynamic_CPP/TraceLoggingDynamic.h
index 9564860..8ab6447 100644
--- a/etw/TraceLoggingDynamic_CPP/TraceLoggingDynamic.h
+++ b/etw/TraceLoggingDynamic_CPP/TraceLoggingDynamic.h
@@ -674,7 +674,7 @@ namespace tld
             }
 
             void AddBytes(
-                _In_bytecount_(cb) void const* p,
+                _In_reads_bytes_(cb) void const* p,
                 unsigned cb)
             {
                 auto pb = static_cast<UINT8 const*>(p);
@@ -2047,7 +2047,7 @@ namespace tld
 
         void AddTrait(
             ProviderTraitType type,
-            _In_bytecount_(cbData) void const* pData,
+            _In_reads_bytes_(cbData) void const* pData,
             unsigned cbData)
         {
             this->AddU16(static_cast<UINT16>(cbData + 3));
@@ -2389,7 +2389,7 @@ namespace tld
         Note: should only be used for blittable POD types with no padding.
         */
         template<class T>
-        void AddValues(_In_count_(cValues) T const* pValues, unsigned cValues)
+        void AddValues(_In_reads_(cValues) T const* pValues, unsigned cValues)
         {
             AddBytes(pValues, sizeof(T) * cValues);
         }
@@ -3055,7 +3055,7 @@ namespace tld
         e.g. INT32, FILETIME, GUID, not for strings or structs.
         */
         template<class T>
-        void AddValues(_In_count_(cValues) T const* pValues, unsigned cValues)
+        void AddValues(_In_reads_(cValues) T const* pValues, unsigned cValues)
         {
             m_dataBuilder.AddValues(pValues, cValues);
         }