diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-02-01 18:54:54 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-02-04 22:16:10 -0600 |
commit | cede270b2bd3da6bd8d5205b8834e786c8d6c1ce (patch) | |
tree | fc37ad41e0a03f67fc2a8946231e519551cdcc95 /src/engine/apply.cpp | |
parent | f1f1a124df59e8639c2bcbfa7d3a4b37fb348bb7 (diff) | |
download | wix-cede270b2bd3da6bd8d5205b8834e786c8d6c1ce.tar.gz wix-cede270b2bd3da6bd8d5205b8834e786c8d6c1ce.tar.bz2 wix-cede270b2bd3da6bd8d5205b8834e786c8d6c1ce.zip |
Remove feature to uninstall compatible orphaned MSI packages.
Diffstat (limited to 'src/engine/apply.cpp')
-rw-r--r-- | src/engine/apply.cpp | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/engine/apply.cpp b/src/engine/apply.cpp index 8e5099d9..dd4932aa 100644 --- a/src/engine/apply.cpp +++ b/src/engine/apply.cpp | |||
@@ -199,10 +199,6 @@ static HRESULT ExecuteDependencyAction( | |||
199 | __in BURN_EXECUTE_ACTION* pAction, | 199 | __in BURN_EXECUTE_ACTION* pAction, |
200 | __in BURN_EXECUTE_CONTEXT* pContext | 200 | __in BURN_EXECUTE_CONTEXT* pContext |
201 | ); | 201 | ); |
202 | static HRESULT ExecuteCompatiblePackageAction( | ||
203 | __in BURN_ENGINE_STATE* pEngineState, | ||
204 | __in BURN_EXECUTE_ACTION* pAction | ||
205 | ); | ||
206 | static HRESULT ExecuteMsiBeginTransaction( | 202 | static HRESULT ExecuteMsiBeginTransaction( |
207 | __in BURN_ENGINE_STATE* pEngineState, | 203 | __in BURN_ENGINE_STATE* pEngineState, |
208 | __in BURN_ROLLBACK_BOUNDARY* pRollbackBoundary, | 204 | __in BURN_ROLLBACK_BOUNDARY* pRollbackBoundary, |
@@ -1727,11 +1723,6 @@ static HRESULT DoExecuteAction( | |||
1727 | ExitOnFailure(hr, "Failed to execute dependency action."); | 1723 | ExitOnFailure(hr, "Failed to execute dependency action."); |
1728 | break; | 1724 | break; |
1729 | 1725 | ||
1730 | case BURN_EXECUTE_ACTION_TYPE_COMPATIBLE_PACKAGE: | ||
1731 | hr = ExecuteCompatiblePackageAction(pEngineState, pExecuteAction); | ||
1732 | ExitOnFailure(hr, "Failed to execute compatible package action."); | ||
1733 | break; | ||
1734 | |||
1735 | case BURN_EXECUTE_ACTION_TYPE_REGISTRATION: | 1726 | case BURN_EXECUTE_ACTION_TYPE_REGISTRATION: |
1736 | *pfKeepRegistration = pExecuteAction->registration.fKeep; | 1727 | *pfKeepRegistration = pExecuteAction->registration.fKeep; |
1737 | break; | 1728 | break; |
@@ -2183,25 +2174,6 @@ LExit: | |||
2183 | return hr; | 2174 | return hr; |
2184 | } | 2175 | } |
2185 | 2176 | ||
2186 | static HRESULT ExecuteCompatiblePackageAction( | ||
2187 | __in BURN_ENGINE_STATE* pEngineState, | ||
2188 | __in BURN_EXECUTE_ACTION* pAction | ||
2189 | ) | ||
2190 | { | ||
2191 | HRESULT hr = S_OK; | ||
2192 | |||
2193 | if (pAction->compatiblePackage.pReferencePackage->fPerMachine) | ||
2194 | { | ||
2195 | hr = ElevationLoadCompatiblePackageAction(pEngineState->companionConnection.hPipe, pAction); | ||
2196 | ExitOnFailure(hr, "Failed to load compatible package on per-machine package."); | ||
2197 | } | ||
2198 | |||
2199 | // Compatible package already loaded in this process. | ||
2200 | |||
2201 | LExit: | ||
2202 | return hr; | ||
2203 | } | ||
2204 | |||
2205 | static HRESULT ExecuteMsiBeginTransaction( | 2177 | static HRESULT ExecuteMsiBeginTransaction( |
2206 | __in BURN_ENGINE_STATE* pEngineState, | 2178 | __in BURN_ENGINE_STATE* pEngineState, |
2207 | __in BURN_ROLLBACK_BOUNDARY* pRollbackBoundary, | 2179 | __in BURN_ROLLBACK_BOUNDARY* pRollbackBoundary, |