PATCH: x11drv lvalue casts

Marcus Meissner marcus at jet.franken.de
Sat Jul 10 02:59:29 CDT 2004


Hi,

More gcc 3.5 fixes regarding lvalue casts with postincrements.

Ciao, Marcus

Changelog:
	Replaced lvalue casts / postincrement mixes.

Index: dlls/x11drv/dib_convert.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/dib_convert.c,v
retrieving revision 1.1
diff -u -r1.1 dib_convert.c
--- dlls/x11drv/dib_convert.c	25 Nov 2003 03:27:38 -0000	1.1
+++ dlls/x11drv/dib_convert.c	10 Jul 2004 07:44:02 -0000
@@ -1188,7 +1188,8 @@
         for (x=0; x<oddwidth; x++) {
             DWORD srcval;
             srcval=*srcpixel++;
-            *((WORD*)dstbyte)++=srcval;                 /* h, g */
+            *((WORD*)dstbyte) = srcval;                 /* h, g */
+            dstbyte+=sizeof(WORD);
             *dstbyte++=srcval >> 16;                    /* l */
         }
         srcbits = (char*)srcbits + srclinebytes;
@@ -1239,8 +1240,9 @@
         for (x=0; x<oddwidth; x++) {
             DWORD srcval;
             srcval=*srcpixel++;
-            *((WORD*)dstbyte)++=((srcval >> 16) & 0x00ff) | /* h */
-                                (srcval         & 0xff00);  /* g */
+            *((WORD*)dstbyte)=((srcval >> 16) & 0x00ff) | /* h */
+                              (srcval         & 0xff00);  /* g */
+            dstbyte += sizeof(WORD);
             *dstbyte++=srcval;                              /* l */
         }
         srcbits = (char*)srcbits + srclinebytes;
Index: dlls/x11drv/dib_src_swap.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/dib_src_swap.c,v
retrieving revision 1.1
diff -u -r1.1 dib_src_swap.c
--- dlls/x11drv/dib_src_swap.c	25 Nov 2003 03:27:38 -0000	1.1
+++ dlls/x11drv/dib_src_swap.c	10 Jul 2004 07:44:02 -0000
@@ -1360,7 +1360,8 @@
             DWORD srcval;
             srcval=*srcpixel++;
             FLIP_DWORD(&srcval);
-            *((WORD*)dstbyte)++=srcval;                 /* h, g */
+            *((WORD*)dstbyte)=srcval;                   /* h, g */
+            dstbyte+=sizeof(WORD);
             *dstbyte++=srcval >> 16;                    /* l */
         }
         srcbits = (char*)srcbits + srclinebytes;
@@ -1405,7 +1406,8 @@
         for (x=0; x<oddwidth; x++) {
             DWORD srcval;
             srcval=*srcpixel++;
-            *((WORD*)dstbyte)++=((srcval >> 8) & 0xffff); /* g, h */
+            *((WORD*)dstbyte)=((srcval >> 8) & 0xffff); /* g, h */
+            dstbyte+=sizeof(WORD);
             *dstbyte++= srcval >> 24;                     /* l */
         }
         srcbits = (char*)srcbits + srclinebytes;



More information about the wine-patches mailing list