Skip to content

Commit 37e2dee

Browse files
committed
"Detected related package" log message- log the package id
1 parent a8595cd commit 37e2dee

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/burn/engine/engine.mc

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ MessageId=103
181181
Severity=Success
182182
SymbolicName=MSG_DETECTED_RELATED_PACKAGE
183183
Language=English
184-
Detected related package: %1!ls!, scope: %2!hs!, version: %3!hs!, language: %4!u! operation: %5!hs!
184+
Detected related package for %1!ls!: %2!ls!, scope: %3!hs!, version: %4!hs!, language: %5!u! operation: %6!hs!
185185
.
186186
187187
MessageId=104

src/burn/engine/msiengine.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ extern "C" HRESULT MsiEngineDetectPackage(
433433
// report related MSI package to UX
434434
if (BOOTSTRAPPER_RELATED_OPERATION_NONE != operation)
435435
{
436-
LogId(REPORT_STANDARD, MSG_DETECTED_RELATED_PACKAGE, pPackage->Msi.sczProductCode, LoggingPerMachineToString(pPackage->fPerMachine), LoggingVersionToString(pPackage->Msi.qwInstalledVersion), pPackage->Msi.dwLanguage, LoggingRelatedOperationToString(operation));
436+
LogId(REPORT_STANDARD, MSG_DETECTED_RELATED_PACKAGE, pPackage->sczId, pPackage->Msi.sczProductCode, LoggingPerMachineToString(pPackage->fPerMachine), LoggingVersionToString(pPackage->Msi.qwInstalledVersion), pPackage->Msi.dwLanguage, LoggingRelatedOperationToString(operation));
437437

438438
nResult = pUserExperience->pUserExperience->OnDetectRelatedMsiPackage(pPackage->sczId, pPackage->Msi.sczProductCode, pPackage->fPerMachine, pPackage->Msi.qwInstalledVersion, operation);
439439
hr = UserExperienceInterpretResult(pUserExperience, MB_OKCANCEL, nResult);
@@ -600,7 +600,7 @@ extern "C" HRESULT MsiEngineDetectPackage(
600600
operation = BOOTSTRAPPER_RELATED_OPERATION_MAJOR_UPGRADE;
601601
}
602602

603-
LogId(REPORT_STANDARD, MSG_DETECTED_RELATED_PACKAGE, wzProductCode, LoggingPerMachineToString(fPerMachine), LoggingVersionToString(qwVersion), uLcid, LoggingRelatedOperationToString(relatedMsiOperation));
603+
LogId(REPORT_STANDARD, MSG_DETECTED_RELATED_PACKAGE, pPackage->sczId, wzProductCode, LoggingPerMachineToString(fPerMachine), LoggingVersionToString(qwVersion), uLcid, LoggingRelatedOperationToString(relatedMsiOperation));
604604

605605
// pass to UX
606606
nResult = pUserExperience->pUserExperience->OnDetectRelatedMsiPackage(pPackage->sczId, wzProductCode, fPerMachine, qwVersion, relatedMsiOperation);

0 commit comments

Comments
 (0)