diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-09-02 16:12:42 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-09-03 15:29:26 -0500 |
| commit | 237bdc6a97c0dd455da99c16e6b3b7cac4c79e86 (patch) | |
| tree | 1f2c789a7aa752e068fac8a4ca08815d13bf527a /src/burn/test | |
| parent | 7728e34e48a4fdb710ecc92dd8dca833bff3993f (diff) | |
| download | wix-237bdc6a97c0dd455da99c16e6b3b7cac4c79e86.tar.gz wix-237bdc6a97c0dd455da99c16e6b3b7cac4c79e86.tar.bz2 wix-237bdc6a97c0dd455da99c16e6b3b7cac4c79e86.zip | |
Add WixCanRestart and make wixstdba elevate for restart when required.
Fixes 5499
Diffstat (limited to 'src/burn/test')
| -rw-r--r-- | src/burn/test/BurnUnitTest/ElevationTest.cpp | 2 | ||||
| -rw-r--r-- | src/burn/test/BurnUnitTest/ExitCodeTest.cpp | 2 | ||||
| -rw-r--r-- | src/burn/test/BurnUnitTest/VariableTest.cpp | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/burn/test/BurnUnitTest/ElevationTest.cpp b/src/burn/test/BurnUnitTest/ElevationTest.cpp index 8d4cc7ff..713d9e07 100644 --- a/src/burn/test/BurnUnitTest/ElevationTest.cpp +++ b/src/burn/test/BurnUnitTest/ElevationTest.cpp | |||
| @@ -68,7 +68,7 @@ namespace Bootstrapper | |||
| 68 | // | 68 | // |
| 69 | // per-user side setup | 69 | // per-user side setup |
| 70 | // | 70 | // |
| 71 | hr = ElevationElevate(&engineState, NULL); | 71 | hr = ElevationElevate(&engineState, WM_BURN_ELEVATE, NULL); |
| 72 | TestThrowOnFailure(hr, L"Failed to elevate."); | 72 | TestThrowOnFailure(hr, L"Failed to elevate."); |
| 73 | 73 | ||
| 74 | // post execute message | 74 | // post execute message |
diff --git a/src/burn/test/BurnUnitTest/ExitCodeTest.cpp b/src/burn/test/BurnUnitTest/ExitCodeTest.cpp index d7d91d06..465ee04b 100644 --- a/src/burn/test/BurnUnitTest/ExitCodeTest.cpp +++ b/src/burn/test/BurnUnitTest/ExitCodeTest.cpp | |||
| @@ -118,7 +118,7 @@ static void LoadEngineState( | |||
| 118 | // | 118 | // |
| 119 | LoadEngineState(&engineState); | 119 | LoadEngineState(&engineState); |
| 120 | 120 | ||
| 121 | hr = ElevationElevate(&engineState, NULL); | 121 | hr = ElevationElevate(&engineState, WM_BURN_ELEVATE, NULL); |
| 122 | TestThrowOnFailure(hr, L"Failed to elevate."); | 122 | TestThrowOnFailure(hr, L"Failed to elevate."); |
| 123 | 123 | ||
| 124 | for (DWORD i = 0; i < countof(rgExitCodeItems); ++i) | 124 | for (DWORD i = 0; i < countof(rgExitCodeItems); ++i) |
diff --git a/src/burn/test/BurnUnitTest/VariableTest.cpp b/src/burn/test/BurnUnitTest/VariableTest.cpp index 8ee6e179..b373ae8e 100644 --- a/src/burn/test/BurnUnitTest/VariableTest.cpp +++ b/src/burn/test/BurnUnitTest/VariableTest.cpp | |||
| @@ -564,6 +564,7 @@ namespace Bootstrapper | |||
| 564 | VariableGetNumericHelper(&variables, L"TerminalServer"); | 564 | VariableGetNumericHelper(&variables, L"TerminalServer"); |
| 565 | VariableGetNumericHelper(&variables, L"UserUILanguageID"); | 565 | VariableGetNumericHelper(&variables, L"UserUILanguageID"); |
| 566 | VariableGetNumericHelper(&variables, L"UserLanguageID"); | 566 | VariableGetNumericHelper(&variables, L"UserLanguageID"); |
| 567 | VariableGetNumericHelper(&variables, L"WixCanRestart"); | ||
| 567 | 568 | ||
| 568 | // known folders | 569 | // known folders |
| 569 | Assert::Equal<String^>(Environment::GetFolderPath(Environment::SpecialFolder::ApplicationData) + "\\", VariableGetStringHelper(&variables, L"AppDataFolder")); | 570 | Assert::Equal<String^>(Environment::GetFolderPath(Environment::SpecialFolder::ApplicationData) + "\\", VariableGetStringHelper(&variables, L"AppDataFolder")); |