aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-11-08 15:01:35 -0600
committerSean Hall <r.sean.hall@gmail.com>2021-11-10 17:33:25 -0600
commitb49ab4e082127e450b266c25218905c94495892e (patch)
tree3790b3a6d639e6499ed0bf88515dede99eab305e
parent5e9406d6ea6f6fb02236be36ebfcbd09c17b07dd (diff)
downloadwix-b49ab4e082127e450b266c25218905c94495892e.tar.gz
wix-b49ab4e082127e450b266c25218905c94495892e.tar.bz2
wix-b49ab4e082127e450b266c25218905c94495892e.zip
Enable warning to detect hidden base class functions
-rw-r--r--src/Directory.vcxproj.props2
-rw-r--r--src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp3
-rw-r--r--src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp3
3 files changed, 5 insertions, 3 deletions
diff --git a/src/Directory.vcxproj.props b/src/Directory.vcxproj.props
index d0953841..95f828ec 100644
--- a/src/Directory.vcxproj.props
+++ b/src/Directory.vcxproj.props
@@ -35,7 +35,7 @@
35 <TreatWarningAsError>true</TreatWarningAsError> 35 <TreatWarningAsError>true</TreatWarningAsError>
36 <ExceptionHandling>false</ExceptionHandling> 36 <ExceptionHandling>false</ExceptionHandling>
37 <ControlFlowGuard>Guard</ControlFlowGuard> 37 <ControlFlowGuard>Guard</ControlFlowGuard>
38 <AdditionalOptions>-YlprecompDefine</AdditionalOptions> 38 <AdditionalOptions>-YlprecompDefine /w44263</AdditionalOptions>
39 <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> 39 <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
40 <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) &gt; 4 ">true</MultiProcessorCompilation> 40 <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) &gt; 4 ">true</MultiProcessorCompilation>
41 </ClCompile> 41 </ClCompile>
diff --git a/src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp b/src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp
index 531b86a3..870b219b 100644
--- a/src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp
+++ b/src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp
@@ -8,6 +8,7 @@ class CWixSampleBAFunctions : public CBalBaseBAFunctions
8{ 8{
9public: // IBootstrapperApplication 9public: // IBootstrapperApplication
10 virtual STDMETHODIMP OnDetectBegin( 10 virtual STDMETHODIMP OnDetectBegin(
11 __in BOOL fCached,
11 __in BOOL fInstalled, 12 __in BOOL fInstalled,
12 __in DWORD cPackages, 13 __in DWORD cPackages,
13 __inout BOOL* pfCancel 14 __inout BOOL* pfCancel
@@ -15,7 +16,7 @@ public: // IBootstrapperApplication
15 { 16 {
16 HRESULT hr = S_OK; 17 HRESULT hr = S_OK;
17 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);
19 20
20 //------------------------------------------------------------------------------------------------- 21 //-------------------------------------------------------------------------------------------------
21 // YOUR CODE GOES HERE 22 // YOUR CODE GOES HERE
diff --git a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp
index d1b18cb3..4d819c7d 100644
--- a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp
+++ b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp
@@ -275,7 +275,8 @@ public: // IBootstrapperApplication
275 virtual STDMETHODIMP OnDetectPackageComplete( 275 virtual STDMETHODIMP OnDetectPackageComplete(
276 __in LPCWSTR wzPackageId, 276 __in LPCWSTR wzPackageId,
277 __in HRESULT /*hrStatus*/, 277 __in HRESULT /*hrStatus*/,
278 __in BOOTSTRAPPER_PACKAGE_STATE state 278 __in BOOTSTRAPPER_PACKAGE_STATE state,
279 __in BOOL /*fCached*/
279 ) 280 )
280 { 281 {
281 WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL; 282 WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL;