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"
 #include "PluginClientFactory.h"
-#include "PluginHttpRequest.h"
 #include "PluginMutex.h"
-#include "DownloadSource.h"
 #include "sddl.h"
 #include "PluginUtil.h"
 #include "PluginUserSettings.h"
 
 #include "../shared/Dictionary.h"
 
 #ifdef DEBUG_HIDE_EL
 DWORD profileTime = 0;
 #endif
 
@@ skipping 40 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)

[Wladimir Palant, 2013/07/26 16:45:37]

This comment is wrong, the plugin no longer deals with subscriptions directly.
Which leads to the question - is it necessary to explicitly instantiate settings
here?

   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();
-
-    // Ensure plugin version
-    if (!settings->Has(SETTING_PLUGIN_VERSION))
-    {
-      settings->SetString(SETTING_PLUGIN_VERSION, IEPLUGIN_VERSION);
-      settings->SetFirstRunUpdate();
-    }
-
-    // First run or deleted settings file (dictionary version = 1)
-    if (settings->GetString(SETTING_DICTIONARY_VERSION, L"1").Compare(L"1") == 0)
-    {
-      settings->SetFirstRun();
-    }
-
-    // Update?
-    CString oldVersion = settings->GetString(SETTING_PLUGIN_VERSION);
-    if (settings->IsFirstRunUpdate() || settings->GetString(SETTING_PLUGIN_UPDATE_VERSION) == IEPLUGIN_VERSION || oldVersion != IEPLUGIN_VERSION)
-    {
-      settings->SetString(SETTING_PLUGIN_VERSION, IEPLUGIN_VERSION);
-
-      settings->SetFirstRunUpdate();
-    }
-
-    int info = settings->GetValue(SETTING_PLUGIN_INFO_PANEL, 0);
-
-#ifdef ENABLE_DEBUG_RESULT
-    CPluginDebug::DebugResultClear();
-#endif
-
-#ifdef ENABLE_DEBUG_INFO
-    if (info == 0 || info > 2)
-    {
-      CPluginDebug::DebugClear();
-    }
-#endif // ENABLE_DEBUG_INFO
-
-    settings->Write(false);
-  }
 }
 
 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 27 matching lines @@
 
   CComQIPtr<IWebBrowser2> browser = GetAsyncBrowser();
   if (browser)
   {
     HRESULT hr = S_OK;
     hr = browser->get_StatusBar(&isVisible);
     if (SUCCEEDED(hr))
     {
       if (!isVisible)
       {
-        if (!settings->GetBool("statusbarasked", false))
+        if (!settings->GetStatusBarAsked())
         {
           SHANDLE_PTR pBrowserHWnd;
           browser->get_HWND((SHANDLE_PTR*)&pBrowserHWnd);
           Dictionary* dictionary = Dictionary::GetInstance();
-          settings->SetBool("statusbarasked", true);
-          settings->Write();
+          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 244 matching lines @@
         else
         {
           s_mimeFilter = NULL;
 
           CPluginClientFactory::ReleaseMimeFilterClientInstance();
         }
       }
       s_criticalSectionLocal.Unlock();
     }
     break;
-#ifndef ENTERPRISE
-  case ID_SETTINGS:
-    {
-      url = CString(UserSettingsFileUrl().c_str());
-    }
-    break;
-#endif
-  case ID_INVITEFRIENDS:
-    {
-      url = CPluginHttpRequest::GetStandardUrl(USERS_SCRIPT_INVITATION);
-      navigationErrorId = PLUGIN_ERROR_NAVIGATION_INVITATION;
-    }
-    break;
-
-  case ID_FAQ:
-    {
-      url = CPluginHttpRequest::GetStandardUrl(USERS_SCRIPT_FAQ);
-      navigationErrorId = PLUGIN_ERROR_NAVIGATION_FAQ;
-    }
-    break;
-
-  case ID_FEEDBACK:
-    {
-      CPluginHttpRequest httpRequest(USERS_SCRIPT_FEEDBACK);
-
-      httpRequest.AddPluginId();
-      httpRequest.Add("reason", 0);
-      httpRequest.Add(L"url", m_tab->GetDocumentUrl(), false);
-
-      url = httpRequest.GetUrl();
-      navigationErrorId = PLUGIN_ERROR_NAVIGATION_FEEDBACK;
-    }
-    break;
-
-  case ID_ABOUT:
-    {
-      url = CPluginHttpRequest::GetStandardUrl(USERS_SCRIPT_ABOUT);
-      navigationErrorId = PLUGIN_ERROR_NAVIGATION_ABOUT;
-    }
-    break;
-
   default:
-
     break;
   }
 
   // Invalidate and redraw the control
   UpdateStatusBar();
 
   CComQIPtr<IWebBrowser2> browser = GetBrowser();
   if (!url.IsEmpty() && browser)
   {
     VARIANT vFlags;
@@ skipping 42 matching lines @@
   MENUITEMINFOW miiSep;
   memset(&miiSep, 0, sizeof(MENUITEMINFO));
   miiSep.cbSize = sizeof(MENUITEMINFO);
   miiSep.fMask = MIIM_TYPE | MIIM_FTYPE;
   miiSep.fType = MFT_SEPARATOR;
 
   CPluginClient* client = CPluginClient::GetInstance();
 
   CPluginSettings* settings = CPluginSettings::GetInstance();
 
-  settings->RefreshTab();
-
-  // Update settings
-  m_tab->OnUpdateSettings(false);
-
 #ifdef SUPPORT_WHITELIST
   {
     // White list domain
     ctext = dictionary->Lookup("menu", "disable-on-site");
     fmii.fMask = MIIM_STRING | MIIM_STATE;
     fmii.fState = MFS_DISABLED;
     fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
     fmii.cch = ctext.size();
 
     UINT index = WM_WHITELIST_DOMAIN;
 
     ::SetMenuItemInfoW(hMenu, ID_WHITELISTDOMAIN, FALSE, &fmii);
   }
 #else
   {
     ::DeleteMenu(hMenu, ID_WHITELISTDOMAIN, FALSE);
   }
 #endif // SUPPORT_WHITELIST
 
-  // Invite friends
-  ctext = dictionary->Lookup("menu", "invite");
-  fmii.fMask  = MIIM_STATE | MIIM_STRING;
-  fmii.fState = MFS_ENABLED;
-  fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
-  fmii.cch = ctext.size();
-  ::SetMenuItemInfoW(hMenu, ID_INVITEFRIENDS, FALSE, &fmii);
-
-  // FAQ
-  ctext = dictionary->Lookup("menu", "faq");
-  fmii.fMask  = MIIM_STATE | MIIM_STRING;
-  fmii.fState = MFS_ENABLED;
-  fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
-  fmii.cch = ctext.size();
-  ::SetMenuItemInfoW(hMenu, ID_FAQ, FALSE, &fmii);
-
-  // About
-  ctext = dictionary->Lookup("menu", "about");
-  fmii.fMask = MIIM_STATE | MIIM_STRING;
-  fmii.fState = MFS_ENABLED;
-  fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
-  fmii.cch = ctext.size();
-  ::SetMenuItemInfoW(hMenu, ID_ABOUT, FALSE, &fmii);
-
-  // Feedback
-  ctext = dictionary->Lookup("menu", "feedback");
-  fmii.fMask = MIIM_STATE | MIIM_STRING;
-  fmii.fState = MFS_ENABLED;
-  fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
-  fmii.cch = ctext.size();
-  ::SetMenuItemInfoW(hMenu, ID_FEEDBACK, FALSE, &fmii);
-
   // Plugin enable
   if (settings->GetPluginEnabled())
   {
     ctext = dictionary->Lookup("menu", "disable");
   }
   else
   {
     ctext = dictionary->Lookup("menu", "enable");
   }
   fmii.fMask  = MIIM_STATE | MIIM_STRING;
   fmii.fState = client ? MFS_ENABLED : MFS_DISABLED;
   fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
   fmii.cch = ctext.size();
   ::SetMenuItemInfoW(hMenu, ID_PLUGIN_ENABLE, FALSE, &fmii);
 
   // Settings
-#ifndef ENTERPRISE
   ctext = dictionary->Lookup("menu", "settings");
   fmii.fMask  = MIIM_STATE | MIIM_STRING;
   fmii.fState = MFS_ENABLED;
   fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
   fmii.cch = ctext.size();
   ::SetMenuItemInfoW(hMenu, ID_SETTINGS, FALSE, &fmii);
-#else
-  RemoveMenu(hMenu, ID_SETTINGS, MF_BYCOMMAND);
-  RemoveMenu(hMenu, 5, MF_BYPOSITION);
-#endif
 
   return true;
 }
 
 
 STDMETHODIMP CPluginClass::Exec(const GUID*, DWORD nCmdID, DWORD, VARIANTARG*, VARIANTARG*)
 {
   HWND hBrowserWnd = GetBrowserHWND();
   if (!hBrowserWnd)
   {
@@ skipping 344 matching lines @@
           if (FAILED(hr))
           {
             DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION_SETTINGS, "Navigation::Failed")
           }
         }
       }
 #endif
     }
     break;
 
