[ros-diffs] [sginsberg] 37630: - Correct some type casts

[sginsberg at svn.reactos.org]

Author: sginsberg
Date: Tue Nov 25 07:57:26 2008
New Revision: 37630

URL: http://svn.reactos.org/svn/reactos?rev=37630&view=rev
Log:
- Correct some type casts

Modified:
    trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c
    trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c
    trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c
    trunk/reactos/subsystems/win32/win32k/objects/color.c

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c?rev=37630&r1=37629&r2=37630&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Tue Nov 25 07:57:26 2008
@@ -955,7 +955,7 @@
 
 
                     BitmapObj = BITMAPOBJ_LockBitmap(hMem);
-                    BITMAP_GetObject(BitmapObj, sizeof(BITMAP), (LPSTR)&bm);
+                    BITMAP_GetObject(BitmapObj, sizeof(BITMAP), (PVOID)&bm);
                     if(BitmapObj)
                     {
                         BITMAPOBJ_UnlockBitmap(BitmapObj);

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c?rev=37630&r1=37629&r2=37630&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Tue Nov 25 07:57:26 2008
@@ -1524,12 +1524,12 @@
    if (istepIfAniCur)
       DPRINT1("NtUserDrawIconEx: istepIfAniCur is not supported!\n");
 
-   if (!hbmMask || !IntGdiGetObject(hbmMask, sizeof(BITMAP), &bmpMask))
+   if (!hbmMask || !IntGdiGetObject(hbmMask, sizeof(BITMAP), (PVOID)&bmpMask))
    {
       return FALSE;
    }
 
-   if (hbmColor && !IntGdiGetObject(hbmColor, sizeof(BITMAP), &bmpColor))
+   if (hbmColor && !IntGdiGetObject(hbmColor, sizeof(BITMAP), (PVOID)&bmpColor))
    {
       return FALSE;
    }
@@ -1597,7 +1597,7 @@
           DPRINT1("GDIOBJ_LockObj() failed!\n");
           goto cleanup;
       }
-      BITMAP_GetObject(BitmapObj, sizeof(BITMAP), &bm);
+      BITMAP_GetObject(BitmapObj, sizeof(BITMAP), (PVOID)&bm);
 
       if (bm.bmBitsPixel != 32)
         bAlpha = FALSE;
@@ -1696,7 +1696,7 @@
             DPRINT1("GDIOBJ_LockObj() failed!\n");
             goto cleanup;
         }
-        BITMAP_GetObject(BitmapObj, sizeof(BITMAP), &bm);
+        BITMAP_GetObject(BitmapObj, sizeof(BITMAP), (PVOID)&bm);
 
         pBits = ExAllocatePoolWithTag(PagedPool, bm.bmWidthBytes * abs(bm.bmHeight), TAG_BITMAP);
         if (pBits == NULL)

Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c?rev=37630&r1=37629&r2=37630&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Tue Nov 25 07:57:26 2008
@@ -679,7 +679,7 @@
 		return 0;
 	}
 
-	BITMAP_GetObject(Bitmap, sizeof(BITMAP), &bm);
+	BITMAP_GetObject(Bitmap, sizeof(BITMAP), (PVOID)&bm);
 	bm.bmBits = NULL;
 	if (Bitmap->SurfObj.lDelta >= 0)
 		bm.bmHeight = -bm.bmHeight;

Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/color.c?rev=37630&r1=37629&r2=37630&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] Tue Nov 25 07:57:26 2008
@@ -846,20 +846,20 @@
 	{
 		case GdiPalAnimate:
 			if (pEntries)
-				ret = IntAnimatePalette((HPALETTE)hObj, iStart, cEntries, pEntries);
+				ret = IntAnimatePalette((HPALETTE)hObj, iStart, cEntries, (CONST PPALETTEENTRY)pEntries);
 			break;
 
 		case GdiPalSetEntries:
 			if (pEntries)
-				ret = IntSetPaletteEntries((HPALETTE)hObj, iStart, cEntries, pEntries);
+				ret = IntSetPaletteEntries((HPALETTE)hObj, iStart, cEntries, (CONST LPPALETTEENTRY)pEntries);
 			break;
 
 		case GdiPalGetEntries:
-			ret = IntGetPaletteEntries((HPALETTE)hObj, iStart, cEntries, pEntries);
+			ret = IntGetPaletteEntries((HPALETTE)hObj, iStart, cEntries, (LPPALETTEENTRY)pEntries);
 			break;
 
 		case GdiPalGetSystemEntries:
-			ret = IntGetSystemPaletteEntries((HDC)hObj, iStart, cEntries, pEntries);
+			ret = IntGetSystemPaletteEntries((HDC)hObj, iStart, cEntries, (LPPALETTEENTRY)pEntries);
 			break;
 
 		case GdiPalSetColorTable: