IE6 status bar and FRP fix. Debugging info added.

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"
@@ skipping 253 matching lines @@
       s_asyncWebBrowser2 = unknownSite;
       s_instances.Add(this);
     }
     s_criticalSectionLocal.Unlock();
 
     try
     {
       // Check if loaded as BHO
       if (GetBrowser())
       {
+        DEBUG_GENERAL("Loaded as BHO");
         CComPtr<IConnectionPoint> pPoint = GetConnectionPoint();
         if (pPoint)
         {
           HRESULT hr = pPoint->Advise((IDispatch*)this, &m_nConnectionID);
           if (SUCCEEDED(hr))
           {
             m_isAdviced = true;
 
             DWORD id;
             HANDLE handle = ::CreateThread(NULL, 0, StartInitObject, (LPVOID)this, NULL, &id);
             if (handle == NULL)
             {
               DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_THREAD, PLUGIN_ERROR_MAIN_THREAD_CREATE_PROCESS, "Class::Thread - Failed to create main thread");
             }
 
           }
           else
           {
             DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_SET_SITE, PLUGIN_ERROR_SET_SITE_ADVICE, "Class::SetSite - Advice");
           }
         }
       }
       else // Check if loaded as toolbar handler
       {
+        DEBUG_GENERAL("Loaded as toolbar handler");
         CComPtr<IServiceProvider> pServiceProvider;
 
         HRESULT hr = unknownSite->QueryInterface(&pServiceProvider);
         if (SUCCEEDED(hr))
         {
           if (pServiceProvider)
           {
             s_criticalSectionBrowser.Lock();
             {
               HRESULT hr = pServiceProvider->QueryService(IID_IWebBrowserApp, &m_webBrowser2);
@@ skipping 13 matching lines @@
           }
         }
         else
         {
           DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_SET_SITE, PLUGIN_ERROR_SET_SITE_QUERY_SERVICE_PROVIDER, "Class::SetSite - QueryInterface (service provider)");
         }
       }
     }
     catch (std::runtime_error e)
     {
+      DEBUG_ERROR(e.what());
       Unadvice();
     }
   }
   else
   {
     // Unadvice
     Unadvice();
 
     // Destroy window
     if (m_pWndProcStatus)
@@ skipping 42 matching lines @@
     DEBUG_GENERAL("================================================================================\nNEW TAB UI - END\n================================================================================")
 
     ::CoUninitialize();
   }
 
   return IObjectWithSiteImpl<CPluginClass>::SetSite(unknownSite);
 }
 
 bool CPluginClass::IsStatusBarEnabled()
 {
+  DEBUG_GENERAL("IsStatusBarEnabled start");
   HKEY pHkey;
   HKEY pHkeySub;
   RegOpenCurrentUser(KEY_QUERY_VALUE, &pHkey);
   DWORD trueth = 1;
   DWORD truethSize = sizeof(DWORD);
   RegOpenKey(pHkey, L"Software\\Microsoft\\Internet Explorer\\Main", &pHkeySub);
   LONG res = RegQueryValueEx(pHkeySub, L"StatusBarWeb", NULL, NULL, (BYTE*)&trueth, &truethSize);
   RegCloseKey(pHkey);
   if (res != ERROR_SUCCESS)
   {
     res = RegOpenKey(pHkey, L"Software\\Microsoft\\Internet Explorer\\MINIE", &pHkeySub);
     if (res == ERROR_SUCCESS)
     {
       LONG res = RegQueryValueEx(pHkeySub, L"ShowStatusBar", NULL, NULL, (BYTE*)&trueth, &truethSize);
       if (res == ERROR_SUCCESS)
       {
         RegCloseKey(pHkey);
       }
     }
   }
+  DEBUG_GENERAL("IsStatusBarEnabled end");
   return trueth == 1;
 }
 
 void CPluginClass::ShowStatusBar()
 {
+  DEBUG_GENERAL("ShowStatusBar start");
+
   VARIANT_BOOL isVisible;
 
 
   CComQIPtr<IWebBrowser2> browser = GetAsyncBrowser();
   if (browser)
   {
     HRESULT hr = S_OK;
     hr = browser->get_StatusBar(&isVisible);
     if (SUCCEEDED(hr))
     {
@@ skipping 59 matching lines @@
           }
           browser->Quit();
         }
       }
     }
     else
     {
       DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_GET_STATUSBAR, "Class::Get statusbar state");
     }
   }
