aboutsummaryrefslogtreecommitdiff
path: root/src/burn/engine/embedded.cpp
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2024-01-11 00:17:24 -0800
committerRob Mensching <rob@firegiant.com>2024-01-11 18:24:06 -0800
commit8b55203c8b5a66362464f0738380932ac49918be (patch)
tree2a57a8bc193566b3287f70ad5dd53e4c98a5a159 /src/burn/engine/embedded.cpp
parent8cfd711f775e8501836162538998b5b6d8efbf89 (diff)
downloadwix-8b55203c8b5a66362464f0738380932ac49918be.tar.gz
wix-8b55203c8b5a66362464f0738380932ac49918be.tar.bz2
wix-8b55203c8b5a66362464f0738380932ac49918be.zip
Correctly prefix the functions exposed from burnpipe.h
Diffstat (limited to 'src/burn/engine/embedded.cpp')
-rw-r--r--src/burn/engine/embedded.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/burn/engine/embedded.cpp b/src/burn/engine/embedded.cpp
index 1e0759d1..e0e9ffd9 100644
--- a/src/burn/engine/embedded.cpp
+++ b/src/burn/engine/embedded.cpp
@@ -55,16 +55,16 @@ extern "C" HRESULT EmbeddedRunBundle(
55 PROCESS_INFORMATION pi = { }; 55 PROCESS_INFORMATION pi = { };
56 BURN_PIPE_RESULT result = { }; 56 BURN_PIPE_RESULT result = { };
57 57
58 PipeConnectionInitialize(pConnection); 58 BurnPipeConnectionInitialize(pConnection);
59 59
60 BURN_EMBEDDED_CALLBACK_CONTEXT context = { }; 60 BURN_EMBEDDED_CALLBACK_CONTEXT context = { };
61 context.pfnGenericMessageHandler = pfnGenericMessageHandler; 61 context.pfnGenericMessageHandler = pfnGenericMessageHandler;
62 context.pvContext = pvContext; 62 context.pvContext = pvContext;
63 63
64 hr = PipeCreateNameAndSecret(&pConnection->sczName, &pConnection->sczSecret); 64 hr = BurnPipeCreateNameAndSecret(&pConnection->sczName, &pConnection->sczSecret);
65 ExitOnFailure(hr, "Failed to create embedded pipe name and client token."); 65 ExitOnFailure(hr, "Failed to create embedded pipe name and client token.");
66 66
67 hr = PipeCreatePipes(pConnection, FALSE); 67 hr = BurnPipeCreatePipes(pConnection, FALSE);
68 ExitOnFailure(hr, "Failed to create embedded pipe."); 68 ExitOnFailure(hr, "Failed to create embedded pipe.");
69 69
70 hr = StrAllocFormatted(&sczCommand, L"%ls -%ls %ls %ls %u", sczBaseCommand, BURN_COMMANDLINE_SWITCH_EMBEDDED, pConnection->sczName, pConnection->sczSecret, dwCurrentProcessId); 70 hr = StrAllocFormatted(&sczCommand, L"%ls -%ls %ls %ls %u", sczBaseCommand, BURN_COMMANDLINE_SWITCH_EMBEDDED, pConnection->sczName, pConnection->sczSecret, dwCurrentProcessId);
@@ -84,10 +84,10 @@ extern "C" HRESULT EmbeddedRunBundle(
84 pConnection->hProcess = pi.hProcess; 84 pConnection->hProcess = pi.hProcess;
85 pi.hProcess = NULL; 85 pi.hProcess = NULL;
86 86
87 hr = PipeWaitForChildConnect(pConnection); 87 hr = BurnPipeWaitForChildConnect(pConnection);
88 ExitOnFailure(hr, "Failed to wait for embedded process to connect to pipe."); 88 ExitOnFailure(hr, "Failed to wait for embedded process to connect to pipe.");
89 89
90 hr = PipePumpMessages(pConnection->hPipe, ProcessEmbeddedMessages, &context, &result); 90 hr = BurnPipePumpMessages(pConnection->hPipe, ProcessEmbeddedMessages, &context, &result);
91 ExitOnFailure(hr, "Failed to process messages from embedded message."); 91 ExitOnFailure(hr, "Failed to process messages from embedded message.");
92 92
93 // Get the return code from the embedded process. 93 // Get the return code from the embedded process.
@@ -99,7 +99,7 @@ LExit:
99 ReleaseHandle(pi.hProcess); 99 ReleaseHandle(pi.hProcess);
100 100
101 StrSecureZeroFreeString(sczCommand); 101 StrSecureZeroFreeString(sczCommand);
102 PipeConnectionUninitialize(pConnection); 102 BurnPipeConnectionUninitialize(pConnection);
103 103
104 return hr; 104 return hr;
105} 105}