diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl
index 567c4edbfaa..b3036954034 100755
--- a/dlls/opengl32/make_opengl
+++ b/dlls/opengl32/make_opengl
@@ -154,10 +154,10 @@ my %arg_conv =
      "GLboolean" => [ "long", 4 ],
      "GLbyte" => [ "long", 4 ],
      "GLclampd" => [ "double", 8 ],
-     "GLclampf" => [ "long", 4 ],
+     "GLclampf" => [ "float", 4 ],
      "GLdouble" => [ "double", 8 ],
      "GLenum" => [ "long", 4 ],
-     "GLfloat" => [ "long", 4 ],
+     "GLfloat" => [ "float", 4 ],
      "GLint" => [ "long", 4 ],
      "GLshort" => [ "long", 4 ],
      "GLsizei" => [ "long", 4 ],
@@ -172,7 +172,6 @@ my %arg_conv =
      "GLcharARB" => [ "long", 4 ],
      "GLintptr" => [ "long", 4 ],
      "GLsizeiptr" => [ "long", 4 ],
-     "GLvoid" => [ "void", 4 ],
      "_GLfuncptr" => [ "ptr", 4 ]);
 
 #
diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec
index 238b12af5bc..9bd232f579f 100644
--- a/dlls/opengl32/opengl32.spec
+++ b/dlls/opengl32/opengl32.spec
@@ -1,25 +1,25 @@
-@  stdcall glAccum( long long ) wine_glAccum
-@  stdcall glAlphaFunc( long long ) wine_glAlphaFunc
+@  stdcall glAccum( long float ) wine_glAccum
+@  stdcall glAlphaFunc( long float ) wine_glAlphaFunc
 @  stdcall glAreTexturesResident( long ptr ptr ) wine_glAreTexturesResident
 @  stdcall glArrayElement( long ) wine_glArrayElement
 @  stdcall glBegin( long ) wine_glBegin
 @  stdcall glBindTexture( long long ) wine_glBindTexture
-@  stdcall glBitmap( long long long long long long ptr ) wine_glBitmap
+@  stdcall glBitmap( long long float float float float ptr ) wine_glBitmap
 @  stdcall glBlendFunc( long long ) wine_glBlendFunc
 @  stdcall glCallList( long ) wine_glCallList
 @  stdcall glCallLists( long long ptr ) wine_glCallLists
 @  stdcall glClear( long ) wine_glClear
-@  stdcall glClearAccum( long long long long ) wine_glClearAccum
-@  stdcall glClearColor( long long long long ) wine_glClearColor
+@  stdcall glClearAccum( float float float float ) wine_glClearAccum
+@  stdcall glClearColor( float float float float ) wine_glClearColor
 @  stdcall glClearDepth( double ) wine_glClearDepth
-@  stdcall glClearIndex( long ) wine_glClearIndex
+@  stdcall glClearIndex( float ) wine_glClearIndex
 @  stdcall glClearStencil( long ) wine_glClearStencil
 @  stdcall glClipPlane( long ptr ) wine_glClipPlane
 @  stdcall glColor3b( long long long ) wine_glColor3b
 @  stdcall glColor3bv( ptr ) wine_glColor3bv
 @  stdcall glColor3d( double double double ) wine_glColor3d
 @  stdcall glColor3dv( ptr ) wine_glColor3dv
-@  stdcall glColor3f( long long long ) wine_glColor3f
+@  stdcall glColor3f( float float float ) wine_glColor3f
 @  stdcall glColor3fv( ptr ) wine_glColor3fv
 @  stdcall glColor3i( long long long ) wine_glColor3i
 @  stdcall glColor3iv( ptr ) wine_glColor3iv
@@ -35,7 +35,7 @@
 @  stdcall glColor4bv( ptr ) wine_glColor4bv
 @  stdcall glColor4d( double double double double ) wine_glColor4d
 @  stdcall glColor4dv( ptr ) wine_glColor4dv
-@  stdcall glColor4f( long long long long ) wine_glColor4f
+@  stdcall glColor4f( float float float float ) wine_glColor4f
 @  stdcall glColor4fv( ptr ) wine_glColor4fv
 @  stdcall glColor4i( long long long long ) wine_glColor4i
 @  stdcall glColor4iv( ptr ) wine_glColor4iv
@@ -76,11 +76,11 @@
 @  stdcall glEndList( ) wine_glEndList
 @  stdcall glEvalCoord1d( double ) wine_glEvalCoord1d
 @  stdcall glEvalCoord1dv( ptr ) wine_glEvalCoord1dv
