Changeset 1b75d79ed2680352f5ed1f67d57e9c205dd73162

Timestamp:

04/18/05 13:35:18 (3 years ago)

Author:

Damien Fouilleul <damienf@videolan.org>

git-committer:

Damien Fouilleul <damienf@videolan.org> 1113824118 +0000

git-parent:

[ad67acad03c34bf97e9815c476fc1071902ea633]

git-author:

Damien Fouilleul <damienf@videolan.org> 1113824118 +0000

Message:

- source cleanup
- few bugs fixed
- added suport to Ole Extent measurments to improve compatibilty

Files:

• AUTHORS (modified) (1 diff)
• activex/README.TXT (modified) (1 diff)
• activex/oleobject.cpp (modified) (2 diffs)
• activex/persistpropbag.cpp (modified) (1 diff)
• activex/plugin.cpp (modified) (13 diffs)
• activex/plugin.h (modified) (5 diffs)
• activex/utils.cpp (modified) (1 diff)
• activex/utils.h (modified) (1 diff)
• activex/viewobject.cpp (modified) (6 diffs)
• activex/viewobject.h (modified) (3 diffs)
• activex/vlccontrol.cpp (modified) (11 diffs)

AUTHORS

@@ -344 +344 @@
-S: France
-
+N: Damien Fouilleul
+E: Damien.Fouilleul@laposte.net
+C: Quovodis
+D: ActiveX control
+S: Germany
+

activex/README.TXT

@@ -68 +68 @@
-InstallDir="C:\Program Files\VideoLAN\VLC"
-
-contain
+be the parent directory of
-
-WARNING: Both control and plugins must come from the same build source tree.

activex/oleobject.cpp

@@ -226 +226 @@
-STDMETHODIMP VLCOleObject::GetExtent(DWORD dwDrawAspect, SIZEL *pSizel)
-{
+    if( NULL == pSizel )
+        return E_POINTER;
+
+    if( dwDrawAspect & DVASPECT_CONTENT )
+    {
+        *pSizel = _p_instance->getExtent();
+        return S_OK;
+    }
+    pSizel->cx= 0L;
+    pSizel->cy= 0L;
-    return E_NOTIMPL;
-};
@@ -315 +325 @@
-STDMETHODIMP VLCOleObject::SetExtent(DWORD dwDrawAspect, SIZEL *pSizel)
-{
+    if( NULL == pSizel )
+        return E_POINTER;
+
+    if( dwDrawAspect & DVASPECT_CONTENT )
+    {
+        _p_instance->setExtent(*pSizel);
+
+        if( _p_instance->isInPlaceActive() )
+        {
+            LPOLEINPLACESITE p_inPlaceSite;
+
+            if( SUCCEEDED(_p_clientsite->QueryInterface(IID_IOleInPlaceSite, (void**)&p_inPlaceSite)) )
+            {
+                LPOLECONTROLSITE p_controlSite;
+                RECT posRect = _p_instance->getPosRect();
+
+                if( SUCCEEDED(_p_clientsite->QueryInterface(IID_IOleControlSite, (void**)&p_controlSite)) )
+                {
+                    // use HIMETRIC to container transform
+                    POINTL extent = { pSizel->cx, pSizel->cy };
+                    POINTF container;
+                    if( SUCCEEDED(p_controlSite->TransformCoords(&extent,
+                                    &container, XFORMCOORDS_SIZE|XFORMCOORDS_HIMETRICTOCONTAINER)) )
+                    {
+                        posRect.right  = ((LONG)container.x)+posRect.left;
+                        posRect.bottom = ((LONG)container.y)+posRect.top;
+                    }
+                    p_controlSite->Release();
+                }
+                else {
+                    // use HIMETRIC to display transform 
+                    HDC hDC = CreateDevDC(NULL);
+                    posRect.right = (pSizel->cx*GetDeviceCaps(hDC, LOGPIXELSX)/2540L)+posRect.left;
+                    posRect.bottom = (pSizel->cy*GetDeviceCaps(hDC, LOGPIXELSY)/2540L)+posRect.top;
+                    DeleteDC(hDC);
+                }
+                p_inPlaceSite->OnPosRectChange(&posRect);
+                p_inPlaceSite->Release();
+            }
+        }
+        return S_OK;
+    }
-    return E_NOTIMPL;
-};

