Implemented glu32.dll as libGLU.so forwarder.

Make.rules.in

@@ -99,6 +99,7 @@ LINTS = $(C_SRCS:.c=.ln)
 X_DLLS = \
 	ddraw \
 	@OPENGL32_DLL@ \
+	@GLU32_DLL@ \
 	x11drv
 
 DLLS = \

configure.in

@@ -91,7 +91,7 @@ AC_SUBST(LDCOMBINE)
 
 dnl **** Check for some libraries ****
 
-dnl Check for -lm for BeOS
+dnl Check for -lm
 AC_CHECK_LIB(m,sqrt)
 dnl Check for -li386 for NetBSD and OpenBSD
 AC_CHECK_LIB(i386,i386_set_ldt)
@@ -134,6 +134,10 @@ AC_SUBST(OPENGLFILES)
 OPENGLFILES=""
 AC_SUBST(OPENGL32_DLL)
 OPENGL32_DLL=""
+GLU32FILES=""
+AC_SUBST(GLU32FILES)
+GLU32_DLL=""
+AC_SUBST(GLU32_DLL)
 if test "$have_x" = "yes"
 then
     XLIB="-lXext -lX11"
@@ -328,6 +332,14 @@ then
                             ]
                         )
 		fi
+	        dnl Check for GLU32 library.
+		AC_CHECK_LIB(GLU,glBegin,
+			     X_PRE_LIBS="$X_PRE_LIBS -lGLU"
+			     GLU32FILES='$(GLU32FILES)'
+			     GLU32_DLL=glu32
+			     ,,
+			     $X_LIBS $X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS
+		)
 	     fi
 	 fi
     fi
@@ -1178,6 +1190,7 @@ dlls/dplay/Makefile
 dlls/dplayx/Makefile
 dlls/dsound/Makefile
 dlls/gdi/Makefile
+dlls/glu32/Makefile
 dlls/icmp/Makefile
 dlls/imagehlp/Makefile
 dlls/imm32/Makefile

dlls/Makefile.in

@@ -3,7 +3,11 @@ TOPOBJDIR = ..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 
+GLU32FILES= \
+	glu32/libglu32.@LIBEXT@
+
 OPENGLFILES= \
+	@GLU32FILES@ \
 	opengl32/libopengl32.@LIBEXT@
 
 XFILES = \
@@ -140,6 +144,7 @@ SUBDIRS = \
 	dplayx \
 	dsound \
 	gdi \
+	glu32 \
 	icmp \
 	imagehlp \
 	imm32 \
@@ -239,6 +244,9 @@ libdsound.@LIBEXT@: dsound/libdsound.@LIBEXT@
 libgdi32.@LIBEXT@ libdispdib.@LIBEXT@ libgdi.@LIBEXT@ libwing.@LIBEXT@: gdi/libgdi32.@LIBEXT@
 	$(RM) $@ && $(LN_S) gdi/libgdi32.@LIBEXT@ $@
 
+libglu32.@LIBEXT@: glu32/libglu32.@LIBEXT@
+	$(RM) $@ && $(LN_S) glu32/libglu32.@LIBEXT@ $@
+
 libicmp.@LIBEXT@: icmp/libicmp.@LIBEXT@
 	$(RM) $@ && $(LN_S) icmp/libicmp.@LIBEXT@ $@
 
@@ -414,7 +422,7 @@ libx11drv.@LIBEXT@: x11drv/libx11drv.@LIBEXT@
 # Inter-dll dependencies (only necessary for dynamic libs)
 
 advapi32/libadvapi32.@LIBEXT@: libkernel32.@LIBEXT@ libntdll.@LIBEXT@
-avifil32/libavifil32.@LIBEXT@: libmsvfw32.@LIBEXT@ libkernel32.@LIBEXT@ libntdll.@LIBEXT@
+avifil32/libavifil32.@LIBEXT@: libmsvfw32.@LIBEXT@ libole32.@LIBEXT@ libkernel32.@LIBEXT@ libntdll.@LIBEXT@
 comctl32/libcomctl32.@LIBEXT@: libmsvfw32.@LIBEXT@ libwinmm.@LIBEXT@ libuser32.@LIBEXT@ libgdi32.@LIBEXT@ libadvapi32.@LIBEXT@ libkernel32.@LIBEXT@ libntdll.@LIBEXT@
 commdlg/libcomdlg32.@LIBEXT@: libshell32.@LIBEXT@ libshlwapi.@LIBEXT@ libcomctl32.@LIBEXT@ libwinspool.drv.@LIBEXT@ libuser32.@LIBEXT@ libgdi32.@LIBEXT@ libkernel32.@LIBEXT@ libntdll.@LIBEXT@
 crtdll/libcrtdll.@LIBEXT@: libmsvcrt.@LIBEXT@ libkernel32.@LIBEXT@ libntdll.@LIBEXT@
