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/msiengine.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/msiengine.cpp')
| -rw-r--r-- | src/engine/msiengine.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/engine/msiengine.cpp b/src/engine/msiengine.cpp index 252a17b7..801bf9a8 100644 --- a/src/engine/msiengine.cpp +++ b/src/engine/msiengine.cpp | |||
| @@ -714,8 +714,7 @@ LExit: | |||
| 714 | // | 714 | // |
| 715 | extern "C" HRESULT MsiEnginePlanCalculatePackage( | 715 | extern "C" HRESULT MsiEnginePlanCalculatePackage( |
| 716 | __in BURN_PACKAGE* pPackage, | 716 | __in BURN_PACKAGE* pPackage, |
| 717 | __in BOOL fInsideMsiTransaction, | 717 | __in BOOL fInsideMsiTransaction |
| 718 | __out_opt BOOL* pfBARequestedCache | ||
| 719 | ) | 718 | ) |
| 720 | { | 719 | { |
| 721 | Trace(REPORT_STANDARD, "Planning MSI package 0x%p", pPackage); | 720 | Trace(REPORT_STANDARD, "Planning MSI package 0x%p", pPackage); |
| @@ -728,7 +727,6 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage( | |||
| 728 | BOOTSTRAPPER_ACTION_STATE rollback = BOOTSTRAPPER_ACTION_STATE_NONE; | 727 | BOOTSTRAPPER_ACTION_STATE rollback = BOOTSTRAPPER_ACTION_STATE_NONE; |
| 729 | BOOL fFeatureActionDelta = FALSE; | 728 | BOOL fFeatureActionDelta = FALSE; |
| 730 | BOOL fRollbackFeatureActionDelta = FALSE; | 729 | BOOL fRollbackFeatureActionDelta = FALSE; |
| 731 | BOOL fBARequestedCache = FALSE; | ||
| 732 | 730 | ||
| 733 | if (pPackage->Msi.cFeatures) | 731 | if (pPackage->Msi.cFeatures) |
| 734 | { | 732 | { |
| @@ -813,11 +811,6 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage( | |||
| 813 | execute = BOOTSTRAPPER_ACTION_STATE_INSTALL; | 811 | execute = BOOTSTRAPPER_ACTION_STATE_INSTALL; |
| 814 | break; | 812 | break; |
| 815 | 813 | ||
| 816 | case BOOTSTRAPPER_REQUEST_STATE_CACHE: | ||
| 817 | execute = BOOTSTRAPPER_ACTION_STATE_NONE; | ||
| 818 | fBARequestedCache = TRUE; | ||
| 819 | break; | ||
| 820 | |||
| 821 | default: | 814 | default: |
| 822 | execute = BOOTSTRAPPER_ACTION_STATE_NONE; | 815 | execute = BOOTSTRAPPER_ACTION_STATE_NONE; |
| 823 | break; | 816 | break; |
| @@ -880,11 +873,6 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage( | |||
| 880 | pPackage->execute = execute; | 873 | pPackage->execute = execute; |
| 881 | pPackage->rollback = rollback; | 874 | pPackage->rollback = rollback; |
| 882 | 875 | ||
| 883 | if (pfBARequestedCache) | ||
| 884 | { | ||
| 885 | *pfBARequestedCache = fBARequestedCache; | ||
| 886 | } | ||
| 887 | |||
| 888 | LExit: | 876 | LExit: |
| 889 | return hr; | 877 | return hr; |
| 890 | } | 878 | } |
