Add AppWaitForSingleObject/MultipleObjects, ThreadWaitForCompletion.

1 files changed, 2 insertions, 9 deletions

diff --git a/src/burn/engine/elevation.cpp b/src/burn/engine/elevation.cpp
index 4a5be8ec..e165a257 100644
--- a/src/burn/engine/elevation.cpp
+++ b/src/burn/engine/elevation.cpp
@@ -1687,15 +1687,8 @@ static HRESULT WaitForElevatedChildCacheThread(
     HRESULT hr = S_OK;
     DWORD dwExitCode = ERROR_SUCCESS;
 
-    if (WAIT_OBJECT_0 != ::WaitForSingleObject(hCacheThread, BURN_TIMEOUT))
-    {
-        ExitWithLastError(hr, "Failed to wait for cache thread to terminate.");
-    }
-
-    if (!::GetExitCodeThread(hCacheThread, &dwExitCode))
-    {
-        ExitWithLastError(hr, "Failed to get cache thread exit code.");
-    }
+    hr = ThrdWaitForCompletion(hCacheThread, BURN_TIMEOUT, &dwExitCode);
+    ExitOnFailure(hr, "Failed to wait for cache thread to complete.");
 
     AssertSz(dwExitCode == dwExpectedExitCode, "Cache thread should have exited with the expected exit code.");