- beginning of implementation of Direct3D2 (DX 5.0) and associated classes

- some basic code for Direct3D and Direct3DExecuteBuffer (DX 3.0) - added stretching to Blt function
1999-01-03 17:00:19 +00:00 · 1999-01-03 17:00:19 +00:00 · 5ff007747f
parent 2cc30a6f30
commit 5ff007747f
19 changed files with 5040 additions and 210 deletions
--- a/217
+++ b/217
@ -2451,6 +2451,49 @@ else
  echo "$ac_t""no" 1>&6
 fi
        echo $ac_n "checking for OSMesaCreateContext in -lMesaGL""... $ac_c" 1>&6
 echo "configure:2456: checking for OSMesaCreateContext in -lMesaGL" >&5
 ac_lib_var=`echo MesaGL'_'OSMesaCreateContext | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  ac_save_LIBS="$LIBS"
 LIBS="-lMesaGL $X_LIBS -lXext -lX11 -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 2464 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
 char OSMesaCreateContext();
 int main() {
 OSMesaCreateContext()
 ; return 0; }
 EOF
 if { (eval echo configure:2475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
  echo "configure: failed program was:" >&5
  cat conftest.$ac_ext >&5
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
 LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
  echo "$ac_t""yes" 1>&6
  cat >> confdefs.h <<\EOF
 #define HAVE_MESAGL 1
 EOF
 X_PRE_LIBS="$X_PRE_LIBS -lMesaGL"
 else
  echo "$ac_t""no" 1>&6
 fi
 else
    XLIB=""
    X_CFLAGS=""
@ -2458,7 +2501,7 @@ else
 fi
 echo $ac_n "checking for waddch in -lncurses""... $ac_c" 1>&6
-echo "configure:2462: checking for waddch in -lncurses" >&5
+echo "configure:2505: checking for waddch in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'waddch | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@ -2466,7 +2509,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2470 "configure"
+#line 2513 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@ -2477,7 +2520,7 @@ int main() {
 waddch()
 ; return 0; }
 EOF
-if { (eval echo configure:2481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@ -2508,7 +2551,7 @@ if test "$ac_cv_lib_ncurses_waddch" = "yes"
 then :
 else
    echo $ac_n "checking for waddch in -lcurses""... $ac_c" 1>&6
-echo "configure:2512: checking for waddch in -lcurses" >&5
+echo "configure:2555: checking for waddch in -lcurses" >&5
 ac_lib_var=`echo curses'_'waddch | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@ -2516,7 +2559,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2520 "configure"
+#line 2563 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@ -2527,7 +2570,7 @@ int main() {
 waddch()
 ; return 0; }
 EOF
