* include/wingdi.h (GetFontUnicodeRanges,GetGlyphIndicesA,

	GetGlyphIndicesW): Declare.
	(GGI_MARK_NONEXISTING_GLYPHS): Define
	* lib/gdi32.def (GetFontUnicodeRanges,GetGlyphIndicesA,
	GetGlyphIndicesW): Add stubs.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 81a589cda5fd7e309e2685983283bd4ce5dc32ef..e9e5f48316f9222cb9f1ff2e7e2dbc79f7e2ccf2 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,11 @@
+2004-11-02  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * include/wingdi.h (GetFontUnicodeRanges,GetGlyphIndicesA,
+       GetGlyphIndicesW): Declare.
+       (GGI_MARK_NONEXISTING_GLYPHS): Define
+       * lib/gdi32.def (GetFontUnicodeRanges,GetGlyphIndicesA,
+       GetGlyphIndicesW): Add stubs.
+
 2004-10-24  Dan Aloni  <da-x@colinux.org>
 
        * include/ddk/ntapi.h (NtQueryFullAttributesFile,

diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h
index bf678a742982da258fb9910024bcb24f57930d81..8845f69540a7b7d2ef7b15dcfdaa8778216b30eb 100644 (file)
--- a/winsup/w32api/include/wingdi.h
+++ b/winsup/w32api/include/wingdi.h
@@ -1190,6 +1190,11 @@ extern "C" {
 #define DISPLAY_DEVICE_VGA_COMPATIBLE      0x00000010
 #define DISPLAY_DEVICE_REMOVABLE           0x00000020
 #define DISPLAY_DEVICE_MODESPRUNED         0x08000000
+
+#if (_WIN32_WINNT >= 0x0500)
+#define GGI_MARK_NONEXISTING_GLYPHS 1
+#endif
+
 #ifndef RC_INVOKED
 typedef struct _ABC {
        int abcA;
@@ -2868,12 +2873,18 @@ BOOL WINAPI wglUseFontBitmapsW(HDC,DWORD,DWORD,DWORD);
 BOOL WINAPI wglUseFontOutlinesA(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,LPGLYPHMETRICSFLOAT);
 BOOL WINAPI wglUseFontOutlinesW(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,LPGLYPHMETRICSFLOAT);
 
-#if (WINVER>= 0x0500)
+#if (WINVER >= 0x0500)
 BOOL WINAPI AlphaBlend(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION);
 BOOL WINAPI GradientFill(HDC,PTRIVERTEX,ULONG,PVOID,ULONG,ULONG);
 BOOL WINAPI TransparentBlt(HDC,int,int,int,int,HDC,int,int,int,int,UINT);
 #endif
 
+#if (_WIN32_WINNT >= 0x0500)
+DWORD WINAPI GetFontUnicodeRanges(HDC,LPGLYPHSET);
+DWORD WINAPI GetGlyphIndicesA(HDC,LPCSTR,int,LPWORD,DWORD);
+DWORD WINAPI GetGlyphIndicesW(HDC,LPCWSTR,int,LPWORD,DWORD);
+#endif
+
 #ifdef UNICODE
 typedef WCHAR BCHAR;
 typedef DOCINFOW DOCINFO, *LPDOCINFO;
@@ -2948,7 +2959,10 @@ typedef DISPLAY_DEVICEW DISPLAY_DEVICE, *PDISPLAY_DEVICE, *LPDISPLAY_DEVICE;
 #define UpdateICMRegKey UpdateICMRegKeyW
 #define wglUseFontBitmaps wglUseFontBitmapsW
 #define wglUseFontOutlines wglUseFontOutlinesW
-#else
+#if (_WIN32_WINNT >= 0x0500)
+#define GetGlyphIndices  GetGlyphIndicesW
+#endif
+#else  /* UNICODE */
 typedef BYTE BCHAR;
 typedef DOCINFOA DOCINFO, *LPDOCINFO;
 typedef LOGFONTA LOGFONT,*PLOGFONT,*LPLOGFONT;
@@ -3022,8 +3036,11 @@ typedef DISPLAY_DEVICEA DISPLAY_DEVICE, *PDISPLAY_DEVICE, *LPDISPLAY_DEVICE;
 #define UpdateICMRegKey UpdateICMRegKeyA
 #define wglUseFontBitmaps wglUseFontBitmapsA
 #define wglUseFontOutlines wglUseFontOutlinesA
+#if (_WIN32_WINNT >= 0x0500)
+#define GetGlyphIndices  GetGlyphIndicesA
 #endif
-#endif
+#endif /* UNICODE */
+#endif /* RC_INVOKED */
 #ifdef __cplusplus
 }
 #endif

diff --git a/winsup/w32api/lib/gdi32.def b/winsup/w32api/lib/gdi32.def
index 927664c95d71ecc49e101e0ff10bb3aae7be865b..a0df3995bd8ef34b03a9cec9cb15cb7e8128e5f8 100644 (file)
--- a/winsup/w32api/lib/gdi32.def
+++ b/winsup/w32api/lib/gdi32.def
@@ -159,6 +159,9 @@ GetFontData@20
 GetFontLanguageInfo@4
 GetFontResourceInfo@16
 GetFontResourceInfoW@16
+GetFontUnicodeRanges@8
+GetGlyphIndicesA@20
+GetGlyphIndicesW@20
 GetGlyphOutline@28
 GetGlyphOutlineA@28
 GetGlyphOutlineW@28