+  DEBUG_GENERAL("ShowStatusBar end");
 }
 
 void CPluginClass::BeforeNavigate2(DISPPARAMS* pDispParams)
 {
 
   if (pDispParams->cArgs < 7)
   {
     return;
   }
   //Register a mime filter if it's not registered yet
@@ skipping 52 matching lines @@
   {
     DEBUG_NAVI(L"Navi::Begin navigation url:" + url)
 
 #ifdef SUPPORT_FRAME_CACHING
       m_tab->CacheFrame(url);
 #endif
   }
 }
 STDMETHODIMP CPluginClass::OnTabChanged(DISPPARAMS* pDispParams, WORD wFlags)
 {
+  DEBUG_GENERAL("Tab changed");
   bool newtabshown = pDispParams->rgvarg[1].intVal==3;
   if (newtabshown)
   {
     std::map<DWORD,CPluginClass*>::const_iterator it = s_threadInstances.find(GetCurrentThreadId());
     if (it == s_threadInstances.end())
     {
       s_threadInstances[::GetCurrentThreadId()] = this;
 
 
       if (!m_isInitializedOk)
       {
         m_isInitializedOk = true;
         if (!InitObject(true))
         {
           //                                    Unadvice();
         }
         UpdateStatusBar();
       }
     }
   }
+  DEBUG_GENERAL("Tab change end");
   return VARIANT_TRUE;
 }
 
 // This gets called whenever there's a browser event
 STDMETHODIMP CPluginClass::Invoke(DISPID dispidMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pvarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr)
 {
   WCHAR tmp[256];
   wsprintf(tmp, L"Invoke: %d\n", dispidMember);
   DEBUG_GENERAL(tmp);
   switch (dispidMember)
@@ skipping 40 matching lines @@
   case DISPID_BEFORENAVIGATE:
     DEBUG_NAVI("Navi::BeforeNavigate")
       return VARIANT_TRUE;
   case DISPID_COMMANDSTATECHANGE:
     if (m_hPaneWnd == NULL)
     {
       CreateStatusBarPane();
     }
     else
     {
-      RECT rect;
-      BOOL rectRes = GetClientRect(m_hStatusBarWnd, &rect);
-      if (rectRes == TRUE)
+      if (CPluginClient::GetInstance()->GetIEVersion() > 6)
       {
-        MoveWindow(m_hPaneWnd, rect.right - 200, 0, m_nPaneWidth, rect.bottom - rect.top, TRUE);
-      }
+        RECT rect;
+        BOOL rectRes = GetClientRect(m_hStatusBarWnd, &rect);
+        if (rectRes == TRUE)
+        {
+          MoveWindow(m_hPaneWnd, rect.right - 200, 0, m_nPaneWidth, rect.bottom - rect.top, TRUE);

[Oleksandr, 2013/08/19 08:19:13]

This repositions the icon when IE is resized. IE6 doesn't need this since the
icon is in a dedicated pane there

+        }
+      }      
     }
     break;
   case DISPID_STATUSTEXTCHANGE:
     break;
 
   case DISPID_BEFORENAVIGATE2:
     BeforeNavigate2(pDispParams);
     break;
 
   case DISPID_DOWNLOADBEGIN:
@@ skipping 57 matching lines @@
 
     // do nothing
     break;
   }
 
   return VARIANT_TRUE;
 }
 
 bool CPluginClass::InitObject(bool bBHO)
 {
+  DEBUG_GENERAL("InitObject");
   CPluginSettings* settings = CPluginSettings::GetInstance();
 
   if (!settings->GetPluginEnabled())
   {
     s_mimeFilter->Unregister();
   }
 
   // Load theme module
   s_criticalSectionLocal.Lock();
   {
@@ skipping 53 matching lines @@
     s_criticalSectionLocal.Unlock();
 
     if (!GetAtomPaneClass())
     {
       DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_REGISTER_PANE_CLASS, "Class::InitObject - RegisterClassEx");
       return false;
     }
   }
 
 
+  int ieVersion = CPluginClient::GetInstance()->GetIEVersion();
   // Create status pane
