@joebigelow / wix-1 / commits / b49ab4e0

Enable warning to detect hidden base class functions

Sean Hall committed Nov 8, 2021 at 15:01 UTC b49ab4e082127e450b266c25218905c94495892e
3 files changed +5 -3
src/Directory.vcxproj.props
+1 -1
@@ -35,7 +35,7 @@
35 <TreatWarningAsError>true</TreatWarningAsError>
36 <ExceptionHandling>false</ExceptionHandling>
37 <ControlFlowGuard>Guard</ControlFlowGuard>
38 - <AdditionalOptions>-YlprecompDefine</AdditionalOptions>
38 + <AdditionalOptions>-YlprecompDefine /w44263</AdditionalOptions>
39 <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
40 <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) &gt; 4 ">true</MultiProcessorCompilation>
41 </ClCompile>
src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp
+2 -1
@@ -8,6 +8,7 @@ class CWixSampleBAFunctions : public CBalBaseBAFunctions
8 {
9 public: // IBootstrapperApplication
10 virtual STDMETHODIMP OnDetectBegin(
11 + __in BOOL fCached,
12 __in BOOL fInstalled,
13 __in DWORD cPackages,
14 __inout BOOL* pfCancel
@@ -15,7 +16,7 @@ public: // IBootstrapperApplication
16 {
17 HRESULT hr = S_OK;
18
18 - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Running detect begin BA function. fInstalled=%d, cPackages=%u, fCancel=%d", fInstalled, cPackages, *pfCancel);
19 + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Running detect begin BA function. fCached=%d, fInstalled=%d, cPackages=%u, fCancel=%d", fCached, fInstalled, cPackages, *pfCancel);
20
21 //-------------------------------------------------------------------------------------------------
22 // YOUR CODE GOES HERE
src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp
+2 -1
@@ -275,7 +275,8 @@ public: // IBootstrapperApplication
275 virtual STDMETHODIMP OnDetectPackageComplete(
276 __in LPCWSTR wzPackageId,
277 __in HRESULT /*hrStatus*/,
278 - __in BOOTSTRAPPER_PACKAGE_STATE state
278 + __in BOOTSTRAPPER_PACKAGE_STATE state,
279 + __in BOOL /*fCached*/
280 )
281 {
282 WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL;