diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-08-19 14:08:23 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-08-19 17:02:27 -0500 |
| commit | b72f58abdf6dd5d0020f174358027158cb52cb72 (patch) | |
| tree | 3070c1f1fa8a74125a2933f23a1be3c514ed1de7 /src/burn/engine/uithread.cpp | |
| parent | bbc36178172e4198351f2f84a91faf56c65e1475 (diff) | |
| download | wix-b72f58abdf6dd5d0020f174358027158cb52cb72.tar.gz wix-b72f58abdf6dd5d0020f174358027158cb52cb72.tar.bz2 wix-b72f58abdf6dd5d0020f174358027158cb52cb72.zip | |
Use a dedicated pipe for redirecting logging from the elevated process.
Fixes 6869
Diffstat (limited to 'src/burn/engine/uithread.cpp')
| -rw-r--r-- | src/burn/engine/uithread.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/burn/engine/uithread.cpp b/src/burn/engine/uithread.cpp index fe1c21b8..26a9b723 100644 --- a/src/burn/engine/uithread.cpp +++ b/src/burn/engine/uithread.cpp | |||
| @@ -107,18 +107,6 @@ static DWORD WINAPI ThreadProc( | |||
| 107 | BURN_ENGINE_STATE* pEngineState = pContext->pEngineState; | 107 | BURN_ENGINE_STATE* pEngineState = pContext->pEngineState; |
| 108 | BOOL fElevatedEngine = BURN_MODE_ELEVATED == pContext->pEngineState->internalCommand.mode; | 108 | BOOL fElevatedEngine = BURN_MODE_ELEVATED == pContext->pEngineState->internalCommand.mode; |
| 109 | 109 | ||
| 110 | // If elevated, set up the thread local storage to store the correct pipe to communicate logging. | ||
| 111 | if (fElevatedEngine) | ||
| 112 | { | ||
| 113 | Assert(TLS_OUT_OF_INDEXES != pEngineState->dwElevatedLoggingTlsId); | ||
| 114 | |||
| 115 | if (!::TlsSetValue(pEngineState->dwElevatedLoggingTlsId, pEngineState->companionConnection.hPipe)) | ||
| 116 | { | ||
| 117 | // If the function failed we cannot write to the pipe so just terminate. | ||
| 118 | ExitFunction1(hr = E_INVALIDSTATE); | ||
| 119 | } | ||
| 120 | } | ||
| 121 | |||
| 122 | wc.lpfnWndProc = WndProc; | 110 | wc.lpfnWndProc = WndProc; |
| 123 | wc.hInstance = pContext->hInstance; | 111 | wc.hInstance = pContext->hInstance; |
| 124 | wc.lpszClassName = BURN_UITHREAD_CLASS_WINDOW; | 112 | wc.lpszClassName = BURN_UITHREAD_CLASS_WINDOW; |
