diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-03-02 14:19:14 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-03-02 15:40:02 -0600 |
commit | 10ebf674da5df9224e4eddd3545518434c5b455b (patch) | |
tree | ea1f4063edd46e9942eab94dd7adb2f75c6c589e /src/dutil/inc/memutil.h | |
parent | 3bbf1347b900ec115a12faf8f46965c9b7649696 (diff) | |
download | wix-10ebf674da5df9224e4eddd3545518434c5b455b.tar.gz wix-10ebf674da5df9224e4eddd3545518434c5b455b.tar.bz2 wix-10ebf674da5df9224e4eddd3545518434c5b455b.zip |
Update rest of dutil to use their own source with the Exit* macros.
Fix some CA warnings.
Diffstat (limited to 'src/dutil/inc/memutil.h')
-rw-r--r-- | src/dutil/inc/memutil.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dutil/inc/memutil.h b/src/dutil/inc/memutil.h index 93e53228..49f86e0a 100644 --- a/src/dutil/inc/memutil.h +++ b/src/dutil/inc/memutil.h | |||
@@ -39,13 +39,13 @@ HRESULT DAPI MemReAllocArray( | |||
39 | __in DWORD dwNewItemCount | 39 | __in DWORD dwNewItemCount |
40 | ); | 40 | ); |
41 | HRESULT DAPI MemEnsureArraySize( | 41 | HRESULT DAPI MemEnsureArraySize( |
42 | __deref_out_bcount(cArray * cbArrayType) LPVOID* ppvArray, | 42 | __deref_inout_bcount(cArray * cbArrayType) LPVOID* ppvArray, |
43 | __in DWORD cArray, | 43 | __in DWORD cArray, |
44 | __in SIZE_T cbArrayType, | 44 | __in SIZE_T cbArrayType, |
45 | __in DWORD dwGrowthCount | 45 | __in DWORD dwGrowthCount |
46 | ); | 46 | ); |
47 | HRESULT DAPI MemInsertIntoArray( | 47 | HRESULT DAPI MemInsertIntoArray( |
48 | __deref_out_bcount((cExistingArray + cInsertItems) * cbArrayType) LPVOID* ppvArray, | 48 | __deref_inout_bcount((cExistingArray + cInsertItems) * cbArrayType) LPVOID* ppvArray, |
49 | __in DWORD dwInsertIndex, | 49 | __in DWORD dwInsertIndex, |
50 | __in DWORD cInsertItems, | 50 | __in DWORD cInsertItems, |
51 | __in DWORD cExistingArray, | 51 | __in DWORD cExistingArray, |
@@ -61,7 +61,7 @@ void DAPI MemRemoveFromArray( | |||
61 | __in BOOL fPreserveOrder | 61 | __in BOOL fPreserveOrder |
62 | ); | 62 | ); |
63 | void DAPI MemArraySwapItems( | 63 | void DAPI MemArraySwapItems( |
64 | __inout_bcount((cExistingArray) * cbArrayType) LPVOID pvArray, | 64 | __inout_bcount(cbArrayType) LPVOID pvArray, |
65 | __in DWORD dwIndex1, | 65 | __in DWORD dwIndex1, |
66 | __in DWORD dwIndex2, | 66 | __in DWORD dwIndex2, |
67 | __in SIZE_T cbArrayType | 67 | __in SIZE_T cbArrayType |