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

gdi32: Use ntgdi names for region constructors. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2021-07-07 15:02:38 +02:00 committed by Alexandre Julliard
parent 94876d81ce
commit 8df14dac7a
14 changed files with 52 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/gdi32/bitblt.c
View File

@ -482,7 +482,7 @@ BOOL CDECL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert
pts[i].y -= dst.visrect.top;
}
rgn = CreateRectRgn( 0, 0, 0, 0 );
rgn = NtGdiCreateRectRgn( 0, 0, 0, 0 );
gradient_bitmapinfo( info, bits.ptr, vert_array, nvert, grad_array, ngrad, mode, pts, rgn );
OffsetRgn( rgn, dst.visrect.left, dst.visrect.top );
ret = !dev->funcs->pPutImage( dev, rgn, info, &bits, &src, &dst, SRCCOPY );

8
dlls/gdi32/bitmap.c
View File

@ -303,10 +303,10 @@ LONG WINAPI NtGdiSetBitmapBits(
if ((count % src_stride << 3) % bmp->dib.dsBm.bmBitsPixel)
FIXME( "Unhandled partial pixel\n" );
clip = CreateRectRgn( src.visrect.left, src.visrect.top,
src.visrect.right, src.visrect.bottom - 1 );
last_row = CreateRectRgn( src.visrect.left, src.visrect.bottom - 1,
src.visrect.left + extra_pixels, src.visrect.bottom );
clip = NtGdiCreateRectRgn( src.visrect.left, src.visrect.top,
src.visrect.right, src.visrect.bottom - 1 );
last_row = NtGdiCreateRectRgn( src.visrect.left, src.visrect.bottom - 1,
src.visrect.left + extra_pixels, src.visrect.bottom );
CombineRgn( clip, clip, last_row, RGN_OR );
DeleteObject( last_row );
}

4
dlls/gdi32/clipping.c
View File

@ -105,7 +105,7 @@ void update_dc_clipping( DC * dc )
if (count > 1)
{
if (!dc->region) dc->region = CreateRectRgn( 0, 0, 0, 0 );
if (!dc->region) dc->region = NtGdiCreateRectRgn( 0, 0, 0, 0 );
CombineRgn( dc->region, regions[0], regions[1], RGN_AND );
if (count > 2) CombineRgn( dc->region, dc->region, regions[2], RGN_AND );
}
@ -170,7 +170,7 @@ INT CDECL nulldrv_ExtSelectClipRgn( PHYSDEV dev, HRGN rgn, INT mode )
if (dc->layout & LAYOUT_RTL)
{
if (!(mirrored = CreateRectRgn( 0, 0, 0, 0 ))) return ERROR;
if (!(mirrored = NtGdiCreateRectRgn( 0, 0, 0, 0 ))) return ERROR;
mirror_region( mirrored, rgn, dc->vis_rect.right - dc->vis_rect.left );
rgn = mirrored;
}

8
dlls/gdi32/dc.c
View File

@ -418,12 +418,12 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev )
if (dc->hClipRgn)
{
newdc->hClipRgn = CreateRectRgn( 0, 0, 0, 0 );
newdc->hClipRgn = NtGdiCreateRectRgn( 0, 0, 0, 0 );
CombineRgn( newdc->hClipRgn, dc->hClipRgn, 0, RGN_COPY );
}
if (dc->hMetaRgn)
{
newdc->hMetaRgn = CreateRectRgn( 0, 0, 0, 0 );
newdc->hMetaRgn = NtGdiCreateRectRgn( 0, 0, 0, 0 );
CombineRgn( newdc->hMetaRgn, dc->hMetaRgn, 0, RGN_COPY );
}
@ -493,7 +493,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level )
if (dcs->hClipRgn)
{
if (!dc->hClipRgn) dc->hClipRgn = CreateRectRgn( 0, 0, 0, 0 );
if (!dc->hClipRgn) dc->hClipRgn = NtGdiCreateRectRgn( 0, 0, 0, 0 );
CombineRgn( dc->hClipRgn, dcs->hClipRgn, 0, RGN_COPY );
}
else
@ -503,7 +503,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level )
}
if (dcs->hMetaRgn)
{
if (!dc->hMetaRgn) dc->hMetaRgn = CreateRectRgn( 0, 0, 0, 0 );
if (!dc->hMetaRgn) dc->hMetaRgn = NtGdiCreateRectRgn( 0, 0, 0, 0 );
CombineRgn( dc->hMetaRgn, dcs->hMetaRgn, 0, RGN_COPY );
}
else

