Issue #1185 - Formatting for sources in 'installer-ca'

installer/src/custom-action/close_application.cpp

 /**
  * \file close_application.cpp
  */
 
 #include <algorithm>
 
 #include "session.h"
 #include "property.h"
 #include "database.h"
 #include "process.h"
@@ skipping 23 matching lines @@
     snapshot.Refresh();
     browserCloser.Refresh();
     engineCloser.Refresh();
   }
 
   bool IsRunning()
   {
     return browserCloser.IsRunning() || engineCloser.IsRunning();
   }
 
-  bool ShutDown()
-  {
-    if (browserCloser.IsRunning() && !browserCloser.ShutDown())
+  bool ShutDown(ImmediateSession& session)
+  {
+    if (browserCloser.IsRunning() && !browserCloser.ShutDown(session))
     {
       // Assert IE is still running
       // This is after we've tried to shut it down, so we fail
       return false;
     }
-    if (engineCloser.IsRunning() && !engineCloser.ShutDown())
+    if (engineCloser.IsRunning() && !engineCloser.ShutDown(session))
     {
       // Assert the engine is still running
       // This is after IE has shut down itself and after we've tried to shut down the engine. Whatever.
       return false;
     }
     return true;
   }
 };
 
 //-------------------------------------------------------
@@ skipping 158 matching lines @@
          * This is where we specify default behavior for non-interactive operation.
          * The choice of "allow" makes it act like other installers, which is to make no effort to avoid a reboot after installation.
          */
         state = allow;
         session.Log("Reboot allowed by default in non-interactive session.");
       }
       else if (state == active)
       {
         throw std::runtime_error("AVOIDREBOOT=ACTIVE in non-interative session is not consistent");
       }
-      // Assert state is one of { allow, passive, automatic }

[Oleksandr, 2015/10/11 16:13:12]

Nit: I know this is a comment, but still would be good to remove the spaces
after and before '{' and '}'

+      // Assert state is one of {allow, passive, automatic}
     }
     else
     {
       throw std::runtime_error("unrecognized value for UILevel");
     }
 
     /*
      * Now that preliminaries are over, we set up the accessors for UI text.
      * We only use the object 'messageText' for interactive sessions, but it's cheap to set up and a hassle to conditionalize.
      *
@@ skipping 119 matching lines @@
          * We first shut down IE, or at least attempt to.
          *
          * Succeeded -> Goto success
          * Failed && interactive ->
          *   Ask user if they would like to try again
          *   Retry -> re-enter this state
          *   Cancel -> Goto notKnown
          * Failed && not interactive -> Goto abort
          */
         {
-          bool ieWasClosed = iec.ShutDown();
+          bool ieWasClosed = iec.ShutDown(session);
           if (iec.IsRunning())
           {
             session.Log("Attempt to shut down IE automatically failed.");
             if (interactive)
             {
               // Assert Interactive session and IE did not shut down.
               int x = session.WriteMessage(IMB(
                 messageText.Text(L"dialog_automatic_retry"),
                 IMB::Box::warning, IMB::ButtonSet::retryCancel, IMB::DefaultButton::one));
               switch (x)
@@ skipping 54 matching lines @@
     return ERROR_INSTALL_FAILURE;
   }
   catch (...)
   {
     session.LogNoexcept("terminated by unknown exception");
     return ERROR_INSTALL_FAILURE;
   }
   // Should be unreachable.
   return ERROR_INSTALL_FAILURE;
 }