? emacs
? test.c
Index: device.c
===================================================================
RCS file: /home/wine/wine/dlls/d3d8/device.c,v
retrieving revision 1.111
diff -u -r1.111 device.c
--- device.c	19 May 2004 04:33:42 -0000	1.111
+++ device.c	11 Jun 2004 00:38:09 -0000
@@ -3703,7 +3703,7 @@
 
 	    case D3DTSS_TCI_CAMERASPACENORMAL:
 	      {
-		if (GL_SUPPORT(GL_NV_texgen_reflection)) {
+		if (GL_SUPPORT(NV_TEXGEN_REFLECTION)) {
 		  float s_plane[] = { 1.0, 0.0, 0.0, 0.0 };
 		  float t_plane[] = { 0.0, 1.0, 0.0, 0.0 };
 		  float r_plane[] = { 0.0, 0.0, 1.0, 0.0 };
@@ -3737,7 +3737,7 @@
 
 	    case D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR:
 	      {
-		if (GL_SUPPORT(GL_NV_texgen_reflection)) {
+		if (GL_SUPPORT(NV_TEXGEN_REFLECTION)) {
 		  float s_plane[] = { 1.0, 0.0, 0.0, 0.0 };
 		  float t_plane[] = { 0.0, 1.0, 0.0, 0.0 };
 		  float r_plane[] = { 0.0, 0.0, 1.0, 0.0 };
Index: utils.c
===================================================================
RCS file: /home/wine/wine/dlls/d3d8/utils.c,v
retrieving revision 1.23
diff -u -r1.23 utils.c
--- utils.c	2 Jun 2004 00:35:41 -0000	1.23
+++ utils.c	11 Jun 2004 00:38:12 -0000
@@ -1019,13 +1019,13 @@
 	    glTexEnvi(GL_TEXTURE_ENV, src3_target, src1);
 	    checkGLcall("GL_TEXTURE_ENV, src3_target, src1");
 	    switch (opr1) {
-	    case GL_SRC_COLOR: opr1 = GL_ONE_MINUS_SRC_COLOR; break;
-	    case GL_ONE_MINUS_SRC_COLOR: opr1 = GL_SRC_COLOR; break;
-	    case GL_SRC_ALPHA: opr1 = GL_ONE_MINUS_SRC_ALPHA; break;
-	    case GL_ONE_MINUS_SRC_ALPHA: opr1 = GL_SRC_ALPHA; break;
+	    case GL_SRC_COLOR: opr = GL_ONE_MINUS_SRC_COLOR; break;
+	    case GL_ONE_MINUS_SRC_COLOR: opr = GL_SRC_COLOR; break;
+	    case GL_SRC_ALPHA: opr = GL_ONE_MINUS_SRC_ALPHA; break;
+	    case GL_ONE_MINUS_SRC_ALPHA: opr = GL_SRC_ALPHA; break;
 	    }
-	    glTexEnvi(GL_TEXTURE_ENV, opr3_target, opr1);
-	    checkGLcall("GL_TEXTURE_ENV, opr3_target, opr1");
+	    glTexEnvi(GL_TEXTURE_ENV, opr3_target, opr);
+	    checkGLcall("GL_TEXTURE_ENV, opr3_target, opr");
 	    glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
 	    checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
 	    break;
@@ -1135,12 +1135,12 @@
 	    checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");     /*  a3 = src1 alpha   */
 	    glTexEnvi(GL_TEXTURE_ENV, src3_target, src1);
 	    checkGLcall("GL_TEXTURE_ENV, src3_target, src1");
-	    switch (opr1) {
-	    case GL_SRC_COLOR: opr1 = GL_SRC_ALPHA; break;
-	    case GL_ONE_MINUS_SRC_COLOR: opr1 = GL_ONE_MINUS_SRC_ALPHA; break;
+	    switch (opr) {
+	    case GL_SRC_COLOR: opr = GL_SRC_ALPHA; break;
+	    case GL_ONE_MINUS_SRC_COLOR: opr = GL_ONE_MINUS_SRC_ALPHA; break;
 	    }
-	    glTexEnvi(GL_TEXTURE_ENV, opr3_target, opr1);
-	    checkGLcall("GL_TEXTURE_ENV, opr3_target, opr1");
+	    glTexEnvi(GL_TEXTURE_ENV, opr3_target, opr);
+	    checkGLcall("GL_TEXTURE_ENV, opr3_target, opr");
 	    glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
 	    checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
 	    break;
@@ -1158,11 +1158,11 @@
 	    glTexEnvi(GL_TEXTURE_ENV, src2_target, src1);
 	    checkGLcall("GL_TEXTURE_ENV, src2_target, src1");
 	    switch (opr1) {
-	    case GL_SRC_COLOR: opr1 = GL_SRC_ALPHA; break;
-	    case GL_ONE_MINUS_SRC_COLOR: opr1 = GL_ONE_MINUS_SRC_ALPHA; break;
+	    case GL_SRC_COLOR: opr = GL_SRC_ALPHA; break;
+	    case GL_ONE_MINUS_SRC_COLOR: opr = GL_ONE_MINUS_SRC_ALPHA; break;
 	    }
-	    glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr1);
-	    checkGLcall("GL_TEXTURE_ENV, opr2_target, opr1");
+	    glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr);
+	    checkGLcall("GL_TEXTURE_ENV, opr2_target, opr");
 	    glTexEnvi(GL_TEXTURE_ENV, src3_target, GL_ZERO);
 	    checkGLcall("GL_TEXTURE_ENV, src3_target, GL_ZERO");
 	    glTexEnvi(GL_TEXTURE_ENV, opr3_target, invopr);
@@ -1218,11 +1218,11 @@
 	    glTexEnvi(GL_TEXTURE_ENV, src2_target, src1);
 	    checkGLcall("GL_TEXTURE_ENV, src2_target, src1");
 	    switch (opr1) {
-	    case GL_SRC_COLOR: opr1 = GL_SRC_ALPHA; break;
-	    case GL_ONE_MINUS_SRC_COLOR: opr1 = GL_ONE_MINUS_SRC_ALPHA; break;
+	    case GL_SRC_COLOR: opr = GL_SRC_ALPHA; break;
+	    case GL_ONE_MINUS_SRC_COLOR: opr = GL_ONE_MINUS_SRC_ALPHA; break;
 	    }
-	    glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr1);
-	    checkGLcall("GL_TEXTURE_ENV, opr2_target, opr1");
+	    glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr);
+	    checkGLcall("GL_TEXTURE_ENV, opr2_target, opr");
 	    glTexEnvi(GL_TEXTURE_ENV, src3_target, GL_ZERO);
 	    checkGLcall("GL_TEXTURE_ENV, src3_target, GL_ZERO");
 	    glTexEnvi(GL_TEXTURE_ENV, opr3_target, invopr);
@@ -1678,13 +1678,13 @@
 		  glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
 		  checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
 		  glTexEnvi(GL_TEXTURE_ENV, src1_target, src1);
-		  checkGLcall("GL_TEXTURE_ENV, src1_target, src2");
-		  glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr1);
-		  checkGLcall("GL_TEXTURE_ENV, opr1_target, opr2");
-		  glTexEnvi(GL_TEXTURE_ENV, src2_target, src1);
-		  checkGLcall("GL_TEXTURE_ENV, src2_target, src1");
-		  glTexEnvi(GL_TEXTURE_ENV, opr2_target, GL_SRC_ALPHA);
-		  checkGLcall("GL_TEXTURE_ENV, opr2_target, GL_SRC_ALPHA");
+		  checkGLcall("GL_TEXTURE_ENV, src1_target, src1");
+		  glTexEnvi(GL_TEXTURE_ENV, opr1_target, GL_SRC_ALPHA);
+		  checkGLcall("GL_TEXTURE_ENV, opr1_target, GL_SRC_ALPHA");
+		  glTexEnvi(GL_TEXTURE_ENV, src2_target, src2);
+		  checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
+		  glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2);
+		  checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");
 		  glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
 		  checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
 		} else
@@ -1717,16 +1717,16 @@
 		  checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI");
 		  glTexEnvi(GL_TEXTURE_ENV, src0_target, src1);
 		  checkGLcall("GL_TEXTURE_ENV, src0_target, src1");
-		  glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1);
-		  checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1");
+		  glTexEnvi(GL_TEXTURE_ENV, opr0_target, GL_ONE_MINUS_SRC_COLOR);
+		  checkGLcall("GL_TEXTURE_ENV, opr0_target, GL_ONE_MINUS_SRC_COLOR");
 		  glTexEnvi(GL_TEXTURE_ENV, src1_target, src1);
-		  checkGLcall("GL_TEXTURE_ENV, src1_target, src2");
-		  glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr1);
-		  checkGLcall("GL_TEXTURE_ENV, opr1_target, opr2");
-		  glTexEnvi(GL_TEXTURE_ENV, src2_target, src1);
-		  checkGLcall("GL_TEXTURE_ENV, src2_target, src1");
-		  glTexEnvi(GL_TEXTURE_ENV, opr2_target, GL_ONE_MINUS_SRC_ALPHA);
-		  checkGLcall("GL_TEXTURE_ENV, opr2_target, GL_ONE_MINUS_SRC_ALPHA");
+		  checkGLcall("GL_TEXTURE_ENV, src1_target, src1");
+		  glTexEnvi(GL_TEXTURE_ENV, opr1_target, GL_SRC_ALPHA);
+		  checkGLcall("GL_TEXTURE_ENV, opr1_target, GL_SRC_ALPHA");
+		  glTexEnvi(GL_TEXTURE_ENV, src2_target, src2);
+		  checkGLcall("GL_TEXTURE_ENV, src2_target, src2");
+		  glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2);
+		  checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2");
 		  glTexEnvi(GL_TEXTURE_ENV, scal_target, 1);
 		  checkGLcall("GL_TEXTURE_ENV, scal_target, 1");
 		} else
Index: version.rc
===================================================================
RCS file: /home/wine/wine/dlls/d3d8/version.rc,v
retrieving revision 1.2
diff -u -r1.2 version.rc
--- version.rc	14 May 2004 21:37:35 -0000	1.2
+++ version.rc	11 Jun 2004 00:38:13 -0000
@@ -21,7 +21,7 @@
 #define WINE_FILEVERSION 5,3,0,900
 #define WINE_FILEVERSION_STR "5.3.0.900"
 #define WINE_PRODUCTVERSION 5,3,0,900
-#define WINE_PRODUCTVERSION_STR "5.3"
+#define WINE_PRODUCTVERSION_STR "5.3.0.900"
 #define WINE_PRODUCTNAME_STR "DirectX"
 
 #include "wine/wine_common_ver.rc"