6 files changed, 0 insertions, 47 deletions

diff --git a/src/api/burn/balutil/inc/BAFunctions.h b/src/api/burn/balutil/inc/BAFunctions.h
index 9be3f62f..c1057ab6 100644
--- a/src/api/burn/balutil/inc/BAFunctions.h
+++ b/src/api/burn/balutil/inc/BAFunctions.h
@@ -15,7 +15,6 @@ enum BA_FUNCTIONS_MESSAGE
     BA_FUNCTIONS_MESSAGE_ONPLANCOMPLETE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPLETE,
     BA_FUNCTIONS_MESSAGE_ONSTARTUP = BOOTSTRAPPER_APPLICATION_MESSAGE_ONSTARTUP,
     BA_FUNCTIONS_MESSAGE_ONSHUTDOWN = BOOTSTRAPPER_APPLICATION_MESSAGE_ONSHUTDOWN,
-    BA_FUNCTIONS_MESSAGE_ONSYSTEMSHUTDOWN = BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMSHUTDOWN,
     BA_FUNCTIONS_MESSAGE_ONDETECTFORWARDCOMPATIBLEBUNDLE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTFORWARDCOMPATIBLEBUNDLE,
     BA_FUNCTIONS_MESSAGE_ONDETECTUPDATEBEGIN = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTUPDATEBEGIN,
     BA_FUNCTIONS_MESSAGE_ONDETECTUPDATE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTUPDATE,
diff --git a/src/api/burn/balutil/inc/BalBaseBAFunctions.h b/src/api/burn/balutil/inc/BalBaseBAFunctions.h
index 9ff58d2b..ca070553 100644
--- a/src/api/burn/balutil/inc/BalBaseBAFunctions.h
+++ b/src/api/burn/balutil/inc/BalBaseBAFunctions.h
@@ -98,14 +98,6 @@ public: // IBootstrapperApplication
         return S_OK;
     }
 
-    virtual STDMETHODIMP OnSystemShutdown(
-        __in DWORD /*dwEndSession*/,
-        __inout BOOL* /*pfCancel*/
-        )
-    {
-        return S_OK;
-    }
-
     virtual STDMETHODIMP OnDetectBegin(
         __in BOOL /*fCached*/,
         __in BOOTSTRAPPER_REGISTRATION_TYPE /*registrationType*/,
diff --git a/src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h b/src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h
index 4564ad0c..ff92717d 100644
--- a/src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h
+++ b/src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h
@@ -86,7 +86,6 @@ static HRESULT WINAPI BalBaseBAFunctionsProc(
         case BA_FUNCTIONS_MESSAGE_ONPLANCOMPLETE:
         case BA_FUNCTIONS_MESSAGE_ONSTARTUP:
         case BA_FUNCTIONS_MESSAGE_ONSHUTDOWN:
-        case BA_FUNCTIONS_MESSAGE_ONSYSTEMSHUTDOWN:
         case BA_FUNCTIONS_MESSAGE_ONDETECTFORWARDCOMPATIBLEBUNDLE:
         case BA_FUNCTIONS_MESSAGE_ONDETECTUPDATEBEGIN:
         case BA_FUNCTIONS_MESSAGE_ONDETECTUPDATE:
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
         return S_OK;
     }
 
-    virtual STDMETHODIMP OnSystemShutdown(
-        __in DWORD dwEndSession,
-        __inout BOOL* pfCancel
-        )
-    {
-        HRESULT hr = S_OK;
-
-        // Allow requests to shut down when critical or not applying.
-        *pfCancel = !(ENDSESSION_CRITICAL & dwEndSession || !m_fApplying);
-
-        return hr;
-    }
-
     virtual STDMETHODIMP OnDetectBegin(
         __in BOOL /*fCached*/,
         __in BOOTSTRAPPER_REGISTRATION_TYPE /*registrationType*/,
@@ -406,8 +393,6 @@ public: // IBootstrapperApplication
         __inout BOOL* pfCancel
         )
     {
-        m_fApplying = TRUE;
-
         m_dwProgressPercentage = 0;
         m_dwOverallProgressPercentage = 0;
 
@@ -859,8 +844,6 @@ public: // IBootstrapperApplication
             *pAction = BOOTSTRAPPER_APPLYCOMPLETE_ACTION_RESTART;
         }
 
-        m_fApplying = FALSE;
-
         return hr;
     }
 
