diff options
Diffstat (limited to 'src/engine/msiengine.cpp')
-rw-r--r-- | src/engine/msiengine.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/engine/msiengine.cpp b/src/engine/msiengine.cpp index c298e219..688be7af 100644 --- a/src/engine/msiengine.cpp +++ b/src/engine/msiengine.cpp | |||
@@ -856,7 +856,7 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage( | |||
856 | // Calculate the rollback action if there is an execute action. | 856 | // Calculate the rollback action if there is an execute action. |
857 | if (BOOTSTRAPPER_ACTION_STATE_NONE != execute && !fInsideMsiTransaction) | 857 | if (BOOTSTRAPPER_ACTION_STATE_NONE != execute && !fInsideMsiTransaction) |
858 | { | 858 | { |
859 | switch (BOOTSTRAPPER_PACKAGE_STATE_UNKNOWN != pPackage->expected ? pPackage->expected : pPackage->currentState) | 859 | switch (pPackage->currentState) |
860 | { | 860 | { |
861 | case BOOTSTRAPPER_PACKAGE_STATE_PRESENT: __fallthrough; | 861 | case BOOTSTRAPPER_PACKAGE_STATE_PRESENT: __fallthrough; |
862 | case BOOTSTRAPPER_PACKAGE_STATE_SUPERSEDED: | 862 | case BOOTSTRAPPER_PACKAGE_STATE_SUPERSEDED: |
@@ -1322,12 +1322,6 @@ extern "C" HRESULT MsiEngineExecutePackage( | |||
1322 | // | 1322 | // |
1323 | switch (pExecuteAction->msiPackage.action) | 1323 | switch (pExecuteAction->msiPackage.action) |
1324 | { | 1324 | { |
1325 | case BOOTSTRAPPER_ACTION_STATE_ADMIN_INSTALL: | ||
1326 | hr = StrAllocConcatSecure(&sczProperties, L" ACTION=ADMIN", 0); | ||
1327 | ExitOnFailure(hr, "Failed to add ADMIN property on admin install."); | ||
1328 | __fallthrough; | ||
1329 | |||
1330 | case BOOTSTRAPPER_ACTION_STATE_MAJOR_UPGRADE: __fallthrough; | ||
1331 | case BOOTSTRAPPER_ACTION_STATE_INSTALL: | 1325 | case BOOTSTRAPPER_ACTION_STATE_INSTALL: |
1332 | hr = StrAllocConcatSecure(&sczProperties, L" REBOOT=ReallySuppress", 0); | 1326 | hr = StrAllocConcatSecure(&sczProperties, L" REBOOT=ReallySuppress", 0); |
1333 | ExitOnFailure(hr, "Failed to add reboot suppression property on install."); | 1327 | ExitOnFailure(hr, "Failed to add reboot suppression property on install."); |