Skip to content

W
wine-cw
Commit 01d63a21 authored by Cyril Margorin's avatar Cyril Margorin Committed by Alexandre Julliard
Browse files
Options

x11drv: Fix X11DRV_DIB_SetImageBits and X11DRV_DIB_GetImageBits to

check for passed image, and do not use shared memory extension for temporary created image.
parent fc5e5eae
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
dlls/x11drv/dib.c
View file @ 01d63a21
...@@ -3626,7 +3626,7 @@ static int X11DRV_DIB_SetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr ) ...@@ -3626,7 +3626,7 @@ static int X11DRV_DIB_SetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr )
descr->xSrc, descr->ySrc, descr->xDest, descr->yDest, descr->xSrc, descr->ySrc, descr->xDest, descr->yDest,
descr->width, descr->height); descr->width, descr->height);
#ifdef HAVE_LIBXXSHM #ifdef HAVE_LIBXXSHM
if (descr->useShm) if (descr->image && descr->useShm)
{ {
XShmPutImage( gdi_display, descr->drawable, descr->gc, bmpImage, XShmPutImage( gdi_display, descr->drawable, descr->gc, bmpImage,
descr->xSrc, descr->ySrc, descr->xDest, descr->yDest, descr->xSrc, descr->ySrc, descr->xDest, descr->yDest,
...@@ -3670,7 +3670,7 @@ static int X11DRV_DIB_GetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr ) ...@@ -3670,7 +3670,7 @@ static int X11DRV_DIB_GetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr )
} }
#ifdef HAVE_LIBXXSHM #ifdef HAVE_LIBXXSHM
if (descr->useShm) if (descr->image && descr->useShm)
{ {
int saveRed, saveGreen, saveBlue; int saveRed, saveGreen, saveBlue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment