Issue #1186 - Change names that appear in the custom action

installer/src/installer-lib/session.cpp

 /**
 * \file session.cpp Implementation of Session class.
 */
 
 #include "installer-lib.h"
 #include "session.h"
 #include "property.h"
 #include "msiquery.h"
 
 //-----------------------------------------------------------------------------------------
 // Message
 //-----------------------------------------------------------------------------------------
 Message::Message( std::string message, INSTALLMESSAGE message_type )
   : r( 1 ), message_type( message_type )
 {
   r.assign_string( 0, message ) ;
 }
 
 Message::Message( std::wstring message, INSTALLMESSAGE message_type )
   : r( 1 ), message_type( message_type )
 {
   r.assign_string( 0, message ) ;
 }
 
 //-----------------------------------------------------------------------------------------
 // Session
 //-----------------------------------------------------------------------------------------
 Session::Session( MSIHANDLE handle, std::string name )
   : handle( handle ), 
   log_prefix( name + ": " )

[Oleksandr, 2014/10/06 20:44:12]

logPrefix?

[Eric, 2014/10/14 17:42:49]

Next round, as also with the two below. See review comment for more.

 {
   log_prefix_w.assign( name.begin(), name.end() ) ;
   log_prefix_w += L": " ;
   LogNoexcept( "Entering custom action" ) ;
 }
 
 Session::~Session()
 {
   LogNoexcept( "Exiting custom action" ) ;
 }
 
 /**
 * A message for the installation log.
 *
 * Writing to the installation log uses MsiProcessMessage just like interactive dialog boxes do.
 *
 * This class is not exposed outside this compilation unit because everything it can do is already exposed by the log functions.
 */
 struct Log_Message

[Oleksandr, 2014/10/06 20:44:12]

LogMessage here?

   : public Message
 {
   Log_Message ( std::wstring message )
     : Message( message, INSTALLMESSAGE_INFO )
   {}
 
   Log_Message ( std::string message )
     : Message( message, INSTALLMESSAGE_INFO )
   {}
 } ;
 
-void Session::log( std::string message )
+void Session::Log( std::string message )
 {
   WriteMessage( Log_Message( log_prefix + message ) ) ;
 }
 
-void Session::log( std::wstring message )
+void Session::Log( std::wstring message )
 {
   WriteMessage( Log_Message( log_prefix_w + message ) ) ;
 }
 
 void Session::LogNoexcept( std::string message )
 {
   write_message_noexcept( Log_Message( log_prefix + message ) ) ;

[Oleksandr, 2014/10/06 20:44:12]

WriteMessageNoexcept

 }
 
 int Session::WriteMessage( Message & m )
 {
   int x = write_message_noexcept( m ) ;
   if ( x == -1 )
   {
     throw windows_api_error( "MsiProcessMessage", x, "attempt to write to log file" ) ;
   }
   return x ;
 }
 
 int Session::write_message_noexcept( Message & m )
 {
   return MsiProcessMessage( handle, m.message_type, m.r.handle() ) ;
 }
 
 //-----------------------------------------------------------------------------------------
 // ImmediateSession
 //-----------------------------------------------------------------------------------------
 ImmediateSession::ImmediateSession( MSIHANDLE handle, std::string name )
   : Session( handle, name )
 {}