-#ifndef ENTERPRISE
 
-  case WM_LAUNCH_INFO:
+    // First run page 
+    case WM_LAUNCH_INFO:
     {
       // Set the status bar visible, if it isn't
       // Otherwise the user won't see the icon the first time
 
       if (wParam == 1)
       {
         // Redirect to welcome page
         VARIANT_BOOL isVisible;
         CComQIPtr<IWebBrowser2> browser = GetAsyncBrowser();
         if (browser)
@@ skipping 21 matching lines @@
               }
             }
           }
           else
           {
             DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_GET_STATUSBAR, "Class::Get statusbar state");
           }
 
           CPluginSettings* settings = CPluginSettings::GetInstance();
 
-          CPluginHttpRequest httpRequest(USERS_SCRIPT_WELCOME);
-
-          httpRequest.Add("errors", settings->GetErrorList());
-
-
-          hr = browser->Navigate(CComBSTR(httpRequest.GetUrl() + "&src=" + DOWNLOAD_SOURCE), NULL, NULL, NULL, NULL);
+          //TODO: Navigate to first run page here
+/*        hr = browser->Navigate(CComBSTR("FIRST_RUN_PAGE_URL"), NULL, NULL, NULL, NULL);
           if (FAILED(hr))
           {
             DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION_WELCOME, "Navigation::Welcome page failed")
           }
-
-          // Update settings server side on next IE start, as they have possibly changed
-          settings->ForceConfigurationUpdateOnStart();
+          */
         }
       }
       else
       {
         // Redirect to info page
         CComQIPtr<IWebBrowser2> browser = GetAsyncBrowser();
         if (browser)
         {
-          CPluginHttpRequest httpRequest(USERS_SCRIPT_INFO);
-
-          httpRequest.Add("info", wParam);
-
           VARIANT vFlags;
           vFlags.vt = VT_I4;
           vFlags.intVal = navOpenInNewTab;
 
-          HRESULT hr = browser->Navigate(CComBSTR(httpRequest.GetUrl()), &vFlags, NULL, NULL, NULL);
+          // TODO: Navigate to info page here or remove this clause
+/*          HRESULT hr = browser->Navigate(CComBSTR(INFO_PAGE_URL), &vFlags, NULL, NULL, NULL);
           if (FAILED(hr))
           {
             vFlags.intVal = navOpenInNewWindow;
 
             hr = browser->Navigate(CComBSTR(httpRequest.GetUrl()), &vFlags, NULL, NULL, NULL);
             if (FAILED(hr))
             {
               DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION_INFO, "Navigation::Info page failed")
             }
           }
+          */
         }
       }
     }
     break;
-#endif
 
   case WM_DESTROY:
     break;
   case SC_CLOSE:
     break;
 
   case WM_UPDATEUISTATE:
     {
       CPluginTab* tab = GetTab(::GetCurrentThreadId());
       if (tab)
@@ skipping 138 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }