Some small SAL annotation fixups
Rob Mensching committed
Feb 9, 2023 at 05:03 UTC
dc8a7f2398602f994c3e43a733aa09b18dbd7662
4 files changed
+15
-15
src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
+8
-8
@@ -110,7 +110,7 @@ public: // IBootstrapperApplication
110
__in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
111
__in_z LPCWSTR /*wzBundleTag*/,
112
__in BOOL /*fPerMachine*/,
113
- __in LPCWSTR /*wzVersion*/,
113
+ __in_z LPCWSTR /*wzVersion*/,
114
__in BOOL /*fMissingFromCache*/,
115
__inout BOOL* pfCancel
116
)
@@ -134,7 +134,7 @@ public: // IBootstrapperApplication
134
__in DWORD64 /*dw64Size*/,
135
__in_z_opt LPCWSTR /*wzHash*/,
136
__in BOOTSTRAPPER_UPDATE_HASH_TYPE /*hashAlgorithm*/,
137
- __in LPCWSTR /*wzVersion*/,
137
+ __in_z LPCWSTR /*wzVersion*/,
138
__in_z LPCWSTR /*wzTitle*/,
139
__in_z LPCWSTR /*wzSummary*/,
140
__in_z LPCWSTR /*wzContentType*/,
@@ -160,7 +160,7 @@ public: // IBootstrapperApplication
160
__in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
161
__in_z LPCWSTR /*wzBundleTag*/,
162
__in BOOL /*fPerMachine*/,
163
- __in LPCWSTR /*wzVersion*/,
163
+ __in_z LPCWSTR /*wzVersion*/,
164
__in BOOL /*fMissingFromCache*/,
165
__inout BOOL* pfCancel
166
)
@@ -181,7 +181,7 @@ public: // IBootstrapperApplication
181
virtual STDMETHODIMP OnDetectCompatibleMsiPackage(
182
__in_z LPCWSTR /*wzPackageId*/,
183
__in_z LPCWSTR /*wzCompatiblePackageId*/,
184
- __in LPCWSTR /*wzCompatiblePackageVersion*/,
184
+ __in_z LPCWSTR /*wzCompatiblePackageVersion*/,
185
__inout BOOL* pfCancel
186
)
187
{
@@ -194,7 +194,7 @@ public: // IBootstrapperApplication
194
__in_z LPCWSTR /*wzUpgradeCode*/,
195
__in_z LPCWSTR /*wzProductCode*/,
196
__in BOOL /*fPerMachine*/,
197
- __in LPCWSTR /*wzVersion*/,
197
+ __in_z LPCWSTR /*wzVersion*/,
198
__in BOOTSTRAPPER_RELATED_OPERATION /*operation*/,
199
__inout BOOL* pfCancel
200
)
@@ -294,7 +294,7 @@ public: // IBootstrapperApplication
294
virtual STDMETHODIMP OnPlanCompatibleMsiPackageBegin(
295
__in_z LPCWSTR /*wzPackageId*/,
296
__in_z LPCWSTR /*wzCompatiblePackageId*/,
297
- __in LPCWSTR /*wzCompatiblePackageVersion*/,
297
+ __in_z LPCWSTR /*wzCompatiblePackageVersion*/,
298
__in BOOL /*fRecommendedRemove*/,
299
__inout BOOL* /*pfRequestRemove*/,
300
__inout BOOL* pfCancel
@@ -976,7 +976,7 @@ public: // IBootstrapperApplication
976
__in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
977
__in_z LPCWSTR /*wzBundleTag*/,
978
__in BOOL /*fPerMachine*/,
979
- __in LPCWSTR /*wzVersion*/,
979
+ __in_z LPCWSTR /*wzVersion*/,
980
__in BOOL /*fRecommendedIgnoreBundle*/,
981
__inout BOOL* pfCancel,
982
__inout BOOL* /*pfIgnoreBundle*/
@@ -1109,7 +1109,7 @@ public: // IBootstrapperApplication
1109
__in_z LPCWSTR /*wzBundleId*/,
1110
__in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
1111
__in BOOL /*fPerMachine*/,
1112
- __in LPCWSTR /*wzVersion*/,
1112
+ __in_z LPCWSTR /*wzVersion*/,
1113
__inout BOOL* pfCancel
1114
)
1115
{
src/api/burn/balutil/inc/balinfo.h
+3
-3
@@ -115,7 +115,7 @@ typedef struct _BAL_INFO_COMMAND
115
BalInfoParseCommandLine - parses wzCommandLine from BOOTSTRAPPER_COMMAND.
116
117
********************************************************************/
118
-HRESULT DAPI BalInfoParseCommandLine(
118
+DAPI_(HRESULT) BalInfoParseCommandLine(
119
__in BAL_INFO_COMMAND* pCommand,
120
__in const BOOTSTRAPPER_COMMAND* pBootstrapperCommand
121
);
@@ -181,7 +181,7 @@ DAPI_(void) BalInfoUninitialize(
181
BalInfoUninitializeCommandLine - uninitializes BAL_INFO_COMMAND.
182
183
********************************************************************/
184
-void DAPI BalInfoUninitializeCommandLine(
184
+DAPI_(void) BalInfoUninitializeCommandLine(
185
__in BAL_INFO_COMMAND* pCommand
186
);
187
@@ -190,7 +190,7 @@ void DAPI BalInfoUninitializeCommandLine(
190
BalInfoSetOverridableVariablesFromEngine - sets overridable variables from command line.
191
192
********************************************************************/
193
-HRESULT DAPI BalSetOverridableVariablesFromEngine(
193
+DAPI_(HRESULT) BalSetOverridableVariablesFromEngine(
194
__in BAL_INFO_OVERRIDABLE_VARIABLES* pOverridableVariables,
195
__in BAL_INFO_COMMAND* pCommand,
196
__in IBootstrapperEngine* pEngine
src/libs/dutil/WixToolset.DUtil/inc/locutil.h
+2
-2
@@ -46,7 +46,7 @@ HRESULT DAPI LocProbeForFile(
46
__in_z LPCWSTR wzBasePath,
47
__in_z LPCWSTR wzLocFileName,
48
__in_z_opt LPCWSTR wzLanguage,
49
- __inout LPWSTR* psczPath
49
+ __deref_out_z LPWSTR* psczPath
50
);
51
52
/********************************************************************
@@ -84,7 +84,7 @@ void DAPI LocFree(
84
*******************************************************************/
85
HRESULT DAPI LocLocalizeString(
86
__in const WIX_LOCALIZATION* pWixLoc,
87
- __inout LPWSTR* psczInput
87
+ __deref_out_z LPWSTR* psczInput
88
);
89
90
/********************************************************************
src/libs/dutil/WixToolset.DUtil/locutil.cpp
+2
-2
@@ -62,7 +62,7 @@ extern "C" HRESULT DAPI LocProbeForFile(
62
__in_z LPCWSTR wzBasePath,
63
__in_z LPCWSTR wzLocFileName,
64
__in_z_opt LPCWSTR wzLanguage,
65
- __inout LPWSTR* psczPath
65
+ __deref_out_z LPWSTR* psczPath
66
)
67
{
68
HRESULT hr = S_OK;
@@ -286,7 +286,7 @@ extern "C" void DAPI LocFree(
286
287
extern "C" HRESULT DAPI LocLocalizeString(
288
__in const WIX_LOCALIZATION* pWixLoc,
289
- __inout LPWSTR* ppsczInput
289
+ __deref_out_z LPWSTR* ppsczInput
290
)
291
{
292
Assert(ppsczInput && pWixLoc);