-  if (bBHO)
+  if (bBHO && ieVersion > 6)

[Oleksandr, 2013/08/19 08:19:13]

This is an actual fix of the status bar icon for IE6. 

   {
     if (!CreateStatusBarPane())

[Wladimir Palant, 2013/08/19 14:49:40]

This nested if isn't actually necessary, it can be merged with the one above.

     {
       return false;
     }
   }
-
+  
   if (CPluginClient::GetInstance()->IsFirstRun())
   {   
     // IE6 can't be accessed from another thread, execute in current thread
-    if (CPluginClient::GetInstance()->GetIEVersion() < 7)
+    if (ieVersion < 7)
     {
       FirstRunThread();
     }
     else
     {
       CreateThread(NULL, NULL, (LPTHREAD_START_ROUTINE)CPluginClass::FirstRunThread, NULL, NULL, NULL);
     }
     if ((m_hPaneWnd == NULL) || (!IsStatusBarEnabled()))
     {
       ShowStatusBar();
     }
 
   }
   return true;
 }
 
 bool CPluginClass::CreateStatusBarPane()
 {
-  DEBUG_GENERAL(L"Getting client");
+  DEBUG_GENERAL(L"Going to create status bar");
+  CriticalSection::Lock lock(m_csStatusBar);
+  DEBUG_GENERAL(L"Create status bar");
 
   CPluginClient* client = CPluginClient::GetInstance();
 
-  DEBUG_GENERAL(L"Getting ieversion");
-
-  if (client->GetIEVersion()< 7)
-
-    return true;
-
   TCHAR szClassName[MAX_PATH];
   DEBUG_GENERAL(L"Getting browser wnd");
   // Get browser window and url
   HWND hBrowserWnd = GetBrowserHWND();
   if (!hBrowserWnd)
   {
     DEBUG_ERROR_LOG(0, PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_NO_STATUSBAR_BROWSER, "Class::CreateStatusBarPane - No status bar")
-      return false;
+    return false;
   }
 
   // Looking for a TabWindowClass window in IE7
   // the last one should be parent for statusbar
   HWND hWndStatusBar = NULL;
 
   DEBUG_GENERAL(L"Locating status bar window");
 
   HWND hTabWnd = ::GetWindow(hBrowserWnd, GW_CHILD);
   UINT amoundOfNewTabs = 0;
@@ skipping 67 matching lines @@
     }
 
     hWnd = ::GetWindow(hWnd, GW_HWNDNEXT);
   }
 
   DEBUG_GENERAL(L"Status bar located 2");
 
   if (!hWndStatusBar)
   {
     DEBUG_ERROR_LOG(0, PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_NO_STATUSBAR_WIN, "Class::CreateStatusBarPane - No status bar")
-      return true;
+    return true;
   }
 
   // Calculate pane height
   CRect rcStatusBar;
   ::GetClientRect(hWndStatusBar, &rcStatusBar);
 
   if (rcStatusBar.Height() > 0)
   {
 #ifdef _DEBUG
     m_nPaneWidth = 70;
@@ skipping 17 matching lines @@
     WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
     rcStatusBar.Width() - 500,0,m_nPaneWidth,rcStatusBar.Height(),
     hWndStatusBar,
     (HMENU)3671,
     _Module.m_hInst,
     NULL);
 
   if (!hWndNewPane)
   {
     DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_CREATE_STATUSBAR_PANE, "Class::CreateStatusBarPane - CreateWindowEx")
-      return false;
+    return false;
   }
 
+  DEBUG_GENERAL("ABP window created");
   m_hTabWnd = hTabWnd;
   m_hStatusBarWnd = hWndStatusBar;
   m_hPaneWnd = hWndNewPane;
 
   UpdateTheme();
 
   // Subclass status bar
   m_pWndProcStatus = (WNDPROC)SetWindowLongPtr(hWndStatusBar, GWLP_WNDPROC, (LPARAM)(WNDPROC)NewStatusProc);
 
