summaryrefslogtreecommitdiff
path: root/src/ext/Dependency/ca/wixdepca.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2022-08-08 18:02:15 -0500
committerSean Hall <r.sean.hall@gmail.com>2022-08-09 09:57:02 -0500
commit240b663ad5fc94ed6d19c966b5c9105a176ecf40 (patch)
treed194e242ccb5bb69f0dbbc388ede87cef65c700f /src/ext/Dependency/ca/wixdepca.cpp
parent8e1cbe8d7b468553d76c20452561e89726de5c47 (diff)
downloadwix-240b663ad5fc94ed6d19c966b5c9105a176ecf40.tar.gz
wix-240b663ad5fc94ed6d19c966b5c9105a176ecf40.tar.bz2
wix-240b663ad5fc94ed6d19c966b5c9105a176ecf40.zip
Skip logging errors in some places when they are due to missing files or registry keys or values.
Related to 6696
Diffstat (limited to 'src/ext/Dependency/ca/wixdepca.cpp')
-rw-r--r--src/ext/Dependency/ca/wixdepca.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/ext/Dependency/ca/wixdepca.cpp b/src/ext/Dependency/ca/wixdepca.cpp
index e9278e04..87610420 100644
--- a/src/ext/Dependency/ca/wixdepca.cpp
+++ b/src/ext/Dependency/ca/wixdepca.cpp
@@ -277,6 +277,7 @@ static HRESULT EnsureAbsentDependents(
277 DEPENDENCY* rgDependents = NULL; 277 DEPENDENCY* rgDependents = NULL;
278 UINT cDependents = 0; 278 UINT cDependents = 0;
279 PMSIHANDLE hDependencyRec = NULL; 279 PMSIHANDLE hDependencyRec = NULL;
280 BOOL fExists = FALSE;
280 281
281 // Skip the dependent check if the Wix4DependencyProvider table is missing (no dependency providers). 282 // Skip the dependent check if the Wix4DependencyProvider table is missing (no dependency providers).
282 hr = WcaTableExists(L"Wix4DependencyProvider"); 283 hr = WcaTableExists(L"Wix4DependencyProvider");
@@ -338,11 +339,7 @@ static HRESULT EnsureAbsentDependents(
338 339
339 // Check the registry to see if the provider has any dependents registered. 340 // Check the registry to see if the provider has any dependents registered.
340 hr = DepCheckDependents(hkHive, sczProviderKey, iAttributes, sdIgnoredDependents, &rgDependents, &cDependents); 341 hr = DepCheckDependents(hkHive, sczProviderKey, iAttributes, sdIgnoredDependents, &rgDependents, &cDependents);
341 if (E_FILENOTFOUND == hr) 342 ExitOnPathFailure(hr, fExists, "Failed dependents check for %ls.", sczId);
342 {
343 hr = S_OK;
344 }
345 ExitOnFailure(hr, "Failed dependents check for %ls.", sczId);
346 } 343 }
347 344
348 if (E_NOMOREITEMS != hr) 345 if (E_NOMOREITEMS != hr)