Removed no longer used create_region function, and directly export

server/region.c

@@ -557,39 +557,56 @@ static int union_overlapping( struct region *pReg,
 }
 
 
-/* create a region from an array of rectangles */
-struct region *create_region( const rectangle_t *rects, unsigned int nb_rects )
+/* create an empty region */
+struct region *create_empty_region(void)
 {
     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->rects = mem_alloc( size * sizeof(*region->rects) )))
+    if (!(region->rects = mem_alloc( RGN_DEFAULT_RECTS * sizeof(*region->rects) )))
     {
         free( region );
         return NULL;
     }
-    region->size = size;
-    region->num_rects = nb_rects;
-    memcpy( region->rects, rects, nb_rects * sizeof(*rects) );
-    set_region_extents( region );
+    region->size = RGN_DEFAULT_RECTS;
+    region->num_rects = 0;
+    region->extents.left = 0;
+    region->extents.top = 0;
+    region->extents.right = 0;
+    region->extents.bottom = 0;
     return region;
 }
 
 /* create a region from request data */
 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;
     int nb_rects = size / sizeof(rectangle_t);
 
     /* 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;
-    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 */
@@ -677,6 +694,7 @@ void offset_region( struct region *region, int x, int y )
 {
     rectangle_t *rect, *end;
 
+    if (!region->num_rects) return;
     for (rect = region->rects, end = rect + region->num_rects; rect < end; rect++)
     {
         rect->left += x;

server/user.h

@@ -72,7 +72,7 @@ extern void post_win_event( struct thread *thread, unsigned int event,
 
 /* 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 void free_region( struct region *region );
 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 );
 extern int point_in_region( struct region *region, int x, int y );
 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 */