user: Cast-qual warnings fix

Andrew Talbot Andrew.Talbot at talbotville.com
Mon Oct 2 15:14:11 CDT 2006


Changelog:
    user: Cast-qual warnings fix.

diff -urN a/dlls/user/cursoricon.c b/dlls/user/cursoricon.c
--- a/dlls/user/cursoricon.c	2006-08-09 16:38:48.000000000 +0100
+++ b/dlls/user/cursoricon.c	2006-10-02 18:36:18.000000000 +0100
@@ -269,7 +269,7 @@
 
     if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER))
     {
-        RGBTRIPLE *rgb = ((BITMAPCOREINFO *) info)->bmciColors;
+        const RGBTRIPLE *rgb = ((const BITMAPCOREINFO*)info)->bmciColors;
 
         /* Check if the first color is black */
         if ((rgb->rgbtRed == 0) && (rgb->rgbtGreen == 0) && (rgb->rgbtBlue == 0))
@@ -320,7 +320,7 @@
     }
     if (header->biSize == sizeof(BITMAPCOREHEADER))
     {
-        BITMAPCOREHEADER *core = (BITMAPCOREHEADER *)header;
+        const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)header;
         *width  = core->bcWidth;
         *height = core->bcHeight;
         *bpp    = core->bcBitCount;
@@ -329,7 +329,7 @@
     }
     if (header->biSize == sizeof(BITMAPV4HEADER))
     {
-        BITMAPV4HEADER *v4hdr = (BITMAPV4HEADER *)header;
+        const BITMAPV4HEADER *v4hdr = (const BITMAPV4HEADER *)header;
         *width  = v4hdr->bV4Width;
         *height = v4hdr->bV4Height;
         *bpp    = v4hdr->bV4BitCount;
@@ -338,7 +338,7 @@
     }
     if (header->biSize == sizeof(BITMAPV5HEADER))
     {
-        BITMAPV5HEADER *v5hdr = (BITMAPV5HEADER *)header;
+        const BITMAPV5HEADER *v5hdr = (const BITMAPV5HEADER *)header;
         *width  = v5hdr->bV5Width;
         *height = v5hdr->bV5Height;
         *bpp    = v5hdr->bV5BitCount;
diff -urN a/dlls/user/exticon.c b/dlls/user/exticon.c
--- a/dlls/user/exticon.c	2006-06-13 12:01:00.000000000 +0100
+++ b/dlls/user/exticon.c	2006-10-02 20:19:12.000000000 +0100
@@ -607,7 +607,7 @@
 	    const IMAGE_RESOURCE_DIRECTORY *resdir;
 
 	    /* go down this resource entry, name */
-            resdir = (PIMAGE_RESOURCE_DIRECTORY)((char *)rootresdir + xresent->u2.s3.OffsetToDirectory);
+            resdir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)rootresdir + xresent->u2.s3.OffsetToDirectory);
 
 	    /* default language (0) */
 	    resdir = find_entry_default(resdir,rootresdir);
diff -urN a/dlls/user/spy.c b/dlls/user/spy.c
--- a/dlls/user/spy.c	2006-08-02 21:22:24.000000000 +0100
+++ b/dlls/user/spy.c	2006-10-02 20:52:07.000000000 +0100
@@ -2659,7 +2659,7 @@
             q++;
         }
         q--;
-        cc_array[i].lastmsg = (USER_MSG *)q;
+        cc_array[i].lastmsg = q;
 
         i++;
     }



More information about the wine-patches mailing list