Enhanced Protected Mode support

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 "PluginMutex.h"
 #include "sddl.h"
 #include "PluginUtil.h"
 #include "PluginUserSettings.h"
-#include "../shared/Utils.h"
 
 #include "../shared/Dictionary.h"
-
 
 #ifdef DEBUG_HIDE_EL
 DWORD profileTime = 0;
 #endif
 
 typedef HANDLE (WINAPI *OPENTHEMEDATA)(HWND, LPCWSTR);
 typedef HRESULT (WINAPI *DRAWTHEMEBACKGROUND)(HANDLE, HDC, INT, INT, LPRECT, LPRECT);
 typedef HRESULT (WINAPI *CLOSETHEMEDATA)(HANDLE);
 
 
@@ skipping 178 matching lines @@
   else
   {
     url = m_tab->GetDocumentUrl();
   }
 
   return url;
 }
 
 DWORD WINAPI CPluginClass::StartInitObject(LPVOID thisPtr)
 {
-  INITCOMMONCONTROLSEX commControls;
-  commControls.dwSize = sizeof(INITCOMMONCONTROLSEX);
-  commControls.dwICC = ICC_USEREX_CLASSES | ICC_STANDARD_CLASSES | ICC_BAR_CLASSES;
-  InitCommonControlsEx(&commControls);
   if (thisPtr == NULL)
     return 0;
   if (!((CPluginClass*)thisPtr)->InitObject(true))
   {
     ((CPluginClass*)thisPtr)->Unadvice();
   }
 
   return 0;
 }
 
 
 
 // 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();
   CPluginSystem* system = CPluginSystem::GetInstance();
 
   MULTIPLE_VERSIONS_CHECK();
 
   if (unknownSite)
   {
 

[Felix Dahlke, 2013/09/16 16:30:12]

Not really related I think.

     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();
     {
@@ skipping 1011 matching lines @@
   int nCommand = ::TrackPopupMenu(hMenu, nMenuFlags, pt.x, pt.y, 0, hMenuWnd, 0);
 
   ::DestroyMenu(hMenu);
   ::DestroyWindow(hMenuWnd);
 
   switch (nCommand)
   {
   case ID_MENU_UPDATE:
     {
       CPluginClient* client = CPluginClient::GetInstance();
-      notifMessage.SetParent(m_hPaneWnd);
-      Dictionary* dictionary = Dictionary::GetInstance();
-      std::wstring checkingText = dictionary->Lookup("updater", "checking-for-updates-text");
-      std::wstring checkingTitle = dictionary->Lookup("updater", "checking-for-updates-title");
-
-      notifMessage.Show(checkingText.c_str(), TTI_INFO);
-      notifMessage.SetTextAndIcon(checkingText.c_str(), checkingTitle.c_str(), TTI_INFO);
-      client->CheckForUpdates(m_hPaneWnd);
+      client->CheckForUpdates();
     }
     break;
   case ID_MENU_DISABLE:
     {
       CPluginSettings* settings = CPluginSettings::GetInstance();
 
       settings->TogglePluginEnabled();
 
       // Enable / disable mime filter
       s_criticalSectionLocal.Lock();
@@ skipping 486 matching lines @@
     break;
   case SC_CLOSE:
     break;
 
   case WM_UPDATEUISTATE:
     {
       CPluginTab* tab = GetTab(::GetCurrentThreadId());
       if (tab)
       {
         tab->OnActivate();
-        RECT rect;
-        GetWindowRect(pClass->m_hPaneWnd, &rect);
-        pClass->notifMessage.Move(rect.left + (rect.right - rect.left) / 2, rect.top + (rect.bottom - rect.top) / 2); 
-      }
-      pClass->notifMessage.Hide();
-    }
-    break;
-  case WM_WINDOWPOSCHANGING:
-    {
-      RECT rect;
-      GetWindowRect(pClass->m_hPaneWnd, &rect);
-      pClass->notifMessage.Move(rect.left + (rect.right - rect.left) / 2, rect.top + (rect.bottom - rect.top) / 2); 
-    }
-    break;
-  case WM_ALREADY_UP_TO_DATE:
-    {
-      Dictionary* dictionary = Dictionary::GetInstance();
-      std::wstring upToDateText = dictionary->Lookup("updater", "update-already-up-to-date-text");
-      std::wstring upToDateTitle = dictionary->Lookup("updater", "update-already-up-to-date-title");
-      pClass->notifMessage.SetTextAndIcon(upToDateText.c_str(), upToDateTitle.c_str(), TTI_INFO);
-    }
-    break;
-  case WM_UPDATE_CHECK_ERROR:
-    {
-      Dictionary* dictionary = Dictionary::GetInstance();
-      std::wstring errorText = dictionary->Lookup("updater", "update-error-text");
-      std::wstring errorTitle = dictionary->Lookup("updater", "update-error-title");
-      pClass->notifMessage.SetTextAndIcon(errorText.c_str(), errorText.c_str(), TTI_ERROR);
-    }
-    break;
-  case WM_DOWNLOADING_UPDATE:
-    {
-      Dictionary* dictionary = Dictionary::GetInstance();
-      std::wstring downloadingText = dictionary->Lookup("updater", "downloading-update-text");
-      std::wstring downloadingTitle = dictionary->Lookup("updater", "downloading-update-title");
-      pClass->notifMessage.SetTextAndIcon(downloadingText.c_str(), downloadingTitle.c_str(), TTI_ERROR);
+      }
     }
     break;
   }
 
   return DefWindowProc(hWnd, message, wParam, lParam);
 }
 
 
 void CPluginClass::UpdateStatusBar()
 {
@@ skipping 121 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }