Cleanup

src/plugin/PluginClass.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClass.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
 #include "PluginMimeFilterClient.h"
 #include "PluginClient.h"
@@ skipping 52 matching lines @@
   m_hStatusBarWnd = NULL;
   m_hPaneWnd = NULL;
   m_nPaneWidth = 0;
   m_pWndProcStatus = NULL;
   m_hTheme = NULL;
   m_isInitializedOk = false;
 
 
   m_tab = new CPluginTab(this);
 
-  // Load / create settings
+  // Load settings (fetch the available subscriptions, if still not fetched)
   CPluginSettings* settings = CPluginSettings::GetInstance();
 
   CPluginSystem* system = CPluginSystem::GetInstance();
 
   std::wstring locale((LPCWSTR)system->GetBrowserLanguage());
   Dictionary::Create(locale);
-
-  bool isMainTab = settings->IncrementTabCount();
-
-  if (isMainTab)
-  {
-    // Prepare settings
-    settings->SetMainProcessId();
-    settings->SetMainUiThreadId();
-#ifdef ENABLE_DEBUG_RESULT
-    CPluginDebug::DebugResultClear();
-#endif
-  }
 }
 
 CPluginClass::~CPluginClass()
 {
   delete m_tab;
-
-  CPluginSettings* settings = CPluginSettings::GetInstance();
-
-  settings->DecrementTabCount();
 }
 
 
 /////////////////////////////////////////////////////////////////////////////
 // Initialization
 
 HRESULT CPluginClass::FinalConstruct()
 {
   return S_OK;
 }
@@ skipping 112 matching lines @@
     }
   }
   else
   {
     url = m_tab->GetDocumentUrl();
   }
 
   return url;
 }
 
-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;
-  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);
-  }
-#endif // not AUTOMATIC_SHUTDOWN
-
-  ::CloseHandle(pi.hProcess);
-  ::CloseHandle(pi.hThread);
-}
-
 DWORD WINAPI CPluginClass::StartInitObject(LPVOID thisPtr)
 {
   if (thisPtr == NULL)
     return 0;
   if (!((CPluginClass*)thisPtr)->InitObject(true))
   {
     ((CPluginClass*)thisPtr)->Unadvice();
   }
 
   if ((((CPluginClass*)thisPtr)->m_hPaneWnd == NULL) || (!((CPluginClass*)thisPtr)->IsStatusBarEnabled()))
@@ skipping 12 matching lines @@
 // so we should handle that it is called this way several times during a session
 STDMETHODIMP CPluginClass::SetSite(IUnknown* unknownSite)
 {
   CPluginSettings* settings = CPluginSettings::GetInstance();
   CPluginSystem* system = CPluginSystem::GetInstance();
 
   MULTIPLE_VERSIONS_CHECK();
 
   if (unknownSite)
   {
-    if (settings->IsMainProcess() && settings->IsMainUiThread())
-    {
-      DEBUG_GENERAL(L"================================================================================\nMAIN TAB UI\n================================================================================")
-    }
-    else
-    {
-      DEBUG_GENERAL(L"================================================================================\nNEW TAB UI\n================================================================================")
-    }
+    DEBUG_GENERAL(L"================================================================================\nNEW TAB UI\n================================================================================")
 
     HRESULT hr = ::CoInitialize(NULL);
     if (FAILED(hr))
     {
       DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_SET_SITE, PLUGIN_ERROR_SET_SITE_COINIT, "Class::SetSite - CoInitialize");
     }
 
     s_criticalSectionBrowser.Lock();
     {
       m_webBrowser2 = unknownSite;
@@ skipping 104 matching lines @@
     m_hStatusBarWnd = NULL;
 
     // Remove instance from the list, shutdown threads
     HANDLE hMainThread = NULL;
     HANDLE hTabThread = NULL;
 
     s_criticalSectionLocal.Lock();
     {
       s_instances.Remove(this);
 
-      if (s_instances.GetSize() == 0)
-      {
-        if (settings->IsMainProcess() && settings->IsMainUiThread())
-        {
-          hMainThread = s_hMainThread;
-          s_hMainThread = NULL;
-        }
-      }
-
       std::map<DWORD,CPluginClass*>::iterator it = s_threadInstances.find(::GetCurrentThreadId());
       if (it != s_threadInstances.end())
       {
         s_threadInstances.erase(it);
       }
       if (s_instances.GetSize() == 0)
       {
         CPluginClientFactory::ReleaseMimeFilterClientInstance();
       }
     }
     s_criticalSectionLocal.Unlock();
 
-    if (hMainThread != NULL)
-    {
-      s_isMainThreadDone = true;
-
-      ::WaitForSingleObject(hMainThread, INFINITE);
-      ::CloseHandle(hMainThread);
-    }
-
     // Release browser interface
     s_criticalSectionBrowser.Lock();
     {
       m_webBrowser2.Release();
     }
     s_criticalSectionBrowser.Unlock();
 
-    if (settings->IsMainProcess() && settings->IsMainUiThread())
-    {
-      DEBUG_GENERAL("================================================================================\nMAIN TAB UI - END\n================================================================================")
-    }
-    else
-    {
-      DEBUG_GENERAL("================================================================================\nNEW TAB UI - END\n================================================================================")
-    }
+    DEBUG_GENERAL("================================================================================\nNEW TAB UI - END\n================================================================================")
 
     ::CoUninitialize();
   }
 
   return IObjectWithSiteImpl<CPluginClass>::SetSite(unknownSite);
 }
 
 bool CPluginClass::IsStatusBarEnabled()
 {
   HKEY pHkey;
@@ skipping 18 matching lines @@
   }
   return trueth == 1;
 }
 
 void CPluginClass::ShowStatusBar()
 {
   VARIANT_BOOL isVisible;
 
   CPluginSettings* settings = CPluginSettings::GetInstance();
 
+  //TODO: Remove the message box
+  MessageBox(NULL, L"", L"", MB_OK);

[Wladimir Palant, 2013/07/11 12:53:10]

Please address that TODO comment ;)

