Issue 1619 - Wrong return value of CPluginClass::Invoke

src/plugin/PluginClass.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClass.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #include "PluginFilter.h"
 #include "PluginMimeFilterClient.h"
 #include "PluginClient.h"
 #include "PluginClientFactory.h"
 #include "PluginMutex.h"
@@ skipping 611 matching lines @@
   WCHAR tmp[256];
   wsprintf(tmp, L"Invoke: %d\n", dispidMember);
   DEBUG_GENERAL(tmp);
   switch (dispidMember)
   {
 
   case DISPID_WINDOWSTATECHANGED:
     return OnTabChanged(pDispParams, wFlags);
     break;
   case DISPID_HTMLDOCUMENTEVENTS2_ONBEFOREUPDATE:
     return VARIANT_TRUE;

[Oleksandr, 2014/11/27 09:52:56]

How about returns here? In fact most of these cases can be safely removed, I
think.

     break;
 
   case DISPID_HTMLDOCUMENTEVENTS2_ONCLICK:
     return VARIANT_TRUE;
     break;
 
   case DISPID_EVMETH_ONLOAD:
     DEBUG_NAVI("Navi::OnLoad")
       return VARIANT_TRUE;
     break;
@@ skipping 104 matching lines @@
       CString did;
       did.Format(L"DispId:%u", dispidMember);
 
       DEBUG_NAVI(L"Navi::Default " + did)
     }
 
     // do nothing
     break;
   }
 
-  return VARIANT_TRUE;
+  return S_OK;
 }
 
 bool CPluginClass::InitObject(bool bBHO)
 {
   DEBUG_GENERAL("InitObject");
   CPluginSettings* settings = CPluginSettings::GetInstance();
 
   if (!settings->GetPluginEnabled())
   {
     s_mimeFilter->Unregister();
@@ skipping 1096 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }