// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "dataobj.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
wxIEnumFORMATETC(const wxDataFormat* formats, ULONG nCount);
virtual ~wxIEnumFORMATETC() { delete [] m_formats; }
- DECLARE_IUNKNOWN_METHODS;
-
// IEnumFORMATETC
STDMETHODIMP Next(ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched);
STDMETHODIMP Skip(ULONG celt);
STDMETHODIMP Reset();
STDMETHODIMP Clone(IEnumFORMATETC **ppenum);
+ DECLARE_IUNKNOWN_METHODS;
+
private:
CLIPFORMAT *m_formats; // formats we can provide data in
ULONG m_nCount, // number of formats we support
virtual ~wxIDataObject();
// normally, wxDataObject controls our lifetime (i.e. we're deleted when it
- // is), but in some cases, the situation is inversed, that is we delete it
+ // is), but in some cases, the situation is reversed, that is we delete it
// when this object is deleted - setting this flag enables such logic
- void SetDeleteFlag() { m_mustDelete = TRUE; }
-
- DECLARE_IUNKNOWN_METHODS;
+ void SetDeleteFlag() { m_mustDelete = true; }
// IDataObject
STDMETHODIMP GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium);
STDMETHODIMP DUnadvise(DWORD dwConnection);
STDMETHODIMP EnumDAdvise(IEnumSTATDATA **ppenumAdvise);
+ DECLARE_IUNKNOWN_METHODS;
+
private:
wxDataObject *m_pDataObject; // pointer to C++ class we belong to
wxIDataObject::wxIDataObject(wxDataObject *pDataObject)
{
m_pDataObject = pDataObject;
- m_mustDelete = FALSE;
+ m_mustDelete = false;
}
wxIDataObject::~wxIDataObject()
return DV_E_FORMATETC;
}
- if ( !format.IsStandard() ) {
- // for custom formats, put the size with the data - alloc the
- // space for it
- // MB: not completely sure this is correct,
- // even if I can't figure out what's wrong
- size += m_pDataObject->GetBufferOffset( format );
- }
+ // we may need extra space for the buffer size
+ size += m_pDataObject->GetBufferOffset( format );
HGLOBAL hGlobal = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, size);
if ( hGlobal == NULL ) {
}
wxDataFormat format = pformatetc->cfFormat;
- if ( !format.IsStandard() ) {
- // for custom formats, put the size with the data
- pBuf = m_pDataObject->SetSizeInBuffer( pBuf, GlobalSize(hGlobal), format );
- }
+
+ // possibly put the size in the beginning of the buffer
+ pBuf = m_pDataObject->SetSizeInBuffer
+ (
+ pBuf,
+ ::GlobalSize(hGlobal),
+ format
+ );
if ( !m_pDataObject->GetDataHere(format, pBuf) )
return E_UNEXPECTED;
case CF_OEMTEXT:
size = strlen((const char *)pBuf);
break;
-#if !defined(__WATCOMC__) && ! (defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
+#if !(defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
case CF_UNICODETEXT:
#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \
|| ( defined(__MWERKS__) && defined(__WXMSW__) )
break;
#endif
default:
- {
- // we suppose that the size precedes the data
- pBuf = m_pDataObject->GetSizeFromBuffer( pBuf, &size, format );
- if (! format.IsStandard() ) {
- // see GetData for coresponding increment
- size -= m_pDataObject->GetBufferOffset( format );
- }
- }
+ pBuf = m_pDataObject->
+ GetSizeFromBuffer(pBuf, &size, format);
+ size -= m_pDataObject->GetBufferOffset(format);
}
bool ok = m_pDataObject->SetData(format, size, pBuf);
wxDataObject::Direction dir = dwDir == DATADIR_GET ? wxDataObject::Get
: wxDataObject::Set;
- size_t nFormatCount = m_pDataObject->GetFormatCount(dir);
+ ULONG nFormatCount = wx_truncate_cast(ULONG, m_pDataObject->GetFormatCount(dir));
wxDataFormat format;
wxDataFormat *formats;
formats = nFormatCount == 1 ? &format : new wxDataFormat[nFormatCount];
m_pIDataObject = NULL;
}
-size_t wxDataObject::GetBufferOffset( const wxDataFormat& WXUNUSED(format) )
+size_t wxDataObject::GetBufferOffset(const wxDataFormat& format )
{
- return sizeof(size_t);
+ // if we prepend the size of the data to the buffer itself, account for it
+ return NeedsVerbatimData(format) ? 0 : sizeof(size_t);
}
const void* wxDataObject::GetSizeFromBuffer( const void* buffer, size_t* size,
- const wxDataFormat& WXUNUSED(format) )
+ const wxDataFormat& format )
{
- size_t* p = (size_t*)buffer;
- *size = *p;
+ size_t realsz = ::HeapSize(::GetProcessHeap(), 0, buffer);
+ if ( realsz == (size_t)-1 )
+ {
+ // note that HeapSize() does not set last error
+ wxLogApiError(wxT("HeapSize"), 0);
+ return NULL;
+ }
- return p + 1;
+ *size = realsz;
+
+ // check if this data has its size prepended (as it was by default for wx
+ // programs prior 2.6.3):
+ size_t *p = (size_t *)buffer;
+ if ( *p == realsz )
+ {
+ if ( NeedsVerbatimData(format) )
+ wxLogDebug(wxT("Apparent data format mismatch: size not needed"));
+
+ p++; // this data has its size prepended; skip first DWORD
+ }
+
+ return p;
}
void* wxDataObject::SetSizeInBuffer( void* buffer, size_t size,
- const wxDataFormat& WXUNUSED(format) )
+ const wxDataFormat& format )
{
- size_t* p = (size_t*)buffer;
- *p = size;
+ size_t* p = (size_t *)buffer;
+ if ( !NeedsVerbatimData(format) )
+ {
+ // prepend the size to the data and skip it
+ *p++ = size;
+ }
- return p + 1;
+ return p;
}
#ifdef __WXDEBUG__
return wxDIB::ConvertFromBitmap(pbi, GetHbitmapOf(GetBitmap())) != 0;
#else
- return FALSE;
+ wxUnusedVar(buf);
+ return false;
#endif
}
SetBitmap(bitmap);
- return TRUE;
+ return true;
#else
- return FALSE;
+ wxUnusedVar(buf);
+ return false;
#endif
}
// we put a bitmap handle into pBuf
*(WXHBITMAP *)pBuf = GetBitmap().GetHBITMAP();
- return TRUE;
+ return true;
}
bool wxBitmapDataObject2::SetData(size_t WXUNUSED(len), const void *pBuf)
if ( !bitmap.Ok() ) {
wxFAIL_MSG(wxT("pasting/dropping invalid bitmap"));
- return FALSE;
+ return false;
}
SetBitmap(bitmap);
- return TRUE;
+ return true;
}
#if 0
{
wxLogLastError(wxT("GetDIBits"));
- return FALSE;
+ return false;
}
}
else // CF_BITMAP
*(HBITMAP *)pBuf = hbmp;
}
- return TRUE;
+ return true;
}
bool wxBitmapDataObject::SetData(const wxDataFormat& format,
wxASSERT_MSG( m_bitmap.Ok(), wxT("pasting invalid bitmap") );
- return TRUE;
+ return true;
}
#endif // 0
// wxFileDataObject
// ----------------------------------------------------------------------------
-bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *pData)
+bool wxFileDataObject::SetData(size_t WXUNUSED(size),
+ const void *WXUNUSED_IN_WINCE(pData))
{
#ifndef __WXWINCE__
m_filenames.Empty();
}
}
- return TRUE;
+ return true;
#else
- return FALSE;
+ return false;
#endif
}
return 0;
// inital size of DROPFILES struct + null byte
- size_t sz = sizeof(DROPFILES) + 1;
+ size_t sz = sizeof(DROPFILES) + (1 * sizeof(wxChar));
size_t count = m_filenames.GetCount();
for ( size_t i = 0; i < count; i++ )
{
// add filename length plus null byte
- sz += m_filenames[i].Len() + 1;
+ sz += (m_filenames[i].Len() + 1) * sizeof(wxChar);
}
return sz;
#endif
}
-bool wxFileDataObject::GetDataHere(void *pData) const
+bool wxFileDataObject::GetDataHere(void *WXUNUSED_IN_WINCE(pData)) const
{
#ifndef __WXWINCE__
// pData points to an externally allocated memory block
// if pData is NULL, or there are no files, return
if ( !pData || m_filenames.GetCount() == 0 )
- return FALSE;
+ return false;
// convert data pointer to a DROPFILES struct pointer
LPDROPFILES pDrop = (LPDROPFILES) pData;
// add final null terminator
*pbuf = wxT('\0');
- return TRUE;
+ return true;
#else
- return FALSE;
+ return false;
#endif
}
{
public:
CFSTR_SHELLURLDataObject() : wxCustomDataObject(CFSTR_SHELLURL) {}
-protected:
+
virtual size_t GetBufferOffset( const wxDataFormat& WXUNUSED(format) )
{
return 0;
memcpy( buffer, unicode_buffer.c_str(),
( unicode_buffer.length() + 1 ) * sizeof(wxChar) );
- return TRUE;
+ return true;
}
virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format),
void *buf) const
#endif // Debug
#else // not using OLE at all
+
// ----------------------------------------------------------------------------
// wxDataObject
// ----------------------------------------------------------------------------
}
#ifdef __WXDEBUG__
-const wxChar *wxDataObject::GetFormatName(wxDataFormat format)
+const wxChar *wxDataObject::GetFormatName(wxDataFormat WXUNUSED(format))
{
return NULL;
}
-#endif
+#endif // __WXDEBUG__
-#endif
+#endif // wxUSE_DATAOBJ
+
+#endif // wxUSE_OLE/!wxUSE_OLE
-#endif
projects / wxWidgets.git / blobdiff