Exe updater support and bug fixes

Shared/PluginClass.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClass.h"
 #include "PluginDictionary.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
 #include "PluginMimeFilterClient.h"
@@ skipping 260 matching lines @@
 
 void CPluginClass::LaunchUpdater(const CString& strPath)
 {
         PROCESS_INFORMATION pi;
         ::ZeroMemory(&pi, sizeof(pi));
 
         STARTUPINFO si;
         ::ZeroMemory(&si, sizeof(si));
         si.cb = sizeof(si);
         si.wShowWindow = FALSE;
-
-        CString cpath = _T("\"msiexec.exe\" /i \"") + strPath + _T("\" UPDATEPLUGIN=\"True\"");
+        CString cpath;
+        if (strPath.Find(L".exe") == strPath.GetLength() - 4)
+        {
+                cpath = strPath;
+        }
+        else
+        {
+                cpath = _T("\"msiexec.exe\" /i \"") + strPath + _T("\" UPDATEPLUGIN=\"True\"");
+        }
 
         if (!::CreateProcess(NULL, cpath.GetBuffer(), NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi))
         {
                 DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UPDATER, PLUGIN_ERROR_UPDATER_CREATE_PROCESS, "Class::Updater - Failed to start process");
                 return;
         }
 #ifndef AUTOMATIC_SHUTDOWN
         else 
         {
                 ::WaitForSingleObject(pi.hProcess, INFINITE);
@@ skipping 22 matching lines @@
 
 
 
 // This gets called when a new browser window is created (which also triggers the
 // creation of this object). The pointer passed in should be to a IWebBrowser2
 // interface that represents the browser for the window. 
 // it is also called when a tab is closed, this unknownSite will be null
 // so we should handle that it is called this way several times during a session
 STDMETHODIMP CPluginClass::SetSite(IUnknown* unknownSite)
 {
-
+        
     CPluginSettings* settings = CPluginSettings::GetInstance();
 #ifdef AVAST_ABP
         HKEY hkey;
         LONG res = RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Browser Helper Objects\\{FFCB3198-32F3-4E8B-9539-4324694ED664}", NULL, KEY_QUERY_VALUE, &hkey);
         if (hkey != NULL)
         {
                 RegCloseKey(hkey);
                 // Decide what to do when there are 2 versions installed
 /*              SHANDLE_PTR pBrowserHWnd = NULL;
                 CComQIPtr<IWebBrowser2> tmpbrwsr;
@@ skipping 590 matching lines @@
         s_hMainThread = handle;
 
             ::ResumeThread(handle);
     }
 
         return true;
 }
 
 bool CPluginClass::CreateStatusBarPane()
 {
+        CPluginClient* client = CPluginClient::GetInstance();
+
+        if (client->GetIEVersion()< 7)
+
+                return true;
+
         TCHAR szClassName[MAX_PATH];
 
         // Get browser window and url
         HWND hBrowserWnd = GetBrowserHWND();
         if (!hBrowserWnd)
         {
         DEBUG_ERROR_LOG(0, PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_NO_STATUSBAR_BROWSER, "Class::CreateStatusBarPane - No status bar")
                 return false;
         }
 
@@ skipping 1221 matching lines @@
 
 
 void CPluginClass::UpdateStatusBar()
 {
     DEBUG_GENERAL("*** Updating statusbar")
 
         if (m_hPaneWnd == NULL)
         {
                 CreateStatusBarPane();
         }
-    if (!::InvalidateRect(m_hPaneWnd, NULL, FALSE))
+        if (m_hPaneWnd != NULL)
         {
-                DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_INVALIDATE_STATUSBAR, "Class::Invalidate statusbar");        
+                if (!::InvalidateRect(m_hPaneWnd, NULL, FALSE))
+                {
+                        DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_INVALIDATE_STATUSBAR, "Class::Invalidate statusbar");        
+                }
         }
 }
 
 
 void CPluginClass::Unadvice()
 {
     s_criticalSectionLocal.Lock();
     {
         if (m_isAdviced)
         {
@@ skipping 103 matching lines @@
                                 }
                         }
                 }
 
                 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
         }
 
         return hTabWnd;
 
 }