Left: | ||
Right: |
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 #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" |
(...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
660 case DISPID_BEFORENAVIGATE: | 660 case DISPID_BEFORENAVIGATE: |
661 DEBUG_NAVI("Navi::BeforeNavigate") | 661 DEBUG_NAVI("Navi::BeforeNavigate") |
662 return VARIANT_TRUE; | 662 return VARIANT_TRUE; |
663 case DISPID_COMMANDSTATECHANGE: | 663 case DISPID_COMMANDSTATECHANGE: |
664 if (m_hPaneWnd == NULL) | 664 if (m_hPaneWnd == NULL) |
665 { | 665 { |
666 CreateStatusBarPane(); | 666 CreateStatusBarPane(); |
667 } | 667 } |
668 else | 668 else |
669 { | 669 { |
670 if (CPluginClient::GetInstance()->GetIEVersion() > 6) | 670 RECT rect; |
Oleksandr
2014/06/22 21:53:17
IIRC IE6 was not starting at all if these checks w
Eric
2014/06/25 18:52:02
Exactly.
You and I spoke about this, and it becam
| |
671 BOOL rectRes = GetClientRect(m_hStatusBarWnd, &rect); | |
672 if (rectRes == TRUE) | |
671 { | 673 { |
672 RECT rect; | 674 MoveWindow(m_hPaneWnd, rect.right - 200, 0, m_nPaneWidth, rect.bottom - rect.top, TRUE); |
673 BOOL rectRes = GetClientRect(m_hStatusBarWnd, &rect); | 675 } |
674 if (rectRes == TRUE) | |
675 { | |
676 MoveWindow(m_hPaneWnd, rect.right - 200, 0, m_nPaneWidth, rect.bottom - rect.top, TRUE); | |
677 } | |
678 } | |
679 } | 676 } |
680 break; | 677 break; |
681 case DISPID_STATUSTEXTCHANGE: | 678 case DISPID_STATUSTEXTCHANGE: |
682 break; | 679 break; |
683 | 680 |
684 case DISPID_BEFORENAVIGATE2: | 681 case DISPID_BEFORENAVIGATE2: |
685 BeforeNavigate2(pDispParams); | 682 BeforeNavigate2(pDispParams); |
686 break; | 683 break; |
687 | 684 |
688 case DISPID_DOWNLOADBEGIN: | 685 case DISPID_DOWNLOADBEGIN: |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
816 } | 813 } |
817 s_criticalSectionLocal.Unlock(); | 814 s_criticalSectionLocal.Unlock(); |
818 | 815 |
819 if (!GetAtomPaneClass()) | 816 if (!GetAtomPaneClass()) |
820 { | 817 { |
821 DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_REGISTE R_PANE_CLASS, L"Class::InitObject - RegisterClassEx"); | 818 DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_REGISTE R_PANE_CLASS, L"Class::InitObject - RegisterClassEx"); |
822 return false; | 819 return false; |
823 } | 820 } |
824 } | 821 } |
825 | 822 |
826 | |
827 int ieVersion = CPluginClient::GetInstance()->GetIEVersion(); | |
828 // Create status pane | 823 // Create status pane |
829 if (bBHO && ieVersion > 6 && !CreateStatusBarPane()) | 824 if (bBHO && !CreateStatusBarPane()) |
830 { | 825 { |
831 return false; | 826 return false; |
832 } | 827 } |
833 | 828 |
834 if (CPluginClient::GetInstance()->IsFirstRun()) | 829 if (CPluginClient::GetInstance()->IsFirstRun()) |
835 { | 830 { |
836 // IE6 can't be accessed from another thread, execute in current thread | 831 CreateThread(NULL, NULL, (LPTHREAD_START_ROUTINE)CPluginClass::FirstRunThrea d, NULL, NULL, NULL); |
837 if (ieVersion < 7) | |
838 { | |
839 FirstRunThread(); | |
840 } | |
841 else | |
842 { | |
843 CreateThread(NULL, NULL, (LPTHREAD_START_ROUTINE)CPluginClass::FirstRunThr ead, NULL, NULL, NULL); | |
844 } | |
845 if ((m_hPaneWnd == NULL) || (!IsStatusBarEnabled())) | 832 if ((m_hPaneWnd == NULL) || (!IsStatusBarEnabled())) |
846 { | 833 { |
847 ShowStatusBar(); | 834 ShowStatusBar(); |
848 } | 835 } |
849 | 836 |
850 } | 837 } |
851 return true; | 838 return true; |
852 } | 839 } |
853 | 840 |
854 bool CPluginClass::CreateStatusBarPane() | 841 bool CPluginClass::CreateStatusBarPane() |
(...skipping 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1956 } | 1943 } |
1957 } | 1944 } |
1958 } | 1945 } |
1959 | 1946 |
1960 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT); | 1947 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT); |
1961 } | 1948 } |
1962 | 1949 |
1963 return hTabWnd; | 1950 return hTabWnd; |
1964 | 1951 |
1965 } | 1952 } |
OLD | NEW |