*
* 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"
////////////////////////////////////////////////////////////////////////////////////////////////
-class VLCEnumFORMATETC : public IEnumFORMATETC
-{
-public:
-
- VLCEnumFORMATETC(vector<FORMATETC> &v) :
- e(VLCEnum<FORMATETC>(IID_IEnumFORMATETC, v)) {};
-
- VLCEnumFORMATETC(const VLCEnumFORMATETC &vlcEnum) : e(vlcEnum.e) {};
- virtual ~VLCEnumFORMATETC() {};
-
- // IUnknown methods
- STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
- { return e.QueryInterface(riid, ppv); };
- STDMETHODIMP_(ULONG) AddRef(void)
- { return e.AddRef(); };
- STDMETHODIMP_(ULONG) Release(void)
- {return e.Release(); };
-
- //IEnumConnectionPoints
- STDMETHODIMP Next(ULONG celt, LPFORMATETC rgelt, ULONG *pceltFetched)
- { return e.Next(celt, rgelt, pceltFetched); };
- STDMETHODIMP Skip(ULONG celt)
- { return e.Skip(celt);};
- STDMETHODIMP Reset(void)
- { return e.Reset();};
- STDMETHODIMP Clone(LPENUMFORMATETC *ppenum)
- { if( NULL == ppenum ) return E_POINTER;
- *ppenum = dynamic_cast<LPENUMFORMATETC>(new VLCEnumFORMATETC(*this));
- return (NULL != *ppenum) ? S_OK : E_OUTOFMEMORY;
- };
-
-private:
-
- VLCEnum<FORMATETC> e;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
static const FORMATETC _metaFileFormatEtc =
{
CF_METAFILEPICT,
TYMED_ENHMF,
};
+class VLCEnumFORMATETC : public VLCEnumIterator<IID_IEnumFORMATETC,
+ IEnumFORMATETC,
+ FORMATETC,
+ vector<FORMATETC>::iterator>
+{
+public:
+ VLCEnumFORMATETC(vector<FORMATETC> v) :
+ VLCEnumIterator<IID_IEnumFORMATETC,
+ IEnumFORMATETC,
+ FORMATETC,
+ vector<FORMATETC>::iterator>(v.begin(), v.end())
+ {};
+};
+
+////////////////////////////////////////////////////////////////////////////////////////////////
+
VLCDataObject::VLCDataObject(VLCPlugin *p_instance) : _p_instance(p_instance)
{
_v_formatEtc.push_back(_enhMetaFileFormatEtc);
return _p_adviseHolder->EnumAdvise(ppenumAdvise);
};
-STDMETHODIMP VLCDataObject::EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC **ppenumformatetc)
+STDMETHODIMP VLCDataObject::EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC **ppEnum)
{
- if( NULL == ppenumformatetc )
+ if( NULL == ppEnum )
return E_POINTER;
- *ppenumformatetc = new VLCEnumFORMATETC(_v_formatEtc);
- return NOERROR;
+ *ppEnum = dynamic_cast<IEnumFORMATETC *>(new VLCEnumFORMATETC(_v_formatEtc));
+
+ return (NULL != *ppEnum ) ? S_OK : E_OUTOFMEMORY;
};
STDMETHODIMP VLCDataObject::GetCanonicalFormatEtc(LPFORMATETC pFormatEtcIn, LPFORMATETC pFormatEtcOut)
if( NULL == hicTargetDev )
return E_FAIL;
- HDC hdcMeta = CreateMetaFile(NULL);
+ HDC hdcMeta = CreateMetaFile(NULL);
if( NULL != hdcMeta )
{
LPMETAFILEPICT pMetaFilePict = (LPMETAFILEPICT)CoTaskMemAlloc(sizeof(METAFILEPICT));
SIZEL size = _p_instance->getExtent();
- HDC hdcMeta = CreateEnhMetaFile(hicTargetDev, NULL, NULL, NULL);
+ HDC hdcMeta = CreateEnhMetaFile(hicTargetDev, NULL, NULL, NULL);
if( NULL != hdcMeta )
{
RECTL wBounds = { 0L, 0L, size.cx, size.cy };
default:
return DV_E_FORMATETC;
}
-
+
if( pFormatEtc->dwAspect != formatEtc->dwAspect )
return DV_E_DVASPECT;