@@ -470,7 +478,7 @@ winmm/mciavi/libmciavi.drv.@LIBEXT@: libmsvfw32.@LIBEXT@ libwinmm.@LIBEXT@ libus
 winmm/mcicda/libmcicda.drv.@LIBEXT@: libwinmm.@LIBEXT@ libuser32.@LIBEXT@ libkernel32.@LIBEXT@ libntdll.@LIBEXT@
 winmm/mciseq/libmciseq.drv.@LIBEXT@: libwinmm.@LIBEXT@ libuser32.@LIBEXT@ libkernel32.@LIBEXT@ libntdll.@LIBEXT@
 winmm/mciwave/libmciwave.drv.@LIBEXT@: libwinmm.@LIBEXT@ libuser32.@LIBEXT@ libkernel32.@LIBEXT@ libntdll.@LIBEXT@
-winmm/midimap/libmidimap.drv.@LIBEXT@: libwinmm.@LIBEXT@ libuser32.@LIBEXT@ libkernel32.@LIBEXT@ libntdll.@LIBEXT@
+winmm/midimap/libmidimap.drv.@LIBEXT@: libwinmm.@LIBEXT@ libuser32.@LIBEXT@ libadvapi32.@LIBEXT@ libkernel32.@LIBEXT@ libntdll.@LIBEXT@
 winmm/wavemap/libmsacm.drv.@LIBEXT@: libmsacm32.@LIBEXT@ libwinmm.@LIBEXT@ libuser32.@LIBEXT@ libkernel32.@LIBEXT@ libntdll.@LIBEXT@
 winmm/wineoss/libwineoss.drv.@LIBEXT@: libwinmm.@LIBEXT@ libuser32.@LIBEXT@ libkernel32.@LIBEXT@ libntdll.@LIBEXT@
 winnls/libwinnls32.@LIBEXT@: libkernel32.@LIBEXT@ libntdll.@LIBEXT@

dlls/glu32/.cvsignore

@@ -0,0 +1,2 @@
+Makefile
+glu32.spec.c

dlls/glu32/Makefile.in

@@ -0,0 +1,16 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = glu32
+EXTRALIBS = $(X_LIBS) $(XLIB)
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
+
+C_SRCS = \
+	glu.c
+
+@MAKE_DLL_RULES@
+
+### Dependencies:

dlls/glu32/glu.c

