8 files changed, 240 insertions, 133 deletions

diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp
index 3c1ed117..c8dce17b 100644
--- a/src/burn/engine/core.cpp
+++ b/src/burn/engine/core.cpp
@@ -2028,6 +2028,48 @@ extern "C" HRESULT DAPI CoreWaitForProcCompletion(
     return vpfnProcWaitForCompletion(hProcess, dwTimeout, pdwReturnCode);
 }
 
+extern "C" HRESULT DAPI CoreCloseElevatedLoggingThread(
+    __in BURN_ENGINE_STATE* pEngineState
+    )
+{
+    HRESULT hr = S_OK;
+
+    if (INVALID_HANDLE_VALUE == pEngineState->elevatedLoggingContext.hThread)
+    {
+        ExitFunction();
+    }
+
+    if (!::SetEvent(pEngineState->elevatedLoggingContext.hFinishedEvent))
+    {
+        ExitWithLastError(hr, "Failed to set log finished event.");
+    }
+
+    hr = AppWaitForSingleObject(pEngineState->elevatedLoggingContext.hThread, 5 * 60 * 1000); // TODO: is 5 minutes good?
+    ExitOnFailure(hr, "Failed to wait for elevated logging thread.");
+
+LExit:
+    return hr;
+}
+
+extern "C" HRESULT DAPI CoreWaitForUnelevatedLoggingThread(
+    __in HANDLE hUnelevatedLoggingThread
+    )
+{
+    HRESULT hr = S_OK;
+
+    if (INVALID_HANDLE_VALUE == hUnelevatedLoggingThread)
+    {
+        ExitFunction();
+    }
+
+    // Give the thread 15 seconds to exit.
+    hr = AppWaitForSingleObject(hUnelevatedLoggingThread, 15 * 1000);
+    ExitOnFailure(hr, "Failed to wait for unelevated logging thread.");
+
+LExit:
+    return hr;
+}
+
 // internal helper functions
 
 static HRESULT AppendEscapedArgumentToCommandLine(
diff --git a/src/burn/engine/core.h b/src/burn/engine/core.h
index 28b5ba5d..812b40b1 100644
--- a/src/burn/engine/core.h
+++ b/src/burn/engine/core.h
@@ -123,6 +123,16 @@ typedef struct _BURN_ENGINE_COMMAND
     LPWSTR sczLogFile;
 } BURN_ENGINE_COMMAND;
 
+typedef struct _BURN_REDIRECTED_LOGGING_CONTEXT
+{
+    CRITICAL_SECTION csBuffer;
+    LPSTR sczBuffer;
+    HANDLE hPipe;
+    HANDLE hLogEvent;
+    HANDLE hFinishedEvent;
+    HANDLE hThread;
+} BURN_REDIRECTED_LOGGING_CONTEXT;
+
 typedef struct _BURN_ENGINE_STATE
 {
     // UX flow control
@@ -164,6 +174,7 @@ typedef struct _BURN_ENGINE_STATE
 
     BURN_PLAN plan;
 
+    BURN_REDIRECTED_LOGGING_CONTEXT elevatedLoggingContext;
     HANDLE hUnelevatedLoggingThread;
 
     LPWSTR sczBundleEngineWorkingPath;
@@ -336,6 +347,12 @@ HRESULT DAPI CoreWaitForProcCompletion(
     __in DWORD dwTimeout,
     __out_opt DWORD* pdwReturnCode
     );
+HRESULT DAPI CoreCloseElevatedLoggingThread(
+    __in BURN_ENGINE_STATE* pEngineState
+    );
+HRESULT DAPI CoreWaitForUnelevatedLoggingThread(
+    __in HANDLE hUnelevatedLoggingThread
+    );
 
 #if defined(__cplusplus)
 }
diff --git a/src/burn/engine/engine.cpp b/src/burn/engine/engine.cpp
index 9c8b6c1d..89082a88 100644
--- a/src/burn/engine/engine.cpp
+++ b/src/burn/engine/engine.cpp
@@ -3,15 +3,6 @@
 #include "precomp.h"
 
 
