Henri Verbeet : winex11.drv: Fallback to X11DRV_SHM_NONE in X11DRV_DIB_DoCopyDIBSection() if dest doesn 't match the pixmap.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 85fe381daf09d42fa4c9275b381677fe2625e06f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=85fe381daf09d42fa4c9275b38...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Fri Aug  7 11:53:17 2009 +0200

winex11.drv: Fallback to X11DRV_SHM_NONE in X11DRV_DIB_DoCopyDIBSection() if dest doesn't match the pixmap.

Falling back to X11DRV_SHM_IMAGE doesn't work, the image's data isn't in
shared memory if the pixmap was created as Shm pixmap.

---

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

diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c
index effe1a4..09df53f 100644
--- a/dlls/winex11.drv/dib.c
+++ b/dlls/winex11.drv/dib.c
@@ -4300,7 +4300,7 @@ static void X11DRV_DIB_DoCopyDIBSection(X_PHYSBITMAP *physBitmap, BOOL toDIB,
 #ifdef HAVE_LIBXXSHM
   if (physBitmap->shm_mode == X11DRV_SHM_PIXMAP && physBitmap->pixmap != dest)
   {
-    descr.shm_mode = X11DRV_SHM_IMAGE;
+    descr.shm_mode = X11DRV_SHM_NONE;
   }
 #endif
   descr.dibpitch = dibSection.dsBm.bmWidthBytes;