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

gdi32: Use ntgdi for AddFontResourceExW and RemoveFontResourceExW. 

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-09-01 14:08:52 +02:00 committed by Alexandre Julliard
parent 8a68a9ee31
commit 7da78fd269
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/gdi32/font.c
View File

@ -6251,9 +6251,10 @@ void font_init(void)
} }
/*********************************************************************** /***********************************************************************
* AddFontResourceExW (GDI32.@) * NtGdiAddFontResourceW (win32u.@)
*/ */
INT WINAPI AddFontResourceExW( LPCWSTR str, DWORD flags, PVOID pdv ) INT WINAPI NtGdiAddFontResourceW( const WCHAR *str, ULONG size, ULONG files, DWORD flags,
DWORD tid, void *dv )
{ {
int ret; int ret;
WCHAR *filename; WCHAR *filename;
@ -6344,9 +6345,10 @@ BOOL WINAPI NtGdiRemoveFontMemResourceEx( HANDLE handle )
} }
/*********************************************************************** /***********************************************************************
* RemoveFontResourceExW (GDI32.@) * NtGdiRemoveFontResourceW (win32u.@)
*/ */
BOOL WINAPI RemoveFontResourceExW( LPCWSTR str, DWORD flags, PVOID pdv ) BOOL WINAPI NtGdiRemoveFontResourceW( const WCHAR *str, ULONG size, ULONG files, DWORD flags,
DWORD tid, void *dv )
{ {
int ret; int ret;
WCHAR *filename; WCHAR *filename;

16
dlls/gdi32/text.c
View File

@ -2275,6 +2275,22 @@ BOOL WINAPI RemoveFontResourceExA( const char *str, DWORD fl, void *pdv )
return ret; return ret;
} }
/***********************************************************************
* AddFontResourceExW (GDI32.@)
*/
INT WINAPI AddFontResourceExW( const WCHAR *str, DWORD flags, void *dv )
{
return NtGdiAddFontResourceW( str, 0, 1, flags, 0, dv );
}
/***********************************************************************
* RemoveFontResourceExW (GDI32.@)
*/
BOOL WINAPI RemoveFontResourceExW( const WCHAR *str, DWORD flags, void *dv )
{
return NtGdiRemoveFontResourceW( str, 0, 1, flags, 0, dv );
}
/*********************************************************************** /***********************************************************************
* GetFontResourceInfoW (GDI32.@) * GetFontResourceInfoW (GDI32.@)
*/ */

4
include/ntgdi.h
View File

@ -210,6 +210,8 @@ INT WINAPI NtGdiAbortDoc( HDC hdc );
BOOL WINAPI NtGdiAbortPath( HDC hdc ); BOOL WINAPI NtGdiAbortPath( HDC hdc );
HANDLE WINAPI NtGdiAddFontMemResourceEx( void *ptr, DWORD size, void *dv, ULONG dv_size, HANDLE WINAPI NtGdiAddFontMemResourceEx( void *ptr, DWORD size, void *dv, ULONG dv_size,
DWORD *count ); DWORD *count );
INT WINAPI NtGdiAddFontResourceW( const WCHAR *str, ULONG size, ULONG files, DWORD flags,
DWORD tid, void *dv );
BOOL WINAPI NtGdiAlphaBlend( HDC hdc_dst, int x_dst, int y_dst, int width_dst, int height_dst, BOOL WINAPI NtGdiAlphaBlend( HDC hdc_dst, 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, HDC hdc_src, int x_src, int y_src, int width_src, int height_src,
BLENDFUNCTION blend_function, HANDLE xform ); BLENDFUNCTION blend_function, HANDLE xform );
@ -351,6 +353,8 @@ BOOL WINAPI NtGdiRectInRegion( HRGN hrgn, const RECT *rect );
BOOL WINAPI NtGdiRectVisible( HDC hdc, const RECT *rect ); BOOL WINAPI NtGdiRectVisible( HDC hdc, const RECT *rect );
BOOL WINAPI NtGdiRectangle( HDC hdc, INT left, INT top, INT right, INT bottom ); BOOL WINAPI NtGdiRectangle( HDC hdc, INT left, INT top, INT right, INT bottom );
BOOL WINAPI NtGdiRemoveFontMemResourceEx( HANDLE handle ); BOOL WINAPI NtGdiRemoveFontMemResourceEx( HANDLE handle );
BOOL WINAPI NtGdiRemoveFontResourceW( const WCHAR *str, ULONG size, ULONG files,
DWORD flags, DWORD tid, void *dv );
BOOL WINAPI NtGdiResetDC( HDC hdc, const DEVMODEW *devmode, BOOL *banding, BOOL WINAPI NtGdiResetDC( HDC hdc, const DEVMODEW *devmode, BOOL *banding,
DRIVER_INFO_2W *driver_info, void *dev ); DRIVER_INFO_2W *driver_info, void *dev );
BOOL WINAPI NtGdiResizePalette( HPALETTE palette, UINT count ); BOOL WINAPI NtGdiResizePalette( HPALETTE palette, UINT count );