diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-08-08 18:02:15 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-08-09 09:57:02 -0500 |
| commit | 240b663ad5fc94ed6d19c966b5c9105a176ecf40 (patch) | |
| tree | d194e242ccb5bb69f0dbbc388ede87cef65c700f /src/burn/engine/relatedbundle.cpp | |
| parent | 8e1cbe8d7b468553d76c20452561e89726de5c47 (diff) | |
| download | wix-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/burn/engine/relatedbundle.cpp')
| -rw-r--r-- | src/burn/engine/relatedbundle.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/burn/engine/relatedbundle.cpp b/src/burn/engine/relatedbundle.cpp index 586446b1..23e0f352 100644 --- a/src/burn/engine/relatedbundle.cpp +++ b/src/burn/engine/relatedbundle.cpp | |||
| @@ -322,6 +322,7 @@ static HRESULT LoadRelatedBundleFromKey( | |||
| 322 | LPWSTR sczCachePath = NULL; | 322 | LPWSTR sczCachePath = NULL; |
| 323 | BOOL fCached = FALSE; | 323 | BOOL fCached = FALSE; |
| 324 | DWORD64 qwFileSize = 0; | 324 | DWORD64 qwFileSize = 0; |
| 325 | BOOL fExists = FALSE; | ||
| 325 | BURN_DEPENDENCY_PROVIDER dependencyProvider = { }; | 326 | BURN_DEPENDENCY_PROVIDER dependencyProvider = { }; |
| 326 | BURN_DEPENDENCY_PROVIDER* pBundleDependencyProvider = NULL; | 327 | BURN_DEPENDENCY_PROVIDER* pBundleDependencyProvider = NULL; |
| 327 | 328 | ||
| @@ -369,10 +370,7 @@ static HRESULT LoadRelatedBundleFromKey( | |||
| 369 | pRelatedBundle->fPlannable = fCached; | 370 | pRelatedBundle->fPlannable = fCached; |
| 370 | 371 | ||
| 371 | hr = RegReadString(hkBundleId, BURN_REGISTRATION_REGISTRY_BUNDLE_PROVIDER_KEY, &dependencyProvider.sczKey); | 372 | hr = RegReadString(hkBundleId, BURN_REGISTRATION_REGISTRY_BUNDLE_PROVIDER_KEY, &dependencyProvider.sczKey); |
| 372 | if (E_FILENOTFOUND != hr) | 373 | ExitOnPathFailure(hr, fExists, "Failed to read provider key from registry for bundle: %ls", wzRelatedBundleId); |
| 373 | { | ||
| 374 | ExitOnFailure(hr, "Failed to read provider key from registry for bundle: %ls", wzRelatedBundleId); | ||
| 375 | } | ||
| 376 | 374 | ||
| 377 | if (dependencyProvider.sczKey && *dependencyProvider.sczKey) | 375 | if (dependencyProvider.sczKey && *dependencyProvider.sczKey) |
| 378 | { | 376 | { |
| @@ -384,18 +382,11 @@ static HRESULT LoadRelatedBundleFromKey( | |||
| 384 | ExitOnFailure(hr, "Failed to copy version for bundle: %ls", wzRelatedBundleId); | 382 | ExitOnFailure(hr, "Failed to copy version for bundle: %ls", wzRelatedBundleId); |
| 385 | 383 | ||
| 386 | hr = RegReadString(hkBundleId, BURN_REGISTRATION_REGISTRY_BUNDLE_DISPLAY_NAME, &dependencyProvider.sczDisplayName); | 384 | hr = RegReadString(hkBundleId, BURN_REGISTRATION_REGISTRY_BUNDLE_DISPLAY_NAME, &dependencyProvider.sczDisplayName); |
| 387 | if (E_FILENOTFOUND != hr) | 385 | ExitOnPathFailure(hr, fExists, "Failed to copy display name for bundle: %ls", wzRelatedBundleId); |
| 388 | { | ||
| 389 | ExitOnFailure(hr, "Failed to copy display name for bundle: %ls", wzRelatedBundleId); | ||
| 390 | } | ||
| 391 | } | 386 | } |
| 392 | 387 | ||
| 393 | hr = RegReadString(hkBundleId, BURN_REGISTRATION_REGISTRY_BUNDLE_TAG, &pRelatedBundle->sczTag); | 388 | hr = RegReadString(hkBundleId, BURN_REGISTRATION_REGISTRY_BUNDLE_TAG, &pRelatedBundle->sczTag); |
| 394 | if (E_FILENOTFOUND == hr) | 389 | ExitOnPathFailure(hr, fExists, "Failed to read tag from registry for bundle: %ls", wzRelatedBundleId); |
| 395 | { | ||
| 396 | hr = S_OK; | ||
| 397 | } | ||
| 398 | ExitOnFailure(hr, "Failed to read tag from registry for bundle: %ls", wzRelatedBundleId); | ||
| 399 | 390 | ||
| 400 | pRelatedBundle->detectRelationType = relationType; | 391 | pRelatedBundle->detectRelationType = relationType; |
| 401 | 392 | ||