Module: wine Branch: master Commit: ccb6fbba76d4259adafa634874219672ec6c6d93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccb6fbba76d4259adafa63487...
Author: Jacek Caban jacek@codeweavers.com Date: Fri Jul 23 10:52:06 2021 +0200
gdi32: Use ntgdi name for GetPixel.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Huw Davies huw@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/painting.c | 4 ++-- include/ntgdi.h | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 6974f3cb873..299b84268a5 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -327,7 +327,7 @@ @ stdcall GetOutlineTextMetricsW(long long ptr) @ stdcall GetPaletteEntries(long long long ptr) @ stdcall GetPath(long ptr ptr long) -@ stdcall GetPixel(long long long) +@ stdcall GetPixel(long long long) NtGdiGetPixel @ stdcall GetPixelFormat(long) @ stdcall GetPolyFillMode(long) @ stdcall GetROP2(long) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 21c3c853998..c879aeb9582 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -416,9 +416,9 @@ COLORREF WINAPI NtGdiSetPixel( HDC hdc, INT x, INT y, COLORREF color ) }
/*********************************************************************** - * GetPixel (GDI32.@) + * NtGdiGetPixel (win32u.@) */ -COLORREF WINAPI GetPixel( HDC hdc, INT x, INT y ) +COLORREF WINAPI NtGdiGetPixel( HDC hdc, INT x, INT y ) { PHYSDEV physdev; COLORREF ret; diff --git a/include/ntgdi.h b/include/ntgdi.h index 56921d68fc3..2cf0a6f681e 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -166,8 +166,9 @@ BOOL WINAPI NtGdiGetMiterLimit( HDC hdc, FLOAT *limit ); COLORREF WINAPI NtGdiGetNearestColor( HDC hdc, COLORREF color ); UINT WINAPI NtGdiGetNearestPaletteIndex( HPALETTE hpalette, COLORREF color ); UINT WINAPI NtGdiGetOutlineTextMetricsInternalW( HDC hdc, UINT cbData, - OUTLINETEXTMETRICW *otm, ULONG opts); + OUTLINETEXTMETRICW *otm, ULONG opts ); INT WINAPI NtGdiGetPath( HDC hdc, POINT *points, BYTE *types, INT size ); +COLORREF WINAPI NtGdiGetPixel( HDC hdc, INT x, INT y ); INT WINAPI NtGdiGetRandomRgn( HDC hdc, HRGN region, INT code ); DWORD WINAPI NtGdiGetRegionData( HRGN hrgn, DWORD count, RGNDATA *data ); INT WINAPI NtGdiGetRgnBox( HRGN hrgn, RECT *rect );