Alexandre Julliard : gdi32: Keep the source DC locked until the end in StretchBlt and AlphaBlend.
Alexandre Julliard
julliard at winehq.org
Thu May 31 13:30:41 CDT 2012
Module: wine
Branch: master
Commit: 6d23f3e7e17b5f88c66a46b65cd31e55ee881b75
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d23f3e7e17b5f88c66a46b65cd31e55ee881b75
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed May 30 22:55:30 2012 +0200
gdi32: Keep the source DC locked until the end in StretchBlt and AlphaBlend.
---
dlls/gdi32/bitblt.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c
index 8763218..238e375 100644
--- a/dlls/gdi32/bitblt.c
+++ b/dlls/gdi32/bitblt.c
@@ -256,9 +256,11 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst,
if (!(dc_src = get_dc_ptr( src_dev->hdc ))) return FALSE;
src_dev = GET_DC_PHYSDEV( dc_src, pGetImage );
- err = src_dev->funcs->pGetImage( src_dev, src_info, &bits, src );
- release_dc_ptr( dc_src );
- if (err) return FALSE;
+ if (src_dev->funcs->pGetImage( src_dev, src_info, &bits, src ))
+ {
+ release_dc_ptr( dc_src );
+ return FALSE;
+ }
dst_dev = GET_DC_PHYSDEV( dc_dst, pPutImage );
copy_bitmapinfo( dst_info, src_info );
@@ -299,6 +301,7 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst,
}
if (bits.free) bits.free( &bits );
+ release_dc_ptr( dc_src );
return !err;
}
@@ -317,7 +320,6 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst,
if (!(dc_src = get_dc_ptr( src_dev->hdc ))) return FALSE;
src_dev = GET_DC_PHYSDEV( dc_src, pGetImage );
err = src_dev->funcs->pGetImage( src_dev, src_info, &bits, src );
- release_dc_ptr( dc_src );
if (err) goto done;
dst_dev = GET_DC_PHYSDEV( dc_dst, pBlendImage );
@@ -339,6 +341,7 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst,
if (bits.free) bits.free( &bits );
done:
+ release_dc_ptr( dc_src );
if (err) SetLastError( err );
return !err;
}
More information about the wine-cvs
mailing list