diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-06-29 10:28:53 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-06-29 15:08:37 -0500 |
| commit | 7cca75c8e95f129a21c33f1f4568e90e9e397f9d (patch) | |
| tree | cb9890caa1ac8bc891d444b6376a5e9f997ca1e3 /src/burn/test/BurnUnitTest | |
| parent | 3ff6428a068bafd74d8ec072a5fc261c33cc2019 (diff) | |
| download | wix-7cca75c8e95f129a21c33f1f4568e90e9e397f9d.tar.gz wix-7cca75c8e95f129a21c33f1f4568e90e9e397f9d.tar.bz2 wix-7cca75c8e95f129a21c33f1f4568e90e9e397f9d.zip | |
Add AppWaitForSingleObject/MultipleObjects, ThreadWaitForCompletion.
Diffstat (limited to 'src/burn/test/BurnUnitTest')
| -rw-r--r-- | src/burn/test/BurnUnitTest/ElevationTest.cpp | 3 | ||||
| -rw-r--r-- | src/burn/test/BurnUnitTest/precomp.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/burn/test/BurnUnitTest/ElevationTest.cpp b/src/burn/test/BurnUnitTest/ElevationTest.cpp index 97d76b7d..ce34b4b1 100644 --- a/src/burn/test/BurnUnitTest/ElevationTest.cpp +++ b/src/burn/test/BurnUnitTest/ElevationTest.cpp | |||
| @@ -54,7 +54,6 @@ namespace Bootstrapper | |||
| 54 | HRESULT hr = S_OK; | 54 | HRESULT hr = S_OK; |
| 55 | BURN_ENGINE_STATE engineState = { }; | 55 | BURN_ENGINE_STATE engineState = { }; |
| 56 | BURN_PIPE_CONNECTION* pConnection = &engineState.companionConnection; | 56 | BURN_PIPE_CONNECTION* pConnection = &engineState.companionConnection; |
| 57 | HANDLE hEvent = NULL; | ||
| 58 | DWORD dwResult = S_OK; | 57 | DWORD dwResult = S_OK; |
| 59 | 58 | ||
| 60 | engineState.sczBundleEngineWorkingPath = L"tests\\ignore\\this\\path\\to\\burn.exe"; | 59 | engineState.sczBundleEngineWorkingPath = L"tests\\ignore\\this\\path\\to\\burn.exe"; |
| @@ -62,6 +61,7 @@ namespace Bootstrapper | |||
| 62 | try | 61 | try |
| 63 | { | 62 | { |
| 64 | ShelFunctionOverride(ElevateTest_ShellExecuteExW); | 63 | ShelFunctionOverride(ElevateTest_ShellExecuteExW); |
| 64 | CoreFunctionOverride(ThrdWaitForCompletion); | ||
| 65 | 65 | ||
| 66 | PipeConnectionInitialize(pConnection); | 66 | PipeConnectionInitialize(pConnection); |
| 67 | 67 | ||
| @@ -87,7 +87,6 @@ namespace Bootstrapper | |||
| 87 | finally | 87 | finally |
| 88 | { | 88 | { |
| 89 | PipeConnectionUninitialize(pConnection); | 89 | PipeConnectionUninitialize(pConnection); |
| 90 | ReleaseHandle(hEvent); | ||
| 91 | } | 90 | } |
| 92 | } | 91 | } |
| 93 | }; | 92 | }; |
diff --git a/src/burn/test/BurnUnitTest/precomp.h b/src/burn/test/BurnUnitTest/precomp.h index 92c8c4c0..69c62cb2 100644 --- a/src/burn/test/BurnUnitTest/precomp.h +++ b/src/burn/test/BurnUnitTest/precomp.h | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <resrutil.h> | 28 | #include <resrutil.h> |
| 29 | #include <shelutil.h> | 29 | #include <shelutil.h> |
| 30 | #include <strutil.h> | 30 | #include <strutil.h> |
| 31 | #include <thrdutil.h> | ||
| 31 | #include <wiutil.h> | 32 | #include <wiutil.h> |
| 32 | #include <xmlutil.h> | 33 | #include <xmlutil.h> |
| 33 | #include <dictutil.h> | 34 | #include <dictutil.h> |