reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-12-13 14:26:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

winex11: Correctly free CF_DIB format, and don't free unknown GDI formats.

Browse Source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2016-08-18 18:24:28 +09:00
parent 4fa616c37c
commit 228d855907
1 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
dlls/winex11.drv/clipboard.c
View File

@ -577,38 +577,30 @@ static void X11DRV_CLIPBOARD_FreeData(LPWINE_CLIPDATA lpData)
{
TRACE("%04x\n", lpData->wFormatID);
if ((lpData->wFormatID >= CF_GDIOBJFIRST &&
lpData->wFormatID <= CF_GDIOBJLAST) ||
lpData->wFormatID == CF_BITMAP ||
lpData->wFormatID == CF_DIB ||
lpData->wFormatID == CF_PALETTE)
{
if (lpData->hData)
DeleteObject(lpData->hData);
if (!lpData->hData) return;
if ((lpData->wFormatID == CF_DIB) && lpData->drvData)
XFreePixmap(gdi_display, lpData->drvData);
}
else if (lpData->wFormatID == CF_METAFILEPICT)
switch (lpData->wFormatID)
{
if (lpData->hData)
{
case CF_BITMAP:
case CF_PALETTE:
DeleteObject(lpData->hData);
break;
case CF_DIB:
if (lpData->drvData) XFreePixmap(gdi_display, lpData->drvData);
GlobalFree(lpData->hData);
break;
case CF_METAFILEPICT:
DeleteMetaFile(((METAFILEPICT *)GlobalLock( lpData->hData ))->hMF );
GlobalFree(lpData->hData);
}
}
else if (lpData->wFormatID == CF_ENHMETAFILE)
{
if (lpData->hData)
DeleteEnhMetaFile(lpData->hData);
}
else if (lpData->wFormatID < CF_PRIVATEFIRST ||
lpData->wFormatID > CF_PRIVATELAST)
{
if (lpData->hData)
break;
case CF_ENHMETAFILE:
DeleteEnhMetaFile(lpData->hData);
break;
default:
if (lpData->wFormatID >= CF_PRIVATEFIRST && lpData->wFormatID <= CF_PRIVATELAST) break;
GlobalFree(lpData->hData);
break;
}
lpData->hData = 0;
lpData->drvData = 0;
}