Author: tkreuzer
Date: Fri Apr 10 02:28:54 2009
New Revision: 40434
URL: http://svn.reactos.org/svn/reactos?rev=40434&view=rev
Log:
Rename PALGDI to PALETTE as it's called in gdikdx.
Modified:
trunk/reactos/subsystems/win32/win32k/eng/palette.c
trunk/reactos/subsystems/win32/win32k/eng/xlate.c
trunk/reactos/subsystems/win32/win32k/include/dc.h
trunk/reactos/subsystems/win32/win32k/include/palette.h
trunk/reactos/subsystems/win32/win32k/include/pdevobj.h
trunk/reactos/subsystems/win32/win32k/objects/bitblt.c
trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c
trunk/reactos/subsystems/win32/win32k/objects/color.c
trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c
trunk/reactos/subsystems/win32/win32k/objects/dibobj.c
trunk/reactos/subsystems/win32/win32k/objects/fillshap.c
trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c
trunk/reactos/subsystems/win32/win32k/objects/icm.c
trunk/reactos/subsystems/win32/win32k/objects/palobj.c
Modified: trunk/reactos/subsystems/win32/win32k/eng/palette.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/eng/palette.c?rev=40434&r1=40433&r2=40434&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/eng/palette.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/eng/palette.c [iso-8859-1] Fri Apr 10
02:28:54 2009
@@ -36,7 +36,7 @@
//
//
VOID FASTCALL
-ColorCorrection(PPALGDI PalGDI, PPALETTEENTRY PaletteEntry, ULONG Colors)
+ColorCorrection(PPALETTE PalGDI, PPALETTEENTRY PaletteEntry, ULONG Colors)
{
PPDEVOBJ ppdev = (PPDEVOBJ)PalGDI->hPDev;
@@ -91,10 +91,10 @@
ULONG APIENTRY
PALOBJ_cGetColors(PALOBJ *PalObj, ULONG Start, ULONG Colors, ULONG
*PaletteEntry)
{
- PALGDI *PalGDI;
+ PALETTE *PalGDI;
- PalGDI = (PALGDI*)PalObj;
- /* PalGDI = (PALGDI*)AccessInternalObjectFromUserObject(PalObj); */
+ PalGDI = (PALETTE*)PalObj;
+ /* PalGDI = (PALETTE*)AccessInternalObjectFromUserObject(PalObj); */
if (Start >= PalGDI->NumColors)
return 0;
Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/eng/xlate.c?rev=40434&r1=40433&r2=40434&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Fri Apr 10
02:28:54 2009
@@ -95,7 +95,7 @@
}
static __inline VOID
-BitMasksFromPal(USHORT PalType, PPALGDI Palette,
+BitMasksFromPal(USHORT PalType, PPALETTE Palette,
PULONG RedMask, PULONG BlueMask, PULONG GreenMask)
{
static const union { PALETTEENTRY Color; ULONG Mask; } Red = {{0xFF,
0x00, 0x00}};
@@ -152,8 +152,8 @@
{
XLATEOBJ *XlateObj;
XLATEGDI *XlateGDI;
- PALGDI *SourcePalGDI = 0;
- PALGDI *DestPalGDI = 0;
+ PALETTE *SourcePalGDI = 0;
+ PALETTE *DestPalGDI = 0;
ULONG SourceRedMask = 0, SourceGreenMask = 0, SourceBlueMask = 0;
ULONG DestRedMask = 0, DestGreenMask = 0, DestBlueMask = 0;
ULONG i;
@@ -297,7 +297,7 @@
{
XLATEOBJ *XlateObj;
XLATEGDI *XlateGDI;
- PALGDI *SourcePalGDI;
+ PALETTE *SourcePalGDI;
XlateGDI = EngAllocMem(0, sizeof(XLATEGDI), TAG_XLATEOBJ);
if (XlateGDI == NULL)
@@ -363,7 +363,7 @@
{
XLATEOBJ *XlateObj;
XLATEGDI *XlateGDI;
- PALGDI *DestPalGDI;
+ PALETTE *DestPalGDI;
DestPalGDI = PALETTE_LockPalette(PaletteDest);
if (DestPalGDI == NULL)
@@ -487,7 +487,7 @@
/* DIB sections need special handling */
if (psurfSrc->hSecure)
{
- PPALGDI ppal =
PALETTE_LockPalette(psurfSrc->hDIBPalette);
+ PPALETTE ppal =
PALETTE_LockPalette(psurfSrc->hDIBPalette);
if (ppal)
{
XlateObj =
IntEngCreateSrcMonoXlate(DestPalette, ((ULONG*)ppal->IndexedColors)[0],
((ULONG*)ppal->IndexedColors)[1]);
@@ -564,7 +564,7 @@
XLATEOBJ_iXlate(XLATEOBJ *XlateObj, ULONG Color)
{
XLATEGDI *XlateGDI;
- PALGDI *PalGDI;
+ PALETTE *PalGDI;
ULONG Closest;
/* Return the original color if there's no color translation object. */
@@ -623,7 +623,7 @@
{
HPALETTE hPalette;
XLATEGDI *XlateGDI;
- PALGDI *PalGDI;
+ PALETTE *PalGDI;
ULONG *InPal;
XlateGDI = ObjToGDI(XlateObj, XLATE);
Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/include/dc.h?rev=40434&r1=40433&r2=40434&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Fri Apr 10
02:28:54 2009
@@ -43,7 +43,7 @@
typedef struct _DCLEVEL
{
HPALETTE hpal;
- struct _PALGDI * ppal;
+ struct _PALETTE * ppal;
PVOID pColorSpace; /* COLORSPACE* */
LONG lIcmMode;
LONG lSaveDepth;
Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/include/palette.h?rev=40434&r1=40433&r2=40434&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/palette.h [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/win32/win32k/include/palette.h [iso-8859-1] Fri
Apr 10 02:28:54 2009
@@ -40,7 +40,7 @@
int max;
} ColorShifts;
-typedef struct _PALGDI
+typedef struct _PALETTE
{
/* Header for all gdi objects in the handle table.
Do not (re)move this. */
@@ -56,7 +56,7 @@
ULONG GreenMask;
ULONG BlueMask;
HDEV hPDev;
-} PALGDI, *PPALGDI;
+} PALETTE, *PPALETTE;
HPALETTE FASTCALL PALETTE_AllocPalette(ULONG Mode,
ULONG NumColors,
@@ -68,7 +68,7 @@
CONST RGBQUAD *Colors);
#define PALETTE_FreePalette(pPalette) GDIOBJ_FreeObj((POBJ)pPalette,
GDIObjType_PAL_TYPE)
#define PALETTE_FreePaletteByHandle(hPalette)
GDIOBJ_FreeObjByHandle((HGDIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE)
-#define PALETTE_LockPalette(hPalette)
((PPALGDI)GDIOBJ_LockObj((HGDIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE))
+#define PALETTE_LockPalette(hPalette)
((PPALETTE)GDIOBJ_LockObj((HGDIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE))
#define PALETTE_UnlockPalette(pPalette) GDIOBJ_UnlockObjByPtr((POBJ)pPalette)
BOOL INTERNAL_CALL PALETTE_Cleanup(PVOID ObjectBody);
@@ -79,7 +79,7 @@
#endif
INT FASTCALL PALETTE_ToPhysical (PDC dc, COLORREF color);
-INT FASTCALL PALETTE_GetObject(PPALGDI pGdiObject, INT cbCount, LPLOGBRUSH
lpBuffer);
+INT FASTCALL PALETTE_GetObject(PPALETTE pGdiObject, INT cbCount, LPLOGBRUSH
lpBuffer);
PPALETTEENTRY FASTCALL ReturnSystemPalette (VOID);
HPALETTE FASTCALL GdiSelectPalette(HDC, HPALETTE, BOOL);
Modified: trunk/reactos/subsystems/win32/win32k/include/pdevobj.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/include/pdevobj.h?rev=40434&r1=40433&r2=40434&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] Fri
Apr 10 02:28:54 2009
@@ -86,7 +86,7 @@
// ULONG TagSig;
// PLDEVOBJ pldev;
DHPDEV hPDev; /* dhpdev, DHPDEV for device. */
- PVOID ppalSurf; /* PEPALOBJ/PPALGDI for this
device. */
+ PVOID ppalSurf; /* PEPALOBJ/PPALETTE for this
device. */
DEVINFO DevInfo; // devinfo
GDIINFO GDIInfo; // gdiinfo
HSURF pSurface; /* SURFACE for this device.,
FIXME: PSURFACE */
Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/bitblt.c?rev=40434&r1=40433&r2=40434&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Fri Apr
10 02:28:54 2009
@@ -347,7 +347,7 @@
SURFACE *BitmapDest, *BitmapSrc = NULL;
XLATEOBJ *XlateObj = NULL;
HPALETTE SourcePalette = 0, DestPalette = 0;
- PPALGDI PalDestGDI, PalSourceGDI;
+ PPALETTE PalDestGDI, PalSourceGDI;
USHORT PalDestMode, PalSrcMode;
ULONG TransparentColor = 0;
BOOL Ret = FALSE;
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=40434&r1=40433&r2=40434&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] Fri
Apr 10 02:28:54 2009
@@ -218,7 +218,7 @@
{
/* Copy the color table */
UINT Index;
- PPALGDI PalGDI =
PALETTE_LockPalette(psurf->hDIBPalette);
+ PPALETTE PalGDI =
PALETTE_LockPalette(psurf->hDIBPalette);
if (!PalGDI)
{
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=40434&r1=40433&r2=40434&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] Fri Apr
10 02:28:54 2009
@@ -84,14 +84,14 @@
if( hPal != NtGdiGetStockObject(DEFAULT_PALETTE) )
{
- PPALGDI palPtr;
+ PPALETTE palPtr;
UINT pal_entries;
HDC hDC;
PDC dc;
PWINDOW_OBJECT Wnd;
const PALETTEENTRY *pptr = PaletteColors;
- palPtr = (PPALGDI)PALETTE_LockPalette(hPal);
+ palPtr = (PPALETTE)PALETTE_LockPalette(hPal);
if (!palPtr) return FALSE;
pal_entries = palPtr->NumColors;
@@ -246,7 +246,7 @@
HPALETTE APIENTRY
NtGdiCreatePaletteInternal ( IN LPLOGPALETTE pLogPal, IN UINT cEntries )
{
- PPALGDI PalGDI;
+ PPALETTE PalGDI;
HPALETTE NewPalette;
pLogPal->palNumEntries = cEntries;
@@ -260,7 +260,7 @@
return NULL;
}
- PalGDI = (PPALGDI) PALETTE_LockPalette(NewPalette);
+ PalGDI = (PPALETTE) PALETTE_LockPalette(NewPalette);
if (PalGDI != NULL)
{
PALETTE_ValidateFlags(PalGDI->IndexedColors, PalGDI->NumColors);
@@ -295,14 +295,14 @@
{
COLORREF nearest = CLR_INVALID;
PDC dc;
- PPALGDI palGDI;
+ PPALETTE palGDI;
LONG RBits, GBits, BBits;
dc = DC_LockDc(hDC);
if (NULL != dc)
{
HPALETTE hpal = dc->dclevel.hpal;
- palGDI = (PPALGDI) PALETTE_LockPalette(hpal);
+ palGDI = (PPALETTE) PALETTE_LockPalette(hpal);
if (!palGDI)
{
DC_UnlockDc(dc);
@@ -339,7 +339,7 @@
UINT APIENTRY NtGdiGetNearestPaletteIndex(HPALETTE hpal,
COLORREF Color)
{
- PPALGDI palGDI = (PPALGDI) PALETTE_LockPalette(hpal);
+ PPALETTE palGDI = (PPALETTE) PALETTE_LockPalette(hpal);
UINT index = 0;
if (NULL != palGDI)
@@ -358,10 +358,10 @@
UINT Entries,
LPPALETTEENTRY pe)
{
- PPALGDI palGDI;
+ PPALETTE palGDI;
UINT numEntries;
- palGDI = (PPALGDI) PALETTE_LockPalette(hpal);
+ palGDI = (PPALETTE) PALETTE_LockPalette(hpal);
if (NULL == palGDI)
{
return 0;
@@ -403,7 +403,7 @@
UINT Entries,
LPPALETTEENTRY pe)
{
- PPALGDI palGDI = NULL;
+ PPALETTE palGDI = NULL;
PDC dc = NULL;
UINT EntriesSize = 0;
UINT Ret = 0;
@@ -489,7 +489,7 @@
* of bugs in it.
*/
- PPALGDI palGDI, sysGDI;
+ PPALETTE palGDI, sysGDI;
int realized = 0;
PDC dc;
HPALETTE systemPalette;
@@ -608,7 +608,7 @@
UINT Entries,
CONST LPPALETTEENTRY pe)
{
- PPALGDI palGDI;
+ PPALETTE palGDI;
WORD numEntries;
if ((UINT)hpal & GDI_HANDLE_STOCK_MASK)
@@ -670,7 +670,7 @@
NtGdiUnrealizeObject(HGDIOBJ hgdiobj)
{
BOOL Ret = FALSE;
- PPALGDI palGDI;
+ PPALETTE palGDI;
if ( !hgdiobj ||
((UINT)hgdiobj & GDI_HANDLE_STOCK_MASK) ||
Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c?rev=40434&r1=40433&r2=40434&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] Fri Apr
10 02:28:54 2009
@@ -247,7 +247,7 @@
{
PDC pdc;
HPALETTE oldPal = NULL;
- PPALGDI ppal;
+ PPALETTE ppal;
// FIXME: mark the palette as a [fore\back]ground pal
pdc = DC_LockDc(hDC);
Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/dibobj.c?rev=40434&r1=40433&r2=40434&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Fri Apr
10 02:28:54 2009
@@ -74,7 +74,7 @@
{
PDC dc;
PSURFACE psurf;
- PPALGDI PalGDI;
+ PPALETTE PalGDI;
UINT Index;
ULONG biBitCount;
@@ -143,7 +143,7 @@
{
PDC dc;
PSURFACE psurf;
- PPALGDI PalGDI;
+ PPALETTE PalGDI;
UINT Index;
ULONG biBitCount;
@@ -226,7 +226,7 @@
POINTL ZeroPoint;
RECTL DestRect;
XLATEOBJ *XlateObj;
- PPALGDI hDCPalette;
+ PPALETTE hDCPalette;
//RGBQUAD *lpRGB;
HPALETTE DDB_Palette, DIB_Palette;
ULONG DDB_Palette_Type, DIB_Palette_Type;
@@ -446,7 +446,7 @@
INT DIBWidth;
SIZEL SourceSize;
XLATEOBJ *XlateObj = NULL;
- PPALGDI pDCPalette;
+ PPALETTE pDCPalette;
HPALETTE DDBPalette, DIBPalette = NULL;
ULONG DDBPaletteType, DIBPaletteType;
@@ -606,8 +606,8 @@
HBITMAP hDestBitmap = NULL;
HPALETTE hSourcePalette = NULL;
HPALETTE hDestPalette = NULL;
- PPALGDI SourcePalette = NULL;
- PPALGDI DestPalette = NULL;
+ PPALETTE SourcePalette = NULL;
+ PPALETTE DestPalette = NULL;
NTSTATUS Status = STATUS_SUCCESS;
ULONG Result = 0;
BOOL bPaletteMatch = FALSE;
@@ -1615,7 +1615,7 @@
RGBQUAD *lpRGB;
ULONG nNumColors,i;
USHORT *lpIndex;
- PPALGDI palGDI;
+ PPALETTE palGDI;
palGDI = PALETTE_LockPalette(dc->dclevel.hpal);
Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/fillshap.c?rev=40434&r1=40433&r2=40434&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Fri
Apr 10 02:28:54 2009
@@ -851,7 +851,7 @@
ULONG ulMode)
{
SURFACE *psurf;
- PPALGDI PalDestGDI;
+ PPALETTE PalDestGDI;
XLATEOBJ *XlateObj;
RECTL Extent;
POINTL DitherOrg;
Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c?rev=40434&r1=40433&r2=40434&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Fri Apr
10 02:28:54 2009
@@ -50,7 +50,7 @@
{1, sizeof(SURFACE), TAG_SURFACE, SURFACE_Cleanup}, /* 05
SURFACE */
{1, sizeof(CLIENTOBJ), TAG_CLIENTOBJ, GDI_CleanupDummy}, /* 06
CLIENTOBJ: METADC,... */
{1, sizeof(PATH), TAG_PATH, GDI_CleanupDummy}, /* 07 PATH */
- {1, sizeof(PALGDI), TAG_PALETTE, PALETTE_Cleanup}, /* 08 PAL */
+ {1, sizeof(PALETTE), TAG_PALETTE, PALETTE_Cleanup}, /* 08 PAL */
{1, sizeof(COLORSPACE), TAG_ICMLCS, GDI_CleanupDummy}, /* 09
ICMLCS, */
{1, sizeof(TEXTOBJ), TAG_LFONT, GDI_CleanupDummy}, /* 0a LFONT
*/
{0, 0, TAG_RFONT, NULL}, /* 0b RFONT,
unused */
@@ -1721,7 +1721,7 @@
break;
case GDI_OBJECT_TYPE_PALETTE:
- Result = PALETTE_GetObject((PPALGDI) pGdiObject, cbCount, lpBuffer);
+ Result = PALETTE_GetObject((PPALETTE) pGdiObject, cbCount, lpBuffer);
break;
default:
Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/icm.c?rev=40434&r1=40433&r2=40434&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/icm.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/icm.c [iso-8859-1] Fri Apr 10
02:28:54 2009
@@ -232,7 +232,7 @@
UpdateDeviceGammaRamp( HDEV hPDev )
{
BOOL Ret = FALSE;
- PPALGDI palGDI;
+ PPALETTE palGDI;
PALOBJ *palPtr;
PPDEVOBJ pGDev = (PPDEVOBJ) hPDev;
Modified: trunk/reactos/subsystems/win32/win32k/objects/palobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/palobj.c?rev=40434&r1=40433&r2=40434&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/palobj.c [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/win32/win32k/objects/palobj.c [iso-8859-1] Fri Apr
10 02:28:54 2009
@@ -42,7 +42,7 @@
BOOL INTERNAL_CALL
PALETTE_Cleanup(PVOID ObjectBody)
{
- PPALGDI pPal = (PPALGDI)ObjectBody;
+ PPALETTE pPal = (PPALETTE)ObjectBody;
if (NULL != pPal->IndexedColors)
{
ExFreePool(pPal->IndexedColors);
@@ -61,9 +61,9 @@
ULONG Blue)
{
HPALETTE NewPalette;
- PPALGDI PalGDI;
-
- PalGDI = (PPALGDI)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PALETTE);
+ PPALETTE PalGDI;
+
+ PalGDI = (PPALETTE)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PALETTE);
if (!PalGDI)
{
return NULL;
@@ -108,10 +108,10 @@
CONST RGBQUAD *Colors)
{
HPALETTE NewPalette;
- PPALGDI PalGDI;
+ PPALETTE PalGDI;
UINT i;
- PalGDI = (PPALGDI)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PALETTE);
+ PalGDI = (PPALETTE)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PALETTE);
if (!PalGDI)
{
return NULL;
@@ -229,8 +229,8 @@
int index, iRemapped = 0;
int *mapping;
HPALETTE hSysPal = NtGdiGetStockObject(DEFAULT_PALETTE);
- PPALGDI pSysPal = PALETTE_LockPalette(hSysPal);
- PPALGDI palGDI = CONTAINING_RECORD(palPtr,PALGDI,PalObj);
+ PPALETTE pSysPal = PALETTE_LockPalette(hSysPal);
+ PPALETTE palGDI = CONTAINING_RECORD(palPtr,PALETTE,PalObj);
/* FIXME - handle pSysPal == NULL!!!!!!! */
COLOR_sysPal = pSysPal->IndexedColors;
@@ -339,7 +339,7 @@
#endif
INT FASTCALL
-PALETTE_GetObject(PPALGDI pGdiObject, INT cbCount, LPLOGBRUSH lpBuffer)
+PALETTE_GetObject(PPALETTE pGdiObject, INT cbCount, LPLOGBRUSH lpBuffer)
{
if (!lpBuffer)
{
