From 5a780ffd63547b591c0853b546fdf5132725c8a2 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Mon, 30 Aug 2021 13:56:21 +0200 Subject: [PATCH] gdi32: Use ntgdi names for GetClipBox and GetRandomRgn. Signed-off-by: Jacek Caban Signed-off-by: Huw Davies Signed-off-by: Alexandre Julliard --- dlls/gdi32/clipping.c | 10 +++++----- dlls/gdi32/gdi32.spec | 4 ++-- dlls/gdi32/metafile.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 3215d5e9a14..28a314b76b9 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -197,7 +197,7 @@ INT WINAPI NtGdiExtSelectClipRgn( HDC hdc, HRGN rgn, INT mode ) } /*********************************************************************** - * __wine_set_visible_region (GDI32.@) + * __wine_set_visible_region (win32u.@) */ void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect, const RECT *device_rect, struct window_surface *surface ) @@ -357,9 +357,9 @@ BOOL WINAPI NtGdiRectVisible( HDC hdc, const RECT *rect ) /*********************************************************************** - * GetClipBox (GDI32.@) + * NtGdiGetAppClipBox (win32u.@) */ -INT WINAPI GetClipBox( HDC hdc, LPRECT rect ) +INT WINAPI NtGdiGetAppClipBox( HDC hdc, RECT *rect ) { RECT visrect; INT ret; @@ -440,7 +440,7 @@ INT WINAPI GetMetaRgn( HDC hdc, HRGN hRgn ) /*********************************************************************** - * GetRandomRgn [GDI32.@] + * NtGdiGetRandomRgn (win32u.@) * * NOTES * This function is documented in MSDN online for the case of @@ -453,7 +453,7 @@ INT WINAPI GetMetaRgn( HDC hdc, HRGN hRgn ) * * See http://www.codeproject.com/gdi/cliprgnguide.asp */ -INT WINAPI GetRandomRgn(HDC hDC, HRGN hRgn, INT iCode) +INT WINAPI NtGdiGetRandomRgn( HDC hDC, HRGN hRgn, INT iCode ) { INT ret = 1; DC *dc = get_dc_ptr( hDC ); diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 33ebf828440..4e0f0bf37a3 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -264,7 +264,7 @@ @ stub GetCharWidthWOW @ stdcall GetCharacterPlacementA(long str long long ptr long) @ stdcall GetCharacterPlacementW(long wstr long long ptr long) -@ stdcall GetClipBox(long ptr) +@ stdcall GetClipBox(long ptr) NtGdiGetAppClipBox @ stdcall GetClipRgn(long long) @ stdcall GetColorAdjustment(long ptr) @ stdcall GetColorSpace(long) @@ -332,7 +332,7 @@ @ stdcall GetPixelFormat(long) @ stdcall GetPolyFillMode(long) @ stdcall GetROP2(long) -@ stdcall GetRandomRgn(long long long) +@ stdcall GetRandomRgn(long long long) NtGdiGetRandomRgn @ stdcall GetRasterizerCaps(ptr long) NtGdiGetRasterizerCaps @ stdcall GetRegionData(long long ptr) NtGdiGetRegionData @ stdcall GetRelAbs(long long) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 2059e9baab9..07f467914cc 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -1217,7 +1217,7 @@ UINT WINAPI GetWinMetaFileBits(HENHMETAFILE hemf, UINT ret, full_size; RECT rc; - GetClipBox(hdcRef, &rc); + NtGdiGetAppClipBox(hdcRef, &rc); TRACE("(%p,%d,%p,%d,%p) rc=%s\n", hemf, cbBuffer, lpbBuffer, map_mode, hdcRef, wine_dbgstr_rect(&rc));