@@ -1183,7 +1166,6 @@ protected:
         ::InitializeCriticalSection(&m_csCanceled);
         m_fCanceled = FALSE;
         m_BalInfoCommand = { };
-        m_fApplying = FALSE;
         m_fRollingBack = FALSE;
 
         m_dwProgressPercentage = 0;
@@ -1212,7 +1194,6 @@ private:
     BOOTSTRAPPER_DISPLAY m_display;
     IBootstrapperEngine* m_pEngine;
 
-    BOOL m_fApplying;
     BOOL m_fRollingBack;
 
     DWORD m_dwProgressPercentage;
diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h b/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h
index e35678ad..92243540 100644
--- a/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h
+++ b/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h
@@ -63,15 +63,6 @@ static HRESULT BalBaseBAProcOnShutdown(
     return pBA->OnShutdown(&pResults->action);
 }
 
-static HRESULT BalBaseBAProcOnSystemShutdown(
-    __in IBootstrapperApplication* pBA,
-    __in BA_ONSYSTEMSHUTDOWN_ARGS* pArgs,
-    __inout BA_ONSYSTEMSHUTDOWN_RESULTS* pResults
-    )
-{
-    return pBA->OnSystemShutdown(pArgs->dwEndSession, &pResults->fCancel);
-}
-
 static HRESULT BalBaseBAProcOnDetectForwardCompatibleBundle(
     __in IBootstrapperApplication* pBA,
     __in BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_ARGS* pArgs,
@@ -803,9 +794,6 @@ static HRESULT WINAPI BalBaseBootstrapperApplicationProc(
         case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSHUTDOWN:
             hr = BalBaseBAProcOnShutdown(pBA, reinterpret_cast<BA_ONSHUTDOWN_ARGS*>(pvArgs), reinterpret_cast<BA_ONSHUTDOWN_RESULTS*>(pvResults));
             break;
-        case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMSHUTDOWN:
-            hr = BalBaseBAProcOnSystemShutdown(pBA, reinterpret_cast<BA_ONSYSTEMSHUTDOWN_ARGS*>(pvArgs), reinterpret_cast<BA_ONSYSTEMSHUTDOWN_RESULTS*>(pvResults));
-            break;
         case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTFORWARDCOMPATIBLEBUNDLE:
             hr = BalBaseBAProcOnDetectForwardCompatibleBundle(pBA, reinterpret_cast<BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_ARGS*>(pvArgs), reinterpret_cast<BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_RESULTS*>(pvResults));
             break;
diff --git a/src/api/burn/balutil/inc/IBootstrapperApplication.h b/src/api/burn/balutil/inc/IBootstrapperApplication.h
index 6eca90fa..382d5aad 100644
--- a/src/api/burn/balutil/inc/IBootstrapperApplication.h
+++ b/src/api/burn/balutil/inc/IBootstrapperApplication.h
@@ -33,12 +33,6 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
         __inout BOOTSTRAPPER_SHUTDOWN_ACTION* pAction
         ) = 0;
 
-    // OnSystemShutdown - called when the operating system is instructed to shutdown the machine.
-    STDMETHOD(OnSystemShutdown)(
-        __in DWORD dwEndSession,
-        __inout BOOL* pfCancel
-        ) = 0;
-
     // OnDetectBegin - called when the engine begins detection.
     STDMETHOD(OnDetectBegin)(
         __in BOOL fCached,