ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Use the visrect coordinates in dibdrv_PutImage.

This commit is contained in:
Alexandre Julliard 2011-08-03 19:59:46 +02:00
parent 89dcf229d0
commit 2ba1a43703
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/gdi32/dibdrv/dc.c
View File

@ -513,7 +513,6 @@ static DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINF
{ {
dib_info *dib, stand_alone; dib_info *dib, stand_alone;
DWORD ret; DWORD ret;
RECT rect;
POINT origin; POINT origin;
dib_info src_dib; dib_info src_dib;
HRGN total_clip, saved_clip = NULL; HRGN total_clip, saved_clip = NULL;
@ -564,12 +563,8 @@ static DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINF
init_dib_info_from_bitmapinfo( &src_dib, info, bits->ptr, 0 ); init_dib_info_from_bitmapinfo( &src_dib, info, bits->ptr, 0 );
rect.left = dst->x; origin.x = src->visrect.left;
rect.top = dst->y; origin.y = src->visrect.top;
rect.right = dst->x + dst->width;
rect.bottom = dst->y + dst->height;
origin.x = src->x;
origin.y = src->y;
if (hbitmap) if (hbitmap)
{ {
@ -583,7 +578,7 @@ static DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINF
rop2 = ((rop >> 16) & 0xf) + 1; rop2 = ((rop >> 16) & 0xf) + 1;
} }
if (total_clip == NULL) dib->funcs->copy_rect( dib, &rect, &src_dib, &origin, rop2 ); if (total_clip == NULL) dib->funcs->copy_rect( dib, &dst->visrect, &src_dib, &origin, rop2 );
else else
{ {
clip_data = get_wine_region( total_clip ); clip_data = get_wine_region( total_clip );
@ -591,10 +586,10 @@ static DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINF
{ {
RECT clipped_rect; RECT clipped_rect;
if (intersect_rect( &clipped_rect, &rect, clip_data->rects + i )) if (intersect_rect( &clipped_rect, &dst->visrect, clip_data->rects + i ))
{ {
origin.x = src->x + clipped_rect.left - dst->x; origin.x = src->visrect.left + clipped_rect.left - dst->visrect.left;
origin.y = src->y + clipped_rect.top - dst->y; origin.y = src->visrect.top + clipped_rect.top - dst->visrect.top;
dib->funcs->copy_rect( dib, &clipped_rect, &src_dib, &origin, rop2 ); dib->funcs->copy_rect( dib, &clipped_rect, &src_dib, &origin, rop2 );
} }
} }