marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11: Make sure the bitmap created from a packed DIB is owned by x11drv before getting its pixmap.

oldstable
Alexandre Julliard 2011-09-07 22:55:12 +02:00
parent d7ed2457b0
commit da0327917c
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/winex11.drv/dib.c
View File

@ -4323,10 +4323,11 @@ HGLOBAL X11DRV_DIB_CreateDIBFromPixmap(Pixmap pixmap, HDC hdc)
*/ */
Pixmap X11DRV_DIB_CreatePixmapFromDIB( HGLOBAL hPackedDIB, HDC hdc ) Pixmap X11DRV_DIB_CreatePixmapFromDIB( HGLOBAL hPackedDIB, HDC hdc )
{ {
Pixmap pixmap; Pixmap pixmap = 0;
X_PHYSBITMAP *physBitmap; X_PHYSBITMAP *physBitmap;
HBITMAP hBmp; HBITMAP hBmp;
LPBITMAPINFO pbmi; LPBITMAPINFO pbmi;
HDC memdc;
/* Create a DDB from the DIB */ /* Create a DDB from the DIB */
@ -4336,10 +4337,17 @@ Pixmap X11DRV_DIB_CreatePixmapFromDIB( HGLOBAL hPackedDIB, HDC hdc )
pbmi, DIB_RGB_COLORS); pbmi, DIB_RGB_COLORS);
GlobalUnlock(hPackedDIB); GlobalUnlock(hPackedDIB);
/* make sure it's owned by x11drv */
memdc = CreateCompatibleDC( hdc );
SelectObject( memdc, hBmp );
DeleteDC( memdc );
/* clear the physBitmap so that we can steal its pixmap */ /* clear the physBitmap so that we can steal its pixmap */
physBitmap = X11DRV_get_phys_bitmap( hBmp ); if ((physBitmap = X11DRV_get_phys_bitmap( hBmp )))
pixmap = physBitmap->pixmap; {
physBitmap->pixmap = 0; pixmap = physBitmap->pixmap;
physBitmap->pixmap = 0;
}
/* Delete the DDB we created earlier now that we have stolen its pixmap */ /* Delete the DDB we created earlier now that we have stolen its pixmap */
DeleteObject(hBmp); DeleteObject(hBmp);