Alexandre Julliard : winex11: Remove the remainining DIB section locking calls.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Mon Jan  9 14:37:50 2012 +0100

winex11: Remove the remainining DIB section locking calls.

---

dlls/winex11.drv/bitblt.c  |    3 ---
 dlls/winex11.drv/brush.c   |    4 ----
 dlls/winex11.drv/xrender.c |    6 ------
 3 files changed, 0 insertions(+), 13 deletions(-)

diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c
index 8d20277..a54ca49 100644
--- a/dlls/winex11.drv/bitblt.c
+++ b/dlls/winex11.drv/bitblt.c
@@ -1241,9 +1241,6 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info
         int height = dst->visrect.bottom - dst->visrect.top;

image->data = dst_bits.ptr;
-        /* hack: make sure the bits are readable if we are reading from a DIB section */
-        /* to be removed once we get rid of DIB access protections */
-        if (!dst_bits.is_copy) IsBadReadPtr( dst_bits.ptr, height * image->bytes_per_line );

if (bitmap)
         {
diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c
index 8de8c01..afc1e0b 100644
--- a/dlls/winex11.drv/brush.c
+++ b/dlls/winex11.drv/brush.c
@@ -215,8 +215,6 @@ static void BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap,

GetObjectW( hbitmap, sizeof(bitmap), &bitmap );

-    X11DRV_DIB_Lock( physBitmap, DIB_Status_GdiMod );
-
     wine_tsx11_lock();

if (physDev->brush.pixmap) XFreePixmap( gdi_display, physDev->brush.pixmap );
@@ -239,8 +237,6 @@ static void BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap,
     }
     wine_tsx11_unlock();

-    X11DRV_DIB_Unlock( physBitmap, TRUE );
-
     if (physBitmap->depth > 1)
     {
    physDev->brush.fillStyle = FillTiled;
diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c
index cbe9185..dc3d55b 100644
--- a/dlls/winex11.drv/xrender.c
+++ b/dlls/winex11.drv/xrender.c
@@ -1997,9 +1997,6 @@ static DWORD create_image_pixmap( BITMAPINFO *info, const struct gdi_image_bits
     if (ret) return ret;

image->data = dst_bits.ptr;
-    /* hack: make sure the bits are readable if we are reading from a DIB section */
-    /* to be removed once we get rid of DIB access protections */
-    if (!dst_bits.is_copy) IsBadReadPtr( dst_bits.ptr, image->height * image->bytes_per_line );

*use_repeat = (width == 1 && height == 1);
     pa.repeat = *use_repeat ? RepeatNormal : RepeatNone;
@@ -2641,8 +2638,6 @@ static HBRUSH xrenderdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct b

GetObjectW( bitmap, sizeof(bm), &bm );

-    X11DRV_DIB_Lock( physbitmap, DIB_Status_GdiMod );
-
     wine_tsx11_lock();
     pixmap = XCreatePixmap( gdi_display, root_window, bm.bmWidth, bm.bmHeight,
                             physdev->pict_format->depth );
@@ -2662,7 +2657,6 @@ static HBRUSH xrenderdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct b
     physdev->x11dev->brush.style = BS_PATTERN;
     wine_tsx11_unlock();

-    X11DRV_DIB_Unlock( physbitmap, TRUE );
     if (delete_bitmap) DeleteObject( bitmap );
     return hbrush;