-if { (eval echo configure:2531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@ -2557,12 +2600,12 @@ fi
 fi
 echo $ac_n "checking "for GNU style IPX support"""... $ac_c" 1>&6
-echo "configure:2561: checking "for GNU style IPX support"" >&5
+echo "configure:2604: 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 2566 "configure"
+#line 2609 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
    #include <netipx/ipx.h>
@ -2570,7 +2613,7 @@ int main() {
 ((struct sockaddr_ipx *)0)->sipx_family == AF_IPX
 ; return 0; }
 EOF
-if { (eval echo configure:2574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  cat >> confdefs.h <<\EOF
 #define HAVE_IPX_GNU 1
@ -2592,12 +2635,12 @@ echo "$ac_t""$ac_cv_c_ipx_gnu" 1>&6
 if test "$ac_cv_c_ipx_gnu" = "no"
 then
 echo $ac_n "checking "for linux style IPX support"""... $ac_c" 1>&6
-echo "configure:2596: checking "for linux style IPX support"" >&5
+echo "configure:2639: 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 2601 "configure"
+#line 2644 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
     #include <asm/types.h>
@ -2606,7 +2649,7 @@ int main() {
 ((struct sockaddr_ipx *)0)->sipx_family == AF_IPX
 ; return 0; }
 EOF
-if { (eval echo configure:2610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  cat >> confdefs.h <<\EOF
 #define HAVE_IPX_LINUX 1
@ -2630,17 +2673,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:2634: checking for $ac_hdr" >&5
+echo "configure:2677: 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 2639 "configure"
+#line 2682 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2687: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
  rm -rf conftest*
@ -2668,12 +2711,12 @@ done
 echo $ac_n "checking "for Open Sound System"""... $ac_c" 1>&6
-echo "configure:2672: checking "for Open Sound System"" >&5
+echo "configure:2715: 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 2677 "configure"
+#line 2720 "configure"
 #include "confdefs.h"
 	#if defined(HAVE_SYS_SOUNDCARD_H)
@ -2694,7 +2737,7 @@ int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:2698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2741: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_opensoundsystem="yes"
 else
@ -2718,12 +2761,12 @@ fi
 echo $ac_n "checking "for union semun"""... $ac_c" 1>&6
-echo "configure:2722: checking "for union semun"" >&5
+echo "configure:2765: checking "for union semun"" >&5
 if eval "test \"`echo '$''{'ac_cv_c_union_semun'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 2727 "configure"
+#line 2770 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/sem.h>
@ -2731,7 +2774,7 @@ int main() {
 union semun foo
 ; return 0; }
 EOF
-if { (eval echo configure:2735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_union_semun="yes"
 else
@ -2759,7 +2802,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:2763: checking "for gcc strength-reduce bug"" >&5
+echo "configure:2806: 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
@ -2767,7 +2810,7 @@ else
  ac_cv_c_gcc_strength_bug="yes"
 else
  cat > conftest.$ac_ext <<EOF
-#line 2771 "configure"
+#line 2814 "configure"
 #include "confdefs.h"
 int main(void) {
@ -2778,7 +2821,7 @@ int main(void) {
  exit( Array[1] != -2 );
 }
 EOF
-if { (eval echo configure:2782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
  ac_cv_c_gcc_strength_bug="no"
 else
@ -2801,7 +2844,7 @@ fi
 echo $ac_n "checking "whether external symbols need an underscore prefix"""... $ac_c" 1>&6
-echo "configure:2805: checking "whether external symbols need an underscore prefix"" >&5
+echo "configure:2848: 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
@ -2813,14 +2856,14 @@ _ac_test:
 	.long 0
 EOF
 cat > conftest.$ac_ext <<EOF
-#line 2817 "configure"
+#line 2860 "configure"
 #include "confdefs.h"
 extern int ac_test;
 int main() {
 if (ac_test) return 1
 ; return 0; }
 EOF
-if { (eval echo configure:2824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  ac_cv_c_extern_prefix="yes"
 else
@ -2844,7 +2887,7 @@ fi
 echo $ac_n "checking "whether assembler accepts .string"""... $ac_c" 1>&6
-echo "configure:2848: checking "whether assembler accepts .string"" >&5
+echo "configure:2891: 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
@ -2854,14 +2897,14 @@ cat > conftest_asm.s <<EOF
 	.string "test"
 EOF
 cat > conftest.$ac_ext <<EOF
-#line 2858 "configure"
+#line 2901 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:2865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  ac_cv_c_asm_string="yes"
 else
@ -2889,21 +2932,21 @@ LDSHARED=""
 if test "$LIB_TARGET" = "libwine.so.1.0"
 then
  echo $ac_n "checking "whether we can build a Linux dll"""... $ac_c" 1>&6
-echo "configure:2893: checking "whether we can build a Linux dll"" >&5
+echo "configure:2936: checking "whether we can build a Linux dll"" >&5
 if eval "test \"`echo '$''{'ac_cv_c_dll_linux'+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"
  cat > conftest.$ac_ext <<EOF
-#line 2900 "configure"
+#line 2943 "configure"
 #include "confdefs.h"
 int main() {
 return 1
 ; return 0; }
 EOF
-if { (eval echo configure:2907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  ac_cv_c_dll_linux="yes"
 else
@ -2924,21 +2967,21 @@ echo "$ac_t""$ac_cv_c_dll_linux" 1>&6
    LDSHARED="\$(CC) -shared -Wl,-soname,libwine.so"
  else
    echo $ac_n "checking "whether we can build a NetBSD dll"""... $ac_c" 1>&6
-echo "configure:2928: checking "whether we can build a NetBSD dll"" >&5
+echo "configure:2971: checking "whether we can build a NetBSD dll"" >&5
 if eval "test \"`echo '$''{'ac_cv_c_dll_netbsd'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  saved_cflags=$CFLAGS
    CFLAGS="$CFLAGS -fPIC -Bshareable -Bforcearchive"
    cat > conftest.$ac_ext <<EOF
-#line 2935 "configure"
+#line 2978 "configure"
 #include "confdefs.h"
 int main() {
 return 1
 ; return 0; }
 EOF
-if { (eval echo configure:2942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  ac_cv_c_dll_netbsd="yes"
 else
@ -2969,7 +3012,7 @@ fi
 echo $ac_n "checking "for reentrant libc"""... $ac_c" 1>&6
-echo "configure:2973: checking "for reentrant libc"" >&5
+echo "configure:3016: checking "for reentrant libc"" >&5
 if eval "test \"`echo '$''{'wine_cv_libc_reentrant'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -2977,14 +3020,14 @@ else
  wine_cv_libc_reentrant=yes 
 else
  cat > conftest.$ac_ext <<EOF
-#line 2981 "configure"
+#line 3024 "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:2988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
  wine_cv_libc_reentrant=yes
 else
@ -3009,7 +3052,7 @@ fi
 echo $ac_n "checking "for reentrant X libraries"""... $ac_c" 1>&6
-echo "configure:3013: checking "for reentrant X libraries"" >&5
+echo "configure:3056: 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
@ -3054,12 +3097,12 @@ fi
 for ac_func in clone getpagesize memmove sendmsg sigaltstack strerror stricmp tcgetattr timegm usleep wait4 waitpid vfscanf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3058: checking for $ac_func" >&5
+echo "configure:3101: 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 3063 "configure"
+#line 3106 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@ -3082,7 +3125,7 @@ $ac_func();
 ; return 0; }
 EOF
-if { (eval echo configure:3086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_func_$ac_func=yes"
 else
@ -3110,17 +3153,17 @@ for ac_hdr in wctype.h sys/syscall.h syscall.h sys/param.h sys/vfs.h sys/mount.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3114: checking for $ac_hdr" >&5
+echo "configure:3157: 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 3119 "configure"
+#line 3162 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
  rm -rf conftest*
@ -3147,12 +3190,12 @@ fi
 done
 echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
-echo "configure:3151: checking whether stat file-mode macros are broken" >&5
+echo "configure:3194: 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 3156 "configure"
+#line 3199 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@ -3203,12 +3246,12 @@ EOF
 fi
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3207: checking for working const" >&5
+echo "configure:3250: 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 3212 "configure"
+#line 3255 "configure"
 #include "confdefs.h"
 int main() {
@ -3257,7 +3300,7 @@ ccp = (char const *const *) p;
 ; return 0; }
 EOF
-if { (eval echo configure:3261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_const=yes
 else
@ -3278,12 +3321,12 @@ EOF
 fi
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3282: checking for ANSI C header files" >&5
+echo "configure:3325: 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 3287 "configure"
+#line 3330 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@ -3291,7 +3334,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3295: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3338: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
  rm -rf conftest*
@ -3308,7 +3351,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 3312 "configure"
+#line 3355 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@ -3326,7 +3369,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 3330 "configure"
+#line 3373 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@ -3347,7 +3390,7 @@ if test "$cross_compiling" = yes; then
  :
 else
  cat > conftest.$ac_ext <<EOF
-#line 3351 "configure"
+#line 3394 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@ -3358,7 +3401,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 EOF
-if { (eval echo configure:3362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
  :
 else
@ -3382,12 +3425,12 @@ EOF
 fi
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3386: checking for size_t" >&5
+echo "configure:3429: 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 3391 "configure"
+#line 3434 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@ -3415,7 +3458,7 @@ EOF
 fi
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:3419: checking size of long long" >&5
+echo "configure:3462: 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
@ -3423,7 +3466,7 @@ else
  ac_cv_sizeof_long_long=0
 else
  cat > conftest.$ac_ext <<EOF
-#line 3427 "configure"
+#line 3470 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@ -3434,7 +3477,7 @@ main()
  exit(0);
 }
 EOF
-if { (eval echo configure:3438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
  ac_cv_sizeof_long_long=`cat conftestval`
 else
@ -3457,7 +3500,7 @@ EOF
 if test $ac_cv_func_sendmsg = no; then
    echo $ac_n "checking for sendmsg in -lsocket""... $ac_c" 1>&6
-echo "configure:3461: checking for sendmsg in -lsocket" >&5
+echo "configure:3504: checking for sendmsg in -lsocket" >&5
 ac_lib_var=`echo socket'_'sendmsg | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@ -3465,7 +3508,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3469 "configure"
+#line 3512 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@ -3476,7 +3519,7 @@ int main() {
 sendmsg()
 ; return 0; }
 EOF
-if { (eval echo configure:3480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@ -3509,12 +3552,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:3513: checking "whether sys/vfs.h defines statfs"" >&5
+echo "configure:3556: 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 3518 "configure"
+#line 3561 "configure"
 #include "confdefs.h"
 	#include <sys/types.h>
@ -3531,7 +3574,7 @@ int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:3535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3578: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  wine_cv_sys_vfs_has_statfs=yes
 else
@ -3558,12 +3601,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:3562: checking "whether sys/statfs.h defines statfs"" >&5
+echo "configure:3605: 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 3567 "configure"
+#line 3610 "configure"
 #include "confdefs.h"
 	#include <sys/types.h>
@ -3578,7 +3621,7 @@ int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:3582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3625: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  wine_cv_sys_statfs_has_statfs=yes
 else
@ -3605,12 +3648,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:3609: checking "whether sys/mount.h defines statfs"" >&5
+echo "configure:3652: 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 3614 "configure"
+#line 3657 "configure"
 #include "confdefs.h"
 	#include <sys/types.h>
@ -3625,7 +3668,7 @@ int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:3629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  wine_cv_sys_mount_has_statfs=yes
 else
@ -3651,7 +3694,7 @@ fi
 echo $ac_n "checking "for statfs.f_bfree"""... $ac_c" 1>&6
-echo "configure:3655: checking "for statfs.f_bfree"" >&5
+echo "configure:3698: 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
@ -3660,7 +3703,7 @@ else
        wine_cv_statfs_bfree=no
    else
    	cat > conftest.$ac_ext <<EOF
-#line 3664 "configure"
+#line 3707 "configure"
 #include "confdefs.h"
 	#include <sys/types.h>
@ -3687,7 +3730,7 @@ int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:3691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3734: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  wine_cv_statfs_bfree=yes
 else
@ -3711,7 +3754,7 @@ EOF
 fi
 echo $ac_n "checking "for statfs.f_bavail"""... $ac_c" 1>&6
-echo "configure:3715: checking "for statfs.f_bavail"" >&5
+echo "configure:3758: 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
@ -3720,7 +3763,7 @@ else
        wine_cv_statfs_bavail=no
    else
    	cat > conftest.$ac_ext <<EOF
-#line 3724 "configure"
+#line 3767 "configure"
 #include "confdefs.h"
 	#include <sys/types.h>
@ -3747,7 +3790,7 @@ int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:3751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  wine_cv_statfs_bavail=yes
 else
@ -3772,7 +3815,7 @@ fi
 echo $ac_n "checking "for working sigaltstack"""... $ac_c" 1>&6
-echo "configure:3776: checking "for working sigaltstack"" >&5
+echo "configure:3819: checking "for working sigaltstack"" >&5
 if eval "test \"`echo '$''{'ac_cv_c_working_sigaltstack'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -3781,7 +3824,7 @@ else
 else
  cat > conftest.$ac_ext <<EOF
-#line 3785 "configure"
+#line 3828 "configure"
 #include "confdefs.h"
 	#include <stdio.h>
@ -3819,7 +3862,7 @@ else
 	}
 EOF
-if { (eval echo configure:3823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
  ac_cv_c_working_sigaltstack="yes"
 else
@ -3846,12 +3889,12 @@ fi
 echo $ac_n "checking "for msg_accrights in struct msghdr"""... $ac_c" 1>&6
-echo "configure:3850: checking "for msg_accrights in struct msghdr"" >&5
+echo "configure:3893: 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 3855 "configure"
+#line 3898 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@ -3859,7 +3902,7 @@ int main() {
 struct msghdr hdr; hdr.msg_accrights=0
 ; return 0; }
 EOF
-if { (eval echo configure:3863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_msg_accrights="yes"
 else
--- a/configure.in
+++ b/configure.in
@ -106,6 +106,8 @@ then
    AC_CHECK_LIB(Xxf86dga,XF86DGAQueryExtension,AC_DEFINE(HAVE_LIBXXF86DGA) X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga",,$X_LIBS -lXext -lX11)
    dnl Check for XFree86 VMODE extension
    AC_CHECK_LIB(Xxf86vm,XF86VidModeQueryExtension,AC_DEFINE(HAVE_LIBXXF86VM) X_PRE_LIBS="$X_PRE_LIBS -lXxf86vm",,$X_LIBS -lXext -lX11)
    dnl Check for the presence of Mesa
    AC_CHECK_LIB(MesaGL,OSMesaCreateContext,AC_DEFINE(HAVE_MESAGL) X_PRE_LIBS="$X_PRE_LIBS -lMesaGL",,$X_LIBS -lXext -lX11 -lm)
 else
    XLIB=""
    X_CFLAGS=""
--- a/documentation/status/direct3D
+++ b/documentation/status/direct3D
@ -0,0 +1,55 @@
 Introduction
 ------------
 This file contains information about Wine's implementation of
 Direct3D. 
 The current version requires :
 * Mesa (tested with version 3.1 beta)
 * a display in 16bpp
 To minimize the impact on DirectDraw (i.e. to reuse most of the code
 already done for DirectDraw), I decided not to start with an
 implementation based on GLX, but on OSMesa. This way, all the OpenGL
 rendering are done in a 'private' memory buffer, buffer that will
 copied back to the DirectDraw Surface each time a 3D scene
 finishes. It is not optimal for execution speed (on each frame, the
 OpenGL buffer is converted from 32 to 16 bpp and copied onto the
 screen) but is for development (I had almost nothing to change in
 DirectDraw). Moreover, 99 % of the code in the Direct3D implementation
 is 'device independant' (i.e. GLX / OSMesa / whatever), so that
 changing to GLX will have only a minor impact on Direct3D's code.
 Code structure
 --------------
 TODO (well, once the code will be put in the dll/ddraw directory)
 Status
 ------
 I tested this code with two programs (all using Direct3D 5.0) :
 * BOIDS.EXE that comes with the 5.2 DirectX SDK : works great. Only
   thing missing is the texturing and transparency on the spinning
   gobes. Lighting seems to be a bit different than the Real One.
 * Tomb Raider II : works quite well (without texturing).
 TODO
 ----
 * finish working on Execute Buffers (i.e. Direct3D 3.0)
 * texture mapping / blending effects
 * real GLX implementation (will need a complete rewrite of DirectDraw
   also) to have 3DFx support
 * restructuration of all the DDRAW.DLL (put that in the dll
   directory, better separation of 'drivers, ...)
 * start looking into DirectX 6.0
 * inquire on Mesa / XFree86 mailing lists about direct access to 
   display hardware (for games such as Tomb Raider II that displays 
   vertices that are already in screen coordinates)
 * look into thread safeness...
 -- 
 Lionel Ulmer - ulmer@directprovider.net
 Last updated : Sun Jan 03 1999
--- a/documentation/status/directdraw
+++ b/documentation/status/directdraw
@ -1,5 +1,5 @@
 This file contains information on the current implementation of the DirectDraw
-API.
+API. Information specific to Direct3D is in the direct3D file.
 The DirectDraw API is being used in a lot of current computergames. Its API
 layer is represented by the functions in the Win32 DLL ddraw.dll and the
--- a/graphics/Makefile.in
+++ b/graphics/Makefile.in
@ -8,6 +8,13 @@ MODULE    = graphics
 C_SRCS = \
 	bitblt.c \
 	cache.c \
 	d3dcommon.c \
 	d3ddevices.c \
 	d3dexecutebuffer.c \
 	d3dlight.c \
 	d3dmaterial.c \
 	d3dtexture.c \
 	d3dviewport.c \
 	ddraw.c \
 	dispdib.c \
 	driver.c \
--- a/graphics/d3d_private.h
+++ b/graphics/d3d_private.h
@ -0,0 +1,110 @@
 /* Direct3D private include file
   (c) 1998 Lionel ULMER
   This files contains all the structure that are not exported
   through d3d.h and all common macros. */
 #ifndef _WINE_D3D_PRIVATE_H
 #define _WINE_D3D_PRIVATE_H
 #ifdef HAVE_MESAGL
 #include "d3d.h"
 #include "wine_gl.h"
 /* Matrix copy WITH transposition */
 #define conv_mat2(mat,gl_mat)			\
 {						\
  TRACE(ddraw, "%f %f %f %f\n", (mat)->_11, (mat)->_12, (mat)->_13, (mat)->_14); \
  TRACE(ddraw, "%f %f %f %f\n", (mat)->_21, (mat)->_22, (mat)->_23, (mat)->_24); \
  TRACE(ddraw, "%f %f %f %f\n", (mat)->_31, (mat)->_32, (mat)->_33, (mat)->_34); \
  TRACE(ddraw, "%f %f %f %f\n", (mat)->_41, (mat)->_42, (mat)->_43, (mat)->_44); \
  (gl_mat)[ 0] = (mat)->_11;			\
  (gl_mat)[ 1] = (mat)->_21;			\
  (gl_mat)[ 2] = (mat)->_31;			\
  (gl_mat)[ 3] = (mat)->_41;			\
  (gl_mat)[ 4] = (mat)->_12;			\
  (gl_mat)[ 5] = (mat)->_22;			\
  (gl_mat)[ 6] = (mat)->_32;			\
  (gl_mat)[ 7] = (mat)->_42;			\
  (gl_mat)[ 8] = (mat)->_13;			\
  (gl_mat)[ 9] = (mat)->_23;			\
  (gl_mat)[10] = (mat)->_33;			\
  (gl_mat)[11] = (mat)->_43;			\
  (gl_mat)[12] = (mat)->_14;			\
  (gl_mat)[13] = (mat)->_24;			\
  (gl_mat)[14] = (mat)->_34;			\
  (gl_mat)[15] = (mat)->_44;			\
 };
 /* Matrix copy WITHOUT transposition */
 #define conv_mat(mat,gl_mat)			\
 {                                               \
  TRACE(ddraw, "%f %f %f %f\n", (mat)->_11, (mat)->_12, (mat)->_13, (mat)->_14); \
  TRACE(ddraw, "%f %f %f %f\n", (mat)->_21, (mat)->_22, (mat)->_23, (mat)->_24); \
  TRACE(ddraw, "%f %f %f %f\n", (mat)->_31, (mat)->_32, (mat)->_33, (mat)->_34); \
  TRACE(ddraw, "%f %f %f %f\n", (mat)->_41, (mat)->_42, (mat)->_43, (mat)->_44); \
  memcpy(gl_mat, (mat), 16 * sizeof(float));      \
 };
 #define dump_mat(mat) \
  TRACE(ddraw, "%f %f %f %f\n", (mat)->_11, (mat)->_12, (mat)->_13, (mat)->_14); \
  TRACE(ddraw, "%f %f %f %f\n", (mat)->_21, (mat)->_22, (mat)->_23, (mat)->_24); \
  TRACE(ddraw, "%f %f %f %f\n", (mat)->_31, (mat)->_32, (mat)->_33, (mat)->_34); \
  TRACE(ddraw, "%f %f %f %f\n", (mat)->_41, (mat)->_42, (mat)->_43, (mat)->_44);
 typedef struct OpenGL_IDirect3DDevice2 {
  IDirect3DDevice2 common;
  /* These are the OpenGL-specific variables */
  OSMesaContext ctx;
  unsigned char *buffer;
  float world_mat[16];
  float view_mat[16];
  float proj_mat[16];
 } OpenGL_IDirect3DDevice2;
 typedef struct OpenGL_IDirect3DDevice {
  IDirect3DDevice common;
  /* These are the OpenGL-specific variables */
  OSMesaContext ctx;
  unsigned char *buffer;
  D3DMATRIX *world_mat;
  D3DMATRIX *view_mat;
  D3DMATRIX *proj_mat;
 } OpenGL_IDirect3DDevice;
 #define _dump_colorvalue(s,v)                      \
  TRACE(ddraw, " " s " : %f %f %f %f\n",           \
 	(v).r.r, (v).g.g, (v).b.b, (v).a.a);
 #endif /* HAVE_MESAGL */
 /* Common functions defined in d3dcommon.c */
 void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
 		      DWORD dwRenderState) ;
 /* All non-static functions 'exported' by various sub-objects */
 extern LPDIRECT3DTEXTURE2 d3dtexture2_create(LPDIRECTDRAWSURFACE3 surf) ;
 extern LPDIRECT3DTEXTURE d3dtexture_create(LPDIRECTDRAWSURFACE3 surf) ;
 extern LPDIRECT3DLIGHT d3dlight_create_dx3(LPDIRECT3D d3d) ;
 extern LPDIRECT3DLIGHT d3dlight_create(LPDIRECT3D2 d3d) ;
 extern LPDIRECT3DEXECUTEBUFFER d3dexecutebuffer_create(LPDIRECT3DDEVICE d3ddev, LPD3DEXECUTEBUFFERDESC lpDesc) ;
 extern LPDIRECT3DMATERIAL d3dmaterial_create(LPDIRECT3D d3d) ;
 extern LPDIRECT3DMATERIAL2 d3dmaterial2_create(LPDIRECT3D2 d3d) ;
 extern LPDIRECT3DVIEWPORT d3dviewport_create(LPDIRECT3D d3d) ;
 extern LPDIRECT3DVIEWPORT2 d3dviewport2_create(LPDIRECT3D2 d3d) ;
 extern int is_OpenGL_dx3(REFCLSID rguid, LPDIRECTDRAWSURFACE surface, LPDIRECT3DDEVICE *device) ;
 extern int d3d_OpenGL_dx3(LPD3DENUMDEVICESCALLBACK cb, LPVOID context) ;
 extern int d3d_OpenGL(LPD3DENUMDEVICESCALLBACK cb, LPVOID context) ;
 extern int is_OpenGL(REFCLSID rguid, LPDIRECTDRAWSURFACE surface, LPDIRECT3DDEVICE2 *device, LPDIRECT3D2 d3d) ;
 #endif /* _WINE_D3D_PRIVATE_H */
--- a/graphics/d3dcommon.c
+++ b/graphics/d3dcommon.c
@ -0,0 +1,185 @@
 /* Direct3D Common functions
   (c) 1998 Lionel ULMER
   This file contains all common miscellaneous code that spans
   different 'objects' */
 #include "config.h"
 #include "windows.h"
 #include "wintypes.h"
 #include "interfaces.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debug.h"
 #include "d3d_private.h"
 #ifdef HAVE_MESAGL
 static void _dump_renderstate(D3DRENDERSTATETYPE type,
 			      DWORD value) {
  char *states[] = {
    NULL,
    "D3DRENDERSTATE_TEXTUREHANDLE",
    "D3DRENDERSTATE_ANTIALIAS",
    "D3DRENDERSTATE_TEXTUREADDRESS",
    "D3DRENDERSTATE_TEXTUREPERSPECTIVE",
    "D3DRENDERSTATE_WRAPU",
    "D3DRENDERSTATE_WRAPV",
    "D3DRENDERSTATE_ZENABLE",
    "D3DRENDERSTATE_FILLMODE",
    "D3DRENDERSTATE_SHADEMODE",
    "D3DRENDERSTATE_LINEPATTERN",
    "D3DRENDERSTATE_MONOENABLE",
    "D3DRENDERSTATE_ROP2",
    "D3DRENDERSTATE_PLANEMASK",
    "D3DRENDERSTATE_ZWRITEENABLE",
    "D3DRENDERSTATE_ALPHATESTENABLE",
    "D3DRENDERSTATE_LASTPIXEL",
    "D3DRENDERSTATE_TEXTUREMAG",
    "D3DRENDERSTATE_TEXTUREMIN",
    "D3DRENDERSTATE_SRCBLEND",
    "D3DRENDERSTATE_DESTBLEND",
    "D3DRENDERSTATE_TEXTUREMAPBLEND",
    "D3DRENDERSTATE_CULLMODE",
    "D3DRENDERSTATE_ZFUNC",
    "D3DRENDERSTATE_ALPHAREF",
    "D3DRENDERSTATE_ALPHAFUNC",
    "D3DRENDERSTATE_DITHERENABLE",
    "D3DRENDERSTATE_ALPHABLENDENABLE",
    "D3DRENDERSTATE_FOGENABLE",
    "D3DRENDERSTATE_SPECULARENABLE",
    "D3DRENDERSTATE_ZVISIBLE",
    "D3DRENDERSTATE_SUBPIXEL",
    "D3DRENDERSTATE_SUBPIXELX",
    "D3DRENDERSTATE_STIPPLEDALPHA",
    "D3DRENDERSTATE_FOGCOLOR",
    "D3DRENDERSTATE_FOGTABLEMODE",
    "D3DRENDERSTATE_FOGTABLESTART",
    "D3DRENDERSTATE_FOGTABLEEND",
    "D3DRENDERSTATE_FOGTABLEDENSITY",
    "D3DRENDERSTATE_STIPPLEENABLE",
    "D3DRENDERSTATE_EDGEANTIALIAS",
    "D3DRENDERSTATE_COLORKEYENABLE",
    "D3DRENDERSTATE_BORDERCOLOR",
    "D3DRENDERSTATE_TEXTUREADDRESSU",
    "D3DRENDERSTATE_TEXTUREADDRESSV",
    "D3DRENDERSTATE_MIPMAPLODBIAS",
    "D3DRENDERSTATE_ZBIAS",
    "D3DRENDERSTATE_RANGEFOGENABLE",
    "D3DRENDERSTATE_ANISOTROPY",
    "D3DRENDERSTATE_FLUSHBATCH",
    "D3DRENDERSTATE_STIPPLEPATTERN00",
    "D3DRENDERSTATE_STIPPLEPATTERN01",
    "D3DRENDERSTATE_STIPPLEPATTERN02",
    "D3DRENDERSTATE_STIPPLEPATTERN03",
    "D3DRENDERSTATE_STIPPLEPATTERN04",
    "D3DRENDERSTATE_STIPPLEPATTERN05",
    "D3DRENDERSTATE_STIPPLEPATTERN06",
    "D3DRENDERSTATE_STIPPLEPATTERN07",
    "D3DRENDERSTATE_STIPPLEPATTERN08",
    "D3DRENDERSTATE_STIPPLEPATTERN09",
    "D3DRENDERSTATE_STIPPLEPATTERN10",
    "D3DRENDERSTATE_STIPPLEPATTERN11",
    "D3DRENDERSTATE_STIPPLEPATTERN12",
    "D3DRENDERSTATE_STIPPLEPATTERN13",
    "D3DRENDERSTATE_STIPPLEPATTERN14",
    "D3DRENDERSTATE_STIPPLEPATTERN15",
    "D3DRENDERSTATE_STIPPLEPATTERN16",
    "D3DRENDERSTATE_STIPPLEPATTERN17",
    "D3DRENDERSTATE_STIPPLEPATTERN18",
    "D3DRENDERSTATE_STIPPLEPATTERN19",
    "D3DRENDERSTATE_STIPPLEPATTERN20",
    "D3DRENDERSTATE_STIPPLEPATTERN21",
    "D3DRENDERSTATE_STIPPLEPATTERN22",
    "D3DRENDERSTATE_STIPPLEPATTERN23",
    "D3DRENDERSTATE_STIPPLEPATTERN24",
    "D3DRENDERSTATE_STIPPLEPATTERN25",
    "D3DRENDERSTATE_STIPPLEPATTERN26",
    "D3DRENDERSTATE_STIPPLEPATTERN27",
    "D3DRENDERSTATE_STIPPLEPATTERN28",
    "D3DRENDERSTATE_STIPPLEPATTERN29",
    "D3DRENDERSTATE_STIPPLEPATTERN30",
    "D3DRENDERSTATE_STIPPLEPATTERN31"
  };
  DUMP(" %s = 0x%08lx\n", states[type], value);
 }
 void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
 		      DWORD dwRenderState)
 {
  if (TRACE_ON(ddraw))
    _dump_renderstate(dwRenderStateType, dwRenderState);
  /* First, all the stipple patterns */
  if ((dwRenderStateType >= D3DRENDERSTATE_STIPPLEPATTERN00) && 
      (dwRenderStateType >= D3DRENDERSTATE_STIPPLEPATTERN31)) {
  } else {
    /* All others state variables */
    switch (dwRenderStateType) {
    case D3DRENDERSTATE_ZENABLE:          /*  7 */
      if (dwRenderState)
 	glEnable(GL_DEPTH_TEST);
      else
 	glDisable(GL_DEPTH_TEST);
      break;
    case D3DRENDERSTATE_ZWRITEENABLE:     /* 14 */
      if (dwRenderState)
 	glDepthMask(GL_TRUE);
      else
 	glDepthMask(GL_FALSE);
      break;
    case D3DRENDERSTATE_ZFUNC:            /* 23 */
      switch ((D3DCMPFUNC) dwRenderState) {
      case D3DCMP_NEVER:
 	glDepthFunc(GL_NEVER);
 	break;
      case D3DCMP_LESS:
 	glDepthFunc(GL_LESS);
 	break;
      case D3DCMP_EQUAL:
 	glDepthFunc(GL_EQUAL);
 	break;
      case D3DCMP_LESSEQUAL:
 	glDepthFunc(GL_LEQUAL);
 	break;
      case D3DCMP_GREATER:
 	glDepthFunc(GL_GREATER);
 	break;
      case D3DCMP_NOTEQUAL:
 	glDepthFunc(GL_NOTEQUAL);
 	break;
      case D3DCMP_GREATEREQUAL:
 	glDepthFunc(GL_GEQUAL);
 	break;
      case D3DCMP_ALWAYS:
 	glDepthFunc(GL_ALWAYS);
 	break;
      default:
 	ERR(ddraw, "Unexpected value\n");
      }
      break;
    case D3DRENDERSTATE_DITHERENABLE:     /* 26 */
      if (dwRenderState)
 	glEnable(GL_DITHER);
      else
 	glDisable(GL_DITHER);
      break;
    default:
      FIXME(ddraw, "Unhandled Render State\n");
      break;
    }
  }
 }
 #endif /* HAVE_MESAGL */
--- a/graphics/d3ddevices.c
+++ b/graphics/d3ddevices.c
--- a/graphics/d3dexecutebuffer.c
+++ b/graphics/d3dexecutebuffer.c
@ -0,0 +1,578 @@
 /* Direct3D ExecuteBuffer
   (c) 1998 Lionel ULMER
   This files contains the implementation of Direct3DExecuteBuffer. */
 #include "config.h"
 #include "windows.h"
 #include "wintypes.h"
 #include "winerror.h"
 #include "interfaces.h"
 #include "heap.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debug.h"
 #include "d3d_private.h"
 #ifdef HAVE_MESAGL
 static IDirect3DExecuteBuffer_VTable executebuffer_vtable;
 /*******************************************************************************
 *				ExecuteBuffer static functions
 */
 void _dump_d3dstatus(LPD3DSTATUS lpStatus) {
 }
 void _dump_executedata(LPD3DEXECUTEDATA lpData) {
  DUMP("dwSize : %ld\n", lpData->dwSize);
  DUMP("Vertex      Offset : %ld  Count  : %ld\n", lpData->dwVertexOffset, lpData->dwVertexCount);
  DUMP("Instruction Offset : %ld  Length : %ld\n", lpData->dwInstructionOffset, lpData->dwInstructionLength);
  DUMP("HVertex     Offset : %ld\n", lpData->dwHVertexOffset);
  _dump_d3dstatus(&(lpData->dsStatus));
 }
 #define DO_VERTEX(index) 			\
  glNormal3f(tvert[index].nx.nx,		\
 	     tvert[index].ny.ny,		\
 	     tvert[index].nz.nz);		\
  glVertex3f(tvert[index].x.x,			\
 	     tvert[index].y.y,			\
 	     tvert[index].z.z);
 static void execute(LPDIRECT3DEXECUTEBUFFER lpBuff,
 		    LPDIRECT3DDEVICE dev,
 		    LPDIRECT3DVIEWPORT vp) {
  DWORD bs = lpBuff->desc.dwBufferSize;
  DWORD vs = lpBuff->data.dwVertexOffset;
  DWORD vc = lpBuff->data.dwVertexCount;
  DWORD is = lpBuff->data.dwInstructionOffset;
  DWORD il = lpBuff->data.dwInstructionLength;
  unsigned char *instr = lpBuff->desc.lpData + is;
  LPD3DVERTEX vert = (LPD3DVERTEX) (lpBuff->desc.lpData + vs);
  LPD3DVERTEX tvert = lpBuff->vertex_data;
  OpenGL_IDirect3DDevice *odev = (OpenGL_IDirect3DDevice *) dev;
  TRACE(ddraw, "ExecuteData : \n");
  _dump_executedata(&(lpBuff->data));
  while (1) {
    LPD3DINSTRUCTION current = (LPD3DINSTRUCTION) instr;
    BYTE size;
    WORD count;
    count = current->wCount;
    size = current->bSize;
    instr += sizeof(D3DINSTRUCTION);
    switch (current->bOpcode) {
    case D3DOP_POINT: {
      TRACE(ddraw, "POINT-s          (%d)\n", count);
      instr += count * size;
    } break;
    case D3DOP_LINE: {
      TRACE(ddraw, "LINE-s           (%d)\n", count);
      instr += count * size;
    } break;
    case D3DOP_TRIANGLE: {
      int i;
      TRACE(ddraw, "TRIANGLE         (%d)\n", count);
      /* Use given matrixes */
      glMatrixMode(GL_MODELVIEW);
      glLoadIdentity(); /* The model transformation was done during the
 			   transformation phase */
      glMatrixMode(GL_PROJECTION);
      glLoadMatrixf((float *) odev->proj_mat);
      glMultMatrixf((float *) odev->view_mat);
      for (i = 0; i < count; i++) {
 	LPD3DTRIANGLE ci = (LPD3DTRIANGLE) instr;
 	TRACE(ddraw, "  v1: %d  v2: %d  v3: %d\n",
 	      ci->v1.v1, ci->v2.v2, ci->v3.v3);
 	TRACE(ddraw, "  Flags : ");
 	if (TRACE_ON(ddraw)) {
 	  /* Wireframe */
 	  if (ci->wFlags & D3DTRIFLAG_EDGEENABLE1)
 	    DUMP("EDGEENABLE1 ");
 	  if (ci->wFlags & D3DTRIFLAG_EDGEENABLE2)
 	    DUMP("EDGEENABLE2 ");
 	  if (ci->wFlags & D3DTRIFLAG_EDGEENABLE1)
 	    DUMP("EDGEENABLE3 ");
 	  /* Strips / Fans */
 	  if (ci->wFlags == D3DTRIFLAG_EVEN)
 	    DUMP("EVEN ");
 	  if (ci->wFlags == D3DTRIFLAG_ODD)
 	    DUMP("ODD ");
 	  if (ci->wFlags == D3DTRIFLAG_START)
 	    DUMP("START ");
 	  if ((ci->wFlags > 0) && (ci->wFlags < 30))
 	    DUMP("STARTFLAT(%d) ", ci->wFlags);
 	  DUMP("\n");
 	}
 	glBegin(GL_TRIANGLES); {
 	  DO_VERTEX(ci->v1.v1);
 	  DO_VERTEX(ci->v2.v2);
 	  DO_VERTEX(ci->v3.v3);
 	} glEnd();
 	instr += size;
      }
    } break;
    case D3DOP_MATRIXLOAD: {
      TRACE(ddraw, "MATRIXLOAD-s     (%d)\n", count);
      instr += count * size;
    } break;
    case D3DOP_MATRIXMULTIPLY: {
      int i;
      TRACE(ddraw, "MATRIXMULTIPLY   (%d)\n", count);
      for (i = 0; i < count; i++) {
 	LPD3DMATRIXMULTIPLY ci = (LPD3DMATRIXMULTIPLY) instr;
 	LPD3DMATRIX a = (LPD3DMATRIX) ci->hDestMatrix;
 	LPD3DMATRIX b = (LPD3DMATRIX) ci->hSrcMatrix1;
 	LPD3DMATRIX c = (LPD3DMATRIX) ci->hSrcMatrix2;
 	TRACE(ddraw, "  Dest : %08lx  Src1 : %08lx  Src2 : %08lx\n",
 	      ci->hDestMatrix, ci->hSrcMatrix1, ci->hSrcMatrix2);
 	/* Do the multiplication..
 	   As I am VERY lazy, I let OpenGL do the multiplication for me */
 	glMatrixMode(GL_PROJECTION);
 	/* Save the current matrix */
 	glPushMatrix();
 	/* Load Matrix one and do the multiplication */
 	glLoadMatrixf((float *) ci->hSrcMatrix1);
 	glMultMatrixf((float *) ci->hSrcMatrix2);
 	glGetFloatv(GL_PROJECTION_MATRIX, (float *) ci->hDestMatrix);
 	/* Restore the current matrix */
 	glPopMatrix();
 	instr += size;
      }
    } break;
    case D3DOP_STATETRANSFORM: {
      int i;
      TRACE(ddraw, "STATETRANSFORM   (%d)\n", count);
      for (i = 0; i < count; i++) {
 	LPD3DSTATE ci = (LPD3DSTATE) instr;
 	/* Handle the state transform */
 	switch (ci->t.dtstTransformStateType) {
 	case D3DTRANSFORMSTATE_WORLD: {
 	  TRACE(ddraw, "  WORLD (%p)\n", (D3DMATRIX*) ci->v.dwArg[0]);
 	  odev->world_mat = (D3DMATRIX*) ci->v.dwArg[0];
 	} break;
 	case D3DTRANSFORMSTATE_VIEW: {
 	  TRACE(ddraw, "  VIEW (%p)\n", (D3DMATRIX*) ci->v.dwArg[0]);
 	  odev->view_mat = (D3DMATRIX*) ci->v.dwArg[0];
 	} break;
 	case D3DTRANSFORMSTATE_PROJECTION: {
    	  TRACE(ddraw, "  PROJECTION (%p)\n", (D3DMATRIX*) ci->v.dwArg[0]);
 	  odev->proj_mat = (D3DMATRIX*) ci->v.dwArg[0];
 	} break;
 	default:
 	  ERR(ddraw, "  Unhandled state transformation !! (%d)\n", (int) ci->t.dtstTransformStateType);
 	  break;
 	}
 	instr += size;
      }
    } break;
    case D3DOP_STATELIGHT: {
      int i;
      TRACE(ddraw, "STATELIGHT       (%d)\n", count);
      for (i = 0; i < count; i++) {
 	LPD3DSTATE ci = (LPD3DSTATE) instr;
 	/* Handle the state transform */
 	switch (ci->t.dlstLightStateType) {
 	case D3DLIGHTSTATE_MATERIAL: {
 	  LPDIRECT3DMATERIAL mat = (LPDIRECT3DMATERIAL) ci->v.dwArg[0];
 	  TRACE(ddraw, "  MATERIAL\n");
 	  if (mat != NULL) {
 	    mat->activate(mat);
 	  } else {
 	    TRACE(ddraw, "    bad Material Handle\n");
 	  }
 	} break ;
 	case D3DLIGHTSTATE_AMBIENT: {
 	  float light[4];
 	  DWORD dwLightState = ci->v.dwArg[0];
 	  TRACE(ddraw, "  AMBIENT\n");
 	  light[0] = ((dwLightState >> 16) & 0xFF) / 255.0;
 	  light[1] = ((dwLightState >>  8) & 0xFF) / 255.0;
 	  light[2] = ((dwLightState >>  0) & 0xFF) / 255.0;
 	  light[3] = 1.0;
 	  glLightModelfv(GL_LIGHT_MODEL_AMBIENT, (float *) light);
 	  TRACE(ddraw, "    R:%02lx G:%02lx B:%02lx A:%02lx\n",
 		((dwLightState >> 16) & 0xFF),
 		((dwLightState >>  8) & 0xFF),
 		((dwLightState >>  0) & 0xFF),
 		((dwLightState >> 24) & 0xFF));
 	} break ;
 	case D3DLIGHTSTATE_COLORMODEL: {
 	  TRACE(ddraw, "  COLORMODEL\n");
 	} break ;
 	case D3DLIGHTSTATE_FOGMODE: {
 	  TRACE(ddraw, "  FOGMODE\n");
 	} break ;
 	case D3DLIGHTSTATE_FOGSTART: {
 	  TRACE(ddraw, "  FOGSTART\n");
 	} break ;
 	case D3DLIGHTSTATE_FOGEND: {
 	  TRACE(ddraw, "  FOGEND\n");
 	} break ;
 	case D3DLIGHTSTATE_FOGDENSITY: {
 	  TRACE(ddraw, "  FOGDENSITY\n");
 	} break ;
 	default:
 	  ERR(ddraw, "  Unhandled light state !! (%d)\n", (int) ci->t.dlstLightStateType);
 	  break;
 	}
 	instr += size;
      }
    } break;
    case D3DOP_STATERENDER: {
      int i;
      TRACE(ddraw, "STATERENDER      (%d)\n", count);
      for (i = 0; i < count; i++) {
 	LPD3DSTATE ci = (LPD3DSTATE) instr;
 	/* Handle the state transform */
 	set_render_state(ci->t.drstRenderStateType, ci->v.dwArg[0]);
 	instr += size;
      }
    } break;
    case D3DOP_PROCESSVERTICES: {
      int i;
      TRACE(ddraw, "PROCESSVERTICES  (%d)\n", count);
      for (i = 0; i < count; i++) {
 	LPD3DPROCESSVERTICES ci = (LPD3DPROCESSVERTICES) instr;
 	TRACE(ddraw, "  Start : %d Dest : %d Count : %ld\n",
 	      ci->wStart, ci->wDest, ci->dwCount);
 	TRACE(ddraw, "  Flags : ");
 	if (TRACE_ON(ddraw)) {
 	  if (ci->dwFlags & D3DPROCESSVERTICES_COPY)
 	    DUMP("COPY ");
 	  if (ci->dwFlags & D3DPROCESSVERTICES_NOCOLOR)
 	    DUMP("NOCOLOR ");
 	  if (ci->dwFlags == D3DPROCESSVERTICES_OPMASK)
 	    DUMP("OPMASK ");
 	  if (ci->dwFlags & D3DPROCESSVERTICES_TRANSFORM)
 	    DUMP("TRANSFORM ");
 	  if (ci->dwFlags == D3DPROCESSVERTICES_TRANSFORMLIGHT)
 	    DUMP("TRANSFORMLIGHT ");
 	  if (ci->dwFlags & D3DPROCESSVERTICES_UPDATEEXTENTS)
 	    DUMP("UPDATEEXTENTS ");
 	  DUMP("\n");
 	}
 	/* This is where doing Direct3D on top on OpenGL is quite difficult.
 	   This method transforms a set of vertices using the CURRENT state
 	   (lighting, projection, ...) but does not rasterize them.
 	   They will oinly be put on screen later (with the POINT / LINE and
 	   TRIANGLE op-codes). The problem is that you can have a triangle
 	   with each point having been transformed using another state...
 	   In this implementation, I will emulate only ONE thing : each
 	   vertex can have its own "WORLD" transformation (this is used in the
 	   TWIST.EXE demo of the 5.2 SDK). I suppose that all vertices of the 
 	   execute buffer use the same state.
 	   If I find applications that change other states, I will try to do a
 	   more 'fine-tuned' state emulation (but I may become quite tricky if 
 	   it changes a light position in the middle of a triangle).
 	   In this case, a 'direct' approach (i.e. without using OpenGL, but
 	   writing our own 3D rasterizer) would be easier. */
 	/* The current method (with the hypothesis that only the WORLD matrix
 	   will change between two points) is like this :
 	    - I transform 'manually' all the vertices with the current WORLD
 	      matrix and store them in the vertex buffer
 	    - during the rasterization phase, the WORLD matrix will be set to
 	      the Identity matrix */
 	/* Enough for the moment */
 	if (ci->dwFlags == D3DPROCESSVERTICES_TRANSFORMLIGHT) {
 	  /* Enable lighting, so that when the rasterization will take place,
 	     the correct LIGHTING state is active. */
 	  glEnable(GL_LIGHTING);
 	  /* */
 	}
 	instr += size;
      }
    } break;
    case D3DOP_TEXTURELOAD: {
      TRACE(ddraw, "TEXTURELOAD-s    (%d)\n", count);
      instr += count * size;
    } break;
    case D3DOP_EXIT: {
      TRACE(ddraw, "EXIT             (%d)\n", count);
      /* We did this instruction */
      instr += size;
      /* Exit this loop */
      goto end_of_buffer;
    } break;
    case D3DOP_BRANCHFORWARD: {
      TRACE(ddraw, "BRANCHFORWARD-s  (%d)\n", count);
      instr += count * size;
    } break;
    case D3DOP_SPAN: {
      TRACE(ddraw, "SPAN-s           (%d)\n", count);
      instr += count * size;
    } break;
    case D3DOP_SETSTATUS: {
      TRACE(ddraw, "SETSTATUS-s      (%d)\n", count);
      instr += count * size;
    } break;
    default:
      ERR(ddraw, "Unhandled OpCode !!!\n");
      /* Try to save ... */
      instr += count * size;
      break;
    }
  }
 end_of_buffer:
 }
 /*******************************************************************************
 *				ExecuteBuffer Creation functions
 */
 LPDIRECT3DEXECUTEBUFFER d3dexecutebuffer_create(LPDIRECT3DDEVICE d3ddev, LPD3DEXECUTEBUFFERDESC lpDesc)
 {
  LPDIRECT3DEXECUTEBUFFER eb;
  eb = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirect3DExecuteBuffer));
  eb->ref = 1;
  eb->lpvtbl = &executebuffer_vtable;
  eb->d3ddev = d3ddev;
  /* Initializes memory */
  eb->desc = *lpDesc;
  /* No buffer given */
  if (!(eb->desc.dwFlags & D3DDEB_LPDATA))
    eb->desc.lpData = NULL;
  /* No buffer size given */
  if (!(lpDesc->dwFlags & D3DDEB_BUFSIZE))
    eb->desc.dwBufferSize = 0;
  /* Create buffer if asked */
  if ((eb->desc.lpData == NULL) && (eb->desc.dwBufferSize > 0)) {
    eb->need_free = TRUE;
    eb->desc.lpData = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,eb->desc.dwBufferSize);
  } else {
    eb->need_free = FALSE;
  }
  /* No vertices for the moment */
  eb->vertex_data = NULL;
  eb->desc.dwFlags |= D3DDEB_LPDATA;
  eb->execute = execute;
  return eb;
 }
 /*******************************************************************************
 *				IDirect3DLight methods
 */
 static HRESULT WINAPI IDirect3DExecuteBuffer_QueryInterface(LPDIRECT3DEXECUTEBUFFER this,
 							    REFIID riid,
 							    LPVOID* ppvObj)
 {
  char xrefiid[50];
  WINE_StringFromCLSID((LPCLSID)riid,xrefiid);
  FIXME(ddraw, "(%p)->(%s,%p): stub\n", this, xrefiid,ppvObj);
  return S_OK;
 }
 static ULONG WINAPI IDirect3DExecuteBuffer_AddRef(LPDIRECT3DEXECUTEBUFFER this)
 {
  TRACE(ddraw, "(%p)->()incrementing from %lu.\n", this, this->ref );
  return ++(this->ref);
 }
 static ULONG WINAPI IDirect3DExecuteBuffer_Release(LPDIRECT3DEXECUTEBUFFER this)
 {
  FIXME( ddraw, "(%p)->() decrementing from %lu.\n", this, this->ref );
  if (!--(this->ref)) {
    if ((this->desc.lpData != NULL) && this->need_free)
      HeapFree(GetProcessHeap(),0,this->desc.lpData);
    if (this->vertex_data != NULL)
      HeapFree(GetProcessHeap(),0,this->vertex_data);
    HeapFree(GetProcessHeap(),0,this);
    return 0;
  }
  return this->ref;
 }
 static HRESULT WINAPI IDirect3DExecuteBuffer_Initialize(LPDIRECT3DEXECUTEBUFFER this,
 							LPDIRECT3DDEVICE lpDirect3DDevice,
 							LPD3DEXECUTEBUFFERDESC lpDesc)
 {
  FIXME(ddraw, "(%p)->(%p,%p): stub\n", this, lpDirect3DDevice, lpDesc);
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DExecuteBuffer_Lock(LPDIRECT3DEXECUTEBUFFER this,
 						  LPD3DEXECUTEBUFFERDESC lpDesc)
 {
  TRACE(ddraw, "(%p)->(%p)\n", this, lpDesc);
  /* Copies the buffer description */
  *lpDesc = this->desc;
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DExecuteBuffer_Unlock(LPDIRECT3DEXECUTEBUFFER this)
 {
  TRACE(ddraw, "(%p)->()\n", this);
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DExecuteBuffer_SetExecuteData(LPDIRECT3DEXECUTEBUFFER this,
 							    LPD3DEXECUTEDATA lpData)
 {
  DWORD nbvert;
  TRACE(ddraw, "(%p)->(%p)\n", this, lpData);
  this->data = *lpData;
  /* Get the number of vertices in the execute buffer */
  nbvert = this->data.dwVertexCount;
  /* Prepares the transformed vertex buffer */
  if (this->vertex_data != NULL)
    HeapFree(GetProcessHeap(), 0, this->vertex_data);
  this->vertex_data = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,nbvert * sizeof(D3DVERTEX));
  if (TRACE_ON(ddraw)) {
    _dump_executedata(lpData);
  }
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DExecuteBuffer_GetExecuteData(LPDIRECT3DEXECUTEBUFFER this,
 							    LPD3DEXECUTEDATA lpData)
 {
  TRACE(ddraw, "(%p)->(%p): stub\n", this, lpData);
  *lpData = this->data;
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DExecuteBuffer_Validate(LPDIRECT3DEXECUTEBUFFER this,
 						      LPDWORD lpdwOffset,
 						      LPD3DVALIDATECALLBACK lpFunc,
 						      LPVOID lpUserArg,
 						      DWORD dwReserved)
 {
  TRACE(ddraw, "(%p)->(%p,%p,%p,%lu)\n", this, lpdwOffset, lpFunc, lpUserArg, dwReserved);
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DExecuteBuffer_Optimize(LPDIRECT3DEXECUTEBUFFER this,
 						      DWORD dwReserved)
 {
  TRACE(ddraw, "(%p)->(%lu)\n", this, dwReserved);
  return DD_OK;
 }
 /*******************************************************************************
 *				IDirect3DLight VTable
 */
 static IDirect3DExecuteBuffer_VTable executebuffer_vtable = {
  /*** IUnknown methods ***/
  IDirect3DExecuteBuffer_QueryInterface,
  IDirect3DExecuteBuffer_AddRef,
  IDirect3DExecuteBuffer_Release,
  /*** IDirect3DExecuteBuffer methods ***/
  IDirect3DExecuteBuffer_Initialize,
  IDirect3DExecuteBuffer_Lock,
  IDirect3DExecuteBuffer_Unlock,
  IDirect3DExecuteBuffer_SetExecuteData,
  IDirect3DExecuteBuffer_GetExecuteData,
  IDirect3DExecuteBuffer_Validate,
  IDirect3DExecuteBuffer_Optimize
 };
 #endif /* HAVE_MESAGL */
--- a/graphics/d3dlight.c
+++ b/graphics/d3dlight.c
@ -0,0 +1,260 @@
 /* Direct3D Light
   (c) 1998 Lionel ULMER
   This files contains the implementation of Direct3DLight. */
 #include "config.h"
 #include "windows.h"
 #include "wintypes.h"
 #include "winerror.h"
 #include "interfaces.h"
 #include "heap.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debug.h"
 #include "d3d_private.h"
 #ifdef HAVE_MESAGL
 static IDirect3DLight_VTable light_vtable;
 enum {
  D3D_1,
  D3D_2
 };
 /*******************************************************************************
 *				Light static functions
 */
 static const float zero_value[] = {
  0.0, 0.0, 0.0, 0.0
 };
 static void update(LPDIRECT3DLIGHT this) {
  switch (this->light.dltType) {
  case D3DLIGHT_POINT:         /* 1 */
    TRACE(ddraw, "Activating POINT\n");
    break;
  case D3DLIGHT_SPOT:          /* 2 */
    TRACE(ddraw, "Activating SPOT\n");
    break;
  case D3DLIGHT_DIRECTIONAL: {  /* 3 */
    float direction[4];
    TRACE(ddraw, "Activating DIRECTIONAL\n");
    TRACE(ddraw, "  direction : %f %f %f\n",
 	  this->light.dvDirection.x.x,
 	  this->light.dvDirection.y.y,
 	  this->light.dvDirection.z.z);
    _dump_colorvalue(" color    ", this->light.dcvColor);
    glLightfv(this->light_num,
 	      GL_AMBIENT,
 	      (float *) zero_value);
    glLightfv(this->light_num,
 	      GL_DIFFUSE,
 	      (float *) &(this->light.dcvColor));
    direction[0] = -this->light.dvDirection.x.x;
    direction[1] = -this->light.dvDirection.y.y;
    direction[2] = -this->light.dvDirection.z.z;
    direction[3] = 0.0; /* This is a directional light */
    glLightfv(this->light_num,
 	      GL_POSITION,
 	      (float *) direction);
  } break;
  case D3DLIGHT_PARALLELPOINT:  /* 4 */
    TRACE(ddraw, "Activating PARRALLEL-POINT\n");
    break;
  default:
    TRACE(ddraw, "Not a know Light Type\n");
    break;
  }
 }
 static void activate(LPDIRECT3DLIGHT this) {
  update(this);
  /* If was not active, activate it */
  if (this->is_active == 0) {
    glEnable(this->light_num);
    this->is_active = 1;
  }
  return ;
 }
 /*******************************************************************************
 *				Light Creation functions
 */
 LPDIRECT3DLIGHT d3dlight_create(LPDIRECT3D2 d3d)
 {
  LPDIRECT3DLIGHT mat;
  mat = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirect3DLight));
  mat->ref = 1;
  mat->lpvtbl = &light_vtable;
  mat->d3d.d3d2 = d3d;
  mat->type = D3D_2;
  mat->next = NULL;
  mat->prev = NULL;
  mat->activate = activate;
  mat->is_active = 0;
  return mat;
 }
 LPDIRECT3DLIGHT d3dlight_create_dx3(LPDIRECT3D d3d)
 {
  LPDIRECT3DLIGHT mat;
  mat = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirect3DLight));
  mat->ref = 1;
  mat->lpvtbl = &light_vtable;
  mat->d3d.d3d = d3d;
  mat->type = D3D_1;
  mat->next = NULL;
  mat->prev = NULL;
  mat->activate = activate;
  mat->is_active = 0;
  return mat;
 }
 /*******************************************************************************
 *				IDirect3DLight methods
 */
 static HRESULT WINAPI IDirect3DLight_QueryInterface(LPDIRECT3DLIGHT this,
 						    REFIID riid,
 						    LPVOID* ppvObj)
 {
  char xrefiid[50];
  WINE_StringFromCLSID((LPCLSID)riid,xrefiid);
  FIXME(ddraw, "(%p)->(%s,%p): stub\n", this, xrefiid,ppvObj);
  return S_OK;
 }
 static ULONG WINAPI IDirect3DLight_AddRef(LPDIRECT3DLIGHT this)
 {
  TRACE(ddraw, "(%p)->()incrementing from %lu.\n", this, this->ref );
  return ++(this->ref);
 }
 static ULONG WINAPI IDirect3DLight_Release(LPDIRECT3DLIGHT this)
 {
  FIXME( ddraw, "(%p)->() decrementing from %lu.\n", this, this->ref );
  if (!--(this->ref)) {
    HeapFree(GetProcessHeap(),0,this);
    return 0;
  }
  return this->ref;
 }
 /*** IDirect3DLight methods ***/
 static void dump_light(LPD3DLIGHT light)
 {
  fprintf(stderr, "  dwSize : %ld\n", light->dwSize);
 }
 static HRESULT WINAPI IDirect3DLight_GetLight(LPDIRECT3DLIGHT this,
 					      LPD3DLIGHT lpLight)
 {
  TRACE(ddraw, "(%p)->(%p)\n", this, lpLight);
  if (TRACE_ON(ddraw))
    dump_light(lpLight);
  /* Copies the light structure */
  switch (this->type) {
  case D3D_1:
    *((LPD3DLIGHT)lpLight) = *((LPD3DLIGHT) &(this->light));
    break;
  case D3D_2:
    *((LPD3DLIGHT2)lpLight) = *((LPD3DLIGHT2) &(this->light));
    break;
  }
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DLight_SetLight(LPDIRECT3DLIGHT this,
 					      LPD3DLIGHT lpLight)
 {
  TRACE(ddraw, "(%p)->(%p)\n", this, lpLight);
  if (TRACE_ON(ddraw))
    dump_light(lpLight);
  /* Stores the light */
  switch (this->type) {
  case D3D_1:
    *((LPD3DLIGHT) &(this->light)) = *((LPD3DLIGHT)lpLight);
    break;
  case D3D_2:
    *((LPD3DLIGHT2) &(this->light)) = *((LPD3DLIGHT2)lpLight);
    break;
  }
  if (this->is_active)
    update(this);
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DLight_Initialize(LPDIRECT3DLIGHT this,
 						LPDIRECT3D lpDirect3D)
 {
  TRACE(ddraw, "(%p)->(%p)\n", this, lpDirect3D);
  return DDERR_ALREADYINITIALIZED;
 }
 /*******************************************************************************
 *				IDirect3DLight VTable
 */
 static IDirect3DLight_VTable light_vtable = {
  /*** IUnknown methods ***/
  IDirect3DLight_QueryInterface,
  IDirect3DLight_AddRef,
  IDirect3DLight_Release,
  /*** IDirect3DLight methods ***/
  IDirect3DLight_Initialize,
  IDirect3DLight_SetLight,
  IDirect3DLight_GetLight
 };
 #else /* HAVE_MESAGL */
 /* These function should never be called if MesaGL is not present */
 LPDIRECT3DLIGHT d3dlight_create_dx3(LPDIRECT3D d3d) {
  ERR(ddraw, "Should not be called...\n");
  return NULL;
 }
 LPDIRECT3DLIGHT d3dlight_create(LPDIRECT3D2 d3d) {
  ERR(ddraw, "Should not be called...\n");
  return NULL;
 }
 #endif /* HAVE_MESAGL */
--- a/graphics/d3dmaterial.c
+++ b/graphics/d3dmaterial.c
@ -0,0 +1,251 @@
 /* Direct3D Material
   (c) 1998 Lionel ULMER
   This files contains the implementation of Direct3DMaterial2. */
 #include "config.h"
 #include "windows.h"
 #include "wintypes.h"
 #include "winerror.h"
 #include "interfaces.h"
 #include "heap.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debug.h"
 #include "d3d_private.h"
 #ifdef HAVE_MESAGL
 static IDirect3DMaterial2_VTable material2_vtable;
 static IDirect3DMaterial_VTable material_vtable;
 /*******************************************************************************
 *				Matrial2 static functions
 */
 static void activate(LPDIRECT3DMATERIAL2 this) {
  TRACE(ddraw, "Activating material %p\n", this);
  /* First, set the rendering context */
  if (this->use_d3d2)
    this->device.active_device2->set_context(this->device.active_device2);
  else
    this->device.active_device1->set_context(this->device.active_device1);
  /* Set the current Material */
  _dump_colorvalue("Diffuse", this->mat.a.diffuse);
  glMaterialfv(GL_FRONT,
 	       GL_DIFFUSE,
 	       (float *) &(this->mat.a.diffuse));
  _dump_colorvalue("Ambient", this->mat.b.ambient);
  glMaterialfv(GL_FRONT,
 	       GL_AMBIENT,
 	       (float *) &(this->mat.b.ambient));
  _dump_colorvalue("Specular", this->mat.c.specular);
  glMaterialfv(GL_FRONT,
 	       GL_SPECULAR,
 	       (float *) &(this->mat.c.specular));
  _dump_colorvalue("Emissive", this->mat.d.emissive);
  glMaterialfv(GL_FRONT,
 	       GL_EMISSION,
 	       (float *) &(this->mat.d.emissive));
  TRACE(ddraw, "Size  : %ld\n", this->mat.dwSize);
  TRACE(ddraw, "Power : %f\n", this->mat.e.power);
  return ;
 }
 /*******************************************************************************
 *				Matrial2 Creation functions
 */
 LPDIRECT3DMATERIAL2 d3dmaterial2_create(LPDIRECT3D2 d3d)
 {
  LPDIRECT3DMATERIAL2 mat;
  mat = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirect3DMaterial2));
  mat->ref = 1;
  mat->lpvtbl = &material2_vtable;
  mat->use_d3d2 = 1;
  mat->d3d.d3d2 = d3d;
  mat->activate = activate;
  return mat;
 }
 LPDIRECT3DMATERIAL d3dmaterial_create(LPDIRECT3D d3d)
 {
  LPDIRECT3DMATERIAL2 mat;
  mat = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirect3DMaterial2));
  mat->ref = 1;
  mat->lpvtbl = (LPDIRECT3DMATERIAL2_VTABLE) &material_vtable;
  mat->use_d3d2 = 0;
  mat->d3d.d3d1 = d3d;
  mat->activate = activate;
  return (LPDIRECT3DMATERIAL) mat;
 }
 /*******************************************************************************
 *				IDirect3DMaterial2 methods
 */
 static HRESULT WINAPI IDirect3DMaterial2_QueryInterface(LPDIRECT3DMATERIAL2 this,
 							REFIID riid,
 							LPVOID* ppvObj)
 {
  char xrefiid[50];
  WINE_StringFromCLSID((LPCLSID)riid,xrefiid);
  FIXME(ddraw, "(%p)->(%s,%p): stub\n", this, xrefiid,ppvObj);
  return S_OK;
 }
 static ULONG WINAPI IDirect3DMaterial2_AddRef(LPDIRECT3DMATERIAL2 this)
 {
  TRACE(ddraw, "(%p)->()incrementing from %lu.\n", this, this->ref );
  return ++(this->ref);
 }
 static ULONG WINAPI IDirect3DMaterial2_Release(LPDIRECT3DMATERIAL2 this)
 {
  FIXME( ddraw, "(%p)->() decrementing from %lu.\n", this, this->ref );
  if (!--(this->ref)) {
    HeapFree(GetProcessHeap(),0,this);
    return 0;
  }
  return this->ref;
 }
 /*** IDirect3DMaterial2 methods ***/
 static void dump_material(LPD3DMATERIAL mat)
 {
  fprintf(stderr, "  dwSize : %ld\n", mat->dwSize);
 }
 static HRESULT WINAPI IDirect3DMaterial2_GetMaterial(LPDIRECT3DMATERIAL2 this,
 						     LPD3DMATERIAL lpMat)
 {
  TRACE(ddraw, "(%p)->(%p)\n", this, lpMat);
  if (TRACE_ON(ddraw))
    dump_material(lpMat);
  /* Copies the material structure */
  *lpMat = this->mat;
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DMaterial2_SetMaterial(LPDIRECT3DMATERIAL2 this,
 						     LPD3DMATERIAL lpMat)
 {
  TRACE(ddraw, "(%p)->(%p)\n", this, lpMat);
  if (TRACE_ON(ddraw))
    dump_material(lpMat);
  /* Stores the material */
  this->mat = *lpMat;
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DMaterial2_GetHandle(LPDIRECT3DMATERIAL2 this,
 						   LPDIRECT3DDEVICE2 lpD3DDevice2,
 						   LPD3DMATERIALHANDLE lpMatHandle)
 {
  FIXME(ddraw, "(%p)->(%p,%p): stub\n", this, lpD3DDevice2, lpMatHandle);
  if (this->use_d3d2)
    this->device.active_device2 = lpD3DDevice2;
  else
    this->device.active_device1 = (LPDIRECT3DDEVICE) lpD3DDevice2;
  *lpMatHandle = (DWORD) this; /* lpD3DDevice2->store_material(this); */
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DMaterial_Reserve(LPDIRECT3DMATERIAL this)
 {
  FIXME(ddraw, "(%p)->(): stub\n", this);
  return DDERR_INVALIDPARAMS;
 }
 static HRESULT WINAPI IDirect3DMaterial_Unreserve(LPDIRECT3DMATERIAL this)
 {
  FIXME(ddraw, "(%p)->(): stub\n", this);
  return DDERR_INVALIDPARAMS;
 }
 static HRESULT WINAPI IDirect3DMaterial_Initialize(LPDIRECT3DMATERIAL this,
 						   LPDIRECT3D lpDirect3D)
 {
  TRACE(ddraw, "(%p)->(%p)\n", this, lpDirect3D);
  return DDERR_ALREADYINITIALIZED;
 }
 /*******************************************************************************
 *				IDirect3DMaterial VTable
 */
 static IDirect3DMaterial_VTable material_vtable = {
  /*** IUnknown methods ***/
  IDirect3DMaterial2_QueryInterface,
  IDirect3DMaterial2_AddRef,
  IDirect3DMaterial2_Release,
  /*** IDirect3DMaterial methods ***/
  IDirect3DMaterial_Initialize,
  IDirect3DMaterial2_SetMaterial,
  IDirect3DMaterial2_GetMaterial,
  IDirect3DMaterial2_GetHandle,
  IDirect3DMaterial_Reserve,
  IDirect3DMaterial_Unreserve
 };
 /*******************************************************************************
 *				IDirect3DMaterial2 VTable
 */
 static IDirect3DMaterial2_VTable material2_vtable = {
  /*** IUnknown methods ***/
  IDirect3DMaterial2_QueryInterface,
  IDirect3DMaterial2_AddRef,
  IDirect3DMaterial2_Release,
  /*** IDirect3DMaterial methods ***/
  IDirect3DMaterial2_SetMaterial,
  IDirect3DMaterial2_GetMaterial,
  IDirect3DMaterial2_GetHandle
 };
 #else /* HAVE_MESAGL */
 LPDIRECT3DMATERIAL d3dmaterial_create(LPDIRECT3D d3d) {
  ERR(ddraw, "Should not be called...\n");
  return NULL;
 }
 LPDIRECT3DMATERIAL2 d3dmaterial2_create(LPDIRECT3D2 d3d) {
  ERR(ddraw, "Should not be called...\n");
  return NULL;
 }
 #endif /* HAVE_MESAGL */
--- a/graphics/d3dtexture.c
+++ b/graphics/d3dtexture.c
@ -0,0 +1,200 @@
 /* Direct3D Texture
   (c) 1998 Lionel ULMER
   This files contains the implementation of interface Direct3DTexture2. */
 #include "config.h"
 #include "windows.h"
 #include "wintypes.h"
 #include "winerror.h"
 #include "interfaces.h"
 #include "heap.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debug.h"
 #include "d3d_private.h"
 #ifdef HAVE_MESAGL
 static IDirect3DTexture2_VTable texture2_vtable;
 static IDirect3DTexture_VTable texture_vtable;
 /*******************************************************************************
 *				Texture2 Creation functions
 */
 LPDIRECT3DTEXTURE2 d3dtexture2_create(LPDIRECTDRAWSURFACE3 surf)
 {
  LPDIRECT3DTEXTURE2 mat;
  mat = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirect3DTexture2));
  mat->ref = 1;
  mat->lpvtbl = &texture2_vtable;
  mat->surface = surf;
  return mat;
 }
 /*******************************************************************************
 *				Texture Creation functions
 */
 LPDIRECT3DTEXTURE d3dtexture_create(LPDIRECTDRAWSURFACE3 surf)
 {
  LPDIRECT3DTEXTURE mat;
  mat = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirect3DTexture));
  mat->ref = 1;
  mat->lpvtbl = (IDirect3DTexture2_VTable*) &texture_vtable;
  mat->surface = surf;
  return mat;
 }
 /*******************************************************************************
 *				IDirect3DTexture2 methods
 */
 static HRESULT WINAPI IDirect3DTexture2_QueryInterface(LPDIRECT3DTEXTURE2 this,
 							REFIID riid,
 							LPVOID* ppvObj)
 {
  char xrefiid[50];
  WINE_StringFromCLSID((LPCLSID)riid,xrefiid);
  FIXME(ddraw, "(%p)->(%s,%p): stub\n", this, xrefiid,ppvObj);
  return S_OK;
 }
 static ULONG WINAPI IDirect3DTexture2_AddRef(LPDIRECT3DTEXTURE2 this)
 {
  TRACE(ddraw, "(%p)->()incrementing from %lu.\n", this, this->ref );
  return ++(this->ref);
 }
 static ULONG WINAPI IDirect3DTexture2_Release(LPDIRECT3DTEXTURE2 this)
 {
  FIXME( ddraw, "(%p)->() decrementing from %lu.\n", this, this->ref );
  if (!--(this->ref)) {
    HeapFree(GetProcessHeap(),0,this);
    return 0;
  }
  return this->ref;
 }
 /*** IDirect3DTexture methods ***/
 static HRESULT WINAPI IDirect3DTexture_GetHandle(LPDIRECT3DTEXTURE this,
 						 LPDIRECT3DDEVICE lpD3DDevice,
 						 LPD3DTEXTUREHANDLE lpHandle)
 {
  FIXME(ddraw, "(%p)->(%p,%p): stub\n", this, lpD3DDevice, lpHandle);
  *lpHandle = (DWORD) this->surface;
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DTexture_Initialize(LPDIRECT3DTEXTURE this,
 						  LPDIRECT3DDEVICE lpD3DDevice,
 						  LPDIRECTDRAWSURFACE lpSurface)
 {
  TRACE(ddraw, "(%p)->(%p,%p)\n", this, lpD3DDevice, lpSurface);
  return DDERR_ALREADYINITIALIZED;
 }
 static HRESULT WINAPI IDirect3DTexture_Unload(LPDIRECT3DTEXTURE this)
 {
  FIXME(ddraw, "(%p)->(): stub\n", this);
  return DD_OK;
 }
 /*** IDirect3DTexture2 methods ***/
 static HRESULT WINAPI IDirect3DTexture2_GetHandle(LPDIRECT3DTEXTURE2 this,
 						  LPDIRECT3DDEVICE2 lpD3DDevice2,
 						  LPD3DTEXTUREHANDLE lpHandle)
 {
  FIXME(ddraw, "(%p)->(%p,%p): stub\n", this, lpD3DDevice2, lpHandle);
  *lpHandle = (DWORD) this->surface; /* lpD3DDevice2->store_texture(this); */
  return DD_OK;
 }
 /* Common methods */
 static HRESULT WINAPI IDirect3DTexture2_PaletteChanged(LPDIRECT3DTEXTURE2 this,
 						       DWORD dwStart,
 						       DWORD dwCount)
 {
  FIXME(ddraw, "(%p)->(%8ld,%8ld): stub\n", this, dwStart, dwCount);
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DTexture2_Load(LPDIRECT3DTEXTURE2 this,
 					     LPDIRECT3DTEXTURE2 lpD3DTexture2)
 {
  FIXME(ddraw, "(%p)->(%p): stub\n", this, lpD3DTexture2);
  /* Hack ? */
  FIXME(ddraw, "Sthis %p / Sload %p\n", this->surface, lpD3DTexture2->surface);
  this->surface->s.surface_desc.ddsCaps.dwCaps &= ~DDSCAPS_ALLOCONLOAD;
  return DD_OK;
 }
 /*******************************************************************************
 *				IDirect3DTexture2 VTable
 */
 static IDirect3DTexture2_VTable texture2_vtable = {
  /*** IUnknown methods ***/
  IDirect3DTexture2_QueryInterface,
  IDirect3DTexture2_AddRef,
  IDirect3DTexture2_Release,
  /*** IDirect3DTexture methods ***/
  IDirect3DTexture2_GetHandle,
  IDirect3DTexture2_PaletteChanged,
  IDirect3DTexture2_Load
 };
 /*******************************************************************************
 *				IDirect3DTexture VTable
 */
 static IDirect3DTexture_VTable texture_vtable = {
  /*** IUnknown methods ***/
  IDirect3DTexture2_QueryInterface,
  IDirect3DTexture2_AddRef,
  IDirect3DTexture2_Release,
  /*** IDirect3DTexture methods ***/
  IDirect3DTexture_Initialize,
  IDirect3DTexture_GetHandle,
  IDirect3DTexture2_PaletteChanged,
  IDirect3DTexture2_Load,
  IDirect3DTexture_Unload
 };
 #else /* HAVE_MESAGL */
 /* These function should never be called if MesaGL is not present */
 LPDIRECT3DTEXTURE2 d3dtexture2_create(LPDIRECTDRAWSURFACE3 surf) {
  ERR(ddraw, "Should not be called...\n");
  return NULL;
 }
 LPDIRECT3DTEXTURE d3dtexture_create(LPDIRECTDRAWSURFACE3 surf) {
  ERR(ddraw, "Should not be called...\n");
  return NULL;
 }
 #endif /* HAVE_MESAGL */
--- a/graphics/d3dviewport.c
+++ b/graphics/d3dviewport.c
@ -0,0 +1,350 @@
 /* Direct3D Viewport
   (c) 1998 Lionel ULMER
   This files contains the implementation of Direct3DViewport2. */
 #include "config.h"
 #include "windows.h"
 #include "wintypes.h"
 #include "winerror.h"
 #include "interfaces.h"
 #include "heap.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debug.h"
 #include "d3d_private.h"
 #ifdef HAVE_MESAGL
 static IDirect3DViewport2_VTable viewport2_vtable;
 /*******************************************************************************
 *				Viewport1/2 static functions
 */
 static void activate(LPDIRECT3DVIEWPORT2 this) {
  LPDIRECT3DLIGHT l;
  /* Activate all the lights associated with this context */
  l = this->lights;
  while (l != NULL) {
    l->activate(l);
    l = l->next;
  }
 }
 /*******************************************************************************
 *				Viewport1/2 Creation functions
 */
 LPDIRECT3DVIEWPORT2 d3dviewport2_create(LPDIRECT3D2 d3d)
 {
  LPDIRECT3DVIEWPORT2 vp;
  vp = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirect3DViewport2));
  vp->ref = 1;
  vp->lpvtbl = &viewport2_vtable;
  vp->d3d.d3d2 = d3d;
  vp->use_d3d2 = 1;
  vp->device.active_device2 = NULL;
  vp->activate = activate;
  vp->lights = NULL;
  vp->nextlight = GL_LIGHT0;
  return vp;
 }
 LPDIRECT3DVIEWPORT d3dviewport_create(LPDIRECT3D d3d)
 {
  LPDIRECT3DVIEWPORT2 vp;
  vp = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirect3DViewport2));
  vp->ref = 1;
  vp->lpvtbl = &viewport2_vtable;
  vp->d3d.d3d1 = d3d;
  vp->use_d3d2 = 0;
  vp->device.active_device1 = NULL;
  vp->activate = activate;
  vp->lights = NULL;
  vp->nextlight = GL_LIGHT0;
  return (LPDIRECT3DVIEWPORT) vp;
 }
 /*******************************************************************************
 *				IDirect3DViewport2 methods
 */
 static HRESULT WINAPI IDirect3DViewport2_QueryInterface(LPDIRECT3DVIEWPORT2 this,
 							REFIID riid,
 							LPVOID* ppvObj)
 {
  char xrefiid[50];
  WINE_StringFromCLSID((LPCLSID)riid,xrefiid);
  FIXME(ddraw, "(%p)->(%s,%p): stub\n", this, xrefiid,ppvObj);
  return S_OK;
 }
 static ULONG WINAPI IDirect3DViewport2_AddRef(LPDIRECT3DVIEWPORT2 this)
 {
  TRACE(ddraw, "(%p)->()incrementing from %lu.\n", this, this->ref );
  return ++(this->ref);
 }
 static ULONG WINAPI IDirect3DViewport2_Release(LPDIRECT3DVIEWPORT2 this)
 {
  FIXME( ddraw, "(%p)->() decrementing from %lu.\n", this, this->ref );
  if (!--(this->ref)) {
    HeapFree(GetProcessHeap(),0,this);
    return 0;
  }
  return this->ref;
 }
 /*** IDirect3DViewport methods ***/
 static HRESULT WINAPI IDirect3DViewport2_Initialize(LPDIRECT3DVIEWPORT2 this,
 						    LPDIRECT3D d3d)
 {
  FIXME(ddraw, "(%p)->(%p): stub\n", this, d3d);
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DViewport2_GetViewport(LPDIRECT3DVIEWPORT2 this,
 						     LPD3DVIEWPORT lpvp)
 {
  FIXME(ddraw, "(%p)->(%p): stub\n", this, lpvp);
  if (this->use_vp2 != 0)
    return DDERR_INVALIDPARAMS;
  *lpvp = this->viewport.vp1;
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DViewport2_SetViewport(LPDIRECT3DVIEWPORT2 this,
 						     LPD3DVIEWPORT lpvp)
 {
  FIXME(ddraw, "(%p)->(%p): stub\n", this, lpvp);
  this->use_vp2 = 0;
  this->viewport.vp1 = *lpvp;
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DViewport2_TransformVertices(LPDIRECT3DVIEWPORT2 this,
 							   DWORD dwVertexCount,
 							   LPD3DTRANSFORMDATA lpData,
 							   DWORD dwFlags,
 							   LPDWORD lpOffScreen)
 {
  FIXME(ddraw, "(%p)->(%8ld,%p,%08lx,%p): stub\n",
 	this, dwVertexCount, lpData, dwFlags, lpOffScreen);
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DViewport2_LightElements(LPDIRECT3DVIEWPORT2 this,
 						       DWORD dwElementCount,
 						       LPD3DLIGHTDATA lpData)
 {
  FIXME(ddraw, "(%p)->(%8ld,%p): stub\n", this, dwElementCount, lpData);
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DViewport2_SetBackground(LPDIRECT3DVIEWPORT2 this,
 						       D3DMATERIALHANDLE hMat)
 {
  FIXME(ddraw, "(%p)->(%08x): stub\n", this, hMat);
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DViewport2_GetBackground(LPDIRECT3DVIEWPORT2 this,
 						       LPD3DMATERIALHANDLE lphMat,
 						       LPBOOL lpValid)
 {
  FIXME(ddraw, "(%p)->(%p,%p): stub\n", this, lphMat, lpValid);
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DViewport2_SetBackgroundDepth(LPDIRECT3DVIEWPORT2 this,
 							    LPDIRECTDRAWSURFACE lpDDSurface)
 {
  FIXME(ddraw, "(%p)->(%p): stub\n", this, lpDDSurface);
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DViewport2_GetBackgroundDepth(LPDIRECT3DVIEWPORT2 this,
 							    LPDIRECTDRAWSURFACE* lplpDDSurface,
 							    LPBOOL lpValid)
 {
  FIXME(ddraw, "(%p)->(%p,%p): stub\n", this, lplpDDSurface, lpValid);
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DViewport2_Clear(LPDIRECT3DVIEWPORT2 this,
 					       DWORD dwCount,
 					       LPD3DRECT lpRects,
 					       DWORD dwFlags)
 {
  FIXME(ddraw, "(%p)->(%8ld,%p,%08lx): stub\n", this, dwCount, lpRects, dwFlags);
  /* For the moment, ignore the rectangles */
  if (this->device.active_device1 != NULL) {
    /* Get the rendering context */
    if (this->use_d3d2)
      this->device.active_device2->set_context(this->device.active_device2);
    else
      this->device.active_device1->set_context(this->device.active_device1);
    /* Clears the screen */
    glDepthMask(GL_TRUE); /* Enables Z writing to be sure to delete also the Z buffer */
    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
  }
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DViewport2_AddLight(LPDIRECT3DVIEWPORT2 this,
 						  LPDIRECT3DLIGHT lpLight)
 {
  FIXME(ddraw, "(%p)->(%p): stub\n", this, lpLight);
  /* Add the light in the 'linked' chain */
  lpLight->next = this->lights;
  this->lights = lpLight;
  /* If active, activate the light */
  if (this->device.active_device1 != NULL) {
    /* Get the rendering context */
    if (this->use_d3d2)
      this->device.active_device2->set_context(this->device.active_device2);
    else
      this->device.active_device1->set_context(this->device.active_device1);
    /* Activate the light */
    lpLight->light_num = this->nextlight++;
    lpLight->activate(lpLight);
  }
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DViewport2_DeleteLight(LPDIRECT3DVIEWPORT2 this,
 						     LPDIRECT3DLIGHT lpLight)
 {
  FIXME(ddraw, "(%p)->(%p): stub\n", this, lpLight);
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DViewport2_NextLight(LPDIRECT3DVIEWPORT2 this,
 						   LPDIRECT3DLIGHT lpLight,
 						   LPDIRECT3DLIGHT* lplpLight,
 						   DWORD dwFlags)
 {
  FIXME(ddraw, "(%p)->(%p,%p,%08lx): stub\n", this, lpLight, lplpLight, dwFlags);
  return DD_OK;
 }
 /*** IDirect3DViewport2 methods ***/
 static HRESULT WINAPI IDirect3DViewport2_GetViewport2(LPDIRECT3DVIEWPORT2 this,
 						      LPD3DVIEWPORT2 lpViewport2)
 {
  TRACE(ddraw, "(%p)->(%p)\n", this, lpViewport2);
  if (this->use_vp2 != 1)
    return DDERR_INVALIDPARAMS;
  *lpViewport2 = this->viewport.vp2;
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3DViewport2_SetViewport2(LPDIRECT3DVIEWPORT2 this,
 						      LPD3DVIEWPORT2 lpViewport2)
 {
  TRACE(ddraw, "(%p)->(%p)\n", this, lpViewport2);
  TRACE(ddraw, "dwSize = %ld   dwX = %ld   dwY = %ld\n",
 	lpViewport2->dwSize, lpViewport2->dwX, lpViewport2->dwY);
  TRACE(ddraw, "dwWidth = %ld   dwHeight = %ld\n",
 	lpViewport2->dwWidth, lpViewport2->dwHeight);
  TRACE(ddraw, "dvClipX = %f   dvClipY = %f\n",
 	lpViewport2->dvClipX, lpViewport2->dvClipY);
  TRACE(ddraw, "dvClipWidth = %f   dvClipHeight = %f\n",
 	lpViewport2->dvClipWidth, lpViewport2->dvClipHeight);
  TRACE(ddraw, "dvMinZ = %f   dvMaxZ = %f\n",
 	lpViewport2->dvMinZ, lpViewport2->dvMaxZ);
  this->viewport.vp2 = *lpViewport2;
  this->use_vp2 = 1;
  return DD_OK;
 }
 /*******************************************************************************
 *				IDirect3DViewport1/2 VTable
 */
 static IDirect3DViewport2_VTable viewport2_vtable = {
  /*** IUnknown methods ***/
  IDirect3DViewport2_QueryInterface,
  IDirect3DViewport2_AddRef,
  IDirect3DViewport2_Release,
  /*** IDirect3DViewport methods ***/
  IDirect3DViewport2_Initialize,
  IDirect3DViewport2_GetViewport,
  IDirect3DViewport2_SetViewport,
  IDirect3DViewport2_TransformVertices,
  IDirect3DViewport2_LightElements,
  IDirect3DViewport2_SetBackground,
  IDirect3DViewport2_GetBackground,
  IDirect3DViewport2_SetBackgroundDepth,
  IDirect3DViewport2_GetBackgroundDepth,
  IDirect3DViewport2_Clear,
  IDirect3DViewport2_AddLight,
  IDirect3DViewport2_DeleteLight,
  IDirect3DViewport2_NextLight,
  /*** IDirect3DViewport2 methods ***/
  IDirect3DViewport2_GetViewport2,
  IDirect3DViewport2_SetViewport2
 };
 #else /* HAVE_MESAGL */
 LPDIRECT3DVIEWPORT d3dviewport_create(LPDIRECT3D d3d) {
  ERR(ddraw, "Should not be called...\n");
  return NULL;
 }
 LPDIRECT3DVIEWPORT2 d3dviewport2_create(LPDIRECT3D2 d3d) {
  ERR(ddraw, "Should not be called...\n");
  return NULL;
 }
 #endif /* HAVE_MESAGL */
--- a/graphics/ddraw.c
+++ b/graphics/ddraw.c
@ -1,6 +1,7 @@
 /*		DirectDraw using DGA or Xlib(XSHM)
 *
 * Copyright 1997,1998 Marcus Meissner
 * Copyright 1998 Lionel Ulmer (most of Direct3D stuff)
 */
 /* XF86DGA:
 * When DirectVideo mode is enabled you can no longer use 'normal' X 
@ -59,6 +60,9 @@
 #include "ts_xshm.h"
 #endif
 /* This for all the enumeration and creation of D3D-related objects */
 #include "d3d_private.h"
 /* define this if you want to play Diablo using XF86DGA. (bug workaround) */
 #undef DIABLO_HACK
@ -121,10 +125,13 @@ DDRAW_DGA_Available()
 HRESULT WINAPI
 DirectDrawEnumerate32A(LPDDENUMCALLBACK32A ddenumproc,LPVOID data) {
 	if (DDRAW_DGA_Available()) {
 	  TRACE(ddraw, "Enumerating DGA interface\n");
 		ddenumproc(&DGA_DirectDraw_GUID,"WINE with XFree86 DGA","display",data);
 	}
 	TRACE(ddraw, "Enumerating Xlib interface\n");
 	ddenumproc(&XLIB_DirectDraw_GUID,"WINE with Xlib","display",data);
-	ddenumproc(NULL,"WINE","display",data);
+	TRACE(ddraw, "Enumerating Default interface\n");
 	ddenumproc(NULL,"WINE (default)","display",data);
 	return DD_OK;
 }
@ -324,9 +331,11 @@ static void _dump_DDCOLORKEY(DWORD flagmask) {
 }
 static void _dump_pixelformat(LPDDPIXELFORMAT pf) {
  DUMP("Size : %ld\n", pf->dwSize);
  if (pf->dwFlags)
  _dump_DDCOLORKEY(pf->dwFlags);
  DUMP("dwFourCC : %ld\n", pf->dwFourCC);
-  DUMP("RBG bit cbout : %ld\n", pf->x.dwRGBBitCount);
+  DUMP("RGB bit count : %ld\n", pf->x.dwRGBBitCount);
  DUMP("Masks : R %08lx  G %08lx  B %08lx  A %08lx\n",
       pf->y.dwRBitMask, pf->z.dwGBitMask, pf->xx.dwBBitMask, pf->xy.dwRGBAlphaBitMask);
 }
@ -340,6 +349,7 @@ static int _getpixelformat(LPDIRECTDRAW2 ddraw,LPDDPIXELFORMAT pf) {
 		vi = TSXGetVisualInfo(display,VisualNoMask,&vt,&nitems);
 	pf->dwFourCC = 0;
 	pf->dwSize = sizeof(DDPIXELFORMAT);
 	if (ddraw->d.depth==8) {
 		pf->dwFlags 		= DDPF_RGB|DDPF_PALETTEINDEXED8;
 		pf->x.dwRGBBitCount	= 8;
@ -585,7 +595,7 @@ static HRESULT WINAPI Xlib_IDirectDrawSurface3_SetPalette(
 static HRESULT WINAPI DGA_IDirectDrawSurface3_SetPalette(
 	LPDIRECTDRAWSURFACE3 this,LPDIRECTDRAWPALETTE pal
 ) {
-	TRACE(ddraw,"(%p)->SetPalette(%p)\n",this,pal);
+	TRACE(ddraw,"(%p)->(%p)\n",this,pal);
 #ifdef HAVE_LIBXXF86DGA
        /* According to spec, we are only supposed to 
         * AddRef if this is not the same palette.
@ -701,16 +711,49 @@ static HRESULT WINAPI IDirectDrawSurface3_Blt(
 		       ddesc.dwHeight * ddesc.lPitch);
 	} else {
 	  int bpp = ddesc.ddpfPixelFormat.x.dwRGBBitCount / 8;
-	  int height = xsrc.bottom - xsrc.top;
+	  int srcheight = xsrc.bottom - xsrc.top;
 	  int srcwidth = xsrc.right - xsrc.left;
 	  int dstheight = xdst.bottom - xdst.top;
 	  int dstwidth = xdst.right - xdst.left;
 	  int width = (xsrc.right - xsrc.left) * bpp;
 	  int h;
-	  for (h = 0; h < height; h++) {
+	  /* Sanity check for rectangle sizes */
 	  if ((srcheight != dstheight) || (srcwidth  != dstwidth)) {
 	    int x, y;
 	    /* I think we should do a Blit with 'stretching' here....
 	       Tomb Raider II uses this to display the background during the menu selection
 	       when the screen resolution is != than 40x480 */
 	    TRACE(ddraw, "Blt with stretching\n");
 	    /* This is a basic stretch implementation. It is painfully slow and quite ugly. */
 	    if (bpp == 1) {
 	      /* In this case, we cannot do any anti-aliasing */
 	      for (y = xdst.top; y < xdst.bottom; y++) {
 		for (x = xdst.left; x < xdst.right; x++) {
 		  double sx, sy;
 		  unsigned char *dbuf = (unsigned char *) ddesc.y.lpSurface;
 		  unsigned char *sbuf = (unsigned char *) sdesc.y.lpSurface;
 		  sx = (((double) (x - xdst.left) / dstwidth) * srcwidth) + xsrc.left;
 		  sy = (((double) (y - xdst.top) / dstheight) * srcheight) + xsrc.top;
 		  dbuf[(y * ddesc.lPitch) + x] = sbuf[(((int) sy) * sdesc.lPitch) + ((int) sx)];
 		}
 	      }
 	    } else {
 	      FIXME(ddraw, "Not done yet for depth != 8\n");
 	    }
 	  } else {
 	    /* Same size => fast blit */
 	    for (h = 0; h < srcheight; h++) {
 	    memcpy(ddesc.y.lpSurface + ((h + xdst.top) * ddesc.lPitch) + xdst.left * bpp,
 		   sdesc.y.lpSurface + ((h + xsrc.top) * sdesc.lPitch) + xsrc.left * bpp,
 		   width);
 	  }
 	}
 	}
 	if (dwFlags && FIXME_ON(ddraw)) {
 	  FIXME(ddraw,"\tUnsupported flags: ");_dump_DDBLT(dwFlags);
@ -956,8 +999,41 @@ static HRESULT WINAPI IDirectDrawSurface3_QueryInterface(LPDIRECTDRAWSURFACE3 th
 	) {
 		*obj = this;
 		this->lpvtbl->fnAddRef(this);
 		TRACE(ddraw, "  Creating IDirect3DSurfaceX interface (%p)\n", *obj);
 		return S_OK;
 	}
 	else if (!memcmp(&IID_IDirect3DTexture2,refiid,sizeof(IID)))
 	  {
 	    /* Texture interface */
 	    *obj = d3dtexture2_create(this);
 	    this->lpvtbl->fnAddRef(this);
 	    TRACE(ddraw, "  Creating IDirect3DTexture2 interface (%p)\n", *obj);
 	    return S_OK;
 	  }
 	else if (!memcmp(&IID_IDirect3DTexture,refiid,sizeof(IID)))
 	  {
 	    /* Texture interface */
 	    *obj = d3dtexture_create(this);
 	    this->lpvtbl->fnAddRef(this);
 	    TRACE(ddraw, "  Creating IDirect3DTexture interface (%p)\n", *obj);
 	    return S_OK;
 	  }
 	else if (is_OpenGL_dx3(refiid, (LPDIRECTDRAWSURFACE) this, (LPDIRECT3DDEVICE *) obj))
 	  {
 	    /* It is the OpenGL Direct3D Device */
 	    this->lpvtbl->fnAddRef(this);
 	    TRACE(ddraw, "  Creating IDirect3DDevice interface (%p)\n", *obj);
 		return S_OK;
 	}
 	FIXME(ddraw,"(%p):interface for IID %s NOT found!\n",this,xrefiid);
 	return OLE_E_ENUM_NOMORE;
 }
@ -1159,6 +1235,9 @@ static HRESULT WINAPI IDirectDrawSurface3_GetDDInterface(
 {
  FIXME(ddraw,"(%p)->(%p),stub!\n", this, lplpDD);
  /* Not sure about that... */
  *lplpDD = (void *) this->s.ddraw;
  return DD_OK;
 }
@ -1554,6 +1633,9 @@ static HRESULT WINAPI IDirect3D_QueryInterface(
        if (!memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown))) {
                *obj = this;
                this->lpvtbl->fnAddRef(this);
 		TRACE(ddraw, "  Creating IUnknown interface (%p)\n", *obj);
                return S_OK;
        }
        if (!memcmp(&IID_IDirect3D,refiid,sizeof(IID_IDirect3D))) {
@ -1565,6 +1647,9 @@ static HRESULT WINAPI IDirect3D_QueryInterface(
                this->lpvtbl->fnAddRef(this);
                d3d->lpvtbl = &d3dvt;
                *obj = d3d;
 		TRACE(ddraw, "  Creating IDirect3D interface (%p)\n", *obj);
                return S_OK;
        }
        if (!memcmp(&IID_IDirect3D2,refiid,sizeof(IID_IDirect3D))) {
@ -1576,6 +1661,9 @@ static HRESULT WINAPI IDirect3D_QueryInterface(
                this->lpvtbl->fnAddRef(this);
                d3d->lpvtbl = &d3d2vt;
                *obj = d3d;
 		TRACE(ddraw, "  Creating IDirect3D2 interface (%p)\n", *obj);
                return S_OK;
        }
        FIXME(ddraw,"(%p):interface for IID %s NOT found!\n",this,xrefiid);
@ -1612,61 +1700,63 @@ static HRESULT WINAPI IDirect3D_Initialize(
  return DDERR_ALREADYINITIALIZED;
 }
-static HRESULT WINAPI IDirect3D_CreateLight(LPDIRECT3D this,LPDIRECT3DLIGHT *light,IUnknown* lpunk) {
+static HRESULT WINAPI IDirect3D_EnumDevices(LPDIRECT3D this,
-    FIXME(ddraw,"(%p)->(%p,%p)\n",this,light,lpunk);
+					    LPD3DENUMDEVICESCALLBACK cb,
-    return E_FAIL;
+					    LPVOID context) {
-}
+  FIXME(ddraw,"(%p)->(%p,%p),stub!\n",this,cb,context);
-typedef LPVOID LPDIRECT3DDEVICE;
+  /* Call functions defined in d3ddevices.c */
  if (d3d_OpenGL_dx3(cb, context))
    return DD_OK;
 static HRESULT WINAPI IDirect3D_CreateDevice(LPDIRECT3D this,LPCLSID rclsid,LPDIRECTDRAWSURFACE surf,LPDIRECT3DDEVICE *d3dev) {
  char    xclsid[50];
  WINE_StringFromCLSID(rclsid,xclsid);
  FIXME(ddraw,"(%p)->(%s,%p,%p), no Direct3D devices implemented yet!\n",this,xclsid,surf,d3dev);
  return E_FAIL; /* D3DERR_INVALID_DEVICE probably */
 }
 static HRESULT WINAPI IDirect3D_EnumDevices(
         LPDIRECT3D this,
         LPD3DENUMDEVICESCALLBACK a,
         LPVOID b )
 {
  FIXME( ddraw,"(%p)->(%p,%p)\n",this,a,b);
  return DD_OK;
 }
-static HRESULT WINAPI IDirect3D_CreateMaterial(
+static HRESULT WINAPI IDirect3D_CreateLight(LPDIRECT3D this,
-         LPDIRECT3D this,
+					    LPDIRECT3DLIGHT *lplight,
-         LPDIRECT3DMATERIAL* a,
+					    IUnknown *lpunk)
         IUnknown* b)
 {
-  FIXME( ddraw,"(%p)->(%p,%p)\n",this,a,b);
+  TRACE(ddraw, "(%p)->(%p,%p): stub\n", this, lplight, lpunk);
  /* Call the creation function that is located in d3dlight.c */
  *lplight = d3dlight_create_dx3(this);
  return DD_OK;
 }
-static HRESULT WINAPI IDirect3D_CreateViewport(
+static HRESULT WINAPI IDirect3D_CreateMaterial(LPDIRECT3D this,
-         LPDIRECT3D this,
+					       LPDIRECT3DMATERIAL *lpmaterial,
-         LPDIRECT3DVIEWPORT* a,
+					       IUnknown *lpunk)
         IUnknown* b )
 {
-  FIXME( ddraw,"(%p)->(%p,%p)\n",this,a,b);
+  TRACE(ddraw, "(%p)->(%p,%p): stub\n", this, lpmaterial, lpunk);
  /* Call the creation function that is located in d3dviewport.c */
  *lpmaterial = d3dmaterial_create(this);
  return DD_OK;
 }
-static HRESULT WINAPI IDirect3D_FindDevice(
+static HRESULT WINAPI IDirect3D_CreateViewport(LPDIRECT3D this,
-         LPDIRECT3D this,
+					       LPDIRECT3DVIEWPORT *lpviewport,
-         LPD3DFINDDEVICESEARCH a,
+					       IUnknown *lpunk)
         LPD3DFINDDEVICERESULT b )
 {
-  FIXME( ddraw,"(%p)->(%p,%p)\n",this,a,b);
+  TRACE(ddraw, "(%p)->(%p,%p): stub\n", this, lpviewport, lpunk);
  /* Call the creation function that is located in d3dviewport.c */
  *lpviewport = d3dviewport_create(this);
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3D_FindDevice(LPDIRECT3D this,
 					   LPD3DFINDDEVICESEARCH lpfinddevsrc,
 					   LPD3DFINDDEVICERESULT lpfinddevrst)
 {
  TRACE(ddraw, "(%p)->(%p,%p): stub\n", this, lpfinddevsrc, lpfinddevrst);
  return DD_OK;
 }
 /*******************************************************************************
 *				IDirect3D
 */
 static struct IDirect3D_VTable d3dvt = {
        IDirect3D_QueryInterface,
        IDirect3D_AddRef,
@ -1676,12 +1766,26 @@ static struct IDirect3D_VTable d3dvt = {
        IDirect3D_CreateLight,
        IDirect3D_CreateMaterial,
        IDirect3D_CreateViewport,
-        IDirect3D_FindDevice,
+	IDirect3D_FindDevice
 };
 /*******************************************************************************
 *				IDirect3D2
 */
 static HRESULT WINAPI IDirect3D2_QueryInterface(
        LPDIRECT3D2 this,REFIID refiid,LPVOID *obj) {
  /* For the moment, we use the same function as in IDirect3D */
  TRACE(ddraw, "Calling IDirect3D enumerating function.\n");
  return IDirect3D_QueryInterface((LPDIRECT3D) this, refiid, obj);
 }
 static ULONG WINAPI IDirect3D2_AddRef(LPDIRECT3D2 this) {
        TRACE( ddraw, "(%p)->() incrementing from %lu.\n", this, this->ref );
        return ++(this->ref);
 }
 static ULONG WINAPI IDirect3D2_Release(LPDIRECT3D2 this) {
        TRACE( ddraw, "(%p)->() decrementing from %lu.\n", this, this->ref );
@ -1696,43 +1800,88 @@ static ULONG WINAPI IDirect3D2_Release(LPDIRECT3D2 this) {
 static HRESULT WINAPI IDirect3D2_EnumDevices(
 	LPDIRECT3D2 this,LPD3DENUMDEVICESCALLBACK cb, LPVOID context
 ) {
 	D3DDEVICEDESC	d1,d2;
 	FIXME(ddraw,"(%p)->(%p,%p),stub!\n",this,cb,context);
 #if 0
 	d1.dwSize	= sizeof(d1);
 	d1.dwFlags	= 0;
-	d2.dwSize	= sizeof(d2);
+	/* Call functions defined in d3ddevices.c */
-	d2.dwFlags	= 0;
+	if (d3d_OpenGL(cb, context))
-	cb((void*)&IID_IDirect3DHALDevice,"WINE Direct3D HAL","direct3d",&d1,&d2,context);
+	  return DD_OK;
-#endif
+
 	return DD_OK;
 }
-static HRESULT WINAPI IDirect3D2_CreateDevice(LPDIRECT3D2 this,REFCLSID rclsid,LPDIRECTDRAWSURFACE surf,LPDIRECT3DDEVICE2 *d3dev) {
+static HRESULT WINAPI IDirect3D2_CreateLight(LPDIRECT3D2 this,
-  char    xclsid[50];
+					     LPDIRECT3DLIGHT *lplight,
 					     IUnknown *lpunk)
 {
  TRACE(ddraw, "(%p)->(%p,%p): stub\n", this, lplight, lpunk);
-  WINE_StringFromCLSID((LPCLSID)rclsid,xclsid);
+  /* Call the creation function that is located in d3dlight.c */
-  FIXME(ddraw,"(%p)->(%s,%p,%p), no Direct3D devices implemented yet!\n",this,xclsid,surf,d3dev);
+  *lplight = d3dlight_create(this);
-  return E_FAIL; /* D3DERR_INVALID_DEVICE probably */
+  
 	return DD_OK;
 }
-static HRESULT WINAPI IDirect3D2_CreateLight(LPDIRECT3D2 this,LPDIRECT3DLIGHT *light,IUnknown* lpunk) {
+static HRESULT WINAPI IDirect3D2_CreateMaterial(LPDIRECT3D2 this,
-    FIXME(ddraw,"(%p)->(%p,%p)\n",this,light,lpunk);
+						LPDIRECT3DMATERIAL2 *lpmaterial,
-    return E_FAIL;
+						IUnknown *lpunk)
 {
  TRACE(ddraw, "(%p)->(%p,%p): stub\n", this, lpmaterial, lpunk);
  /* Call the creation function that is located in d3dviewport.c */
  *lpmaterial = d3dmaterial2_create(this);
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3D2_CreateViewport(LPDIRECT3D2 this,
 						LPDIRECT3DVIEWPORT2 *lpviewport,
 						IUnknown *lpunk)
 {
  TRACE(ddraw, "(%p)->(%p,%p): stub\n", this, lpviewport, lpunk);
  /* Call the creation function that is located in d3dviewport.c */
  *lpviewport = d3dviewport2_create(this);
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3D2_FindDevice(LPDIRECT3D2 this,
 					    LPD3DFINDDEVICESEARCH lpfinddevsrc,
 					    LPD3DFINDDEVICERESULT lpfinddevrst)
 {
  TRACE(ddraw, "(%p)->(%p,%p): stub\n", this, lpfinddevsrc, lpfinddevrst);
  return DD_OK;
 }
 static HRESULT WINAPI IDirect3D2_CreateDevice(LPDIRECT3D2 this,
 					      REFCLSID rguid,
 					      LPDIRECTDRAWSURFACE surface,
 					      LPDIRECT3DDEVICE2 *device)
 {
  char	xbuf[50];
  WINE_StringFromCLSID(rguid,xbuf);
  FIXME(ddraw,"(%p)->(%s,%p,%p): stub\n",this,xbuf,surface,device);
  if (is_OpenGL(rguid, surface, device, this)) {
    this->lpvtbl->fnAddRef(this);
    return DD_OK;
 }
  return DDERR_INVALIDPARAMS;
 }
 static struct IDirect3D2_VTable d3d2vt = {
-        (void*)IDirect3D_QueryInterface,
+	IDirect3D2_QueryInterface,
-        (void*)IDirect3D_AddRef,
+	IDirect3D2_AddRef,
        IDirect3D2_Release,
        IDirect3D2_EnumDevices,
-        (void*)IDirect3D_EnumDevices,
+	IDirect3D2_CreateLight,
-        (void*)IDirect3D_CreateLight,
+	IDirect3D2_CreateMaterial,
-        (void*)IDirect3D_CreateMaterial,
+	IDirect3D2_CreateViewport,
-        (void*)IDirect3D_CreateViewport,
+	IDirect3D2_FindDevice,
-        (void*)IDirect3D_FindDevice,
+	IDirect3D2_CreateDevice
 };
 /*******************************************************************************
@ -1751,6 +1900,13 @@ static HRESULT common_off_screen_CreateSurface(LPDIRECTDRAW2 this,
  int bpp;
  /* The surface was already allocated when entering in this function */
  TRACE(ddraw,"using system memory for a surface (%p)\n", lpdsf);
  if (lpddsd->dwFlags & DDSD_ZBUFFERBITDEPTH) {
    /* This is a Z Buffer */
    bpp = lpddsd->x.dwZBufferBitDepth;
  } else {
    /* This is a standard image */
  if (!(lpddsd->dwFlags & DDSD_PIXELFORMAT)) {
    /* No pixel format => use DirectDraw's format */
    _getpixelformat(this,&(lpddsd->ddpfPixelFormat));
@ -1761,8 +1917,13 @@ static HRESULT common_off_screen_CreateSurface(LPDIRECTDRAW2 this,
      _dump_pixelformat(&(lpddsd->ddpfPixelFormat));
    }
  }
  }
  if (lpddsd->ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8) {
    bpp = 1;
  } else {
  bpp = lpddsd->ddpfPixelFormat.x.dwRGBBitCount / 8;
  }
  /* Copy the surface description */
  lpdsf->s.surface_desc = *lpddsd;
@ -1771,8 +1932,6 @@ static HRESULT common_off_screen_CreateSurface(LPDIRECTDRAW2 this,
  lpdsf->s.surface_desc.y.lpSurface = (LPBYTE)HeapAlloc(GetProcessHeap(),0,lpddsd->dwWidth * lpddsd->dwHeight * bpp);
  lpdsf->s.surface_desc.lPitch = lpddsd->dwWidth * bpp;
  TRACE(ddraw,"using system memory for a surface (%p)\n", lpdsf);
  return DD_OK;
 }
@ -2085,6 +2244,11 @@ static HRESULT WINAPI IDirectDraw2_SetCooperativeLevel(
 	  TRACE(ddraw,"	cooperative level %s\n", dbg_str(ddraw));
 	}
        this->d.mainWindow = hwnd;
 	/* This will be overwritten in the case of Full Screen mode.
 	   Windowed games could work with that :-) */
 	this->e.xlib.drawable  = ((X11DRV_WND_DATA *) WIN_FindWndPtr(hwnd)->pDriverData)->window;
 	return DD_OK;
 }
@ -2276,20 +2440,45 @@ static HRESULT WINAPI DGA_IDirectDraw2_GetCaps(
 #endif /* defined(HAVE_LIBXXF86DGA) */
 }
 static void fill_caps(LPDDCAPS caps) {
  /* This function tries to fill the capabilities of Wine's DDraw implementation.
     Need to be fixed, though.. */
  if (caps == NULL)
    return;
  caps->dwSize = sizeof(*caps);
  caps->dwCaps = DDCAPS_3D | DDCAPS_ALPHA | DDCAPS_BLT | DDCAPS_BLTCOLORFILL | DDCAPS_BLTDEPTHFILL |
    DDCAPS_CANBLTSYSMEM | DDCAPS_PALETTE | DDCAPS_ZBLTS;
  caps->dwCaps2 = DDCAPS2_CERTIFIED | DDCAPS2_NO2DDURING3DSCENE | DDCAPS2_NOPAGELOCKREQUIRED |
    DDCAPS2_WIDESURFACES;
  caps->dwCKeyCaps = 0;
  caps->dwFXCaps = 0;
  caps->dwFXAlphaCaps = 0;
  caps->dwPalCaps = DDPCAPS_8BIT | DDPCAPS_ALLOW256;
  caps->dwSVCaps = 0;
  caps->dwZBufferBitDepths = DDBD_16;
  /* I put here 8 Mo so that D3D applications will believe they have enough memory
     to put textures in video memory.
     BTW, is this only frame buffer memory or also texture memory (for Voodoo boards
     for example) ? */
  caps->dwVidMemTotal = 8192 * 1024;
  caps->dwVidMemFree = 8192 * 1024;
  /* These are all the supported capabilities of the surfaces */
  caps->ddsCaps.dwCaps = DDSCAPS_3DDEVICE | DDSCAPS_ALPHA | DDSCAPS_BACKBUFFER | DDSCAPS_COMPLEX | DDSCAPS_FLIP |
    DDSCAPS_FRONTBUFFER | DDSCAPS_LOCALVIDMEM | DDSCAPS_MIPMAP | DDSCAPS_NONLOCALVIDMEM | DDSCAPS_OFFSCREENPLAIN |
      DDSCAPS_OVERLAY | DDSCAPS_PALETTE | DDSCAPS_PRIMARYSURFACE | DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE |
 	DDSCAPS_VIDEOMEMORY | DDSCAPS_VISIBLE | DDSCAPS_ZBUFFER;
 }
 static HRESULT WINAPI Xlib_IDirectDraw2_GetCaps(
 	LPDIRECTDRAW2 this,LPDDCAPS caps1,LPDDCAPS caps2
 )  {
 	TRACE(ddraw,"(%p)->GetCaps(%p,%p)\n",this,caps1,caps2);
-	/* FIXME: Xlib */
+
-	caps1->dwVidMemTotal = 2048*1024;
+	/* Put the same caps for the two capabilities */
-	caps1->dwCaps = 0xffffffff&~(DDCAPS_BANKSWITCHED|DDCAPS_GDI);
+	fill_caps(caps1);
-	caps1->ddsCaps.dwCaps = 0xffffffff;	/* we can do anything */
+	fill_caps(caps2);
-	if (caps2) {
+
 		caps2->dwVidMemTotal = 2048*1024;
 		caps2->dwCaps = 0xffffffff&~(DDCAPS_BANKSWITCHED|DDCAPS_GDI);
 		caps2->ddsCaps.dwCaps = 0xffffffff;	/* we can do anything */
 	}
 	/* END FIXME: Xlib */
 	return DD_OK;
 }
@ -2325,7 +2514,6 @@ static HRESULT WINAPI common_IDirectDraw2_CreatePalette(
                /* Initialize the palette based on the passed palent struct */
                FIXME(ddraw,"needs to handle palent (%p)\n",palent);
        }
 	return DD_OK;
 }
@ -2370,7 +2558,7 @@ static HRESULT WINAPI DGA_IDirectDraw2_RestoreDisplayMode(LPDIRECTDRAW2 this) {
 #ifdef RESTORE_SIGNALS
 	SIGNAL_InitEmulator();
 #endif
-	return 0;
+	return DD_OK;
 #else /* defined(HAVE_LIBXXF86DGA) */
 	return E_UNEXPECTED;
 #endif
@ -2442,18 +2630,27 @@ static HRESULT WINAPI DGA_IDirectDraw2_QueryInterface(
 	if (!memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown))) {
 		*obj = this;
 		this->lpvtbl->fnAddRef(this);
 		TRACE(ddraw, "  Creating IUnknown interface (%p)\n", *obj);
 		return S_OK;
 	}
 	if (!memcmp(&IID_IDirectDraw,refiid,sizeof(IID_IDirectDraw))) {
 		this->lpvtbl = (LPDIRECTDRAW2_VTABLE)&dga_ddvt;
 		this->lpvtbl->fnAddRef(this);
 		*obj = this;
 		TRACE(ddraw, "  Creating IDirectDraw interface (%p)\n", *obj);
 		return S_OK;
 	}
 	if (!memcmp(&IID_IDirectDraw2,refiid,sizeof(IID_IDirectDraw2))) {
 		this->lpvtbl = (LPDIRECTDRAW2_VTABLE)&dga_dd2vt;
 		this->lpvtbl->fnAddRef(this);
 		*obj = this;
 		TRACE(ddraw, "  Creating IDirectDraw2 interface (%p)\n", *obj);
 		return S_OK;
 	}
 	if (!memcmp(&IID_IDirect3D,refiid,sizeof(IID_IDirect3D))) {
@ -2465,6 +2662,9 @@ static HRESULT WINAPI DGA_IDirectDraw2_QueryInterface(
 		this->lpvtbl->fnAddRef(this);
 		d3d->lpvtbl = &d3dvt;
 		*obj = d3d;
 		TRACE(ddraw, "  Creating IDirect3D interface (%p)\n", *obj);
 		return S_OK;
 	}
 	if (!memcmp(&IID_IDirect3D2,refiid,sizeof(IID_IDirect3D))) {
@ -2476,6 +2676,9 @@ static HRESULT WINAPI DGA_IDirectDraw2_QueryInterface(
 		this->lpvtbl->fnAddRef(this);
 		d3d->lpvtbl = &d3d2vt;
 		*obj = d3d;
 		TRACE(ddraw, "  Creating IDirect3D2 interface (%p)\n", *obj);
 		return S_OK;
 	}
 	WARN(ddraw,"(%p):interface for IID %s _NOT_ found!\n",this,xrefiid);
@ -2492,18 +2695,27 @@ static HRESULT WINAPI Xlib_IDirectDraw2_QueryInterface(
 	if (!memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown))) {
 		*obj = this;
 		this->lpvtbl->fnAddRef(this);
 		TRACE(ddraw, "  Creating IUnknown interface (%p)\n", *obj);
 		return S_OK;
 	}
 	if (!memcmp(&IID_IDirectDraw,refiid,sizeof(IID_IDirectDraw))) {
 		this->lpvtbl = (LPDIRECTDRAW2_VTABLE)&xlib_ddvt;
 		this->lpvtbl->fnAddRef(this);
 		*obj = this;
 		TRACE(ddraw, "  Creating IDirectDraw interface (%p)\n", *obj);
 		return S_OK;
 	}
 	if (!memcmp(&IID_IDirectDraw2,refiid,sizeof(IID_IDirectDraw2))) {
 		this->lpvtbl = (LPDIRECTDRAW2_VTABLE)&xlib_dd2vt;
 		this->lpvtbl->fnAddRef(this);
 		*obj = this;
 		TRACE(ddraw, "  Creating IDirectDraw2 interface (%p)\n", *obj);
 		return S_OK;
 	}
 	if (!memcmp(&IID_IDirect3D,refiid,sizeof(IID_IDirect3D))) {
@ -2515,6 +2727,9 @@ static HRESULT WINAPI Xlib_IDirectDraw2_QueryInterface(
 		this->lpvtbl->fnAddRef(this);
 		d3d->lpvtbl = &d3dvt;
 		*obj = d3d;
 		TRACE(ddraw, "  Creating IDirect3D interface (%p)\n", *obj);
 		return S_OK;
 	}
 	if (!memcmp(&IID_IDirect3D2,refiid,sizeof(IID_IDirect3D))) {
@ -2526,6 +2741,9 @@ static HRESULT WINAPI Xlib_IDirectDraw2_QueryInterface(
 		this->lpvtbl->fnAddRef(this);
 		d3d->lpvtbl = &d3d2vt;
 		*obj = d3d;
 		TRACE(ddraw, "  Creating IDirect3D2 interface (%p)\n", *obj);
 		return S_OK;
 	}
 	WARN(ddraw,"(%p):interface for IID %s _NOT_ found!\n",this,xrefiid);
@ -2683,10 +2901,8 @@ static HRESULT WINAPI IDirectDraw2_GetFourCCCodes(
 static HRESULT WINAPI IDirectDraw2_EnumSurfaces(
 	LPDIRECTDRAW2 this,DWORD x,LPDDSURFACEDESC ddsfd,LPVOID context,LPDDENUMSURFACESCALLBACK ddsfcb
-) 
+) {
 {
  FIXME(ddraw,"(%p)->(0x%08lx,%p,%p,%p),stub!\n",this,x,ddsfd,context,ddsfcb);
  return DD_OK;
 }
--- a/include/acconfig.h
+++ b/include/acconfig.h
@ -72,3 +72,5 @@
 /* Define if IPX includes are taken from Linux kernel */
 #undef HAVE_IPX_LINUX
 /* Define if Mesa is present on the system or not */
 #undef HAVE_MESAGL
--- a/include/config.h.in
+++ b/include/config.h.in
@ -75,6 +75,9 @@
 /* Define if IPX includes are taken from Linux kernel */
 #undef HAVE_IPX_LINUX
 /* Define if Mesa is present on the system or not */
 #undef HAVE_MESAGL
 /* The number of bytes in a long long.  */
 #undef SIZEOF_LONG_LONG
--- a/include/d3d.h
+++ b/include/d3d.h
--- a/include/wine_gl.h
+++ b/include/wine_gl.h
@ -0,0 +1,32 @@
 /* Wrapper for OpenGL includes...
     Copyright 1998 - Lionel Ulmer
   This wrapper is needed because Mesa uses also the CALLBACK / WINAPI
   constants. */
 #ifndef __WINE_GL_H
 #define __WINE_GL_H
 #ifdef HAVE_MESAGL
 #undef APIENTRY
 #undef CALLBACK
 #undef WINAPI
 #include <GL/gl.h>
 /* These will need to have some #ifdef / #endif added to support
   more than the X11 using OSMesa target */
 #include <GL/osmesa.h>
 #undef APIENTRY
 #undef CALLBACK
 #undef WINAPI
 /* Redefines the constants */
 #define CALLBACK    __stdcall
 #define WINAPI      __stdcall
 #define APIENTRY    WINAPI
 #endif /* HAVE_MESAGL */
 #endif /* __WINE_GL_H */
--- a/multimedia/dsound.c
+++ b/multimedia/dsound.c
@ -1211,17 +1211,17 @@ static HRESULT WINAPI IDirectSound_CreateSoundBuffer(
 		ds3db->lpvtbl = &ds3dbvt;
 		(*ppdsb)->ds3db = ds3db;
 		ds3db->ds3db.dwSize = sizeof(DS3DBUFFER);
-		ds3db->ds3db.vPosition.x = 0.0;
+		ds3db->ds3db.vPosition.x.x = 0.0;
-		ds3db->ds3db.vPosition.y = 0.0;
+		ds3db->ds3db.vPosition.y.y = 0.0;
-		ds3db->ds3db.vPosition.z = 0.0;
+		ds3db->ds3db.vPosition.z.z = 0.0;
-		ds3db->ds3db.vVelocity.x = 0.0;
+		ds3db->ds3db.vVelocity.x.x = 0.0;
-		ds3db->ds3db.vVelocity.y = 0.0;
+		ds3db->ds3db.vVelocity.y.y = 0.0;
-		ds3db->ds3db.vVelocity.z = 0.0;
+		ds3db->ds3db.vVelocity.z.z = 0.0;
 		ds3db->ds3db.dwInsideConeAngle = DS3D_DEFAULTCONEANGLE;
 		ds3db->ds3db.dwOutsideConeAngle = DS3D_DEFAULTCONEANGLE;
-		ds3db->ds3db.vConeOrientation.x = 0.0;
+		ds3db->ds3db.vConeOrientation.x.x = 0.0;
-		ds3db->ds3db.vConeOrientation.y = 0.0;
+		ds3db->ds3db.vConeOrientation.y.y = 0.0;
-		ds3db->ds3db.vConeOrientation.z = 0.0;
+		ds3db->ds3db.vConeOrientation.z.z = 0.0;
 		ds3db->ds3db.lConeOutsideVolume = DS3D_DEFAULTCONEOUTSIDEVOLUME;
 		ds3db->ds3db.flMinDistance = DS3D_DEFAULTMINDISTANCE;
 		ds3db->ds3db.flMaxDistance = DS3D_DEFAULTMAXDISTANCE;
@ -1355,18 +1355,18 @@ static HRESULT WINAPI IDirectSound_QueryInterface(
 		this->listener->lpvtbl = &ds3dlvt;
 		this->lpvtbl->fnAddRef(this);
 		this->listener->ds3dl.dwSize = sizeof(DS3DLISTENER);
-		this->listener->ds3dl.vPosition.x = 0.0;
+		this->listener->ds3dl.vPosition.x.x = 0.0;
-		this->listener->ds3dl.vPosition.y = 0.0;
+		this->listener->ds3dl.vPosition.y.y = 0.0;
-		this->listener->ds3dl.vPosition.z = 0.0;
+		this->listener->ds3dl.vPosition.z.z = 0.0;
-		this->listener->ds3dl.vVelocity.x = 0.0;
+		this->listener->ds3dl.vVelocity.x.x = 0.0;
-		this->listener->ds3dl.vVelocity.y = 0.0;
+		this->listener->ds3dl.vVelocity.y.y = 0.0;
-		this->listener->ds3dl.vVelocity.z = 0.0;
+		this->listener->ds3dl.vVelocity.z.z = 0.0;
-		this->listener->ds3dl.vOrientFront.x = 0.0;
+		this->listener->ds3dl.vOrientFront.x.x = 0.0;
-		this->listener->ds3dl.vOrientFront.y = 0.0;
+		this->listener->ds3dl.vOrientFront.y.y = 0.0;
-		this->listener->ds3dl.vOrientFront.z = 1.0;
+		this->listener->ds3dl.vOrientFront.z.z = 1.0;
-		this->listener->ds3dl.vOrientTop.x = 0.0;
+		this->listener->ds3dl.vOrientTop.x.x = 0.0;
-		this->listener->ds3dl.vOrientTop.y = 1.0;
+		this->listener->ds3dl.vOrientTop.y.y = 1.0;
-		this->listener->ds3dl.vOrientTop.z = 0.0;
+		this->listener->ds3dl.vOrientTop.z.z = 0.0;
 		this->listener->ds3dl.flDistanceFactor = DS3D_DEFAULTDISTANCEFACTOR;
 		this->listener->ds3dl.flRolloffFactor = DS3D_DEFAULTROLLOFFFACTOR;
 		this->listener->ds3dl.flDopplerFactor = DS3D_DEFAULTDOPPLERFACTOR;