- Correct some type casts

svn path=/trunk/; revision=37630
This commit is contained in:
Stefan Ginsberg
2008-11-25 13:57:26 +00:00
parent ea60c32d4f
commit 41bcb8cc77
4 changed files with 10 additions and 10 deletions
@@ -955,7 +955,7 @@ NtUserSetClipboardData(UINT uFormat, HANDLE hMem, DWORD size)
BitmapObj = BITMAPOBJ_LockBitmap(hMem);
BITMAP_GetObject(BitmapObj, sizeof(BITMAP), (LPSTR)&bm);
BITMAP_GetObject(BitmapObj, sizeof(BITMAP), (PVOID)&bm);
if(BitmapObj)
{
BITMAPOBJ_UnlockBitmap(BitmapObj);
@@ -1524,12 +1524,12 @@ UserDrawIconEx(
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 @@ UserDrawIconEx(
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 @@ UserDrawIconEx(
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)
@@ -679,7 +679,7 @@ BITMAPOBJ_CopyBitmap(HBITMAP hBitmap)
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;
@@ -846,20 +846,20 @@ NtGdiDoPalette(
{
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: