Alexandre Julliard : winex11: Disable the XRender StretchBlt implementation if XRender wasn't loaded.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Fri Sep 16 11:36:59 2011 +0200

winex11: Disable the XRender StretchBlt implementation if XRender wasn't loaded.

---

dlls/winex11.drv/xrender.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c
index 77b0aeb..ce3bc03 100644
--- a/dlls/winex11.drv/xrender.c
+++ b/dlls/winex11.drv/xrender.c
@@ -2435,13 +2435,14 @@ static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst,
         return dst_dev->funcs->pStretchBlt( dst_dev, dst, src_dev, src, rop );
     }

+    if (!X11DRV_XRender_Installed) goto x11drv_fallback;
+
     /* XRender is of no use for color -> mono */
     if (physdev_dst->format == WXR_FORMAT_MONO && physdev_src->format != WXR_FORMAT_MONO)
-        return X11DRV_StretchBlt( &physdev_dst->x11dev->dev, dst, &physdev_src->x11dev->dev, src, rop );
+        goto x11drv_fallback;

/* if not stretching, we only need to handle format conversion */
-    if (!stretch && physdev_dst->format == physdev_src->format)
-        return X11DRV_StretchBlt( &physdev_dst->x11dev->dev, dst, &physdev_src->x11dev->dev, src, rop );
+    if (!stretch && physdev_dst->format == physdev_src->format) goto x11drv_fallback;

sSrc = sDst = X11DRV_LockDIBSection( physdev_dst->x11dev, DIB_Status_None );
     if (physdev_dst != physdev_src) sSrc = X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_None );
@@ -2484,6 +2485,9 @@ static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst,
     if (physdev_dst != physdev_src) X11DRV_UnlockDIBSection( physdev_src->x11dev, FALSE );
     X11DRV_UnlockDIBSection( physdev_dst->x11dev, TRUE );
     return TRUE;
+
+x11drv_fallback:
+    return X11DRV_StretchBlt( &physdev_dst->x11dev->dev, dst, &physdev_src->x11dev->dev, src, rop );
 }