activex/persistpropbag.cpp

@@ -117 +117 @@
-};
-
-
+t
-{
-    if( NULL == pPropBag )

activex/plugin.cpp

@@ -251 +251 @@
-    vlcControl = new VLCControl(this);
-    vlcViewObject = new VLCViewObject(this);
+
+    // set default/preferred size (320x240) pixels in HIMETRIC
+    HDC hDC = CreateDevDC(NULL);
+    _extent.cx = (320*2540L)/GetDeviceCaps(hDC, LOGPIXELSX);
+    _extent.cy = (240*2540L)/GetDeviceCaps(hDC, LOGPIXELSY);
+    DeleteDC(hDC);
-};
-
@@ -384 +390 @@
-        return NOERROR;
-    }
+    else if( IID_IViewObject2 == riid )
+    {
+        AddRef();
+        *ppv = reinterpret_cast<LPVOID>(vlcViewObject);
+        return NOERROR;
+    }
-
-    *ppv = NULL;
@@ -408 +420 @@
-
-/*
-n in-place child
-size
-
-cartesian coordinate system represented by _bounds.
+
+geometry
+must
+follow coordinates system described in lprPosRect
-*/
-
-
-
-
-
-
+
+
+
+
+
+
-    {
-        // left side is not clipped out
-_
-
-c
+
+
+
-        {
-            // right side is not clipped out, no change
-        }
-c
+
-        {
-            // right side is clipped out
-c
+
-        }
-        else
@@ -441 +454 @@
-    {
-        // left side is clipped out
-_bounds.left = lprPosRect->left-lprc
-_bounds.right += _
-
-c
-c
+bounds.left = lprPosRect->left-lpr
+bounds.right += 
+
+
+
-        {
-            // right side is not clipped out
@@ -452 +465 @@
-        {
-            // right side is clipped out
-c
-
-
-
-_
-
-c
+
+
+
+
+
+
+
-    {
-        // top side is not clipped out
-_
-
-c
+
+
+
-        {
-            // bottom side is not clipped out, no change
-        }
-c
+
-        {
-            // bottom side is clipped out
-c
+
-        }
-        else
@@ -480 +493 @@
-    else
-    {
-_bounds.top = lprPosRect->top-lprc
-_bounds.bottom += _
-
-c
-c
+bounds.top = lprPosRect->top-lpr
+bounds.bottom += 
+
+
+
-        {
-            // bottom side is not clipped out
@@ -491 +504 @@
-        {
-            // bottom side is clipped out
-
-
-
+
+
+
+
+
-};
-
@@ -523 +538 @@
-        }
-
-0
+1
-        ppsz_argv[0] = "C:\\cygwin\\home\\Damien_Fouilleul\\dev\\videolan\\vlc-trunk\\vlc";
-#endif
@@ -611 +626 @@
-{
-    RECT posRect = *lprcPosRect;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    _inplacewnd = CreateWindow(_p_class->getInPlaceWndClassName(),
-            "VLC Plugin In-Place Window",
-            WS_CHILD|WS_CLIPCHILDREN|WS_TABSTOP,
-pos
-pos
-posRect.right-pos
-posRect.bottom-pos
+clip
+clip
+clipRect.right-clip
+clipRect.bottom-clip
-            hwndParent,
-            0,
@@ -632 +661 @@
-    SetWindowLongPtr(_inplacewnd, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
-
+    /*
+    ** VLC embedded video geometry automatically matches parent window.
+    ** hence create a child window so that video position and size
+    ** is always correct relative to the viewport bounds
+    */
-    _videownd = CreateWindow(_p_class->getVideoWndClassName(),
-            "VLC Plugin Video Window",
-            WS_CHILD|WS_CLIPCHILDREN|WS_VISIBLE,
-_bounds
-_bounds
-_bounds.right-_bounds
-_bounds.bottom-_bounds
+posRect
+posRect
+posRect.right-posRect
+posRect.bottom-posRect
-            _inplacewnd,
-            0,
@@ -764 +798 @@
-void VLCPlugin::onPositionChange(LPCRECT lprcPosRect, LPCRECT lprcClipRect)
-{
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /*
@@ -772 +815 @@
-    */
-    MoveWindow(_inplacewnd,
+            clipRect.left,
+            clipRect.top,
+            clipRect.right-clipRect.left,
+            clipRect.bottom-clipRect.top,
+            FALSE);
+
+    /*
+    ** change video window geometry to match object bounds within clipping region
+    */
+    MoveWindow(_videownd,
-            posRect.left,
-            posRect.top,
@@ -778 +831 @@
-            FALSE);
-
-
-
+
+
+
-    */
-    MoveWindow(_videownd,
-            _bounds.left,
-            _bounds.top,
-            _bounds.right-_bounds.left,
-            _bounds.bottom-_bounds.top,
-            FALSE);
-
-    RECT updateRect;
-
-
-
-
-
+
+
+
+
-
-    ValidateRect(_videownd, NULL);

activex/plugin.h

@@ -117 +117 @@
-    BOOL getVisible(void) { return _b_visible; };
-
+    
-    // container events
-    void onPositionChange(LPCRECT lprcPosRect, LPCRECT lprcClipRect);
@@ -127 +128 @@
-    void fireOnStopEvent(void);
-
+    // control size in HIMETRIC
+    const SIZEL& getExtent(void) { return _extent; };
+    void  setExtent(const SIZEL& extent) { _extent = extent; };
+
+    // control geometry within container
+    RECT getPosRect(void) { return _posRect; }; 
+
-protected:
-
@@ -132 +140 @@
-
-private:
-
-    void calcPositionChange(LPRECT lprPosRect, LPCRECT lprcClipRect);
-
-    //implemented interfaces
@@ -153 +159 @@
-    // video window (Drawing window)
-    HWND _videownd;
-    RECT _bounds;
-
-    VLCPluginClass *_p_class;
@@ -164 +169 @@
-    BOOL _b_visible;
-    BOOL _b_sendevents;
-
+
+
+
+
-};
-

activex/utils.cpp

@@ -99 +99 @@
-};
-
+HDC CreateDevDC(DVTARGETDEVICE *ptd)
+{
+    HDC hdc=NULL;
+    LPDEVNAMES lpDevNames;
+    LPDEVMODE lpDevMode;
+    LPTSTR lpszDriverName;
+    LPTSTR lpszDeviceName;
+    LPTSTR lpszPortName;
-
+    if (ptd == NULL) {
+        hdc = CreateDC(TEXT("DISPLAY"), NULL, NULL, NULL);
+        goto errReturn;
+    }
+
+    lpDevNames = (LPDEVNAMES) ptd; // offset for size field
+
+    if (ptd->tdExtDevmodeOffset == 0) {
+        lpDevMode = NULL;
+    }else{
+        lpDevMode  = (LPDEVMODE) ((LPTSTR)ptd + ptd->tdExtDevmodeOffset);
+    }
+
+    lpszDriverName = (LPTSTR) lpDevNames + ptd->tdDriverNameOffset;
+    lpszDeviceName = (LPTSTR) lpDevNames + ptd->tdDeviceNameOffset;
+    lpszPortName   = (LPTSTR) lpDevNames + ptd->tdPortNameOffset;
+
+    hdc = CreateDC(lpszDriverName, lpszDeviceName, lpszPortName, lpDevMode);
+
+errReturn:
+    return hdc;
+};
+
+

activex/utils.h

@@ -34 +34 @@
-// properties
-extern HRESULT GetObjectProperty(LPUNKNOWN object, DISPID dispID, VARIANT& v);
+
+// properties
+extern HDC CreateDevDC(DVTARGETDEVICE *ptd);
-
-// enumeration

activex/viewobject.cpp

@@ -24 +24 @@
-#include "viewobject.h"
-
-<iostream>
+"utils.h"
-
-using namespace std;
@@ -32 +32 @@
-        LPCRECTL lprcWBounds, BOOL(CALLBACK *pfnContinue)(DWORD), DWORD dwContinue)
-{
-switch( dwAspect
+if( dwAspect & DVASPECT_CONTENT
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    }
-    return E_NOTIMPL;
@@ -61 +54 @@
-        return E_INVALIDARG;
-
-OLE_E_BLANK
+E_NOTIMPL
-};
-
@@ -67 +60 @@
-        LPADVISESINK *ppAdviseSink)
-{
-
+
+
+
+
+
+
+
+
+
+
-};
-
@@ -73 +75 @@
-        PVOID pvAspect, DVTARGETDEVICE *ptd, HDC hicTargetDev, LPLOGPALETTE *ppColorSet)
-{
-E_NOTIMPL
+S_FALSE
-};
-
@@ -87 +89 @@
-};
-
+STDMETHODIMP VLCViewObject::GetExtent(DWORD dwAspect, LONG lindex,
+        DVTARGETDEVICE *ptd, LPSIZEL lpSizel)
+{
+    if( dwAspect & DVASPECT_CONTENT )
+    {
+        *lpSizel = _p_instance->getExtent();
+        return S_OK;
+    }
+    lpSizel->cx= 0L;
+    lpSizel->cy= 0L;
+    return E_NOTIMPL;
+};
+

activex/viewobject.h

@@ -26 +26 @@
-#include <oleidl.h>
-
-
+2
-{
-
@@ -40 +40 @@
-         && (IID_IUnknown == riid) 
-         && (IID_IPersist == riid) 
-
+
+
-            AddRef();
-            *ppv = reinterpret_cast<LPVOID>(this);
@@ -59 +60 @@
-    STDMETHODIMP Unfreeze(DWORD);
-
+    // IViewObject2 methods
+    STDMETHODIMP GetExtent(DWORD,LONG,DVTARGETDEVICE *,LPSIZEL);
+
-private:
-

activex/vlccontrol.cpp

@@ -55 +55 @@
-STDMETHODIMP VLCControl::GetTypeInfoCount(UINT* pctInfo)
-{
+    if( NULL == pctInfo )
+        return E_INVALIDARG;
+
-    if( SUCCEEDED(getTypeInfo()) )
-        *pctInfo = 1;
@@ -103 +106 @@
-{
-    if( NULL == pvarValue )
-INVALIDARG
+POINTER
-
-    V_VT(pvarValue) = VT_BOOL;
@@ -128 +131 @@
-{
-    if( NULL == isVisible )
-INVALIDARG
+POINTER
-
-    *isVisible = _p_instance->getVisible();
@@ -181 +184 @@
-{
-    if( NULL == isPlaying )
-INVALIDARG
+POINTER
-
-    int i_vlc = _p_instance->getVLCObject();
@@ -216 +219 @@
-{
-    if( NULL == position )
-INVALIDARG
+POINTER
-
-    int i_vlc = _p_instance->getVLCObject();
@@ -242 +245 @@
-{
-    if( NULL == seconds )
-INVALIDARG
+POINTER
-
-    int i_vlc = _p_instance->getVLCObject();
@@ -290 +293 @@
-{
-    if( NULL == seconds )
-INVALIDARG
+POINTER
-
-    int i_vlc = _p_instance->getVLCObject();
@@ -327 +330 @@
-{
-    if( NULL == volume )
-INVALIDARG
+POINTER
-
-    int i_vlc = _p_instance->getVLCObject();
@@ -558 +561 @@
-STDMETHODIMP VLCControl::addTarget( BSTR uri, VARIANT options, enum VLCPlaylistMode mode, int position)
-{
-NULL == uri
+0 == SysStringLen(uri)
-        return E_INVALIDARG;
-
@@ -589 +592 @@
-{
-    if( NULL == index )
-INVALIDARG
+POINTER
-
-    int i_vlc = _p_instance->getVLCObject();
@@ -648 +651 @@
-{
-    if( NULL == version )
-INVALIDARG
+POINTER
-
-    const char *versionStr = VLC_Version();