Update rest of dutil to use their own source with the Exit* macros.

Fix some CA warnings.

17 files changed, 34 insertions, 34 deletions

diff --git a/src/dutil/inc/atomutil.h b/src/dutil/inc/atomutil.h
index ff869c4a..9acfc1d5 100644
--- a/src/dutil/inc/atomutil.h
+++ b/src/dutil/inc/atomutil.h
@@ -138,7 +138,7 @@ HRESULT DAPI AtomParseFromDocument(
     );
 
 void DAPI AtomFreeFeed(
-    __in_xcount(pFeed->cItems) ATOM_FEED *pFEED
+    __in_xcount(pFeed->cItems) ATOM_FEED* pFeed
     );
 
 #ifdef __cplusplus
diff --git a/src/dutil/inc/buffutil.h b/src/dutil/inc/buffutil.h
index a718e9c0..7509f76a 100644
--- a/src/dutil/inc/buffutil.h
+++ b/src/dutil/inc/buffutil.h
@@ -50,37 +50,37 @@ HRESULT BuffReadStream(
     __in_bcount(cbBuffer) const BYTE* pbBuffer,
     __in SIZE_T cbBuffer,
     __inout SIZE_T* piBuffer,
-    __deref_out_bcount(*pcbStream) BYTE** ppbStream,
+    __deref_inout_bcount(*pcbStream) BYTE** ppbStream,
     __out SIZE_T* pcbStream
     );
 
 HRESULT BuffWriteNumber(
-    __deref_out_bcount(*piBuffer) BYTE** ppbBuffer,
+    __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
     __inout SIZE_T* piBuffer,
     __in DWORD_PTR dw
     );
 HRESULT BuffWriteNumber64(
-    __deref_out_bcount(*piBuffer) BYTE** ppbBuffer,
+    __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
     __inout SIZE_T* piBuffer,
     __in DWORD64 dw64
     );
 HRESULT BuffWritePointer(
-    __deref_out_bcount(*piBuffer) BYTE** ppbBuffer,
+    __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
     __inout SIZE_T* piBuffer,
     __in DWORD_PTR dw
 );
 HRESULT BuffWriteString(
-    __deref_out_bcount(*piBuffer) BYTE** ppbBuffer,
+    __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
     __inout SIZE_T* piBuffer,
     __in_z_opt LPCWSTR scz
     );
 HRESULT BuffWriteStringAnsi(
-    __deref_out_bcount(*piBuffer) BYTE** ppbBuffer,
+    __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
     __inout SIZE_T* piBuffer,
     __in_z_opt LPCSTR scz
     );
 HRESULT BuffWriteStream(
-    __deref_out_bcount(*piBuffer) BYTE** ppbBuffer,
+    __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
     __inout SIZE_T* piBuffer,
     __in_bcount(cbStream) const BYTE* pbStream,
     __in SIZE_T cbStream
diff --git a/src/dutil/inc/conutil.h b/src/dutil/inc/conutil.h
index 5f611d01..38aaea84 100644
--- a/src/dutil/inc/conutil.h
+++ b/src/dutil/inc/conutil.h
@@ -55,12 +55,12 @@ HRESULT DAPI ConsoleReadW(
     );
 
 HRESULT DAPI ConsoleReadStringA(
-    __deref_out_ecount_part(cchCharBuffer,*pcchNumCharReturn) LPSTR* szCharBuffer,
+    __deref_inout_ecount_part(cchCharBuffer,*pcchNumCharReturn) LPSTR* szCharBuffer,
     CONST DWORD cchCharBuffer,
     __out DWORD* pcchNumCharReturn
     );
 HRESULT DAPI ConsoleReadStringW(
-    __deref_out_ecount_part(cchCharBuffer,*pcchNumCharReturn) LPWSTR* szCharBuffer,
+    __deref_inout_ecount_part(cchCharBuffer,*pcchNumCharReturn) LPWSTR* szCharBuffer,
     CONST DWORD cchCharBuffer,
     __out DWORD* pcchNumCharReturn
     );
diff --git a/src/dutil/inc/deputil.h b/src/dutil/inc/deputil.h
index 8f5f0ae8..bfe235f3 100644
--- a/src/dutil/inc/deputil.h
+++ b/src/dutil/inc/deputil.h
@@ -55,7 +55,7 @@ DAPI_(HRESULT) DepCheckDependency(
 DAPI_(HRESULT) DepCheckDependents(
     __in HKEY hkHive,
     __in_z LPCWSTR wzProviderKey,
-    __in int iAttributes,
+    __reserved int iAttributes,
     __in C_STRINGDICT_HANDLE sdIgnoredDependents,
     __deref_inout_ecount_opt(*pcDependents) DEPENDENCY** prgDependents,
     __inout LPUINT pcDependents
diff --git a/src/dutil/inc/dutil.h b/src/dutil/inc/dutil.h
index 15d45d21..fc9ec0f4 100644
--- a/src/dutil/inc/dutil.h
+++ b/src/dutil/inc/dutil.h
@@ -44,7 +44,7 @@ void DAPI DutilUninitialize();
 void DAPI Dutil_SetAssertModule(__in HMODULE hAssertModule);
 void DAPI Dutil_SetAssertDisplayFunction(__in DUTIL_ASSERTDISPLAYFUNCTION pfn);
 void DAPI Dutil_Assert(__in_z LPCSTR szFile, __in int iLine);
-void DAPI Dutil_AssertSz(__in_z LPCSTR szFile, __in int iLine, __in_z LPCSTR szMessage);
+void DAPI Dutil_AssertSz(__in_z LPCSTR szFile, __in int iLine, __in_z __format_string LPCSTR szMessage);
 
 void DAPI Dutil_TraceSetLevel(__in REPORT_LEVEL ll, __in BOOL fTraceFilenames);
 REPORT_LEVEL DAPI Dutil_TraceGetLevel();
diff --git a/src/dutil/inc/eseutil.h b/src/dutil/inc/eseutil.h
index 1c408927..bea47b2b 100644
--- a/src/dutil/inc/eseutil.h
+++ b/src/dutil/inc/eseutil.h
@@ -160,7 +160,7 @@ HRESULT DAPI EseGetColumnBinary(
     __in JET_SESID jsSession,
     __in ESE_TABLE_SCHEMA tsTable,
     __in DWORD dwColumn,
-    __deref_out_bcount(*piBuffer) BYTE** ppbBuffer,
+    __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
     __inout SIZE_T* piBuffer
     );
 HRESULT DAPI EseGetColumnDword(
diff --git a/src/dutil/inc/fileutil.h b/src/dutil/inc/fileutil.h
index d2b2f4fe..7caa62b8 100644
--- a/src/dutil/inc/fileutil.h
+++ b/src/dutil/inc/fileutil.h
@@ -121,7 +121,7 @@ HRESULT DAPI FileReadPartial(
     __in BOOL fPartialOK
     );
 HRESULT DAPI FileReadPartialEx(
-    __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest,
+    __deref_inout_bcount_full(*pcbDest) LPBYTE* ppbDest,
     __out_range(<=, cbMaxRead) SIZE_T* pcbDest,
     __in_z LPCWSTR wzSrcPath,
     __in BOOL fSeek,
diff --git a/src/dutil/inc/inetutil.h b/src/dutil/inc/inetutil.h
index 4cbf510b..19ace88b 100644
--- a/src/dutil/inc/inetutil.h
+++ b/src/dutil/inc/inetutil.h
@@ -30,7 +30,7 @@ HRESULT DAPI InternetQueryInfoString(
 HRESULT DAPI InternetQueryInfoNumber(
     __in HINTERNET h,
     __in DWORD dwInfo,
-    __out LONG* plInfo
+    __inout LONG* plInfo
     );
 
 #ifdef __cplusplus
diff --git a/src/dutil/inc/iniutil.h b/src/dutil/inc/iniutil.h
index d5b50c17..c8503155 100644
--- a/src/dutil/inc/iniutil.h
+++ b/src/dutil/inc/iniutil.h
@@ -55,7 +55,7 @@ HRESULT DAPI IniParse(
 // (their value will be NULL)
 HRESULT DAPI IniGetValueList(
     __in_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle,
-    __deref_out_ecount_opt(pcValues) INI_VALUE** prgivValues,
+    __deref_out_ecount_opt(*pcValues) INI_VALUE** prgivValues,
     __out DWORD *pcValues
     );
 HRESULT DAPI IniGetValue(
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(
     __in DWORD dwNewItemCount
     );
 HRESULT DAPI MemEnsureArraySize(
-    __deref_out_bcount(cArray * cbArrayType) LPVOID* ppvArray,
+    __deref_inout_bcount(cArray * cbArrayType) LPVOID* ppvArray,
     __in DWORD cArray,
     __in SIZE_T cbArrayType,
     __in DWORD dwGrowthCount
     );
 HRESULT DAPI MemInsertIntoArray(
-    __deref_out_bcount((cExistingArray + cInsertItems) * cbArrayType) LPVOID* ppvArray,
+    __deref_inout_bcount((cExistingArray + cInsertItems) * cbArrayType) LPVOID* ppvArray,
     __in DWORD dwInsertIndex,
     __in DWORD cInsertItems,
     __in DWORD cExistingArray,
@@ -61,7 +61,7 @@ void DAPI MemRemoveFromArray(
     __in BOOL fPreserveOrder
     );
 void DAPI MemArraySwapItems(
-    __inout_bcount((cExistingArray) * cbArrayType) LPVOID pvArray,
+    __inout_bcount(cbArrayType) LPVOID pvArray,
     __in DWORD dwIndex1,
     __in DWORD dwIndex2,
     __in SIZE_T cbArrayType
diff --git a/src/dutil/inc/pathutil.h b/src/dutil/inc/pathutil.h
index bee8ed1b..f4f4e59c 100644
--- a/src/dutil/inc/pathutil.h
+++ b/src/dutil/inc/pathutil.h
@@ -19,7 +19,7 @@ typedef enum PATH_EXPAND
     (i.e. quote arguments with spaces in them).
 ********************************************************************/
 DAPI_(HRESULT) PathCommandLineAppend(
-    __deref_out_z LPWSTR* psczCommandLine,
+    __deref_inout_z LPWSTR* psczCommandLine,
     __in_z LPCWSTR wzArgument
     );
 
@@ -43,7 +43,7 @@ DAPI_(LPCWSTR) PathExtension(
 ********************************************************************/
 DAPI_(HRESULT) PathGetDirectory(
     __in_z LPCWSTR wzPath,
-    __out LPWSTR *psczDirectory
+    __out_z LPWSTR *psczDirectory
     );
 
 /*******************************************************************
@@ -206,7 +206,7 @@ DAPI_(HRESULT) PathCompress(
 *******************************************************************/
 DAPI_(HRESULT) PathGetHierarchyArray(
     __in_z LPCWSTR wzPath,
-    __deref_inout_ecount_opt(*pcStrArray) LPWSTR **prgsczPathArray,
+    __deref_inout_ecount_opt(*pcPathArray) LPWSTR **prgsczPathArray,
     __inout LPUINT pcPathArray
     );
 
diff --git a/src/dutil/inc/regutil.h b/src/dutil/inc/regutil.h
index 897b9d03..2f09d244 100644
--- a/src/dutil/inc/regutil.h
+++ b/src/dutil/inc/regutil.h
@@ -50,7 +50,7 @@ typedef LSTATUS (APIENTRY *PFN_REGENUMKEYEXW)(
     __out        LPWSTR lpName,
     __inout      LPDWORD lpcName,
     __reserved   LPDWORD lpReserved,
-    __inout      LPWSTR lpClass,
+    __inout_opt  LPWSTR lpClass,
     __inout_opt  LPDWORD lpcClass,
     __out_opt    PFILETIME lpftLastWriteTime
     );
@@ -66,7 +66,7 @@ typedef LSTATUS (APIENTRY *PFN_REGENUMVALUEW)(
     );
 typedef LSTATUS (APIENTRY *PFN_REGQUERYINFOKEYW)(
     __in         HKEY hKey,
-    __out        LPWSTR lpClass,
+    __out_opt    LPWSTR lpClass,
     __inout_opt  LPDWORD lpcClass,
     __reserved   LPDWORD lpReserved,
     __out_opt    LPDWORD lpcSubKeys,
@@ -170,7 +170,7 @@ HRESULT DAPI RegReadString(
 HRESULT DAPI RegReadStringArray(
     __in HKEY hk,
     __in_z_opt LPCWSTR wzName,
-    __deref_out_ecount_opt(pcStrings) LPWSTR** prgsczStrings,
+    __deref_out_ecount_opt(*pcStrings) LPWSTR** prgsczStrings,
     __out DWORD *pcStrings
     );
 HRESULT DAPI RegReadVersion(
@@ -202,7 +202,7 @@ HRESULT DAPI RegWriteString(
 HRESULT DAPI RegWriteStringArray(
     __in HKEY hk,
     __in_z_opt LPCWSTR wzName,
-    __in_ecount(cValues) LPWSTR *rgwzStrings,
+    __in_ecount(cStrings) LPWSTR *rgwzStrings,
     __in DWORD cStrings
     );
 HRESULT DAPI RegWriteStringFormatted(
diff --git a/src/dutil/inc/shelutil.h b/src/dutil/inc/shelutil.h
index 21e82672..0b9f539d 100644
--- a/src/dutil/inc/shelutil.h
+++ b/src/dutil/inc/shelutil.h
@@ -19,9 +19,9 @@ void DAPI ShelFunctionOverride(
     );
 HRESULT DAPI ShelExec(
     __in_z LPCWSTR wzTargetPath,
-    __in_opt LPCWSTR wzParameters,
-    __in_opt LPCWSTR wzVerb,
-    __in_opt LPCWSTR wzWorkingDirectory,
+    __in_z_opt LPCWSTR wzParameters,
+    __in_z_opt LPCWSTR wzVerb,
+    __in_z_opt LPCWSTR wzWorkingDirectory,
     __in int nShowCmd,
     __in_opt HWND hwndParent,
     __out_opt HANDLE* phProcess
diff --git a/src/dutil/inc/strutil.h b/src/dutil/inc/strutil.h
index 187bfda8..cf8c751c 100644
--- a/src/dutil/inc/strutil.h
+++ b/src/dutil/inc/strutil.h
@@ -198,7 +198,7 @@ HRESULT DAPI StrAllocBase85Decode(
 
 HRESULT DAPI MultiSzLen(
     __in_ecount(*pcch) __nullnullterminated LPCWSTR pwzMultiSz,
-    __out SIZE_T* pcbch
+    __out SIZE_T* pcch
     );
 HRESULT DAPI MultiSzPrepend(
     __deref_inout_ecount(*pcchMultiSz) __nullnullterminated LPWSTR* ppwzMultiSz,
@@ -222,7 +222,7 @@ HRESULT DAPI MultiSzRemoveString(
     __in DWORD_PTR dwIndex
     );
 HRESULT DAPI MultiSzInsertString(
-    __deref_inout_z LPWSTR* ppwzMultiSz,
+    __deref_inout __nullnullterminated LPWSTR* ppwzMultiSz,
     __inout_opt SIZE_T* pcchMultiSz,
     __in DWORD_PTR dwIndex,
     __in_z LPCWSTR pwzInsert
diff --git a/src/dutil/inc/thmutil.h b/src/dutil/inc/thmutil.h
index 11eac9c2..d3dd6d21 100644
--- a/src/dutil/inc/thmutil.h
+++ b/src/dutil/inc/thmutil.h
@@ -737,7 +737,7 @@ HRESULT DAPI ThemeSetTextControlEx(
 HRESULT DAPI ThemeGetTextControl(
     __in const THEME* pTheme,
     __in DWORD dwControl,
-    __out_z LPWSTR* psczText
+    __inout_z LPWSTR* psczText
     );
 
 /********************************************************************
diff --git a/src/dutil/inc/uriutil.h b/src/dutil/inc/uriutil.h
index 52e78308..d6dfdd6b 100644
--- a/src/dutil/inc/uriutil.h
+++ b/src/dutil/inc/uriutil.h
@@ -91,7 +91,7 @@ HRESULT DAPI UriResolve(
     __in_z LPCWSTR wzUri,
     __in_opt LPCWSTR wzBaseUri,
     __out LPWSTR* ppwzResolvedUri,
-    __out_opt const URI_PROTOCOL* pResolvedProtocol
+    __out_opt URI_PROTOCOL* pResolvedProtocol
     );
 
 #ifdef __cplusplus
diff --git a/src/dutil/inc/wiutil.h b/src/dutil/inc/wiutil.h
index 10d003b0..9c2de209 100644
--- a/src/dutil/inc/wiutil.h
+++ b/src/dutil/inc/wiutil.h
@@ -330,7 +330,7 @@ HRESULT DAPI WiuEnumRelatedProducts(
     );
 HRESULT DAPI WiuEnumRelatedProductCodes(
     __in_z LPCWSTR wzUpgradeCode,
-    __deref_out_ecount_opt(pcRelatedProducts) LPWSTR** prgsczProductCodes,
+    __deref_out_ecount_opt(*pcRelatedProducts) LPWSTR** prgsczProductCodes,
     __out DWORD* pcRelatedProducts,
     __in BOOL fReturnHighestVersionOnly
     );