Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix adding bitmap to clipboard when wxUSE_OLE == 0 (wxMSW)

Browse Source 
When CF_DIB object is placed to the clipboard, a handle to the memory
object containing a BITMAPINFO structure followed by the bitmap bits should
be passed to SetClipboardData(), not a handle to a DIB section.
Also, wxClipboard is the owner of the wxDataObject being added, so it
should release passed object.
This commit is contained in:
Artur Wieczorek
2017-04-30 21:39:50 +02:00
parent b1fad4da44
commit 15e2dcc38d
2 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/msw/clipbrd.cpp
View File

@@ -219,9 +219,51 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
if ( bitmap && bitmap->IsOk() )
{
wxDIB dib(*bitmap);
if ( dib.IsOk() )
{
handle = ::SetClipboardData(CF_DIB, dib.Detach());
DIBSECTION ds;
int n = ::GetObject(dib.GetHandle(), sizeof(DIBSECTION), &ds);
wxASSERT( n == sizeof(DIBSECTION) && ds.dsBm.bmBits );
// Number of colours in the palette.
int numColors;
switch ( ds.dsBmih.biCompression )
{
case BI_BITFIELDS:
numColors = 3;
break;
case BI_RGB:
numColors = ds.dsBmih.biClrUsed;
if ( !numColors )
{
numColors = ds.dsBmih.biBitCount <= 8 ? 1 << ds.dsBmih.biBitCount : 0;
}
break;
default:
numColors = 0;
}
unsigned long bmpSize = wxDIB::GetLineSize(ds.dsBmih.biWidth, ds.dsBmih.biBitCount) *
abs(ds.dsBmih.biHeight);
HANDLE hMem;
hMem = ::GlobalAlloc(GHND, ds.dsBmih.biSize + numColors*sizeof(RGBQUAD) + bmpSize);
if ( hMem )
{
char* pDst = (char*)::GlobalLock(hMem);
memcpy(pDst, &ds.dsBmih, ds.dsBmih.biSize);
pDst += ds.dsBmih.biSize;
if ( numColors > 0 )
{
// Get colour table.
MemoryHDC hDC;
SelectInHDC sDC(hDC, dib.GetHandle());
::GetDIBColorTable(hDC, 0, numColors, (RGBQUAD*)pDst);
pDst += numColors*sizeof(RGBQUAD);
}
memcpy(pDst, dib.GetData(), bmpSize);
::GlobalUnlock(hMem);
handle = ::SetClipboardData(CF_DIB, hMem);
}
}
}
break;
@@ -684,6 +726,7 @@ bool wxClipboard::AddData( wxDataObject *data )
#elif wxUSE_DATAOBJ
wxCHECK_MSG( wxIsClipboardOpened(), false, wxT("clipboard not open") );
bool bRet = false;
switch ( format )
{
case wxDF_TEXT:
@@ -691,16 +734,18 @@ bool wxClipboard::AddData( wxDataObject *data )
{
wxTextDataObject* textDataObject = (wxTextDataObject*) data;
wxString str(textDataObject->GetText());
return wxSetClipboardData(format, str.c_str());
bRet = wxSetClipboardData(format, str.c_str());
}
break;
case wxDF_BITMAP:
case wxDF_DIB:
{
wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data;
wxBitmap bitmap(bitmapDataObject->GetBitmap());
return wxSetClipboardData(format, &bitmap);
bRet = wxSetClipboardData(format, &bitmap);
}
break;
#if wxUSE_METAFILE
case wxDF_METAFILE:
@@ -708,16 +753,16 @@ bool wxClipboard::AddData( wxDataObject *data )
#if 1
// TODO
wxLogError(wxT("Not implemented because wxMetafileDataObject does not contain width and height values."));
return false;
#else
wxMetafileDataObject* metaFileDataObject =
(wxMetafileDataObject*) data;
wxMetafile metaFile = metaFileDataObject->GetMetafile();
return wxSetClipboardData(wxDF_METAFILE, &metaFile,
bRet = wxSetClipboardData(wxDF_METAFILE, &metaFile,
metaFileDataObject->GetWidth(),
metaFileDataObject->GetHeight());
#endif
}
break;
#endif // wxUSE_METAFILE
default:
@@ -726,9 +771,11 @@ bool wxClipboard::AddData( wxDataObject *data )
// return wxSetClipboardData(data);
// TODO
wxLogError(wxT("Not implemented."));
return false;
}
}
// Delete owned, no longer necessary data.
delete data;
return bRet;
#else // !wxUSE_DATAOBJ
return false;
#endif // wxUSE_DATAOBJ/!wxUSE_DATAOBJ