diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 54a5fcef585..d425517cd7f 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -251,3 +251,31 @@ HRGN WINAPI ExtCreateRegion( const XFORM *xform, DWORD count, const RGNDATA *dat return NtGdiExtCreateRegion( xform, count, data ); } + +/*********************************************************************** + * CreateRectRgnIndirect (GDI32.@) + * + * Creates a simple rectangular region. + */ +HRGN WINAPI CreateRectRgnIndirect( const RECT* rect ) +{ + return NtGdiCreateRectRgn( rect->left, rect->top, rect->right, rect->bottom ); +} + +/*********************************************************************** + * CreateEllipticRgnIndirect (GDI32.@) + * + * Creates an elliptical region. + */ +HRGN WINAPI CreateEllipticRgnIndirect( const RECT *rect ) +{ + return NtGdiCreateEllipticRgn( rect->left, rect->top, rect->right, rect->bottom ); +} + +/*********************************************************************** + * CreatePolygonRgn (GDI32.@) + */ +HRGN WINAPI CreatePolygonRgn( const POINT *points, INT count, INT mode ) +{ + return CreatePolyPolygonRgn( points, &count, 1, mode ); +} diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index ce76d09a6a2..f799221e311 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -622,24 +622,6 @@ HRGN WINAPI NtGdiCreateRectRgn( INT left, INT top, INT right, INT bottom ) } -/*********************************************************************** - * CreateRectRgnIndirect (GDI32.@) - * - * Creates a simple rectangular region. - * - * PARAMS - * rect [I] Coordinates of rectangular region. - * - * RETURNS - * Success: Handle to region. - * Failure: NULL. - */ -HRGN WINAPI CreateRectRgnIndirect( const RECT* rect ) -{ - return NtGdiCreateRectRgn( rect->left, rect->top, rect->right, rect->bottom ); -} - - /*********************************************************************** * NtGdiSetRectRgn (win32u.@) * @@ -822,28 +804,6 @@ HRGN WINAPI NtGdiCreateEllipticRgn( INT left, INT top, INT right, INT bottom ) } -/*********************************************************************** - * CreateEllipticRgnIndirect (GDI32.@) - * - * Creates an elliptical region. - * - * PARAMS - * rect [I] Pointer to bounding rectangle of the ellipse. - * - * RETURNS - * Success: Handle to region. - * Failure: NULL. - * - * NOTES - * This is a special case of CreateRoundRectRgn() where the width of the - * ellipse at each corner is equal to the width the rectangle and - * the same for the height. - */ -HRGN WINAPI CreateEllipticRgnIndirect( const RECT *rect ) -{ - return NtGdiCreateEllipticRgn( rect->left, rect->top, rect->right, rect->bottom ); -} - /*********************************************************************** * NtGdiGetRegionData (win32u.@) * @@ -2741,12 +2701,3 @@ HRGN WINAPI CreatePolyPolygonRgn( const POINT *pts, const INT *count, INT nbpoly { return create_polypolygon_region( pts, count, nbpolygons, mode, NULL ); } - - -/*********************************************************************** - * CreatePolygonRgn (GDI32.@) - */ -HRGN WINAPI CreatePolygonRgn( const POINT *points, INT count, INT mode ) -{ - return create_polypolygon_region( points, &count, 1, mode, NULL ); -}