// ----------------------------------------------------------------------------
#ifdef __GNUG__
- #pragma implementation "dataobj.h"
+ #pragma implementation "dataobj.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if defined(__BORLANDC__)
- #pragma hdrstop
+ #pragma hdrstop
#endif
+
+#if defined(__WIN32__) && !defined(__GNUWIN32_OLD__)
+
#ifndef WX_PRECOMP
-#include "wx/intl.h"
+ #include "wx/intl.h"
+ #include "wx/log.h"
#endif
-#include "wx/defs.h"
-#if defined(__WIN32__) && !defined(__GNUWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
-
-#include "wx/log.h"
#include "wx/dataobj.h"
-#include <windows.h>
-#ifdef wxUSE_NORLANDER_HEADERS
+#include "wx/msw/private.h" // includes <windows.h>
+
+#if wxUSE_NORLANDER_HEADERS
#include <ole2.h>
#endif
#include <oleauto.h>
#include <olestd.h>
#endif
-#include "wx/msw/ole/oleutils.h"
+#include <shlobj.h>
+
+#include "wx/msw/ole/oleutils.h"
+
+#include "wx/msw/dib.h"
// ----------------------------------------------------------------------------
// functions
#define GetTymedName(tymed) ""
#endif // Debug/!Debug
-// to be moved into wx/msw/bitmap.h
-extern size_t wxConvertBitmapToDIB(BITMAPINFO *pbi, const wxBitmap& bitmap);
-extern wxBitmap wxConvertDIBToBitmap(const BITMAPINFO *bmi);
-
// ----------------------------------------------------------------------------
// wxIEnumFORMATETC interface implementation
// ----------------------------------------------------------------------------
{
public:
wxIEnumFORMATETC(const wxDataFormat* formats, ULONG nCount);
- ~wxIEnumFORMATETC() { delete [] m_formats; }
+ virtual ~wxIEnumFORMATETC() { delete [] m_formats; }
DECLARE_IUNKNOWN_METHODS;
{
public:
wxIDataObject(wxDataObject *pDataObject);
- ~wxIDataObject();
+ 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
bool m_mustDelete;
};
-// ----------------------------------------------------------------------------
-// small helper class for getting screen DC (we're working with bitmaps and
-// DIBs here)
-// ----------------------------------------------------------------------------
-
-class ScreenHDC
-{
-public:
- ScreenHDC() { m_hdc = GetDC(NULL); }
- ~ScreenHDC() { ReleaseDC(NULL, m_hdc); }
- operator HDC() const { return m_hdc; }
-
-private:
- HDC m_hdc;
-};
-
// ============================================================================
// implementation
// ============================================================================
void wxDataFormat::SetId(const wxChar *format)
{
- m_format = ::RegisterClipboardFormat(format);
+ m_format = (wxDataFormat::NativeFormat)::RegisterClipboardFormat(format);
if ( !m_format )
{
wxLogError(_("Couldn't register clipboard format '%s'."), format);
STDMETHODIMP wxIEnumFORMATETC::Next(ULONG celt,
FORMATETC *rgelt,
- ULONG *pceltFetched)
+ ULONG *WXUNUSED(pceltFetched))
{
wxLogTrace(wxTRACE_OleCalls, wxT("wxIEnumFORMATETC::Next"));
pmedium->tymed = TYMED_GDI;
break;
+ case wxDF_ENHMETAFILE:
+ pmedium->tymed = TYMED_ENHMF;
+ break;
+
case wxDF_METAFILE:
+ pmedium->hGlobal = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE,
+ sizeof(METAFILEPICT));
+ if ( !pmedium->hGlobal ) {
+ wxLogLastError(wxT("GlobalAlloc"));
+ return E_OUTOFMEMORY;
+ }
pmedium->tymed = TYMED_MFPICT;
break;
HGLOBAL hGlobal = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, size);
if ( hGlobal == NULL ) {
- wxLogLastError("GlobalAlloc");
+ wxLogLastError(wxT("GlobalAlloc"));
return E_OUTOFMEMORY;
}
hr = GetDataHere(pformatetcIn, pmedium);
if ( FAILED(hr) ) {
// free resources we allocated
- if ( pmedium->tymed == TYMED_HGLOBAL ) {
+ if ( pmedium->tymed & (TYMED_HGLOBAL | TYMED_MFPICT) ) {
GlobalFree(pmedium->hGlobal);
}
return E_UNEXPECTED;
break;
- case TYMED_MFPICT:
- // this should be copied on bitmaps - but I don't have time for
- // this now
- wxFAIL_MSG(wxT("TODO - no support for metafiles in wxDataObject"));
+ case TYMED_ENHMF:
+ if ( !m_pDataObject->GetDataHere(wxDF_ENHMETAFILE,
+ &pmedium->hEnhMetaFile) )
+ return E_UNEXPECTED;
break;
+ case TYMED_MFPICT:
+ // fall through - we pass METAFILEPICT through HGLOBAL
+
case TYMED_HGLOBAL:
{
// copy data
m_pDataObject->SetData(wxDF_BITMAP, 0, &pmedium->hBitmap);
break;
- case TYMED_MFPICT:
- // this should be copied on bitmaps - but I don't have time for
- // this now
- wxFAIL_MSG(wxT("TODO - no support for metafiles in wxDataObject"));
+ case TYMED_ENHMF:
+ m_pDataObject->SetData(wxDF_ENHMETAFILE, 0, &pmedium->hEnhMetaFile);
break;
+ case TYMED_MFPICT:
+ // fall through - we pass METAFILEPICT through HGLOBAL
case TYMED_HGLOBAL:
{
+ wxDataFormat format = pformatetc->cfFormat;
+
+ // this is quite weird, but for file drag and drop, explorer
+ // calls our SetData() with the formats we do *not* support!
+ //
+ // as we can't fix this bug in explorer (it's a bug because it
+ // should only use formats returned by EnumFormatEtc), do the
+ // check here
+ if ( !m_pDataObject->IsSupportedFormat(format) ) {
+ // go away!
+ return DV_E_FORMATETC;
+ }
+
// copy data
void *pBuf = GlobalLock(pmedium->hGlobal);
if ( pBuf == NULL ) {
- wxLogLastError("GlobalLock");
+ wxLogLastError(wxT("GlobalLock"));
return E_OUTOFMEMORY;
}
// synthetise it for known formats and we suppose that all data
// in custom formats starts with a DWORD containing the size
size_t size;
- switch ( pformatetc->cfFormat )
+ switch ( format )
{
case CF_TEXT:
case CF_OEMTEXT:
size = strlen((const char *)pBuf);
break;
-
+#if !defined(__WATCOMC__) && ! (defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
case CF_UNICODETEXT:
- size = wcslen((const wchar_t *)pBuf);
+#if (defined(__BORLANDC__) && (__BORLANDC__ > 0x530))
+ size = std::wcslen((const wchar_t *)pBuf);
+#else
+ size = ::wcslen((const wchar_t *)pBuf);
+#endif
break;
-
+#endif
case CF_BITMAP:
case CF_HDROP:
// these formats don't use size at all, anyhow (but
size = 0;
break;
+ case CF_DIB:
+ // the handler will calculate size itself (it's too
+ // complicated to do it here)
+ size = 0;
+ break;
+
+ case CF_METAFILEPICT:
+ size = sizeof(METAFILEPICT);
+ break;
+
default:
{
// we suppose that the size precedes the data
size_t *p = (size_t *)pBuf;
size = *p++;
pBuf = p;
+ if (! format.IsStandard() ) {
+ // see GetData for coresponding increment
+ size -= sizeof(size_t);
+ }
}
}
- wxDataFormat format = pformatetc->cfFormat;
bool ok = m_pDataObject->SetData(format, size, pBuf);
GlobalUnlock(pmedium->hGlobal);
}
if ( fRelease ) {
- // we own the medium, so we must release it - but do *not* free the
- // bitmap handle fi we have it because we have copied it elsewhere
- if ( pmedium->tymed == TYMED_GDI )
+ // we own the medium, so we must release it - but do *not* free any
+ // data we pass by handle because we have copied it elsewhere
+ switch ( pmedium->tymed )
{
- pmedium->hBitmap = 0;
+ case TYMED_GDI:
+ pmedium->hBitmap = 0;
+ break;
+
+ case TYMED_MFPICT:
+ pmedium->hMetaFilePict = 0;
+ break;
+
+ case TYMED_ENHMF:
+ pmedium->hEnhMetaFile = 0;
+ break;
}
ReleaseStgMedium(pmedium);
return S_OK;
}
-STDMETHODIMP wxIDataObject::GetCanonicalFormatEtc(FORMATETC *pFormatetcIn,
+STDMETHODIMP wxIDataObject::GetCanonicalFormatEtc(FORMATETC *WXUNUSED(pFormatetcIn),
FORMATETC *pFormatetcOut)
{
wxLogTrace(wxTRACE_OleCalls, wxT("wxIDataObject::GetCanonicalFormatEtc"));
: wxDataObject::Set;
size_t nFormatCount = m_pDataObject->GetFormatCount(dir);
- wxDataFormat format, *formats;
+ wxDataFormat format;
+ wxDataFormat *formats;
formats = nFormatCount == 1 ? &format : new wxDataFormat[nFormatCount];
m_pDataObject->GetAllFormats(formats, dir);
// advise sink functions (not implemented)
// ----------------------------------------------------------------------------
-STDMETHODIMP wxIDataObject::DAdvise(FORMATETC *pformatetc,
- DWORD advf,
- IAdviseSink *pAdvSink,
- DWORD *pdwConnection)
+STDMETHODIMP wxIDataObject::DAdvise(FORMATETC *WXUNUSED(pformatetc),
+ DWORD WXUNUSED(advf),
+ IAdviseSink *WXUNUSED(pAdvSink),
+ DWORD *WXUNUSED(pdwConnection))
{
return OLE_E_ADVISENOTSUPPORTED;
}
-STDMETHODIMP wxIDataObject::DUnadvise(DWORD dwConnection)
+STDMETHODIMP wxIDataObject::DUnadvise(DWORD WXUNUSED(dwConnection))
{
return OLE_E_ADVISENOTSUPPORTED;
}
-STDMETHODIMP wxIDataObject::EnumDAdvise(IEnumSTATDATA **ppenumAdvise)
+STDMETHODIMP wxIDataObject::EnumDAdvise(IEnumSTATDATA **WXUNUSED(ppenumAdvise))
{
return OLE_E_ADVISENOTSUPPORTED;
}
m_pIDataObject = NULL;
}
-bool wxDataObject::IsSupportedFormat(const wxDataFormat& format) const
-{
- size_t nFormatCount = GetFormatCount();
- if ( nFormatCount == 1 ) {
- return format == GetPreferredFormat();
- }
- else {
- wxDataFormat *formats = new wxDataFormat[nFormatCount];
- GetAllFormats(formats);
+#ifdef __WXDEBUG__
- size_t n;
- for ( n = 0; n < nFormatCount; n++ ) {
- if ( formats[n] == format )
- break;
- }
+const wxChar *wxDataObject::GetFormatName(wxDataFormat format)
+{
+ // case 'xxx' is not a valid value for switch of enum 'wxDataFormat'
+ #ifdef __VISUALC__
+ #pragma warning(disable:4063)
+ #endif // VC++
+
+ static wxChar s_szBuf[256];
+ switch ( format ) {
+ case CF_TEXT: return wxT("CF_TEXT");
+ case CF_BITMAP: return wxT("CF_BITMAP");
+ case CF_METAFILEPICT: return wxT("CF_METAFILEPICT");
+ case CF_SYLK: return wxT("CF_SYLK");
+ case CF_DIF: return wxT("CF_DIF");
+ case CF_TIFF: return wxT("CF_TIFF");
+ case CF_OEMTEXT: return wxT("CF_OEMTEXT");
+ case CF_DIB: return wxT("CF_DIB");
+ case CF_PALETTE: return wxT("CF_PALETTE");
+ case CF_PENDATA: return wxT("CF_PENDATA");
+ case CF_RIFF: return wxT("CF_RIFF");
+ case CF_WAVE: return wxT("CF_WAVE");
+ case CF_UNICODETEXT: return wxT("CF_UNICODETEXT");
+ case CF_ENHMETAFILE: return wxT("CF_ENHMETAFILE");
+ case CF_HDROP: return wxT("CF_HDROP");
+ case CF_LOCALE: return wxT("CF_LOCALE");
- delete [] formats;
+ default:
+ if ( !::GetClipboardFormatName(format, s_szBuf, WXSIZEOF(s_szBuf)) )
+ {
+ // it must be a new predefined format we don't know the name of
+ wxSprintf(s_szBuf, wxT("unknown CF (0x%04x)"), format.GetFormatId());
+ }
- // found?
- return n < nFormatCount;
+ return s_szBuf;
}
-}
-
-#ifdef __WXDEBUG__
-const char *wxDataObject::GetFormatName(wxDataFormat format)
-{
- // case 'xxx' is not a valid value for switch of enum 'wxDataFormat'
- #ifdef __VISUALC__
- #pragma warning(disable:4063)
- #endif // VC++
-
- static char s_szBuf[128];
- switch ( format ) {
- case CF_TEXT: return "CF_TEXT";
- case CF_BITMAP: return "CF_BITMAP";
- case CF_METAFILEPICT: return "CF_METAFILEPICT";
- case CF_SYLK: return "CF_SYLK";
- case CF_DIF: return "CF_DIF";
- case CF_TIFF: return "CF_TIFF";
- case CF_OEMTEXT: return "CF_OEMTEXT";
- case CF_DIB: return "CF_DIB";
- case CF_PALETTE: return "CF_PALETTE";
- case CF_PENDATA: return "CF_PENDATA";
- case CF_RIFF: return "CF_RIFF";
- case CF_WAVE: return "CF_WAVE";
- case CF_UNICODETEXT: return "CF_UNICODETEXT";
- case CF_ENHMETAFILE: return "CF_ENHMETAFILE";
- case CF_HDROP: return "CF_HDROP";
- case CF_LOCALE: return "CF_LOCALE";
- default:
- sprintf(s_szBuf, "clipboard format 0x%x (unknown)", format);
- return s_szBuf;
- }
-
- #ifdef __VISUALC__
- #pragma warning(default:4063)
- #endif // VC++
+ #ifdef __VISUALC__
+ #pragma warning(default:4063)
+ #endif // VC++
}
#endif // Debug
bool wxBitmapDataObject::GetDataHere(void *buf) const
{
- return wxConvertBitmapToDIB((BITMAPINFO *)buf, GetBitmap()) != 0;
+ return wxConvertBitmapToDIB((LPBITMAPINFO)buf, GetBitmap()) != 0;
}
-bool wxBitmapDataObject::SetData(size_t len, const void *buf)
+bool wxBitmapDataObject::SetData(size_t WXUNUSED(len), const void *buf)
{
- wxBitmap bitmap(wxConvertDIBToBitmap((const BITMAPINFO *)buf));
+ wxBitmap bitmap(wxConvertDIBToBitmap((const LPBITMAPINFO)buf));
if ( !bitmap.Ok() ) {
wxFAIL_MSG(wxT("pasting/dropping invalid bitmap"));
return TRUE;
}
-bool wxBitmapDataObject2::SetData(size_t len, const void *pBuf)
+bool wxBitmapDataObject2::SetData(size_t WXUNUSED(len), const void *pBuf)
{
HBITMAP hbmp = *(HBITMAP *)pBuf;
BITMAP bmp;
if ( !GetObject(hbmp, sizeof(BITMAP), &bmp) )
{
- wxLogLastError("GetObject(HBITMAP)");
+ wxLogLastError(wxT("GetObject(HBITMAP)"));
}
wxBitmap bitmap(bmp.bmWidth, bmp.bmHeight, bmp.bmPlanes);
if ( !GetDIBits(hdc, (HBITMAP)m_bitmap.GetHBITMAP(), 0, 0,
NULL, &bi, DIB_RGB_COLORS) )
{
- wxLogLastError("GetDIBits(NULL)");
+ wxLogLastError(wxT("GetDIBits(NULL)"));
return 0;
}
BITMAPINFO *pbi = (BITMAPINFO *)pBuf;
if ( !GetDIBits(hdc, hbmp, 0, 0, NULL, pbi, DIB_RGB_COLORS) )
{
- wxLogLastError("GetDIBits(NULL)");
+ wxLogLastError(wxT("GetDIBits(NULL)"));
return 0;
}
if ( !GetDIBits(hdc, hbmp, 0, pbi->bmiHeader.biHeight, pbi + 1,
pbi, DIB_RGB_COLORS) )
{
- wxLogLastError("GetDIBits");
+ wxLogLastError(wxT("GetDIBits"));
return FALSE;
}
pbmi + 1, pbmi, DIB_RGB_COLORS);
if ( !hbmp )
{
- wxLogLastError("CreateDIBitmap");
+ wxLogLastError(wxT("CreateDIBitmap"));
}
m_bitmap.SetWidth(pbmih->biWidth);
BITMAP bmp;
if ( !GetObject(hbmp, sizeof(BITMAP), &bmp) )
{
- wxLogLastError("GetObject(HBITMAP)");
+ wxLogLastError(wxT("GetObject(HBITMAP)"));
}
m_bitmap.SetWidth(bmp.bmWidth);
// get number of files (magic value -1)
UINT nFiles = ::DragQueryFile(hdrop, (unsigned)-1, NULL, 0u);
+ wxCHECK_MSG ( nFiles != (UINT)-1, FALSE, wxT("wrong HDROP handle") );
+
// for each file get the length, allocate memory and then get the name
wxString str;
UINT len, n;
m_filenames.Add(str);
if ( len2 != len - 1 ) {
- wxLogDebug(wxT("In wxFileDropTarget::OnDrop DragQueryFile returned"
- " %d characters, %d expected."), len2, len - 1);
+ wxLogDebug(wxT("In wxFileDropTarget::OnDrop DragQueryFile returned\
+ %d characters, %d expected."), len2, len - 1);
}
}
return TRUE;
}
+void wxFileDataObject::AddFile(const wxString& file)
+{
+ // just add file to filenames array
+ // all useful data (such as DROPFILES struct) will be
+ // created later as necessary
+ m_filenames.Add(file);
+}
+
+size_t wxFileDataObject::GetDataSize() const
+{
+ // size returned will be the size of the DROPFILES structure,
+ // plus the list of filesnames (null byte separated), plus
+ // a double null at the end
+
+ // if no filenames in list, size is 0
+ if ( m_filenames.GetCount() == 0 )
+ return 0;
+
+ // inital size of DROPFILES struct + null byte
+ size_t sz = sizeof(DROPFILES) + 1;
+
+ 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;
+ }
+
+ return sz;
+}
+
+bool wxFileDataObject::GetDataHere(void *pData) const
+{
+ // pData points to an externally allocated memory block
+ // created using the size returned by GetDataSize()
+
+ // if pData is NULL, or there are no files, return
+ if ( !pData || m_filenames.GetCount() == 0 )
+ return FALSE;
+
+ // convert data pointer to a DROPFILES struct pointer
+ LPDROPFILES pDrop = (LPDROPFILES) pData;
+
+ // initialize DROPFILES struct
+ pDrop->pFiles = sizeof(DROPFILES);
+ pDrop->fNC = FALSE; // not non-client coords
+#if wxUSE_UNICODE
+ pDrop->fWide = TRUE;
+#else // ANSI
+ pDrop->fWide = FALSE;
+#endif // Unicode/Ansi
+
+ // set start of filenames list (null separated)
+ wxChar *pbuf = (wxChar*) ((BYTE *)pDrop + sizeof(DROPFILES));
+
+ size_t count = m_filenames.GetCount();
+ for (size_t i = 0; i < count; i++ )
+ {
+ // copy filename to pbuf and add null terminator
+ size_t len = m_filenames[i].Len();
+ memcpy(pbuf, m_filenames[i], len);
+ pbuf += len;
+ *pbuf++ = wxT('\0');
+ }
+
+ *pbuf = wxT('\0'); // add final null terminator
+
+ return TRUE;
+}
+
// ----------------------------------------------------------------------------
// private functions
// ----------------------------------------------------------------------------
-// otherwise VC++ would give here:
-// "local variable 'bi' may be used without having been initialized"
-// even though in fact it may not
-#ifdef __VISUALC__
- #pragma warning(disable:4701)
-#endif // __VISUALC__
+static size_t wxGetNumOfBitmapColors(size_t bitsPerPixel)
+{
+ switch ( bitsPerPixel )
+ {
+ case 1:
+ // monochrome bitmap, 2 entries
+ return 2;
+
+ case 4:
+ return 16;
+
+ case 8:
+ return 256;
+
+ case 24:
+ // may be used with 24bit bitmaps, but we don't use it here - fall
+ // through
+
+ case 16:
+ case 32:
+ // bmiColors not used at all with these bitmaps
+ return 0;
+
+ default:
+ wxFAIL_MSG( wxT("unknown bitmap format") );
+ return 0;
+ }
+}
-size_t wxConvertBitmapToDIB(BITMAPINFO *pbi, const wxBitmap& bitmap)
+size_t wxConvertBitmapToDIB(LPBITMAPINFO pbi, const wxBitmap& bitmap)
{
+ wxASSERT_MSG( bitmap.Ok(), wxT("invalid bmp can't be converted to DIB") );
+
// shouldn't be selected into a DC or GetDIBits() would fail
wxASSERT_MSG( !bitmap.GetSelectedInto(),
wxT("can't copy bitmap selected into wxMemoryDC") );
+ // prepare all the info we need
+ BITMAP bm;
HBITMAP hbmp = (HBITMAP)bitmap.GetHBITMAP();
+ if ( !GetObject(hbmp, sizeof(bm), &bm) )
+ {
+ wxLogLastError(wxT("GetObject(bitmap)"));
+
+ return 0;
+ }
+
+ // calculate the number of bits per pixel and the number of items in
+ // bmiColors array (whose meaning depends on the bitmap format)
+ WORD biBits = bm.bmPlanes * bm.bmBitsPixel;
+ WORD biColors = (WORD)wxGetNumOfBitmapColors(biBits);
- BITMAPINFO bi;
+ BITMAPINFO bi2;
- // first get the info
+ bool wantSizeOnly = pbi == NULL;
+ if ( wantSizeOnly )
+ pbi = &bi2;
+
+ // just for convenience
+ BITMAPINFOHEADER& bi = pbi->bmiHeader;
+
+ bi.biSize = sizeof(BITMAPINFOHEADER);
+ bi.biWidth = bm.bmWidth;
+ bi.biHeight = bm.bmHeight;
+ bi.biPlanes = 1;
+ bi.biBitCount = biBits;
+ bi.biCompression = BI_RGB;
+ bi.biSizeImage = 0;
+ bi.biXPelsPerMeter = 0;
+ bi.biYPelsPerMeter = 0;
+ bi.biClrUsed = 0;
+ bi.biClrImportant = 0;
+
+ // memory we need for BITMAPINFO only
+ DWORD dwLen = bi.biSize + biColors * sizeof(RGBQUAD);
+
+ // first get the image size
ScreenHDC hdc;
- if ( !GetDIBits(hdc, hbmp, 0, 0, NULL, pbi ? pbi : &bi, DIB_RGB_COLORS) )
+ if ( !GetDIBits(hdc, hbmp, 0, bi.biHeight, NULL, pbi, DIB_RGB_COLORS) )
{
- wxLogLastError("GetDIBits(NULL)");
+ wxLogLastError(wxT("GetDIBits(NULL)"));
return 0;
}
- if ( !pbi )
+ if ( wantSizeOnly )
{
- // we were only asked for size needed for the buffer, not to actually
- // copy the data
- return sizeof(BITMAPINFO) + bi.bmiHeader.biSizeImage;
+ // size of the header + size of the image
+ return dwLen + bi.biSizeImage;
}
// and now copy the bits
- if ( !GetDIBits(hdc, hbmp, 0, pbi->bmiHeader.biHeight, pbi + 1,
- pbi, DIB_RGB_COLORS) )
+ void *image = (char *)pbi + dwLen;
+ if ( !GetDIBits(hdc, hbmp, 0, bi.biHeight, image, pbi, DIB_RGB_COLORS) )
{
- wxLogLastError("GetDIBits");
+ wxLogLastError(wxT("GetDIBits"));
return 0;
}
- return sizeof(BITMAPINFO) + pbi->bmiHeader.biSizeImage;
+ return dwLen + bi.biSizeImage;
}
-#ifdef __VISUALC__
- #pragma warning(default:4701)
-#endif // __VISUALC__
-
-wxBitmap wxConvertDIBToBitmap(const BITMAPINFO *pbmi)
+wxBitmap wxConvertDIBToBitmap(const LPBITMAPINFO pbmi)
{
// here we get BITMAPINFO struct followed by the actual bitmap bits and
// BITMAPINFO starts with BITMAPINFOHEADER followed by colour info
const BITMAPINFOHEADER *pbmih = &pbmi->bmiHeader;
+ // offset of image from the beginning of the header
+ DWORD ofs = wxGetNumOfBitmapColors(pbmih->biBitCount) * sizeof(RGBQUAD);
+ void *image = (char *)pbmih + sizeof(BITMAPINFOHEADER) + ofs;
+
ScreenHDC hdc;
HBITMAP hbmp = CreateDIBitmap(hdc, pbmih, CBM_INIT,
- pbmi + 1, pbmi, DIB_RGB_COLORS);
+ image, pbmi, DIB_RGB_COLORS);
if ( !hbmp )
{
- wxLogLastError("CreateDIBitmap");
+ wxLogLastError(wxT("CreateDIBitmap"));
}
wxBitmap bitmap(pbmih->biWidth, pbmih->biHeight, pbmih->biBitCount);
case TYMED_MFPICT: return wxT("TYMED_MFPICT");
case TYMED_ENHMF: return wxT("TYMED_ENHMF");
default:
- wxSprintf(s_szBuf, wxT("type of media format %d (unknown)"), tymed);
+ wxSprintf(s_szBuf, wxT("type of media format %ld (unknown)"), tymed);
return s_szBuf;
}
}
projects / wxWidgets.git / blobdiff