From 41bcb8cc779da193928670d076ab2b3be6cebf12 Mon Sep 17 00:00:00 2001 From: Stefan Ginsberg Date: Tue, 25 Nov 2008 13:57:26 +0000 Subject: [PATCH] - Correct some type casts svn path=/trunk/; revision=37630 --- reactos/subsystems/win32/win32k/ntuser/clipboard.c | 2 +- reactos/subsystems/win32/win32k/ntuser/cursoricon.c | 8 ++++---- reactos/subsystems/win32/win32k/objects/bitmaps.c | 2 +- reactos/subsystems/win32/win32k/objects/color.c | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/reactos/subsystems/win32/win32k/ntuser/clipboard.c b/reactos/subsystems/win32/win32k/ntuser/clipboard.c index 72d23942f94..ae3e8175f66 100644 --- a/reactos/subsystems/win32/win32k/ntuser/clipboard.c +++ b/reactos/subsystems/win32/win32k/ntuser/clipboard.c @@ -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); diff --git a/reactos/subsystems/win32/win32k/ntuser/cursoricon.c b/reactos/subsystems/win32/win32k/ntuser/cursoricon.c index 2452081edd7..12eb4d43be0 100644 --- a/reactos/subsystems/win32/win32k/ntuser/cursoricon.c +++ b/reactos/subsystems/win32/win32k/ntuser/cursoricon.c @@ -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) diff --git a/reactos/subsystems/win32/win32k/objects/bitmaps.c b/reactos/subsystems/win32/win32k/objects/bitmaps.c index 171b9f15a5f..7a5d5167672 100644 --- a/reactos/subsystems/win32/win32k/objects/bitmaps.c +++ b/reactos/subsystems/win32/win32k/objects/bitmaps.c @@ -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; diff --git a/reactos/subsystems/win32/win32k/objects/color.c b/reactos/subsystems/win32/win32k/objects/color.c index 7ab65c5844b..83acc686f36 100644 --- a/reactos/subsystems/win32/win32k/objects/color.c +++ b/reactos/subsystems/win32/win32k/objects/color.c @@ -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: