Always reset the system component status when registering the bundle.

Finishes 4454

1 files changed, 0 insertions, 85 deletions

diff --git a/src/burn/engine/elevation.cpp b/src/burn/engine/elevation.cpp
index 3305cf62..d2c5c8c6 100644
--- a/src/burn/engine/elevation.cpp
+++ b/src/burn/engine/elevation.cpp
@@ -11,7 +11,6 @@ typedef enum _BURN_ELEVATION_MESSAGE_TYPE
     BURN_ELEVATION_MESSAGE_TYPE_APPLY_INITIALIZE,
     BURN_ELEVATION_MESSAGE_TYPE_APPLY_UNINITIALIZE,
     BURN_ELEVATION_MESSAGE_TYPE_SESSION_BEGIN,
-    BURN_ELEVATION_MESSAGE_TYPE_SESSION_RESUME,
     BURN_ELEVATION_MESSAGE_TYPE_SESSION_END,
     BURN_ELEVATION_MESSAGE_TYPE_SAVE_STATE,
     BURN_ELEVATION_MESSAGE_TYPE_CACHE_PREPARE_PACKAGE,
@@ -195,12 +194,6 @@ static HRESULT OnSessionBegin(
     __in BYTE* pbData,
     __in SIZE_T cbData
     );
-static HRESULT OnSessionResume(
-    __in BURN_REGISTRATION* pRegistration,
-    __in BURN_VARIABLES* pVariables,
-    __in BYTE* pbData,
-    __in SIZE_T cbData
-    );
 static HRESULT OnSessionEnd(
     __in BURN_CACHE* pCache,
     __in BURN_PACKAGES* pPackages,
@@ -586,48 +579,6 @@ LExit:
 }
 
 /*******************************************************************
- ElevationSessionResume - 
-
-*******************************************************************/
-extern "C" HRESULT ElevationSessionResume(
-    __in HANDLE hPipe,
-    __in_z LPCWSTR wzResumeCommandLine,
-    __in BOOL fDisableResume,
-    __in BURN_VARIABLES* pVariables,
-    __in BOOTSTRAPPER_REGISTRATION_TYPE registrationType
-    )
-{
-    HRESULT hr = S_OK;
-    BYTE* pbData = NULL;
-    SIZE_T cbData = 0;
-    DWORD dwResult = 0;
-
-    // serialize message data
-    hr = BuffWriteString(&pbData, &cbData, wzResumeCommandLine);
-    ExitOnFailure(hr, "Failed to write resume command line to message buffer.");
-
-    hr = BuffWriteNumber(&pbData, &cbData, fDisableResume);
-    ExitOnFailure(hr, "Failed to write resume flag.");
-
-    hr = BuffWriteNumber(&pbData, &cbData, (DWORD)registrationType);
-    ExitOnFailure(hr, "Failed to write registration type to message buffer.");
-
-    hr = VariableSerialize(pVariables, FALSE, &pbData, &cbData);
-    ExitOnFailure(hr, "Failed to write variables.");
-
-    // send message
-    hr = PipeSendMessage(hPipe, BURN_ELEVATION_MESSAGE_TYPE_SESSION_RESUME, pbData, cbData, NULL, NULL, &dwResult);
-    ExitOnFailure(hr, "Failed to send message to per-machine process.");
-
-    hr = (HRESULT)dwResult;
-
-LExit:
-    ReleaseBuffer(pbData);
-
-    return hr;
-}
-
-/*******************************************************************
  ElevationSessionEnd - 
 
 *******************************************************************/
@@ -2174,10 +2125,6 @@ static HRESULT ProcessElevatedChildMessage(
         hrResult = OnSessionBegin(pContext->pCache, pContext->pRegistration, pContext->pVariables, (BYTE*)pMsg->pvData, pMsg->cbData);
         break;
 
-    case BURN_ELEVATION_MESSAGE_TYPE_SESSION_RESUME:
-        hrResult = OnSessionResume(pContext->pRegistration, pContext->pVariables, (BYTE*)pMsg->pvData, pMsg->cbData);
-        break;
-
     case BURN_ELEVATION_MESSAGE_TYPE_SESSION_END:
         hrResult = OnSessionEnd(pContext->pCache, pContext->pPackages, pContext->pRegistration, pContext->pVariables, (BYTE*)pMsg->pvData, pMsg->cbData);
         break;
@@ -2539,38 +2486,6 @@ LExit:
     return hr;
 }
 
-static HRESULT OnSessionResume(
-    __in BURN_REGISTRATION* pRegistration,
-    __in BURN_VARIABLES* pVariables,
-    __in BYTE* pbData,
-    __in SIZE_T cbData
-    )
-{
-    HRESULT hr = S_OK;
-    SIZE_T iData = 0;
-    DWORD dwRegistrationType = 0;
-
-    // Deserialize message data.
-    hr = BuffReadString(pbData, cbData, &iData, &pRegistration->sczResumeCommandLine);
-    ExitOnFailure(hr, "Failed to read resume command line.");
-
-    hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&pRegistration->fDisableResume);
-    ExitOnFailure(hr, "Failed to read resume flag.");
-
-    hr = BuffReadNumber(pbData, cbData, &iData, &dwRegistrationType);
-    ExitOnFailure(hr, "Failed to read dependency registration action.");
-
-    hr = VariableDeserialize(pVariables, FALSE, pbData, cbData, &iData);
-    ExitOnFailure(hr, "Failed to read variables.");
-
-    // resume session in per-machine process
-    hr = RegistrationSessionResume(pRegistration, pVariables, (BOOTSTRAPPER_REGISTRATION_TYPE)dwRegistrationType);
-    ExitOnFailure(hr, "Failed to resume registration session.");
-
-LExit:
-    return hr;
-}
-
 static HRESULT OnSessionEnd(
     __in BURN_CACHE* pCache,
     __in BURN_PACKAGES* pPackages,