system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 09:04:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gdi32: Get rid of the offset in the gdi_image_bits structure now that we are passing the full rectangles.

Browse source
This commit is contained in:
Alexandre Julliard 2011-07-21 12:03:30 +02:00
parent 97c30bdd6c
commit 7dc8f48ef8
3 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/gdi32/bitblt.c
View file

@ -253,7 +253,6 @@ try_get_image:
if (bits.free) bits.free( &bits );
bits.ptr = ptr;
bits.is_copy = TRUE;
bits.offset = 0;
bits.free = free_heap_bits;
if (!err)
{

5
dlls/winex11.drv/bitblt.c
View file

@ -1761,7 +1761,6 @@ static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts,
info->bmiHeader.biSizeImage = height * width_bytes;
if (!(dst_bits->ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage )))
return ERROR_OUTOFMEMORY;
dst_bits->offset = src_bits->offset;
dst_bits->is_copy = TRUE;
dst_bits->free = free_heap_bits;
}
@ -1769,7 +1768,6 @@ static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts,
{
/* swap bits in place */
dst_bits->ptr = src;
dst_bits->offset = src_bits->offset;
dst_bits->is_copy = src_bits->is_copy;
dst_bits->free = NULL;
if (!need_byteswap && zeropad_mask == ~0u && !mapping) return ERROR_SUCCESS; /* nothing to do */
@ -2029,8 +2027,7 @@ DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info,
FIXME( "depth %u bpp %u not supported yet\n", depth, format->bits_per_pixel );
return ERROR_BAD_FORMAT;
}
src_bits.offset = src->visrect.left & (align - 1);
x = src->visrect.left - src_bits.offset;
x = src->visrect.left & ~(align - 1);
y = src->visrect.top;
width = src->visrect.right - x;
height = src->visrect.bottom - src->visrect.top;

11
include/wine/gdi_driver.h
View file

@ -46,11 +46,10 @@ struct bitblt_coords
struct gdi_image_bits
{
void *ptr; /* pointer to the bits */
unsigned int offset; /* x offset of first requested pixel */
BOOL is_copy; /* whether this is a copy of the bits that can be modified */
void (*free)(struct gdi_image_bits *); /* callback for freeing the bits */
void *param; /* extra parameter for callback private use */
void *ptr; /* pointer to the bits */
BOOL is_copy; /* whether this is a copy of the bits that can be modified */
void (*free)(struct gdi_image_bits *); /* callback for freeing the bits */
void *param; /* extra parameter for callback private use */
};
struct gdi_dc_funcs
@ -192,7 +191,7 @@ struct gdi_dc_funcs
};
/* increment this when you change the DC function table */
#define WINE_GDI_DRIVER_VERSION 5
#define WINE_GDI_DRIVER_VERSION 6
static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset )
{