| OLD | NEW | 
|---|
| 1 #include "PluginStdAfx.h" | 1 #include "PluginStdAfx.h" | 
| 2 | 2 | 
| 3 #include "PluginClass.h" | 3 #include "PluginClass.h" | 
| 4 #include "PluginSettings.h" | 4 #include "PluginSettings.h" | 
| 5 #include "PluginSystem.h" | 5 #include "PluginSystem.h" | 
| 6 #include "PluginFilter.h" | 6 #include "PluginFilter.h" | 
| 7 #include "PluginMimeFilterClient.h" | 7 #include "PluginMimeFilterClient.h" | 
| 8 #include "PluginClient.h" | 8 #include "PluginClient.h" | 
| 9 #include "PluginClientFactory.h" | 9 #include "PluginClientFactory.h" | 
| 10 #include "PluginMutex.h" | 10 #include "PluginMutex.h" | 
| 11 #include "sddl.h" | 11 #include "sddl.h" | 
| 12 #include "PluginUtil.h" | 12 #include "PluginUtil.h" | 
| 13 #include "PluginUserSettings.h" | 13 #include "PluginUserSettings.h" | 
| 14 #include "../shared/Utils.h" | 14 #include "../shared/Utils.h" | 
| 15 #include "../shared/Dictionary.h" | 15 #include "../shared/Dictionary.h" | 
|  | 16 #include "../shared/IE_version.h" | 
| 16 #include <thread> | 17 #include <thread> | 
| 17 #include <array> | 18 #include <array> | 
| 18 | 19 | 
| 19 #ifdef DEBUG_HIDE_EL | 20 #ifdef DEBUG_HIDE_EL | 
| 20 DWORD profileTime = 0; | 21 DWORD profileTime = 0; | 
| 21 #endif | 22 #endif | 
| 22 | 23 | 
| 23 typedef HANDLE (WINAPI *OPENTHEMEDATA)(HWND, LPCWSTR); | 24 typedef HANDLE (WINAPI *OPENTHEMEDATA)(HWND, LPCWSTR); | 
| 24 typedef HRESULT (WINAPI *DRAWTHEMEBACKGROUND)(HANDLE, HDC, INT, INT, LPRECT, LPR
      ECT); | 25 typedef HRESULT (WINAPI *DRAWTHEMEBACKGROUND)(HANDLE, HDC, INT, INT, LPRECT, LPR
      ECT); | 
| 25 typedef HRESULT (WINAPI *CLOSETHEMEDATA)(HANDLE); | 26 typedef HRESULT (WINAPI *CLOSETHEMEDATA)(HANDLE); | 
| (...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 676       DEBUG_NAVI("Navi::BeforeNavigate"); | 677       DEBUG_NAVI("Navi::BeforeNavigate"); | 
| 677       break; | 678       break; | 
| 678 | 679 | 
| 679     case DISPID_COMMANDSTATECHANGE: | 680     case DISPID_COMMANDSTATECHANGE: | 
| 680       if (m_hPaneWnd == NULL) | 681       if (m_hPaneWnd == NULL) | 
| 681       { | 682       { | 
| 682         CreateStatusBarPane(); | 683         CreateStatusBarPane(); | 
| 683       } | 684       } | 
| 684       else | 685       else | 
| 685       { | 686       { | 
| 686         if (CPluginClient::GetInstance()->GetIEVersion() > 6) | 687       if (AdblockPlus::IE::InstalledMajorVersion() > 6) | 
| 687         { | 688         { | 
| 688           RECT rect; | 689           RECT rect; | 
| 689           BOOL rectRes = GetClientRect(m_hStatusBarWnd, &rect); | 690           BOOL rectRes = GetClientRect(m_hStatusBarWnd, &rect); | 
| 690           if (rectRes == TRUE) | 691           if (rectRes == TRUE) | 
| 691           { | 692           { | 
| 692             MoveWindow(m_hPaneWnd, rect.right - 200, 0, m_nPaneWidth, rect.botto
      m - rect.top, TRUE); | 693             MoveWindow(m_hPaneWnd, rect.right - 200, 0, m_nPaneWidth, rect.botto
      m - rect.top, TRUE); | 
| 693           } | 694           } | 
| 694         } | 695         } | 
| 695       } | 696       } | 
| 696       break; | 697       break; | 
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 843     } | 844     } | 
| 844     s_criticalSectionLocal.Unlock(); | 845     s_criticalSectionLocal.Unlock(); | 
| 845 | 846 | 
| 846     if (!GetAtomPaneClass()) | 847     if (!GetAtomPaneClass()) | 
| 847     { | 848     { | 
| 848       DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_REGISTE
      R_PANE_CLASS, "Class::InitObject - RegisterClassEx"); | 849       DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_REGISTE
      R_PANE_CLASS, "Class::InitObject - RegisterClassEx"); | 
| 849       return false; | 850       return false; | 
| 850     } | 851     } | 
| 851   } | 852   } | 
| 852 | 853 | 
| 853 | 854   int ieVersion = AdblockPlus::IE::InstalledMajorVersion(); | 
| 854   int ieVersion = CPluginClient::GetInstance()->GetIEVersion(); |  | 
| 855   // Create status pane | 855   // Create status pane | 
| 856   if (bBHO && ieVersion > 6 && !CreateStatusBarPane()) | 856   if (bBHO && ieVersion > 6 && !CreateStatusBarPane()) | 
| 857   { | 857   { | 
| 858     return false; | 858     return false; | 
| 859   } | 859   } | 
| 860 | 860 | 
| 861   s_criticalSectionLocal.Lock(); | 861   s_criticalSectionLocal.Lock(); | 
| 862   int versionCompRes = CPluginClient::GetInstance()->CompareVersions(CPluginClie
      nt::GetInstance()->GetPref(L"currentVersion", L"0.0"), L"1.2"); | 862   int versionCompRes = CPluginClient::GetInstance()->CompareVersions(CPluginClie
      nt::GetInstance()->GetPref(L"currentVersion", L"0.0"), L"1.2"); | 
| 863 | 863 | 
| 864   bool isFirstRun = CPluginClient::GetInstance()->IsFirstRun(); | 864   bool isFirstRun = CPluginClient::GetInstance()->IsFirstRun(); | 
| (...skipping 1010 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1875         } | 1875         } | 
| 1876       } | 1876       } | 
| 1877     } | 1877     } | 
| 1878 | 1878 | 
| 1879     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT); | 1879     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT); | 
| 1880   } | 1880   } | 
| 1881 | 1881 | 
| 1882   return hTabWnd; | 1882   return hTabWnd; | 
| 1883 | 1883 | 
| 1884 } | 1884 } | 
| OLD | NEW | 
|---|