Only take into account processes that have our plugin loaded

installer/src/installer-lib/process.cpp

 #include <stdexcept>
 #include <functional>
 #include <wctype.h>
 // <thread> is C++11, but implemented in VS2012
 #include <thread>
 
 #include "process.h"
 
 //-------------------------------------------------------
 // Windows_Handle
@@ skipping 13 matching lines @@
 {
   this -> ~Windows_Handle() ;
   handle = h ;
   validate_handle() ;
 }
 
 void Windows_Handle::validate_handle()
 {
   if ( handle == INVALID_HANDLE_VALUE )
   {
+    // TODO: This code really deserves use of a proper exception class that packages 
+    // Windows API errors consistently.
     char tmp[256];
-        sprintf(tmp, "Invalid handle. Last error: %d", GetLastError());

[Eric, 2014/03/27 16:52:44]

Using sprintf() seems safe here, but it's such a buffer-leaking hazard generally
that it's better to omit it entirely.

Not relevant here, though. This code really deserves use of a proper exception
class that packages Windows API errors consistently. Please just mark this in a
comment as TODO and I'll take care or it.

+    sprintf_s(tmp, "Invalid handle. Last error: %d", GetLastError());
     throw std::runtime_error( tmp ) ;
   }
 }
 
 //-------------------------------------------------------
 // process_by_name_CI
 //-------------------------------------------------------
 process_by_name_CI::process_by_name_CI( const wchar_t * name )
   : name( name ), length( wcslen( name ) )
 {}
 
 bool process_by_name_CI::operator()( const PROCESSENTRY32W & process )
 {
   return 0 == wcsncmpi( process.szExeFile, name, length ) ;
 }
 
-//-------------------------------------------------------
-// process_by_any_exe_name_CI
-//-------------------------------------------------------
-bool process_by_any_exe_name_CI::operator()( const PROCESSENTRY32W & process )
-{
-  return names.find( process.szExeFile ) != names.end() ;
-}
-
-//-------------------------------------------------------
-// process_by_any_exe_name_CI_w_ABP
-//-------------------------------------------------------
-bool process_by_any_exe_name_CI_w_ABP::operator()( const PROCESSENTRY32W & process )
-{
-  bool moduleFound = false;

[Eric, 2014/03/27 16:52:44]

We can eliminate 'moduleFound'

-  if ( names.find( process.szExeFile ) != names.end() )
-  {
-      if (moduleNames.empty())
-                  return true;

[Eric, 2014/03/27 16:52:44]

We should document that if no module names are present, that the filter uses
only one criterion and not two. Ordinarily, if there were a requirement that
there be some element in a set and that set were empty, that the requirement
couldn't be satisfied. That would mean "return false" here. Documenting that an
empty set means "don't filter on this set" would put that aright.

-
-          ModulesSnapshot ms( process.th32ProcessID );
-return true;

[Eric, 2014/03/27 16:52:44]

Stub return for testing something, I assume?

-          MODULEENTRY32* me = ms.begin();
-          while ( me != ms.end() )
-          {
-                  if (moduleNames.find( me->szModule ) != moduleNames.end())
-                  {
-                          moduleFound = true;

[Eric, 2014/03/27 16:52:44]

return true

-                          break;
-                  }
-                  me = ms.next();
-          }
-  }
-  return moduleFound;

[Eric, 2014/03/27 16:52:44]

return false

+
+bool process_by_any_exe_with_any_module::operator()( const PROCESSENTRY32W & process )
+{
+  if (processNames.find(process.szExeFile) != processNames.end())
+  {
+    if (moduleNames.empty())
+      return true;
+
+    ModulesSnapshot ms(process.th32ProcessID);
+    MODULEENTRY32W* me = ms.first();
+    while (me != NULL)
+    {
+      if (moduleNames.find(me->szModule) != moduleNames.end())
+      {
+        return true;
+      }
+      me = ms.next();
+    }
+  }
+  return false;
 }
 
 //-------------------------------------------------------
 // wcscmpi
 //-------------------------------------------------------
 int wcscmpi( const wchar_t * s1, const wchar_t * s2 )
 {
   // Note: Equality of character sequences is case-insensitive in all predicates below.
   // Loop invariant: s1[0..j) == s2[0..j)
   const size_t LIMIT( 65535 ) ; // Runaway limit of 2^16 - 1 should be acceptably long.
@@ skipping 72 matching lines @@
 
 //-------------------------------------------------------
 // Snapshot
 //-------------------------------------------------------
 Snapshot::Snapshot()
   : handle( ::CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 ) )
 {
   process.dwSize = sizeof( PROCESSENTRY32W ) ;
 }
 
-PROCESSENTRY32W * Snapshot::begin()
-{
-  return ::Process32FirstW( handle, & process ) ? ( & process ) : 0 ;
+PROCESSENTRY32W * Snapshot::first()
+{
+  return ::Process32FirstW(handle, &process) ? (&process) : 0;
 }
 
 PROCESSENTRY32W * Snapshot::next()
 {
-  return ::Process32NextW( handle, & process ) ? ( & process ) : 0 ;
+  return ::Process32NextW(handle, &process) ? (&process) : 0;
 }
 
 void Snapshot::refresh()
 {
-  handle = ::CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 ) ;
+  handle = ::CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
 }
 
 
 //-------------------------------------------------------
 // ModulesSnapshot
 //-------------------------------------------------------
 ModulesSnapshot::ModulesSnapshot(DWORD processId)
-  : handle( ::CreateToolhelp32Snapshot( TH32CS_SNAPMODULE | TH32CS_SNAPMODULE32, processId ) )
-{
-  module.dwSize = sizeof( MODULEENTRY32 ) ;
-}
-
-MODULEENTRY32W * ModulesSnapshot::begin()
-{
-  return ::Module32FirstW( handle, & module ) ? ( & module ) : 0 ;
+  : handle(::CreateToolhelp32Snapshot(TH32CS_SNAPMODULE | TH32CS_SNAPMODULE32, processId))
+{
+  module.dwSize = sizeof(MODULEENTRY32);
+}
+
+MODULEENTRY32W * ModulesSnapshot::first()
+{
+  return ::Module32FirstW(handle, &module) ? (&module) : 0;
 }
 
 MODULEENTRY32W * ModulesSnapshot::next()
 {
-  return ::Module32NextW( handle, & module ) ? ( & module ) : 0 ;
-}
-
-void ModulesSnapshot::refresh(DWORD processId)

[Eric, 2014/03/27 16:52:44]

refresh() not needed.

-{
-  handle = ::CreateToolhelp32Snapshot( TH32CS_SNAPMODULE | TH32CS_SNAPMODULE32, processId ) ;

[Eric, 2014/03/27 16:52:44]

Not that it matters, but processID isn't initialized in the constructor.

+  return ::Module32NextW(handle, &module) ? (&module) : 0;
 }
 
 
 //-------------------------------------------------------
 // send_message, send_endsession_messages
 //-------------------------------------------------------
 /**
  * Default process exit wait time (per message) 5000 ms
  *
  * 5 seconds is time that the system will wait before it considers a process non-responsive.
@@ skipping 236 matching lines @@
       if ( ! is_running() )
       {
         return true ;
       }
     }
     // Assert is_running()
   }
   // No control path leaves the for-loop.
 } ;