summaryrefslogtreecommitdiff
path: root/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2022-05-03 15:30:50 -0500
committerSean Hall <r.sean.hall@gmail.com>2022-05-04 10:05:21 -0500
commit29f7e00586412163a20e298fbf84505f8a917425 (patch)
tree30257a3544f6982ded159443ebed0eb933f11a51 /src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
parent41d2c12d60ee84cefc26ec99abb328701883c8f5 (diff)
downloadwix-29f7e00586412163a20e298fbf84505f8a917425.tar.gz
wix-29f7e00586412163a20e298fbf84505f8a917425.tar.bz2
wix-29f7e00586412163a20e298fbf84505f8a917425.zip
Only block shutdown during Apply.
Diffstat (limited to 'src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h')
-rw-r--r--src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h19
1 files changed, 0 insertions, 19 deletions
diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
index 2e848df7..fc9c4dd7 100644
--- a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
+++ b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
@@ -94,19 +94,6 @@ public: // IBootstrapperApplication
94 return S_OK; 94 return S_OK;
95 } 95 }
96 96
97 virtual STDMETHODIMP OnSystemShutdown(
98 __in DWORD dwEndSession,
99 __inout BOOL* pfCancel
100 )
101 {
102 HRESULT hr = S_OK;
103
104 // Allow requests to shut down when critical or not applying.
105 *pfCancel = !(ENDSESSION_CRITICAL & dwEndSession || !m_fApplying);
106
107 return hr;
108 }
109
110 virtual STDMETHODIMP OnDetectBegin( 97 virtual STDMETHODIMP OnDetectBegin(
111 __in BOOL /*fCached*/, 98 __in BOOL /*fCached*/,
112 __in BOOTSTRAPPER_REGISTRATION_TYPE /*registrationType*/, 99 __in BOOTSTRAPPER_REGISTRATION_TYPE /*registrationType*/,
@@ -406,8 +393,6 @@ public: // IBootstrapperApplication
406 __inout BOOL* pfCancel 393 __inout BOOL* pfCancel
407 ) 394 )
408 { 395 {
409 m_fApplying = TRUE;
410
411 m_dwProgressPercentage = 0; 396 m_dwProgressPercentage = 0;
412 m_dwOverallProgressPercentage = 0; 397 m_dwOverallProgressPercentage = 0;
413 398
@@ -859,8 +844,6 @@ public: // IBootstrapperApplication
859 *pAction = BOOTSTRAPPER_APPLYCOMPLETE_ACTION_RESTART; 844 *pAction = BOOTSTRAPPER_APPLYCOMPLETE_ACTION_RESTART;
860 } 845 }
861 846
862 m_fApplying = FALSE;
863
864 return hr; 847 return hr;
865 } 848 }
866 849
@@ -1183,7 +1166,6 @@ protected:
1183 ::InitializeCriticalSection(&m_csCanceled); 1166 ::InitializeCriticalSection(&m_csCanceled);
1184 m_fCanceled = FALSE; 1167 m_fCanceled = FALSE;
1185 m_BalInfoCommand = { }; 1168 m_BalInfoCommand = { };
1186 m_fApplying = FALSE;
1187 m_fRollingBack = FALSE; 1169 m_fRollingBack = FALSE;
1188 1170
1189 m_dwProgressPercentage = 0; 1171 m_dwProgressPercentage = 0;
@@ -1212,7 +1194,6 @@ private:
1212 BOOTSTRAPPER_DISPLAY m_display; 1194 BOOTSTRAPPER_DISPLAY m_display;
1213 IBootstrapperEngine* m_pEngine; 1195 IBootstrapperEngine* m_pEngine;
1214 1196
1215 BOOL m_fApplying;
1216 BOOL m_fRollingBack; 1197 BOOL m_fRollingBack;
1217 1198
1218 DWORD m_dwProgressPercentage; 1199 DWORD m_dwProgressPercentage;