Some small SAL annotation fixups

4 files changed, 15 insertions, 15 deletions

diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
index c8b80d13..ae7b2a93 100644
--- a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
+++ b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
@@ -110,7 +110,7 @@ public: // IBootstrapperApplication
         __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
         __in_z LPCWSTR /*wzBundleTag*/,
         __in BOOL /*fPerMachine*/,
-        __in LPCWSTR /*wzVersion*/,
+        __in_z LPCWSTR /*wzVersion*/,
         __in BOOL /*fMissingFromCache*/,
         __inout BOOL* pfCancel
         )
@@ -134,7 +134,7 @@ public: // IBootstrapperApplication
         __in DWORD64 /*dw64Size*/,
         __in_z_opt LPCWSTR /*wzHash*/,
         __in BOOTSTRAPPER_UPDATE_HASH_TYPE /*hashAlgorithm*/,
-        __in LPCWSTR /*wzVersion*/,
+        __in_z LPCWSTR /*wzVersion*/,
         __in_z LPCWSTR /*wzTitle*/,
         __in_z LPCWSTR /*wzSummary*/,
         __in_z LPCWSTR /*wzContentType*/,
@@ -160,7 +160,7 @@ public: // IBootstrapperApplication
         __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
         __in_z LPCWSTR /*wzBundleTag*/,
         __in BOOL /*fPerMachine*/,
-        __in LPCWSTR /*wzVersion*/,
+        __in_z LPCWSTR /*wzVersion*/,
         __in BOOL /*fMissingFromCache*/,
         __inout BOOL* pfCancel
         )
@@ -181,7 +181,7 @@ public: // IBootstrapperApplication
     virtual STDMETHODIMP OnDetectCompatibleMsiPackage(
         __in_z LPCWSTR /*wzPackageId*/,
         __in_z LPCWSTR /*wzCompatiblePackageId*/,
-        __in LPCWSTR /*wzCompatiblePackageVersion*/,
+        __in_z LPCWSTR /*wzCompatiblePackageVersion*/,
         __inout BOOL* pfCancel
         )
     {
@@ -194,7 +194,7 @@ public: // IBootstrapperApplication
         __in_z LPCWSTR /*wzUpgradeCode*/,
         __in_z LPCWSTR /*wzProductCode*/,
         __in BOOL /*fPerMachine*/,
-        __in LPCWSTR /*wzVersion*/,
+        __in_z LPCWSTR /*wzVersion*/,
         __in BOOTSTRAPPER_RELATED_OPERATION /*operation*/,
         __inout BOOL* pfCancel
         )
@@ -294,7 +294,7 @@ public: // IBootstrapperApplication
     virtual STDMETHODIMP OnPlanCompatibleMsiPackageBegin(
         __in_z LPCWSTR /*wzPackageId*/,
         __in_z LPCWSTR /*wzCompatiblePackageId*/,
-        __in LPCWSTR /*wzCompatiblePackageVersion*/,
+        __in_z LPCWSTR /*wzCompatiblePackageVersion*/,
         __in BOOL /*fRecommendedRemove*/,
         __inout BOOL* /*pfRequestRemove*/,
         __inout BOOL* pfCancel
@@ -976,7 +976,7 @@ public: // IBootstrapperApplication
         __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
         __in_z LPCWSTR /*wzBundleTag*/,
         __in BOOL /*fPerMachine*/,
-        __in LPCWSTR /*wzVersion*/,
+        __in_z LPCWSTR /*wzVersion*/,
         __in BOOL /*fRecommendedIgnoreBundle*/,
         __inout BOOL* pfCancel,
         __inout BOOL* /*pfIgnoreBundle*/
@@ -1109,7 +1109,7 @@ public: // IBootstrapperApplication
         __in_z LPCWSTR /*wzBundleId*/,
         __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
         __in BOOL /*fPerMachine*/,
-        __in LPCWSTR /*wzVersion*/,
+        __in_z LPCWSTR /*wzVersion*/,
         __inout BOOL* pfCancel
         )
     {
diff --git a/src/api/burn/balutil/inc/balinfo.h b/src/api/burn/balutil/inc/balinfo.h
index 3ef3a61a..7c607c44 100644
--- a/src/api/burn/balutil/inc/balinfo.h
+++ b/src/api/burn/balutil/inc/balinfo.h
@@ -115,7 +115,7 @@ typedef struct _BAL_INFO_COMMAND
  BalInfoParseCommandLine - parses wzCommandLine from BOOTSTRAPPER_COMMAND.
 
 ********************************************************************/
-HRESULT DAPI BalInfoParseCommandLine(
+DAPI_(HRESULT) BalInfoParseCommandLine(
     __in BAL_INFO_COMMAND* pCommand,
     __in const BOOTSTRAPPER_COMMAND* pBootstrapperCommand
     );
@@ -181,7 +181,7 @@ DAPI_(void) BalInfoUninitialize(
  BalInfoUninitializeCommandLine - uninitializes BAL_INFO_COMMAND.
 
 ********************************************************************/
-void DAPI BalInfoUninitializeCommandLine(
+DAPI_(void) BalInfoUninitializeCommandLine(
     __in BAL_INFO_COMMAND* pCommand
 );
 
@@ -190,7 +190,7 @@ void DAPI BalInfoUninitializeCommandLine(
  BalInfoSetOverridableVariablesFromEngine - sets overridable variables from command line.
 
  ********************************************************************/
-HRESULT DAPI BalSetOverridableVariablesFromEngine(
+DAPI_(HRESULT) BalSetOverridableVariablesFromEngine(
     __in BAL_INFO_OVERRIDABLE_VARIABLES* pOverridableVariables,
     __in BAL_INFO_COMMAND* pCommand,
     __in IBootstrapperEngine* pEngine
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/locutil.h b/src/libs/dutil/WixToolset.DUtil/inc/locutil.h
index 38ddda20..8be03a18 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/locutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/locutil.h
@@ -46,7 +46,7 @@ HRESULT DAPI LocProbeForFile(
     __in_z LPCWSTR wzBasePath,
     __in_z LPCWSTR wzLocFileName,
     __in_z_opt LPCWSTR wzLanguage,
-    __inout LPWSTR* psczPath
+    __deref_out_z LPWSTR* psczPath
     );
 
 /********************************************************************
@@ -84,7 +84,7 @@ void DAPI LocFree(
 *******************************************************************/
 HRESULT DAPI LocLocalizeString(
     __in const WIX_LOCALIZATION* pWixLoc,
-    __inout LPWSTR* psczInput
+    __deref_out_z LPWSTR* psczInput
     );
 
 /********************************************************************
diff --git a/src/libs/dutil/WixToolset.DUtil/locutil.cpp b/src/libs/dutil/WixToolset.DUtil/locutil.cpp
index 318468b4..5ea3f814 100644
--- a/src/libs/dutil/WixToolset.DUtil/locutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/locutil.cpp
@@ -62,7 +62,7 @@ extern "C" HRESULT DAPI LocProbeForFile(
     __in_z LPCWSTR wzBasePath,
     __in_z LPCWSTR wzLocFileName,
     __in_z_opt LPCWSTR wzLanguage,
-    __inout LPWSTR* psczPath
+    __deref_out_z LPWSTR* psczPath
     )
 {
     HRESULT hr = S_OK;
@@ -286,7 +286,7 @@ extern "C" void DAPI LocFree(
 
 extern "C" HRESULT DAPI LocLocalizeString(
     __in const WIX_LOCALIZATION* pWixLoc,
-    __inout LPWSTR* ppsczInput
+    __deref_out_z LPWSTR* ppsczInput
     )
 {
     Assert(ppsczInput && pWixLoc);