-@  stdcall glEvalCoord1f( long ) wine_glEvalCoord1f
+@  stdcall glEvalCoord1f( float ) wine_glEvalCoord1f
 @  stdcall glEvalCoord1fv( ptr ) wine_glEvalCoord1fv
 @  stdcall glEvalCoord2d( double double ) wine_glEvalCoord2d
 @  stdcall glEvalCoord2dv( ptr ) wine_glEvalCoord2dv
-@  stdcall glEvalCoord2f( long long ) wine_glEvalCoord2f
+@  stdcall glEvalCoord2f( float float ) wine_glEvalCoord2f
 @  stdcall glEvalCoord2fv( ptr ) wine_glEvalCoord2fv
 @  stdcall glEvalMesh1( long long long ) wine_glEvalMesh1
 @  stdcall glEvalMesh2( long long long long long ) wine_glEvalMesh2
@@ -89,7 +89,7 @@
 @  stdcall glFeedbackBuffer( long long ptr ) wine_glFeedbackBuffer
 @  stdcall glFinish( ) wine_glFinish
 @  stdcall glFlush( ) wine_glFlush
-@  stdcall glFogf( long long ) wine_glFogf
+@  stdcall glFogf( long float ) wine_glFogf
 @  stdcall glFogfv( long ptr ) wine_glFogfv
 @  stdcall glFogi( long long ) wine_glFogi
 @  stdcall glFogiv( long ptr ) wine_glFogiv
@@ -131,7 +131,7 @@
 @  stdcall glIndexPointer( long long ptr ) wine_glIndexPointer
 @  stdcall glIndexd( double ) wine_glIndexd
 @  stdcall glIndexdv( ptr ) wine_glIndexdv
-@  stdcall glIndexf( long ) wine_glIndexf
+@  stdcall glIndexf( float ) wine_glIndexf
 @  stdcall glIndexfv( ptr ) wine_glIndexfv
 @  stdcall glIndexi( long ) wine_glIndexi
 @  stdcall glIndexiv( ptr ) wine_glIndexiv
@@ -144,16 +144,16 @@
 @  stdcall glIsEnabled( long ) wine_glIsEnabled
 @  stdcall glIsList( long ) wine_glIsList
 @  stdcall glIsTexture( long ) wine_glIsTexture
-@  stdcall glLightModelf( long long ) wine_glLightModelf
+@  stdcall glLightModelf( long float ) wine_glLightModelf
 @  stdcall glLightModelfv( long ptr ) wine_glLightModelfv
 @  stdcall glLightModeli( long long ) wine_glLightModeli
 @  stdcall glLightModeliv( long ptr ) wine_glLightModeliv
-@  stdcall glLightf( long long long ) wine_glLightf
+@  stdcall glLightf( long long float ) wine_glLightf
 @  stdcall glLightfv( long long ptr ) wine_glLightfv
 @  stdcall glLighti( long long long ) wine_glLighti
 @  stdcall glLightiv( long long ptr ) wine_glLightiv
 @  stdcall glLineStipple( long long ) wine_glLineStipple
-@  stdcall glLineWidth( long ) wine_glLineWidth
+@  stdcall glLineWidth( float ) wine_glLineWidth
 @  stdcall glListBase( long ) wine_glListBase
 @  stdcall glLoadIdentity( ) wine_glLoadIdentity
 @  stdcall glLoadMatrixd( ptr ) wine_glLoadMatrixd
@@ -161,14 +161,14 @@
 @  stdcall glLoadName( long ) wine_glLoadName
 @  stdcall glLogicOp( long ) wine_glLogicOp
 @  stdcall glMap1d( long double double long long ptr ) wine_glMap1d
-@  stdcall glMap1f( long long long long long ptr ) wine_glMap1f
+@  stdcall glMap1f( long float float long long ptr ) wine_glMap1f
 @  stdcall glMap2d( long double double long long double double long long ptr ) wine_glMap2d
-@  stdcall glMap2f( long long long long long long long long long ptr ) wine_glMap2f
+@  stdcall glMap2f( long float float long long float float long long ptr ) wine_glMap2f
 @  stdcall glMapGrid1d( long double double ) wine_glMapGrid1d
-@  stdcall glMapGrid1f( long long long ) wine_glMapGrid1f
+@  stdcall glMapGrid1f( long float float ) wine_glMapGrid1f
 @  stdcall glMapGrid2d( long double double long double double ) wine_glMapGrid2d
