diff options
Diffstat (limited to '')
| -rw-r--r-- | src/burn/engine/msiengine.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/burn/engine/msiengine.cpp b/src/burn/engine/msiengine.cpp index 32b6660e..d5268b17 100644 --- a/src/burn/engine/msiengine.cpp +++ b/src/burn/engine/msiengine.cpp | |||
| @@ -489,7 +489,7 @@ extern "C" HRESULT MsiEngineDetectPackage( | |||
| 489 | { | 489 | { |
| 490 | LogId(REPORT_STANDARD, MSG_DETECTED_RELATED_PACKAGE, pPackage->Msi.sczProductCode, LoggingPerMachineToString(pPackage->fPerMachine), pVersion->sczVersion, pPackage->Msi.dwLanguage, LoggingRelatedOperationToString(pPackage->Msi.operation)); | 490 | LogId(REPORT_STANDARD, MSG_DETECTED_RELATED_PACKAGE, pPackage->Msi.sczProductCode, LoggingPerMachineToString(pPackage->fPerMachine), pVersion->sczVersion, pPackage->Msi.dwLanguage, LoggingRelatedOperationToString(pPackage->Msi.operation)); |
| 491 | 491 | ||
| 492 | hr = UserExperienceOnDetectRelatedMsiPackage(pUserExperience, pPackage->sczId, pPackage->Msi.sczUpgradeCode, pPackage->Msi.sczProductCode, pPackage->fPerMachine, pVersion, pPackage->Msi.operation); | 492 | hr = BACallbackOnDetectRelatedMsiPackage(pUserExperience, pPackage->sczId, pPackage->Msi.sczUpgradeCode, pPackage->Msi.sczProductCode, pPackage->fPerMachine, pVersion, pPackage->Msi.operation); |
| 493 | ExitOnRootFailure(hr, "BA aborted detect related MSI package."); | 493 | ExitOnRootFailure(hr, "BA aborted detect related MSI package."); |
| 494 | } | 494 | } |
| 495 | } | 495 | } |
| @@ -651,7 +651,7 @@ extern "C" HRESULT MsiEngineDetectPackage( | |||
| 651 | LogId(REPORT_STANDARD, MSG_DETECTED_RELATED_PACKAGE, wzProductCode, LoggingPerMachineToString(fPerMachine), pVersion->sczVersion, uLcid, LoggingRelatedOperationToString(relatedMsiOperation)); | 651 | LogId(REPORT_STANDARD, MSG_DETECTED_RELATED_PACKAGE, wzProductCode, LoggingPerMachineToString(fPerMachine), pVersion->sczVersion, uLcid, LoggingRelatedOperationToString(relatedMsiOperation)); |
| 652 | 652 | ||
| 653 | // Pass to BA. | 653 | // Pass to BA. |
| 654 | hr = UserExperienceOnDetectRelatedMsiPackage(pUserExperience, pPackage->sczId, pRelatedMsi->sczUpgradeCode, wzProductCode, fPerMachine, pVersion, relatedMsiOperation); | 654 | hr = BACallbackOnDetectRelatedMsiPackage(pUserExperience, pPackage->sczId, pRelatedMsi->sczUpgradeCode, wzProductCode, fPerMachine, pVersion, relatedMsiOperation); |
| 655 | ExitOnRootFailure(hr, "BA aborted detect related MSI package."); | 655 | ExitOnRootFailure(hr, "BA aborted detect related MSI package."); |
| 656 | } | 656 | } |
| 657 | } | 657 | } |
| @@ -700,7 +700,7 @@ extern "C" HRESULT MsiEngineDetectPackage( | |||
| 700 | } | 700 | } |
| 701 | 701 | ||
| 702 | // Pass to BA. | 702 | // Pass to BA. |
| 703 | hr = UserExperienceOnDetectMsiFeature(pUserExperience, pPackage->sczId, pFeature->sczId, pFeature->currentState); | 703 | hr = BACallbackOnDetectMsiFeature(pUserExperience, pPackage->sczId, pFeature->sczId, pFeature->currentState); |
| 704 | ExitOnRootFailure(hr, "BA aborted detect MSI feature."); | 704 | ExitOnRootFailure(hr, "BA aborted detect MSI feature."); |
| 705 | } | 705 | } |
| 706 | } | 706 | } |
| @@ -747,7 +747,7 @@ extern "C" HRESULT MsiEngineDetectPackage( | |||
| 747 | 747 | ||
| 748 | LogId(REPORT_STANDARD, MSG_DETECTED_COMPATIBLE_PACKAGE_FROM_PROVIDER, pPackage->sczId, pPackage->compatiblePackage.compatibleEntry.sczProviderKey, wzCompatibleProductCode, wzCompatibleInstalledVersion, pPackage->Msi.sczProductCode); | 748 | LogId(REPORT_STANDARD, MSG_DETECTED_COMPATIBLE_PACKAGE_FROM_PROVIDER, pPackage->sczId, pPackage->compatiblePackage.compatibleEntry.sczProviderKey, wzCompatibleProductCode, wzCompatibleInstalledVersion, pPackage->Msi.sczProductCode); |
| 749 | 749 | ||
| 750 | hr = UserExperienceOnDetectCompatibleMsiPackage(pUserExperience, pPackage->sczId, wzCompatibleProductCode, pPackage->compatiblePackage.Msi.pVersion); | 750 | hr = BACallbackOnDetectCompatibleMsiPackage(pUserExperience, pPackage->sczId, wzCompatibleProductCode, pPackage->compatiblePackage.Msi.pVersion); |
| 751 | ExitOnRootFailure(hr, "BA aborted detect compatible MSI package."); | 751 | ExitOnRootFailure(hr, "BA aborted detect compatible MSI package."); |
| 752 | } | 752 | } |
| 753 | } | 753 | } |
| @@ -828,7 +828,7 @@ extern "C" HRESULT MsiEnginePlanInitializePackage( | |||
| 828 | pFeature->requested = pFeature->defaultRequested; | 828 | pFeature->requested = pFeature->defaultRequested; |
| 829 | 829 | ||
| 830 | // Send plan MSI feature message to BA. | 830 | // Send plan MSI feature message to BA. |
| 831 | hr = UserExperienceOnPlanMsiFeature(pUserExperience, pPackage->sczId, pFeature->sczId, &pFeature->requested); | 831 | hr = BACallbackOnPlanMsiFeature(pUserExperience, pPackage->sczId, pFeature->sczId, &pFeature->requested); |
| 832 | ExitOnRootFailure(hr, "BA aborted plan MSI feature."); | 832 | ExitOnRootFailure(hr, "BA aborted plan MSI feature."); |
| 833 | } | 833 | } |
| 834 | } | 834 | } |
| @@ -840,8 +840,8 @@ extern "C" HRESULT MsiEnginePlanInitializePackage( | |||
| 840 | pPackage->compatiblePackage.fDefaultRequested = BOOTSTRAPPER_ACTION_UNINSTALL == overallAction || BOOTSTRAPPER_ACTION_UNSAFE_UNINSTALL == overallAction; | 840 | pPackage->compatiblePackage.fDefaultRequested = BOOTSTRAPPER_ACTION_UNINSTALL == overallAction || BOOTSTRAPPER_ACTION_UNSAFE_UNINSTALL == overallAction; |
| 841 | pPackage->compatiblePackage.fRequested = pPackage->compatiblePackage.fDefaultRequested; | 841 | pPackage->compatiblePackage.fRequested = pPackage->compatiblePackage.fDefaultRequested; |
| 842 | 842 | ||
| 843 | hr = UserExperienceOnPlanCompatibleMsiPackageBegin(pUserExperience, pPackage->sczId, pPackage->compatiblePackage.compatibleEntry.sczId, pPackage->compatiblePackage.Msi.pVersion, &pPackage->compatiblePackage.fRequested); | 843 | hr = BACallbackOnPlanCompatibleMsiPackageBegin(pUserExperience, pPackage->sczId, pPackage->compatiblePackage.compatibleEntry.sczId, pPackage->compatiblePackage.Msi.pVersion, &pPackage->compatiblePackage.fRequested); |
| 844 | UserExperienceOnPlanCompatibleMsiPackageComplete(pUserExperience, pPackage->sczId, pPackage->compatiblePackage.compatibleEntry.sczId, hr, pPackage->compatiblePackage.fRequested); | 844 | BACallbackOnPlanCompatibleMsiPackageComplete(pUserExperience, pPackage->sczId, pPackage->compatiblePackage.compatibleEntry.sczId, hr, pPackage->compatiblePackage.fRequested); |
| 845 | ExitOnRootFailure(hr, "BA aborted plan compatible MSI package begin."); | 845 | ExitOnRootFailure(hr, "BA aborted plan compatible MSI package begin."); |
| 846 | } | 846 | } |
| 847 | 847 | ||
| @@ -1679,7 +1679,7 @@ extern "C" HRESULT MsiEnginePlanPackageOptions( | |||
| 1679 | break; | 1679 | break; |
| 1680 | } | 1680 | } |
| 1681 | 1681 | ||
| 1682 | return UserExperienceOnPlanMsiPackage(pUserExperience, wzPackageId, fExecute, actionState, pActionMsiProperty, pUiLevel, pfDisableExternalUiHandler, pFileVersioning); | 1682 | return BACallbackOnPlanMsiPackage(pUserExperience, wzPackageId, fExecute, actionState, pActionMsiProperty, pUiLevel, pfDisableExternalUiHandler, pFileVersioning); |
| 1683 | } | 1683 | } |
| 1684 | 1684 | ||
| 1685 | extern "C" void MsiEngineUpdateInstallRegistrationState( | 1685 | extern "C" void MsiEngineUpdateInstallRegistrationState( |
