PATCH: winproc / gcc3.5

Marcus Meissner marcus at jet.franken.de
Sun Jul 4 13:05:21 CDT 2004


Hi,

This patch gets rid of unnecessary lvalue casts which are no longer supported
with gcc 3.5.

Ciao, Marcus

Changelog:
	Replace lvalue casts of post increments for newer compiler.

Index: windows/winproc.c
===================================================================
RCS file: /home/wine/wine/windows/winproc.c,v
retrieving revision 1.115
diff -u -r1.115 winproc.c
--- windows/winproc.c	14 Jun 2004 17:55:27 -0000	1.115
+++ windows/winproc.c	4 Jul 2004 18:04:07 -0000
@@ -2008,11 +2008,12 @@
         return 1;
     case LB_GETSELITEMS:
         {
-            LPINT16 items;
+            LPARAM *items; /* old LPARAM first, then *pwparam16 x INT16 entries */
+
             *pwparam16 = (WPARAM16)min( wParam32, 0x7f80 ); /* Must be < 64K */
             if (!(items = HeapAlloc( GetProcessHeap(), 0,
                                      *pwparam16 * sizeof(INT16) + sizeof(LPARAM)))) return -1;
-            *((LPARAM *)items)++ = *plparam;  /* Store the previous lParam */
+            *items++ = *plparam;  /* Store the previous lParam */
             *plparam = MapLS( items );
         }
 	*pmsg16 = LB_GETSELITEMS16;
@@ -2152,10 +2153,10 @@
     case WM_GETTEXT:
     case WM_ASKCBFORMATNAME:
         {
-            LPSTR str;
+            LPARAM *str; /* store LPARAM, then *pwparam16 char space */
             *pwparam16 = (WPARAM16)min( wParam32, 0xff80 ); /* Must be < 64K */
             if (!(str = HeapAlloc( GetProcessHeap(), 0, *pwparam16 + sizeof(LPARAM)))) return -1;
-            *((LPARAM *)str)++ = *plparam;  /* Store the previous lParam */
+            *str++ = *plparam;  /* Store the previous lParam */
             *plparam = MapLS( str );
         }
         return 1;
-- 



More information about the wine-patches mailing list