-@  stdcall glMapGrid2f( long long long long long long ) wine_glMapGrid2f
-@  stdcall glMaterialf( long long long ) wine_glMaterialf
+@  stdcall glMapGrid2f( long float float long float float ) wine_glMapGrid2f
+@  stdcall glMaterialf( long long float ) wine_glMaterialf
 @  stdcall glMaterialfv( long long ptr ) wine_glMaterialfv
 @  stdcall glMateriali( long long long ) wine_glMateriali
 @  stdcall glMaterialiv( long long ptr ) wine_glMaterialiv
@@ -180,7 +180,7 @@
 @  stdcall glNormal3bv( ptr ) wine_glNormal3bv
 @  stdcall glNormal3d( double double double ) wine_glNormal3d
 @  stdcall glNormal3dv( ptr ) wine_glNormal3dv
-@  stdcall glNormal3f( long long long ) wine_glNormal3f
+@  stdcall glNormal3f( float float float ) wine_glNormal3f
 @  stdcall glNormal3fv( ptr ) wine_glNormal3fv
 @  stdcall glNormal3i( long long long ) wine_glNormal3i
 @  stdcall glNormal3iv( ptr ) wine_glNormal3iv
@@ -188,18 +188,18 @@
 @  stdcall glNormal3sv( ptr ) wine_glNormal3sv
 @  stdcall glNormalPointer( long long ptr ) wine_glNormalPointer
 @  stdcall glOrtho( double double double double double double ) wine_glOrtho
-@  stdcall glPassThrough( long ) wine_glPassThrough
+@  stdcall glPassThrough( float ) wine_glPassThrough
 @  stdcall glPixelMapfv( long long ptr ) wine_glPixelMapfv
 @  stdcall glPixelMapuiv( long long ptr ) wine_glPixelMapuiv
 @  stdcall glPixelMapusv( long long ptr ) wine_glPixelMapusv
-@  stdcall glPixelStoref( long long ) wine_glPixelStoref
+@  stdcall glPixelStoref( long float ) wine_glPixelStoref
 @  stdcall glPixelStorei( long long ) wine_glPixelStorei
-@  stdcall glPixelTransferf( long long ) wine_glPixelTransferf
+@  stdcall glPixelTransferf( long float ) wine_glPixelTransferf
 @  stdcall glPixelTransferi( long long ) wine_glPixelTransferi
-@  stdcall glPixelZoom( long long ) wine_glPixelZoom
-@  stdcall glPointSize( long ) wine_glPointSize
+@  stdcall glPixelZoom( float float ) wine_glPixelZoom
+@  stdcall glPointSize( float ) wine_glPointSize
 @  stdcall glPolygonMode( long long ) wine_glPolygonMode
-@  stdcall glPolygonOffset( long long ) wine_glPolygonOffset
+@  stdcall glPolygonOffset( float float ) wine_glPolygonOffset
 @  stdcall glPolygonStipple( ptr ) wine_glPolygonStipple
 @  stdcall glPopAttrib( ) wine_glPopAttrib
 @  stdcall glPopClientAttrib( ) wine_glPopClientAttrib
@@ -212,7 +212,7 @@
 @  stdcall glPushName( long ) wine_glPushName
 @  stdcall glRasterPos2d( double double ) wine_glRasterPos2d
 @  stdcall glRasterPos2dv( ptr ) wine_glRasterPos2dv
-@  stdcall glRasterPos2f( long long ) wine_glRasterPos2f
+@  stdcall glRasterPos2f( float float ) wine_glRasterPos2f
 @  stdcall glRasterPos2fv( ptr ) wine_glRasterPos2fv
 @  stdcall glRasterPos2i( long long ) wine_glRasterPos2i
 @  stdcall glRasterPos2iv( ptr ) wine_glRasterPos2iv
@@ -220,7 +220,7 @@
 @  stdcall glRasterPos2sv( ptr ) wine_glRasterPos2sv
 @  stdcall glRasterPos3d( double double double ) wine_glRasterPos3d
 @  stdcall glRasterPos3dv( ptr ) wine_glRasterPos3dv
-@  stdcall glRasterPos3f( long long long ) wine_glRasterPos3f
+@  stdcall glRasterPos3f( float float float ) wine_glRasterPos3f
 @  stdcall glRasterPos3fv( ptr ) wine_glRasterPos3fv
 @  stdcall glRasterPos3i( long long long ) wine_glRasterPos3i
 @  stdcall glRasterPos3iv( ptr ) wine_glRasterPos3iv
