diff options
| author | Rob Mensching <rob@firegiant.com> | 2024-01-11 00:00:27 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2024-01-11 18:24:06 -0800 |
| commit | 8cfd711f775e8501836162538998b5b6d8efbf89 (patch) | |
| tree | 3083faee64b5be16062a93ed4e4b6668fc4f64c8 /src/burn/test/BurnUnitTest/ElevationTest.cpp | |
| parent | 4e7b7c0059d76498d1c24f348dbf6d5799203fe0 (diff) | |
| download | wix-8cfd711f775e8501836162538998b5b6d8efbf89.tar.gz wix-8cfd711f775e8501836162538998b5b6d8efbf89.tar.bz2 wix-8cfd711f775e8501836162538998b5b6d8efbf89.zip | |
Update Burn to use pipeutil for low-level pipe operations
Diffstat (limited to 'src/burn/test/BurnUnitTest/ElevationTest.cpp')
| -rw-r--r-- | src/burn/test/BurnUnitTest/ElevationTest.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/burn/test/BurnUnitTest/ElevationTest.cpp b/src/burn/test/BurnUnitTest/ElevationTest.cpp index 713d9e07..857873b6 100644 --- a/src/burn/test/BurnUnitTest/ElevationTest.cpp +++ b/src/burn/test/BurnUnitTest/ElevationTest.cpp | |||
| @@ -16,12 +16,12 @@ static DWORD CALLBACK ElevateTest_ThreadProc( | |||
| 16 | __in LPVOID lpThreadParameter | 16 | __in LPVOID lpThreadParameter |
| 17 | ); | 17 | ); |
| 18 | static HRESULT ProcessParentMessages( | 18 | static HRESULT ProcessParentMessages( |
| 19 | __in BURN_PIPE_MESSAGE* pMsg, | 19 | __in PIPE_MESSAGE* pMsg, |
| 20 | __in_opt LPVOID pvContext, | 20 | __in_opt LPVOID pvContext, |
| 21 | __out DWORD* pdwResult | 21 | __out DWORD* pdwResult |
| 22 | ); | 22 | ); |
| 23 | static HRESULT ProcessChildMessages( | 23 | static HRESULT ProcessChildMessages( |
| 24 | __in BURN_PIPE_MESSAGE* pMsg, | 24 | __in PIPE_MESSAGE* pMsg, |
| 25 | __in_opt LPVOID pvContext, | 25 | __in_opt LPVOID pvContext, |
| 26 | __out DWORD* pdwResult | 26 | __out DWORD* pdwResult |
| 27 | ); | 27 | ); |
| @@ -155,7 +155,7 @@ LExit: | |||
| 155 | } | 155 | } |
| 156 | 156 | ||
| 157 | static HRESULT ProcessParentMessages( | 157 | static HRESULT ProcessParentMessages( |
| 158 | __in BURN_PIPE_MESSAGE* pMsg, | 158 | __in PIPE_MESSAGE* pMsg, |
| 159 | __in_opt LPVOID /*pvContext*/, | 159 | __in_opt LPVOID /*pvContext*/, |
| 160 | __out DWORD* pdwResult | 160 | __out DWORD* pdwResult |
| 161 | ) | 161 | ) |
| @@ -164,7 +164,7 @@ static HRESULT ProcessParentMessages( | |||
| 164 | HRESULT hrResult = E_INVALIDDATA; | 164 | HRESULT hrResult = E_INVALIDDATA; |
| 165 | 165 | ||
| 166 | // Process the message. | 166 | // Process the message. |
| 167 | switch (pMsg->dwMessage) | 167 | switch (pMsg->dwMessageType) |
| 168 | { | 168 | { |
| 169 | case TEST_CHILD_SENT_MESSAGE_ID: | 169 | case TEST_CHILD_SENT_MESSAGE_ID: |
| 170 | if (sizeof(TEST_MESSAGE_DATA) == pMsg->cbData && 0 == memcmp(TEST_MESSAGE_DATA, pMsg->pvData, sizeof(TEST_MESSAGE_DATA))) | 170 | if (sizeof(TEST_MESSAGE_DATA) == pMsg->cbData && 0 == memcmp(TEST_MESSAGE_DATA, pMsg->pvData, sizeof(TEST_MESSAGE_DATA))) |
| @@ -175,7 +175,7 @@ static HRESULT ProcessParentMessages( | |||
| 175 | 175 | ||
| 176 | default: | 176 | default: |
| 177 | hr = E_INVALIDARG; | 177 | hr = E_INVALIDARG; |
| 178 | ExitOnRootFailure(hr, "Unexpected elevated message sent to parent process, msg: %u", pMsg->dwMessage); | 178 | ExitOnRootFailure(hr, "Unexpected elevated message sent to parent process, msg: %u", pMsg->dwMessageType); |
| 179 | } | 179 | } |
| 180 | 180 | ||
| 181 | *pdwResult = static_cast<DWORD>(hrResult); | 181 | *pdwResult = static_cast<DWORD>(hrResult); |
| @@ -185,7 +185,7 @@ LExit: | |||
| 185 | } | 185 | } |
| 186 | 186 | ||
| 187 | static HRESULT ProcessChildMessages( | 187 | static HRESULT ProcessChildMessages( |
| 188 | __in BURN_PIPE_MESSAGE* pMsg, | 188 | __in PIPE_MESSAGE* pMsg, |
| 189 | __in_opt LPVOID pvContext, | 189 | __in_opt LPVOID pvContext, |
| 190 | __out DWORD* pdwResult | 190 | __out DWORD* pdwResult |
| 191 | ) | 191 | ) |
| @@ -195,7 +195,7 @@ static HRESULT ProcessChildMessages( | |||
| 195 | DWORD dwResult = 0; | 195 | DWORD dwResult = 0; |
| 196 | 196 | ||
| 197 | // Process the message. | 197 | // Process the message. |
| 198 | switch (pMsg->dwMessage) | 198 | switch (pMsg->dwMessageType) |
| 199 | { | 199 | { |
| 200 | case TEST_PARENT_SENT_MESSAGE_ID: | 200 | case TEST_PARENT_SENT_MESSAGE_ID: |
| 201 | // send test message | 201 | // send test message |
| @@ -205,7 +205,7 @@ static HRESULT ProcessChildMessages( | |||
| 205 | 205 | ||
| 206 | default: | 206 | default: |
| 207 | hr = E_INVALIDARG; | 207 | hr = E_INVALIDARG; |
| 208 | ExitOnRootFailure(hr, "Unexpected elevated message sent to child process, msg: %u", pMsg->dwMessage); | 208 | ExitOnRootFailure(hr, "Unexpected elevated message sent to child process, msg: %u", pMsg->dwMessageType); |
| 209 | } | 209 | } |
| 210 | 210 | ||
| 211 | *pdwResult = dwResult; | 211 | *pdwResult = dwResult; |
