diff options
| author | Bob Arnson <bob@joyofsetup.com> | 2020-03-05 19:48:12 -0500 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-03-09 12:16:09 -0400 |
| commit | e9d10933bedb8215ec50ca85db272d6647426b31 (patch) | |
| tree | 262cbaf190de5d5461941c79923bef8cf4cf7ad1 /src/ca/scaperfexec.cpp | |
| parent | 7533ca33de2b8125e9f9ecb3b28a247acca85f83 (diff) | |
| download | wix-e9d10933bedb8215ec50ca85db272d6647426b31.tar.gz wix-e9d10933bedb8215ec50ca85db272d6647426b31.tar.bz2 wix-e9d10933bedb8215ec50ca85db272d6647426b31.zip | |
Version extension ids.
Partial fix for wixtoolset/issues#5933.
Diffstat (limited to 'src/ca/scaperfexec.cpp')
| -rw-r--r-- | src/ca/scaperfexec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ca/scaperfexec.cpp b/src/ca/scaperfexec.cpp index bf58c8d0..04c0648a 100644 --- a/src/ca/scaperfexec.cpp +++ b/src/ca/scaperfexec.cpp | |||
| @@ -35,7 +35,7 @@ extern "C" UINT __stdcall RegisterPerfCounterData( | |||
| 35 | ExitOnFailure(hr, "Failed to initialize RegisterPerfCounterData."); | 35 | ExitOnFailure(hr, "Failed to initialize RegisterPerfCounterData."); |
| 36 | 36 | ||
| 37 | hr = ExecutePerfCounterData(hInstall, TRUE); | 37 | hr = ExecutePerfCounterData(hInstall, TRUE); |
| 38 | MessageExitOnFailure(hr, msierrInstallPerfCounterData, "Failed to execute PerformanceCategory table."); | 38 | MessageExitOnFailure(hr, msierrInstallPerfCounterData, "Failed to execute Wix4PerformanceCategory table."); |
| 39 | 39 | ||
| 40 | LExit: | 40 | LExit: |
| 41 | er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; | 41 | er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; |
| @@ -61,7 +61,7 @@ extern "C" UINT __stdcall UnregisterPerfCounterData( | |||
| 61 | ExitOnFailure(hr, "Failed to initialize UnregisterPerfCounterData."); | 61 | ExitOnFailure(hr, "Failed to initialize UnregisterPerfCounterData."); |
| 62 | 62 | ||
| 63 | hr = ExecutePerfCounterData(hInstall, FALSE); | 63 | hr = ExecutePerfCounterData(hInstall, FALSE); |
| 64 | MessageExitOnFailure(hr, msierrUninstallPerfCounterData, "Failed to execute PerformanceCategory table."); | 64 | MessageExitOnFailure(hr, msierrUninstallPerfCounterData, "Failed to execute Wix4PerformanceCategory table."); |
| 65 | 65 | ||
| 66 | LExit: | 66 | LExit: |
| 67 | er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; | 67 | er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE; |