Cyril Margorin : x11drv: Fix X11DRV_DIB_SetImageBits and X11DRV_DIB_GetImageBits to

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 01d63a217a30846b7c9cf2766652e138c2333c07
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=01d63a217a30846b7c9cf276...

Author: Cyril Margorin 
Date:   Mon Feb 13 13:25:01 2006 +0100

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.

---

dlls/x11drv/dib.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/x11drv/dib.c b/dlls/x11drv/dib.c
index ed49e5f..f9321e6 100644
--- a/dlls/x11drv/dib.c
+++ b/dlls/x11drv/dib.c
@@ -3626,7 +3626,7 @@ static int X11DRV_DIB_SetImageBits( cons
      descr->xSrc, descr->ySrc, descr->xDest, descr->yDest,
      descr->width, descr->height);
 #ifdef HAVE_LIBXXSHM
-    if (descr->useShm)
+    if (descr->image && descr->useShm)
     {
         XShmPutImage( gdi_display, descr->drawable, descr->gc, bmpImage,
                       descr->xSrc, descr->ySrc, descr->xDest, descr->yDest,
@@ -3670,7 +3670,7 @@ static int X11DRV_DIB_GetImageBits( cons
     }

#ifdef HAVE_LIBXXSHM
-    if (descr->useShm)
+    if (descr->image && descr->useShm)
     {
         int saveRed, saveGreen, saveBlue;