diff options
author | Rob Mensching <rob@firegiant.com> | 2024-01-11 00:17:24 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2024-01-11 18:24:06 -0800 |
commit | 8b55203c8b5a66362464f0738380932ac49918be (patch) | |
tree | 2a57a8bc193566b3287f70ad5dd53e4c98a5a159 /src/burn/engine/core.cpp | |
parent | 8cfd711f775e8501836162538998b5b6d8efbf89 (diff) | |
download | wix-8b55203c8b5a66362464f0738380932ac49918be.tar.gz wix-8b55203c8b5a66362464f0738380932ac49918be.tar.bz2 wix-8b55203c8b5a66362464f0738380932ac49918be.zip |
Correctly prefix the functions exposed from burnpipe.h
Diffstat (limited to 'src/burn/engine/core.cpp')
-rw-r--r-- | src/burn/engine/core.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp index 8903b5b2..6d6d99d5 100644 --- a/src/burn/engine/core.cpp +++ b/src/burn/engine/core.cpp | |||
@@ -227,7 +227,7 @@ extern "C" HRESULT CoreInitializeConstants( | |||
227 | hr = StrAllocString(&pRegistration->sczBundlePackageAncestors, pRegistration->sczId, 0); | 227 | hr = StrAllocString(&pRegistration->sczBundlePackageAncestors, pRegistration->sczId, 0); |
228 | ExitOnFailure(hr, "Failed to copy self to bundle package ancestors."); | 228 | ExitOnFailure(hr, "Failed to copy self to bundle package ancestors."); |
229 | } | 229 | } |
230 | 230 | ||
231 | for (DWORD i = 0; i < pEngineState->packages.cPackages; ++i) | 231 | for (DWORD i = 0; i < pEngineState->packages.cPackages; ++i) |
232 | { | 232 | { |
233 | BURN_PACKAGE* pPackage = pEngineState->packages.rgPackages + i; | 233 | BURN_PACKAGE* pPackage = pEngineState->packages.rgPackages + i; |
@@ -2285,7 +2285,7 @@ static HRESULT DetectPackage( | |||
2285 | { | 2285 | { |
2286 | HRESULT hr = S_OK; | 2286 | HRESULT hr = S_OK; |
2287 | BOOL fBegan = FALSE; | 2287 | BOOL fBegan = FALSE; |
2288 | 2288 | ||
2289 | fBegan = TRUE; | 2289 | fBegan = TRUE; |
2290 | hr = UserExperienceOnDetectPackageBegin(&pEngineState->userExperience, pPackage->sczId); | 2290 | hr = UserExperienceOnDetectPackageBegin(&pEngineState->userExperience, pPackage->sczId); |
2291 | ExitOnRootFailure(hr, "BA aborted detect package begin."); | 2291 | ExitOnRootFailure(hr, "BA aborted detect package begin."); |
@@ -2423,7 +2423,7 @@ static DWORD WINAPI LoggingThreadProc( | |||
2423 | BURN_ENGINE_STATE* pEngineState = reinterpret_cast<BURN_ENGINE_STATE*>(lpThreadParameter); | 2423 | BURN_ENGINE_STATE* pEngineState = reinterpret_cast<BURN_ENGINE_STATE*>(lpThreadParameter); |
2424 | BURN_PIPE_RESULT result = { }; | 2424 | BURN_PIPE_RESULT result = { }; |
2425 | 2425 | ||
2426 | hr = PipePumpMessages(pEngineState->companionConnection.hLoggingPipe, NULL, NULL, &result); | 2426 | hr = BurnPipePumpMessages(pEngineState->companionConnection.hLoggingPipe, NULL, NULL, &result); |
2427 | ExitOnFailure(hr, "Failed to pump logging messages for elevated process."); | 2427 | ExitOnFailure(hr, "Failed to pump logging messages for elevated process."); |
2428 | 2428 | ||
2429 | hr = (HRESULT)result.dwResult; | 2429 | hr = (HRESULT)result.dwResult; |