diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-02-18 10:45:20 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-02-22 20:25:06 -0600 |
| commit | 837f2e309c8ef0476668c342f612dfe1bb26cb87 (patch) | |
| tree | f8a5fbef5e17e88b27a2a4cb6dc7a52f7cba4a5e /src/engine/msuengine.cpp | |
| parent | b29af5d005c2cc802aa60a123d435042038ba8ef (diff) | |
| download | wix-837f2e309c8ef0476668c342f612dfe1bb26cb87.tar.gz wix-837f2e309c8ef0476668c342f612dfe1bb26cb87.tar.bz2 wix-837f2e309c8ef0476668c342f612dfe1bb26cb87.zip | |
Only the requested state and Cache=always should affect requestedCache.
Diffstat (limited to 'src/engine/msuengine.cpp')
| -rw-r--r-- | src/engine/msuengine.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/engine/msuengine.cpp b/src/engine/msuengine.cpp index 499e1da6..91bbf361 100644 --- a/src/engine/msuengine.cpp +++ b/src/engine/msuengine.cpp | |||
| @@ -82,14 +82,12 @@ LExit: | |||
| 82 | // PlanCalculate - calculates the execute and rollback state for the requested package state. | 82 | // PlanCalculate - calculates the execute and rollback state for the requested package state. |
| 83 | // | 83 | // |
| 84 | extern "C" HRESULT MsuEnginePlanCalculatePackage( | 84 | extern "C" HRESULT MsuEnginePlanCalculatePackage( |
| 85 | __in BURN_PACKAGE* pPackage, | 85 | __in BURN_PACKAGE* pPackage |
| 86 | __out_opt BOOL* pfBARequestedCache | ||
| 87 | ) | 86 | ) |
| 88 | { | 87 | { |
| 89 | HRESULT hr = S_OK; | 88 | HRESULT hr = S_OK; |
| 90 | BOOTSTRAPPER_ACTION_STATE execute = BOOTSTRAPPER_ACTION_STATE_NONE; | 89 | BOOTSTRAPPER_ACTION_STATE execute = BOOTSTRAPPER_ACTION_STATE_NONE; |
| 91 | BOOTSTRAPPER_ACTION_STATE rollback = BOOTSTRAPPER_ACTION_STATE_NONE; | 90 | BOOTSTRAPPER_ACTION_STATE rollback = BOOTSTRAPPER_ACTION_STATE_NONE; |
| 92 | BOOL fBARequestedCache = FALSE; | ||
| 93 | BOOL fAllowUninstall = FALSE; | 91 | BOOL fAllowUninstall = FALSE; |
| 94 | 92 | ||
| 95 | // We can only uninstall MSU packages if they have a KB and we are on Win7 or newer. | 93 | // We can only uninstall MSU packages if they have a KB and we are on Win7 or newer. |
| @@ -129,10 +127,6 @@ extern "C" HRESULT MsuEnginePlanCalculatePackage( | |||
| 129 | execute = BOOTSTRAPPER_ACTION_STATE_INSTALL; | 127 | execute = BOOTSTRAPPER_ACTION_STATE_INSTALL; |
| 130 | break; | 128 | break; |
| 131 | 129 | ||
| 132 | case BOOTSTRAPPER_REQUEST_STATE_CACHE: | ||
| 133 | execute = BOOTSTRAPPER_ACTION_STATE_NONE; | ||
| 134 | fBARequestedCache = TRUE; | ||
| 135 | |||
| 136 | default: | 130 | default: |
| 137 | execute = BOOTSTRAPPER_ACTION_STATE_NONE; | 131 | execute = BOOTSTRAPPER_ACTION_STATE_NONE; |
| 138 | break; | 132 | break; |
| @@ -187,11 +181,6 @@ extern "C" HRESULT MsuEnginePlanCalculatePackage( | |||
| 187 | pPackage->execute = execute; | 181 | pPackage->execute = execute; |
| 188 | pPackage->rollback = rollback; | 182 | pPackage->rollback = rollback; |
| 189 | 183 | ||
| 190 | if (pfBARequestedCache) | ||
| 191 | { | ||
| 192 | *pfBARequestedCache = fBARequestedCache; | ||
| 193 | } | ||
| 194 | |||
| 195 | LExit: | 184 | LExit: |
| 196 | return hr; | 185 | return hr; |
| 197 | } | 186 | } |
