summaryrefslogtreecommitdiff
path: root/src/burn/engine/elevation.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/burn/engine/elevation.cpp')
-rw-r--r--src/burn/engine/elevation.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/burn/engine/elevation.cpp b/src/burn/engine/elevation.cpp
index 9c7cf89f..4a5be8ec 100644
--- a/src/burn/engine/elevation.cpp
+++ b/src/burn/engine/elevation.cpp
@@ -907,6 +907,9 @@ extern "C" HRESULT ElevationExecuteBundlePackage(
907 hr = BuffWriteNumber(&pbData, &cbData, fRollback); 907 hr = BuffWriteNumber(&pbData, &cbData, fRollback);
908 ExitOnFailure(hr, "Failed to write rollback."); 908 ExitOnFailure(hr, "Failed to write rollback.");
909 909
910 hr = BuffWriteNumber(&pbData, &cbData, SUCCEEDED(pExecuteAction->bundlePackage.pPackage->hrCacheResult));
911 ExitOnFailure(hr, "Failed to write fCacheAvailable.");
912
910 hr = BuffWriteString(&pbData, &cbData, pExecuteAction->bundlePackage.sczParent); 913 hr = BuffWriteString(&pbData, &cbData, pExecuteAction->bundlePackage.sczParent);
911 ExitOnFailure(hr, "Failed to write the parent to the message buffer."); 914 ExitOnFailure(hr, "Failed to write the parent to the message buffer.");
912 915
@@ -2855,7 +2858,8 @@ static HRESULT OnExecuteBundlePackage(
2855 HRESULT hr = S_OK; 2858 HRESULT hr = S_OK;
2856 SIZE_T iData = 0; 2859 SIZE_T iData = 0;
2857 LPWSTR sczPackage = NULL; 2860 LPWSTR sczPackage = NULL;
2858 DWORD dwRollback = 0; 2861 BOOL fRollback = FALSE;
2862 BOOL fCacheAvailable = FALSE;
2859 BURN_EXECUTE_ACTION executeAction = { }; 2863 BURN_EXECUTE_ACTION executeAction = { };
2860 LPWSTR sczIgnoreDependencies = NULL; 2864 LPWSTR sczIgnoreDependencies = NULL;
2861 LPWSTR sczAncestors = NULL; 2865 LPWSTR sczAncestors = NULL;
@@ -2871,9 +2875,12 @@ static HRESULT OnExecuteBundlePackage(
2871 hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&executeAction.bundlePackage.action); 2875 hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&executeAction.bundlePackage.action);
2872 ExitOnFailure(hr, "Failed to read action."); 2876 ExitOnFailure(hr, "Failed to read action.");
2873 2877
2874 hr = BuffReadNumber(pbData, cbData, &iData, &dwRollback); 2878 hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&fRollback);
2875 ExitOnFailure(hr, "Failed to read rollback."); 2879 ExitOnFailure(hr, "Failed to read rollback.");
2876 2880
2881 hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&fCacheAvailable);
2882 ExitOnFailure(hr, "Failed to read fCacheAvailable.");
2883
2877 hr = BuffReadString(pbData, cbData, &iData, &executeAction.bundlePackage.sczParent); 2884 hr = BuffReadString(pbData, cbData, &iData, &executeAction.bundlePackage.sczParent);
2878 ExitOnFailure(hr, "Failed to read the parent."); 2885 ExitOnFailure(hr, "Failed to read the parent.");
2879 2886
@@ -2918,7 +2925,7 @@ static HRESULT OnExecuteBundlePackage(
2918 } 2925 }
2919 2926
2920 // Execute BUNDLE package. 2927 // Execute BUNDLE package.
2921 hr = BundlePackageEngineExecutePackage(&executeAction, pCache, pVariables, static_cast<BOOL>(dwRollback), GenericExecuteMessageHandler, hPipe, &bundleRestart); 2928 hr = BundlePackageEngineExecutePackage(&executeAction, pCache, pVariables, fRollback, fCacheAvailable, GenericExecuteMessageHandler, hPipe, &bundleRestart);
2922 ExitOnFailure(hr, "Failed to execute BUNDLE package."); 2929 ExitOnFailure(hr, "Failed to execute BUNDLE package.");
2923 2930
2924LExit: 2931LExit: