marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed no longer used create_region function, and directly export 

create_empty_region instead.
oldstable
Alexandre Julliard 2005-02-22 19:42:35 +00:00
parent 548c973457
commit 43b2826714
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
server/region.c
View File

@ -557,39 +557,56 @@ static int union_overlapping( struct region *pReg,
} }
/* create a region from an array of rectangles */ /* create an empty region */
struct region *create_region( const rectangle_t *rects, unsigned int nb_rects ) struct region *create_empty_region(void)
{ {
struct region *region; struct region *region;
unsigned int size = max( nb_rects, RGN_DEFAULT_RECTS );
if (!validate_rectangles( rects, nb_rects ))
{
set_error( STATUS_INVALID_PARAMETER );
return NULL;
}
if (!(region = mem_alloc( sizeof(*region) ))) return NULL; if (!(region = mem_alloc( sizeof(*region) ))) return NULL;
if (!(region->rects = mem_alloc( size * sizeof(*region->rects) ))) if (!(region->rects = mem_alloc( RGN_DEFAULT_RECTS * sizeof(*region->rects) )))
{ {
free( region ); free( region );
return NULL; return NULL;
} }
region->size = size; region->size = RGN_DEFAULT_RECTS;
region->num_rects = nb_rects; region->num_rects = 0;
memcpy( region->rects, rects, nb_rects * sizeof(*rects) ); region->extents.left = 0;
set_region_extents( region ); region->extents.top = 0;
region->extents.right = 0;
region->extents.bottom = 0;
return region; return region;
} }
/* create a region from request data */ /* create a region from request data */
struct region *create_region_from_req_data( const void *data, size_t size ) struct region *create_region_from_req_data( const void *data, size_t size )
{ {
unsigned int alloc_rects;
struct region *region;
const rectangle_t *rects = data; const rectangle_t *rects = data;
int nb_rects = size / sizeof(rectangle_t); int nb_rects = size / sizeof(rectangle_t);
/* special case: empty region can be specified by a single all-zero rectangle */ /* special case: empty region can be specified by a single all-zero rectangle */
if (nb_rects == 1 && !memcmp( rects, &empty_rect, sizeof(empty_rect) )) nb_rects = 0; if (nb_rects == 1 && !memcmp( rects, &empty_rect, sizeof(empty_rect) )) nb_rects = 0;
return create_region( rects, nb_rects );
if (!validate_rectangles( rects, nb_rects ))
{
set_error( STATUS_INVALID_PARAMETER );
return NULL;
}
if (!(region = mem_alloc( sizeof(*region) ))) return NULL;
alloc_rects = max( nb_rects, RGN_DEFAULT_RECTS );
if (!(region->rects = mem_alloc( alloc_rects * sizeof(*region->rects) )))
{
free( region );
return NULL;
}
region->size = alloc_rects;
region->num_rects = nb_rects;
memcpy( region->rects, rects, nb_rects * sizeof(*rects) );
set_region_extents( region );
return region;
} }
/* free a region */ /* free a region */
@ -677,6 +694,7 @@ void offset_region( struct region *region, int x, int y )
{ {
rectangle_t *rect, *end; rectangle_t *rect, *end;
if (!region->num_rects) return;
for (rect = region->rects, end = rect + region->num_rects; rect < end; rect++) for (rect = region->rects, end = rect + region->num_rects; rect < end; rect++)
{ {
rect->left += x; rect->left += x;

3
server/user.h
View File

@ -72,7 +72,7 @@ extern void post_win_event( struct thread *thread, unsigned int event,
/* region functions */ /* region functions */
extern struct region *create_region( const rectangle_t *rects, unsigned int nb_rects ); extern struct region *create_empty_region(void);
extern struct region *create_region_from_req_data( const void *data, size_t size ); extern struct region *create_region_from_req_data( const void *data, size_t size );
extern void free_region( struct region *region ); extern void free_region( struct region *region );
extern void set_region_rect( struct region *region, const rectangle_t *rect ); extern void set_region_rect( struct region *region, const rectangle_t *rect );
@ -94,7 +94,6 @@ extern struct region *xor_region( struct region *dst, const struct region *src1,
const struct region *src2 ); const struct region *src2 );
extern int point_in_region( struct region *region, int x, int y ); extern int point_in_region( struct region *region, int x, int y );
extern int rect_in_region( struct region *region, const rectangle_t *rect ); extern int rect_in_region( struct region *region, const rectangle_t *rect );
static inline struct region *create_empty_region(void) { return create_region( NULL, 0 ); }
/* window functions */ /* window functions */