From 37e2deee179b31a10a7b15ddf8d918e3ba9af8cf Mon Sep 17 00:00:00 2001 From: Nir Bar Date: Thu, 30 May 2024 12:57:40 +0300 Subject: [PATCH] "Detected related package" log message- log the package id --- src/burn/engine/engine.mc | 2 +- src/burn/engine/msiengine.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/burn/engine/engine.mc b/src/burn/engine/engine.mc index 2e882fc0d..553d3df86 100644 --- a/src/burn/engine/engine.mc +++ b/src/burn/engine/engine.mc @@ -181,7 +181,7 @@ MessageId=103 Severity=Success SymbolicName=MSG_DETECTED_RELATED_PACKAGE Language=English -Detected related package: %1!ls!, scope: %2!hs!, version: %3!hs!, language: %4!u! operation: %5!hs! +Detected related package for %1!ls!: %2!ls!, scope: %3!hs!, version: %4!hs!, language: %5!u! operation: %6!hs! . MessageId=104 diff --git a/src/burn/engine/msiengine.cpp b/src/burn/engine/msiengine.cpp index d864a9908..e8f4edd19 100644 --- a/src/burn/engine/msiengine.cpp +++ b/src/burn/engine/msiengine.cpp @@ -433,7 +433,7 @@ extern "C" HRESULT MsiEngineDetectPackage( // report related MSI package to UX if (BOOTSTRAPPER_RELATED_OPERATION_NONE != operation) { - LogId(REPORT_STANDARD, MSG_DETECTED_RELATED_PACKAGE, pPackage->Msi.sczProductCode, LoggingPerMachineToString(pPackage->fPerMachine), LoggingVersionToString(pPackage->Msi.qwInstalledVersion), pPackage->Msi.dwLanguage, LoggingRelatedOperationToString(operation)); + LogId(REPORT_STANDARD, MSG_DETECTED_RELATED_PACKAGE, pPackage->sczId, pPackage->Msi.sczProductCode, LoggingPerMachineToString(pPackage->fPerMachine), LoggingVersionToString(pPackage->Msi.qwInstalledVersion), pPackage->Msi.dwLanguage, LoggingRelatedOperationToString(operation)); nResult = pUserExperience->pUserExperience->OnDetectRelatedMsiPackage(pPackage->sczId, pPackage->Msi.sczProductCode, pPackage->fPerMachine, pPackage->Msi.qwInstalledVersion, operation); hr = UserExperienceInterpretResult(pUserExperience, MB_OKCANCEL, nResult); @@ -600,7 +600,7 @@ extern "C" HRESULT MsiEngineDetectPackage( operation = BOOTSTRAPPER_RELATED_OPERATION_MAJOR_UPGRADE; } - LogId(REPORT_STANDARD, MSG_DETECTED_RELATED_PACKAGE, wzProductCode, LoggingPerMachineToString(fPerMachine), LoggingVersionToString(qwVersion), uLcid, LoggingRelatedOperationToString(relatedMsiOperation)); + LogId(REPORT_STANDARD, MSG_DETECTED_RELATED_PACKAGE, pPackage->sczId, wzProductCode, LoggingPerMachineToString(fPerMachine), LoggingVersionToString(qwVersion), uLcid, LoggingRelatedOperationToString(relatedMsiOperation)); // pass to UX nResult = pUserExperience->pUserExperience->OnDetectRelatedMsiPackage(pPackage->sczId, wzProductCode, fPerMachine, qwVersion, relatedMsiOperation);