-typedef struct _REDIRECTED_LOGGING_CONTEXT
-{
-    CRITICAL_SECTION csBuffer;
-    LPSTR sczBuffer;
-    HANDLE hPipe;
-    HANDLE hLogEvent;
-    HANDLE hFinishedEvent;
-} REDIRECTED_LOGGING_CONTEXT;
-
 // constants
 
 const DWORD RESTART_RETRIES = 10;
@@ -65,13 +56,6 @@ static HRESULT LogStringOverPipe(
 static DWORD WINAPI ElevatedLoggingThreadProc(
     __in LPVOID lpThreadParameter
     );
-static HRESULT WaitForElevatedLoggingThread(
-    __in REDIRECTED_LOGGING_CONTEXT* pContext,
-    __in HANDLE hLoggingThread
-    );
-static HRESULT WaitForUnelevatedLoggingThread(
-    __in HANDLE hUnelevatedLoggingThread
-    );
 static HRESULT Restart(
     __in BURN_ENGINE_STATE* pEngineState
     );
@@ -308,10 +292,6 @@ LExit:
     {
         LogId(REPORT_STANDARD, MSG_EXITING_RUN_ONCE, FAILED(hr) ? (int)hr : *pdwExitCode);
     }
-    else if (fRunElevated)
-    {
-        LogId(REPORT_STANDARD, MSG_EXITING_ELEVATED, FAILED(hr) ? (int)hr : *pdwExitCode);
-    }
 
     if (fLogInitialized)
     {
@@ -320,7 +300,12 @@ LExit:
         LogFlush();
     }
 
-    if (engineState.fRestart)
+    // end per-machine process if running
+    if (!fRunElevated && INVALID_HANDLE_VALUE != engineState.companionConnection.hPipe)
+    {
+        PipeTerminateChildProcess(&engineState.companionConnection, *pdwExitCode, engineState.fRestart);
+    }
+    else if (engineState.fRestart)
     {
         LogId(REPORT_STANDARD, MSG_RESTARTING);
 
@@ -334,6 +319,30 @@ LExit:
     // If the message window is still around, close it.
     UiCloseMessageWindow(&engineState);
 
+    // If the logging thread is still around, close it.
+    if (!fRunElevated)
+    {
+        CoreWaitForUnelevatedLoggingThread(engineState.hUnelevatedLoggingThread);
+    }
+    else if (fRunElevated)
+    {
+        CoreCloseElevatedLoggingThread(&engineState);
+
+        // We're done talking to the child so always reset logging now.
+        LogRedirect(NULL, NULL);
+
+        // If there was a log message left, try to log it locally.
+        if (engineState.elevatedLoggingContext.sczBuffer)
+        {
+            LogStringWorkRaw(engineState.elevatedLoggingContext.sczBuffer);
+
+            ReleaseStr(engineState.elevatedLoggingContext.sczBuffer);
+        }
+
+        // Log the exit code here to make sure it gets in the elevated log.
+        LogId(REPORT_STANDARD, MSG_EXITING_ELEVATED, FAILED(hr) ? (int)hr : *pdwExitCode);
+    }
+
     UninitializeEngineState(&engineState);
 
     if (fXmlInitialized)
@@ -387,7 +396,12 @@ static HRESULT InitializeEngineState(
     HANDLE hSectionFile = hEngineFile;
     HANDLE hSourceEngineFile = INVALID_HANDLE_VALUE;
 
+    pEngineState->hUnelevatedLoggingThread = INVALID_HANDLE_VALUE;
+    pEngineState->elevatedLoggingContext.hPipe = INVALID_HANDLE_VALUE;
+    pEngineState->elevatedLoggingContext.hThread = INVALID_HANDLE_VALUE;
+
     ::InitializeCriticalSection(&pEngineState->csRestartState);
+    ::InitializeCriticalSection(&pEngineState->elevatedLoggingContext.csBuffer);
 
     pEngineState->internalCommand.automaticUpdates = BURN_AU_PAUSE_ACTION_IFELEVATED;
     ::InitializeCriticalSection(&pEngineState->userExperience.csEngineActive);
@@ -423,6 +437,12 @@ static void UninitializeEngineState(
     ReleaseMem(pEngineState->internalCommand.rgSecretArgs);
     ReleaseMem(pEngineState->internalCommand.rgUnknownArgs);
 
+    ReleaseFileHandle(pEngineState->hUnelevatedLoggingThread);
+    ReleaseFileHandle(pEngineState->elevatedLoggingContext.hThread);
+    ::DeleteCriticalSection(&pEngineState->elevatedLoggingContext.csBuffer);
+    ReleaseHandle(pEngineState->elevatedLoggingContext.hLogEvent);
+    ReleaseHandle(pEngineState->elevatedLoggingContext.hFinishedEvent);
+
     PipeConnectionUninitialize(&pEngineState->embeddedConnection);
     PipeConnectionUninitialize(&pEngineState->companionConnection);
     ReleaseStr(pEngineState->sczBundleEngineWorkingPath)
@@ -643,14 +663,6 @@ LExit:
 
     VariablesDump(&pEngineState->variables);
 
-    // end per-machine process if running
-    if (INVALID_HANDLE_VALUE != pEngineState->companionConnection.hPipe)
-    {
-        PipeTerminateChildProcess(&pEngineState->companionConnection, pEngineState->userExperience.dwExitCode, FALSE);
-
-        WaitForUnelevatedLoggingThread(pEngineState->hUnelevatedLoggingThread);
-    }
-
     // If the splash screen is still around, close it.
     if (::IsWindow(pEngineState->command.hwndSplashScreen))
     {
@@ -671,9 +683,7 @@ static HRESULT RunElevated(
 {
     HRESULT hr = S_OK;
     HANDLE hLock = NULL;
-    HANDLE hLoggingThread = NULL;
-    REDIRECTED_LOGGING_CONTEXT loggingContext = { };
-    BOOL fDeleteLoggingCs = FALSE;
+    BURN_REDIRECTED_LOGGING_CONTEXT* pLoggingContext = &pEngineState->elevatedLoggingContext;
 
     // Initialize logging.
     hr = LoggingOpen(&pEngineState->log, &pEngineState->internalCommand, &pEngineState->command, &pEngineState->variables, pEngineState->registration.sczDisplayName);
@@ -685,21 +695,18 @@ static HRESULT RunElevated(
 
     // Set up the context for the logging thread then
     // override logging to write over the pipe.
-    ::InitializeCriticalSection(&loggingContext.csBuffer);
-    fDeleteLoggingCs = TRUE;
-
-    loggingContext.hLogEvent = ::CreateEventW(NULL, TRUE, FALSE, NULL);
-    ExitOnNullWithLastError(loggingContext.hLogEvent, hr, "Failed to create log event for logging thread.");
+    pLoggingContext->hLogEvent = ::CreateEventW(NULL, TRUE, FALSE, NULL);
+    ExitOnNullWithLastError(pLoggingContext->hLogEvent, hr, "Failed to create log event for logging thread.");
 
-    loggingContext.hFinishedEvent = ::CreateEventW(NULL, TRUE, FALSE, NULL);
-    ExitOnNullWithLastError(loggingContext.hFinishedEvent, hr, "Failed to create finished event for logging thread.");
+    pLoggingContext->hFinishedEvent = ::CreateEventW(NULL, TRUE, FALSE, NULL);
+    ExitOnNullWithLastError(pLoggingContext->hFinishedEvent, hr, "Failed to create finished event for logging thread.");
 
-    loggingContext.hPipe = pEngineState->companionConnection.hLoggingPipe;
+    pLoggingContext->hPipe = pEngineState->companionConnection.hLoggingPipe;
 
-    hLoggingThread = ::CreateThread(NULL, 0, ElevatedLoggingThreadProc, &loggingContext, 0, NULL);
-    ExitOnNullWithLastError(hLoggingThread, hr, "Failed to create elevated logging thread.");
+    pLoggingContext->hThread = ::CreateThread(NULL, 0, ElevatedLoggingThreadProc, pLoggingContext, 0, NULL);
+    ExitOnNullWithLastError(pLoggingContext->hThread, hr, "Failed to create elevated logging thread.");
 
-    LogRedirect(RedirectLoggingOverPipe, &loggingContext);
+    LogRedirect(RedirectLoggingOverPipe, pLoggingContext);
 
     if (!pEngineState->internalCommand.fInitiallyElevated)
     {
@@ -716,29 +723,7 @@ static HRESULT RunElevated(
     hr = ElevationChildPumpMessages(pEngineState->companionConnection.hPipe, pEngineState->companionConnection.hCachePipe, &pEngineState->approvedExes, &pEngineState->cache, &pEngineState->containers, &pEngineState->packages, &pEngineState->payloads, &pEngineState->variables, &pEngineState->registration, &pEngineState->userExperience, &hLock, &pEngineState->userExperience.dwExitCode, &pEngineState->fRestart, &pEngineState->plan.fApplying);
     ExitOnFailure(hr, "Failed to pump messages from parent process.");
 
-    WaitForElevatedLoggingThread(&loggingContext, hLoggingThread);
-
 LExit:
-    ReleaseHandle(hLoggingThread);
-
-    LogRedirect(NULL, NULL); // we're done talking to the child so always reset logging now.
-
-    if (fDeleteLoggingCs)
-    {
-        ::DeleteCriticalSection(&loggingContext.csBuffer);
-    }
-
-    ReleaseHandle(loggingContext.hLogEvent);
-    ReleaseHandle(loggingContext.hFinishedEvent);
-
-    // If there was a log message left, try to log it locally.
-    if (loggingContext.sczBuffer)
-    {
-        LogStringWorkRaw(loggingContext.sczBuffer);
-
-        ReleaseStr(loggingContext.sczBuffer);
-    }
-
     if (hLock)
     {
         ::ReleaseMutex(hLock);
@@ -936,7 +921,7 @@ static HRESULT DAPI RedirectLoggingOverPipe(
     )
 {
     HRESULT hr = S_OK;
-    REDIRECTED_LOGGING_CONTEXT* pContext = static_cast<REDIRECTED_LOGGING_CONTEXT*>(pvContext);
+    BURN_REDIRECTED_LOGGING_CONTEXT* pContext = static_cast<BURN_REDIRECTED_LOGGING_CONTEXT*>(pvContext);
 
     ::EnterCriticalSection(&pContext->csBuffer);
 
@@ -986,7 +971,7 @@ static DWORD WINAPI ElevatedLoggingThreadProc(
 {
     HRESULT hr = S_OK;
     DWORD dwLastError = ERROR_SUCCESS;
-    REDIRECTED_LOGGING_CONTEXT* pContext = static_cast<REDIRECTED_LOGGING_CONTEXT*>(lpThreadParameter);
+    BURN_REDIRECTED_LOGGING_CONTEXT* pContext = static_cast<BURN_REDIRECTED_LOGGING_CONTEXT*>(lpThreadParameter);
     DWORD dwSignaledIndex = 0;
     LPSTR sczBuffer = NULL;
     BURN_PIPE_RESULT result = { };
@@ -1079,39 +1064,6 @@ LExit:
     return (DWORD)hr;
 }
 
-static HRESULT WaitForElevatedLoggingThread(
-    __in REDIRECTED_LOGGING_CONTEXT* pContext,
-    __in HANDLE hLoggingThread
-    )
-{
-    HRESULT hr = S_OK;
-
-    if (!::SetEvent(pContext->hFinishedEvent))
-    {
-        ExitWithLastError(hr, "Failed to set log finished event.");
-    }
-
-    hr = AppWaitForSingleObject(hLoggingThread, 5 * 60 * 1000); // TODO: is 5 minutes good?
-    ExitOnFailure(hr, "Failed to wait for elevated logging thread.");
-
-LExit:
-    return hr;
-}
-
-static HRESULT WaitForUnelevatedLoggingThread(
-    __in HANDLE hUnelevatedLoggingThread
-    )
-{
-    HRESULT hr = S_OK;
-
-    // Give the thread 15 seconds to exit.
-    hr = AppWaitForSingleObject(hUnelevatedLoggingThread, 15 * 1000);
-    ExitOnFailure(hr, "Failed to wait for unelevated logging thread.");
-
-LExit:
-    return hr;
-}
-
 static HRESULT Restart(
     __in BURN_ENGINE_STATE* pEngineState
     )
diff --git a/src/burn/engine/uithread.cpp b/src/burn/engine/uithread.cpp
index 673111f8..8ddd51bd 100644
--- a/src/burn/engine/uithread.cpp
+++ b/src/burn/engine/uithread.cpp
@@ -222,6 +222,16 @@ static LRESULT CALLBACK WndProc(
                 ::Sleep(250);
             }
 
+            // If this is the per-machine process then close the logging pipe with the parent process.
+            if (pInfo->fElevatedEngine)
+            {
+                CoreCloseElevatedLoggingThread(pInfo->pEngineState);
+            }
+            else
+            {
+                CoreWaitForUnelevatedLoggingThread(pInfo->pEngineState->hUnelevatedLoggingThread);
+            }
+
             LogStringWorkRaw("=======================================\r\n");
 
             // Close the log to try to make sure everything is flushed to disk.
diff --git a/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.cpp b/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.cpp
index ce74534d..c619dbd6 100644
--- a/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.cpp
+++ b/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.cpp
@@ -89,39 +89,6 @@ public: // IBAFunctions
         return hr;
     }
 
-    virtual STDMETHODIMP WndProc(
-        __in HWND hWnd,
-        __in UINT uMsg,
-        __in WPARAM /*wParam*/,
-        __in LPARAM lParam,
-        __inout BOOL* pfProcessed,
-        __inout LRESULT* plResult
-        )
-    {
-        switch (uMsg)
-        {
-        case WM_QUERYENDSESSION:
-            if (BOOTSTRAPPER_DISPLAY_FULL <= m_command.display)
-            {
-                DWORD dwEndSession = static_cast<DWORD>(lParam);
-                if (ENDSESSION_CRITICAL & dwEndSession)
-                {
-                    // Return false to get the WM_ENDSESSION message so that critical shutdowns can be delayed.
-                    *plResult = FALSE;
-                    *pfProcessed = TRUE;
-                }
-            }
-            break;
-        case WM_ENDSESSION:
-            if (BOOTSTRAPPER_DISPLAY_FULL <= m_command.display)
-            {
-                ::MessageBoxW(hWnd, L"WM_ENDSESSION", L"BAFunctions WndProc", MB_OK);
-            }
-            break;
-        }
-        return S_OK;
-    }
-
 public: //IBootstrapperApplication
     virtual STDMETHODIMP OnExecuteBegin(
         __in DWORD /*cExecutingPackages*/,
diff --git a/src/test/burn/TestData/Manual/BundleA/BundleA.wixproj b/src/test/burn/TestData/Manual/BundleA/BundleA.wixproj
index 907b85c9..225664b9 100644
--- a/src/test/burn/TestData/Manual/BundleA/BundleA.wixproj
+++ b/src/test/burn/TestData/Manual/BundleA/BundleA.wixproj
@@ -11,8 +11,12 @@
   <ItemGroup>
     <ProjectReference Include="..\BafThmUtilTesting\BafThmUtilTesting.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="WixToolset.Bal.wixext" />
   </ItemGroup>
+  <Target Name="CopyManualInstructions" AfterTargets="AfterBuild">
+    <Copy SourceFiles="ManualTests.txt" DestinationFiles="$(OutputPath)ManualTests.txt" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/test/burn/TestData/Manual/BundleA/BundleA.wxs b/src/test/burn/TestData/Manual/BundleA/BundleA.wxs
index 44abc645..20b68a91 100644
--- a/src/test/burn/TestData/Manual/BundleA/BundleA.wxs
+++ b/src/test/burn/TestData/Manual/BundleA/BundleA.wxs
@@ -11,7 +11,12 @@
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)">
         <MsiProperty Name="FORCERESTARTCA" Value="[FORCERESTARTCA]" />
       </MsiPackage>
+      <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
+                  DetectCondition="" Permanent="yes" InstallArguments="/ec [EXEEXITCODE]">
+        <PayloadGroupRef Id="TestExePayloads" />
+      </ExePackage>
     </PackageGroup>
+    <Variable Name="EXEEXITCODE" bal:Overridable="yes" Value="0" />
     <Variable Name="FORCERESTARTCA" bal:Overridable="yes" />
   </Fragment>
 </Wix>
diff --git a/src/test/burn/TestData/Manual/BundleA/ManualTests.txt b/src/test/burn/TestData/Manual/BundleA/ManualTests.txt
new file mode 100644
index 00000000..d432f94a
--- /dev/null
+++ b/src/test/burn/TestData/Manual/BundleA/ManualTests.txt
@@ -0,0 +1,110 @@
+VariousWixstdbaAndBAFunctionsAndThmutilFunctionality
+1. Run BundleA.exe unelevated.
+2. Click Test.
+3. Verify that the BafThmUtilTestingTheme window comes up and click Start.
+4. There are several pages. Follow the instructions on each page before clicking Next.
+5. Click ThemeClose to close the BafThmUtilTestingTheme window.
+6. Click the Options button.
+7. Click the Browse button.
+8. Type in "C:\Program Files (x86)\mytest".
+9. Click the Select Folder button.
+10. Verify the Install location textbox was populated with "C:\Program Files (x86)\mytest".
+11. Click OK.
+12. Verify the caption of the window is "~Manual - BundleA Setup" and the text is "~Manual - BundleA".
+13. Verify the Install button has the UAC shield and then click it (accept elevation).
+14. Click OK on the OnExecuteBegin message box.
+15. After it finishes, verify the window text is "Installation Successfully Completed".
+16. Click Close.
+17. Verify in the bundle log that the variable InstallFolder was set to "C:\Program Files (x86)\mytest".
+18. Run BundleA.exe again.
+19. Click Uninstall (accept elevation).
+20. Click OK on the OnExecuteBegin message box.
+21. After it finishes, verify the window text is "Uninstallation Successfully Completed".
+22. Click Close.
+
+CanBlockShutdownDuringApply
+1. Run BundleA.exe unelevated.
+2. Click Install (accept elevation).
+3. Verify the OnExecuteBegin message box comes up with the message "Shutdown requests should be denied right now." and leave it up.
+4. Use the Windows UI to try to restart the machine.
+5. On current versions of Windows, full screen UI will display that the bundle is blocking restart. Click Cancel to stop the restart.
+6. Click OK on the message box from step 3 to allow installation to continue.
+7. Verify that the installation was successful and then close the bundle.
+8. Look in the bundle log and verify that the restart request didn't cause any errors, and that it logged messages that look like:
+
+i400: Received system request to shut down the process: allowed: No, elevated: No, critical: No, logoff: No, close app: No
+i400: Received system request to shut down the process: allowed: No, elevated: Yes, critical: No, logoff: No, close app: No
+i401: Received result of system request to shut down the process: closing: No, elevated: No, critical: No, logoff: No, close app: No
+i401: Received result of system request to shut down the process: closing: No, elevated: Yes, critical: No, logoff: No, close app: No
+
+(9. Uninstall the bundle)
+
+CanLogRestartFailure
+
+    Note: this test requires special setup. Change the User Rights Assignment such that no one has the shutdown privilege. Logout and log back in after making changes to make them take effect.
+    (mmc.exe -> Group Policy Object Editor -> Local Computer Policy -> Computer Configuration -> Windows Settings -> Security Settings -> Local Policies -> User Rights Assignment -> Shut down the system)
+
+1. Run BundleA.exe elevated with the command line EXEEXITCODE=3010.
+2. Click Install.
+3. Click OK on the OnExecuteBegin message box.
+4. Click Restart.
+5. Look in the bundle log and verify that the restart request failure was logged with messages that look like:
+
+w005: Restarting computer...
+e000: Error 0x80070005: Failed to schedule restart.
+e023: The restart request failed, error: 0x80070005. The machine will need to be manually restarted.
+
+(5. Uninstall the bundle)
+
+CanGracefullyCutApplyShortInResponseToCriticalShutdown
+
+    Note: Requires different User Rights Assignment settings from CanLogRestartFailure - Administrators need to have the shutdown privilege.
+
+1. Run BundleA.exe FORCERESTARTCA=1.
+2. Click Install (accept elevation).
+3. Click OK on the OnExecuteBegin message box.
+4. Verify the machine automatically restarts with no chance to cancel it (because the MSI forces a restart).
+5. Login to the machine.
+6. Verify that the bundle automatically started running again.
+7. Click OK on the OnExecuteBegin message box.
+8. Verify that the installation was successful and then close the bundle.
+9. Look in the bundle log and verify that the restart request didn't cause any errors, and that it logged messages that look like:
+
+i301: Applying execute package: PackageA, action: Install, path: C:\ProgramData\Package Cache\{1C6F49C0-B4BA-438D-871D-2B5E91C0EED5}v1.0.0.0\PackageA.msi, arguments: ' FORCERESTARTCA="1" ARPSYSTEMCOMPONENT="1" MSIFASTINSTALL="7" BURNMSIINSTALL=1 REINSTALLMODE="muso" REBOOT=ReallySuppress'
+...
+i400: Received system request to shut down the process: allowed: No, elevated: No, critical: Yes, logoff: No, close app: No
+i400: Received system request to shut down the process: allowed: No, elevated: Yes, critical: Yes, logoff: No, close app: No
+i401: Received result of system request to shut down the process: closing: Yes, elevated: No, critical: Yes, logoff: No, close app: No
+i401: Received result of system request to shut down the process: closing: Yes, elevated: Yes, critical: Yes, logoff: No, close app: No
+...
+i319: Applied execute package: PackageA, result: 0x0, restart: Initiated
+...
+i420: Resuming automatic updates.
+i421: Resumed automatic updates.
+=======================================
+i001: Burn x86 v4.0.0.525, Windows v10.0 x64 (Build 19041: Service Pack 0), path: C:\ProgramData\Package Cache\{30D63455-CD23-4AC3-81CC-4695434F848A}\BundleA.exe
+
+(10. Uninstall the bundle)
+
+CanRestartFromUnelevatedPerMachineBundleWithoutShutdownPrivilege
+
+    Note: Requires different User Rights Assignment settings from CanLogRestartFailure - Only Administrators should have the shutdown privilege. Users should not have it.
+
+1. Run BundleA.exe unelevated with the command line EXEEXITCODE=3010.
+2. Click Install.
+3. Verify that the UAC prompt came up and accept elevation.
+4. Click OK on the OnExecuteBegin message box.
+5. Click Restart.
+6. The machine should restart.
+7. Login to the machine.
+8. Verify that the bundle did not automatically start running.
+9. Look in the bundle log and verify that the restart request didn't cause any errors, and that it logged messages that look like (the process id for w005 must match the elevated i400 and i401):
+
+[0DDC:0448]w005: Restarting computer...
+[1228:18CC]i400: Received system request to shut down the process: allowed: Yes, elevated: No, critical: No, logoff: No, close app: No
+[1228:18CC]i401: Received result of system request to shut down the process: closing: Yes, elevated: No, critical: No, logoff: No, close app: No
+[0DDC:0954]i400: Received system request to shut down the process: allowed: Yes, elevated: Yes, critical: No, logoff: No, close app: No
+[0DDC:0954]i401: Received result of system request to shut down the process: closing: Yes, elevated: Yes, critical: No, logoff: No, close app: No
+=======================================
+
+(10. Uninstall the bundle)