JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2003-02-28 Roland Schwingel <roland.schwingel@onevision.de>

Browse Source 
Fixup UNICODE thinko in 2003-02-22 patch.
	* include/wingdi.h (AddFontMemResourceEx): Add.
	(RemoveFontMemResourceEx): Ditto.
	(AddFontMemResourceEx[AW]): Remove.
	(RemoveFontMemResourceEx[AW]): Ditto
	* lib/gdi32.def: (AddFontResourceEx): Add.
	(RemoveFontMemResourceEx): Ditto.
	(AddFontMemResourceEx[AW]): Remove.
	(RemoveFontResourceEx[AW]): Ditto.
This commit is contained in:
Danny Smith
2003-02-28 08:03:13 +00:00
parent f31d07a962
commit 3d5a4cbe6b
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
winsup/w32api/include/wingdi.h
View File

@@ -2406,8 +2406,7 @@ BOOL WINAPI AbortPath(HDC);
int WINAPI AddFontResourceA(LPCSTR);
int WINAPI AddFontResourceW(LPCWSTR);
#if (_WIN32_WINNT >= 0x0500)
HANDLE WINAPI AddFontMemResourceExA(PVOID,DWORD,PVOID,DWORD);
HANDLE WINAPI AddFontMemResourceExW(PVOID,DWORD,PVOID,DWORD);
HANDLE WINAPI AddFontMemResourceEx(PVOID,DWORD,PVOID,DWORD *);
int WINAPI AddFontResourceExA(LPCSTR,DWORD,PVOID);
int WINAPI AddFontResourceExW(LPCWSTR,DWORD,PVOID);
#endif
@@ -2664,8 +2663,7 @@ BOOL WINAPI RectVisible(HDC,LPCRECT);
BOOL WINAPI RemoveFontResourceA(LPCSTR);
BOOL WINAPI RemoveFontResourceW(LPCWSTR);
#if (_WIN32_WINNT >= 0x0500)
BOOL WINAPI RemoveFontMemResourceExA(HANDLE);
BOOL WINAPI RemoveFontMemResourceExW(HANDLE);
BOOL WINAPI RemoveFontMemResourceEx(HANDLE);
BOOL WINAPI RemoveFontResourceExA(LPCSTR,DWORD,PVOID);
BOOL WINAPI RemoveFontResourceExW(LPCWSTR,DWORD,PVOID);
#endif
@@ -2784,7 +2782,6 @@ typedef ENUMLOGFONTW ENUMLOGFONT,*LPENUMLOGFONT;
typedef ENUMLOGFONTEXW ENUMLOGFONTEX,*LPENUMLOGFONTEX;
#define AddFontResource AddFontResourceW
#if (_WIN32_WINNT >= 0x0500)
#define AddFontMemResourceEx AddFontMemResourceExW
#define AddFontResourceEx AddFontResourceExW
#endif
#define CopyEnhMetaFile CopyEnhMetaFileW
@@ -2825,7 +2822,6 @@ typedef ENUMLOGFONTEXW ENUMLOGFONTEX,*LPENUMLOGFONTEX;
#define PolyTextOut PolyTextOutW
#define RemoveFontResource RemoveFontResourceW
#if (_WIN32_WINNT >= 0x0500)
#define RemoveFontMemResourceEx RemoveFontMemResourceExW
#define RemoveFontResourceEx RemoveFontResourceExW
#endif
#define ResetDC ResetDCW
@@ -2854,7 +2850,6 @@ typedef ENUMLOGFONTA ENUMLOGFONT,*LPENUMLOGFONT;
typedef ENUMLOGFONTEXA ENUMLOGFONTEX,*LPENUMLOGFONTEX;
#define AddFontResource AddFontResourceA
#if (_WIN32_WINNT >= 0x0500)
#define AddFontMemResourceEx AddFontMemResourceExA
#define AddFontResourceEx AddFontResourceExA
#endif
#define CopyEnhMetaFile CopyEnhMetaFileA
@@ -2895,7 +2890,6 @@ typedef ENUMLOGFONTEXA ENUMLOGFONTEX,*LPENUMLOGFONTEX;
#define PolyTextOut PolyTextOutA
#define RemoveFontResource RemoveFontResourceA
#if (_WIN32_WINNT >= 0x0500)
#define RemoveFontMemResourceEx RemoveFontMemResourceExA
#define RemoveFontResourceEx RemoveFontResourceExA
#endif
#define ResetDC ResetDCA