4
dlls/gdi32/dib.c
View File

@ -329,8 +329,8 @@ static BOOL build_rle_bitmap( BITMAPINFO *info, struct gdi_image_bits *bits, HRG
if (clip)
{
*clip = CreateRectRgn( 0, 0, 0, 0 );
run = CreateRectRgn( 0, 0, 0, 0 );
*clip = NtGdiCreateRectRgn( 0, 0, 0, 0 );
run = NtGdiCreateRectRgn( 0, 0, 0, 0 );
if (!*clip || !run) goto fail;
}

2
dlls/gdi32/dibdrv/bitblt.c
View File

@ -1011,7 +1011,7 @@ DWORD CDECL dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info,
if (clip && pdev->clip)
{
tmp_rgn = CreateRectRgn( 0, 0, 0, 0 );
tmp_rgn = NtGdiCreateRectRgn( 0, 0, 0, 0 );
CombineRgn( tmp_rgn, clip, pdev->clip, RGN_AND );
clip = tmp_rgn;
}

20
dlls/gdi32/dibdrv/graphics.c
View File

@ -363,7 +363,7 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
return TRUE;
}
if (pdev->pen_uses_region && !(outline = CreateRectRgn( 0, 0, 0, 0 )))
if (pdev->pen_uses_region && !(outline = NtGdiCreateRectRgn( 0, 0, 0, 0 )))
{
HeapFree( GetProcessHeap(), 0, points );
return FALSE;
@ -422,7 +422,7 @@ static BOOL stroke_and_fill_path( dibdrv_physdev *dev, BOOL stroke, BOOL fill )
if (!(path = get_gdi_flat_path( dc, fill ? &interior : NULL ))) return FALSE;
if (!(total = get_gdi_path_data( path, &points, &types ))) goto done;
if (stroke && dev->pen_uses_region) outline = CreateRectRgn( 0, 0, 0, 0 );
if (stroke && dev->pen_uses_region) outline = NtGdiCreateRectRgn( 0, 0, 0, 0 );
/* if not using a region, paint the interior first so the outline can overlap it */
if (interior && !outline)
@ -1063,7 +1063,7 @@ BOOL CDECL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT
if (!is_interior( &pdev->dib, pdev->clip, x, y, pixel, type )) return FALSE;
if (!(rgn = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE;
if (!(rgn = NtGdiCreateRectRgn( 0, 0, 0, 0 ))) return FALSE;
row.left = x;
row.right = x + 1;
row.top = y;
@ -1146,7 +1146,7 @@ BOOL CDECL dibdrv_LineTo( PHYSDEV dev, INT x, INT y )
lp_to_dp(dc, pts, 2);
if (pdev->pen_uses_region && !(region = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE;
if (pdev->pen_uses_region && !(region = NtGdiCreateRectRgn( 0, 0, 0, 0 ))) return FALSE;
reset_dash_origin(pdev);
@ -1277,7 +1277,7 @@ BOOL CDECL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts,
goto done;
}
if (pdev->pen_uses_region) outline = CreateRectRgn( 0, 0, 0, 0 );
if (pdev->pen_uses_region) outline = NtGdiCreateRectRgn( 0, 0, 0, 0 );
/* if not using a region, paint the interior first so the outline can overlap it */
if (interior && !outline)
@ -1339,7 +1339,7 @@ BOOL CDECL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* count
memcpy( points, pt, total * sizeof(*pt) );
lp_to_dp( dc, points, total );
if (pdev->pen_uses_region && !(outline = CreateRectRgn( 0, 0, 0, 0 )))
if (pdev->pen_uses_region && !(outline = NtGdiCreateRectRgn( 0, 0, 0, 0 )))
{
ret = FALSE;
goto done;
@ -1410,7 +1410,7 @@ BOOL CDECL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bott
if (!get_pen_device_rect( dc, pdev, &rect, left, top, right, bottom )) return TRUE;
if (pdev->pen_uses_region && !(outline = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE;
if (pdev->pen_uses_region && !(outline = NtGdiCreateRectRgn( 0, 0, 0, 0 ))) return FALSE;
rect.right--;
rect.bottom--;
@ -1488,15 +1488,15 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott
points = HeapAlloc( GetProcessHeap(), 0, (ellipse_width + ellipse_height) * 2 * sizeof(*points) );
if (!points) return FALSE;
if (pdev->pen_uses_region && !(outline = CreateRectRgn( 0, 0, 0, 0 )))
if (pdev->pen_uses_region && !(outline = NtGdiCreateRectRgn( 0, 0, 0, 0 )))
{
HeapFree( GetProcessHeap(), 0, points );
return FALSE;
}
if (pdev->brush.style != BS_NULL &&
!(interior = CreateRoundRectRgn( rect.left, rect.top, rect.right + 1, rect.bottom + 1,
ellipse_width, ellipse_height )))
!(interior = NtGdiCreateRoundRectRgn( rect.left, rect.top, rect.right + 1, rect.bottom + 1,
ellipse_width, ellipse_height )))
{
HeapFree( GetProcessHeap(), 0, points );
if (outline) DeleteObject( outline );

8
dlls/gdi32/dibdrv/objects.c
View File

@ -1575,8 +1575,8 @@ static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close
while (num > 2 && pts[num - 1].x == pts[num - 2].x && pts[num - 1].y == pts[num - 2].y) num--;
if (pdev->pen_join == PS_JOIN_ROUND || pdev->pen_endcap == PS_ENDCAP_ROUND)
round_cap = CreateEllipticRgn( -(pdev->pen_width / 2), -(pdev->pen_width / 2),
(pdev->pen_width + 1) / 2 + 1, (pdev->pen_width + 1) / 2 + 1 );
round_cap = NtGdiCreateEllipticRgn( -(pdev->pen_width / 2), -(pdev->pen_width / 2),
(pdev->pen_width + 1) / 2 + 1, (pdev->pen_width + 1) / 2 + 1 );
if (close)
wide_line_segments( pdev, num, pts, TRUE, 0, num, &pts[0], &pts[0], round_cap, total );
@ -1601,8 +1601,8 @@ static BOOL dashed_wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOO
while (num > 2 && pts[num - 1].x == pts[num - 2].x && pts[num - 1].y == pts[num - 2].y) num--;
if (pdev->pen_join == PS_JOIN_ROUND || pdev->pen_endcap == PS_ENDCAP_ROUND)
round_cap = CreateEllipticRgn( -(pdev->pen_width / 2), -(pdev->pen_width / 2),
(pdev->pen_width + 1) / 2 + 1, (pdev->pen_width + 1) / 2 + 1);
round_cap = NtGdiCreateEllipticRgn( -(pdev->pen_width / 2), -(pdev->pen_width / 2),
(pdev->pen_width + 1) / 2 + 1, (pdev->pen_width + 1) / 2 + 1 );
start = 0;
cur_len = 0;

2
dlls/gdi32/enhmetafile.c
View File

@ -2413,7 +2413,7 @@ BOOL WINAPI EnumEnhMetaFile(
hBrush = GetCurrentObject(hdc, OBJ_BRUSH);
hFont = GetCurrentObject(hdc, OBJ_FONT);
hRgn = CreateRectRgn(0, 0, 0, 0);
hRgn = NtGdiCreateRectRgn(0, 0, 0, 0);
if (!GetClipRgn(hdc, hRgn))
{
DeleteObject(hRgn);

6
dlls/gdi32/gdi32.spec
View File

@ -52,7 +52,7 @@
@ stdcall CreateDIBSection(long ptr long ptr long long)
@ stdcall CreateDIBitmap(long ptr long ptr ptr long)
@ stdcall CreateDiscardableBitmap(long long long)
@ stdcall CreateEllipticRgn(long long long long)
@ stdcall CreateEllipticRgn(long long long long) NtGdiCreateEllipticRgn
@ stdcall CreateEllipticRgnIndirect(ptr)
@ stdcall CreateEnhMetaFileA(long str ptr str)
@ stdcall CreateEnhMetaFileW(long wstr ptr wstr)
@ -74,9 +74,9 @@
@ stdcall CreatePenIndirect(ptr)
@ stdcall CreatePolyPolygonRgn(ptr ptr long long)
@ stdcall CreatePolygonRgn(ptr long long)
@ stdcall CreateRectRgn(long long long long)
@ stdcall CreateRectRgn(long long long long) NtGdiCreateRectRgn
@ stdcall CreateRectRgnIndirect(ptr)
@ stdcall CreateRoundRectRgn(long long long long long long)
@ stdcall CreateRoundRectRgn(long long long long long long) NtGdiCreateRoundRectRgn
@ stdcall CreateScalableFontResourceA(long str str str)
@ stdcall CreateScalableFontResourceW(long wstr wstr wstr)
@ stdcall CreateSolidBrush(long)

6
dlls/gdi32/metafile.c
View File

@ -341,7 +341,7 @@ BOOL WINAPI PlayMetaFile( HDC hdc, HMETAFILE hmf )
hBrush = GetCurrentObject(hdc, OBJ_BRUSH);
hPal = GetCurrentObject(hdc, OBJ_PAL);
hRgn = CreateRectRgn(0, 0, 0, 0);
hRgn = NtGdiCreateRectRgn(0, 0, 0, 0);
if (!GetClipRgn(hdc, hRgn))
{
DeleteObject(hRgn);
@ -861,7 +861,7 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc, HANDLETABLE *ht, METARECORD *mr, UINT
case META_CREATEREGION:
{
HRGN hrgn = CreateRectRgn(0,0,0,0);
HRGN hrgn = NtGdiCreateRectRgn(0,0,0,0);
MF_Play_MetaCreateRegion(mr, hrgn);
MF_AddHandle(ht, handles, hrgn);
@ -1270,7 +1270,7 @@ static BOOL MF_Play_MetaCreateRegion( METARECORD *mr, HRGN hrgn )
WORD band, pair;
WORD *start, *end;
INT16 y0, y1;
HRGN hrgn2 = CreateRectRgn( 0, 0, 0, 0 );
HRGN hrgn2 = NtGdiCreateRectRgn( 0, 0, 0, 0 );
for(band = 0, start = &(mr->rdParm[11]); band < mr->rdParm[5];
band++, start = end + 1) {

2
dlls/gdi32/painting.c
View File

@ -85,7 +85,7 @@ BOOL CDECL nulldrv_FillRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush )
BOOL CDECL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, INT height )
{
BOOL ret = FALSE;
HRGN tmp = CreateRectRgn( 0, 0, 0, 0 );
HRGN tmp = NtGdiCreateRectRgn( 0, 0, 0, 0 );
if (tmp)
{

34
dlls/gdi32/region.c
View File

@ -590,7 +590,7 @@ INT WINAPI GetRgnBox( HRGN hrgn, LPRECT rect )
/***********************************************************************
* CreateRectRgn (GDI32.@)
* NtGdiCreateRectRgn (win32u.@)
*
* Creates a simple rectangular region.
*
@ -604,7 +604,7 @@ INT WINAPI GetRgnBox( HRGN hrgn, LPRECT rect )
* Success: Handle to region.
* Failure: NULL.
*/
HRGN WINAPI CreateRectRgn(INT left, INT top, INT right, INT bottom)
HRGN WINAPI NtGdiCreateRectRgn( INT left, INT top, INT right, INT bottom )
{
HRGN hrgn;
WINEREGION *obj;
@ -636,7 +636,7 @@ HRGN WINAPI CreateRectRgn(INT left, INT top, INT right, INT bottom)
*/
HRGN WINAPI CreateRectRgnIndirect( const RECT* rect )
{
return CreateRectRgn( rect->left, rect->top, rect->right, rect->bottom );
return NtGdiCreateRectRgn( rect->left, rect->top, rect->right, rect->bottom );
}
@ -688,7 +688,7 @@ BOOL WINAPI SetRectRgn( HRGN hrgn, INT left, INT top,
/***********************************************************************
* CreateRoundRectRgn (GDI32.@)
* NtGdiCreateRoundRectRgn (win32u.@)
*
* Creates a rectangular region with rounded corners.
*
@ -708,9 +708,8 @@ BOOL WINAPI SetRectRgn( HRGN hrgn, INT left, INT top,
* If ellipse_width or ellipse_height is less than 2 logical units then
* it is treated as though CreateRectRgn() was called instead.
*/
HRGN WINAPI CreateRoundRectRgn( INT left, INT top,
INT right, INT bottom,
INT ellipse_width, INT ellipse_height )
HRGN WINAPI NtGdiCreateRoundRectRgn( INT left, INT top, INT right, INT bottom,
INT ellipse_width, INT ellipse_height )
{
WINEREGION *obj;
HRGN hrgn = 0;
@ -732,7 +731,7 @@ HRGN WINAPI CreateRoundRectRgn( INT left, INT top,
/* Check if we can do a normal rectangle instead */
if ((ellipse_width < 2) || (ellipse_height < 2))
return CreateRectRgn( left, top, right, bottom );
return NtGdiCreateRectRgn( left, top, right, bottom );
if (!(obj = alloc_region( ellipse_height ))) return 0;
obj->numRects = ellipse_height;
@ -798,7 +797,7 @@ HRGN WINAPI CreateRoundRectRgn( INT left, INT top,
/***********************************************************************
* CreateEllipticRgn (GDI32.@)
* NtGdiCreateEllipticRgn (win32u.@)
*
* Creates an elliptical region.
*
@ -817,11 +816,10 @@ HRGN WINAPI CreateRoundRectRgn( INT left, INT top,
* ellipse at each corner is equal to the width the rectangle and
* the same for the height.
*/
HRGN WINAPI CreateEllipticRgn( INT left, INT top,
INT right, INT bottom )
HRGN WINAPI NtGdiCreateEllipticRgn( INT left, INT top, INT right, INT bottom )
{
return CreateRoundRectRgn( left, top, right, bottom,
right-left, bottom-top );
return NtGdiCreateRoundRectRgn( left, top, right, bottom,
right - left, bottom - top );
}
@ -844,9 +842,7 @@ HRGN WINAPI CreateEllipticRgn( INT left, INT top,
*/
HRGN WINAPI CreateEllipticRgnIndirect( const RECT *rect )
{
return CreateRoundRectRgn( rect->left, rect->top, rect->right,
rect->bottom, rect->right - rect->left,
rect->bottom - rect->top );
return NtGdiCreateEllipticRgn( rect->left, rect->top, rect->right, rect->bottom );
}
/***********************************************************************
@ -953,7 +949,7 @@ HRGN WINAPI NtGdiExtCreateRegion( const XFORM *xform, DWORD count, const RGNDATA
{
const RECT *pCurRect, *pEndRect;
hrgn = CreateRectRgn( 0, 0, 0, 0 );
hrgn = NtGdiCreateRectRgn( 0, 0, 0, 0 );
pEndRect = (const RECT *)rgndata->Buffer + rgndata->rdh.nCount;
for (pCurRect = (const RECT *)rgndata->Buffer; pCurRect < pEndRect; pCurRect++)
@ -2716,8 +2712,8 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo
(Pts[1].y == Pts[2].y) &&
(Pts[2].x == Pts[3].x) &&
(Pts[3].y == Pts[0].y))))
return CreateRectRgn( min(Pts[0].x, Pts[2].x), min(Pts[0].y, Pts[2].y),
max(Pts[0].x, Pts[2].x), max(Pts[0].y, Pts[2].y) );
return NtGdiCreateRectRgn( min(Pts[0].x, Pts[2].x), min(Pts[0].y, Pts[2].y),
max(Pts[0].x, Pts[2].x), max(Pts[0].y, Pts[2].y) );
for(poly = total = 0; poly < nbpolygons; poly++)
total += Count[poly];

1
include/ntgdi.h
View File

@ -67,6 +67,7 @@ HANDLE WINAPI NtGdiCreateClientObj( ULONG type );
HFONT WINAPI NtGdiHfontCreate( const ENUMLOGFONTEXDVW *enumex, ULONG unk2, ULONG unk3,
ULONG unk4, void *data );
HBRUSH WINAPI NtGdiCreateDIBBrush( const void* data, UINT coloruse );
HRGN WINAPI NtGdiCreateEllipticRgn( INT left, INT top, INT right, INT bottom );
HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP hbitmap, BOOL pen );
HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush );
HRGN WINAPI NtGdiCreateRectRgn( INT left, INT top, INT right, INT bottom );