diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2003-02-12 21:15:13 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2003-02-12 21:15:13 +0000 |
| commit | 31ad033df20c27566466380f3376a0e8a3094ad4 (patch) | |
| tree | b9971afb65124f6cde84b81df540f6968343079b | |
| parent | de8eec5609a297c8622c3ceeb1cc37bbe5214de5 (diff) | |
| download | cygnal-31ad033df20c27566466380f3376a0e8a3094ad4.tar.gz cygnal-31ad033df20c27566466380f3376a0e8a3094ad4.tar.bz2 cygnal-31ad033df20c27566466380f3376a0e8a3094ad4.zip | |
2003-02-12 Roland Schwingel <roland.schwingel@onevision.de>
* include/wingdi.h (AddFontResourceEx[AW]): Add.
(RemoveFontResourceEx[AW]): Ditto
(FR_PRIVATE): Define.
(FR_NOT_ENUM): Define.
* lib/gdi32.def (AddFontResourceEx[AW]): Add.
(RemoveFontResourceEx[AW]): Ditto.
| -rw-r--r-- | winsup/w32api/ChangeLog | 9 | ||||
| -rw-r--r-- | winsup/w32api/include/wingdi.h | 24 | ||||
| -rw-r--r-- | winsup/w32api/lib/gdi32.def | 4 |
3 files changed, 37 insertions, 0 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 824d939c9..9a827da24 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,12 @@ +2003-02-12 Roland Schwingel <roland.schwingel@onevision.de> + + * include/wingdi.h (AddFontResourceEx[AW]): Add. + (RemoveFontResourceEx[AW]): Ditto + (FR_PRIVATE): Define. + (FR_NOT_ENUM): Define. + * lib/gdi32.def (AddFontResourceEx[AW]): Add. + (RemoveFontResourceEx[AW]): Ditto. + 2003-02-10 Earnie Boyd <earnie@users.sf.net> * include/w32api.h: Increment version to 2.3. diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h index 7fd90e8f6..69840ac2d 100644 --- a/winsup/w32api/include/wingdi.h +++ b/winsup/w32api/include/wingdi.h @@ -154,6 +154,10 @@ extern "C" { #define EMR_PIXELFORMAT 104 #define ENHMETA_SIGNATURE 1179469088 #define EPS_SIGNATURE 0x46535045 +#if (_WIN32_WINNT >= 0x0500) +#define FR_PRIVATE 0x10 +#define FR_NOT_ENUM 0x20 +#endif #define META_SETBKCOLOR 0x201 #define META_SETBKMODE 0x102 #define META_SETMAPMODE 0x103 @@ -2401,6 +2405,10 @@ int WINAPI AbortDoc(HDC); BOOL WINAPI AbortPath(HDC); int WINAPI AddFontResourceA(LPCSTR); int WINAPI AddFontResourceW(LPCWSTR); +#if (_WIN32_WINNT >= 0x0500) +int WINAPI AddFontResourceExA(LPCSTR,DWORD,PVOID); +int WINAPI AddFontResourceExW(LPCWSTR,DWORD,PVOID); +#endif BOOL WINAPI AngleArc(HDC,int,int,DWORD,FLOAT,FLOAT); BOOL WINAPI AnimatePalette(HPALETTE,UINT,UINT,const PALETTEENTRY*); BOOL WINAPI Arc(HDC,int,int,int,int,int,int,int,int); @@ -2653,6 +2661,10 @@ BOOL WINAPI RectInRegion(HRGN,LPCRECT); BOOL WINAPI RectVisible(HDC,LPCRECT); BOOL WINAPI RemoveFontResourceA(LPCSTR); BOOL WINAPI RemoveFontResourceW(LPCWSTR); +#if (_WIN32_WINNT >= 0x0500) +BOOL WINAPI RemoveFontResourceExA(LPCSTR,DWORD,PVOID); +BOOL WINAPI RemoveFontResourceExW(LPCWSTR,DWORD,PVOID); +#endif HDC WINAPI ResetDCA(HDC,const DEVMODEA*); HDC WINAPI ResetDCW(HDC,const DEVMODEW*); BOOL WINAPI ResizePalette(HPALETTE,UINT); @@ -2767,6 +2779,9 @@ typedef NEWTEXTMETRICEXW NEWTEXTMETRICEX; typedef ENUMLOGFONTW ENUMLOGFONT,*LPENUMLOGFONT; typedef ENUMLOGFONTEXW ENUMLOGFONTEX,*LPENUMLOGFONTEX; #define AddFontResource AddFontResourceW +#if (_WIN32_WINNT >= 0x0500) +#define AddFontResourceEx AddFontResourceExW +#endif #define CopyEnhMetaFile CopyEnhMetaFileW #define CopyMetaFile CopyMetaFileW #define CreateDC CreateDCW @@ -2804,6 +2819,9 @@ typedef ENUMLOGFONTEXW ENUMLOGFONTEX,*LPENUMLOGFONTEX; #define GetTextMetrics GetTextMetricsW #define PolyTextOut PolyTextOutW #define RemoveFontResource RemoveFontResourceW +#if (_WIN32_WINNT >= 0x0500) +#define RemoveFontResourceEx RemoveFontResourceExW +#endif #define ResetDC ResetDCW #define SetICMProfile SetICMProfileW #define StartDoc StartDocW @@ -2829,6 +2847,9 @@ typedef NEWTEXTMETRICEXA NEWTEXTMETRICEX; typedef ENUMLOGFONTA ENUMLOGFONT,*LPENUMLOGFONT; typedef ENUMLOGFONTEXA ENUMLOGFONTEX,*LPENUMLOGFONTEX; #define AddFontResource AddFontResourceA +#if (_WIN32_WINNT >= 0x0500) +#define AddFontResourceEx AddFontResourceExA +#endif #define CopyEnhMetaFile CopyEnhMetaFileA #define CopyMetaFile CopyMetaFileA #define CreateDC CreateDCA @@ -2866,6 +2887,9 @@ typedef ENUMLOGFONTEXA ENUMLOGFONTEX,*LPENUMLOGFONTEX; #define GetTextMetrics GetTextMetricsA #define PolyTextOut PolyTextOutA #define RemoveFontResource RemoveFontResourceA +#if (_WIN32_WINNT >= 0x0500) +#define RemoveFontResourceEx RemoveFontResourceExA +#endif #define ResetDC ResetDCA #define SetICMProfile SetICMProfileA #define StartDoc StartDocA diff --git a/winsup/w32api/lib/gdi32.def b/winsup/w32api/lib/gdi32.def index d3b3d9c35..925e19e81 100644 --- a/winsup/w32api/lib/gdi32.def +++ b/winsup/w32api/lib/gdi32.def @@ -4,6 +4,8 @@ AbortDoc@4 AbortPath@4 AddFontResourceA@4 AddFontResourceW@4 +AddFontResourceExA@12 +AddFontResourceExW@12 AngleArc@24 AnimatePalette@16 Arc@36 @@ -256,6 +258,8 @@ RectVisible@8 Rectangle@20 RemoveFontResourceA@4 RemoveFontResourceW@4 +RemoveFontResourceExA@12 +RemoveFontResourceExW@12 ResetDCA@8 ResetDCW@8 ResizePalette@8 |