Fix package reordering: Only cache actions are reordered, rather than…

… the packages

README.md

@@ -25,3 +25,4 @@ This repository contains the PanelSwWix4: A custom WiX Toolset codebase
 - Support sending custom messages on embedded pipe
 - Best effort to log premature termination of companion process
 - Monitor UX folder and re-extract any UX payloads that were deleted for any reason
+- Reorder cache actions: moves non-executing package caching to the end of the plan. This optimizes run time as packages that are cached but not executed will not stand in the way of executing packages.

src/burn/engine/apply.cpp

@@ -662,6 +662,10 @@ extern "C" HRESULT ApplyCache(
             }
             break;
 
+        case BURN_CACHE_ACTION_TYPE_DELAYABLE_START:
+        case BURN_CACHE_ACTION_TYPE_DELAYABLE_END:
+            break;
+
         default:
             AssertSz(FALSE, "Unknown cache action.");
             break;
@@ -2407,7 +2411,6 @@ static void DoRollbackCache(
     __in DWORD dwCheckpoint
     )
 {
-    HRESULT hr = S_OK;
     BURN_PACKAGE* pPackage = NULL;
     DWORD dwLastCheckpoint = 0;
 
@@ -2432,7 +2435,7 @@ static void DoRollbackCache(
                 {
                     if (dwLastCheckpoint <= dwCheckpoint) // only rollback when it was attempted to be cached.
                     {
-                        hr = CleanPackage(pPlan->pCache, hPipe, pPackage);
+                        CleanPackage(pPlan->pCache, hPipe, pPackage);
                     }
                 }
                 else if (pPackage->fCanAffectRegistration)

src/burn/engine/engine.mc

@@ -1321,5 +1321,5 @@ MessageId=707
 Severity=Success
 SymbolicName=MSG_REORDERING_PACKAGE
 Language=English
-Moving packages '%1!ls!' to the end of the queue since it is not planned to execute.
+Moving packages '%1!ls!' caching to the end of the queue since it is not planned to execute.
 .

src/burn/engine/package.cpp

@@ -142,8 +142,6 @@ extern "C" HRESULT PackagesParseFromXml(
     {
         BURN_PACKAGE* pPackage = &pPackages->rgPackages[i];
 
-        pPackage->dwPackageIndex = i;
-
         hr = XmlNextElement(pixnNodes, &pixnNode, &bstrNodeName);
         ExitOnFailure(hr, "Failed to get next node.");
 

src/burn/engine/package.h

@@ -285,8 +285,6 @@ typedef struct _BURN_PACKAGE
     DWORD64 qwInstallSize;
     DWORD64 qwSize;
 
-    DWORD dwPackageIndex;
-
     BURN_ROLLBACK_BOUNDARY* pRollbackBoundaryForward;  // used during install and repair.
     BURN_ROLLBACK_BOUNDARY* pRollbackBoundaryBackward; // used during uninstall.