diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2003-02-28 11:03:13 +0300 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2003-02-28 11:03:13 +0300 |
| commit | 3d5a4cbe6b47394445ff671782d70c0ba2271b43 (patch) | |
| tree | dd5573707f699b001e8454bb10d3a02bfc96c673 | |
| parent | f31d07a962949d19ece6c8d086708bb09edc87ec (diff) | |
2003-02-28 Roland Schwingel <roland.schwingel@onevision.de>
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.
| -rw-r--r-- | winsup/w32api/ChangeLog | 12 | ||||
| -rw-r--r-- | winsup/w32api/include/wingdi.h | 10 | ||||
| -rw-r--r-- | winsup/w32api/lib/gdi32.def | 6 |
3 files changed, 16 insertions, 12 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index adbf625d9..c5a1e9eb5 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,15 @@ +2003-02-28 Roland Schwingel <roland.schwingel@onevision.de> + + 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. + 2003-02-23 Danny Smith <dannysmith@users.sourceforge.net> * include/winbase.h (EVENTLOG_SUCCESS): Add define. diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h index b4f5e52d0..1d7972154 100644 --- a/winsup/w32api/include/wingdi.h +++ b/winsup/w32api/include/wingdi.h @@ -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 diff --git a/winsup/w32api/lib/gdi32.def b/winsup/w32api/lib/gdi32.def index 679340f35..39c36ec20 100644 --- a/winsup/w32api/lib/gdi32.def +++ b/winsup/w32api/lib/gdi32.def @@ -2,8 +2,7 @@ LIBRARY GDI32.dll EXPORTS AbortDoc@4 AbortPath@4 -AddFontMemResourceExA@16 -AddFontMemResourceExW@16 +AddFontMemResourceEx@16 AddFontResourceA@4 AddFontResourceW@4 AddFontResourceExA@12 @@ -258,8 +257,7 @@ RealizePalette@4 RectInRegion@8 RectVisible@8 Rectangle@20 -RemoveFontMemResourceExA@4 -RemoveFontMemResourceExW@4 +RemoveFontMemResourceEx@4 RemoveFontResourceA@4 RemoveFontResourceW@4 RemoveFontResourceExA@12 |