Move registry checks for dependency ref-counting into Detect.

1 files changed, 28 insertions, 0 deletions

diff --git a/src/engine/detect.cpp b/src/engine/detect.cpp
index 63e66539..3b8d63e2 100644
--- a/src/engine/detect.cpp
+++ b/src/engine/detect.cpp
@@ -41,12 +41,28 @@ extern "C" void DetectReset(
     ReleaseNullStr(pRegistration->sczDetectedProviderKeyBundleId);
     pRegistration->fEnabledForwardCompatibleBundle = FALSE;
     PackageUninitialize(&pRegistration->forwardCompatibleBundle);
+    pRegistration->fSelfRegisteredAsDependent = FALSE;
+
+    if (pRegistration->rgIgnoredDependencies)
+    {
+        ReleaseDependencyArray(pRegistration->rgIgnoredDependencies, pRegistration->cIgnoredDependencies);
+    }
+    pRegistration->rgIgnoredDependencies = NULL;
+    pRegistration->cIgnoredDependencies = 0;
+
+    if (pRegistration->rgDependents)
+    {
+        ReleaseDependencyArray(pRegistration->rgDependents, pRegistration->cDependents);
+    }
+    pRegistration->rgDependents = NULL;
+    pRegistration->cDependents = 0;
 
     for (DWORD iPackage = 0; iPackage < pPackages->cPackages; ++iPackage)
     {
         BURN_PACKAGE* pPackage = pPackages->rgPackages + iPackage;
 
         pPackage->currentState = BOOTSTRAPPER_PACKAGE_STATE_UNKNOWN;
+        pPackage->fPackageProviderExists = FALSE;
 
         pPackage->cache = BURN_CACHE_STATE_NONE;
         for (DWORD iPayload = 0; iPayload < pPackage->cPayloads; ++iPayload)
@@ -69,6 +85,18 @@ extern "C" void DetectReset(
             ReleaseNullMem(pPackage->Msp.rgTargetProducts);
             pPackage->Msp.cTargetProductCodes = 0;
         }
+
+        for (DWORD iProvider = 0; iProvider < pPackage->cDependencyProviders; ++iProvider)
+        {
+            BURN_DEPENDENCY_PROVIDER* pProvider = pPackage->rgDependencyProviders + iProvider;
+
+            if (pProvider->rgDependents)
+            {
+                ReleaseDependencyArray(pProvider->rgDependents, pProvider->cDependents);
+            }
+            pProvider->rgDependents = NULL;
+            pProvider->cDependents = 0;
+        }
     }
 
     for (DWORD iPatchInfo = 0; iPatchInfo < pPackages->cPatchInfo; ++iPatchInfo)