X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33ac7e6f01acbac1cff0ad400d8ea7f0bfd0a62f..cf31a1d7b60feddf23cc30259c6d909d4736ca56:/src/msw/ole/dataobj.cpp?ds=sidebyside diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index 9af22753cf..65151fbf5e 100644 --- a/src/msw/ole/dataobj.cpp +++ b/src/msw/ole/dataobj.cpp @@ -28,8 +28,6 @@ #pragma hdrstop #endif -#if defined(__WIN32__) && !defined(__GNUWIN32_OLD__) - #ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/log.h" @@ -37,6 +35,8 @@ #include "wx/dataobj.h" +#if wxUSE_OLE && defined(__WIN32__) && !defined(__GNUWIN32_OLD__) + #include "wx/msw/private.h" // includes #if wxUSE_NORLANDER_HEADERS @@ -55,6 +55,10 @@ #include "wx/msw/dib.h" +#ifndef CFSTR_SHELLURL +#define CFSTR_SHELLURL _T("UniformResourceLocator") +#endif + // ---------------------------------------------------------------------------- // functions // ---------------------------------------------------------------------------- @@ -62,7 +66,7 @@ #ifdef __WXDEBUG__ static const wxChar *GetTymedName(DWORD tymed); #else // !Debug - #define GetTymedName(tymed) "" + #define GetTymedName(tymed) _T("") #endif // Debug/!Debug // ---------------------------------------------------------------------------- @@ -324,7 +328,9 @@ STDMETHODIMP wxIDataObject::GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium) if ( !format.IsStandard() ) { // for custom formats, put the size with the data - alloc the // space for it - size += sizeof(size_t); + // MB: not completely sure this is correct, + // even if I can't figure out what's wrong + size += m_pDataObject->GetBufferOffset( format ); } HGLOBAL hGlobal = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, size); @@ -386,14 +392,12 @@ STDMETHODIMP wxIDataObject::GetDataHere(FORMATETC *pformatetc, return E_OUTOFMEMORY; } - if ( !wxDataFormat(pformatetc->cfFormat).IsStandard() ) { + wxDataFormat format = pformatetc->cfFormat; + if ( !format.IsStandard() ) { // for custom formats, put the size with the data - size_t *p = (size_t *)pBuf; - *p++ = GlobalSize(hGlobal); - pBuf = p; + pBuf = m_pDataObject->SetSizeInBuffer( pBuf, GlobalSize(hGlobal), format ); } - wxDataFormat format = pformatetc->cfFormat; if ( !m_pDataObject->GetDataHere(format, pBuf) ) return E_UNEXPECTED; @@ -443,7 +447,7 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc, } // copy data - void *pBuf = GlobalLock(pmedium->hGlobal); + const void *pBuf = GlobalLock(pmedium->hGlobal); if ( pBuf == NULL ) { wxLogLastError(wxT("GlobalLock")); @@ -464,10 +468,11 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc, break; #if !defined(__WATCOMC__) && ! (defined(__BORLANDC__) && (__BORLANDC__ < 0x500)) case CF_UNICODETEXT: -#if (defined(__BORLANDC__) && (__BORLANDC__ > 0x530)) - size = std::wcslen((const wchar_t *)pBuf); +#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \ + || ( defined(__MWERKS__) && defined(__WXMSW__) ) + size = std::wcslen((const wchar_t *)pBuf) * sizeof(wchar_t); #else - size = ::wcslen((const wchar_t *)pBuf); + size = ::wcslen((const wchar_t *)pBuf) * sizeof(wchar_t); #endif break; #endif @@ -491,12 +496,10 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc, default: { // we suppose that the size precedes the data - size_t *p = (size_t *)pBuf; - size = *p++; - pBuf = p; + pBuf = m_pDataObject->GetSizeFromBuffer( pBuf, &size, format ); if (! format.IsStandard() ) { // see GetData for coresponding increment - size -= sizeof(size_t); + size -= m_pDataObject->GetBufferOffset( format ); } } } @@ -621,7 +624,7 @@ STDMETHODIMP wxIDataObject::EnumFormatEtc(DWORD dwDir, size_t nFormatCount = m_pDataObject->GetFormatCount(dir); wxDataFormat format; - wxDataFormat *formats; + wxDataFormat *formats; formats = nFormatCount == 1 ? &format : new wxDataFormat[nFormatCount]; m_pDataObject->GetAllFormats(formats, dir); @@ -682,6 +685,29 @@ void wxDataObject::SetAutoDelete() m_pIDataObject = NULL; } +size_t wxDataObject::GetBufferOffset( const wxDataFormat& format ) +{ + return sizeof(size_t); +} + +const void* wxDataObject::GetSizeFromBuffer( const void* buffer, size_t* size, + const wxDataFormat& format ) +{ + size_t* p = (size_t*)buffer; + *size = *p; + + return p + 1; +} + +void* wxDataObject::SetSizeInBuffer( void* buffer, size_t size, + const wxDataFormat& format ) +{ + size_t* p = (size_t*)buffer; + *p = size; + + return p + 1; +} + #ifdef __WXDEBUG__ const wxChar *wxDataObject::GetFormatName(wxDataFormat format) @@ -1029,11 +1055,98 @@ bool wxFileDataObject::GetDataHere(void *pData) const *pbuf++ = wxT('\0'); } - *pbuf = wxT('\0'); // add final null terminator + // add final null terminator + *pbuf = wxT('\0'); return TRUE; } +// ---------------------------------------------------------------------------- +// wxURLDataObject +// ---------------------------------------------------------------------------- + +class CFSTR_SHELLURLDataObject:public wxCustomDataObject +{ +public: + CFSTR_SHELLURLDataObject() : wxCustomDataObject(CFSTR_SHELLURL) {} +protected: + virtual size_t GetBufferOffset( const wxDataFormat& format ) + { + return 0; + } + + virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size, + const wxDataFormat& format ) + { + // CFSTR_SHELLURL is _always_ ANSI text + *size = strlen( (const char*)buffer ); + + return buffer; + } + + virtual void* SetSizeInBuffer( void* buffer, size_t size, + const wxDataFormat& format ) + { + return buffer; + } +#if wxUSE_UNICODE + virtual bool GetDataHere( void* buffer ) const + { + // CFSTR_SHELLURL is _always_ ANSI! + wxCharBuffer char_buffer( GetDataSize() ); + wxCustomDataObject::GetDataHere( (void*)char_buffer.data() ); + wxString unicode_buffer( char_buffer ); + memcpy( buffer, unicode_buffer.c_str(), + ( unicode_buffer.length() + 1 ) * sizeof(wxChar) ); + + return TRUE; + } +#endif +}; + +wxURLDataObject::wxURLDataObject() +{ + // we support CF_TEXT and CFSTR_SHELLURL formats which are basicly the same + // but it seems that some browsers only provide one of them so we have to + // support both + Add(new wxTextDataObject); + Add(new CFSTR_SHELLURLDataObject()); + + // we don't have any data yet + m_dataObjectLast = NULL; +} + +bool wxURLDataObject::SetData(const wxDataFormat& format, + size_t len, + const void *buf) +{ + m_dataObjectLast = GetObject(format); + + wxCHECK_MSG( m_dataObjectLast, FALSE, + wxT("unsupported format in wxURLDataObject")); + + return m_dataObjectLast->SetData(len, buf); +} + +wxString wxURLDataObject::GetURL() const +{ + wxString url; + wxCHECK_MSG( m_dataObjectLast, url, _T("no data in wxURLDataObject") ); + + size_t len = m_dataObjectLast->GetDataSize(); + + m_dataObjectLast->GetDataHere(url.GetWriteBuf(len)); + url.UngetWriteBuf(); + + return url; +} + +void wxURLDataObject::SetURL(const wxString& url) +{ + SetData(wxDataFormat(wxDF_TEXT), url.Length()+1, url.c_str()); + SetData(wxDataFormat(CFSTR_SHELLURL), url.Length()+1, url.c_str()); +} + // ---------------------------------------------------------------------------- // private functions // ---------------------------------------------------------------------------- @@ -1147,8 +1260,15 @@ wxBitmap wxConvertDIBToBitmap(const LPBITMAPINFO pbmi) // BITMAPINFO starts with BITMAPINFOHEADER followed by colour info const BITMAPINFOHEADER *pbmih = &pbmi->bmiHeader; + // biClrUsed has the number of colors, unless it's 0 + int numColors = pbmih->biClrUsed; + if (numColors==0) + { + numColors = wxGetNumOfBitmapColors(pbmih->biBitCount); + } + // offset of image from the beginning of the header - DWORD ofs = wxGetNumOfBitmapColors(pbmih->biBitCount) * sizeof(RGBQUAD); + DWORD ofs = numColors * sizeof(RGBQUAD); void *image = (char *)pbmih + sizeof(BITMAPINFOHEADER) + ofs; ScreenHDC hdc; @@ -1186,5 +1306,29 @@ static const wxChar *GetTymedName(DWORD tymed) #endif // Debug -#endif // not using OLE at all +#else // not using OLE at all +// ---------------------------------------------------------------------------- +// wxDataObject +// ---------------------------------------------------------------------------- + +wxDataObject::wxDataObject() +{ +} + +wxDataObject::~wxDataObject() +{ +} + +void wxDataObject::SetAutoDelete() +{ +} + +#ifdef __WXDEBUG__ +const wxChar *wxDataObject::GetFormatName(wxDataFormat format) +{ + return NULL; +} +#endif + +#endif