+
   CComQIPtr<IWebBrowser2> browser = GetAsyncBrowser();
   if (browser)
   {
     HRESULT hr = S_OK;
     hr = browser->get_StatusBar(&isVisible);
     if (SUCCEEDED(hr))
     {
       if (!isVisible)
       {
         if (!settings->GetStatusBarAsked())
         {
           SHANDLE_PTR pBrowserHWnd;
           browser->get_HWND((SHANDLE_PTR*)&pBrowserHWnd);
           Dictionary* dictionary = Dictionary::GetInstance();
-          settings->SetStatusBarAsked(true);
+          settings->SetStatusBarAsked();
 
           HKEY pHkey;
           HKEY pHkeySub;
           LSTATUS regRes = 0;
           regRes = RegOpenCurrentUser(KEY_WRITE, &pHkey);
 
           // Do we have enough rights to enable a status bar?
           if (regRes != 0)
           {
             // We use the tab window here and in the next few calls, since the browser window may still not be available
@@ skipping 359 matching lines @@
   // Create status pane
   if (bBHO)
   {
     if (!CreateStatusBarPane())
     {
       return false;
     }
   }
 
   CPluginSettings* settings = CPluginSettings::GetInstance();
-
-  // Create main thread
-  if (GetMainThreadHandle() == NULL && settings->IsMainProcess() && settings->IsMainUiThread())
-  {
-    DWORD id;
-    HANDLE handle = ::CreateThread(NULL, 0, MainThreadProc, (LPVOID)m_tab, CREATE_SUSPENDED, &id);
-    if (handle == NULL)
-    {
-      DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_THREAD, PLUGIN_ERROR_MAIN_THREAD_CREATE_PROCESS, "Class::Thread - Failed to create main thread");
-    }
-
-    s_hMainThread = handle;
-
-    ::ResumeThread(handle);
-  }
-
   return true;
 }
 
 bool CPluginClass::CreateStatusBarPane()
 {
   DEBUG_GENERAL(L"Getting client");
 
   CPluginClient* client = CPluginClient::GetInstance();
 
   DEBUG_GENERAL(L"Getting ieversion");
@@ skipping 156 matching lines @@
 
     ::SendMessage(m_hStatusBarWnd, SB_GETPARTS, nPartCount, (LPARAM)pData);
     ::SendMessage(m_hStatusBarWnd, SB_SETPARTS, nPartCount, (LPARAM)pData);
 
     delete[] pData;
   }
   HDC hdc = GetWindowDC(m_hStatusBarWnd);
   SendMessage(m_hStatusBarWnd, WM_PAINT, (WPARAM)hdc, 0);
   ReleaseDC(m_hStatusBarWnd, hdc);
   return true;
-}/////////////////////////////////////////////////////////////////////////////
-// Implementation
+}
 
 void CPluginClass::CloseTheme()
 {
   if (m_hTheme)
   {
     if (pfnClose)
     {
       pfnClose(m_hTheme);
     }
 
@@ skipping 950 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }