Module: wine Branch: master Commit: d2d81327346f6d9e21c5baa89c75a08dbce140f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2d81327346f6d9e21c5baa89...
Author: Jacek Caban jacek@codeweavers.com Date: Fri Sep 10 14:28:04 2021 +0200
gdi32: Fix some ntgdi names.
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/brush.c | 4 ++-- dlls/gdi32/font.c | 12 ++++++------ dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/objects.c | 2 +- dlls/gdi32/text.c | 12 ++++++------ include/ntgdi.h | 14 +++++++++----- 6 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 8ef902f60b9..f31dab0fdd4 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -207,11 +207,11 @@ HBRUSH create_brush( const LOGBRUSH *brush )
/*********************************************************************** - * NtGdiCreateHatchBrush (win32u.@) + * NtGdiCreateHatchBrushInternal (win32u.@) * * Create a logical brush with a hatched pattern. */ -HBRUSH WINAPI NtGdiCreateHatchBrush( INT style, COLORREF color, BOOL pen ) +HBRUSH WINAPI NtGdiCreateHatchBrushInternal( INT style, COLORREF color, BOOL pen ) { LOGBRUSH logbrush;
diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d642b474ded..d32e8b8fe40 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5447,11 +5447,11 @@ BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT first, UINT last, WCHAR *chars
/*********************************************************************** - * NtGdiGetGlyphOutlineW (win32u.@) + * NtGdiGetGlyphOutline (win32u.@) */ -DWORD WINAPI NtGdiGetGlyphOutlineW( HDC hdc, UINT ch, UINT format, GLYPHMETRICS *metrics, - DWORD size, void *buffer, const MAT2 *mat2, - BOOL ignore_rotation ) +DWORD WINAPI NtGdiGetGlyphOutline( HDC hdc, UINT ch, UINT format, GLYPHMETRICS *metrics, + DWORD size, void *buffer, const MAT2 *mat2, + BOOL ignore_rotation ) { DC *dc; DWORD ret; @@ -5732,9 +5732,9 @@ done: }
/************************************************************************* - * NtGdiGetKerningPairsW (win32u.@) + * NtGdiGetKerningPairs (win32u.@) */ -DWORD WINAPI NtGdiGetKerningPairsW( HDC hdc, DWORD count, KERNINGPAIR *kern_pair ) +DWORD WINAPI NtGdiGetKerningPairs( HDC hdc, DWORD count, KERNINGPAIR *kern_pair ) { DC *dc; DWORD ret; diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index da37f8ba643..81a4dd5d1e9 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -309,7 +309,7 @@ @ stdcall GetICMProfileW(long ptr ptr) @ stdcall GetKerningPairs(long long ptr) GetKerningPairsA @ stdcall GetKerningPairsA(long long ptr) -@ stdcall GetKerningPairsW(long long ptr) NtGdiGetKerningPairsW +@ stdcall GetKerningPairsW(long long ptr) NtGdiGetKerningPairs @ stdcall GetLayout(long) @ stdcall GetLogColorSpaceA(long ptr long) @ stdcall GetLogColorSpaceW(long ptr long) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 97b0fec5ecf..7f6893f0952 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -546,7 +546,7 @@ HBRUSH WINAPI CreateSolidBrush( COLORREF color ) */ HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color ) { - return NtGdiCreateHatchBrush( style, color, FALSE ); + return NtGdiCreateHatchBrushInternal( style, color, FALSE ); }
/*********************************************************************** diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index c54dfac0a42..4037eaa4b65 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1083,7 +1083,7 @@ static int *kern_string( HDC hdc, const WCHAR *str, int len, int *kern_total ) ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(*ret) ); if (!ret) return NULL;
- count = NtGdiGetKerningPairsW( hdc, 0, NULL ); + count = NtGdiGetKerningPairs( hdc, 0, NULL ); if (count) { kern = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*kern) ); @@ -1093,7 +1093,7 @@ static int *kern_string( HDC hdc, const WCHAR *str, int len, int *kern_total ) return NULL; }
- NtGdiGetKerningPairsW( hdc, count, kern ); + NtGdiGetKerningPairs( hdc, count, kern ); }
for (i = 0; i < len - 1; i++) @@ -1818,7 +1818,7 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT ch, UINT format, GLYPHMETRICS *metr DWORD WINAPI GetGlyphOutlineW( HDC hdc, UINT ch, UINT format, GLYPHMETRICS *metrics, DWORD size, void *buffer, const MAT2 *mat2 ) { - return NtGdiGetGlyphOutlineW( hdc, ch, format, metrics, size, buffer, mat2, FALSE ); + return NtGdiGetGlyphOutline( hdc, ch, format, metrics, size, buffer, mat2, FALSE ); }
/************************************************************************* @@ -1849,11 +1849,11 @@ DWORD WINAPI GetKerningPairsA( HDC hdc, DWORD count, KERNINGPAIR *kern_pairA ) return 0; }
- total_kern_pairs = NtGdiGetKerningPairsW( hdc, 0, NULL ); + total_kern_pairs = NtGdiGetKerningPairs( hdc, 0, NULL ); if (!total_kern_pairs) return 0;
kern_pairW = HeapAlloc( GetProcessHeap(), 0, total_kern_pairs * sizeof(*kern_pairW) ); - NtGdiGetKerningPairsW( hdc, total_kern_pairs, kern_pairW ); + NtGdiGetKerningPairs( hdc, total_kern_pairs, kern_pairW );
for (i = 0; i < total_kern_pairs; i++) { @@ -1922,7 +1922,7 @@ DWORD WINAPI GetFontLanguageInfo( HDC hdc ) if (fontsig.fsCsb[0] & GCP_LIGATE_MASK) result |= GCP_LIGATE;
- if (NtGdiGetKerningPairsW( hdc, 0, NULL )) + if (NtGdiGetKerningPairs( hdc, 0, NULL )) result |= GCP_USEKERNING;
/* this might need a test for a HEBREW- or ARABIC_CHARSET as well */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 4ee02942346..365935e40c4 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -255,7 +255,7 @@ HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc ); HBRUSH WINAPI NtGdiCreateDIBBrush( const void *data, UINT coloruse, UINT size, BOOL is_8x8, BOOL pen, const void *client ); HRGN WINAPI NtGdiCreateEllipticRgn( INT left, INT top, INT right, INT bottom ); -HBRUSH WINAPI NtGdiCreateHatchBrush( INT style, COLORREF color, BOOL pen ); +HBRUSH WINAPI NtGdiCreateHatchBrushInternal( INT style, COLORREF color, BOOL pen ); HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP hbitmap, BOOL pen, BOOL is_8x8 ); HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush ); HRGN WINAPI NtGdiCreateRectRgn( INT left, INT top, INT right, INT bottom ); @@ -264,6 +264,8 @@ HRGN WINAPI NtGdiCreateRoundRectRgn( INT left, INT top, INT right, INT botto HBRUSH WINAPI NtGdiCreateSolidBrush( COLORREF color, HBRUSH brush ); BOOL WINAPI NtGdiDeleteClientObj( HGDIOBJ obj ); BOOL WINAPI NtGdiDeleteObjectApp( HGDIOBJ obj ); +INT WINAPI NtGdiDescribePixelFormat( HDC hdc, INT format, UINT size, + PIXELFORMATDESCRIPTOR *descr ); LONG WINAPI NtGdiDoPalette( HGDIOBJ handle, WORD start, WORD count, void *entries, DWORD func, BOOL inbound ); INT WINAPI NtGdiEndPage( HDC hdc ); @@ -288,6 +290,7 @@ BOOL WINAPI NtGdiFrameRgn( HDC hdc, HRGN hrgn, HBRUSH brush, BOOL WINAPI NtGdiFillPath( HDC hdc ); BOOL WINAPI NtGdiGetAndSetDCDword( HDC hdc, UINT method, DWORD value, DWORD *result ); INT WINAPI NtGdiGetAppClipBox( HDC hdc, RECT *rect ); +LONG WINAPI NtGdiGetBitmapBits( HBITMAP bitmap, LONG count, void *bits ); BOOL WINAPI NtGdiGetBitmapDimension( HBITMAP bitmap, SIZE *size ); UINT WINAPI NtGdiGetBoundsRect( HDC hdc, RECT *rect, UINT flags ); BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT first, UINT last, WCHAR *chars, @@ -312,10 +315,10 @@ BOOL WINAPI NtGdiGetFontFileInfo( DWORD instance_id, DWORD file_index, struc DWORD WINAPI NtGdiGetFontUnicodeRanges( HDC hdc, GLYPHSET *lpgs ); DWORD WINAPI NtGdiGetGlyphIndicesW( HDC hdc, const WCHAR *str, INT count, WORD *indices, DWORD flags ); -DWORD WINAPI NtGdiGetGlyphOutlineW( HDC hdc, UINT ch, UINT format, GLYPHMETRICS *metrics, - DWORD size, void *buffer, const MAT2 *mat2, - BOOL ignore_rotation ); -DWORD WINAPI NtGdiGetKerningPairsW( HDC hdc, DWORD count, KERNINGPAIR *kern_pair ); +DWORD WINAPI NtGdiGetGlyphOutline( HDC hdc, UINT ch, UINT format, GLYPHMETRICS *metrics, + DWORD size, void *buffer, const MAT2 *mat2, + BOOL ignore_rotation ); +DWORD WINAPI NtGdiGetKerningPairs( HDC hdc, DWORD count, KERNINGPAIR *kern_pair ); BOOL WINAPI NtGdiGetMiterLimit( HDC hdc, FLOAT *limit ); COLORREF WINAPI NtGdiGetNearestColor( HDC hdc, COLORREF color ); UINT WINAPI NtGdiGetNearestPaletteIndex( HPALETTE hpalette, COLORREF color ); @@ -417,6 +420,7 @@ INT WINAPI NtGdiStretchDIBitsInternal( HDC hdc, INT x_dst, INT y_dst, INT w HANDLE xform ); BOOL WINAPI NtGdiStrokePath( HDC hdc ); BOOL WINAPI NtGdiStrokeAndFillPath( HDC hdc ); +BOOL WINAPI NtGdiSwapBuffers( HDC hdc ); BOOL WINAPI NtGdiTransparentBlt( HDC hdc, int x_dst, int y_dst, int width_dst, int height_dst, HDC hdc_src, int x_src, int y_src, int width_src, int height_src, UINT color );
-
Alexandre Julliard