diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-02-01 18:54:54 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-02-04 22:16:10 -0600 |
commit | cede270b2bd3da6bd8d5205b8834e786c8d6c1ce (patch) | |
tree | fc37ad41e0a03f67fc2a8946231e519551cdcc95 /src/engine/package.cpp | |
parent | f1f1a124df59e8639c2bcbfa7d3a4b37fb348bb7 (diff) | |
download | wix-cede270b2bd3da6bd8d5205b8834e786c8d6c1ce.tar.gz wix-cede270b2bd3da6bd8d5205b8834e786c8d6c1ce.tar.bz2 wix-cede270b2bd3da6bd8d5205b8834e786c8d6c1ce.zip |
Remove feature to uninstall compatible orphaned MSI packages.
Diffstat (limited to 'src/engine/package.cpp')
-rw-r--r-- | src/engine/package.cpp | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/src/engine/package.cpp b/src/engine/package.cpp index 02958efd..527766eb 100644 --- a/src/engine/package.cpp +++ b/src/engine/package.cpp | |||
@@ -369,15 +369,6 @@ extern "C" void PackagesUninitialize( | |||
369 | MemFree(pPackages->rgPackages); | 369 | MemFree(pPackages->rgPackages); |
370 | } | 370 | } |
371 | 371 | ||
372 | if (pPackages->rgCompatiblePackages) | ||
373 | { | ||
374 | for (DWORD i = 0; i < pPackages->cCompatiblePackages; ++i) | ||
375 | { | ||
376 | PackageUninitialize(pPackages->rgCompatiblePackages + i); | ||
377 | } | ||
378 | MemFree(pPackages->rgCompatiblePackages); | ||
379 | } | ||
380 | |||
381 | if (pPackages->rgPatchTargetCodes) | 372 | if (pPackages->rgPatchTargetCodes) |
382 | { | 373 | { |
383 | for (DWORD i = 0; i < pPackages->cPatchTargetCodes; ++i) | 374 | for (DWORD i = 0; i < pPackages->cPatchTargetCodes; ++i) |
@@ -414,17 +405,6 @@ extern "C" HRESULT PackageFindById( | |||
414 | } | 405 | } |
415 | } | 406 | } |
416 | 407 | ||
417 | for (DWORD i = 0; i < pPackages->cCompatiblePackages; ++i) | ||
418 | { | ||
419 | pPackage = &pPackages->rgCompatiblePackages[i]; | ||
420 | |||
421 | if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pPackage->sczId, -1, wzId, -1)) | ||
422 | { | ||
423 | *ppPackage = pPackage; | ||
424 | ExitFunction1(hr = S_OK); | ||
425 | } | ||
426 | } | ||
427 | |||
428 | hr = E_NOTFOUND; | 408 | hr = E_NOTFOUND; |
429 | 409 | ||
430 | LExit: | 410 | LExit: |
@@ -510,22 +490,6 @@ LExit: | |||
510 | return hr; | 490 | return hr; |
511 | } | 491 | } |
512 | 492 | ||
513 | HRESULT PackageEnsureCompatiblePackagesArray( | ||
514 | __in BURN_PACKAGES* pPackages | ||
515 | ) | ||
516 | { | ||
517 | HRESULT hr = S_OK; | ||
518 | |||
519 | if (!pPackages->rgCompatiblePackages) | ||
520 | { | ||
521 | pPackages->rgCompatiblePackages = (BURN_PACKAGE*)MemAlloc(sizeof(BURN_PACKAGE) * pPackages->cPackages, TRUE); | ||
522 | ExitOnNull(pPackages->rgCompatiblePackages, hr, E_OUTOFMEMORY, "Failed to allocate memory for compatible packages."); | ||
523 | } | ||
524 | |||
525 | LExit: | ||
526 | return hr; | ||
527 | } | ||
528 | |||
529 | 493 | ||
530 | // internal function declarations | 494 | // internal function declarations |
531 | 495 | ||