Remove some assumptions in dependency planning.

* A package might be installed even if it was already present.
* A package might be uninstalled even if it was already absent.
* The bundle might not actually be uninstalled even if the planned action was uninstall.

Fixes #6510

1 files changed, 4 insertions, 3 deletions

diff --git a/src/burn/engine/package.h b/src/burn/engine/package.h
index 38be2098..6d1b5dd9 100644
--- a/src/burn/engine/package.h
+++ b/src/burn/engine/package.h
@@ -193,8 +193,10 @@ typedef struct _BURN_DEPENDENCY_PROVIDER
     LPWSTR sczDisplayName;
     BOOL fImported;
 
-    DEPENDENCY* rgDependents; // only valid after Detect.
-    UINT cDependents;         // only valid after Detect.
+    BOOL fExists;                              // only valid after Detect.
+    BOOL fBundleRegisteredAsDependent;         // only valid after Detect.
+    DEPENDENCY* rgDependents;                  // only valid after Detect.
+    UINT cDependents;                          // only valid after Detect.
 
     BURN_DEPENDENCY_ACTION dependentExecute;   // only valid during Plan.
     BURN_DEPENDENCY_ACTION dependentRollback;  // only valid during Plan.
@@ -264,7 +266,6 @@ typedef struct _BURN_PACKAGE
 
     BOOTSTRAPPER_PACKAGE_STATE currentState;    // only valid after Detect.
     BOOL fCached;                               // only valid after Detect.
-    BOOL fPackageProviderExists;                // only valid after Detect.
     BOOTSTRAPPER_CACHE_TYPE cacheType;          // only valid during Plan.
     BOOTSTRAPPER_REQUEST_STATE defaultRequested;// only valid during Plan.
     BOOTSTRAPPER_REQUEST_STATE requested;       // only valid during Plan.