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

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

Issue 11364147: Fix for IE6 FRP crash (Closed)
Patch Set: Comment addressed Created Aug. 11, 2013, 4:21 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
« no previous file with comments | « html/static/js/ieFirstRun.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
(...skipping 795 matching lines...) Expand 10 before | Expand all | Expand 10 after
806 if (bBHO) 806 if (bBHO)
807 { 807 {
808 if (!CreateStatusBarPane()) 808 if (!CreateStatusBarPane())
809 { 809 {
810 return false; 810 return false;
811 } 811 }
812 } 812 }
813 813
814 if (CPluginClient::GetInstance()->IsFirstRun()) 814 if (CPluginClient::GetInstance()->IsFirstRun())
815 { 815 {
816 CreateThread(NULL, NULL, (LPTHREAD_START_ROUTINE)CPluginClass::FirstRunThrea d, NULL, NULL, NULL); 816 // IE6 can't be accessed from another thread, execute in current thread
817 if (CPluginClient::GetInstance()->GetIEVersion() < 7)
818 {
819 FirstRunThread();
820 }
821 else
822 {
823 CreateThread(NULL, NULL, (LPTHREAD_START_ROUTINE)CPluginClass::FirstRunThr ead, NULL, NULL, NULL);
824 }
817 if ((m_hPaneWnd == NULL) || (!IsStatusBarEnabled())) 825 if ((m_hPaneWnd == NULL) || (!IsStatusBarEnabled()))
818 { 826 {
819 ShowStatusBar(); 827 ShowStatusBar();
820 } 828 }
821 829
822 } 830 }
823 return true; 831 return true;
824 } 832 }
825 833
826 bool CPluginClass::CreateStatusBarPane() 834 bool CPluginClass::CreateStatusBarPane()
(...skipping 1082 matching lines...) Expand 10 before | Expand all | Expand 10 after
1909 } 1917 }
1910 } 1918 }
1911 } 1919 }
1912 1920
1913 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT); 1921 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
1914 } 1922 }
1915 1923
1916 return hTabWnd; 1924 return hTabWnd;
1917 1925
1918 } 1926 }
OLDNEW
« no previous file with comments | « html/static/js/ieFirstRun.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld