thr3ads.net - wine users - Graphics Problem [Jun 2003]

If this information is useful, please help other people find it:
Share via:

Joe Giles

2003-Jun-15 15:05 UTC

Graphics Problem

List, 

I have installed Mandrake 9.1 and the latest stable of Wine. I also have
the newest driver for my GeForce Ti 4200 from NVidia. I have used this
configuration before with out any issues and my Half Life Mod DOD (Day
of Defeat) has worked fine. However, I have recently reloaded my
computer and have kept all the same configuration as before (Including
my old config file from .wine), however, all the graphics are messed up
now (See URL below for image). It appears like all the textures are not
right. This also happens to Counter Strike. I cant even describe what
the problem is other than to say look at the image I have taken. I have
also put all the versions of software I have. Anyone know how to fix
this? 

http://www.joeman1.com/dod.jpg

OS: Mandrake 9.1 Kernel version (uname -a) : Linux linuxbox
2.4.21-0.18mdk

NVidia Driver version: 1.0-4363

Wine Version : 20030408

BTW, I have regressed kernel, video, and wine versions to previous
version to test for compatibility. Also, I can run other OpenGL apps
line Return To Castle Wolfenstien (Native Linux binaries) and it works
great.


Thanks

Joe

Sylvain Petreolle

2003-Jun-15 15:57 UTC

head link

Graphics Problem

Joe,
- latest stable is 20030508.
- the CVS version has many fixes/new features for textures
implementation.
Try one of these two and see if it fixes your problem.
> OS: Mandrake 9.1 Kernel version (uname -a) : Linux linuxbox
> 2.4.21-0.18mdk
> 
> NVidia Driver version: 1.0-4363
> 
> Wine Version : 20030408

====Sylvain Petreolle (spetreolle at users dot sourceforge dot net) 
ICQ #170597259

"What if tomorrow the War could be over ?" Morpheus, in
"Reloaded".

For the Law of Oil and Fire, Im an European that lives in France.
For all my Brothers and friends, Im a human living on Earth.

___________________________________________________________
Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en fran?ais !
Yahoo! Mail : http://fr.mail.yahoo.com

Joe Giles

2003-Jun-15 16:10 UTC

head link

Graphics Problem

My Mistake, I did try the 0508 version and it still didnt work, BUT, let
me try the csv. I havent tried that one.

Thanks for the reply

-- 
Joe Giles
jgiles@joeman1.com
AOL: mcigiles

-------
Registered Linux User #264910 http://counter.li.org
-------

Sylvain Petreolle said:> Joe,
> - latest stable is 20030508.
> - the CVS version has many fixes/new features for textures
> implementation.
> Try one of these two and see if it fixes your problem.
>
>> OS: Mandrake 9.1 Kernel version (uname -a) : Linux linuxbox
>> 2.4.21-0.18mdk
>>
>> NVidia Driver version: 1.0-4363
>>
>> Wine Version : 20030408
>
>
> ====> Sylvain Petreolle (spetreolle at users dot sourceforge dot net)
> ICQ #170597259
>
> "What if tomorrow the War could be over ?" Morpheus, in
"Reloaded".
>
> For the Law of Oil and Fire, Im an European that lives in France.
> For all my Brothers and friends, Im a human living on Earth.
>
> ___________________________________________________________
> Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en fran?ais !
> Yahoo! Mail : http://fr.mail.yahoo.com
> _______________________________________________
> wine-users mailing list
> wine-users@winehq.com
> http://www.winehq.com/mailman/listinfo/wine-users
>

Robert Shearman

2003-Jun-16 12:27 UTC

head link

Graphics Problem

Joe Giles said:> Oh, the Wine installed doesnt pick up weather or not you have OpenGL
> installed or not anymore? I have Open GL installed AND working on other
> games (Native linux binaries such as Quake 2 and RTCW).
It should do.
> Cogman said:
> All you need to do is copy /usr/share/doc/NVIDIA_GLX-1.0/include/GL/* to
> /usr/X11R6/include/GL and rebuild wine.
Yes, this is the right fix. It is a strange problem as it is rare for a
header change to affect what happens in the binary, rather than it just not
compiling. It is a known 'feature' with NVidia drivers, nothing to do
with
Wine.

Rob

Robert Shearman

2003-Jun-17 17:36 UTC

head link

Graphics Problem

Rob Hughes said:> make[2]: Entering directory `/usr/src/wine/dlls/opengl32'
> gcc -c -I. -I. -I../../include -I../../include -I/usr/X11R6/include
> -D_REENTRANT -fPIC -D__WINESRC__  -Wall -mpreferred-stack-boundary=2
> -gstabs+ -Wpointer-arith  -g -O2 -o opengl_ext.o opengl_ext.c
> opengl_ext.c:12: redefinition of `GLintptrARB'
> /usr/X11R6/include/GL/gl.h:67: `GLintptrARB' previously declared here
> opengl_ext.c:13: redefinition of `GLsizeiptrARB'
> /usr/X11R6/include/GL/gl.h:68: `GLsizeiptrARB' previously declared here
> make[2]: *** [opengl_ext.o] Error 1
> make[2]: Leaving directory `/usr/src/wine/dlls/opengl32'
> make[1]: *** [opengl32] Error 2
> make[1]: Leaving directory `/usr/src/wine/dlls'
> make: *** [dlls] Error 2
>
> This is with cvs as of this morning and NVIDIA 43.63 drivers.
>
It appears as though a CVS commit 4 days ago added those types. Perhaps
Lionel could have a look at these errors?

Rob

Lionel Ulmer

2003-Jun-19 16:55 UTC

head link

[OPENGL] Compilation fixes on some b0rken headers

> > This is with cvs as of this morning and NVIDIA 43.63 drivers.
Yeah, thanks NVIDIA for putting extensions in GL.h :-/
> It appears as though a CVS commit 4 days ago added those types. Perhaps
> Lionel could have a look at these errors?
Submitting the attached patch to wine-patches. It will fix your issue.

            Lionel

Changelog:
 - do not use any typedefs in the GL thunks to prevent all possible
   compilation issues

-- 
		 Lionel Ulmer - http://www.bbrox.org/
-------------- next part --------------
Index: make_opengl
==================================================================RCS file:
/home/wine/wine/dlls/opengl32/make_opengl,v
retrieving revision 1.17
diff -u -r1.17 make_opengl
--- make_opengl	13 Jun 2003 16:31:17 -0000	1.17
+++ make_opengl	19 Jun 2003 21:52:54 -0000
@@ -140,6 +140,26 @@
      "_GLfuncptr" => [ "ptr", 4 ]);
 
 #
+# Used to convert some types
+#
+sub ConvertType {
+    my ($type) = @_;
+
+    %hash = ( "GLstring" => "const GLubyte *",
+	      "GLintptrARB" => "ptrdiff_t",
+	      "GLsizeiptrARB" => "ptrdiff_t",
+	      "GLhalfNV" => "unsigned short" );
+
+    foreach $org (keys %hash) {
+	if ($type =~ /$org/) {
+	    ($before, $after) = ($type =~ /^(.*)$org(.*)$/);
+	    return "$before$hash{$org}$after";
+	}
+    }
+    return $type;
+}
+
+#
 # This functions generates the thunk for a given function.
 #
 sub GenerateThunk {
@@ -155,11 +175,11 @@
 	$ret = $ret . " *              " . $func_ref->[0] . "
(OPENGL32.@)\n";
 	$ret = $ret . " */\n";
     }
-    $ret = $ret . $func_ref->[1] . " WINAPI wine_" .
$func_ref->[0] . "( ";
+    $ret = $ret . ConvertType($func_ref->[1]) . " WINAPI wine_" .
$func_ref->[0] . "( ";
     for ($i = 0; $i <= $#{@{$func_ref->[2]}}; $i++) {
 	$type = $func_ref->[2]->[$i]->[0];
 	$name = $func_ref->[2]->[$i]->[1];
-	$ret = $ret . "$type $name";
+	$ret = $ret . ConvertType($type) . " $name";
 	$call_arg = $call_arg . "$name";
 	if ($type =~ /\*/) {
 	    $trace_arg = $trace_arg . "%p";
@@ -177,7 +197,7 @@
     }
     $ret = $ret . ") {\n";
     if ($func_ref->[1] ne "void") {
-	$ret = $ret . "  " . $func_ref->[1] . " ret_value;\n";
+	$ret = $ret . "  " . ConvertType($func_ref->[1]) . "
ret_value;\n";
     }
     if ($gen_traces) {
 	$ret = $ret . "  TRACE(\"(" . $trace_arg .
")\\n\"";
@@ -576,8 +596,6 @@
 #include \"opengl_ext.h\"
 #include \"wine/debug.h\"
 
-typedef const GLubyte * GLstring;
-
 WINE_DEFAULT_DEBUG_CHANNEL(opengl);
 
 ";
@@ -599,14 +617,8 @@
 #include \"opengl_ext.h\"
 #include \"wine/debug.h\"
 
-typedef const GLubyte * GLstring;
-
 WINE_DEFAULT_DEBUG_CHANNEL(opengl);
 
-typedef ptrdiff_t GLintptrARB;
-typedef ptrdiff_t GLsizeiptrARB;
-typedef unsigned short GLhalfNV;
-
 ";
 
 # First, generate the function pointers
@@ -614,7 +626,7 @@
     $func_ref = $ext_functions{$_};
     print EXT $func_ref->[1] . " (*" . $ext_prefix .
$func_ref->[0] . ")( ";
     for ($i = 0; $i <= $#{@{$func_ref->[2]}}; $i++) {
-	$type = $func_ref->[2]->[$i]->[0];
+	$type = ConvertType($func_ref->[2]->[$i]->[0]);
 	print EXT "$type";
 	if ($i != $#{@{$func_ref->[2]}}) {
 	    print EXT ", ";
@@ -631,7 +643,7 @@
     $func_ref = $ext_functions{$_};
     print EXT $func_ref->[1] . " WINAPI " . "wine_" .
$func_ref->[0] . "( ";
     for ($i = 0; $i <= $#{@{$func_ref->[2]}}; $i++) {
-	$type = $func_ref->[2]->[$i]->[0];
+	$type = ConvertType($func_ref->[2]->[$i]->[0]);
 	print EXT "$type";
 	if ($i != $#{@{$func_ref->[2]}}) {
 	    print EXT ", ";
Index: opengl_ext.c
==================================================================RCS file:
/home/wine/wine/dlls/opengl32/opengl_ext.c,v
retrieving revision 1.12
diff -u -r1.12 opengl_ext.c
--- opengl_ext.c	13 Jun 2003 16:31:17 -0000	1.12
+++ opengl_ext.c	19 Jun 2003 21:52:57 -0000
@@ -5,14 +5,8 @@
 #include "opengl_ext.h"
 #include "wine/debug.h"
 
-typedef const GLubyte * GLstring;
-
 WINE_DEFAULT_DEBUG_CHANNEL(opengl);
 
-typedef ptrdiff_t GLintptrARB;
-typedef ptrdiff_t GLsizeiptrARB;
-typedef unsigned short GLhalfNV;
-
 void (*func_glActiveStencilFaceEXT)( GLenum ) = (void *) 0xdeadbeef;
 void (*func_glActiveTexture)( GLenum ) = (void *) 0xdeadbeef;
 void (*func_glAlphaFragmentOp1ATI)( GLenum, GLuint, GLuint, GLuint, GLuint,
GLuint ) = (void *) 0xdeadbeef;
@@ -55,19 +49,19 @@
 void (*func_glBlendFuncSeparate)( GLenum, GLenum, GLenum, GLenum ) = (void *)
0xdeadbeef;
 void (*func_glBlendFuncSeparateEXT)( GLenum, GLenum, GLenum, GLenum ) = (void
*) 0xdeadbeef;
 void (*func_glBlendFuncSeparateINGR)( GLenum, GLenum, GLenum, GLenum ) = (void
*) 0xdeadbeef;
-void (*func_glBufferDataARB)( GLenum, GLsizeiptrARB, GLvoid*, GLenum ) = (void
*) 0xdeadbeef;
+void (*func_glBufferDataARB)( GLenum, ptrdiff_t, GLvoid*, GLenum ) = (void *)
0xdeadbeef;
 GLuint (*func_glBufferRegionEnabled)( ) = (void *) 0xdeadbeef;
-void (*func_glBufferSubDataARB)( GLenum, GLintptrARB, GLsizeiptrARB, GLvoid* )
= (void *) 0xdeadbeef;
+void (*func_glBufferSubDataARB)( GLenum, ptrdiff_t, ptrdiff_t, GLvoid* ) =
(void *) 0xdeadbeef;
 void (*func_glClientActiveTexture)( GLenum ) = (void *) 0xdeadbeef;
 void (*func_glClientActiveVertexStreamATI)( GLenum ) = (void *) 0xdeadbeef;
 void (*func_glColor3fVertex3fSUN)( GLfloat, GLfloat, GLfloat, GLfloat, GLfloat,
GLfloat ) = (void *) 0xdeadbeef;
 void (*func_glColor3fVertex3fvSUN)( GLfloat*, GLfloat* ) = (void *) 0xdeadbeef;
-void (*func_glColor3hNV)( GLhalfNV, GLhalfNV, GLhalfNV ) = (void *) 0xdeadbeef;
-void (*func_glColor3hvNV)( GLhalfNV* ) = (void *) 0xdeadbeef;
+void (*func_glColor3hNV)( unsigned short, unsigned short, unsigned short ) =
(void *) 0xdeadbeef;
+void (*func_glColor3hvNV)( unsigned short* ) = (void *) 0xdeadbeef;
 void (*func_glColor4fNormal3fVertex3fSUN)( GLfloat, GLfloat, GLfloat, GLfloat,
GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat ) = (void *) 0xdeadbeef;
 void (*func_glColor4fNormal3fVertex3fvSUN)( GLfloat*, GLfloat*, GLfloat* ) =
(void *) 0xdeadbeef;
-void (*func_glColor4hNV)( GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV ) = (void *)
0xdeadbeef;
-void (*func_glColor4hvNV)( GLhalfNV* ) = (void *) 0xdeadbeef;
+void (*func_glColor4hNV)( unsigned short, unsigned short, unsigned short,
unsigned short ) = (void *) 0xdeadbeef;
+void (*func_glColor4hvNV)( unsigned short* ) = (void *) 0xdeadbeef;
 void (*func_glColor4ubVertex2fSUN)( GLubyte, GLubyte, GLubyte, GLubyte,
GLfloat, GLfloat ) = (void *) 0xdeadbeef;
 void (*func_glColor4ubVertex2fvSUN)( GLubyte*, GLfloat* ) = (void *)
0xdeadbeef;
 void (*func_glColor4ubVertex3fSUN)( GLubyte, GLubyte, GLubyte, GLubyte,
GLfloat, GLfloat, GLfloat ) = (void *) 0xdeadbeef;
@@ -180,8 +174,8 @@
 void (*func_glFogCoordfEXT)( GLfloat ) = (void *) 0xdeadbeef;
 void (*func_glFogCoordfv)( GLfloat* ) = (void *) 0xdeadbeef;
 void (*func_glFogCoordfvEXT)( GLfloat* ) = (void *) 0xdeadbeef;
-void (*func_glFogCoordhNV)( GLhalfNV ) = (void *) 0xdeadbeef;
-void (*func_glFogCoordhvNV)( GLhalfNV* ) = (void *) 0xdeadbeef;
+void (*func_glFogCoordhNV)( unsigned short ) = (void *) 0xdeadbeef;
+void (*func_glFogCoordhvNV)( unsigned short* ) = (void *) 0xdeadbeef;
 void (*func_glFogFuncSGIS)( GLsizei, GLfloat* ) = (void *) 0xdeadbeef;
 void (*func_glFragmentColorMaterialSGIX)( GLenum, GLenum ) = (void *)
0xdeadbeef;
 void (*func_glFragmentLightModelfSGIX)( GLenum, GLfloat ) = (void *)
0xdeadbeef;
@@ -214,7 +208,7 @@
 void (*func_glGetArrayObjectivATI)( GLenum, GLenum, GLint* ) = (void *)
0xdeadbeef;
 void (*func_glGetBufferParameterivARB)( GLenum, GLenum, GLint* ) = (void *)
0xdeadbeef;
 void (*func_glGetBufferPointervARB)( GLenum, GLenum, GLvoid** ) = (void *)
0xdeadbeef;
-void (*func_glGetBufferSubDataARB)( GLenum, GLintptrARB, GLsizeiptrARB, GLvoid*
) = (void *) 0xdeadbeef;
+void (*func_glGetBufferSubDataARB)( GLenum, ptrdiff_t, ptrdiff_t, GLvoid* ) =
(void *) 0xdeadbeef;
 void (*func_glGetColorTableEXT)( GLenum, GLenum, GLenum, GLvoid* ) = (void *)
0xdeadbeef;
 void (*func_glGetColorTableParameterfvEXT)( GLenum, GLenum, GLfloat* ) = (void
*) 0xdeadbeef;
 void (*func_glGetColorTableParameterfvSGI)( GLenum, GLenum, GLfloat* ) = (void
*) 0xdeadbeef;
@@ -379,8 +373,8 @@
 void (*func_glMultiTexCoord1fSGIS)( GLenum, GLfloat ) = (void *) 0xdeadbeef;
 void (*func_glMultiTexCoord1fv)( GLenum, GLfloat* ) = (void *) 0xdeadbeef;
 void (*func_glMultiTexCoord1fvSGIS)( GLenum, const GLfloat * ) = (void *)
0xdeadbeef;
-void (*func_glMultiTexCoord1hNV)( GLenum, GLhalfNV ) = (void *) 0xdeadbeef;
-void (*func_glMultiTexCoord1hvNV)( GLenum, GLhalfNV* ) = (void *) 0xdeadbeef;
+void (*func_glMultiTexCoord1hNV)( GLenum, unsigned short ) = (void *)
0xdeadbeef;
+void (*func_glMultiTexCoord1hvNV)( GLenum, unsigned short* ) = (void *)
0xdeadbeef;
 void (*func_glMultiTexCoord1i)( GLenum, GLint ) = (void *) 0xdeadbeef;
 void (*func_glMultiTexCoord1iSGIS)( GLenum, GLint ) = (void *) 0xdeadbeef;
 void (*func_glMultiTexCoord1iv)( GLenum, GLint* ) = (void *) 0xdeadbeef;
@@ -397,8 +391,8 @@
 void (*func_glMultiTexCoord2fSGIS)( GLenum, GLfloat, GLfloat ) = (void *)
0xdeadbeef;
 void (*func_glMultiTexCoord2fv)( GLenum, GLfloat* ) = (void *) 0xdeadbeef;
 void (*func_glMultiTexCoord2fvSGIS)( GLenum, GLfloat * ) = (void *) 0xdeadbeef;
-void (*func_glMultiTexCoord2hNV)( GLenum, GLhalfNV, GLhalfNV ) = (void *)
0xdeadbeef;
-void (*func_glMultiTexCoord2hvNV)( GLenum, GLhalfNV* ) = (void *) 0xdeadbeef;
+void (*func_glMultiTexCoord2hNV)( GLenum, unsigned short, unsigned short ) =
(void *) 0xdeadbeef;
+void (*func_glMultiTexCoord2hvNV)( GLenum, unsigned short* ) = (void *)
0xdeadbeef;
 void (*func_glMultiTexCoord2i)( GLenum, GLint, GLint ) = (void *) 0xdeadbeef;
 void (*func_glMultiTexCoord2iSGIS)( GLenum, GLint, GLint ) = (void *)
0xdeadbeef;
 void (*func_glMultiTexCoord2iv)( GLenum, GLint* ) = (void *) 0xdeadbeef;
@@ -415,8 +409,8 @@
 void (*func_glMultiTexCoord3fSGIS)( GLenum, GLfloat, GLfloat, GLfloat ) = (void
*) 0xdeadbeef;
 void (*func_glMultiTexCoord3fv)( GLenum, GLfloat* ) = (void *) 0xdeadbeef;
 void (*func_glMultiTexCoord3fvSGIS)( GLenum, GLfloat * ) = (void *) 0xdeadbeef;
-void (*func_glMultiTexCoord3hNV)( GLenum, GLhalfNV, GLhalfNV, GLhalfNV ) =
(void *) 0xdeadbeef;
-void (*func_glMultiTexCoord3hvNV)( GLenum, GLhalfNV* ) = (void *) 0xdeadbeef;
+void (*func_glMultiTexCoord3hNV)( GLenum, unsigned short, unsigned short,
unsigned short ) = (void *) 0xdeadbeef;
+void (*func_glMultiTexCoord3hvNV)( GLenum, unsigned short* ) = (void *)
0xdeadbeef;
 void (*func_glMultiTexCoord3i)( GLenum, GLint, GLint, GLint ) = (void *)
0xdeadbeef;
 void (*func_glMultiTexCoord3iSGIS)( GLenum, GLint, GLint, GLint ) = (void *)
0xdeadbeef;
 void (*func_glMultiTexCoord3iv)( GLenum, GLint* ) = (void *) 0xdeadbeef;
@@ -433,8 +427,8 @@
 void (*func_glMultiTexCoord4fSGIS)( GLenum, GLfloat, GLfloat, GLfloat, GLfloat
) = (void *) 0xdeadbeef;
 void (*func_glMultiTexCoord4fv)( GLenum, GLfloat* ) = (void *) 0xdeadbeef;
 void (*func_glMultiTexCoord4fvSGIS)( GLenum, GLfloat * ) = (void *) 0xdeadbeef;
-void (*func_glMultiTexCoord4hNV)( GLenum, GLhalfNV, GLhalfNV, GLhalfNV,
GLhalfNV ) = (void *) 0xdeadbeef;
-void (*func_glMultiTexCoord4hvNV)( GLenum, GLhalfNV* ) = (void *) 0xdeadbeef;
+void (*func_glMultiTexCoord4hNV)( GLenum, unsigned short, unsigned short,
unsigned short, unsigned short ) = (void *) 0xdeadbeef;
+void (*func_glMultiTexCoord4hvNV)( GLenum, unsigned short* ) = (void *)
0xdeadbeef;
 void (*func_glMultiTexCoord4i)( GLenum, GLint, GLint, GLint, GLint ) = (void *)
0xdeadbeef;
 void (*func_glMultiTexCoord4iSGIS)( GLenum, GLint, GLint, GLint, GLint ) =
(void *) 0xdeadbeef;
 void (*func_glMultiTexCoord4iv)( GLenum, GLint* ) = (void *) 0xdeadbeef;
@@ -448,8 +442,8 @@
 GLuint (*func_glNewObjectBufferATI)( GLsizei, GLvoid*, GLenum ) = (void *)
0xdeadbeef;
 void (*func_glNormal3fVertex3fSUN)( GLfloat, GLfloat, GLfloat, GLfloat,
GLfloat, GLfloat ) = (void *) 0xdeadbeef;
 void (*func_glNormal3fVertex3fvSUN)( GLfloat*, GLfloat* ) = (void *)
0xdeadbeef;
-void (*func_glNormal3hNV)( GLhalfNV, GLhalfNV, GLhalfNV ) = (void *)
0xdeadbeef;
-void (*func_glNormal3hvNV)( GLhalfNV* ) = (void *) 0xdeadbeef;
+void (*func_glNormal3hNV)( unsigned short, unsigned short, unsigned short ) =
(void *) 0xdeadbeef;
+void (*func_glNormal3hvNV)( unsigned short* ) = (void *) 0xdeadbeef;
 void (*func_glNormalPointerEXT)( GLenum, GLsizei, GLsizei, GLvoid* ) = (void *)
0xdeadbeef;
 void (*func_glNormalPointerListIBM)( GLenum, GLint, GLvoid**, GLint ) = (void
*) 0xdeadbeef;
 void (*func_glNormalPointervINTEL)( GLenum, GLvoid** ) = (void *) 0xdeadbeef;
@@ -562,8 +556,8 @@
 void (*func_glSecondaryColor3fEXT)( GLfloat, GLfloat, GLfloat ) = (void *)
0xdeadbeef;
 void (*func_glSecondaryColor3fv)( GLfloat* ) = (void *) 0xdeadbeef;
 void (*func_glSecondaryColor3fvEXT)( GLfloat* ) = (void *) 0xdeadbeef;
-void (*func_glSecondaryColor3hNV)( GLhalfNV, GLhalfNV, GLhalfNV ) = (void *)
0xdeadbeef;
-void (*func_glSecondaryColor3hvNV)( GLhalfNV* ) = (void *) 0xdeadbeef;
+void (*func_glSecondaryColor3hNV)( unsigned short, unsigned short, unsigned
short ) = (void *) 0xdeadbeef;
+void (*func_glSecondaryColor3hvNV)( unsigned short* ) = (void *) 0xdeadbeef;
 void (*func_glSecondaryColor3i)( GLint, GLint, GLint ) = (void *) 0xdeadbeef;
 void (*func_glSecondaryColor3iEXT)( GLint, GLint, GLint ) = (void *)
0xdeadbeef;
 void (*func_glSecondaryColor3iv)( GLint* ) = (void *) 0xdeadbeef;
@@ -626,8 +620,8 @@
 GLboolean (*func_glTestObjectAPPLE)( GLenum, GLuint ) = (void *) 0xdeadbeef;
 void (*func_glTexBumpParameterfvATI)( GLenum, GLfloat* ) = (void *) 0xdeadbeef;
 void (*func_glTexBumpParameterivATI)( GLenum, GLint* ) = (void *) 0xdeadbeef;
-void (*func_glTexCoord1hNV)( GLhalfNV ) = (void *) 0xdeadbeef;
-void (*func_glTexCoord1hvNV)( GLhalfNV* ) = (void *) 0xdeadbeef;
+void (*func_glTexCoord1hNV)( unsigned short ) = (void *) 0xdeadbeef;
+void (*func_glTexCoord1hvNV)( unsigned short* ) = (void *) 0xdeadbeef;
 void (*func_glTexCoord2fColor3fVertex3fSUN)( GLfloat, GLfloat, GLfloat,
GLfloat, GLfloat, GLfloat, GLfloat, GLfloat ) = (void *) 0xdeadbeef;
 void (*func_glTexCoord2fColor3fVertex3fvSUN)( GLfloat*, GLfloat*, GLfloat* ) =
(void *) 0xdeadbeef;
 void (*func_glTexCoord2fColor4fNormal3fVertex3fSUN)( GLfloat, GLfloat, GLfloat,
GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat
) = (void *) 0xdeadbeef;
@@ -638,16 +632,16 @@
 void (*func_glTexCoord2fNormal3fVertex3fvSUN)( GLfloat*, GLfloat*, GLfloat* ) =
(void *) 0xdeadbeef;
 void (*func_glTexCoord2fVertex3fSUN)( GLfloat, GLfloat, GLfloat, GLfloat,
GLfloat ) = (void *) 0xdeadbeef;
 void (*func_glTexCoord2fVertex3fvSUN)( GLfloat*, GLfloat* ) = (void *)
0xdeadbeef;
-void (*func_glTexCoord2hNV)( GLhalfNV, GLhalfNV ) = (void *) 0xdeadbeef;
-void (*func_glTexCoord2hvNV)( GLhalfNV* ) = (void *) 0xdeadbeef;
-void (*func_glTexCoord3hNV)( GLhalfNV, GLhalfNV, GLhalfNV ) = (void *)
0xdeadbeef;
-void (*func_glTexCoord3hvNV)( GLhalfNV* ) = (void *) 0xdeadbeef;
+void (*func_glTexCoord2hNV)( unsigned short, unsigned short ) = (void *)
0xdeadbeef;
+void (*func_glTexCoord2hvNV)( unsigned short* ) = (void *) 0xdeadbeef;
+void (*func_glTexCoord3hNV)( unsigned short, unsigned short, unsigned short ) =
(void *) 0xdeadbeef;
+void (*func_glTexCoord3hvNV)( unsigned short* ) = (void *) 0xdeadbeef;
 void (*func_glTexCoord4fColor4fNormal3fVertex4fSUN)( GLfloat, GLfloat, GLfloat,
GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat,
GLfloat, GLfloat, GLfloat ) = (void *) 0xdeadbeef;
 void (*func_glTexCoord4fColor4fNormal3fVertex4fvSUN)( GLfloat*, GLfloat*,
GLfloat*, GLfloat* ) = (void *) 0xdeadbeef;
 void (*func_glTexCoord4fVertex4fSUN)( GLfloat, GLfloat, GLfloat, GLfloat,
GLfloat, GLfloat, GLfloat, GLfloat ) = (void *) 0xdeadbeef;
 void (*func_glTexCoord4fVertex4fvSUN)( GLfloat*, GLfloat* ) = (void *)
0xdeadbeef;
-void (*func_glTexCoord4hNV)( GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV ) = (void
*) 0xdeadbeef;
-void (*func_glTexCoord4hvNV)( GLhalfNV* ) = (void *) 0xdeadbeef;
+void (*func_glTexCoord4hNV)( unsigned short, unsigned short, unsigned short,
unsigned short ) = (void *) 0xdeadbeef;
+void (*func_glTexCoord4hvNV)( unsigned short* ) = (void *) 0xdeadbeef;
 void (*func_glTexCoordPointerEXT)( GLint, GLenum, GLsizei, GLsizei, GLvoid* ) =
(void *) 0xdeadbeef;
 void (*func_glTexCoordPointerListIBM)( GLint, GLenum, GLint, GLvoid**, GLint )
= (void *) 0xdeadbeef;
 void (*func_glTexCoordPointervINTEL)( GLint, GLenum, GLvoid** ) = (void *)
0xdeadbeef;
@@ -677,12 +671,12 @@
 void (*func_glVariantubvEXT)( GLuint, GLubyte* ) = (void *) 0xdeadbeef;
 void (*func_glVariantuivEXT)( GLuint, GLuint* ) = (void *) 0xdeadbeef;
 void (*func_glVariantusvEXT)( GLuint, GLushort* ) = (void *) 0xdeadbeef;
-void (*func_glVertex2hNV)( GLhalfNV, GLhalfNV ) = (void *) 0xdeadbeef;
-void (*func_glVertex2hvNV)( GLhalfNV* ) = (void *) 0xdeadbeef;
-void (*func_glVertex3hNV)( GLhalfNV, GLhalfNV, GLhalfNV ) = (void *)
0xdeadbeef;
-void (*func_glVertex3hvNV)( GLhalfNV* ) = (void *) 0xdeadbeef;
-void (*func_glVertex4hNV)( GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV ) = (void *)
0xdeadbeef;
-void (*func_glVertex4hvNV)( GLhalfNV* ) = (void *) 0xdeadbeef;
+void (*func_glVertex2hNV)( unsigned short, unsigned short ) = (void *)
0xdeadbeef;
+void (*func_glVertex2hvNV)( unsigned short* ) = (void *) 0xdeadbeef;
+void (*func_glVertex3hNV)( unsigned short, unsigned short, unsigned short ) =
(void *) 0xdeadbeef;
+void (*func_glVertex3hvNV)( unsigned short* ) = (void *) 0xdeadbeef;
+void (*func_glVertex4hNV)( unsigned short, unsigned short, unsigned short,
unsigned short ) = (void *) 0xdeadbeef;
+void (*func_glVertex4hvNV)( unsigned short* ) = (void *) 0xdeadbeef;
 void (*func_glVertexArrayParameteriAPPLE)( GLenum, GLint ) = (void *)
0xdeadbeef;
 void (*func_glVertexArrayRangeAPPLE)( GLsizei, GLvoid* ) = (void *) 0xdeadbeef;
 void (*func_glVertexArrayRangeNV)( GLsizei, GLvoid* ) = (void *) 0xdeadbeef;
@@ -694,8 +688,8 @@
 void (*func_glVertexAttrib1fNV)( GLuint, GLfloat ) = (void *) 0xdeadbeef;
 void (*func_glVertexAttrib1fvARB)( GLuint, GLfloat* ) = (void *) 0xdeadbeef;
 void (*func_glVertexAttrib1fvNV)( GLuint, GLfloat* ) = (void *) 0xdeadbeef;
-void (*func_glVertexAttrib1hNV)( GLuint, GLhalfNV ) = (void *) 0xdeadbeef;
-void (*func_glVertexAttrib1hvNV)( GLuint, GLhalfNV* ) = (void *) 0xdeadbeef;
+void (*func_glVertexAttrib1hNV)( GLuint, unsigned short ) = (void *)
0xdeadbeef;
+void (*func_glVertexAttrib1hvNV)( GLuint, unsigned short* ) = (void *)
0xdeadbeef;
 void (*func_glVertexAttrib1sARB)( GLuint, GLshort ) = (void *) 0xdeadbeef;
 void (*func_glVertexAttrib1sNV)( GLuint, GLshort ) = (void *) 0xdeadbeef;
 void (*func_glVertexAttrib1svARB)( GLuint, GLshort* ) = (void *) 0xdeadbeef;
@@ -708,8 +702,8 @@
 void (*func_glVertexAttrib2fNV)( GLuint, GLfloat, GLfloat ) = (void *)
0xdeadbeef;
 void (*func_glVertexAttrib2fvARB)( GLuint, GLfloat* ) = (void *) 0xdeadbeef;
 void (*func_glVertexAttrib2fvNV)( GLuint, GLfloat* ) = (void *) 0xdeadbeef;
-void (*func_glVertexAttrib2hNV)( GLuint, GLhalfNV, GLhalfNV ) = (void *)
0xdeadbeef;
-void (*func_glVertexAttrib2hvNV)( GLuint, GLhalfNV* ) = (void *) 0xdeadbeef;
+void (*func_glVertexAttrib2hNV)( GLuint, unsigned short, unsigned short ) =
(void *) 0xdeadbeef;
+void (*func_glVertexAttrib2hvNV)( GLuint, unsigned short* ) = (void *)
0xdeadbeef;
 void (*func_glVertexAttrib2sARB)( GLuint, GLshort, GLshort ) = (void *)
0xdeadbeef;
 void (*func_glVertexAttrib2sNV)( GLuint, GLshort, GLshort ) = (void *)
0xdeadbeef;
 void (*func_glVertexAttrib2svARB)( GLuint, GLshort* ) = (void *) 0xdeadbeef;
@@ -722,8 +716,8 @@
 void (*func_glVertexAttrib3fNV)( GLuint, GLfloat, GLfloat, GLfloat ) = (void *)
0xdeadbeef;
 void (*func_glVertexAttrib3fvARB)( GLuint, GLfloat* ) = (void *) 0xdeadbeef;
 void (*func_glVertexAttrib3fvNV)( GLuint, GLfloat* ) = (void *) 0xdeadbeef;
-void (*func_glVertexAttrib3hNV)( GLuint, GLhalfNV, GLhalfNV, GLhalfNV ) = (void
*) 0xdeadbeef;
-void (*func_glVertexAttrib3hvNV)( GLuint, GLhalfNV* ) = (void *) 0xdeadbeef;
+void (*func_glVertexAttrib3hNV)( GLuint, unsigned short, unsigned short,
unsigned short ) = (void *) 0xdeadbeef;
+void (*func_glVertexAttrib3hvNV)( GLuint, unsigned short* ) = (void *)
0xdeadbeef;
 void (*func_glVertexAttrib3sARB)( GLuint, GLshort, GLshort, GLshort ) = (void
*) 0xdeadbeef;
 void (*func_glVertexAttrib3sNV)( GLuint, GLshort, GLshort, GLshort ) = (void *)
0xdeadbeef;
 void (*func_glVertexAttrib3svARB)( GLuint, GLshort* ) = (void *) 0xdeadbeef;
@@ -744,8 +738,8 @@
 void (*func_glVertexAttrib4fNV)( GLuint, GLfloat, GLfloat, GLfloat, GLfloat ) =
(void *) 0xdeadbeef;
 void (*func_glVertexAttrib4fvARB)( GLuint, GLfloat* ) = (void *) 0xdeadbeef;
 void (*func_glVertexAttrib4fvNV)( GLuint, GLfloat* ) = (void *) 0xdeadbeef;
-void (*func_glVertexAttrib4hNV)( GLuint, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV
) = (void *) 0xdeadbeef;
-void (*func_glVertexAttrib4hvNV)( GLuint, GLhalfNV* ) = (void *) 0xdeadbeef;
+void (*func_glVertexAttrib4hNV)( GLuint, unsigned short, unsigned short,
unsigned short, unsigned short ) = (void *) 0xdeadbeef;
+void (*func_glVertexAttrib4hvNV)( GLuint, unsigned short* ) = (void *)
0xdeadbeef;
 void (*func_glVertexAttrib4ivARB)( GLuint, GLint* ) = (void *) 0xdeadbeef;
 void (*func_glVertexAttrib4sARB)( GLuint, GLshort, GLshort, GLshort, GLshort )
= (void *) 0xdeadbeef;
 void (*func_glVertexAttrib4sNV)( GLuint, GLshort, GLshort, GLshort, GLshort ) =
(void *) 0xdeadbeef;
@@ -761,19 +755,19 @@
 void (*func_glVertexAttribPointerNV)( GLuint, GLint, GLenum, GLsizei, GLvoid* )
= (void *) 0xdeadbeef;
 void (*func_glVertexAttribs1dvNV)( GLuint, GLsizei, GLdouble* ) = (void *)
0xdeadbeef;
 void (*func_glVertexAttribs1fvNV)( GLuint, GLsizei, GLfloat* ) = (void *)
0xdeadbeef;
-void (*func_glVertexAttribs1hvNV)( GLuint, GLsizei, GLhalfNV* ) = (void *)
0xdeadbeef;
+void (*func_glVertexAttribs1hvNV)( GLuint, GLsizei, unsigned short* ) = (void
*) 0xdeadbeef;
 void (*func_glVertexAttribs1svNV)( GLuint, GLsizei, GLshort* ) = (void *)
0xdeadbeef;
 void (*func_glVertexAttribs2dvNV)( GLuint, GLsizei, GLdouble* ) = (void *)
0xdeadbeef;
 void (*func_glVertexAttribs2fvNV)( GLuint, GLsizei, GLfloat* ) = (void *)
0xdeadbeef;
-void (*func_glVertexAttribs2hvNV)( GLuint, GLsizei, GLhalfNV* ) = (void *)
0xdeadbeef;
+void (*func_glVertexAttribs2hvNV)( GLuint, GLsizei, unsigned short* ) = (void
*) 0xdeadbeef;
 void (*func_glVertexAttribs2svNV)( GLuint, GLsizei, GLshort* ) = (void *)
0xdeadbeef;
 void (*func_glVertexAttribs3dvNV)( GLuint, GLsizei, GLdouble* ) = (void *)
0xdeadbeef;
 void (*func_glVertexAttribs3fvNV)( GLuint, GLsizei, GLfloat* ) = (void *)
0xdeadbeef;
-void (*func_glVertexAttribs3hvNV)( GLuint, GLsizei, GLhalfNV* ) = (void *)
0xdeadbeef;
+void (*func_glVertexAttribs3hvNV)( GLuint, GLsizei, unsigned short* ) = (void
*) 0xdeadbeef;
 void (*func_glVertexAttribs3svNV)( GLuint, GLsizei, GLshort* ) = (void *)
0xdeadbeef;
 void (*func_glVertexAttribs4dvNV)( GLuint, GLsizei, GLdouble* ) = (void *)
0xdeadbeef;
 void (*func_glVertexAttribs4fvNV)( GLuint, GLsizei, GLfloat* ) = (void *)
0xdeadbeef;
-void (*func_glVertexAttribs4hvNV)( GLuint, GLsizei, GLhalfNV* ) = (void *)
0xdeadbeef;
+void (*func_glVertexAttribs4hvNV)( GLuint, GLsizei, unsigned short* ) = (void
*) 0xdeadbeef;
 void (*func_glVertexAttribs4svNV)( GLuint, GLsizei, GLshort* ) = (void *)
0xdeadbeef;
 void (*func_glVertexAttribs4ubvNV)( GLuint, GLsizei, GLubyte* ) = (void *)
0xdeadbeef;
 void (*func_glVertexBlendARB)( GLint ) = (void *) 0xdeadbeef;
@@ -817,8 +811,8 @@
 void (*func_glVertexWeightPointerEXT)( GLsizei, GLenum, GLsizei, GLvoid* ) =
(void *) 0xdeadbeef;
 void (*func_glVertexWeightfEXT)( GLfloat ) = (void *) 0xdeadbeef;
 void (*func_glVertexWeightfvEXT)( GLfloat* ) = (void *) 0xdeadbeef;
-void (*func_glVertexWeighthNV)( GLhalfNV ) = (void *) 0xdeadbeef;
-void (*func_glVertexWeighthvNV)( GLhalfNV* ) = (void *) 0xdeadbeef;
+void (*func_glVertexWeighthNV)( unsigned short ) = (void *) 0xdeadbeef;
+void (*func_glVertexWeighthvNV)( unsigned short* ) = (void *) 0xdeadbeef;
 void (*func_glWeightPointerARB)( GLint, GLenum, GLsizei, GLvoid* ) = (void *)
0xdeadbeef;
 void (*func_glWeightbvARB)( GLint, GLbyte* ) = (void *) 0xdeadbeef;
 void (*func_glWeightdvARB)( GLint, GLdouble* ) = (void *) 0xdeadbeef;
@@ -932,19 +926,19 @@
 void WINAPI wine_glBlendFuncSeparate( GLenum, GLenum, GLenum, GLenum );
 void WINAPI wine_glBlendFuncSeparateEXT( GLenum, GLenum, GLenum, GLenum );
 void WINAPI wine_glBlendFuncSeparateINGR( GLenum, GLenum, GLenum, GLenum );
-void WINAPI wine_glBufferDataARB( GLenum, GLsizeiptrARB, GLvoid*, GLenum );
+void WINAPI wine_glBufferDataARB( GLenum, ptrdiff_t, GLvoid*, GLenum );
 GLuint WINAPI wine_glBufferRegionEnabled( );
-void WINAPI wine_glBufferSubDataARB( GLenum, GLintptrARB, GLsizeiptrARB,
GLvoid* );
+void WINAPI wine_glBufferSubDataARB( GLenum, ptrdiff_t, ptrdiff_t, GLvoid* );
 void WINAPI wine_glClientActiveTexture( GLenum );
 void WINAPI wine_glClientActiveVertexStreamATI( GLenum );
 void WINAPI wine_glColor3fVertex3fSUN( GLfloat, GLfloat, GLfloat, GLfloat,
GLfloat, GLfloat );
 void WINAPI wine_glColor3fVertex3fvSUN( GLfloat*, GLfloat* );
-void WINAPI wine_glColor3hNV( GLhalfNV, GLhalfNV, GLhalfNV );
-void WINAPI wine_glColor3hvNV( GLhalfNV* );
+void WINAPI wine_glColor3hNV( unsigned short, unsigned short, unsigned short );
+void WINAPI wine_glColor3hvNV( unsigned short* );
 void WINAPI wine_glColor4fNormal3fVertex3fSUN( GLfloat, GLfloat, GLfloat,
GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat );
 void WINAPI wine_glColor4fNormal3fVertex3fvSUN( GLfloat*, GLfloat*, GLfloat* );
-void WINAPI wine_glColor4hNV( GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV );
-void WINAPI wine_glColor4hvNV( GLhalfNV* );
+void WINAPI wine_glColor4hNV( unsigned short, unsigned short, unsigned short,
unsigned short );
+void WINAPI wine_glColor4hvNV( unsigned short* );
 void WINAPI wine_glColor4ubVertex2fSUN( GLubyte, GLubyte, GLubyte, GLubyte,
GLfloat, GLfloat );
 void WINAPI wine_glColor4ubVertex2fvSUN( GLubyte*, GLfloat* );
 void WINAPI wine_glColor4ubVertex3fSUN( GLubyte, GLubyte, GLubyte, GLubyte,
GLfloat, GLfloat, GLfloat );
@@ -1057,8 +1051,8 @@
 void WINAPI wine_glFogCoordfEXT( GLfloat );
 void WINAPI wine_glFogCoordfv( GLfloat* );
 void WINAPI wine_glFogCoordfvEXT( GLfloat* );
-void WINAPI wine_glFogCoordhNV( GLhalfNV );
-void WINAPI wine_glFogCoordhvNV( GLhalfNV* );
+void WINAPI wine_glFogCoordhNV( unsigned short );
+void WINAPI wine_glFogCoordhvNV( unsigned short* );
 void WINAPI wine_glFogFuncSGIS( GLsizei, GLfloat* );
 void WINAPI wine_glFragmentColorMaterialSGIX( GLenum, GLenum );
 void WINAPI wine_glFragmentLightModelfSGIX( GLenum, GLfloat );
@@ -1091,7 +1085,7 @@
 void WINAPI wine_glGetArrayObjectivATI( GLenum, GLenum, GLint* );
 void WINAPI wine_glGetBufferParameterivARB( GLenum, GLenum, GLint* );
 void WINAPI wine_glGetBufferPointervARB( GLenum, GLenum, GLvoid** );
-void WINAPI wine_glGetBufferSubDataARB( GLenum, GLintptrARB, GLsizeiptrARB,
GLvoid* );
+void WINAPI wine_glGetBufferSubDataARB( GLenum, ptrdiff_t, ptrdiff_t, GLvoid*
);
 void WINAPI wine_glGetColorTableEXT( GLenum, GLenum, GLenum, GLvoid* );
 void WINAPI wine_glGetColorTableParameterfvEXT( GLenum, GLenum, GLfloat* );
 void WINAPI wine_glGetColorTableParameterfvSGI( GLenum, GLenum, GLfloat* );
@@ -1256,8 +1250,8 @@
 void WINAPI wine_glMultiTexCoord1fSGIS( GLenum, GLfloat );
 void WINAPI wine_glMultiTexCoord1fv( GLenum, GLfloat* );
 void WINAPI wine_glMultiTexCoord1fvSGIS( GLenum, const GLfloat * );
-void WINAPI wine_glMultiTexCoord1hNV( GLenum, GLhalfNV );
-void WINAPI wine_glMultiTexCoord1hvNV( GLenum, GLhalfNV* );
+void WINAPI wine_glMultiTexCoord1hNV( GLenum, unsigned short );
+void WINAPI wine_glMultiTexCoord1hvNV( GLenum, unsigned short* );
 void WINAPI wine_glMultiTexCoord1i( GLenum, GLint );
 void WINAPI wine_glMultiTexCoord1iSGIS( GLenum, GLint );
 void WINAPI wine_glMultiTexCoord1iv( GLenum, GLint* );
@@ -1274,8 +1268,8 @@
 void WINAPI wine_glMultiTexCoord2fSGIS( GLenum, GLfloat, GLfloat );
 void WINAPI wine_glMultiTexCoord2fv( GLenum, GLfloat* );
 void WINAPI wine_glMultiTexCoord2fvSGIS( GLenum, GLfloat * );
-void WINAPI wine_glMultiTexCoord2hNV( GLenum, GLhalfNV, GLhalfNV );
-void WINAPI wine_glMultiTexCoord2hvNV( GLenum, GLhalfNV* );
+void WINAPI wine_glMultiTexCoord2hNV( GLenum, unsigned short, unsigned short );
+void WINAPI wine_glMultiTexCoord2hvNV( GLenum, unsigned short* );
 void WINAPI wine_glMultiTexCoord2i( GLenum, GLint, GLint );
 void WINAPI wine_glMultiTexCoord2iSGIS( GLenum, GLint, GLint );
 void WINAPI wine_glMultiTexCoord2iv( GLenum, GLint* );
@@ -1292,8 +1286,8 @@
 void WINAPI wine_glMultiTexCoord3fSGIS( GLenum, GLfloat, GLfloat, GLfloat );
 void WINAPI wine_glMultiTexCoord3fv( GLenum, GLfloat* );
 void WINAPI wine_glMultiTexCoord3fvSGIS( GLenum, GLfloat * );
-void WINAPI wine_glMultiTexCoord3hNV( GLenum, GLhalfNV, GLhalfNV, GLhalfNV );
-void WINAPI wine_glMultiTexCoord3hvNV( GLenum, GLhalfNV* );
+void WINAPI wine_glMultiTexCoord3hNV( GLenum, unsigned short, unsigned short,
unsigned short );
+void WINAPI wine_glMultiTexCoord3hvNV( GLenum, unsigned short* );
 void WINAPI wine_glMultiTexCoord3i( GLenum, GLint, GLint, GLint );
 void WINAPI wine_glMultiTexCoord3iSGIS( GLenum, GLint, GLint, GLint );
 void WINAPI wine_glMultiTexCoord3iv( GLenum, GLint* );
@@ -1310,8 +1304,8 @@
 void WINAPI wine_glMultiTexCoord4fSGIS( GLenum, GLfloat, GLfloat, GLfloat,
GLfloat );
 void WINAPI wine_glMultiTexCoord4fv( GLenum, GLfloat* );
 void WINAPI wine_glMultiTexCoord4fvSGIS( GLenum, GLfloat * );
-void WINAPI wine_glMultiTexCoord4hNV( GLenum, GLhalfNV, GLhalfNV, GLhalfNV,
GLhalfNV );
-void WINAPI wine_glMultiTexCoord4hvNV( GLenum, GLhalfNV* );
+void WINAPI wine_glMultiTexCoord4hNV( GLenum, unsigned short, unsigned short,
unsigned short, unsigned short );
+void WINAPI wine_glMultiTexCoord4hvNV( GLenum, unsigned short* );
 void WINAPI wine_glMultiTexCoord4i( GLenum, GLint, GLint, GLint, GLint );
 void WINAPI wine_glMultiTexCoord4iSGIS( GLenum, GLint, GLint, GLint, GLint );
 void WINAPI wine_glMultiTexCoord4iv( GLenum, GLint* );
@@ -1325,8 +1319,8 @@
 GLuint WINAPI wine_glNewObjectBufferATI( GLsizei, GLvoid*, GLenum );
 void WINAPI wine_glNormal3fVertex3fSUN( GLfloat, GLfloat, GLfloat, GLfloat,
GLfloat, GLfloat );
 void WINAPI wine_glNormal3fVertex3fvSUN( GLfloat*, GLfloat* );
-void WINAPI wine_glNormal3hNV( GLhalfNV, GLhalfNV, GLhalfNV );
-void WINAPI wine_glNormal3hvNV( GLhalfNV* );
+void WINAPI wine_glNormal3hNV( unsigned short, unsigned short, unsigned short
);
+void WINAPI wine_glNormal3hvNV( unsigned short* );
 void WINAPI wine_glNormalPointerEXT( GLenum, GLsizei, GLsizei, GLvoid* );
 void WINAPI wine_glNormalPointerListIBM( GLenum, GLint, GLvoid**, GLint );
 void WINAPI wine_glNormalPointervINTEL( GLenum, GLvoid** );
@@ -1439,8 +1433,8 @@
 void WINAPI wine_glSecondaryColor3fEXT( GLfloat, GLfloat, GLfloat );
 void WINAPI wine_glSecondaryColor3fv( GLfloat* );
 void WINAPI wine_glSecondaryColor3fvEXT( GLfloat* );
-void WINAPI wine_glSecondaryColor3hNV( GLhalfNV, GLhalfNV, GLhalfNV );
-void WINAPI wine_glSecondaryColor3hvNV( GLhalfNV* );
+void WINAPI wine_glSecondaryColor3hNV( unsigned short, unsigned short, unsigned
short );
+void WINAPI wine_glSecondaryColor3hvNV( unsigned short* );
 void WINAPI wine_glSecondaryColor3i( GLint, GLint, GLint );
 void WINAPI wine_glSecondaryColor3iEXT( GLint, GLint, GLint );
 void WINAPI wine_glSecondaryColor3iv( GLint* );
@@ -1503,8 +1497,8 @@
 GLboolean WINAPI wine_glTestObjectAPPLE( GLenum, GLuint );
 void WINAPI wine_glTexBumpParameterfvATI( GLenum, GLfloat* );
 void WINAPI wine_glTexBumpParameterivATI( GLenum, GLint* );
-void WINAPI wine_glTexCoord1hNV( GLhalfNV );
-void WINAPI wine_glTexCoord1hvNV( GLhalfNV* );
+void WINAPI wine_glTexCoord1hNV( unsigned short );
+void WINAPI wine_glTexCoord1hvNV( unsigned short* );
 void WINAPI wine_glTexCoord2fColor3fVertex3fSUN( GLfloat, GLfloat, GLfloat,
GLfloat, GLfloat, GLfloat, GLfloat, GLfloat );
 void WINAPI wine_glTexCoord2fColor3fVertex3fvSUN( GLfloat*, GLfloat*, GLfloat*
);
 void WINAPI wine_glTexCoord2fColor4fNormal3fVertex3fSUN( GLfloat, GLfloat,
GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat,
GLfloat );
@@ -1515,16 +1509,16 @@
 void WINAPI wine_glTexCoord2fNormal3fVertex3fvSUN( GLfloat*, GLfloat*, GLfloat*
);
 void WINAPI wine_glTexCoord2fVertex3fSUN( GLfloat, GLfloat, GLfloat, GLfloat,
GLfloat );
 void WINAPI wine_glTexCoord2fVertex3fvSUN( GLfloat*, GLfloat* );
-void WINAPI wine_glTexCoord2hNV( GLhalfNV, GLhalfNV );
-void WINAPI wine_glTexCoord2hvNV( GLhalfNV* );
-void WINAPI wine_glTexCoord3hNV( GLhalfNV, GLhalfNV, GLhalfNV );
-void WINAPI wine_glTexCoord3hvNV( GLhalfNV* );
+void WINAPI wine_glTexCoord2hNV( unsigned short, unsigned short );
+void WINAPI wine_glTexCoord2hvNV( unsigned short* );
+void WINAPI wine_glTexCoord3hNV( unsigned short, unsigned short, unsigned short
);
+void WINAPI wine_glTexCoord3hvNV( unsigned short* );
 void WINAPI wine_glTexCoord4fColor4fNormal3fVertex4fSUN( GLfloat, GLfloat,
GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat,
GLfloat, GLfloat, GLfloat, GLfloat );
 void WINAPI wine_glTexCoord4fColor4fNormal3fVertex4fvSUN( GLfloat*, GLfloat*,
GLfloat*, GLfloat* );
 void WINAPI wine_glTexCoord4fVertex4fSUN( GLfloat, GLfloat, GLfloat, GLfloat,
GLfloat, GLfloat, GLfloat, GLfloat );
 void WINAPI wine_glTexCoord4fVertex4fvSUN( GLfloat*, GLfloat* );
-void WINAPI wine_glTexCoord4hNV( GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV );
-void WINAPI wine_glTexCoord4hvNV( GLhalfNV* );
+void WINAPI wine_glTexCoord4hNV( unsigned short, unsigned short, unsigned
short, unsigned short );
+void WINAPI wine_glTexCoord4hvNV( unsigned short* );
 void WINAPI wine_glTexCoordPointerEXT( GLint, GLenum, GLsizei, GLsizei, GLvoid*
);
 void WINAPI wine_glTexCoordPointerListIBM( GLint, GLenum, GLint, GLvoid**,
GLint );
 void WINAPI wine_glTexCoordPointervINTEL( GLint, GLenum, GLvoid** );
@@ -1554,12 +1548,12 @@
 void WINAPI wine_glVariantubvEXT( GLuint, GLubyte* );
 void WINAPI wine_glVariantuivEXT( GLuint, GLuint* );
 void WINAPI wine_glVariantusvEXT( GLuint, GLushort* );
-void WINAPI wine_glVertex2hNV( GLhalfNV, GLhalfNV );
-void WINAPI wine_glVertex2hvNV( GLhalfNV* );
-void WINAPI wine_glVertex3hNV( GLhalfNV, GLhalfNV, GLhalfNV );
-void WINAPI wine_glVertex3hvNV( GLhalfNV* );
-void WINAPI wine_glVertex4hNV( GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV );
-void WINAPI wine_glVertex4hvNV( GLhalfNV* );
+void WINAPI wine_glVertex2hNV( unsigned short, unsigned short );
+void WINAPI wine_glVertex2hvNV( unsigned short* );
+void WINAPI wine_glVertex3hNV( unsigned short, unsigned short, unsigned short
);
+void WINAPI wine_glVertex3hvNV( unsigned short* );
+void WINAPI wine_glVertex4hNV( unsigned short, unsigned short, unsigned short,
unsigned short );
+void WINAPI wine_glVertex4hvNV( unsigned short* );
 void WINAPI wine_glVertexArrayParameteriAPPLE( GLenum, GLint );
 void WINAPI wine_glVertexArrayRangeAPPLE( GLsizei, GLvoid* );
 void WINAPI wine_glVertexArrayRangeNV( GLsizei, GLvoid* );
@@ -1571,8 +1565,8 @@
 void WINAPI wine_glVertexAttrib1fNV( GLuint, GLfloat );
 void WINAPI wine_glVertexAttrib1fvARB( GLuint, GLfloat* );
 void WINAPI wine_glVertexAttrib1fvNV( GLuint, GLfloat* );
-void WINAPI wine_glVertexAttrib1hNV( GLuint, GLhalfNV );
-void WINAPI wine_glVertexAttrib1hvNV( GLuint, GLhalfNV* );
+void WINAPI wine_glVertexAttrib1hNV( GLuint, unsigned short );
+void WINAPI wine_glVertexAttrib1hvNV( GLuint, unsigned short* );
 void WINAPI wine_glVertexAttrib1sARB( GLuint, GLshort );
 void WINAPI wine_glVertexAttrib1sNV( GLuint, GLshort );
 void WINAPI wine_glVertexAttrib1svARB( GLuint, GLshort* );
@@ -1585,8 +1579,8 @@
 void WINAPI wine_glVertexAttrib2fNV( GLuint, GLfloat, GLfloat );
 void WINAPI wine_glVertexAttrib2fvARB( GLuint, GLfloat* );
 void WINAPI wine_glVertexAttrib2fvNV( GLuint, GLfloat* );
-void WINAPI wine_glVertexAttrib2hNV( GLuint, GLhalfNV, GLhalfNV );
-void WINAPI wine_glVertexAttrib2hvNV( GLuint, GLhalfNV* );
+void WINAPI wine_glVertexAttrib2hNV( GLuint, unsigned short, unsigned short );
+void WINAPI wine_glVertexAttrib2hvNV( GLuint, unsigned short* );
 void WINAPI wine_glVertexAttrib2sARB( GLuint, GLshort, GLshort );
 void WINAPI wine_glVertexAttrib2sNV( GLuint, GLshort, GLshort );
 void WINAPI wine_glVertexAttrib2svARB( GLuint, GLshort* );
@@ -1599,8 +1593,8 @@
 void WINAPI wine_glVertexAttrib3fNV( GLuint, GLfloat, GLfloat, GLfloat );
 void WINAPI wine_glVertexAttrib3fvARB( GLuint, GLfloat* );
 void WINAPI wine_glVertexAttrib3fvNV( GLuint, GLfloat* );
-void WINAPI wine_glVertexAttrib3hNV( GLuint, GLhalfNV, GLhalfNV, GLhalfNV );
-void WINAPI wine_glVertexAttrib3hvNV( GLuint, GLhalfNV* );
+void WINAPI wine_glVertexAttrib3hNV( GLuint, unsigned short, unsigned short,
unsigned short );
+void WINAPI wine_glVertexAttrib3hvNV( GLuint, unsigned short* );
 void WINAPI wine_glVertexAttrib3sARB( GLuint, GLshort, GLshort, GLshort );
 void WINAPI wine_glVertexAttrib3sNV( GLuint, GLshort, GLshort, GLshort );
 void WINAPI wine_glVertexAttrib3svARB( GLuint, GLshort* );
@@ -1621,8 +1615,8 @@
 void WINAPI wine_glVertexAttrib4fNV( GLuint, GLfloat, GLfloat, GLfloat, GLfloat
);
 void WINAPI wine_glVertexAttrib4fvARB( GLuint, GLfloat* );
 void WINAPI wine_glVertexAttrib4fvNV( GLuint, GLfloat* );
-void WINAPI wine_glVertexAttrib4hNV( GLuint, GLhalfNV, GLhalfNV, GLhalfNV,
GLhalfNV );
-void WINAPI wine_glVertexAttrib4hvNV( GLuint, GLhalfNV* );
+void WINAPI wine_glVertexAttrib4hNV( GLuint, unsigned short, unsigned short,
unsigned short, unsigned short );
+void WINAPI wine_glVertexAttrib4hvNV( GLuint, unsigned short* );
 void WINAPI wine_glVertexAttrib4ivARB( GLuint, GLint* );
 void WINAPI wine_glVertexAttrib4sARB( GLuint, GLshort, GLshort, GLshort,
GLshort );
 void WINAPI wine_glVertexAttrib4sNV( GLuint, GLshort, GLshort, GLshort, GLshort
);
@@ -1638,19 +1632,19 @@
 void WINAPI wine_glVertexAttribPointerNV( GLuint, GLint, GLenum, GLsizei,
GLvoid* );
 void WINAPI wine_glVertexAttribs1dvNV( GLuint, GLsizei, GLdouble* );
 void WINAPI wine_glVertexAttribs1fvNV( GLuint, GLsizei, GLfloat* );
-void WINAPI wine_glVertexAttribs1hvNV( GLuint, GLsizei, GLhalfNV* );
+void WINAPI wine_glVertexAttribs1hvNV( GLuint, GLsizei, unsigned short* );
 void WINAPI wine_glVertexAttribs1svNV( GLuint, GLsizei, GLshort* );
 void WINAPI wine_glVertexAttribs2dvNV( GLuint, GLsizei, GLdouble* );
 void WINAPI wine_glVertexAttribs2fvNV( GLuint, GLsizei, GLfloat* );
-void WINAPI wine_glVertexAttribs2hvNV( GLuint, GLsizei, GLhalfNV* );
+void WINAPI wine_glVertexAttribs2hvNV( GLuint, GLsizei, unsigned short* );
 void WINAPI wine_glVertexAttribs2svNV( GLuint, GLsizei, GLshort* );
 void WINAPI wine_glVertexAttribs3dvNV( GLuint, GLsizei, GLdouble* );
 void WINAPI wine_glVertexAttribs3fvNV( GLuint, GLsizei, GLfloat* );
-void WINAPI wine_glVertexAttribs3hvNV( GLuint, GLsizei, GLhalfNV* );
+void WINAPI wine_glVertexAttribs3hvNV( GLuint, GLsizei, unsigned short* );
 void WINAPI wine_glVertexAttribs3svNV( GLuint, GLsizei, GLshort* );
 void WINAPI wine_glVertexAttribs4dvNV( GLuint, GLsizei, GLdouble* );
 void WINAPI wine_glVertexAttribs4fvNV( GLuint, GLsizei, GLfloat* );
-void WINAPI wine_glVertexAttribs4hvNV( GLuint, GLsizei, GLhalfNV* );
+void WINAPI wine_glVertexAttribs4hvNV( GLuint, GLsizei, unsigned short* );
 void WINAPI wine_glVertexAttribs4svNV( GLuint, GLsizei, GLshort* );
 void WINAPI wine_glVertexAttribs4ubvNV( GLuint, GLsizei, GLubyte* );
 void WINAPI wine_glVertexBlendARB( GLint );
@@ -1694,8 +1688,8 @@
 void WINAPI wine_glVertexWeightPointerEXT( GLsizei, GLenum, GLsizei, GLvoid* );
 void WINAPI wine_glVertexWeightfEXT( GLfloat );
 void WINAPI wine_glVertexWeightfvEXT( GLfloat* );
-void WINAPI wine_glVertexWeighthNV( GLhalfNV );
-void WINAPI wine_glVertexWeighthvNV( GLhalfNV* );
+void WINAPI wine_glVertexWeighthNV( unsigned short );
+void WINAPI wine_glVertexWeighthvNV( unsigned short* );
 void WINAPI wine_glWeightPointerARB( GLint, GLenum, GLsizei, GLvoid* );
 void WINAPI wine_glWeightbvARB( GLint, GLbyte* );
 void WINAPI wine_glWeightdvARB( GLint, GLdouble* );
@@ -2954,7 +2948,7 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glBufferDataARB( GLenum target, GLsizeiptrARB size, GLvoid*
data, GLenum usage ) {
+void WINAPI wine_glBufferDataARB( GLenum target, ptrdiff_t size, GLvoid* data,
GLenum usage ) {
   TRACE("(%d, %d, %p, %d)\n", target, size, data, usage );
   ENTER_GL();
   func_glBufferDataARB( target, size, data, usage );
@@ -2970,7 +2964,7 @@
   return ret_value;
 }
 
-void WINAPI wine_glBufferSubDataARB( GLenum target, GLintptrARB offset,
GLsizeiptrARB size, GLvoid* data ) {
+void WINAPI wine_glBufferSubDataARB( GLenum target, ptrdiff_t offset, ptrdiff_t
size, GLvoid* data ) {
   TRACE("(%d, %d, %d, %p)\n", target, offset, size, data );
   ENTER_GL();
   func_glBufferSubDataARB( target, offset, size, data );
@@ -3005,14 +2999,14 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glColor3hNV( GLhalfNV red, GLhalfNV green, GLhalfNV blue ) {
+void WINAPI wine_glColor3hNV( unsigned short red, unsigned short green,
unsigned short blue ) {
   TRACE("(%d, %d, %d)\n", red, green, blue );
   ENTER_GL();
   func_glColor3hNV( red, green, blue );
   LEAVE_GL();
 }
 
-void WINAPI wine_glColor3hvNV( GLhalfNV* v ) {
+void WINAPI wine_glColor3hvNV( unsigned short* v ) {
   TRACE("(%p)\n", v );
   ENTER_GL();
   func_glColor3hvNV( v );
@@ -3033,14 +3027,14 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glColor4hNV( GLhalfNV red, GLhalfNV green, GLhalfNV blue,
GLhalfNV alpha ) {
+void WINAPI wine_glColor4hNV( unsigned short red, unsigned short green,
unsigned short blue, unsigned short alpha ) {
   TRACE("(%d, %d, %d, %d)\n", red, green, blue, alpha );
   ENTER_GL();
   func_glColor4hNV( red, green, blue, alpha );
   LEAVE_GL();
 }
 
-void WINAPI wine_glColor4hvNV( GLhalfNV* v ) {
+void WINAPI wine_glColor4hvNV( unsigned short* v ) {
   TRACE("(%p)\n", v );
   ENTER_GL();
   func_glColor4hvNV( v );
@@ -3833,14 +3827,14 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glFogCoordhNV( GLhalfNV fog ) {
+void WINAPI wine_glFogCoordhNV( unsigned short fog ) {
   TRACE("(%d)\n", fog );
   ENTER_GL();
   func_glFogCoordhNV( fog );
   LEAVE_GL();
 }
 
-void WINAPI wine_glFogCoordhvNV( GLhalfNV* fog ) {
+void WINAPI wine_glFogCoordhvNV( unsigned short* fog ) {
   TRACE("(%p)\n", fog );
   ENTER_GL();
   func_glFogCoordhvNV( fog );
@@ -4079,7 +4073,7 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glGetBufferSubDataARB( GLenum target, GLintptrARB offset,
GLsizeiptrARB size, GLvoid* data ) {
+void WINAPI wine_glGetBufferSubDataARB( GLenum target, ptrdiff_t offset,
ptrdiff_t size, GLvoid* data ) {
   TRACE("(%d, %d, %d, %p)\n", target, offset, size, data );
   ENTER_GL();
   func_glGetBufferSubDataARB( target, offset, size, data );
@@ -5262,14 +5256,14 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glMultiTexCoord1hNV( GLenum target, GLhalfNV s ) {
+void WINAPI wine_glMultiTexCoord1hNV( GLenum target, unsigned short s ) {
   TRACE("(%d, %d)\n", target, s );
   ENTER_GL();
   func_glMultiTexCoord1hNV( target, s );
   LEAVE_GL();
 }
 
-void WINAPI wine_glMultiTexCoord1hvNV( GLenum target, GLhalfNV* v ) {
+void WINAPI wine_glMultiTexCoord1hvNV( GLenum target, unsigned short* v ) {
   TRACE("(%d, %p)\n", target, v );
   ENTER_GL();
   func_glMultiTexCoord1hvNV( target, v );
@@ -5388,14 +5382,14 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glMultiTexCoord2hNV( GLenum target, GLhalfNV s, GLhalfNV t ) {
+void WINAPI wine_glMultiTexCoord2hNV( GLenum target, unsigned short s, unsigned
short t ) {
   TRACE("(%d, %d, %d)\n", target, s, t );
   ENTER_GL();
   func_glMultiTexCoord2hNV( target, s, t );
   LEAVE_GL();
 }
 
-void WINAPI wine_glMultiTexCoord2hvNV( GLenum target, GLhalfNV* v ) {
+void WINAPI wine_glMultiTexCoord2hvNV( GLenum target, unsigned short* v ) {
   TRACE("(%d, %p)\n", target, v );
   ENTER_GL();
   func_glMultiTexCoord2hvNV( target, v );
@@ -5514,14 +5508,14 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glMultiTexCoord3hNV( GLenum target, GLhalfNV s, GLhalfNV t,
GLhalfNV r ) {
+void WINAPI wine_glMultiTexCoord3hNV( GLenum target, unsigned short s, unsigned
short t, unsigned short r ) {
   TRACE("(%d, %d, %d, %d)\n", target, s, t, r );
   ENTER_GL();
   func_glMultiTexCoord3hNV( target, s, t, r );
   LEAVE_GL();
 }
 
-void WINAPI wine_glMultiTexCoord3hvNV( GLenum target, GLhalfNV* v ) {
+void WINAPI wine_glMultiTexCoord3hvNV( GLenum target, unsigned short* v ) {
   TRACE("(%d, %p)\n", target, v );
   ENTER_GL();
   func_glMultiTexCoord3hvNV( target, v );
@@ -5640,14 +5634,14 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glMultiTexCoord4hNV( GLenum target, GLhalfNV s, GLhalfNV t,
GLhalfNV r, GLhalfNV q ) {
+void WINAPI wine_glMultiTexCoord4hNV( GLenum target, unsigned short s, unsigned
short t, unsigned short r, unsigned short q ) {
   TRACE("(%d, %d, %d, %d, %d)\n", target, s, t, r, q );
   ENTER_GL();
   func_glMultiTexCoord4hNV( target, s, t, r, q );
   LEAVE_GL();
 }
 
-void WINAPI wine_glMultiTexCoord4hvNV( GLenum target, GLhalfNV* v ) {
+void WINAPI wine_glMultiTexCoord4hvNV( GLenum target, unsigned short* v ) {
   TRACE("(%d, %p)\n", target, v );
   ENTER_GL();
   func_glMultiTexCoord4hvNV( target, v );
@@ -5749,14 +5743,14 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glNormal3hNV( GLhalfNV nx, GLhalfNV ny, GLhalfNV nz ) {
+void WINAPI wine_glNormal3hNV( unsigned short nx, unsigned short ny, unsigned
short nz ) {
   TRACE("(%d, %d, %d)\n", nx, ny, nz );
   ENTER_GL();
   func_glNormal3hNV( nx, ny, nz );
   LEAVE_GL();
 }
 
-void WINAPI wine_glNormal3hvNV( GLhalfNV* v ) {
+void WINAPI wine_glNormal3hvNV( unsigned short* v ) {
   TRACE("(%p)\n", v );
   ENTER_GL();
   func_glNormal3hvNV( v );
@@ -6551,14 +6545,14 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glSecondaryColor3hNV( GLhalfNV red, GLhalfNV green, GLhalfNV
blue ) {
+void WINAPI wine_glSecondaryColor3hNV( unsigned short red, unsigned short
green, unsigned short blue ) {
   TRACE("(%d, %d, %d)\n", red, green, blue );
   ENTER_GL();
   func_glSecondaryColor3hNV( red, green, blue );
   LEAVE_GL();
 }
 
-void WINAPI wine_glSecondaryColor3hvNV( GLhalfNV* v ) {
+void WINAPI wine_glSecondaryColor3hvNV( unsigned short* v ) {
   TRACE("(%p)\n", v );
   ENTER_GL();
   func_glSecondaryColor3hvNV( v );
@@ -7005,14 +6999,14 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glTexCoord1hNV( GLhalfNV s ) {
+void WINAPI wine_glTexCoord1hNV( unsigned short s ) {
   TRACE("(%d)\n", s );
   ENTER_GL();
   func_glTexCoord1hNV( s );
   LEAVE_GL();
 }
 
-void WINAPI wine_glTexCoord1hvNV( GLhalfNV* v ) {
+void WINAPI wine_glTexCoord1hvNV( unsigned short* v ) {
   TRACE("(%p)\n", v );
   ENTER_GL();
   func_glTexCoord1hvNV( v );
@@ -7089,28 +7083,28 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glTexCoord2hNV( GLhalfNV s, GLhalfNV t ) {
+void WINAPI wine_glTexCoord2hNV( unsigned short s, unsigned short t ) {
   TRACE("(%d, %d)\n", s, t );
   ENTER_GL();
   func_glTexCoord2hNV( s, t );
   LEAVE_GL();
 }
 
-void WINAPI wine_glTexCoord2hvNV( GLhalfNV* v ) {
+void WINAPI wine_glTexCoord2hvNV( unsigned short* v ) {
   TRACE("(%p)\n", v );
   ENTER_GL();
   func_glTexCoord2hvNV( v );
   LEAVE_GL();
 }
 
-void WINAPI wine_glTexCoord3hNV( GLhalfNV s, GLhalfNV t, GLhalfNV r ) {
+void WINAPI wine_glTexCoord3hNV( unsigned short s, unsigned short t, unsigned
short r ) {
   TRACE("(%d, %d, %d)\n", s, t, r );
   ENTER_GL();
   func_glTexCoord3hNV( s, t, r );
   LEAVE_GL();
 }
 
-void WINAPI wine_glTexCoord3hvNV( GLhalfNV* v ) {
+void WINAPI wine_glTexCoord3hvNV( unsigned short* v ) {
   TRACE("(%p)\n", v );
   ENTER_GL();
   func_glTexCoord3hvNV( v );
@@ -7145,14 +7139,14 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glTexCoord4hNV( GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q
) {
+void WINAPI wine_glTexCoord4hNV( unsigned short s, unsigned short t, unsigned
short r, unsigned short q ) {
   TRACE("(%d, %d, %d, %d)\n", s, t, r, q );
   ENTER_GL();
   func_glTexCoord4hNV( s, t, r, q );
   LEAVE_GL();
 }
 
-void WINAPI wine_glTexCoord4hvNV( GLhalfNV* v ) {
+void WINAPI wine_glTexCoord4hvNV( unsigned short* v ) {
   TRACE("(%p)\n", v );
   ENTER_GL();
   func_glTexCoord4hvNV( v );
@@ -7364,42 +7358,42 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glVertex2hNV( GLhalfNV x, GLhalfNV y ) {
+void WINAPI wine_glVertex2hNV( unsigned short x, unsigned short y ) {
   TRACE("(%d, %d)\n", x, y );
   ENTER_GL();
   func_glVertex2hNV( x, y );
   LEAVE_GL();
 }
 
-void WINAPI wine_glVertex2hvNV( GLhalfNV* v ) {
+void WINAPI wine_glVertex2hvNV( unsigned short* v ) {
   TRACE("(%p)\n", v );
   ENTER_GL();
   func_glVertex2hvNV( v );
   LEAVE_GL();
 }
 
-void WINAPI wine_glVertex3hNV( GLhalfNV x, GLhalfNV y, GLhalfNV z ) {
+void WINAPI wine_glVertex3hNV( unsigned short x, unsigned short y, unsigned
short z ) {
   TRACE("(%d, %d, %d)\n", x, y, z );
   ENTER_GL();
   func_glVertex3hNV( x, y, z );
   LEAVE_GL();
 }
 
-void WINAPI wine_glVertex3hvNV( GLhalfNV* v ) {
+void WINAPI wine_glVertex3hvNV( unsigned short* v ) {
   TRACE("(%p)\n", v );
   ENTER_GL();
   func_glVertex3hvNV( v );
   LEAVE_GL();
 }
 
-void WINAPI wine_glVertex4hNV( GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w )
{
+void WINAPI wine_glVertex4hNV( unsigned short x, unsigned short y, unsigned
short z, unsigned short w ) {
   TRACE("(%d, %d, %d, %d)\n", x, y, z, w );
   ENTER_GL();
   func_glVertex4hNV( x, y, z, w );
   LEAVE_GL();
 }
 
-void WINAPI wine_glVertex4hvNV( GLhalfNV* v ) {
+void WINAPI wine_glVertex4hvNV( unsigned short* v ) {
   TRACE("(%p)\n", v );
   ENTER_GL();
   func_glVertex4hvNV( v );
@@ -7483,14 +7477,14 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glVertexAttrib1hNV( GLuint index, GLhalfNV x ) {
+void WINAPI wine_glVertexAttrib1hNV( GLuint index, unsigned short x ) {
   TRACE("(%d, %d)\n", index, x );
   ENTER_GL();
   func_glVertexAttrib1hNV( index, x );
   LEAVE_GL();
 }
 
-void WINAPI wine_glVertexAttrib1hvNV( GLuint index, GLhalfNV* v ) {
+void WINAPI wine_glVertexAttrib1hvNV( GLuint index, unsigned short* v ) {
   TRACE("(%d, %p)\n", index, v );
   ENTER_GL();
   func_glVertexAttrib1hvNV( index, v );
@@ -7581,14 +7575,14 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glVertexAttrib2hNV( GLuint index, GLhalfNV x, GLhalfNV y ) {
+void WINAPI wine_glVertexAttrib2hNV( GLuint index, unsigned short x, unsigned
short y ) {
   TRACE("(%d, %d, %d)\n", index, x, y );
   ENTER_GL();
   func_glVertexAttrib2hNV( index, x, y );
   LEAVE_GL();
 }
 
-void WINAPI wine_glVertexAttrib2hvNV( GLuint index, GLhalfNV* v ) {
+void WINAPI wine_glVertexAttrib2hvNV( GLuint index, unsigned short* v ) {
   TRACE("(%d, %p)\n", index, v );
   ENTER_GL();
   func_glVertexAttrib2hvNV( index, v );
@@ -7679,14 +7673,14 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glVertexAttrib3hNV( GLuint index, GLhalfNV x, GLhalfNV y,
GLhalfNV z ) {
+void WINAPI wine_glVertexAttrib3hNV( GLuint index, unsigned short x, unsigned
short y, unsigned short z ) {
   TRACE("(%d, %d, %d, %d)\n", index, x, y, z );
   ENTER_GL();
   func_glVertexAttrib3hNV( index, x, y, z );
   LEAVE_GL();
 }
 
-void WINAPI wine_glVertexAttrib3hvNV( GLuint index, GLhalfNV* v ) {
+void WINAPI wine_glVertexAttrib3hvNV( GLuint index, unsigned short* v ) {
   TRACE("(%d, %p)\n", index, v );
   ENTER_GL();
   func_glVertexAttrib3hvNV( index, v );
@@ -7833,14 +7827,14 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glVertexAttrib4hNV( GLuint index, GLhalfNV x, GLhalfNV y,
GLhalfNV z, GLhalfNV w ) {
+void WINAPI wine_glVertexAttrib4hNV( GLuint index, unsigned short x, unsigned
short y, unsigned short z, unsigned short w ) {
   TRACE("(%d, %d, %d, %d, %d)\n", index, x, y, z, w );
   ENTER_GL();
   func_glVertexAttrib4hNV( index, x, y, z, w );
   LEAVE_GL();
 }
 
-void WINAPI wine_glVertexAttrib4hvNV( GLuint index, GLhalfNV* v ) {
+void WINAPI wine_glVertexAttrib4hvNV( GLuint index, unsigned short* v ) {
   TRACE("(%d, %p)\n", index, v );
   ENTER_GL();
   func_glVertexAttrib4hvNV( index, v );
@@ -7952,7 +7946,7 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glVertexAttribs1hvNV( GLuint index, GLsizei n, GLhalfNV* v ) {
+void WINAPI wine_glVertexAttribs1hvNV( GLuint index, GLsizei n, unsigned short*
v ) {
   TRACE("(%d, %d, %p)\n", index, n, v );
   ENTER_GL();
   func_glVertexAttribs1hvNV( index, n, v );
@@ -7980,7 +7974,7 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glVertexAttribs2hvNV( GLuint index, GLsizei n, GLhalfNV* v ) {
+void WINAPI wine_glVertexAttribs2hvNV( GLuint index, GLsizei n, unsigned short*
v ) {
   TRACE("(%d, %d, %p)\n", index, n, v );
   ENTER_GL();
   func_glVertexAttribs2hvNV( index, n, v );
@@ -8008,7 +8002,7 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glVertexAttribs3hvNV( GLuint index, GLsizei n, GLhalfNV* v ) {
+void WINAPI wine_glVertexAttribs3hvNV( GLuint index, GLsizei n, unsigned short*
v ) {
   TRACE("(%d, %d, %p)\n", index, n, v );
   ENTER_GL();
   func_glVertexAttribs3hvNV( index, n, v );
@@ -8036,7 +8030,7 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glVertexAttribs4hvNV( GLuint index, GLsizei n, GLhalfNV* v ) {
+void WINAPI wine_glVertexAttribs4hvNV( GLuint index, GLsizei n, unsigned short*
v ) {
   TRACE("(%d, %d, %p)\n", index, n, v );
   ENTER_GL();
   func_glVertexAttribs4hvNV( index, n, v );
@@ -8344,14 +8338,14 @@
   LEAVE_GL();
 }
 
-void WINAPI wine_glVertexWeighthNV( GLhalfNV weight ) {
+void WINAPI wine_glVertexWeighthNV( unsigned short weight ) {
   TRACE("(%d)\n", weight );
   ENTER_GL();
   func_glVertexWeighthNV( weight );
   LEAVE_GL();
 }
 
-void WINAPI wine_glVertexWeighthvNV( GLhalfNV* weight ) {
+void WINAPI wine_glVertexWeighthvNV( unsigned short* weight ) {
   TRACE("(%p)\n", weight );
   ENTER_GL();
   func_glVertexWeighthvNV( weight );
@@ -8835,3 +8829,4 @@
   func_wglFreeMemoryNV( pointer );
   LEAVE_GL();
 }
+
Index: opengl_norm.c
==================================================================RCS file:
/home/wine/wine/dlls/opengl32/opengl_norm.c,v
retrieving revision 1.7
diff -u -r1.7 opengl_norm.c
--- opengl_norm.c	25 Sep 2002 00:29:57 -0000	1.7
+++ opengl_norm.c	19 Jun 2003 21:52:57 -0000
@@ -5,8 +5,6 @@
 #include "opengl_ext.h"
 #include "wine/debug.h"
 
-typedef const GLubyte * GLstring;
-
 WINE_DEFAULT_DEBUG_CHANNEL(opengl);
 
 /***********************************************************************
@@ -1518,8 +1516,8 @@
 /***********************************************************************
  *              glGetString (OPENGL32.@)
  */
-GLstring WINAPI wine_glGetString( GLenum name ) {
-  GLstring ret_value;
+const GLubyte * WINAPI wine_glGetString( GLenum name ) {
+  const GLubyte * ret_value;
   TRACE("(%d)\n", name );
   ENTER_GL();
   ret_value = glGetString( name );

Sylvain Petreolle

2003-Jun-19 22:22 UTC

head link

[OPENGL] Compilation fixes on some b0rken headers

A 50k patch ??

 --- Lionel Ulmer <lionel.ulmer@free.fr> a ?crit :
> > > This is with cvs as of this morning and NVIDIA 43.63 drivers.
> 
> Yeah, thanks NVIDIA for putting extensions in GL.h :-/
> 
> > It appears as though a CVS commit 4 days ago added those types.
> Perhaps
> > Lionel could have a look at these errors?
> 
> Submitting the attached patch to wine-patches. It will fix your
> issue.
> 
>             Lionel
> 
> Changelog:
>  - do not use any typedefs in the GL thunks to prevent all possible
>    compilation issues

====Sylvain Petreolle (spetreolle at users dot sourceforge dot net) 
ICQ #170597259

"What if tomorrow the War could be over ?" Morpheus, in
"Reloaded".

For the Law of Oil and Fire, Im an European that lives in France.
For all my Brothers and friends, Im a human living on Earth.

___________________________________________________________
Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en fran?ais !
Yahoo! Mail : http://fr.mail.yahoo.com

wine users - Jun 2003 - Graphics Problem

Graphics Problem

Graphics Problem

Graphics Problem

Graphics Problem

Graphics Problem

[OPENGL] Compilation fixes on some b0rken headers

[OPENGL] Compilation fixes on some b0rken headers