Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge pull request #70 from dougma/FB-177

FireBreath-177: Move windowless detection to InPlaceActivate on ActiveX
  • Loading branch information...
commit 96d23bf72ee7e5e46180240e790644847ea936e1 2 parents 71935a6 + 1e0e681
Richard Bateman authored

Showing 1 changed file with 2 additions and 11 deletions. Show diff stats Hide diff stats

  1. 13  src/ActiveXCore/FBControl.h
13  src/ActiveXCore/FBControl.h
@@ -299,12 +299,6 @@ namespace FB {
299 299
         template <const GUID* pFbCLSID, const char* pMT, class ICurObjInterface, const IID* piid, const GUID* plibid>
300 300
         STDMETHODIMP CFBControl<pFbCLSID, pMT,ICurObjInterface,piid,plibid>::SetObjectRects(LPCRECT prcPos, LPCRECT prcClip)
301 301
         {
302  
-            if (!pluginMain->isWindowless())
303  
-            {
304  
-                m_bWndLess = false;
305  
-                m_bWasOnceWindowless = false;
306  
-            }
307  
-            
308 302
             HRESULT hr = IOleInPlaceObjectWindowlessImpl<CFBControlX>::SetObjectRects(prcPos, prcClip);
309 303
 
310 304
             if (m_bWndLess && pluginWin) {
@@ -318,6 +312,8 @@ namespace FB {
318 312
         template <const GUID* pFbCLSID, const char* pMT, class ICurObjInterface, const IID* piid, const GUID* plibid>
319 313
         STDMETHODIMP CFBControl<pFbCLSID, pMT,ICurObjInterface,piid,plibid>::InPlaceActivate( LONG iVerb, const RECT* prcPosRect)
320 314
         {
  315
+            m_bWindowOnly = (FB::pluginGuiEnabled() && !pluginMain->isWindowless());
  316
+
321 317
             HRESULT hr = CComControl<CFBControlX>::InPlaceActivate(iVerb, prcPosRect);
322 318
 
323 319
             if (m_host)
@@ -426,11 +422,6 @@ namespace FB {
426 422
         template <const GUID* pFbCLSID, const char* pMT, class ICurObjInterface, const IID* piid, const GUID* plibid>
427 423
         void CFBControl<pFbCLSID, pMT,ICurObjInterface,piid,plibid>::setReady()
428 424
         {
429  
-            if (FB::pluginGuiEnabled())
430  
-                m_bWindowOnly = pluginMain->isWindowless() ? FALSE : TRUE;
431  
-            else
432  
-                m_bWindowOnly = FALSE;
433  
-
434 425
             // This is when we can consider the plugin "ready".  The window will not be around yet!
435 426
             this->setAPI(pluginMain->getRootJSAPI(), m_host);
436 427
             setReadyState(READYSTATE_COMPLETE);

0 notes on commit 96d23bf

Please sign in to comment.
Something went wrong with that request. Please try again.