Removes trailing spaces. Removes tabs.

[vlc] / activex / viewobject.cpp

diff --git a/activex/viewobject.cpp b/activex/viewobject.cpp
index a0c51138e5317c8e33caf1d5de1df413f1d008c0..a194ff71af2d77dee01ae2eb815b230b91f85c7b 100644 (file)
--- a/activex/viewobject.cpp
+++ b/activex/viewobject.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * viewobject.cpp: ActiveX control for VLC
  *****************************************************************************
- * Copyright (C) 2005 VideoLAN
+ * Copyright (C) 2005 the VideoLAN team
  *
  * Authors: Damien Fouilleul <Damien.Fouilleul@laposte.net>
  *
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #include "plugin.h"
@@ -33,15 +33,35 @@ STDMETHODIMP VLCViewObject::Draw(DWORD dwAspect, LONG lindex, PVOID pvAspect,
 {
     if( dwAspect & DVASPECT_CONTENT )
     {
-        if( _p_instance->getVisible() )
+        if( NULL == lprcBounds )
+            return E_INVALIDARG;
+
+        BOOL releaseDC = FALSE;
+        SIZEL size = _p_instance->getExtent();
+
+        if( NULL == ptd )
         {
-            RECT bounds;
-            bounds.left   = lprcBounds->left;
-            bounds.top    = lprcBounds->top;
-            bounds.right  = lprcBounds->right;
-            bounds.bottom = lprcBounds->bottom;
-            _p_instance->onPaint(hdcDraw, bounds, bounds);
+            hicTargetDev = CreateDevDC(NULL);
+            releaseDC = TRUE;
         }
+        DPFromHimetric(hicTargetDev, (LPPOINT)&size, 1);
+
+        RECTL bounds = { 0L, 0L, size.cx, size.cy };
+
+        int sdc = SaveDC(hdcDraw);
+        SetMapMode(hdcDraw, MM_ANISOTROPIC);
+        SetWindowOrgEx(hdcDraw, 0, 0, NULL);
+        SetWindowExtEx(hdcDraw, size.cx, size.cy, NULL);
+        OffsetViewportOrgEx(hdcDraw, lprcBounds->left, lprcBounds->top, NULL);
+        SetViewportExtEx(hdcDraw, lprcBounds->right-lprcBounds->left,
+                lprcBounds->bottom-lprcBounds->top, NULL);
+
+        _p_instance->onDraw(ptd, hicTargetDev, hdcDraw, &bounds, lprcWBounds);
+        RestoreDC(hdcDraw, sdc);
+
+        if( releaseDC )
+            DeleteDC(hicTargetDev);
+
         return S_OK;
     }
     return E_NOTIMPL;
@@ -50,9 +70,6 @@ STDMETHODIMP VLCViewObject::Draw(DWORD dwAspect, LONG lindex, PVOID pvAspect,
 STDMETHODIMP VLCViewObject::Freeze(DWORD dwAspect, LONG lindex,
         PVOID pvAspect, LPDWORD pdwFreeze)
 {
-    if( NULL != pvAspect )
-        return E_INVALIDARG;
-
     return E_NOTIMPL;
 };
 
@@ -75,7 +92,7 @@ STDMETHODIMP VLCViewObject::GetAdvise(LPDWORD pdwAspect, LPDWORD padvf,
     return S_OK;
 };
 
-STDMETHODIMP VLCViewObject::GetColorSet(DWORD dwAspect, LONG lindex, 
+STDMETHODIMP VLCViewObject::GetColorSet(DWORD dwAspect, LONG lindex,
         PVOID pvAspect, DVTARGETDEVICE *ptd, HDC hicTargetDev, LPLOGPALETTE *ppColorSet)
 {
     return S_FALSE;
@@ -84,21 +101,21 @@ STDMETHODIMP VLCViewObject::GetColorSet(DWORD dwAspect, LONG lindex,
 STDMETHODIMP VLCViewObject::SetAdvise(DWORD dwAspect, DWORD advf,
         LPADVISESINK pAdvSink)
 {
-    _dwAspect = dwAspect;
-    _advf = advf;
+    if( NULL != pAdvSink )
+        pAdvSink->AddRef();
+
     if( NULL != _pAdvSink )
         _pAdvSink->Release();
 
+    _dwAspect = dwAspect;
+    _advf = advf;
     _pAdvSink = pAdvSink;
-    if( NULL != pAdvSink )
-    {
-        pAdvSink->AddRef();
 
-        if( dwAspect & DVASPECT_CONTENT )
-        {
-            pAdvSink->OnViewChange(DVASPECT_CONTENT, -1);
-        }
+    if( (dwAspect & DVASPECT_CONTENT) && (advf & ADVF_PRIMEFIRST) && (NULL != _pAdvSink) )
+    {
+        _pAdvSink->OnViewChange(DVASPECT_CONTENT, -1);
     }
+
     return S_OK;
 };