@@ -228,7 +228,7 @@
 @  stdcall glRasterPos3sv( ptr ) wine_glRasterPos3sv
 @  stdcall glRasterPos4d( double double double double ) wine_glRasterPos4d
 @  stdcall glRasterPos4dv( ptr ) wine_glRasterPos4dv
-@  stdcall glRasterPos4f( long long long long ) wine_glRasterPos4f
+@  stdcall glRasterPos4f( float float float float ) wine_glRasterPos4f
 @  stdcall glRasterPos4fv( ptr ) wine_glRasterPos4fv
 @  stdcall glRasterPos4i( long long long long ) wine_glRasterPos4i
 @  stdcall glRasterPos4iv( ptr ) wine_glRasterPos4iv
@@ -238,7 +238,7 @@
 @  stdcall glReadPixels( long long long long long long ptr ) wine_glReadPixels
 @  stdcall glRectd( double double double double ) wine_glRectd
 @  stdcall glRectdv( ptr ptr ) wine_glRectdv
-@  stdcall glRectf( long long long long ) wine_glRectf
+@  stdcall glRectf( float float float float ) wine_glRectf
 @  stdcall glRectfv( ptr ptr ) wine_glRectfv
 @  stdcall glRecti( long long long long ) wine_glRecti
 @  stdcall glRectiv( ptr ptr ) wine_glRectiv
@@ -246,9 +246,9 @@
 @  stdcall glRectsv( ptr ptr ) wine_glRectsv
 @  stdcall glRenderMode( long ) wine_glRenderMode
 @  stdcall glRotated( double double double double ) wine_glRotated
-@  stdcall glRotatef( long long long long ) wine_glRotatef
+@  stdcall glRotatef( float float float float ) wine_glRotatef
 @  stdcall glScaled( double double double ) wine_glScaled
-@  stdcall glScalef( long long long ) wine_glScalef
+@  stdcall glScalef( float float float ) wine_glScalef
 @  stdcall glScissor( long long long long ) wine_glScissor
 @  stdcall glSelectBuffer( long ptr ) wine_glSelectBuffer
 @  stdcall glShadeModel( long ) wine_glShadeModel
@@ -257,7 +257,7 @@
 @  stdcall glStencilOp( long long long ) wine_glStencilOp
 @  stdcall glTexCoord1d( double ) wine_glTexCoord1d
 @  stdcall glTexCoord1dv( ptr ) wine_glTexCoord1dv
-@  stdcall glTexCoord1f( long ) wine_glTexCoord1f
+@  stdcall glTexCoord1f( float ) wine_glTexCoord1f
 @  stdcall glTexCoord1fv( ptr ) wine_glTexCoord1fv
 @  stdcall glTexCoord1i( long ) wine_glTexCoord1i
 @  stdcall glTexCoord1iv( ptr ) wine_glTexCoord1iv
@@ -265,7 +265,7 @@
 @  stdcall glTexCoord1sv( ptr ) wine_glTexCoord1sv
 @  stdcall glTexCoord2d( double double ) wine_glTexCoord2d
 @  stdcall glTexCoord2dv( ptr ) wine_glTexCoord2dv
-@  stdcall glTexCoord2f( long long ) wine_glTexCoord2f
+@  stdcall glTexCoord2f( float float ) wine_glTexCoord2f
 @  stdcall glTexCoord2fv( ptr ) wine_glTexCoord2fv
 @  stdcall glTexCoord2i( long long ) wine_glTexCoord2i
 @  stdcall glTexCoord2iv( ptr ) wine_glTexCoord2iv
@@ -273,7 +273,7 @@
 @  stdcall glTexCoord2sv( ptr ) wine_glTexCoord2sv
 @  stdcall glTexCoord3d( double double double ) wine_glTexCoord3d
 @  stdcall glTexCoord3dv( ptr ) wine_glTexCoord3dv
-@  stdcall glTexCoord3f( long long long ) wine_glTexCoord3f
+@  stdcall glTexCoord3f( float float float ) wine_glTexCoord3f
 @  stdcall glTexCoord3fv( ptr ) wine_glTexCoord3fv
 @  stdcall glTexCoord3i( long long long ) wine_glTexCoord3i
 @  stdcall glTexCoord3iv( ptr ) wine_glTexCoord3iv
@@ -281,36 +281,36 @@
 @  stdcall glTexCoord3sv( ptr ) wine_glTexCoord3sv
 @  stdcall glTexCoord4d( double double double double ) wine_glTexCoord4d
 @  stdcall glTexCoord4dv( ptr ) wine_glTexCoord4dv
-@  stdcall glTexCoord4f( long long long long ) wine_glTexCoord4f
+@  stdcall glTexCoord4f( float float float float ) wine_glTexCoord4f
 @  stdcall glTexCoord4fv( ptr ) wine_glTexCoord4fv
 @  stdcall glTexCoord4i( long long long long ) wine_glTexCoord4i
 @  stdcall glTexCoord4iv( ptr ) wine_glTexCoord4iv
 @  stdcall glTexCoord4s( long long long long ) wine_glTexCoord4s
 @  stdcall glTexCoord4sv( ptr ) wine_glTexCoord4sv
 @  stdcall glTexCoordPointer( long long long ptr ) wine_glTexCoordPointer
-@  stdcall glTexEnvf( long long long ) wine_glTexEnvf
+@  stdcall glTexEnvf( long long float ) wine_glTexEnvf
 @  stdcall glTexEnvfv( long long ptr ) wine_glTexEnvfv
 @  stdcall glTexEnvi( long long long ) wine_glTexEnvi
 @  stdcall glTexEnviv( long long ptr ) wine_glTexEnviv
 @  stdcall glTexGend( long long double ) wine_glTexGend
 @  stdcall glTexGendv( long long ptr ) wine_glTexGendv
-@  stdcall glTexGenf( long long long ) wine_glTexGenf
+@  stdcall glTexGenf( long long float ) wine_glTexGenf
 @  stdcall glTexGenfv( long long ptr ) wine_glTexGenfv
 @  stdcall glTexGeni( long long long ) wine_glTexGeni
 @  stdcall glTexGeniv( long long ptr ) wine_glTexGeniv
 @  stdcall glTexImage1D( long long long long long long long ptr ) wine_glTexImage1D
 @  stdcall glTexImage2D( long long long long long long long long ptr ) wine_glTexImage2D
-@  stdcall glTexParameterf( long long long ) wine_glTexParameterf
+@  stdcall glTexParameterf( long long float ) wine_glTexParameterf
 @  stdcall glTexParameterfv( long long ptr ) wine_glTexParameterfv
 @  stdcall glTexParameteri( long long long ) wine_glTexParameteri
 @  stdcall glTexParameteriv( long long ptr ) wine_glTexParameteriv
 @  stdcall glTexSubImage1D( long long long long long long ptr ) wine_glTexSubImage1D
 @  stdcall glTexSubImage2D( long long long long long long long long ptr ) wine_glTexSubImage2D
 @  stdcall glTranslated( double double double ) wine_glTranslated
-@  stdcall glTranslatef( long long long ) wine_glTranslatef
+@  stdcall glTranslatef( float float float ) wine_glTranslatef
 @  stdcall glVertex2d( double double ) wine_glVertex2d
 @  stdcall glVertex2dv( ptr ) wine_glVertex2dv
-@  stdcall glVertex2f( long long ) wine_glVertex2f
+@  stdcall glVertex2f( float float ) wine_glVertex2f
 @  stdcall glVertex2fv( ptr ) wine_glVertex2fv
 @  stdcall glVertex2i( long long ) wine_glVertex2i
 @  stdcall glVertex2iv( ptr ) wine_glVertex2iv
@@ -318,7 +318,7 @@
 @  stdcall glVertex2sv( ptr ) wine_glVertex2sv
 @  stdcall glVertex3d( double double double ) wine_glVertex3d
 @  stdcall glVertex3dv( ptr ) wine_glVertex3dv
-@  stdcall glVertex3f( long long long ) wine_glVertex3f
+@  stdcall glVertex3f( float float float ) wine_glVertex3f
 @  stdcall glVertex3fv( ptr ) wine_glVertex3fv
 @  stdcall glVertex3i( long long long ) wine_glVertex3i
 @  stdcall glVertex3iv( ptr ) wine_glVertex3iv
@@ -326,7 +326,7 @@
 @  stdcall glVertex3sv( ptr ) wine_glVertex3sv
 @  stdcall glVertex4d( double double double double ) wine_glVertex4d
 @  stdcall glVertex4dv( ptr ) wine_glVertex4dv
-@  stdcall glVertex4f( long long long long ) wine_glVertex4f
+@  stdcall glVertex4f( float float float float ) wine_glVertex4f
 @  stdcall glVertex4fv( ptr ) wine_glVertex4fv
 @  stdcall glVertex4i( long long long long ) wine_glVertex4i
 @  stdcall glVertex4iv( ptr ) wine_glVertex4iv