Implement GetFontData.

4e2024e8 · Huw D M Davies · Alexandre Julliard · 2843934a · 4e2024e8 · 4e2024e8
Commit 4e2024e8 authored Oct 23, 2001 by Huw D M Davies Committed by Alexandre Julliard Oct 23, 2001
Showing with 202 additions and 145 deletions

configure configure +138 -137

configure.in configure.in +2 -1

freetype.c dlls/gdi/freetype.c +47 -0

config.h.in include/config.h.in +4 -1

font.h include/font.h +1 -0

font.c objects/font.c +10 -6

No files found.
--- a/configure
+++ b/configure
@@ -4664,21 +4664,22 @@ EOF
                         freetype/ftnames.h \
                         freetype/ftsnames.h \
                         freetype/ttnameid.h \
-                         freetype/ftoutln.h
+                         freetype/ftoutln.h \
+                         freetype/internal/sfnt.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4672: checking for $ac_hdr" >&5
+echo "configure:4673: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4677 "configure"
+#line 4678 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4683: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4712,19 +4713,19 @@ fi


 echo $ac_n "checking for parport header/ppdev.h""... $ac_c" 1>&6
-echo "configure:4716: checking for parport header/ppdev.h" >&5
+echo "configure:4717: checking for parport header/ppdev.h" >&5
 if eval "test \"`echo '$''{'ac_cv_c_ppdev'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4721 "configure"
+#line 4722 "configure"
 #include "confdefs.h"
 #include <linux/ppdev.h>
 int main() {
 ioctl (1,PPCLAIM,0)
 ; return 0; }
 EOF
-if { (eval echo configure:4728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_ppdev="yes"
 else
@@ -4747,12 +4748,12 @@ EOF
 fi

 echo $ac_n "checking for GNU style IPX support""... $ac_c" 1>&6
-echo "configure:4751: checking for GNU style IPX support" >&5
+echo "configure:4752: checking for GNU style IPX support" >&5
 if eval "test \"`echo '$''{'ac_cv_c_ipx_gnu'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4756 "configure"
+#line 4757 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
    #include <netipx/ipx.h>
@@ -4760,7 +4761,7 @@ int main() {
 ((struct sockaddr_ipx *)0)->sipx_family == AF_IPX
 ; return 0; }
 EOF
-if { (eval echo configure:4764: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_ipx_gnu="yes"
 else
@@ -4785,12 +4786,12 @@ fi
 if test "$ac_cv_c_ipx_gnu" = "no"
 then
 echo $ac_n "checking for linux style IPX support""... $ac_c" 1>&6
-echo "configure:4789: checking for linux style IPX support" >&5
+echo "configure:4790: checking for linux style IPX support" >&5
 if eval "test \"`echo '$''{'ac_cv_c_ipx_linux'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4794 "configure"
+#line 4795 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
     #include <asm/types.h>
@@ -4799,7 +4800,7 @@ int main() {
 ((struct sockaddr_ipx *)0)->sipx_family == AF_IPX
 ; return 0; }
 EOF
-if { (eval echo configure:4803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_ipx_linux="yes"
 else
@@ -4826,17 +4827,17 @@ for ac_hdr in sys/soundcard.h machine/soundcard.h soundcard.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4830: checking for $ac_hdr" >&5
+echo "configure:4831: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4835 "configure"
+#line 4836 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4864,12 +4865,12 @@ done


 echo $ac_n "checking for Open Sound System""... $ac_c" 1>&6
-echo "configure:4868: checking for Open Sound System" >&5
+echo "configure:4869: checking for Open Sound System" >&5
 if eval "test \"`echo '$''{'ac_cv_c_opensoundsystem'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4873 "configure"
+#line 4874 "configure"
 #include "confdefs.h"

 	#if defined(HAVE_SYS_SOUNDCARD_H)
@@ -4890,7 +4891,7 @@ int main() {

 ; return 0; }
 EOF
-if { (eval echo configure:4894: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4895: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_opensoundsystem="yes"
 else
@@ -4913,12 +4914,12 @@ EOF
 fi

 echo $ac_n "checking for Open Sound System/MIDI interface""... $ac_c" 1>&6
-echo "configure:4917: checking for Open Sound System/MIDI interface" >&5
+echo "configure:4918: checking for Open Sound System/MIDI interface" >&5
 if eval "test \"`echo '$''{'ac_cv_c_opensoundsystem_midi'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4922 "configure"
+#line 4923 "configure"
 #include "confdefs.h"

 	#if defined(HAVE_SYS_SOUNDCARD_H)
@@ -4939,7 +4940,7 @@ int main() {

 ; return 0; }
 EOF
-if { (eval echo configure:4943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_opensoundsystem_midi="yes"
 else
@@ -4965,7 +4966,7 @@ if test "$ac_cv_prog_LN_S" = "ln -s"; then : ; else LN_S=cp ; fi


 echo $ac_n "checking whether mmap64 works defined as mmap""... $ac_c" 1>&6
-echo "configure:4969: checking whether mmap64 works defined as mmap" >&5
+echo "configure:4970: checking whether mmap64 works defined as mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_mmap64_works'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4973,7 +4974,7 @@ else
  ac_cv_mmap64_works="no"
 else
  cat > conftest.$ac_ext <<EOF
-#line 4977 "configure"
+#line 4978 "configure"
 #include "confdefs.h"

 		#define _FILE_OFFSET_BITS 64
@@ -5003,7 +5004,7 @@ else

 	
 EOF
-if { (eval echo configure:5007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
  ac_cv_mmap64_works="yes"
 else
@@ -5032,7 +5033,7 @@ if test "x${GCC}" = "xyes"
 then
  CFLAGS="$CFLAGS -Wall"
  echo $ac_n "checking for gcc strength-reduce bug""... $ac_c" 1>&6
-echo "configure:5036: checking for gcc strength-reduce bug" >&5
+echo "configure:5037: checking for gcc strength-reduce bug" >&5
 if eval "test \"`echo '$''{'ac_cv_c_gcc_strength_bug'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5040,7 +5041,7 @@ else
  ac_cv_c_gcc_strength_bug="yes"
 else
  cat > conftest.$ac_ext <<EOF
-#line 5044 "configure"
+#line 5045 "configure"
 #include "confdefs.h"

 int	L[4] = {0,1,2,3};
@@ -5055,7 +5056,7 @@ int main(void) {
  exit( Array[1] != -2 || L[2] != 3);
 }
 EOF
-if { (eval echo configure:5059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
  ac_cv_c_gcc_strength_bug="no"
 else
@@ -5076,21 +5077,21 @@ echo "$ac_t""$ac_cv_c_gcc_strength_bug" 1>&6
  fi

    echo $ac_n "checking for gcc -mpreferred-stack-boundary=2 support""... $ac_c" 1>&6
-echo "configure:5080: checking for gcc -mpreferred-stack-boundary=2 support" >&5
+echo "configure:5081: checking for gcc -mpreferred-stack-boundary=2 support" >&5
 if eval "test \"`echo '$''{'ac_cv_c_gcc_stack_boundary'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  saved_cflags=$CFLAGS
  CFLAGS="$CFLAGS -mpreferred-stack-boundary=2"
  cat > conftest.$ac_ext <<EOF
-#line 5087 "configure"
+#line 5088 "configure"
 #include "confdefs.h"

 int main() {
 return 0
 ; return 0; }
 EOF
-if { (eval echo configure:5094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5095: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_gcc_stack_boundary="yes"
 else
@@ -5113,7 +5114,7 @@ fi


 echo $ac_n "checking whether .type must sit inside a .def directive""... $ac_c" 1>&6
-echo "configure:5117: checking whether .type must sit inside a .def directive" >&5
+echo "configure:5118: checking whether .type must sit inside a .def directive" >&5
 if eval "test \"`echo '$''{'ac_cv_c_type_in_def'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5126,14 +5127,14 @@ _ac_test:
 	.long 0
 EOF
 cat > conftest.$ac_ext <<EOF
-#line 5130 "configure"
+#line 5131 "configure"
 #include "confdefs.h"

 int main() {

 ; return 0; }
 EOF
-if { (eval echo configure:5137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_c_type_in_def="yes"
 else
@@ -5157,7 +5158,7 @@ fi
 

 echo $ac_n "checking whether external symbols need an underscore prefix""... $ac_c" 1>&6
-echo "configure:5161: checking whether external symbols need an underscore prefix" >&5
+echo "configure:5162: checking whether external symbols need an underscore prefix" >&5
 if eval "test \"`echo '$''{'ac_cv_c_extern_prefix'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5169,14 +5170,14 @@ _ac_test:
 	.long 0
 EOF
 cat > conftest.$ac_ext <<EOF
-#line 5173 "configure"
+#line 5174 "configure"
 #include "confdefs.h"
 extern int ac_test;
 int main() {
 if (ac_test) return 1
 ; return 0; }
 EOF
-if { (eval echo configure:5180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_c_extern_prefix="yes"
 else
@@ -5200,7 +5201,7 @@ fi


 echo $ac_n "checking whether assembler accepts .string""... $ac_c" 1>&6
-echo "configure:5204: checking whether assembler accepts .string" >&5
+echo "configure:5205: checking whether assembler accepts .string" >&5
 if eval "test \"`echo '$''{'ac_cv_c_asm_string'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5210,14 +5211,14 @@ cat > conftest_asm.s <<EOF
 	.string "test"
 EOF
 cat > conftest.$ac_ext <<EOF
-#line 5214 "configure"
+#line 5215 "configure"
 #include "confdefs.h"

 int main() {

 ; return 0; }
 EOF
-if { (eval echo configure:5221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_c_asm_string="yes"
 else
@@ -5245,21 +5246,21 @@ LDDLLFLAGS=""
 if test "$LIBEXT" = "so"
 then
  echo $ac_n "checking whether we can build a GNU style ELF dll""... $ac_c" 1>&6
-echo "configure:5249: checking whether we can build a GNU style ELF dll" >&5
+echo "configure:5250: checking whether we can build a GNU style ELF dll" >&5
 if eval "test \"`echo '$''{'ac_cv_c_dll_gnuelf'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  saved_cflags=$CFLAGS
  CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,conftest.so.1.0,-Bsymbolic"
  cat > conftest.$ac_ext <<EOF
-#line 5256 "configure"
+#line 5257 "configure"
 #include "confdefs.h"

 int main() {
 return 1
 ; return 0; }
 EOF
-if { (eval echo configure:5263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_c_dll_gnuelf="yes"
 else
@@ -5280,21 +5281,21 @@ echo "$ac_t""$ac_cv_c_dll_gnuelf" 1>&6
    LDDLLFLAGS="-Wl,-Bsymbolic"
  else
    echo $ac_n "checking whether we can build a UnixWare (Solaris) dll""... $ac_c" 1>&6
-echo "configure:5284: checking whether we can build a UnixWare (Solaris) dll" >&5
+echo "configure:5285: checking whether we can build a UnixWare (Solaris) dll" >&5
 if eval "test \"`echo '$''{'ac_cv_c_dll_unixware'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  saved_cflags=$CFLAGS
    CFLAGS="$CFLAGS -fPIC -Wl,-G,-h,conftest.so.1.0,-B,symbolic"
    cat > conftest.$ac_ext <<EOF
-#line 5291 "configure"
+#line 5292 "configure"
 #include "confdefs.h"

 int main() {
 return 1
 ; return 0; }
 EOF
-if { (eval echo configure:5298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_c_dll_unixware="yes"
 else
@@ -5358,7 +5359,7 @@ fi
 wine_cv_libc_reentrant=no 

  echo $ac_n "checking for reentrant libc: __errno_location""... $ac_c" 1>&6
-echo "configure:5362: checking for reentrant libc: __errno_location" >&5
+echo "configure:5363: checking for reentrant libc: __errno_location" >&5
 if eval "test \"`echo '$''{'wine_cv_libc_r___errno_location'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5366,14 +5367,14 @@ else
  wine_cv_libc_r___errno_location=yes 
 else
  cat > conftest.$ac_ext <<EOF
-#line 5370 "configure"
+#line 5371 "configure"
 #include "confdefs.h"
 int myerrno = 0;
 char buf[256];
 int *__errno_location(){return &myerrno;}
 main(){connect(0,buf,255); exit(!myerrno);}
 EOF
-if { (eval echo configure:5377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
  wine_cv_libc_r___errno_location=yes
 else
@@ -5396,7 +5397,7 @@ fi


  echo $ac_n "checking for reentrant libc: __error""... $ac_c" 1>&6
-echo "configure:5400: checking for reentrant libc: __error" >&5
+echo "configure:5401: checking for reentrant libc: __error" >&5
 if eval "test \"`echo '$''{'wine_cv_libc_r___error'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5404,14 +5405,14 @@ else
  wine_cv_libc_r___error=yes 
 else
  cat > conftest.$ac_ext <<EOF
-#line 5408 "configure"
+#line 5409 "configure"
 #include "confdefs.h"
 int myerrno = 0;
 char buf[256];
 int *__error(){return &myerrno;}
 main(){connect(0,buf,255); exit(!myerrno);}
 EOF
-if { (eval echo configure:5415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
  wine_cv_libc_r___error=yes
 else
@@ -5434,7 +5435,7 @@ fi


  echo $ac_n "checking for reentrant libc: ___errno""... $ac_c" 1>&6
-echo "configure:5438: checking for reentrant libc: ___errno" >&5
+echo "configure:5439: checking for reentrant libc: ___errno" >&5
 if eval "test \"`echo '$''{'wine_cv_libc_r____errno'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5442,14 +5443,14 @@ else
  wine_cv_libc_r____errno=yes 
 else
  cat > conftest.$ac_ext <<EOF
-#line 5446 "configure"
+#line 5447 "configure"
 #include "confdefs.h"
 int myerrno = 0;
 char buf[256];
 int *___errno(){return &myerrno;}
 main(){connect(0,buf,255); exit(!myerrno);}
 EOF
-if { (eval echo configure:5453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
  wine_cv_libc_r____errno=yes
 else
@@ -5472,7 +5473,7 @@ fi


  echo $ac_n "checking for reentrant libc: __thr_errno""... $ac_c" 1>&6
-echo "configure:5476: checking for reentrant libc: __thr_errno" >&5
+echo "configure:5477: checking for reentrant libc: __thr_errno" >&5
 if eval "test \"`echo '$''{'wine_cv_libc_r___thr_errno'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5480,14 +5481,14 @@ else
  wine_cv_libc_r___thr_errno=yes 
 else
  cat > conftest.$ac_ext <<EOF
-#line 5484 "configure"
+#line 5485 "configure"
 #include "confdefs.h"
 int myerrno = 0;
 char buf[256];
 int *__thr_errno(){return &myerrno;}
 main(){connect(0,buf,255); exit(!myerrno);}
 EOF
-if { (eval echo configure:5491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
  wine_cv_libc_r___thr_errno=yes
 else
@@ -5510,7 +5511,7 @@ fi


  echo $ac_n "checking for reentrant libc: __errno""... $ac_c" 1>&6
-echo "configure:5514: checking for reentrant libc: __errno" >&5
+echo "configure:5515: checking for reentrant libc: __errno" >&5
 if eval "test \"`echo '$''{'wine_cv_libc_r___errno'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5518,14 +5519,14 @@ else
  wine_cv_libc_r___errno=yes 
 else
  cat > conftest.$ac_ext <<EOF
-#line 5522 "configure"
+#line 5523 "configure"
 #include "confdefs.h"
 int myerrno = 0;
 char buf[256];
 int *__errno(){return &myerrno;}
 main(){connect(0,buf,255); exit(!myerrno);}
 EOF
-if { (eval echo configure:5529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
  wine_cv_libc_r___errno=yes
 else
@@ -5559,7 +5560,7 @@ fi
 if test "$have_x" = "yes" -a "$wine_cv_libc_reentrant" != "no"
 then
 echo $ac_n "checking for reentrant X libraries""... $ac_c" 1>&6
-echo "configure:5563: checking for reentrant X libraries" >&5
+echo "configure:5564: checking for reentrant X libraries" >&5
 if eval "test \"`echo '$''{'wine_cv_x_reentrant'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5608,19 +5609,19 @@ fi
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:5612: checking for working alloca.h" >&5
+echo "configure:5613: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5617 "configure"
+#line 5618 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:5624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_header_alloca_h=yes
 else
@@ -5641,12 +5642,12 @@ EOF
 fi

 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:5645: checking for alloca" >&5
+echo "configure:5646: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5650 "configure"
+#line 5651 "configure"
 #include "confdefs.h"

 #ifdef __GNUC__
@@ -5674,7 +5675,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:5678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_func_alloca_works=yes
 else
@@ -5706,12 +5707,12 @@ EOF


 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:5710: checking whether alloca needs Cray hooks" >&5
+echo "configure:5711: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5715 "configure"
+#line 5716 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -5736,12 +5737,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5740: checking for $ac_func" >&5
+echo "configure:5741: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5745 "configure"
+#line 5746 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@@ -5764,7 +5765,7 @@ $ac_func();

 ; return 0; }
 EOF
-if { (eval echo configure:5768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_func_$ac_func=yes"
 else
@@ -5791,7 +5792,7 @@ done
 fi

 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:5795: checking stack direction for C alloca" >&5
+echo "configure:5796: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5799,7 +5800,7 @@ else
  ac_cv_c_stack_direction=0
 else
  cat > conftest.$ac_ext <<EOF
-#line 5803 "configure"
+#line 5804 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -5818,7 +5819,7 @@ main ()
  exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:5822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
  ac_cv_c_stack_direction=1
 else
@@ -5878,12 +5879,12 @@ for ac_func in \

 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5882: checking for $ac_func" >&5
+echo "configure:5883: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5887 "configure"
+#line 5888 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@@ -5906,7 +5907,7 @@ $ac_func();

 ; return 0; }
 EOF
-if { (eval echo configure:5910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_func_$ac_func=yes"
 else
@@ -5989,17 +5990,17 @@ for ac_hdr in \
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5993: checking for $ac_hdr" >&5
+echo "configure:5994: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 5998 "configure"
+#line 5999 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6003: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6004: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -6026,12 +6027,12 @@ fi
 done

 echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
-echo "configure:6030: checking whether stat file-mode macros are broken" >&5
+echo "configure:6031: checking whether stat file-mode macros are broken" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 6035 "configure"
+#line 6036 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -6084,12 +6085,12 @@ fi


 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:6088: checking for working const" >&5
+echo "configure:6089: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 6093 "configure"
+#line 6094 "configure"
 #include "confdefs.h"

 int main() {
@@ -6138,7 +6139,7 @@ ccp = (char const *const *) p;

 ; return 0; }
 EOF
-if { (eval echo configure:6142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_const=yes
 else
@@ -6159,21 +6160,21 @@ EOF
 fi

 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:6163: checking for inline" >&5
+echo "configure:6164: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
  cat > conftest.$ac_ext <<EOF
-#line 6170 "configure"
+#line 6171 "configure"
 #include "confdefs.h"

 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:6177: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6178: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_inline=$ac_kw; break
 else
@@ -6199,12 +6200,12 @@ EOF
 esac

 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:6203: checking for ANSI C header files" >&5
+echo "configure:6204: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 6208 "configure"
+#line 6209 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -6212,7 +6213,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6216: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -6229,7 +6230,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 6233 "configure"
+#line 6234 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -6247,7 +6248,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 6251 "configure"
+#line 6252 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -6268,7 +6269,7 @@ if test "$cross_compiling" = yes; then
  :
 else
  cat > conftest.$ac_ext <<EOF
-#line 6272 "configure"
+#line 6273 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -6279,7 +6280,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }

 EOF
-if { (eval echo configure:6283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
  :
 else
@@ -6303,12 +6304,12 @@ EOF
 fi

 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:6307: checking for size_t" >&5
+echo "configure:6308: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 6312 "configure"
+#line 6313 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6336,7 +6337,7 @@ EOF
 fi

 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:6340: checking size of long long" >&5
+echo "configure:6341: checking size of long long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6344,7 +6345,7 @@ else
  ac_cv_sizeof_long_long=0
 else
  cat > conftest.$ac_ext <<EOF
-#line 6348 "configure"
+#line 6349 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -6356,7 +6357,7 @@ main()
  exit(0);
 }
 EOF
-if { (eval echo configure:6360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
  ac_cv_sizeof_long_long=`cat conftestval`
 else
@@ -6377,12 +6378,12 @@ EOF


 echo $ac_n "checking whether linux/input.h is for real""... $ac_c" 1>&6
-echo "configure:6381: checking whether linux/input.h is for real" >&5
+echo "configure:6382: checking whether linux/input.h is for real" >&5
 if eval "test \"`echo '$''{'wine_cv_linux_input_h'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 6386 "configure"
+#line 6387 "configure"
 #include "confdefs.h"

 	    #include <linux/input.h>
@@ -6395,7 +6396,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:6399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  wine_cv_linux_input_h=yes
 else
@@ -6419,12 +6420,12 @@ EOF

   
 echo $ac_n "checking whether we can use re-entrant gethostbyname_r Linux style""... $ac_c" 1>&6
-echo "configure:6423: checking whether we can use re-entrant gethostbyname_r Linux style" >&5
+echo "configure:6424: checking whether we can use re-entrant gethostbyname_r Linux style" >&5
 if eval "test \"`echo '$''{'wine_cv_linux_gethostbyname_r_6'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 6428 "configure"
+#line 6429 "configure"
 #include "confdefs.h"

 #include <netdb.h>
@@ -6445,7 +6446,7 @@ int main() {
    
 ; return 0; }
 EOF
-if { (eval echo configure:6449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  wine_cv_linux_gethostbyname_r_6=yes
 else
@@ -6471,12 +6472,12 @@ EOF
 if test "$ac_cv_header_linux_joystick_h" = "yes"
 then
   echo $ac_n "checking whether linux/joystick.h uses the Linux 2.2+ API""... $ac_c" 1>&6
-echo "configure:6475: checking whether linux/joystick.h uses the Linux 2.2+ API" >&5
+echo "configure:6476: checking whether linux/joystick.h uses the Linux 2.2+ API" >&5
 if eval "test \"`echo '$''{'wine_cv_linux_joystick_22_api'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 6480 "configure"
+#line 6481 "configure"
 #include "confdefs.h"

 	#include <sys/ioctl.h>
@@ -6491,7 +6492,7 @@ int main() {
 /*empty*/
 ; return 0; }
 EOF
-if { (eval echo configure:6495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  wine_cv_linux_joystick_22_api=yes
 else
@@ -6518,12 +6519,12 @@ fi
 if test "$ac_cv_header_sys_vfs_h" = "yes"
 then
    echo $ac_n "checking whether sys/vfs.h defines statfs""... $ac_c" 1>&6
-echo "configure:6522: checking whether sys/vfs.h defines statfs" >&5
+echo "configure:6523: checking whether sys/vfs.h defines statfs" >&5
 if eval "test \"`echo '$''{'wine_cv_sys_vfs_has_statfs'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 6527 "configure"
+#line 6528 "configure"
 #include "confdefs.h"

 	#include <sys/types.h>
@@ -6540,7 +6541,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:6544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  wine_cv_sys_vfs_has_statfs=yes
 else
@@ -6567,12 +6568,12 @@ fi
 if test "$ac_cv_header_sys_statfs_h" = "yes"
 then
    echo $ac_n "checking whether sys/statfs.h defines statfs""... $ac_c" 1>&6
-echo "configure:6571: checking whether sys/statfs.h defines statfs" >&5
+echo "configure:6572: checking whether sys/statfs.h defines statfs" >&5
 if eval "test \"`echo '$''{'wine_cv_sys_statfs_has_statfs'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 6576 "configure"
+#line 6577 "configure"
 #include "confdefs.h"

 	#include <sys/types.h>
@@ -6587,7 +6588,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:6591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  wine_cv_sys_statfs_has_statfs=yes
 else
@@ -6614,12 +6615,12 @@ fi
 if test "$ac_cv_header_sys_mount_h" = "yes"
 then
    echo $ac_n "checking whether sys/mount.h defines statfs""... $ac_c" 1>&6
-echo "configure:6618: checking whether sys/mount.h defines statfs" >&5
+echo "configure:6619: checking whether sys/mount.h defines statfs" >&5
 if eval "test \"`echo '$''{'wine_cv_sys_mount_has_statfs'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 6623 "configure"
+#line 6624 "configure"
 #include "confdefs.h"

 	#include <sys/types.h>
@@ -6634,7 +6635,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:6638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  wine_cv_sys_mount_has_statfs=yes
 else
@@ -6660,7 +6661,7 @@ fi


 echo $ac_n "checking for statfs.f_bfree""... $ac_c" 1>&6
-echo "configure:6664: checking for statfs.f_bfree" >&5
+echo "configure:6665: checking for statfs.f_bfree" >&5
 if eval "test \"`echo '$''{'wine_cv_statfs_bfree'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6669,7 +6670,7 @@ else
        wine_cv_statfs_bfree=no
    else
    	cat > conftest.$ac_ext <<EOF
-#line 6673 "configure"
+#line 6674 "configure"
 #include "confdefs.h"

 	#include <sys/types.h>
@@ -6696,7 +6697,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:6700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  wine_cv_statfs_bfree=yes
 else
@@ -6720,7 +6721,7 @@ EOF
 fi

 echo $ac_n "checking for statfs.f_bavail""... $ac_c" 1>&6
-echo "configure:6724: checking for statfs.f_bavail" >&5
+echo "configure:6725: checking for statfs.f_bavail" >&5
 if eval "test \"`echo '$''{'wine_cv_statfs_bavail'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6729,7 +6730,7 @@ else
        wine_cv_statfs_bavail=no
    else
    	cat > conftest.$ac_ext <<EOF
-#line 6733 "configure"
+#line 6734 "configure"
 #include "confdefs.h"

 	#include <sys/types.h>
@@ -6756,7 +6757,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:6760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  wine_cv_statfs_bavail=yes
 else
@@ -6781,12 +6782,12 @@ fi


 echo $ac_n "checking for msg_accrights in struct msghdr""... $ac_c" 1>&6
-echo "configure:6785: checking for msg_accrights in struct msghdr" >&5
+echo "configure:6786: checking for msg_accrights in struct msghdr" >&5
 if eval "test \"`echo '$''{'ac_cv_c_msg_accrights'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 6790 "configure"
+#line 6791 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -6794,7 +6795,7 @@ int main() {
 struct msghdr hdr; hdr.msg_accrights=0
 ; return 0; }
 EOF
-if { (eval echo configure:6798: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_msg_accrights="yes"
 else
@@ -6817,12 +6818,12 @@ fi


 echo $ac_n "checking for sa_len in struct sockaddr""... $ac_c" 1>&6
-echo "configure:6821: checking for sa_len in struct sockaddr" >&5
+echo "configure:6822: checking for sa_len in struct sockaddr" >&5
 if eval "test \"`echo '$''{'ac_cv_c_sockaddr_sa_len'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 6826 "configure"
+#line 6827 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -6831,7 +6832,7 @@ int main() {
 static struct sockaddr addr; addr.sa_len = 1
 ; return 0; }
 EOF
-if { (eval echo configure:6835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_sockaddr_sa_len="yes"
 else
@@ -6854,12 +6855,12 @@ fi


 echo $ac_n "checking for sun_len in struct sockaddr_un""... $ac_c" 1>&6
-echo "configure:6858: checking for sun_len in struct sockaddr_un" >&5
+echo "configure:6859: checking for sun_len in struct sockaddr_un" >&5
 if eval "test \"`echo '$''{'ac_cv_c_sockaddr_sun_len'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 6863 "configure"
+#line 6864 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -6868,7 +6869,7 @@ int main() {
 static struct sockaddr_un addr; addr.sun_len = 1
 ; return 0; }
 EOF
-if { (eval echo configure:6872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_sockaddr_sun_len="yes"
 else
@@ -6891,12 +6892,12 @@ fi


 echo $ac_n "checking whether we need to define __i386__""... $ac_c" 1>&6
-echo "configure:6895: checking whether we need to define __i386__" >&5
+echo "configure:6896: checking whether we need to define __i386__" >&5
 if eval "test \"`echo '$''{'ac_cv_cpp_def_i386'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 6900 "configure"
+#line 6901 "configure"
 #include "confdefs.h"
 #if (defined(i386) || defined(__i386)) && !defined(__i386__)
 yes

--- a/configure.in
+++ b/configure.in
@@ -414,7 +414,8 @@ else
                         freetype/ftnames.h \
                         freetype/ftsnames.h \
                         freetype/ttnameid.h \
-                         freetype/ftoutln.h)
+                         freetype/ftoutln.h \
+                         freetype/internal/sfnt.h)
 	CPPFLAGS="$ac_save_CPPFLAGS"
 	wine_cv_msg_freetype=no
    fi

--- a/dlls/gdi/freetype.c
+++ b/dlls/gdi/freetype.c
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <dirent.h>
 #include <stdio.h>
+#include <assert.h>

 DEFAULT_DEBUG_CHANNEL(font);

@@ -47,6 +48,9 @@ DEFAULT_DEBUG_CHANNEL(font);
 #ifdef HAVE_FREETYPE_FTOUTLN_H
 #include <freetype/ftoutln.h>
 #endif
+#ifdef HAVE_FREETYPE_INTERNAL_SFNT_H
+#include <freetype/internal/sfnt.h>
+#endif

 static FT_Library library = 0;

@@ -770,6 +774,43 @@ BOOL WineEngGetTextExtentPoint(GdiFont font, LPCWSTR wstr, INT count,
    return TRUE;
 }

+/*************************************************************
+ * WineEngGetFontData
+ *
+ */
+DWORD WineEngGetFontData(GdiFont font, DWORD table, DWORD offset, LPVOID buf,
+			 DWORD cbData)
+{
+    FT_Face ft_face = font->ft_face;
+    TT_Face tt_face;
+    SFNT_Interface *sfnt;
+    DWORD len;
+    FT_Error err;
+
+    if(!FT_IS_SFNT(ft_face))
+        return GDI_ERROR;
+
+    tt_face = (TT_Face) ft_face;
+    sfnt = (SFNT_Interface*)tt_face->sfnt;
+
+    if(!buf || !cbData)
+        len = 0;
+    else
+        len = cbData;
+
+    if(table) { /* MS tags differ in endidness from FT ones */
+        table = table >> 24 | table << 24 |
+	  (table >> 8 & 0xff00) | (table << 8 & 0xff0000);
+    }
+
+    err = sfnt->load_any(tt_face, table, offset, buf, &len);
+    if(err) {
+        ERR("Can't find table %08lx\n", table);
+	return GDI_ERROR;
+    }
+    return len;
+}
+
 #else /* HAVE_FREETYPE */

 BOOL WineEngInit(void)
@@ -831,5 +872,11 @@ BOOL WineEngGetTextExtentPoint(GdiFont font, LPCWSTR wstr, INT count,
    return FALSE;
 }

+DWORD WineEngGetFontData(GdiFont font, DWORD table, DWORD offset, LPVOID buf,
+			 DWORD cbData)
+{
+    ERR("called but we don't have FreeType\n");
+    return GDI_ERROR;
+}
 #endif /* HAVE_FREETYPE */

--- a/include/config.h.in
+++ b/include/config.h.in
-/* include/config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* include/config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */

 /* Define if using alloca.c.  */
 #undef C_ALLOCA
@@ -238,6 +238,9 @@
 /* Define if you have the <freetype/ftsnames.h> header file.  */
 #undef HAVE_FREETYPE_FTSNAMES_H

+/* Define if you have the <freetype/internal/sfnt.h> header file.  */
+#undef HAVE_FREETYPE_INTERNAL_SFNT_H
+
 /* Define if you have the <freetype/ttnameid.h> header file.  */
 #undef HAVE_FREETYPE_TTNAMEID_H


--- a/include/font.h
+++ b/include/font.h
@@ -78,6 +78,7 @@ extern GdiFont WineEngCreateFontInstance(HFONT);
 extern DWORD WineEngDecRefFont(GdiFont);
 extern DWORD WineEngEnumFonts(LPLOGFONTW, DEVICEFONTENUMPROC, LPARAM);
 extern BOOL WineEngGetCharWidth(GdiFont, UINT, UINT, LPINT);
+extern DWORD WineEngGetFontData(GdiFont, DWORD, DWORD, LPVOID, DWORD);
 extern DWORD WineEngGetGlyphOutline(GdiFont, UINT glyph, UINT format,
 				    LPGLYPHMETRICS, DWORD buflen, LPVOID buf,
 				    const MAT2*);

--- a/objects/font.c
+++ b/objects/font.c
@@ -1895,16 +1895,20 @@ DWORD WINAPI GetFontLanguageInfo16(HDC16 hdc) {
 *
 * Calls SetLastError()  
 *
- * BUGS
- *
- * Unimplemented
 */
 DWORD WINAPI GetFontData(HDC hdc, DWORD table, DWORD offset, 
    LPVOID buffer, DWORD length)
 {
-    FIXME("(%x,%ld,%ld,%p,%ld): stub\n", hdc, table, offset, buffer, length);
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return GDI_ERROR;
+    DC *dc = DC_GetDCPtr(hdc);
+    DWORD ret = GDI_ERROR;
+
+    if(!dc) return GDI_ERROR;
+
+    if(dc->gdiFont)
+      ret = WineEngGetFontData(dc->gdiFont, table, offset, buffer, length);
+
+    GDI_ReleaseObj(hdc);
+    return ret;
 }

 /*************************************************************************