+  DEBUG_GENERAL("SetWindowLongPtr done");
   // Adjust pane
   UINT nPartCount = ::SendMessage(m_hStatusBarWnd, SB_GETPARTS, 0, 0);
 
   if (nPartCount > 1)
   {
     INT *pData = new INT[nPartCount];
 
     ::SendMessage(m_hStatusBarWnd, SB_GETPARTS, nPartCount, (LPARAM)pData);
     ::SendMessage(m_hStatusBarWnd, SB_SETPARTS, nPartCount, (LPARAM)pData);
 
-    delete[] pData;
+    delete []pData;
   }
+  
+  DEBUG_GENERAL("Pane adjusted");
+  
   HDC hdc = GetWindowDC(m_hStatusBarWnd);
   SendMessage(m_hStatusBarWnd, WM_PAINT, (WPARAM)hdc, 0);
   ReleaseDC(m_hStatusBarWnd, hdc);
-
+  
+  DEBUG_GENERAL("Released DC");
   return true;
 }
 
 void CPluginClass::FirstRunThread()
 {
   CoInitialize(NULL);
   VARIANT vFlags;
   vFlags.vt = VT_I4;
   vFlags.intVal = navOpenInNewTab;
 
@@ skipping 86 matching lines @@
   if (cCmds == 0) return E_INVALIDARG;
   if (prgCmds == 0) return E_POINTER;
 
   prgCmds[0].cmdf = OLECMDF_ENABLED;
 
   return S_OK;
 }
 
 HMENU CPluginClass::CreatePluginMenu(const CString& url)
 {
+  DEBUG_GENERAL("CreatePluginMenu");
   HINSTANCE hInstance = _AtlBaseModule.GetModuleInstance();
 
   HMENU hMenu = ::LoadMenu(hInstance, MAKEINTRESOURCE(IDR_MENU1));
 
   HMENU hMenuTrackPopup = GetSubMenu(hMenu, 0);
 
   SetMenuBar(hMenuTrackPopup, url);
 
   return hMenuTrackPopup;
 }
@@ skipping 213 matching lines @@
     break;
   }
 
   // Invalidate and redraw the control
   UpdateStatusBar();
 }
 
 
 bool CPluginClass::SetMenuBar(HMENU hMenu, const CString& url)
 {
+  DEBUG_GENERAL("SetMenuBar");
+
   std::wstring ctext;
 
   s_criticalSectionLocal.Lock();
   {
 #ifdef SUPPORT_WHITELIST
     s_menuDomains.clear();
 #endif
   }
   s_criticalSectionLocal.Unlock();
 
-  CPluginTab* tab = GetTab(::GetCurrentThreadId());
-  if (!tab)
-  {
-    return false;
-  }
 
   Dictionary* dictionary = Dictionary::GetInstance();
 
   MENUITEMINFOW fmii;
   memset(&fmii, 0, sizeof(MENUITEMINFO));
   fmii.cbSize = sizeof(MENUITEMINFO);
 
   MENUITEMINFOW miiSep;
   memset(&miiSep, 0, sizeof(MENUITEMINFO));
   miiSep.cbSize = sizeof(MENUITEMINFO);
@@ skipping 412 matching lines @@
     break;
   }
 
   return DefWindowProc(hWnd, message, wParam, lParam);
 }
 
 
 void CPluginClass::UpdateStatusBar()
 {
   DEBUG_GENERAL("*** Updating statusbar")
-
-    if (m_hPaneWnd == NULL)
+  if (m_hPaneWnd == NULL)
+  {
+    CreateStatusBarPane();
+  }
+  if (m_hPaneWnd != NULL)
+  {
+    if (!::InvalidateRect(m_hPaneWnd, NULL, FALSE))

[Felix Dahlke, 2013/08/19 08:31:17]

No need for a nested if, you can merge this with the one above.

     {
-      CreateStatusBarPane();
+      DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_INVALIDATE_STATUSBAR, "Class::Invalidate statusbar");
     }
-    if (m_hPaneWnd != NULL)
-    {
-      if (!::InvalidateRect(m_hPaneWnd, NULL, FALSE))
-      {
-        DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_INVALIDATE_STATUSBAR, "Class::Invalidate statusbar");
-      }
-    }
+  }
 }
 
 
 void CPluginClass::Unadvice()
 {
   s_criticalSectionLocal.Lock();
   {
     if (m_isAdviced)
     {
       CComPtr<IConnectionPoint> pPoint = GetConnectionPoint();
@@ skipping 102 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }