Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: src/plugin/PluginClass.cpp

Issue 5171515343503360: Issue #41 - Bring method of determining IE version up to date (Closed)
Patch Set: simplify Registry_Key Created July 26, 2014, 5 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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 #ifdef SUPPORT_FILTER 6 #ifdef SUPPORT_FILTER
7 #include "PluginFilter.h" 7 #include "PluginFilter.h"
8 #endif 8 #endif
9 #include "PluginMimeFilterClient.h" 9 #include "PluginMimeFilterClient.h"
10 #include "PluginClient.h" 10 #include "PluginClient.h"
11 #include "PluginClientFactory.h" 11 #include "PluginClientFactory.h"
12 #include "PluginMutex.h" 12 #include "PluginMutex.h"
13 #include "sddl.h" 13 #include "sddl.h"
14 #include "PluginUtil.h" 14 #include "PluginUtil.h"
15 #include "PluginUserSettings.h" 15 #include "PluginUserSettings.h"
16 #include "../shared/Utils.h" 16 #include "../shared/Utils.h"
17 #include "../shared/Dictionary.h" 17 #include "../shared/Dictionary.h"
18 #include "../shared/IE_version.h"
18 #include <thread> 19 #include <thread>
19 20
20 #ifdef DEBUG_HIDE_EL 21 #ifdef DEBUG_HIDE_EL
21 DWORD profileTime = 0; 22 DWORD profileTime = 0;
22 #endif 23 #endif
23 24
24 typedef HANDLE (WINAPI *OPENTHEMEDATA)(HWND, LPCWSTR); 25 typedef HANDLE (WINAPI *OPENTHEMEDATA)(HWND, LPCWSTR);
25 typedef HRESULT (WINAPI *DRAWTHEMEBACKGROUND)(HANDLE, HDC, INT, INT, LPRECT, LPR ECT); 26 typedef HRESULT (WINAPI *DRAWTHEMEBACKGROUND)(HANDLE, HDC, INT, INT, LPRECT, LPR ECT);
26 typedef HRESULT (WINAPI *CLOSETHEMEDATA)(HANDLE); 27 typedef HRESULT (WINAPI *CLOSETHEMEDATA)(HANDLE);
27 28
(...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after
677 case DISPID_BEFORENAVIGATE: 678 case DISPID_BEFORENAVIGATE:
678 DEBUG_NAVI("Navi::BeforeNavigate") 679 DEBUG_NAVI("Navi::BeforeNavigate")
679 return VARIANT_TRUE; 680 return VARIANT_TRUE;
680 case DISPID_COMMANDSTATECHANGE: 681 case DISPID_COMMANDSTATECHANGE:
681 if (m_hPaneWnd == NULL) 682 if (m_hPaneWnd == NULL)
682 { 683 {
683 CreateStatusBarPane(); 684 CreateStatusBarPane();
684 } 685 }
685 else 686 else
686 { 687 {
687 if (CPluginClient::GetInstance()->GetIEVersion() > 6) 688 if (AdblockPlus::IE::installed_major_version() > 6)
688 { 689 {
689 RECT rect; 690 RECT rect;
690 BOOL rectRes = GetClientRect(m_hStatusBarWnd, &rect); 691 BOOL rectRes = GetClientRect(m_hStatusBarWnd, &rect);
691 if (rectRes == TRUE) 692 if (rectRes == TRUE)
692 { 693 {
693 MoveWindow(m_hPaneWnd, rect.right - 200, 0, m_nPaneWidth, rect.bottom - rect.top, TRUE); 694 MoveWindow(m_hPaneWnd, rect.right - 200, 0, m_nPaneWidth, rect.bottom - rect.top, TRUE);
694 } 695 }
695 } 696 }
696 } 697 }
697 break; 698 break;
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
836 } 837 }
837 s_criticalSectionLocal.Unlock(); 838 s_criticalSectionLocal.Unlock();
838 839
839 if (!GetAtomPaneClass()) 840 if (!GetAtomPaneClass())
840 { 841 {
841 DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_REGISTE R_PANE_CLASS, "Class::InitObject - RegisterClassEx"); 842 DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_REGISTE R_PANE_CLASS, "Class::InitObject - RegisterClassEx");
842 return false; 843 return false;
843 } 844 }
844 } 845 }
845 846
846 847 int ieVersion = AdblockPlus::IE::installed_major_version();
847 int ieVersion = CPluginClient::GetInstance()->GetIEVersion();
848 // Create status pane 848 // Create status pane
849 if (bBHO && ieVersion > 6 && !CreateStatusBarPane()) 849 if (bBHO && ieVersion > 6 && !CreateStatusBarPane())
850 { 850 {
851 return false; 851 return false;
852 } 852 }
853 853
854 if (CPluginClient::GetInstance()->IsFirstRun()) 854 if (CPluginClient::GetInstance()->IsFirstRun())
855 { 855 {
856 // IE6 can't be accessed from another thread, execute in current thread 856 // IE6 can't be accessed from another thread, execute in current thread
857 if (ieVersion < 7) 857 if (ieVersion < 7)
(...skipping 1136 matching lines...) Expand 10 before | Expand all | Expand 10 after
1994 } 1994 }
1995 } 1995 }
1996 } 1996 }
1997 1997
1998 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT); 1998 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
1999 } 1999 }
2000 2000
2001 return hTabWnd; 2001 return hTabWnd;
2002 2002
2003 } 2003 }
OLDNEW

Powered by Google App Engine
This is Rietveld