Andrew Talbot : user: Cast-qual warnings fix.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3878ebcd7c1507b6495ff9ea5c678a9d098f4b6b
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=3878ebcd7c1507b6495ff9ea...

Author: Andrew Talbot 
Date:   Mon Oct  2 21:14:11 2006 +0100

user: Cast-qual warnings fix.

---

dlls/user/cursoricon.c |    8 ++++----
 dlls/user/exticon.c    |    2 +-
 dlls/user/spy.c        |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/user/cursoricon.c b/dlls/user/cursoricon.c
index 1a43ebd..e056366 100644
--- a/dlls/user/cursoricon.c
+++ b/dlls/user/cursoricon.c
@@ -269,7 +269,7 @@ static BOOL is_dib_monochrome( const BIT

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 @@ static int DIB_GetBitmapInfo( const BITM
     }
     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 @@ static int DIB_GetBitmapInfo( const BITM
     }
     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 @@ static int DIB_GetBitmapInfo( const BITM
     }
     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 --git a/dlls/user/exticon.c b/dlls/user/exticon.c
index 7961124..71390e7 100644
--- a/dlls/user/exticon.c
+++ b/dlls/user/exticon.c
@@ -607,7 +607,7 @@ static UINT ICO_ExtractIconExW(
        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 --git a/dlls/user/spy.c b/dlls/user/spy.c
index bd84508..e1c3d0b 100644
--- a/dlls/user/spy.c
+++ b/dlls/user/spy.c
@@ -2659,7 +2659,7 @@ int SPY_Init(void)
             q++;
         }
         q--;
-        cc_array[i].lastmsg = (USER_MSG *)q;
+        cc_array[i].lastmsg = q;

i++;
     }