Issue #1762 - Remove smart handle for HMODULE

installer/src/installer-lib/process.cpp

 #include <stdexcept>
 #include <functional>
 #include <wctype.h>
 // <thread> is C++11, but implemented in VS2012
 #include <thread>
 
 #include "installer-lib.h"
 #include "process.h"
 #include "handle.h"
 #include "session.h"
 
 //-------------------------------------------------------
 //-------------------------------------------------------
 typedef int (__stdcall *IsImmersiveDynamicFunc)(HANDLE);
 bool process_by_any_exe_not_immersive::operator()( const PROCESSENTRY32W & process )
 {
-  if (processNames.find(process.szExeFile) != processNames.end())
-  {   
-    // Make sure the process is still alive
-    HANDLE tmpHandle = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, process.th32ProcessID);
-    if (tmpHandle == NULL)
-      return false;
-    Windows_Handle procHandle(tmpHandle);
+  // If the name is not found in our list, it's filtered out
+  if (processNames.find(process.szExeFile) == processNames.end()) return false;
 
-    DWORD exitCode;
-    if (!GetExitCodeProcess(procHandle, &exitCode)) return false;
+  // Make sure the process is still alive
+  HANDLE tmpHandle = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, process.th32ProcessID);
+  if (tmpHandle == NULL) return false;
+  Windows_Handle procHandle(tmpHandle);
+  DWORD exitCode;
+  if (!GetExitCodeProcess(procHandle, &exitCode)) return false;
+  if (exitCode != STILL_ACTIVE) return false;
 
-    if (exitCode != STILL_ACTIVE) return false;
-
-    // Check if this is a Windows Store app process (we don't care for IE in Modern UI)
-    HMODULE tmpModule = LoadLibrary(L"user32.dll");
-    if (tmpModule == NULL)
-      return true;
-    Windows_Module_Handle user32Dll(tmpModule);
-    if (!user32Dll) return true;
-
-    IsImmersiveDynamicFunc IsImmersiveDynamicCall = (IsImmersiveDynamicFunc)GetProcAddress(user32Dll, "IsImmersiveProcess");
-    if (!IsImmersiveDynamicCall) return true;
-
-    BOOL retValue = !IsImmersiveDynamicCall(procHandle);
-
-    return retValue;
-  }
-  return false;
+  // Check if this is a Windows Store app process (we don't care for IE in Modern UI)
+  HMODULE user32Dll = LoadLibrary(L"user32.dll");
+  if (!user32Dll) return true;
+  IsImmersiveDynamicFunc IsImmersiveDynamicCall = (IsImmersiveDynamicFunc)GetProcAddress(user32Dll, "IsImmersiveProcess");
+  if (!IsImmersiveDynamicCall) return true;
+  return !IsImmersiveDynamicCall(procHandle);
 }
 
 //-------------------------------------------------------
 // creator_process
 //-------------------------------------------------------
 DWORD creator_process( HWND window )
 {
   DWORD pid ;
   DWORD r = GetWindowThreadProcessId( window, & pid ) ;
   if ( r == 0 )
@@ skipping 251 matching lines @@
       if ( ! is_running() )
       {
         return true ;
       }
     }
     // Assert is_running()
   }
   // No control path leaves the for-loop.
 } ;