@@ -0,0 +1,226 @@
+#include "winbase.h"
+
+extern int gluLookAt(double arg0,double arg1,double arg2,double arg3,double arg4,double arg5,double arg6,double arg7,double arg8);
+int WINAPI wine_gluLookAt(double arg0,double arg1,double arg2,double arg3,double arg4,double arg5,double arg6,double arg7,double arg8) {
+	return gluLookAt(arg0,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
+}
+
+extern int gluOrtho2D(double arg0,double arg1,double arg2,double arg3);
+int WINAPI wine_gluOrtho2D(double arg0,double arg1,double arg2,double arg3) {
+	return gluOrtho2D(arg0,arg1,arg2,arg3);
+}
+
+extern int gluPerspective(double arg0,double arg1,double arg2,double arg3);
+int WINAPI wine_gluPerspective(double arg0,double arg1,double arg2,double arg3) {
+	return gluPerspective(arg0,arg1,arg2,arg3);
+}
+
+extern int gluPickMatrix(double arg0,double arg1,double arg2,double arg3,void *arg4);
+int WINAPI wine_gluPickMatrix(double arg0,double arg1,double arg2,double arg3,void *arg4) {
+	return gluPickMatrix(arg0,arg1,arg2,arg3,arg4);
+}
+
+extern int gluProject(double arg0,double arg1,double arg2,void *arg3,void *arg4,void *arg5,void *arg6,void *arg7,void *arg8);
+int WINAPI wine_gluProject(double arg0,double arg1,double arg2,void *arg3,void *arg4,void *arg5,void *arg6,void *arg7,void *arg8) {
+	return gluProject(arg0,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
+}
+
+extern int gluUnProject(double arg0,double arg1,double arg2,void *arg3,void *arg4,void *arg5,void *arg6,void *arg7,void *arg8);
+int WINAPI wine_gluUnProject(double arg0,double arg1,double arg2,void *arg3,void *arg4,void *arg5,void *arg6,void *arg7,void *arg8) {
+	return gluUnProject(arg0,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
+}
+
+extern int gluErrorString(int arg0);
+int WINAPI wine_gluErrorString(int arg0) {
+	return gluErrorString(arg0);
+}
+
+extern int gluScaleImage(int arg0,int arg1,int arg2,int arg3,void *arg4,int arg5,int arg6,int arg7,void *arg8);
+int WINAPI wine_gluScaleImage(int arg0,int arg1,int arg2,int arg3,void *arg4,int arg5,int arg6,int arg7,void *arg8) {
+	return gluScaleImage(arg0,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
+}
+
+extern int gluBuild1DMipmaps(int arg0,int arg1,int arg2,int arg3,int arg4,void *arg5);
+int WINAPI wine_gluBuild1DMipmaps(int arg0,int arg1,int arg2,int arg3,int arg4,void *arg5) {
+	return gluBuild1DMipmaps(arg0,arg1,arg2,arg3,arg4,arg5);
+}
+
+extern int gluBuild2DMipmaps(int arg0,int arg1,int arg2,int arg3,int arg4,int arg5,void *arg6);
+int WINAPI wine_gluBuild2DMipmaps(int arg0,int arg1,int arg2,int arg3,int arg4,int arg5,void *arg6) {
+	return gluBuild2DMipmaps(arg0,arg1,arg2,arg3,arg4,arg5,arg6);
+}
+
+extern int gluNewQuadric();
+int WINAPI wine_gluNewQuadric() {
+	return gluNewQuadric();
+}
+
+extern int gluDeleteQuadric(void *arg0);
+int WINAPI wine_gluDeleteQuadric(void *arg0) {
+	return gluDeleteQuadric(arg0);
+}
+
+extern int gluQuadricDrawStyle(void *arg0,int arg1);
+int WINAPI wine_gluQuadricDrawStyle(void *arg0,int arg1) {
+	return gluQuadricDrawStyle(arg0,arg1);
+}
+
+extern int gluQuadricOrientation(void *arg0,int arg1);
+int WINAPI wine_gluQuadricOrientation(void *arg0,int arg1) {
+	return gluQuadricOrientation(arg0,arg1);
+}
+
+extern int gluQuadricNormals(void *arg0,int arg1);
+int WINAPI wine_gluQuadricNormals(void *arg0,int arg1) {
+	return gluQuadricNormals(arg0,arg1);
+}
+
+extern int gluQuadricTexture(void *arg0,int arg1);
+int WINAPI wine_gluQuadricTexture(void *arg0,int arg1) {
+	return gluQuadricTexture(arg0,arg1);
+}
+
+extern int gluQuadricCallback(void *arg0,int arg1,void *arg2);
+int WINAPI wine_gluQuadricCallback(void *arg0,int arg1,void *arg2) {
+	return gluQuadricCallback(arg0,arg1,arg2);
+}
+
+extern int gluCylinder(void *arg0,double arg1,double arg2,double arg3,int arg4,int arg5);
+int WINAPI wine_gluCylinder(void *arg0,double arg1,double arg2,double arg3,int arg4,int arg5) {
+	return gluCylinder(arg0,arg1,arg2,arg3,arg4,arg5);
+}
+
+extern int gluSphere(void *arg0,double arg1,int arg2,int arg3);
+int WINAPI wine_gluSphere(void *arg0,double arg1,int arg2,int arg3) {
+	return gluSphere(arg0,arg1,arg2,arg3);
+}
+
+extern int gluDisk(void *arg0,double arg1,double arg2,int arg3,int arg4);
+int WINAPI wine_gluDisk(void *arg0,double arg1,double arg2,int arg3,int arg4) {
+	return gluDisk(arg0,arg1,arg2,arg3,arg4);
+}
+
+extern int gluPartialDisk(void *arg0,double arg1,double arg2,int arg3,int arg4,double arg5,double arg6);
+int WINAPI wine_gluPartialDisk(void *arg0,double arg1,double arg2,int arg3,int arg4,double arg5,double arg6) {
+	return gluPartialDisk(arg0,arg1,arg2,arg3,arg4,arg5,arg6);
+}
+
+extern int gluNewNurbsRenderer();
+int WINAPI wine_gluNewNurbsRenderer() {
+	return gluNewNurbsRenderer();
+}
+
+extern int gluDeleteNurbsRenderer(void *arg0);
+int WINAPI wine_gluDeleteNurbsRenderer(void *arg0) {
+	return gluDeleteNurbsRenderer(arg0);
+}
+
+extern int gluLoadSamplingMatrices(void *arg0,void *arg1,void *arg2,void *arg3);
+int WINAPI wine_gluLoadSamplingMatrices(void *arg0,void *arg1,void *arg2,void *arg3) {
+	return gluLoadSamplingMatrices(arg0,arg1,arg2,arg3);
+}
+
+extern int gluNurbsProperty(void *arg0,int arg1,int arg2);
+int WINAPI wine_gluNurbsProperty(void *arg0,int arg1,int arg2) {
+	return gluNurbsProperty(arg0,arg1,arg2);
+}
+
+extern int gluGetNurbsProperty(void *arg0,int arg1,void *arg2);
+int WINAPI wine_gluGetNurbsProperty(void *arg0,int arg1,void *arg2) {
+	return gluGetNurbsProperty(arg0,arg1,arg2);
+}
+
+extern int gluBeginCurve(void *arg0);
+int WINAPI wine_gluBeginCurve(void *arg0) {
+	return gluBeginCurve(arg0);
+}
+
+extern int gluEndCurve(void *arg0);
+int WINAPI wine_gluEndCurve(void *arg0) {
+	return gluEndCurve(arg0);
+}
+
+extern int gluNurbsCurve(void *arg0,int arg1,void *arg2,int arg3,void *arg4,int arg5,int arg6);
+int WINAPI wine_gluNurbsCurve(void *arg0,int arg1,void *arg2,int arg3,void *arg4,int arg5,int arg6) {
+	return gluNurbsCurve(arg0,arg1,arg2,arg3,arg4,arg5,arg6);
+}
+
+extern int gluBeginSurface(void *arg0);
+int WINAPI wine_gluBeginSurface(void *arg0) {
+	return gluBeginSurface(arg0);
+}
+
+extern int gluEndSurface(void *arg0);
+int WINAPI wine_gluEndSurface(void *arg0) {
+	return gluEndSurface(arg0);
+}
+
+extern int gluNurbsSurface(void *arg0,int arg1,void *arg2,int arg3,void *arg4,int arg5,int arg6,void *arg7,int arg8,int arg9,int arg10);
+int WINAPI wine_gluNurbsSurface(void *arg0,int arg1,void *arg2,int arg3,void *arg4,int arg5,int arg6,void *arg7,int arg8,int arg9,int arg10) {
+	return gluNurbsSurface(arg0,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10);
+}
+
+extern int gluBeginTrim(void *arg0);
+int WINAPI wine_gluBeginTrim(void *arg0) {
+	return gluBeginTrim(arg0);
+}
+
+extern int gluEndTrim(void *arg0);
+int WINAPI wine_gluEndTrim(void *arg0) {
+	return gluEndTrim(arg0);
+}
+
+extern int gluPwlCurve(void *arg0,int arg1,void *arg2,int arg3,int arg4);
+int WINAPI wine_gluPwlCurve(void *arg0,int arg1,void *arg2,int arg3,int arg4) {
+	return gluPwlCurve(arg0,arg1,arg2,arg3,arg4);
+}
+
+extern int gluNurbsCallback(void *arg0,int arg1,void *arg2);
+int WINAPI wine_gluNurbsCallback(void *arg0,int arg1,void *arg2) {
+	return gluNurbsCallback(arg0,arg1,arg2);
+}
+
+extern int gluNewTess();
+int WINAPI wine_gluNewTess() {
+	return gluNewTess();
+}
+
+extern int gluDeleteTess(void *arg0);
+int WINAPI wine_gluDeleteTess(void *arg0) {
+	return gluDeleteTess(arg0);
+}
+
+extern int gluTessVertex(void *arg0,void *arg1,void *arg2);
+int WINAPI wine_gluTessVertex(void *arg0,void *arg1,void *arg2) {
+	return gluTessVertex(arg0,arg1,arg2);
+}
+
+extern int gluTessCallback(void *arg0,int arg1,void *arg2);
+int WINAPI wine_gluTessCallback(void *arg0,int arg1,void *arg2) {
+	return gluTessCallback(arg0,arg1,arg2);
+}
+
+extern int gluBeginPolygon(void *arg0);
+int WINAPI wine_gluBeginPolygon(void *arg0) {
+	return gluBeginPolygon(arg0);
+}
+
+extern int gluEndPolygon(void *arg0);
+int WINAPI wine_gluEndPolygon(void *arg0) {
+	return gluEndPolygon(arg0);
+}
+
+extern int gluNextContour(void *arg0,int arg1);
+int WINAPI wine_gluNextContour(void *arg0,int arg1) {
+	return gluNextContour(arg0,arg1);
+}
+
+extern int gluGetString(int arg0);
+int WINAPI wine_gluGetString(int arg0) {
+	return gluGetString(arg0);
+}
+
+int WINAPI
+wine_gluCheckExtension( const char *extName, void *extString ) {
+    return 0;
+}

dlls/glu32/glu32.spec

@@ -0,0 +1,48 @@
+name glu32
+type win32
+
+@ stdcall gluLookAt(double double double double double double double double double) wine_gluLookAt
+@ stdcall gluOrtho2D(double double double double) wine_gluOrtho2D
+@ stdcall gluPerspective(double double double double) wine_gluPerspective
+@ stdcall gluPickMatrix(double double double double ptr) wine_gluPickMatrix
+@ stdcall gluProject(double double double ptr ptr ptr ptr ptr ptr) wine_gluProject
+@ stdcall gluUnProject(double double double ptr ptr ptr ptr ptr ptr) wine_gluUnProject
+@ stdcall gluErrorString(long) wine_gluErrorString
+@ stdcall gluScaleImage(long long long long ptr long long long ptr) wine_gluScaleImage
+@ stdcall gluBuild1DMipmaps(long long long long long ptr) wine_gluBuild1DMipmaps
+@ stdcall gluBuild2DMipmaps(long long long long long long ptr) wine_gluBuild2DMipmaps
+@ stdcall gluNewQuadric() wine_gluNewQuadric
+@ stdcall gluDeleteQuadric(ptr) wine_gluDeleteQuadric
+@ stdcall gluQuadricDrawStyle(ptr long) wine_gluQuadricDrawStyle
+@ stdcall gluQuadricOrientation(ptr long) wine_gluQuadricOrientation
+@ stdcall gluQuadricNormals(ptr long) wine_gluQuadricNormals
+@ stdcall gluQuadricTexture(ptr long) wine_gluQuadricTexture
+@ stdcall gluQuadricCallback(ptr long ptr) wine_gluQuadricCallback
+@ stdcall gluCylinder(ptr double double double long long) wine_gluCylinder
+@ stdcall gluSphere(ptr double long long) wine_gluSphere
+@ stdcall gluDisk(ptr double double long long) wine_gluDisk
+@ stdcall gluPartialDisk(ptr double double long long double double) wine_gluPartialDisk
+@ stdcall gluNewNurbsRenderer() wine_gluNewNurbsRenderer
+@ stdcall gluDeleteNurbsRenderer(ptr) wine_gluDeleteNurbsRenderer
+@ stdcall gluLoadSamplingMatrices(ptr ptr ptr ptr) wine_gluLoadSamplingMatrices
+@ stdcall gluNurbsProperty(ptr long long) wine_gluNurbsProperty
+@ stdcall gluGetNurbsProperty(ptr long ptr) wine_gluGetNurbsProperty
+@ stdcall gluBeginCurve(ptr) wine_gluBeginCurve
+@ stdcall gluEndCurve(ptr) wine_gluEndCurve
+@ stdcall gluNurbsCurve(ptr long ptr long ptr long long) wine_gluNurbsCurve
+@ stdcall gluBeginSurface(ptr) wine_gluBeginSurface
+@ stdcall gluEndSurface(ptr) wine_gluEndSurface
+@ stdcall gluNurbsSurface(ptr long ptr long ptr long long ptr long long long) wine_gluNurbsSurface
+@ stdcall gluBeginTrim(ptr) wine_gluBeginTrim
+@ stdcall gluEndTrim(ptr) wine_gluEndTrim
+@ stdcall gluPwlCurve(ptr long ptr long long) wine_gluPwlCurve
+@ stdcall gluNurbsCallback(ptr long ptr) wine_gluNurbsCallback
+@ stdcall gluNewTess() wine_gluNewTess
+@ stdcall gluDeleteTess(ptr) wine_gluDeleteTess
+@ stdcall gluTessVertex(ptr ptr ptr) wine_gluTessVertex
+@ stdcall gluTessCallback(ptr long ptr) wine_gluTessCallback
+@ stdcall gluBeginPolygon(ptr) wine_gluBeginPolygon
+@ stdcall gluEndPolygon(ptr) wine_gluEndPolygon
+@ stdcall gluNextContour(ptr long) wine_gluNextContour
+@ stdcall gluGetString(long) wine_gluGetString
+@ stdcall gluCheckExtension(str ptr) wine_gluCheckExtension

tools/winebuild/build.h

@@ -73,7 +73,7 @@ typedef struct
 typedef struct
 {
     int  n_args;
-    char arg_types[17];
+    char arg_types[21];
 } ORD_FUNCTION;
 
 typedef struct