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/engine.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/engine.cpp')
-rw-r--r-- | src/burn/engine/engine.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/burn/engine/engine.cpp b/src/burn/engine/engine.cpp index b093ec9b..f5ea5332 100644 --- a/src/burn/engine/engine.cpp +++ b/src/burn/engine/engine.cpp | |||
@@ -303,7 +303,7 @@ LExit: | |||
303 | // end per-machine process if running | 303 | // end per-machine process if running |
304 | if (!fRunElevated && INVALID_HANDLE_VALUE != engineState.companionConnection.hPipe) | 304 | if (!fRunElevated && INVALID_HANDLE_VALUE != engineState.companionConnection.hPipe) |
305 | { | 305 | { |
306 | PipeTerminateChildProcess(&engineState.companionConnection, *pdwExitCode, engineState.fRestart); | 306 | BurnPipeTerminateChildProcess(&engineState.companionConnection, *pdwExitCode, engineState.fRestart); |
307 | } | 307 | } |
308 | else if (engineState.fRestart) | 308 | else if (engineState.fRestart) |
309 | { | 309 | { |
@@ -405,8 +405,8 @@ static HRESULT InitializeEngineState( | |||
405 | 405 | ||
406 | pEngineState->internalCommand.automaticUpdates = BURN_AU_PAUSE_ACTION_IFELEVATED; | 406 | pEngineState->internalCommand.automaticUpdates = BURN_AU_PAUSE_ACTION_IFELEVATED; |
407 | ::InitializeCriticalSection(&pEngineState->userExperience.csEngineActive); | 407 | ::InitializeCriticalSection(&pEngineState->userExperience.csEngineActive); |
408 | PipeConnectionInitialize(&pEngineState->companionConnection); | 408 | BurnPipeConnectionInitialize(&pEngineState->companionConnection); |
409 | PipeConnectionInitialize(&pEngineState->embeddedConnection); | 409 | BurnPipeConnectionInitialize(&pEngineState->embeddedConnection); |
410 | 410 | ||
411 | // Retain whether bundle was initially run elevated. | 411 | // Retain whether bundle was initially run elevated. |
412 | ProcElevated(::GetCurrentProcess(), &pEngineState->internalCommand.fInitiallyElevated); | 412 | ProcElevated(::GetCurrentProcess(), &pEngineState->internalCommand.fInitiallyElevated); |
@@ -443,8 +443,8 @@ static void UninitializeEngineState( | |||
443 | ReleaseHandle(pEngineState->elevatedLoggingContext.hLogEvent); | 443 | ReleaseHandle(pEngineState->elevatedLoggingContext.hLogEvent); |
444 | ReleaseHandle(pEngineState->elevatedLoggingContext.hFinishedEvent); | 444 | ReleaseHandle(pEngineState->elevatedLoggingContext.hFinishedEvent); |
445 | 445 | ||
446 | PipeConnectionUninitialize(&pEngineState->embeddedConnection); | 446 | BurnPipeConnectionUninitialize(&pEngineState->embeddedConnection); |
447 | PipeConnectionUninitialize(&pEngineState->companionConnection); | 447 | BurnPipeConnectionUninitialize(&pEngineState->companionConnection); |
448 | ReleaseStr(pEngineState->sczBundleEngineWorkingPath) | 448 | ReleaseStr(pEngineState->sczBundleEngineWorkingPath) |
449 | 449 | ||
450 | ReleaseHandle(pEngineState->hMessageWindowThread); | 450 | ReleaseHandle(pEngineState->hMessageWindowThread); |
@@ -690,7 +690,7 @@ static HRESULT RunElevated( | |||
690 | ExitOnFailure(hr, "Failed to open elevated log."); | 690 | ExitOnFailure(hr, "Failed to open elevated log."); |
691 | 691 | ||
692 | // connect to per-user process | 692 | // connect to per-user process |
693 | hr = PipeChildConnect(&pEngineState->companionConnection, TRUE); | 693 | hr = BurnPipeChildConnect(&pEngineState->companionConnection, TRUE); |
694 | ExitOnFailure(hr, "Failed to connect to unelevated process."); | 694 | ExitOnFailure(hr, "Failed to connect to unelevated process."); |
695 | 695 | ||
696 | // Set up the context for the logging thread then | 696 | // Set up the context for the logging thread then |
@@ -741,7 +741,7 @@ static HRESULT RunEmbedded( | |||
741 | HRESULT hr = S_OK; | 741 | HRESULT hr = S_OK; |
742 | 742 | ||
743 | // Connect to parent process. | 743 | // Connect to parent process. |
744 | hr = PipeChildConnect(&pEngineState->embeddedConnection, FALSE); | 744 | hr = BurnPipeChildConnect(&pEngineState->embeddedConnection, FALSE); |
745 | ExitOnFailure(hr, "Failed to connect to parent of embedded process."); | 745 | ExitOnFailure(hr, "Failed to connect to parent of embedded process."); |
746 | 746 | ||
747 | // Do not register the bundle to automatically restart if embedded. | 747 | // Do not register the bundle to automatically restart if embedded. |
@@ -965,7 +965,7 @@ static HRESULT LogStringOverPipe( | |||
965 | hr = BuffWriteStringAnsi(&pbData, &cbData, szString); | 965 | hr = BuffWriteStringAnsi(&pbData, &cbData, szString); |
966 | ExitOnFailure(hr, "Failed to prepare logging pipe message."); | 966 | ExitOnFailure(hr, "Failed to prepare logging pipe message."); |
967 | 967 | ||
968 | hr = PipeSendMessage(hPipe, static_cast<DWORD>(BURN_PIPE_MESSAGE_TYPE_LOG), pbData, cbData, NULL, NULL, &dwResult); | 968 | hr = BurnPipeSendMessage(hPipe, static_cast<DWORD>(BURN_PIPE_MESSAGE_TYPE_LOG), pbData, cbData, NULL, NULL, &dwResult); |
969 | ExitOnFailure(hr, "Failed to send logging message over the pipe."); | 969 | ExitOnFailure(hr, "Failed to send logging message over the pipe."); |
970 | 970 | ||
971 | hr = (HRESULT)dwResult; | 971 | hr = (HRESULT)dwResult; |
@@ -1048,7 +1048,7 @@ LExit: | |||
1048 | LogRedirect(NULL, NULL); // No more messages will be logged over the pipe. | 1048 | LogRedirect(NULL, NULL); // No more messages will be logged over the pipe. |
1049 | 1049 | ||
1050 | { | 1050 | { |
1051 | HRESULT hrTerminate = PipeTerminateLoggingPipe(pContext->hPipe, hr); | 1051 | HRESULT hrTerminate = BurnPipeTerminateLoggingPipe(pContext->hPipe, hr); |
1052 | if (FAILED(hrTerminate)) | 1052 | if (FAILED(hrTerminate)) |
1053 | { | 1053 | { |
1054 | TraceError(hrTerminate, "Failed to terminate logging pipe."); | 1054 | TraceError(hrTerminate, "Failed to terminate logging pipe."); |